From fedora-cvs-commits at redhat.com Wed Mar 1 00:04:18 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 28 Feb 2006 19:04:18 -0500 Subject: rpms/initscripts/devel .cvsignore, 1.95, 1.96 initscripts.spec, 1.109, 1.110 sources, 1.103, 1.104 Message-ID: <200603010004.k2104IEO024636@cvs.devel.redhat.com> Author: notting Update of /cvs/dist/rpms/initscripts/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv24572 Modified Files: .cvsignore initscripts.spec sources Log Message: update Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/initscripts/devel/.cvsignore,v retrieving revision 1.95 retrieving revision 1.96 diff -u -r1.95 -r1.96 --- .cvsignore 14 Feb 2006 19:43:45 -0000 1.95 +++ .cvsignore 1 Mar 2006 00:04:03 -0000 1.96 @@ -1 +1 @@ -initscripts-8.29.tar.bz2 +initscripts-8.30.tar.bz2 Index: initscripts.spec =================================================================== RCS file: /cvs/dist/rpms/initscripts/devel/initscripts.spec,v retrieving revision 1.109 retrieving revision 1.110 diff -u -r1.109 -r1.110 --- initscripts.spec 14 Feb 2006 19:43:45 -0000 1.109 +++ initscripts.spec 1 Mar 2006 00:04:03 -0000 1.110 @@ -1,6 +1,6 @@ Summary: The inittab file and the /etc/init.d scripts. Name: initscripts -Version: 8.29 +Version: 8.30 License: GPL Group: System Environment/Base Release: 1 @@ -208,6 +208,15 @@ %ghost %attr(0664,root,utmp) /var/run/utmp %changelog +* Tue Feb 28 2006 Bill Nottingham 8.30-1 +- hotplug: don't cause modules to be reloaded on ifdown/rmmod (#179809) +- fix endless loops in ifup/ifdown (#177792, #182466) +- fix enabling of enforcing SELinux mode after relabel (#181893) +- remove debugging code from ifup-bnep +- add /proc, /sys mounting back to rc.sysinit + Note: booting without an initrd is deprecated +- translation updates + * Tue Feb 14 2006 Peter Jones 8.29-1 - scrub another possible error message from dmraid output Index: sources =================================================================== RCS file: /cvs/dist/rpms/initscripts/devel/sources,v retrieving revision 1.103 retrieving revision 1.104 diff -u -r1.103 -r1.104 --- sources 14 Feb 2006 19:43:45 -0000 1.103 +++ sources 1 Mar 2006 00:04:03 -0000 1.104 @@ -1 +1 @@ -045152dab9da20ee95cf25b323faad8a initscripts-8.29.tar.bz2 +097ea19d927afa7340e1e17e530ef960 initscripts-8.30.tar.bz2 From fedora-cvs-commits at redhat.com Wed Mar 1 00:14:32 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 28 Feb 2006 19:14:32 -0500 Subject: rpms/system-config-netboot/devel .cvsignore, 1.26, 1.27 sources, 1.28, 1.29 system-config-netboot.spec, 1.41, 1.42 Message-ID: <200603010014.k210EWHa027846@cvs.devel.redhat.com> Author: jvdias Update of /cvs/dist/rpms/system-config-netboot/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv27811 Modified Files: .cvsignore sources system-config-netboot.spec Log Message: fix bugs 178395, 174629, 182869 - misc. other fixes Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/system-config-netboot/devel/.cvsignore,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- .cvsignore 10 Feb 2006 00:50:34 -0000 1.26 +++ .cvsignore 1 Mar 2006 00:14:29 -0000 1.27 @@ -12,3 +12,4 @@ system-config-netboot-0.1.34.tar.gz system-config-netboot-0.1.36.tar.gz system-config-netboot-0.1.37.tar.gz +system-config-netboot-0.1.38.tar.gz Index: sources =================================================================== RCS file: /cvs/dist/rpms/system-config-netboot/devel/sources,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- sources 10 Feb 2006 00:50:34 -0000 1.28 +++ sources 1 Mar 2006 00:14:29 -0000 1.29 @@ -1 +1 @@ -8e8d2d4108dd88e8308921d84bc73441 system-config-netboot-0.1.37.tar.gz +b238d55f597fe992f7105f1c13a109a1 system-config-netboot-0.1.38.tar.gz Index: system-config-netboot.spec =================================================================== RCS file: /cvs/dist/rpms/system-config-netboot/devel/system-config-netboot.spec,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- system-config-netboot.spec 10 Feb 2006 00:50:34 -0000 1.41 +++ system-config-netboot.spec 1 Mar 2006 00:14:29 -0000 1.42 @@ -1,7 +1,7 @@ # -*- RPM-SPEC -*- Summary: system-config-netboot is an network booting/install configuration utility Name: system-config-netboot -Version: 0.1.37 +Version: 0.1.38 Release: 1 URL: http://www.redhat.com/ Source0: %{name}-%{version}.tar.gz @@ -11,6 +11,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-root Requires: gnome-python2, pygtk2, pygtk2-libglade, gnome-python2-canvas, rhpl, alchemist Requires: tftp-server >= 0.29-3 +Requires(post): hicolor-icon-theme #ExclusiveArch: i386 x86_64 BuildArch: noarch Obsoletes: redhat-config-netboot @@ -73,6 +74,22 @@ %config %{_sysconfdir}/security/console.apps/system-config-netboot %changelog +* Tue Feb 14 2006 Jason Vas Dias - 0.1.38-1 +- further fix for f1 at micromemory.com problem (now bug 181365) + deal with required binaries that have been replaced by scripts +- fix bug 178395: allow setting of NISDOMAIN +- fix bug 174629: fix initscript patches (prevent application!) +- fix bug 182869: should Requires(post): hicolor-icon-theme +- fix issues reported by brian at chpc.utah.edu (bugs to be raised): + o mkdiskless must not wipe out client root customizations on re-run + o give serial console checkbox a speed drop down list + - add "Use tty0 console also" checkbox option + o allow editing of extra boot options in the config file + o do not create snapshot directory for network boot targets + o remove /etc/ssh keys and make /etc/ssh a snapshot file + o mount /var/cache, /var/lib/misc, /var/lib/mrtg on tmpfs / snapshot + o fix network syslog : '*' -> '*.*' + * Thu Feb 09 2006 Jason Vas Dias - 0.1.37-1 - fix problem reported by f1 at micromemory.com: detect and deal with missing libraries in the client root correctly From fedora-cvs-commits at redhat.com Wed Mar 1 00:20:30 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 28 Feb 2006 19:20:30 -0500 Subject: rpms/system-config-netboot/FC-4 .cvsignore, 1.23, 1.24 sources, 1.25, 1.26 system-config-netboot.spec, 1.31, 1.32 Message-ID: <200603010020.k210KUE7010440@cvs.devel.redhat.com> Author: jvdias Update of /cvs/dist/rpms/system-config-netboot/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv10385 Modified Files: .cvsignore sources system-config-netboot.spec Log Message: fix bugs 178395, 174629, 182869 - misc. other fixes Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/system-config-netboot/FC-4/.cvsignore,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- .cvsignore 20 Dec 2005 02:00:25 -0000 1.23 +++ .cvsignore 1 Mar 2006 00:20:27 -0000 1.24 @@ -10,3 +10,6 @@ system-config-netboot-0.1.30.tar.gz system-config-netboot-0.1.33.tar.gz system-config-netboot-0.1.34.tar.gz +system-config-netboot-0.1.36.tar.gz +system-config-netboot-0.1.37.tar.gz +system-config-netboot-0.1.38.tar.gz Index: sources =================================================================== RCS file: /cvs/dist/rpms/system-config-netboot/FC-4/sources,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- sources 20 Dec 2005 02:00:25 -0000 1.25 +++ sources 1 Mar 2006 00:20:27 -0000 1.26 @@ -1,2 +1 @@ -b596562089670d97833d6a216cc3c4ad system-config-netboot-0.1.33.tar.gz -54e5a32dcecc0b03e94e03c76a01c887 system-config-netboot-0.1.34.tar.gz +b238d55f597fe992f7105f1c13a109a1 system-config-netboot-0.1.38.tar.gz Index: system-config-netboot.spec =================================================================== RCS file: /cvs/dist/rpms/system-config-netboot/FC-4/system-config-netboot.spec,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- system-config-netboot.spec 21 Dec 2005 21:55:15 -0000 1.31 +++ system-config-netboot.spec 1 Mar 2006 00:20:27 -0000 1.32 @@ -1,7 +1,7 @@ # -*- RPM-SPEC -*- Summary: system-config-netboot is an network booting/install configuration utility Name: system-config-netboot -Version: 0.1.34 +Version: 0.1.38 Release: 1_FC4 URL: http://www.redhat.com/ Source0: %{name}-%{version}.tar.gz @@ -11,6 +11,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-root Requires: gnome-python2, pygtk2, pygtk2-libglade, gnome-python2-canvas, rhpl, alchemist Requires: tftp-server >= 0.29-3 +Requires(post): hicolor-icon-theme ExclusiveArch: i386 x86_64 #BuildArch: noarch Obsoletes: redhat-config-netboot @@ -39,9 +40,19 @@ mkdir -p %{buildroot}/tftpboot/linux-install/pxelinux.cfg cp -arfp %{buildroot}/%{_datadir}/system-config-netboot/msgs %{buildroot}/tftpboot/linux-install/ cp -fp %{SOURCE1} %{buildroot}/tftpboot/linux-install - +mkdir -p %{buildroot}/%{_datadir}/icons/hicolor/48x48/apps +cp -afp pixmaps/system-config-netboot.png %{buildroot}/%{_datadir}/icons/hicolor/48x48/apps/system-config-netboot.png %find_lang %name +%post +if [ "$1" -eq 1 ]; then + /bin/touch --no-create %{_datadir}/icons/hicolor + /bin/touch --no-create %{_datadir}/icons/hicolor/48x48 + if [ -x /usr/bin/gtk-update-icon-cache ]; then + /usr/bin/gtk-update-icon-cache -q %{_datadir}/icons/hicolor + fi +fi + %clean rm -rf %{buildroot} @@ -54,6 +65,7 @@ %{_datadir}/applications/system-config-netboot.desktop %{_datadir}/system-config-netboot %{_datadir}/pixmaps/system-config-netboot.xpm +%{_datadir}/icons/hicolor/48x48/apps/system-config-netboot.png %{_mandir}/*/*.8* /tftpboot/linux-install/pxelinux.cfg/ /tftpboot/linux-install/msgs/ @@ -62,6 +74,34 @@ %config %{_sysconfdir}/security/console.apps/system-config-netboot %changelog +* Tue Feb 14 2006 Jason Vas Dias - 0.1.38-1 +- further fix for f1 at micromemory.com problem (now bug 181365) + deal with required binaries that have been replaced by scripts +- fix bug 178395: allow setting of NISDOMAIN +- fix bug 174629: fix initscript patches (prevent application!) +- fix bug 182869: should Requires(post): hicolor-icon-theme +- fix issues reported by brian at chpc.utah.edu (bugs to be raised): + o mkdiskless must not wipe out client root customizations on re-run + o give serial console checkbox a speed drop down list + - add "Use tty0 console also" checkbox option + o allow editing of extra boot options in the config file + o do not create snapshot directory for network boot targets + o remove /etc/ssh keys and make /etc/ssh a snapshot file + o mount /var/cache, /var/lib/misc, /var/lib/mrtg on tmpfs / snapshot + o fix network syslog : '*' -> '*.*' + +* Thu Feb 09 2006 Jason Vas Dias - 0.1.37-1 +- fix problem reported by f1 at micromemory.com: + detect and deal with missing libraries in the client root correctly +- fix bug 178392: disklessrc's "^$MODULE" should be "^$MODULE " +- ship updated .po files + +* Wed Dec 21 2005 Jason Vas Dias - 0.1.36-1 +- fix bug 170634: don't use pam_stack in pam configuration file +- fix bug 171820: add desktop.in file to POTFILES.in +- use 'LC_ALL=C' for updateDiskless' 'echo y | /sbin/mke2fs ...', + as pointed out by email from Kiko Albiol Colomer + * Mon Dec 19 2005 Jason Vas Dias - 0.1.34-1 - fix bug 174942: make diskless clients free initrd memory - fix bug 174941: fix mkdiskless syslog.conf typo: '*' -> '*.*' From fedora-cvs-commits at redhat.com Wed Mar 1 00:20:56 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 28 Feb 2006 19:20:56 -0500 Subject: rpms/kernel/devel linux-2.6-xen-compile-fixes.patch, 1.1.12.4, 1.1.12.5 Message-ID: <200603010020.k210Ku4n010653@cvs.devel.redhat.com> Author: quintela Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv10238 Modified Files: Tag: private-xen-rebased-1971-branch linux-2.6-xen-compile-fixes.patch Log Message: fix the topology fix linux-2.6-xen-compile-fixes.patch: linux-2.6.15.i686/arch/i386/mach-xen/Makefile | 4 --- linux-2.6.15.ia64/fs/Kconfig | 1 linux-2.6.15.new/arch/i386/mm/init-xen.c | 1 linux-2.6.15.xen/arch/i386/kernel/Makefile | 3 -- linux-2.6.15.xen/arch/i386/kernel/acpi/boot-xen.c | 3 -- linux-2.6.15.xen/arch/i386/kernel/smp-xen.c | 1 linux-2.6.15.xen/arch/i386/mm/init-xen.c | 1 linux-2.6.15.xen/arch/x86_64/kernel/pmtimer.c | 2 + linux-2.6.15.xen/arch/x86_64/kernel/process-xen.c | 6 ---- linux-2.6.15.xen/arch/x86_64/mm/fault-xen.c | 2 - linux-2.6.15.xen/include/asm-i386/mach-xen/asm/desc.h | 14 +++++++++++ linux-2.6.15.xen/include/asm-i386/mach-xen/asm/mmu.h | 7 +++++ linux-2.6.15.xen/include/asm-i386/mach-xen/asm/pgalloc.h | 1 linux-2.6.15.xen/include/asm-i386/mach-xen/asm/processor.h | 7 ++++- linux-2.6.15.xen/include/asm-i386/mach-xen/asm/swiotlb.h | 1 linux-2.6.15.xen/include/asm-x86_64/acpi.h | 2 + linux-2.6.15.xen/include/asm-x86_64/mach-xen/asm/pgalloc.h | 7 +++++ linux-2.6.15.xen/include/asm-x86_64/mach-xen/asm/pgtable.h | 2 - linux-2.6.15.xen/include/asm-x86_64/mach-xen/asm/processor.h | 2 + 19 files changed, 49 insertions(+), 18 deletions(-) Index: linux-2.6-xen-compile-fixes.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-xen-compile-fixes.patch,v retrieving revision 1.1.12.4 retrieving revision 1.1.12.5 diff -u -r1.1.12.4 -r1.1.12.5 --- linux-2.6-xen-compile-fixes.patch 28 Feb 2006 22:53:14 -0000 1.1.12.4 +++ linux-2.6-xen-compile-fixes.patch 1 Mar 2006 00:20:54 -0000 1.1.12.5 @@ -221,7 +221,8 @@ @@ -3,5 +3,3 @@ # - obj-y := setup.o topology.o +-obj-y := setup.o topology.o ++obj-y := setup.o - -topology-y := ../mach-default/topology.o diff -urNp --exclude-from=/home/mitica/quintela/config/misc/dontdiff kernel-2.6.15/linux-2.6.15.noarch/arch/i386/kernel/acpi/boot-xen.c linux-2.6.15.xen/arch/i386/kernel/acpi/boot-xen.c From fedora-cvs-commits at redhat.com Wed Mar 1 00:34:29 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 28 Feb 2006 19:34:29 -0500 Subject: rpms/system-config-netboot/FC-4 system-config-netboot.pam, NONE, 1.1 system-config-netboot.spec, 1.32, 1.33 Message-ID: <200603010034.k210YTOe014681@cvs.devel.redhat.com> Author: jvdias Update of /cvs/dist/rpms/system-config-netboot/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv14641 Modified Files: system-config-netboot.spec Added Files: system-config-netboot.pam Log Message: fix bugs 178395, 174629, 182869 - misc. other fixes --- NEW FILE system-config-netboot.pam --- #%PAM-1.0 auth sufficient pam_rootok.so auth sufficient pam_timestamp.so auth required pam_stack.so service=system-auth session required pam_permit.so session optional pam_xauth.so session optional pam_timestamp.so account required pam_permit.so Index: system-config-netboot.spec =================================================================== RCS file: /cvs/dist/rpms/system-config-netboot/FC-4/system-config-netboot.spec,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- system-config-netboot.spec 1 Mar 2006 00:20:27 -0000 1.32 +++ system-config-netboot.spec 1 Mar 2006 00:33:59 -0000 1.33 @@ -2,10 +2,11 @@ Summary: system-config-netboot is an network booting/install configuration utility Name: system-config-netboot Version: 0.1.38 -Release: 1_FC4 +Release: 0.1_FC4 URL: http://www.redhat.com/ Source0: %{name}-%{version}.tar.gz Source1: pxelinux.0 +Source2: system-config-netboot.pam License: GPL Group: Applications/System BuildRoot: %{_tmppath}/%{name}-%{version}-root @@ -42,6 +43,8 @@ cp -fp %{SOURCE1} %{buildroot}/tftpboot/linux-install mkdir -p %{buildroot}/%{_datadir}/icons/hicolor/48x48/apps cp -afp pixmaps/system-config-netboot.png %{buildroot}/%{_datadir}/icons/hicolor/48x48/apps/system-config-netboot.png +# replace devel/ pam configuration file with that which uses pam_stack: +cp -fp %{SOURCE2} %{buildroot}/%{_sysconfdir}/pam.d/%{name} %find_lang %name %post From fedora-cvs-commits at redhat.com Wed Mar 1 00:38:40 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 28 Feb 2006 19:38:40 -0500 Subject: rpms/system-config-netboot/FC-4 system-config-netboot.spec, 1.33, 1.34 Message-ID: <200603010038.k210ceYH015871@cvs.devel.redhat.com> Author: jvdias Update of /cvs/dist/rpms/system-config-netboot/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv15842 Modified Files: system-config-netboot.spec Log Message: fix bugs 178395, 174629, 182869 - misc. other fixes Index: system-config-netboot.spec =================================================================== RCS file: /cvs/dist/rpms/system-config-netboot/FC-4/system-config-netboot.spec,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- system-config-netboot.spec 1 Mar 2006 00:33:59 -0000 1.33 +++ system-config-netboot.spec 1 Mar 2006 00:38:38 -0000 1.34 @@ -2,7 +2,7 @@ Summary: system-config-netboot is an network booting/install configuration utility Name: system-config-netboot Version: 0.1.38 -Release: 0.1_FC4 +Release: 2_FC4 URL: http://www.redhat.com/ Source0: %{name}-%{version}.tar.gz Source1: pxelinux.0 @@ -100,7 +100,6 @@ - ship updated .po files * Wed Dec 21 2005 Jason Vas Dias - 0.1.36-1 -- fix bug 170634: don't use pam_stack in pam configuration file - fix bug 171820: add desktop.in file to POTFILES.in - use 'LC_ALL=C' for updateDiskless' 'echo y | /sbin/mke2fs ...', as pointed out by email from Kiko Albiol Colomer From fedora-cvs-commits at redhat.com Wed Mar 1 02:11:59 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 28 Feb 2006 21:11:59 -0500 Subject: rpms/sound-juicer/devel .cvsignore, 1.18, 1.19 sound-juicer.spec, 1.40, 1.41 sources, 1.18, 1.19 Message-ID: <200603010211.k212Bxx3015834@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/sound-juicer/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv15779 Modified Files: .cvsignore sound-juicer.spec sources Log Message: 2.13.6 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/sound-juicer/devel/.cvsignore,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- .cvsignore 12 Feb 2006 19:30:36 -0000 1.18 +++ .cvsignore 1 Mar 2006 02:11:56 -0000 1.19 @@ -8,3 +8,4 @@ sound-juicer-2.13.2.tar.bz2 sound-juicer-2.13.4.tar.bz2 sound-juicer-2.13.5.tar.bz2 +sound-juicer-2.13.6.tar.bz2 Index: sound-juicer.spec =================================================================== RCS file: /cvs/dist/rpms/sound-juicer/devel/sound-juicer.spec,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- sound-juicer.spec 12 Feb 2006 19:30:49 -0000 1.40 +++ sound-juicer.spec 1 Mar 2006 02:11:56 -0000 1.41 @@ -12,7 +12,7 @@ Name: sound-juicer Summary: Clean and lean CD ripper -Version: 2.13.5 +Version: 2.13.6 Release: 1 License: GPL Group: Applications/Multimedia @@ -92,6 +92,9 @@ %{_datadir}/omf/sound-juicer %changelog +* Tue Feb 28 2006 Matthias Clasen - 2.13.6-1 +- Update to 2.13.6 + * Sun Feb 12 2006 Matthias Clasen - 2.13.5-1 - Update to 2.13.5 Index: sources =================================================================== RCS file: /cvs/dist/rpms/sound-juicer/devel/sources,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- sources 12 Feb 2006 19:30:49 -0000 1.18 +++ sources 1 Mar 2006 02:11:56 -0000 1.19 @@ -1 +1 @@ -cb0e983b4c22405851eff58cce5b9392 sound-juicer-2.13.5.tar.bz2 +7a97eaa80cbad2e5650e9a80574d68b2 sound-juicer-2.13.6.tar.bz2 From fedora-cvs-commits at redhat.com Wed Mar 1 02:17:06 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 28 Feb 2006 21:17:06 -0500 Subject: rpms/sound-juicer/devel sound-juicer.spec,1.41,1.42 Message-ID: <200603010217.k212H6ja021733@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/sound-juicer/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv20695 Modified Files: sound-juicer.spec Log Message: fix file lists Index: sound-juicer.spec =================================================================== RCS file: /cvs/dist/rpms/sound-juicer/devel/sound-juicer.spec,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- sound-juicer.spec 1 Mar 2006 02:11:56 -0000 1.41 +++ sound-juicer.spec 1 Mar 2006 02:17:01 -0000 1.42 @@ -87,7 +87,6 @@ %{_sysconfdir}/gconf/schemas/sound-juicer.schemas %{_datadir}/sound-juicer %{_datadir}/applications/sound-juicer.desktop -%{_datadir}/pixmaps/sound-juicer.png %{_datadir}/gnome/help/sound-juicer %{_datadir}/omf/sound-juicer From fedora-cvs-commits at redhat.com Wed Mar 1 02:24:27 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 28 Feb 2006 21:24:27 -0500 Subject: rpms/librsvg2/devel .cvsignore, 1.22, 1.23 librsvg2.spec, 1.40, 1.41 sources, 1.22, 1.23 Message-ID: <200603010224.k212ORi3000313@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/librsvg2/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv32702 Modified Files: .cvsignore librsvg2.spec sources Log Message: 2.14.1 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/librsvg2/devel/.cvsignore,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- .cvsignore 26 Feb 2006 02:03:00 -0000 1.22 +++ .cvsignore 1 Mar 2006 02:24:24 -0000 1.23 @@ -11,3 +11,4 @@ librsvg-2.13.92.tar.bz2 librsvg-2.13.93.tar.bz2 librsvg-2.14.0.tar.bz2 +librsvg-2.14.1.tar.bz2 Index: librsvg2.spec =================================================================== RCS file: /cvs/dist/rpms/librsvg2/devel/librsvg2.spec,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- librsvg2.spec 26 Feb 2006 02:03:01 -0000 1.40 +++ librsvg2.spec 1 Mar 2006 02:24:24 -0000 1.41 @@ -12,7 +12,7 @@ Name: librsvg2 Summary: An SVG library based on cairo. -Version: 2.14.0 +Version: 2.14.1 Release: 1 License: LGPL @@ -121,6 +121,9 @@ ##%doc %{_datadir}/gtk-doc/html/rsvg %changelog +* Tue Feb 28 2006 Matthias Clasen 2.14.1-1 +- Update to 2.14.1 + * Sat Feb 25 2006 Matthias Clasen 2.14.0-1 - Update to 2.14.0 Index: sources =================================================================== RCS file: /cvs/dist/rpms/librsvg2/devel/sources,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- sources 26 Feb 2006 02:03:01 -0000 1.22 +++ sources 1 Mar 2006 02:24:24 -0000 1.23 @@ -1 +1 @@ -3080f9a9cfc9ad7505f869df6cd917f8 librsvg-2.14.0.tar.bz2 +35f1a4f80cda377efecf5525ae6742b9 librsvg-2.14.1.tar.bz2 From fedora-cvs-commits at redhat.com Wed Mar 1 02:28:48 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 28 Feb 2006 21:28:48 -0500 Subject: rpms/sound-juicer/devel sound-juicer.spec,1.42,1.43 Message-ID: <200603010228.k212SmMo002394@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/sound-juicer/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv2298 Modified Files: sound-juicer.spec Log Message: more file list fixery Index: sound-juicer.spec =================================================================== RCS file: /cvs/dist/rpms/sound-juicer/devel/sound-juicer.spec,v retrieving revision 1.42 retrieving revision 1.43 diff -u -r1.42 -r1.43 --- sound-juicer.spec 1 Mar 2006 02:17:01 -0000 1.42 +++ sound-juicer.spec 1 Mar 2006 02:28:46 -0000 1.43 @@ -79,6 +79,16 @@ %post export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/sound-juicer.schemas > /dev/null +touch --no-create %{_datadir}/icons/hicolor +if [ -x /usr/bin/gtk-update-icon-cache ]; then + /usr/bin/gtk-update-icon-cache -q %{_datadir}/icons/hicolor; +fi + +%postun +touch --no-create %{_datadir}/icons/hicolor +if [ -x /usr/bin/gtk-update-icon-cache ]; then + /usr/bin/gtk-update-icon-cache -q %{_datadir}/icons/hicolor; +fi %files -f sound-juicer.lang %defattr(-, root, root) @@ -89,6 +99,7 @@ %{_datadir}/applications/sound-juicer.desktop %{_datadir}/gnome/help/sound-juicer %{_datadir}/omf/sound-juicer +%{_datadir}/icons/hicolor/* %changelog * Tue Feb 28 2006 Matthias Clasen - 2.13.6-1 From fedora-cvs-commits at redhat.com Wed Mar 1 02:45:31 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 28 Feb 2006 21:45:31 -0500 Subject: rpms/totem/devel .cvsignore, 1.19, 1.20 sources, 1.19, 1.20 totem.spec, 1.53, 1.54 Message-ID: <200603010245.k212jVZk007616@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/totem/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv7229 Modified Files: .cvsignore sources totem.spec Log Message: 2.13.92 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/totem/devel/.cvsignore,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- .cvsignore 13 Feb 2006 12:33:11 -0000 1.19 +++ .cvsignore 1 Mar 2006 02:45:27 -0000 1.20 @@ -13,3 +13,4 @@ totem-1.3.1.tar.bz2 totem-1.3.90.tar.bz2 totem-1.3.91.tar.bz2 +totem-1.3.92.tar.bz2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/totem/devel/sources,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- sources 13 Feb 2006 12:33:11 -0000 1.19 +++ sources 1 Mar 2006 02:45:27 -0000 1.20 @@ -1 +1 @@ -2d0b57549a6bcc989061468ce133ea24 totem-1.3.91.tar.bz2 +77c8c068e8ace3d52574422b862be0bf totem-1.3.92.tar.bz2 Index: totem.spec =================================================================== RCS file: /cvs/dist/rpms/totem/devel/totem.spec,v retrieving revision 1.53 retrieving revision 1.54 diff -u -r1.53 -r1.54 --- totem.spec 13 Feb 2006 12:33:11 -0000 1.53 +++ totem.spec 1 Mar 2006 02:45:27 -0000 1.54 @@ -4,7 +4,7 @@ Summary: Movie player for GNOME 2 Name: totem -Version: 1.3.91 +Version: 1.3.92 Release: 1 License: GPL Group: Applications/Multimedia @@ -135,6 +135,9 @@ %{_libdir}/*so %changelog +* Tue Feb 28 2006 Matthias Clasen - 1.3.92-1 +- Update to 1.3.92 + * Mon Feb 13 2006 Matthias Clasen - 1.3.91-1 - Update to 1.3.91 From fedora-cvs-commits at redhat.com Wed Mar 1 03:17:47 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 28 Feb 2006 22:17:47 -0500 Subject: rpms/anaconda/devel .cvsignore, 1.228, 1.229 anaconda.spec, 1.349, 1.350 sources, 1.348, 1.349 Message-ID: <200603010317.k213HlUB010924@cvs.devel.redhat.com> Author: katzj Update of /cvs/dist/rpms/anaconda/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv10861/devel Modified Files: .cvsignore anaconda.spec sources Log Message: auto-import anaconda-10.92.13-1 on branch devel from anaconda-10.92.13-1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/anaconda/devel/.cvsignore,v retrieving revision 1.228 retrieving revision 1.229 diff -u -r1.228 -r1.229 --- .cvsignore 28 Feb 2006 03:38:59 -0000 1.228 +++ .cvsignore 1 Mar 2006 03:17:45 -0000 1.229 @@ -1 +1 @@ -anaconda-10.92.12.tar.bz2 +anaconda-10.92.13.tar.bz2 Index: anaconda.spec =================================================================== RCS file: /cvs/dist/rpms/anaconda/devel/anaconda.spec,v retrieving revision 1.349 retrieving revision 1.350 diff -u -r1.349 -r1.350 --- anaconda.spec 28 Feb 2006 03:38:59 -0000 1.349 +++ anaconda.spec 1 Mar 2006 03:17:45 -0000 1.350 @@ -1,5 +1,5 @@ Name: anaconda -Version: 10.92.12 +Version: 10.92.13 Release: 1 License: GPL Summary: Graphical system installer @@ -79,6 +79,12 @@ /sbin/chkconfig --del reconfig >/dev/null 2>&1 || : %changelog +* Tue Feb 28 2006 Jeremy Katz - 10.92.13-1 +- fix traceback in pkgorder +- don't display xen +- make partitioning type combo wider (dcantrel) +- handle Serbian locales properly (#182591) + * Mon Feb 27 2006 Jeremy Katz - 10.92.12-1 - Dependency whiteout to fix ordering (clumens) - Fix swap on RAID in kickstart (#176537) Index: sources =================================================================== RCS file: /cvs/dist/rpms/anaconda/devel/sources,v retrieving revision 1.348 retrieving revision 1.349 diff -u -r1.348 -r1.349 --- sources 28 Feb 2006 03:38:59 -0000 1.348 +++ sources 1 Mar 2006 03:17:45 -0000 1.349 @@ -1 +1 @@ -26a69ad8bb11915eb80b21223e79adb7 anaconda-10.92.12.tar.bz2 +65ab7f716f91d75708fd029051edc635 anaconda-10.92.13.tar.bz2 From fedora-cvs-commits at redhat.com Wed Mar 1 03:27:13 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 28 Feb 2006 22:27:13 -0500 Subject: rpms/anaconda/devel .cvsignore, 1.229, 1.230 anaconda.spec, 1.350, 1.351 sources, 1.349, 1.350 Message-ID: <200603010327.k213RDHF015239@cvs.devel.redhat.com> Author: katzj Update of /cvs/dist/rpms/anaconda/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv15178/devel Modified Files: .cvsignore anaconda.spec sources Log Message: auto-import anaconda-10.92.14-1 on branch devel from anaconda-10.92.14-1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/anaconda/devel/.cvsignore,v retrieving revision 1.229 retrieving revision 1.230 diff -u -r1.229 -r1.230 --- .cvsignore 1 Mar 2006 03:17:45 -0000 1.229 +++ .cvsignore 1 Mar 2006 03:27:10 -0000 1.230 @@ -1 +1 @@ -anaconda-10.92.13.tar.bz2 +anaconda-10.92.14.tar.bz2 Index: anaconda.spec =================================================================== RCS file: /cvs/dist/rpms/anaconda/devel/anaconda.spec,v retrieving revision 1.350 retrieving revision 1.351 diff -u -r1.350 -r1.351 --- anaconda.spec 1 Mar 2006 03:17:45 -0000 1.350 +++ anaconda.spec 1 Mar 2006 03:27:10 -0000 1.351 @@ -1,5 +1,5 @@ Name: anaconda -Version: 10.92.13 +Version: 10.92.14 Release: 1 License: GPL Summary: Graphical system installer @@ -79,7 +79,7 @@ /sbin/chkconfig --del reconfig >/dev/null 2>&1 || : %changelog -* Tue Feb 28 2006 Jeremy Katz - 10.92.13-1 +* Tue Feb 28 2006 Jeremy Katz - 10.92.14-1 - fix traceback in pkgorder - don't display xen - make partitioning type combo wider (dcantrel) Index: sources =================================================================== RCS file: /cvs/dist/rpms/anaconda/devel/sources,v retrieving revision 1.349 retrieving revision 1.350 diff -u -r1.349 -r1.350 --- sources 1 Mar 2006 03:17:45 -0000 1.349 +++ sources 1 Mar 2006 03:27:10 -0000 1.350 @@ -1 +1 @@ -65ab7f716f91d75708fd029051edc635 anaconda-10.92.13.tar.bz2 +08c3d8d6cf7e2ce5e0da682c0e83d2e4 anaconda-10.92.14.tar.bz2 From fedora-cvs-commits at redhat.com Wed Mar 1 03:28:37 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 28 Feb 2006 22:28:37 -0500 Subject: rpms/xorg-x11-xkbdata/devel .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 xorg-x11-xkbdata.spec, 1.8, 1.9 xkbdata-1.0.1-cz-fix-bug177362.patch, 1.1, NONE xkbdata-1.0.1-greek-fix-bug181313.patch, 1.1, NONE xkbdata-1.0.1-sysreq-fix-bug175661.patch, 1.1, NONE Message-ID: <200603010328.k213SbBF015974@cvs.devel.redhat.com> Author: mharris Update of /cvs/dist/rpms/xorg-x11-xkbdata/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv15932/devel Modified Files: .cvsignore sources xorg-x11-xkbdata.spec Removed Files: xkbdata-1.0.1-cz-fix-bug177362.patch xkbdata-1.0.1-greek-fix-bug181313.patch xkbdata-1.0.1-sysreq-fix-bug175661.patch Log Message: auto-import xorg-x11-xkbdata-1.0.1-4.0.7.xkbcfg.5 on branch devel from xorg-x11-xkbdata-1.0.1-4.0.7.xkbcfg.5.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/xorg-x11-xkbdata/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 31 Jan 2006 15:36:32 -0000 1.4 +++ .cvsignore 1 Mar 2006 03:28:35 -0000 1.5 @@ -1 +1 @@ -xkbdata-1.0.1.tar.bz2 +xkeyboard-config-0.7.tar.bz2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/xorg-x11-xkbdata/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 31 Jan 2006 15:36:32 -0000 1.4 +++ sources 1 Mar 2006 03:28:35 -0000 1.5 @@ -1 +1 @@ -9bf179be9a195953dc5f4c15e23ab7f0 xkbdata-1.0.1.tar.bz2 +a99e9aa576b34a03606118b96e858731 xkeyboard-config-0.7.tar.bz2 Index: xorg-x11-xkbdata.spec =================================================================== RCS file: /cvs/dist/rpms/xorg-x11-xkbdata/devel/xorg-x11-xkbdata.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- xorg-x11-xkbdata.spec 24 Feb 2006 21:35:37 -0000 1.8 +++ xorg-x11-xkbdata.spec 1 Mar 2006 03:28:35 -0000 1.9 @@ -1,21 +1,22 @@ -%define pkgname xkbdata - +%define tarname xkeyboard-config +%define tarver 0.7 # INFO: Package contains data-only, no binaries, so no debuginfo is needed %define debug_package %{nil} -Summary: xkb data files for the X.Org X11 X server -Name: xorg-x11-%{pkgname} +Summary: xkeyboard-config alternative xkb data files +#Name: xkeyboard-config +#Version: 0.7 +#Release: 1 +Name: xorg-x11-xkbdata Version: 1.0.1 -Release: 4 -License: MIT/X11 +# When rebuilding, bump the final digit only +Release: 4.%{tarver}.xkbcfg.5 +License: MIT Group: User Interface/X URL: http://www.x.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Source0: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/%{pkgname}-%{version}.tar.bz2 -Patch0: xkbdata-1.0.1-sysreq-fix-bug175661.patch -Patch1: xkbdata-1.0.1-greek-fix-bug181313.patch -Patch2: xkbdata-1.0.1-cz-fix-bug177362.patch +Source0: http://xlibs.freedesktop.org/xkbdesc/%{tarname}-%{tarver}.tar.bz2 BuildArch: noarch @@ -24,329 +25,75 @@ BuildRequires: xkbcomp Provides: xkbdata +Provides: xkeyboard-config %description -xkb data files for the X.Org X11 X server. +xkeyboard-config alternative xkb data files %prep -%setup -q -n %{pkgname}-%{version} -%patch0 -p0 -b .sysreq-fix-bug175661 -%patch1 -p0 -b .greek-fix-bug181313 -%patch2 -p0 -b .cz-fix-bug177362 +%setup -q -n %{tarname}-%{tarver} %build -%configure +%configure \ + --enable-compat-rules \ + --with-xkb-base=%{_datadir}/X11/xkb \ + --disable-xkbcomp-symlink + make %install rm -rf $RPM_BUILD_ROOT -%makeinstall +make install DESTDIR=$RPM_BUILD_ROOT +# Remove unnecessary symlink +rm -f $RPM_BUILD_ROOT%{_datadir}/X11/xkb/compiled + +# Create filelist +{ + FILESLIST=${PWD}/files.list + pushd $RPM_BUILD_ROOT + find ./usr/share/X11 -type d | sed -e "s/^\./%dir /g" > $FILESLIST + find ./usr/share/X11 -type f | sed -e "s/^\.//g" >> $FILESLIST + popd +} %clean rm -rf $RPM_BUILD_ROOT -# FIXME: The file list should be generated by a script, that auto-flags dirs -# with %dir etc. as a future enhancement. -%files +%pre +{ + # Upgrade section + if [ "$1" -ge "1" ] ; then + # The modular X11R7.0 xkbdata package has symbols/pc as a directory, however + # xkeyboard-config has it as a file. rpm can't deal with this during package + # upgrades from xorg-x11-xkbdata to xkeyboard-config, so we have to remove + # the directory here first as a super-ugly hack. It seems this is the only + # way to make upgrades work properly. Later, once FC5 has shipped, we can + # remove this ugly hack, and just claim to not support upgrades from FC5testN + # releases that included the X11R7.0 xkbdata. + XKBDATA_PC=%{_datadir}/X11/xkb/symbols/pc + if [ -d "$XKBDATA_PC" ] ; then + rm -rf "$XKBDATA_PC" || : &>/dev/null + fi + fi +} + +%files -f files.list %defattr(-,root,root,-) -%doc -%dir %{_datadir}/X11 -%dir %{_datadir}/X11/xkb -%{_datadir}/X11/xkb/compat.dir -%dir %{_datadir}/X11/xkb/compat -%{_datadir}/X11/xkb/compat/README -%{_datadir}/X11/xkb/compat/accessx -%{_datadir}/X11/xkb/compat/basic -%{_datadir}/X11/xkb/compat/complete -%{_datadir}/X11/xkb/compat/default -%{_datadir}/X11/xkb/compat/iso9995 -%{_datadir}/X11/xkb/compat/japan -%{_datadir}/X11/xkb/compat/keypad -%{_datadir}/X11/xkb/compat/ledcaps -%{_datadir}/X11/xkb/compat/lednum -%{_datadir}/X11/xkb/compat/ledscroll -%{_datadir}/X11/xkb/compat/misc -%{_datadir}/X11/xkb/compat/mousekeys -%{_datadir}/X11/xkb/compat/norepeat -%{_datadir}/X11/xkb/compat/pc -%{_datadir}/X11/xkb/compat/pc98 -%{_datadir}/X11/xkb/compat/xfree86 -%{_datadir}/X11/xkb/compat/xtest -%{_datadir}/X11/xkb/geometry.dir -%dir %{_datadir}/X11/xkb/geometry -%{_datadir}/X11/xkb/geometry/README -%{_datadir}/X11/xkb/geometry/amiga -%{_datadir}/X11/xkb/geometry/ataritt -%{_datadir}/X11/xkb/geometry/chicony -%{_datadir}/X11/xkb/geometry/dell -%dir %{_datadir}/X11/xkb/geometry/digital -%{_datadir}/X11/xkb/geometry/digital/lk -%{_datadir}/X11/xkb/geometry/digital/pc -%{_datadir}/X11/xkb/geometry/digital/unix -%{_datadir}/X11/xkb/geometry/everex -%{_datadir}/X11/xkb/geometry/fujitsu -%{_datadir}/X11/xkb/geometry/hp -%dir %{_datadir}/X11/xkb/geometry/ibm -%{_datadir}/X11/xkb/geometry/ibm/thinkpad -%{_datadir}/X11/xkb/geometry/keytronic -%{_datadir}/X11/xkb/geometry/kinesis -%{_datadir}/X11/xkb/geometry/macintosh -%{_datadir}/X11/xkb/geometry/microsoft -%{_datadir}/X11/xkb/geometry/nec -%{_datadir}/X11/xkb/geometry/northgate -%{_datadir}/X11/xkb/geometry/pc -%dir %{_datadir}/X11/xkb/geometry/sgi -%{_datadir}/X11/xkb/geometry/sgi/O2 -%{_datadir}/X11/xkb/geometry/sgi/indigo -%{_datadir}/X11/xkb/geometry/sgi/indy -%{_datadir}/X11/xkb/geometry/sony -%{_datadir}/X11/xkb/geometry/sun -%{_datadir}/X11/xkb/geometry/winbook -%{_datadir}/X11/xkb/keycodes.dir -%dir %{_datadir}/X11/xkb/keycodes -%{_datadir}/X11/xkb/keycodes/README -%{_datadir}/X11/xkb/keycodes/aliases -%{_datadir}/X11/xkb/keycodes/amiga -%{_datadir}/X11/xkb/keycodes/ataritt -%dir %{_datadir}/X11/xkb/keycodes/digital -%{_datadir}/X11/xkb/keycodes/digital/lk -%{_datadir}/X11/xkb/keycodes/digital/pc -%{_datadir}/X11/xkb/keycodes/fujitsu -%{_datadir}/X11/xkb/keycodes/hp -%{_datadir}/X11/xkb/keycodes/ibm -%{_datadir}/X11/xkb/keycodes/macintosh -%{_datadir}/X11/xkb/keycodes/powerpcps2 -%dir %{_datadir}/X11/xkb/keycodes/sgi -%{_datadir}/X11/xkb/keycodes/sgi/indigo -%{_datadir}/X11/xkb/keycodes/sgi/indy -%{_datadir}/X11/xkb/keycodes/sgi/iris -%{_datadir}/X11/xkb/keycodes/sony -%{_datadir}/X11/xkb/keycodes/sun -%{_datadir}/X11/xkb/keycodes/xfree86 -%{_datadir}/X11/xkb/keycodes/xfree98 -%{_datadir}/X11/xkb/keymap.dir -%dir %{_datadir}/X11/xkb/keymap -%{_datadir}/X11/xkb/keymap/README -%{_datadir}/X11/xkb/keymap/amiga -%{_datadir}/X11/xkb/keymap/ataritt -%dir %{_datadir}/X11/xkb/keymap/digital -%{_datadir}/X11/xkb/keymap/digital/us -%{_datadir}/X11/xkb/keymap/macintosh -%dir %{_datadir}/X11/xkb/keymap/sgi -%{_datadir}/X11/xkb/keymap/sgi/* -%{_datadir}/X11/xkb/keymap/sony -%dir %{_datadir}/X11/xkb/keymap/sun -%{_datadir}/X11/xkb/keymap/sun/* -%{_datadir}/X11/xkb/keymap/xfree86 -%{_datadir}/X11/xkb/keymap/xfree98 -%dir %{_datadir}/X11/xkb/rules -%{_datadir}/X11/xkb/rules/README -%{_datadir}/X11/xkb/rules/sgi -%{_datadir}/X11/xkb/rules/sgi.lst -%{_datadir}/X11/xkb/rules/sun -%{_datadir}/X11/xkb/rules/sun.lst -%{_datadir}/X11/xkb/rules/xfree98 -%{_datadir}/X11/xkb/rules/xfree98.lst -%{_datadir}/X11/xkb/rules/xkb.dtd -%{_datadir}/X11/xkb/rules/xml2lst.pl -%{_datadir}/X11/xkb/rules/xorg -%{_datadir}/X11/xkb/rules/xorg-it.lst -%{_datadir}/X11/xkb/rules/xorg.lst -%{_datadir}/X11/xkb/rules/xorg.xml -%dir %{_datadir}/X11/xkb/semantics -%{_datadir}/X11/xkb/semantics/basic -%{_datadir}/X11/xkb/semantics/complete -%{_datadir}/X11/xkb/semantics/default -%{_datadir}/X11/xkb/semantics/xtest -%{_datadir}/X11/xkb/symbols.dir -%dir %{_datadir}/X11/xkb/symbols -%{_datadir}/X11/xkb/symbols/README -%{_datadir}/X11/xkb/symbols/al -%{_datadir}/X11/xkb/symbols/altwin -%{_datadir}/X11/xkb/symbols/am -%{_datadir}/X11/xkb/symbols/apple -%{_datadir}/X11/xkb/symbols/ar -%{_datadir}/X11/xkb/symbols/az -%{_datadir}/X11/xkb/symbols/be -%{_datadir}/X11/xkb/symbols/ben -%{_datadir}/X11/xkb/symbols/bg -%{_datadir}/X11/xkb/symbols/br -%{_datadir}/X11/xkb/symbols/bs -%{_datadir}/X11/xkb/symbols/by -%{_datadir}/X11/xkb/symbols/ca -%{_datadir}/X11/xkb/symbols/ca_enhanced -%{_datadir}/X11/xkb/symbols/capslock -%{_datadir}/X11/xkb/symbols/compose -%{_datadir}/X11/xkb/symbols/ctrl -%{_datadir}/X11/xkb/symbols/cz -%{_datadir}/X11/xkb/symbols/cz_qwerty -%{_datadir}/X11/xkb/symbols/czsk -%{_datadir}/X11/xkb/symbols/de -%{_datadir}/X11/xkb/symbols/de_CH -%{_datadir}/X11/xkb/symbols/dev -%dir %{_datadir}/X11/xkb/symbols/digital -%{_datadir}/X11/xkb/symbols/digital/lk -%{_datadir}/X11/xkb/symbols/digital/pc -%{_datadir}/X11/xkb/symbols/digital/us -%{_datadir}/X11/xkb/symbols/digital/vt -%{_datadir}/X11/xkb/symbols/dk -%{_datadir}/X11/xkb/symbols/dvorak -%{_datadir}/X11/xkb/symbols/ee -%{_datadir}/X11/xkb/symbols/el -%{_datadir}/X11/xkb/symbols/en_US -%{_datadir}/X11/xkb/symbols/es -%{_datadir}/X11/xkb/symbols/eurosign -%{_datadir}/X11/xkb/symbols/fi -%{_datadir}/X11/xkb/symbols/fo -%{_datadir}/X11/xkb/symbols/fr -%{_datadir}/X11/xkb/symbols/fr_CH -%dir %{_datadir}/X11/xkb/symbols/fujitsu -%{_datadir}/X11/xkb/symbols/fujitsu/jp -%{_datadir}/X11/xkb/symbols/fujitsu/us -%{_datadir}/X11/xkb/symbols/gb -%{_datadir}/X11/xkb/symbols/ge_la -%{_datadir}/X11/xkb/symbols/ge_ru -%{_datadir}/X11/xkb/symbols/group -%{_datadir}/X11/xkb/symbols/guj -%{_datadir}/X11/xkb/symbols/gur -%dir %{_datadir}/X11/xkb/symbols/hp -%{_datadir}/X11/xkb/symbols/hp/us -%{_datadir}/X11/xkb/symbols/hr -%{_datadir}/X11/xkb/symbols/hr_US -%{_datadir}/X11/xkb/symbols/hu -%{_datadir}/X11/xkb/symbols/hu_US -%{_datadir}/X11/xkb/symbols/hu_qwerty -%{_datadir}/X11/xkb/symbols/ie -%{_datadir}/X11/xkb/symbols/il -%{_datadir}/X11/xkb/symbols/il_phonetic -%{_datadir}/X11/xkb/symbols/inet -%{_datadir}/X11/xkb/symbols/ir -%{_datadir}/X11/xkb/symbols/is -%{_datadir}/X11/xkb/symbols/iso9995-3 -%{_datadir}/X11/xkb/symbols/it -%{_datadir}/X11/xkb/symbols/iu -%{_datadir}/X11/xkb/symbols/jp -%{_datadir}/X11/xkb/symbols/kan -%{_datadir}/X11/xkb/symbols/keypad -%{_datadir}/X11/xkb/symbols/la -%{_datadir}/X11/xkb/symbols/level3 -%{_datadir}/X11/xkb/symbols/lo -%{_datadir}/X11/xkb/symbols/lock -%{_datadir}/X11/xkb/symbols/lt -%{_datadir}/X11/xkb/symbols/lt_a -%{_datadir}/X11/xkb/symbols/lt_p -%{_datadir}/X11/xkb/symbols/lt_std -%{_datadir}/X11/xkb/symbols/lv -%dir %{_datadir}/X11/xkb/symbols/macintosh -%{_datadir}/X11/xkb/symbols/macintosh/de -%{_datadir}/X11/xkb/symbols/macintosh/de_CH -%{_datadir}/X11/xkb/symbols/macintosh/dk -%{_datadir}/X11/xkb/symbols/macintosh/es -%{_datadir}/X11/xkb/symbols/macintosh/fi -%{_datadir}/X11/xkb/symbols/macintosh/fr -%{_datadir}/X11/xkb/symbols/macintosh/fr_CH -%{_datadir}/X11/xkb/symbols/macintosh/gb -%{_datadir}/X11/xkb/symbols/macintosh/it -%{_datadir}/X11/xkb/symbols/macintosh/nl -%{_datadir}/X11/xkb/symbols/macintosh/no -%{_datadir}/X11/xkb/symbols/macintosh/pt -%{_datadir}/X11/xkb/symbols/macintosh/se -%{_datadir}/X11/xkb/symbols/macintosh/us -%{_datadir}/X11/xkb/symbols/mk -%{_datadir}/X11/xkb/symbols/ml -%{_datadir}/X11/xkb/symbols/mm -%{_datadir}/X11/xkb/symbols/mn -%{_datadir}/X11/xkb/symbols/mt -%{_datadir}/X11/xkb/symbols/mt_us -%dir %{_datadir}/X11/xkb/symbols/nec -%{_datadir}/X11/xkb/symbols/nec/jp -%{_datadir}/X11/xkb/symbols/nl -%{_datadir}/X11/xkb/symbols/no -%{_datadir}/X11/xkb/symbols/ogham -%{_datadir}/X11/xkb/symbols/ori -%dir %{_datadir}/X11/xkb/symbols/pc -%{_datadir}/X11/xkb/symbols/pc/* -%{_datadir}/X11/xkb/symbols/pc104 -%{_datadir}/X11/xkb/symbols/pl -%{_datadir}/X11/xkb/symbols/pl2 -%{_datadir}/X11/xkb/symbols/pt -%{_datadir}/X11/xkb/symbols/ralt -%{_datadir}/X11/xkb/symbols/ro -%{_datadir}/X11/xkb/symbols/ro2 -%{_datadir}/X11/xkb/symbols/ru -%{_datadir}/X11/xkb/symbols/sapmi -%{_datadir}/X11/xkb/symbols/se -%{_datadir}/X11/xkb/symbols/se_FI -%{_datadir}/X11/xkb/symbols/se_NO -%{_datadir}/X11/xkb/symbols/se_SE -%dir %{_datadir}/X11/xkb/symbols/sgi -%{_datadir}/X11/xkb/symbols/sgi/jp -%{_datadir}/X11/xkb/symbols/si -%{_datadir}/X11/xkb/symbols/sk -%{_datadir}/X11/xkb/symbols/sk_qwerty -%dir %{_datadir}/X11/xkb/symbols/sony -%{_datadir}/X11/xkb/symbols/sony/us -%{_datadir}/X11/xkb/symbols/sr -%{_datadir}/X11/xkb/symbols/srvr_ctrl -%dir %{_datadir}/X11/xkb/symbols/sun -%{_datadir}/X11/xkb/symbols/sun/se -%{_datadir}/X11/xkb/symbols/sun/us -%{_datadir}/X11/xkb/symbols/sun/usb -%{_datadir}/X11/xkb/symbols/syr -%{_datadir}/X11/xkb/symbols/syr_phonetic -%{_datadir}/X11/xkb/symbols/tel -%{_datadir}/X11/xkb/symbols/th -%{_datadir}/X11/xkb/symbols/th_pat -%{_datadir}/X11/xkb/symbols/th_tis -%{_datadir}/X11/xkb/symbols/tj -%{_datadir}/X11/xkb/symbols/tml -%{_datadir}/X11/xkb/symbols/tr -%{_datadir}/X11/xkb/symbols/tr_f -%{_datadir}/X11/xkb/symbols/ua -%{_datadir}/X11/xkb/symbols/us -%{_datadir}/X11/xkb/symbols/us_group2 -%{_datadir}/X11/xkb/symbols/us_group3 -%{_datadir}/X11/xkb/symbols/us_intl -%{_datadir}/X11/xkb/symbols/uz -%{_datadir}/X11/xkb/symbols/vn -%dir %{_datadir}/X11/xkb/symbols/xfree68 -%{_datadir}/X11/xkb/symbols/xfree68/amiga -%{_datadir}/X11/xkb/symbols/xfree68/ataritt -%{_datadir}/X11/xkb/symbols/yu -%dir %{_datadir}/X11/xkb/torture -%{_datadir}/X11/xkb/torture/indicator -%{_datadir}/X11/xkb/torture/indicator1 -%{_datadir}/X11/xkb/torture/indicator2 -%{_datadir}/X11/xkb/torture/indicator3 -%{_datadir}/X11/xkb/torture/mod_compat -%{_datadir}/X11/xkb/torture/mod_compat1 -%{_datadir}/X11/xkb/torture/mod_compat2 -%{_datadir}/X11/xkb/torture/mod_compat3 -%{_datadir}/X11/xkb/torture/mod_compat4 -%{_datadir}/X11/xkb/torture/sym_interp -%{_datadir}/X11/xkb/torture/sym_interp1 -%{_datadir}/X11/xkb/torture/sym_interp2 -%{_datadir}/X11/xkb/torture/sym_interp3 -%{_datadir}/X11/xkb/torture/sym_interp4 -%{_datadir}/X11/xkb/torture/types -%{_datadir}/X11/xkb/types.dir -%dir %{_datadir}/X11/xkb/types -%{_datadir}/X11/xkb/types/README -%{_datadir}/X11/xkb/types/basic -%{_datadir}/X11/xkb/types/cancel -%{_datadir}/X11/xkb/types/caps -%{_datadir}/X11/xkb/types/complete -%{_datadir}/X11/xkb/types/default -%{_datadir}/X11/xkb/types/extra -%{_datadir}/X11/xkb/types/iso9995 -%{_datadir}/X11/xkb/types/mousekeys -%{_datadir}/X11/xkb/types/numpad -%{_datadir}/X11/xkb/types/pc %changelog -* Fri Feb 24 2006 Mike A. Harris 1.0.1-4 -- Actually apply the xkbdata-1.0.1-cz-fix-bug177362.patch patch this time. +* Tue Feb 28 2006 Mike A. Harris 1.0.1-4.0.7.xkbcfg.5 +- Added rpm pre script, to pre-remove the symbols/pc during package upgrades, + to avoid an rpm cpio error if the X11R7.0 modular xkbdata package is already + installed, because rpm can not replace a directory with a file. + +* Fri Feb 24 2006 Mike A. Harris 1.0.1-4.0.7.xkbcfg.1 +- Package renamed to xorg-x11-xkbdata and version/release tweaked since it + is too late to add new package names to Fedora Core 5 development. +- Added "Provides: xkeyboard-config" virtual provide. + +* Fri Feb 24 2006 Mike A. Harris 0.7-1 +- Initial package created with xkeyboard-config-0.7. * Tue Feb 21 2006 Mike A. Harris 1.0.1-3 - Added xkbdata-1.0.1-greek-fix-bug181313.patch to fix (#181313,181313) --- xkbdata-1.0.1-cz-fix-bug177362.patch DELETED --- --- xkbdata-1.0.1-greek-fix-bug181313.patch DELETED --- --- xkbdata-1.0.1-sysreq-fix-bug175661.patch DELETED --- From fedora-cvs-commits at redhat.com Wed Mar 1 03:41:41 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 28 Feb 2006 22:41:41 -0500 Subject: rpms/xorg-x11-xkbdata/devel xorg-x11-xkbdata.spec,1.9,1.10 Message-ID: <200603010341.k213ffHh011176@cvs.devel.redhat.com> Author: mharris Update of /cvs/dist/rpms/xorg-x11-xkbdata/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv11163 Modified Files: xorg-x11-xkbdata.spec Log Message: * Tue Feb 28 2006 Mike A. Harris 1.0.1-5 - Fixed rpm pre script upgrade/install testing - Rebuild package as 1.0.1-5 in rawhide, completing the transition to xkeyboard-config. Index: xorg-x11-xkbdata.spec =================================================================== RCS file: /cvs/dist/rpms/xorg-x11-xkbdata/devel/xorg-x11-xkbdata.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- xorg-x11-xkbdata.spec 1 Mar 2006 03:28:35 -0000 1.9 +++ xorg-x11-xkbdata.spec 1 Mar 2006 03:41:39 -0000 1.10 @@ -10,7 +10,7 @@ Name: xorg-x11-xkbdata Version: 1.0.1 # When rebuilding, bump the final digit only -Release: 4.%{tarver}.xkbcfg.5 +Release: 5 License: MIT Group: User Interface/X URL: http://www.x.org @@ -63,7 +63,7 @@ %pre { # Upgrade section - if [ "$1" -ge "1" ] ; then + if [ "$1" -gt "1" ] ; then # The modular X11R7.0 xkbdata package has symbols/pc as a directory, however # xkeyboard-config has it as a file. rpm can't deal with this during package # upgrades from xorg-x11-xkbdata to xkeyboard-config, so we have to remove @@ -82,6 +82,11 @@ %defattr(-,root,root,-) %changelog +* Tue Feb 28 2006 Mike A. Harris 1.0.1-5 +- Fixed rpm pre script upgrade/install testing +- Rebuild package as 1.0.1-5 in rawhide, completing the transition to + xkeyboard-config. + * Tue Feb 28 2006 Mike A. Harris 1.0.1-4.0.7.xkbcfg.5 - Added rpm pre script, to pre-remove the symbols/pc during package upgrades, to avoid an rpm cpio error if the X11R7.0 modular xkbdata package is already From fedora-cvs-commits at redhat.com Wed Mar 1 04:26:43 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 28 Feb 2006 23:26:43 -0500 Subject: rpms/redhat-artwork/devel .cvsignore, 1.71, 1.72 redhat-artwork.spec, 1.126, 1.127 sources, 1.73, 1.74 Message-ID: <200603010426.k214QhSh023470@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/redhat-artwork/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv23399 Modified Files: .cvsignore redhat-artwork.spec sources Log Message: New artwork Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/redhat-artwork/devel/.cvsignore,v retrieving revision 1.71 retrieving revision 1.72 diff -u -r1.71 -r1.72 --- .cvsignore 22 Feb 2006 20:08:39 -0000 1.71 +++ .cvsignore 1 Mar 2006 04:26:40 -0000 1.72 @@ -8,3 +8,4 @@ redhat-artwork-0.238.tar.gz redhat-artwork-0.239.tar.gz redhat-artwork-0.240.tar.gz +redhat-artwork-0.241.tar.gz Index: redhat-artwork.spec =================================================================== RCS file: /cvs/dist/rpms/redhat-artwork/devel/redhat-artwork.spec,v retrieving revision 1.126 retrieving revision 1.127 diff -u -r1.126 -r1.127 --- redhat-artwork.spec 22 Feb 2006 20:08:39 -0000 1.126 +++ redhat-artwork.spec 1 Mar 2006 04:26:40 -0000 1.127 @@ -3,7 +3,7 @@ Summary: Artwork for Red Hat default look-and-feel Name: redhat-artwork -Version: 0.240 +Version: 0.241 Release: 1 URL: http://www.redhat.com Source0: %{name}-%{version}.tar.gz @@ -180,6 +180,9 @@ %config /root/.gtkrc %changelog +* Tue Feb 28 2006 Matthias Clasen - 0.241-1 +- New artwork by Diana Fong + * Wed Feb 22 2006 Matthias Clasen - 0.240-1 - Include Serbian translations Index: sources =================================================================== RCS file: /cvs/dist/rpms/redhat-artwork/devel/sources,v retrieving revision 1.73 retrieving revision 1.74 diff -u -r1.73 -r1.74 --- sources 22 Feb 2006 20:08:39 -0000 1.73 +++ sources 1 Mar 2006 04:26:40 -0000 1.74 @@ -1,4 +1,4 @@ d30a30110d8a040f7fd584d7430cf019 post-install-sources.tar.gz cd630f83371dd14cf01a3767caa24da0 RHEL-gdm-theme-0.2.tar.gz 395452caaf476a7145ffccea356a8966 throbbers.tar.bz2 -ac58da2e5bffcd2b29bf2d36898afea2 redhat-artwork-0.240.tar.gz +d969c1f7d6476595a49536fa977ce083 redhat-artwork-0.241.tar.gz From fedora-cvs-commits at redhat.com Wed Mar 1 04:39:02 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 28 Feb 2006 23:39:02 -0500 Subject: rpms/fedora-logos/devel .cvsignore, 1.23, 1.24 fedora-logos.spec, 1.25, 1.26 sources, 1.24, 1.25 Message-ID: <200603010439.k214d21K026346@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/fedora-logos/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv26300 Modified Files: .cvsignore fedora-logos.spec sources Log Message: 1.1.42 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/fedora-logos/devel/.cvsignore,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- .cvsignore 25 Jan 2006 22:44:27 -0000 1.23 +++ .cvsignore 1 Mar 2006 04:39:00 -0000 1.24 @@ -1,2 +1,3 @@ fedora-logos-1.1.40.tar.bz2 fedora-logos-1.1.41.tar.bz2 +fedora-logos-1.1.42.tar.bz2 Index: fedora-logos.spec =================================================================== RCS file: /cvs/dist/rpms/fedora-logos/devel/fedora-logos.spec,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- fedora-logos.spec 25 Jan 2006 22:44:27 -0000 1.25 +++ fedora-logos.spec 1 Mar 2006 04:39:00 -0000 1.26 @@ -1,6 +1,6 @@ Name: fedora-logos Summary: Red Hat-related icons and pictures. -Version: 1.1.41 +Version: 1.1.42 Release: 1 Group: System Environment/Base Source0: fedora-logos-%{version}.tar.bz2 @@ -135,6 +135,9 @@ # end i386 bits %changelog +* Tue Feb 28 2006 Matthias Clasen 1.1.42-1 +- New artwork for gdm, kdm Bluecurve from Diana Fong + * Wed Jan 25 2006 Chris Lumens 1.1.41-1 - New artwork for firstboot from dfong (#178106). Index: sources =================================================================== RCS file: /cvs/dist/rpms/fedora-logos/devel/sources,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- sources 25 Jan 2006 22:44:27 -0000 1.24 +++ sources 1 Mar 2006 04:39:00 -0000 1.25 @@ -1 +1 @@ -2f5b8cb70afb62a49548ca2269c898d5 fedora-logos-1.1.41.tar.bz2 +d814bc0a885c4b1364187c9902dcaf2f fedora-logos-1.1.42.tar.bz2 From fedora-cvs-commits at redhat.com Wed Mar 1 05:42:18 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 1 Mar 2006 00:42:18 -0500 Subject: rpms/gnome-mount/devel gnome-mount-0.4-no-media.patch, NONE, 1.1 gnome-mount.spec, 1.12, 1.13 Message-ID: <200603010542.k215gIPu003433@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/gnome-mount/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv3371 Modified Files: gnome-mount.spec Added Files: gnome-mount-0.4-no-media.patch Log Message: Fix a crash gnome-mount-0.4-no-media.patch: gnome-mount.c | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) --- NEW FILE gnome-mount-0.4-no-media.patch --- --- gnome-mount-0.4/src/gnome-mount.c.no-media 2006-03-01 00:34:49.000000000 -0500 +++ gnome-mount-0.4/src/gnome-mount.c 2006-03-01 00:39:30.000000000 -0500 @@ -463,9 +463,14 @@ notify_parent (FALSE); - show_error_dialog_mount (volume, error.name, error.message, - (fstype != NULL && strlen (fstype) > 0) ? - fstype : libhal_volume_get_fstype (volume)); + if (fstype == NULL || fstype[0] == 0) { + if (volume) + fstype = libhal_volume_get_fstype (volume); + else + fstype = ""; + } + + show_error_dialog_mount (volume, error.name, error.message, fstype); dbus_error_free (&error); goto out; @@ -1701,7 +1706,7 @@ out: if (drive != NULL) - libhal_volume_free (volume); + libhal_drive_free (drive); if (volume != NULL) libhal_volume_free (volume); Index: gnome-mount.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-mount/devel/gnome-mount.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- gnome-mount.spec 28 Feb 2006 13:41:58 -0000 1.12 +++ gnome-mount.spec 1 Mar 2006 05:42:13 -0000 1.13 @@ -1,11 +1,12 @@ Summary: Mount replacement which uses HAL to do the mounting Name: gnome-mount Version: 0.4 -Release: 3 +Release: 4 License: GPL Group: Applications/System Source: %{name}-%{version}.tar.gz Patch0: gnome-mount-0.4-drive-mount.patch +Patch1: gnome-mount-0.4-no-media.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: hal-devel >= 0.5.5 gtk2-devel >= 2.8.0 dbus-devel >= 0.31 Requires: hal >= 0.5.7 @@ -27,6 +28,7 @@ %setup -q %patch0 -p0 -b .drive-mount +%patch1 -p1 -b .no-media %build @@ -61,6 +63,9 @@ %{_libdir}/pkgconfig/gnome-mount.pc %changelog +* Wed Mar 1 2006 Matthias Clasen - 0.4-4 +- Fix a crash without media (#183191) + * Tue Feb 28 2006 Karsten Hopp 0.4-3 - add some buildrequires From fedora-cvs-commits at redhat.com Wed Mar 1 05:47:49 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 1 Mar 2006 00:47:49 -0500 Subject: rpms/gnucash/devel .cvsignore, 1.12.2.5, 1.12.2.6 gnucash.spec, 1.18.2.15, 1.18.2.16 sources, 1.12.2.5, 1.12.2.6 Message-ID: <200603010547.k215lnNZ008613@cvs.devel.redhat.com> Author: notting Update of /cvs/dist/rpms/gnucash/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv27667 Modified Files: Tag: gnucash-g2-branch .cvsignore gnucash.spec sources Log Message: update Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/gnucash/devel/.cvsignore,v retrieving revision 1.12.2.5 retrieving revision 1.12.2.6 diff -u -r1.12.2.5 -r1.12.2.6 --- .cvsignore 20 Feb 2006 21:33:47 -0000 1.12.2.5 +++ .cvsignore 1 Mar 2006 05:47:46 -0000 1.12.2.6 @@ -1,2 +1,2 @@ -gnucash-docs-1.9.1.svn13331.tar.bz2 -gnucash-1.9.1.tar.gz +gnucash-1.9.1.svn13429.tar.bz2 +gnucash-docs-1.9.1.svn13429.tar.bz2 Index: gnucash.spec =================================================================== RCS file: /cvs/dist/rpms/gnucash/devel/gnucash.spec,v retrieving revision 1.18.2.15 retrieving revision 1.18.2.16 diff -u -r1.18.2.15 -r1.18.2.16 --- gnucash.spec 20 Feb 2006 21:33:47 -0000 1.18.2.15 +++ gnucash.spec 1 Mar 2006 05:47:46 -0000 1.18.2.16 @@ -1,6 +1,6 @@ -%define svnrev 13331 +%define svnrev 13429 -%define buildsvn 0 +%define buildsvn 1 Name: gnucash Summary: GnuCash is an application to keep track of your finances. Index: sources =================================================================== RCS file: /cvs/dist/rpms/gnucash/devel/sources,v retrieving revision 1.12.2.5 retrieving revision 1.12.2.6 diff -u -r1.12.2.5 -r1.12.2.6 --- sources 20 Feb 2006 21:33:47 -0000 1.12.2.5 +++ sources 1 Mar 2006 05:47:46 -0000 1.12.2.6 @@ -1,2 +1,2 @@ -0632996dc637dcbf84d085177d72bdd7 gnucash-docs-1.9.1.svn13331.tar.bz2 -fd1ba54948cf6a91faf1328f2051677d gnucash-1.9.1.tar.gz +d804679b25b5ec8f5b102d5c5fd16afb gnucash-1.9.1.svn13429.tar.bz2 +e95cd593f623b3eea0474ec354787d4a gnucash-docs-1.9.1.svn13429.tar.bz2 From fedora-cvs-commits at redhat.com Wed Mar 1 06:11:45 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 1 Mar 2006 01:11:45 -0500 Subject: rpms/imake/devel imake.spec,1.17,1.18 Message-ID: <200603010611.k216Bj0q012464@cvs.devel.redhat.com> Author: mharris Update of /cvs/dist/rpms/imake/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv12451 Modified Files: imake.spec Log Message: Don't own system dirs Index: imake.spec =================================================================== RCS file: /cvs/dist/rpms/imake/devel/imake.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- imake.spec 11 Feb 2006 03:28:53 -0000 1.17 +++ imake.spec 1 Mar 2006 06:11:42 -0000 1.18 @@ -104,7 +104,6 @@ %files %defattr(-,root,root,-) %doc -%dir %{_bindir} %{_bindir}/ccmakedep %{_bindir}/cleanlinks %{_bindir}/gccmakedep @@ -123,8 +122,7 @@ %{_datadir}/X11/config/*.def %{_datadir}/X11/config/*.rules %{_datadir}/X11/config/*.tmpl -%dir %{_mandir} -%dir %{_mandir}/man1 +#%dir %{_mandir}/man1x %{_mandir}/man1/ccmakedep.1x* %{_mandir}/man1/cleanlinks.1x* %{_mandir}/man1/gccmakedep.1x* @@ -139,10 +137,10 @@ %{_mandir}/man1/xmkmf.1x* %changelog -* Fri Feb 10 2006 Jesse Keating - 1.0.1-1.2 +* Fri Feb 10 2006 Jesse Keating 1.0.1-1.2 - bump again for double-long bug on ppc(64) -* Tue Feb 07 2006 Jesse Keating - 1.0.1-1.1 +* Tue Feb 07 2006 Jesse Keating 1.0.1-1.1 - rebuilt for new gcc4.1 snapshot and glibc changes * Wed Jan 18 2006 Mike A. Harris 1.0.1-1 From fedora-cvs-commits at redhat.com Wed Mar 1 06:16:13 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 1 Mar 2006 01:16:13 -0500 Subject: rpms/mesa/devel mesa.spec,1.44,1.45 Message-ID: <200603010616.k216GCRf012781@cvs.devel.redhat.com> Author: mharris Update of /cvs/dist/rpms/mesa/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv12487 Modified Files: mesa.spec Log Message: Minor spec cleanups Index: mesa.spec =================================================================== RCS file: /cvs/dist/rpms/mesa/devel/mesa.spec,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- mesa.spec 25 Feb 2006 18:47:36 -0000 1.44 +++ mesa.spec 1 Mar 2006 06:16:10 -0000 1.45 @@ -84,7 +84,9 @@ Patch201: mesa-6.4.1-radeon-use-right-texture-format.patch BuildRequires: pkgconfig +%if %{with_dri} BuildRequires: libdrm-devel >= 2.0-1 +%endif BuildRequires: libXxf86vm-devel BuildRequires: expat-devel BuildRequires: xorg-x11-proto-devel >= 7.0-3 @@ -274,8 +276,6 @@ #-- Install ---------------------------------------------------------- %install rm -rf $RPM_BUILD_ROOT -# NOTE: the rpm makeinstall macro does not work for mesa -#%%makeinstall DESTDIR=$RPM_BUILD_ROOT # NOTE: "make install" calls mesa's installmesa script, passing DESTDIR # to it as a commandline arg, but LIB_DIR and INCLUDE_DIR get hard coded in # that script, meaning multilib breaks. @@ -284,8 +284,7 @@ # NOTE: Since Mesa's install procedure doesn't work on multilib properly, # we fix it here, as I have patched the installmesa script to remove the # hard coding, and we set the variables ourself right here, and it should -# hopefully pick them up. -# -- Mike A. Harris +# hopefully pick them up. -- mharris at redhat.com export LIB_DIR=$RPM_BUILD_ROOT%{_libdir} export INCLUDE_DIR=$RPM_BUILD_ROOT%{_includedir} bin/installmesa $RPM_BUILD_ROOT/usr From fedora-cvs-commits at redhat.com Wed Mar 1 06:18:28 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 1 Mar 2006 01:18:28 -0500 Subject: rpms/xorg-x11-apps/devel xorg-x11-apps.spec,1.10,1.11 Message-ID: <200603010618.k216ISJb025003@cvs.devel.redhat.com> Author: mharris Update of /cvs/dist/rpms/xorg-x11-apps/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv24989 Modified Files: xorg-x11-apps.spec Log Message: spec cleanups Index: xorg-x11-apps.spec =================================================================== RCS file: /cvs/dist/rpms/xorg-x11-apps/devel/xorg-x11-apps.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- xorg-x11-apps.spec 24 Feb 2006 12:14:19 -0000 1.10 +++ xorg-x11-apps.spec 1 Mar 2006 06:18:26 -0000 1.11 @@ -62,7 +62,6 @@ pushd $app case $app in -# oclock*|x11perf*|xclipboard*|xclock*|xconsole*|xload*|xlogo*|xmag*|xmessage*) x11perf*) aclocal ; automake ; autoconf ;; @@ -88,28 +87,12 @@ done } -# FIXME: Move/rename manpages to correct location (still broke in RC2) -%if 0 -{ - WRONG_DIR=$RPM_BUILD_ROOT%{_mandir}/man1 - MAN1X_DIR=$RPM_BUILD_ROOT%{_mandir}/man1x - - [ ! -d $MAN1X_DIR ] && mkdir -p $MAN1X_DIR - mv ${WRONG_DIR}/* ${MAN1X_DIR}/ - for each in ${MAN1X_DIR}/* ; do - mv $each ${each/.1/.1x} - done - rmdir $WRONG_DIR -} -%endif - %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc -%dir %{_bindir} %{_bindir}/luit %{_bindir}/oclock %{_bindir}/x11perf @@ -130,7 +113,6 @@ %{_bindir}/xpr %{_bindir}/xwd %{_bindir}/xwud -%dir %{_datadir} %dir %{_datadir}/X11 %dir %{_datadir}/X11/app-defaults %{_datadir}/X11/app-defaults/Clock-color @@ -149,8 +131,7 @@ %{_datadir}/X11/x11perfcomp/fillblnk %{_datadir}/X11/x11perfcomp/perfboth %{_datadir}/X11/x11perfcomp/perfratio -%dir %{_mandir} -%dir %{_mandir}/man1 +#%dir %{_mandir}/man1x %{_mandir}/man1/xcursorgen.1x* %{_mandir}/man1/Xmark.1x* %{_mandir}/man1/luit.1x* From fedora-cvs-commits at redhat.com Wed Mar 1 06:19:31 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 1 Mar 2006 01:19:31 -0500 Subject: rpms/xorg-x11-drivers/devel xorg-x11-drivers.spec,1.9,1.10 Message-ID: <200603010619.k216JVNA025031@cvs.devel.redhat.com> Author: mharris Update of /cvs/dist/rpms/xorg-x11-drivers/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv25015 Modified Files: xorg-x11-drivers.spec Log Message: minor spec cleanups Index: xorg-x11-drivers.spec =================================================================== RCS file: /cvs/dist/rpms/xorg-x11-drivers/devel/xorg-x11-drivers.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- xorg-x11-drivers.spec 16 Feb 2006 19:04:29 -0000 1.9 +++ xorg-x11-drivers.spec 1 Mar 2006 06:19:29 -0000 1.10 @@ -269,7 +269,6 @@ %files %defattr(-,root,root,-) -%doc %changelog * Thu Feb 16 2006 Bill Nottingham - 7.0-2 From fedora-cvs-commits at redhat.com Wed Mar 1 06:21:28 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 1 Mar 2006 01:21:28 -0500 Subject: rpms/xorg-x11-filesystem/devel xorg-x11-filesystem.spec,1.4,1.5 Message-ID: <200603010621.k216LS4n025066@cvs.devel.redhat.com> Author: mharris Update of /cvs/dist/rpms/xorg-x11-filesystem/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv25051 Modified Files: xorg-x11-filesystem.spec Log Message: Minor spec cleanups Index: xorg-x11-filesystem.spec =================================================================== RCS file: /cvs/dist/rpms/xorg-x11-filesystem/devel/xorg-x11-filesystem.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- xorg-x11-filesystem.spec 9 Feb 2006 11:38:24 -0000 1.4 +++ xorg-x11-filesystem.spec 1 Mar 2006 06:21:26 -0000 1.5 @@ -58,7 +58,6 @@ %clean rm -rf $RPM_BUILD_ROOT -# NOTE: Keep all 4 of these scripts updated. %pre # NOTE: Do not replace these with _libdir or _includedir macros, they are # intentionally explicit. From fedora-cvs-commits at redhat.com Wed Mar 1 06:24:05 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 1 Mar 2006 01:24:05 -0500 Subject: rpms/xorg-x11-font-utils/devel xorg-x11-font-utils.spec,1.15,1.16 Message-ID: <200603010624.k216O5n8025111@cvs.devel.redhat.com> Author: mharris Update of /cvs/dist/rpms/xorg-x11-font-utils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv25098 Modified Files: xorg-x11-font-utils.spec Log Message: Minor spec cleanups Index: xorg-x11-font-utils.spec =================================================================== RCS file: /cvs/dist/rpms/xorg-x11-font-utils/devel/xorg-x11-font-utils.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- xorg-x11-font-utils.spec 23 Feb 2006 02:38:03 -0000 1.15 +++ xorg-x11-font-utils.spec 1 Mar 2006 06:24:03 -0000 1.16 @@ -54,16 +54,14 @@ # set, avoiding a possible race condition. Requires(pre): libfontenc >= 0.99.2-2 - Provides: %{pkgname} Provides: bdftopcf, fonttosfnt, mkfontdir, mkfontscale, bdftruncate, ucs2any # NOTE: XFree86-font-utils package contains mkfontdir, mkfontscale, so this # is needed for upgrades to work properly from OS releases that had XFree86 Obsoletes: XFree86-font-utils -# NOTE: XFree86 package used to contain bdftopcf, so this is needed for -# upgrades to work. It also contained mkfontdir/mkfontscale at one point, -# so we just Conflict without a version specification. -Conflicts: XFree86 +# NOTE: XFree86 package used to contain bdftopcf, mkfontdir, mkfontscale so +# this is needed for upgrades to work. +Obsoletes: XFree86 # NOTE: The fonts/util subdir moved from xorg-x11-base-fonts to # xorg-x11-font-utils in 6.7.99.903-3 Obsoletes: xorg-x11-base-fonts <= 6.7.99.903-3 From fedora-cvs-commits at redhat.com Wed Mar 1 06:30:05 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 1 Mar 2006 01:30:05 -0500 Subject: rpms/xorg-x11-proto-devel/devel xorg-x11-proto-devel.spec, 1.21, 1.22 Message-ID: <200603010630.k216U5tY002866@cvs.devel.redhat.com> Author: mharris Update of /cvs/dist/rpms/xorg-x11-proto-devel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv2837 Modified Files: xorg-x11-proto-devel.spec Log Message: Minor spec cleanups Index: xorg-x11-proto-devel.spec =================================================================== RCS file: /cvs/dist/rpms/xorg-x11-proto-devel/devel/xorg-x11-proto-devel.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- xorg-x11-proto-devel.spec 23 Feb 2006 01:29:18 -0000 1.21 +++ xorg-x11-proto-devel.spec 1 Mar 2006 06:29:58 -0000 1.22 @@ -1,4 +1,8 @@ -# NOTE: This package contains only C header files and pkg-config *.pc files, +# INFO: When doing a bootstrap build on a new architecture, set this to 1 to +# avoid build loops. +%define build_bootstrap 0 + +# INFO: This package contains only C header files and pkg-config *.pc files, # and does not contain any ELF binaries or DSOs, so we disable debuginfo # generation. %define debug_package %{nil} @@ -63,7 +67,9 @@ # modular X.Org. Bug #173384. Requires(pre): xorg-x11-filesystem >= 0.99.2-3 +%if ! %{build_bootstrap} Requires: mesa-libGL-devel +%endif %description X.Org X11 Protocol headers @@ -276,7 +282,7 @@ %{_libdir}/pkgconfig/xproxymngproto.pc %changelog -* Wed Feb 22 2006 Jeremy Katz - 7.0-5 +* Wed Feb 22 2006 Jeremy Katz 7.0-5 - require mesa-libGL-devel since it's needed by some of the headers * Sun Feb 19 2006 Ray Strode 7.0-4 From fedora-cvs-commits at redhat.com Wed Mar 1 06:34:47 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 1 Mar 2006 01:34:47 -0500 Subject: rpms/xorg-x11-server/devel xorg-x11-server.spec,1.43,1.44 Message-ID: <200603010634.k216YlnA003113@cvs.devel.redhat.com> Author: mharris Update of /cvs/dist/rpms/xorg-x11-server/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv3083 Modified Files: xorg-x11-server.spec Log Message: Minor spec cleanups Index: xorg-x11-server.spec =================================================================== RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- xorg-x11-server.spec 23 Feb 2006 02:15:38 -0000 1.43 +++ xorg-x11-server.spec 1 Mar 2006 06:34:44 -0000 1.44 @@ -324,9 +324,10 @@ %pre Xorg { + # Install/Upgrade section pushd /etc/X11 # Migrate any pre-existing XFree86 4.x config file to xorg.conf if it - # doesn't already exist, and rename any remaining XFree86 4.x congig files + # doesn't already exist, and rename any remaining XFree86 4.x config files # to have .obsoleted file extensions, to help avoid end user confusion for # people unaware of the config file name change between server # implementations, and avoid bug reports. If this turns out to confuse @@ -518,7 +519,7 @@ # ------------------------------------------------------------------- %changelog -* Wed Feb 22 2006 Jeremy Katz - 1.0.1-7 +* Wed Feb 22 2006 Jeremy Katz 1.0.1-7 - install randrstr.h as part of sdk as required for building some drivers * Tue Feb 21 2006 Mike A. Harris @@ -614,7 +615,7 @@ stipple once again for bug (#173423). - Added "BuildRequires: libdrm-devel" for DRI enabled builds. -* Mon Nov 14 2005 Jeremy Katz - 0.99.3-5 +* Mon Nov 14 2005 Jeremy Katz 0.99.3-5 - Xorg server should be suid for users to be able to run startx (#173064) * Mon Nov 14 2005 Mike A. Harris 0.99.2-4 @@ -628,11 +629,11 @@ - Re-enable _smp_mflags during build. - Added "Requires: xorg-x11-drv-vesa" to Xorg subpackage (#173060) -* Mon Nov 14 2005 Jeremy Katz - 0.99.3-3 +* Mon Nov 14 2005 Jeremy Katz 0.99.3-3 - provide Xserver - add another requires for basic bits -* Sun Nov 13 2005 Jeremy Katz - 0.99.3-2 +* Sun Nov 13 2005 Jeremy Katz 0.99.3-2 - add some deps to the Xorg subpackage for base fonts, keyboard and mouse drivers, and rgb.txt that the server really wont work without From fedora-cvs-commits at redhat.com Wed Mar 1 06:37:03 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 1 Mar 2006 01:37:03 -0500 Subject: rpms/xorg-x11-server-utils/devel xorg-x11-server-utils.spec, 1.12, 1.13 Message-ID: <200603010637.k216b3uI003479@cvs.devel.redhat.com> Author: mharris Update of /cvs/dist/rpms/xorg-x11-server-utils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv3448 Modified Files: xorg-x11-server-utils.spec Log Message: minor spec cleanups Index: xorg-x11-server-utils.spec =================================================================== RCS file: /cvs/dist/rpms/xorg-x11-server-utils/devel/xorg-x11-server-utils.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- xorg-x11-server-utils.spec 11 Feb 2006 06:25:37 -0000 1.12 +++ xorg-x11-server-utils.spec 1 Mar 2006 06:37:01 -0000 1.13 @@ -146,7 +146,6 @@ %files %defattr(-,root,root,-) %doc -%dir %{_bindir} %{_bindir}/iceauth %{_bindir}/lbxproxy %{_bindir}/sessreg @@ -171,20 +170,13 @@ %{_bindir}/xtrapreset %{_bindir}/xtrapstats %{_bindir}/xvidtune -# FIXME: These files should all be moved to /usr/share as they're arch -# independent data. -#%dir %{_libdir} -#%dir %{_libdir}/X11 -%dir %{_datadir} %dir %{_datadir}/X11 %{_datadir}/X11/rgb.txt %dir %{_datadir}/X11/app-defaults %{_datadir}/X11/app-defaults/Xvidtune %dir %{_datadir}/X11/lbxproxy %{_datadir}/X11/lbxproxy/AtomControl -# FIXME: End of files from above that should be in /usr/share. -%dir %{_mandir} -%dir %{_mandir}/man1 +#%dir %{_mandir}/man1x %{_mandir}/man1/iceauth.1x* %{_mandir}/man1/lbxproxy.1x* %{_mandir}/man1/sessreg.1x* @@ -212,10 +204,10 @@ %{_mandir}/man1/xvidtune.1x* %changelog -* Fri Feb 10 2006 Jesse Keating - 1.0.1-1.2 +* Fri Feb 10 2006 Jesse Keating 1.0.1-1.2 - bump again for double-long bug on ppc(64) -* Tue Feb 07 2006 Jesse Keating - 1.0.1-1.1 +* Tue Feb 07 2006 Jesse Keating 1.0.1-1.1 - rebuilt for new gcc4.1 snapshot and glibc changes * Wed Jan 18 2006 Mike A. Harris 1.0.1-1 @@ -242,7 +234,7 @@ - Added xvidtune-0.99.1-datadir-app-defaults-fix.patch to move app-defaults into datadir. -* Mon Nov 14 2005 Jeremy Katz - 0.99.2-3 +* Mon Nov 14 2005 Jeremy Katz 0.99.2-3 - require newer filesystem package (#172610) * Sun Nov 13 2005 Mike A. Harris 0.99.2-2 From fedora-cvs-commits at redhat.com Wed Mar 1 06:39:39 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 1 Mar 2006 01:39:39 -0500 Subject: rpms/xorg-x11-twm/devel xorg-x11-twm.spec,1.11,1.12 Message-ID: <200603010639.k216ddpY004528@cvs.devel.redhat.com> Author: mharris Update of /cvs/dist/rpms/xorg-x11-twm/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv4496 Modified Files: xorg-x11-twm.spec Log Message: Minor spec cleanups Index: xorg-x11-twm.spec =================================================================== RCS file: /cvs/dist/rpms/xorg-x11-twm/devel/xorg-x11-twm.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- xorg-x11-twm.spec 11 Feb 2006 06:26:04 -0000 1.11 +++ xorg-x11-twm.spec 1 Mar 2006 06:39:37 -0000 1.12 @@ -9,7 +9,7 @@ License: MIT/X11 Group: User Interface/X URL: http://www.x.org -Source0: http://xorg.freedesktop.org/releases/X11R7.0-RC4/everything/%{pkgname}-%{version}.tar.bz2 +Source0: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/%{pkgname}-%{version}.tar.bz2 #Source0: %{pkgname}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -88,22 +88,17 @@ %files %defattr(-,root,root,-) %doc -%dir %{_bindir} %{_bindir}/twm -%dir %{_mandir} -%dir %{_mandir}/man1 +#%dir %{_mandir}/man1x %{_mandir}/man1/twm.1x* -# FIXME: modular build is not installing the twm config currently, find out -# why and fix it. -%dir %{_sysconfdir} %dir %{_sysconfdir}/X11/twm %config %{_sysconfdir}/X11/twm/system.twmrc %changelog -* Fri Feb 10 2006 Jesse Keating - 1:1.0.1-1.2 +* Fri Feb 10 2006 Jesse Keating 1:1.0.1-1.2 - bump again for double-long bug on ppc(64) -* Tue Feb 07 2006 Jesse Keating - 1:1.0.1-1.1 +* Tue Feb 07 2006 Jesse Keating 1:1.0.1-1.1 - rebuilt for new gcc4.1 snapshot and glibc changes * Wed Jan 18 2006 Mike A. Harris 1:1.0.1-1 From fedora-cvs-commits at redhat.com Wed Mar 1 06:41:18 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 1 Mar 2006 01:41:18 -0500 Subject: rpms/xorg-x11-util-macros/devel xorg-x11-util-macros.spec,1.8,1.9 Message-ID: <200603010641.k216fIpI005236@cvs.devel.redhat.com> Author: mharris Update of /cvs/dist/rpms/xorg-x11-util-macros/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv5205 Modified Files: xorg-x11-util-macros.spec Log Message: minor spec cleanups Index: xorg-x11-util-macros.spec =================================================================== RCS file: /cvs/dist/rpms/xorg-x11-util-macros/devel/xorg-x11-util-macros.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- xorg-x11-util-macros.spec 11 Feb 2006 06:26:15 -0000 1.8 +++ xorg-x11-util-macros.spec 1 Mar 2006 06:41:15 -0000 1.9 @@ -36,15 +36,14 @@ %files %defattr(-,root,root,-) %doc -%dir %{_datadir}/aclocal %{_datadir}/aclocal/xorgversion.m4 %{_datadir}/aclocal/xorg-macros.m4 %changelog -* Fri Feb 10 2006 Jesse Keating - 1.0.1-1.2 +* Fri Feb 10 2006 Jesse Keating 1.0.1-1.2 - bump again for double-long bug on ppc(64) -* Tue Feb 07 2006 Jesse Keating - 1.0.1-1.1 +* Tue Feb 07 2006 Jesse Keating 1.0.1-1.1 - rebuilt for new gcc4.1 snapshot and glibc changes * Fri Dec 23 2005 Mike A. Harris 1.0.1-1 @@ -53,7 +52,7 @@ * Thu Dec 15 2005 Mike A. Harris 1.0.0-1 - Update to util-macros-1.0.0 from the X11R7 RC4 release. -* Tue Dec 6 2005 Mike A. Harris 0.99.2-1 +* Tue Dec 06 2005 Mike A. Harris 0.99.2-1 - Update to util-macros-0.99.2 from the X11R7 RC3 release. * Wed Oct 19 2005 Mike A. Harris 0.99.1-1 From fedora-cvs-commits at redhat.com Wed Mar 1 06:43:45 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 1 Mar 2006 01:43:45 -0500 Subject: rpms/xorg-x11-utils/devel xorg-x11-utils.spec,1.9,1.10 Message-ID: <200603010643.k216hj8n006362@cvs.devel.redhat.com> Author: mharris Update of /cvs/dist/rpms/xorg-x11-utils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv6332 Modified Files: xorg-x11-utils.spec Log Message: minor spec cleanups Index: xorg-x11-utils.spec =================================================================== RCS file: /cvs/dist/rpms/xorg-x11-utils/devel/xorg-x11-utils.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- xorg-x11-utils.spec 11 Feb 2006 06:26:35 -0000 1.9 +++ xorg-x11-utils.spec 1 Mar 2006 06:43:42 -0000 1.10 @@ -70,7 +70,6 @@ %files %defattr(-,root,root,-) %doc -%dir %{_bindir} %{_bindir}/xdpyinfo %{_bindir}/xdriinfo %{_bindir}/xev @@ -82,30 +81,28 @@ %{_bindir}/xprop %{_bindir}/xvinfo %{_bindir}/xwininfo -%dir %{_datadir} %dir %{_datadir}/X11 %dir %{_datadir}/X11/app-defaults %{_datadir}/X11/app-defaults/XFontSel %{_datadir}/X11/app-defaults/Xfd -%dir %{_mandir} -%dir %{_mandir}/man1 -%{_mandir}/man1/xdpyinfo.1x.gz -%{_mandir}/man1/xdriinfo.1x.gz -%{_mandir}/man1/xev.1x.gz -%{_mandir}/man1/xfd.1x.gz -%{_mandir}/man1/xfontsel.1x.gz -%{_mandir}/man1/xlsatoms.1x.gz -%{_mandir}/man1/xlsclients.1x.gz -%{_mandir}/man1/xlsfonts.1x.gz -%{_mandir}/man1/xprop.1x.gz -%{_mandir}/man1/xvinfo.1x.gz -%{_mandir}/man1/xwininfo.1x.gz +#%dir %{_mandir}/man1x +%{_mandir}/man1/xdpyinfo.1x* +%{_mandir}/man1/xdriinfo.1x* +%{_mandir}/man1/xev.1x* +%{_mandir}/man1/xfd.1x* +%{_mandir}/man1/xfontsel.1x* +%{_mandir}/man1/xlsatoms.1x* +%{_mandir}/man1/xlsclients.1x* +%{_mandir}/man1/xlsfonts.1x* +%{_mandir}/man1/xprop.1x* +%{_mandir}/man1/xvinfo.1x* +%{_mandir}/man1/xwininfo.1x* %changelog -* Fri Feb 10 2006 Jesse Keating - 1.0.1-1.2 +* Fri Feb 10 2006 Jesse Keating 1.0.1-1.2 - bump again for double-long bug on ppc(64) -* Tue Feb 07 2006 Jesse Keating - 1.0.1-1.1 +* Tue Feb 07 2006 Jesse Keating 1.0.1-1.1 - rebuilt for new gcc4.1 snapshot and glibc changes * Wed Jan 18 2006 Mike A. Harris 1.0.1-1 @@ -116,10 +113,10 @@ - Changed manpage dir from man1x to man1 to match upstream RC4 default. - Moved all app-defaults files from _libdir to _datadir -* Mon Nov 14 2005 Jeremy Katz - 0.99.2-3 +* Mon Nov 14 2005 Jeremy Katz 0.99.2-3 - require newer filesystem package (#172610) -* Mon Nov 14 2005 Jeremy Katz - 0.99.2-2 +* Mon Nov 14 2005 Jeremy Katz 0.99.2-2 - rebuild * Fri Nov 11 2005 Mike A. Harris 0.99.2-1 From fedora-cvs-commits at redhat.com Wed Mar 1 06:45:48 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 1 Mar 2006 01:45:48 -0500 Subject: rpms/xorg-x11-xauth/devel xorg-x11-xauth.spec,1.9,1.10 Message-ID: <200603010645.k216jm9X009727@cvs.devel.redhat.com> Author: mharris Update of /cvs/dist/rpms/xorg-x11-xauth/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv9468 Modified Files: xorg-x11-xauth.spec Log Message: minor spec cleanups Index: xorg-x11-xauth.spec =================================================================== RCS file: /cvs/dist/rpms/xorg-x11-xauth/devel/xorg-x11-xauth.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- xorg-x11-xauth.spec 11 Feb 2006 06:26:50 -0000 1.9 +++ xorg-x11-xauth.spec 1 Mar 2006 06:45:45 -0000 1.10 @@ -4,12 +4,12 @@ Name: xorg-x11-%{pkgname} Version: 1.0.1 Release: 1.2 -# FIXME: Remove Epoch line if package gets renamed +# NOTE: Remove Epoch line if package gets renamed Epoch: 1 License: MIT/X11 Group: User Interface/X URL: http://www.x.org -Source0: http://xorg.freedesktop.org/releasesX11R7.0-RC4/everything/%{pkgname}-%{version}.tar.bz2 +Source0: http://xorg.freedesktop.org/releasesX11R7.0/src/everything/%{pkgname}-%{version}.tar.bz2 Source10: mkxauth Source11: mkxauth.man BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -24,10 +24,10 @@ Provides: mkxauth Obsoletes: XFree86-xauth, mkxauth # NOTE: xauth moved from the XFree86 package to XFree86-xauth in -# XFree86-4.2.0-50.11, so this Conflicts line is required for upgrades +# XFree86-4.2.0-50.11, so this Obsoletes line is required for upgrades # from RHL 8 and older, and RHEL 2.1 to work properly when upgrading to # a newer OS release. -Conflicts: XFree86 < 4.2.0-50.11 +Obsoletes: XFree86 < 4.2.0-50.11 %description xauth is used to edit and display the authorization information @@ -57,19 +57,17 @@ %files %defattr(-,root,root,-) %doc -%dir %{_bindir} %{_bindir}/xauth %{_bindir}/mkxauth -%dir %{_mandir} -%dir %{_mandir}/man1 +#%dir %{_mandir}/man1x %{_mandir}/man1/xauth.1x* %{_mandir}/man1/mkxauth.1x* %changelog -* Fri Feb 10 2006 Jesse Keating - 1:1.0.1-1.2 +* Fri Feb 10 2006 Jesse Keating 1:1.0.1-1.2 - bump again for double-long bug on ppc(64) -* Tue Feb 07 2006 Jesse Keating - 1:1.0.1-1.1 +* Tue Feb 07 2006 Jesse Keating 1:1.0.1-1.1 - rebuilt for new gcc4.1 snapshot and glibc changes * Wed Jan 18 2006 Mike A. Harris 1:1.0.1-1 From fedora-cvs-commits at redhat.com Wed Mar 1 06:50:32 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 1 Mar 2006 01:50:32 -0500 Subject: rpms/xorg-x11-xbitmaps/devel xorg-x11-xbitmaps.spec,1.9,1.10 Message-ID: <200603010650.k216oWwq021813@cvs.devel.redhat.com> Author: mharris Update of /cvs/dist/rpms/xorg-x11-xbitmaps/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv21691 Modified Files: xorg-x11-xbitmaps.spec Log Message: minor spec cleanups Index: xorg-x11-xbitmaps.spec =================================================================== RCS file: /cvs/dist/rpms/xorg-x11-xbitmaps/devel/xorg-x11-xbitmaps.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- xorg-x11-xbitmaps.spec 11 Feb 2006 06:27:05 -0000 1.9 +++ xorg-x11-xbitmaps.spec 1 Mar 2006 06:50:17 -0000 1.10 @@ -1,14 +1,18 @@ %define pkgname xbitmaps +%define debug_package %{nil} + Summary: X.Org X11 application bitmaps Name: xorg-x11-%{pkgname} Version: 1.0.1 -Release: 1.2 +Release: 2 License: MIT/X11 Group: User Interface/X URL: http://www.x.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot -Source0: http://xorg.freedesktop.org/releases/X11R7.0-RC4/everything/%{pkgname}-%{version}.tar.bz2 +Source0: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/%{pkgname}-%{version}.tar.bz2 + +BuildArchitecture: noarch # NOTE: This dependency on xorg-x11-filesystem is required to work around # a nasty upgrade problem when going from FC4->FC5 or monolithic to @@ -34,57 +38,29 @@ make install DESTDIR=$RPM_BUILD_ROOT -# FIXME: Upstream installs the bitmaps into /usr/include by default, however -# they are used both at compiletime via #include, as well as at runtime by -# other apps. Being pedantically correct, it makes sense to install them -# into the FHS sanctioned /usr/share heirarchy instead for runtime arch -# independent data. Then provide a symlink from /usr/include to the -# runtime dir for apps to link to. Since this is too much overhead for -# a separate devel subpackage, I've added a virtual Provide above so this -# package provides both. This should be fixed upstream IMHO to use -# /usr/share by default. -%if 0 -{ - mkdir -p $RPM_BUILD_ROOT%{_datadir}/X11 - mv $RPM_BUILD_ROOT%{_includedir}/X11/bitmaps $RPM_BUILD_ROOT%{_datadir}/X11/ - ln -sf ../../..%{_datadir}/X11/bitmaps $RPM_BUILD_ROOT%{_includedir}/X11/ -} -%endif - %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc -%if 0 - -%dir %{_datadir} -%dir %{_datadir}/X11 -%dir %{_datadir}/X11/bitmaps -%{_datadir}/X11/bitmaps/* -# Symlink for devel linking -%{_includedir}/X11/bitmaps - -%else - -%dir %{_includedir} %dir %{_includedir}/X11 %dir %{_includedir}/X11/bitmaps %{_includedir}/X11/bitmaps/* # Symlink for devel linking %{_includedir}/X11/bitmaps - -%endif - -%dir %{_libdir}/pkgconfig %{_libdir}/pkgconfig/xbitmaps.pc %changelog -* Fri Feb 10 2006 Jesse Keating - 1.0.1-1.2 +* Wed Mar 01 2006 Mike A. Harris 1.0.1-2 +- Cleaned up file manifest. +- Made package noarch, as it is just header files. +- Disable debuginfo processing, as there are no ELF objects in package. + +* Fri Feb 10 2006 Jesse Keating 1.0.1-1.2 - bump again for double-long bug on ppc(64) -* Tue Feb 07 2006 Jesse Keating - 1.0.1-1.1 +* Tue Feb 07 2006 Jesse Keating 1.0.1-1.1 - rebuilt for new gcc4.1 snapshot and glibc changes * Wed Jan 18 2006 Mike A. Harris 1.0.1-1 From fedora-cvs-commits at redhat.com Wed Mar 1 06:51:07 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 1 Mar 2006 01:51:07 -0500 Subject: rpms/xorg-x11-xbitmaps/devel xorg-x11-xbitmaps.spec,1.10,1.11 Message-ID: <200603010651.k216p7WF022125@cvs.devel.redhat.com> Author: mharris Update of /cvs/dist/rpms/xorg-x11-xbitmaps/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv22092 Modified Files: xorg-x11-xbitmaps.spec Log Message: minor spec cleanups Index: xorg-x11-xbitmaps.spec =================================================================== RCS file: /cvs/dist/rpms/xorg-x11-xbitmaps/devel/xorg-x11-xbitmaps.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- xorg-x11-xbitmaps.spec 1 Mar 2006 06:50:17 -0000 1.10 +++ xorg-x11-xbitmaps.spec 1 Mar 2006 06:51:05 -0000 1.11 @@ -12,7 +12,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot Source0: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/%{pkgname}-%{version}.tar.bz2 -BuildArchitecture: noarch +BuildArch: noarch # NOTE: This dependency on xorg-x11-filesystem is required to work around # a nasty upgrade problem when going from FC4->FC5 or monolithic to From fedora-cvs-commits at redhat.com Wed Mar 1 07:05:36 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 1 Mar 2006 02:05:36 -0500 Subject: rpms/xorg-x11-xfs/devel xorg-x11-xfs.spec,1.18,1.19 Message-ID: <200603010705.k2175aLm026183@cvs.devel.redhat.com> Author: mharris Update of /cvs/dist/rpms/xorg-x11-xfs/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv26158 Modified Files: xorg-x11-xfs.spec Log Message: * Wed Mar 01 2006 Mike A. Harris 1:1.0.1-4 - Fix all rpm scriptlets "upgrade" tests to only execute on upgrades. Index: xorg-x11-xfs.spec =================================================================== RCS file: /cvs/dist/rpms/xorg-x11-xfs/devel/xorg-x11-xfs.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- xorg-x11-xfs.spec 25 Feb 2006 17:23:03 -0000 1.18 +++ xorg-x11-xfs.spec 1 Mar 2006 07:05:32 -0000 1.19 @@ -1,4 +1,3 @@ -#!/bin/bash %define pkgname xfs %define _x11fontdir %(pkg-config --variable=fontdir fontutil) @@ -8,7 +7,7 @@ Summary: X.Org X11 xfs font server Name: xorg-x11-%{pkgname} Version: 1.0.1 -Release: 3 +Release: 4 # NOTE: Remove Epoch line if package gets renamed Epoch: 1 License: MIT/X11 @@ -169,7 +168,7 @@ { /usr/sbin/useradd -c "X Font Server" -r -s /sbin/nologin -u 43 -d /etc/X11/fs xfs || : # Upgrade path: - if [ "$1" -ge "1" ] ; then + if [ "$1" -gt "1" ] ; then if [ -e "/usr/X11R6/lib/X11/fs/config" ] ; then cat <<-EOF > "/etc/X11/fs/xfs-migrate" On upgrades, we now must determine if we are upgrading from monolithic @@ -189,7 +188,7 @@ /sbin/chkconfig --add xfs #------------------------------------------------------------------------ # Upgrade section - if [ "$1" -ge "1" ] ; then + if [ "$1" -gt "1" ] ; then XORG_CONFIG=/etc/X11/xorg.conf XFSCONFIG=/etc/X11/fs/config @@ -248,7 +247,7 @@ %postun { - if [ "$1" -ge "1" ]; then + if [ "$1" -gt "1" ]; then /sbin/service xfs condrestart &> /dev/null || : fi } @@ -282,10 +281,13 @@ %{_mandir}/man1/xfsinfo.1x* %changelog +* Wed Mar 01 2006 Mike A. Harris 1:1.0.1-4 +- Fix all rpm scriptlets "upgrade" tests to only execute on upgrades. + * Sat Feb 25 2006 Mike A. Harris 1:1.0.1-3 - Redirect output of "rm -rf fonts.dir" to /dev/null in xfs.init -* Fri Feb 10 2006 Jesse Keating - 1:1.0.1-2.1 +* Fri Feb 10 2006 Jesse Keating 1:1.0.1-2.1 - bump again for double-long bug on ppc(64) * Thu Feb 9 2006 Mike A. Harris 1:1.0.1-2 From fedora-cvs-commits at redhat.com Wed Mar 1 07:06:05 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 1 Mar 2006 02:06:05 -0500 Subject: rpms/xorg-x11-xdm/devel xorg-x11-xdm.spec,1.18,1.19 Message-ID: <200603010706.k21765f2026278@cvs.devel.redhat.com> Author: mharris Update of /cvs/dist/rpms/xorg-x11-xdm/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv26248 Modified Files: xorg-x11-xdm.spec Log Message: minor spec cleanups Index: xorg-x11-xdm.spec =================================================================== RCS file: /cvs/dist/rpms/xorg-x11-xdm/devel/xorg-x11-xdm.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- xorg-x11-xdm.spec 11 Feb 2006 06:27:16 -0000 1.18 +++ xorg-x11-xdm.spec 1 Mar 2006 07:06:02 -0000 1.19 @@ -4,13 +4,6 @@ # to be done. The spec file will naturally become less of a mess once # the upstream tarball is kosher. -- mharris -# The build_xxx macros are hopefully temporary. I plan on removing them -# at some point in the near future anyway, when I have no personal use -# for them anymore, which probably is soon. If anyone else is using them, -# I urge them to upgrade to FC5 ASAP. ;o) -%define build_fc3 0 -%define build_fc4 0 - %define pkgname xdm Summary: X.Org X11 xdm - X Display Manager @@ -28,13 +21,6 @@ Source1: Xsetup_0 Source10: xdm.init Source11: xdm.pamd -# FIXME: The xdm-pre-audit-system.pamd file is for FC3/FC4 builds, where -# the new audit system was not included in our pam implementation yet. I -# am not sure if FC4 has the new audit system, but if it does, this file -# will be removed as soon as I can confirm it, and the spec file will be -# useable only on FC4 and higher. I leave this here for now only to make -# it easier to test modular X on more systems for personal convenience. -Source12: xdm-pre-audit-system.pamd Source13: xserver.pamd # NOTE: Change xdm-config to invoke Xwilling with "-s /bin/bash" instead @@ -69,22 +55,11 @@ # real directories, and not symbolic links. Requires(pre): xorg-x11-filesystem >= 0.99.2-3 -# NOTE: Support for the new audit system was added to rawhide in pam-0.77-10, +# NOTE: Support for the new audit system was added to rawhide in FC3/pam-0.77-10, # requiring a change to xdm.pamd (bug #159332). Support for pam_stack.so was # removed from pam, and replaced by a new mechanism in pam-0.78 and later, # requiring additional changes to xdm.pamd. (bug #170661) -%if %{build_fc3} -Requires: pam >= 0.77-10 -%else Requires: pam >= 0.78-0 -%endif - -# pam requires were added for bug #159332 for new audit system. It really -# should be a virtual provide in the pam package, to avoid odd version-release -# games, but this is the way it was done so we have to live with it. -#%if %{build_rhel4} -#Requires: pam >= 0.77-66.8 -#%endif %description X.Org X11 xdm - X Display Manager @@ -134,17 +109,7 @@ { mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/pam.d install -c -m 644 %{SOURCE13} $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/xserver -# FIXME: I think the new audit system got released as an FC4 update, so -# we might be able to remove this conditionalization, and just -# use one xdm.pamd period. In that case, FC3 and older users can -# manually update to FC4 or later pam, or upgrade their whole OS -# to something currently supported. - if [ "%{build_fc3}" = "1" ] ; then - install -c -m 644 %{SOURCE12} $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/xdm - else - install -c -m 644 %{SOURCE11} $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/xdm - fi -# touch $RPM_BUILD_ROOT%{_sysconfigdir}/security/console.apps/xserver + install -c -m 644 %{SOURCE11} $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/xdm } # FIXME: This was in the monolithic xorg packaging, but I don't know if it @@ -173,7 +138,6 @@ %files %defattr(-,root,root,-) %doc -%dir %{_bindir} %{_bindir}/xdm %{_bindir}/xdmshell %dir %{_sysconfdir}/X11/xdm @@ -196,7 +160,6 @@ %{_sysconfdir}/X11/xdm/Xwilling %{_sysconfdir}/pam.d/xdm %{_sysconfdir}/pam.d/xserver - %dir %{_datadir}/X11 %dir %{_datadir}/X11/app-defaults %{_datadir}/X11/app-defaults/Chooser @@ -204,20 +167,17 @@ %dir %{_datadir}/xdm/pixmaps %{_datadir}/xdm/pixmaps/xorg-bw.xpm %{_datadir}/xdm/pixmaps/xorg.xpm - %dir %{_libdir}/X11/xdm %{_libdir}/X11/xdm/chooser %{_libdir}/X11/xdm/libXdmGreet.so - -%dir %{_mandir} -%dir %{_mandir}/man1x +#%dir %{_mandir}/man1x %{_mandir}/man1x/*.1x* %changelog -* Fri Feb 10 2006 Jesse Keating - 1:1.0.1-1.2 +* Fri Feb 10 2006 Jesse Keating 1:1.0.1-1.2 - bump again for double-long bug on ppc(64) -* Tue Feb 07 2006 Jesse Keating - 1:1.0.1-1.1 +* Tue Feb 07 2006 Jesse Keating 1:1.0.1-1.1 - rebuilt for new gcc4.1 snapshot and glibc changes * Mon Jan 9 2006 Mike A. Harris 1:1.0.1-1 @@ -240,10 +200,10 @@ up Makefile.in. Fixes a typo that caused Xreset to not get installed properly also. -* Mon Nov 14 2005 Jeremy Katz - 1:0.99.3-5 +* Mon Nov 14 2005 Jeremy Katz 1:0.99.3-5 - require newer filesystem package (#172610) -* Mon Nov 14 2005 Jeremy Katz - 1:0.99.3-4 +* Mon Nov 14 2005 Jeremy Katz 1:0.99.3-4 - install scripts into /etc/X11/xdm instead of %%{_libdir} (#173081) - use our Xsetup_0 instead of xorg one (#173083) From fedora-cvs-commits at redhat.com Wed Mar 1 07:08:01 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 1 Mar 2006 02:08:01 -0500 Subject: rpms/xorg-x11-xfwp/devel xorg-x11-xfwp.spec,1.7,1.8 Message-ID: <200603010708.k21781ZV026625@cvs.devel.redhat.com> Author: mharris Update of /cvs/dist/rpms/xorg-x11-xfwp/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv26593 Modified Files: xorg-x11-xfwp.spec Log Message: minor spec cleanups Index: xorg-x11-xfwp.spec =================================================================== RCS file: /cvs/dist/rpms/xorg-x11-xfwp/devel/xorg-x11-xfwp.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- xorg-x11-xfwp.spec 11 Feb 2006 06:27:40 -0000 1.7 +++ xorg-x11-xfwp.spec 1 Mar 2006 07:07:59 -0000 1.8 @@ -14,10 +14,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -# FIXME: The BuildRequires are all missing here and need to be figured out. -# That's low priority for now though, unless we encounter real build -# failures in beehive. - BuildRequires: pkgconfig BuildRequires: xorg-x11-util-macros >= 1.0.0 @@ -70,24 +66,22 @@ %files %defattr(-,root,root,-) %doc -%dir %{_bindir} %{_bindir}/proxymngr %{_bindir}/xfindproxy %{_bindir}/xfwp %dir %{_libdir}/X11 %dir %{_libdir}/X11/proxymngr %{_libdir}/X11/proxymngr/pmconfig -%dir %{_mandir} -%dir %{_mandir}/man1 +#%dir %{_mandir}/man1x %{_mandir}/man1/proxymngr.1x* %{_mandir}/man1/xfindproxy.1x* %{_mandir}/man1/xfwp.1x* %changelog -* Fri Feb 10 2006 Jesse Keating - 1.0.1-1.2 +* Fri Feb 10 2006 Jesse Keating 1.0.1-1.2 - bump again for double-long bug on ppc(64) -* Tue Feb 07 2006 Jesse Keating - 1.0.1-1.1 +* Tue Feb 07 2006 Jesse Keating 1.0.1-1.1 - rebuilt for new gcc4.1 snapshot and glibc changes * Wed Jan 18 2006 Mike A. Harris 1.0.1-1 @@ -97,7 +91,7 @@ - Updated all tarballs to version 1.0.0 from X11R7 RC4. - Changed manpage dir from man1x to man1 to match RC4 default. -* Mon Nov 14 2005 Jeremy Katz - 0.99.1-3 +* Mon Nov 14 2005 Jeremy Katz 0.99.1-3 - require newer filesystem package (#172610) * Sun Nov 13 2005 Mike A. Harris 0.99.1-2 From fedora-cvs-commits at redhat.com Wed Mar 1 07:09:48 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 1 Mar 2006 02:09:48 -0500 Subject: rpms/xorg-x11-xinit/devel xorg-x11-xinit.spec,1.16,1.17 Message-ID: <200603010709.k2179mBR027294@cvs.devel.redhat.com> Author: mharris Update of /cvs/dist/rpms/xorg-x11-xinit/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv27276 Modified Files: xorg-x11-xinit.spec Log Message: minor spec cleanups Index: xorg-x11-xinit.spec =================================================================== RCS file: /cvs/dist/rpms/xorg-x11-xinit/devel/xorg-x11-xinit.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- xorg-x11-xinit.spec 16 Feb 2006 14:48:14 -0000 1.16 +++ xorg-x11-xinit.spec 1 Mar 2006 07:09:45 -0000 1.17 @@ -94,10 +94,10 @@ * Thu Feb 16 2006 Mike A. Harris 1.0.1-2 - Change Conflicts to Obsoletes for xorg-x11 and XFree86 (#181414) -* Fri Feb 10 2006 Jesse Keating - 1.0.1-1.2 +* Fri Feb 10 2006 Jesse Keating 1.0.1-1.2 - bump again for double-long bug on ppc(64) -* Tue Feb 07 2006 Jesse Keating - 1.0.1-1.1 +* Tue Feb 07 2006 Jesse Keating 1.0.1-1.1 - rebuilt for new gcc4.1 snapshot and glibc changes * Wed Jan 18 2006 Mike A. Harris 1.0.1-1 From fedora-cvs-commits at redhat.com Wed Mar 1 07:11:25 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 1 Mar 2006 02:11:25 -0500 Subject: rpms/xorg-x11-xkb-utils/devel xorg-x11-xkb-utils.spec,1.10,1.11 Message-ID: <200603010711.k217BP7C028049@cvs.devel.redhat.com> Author: mharris Update of /cvs/dist/rpms/xorg-x11-xkb-utils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv28023 Modified Files: xorg-x11-xkb-utils.spec Log Message: minor spec cleanups Index: xorg-x11-xkb-utils.spec =================================================================== RCS file: /cvs/dist/rpms/xorg-x11-xkb-utils/devel/xorg-x11-xkb-utils.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- xorg-x11-xkb-utils.spec 11 Feb 2006 06:28:02 -0000 1.10 +++ xorg-x11-xkb-utils.spec 1 Mar 2006 07:11:22 -0000 1.11 @@ -8,7 +8,7 @@ Group: User Interface/X URL: http://www.x.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -%define xorgurl http://xorg.freedesktop.org/releases/X11R7.0-RC4/everything +%define xorgurl http://xorg.freedesktop.org/releases/X11R7.0/src/everything Source0: %{xorgurl}/xkbutils-1.0.1.tar.bz2 Source1: %{xorgurl}/xkbcomp-1.0.1.tar.bz2 Source2: %{xorgurl}/xkbevd-1.0.1.tar.bz2 @@ -78,7 +78,6 @@ %files %defattr(-,root,root,-) %doc -%dir %{_bindir} %{_bindir}/setxkbmap %{_bindir}/xkbbell %{_bindir}/xkbcomp @@ -86,8 +85,7 @@ %{_bindir}/xkbprint %{_bindir}/xkbvleds %{_bindir}/xkbwatch -%dir %{_mandir} -%dir %{_mandir}/man1 +#%dir %{_mandir}/man1x # FIXME: manpages are missing for xkbbell, xkbvleds, xkbwatch. I examined # the monolithic packaging however, and it does not appear to have manpages # for them either. @@ -97,10 +95,10 @@ %{_mandir}/man1/xkbprint.1x* %changelog -* Fri Feb 10 2006 Jesse Keating - 1.0.1-1.2 +* Fri Feb 10 2006 Jesse Keating 1.0.1-1.2 - bump again for double-long bug on ppc(64) -* Tue Feb 07 2006 Jesse Keating - 1.0.1-1.1 +* Tue Feb 07 2006 Jesse Keating 1.0.1-1.1 - rebuilt for new gcc4.1 snapshot and glibc changes * Wed Jan 18 2006 Mike A. Harris 1.0.1-1 From fedora-cvs-commits at redhat.com Wed Mar 1 07:12:52 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 1 Mar 2006 02:12:52 -0500 Subject: rpms/xorg-x11-xsm/devel xorg-x11-xsm.spec,1.9,1.10 Message-ID: <200603010712.k217Cq7l028726@cvs.devel.redhat.com> Author: mharris Update of /cvs/dist/rpms/xorg-x11-xsm/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv28698 Modified Files: xorg-x11-xsm.spec Log Message: minor spec cleanups Index: xorg-x11-xsm.spec =================================================================== RCS file: /cvs/dist/rpms/xorg-x11-xsm/devel/xorg-x11-xsm.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- xorg-x11-xsm.spec 14 Feb 2006 12:55:03 -0000 1.9 +++ xorg-x11-xsm.spec 1 Mar 2006 07:12:49 -0000 1.10 @@ -122,10 +122,10 @@ %config %{_sysconfdir}/X11/xsm/system.xsm %changelog -* Fri Feb 10 2006 Jesse Keating - 1.0.1-1.2 +* Fri Feb 10 2006 Jesse Keating 1.0.1-1.2 - bump again for double-long bug on ppc(64) -* Tue Feb 07 2006 Jesse Keating - 1.0.1-1.1 +* Tue Feb 07 2006 Jesse Keating 1.0.1-1.1 - rebuilt for new gcc4.1 snapshot and glibc changes * Wed Jan 18 2006 Mike A. Harris 1.0.1-1 @@ -142,7 +142,7 @@ /etc and data files in /usr/share where they belong. - Added "Requires: xauth, rsh" as rstart invokes xauth, rsh. -* Mon Nov 14 2005 Jeremy Katz - 0.99.2-3 +* Mon Nov 14 2005 Jeremy Katz 0.99.2-3 - require newer filesystem package (#172610) * Sun Nov 13 2005 Mike A. Harris 0.99.1-2 From fedora-cvs-commits at redhat.com Wed Mar 1 07:13:43 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 1 Mar 2006 02:13:43 -0500 Subject: rpms/xorg-x11-xtrans-devel/devel xorg-x11-xtrans-devel.spec, 1.11, 1.12 Message-ID: <200603010713.k217DhlZ029145@cvs.devel.redhat.com> Author: mharris Update of /cvs/dist/rpms/xorg-x11-xtrans-devel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv29113 Modified Files: xorg-x11-xtrans-devel.spec Log Message: minor spec cleanups Index: xorg-x11-xtrans-devel.spec =================================================================== RCS file: /cvs/dist/rpms/xorg-x11-xtrans-devel/devel/xorg-x11-xtrans-devel.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- xorg-x11-xtrans-devel.spec 11 Feb 2006 06:28:25 -0000 1.11 +++ xorg-x11-xtrans-devel.spec 1 Mar 2006 07:13:41 -0000 1.12 @@ -53,16 +53,14 @@ %{_includedir}/X11/Xtrans/Xtranstli.c %{_includedir}/X11/Xtrans/Xtransutil.c %{_includedir}/X11/Xtrans/transport.c -%dir %{_libdir}/pkgconfig %{_libdir}/pkgconfig/xtrans.pc -%dir %{_datadir}/aclocal %{_datadir}/aclocal/xtrans.m4 %changelog -* Fri Feb 10 2006 Jesse Keating - 1.0.0-3.2 +* Fri Feb 10 2006 Jesse Keating 1.0.0-3.2 - bump again for double-long bug on ppc(64) -* Tue Feb 07 2006 Jesse Keating - 1.0.0-3.1 +* Tue Feb 07 2006 Jesse Keating 1.0.0-3.1 - rebuilt for new gcc4.1 snapshot and glibc changes * Mon Jan 23 2006 Mike A. Harris 1.0.0-3 From fedora-cvs-commits at redhat.com Wed Mar 1 09:47:55 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 1 Mar 2006 04:47:55 -0500 Subject: rpms/glibc/devel .cvsignore, 1.139, 1.140 glibc-fedora.patch, 1.137, 1.138 glibc.spec, 1.224, 1.225 sources, 1.161, 1.162 Message-ID: <200603010947.k219ltZ2012546@cvs.devel.redhat.com> Author: jakub Update of /cvs/dist/rpms/glibc/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv12500/devel Modified Files: .cvsignore glibc-fedora.patch glibc.spec sources Log Message: auto-import glibc-2.3.90-39 on branch devel from glibc-2.3.90-39.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/glibc/devel/.cvsignore,v retrieving revision 1.139 retrieving revision 1.140 diff -u -r1.139 -r1.140 --- .cvsignore 17 Feb 2006 16:35:19 -0000 1.139 +++ .cvsignore 1 Mar 2006 09:47:51 -0000 1.140 @@ -1,2 +1,2 @@ -glibc-20060217T1609.tar.bz2 -glibc-fedora-20060217T1609.tar.bz2 +glibc-20060301T0647.tar.bz2 +glibc-fedora-20060301T0647.tar.bz2 glibc-fedora.patch: ChangeLog | 68 ++++ ChangeLog.11 | 21 + ChangeLog.12 | 12 ChangeLog.15 | 45 ++ csu/elf-init.c | 17 + debug/tst-chk1.c | 7 elf/ldconfig.c | 38 +- elf/tst-stackguard1.c | 8 iconv/iconvconfig.c | 55 +-- include/bits/stdlib-ldbl.h | 1 include/bits/wchar-ldbl.h | 1 include/features.h | 8 intl/locale.alias | 2 libio/bits/stdio2.h | 19 - libio/stdio.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/no_NO | 69 ++++ localedata/locales/zh_TW | 6 malloc/mcheck.c | 30 + malloc/mtrace.c | 20 + nptl/ChangeLog | 27 + nptl/Makefile | 8 nptl/sysdeps/unix/sysv/linux/kernel-features.h | 6 nptl/sysdeps/unix/sysv/linux/sparc/lowlevellock.h | 58 +++ nptl/tst-stackguard1.c | 8 nscd/connections.c | 15 nscd/nscd.c | 4 nscd/nscd.conf | 4 nscd/nscd.init | 19 - posix/Makefile | 19 - posix/getconf.speclist.h | 15 sysdeps/generic/dl-cache.h | 8 sysdeps/ia64/Makefile | 4 sysdeps/ia64/ia64libgcc.S | 350 ---------------------- sysdeps/ia64/libgcc-compat.c | 84 +++++ sysdeps/unix/nice.c | 7 sysdeps/unix/sysv/linux/dl-osinfo.h | 29 + sysdeps/unix/sysv/linux/futimesat.c | 23 - 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/tcsetattr.c | 32 +- 50 files changed, 848 insertions(+), 468 deletions(-) Index: glibc-fedora.patch =================================================================== RCS file: /cvs/dist/rpms/glibc/devel/glibc-fedora.patch,v retrieving revision 1.137 retrieving revision 1.138 diff -u -r1.137 -r1.138 --- glibc-fedora.patch 17 Feb 2006 17:21:19 -0000 1.137 +++ glibc-fedora.patch 1 Mar 2006 09:47:51 -0000 1.138 @@ -1,14 +1,6 @@ ---- glibc-20060217T1609/ChangeLog 15 Feb 2006 18:14:59 -0000 1.9991 -+++ glibc-20060217T1609-fedora/ChangeLog 17 Feb 2006 16:18:18 -0000 1.8782.2.164 -@@ -1,3 +1,7 @@ -+2006-02-17 Jakub Jelinek -+ -+ * include/atomic.h (atomic_and, atomic_or): Define. -+ - 2006-02-15 Ulrich Drepper - - * sysdeps/unix/sysv/linux/sparc/bits/mman.h: Define MADV_DONTFORK -@@ -94,6 +98,11 @@ +--- glibc-20060301T0647/ChangeLog 1 Mar 2006 06:38:57 -0000 1.10036 ++++ glibc-20060301T0647-fedora/ChangeLog 1 Mar 2006 06:55:37 -0000 1.8782.2.165 +@@ -804,6 +804,11 @@ (__MATHDECL_2): Use __REDIRECT_NTH instead of __REDIRECT followed by __THROW. @@ -20,7 +12,7 @@ 2006-02-02 Ulrich Drepper * sysdeps/unix/sysv/linux/futimesat.c [__NR_futimesat] -@@ -153,6 +162,11 @@ +@@ -863,6 +868,11 @@ * sysdeps/ieee754/ldbl-128/s_llrintl.c (__llrintl): Fix a typo. * sysdeps/s390/fpu/libm-test-ulps: Remove llrint ulps. @@ -32,7 +24,7 @@ 2006-01-19 Thomas Schwinge * libio/genops.c: Include . -@@ -2579,6 +2593,10 @@ +@@ -3289,6 +3299,10 @@ * elf/order2mod2.c (init): Cast ignored value to void. @@ -43,7 +35,7 @@ 2005-12-27 Ulrich Drepper * elf/tst-tls13.c (do_test): Avoid using the library path when -@@ -2862,6 +2880,26 @@ +@@ -3572,6 +3586,26 @@ * sysdeps/unix/sysv/linux/time.c: If __NR_time is not defined, use sysdeps/unix/time.c implementation. @@ -70,7 +62,7 @@ 2005-12-19 Ulrich Drepper [BZ #1955] -@@ -5980,6 +6018,11 @@ +@@ -6690,6 +6724,11 @@ R_ARM_TLS_TPOFF32, R_ARM_TLS_GD32, R_ARM_TLS_LDM32, R_ARM_TLS_LDO32, R_ARM_TLS_IE32, R_ARM_TLS_LE32): New macros. @@ -82,7 +74,7 @@ 2005-10-03 Roland McGrath * sysdeps/powerpc/nofpu: Directory removed, saved in ports repository. -@@ -6974,6 +7017,12 @@ +@@ -7684,6 +7723,12 @@ * argp/argp-help.c (__argp_error): __asprintf -> vasprintf. (__argp_failure): Likewise. @@ -95,7 +87,7 @@ 2005-08-08 Ulrich Drepper * nscd/cache.c (cache_add): Commit hash table and header to disk. -@@ -7098,6 +7147,17 @@ +@@ -7808,6 +7853,17 @@ __syslog_chk. * misc/Versions: Export __syslog_chk and __vsyslog_chk. @@ -113,7 +105,7 @@ 2005-07-28 Thomas Schwinge [BZ #1137] -@@ -10158,6 +10218,18 @@ +@@ -10868,6 +10924,18 @@ * scripts/soversions.awk: Fix default version set handling. @@ -132,8 +124,8 @@ 2005-02-10 Roland McGrath [BZ #157] ---- glibc-20060217T1609/ChangeLog.11 10 Nov 2000 03:31:36 -0000 1.1 -+++ glibc-20060217T1609-fedora/ChangeLog.11 22 Sep 2004 21:20:47 -0000 1.1.4.1 +--- glibc-20060301T0647/ChangeLog.11 10 Nov 2000 03:31:36 -0000 1.1 ++++ glibc-20060301T0647-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. @@ -183,8 +175,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-20060217T1609/ChangeLog.12 16 Aug 2001 05:24:54 -0000 1.1 -+++ glibc-20060217T1609-fedora/ChangeLog.12 22 Sep 2004 21:20:47 -0000 1.1.4.1 +--- glibc-20060301T0647/ChangeLog.12 16 Aug 2001 05:24:54 -0000 1.1 ++++ glibc-20060301T0647-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. @@ -211,8 +203,8 @@ 2001-01-02 Franz Sirl * sysdeps/powerpc/dl-machine.c (__process_machine_rela): Fix typo. ---- glibc-20060217T1609/ChangeLog.15 16 Feb 2005 07:34:17 -0000 1.1 -+++ glibc-20060217T1609-fedora/ChangeLog.15 3 Mar 2005 17:29:57 -0000 1.1.6.2 +--- glibc-20060301T0647/ChangeLog.15 16 Feb 2005 07:34:17 -0000 1.1 ++++ glibc-20060301T0647-fedora/ChangeLog.15 3 Mar 2005 17:29:57 -0000 1.1.6.2 @@ -477,6 +477,14 @@ 2004-11-26 Jakub Jelinek @@ -293,8 +285,8 @@ 2004-08-30 Roland McGrath * scripts/extract-abilist.awk: If `lastversion' variable defined, omit ---- glibc-20060217T1609/csu/elf-init.c 5 Nov 2005 17:41:38 -0000 1.8 -+++ glibc-20060217T1609-fedora/csu/elf-init.c 15 Nov 2005 09:54:10 -0000 1.3.2.6 +--- glibc-20060301T0647/csu/elf-init.c 5 Nov 2005 17:41:38 -0000 1.8 ++++ glibc-20060301T0647-fedora/csu/elf-init.c 15 Nov 2005 09:54:10 -0000 1.3.2.6 @@ -49,6 +49,23 @@ extern void (*__init_array_end []) (int, extern void (*__fini_array_start []) (void) attribute_hidden; extern void (*__fini_array_end []) (void) attribute_hidden; @@ -319,8 +311,8 @@ /* These function symbols are provided for the .init/.fini section entry points automagically by the linker. */ ---- glibc-20060217T1609/debug/tst-chk1.c 22 Aug 2005 15:12:34 -0000 1.14 -+++ glibc-20060217T1609-fedora/debug/tst-chk1.c 24 Aug 2005 07:23:26 -0000 1.1.2.15 +--- glibc-20060301T0647/debug/tst-chk1.c 22 Aug 2005 15:12:34 -0000 1.14 ++++ glibc-20060301T0647-fedora/debug/tst-chk1.c 24 Aug 2005 07:23:26 -0000 1.1.2.15 @@ -17,6 +17,9 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ @@ -349,8 +341,8 @@ # define O 0 #else # define O 1 ---- glibc-20060217T1609/elf/ldconfig.c 1 Jan 2006 19:15:56 -0000 1.52 -+++ glibc-20060217T1609-fedora/elf/ldconfig.c 2 Jan 2006 10:52:50 -0000 1.47.2.7 +--- glibc-20060301T0647/elf/ldconfig.c 1 Jan 2006 19:15:56 -0000 1.52 ++++ glibc-20060301T0647-fedora/elf/ldconfig.c 2 Jan 2006 10:52:50 -0000 1.47.2.7 @@ -693,7 +693,18 @@ search_dir (const struct dir_entry *entr #endif !is_hwcap_platform (direntry->d_name))) @@ -452,8 +444,8 @@ } search_dirs (); ---- glibc-20060217T1609/elf/tst-stackguard1.c 26 Jun 2005 18:08:36 -0000 1.1 -+++ glibc-20060217T1609-fedora/elf/tst-stackguard1.c 8 Aug 2005 21:24:27 -0000 1.1.2.3 +--- glibc-20060301T0647/elf/tst-stackguard1.c 26 Jun 2005 18:08:36 -0000 1.1 ++++ glibc-20060301T0647-fedora/elf/tst-stackguard1.c 8 Aug 2005 21:24:27 -0000 1.1.2.3 @@ -160,17 +160,21 @@ do_test (void) the 16 runs, something is very wrong. */ int ndifferences = 0; @@ -478,8 +470,8 @@ { puts ("stack guard canaries are not randomized enough"); puts ("nor equal to the default canary value"); ---- glibc-20060217T1609/iconv/iconvconfig.c 1 Jan 2006 19:15:56 -0000 1.25 -+++ glibc-20060217T1609-fedora/iconv/iconvconfig.c 2 Jan 2006 10:52:50 -0000 1.19.2.6 +--- glibc-20060301T0647/iconv/iconvconfig.c 1 Jan 2006 19:15:56 -0000 1.25 ++++ glibc-20060301T0647-fedora/iconv/iconvconfig.c 2 Jan 2006 10:52:50 -0000 1.19.2.6 @@ -1011,6 +1011,34 @@ next_prime (uint32_t seed) module name offset (following last entry with step count 0) @@ -556,59 +548,8 @@ /* Open the output file. */ if (output_file == NULL) { ---- glibc-20060217T1609/include/atomic.h 20 Aug 2005 01:14:07 -0000 1.16 -+++ glibc-20060217T1609-fedora/include/atomic.h 17 Feb 2006 16:18:19 -0000 1.15.2.2 -@@ -1,5 +1,5 @@ - /* Internal macros for atomic operations for GNU C Library. -- Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. -+ Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Ulrich Drepper , 2002. - -@@ -273,6 +273,41 @@ - __oldval & __mask; }) - #endif - -+/* Atomically *mem &= mask and return the old value of *mem. */ -+#ifndef atomic_and -+# define atomic_and(mem, mask) \ -+ ({ __typeof (*(mem)) __oldval; \ -+ __typeof (mem) __memp = (mem); \ -+ __typeof (*(mem)) __mask = (mask); \ -+ \ -+ do \ -+ __oldval = (*__memp); \ -+ while (__builtin_expect (atomic_compare_and_exchange_bool_acq (__memp, \ -+ __oldval \ -+ & __mask, \ -+ __oldval),\ -+ 0)); \ -+ \ -+ __oldval; }) -+#endif -+ -+/* Atomically *mem |= mask and return the old value of *mem. */ -+#ifndef atomic_or -+# define atomic_or(mem, mask) \ -+ ({ __typeof (*(mem)) __oldval; \ -+ __typeof (mem) __memp = (mem); \ -+ __typeof (*(mem)) __mask = (mask); \ -+ \ -+ do \ -+ __oldval = (*__memp); \ -+ while (__builtin_expect (atomic_compare_and_exchange_bool_acq (__memp, \ -+ __oldval \ -+ | __mask, \ -+ __oldval),\ -+ 0)); \ -+ \ -+ __oldval; }) -+#endif - - #ifndef atomic_full_barrier - # define atomic_full_barrier() __asm ("" ::: "memory") ---- glibc-20060217T1609/include/features.h 5 Jan 2006 12:25:35 -0000 1.42 -+++ glibc-20060217T1609-fedora/include/features.h 6 Jan 2006 09:23:23 -0000 1.35.2.11 +--- glibc-20060301T0647/include/features.h 5 Jan 2006 12:25:35 -0000 1.42 ++++ glibc-20060301T0647-fedora/include/features.h 6 Jan 2006 09:23:23 -0000 1.35.2.11 @@ -275,7 +275,13 @@ #endif @@ -624,16 +565,16 @@ # if _FORTIFY_SOURCE > 1 # define __USE_FORTIFY_LEVEL 2 # else ---- glibc-20060217T1609/include/bits/stdlib-ldbl.h 1 Jan 1970 00:00:00 -0000 -+++ glibc-20060217T1609-fedora/include/bits/stdlib-ldbl.h 1 Feb 2006 09:30:43 -0000 1.1.2.1 +--- glibc-20060301T0647/include/bits/stdlib-ldbl.h 1 Jan 1970 00:00:00 -0000 ++++ glibc-20060301T0647-fedora/include/bits/stdlib-ldbl.h 1 Feb 2006 09:30:43 -0000 1.1.2.1 @@ -0,0 +1 @@ +#include ---- glibc-20060217T1609/include/bits/wchar-ldbl.h 1 Jan 1970 00:00:00 -0000 -+++ glibc-20060217T1609-fedora/include/bits/wchar-ldbl.h 1 Feb 2006 09:30:43 -0000 1.1.2.1 +--- glibc-20060301T0647/include/bits/wchar-ldbl.h 1 Jan 1970 00:00:00 -0000 ++++ glibc-20060301T0647-fedora/include/bits/wchar-ldbl.h 1 Feb 2006 09:30:43 -0000 1.1.2.1 @@ -0,0 +1 @@ +#include ---- glibc-20060217T1609/intl/locale.alias 4 Dec 2003 07:57:47 -0000 1.23 -+++ glibc-20060217T1609-fedora/intl/locale.alias 22 Sep 2004 21:20:53 -0000 1.23.2.1 +--- glibc-20060301T0647/intl/locale.alias 4 Dec 2003 07:57:47 -0000 1.23 ++++ glibc-20060301T0647-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 @@ -643,8 +584,8 @@ norwegian nb_NO.ISO-8859-1 nynorsk nn_NO.ISO-8859-1 polish pl_PL.ISO-8859-2 ---- glibc-20060217T1609/libio/stdio.h 16 Jan 2006 20:12:21 -0000 1.86 -+++ glibc-20060217T1609-fedora/libio/stdio.h 30 Jan 2006 09:29:46 -0000 1.78.2.8 +--- glibc-20060301T0647/libio/stdio.h 16 Jan 2006 20:12:21 -0000 1.86 ++++ glibc-20060301T0647-fedora/libio/stdio.h 30 Jan 2006 09:29:46 -0000 1.78.2.8 @@ -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. */ @@ -658,8 +599,8 @@ __BEGIN_NAMESPACE_STD /* Remove file FILENAME. */ ---- glibc-20060217T1609/libio/bits/stdio2.h 19 Mar 2005 00:14:58 -0000 1.4 -+++ glibc-20060217T1609-fedora/libio/bits/stdio2.h 27 Jun 2005 13:04:16 -0000 1.1.2.6 +--- glibc-20060301T0647/libio/bits/stdio2.h 19 Mar 2005 00:14:58 -0000 1.4 ++++ glibc-20060301T0647-fedora/libio/bits/stdio2.h 27 Jun 2005 13:04:16 -0000 1.1.2.6 @@ -61,14 +61,25 @@ extern int __vfprintf_chk (FILE *__restr extern int __vprintf_chk (int __flag, __const char *__restrict __format, _G_va_list __ap); @@ -690,8 +631,8 @@ #endif ---- glibc-20060217T1609/locale/iso-4217.def 23 Sep 2005 19:07:54 -0000 1.18 -+++ glibc-20060217T1609-fedora/locale/iso-4217.def 3 Oct 2005 20:44:15 -0000 1.15.2.3 +--- glibc-20060301T0647/locale/iso-4217.def 23 Sep 2005 19:07:54 -0000 1.18 ++++ glibc-20060301T0647-fedora/locale/iso-4217.def 3 Oct 2005 20:44:15 -0000 1.15.2.3 @@ -8,6 +8,7 @@ * * !!! The list has to be sorted !!! @@ -783,8 +724,8 @@ DEFINE_INT_CURR("PYG") /* Paraguay Guarani */ DEFINE_INT_CURR("QAR") /* Qatar Rial */ DEFINE_INT_CURR("ROL") /* Romanian Leu */ ---- glibc-20060217T1609/locale/programs/3level.h 7 Dec 2005 05:47:27 -0000 1.6 -+++ glibc-20060217T1609-fedora/locale/programs/3level.h 19 Dec 2005 12:11:15 -0000 1.5.2.2 +--- glibc-20060301T0647/locale/programs/3level.h 7 Dec 2005 05:47:27 -0000 1.6 ++++ glibc-20060301T0647-fedora/locale/programs/3level.h 19 Dec 2005 12:11:15 -0000 1.5.2.2 @@ -202,6 +202,42 @@ CONCAT(TABLE,_iterate) (struct TABLE *t, } } @@ -828,8 +769,8 @@ #endif #ifndef NO_FINALIZE ---- glibc-20060217T1609/localedata/Makefile 25 Sep 2005 17:01:12 -0000 1.102 -+++ glibc-20060217T1609-fedora/localedata/Makefile 3 Oct 2005 20:44:15 -0000 1.101.2.2 +--- glibc-20060301T0647/localedata/Makefile 25 Sep 2005 17:01:12 -0000 1.102 ++++ glibc-20060301T0647-fedora/localedata/Makefile 3 Oct 2005 20:44:15 -0000 1.101.2.2 @@ -222,6 +222,7 @@ $(INSTALL-SUPPORTED-LOCALES): install-lo echo -n '...'; \ input=`echo $$locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; \ @@ -838,8 +779,8 @@ -i locales/$$input -c -f charmaps/$$charset \ $(addprefix --prefix=,$(install_root)) $$locale; \ echo ' done'; \ ---- glibc-20060217T1609/localedata/SUPPORTED 5 Nov 2005 16:25:49 -0000 1.87 -+++ glibc-20060217T1609-fedora/localedata/SUPPORTED 15 Nov 2005 08:21:56 -0000 1.71.2.8 +--- glibc-20060301T0647/localedata/SUPPORTED 5 Nov 2005 16:25:49 -0000 1.87 ++++ glibc-20060301T0647-fedora/localedata/SUPPORTED 15 Nov 2005 08:21:56 -0000 1.71.2.8 @@ -69,6 +69,7 @@ cy_GB.UTF-8/UTF-8 \ cy_GB/ISO-8859-14 \ da_DK.UTF-8/UTF-8 \ @@ -881,8 +822,8 @@ ta_IN/UTF-8 \ te_IN/UTF-8 \ tg_TJ.UTF-8/UTF-8 \ ---- glibc-20060217T1609/localedata/locales/cy_GB 28 Sep 2004 04:37:33 -0000 1.4 -+++ glibc-20060217T1609-fedora/localedata/locales/cy_GB 29 Sep 2004 08:48:23 -0000 1.3.2.2 +--- glibc-20060301T0647/localedata/locales/cy_GB 28 Sep 2004 04:37:33 -0000 1.4 ++++ glibc-20060301T0647-fedora/localedata/locales/cy_GB 29 Sep 2004 08:48:23 -0000 1.3.2.2 @@ -248,8 +248,11 @@ mon "" d_fmt "" @@ -897,8 +838,8 @@ END LC_TIME LC_MESSAGES ---- glibc-20060217T1609/localedata/locales/en_GB 31 Oct 2004 23:42:26 -0000 1.12 -+++ glibc-20060217T1609-fedora/localedata/locales/en_GB 2 Nov 2004 12:25:47 -0000 1.10.2.2 +--- glibc-20060301T0647/localedata/locales/en_GB 31 Oct 2004 23:42:26 -0000 1.12 ++++ glibc-20060301T0647-fedora/localedata/locales/en_GB 2 Nov 2004 12:25:47 -0000 1.10.2.2 @@ -112,8 +112,8 @@ mon "" d_fmt "" @@ -910,8 +851,8 @@ date_fmt "/ / " ---- glibc-20060217T1609/localedata/locales/no_NO 1 Jan 1970 00:00:00 -0000 -+++ glibc-20060217T1609-fedora/localedata/locales/no_NO 22 Sep 2004 21:21:01 -0000 1.11.2.1 +--- glibc-20060301T0647/localedata/locales/no_NO 1 Jan 1970 00:00:00 -0000 ++++ glibc-20060301T0647-fedora/localedata/locales/no_NO 22 Sep 2004 21:21:01 -0000 1.11.2.1 @@ -0,0 +1,69 @@ +escape_char / +comment_char % @@ -982,8 +923,8 @@ +LC_ADDRESS +copy "nb_NO" +END LC_ADDRESS ---- glibc-20060217T1609/localedata/locales/zh_TW 31 Oct 2004 23:42:28 -0000 1.7 -+++ glibc-20060217T1609-fedora/localedata/locales/zh_TW 2 Nov 2004 12:25:57 -0000 1.5.2.2 +--- glibc-20060301T0647/localedata/locales/zh_TW 31 Oct 2004 23:42:28 -0000 1.7 ++++ glibc-20060301T0647-fedora/localedata/locales/zh_TW 2 Nov 2004 12:25:57 -0000 1.5.2.2 @@ -1,7 +1,7 @@ comment_char % escape_char / @@ -1011,8 +952,8 @@ revision "0.2" date "2000-08-02" % ---- glibc-20060217T1609/malloc/mcheck.c 8 Sep 2004 20:36:02 -0000 1.18 -+++ glibc-20060217T1609-fedora/malloc/mcheck.c 20 Dec 2005 10:59:21 -0000 1.18.2.1 +--- glibc-20060301T0647/malloc/mcheck.c 8 Sep 2004 20:36:02 -0000 1.18 ++++ glibc-20060301T0647-fedora/malloc/mcheck.c 20 Dec 2005 10:59:21 -0000 1.18.2.1 @@ -24,9 +24,25 @@ # include # include @@ -1088,8 +1029,8 @@ old_free_hook = __free_hook; __free_hook = freehook; ---- glibc-20060217T1609/malloc/mtrace.c 14 Sep 2004 04:24:46 -0000 1.41 -+++ glibc-20060217T1609-fedora/malloc/mtrace.c 20 Dec 2005 10:59:21 -0000 1.41.2.1 +--- glibc-20060301T0647/malloc/mtrace.c 14 Sep 2004 04:24:46 -0000 1.41 ++++ glibc-20060301T0647-fedora/malloc/mtrace.c 20 Dec 2005 10:59:21 -0000 1.41.2.1 @@ -40,6 +40,18 @@ # include # define setvbuf(s, b, f, l) INTUSE(_IO_setvbuf) (s, b, f, l) @@ -1145,36 +1086,21 @@ __memalign_hook = tr_memalignhook; __malloc_hook = tr_mallochook; ---- glibc-20060217T1609/manual/filesys.texi 31 Dec 2005 13:11:27 -0000 1.99 -+++ glibc-20060217T1609-fedora/manual/filesys.texi 3 Feb 2006 09:43:54 -0000 1.96.2.4 -@@ -2806,7 +2806,7 @@ function. - - @comment sys/time.h - @comment BSD -- at deftypefun int futimes (int *@var{fd}, struct timeval @var{tvp}@t{[2]}) -+ at deftypefun int futimes (int @var{fd}, struct timeval @var{tvp}@t{[2]}) - This function is like @code{utimes}, except that it takes an open file - descriptor as an argument instead of a file name. @xref{Low-Level - I/O}. This function comes from FreeBSD, and is not available on all ---- glibc-20060217T1609/nptl/ChangeLog 17 Feb 2006 15:37:51 -0000 1.864 -+++ glibc-20060217T1609-fedora/nptl/ChangeLog 17 Feb 2006 16:18:19 -0000 1.706.2.79 -@@ -1,3 +1,15 @@ -+2006-02-17 Jakub Jelinek +--- glibc-20060301T0647/nptl/ChangeLog 1 Mar 2006 03:37:59 -0000 1.874 ++++ glibc-20060301T0647-fedora/nptl/ChangeLog 1 Mar 2006 07:44:56 -0000 1.706.2.81 +@@ -1,3 +1,11 @@ ++2006-03-01 Jakub Jelinek + -+ * sysdeps/unix/sysv/linux/alpha/lowlevellock.h (lll_robust_mutex_dead, ++ * sysdeps/unix/sysv/linux/sparc/lowlevellock.h (lll_robust_mutex_dead, + lll_robust_mutex_trylock, lll_robust_mutex_lock, + lll_robust_mutex_cond_lock, lll_robust_mutex_timedlock, -+ lll_robust_mutex_unlock): New macros. ++ lll_robust_mutex_unlock): Define. + (__lll_robust_lock_wait, __lll_robust_timedlock_wait): New prototypes. -+ * sysdeps/unix/sysv/linux/s390/lowlevellock.h: Likewise. -+ * sysdeps/unix/sysv/linux/powerpc/lowlevellock.h: Likewise. -+ * sysdeps/unix/sysv/linux/ia64/lowlevellock.h: Likewise. -+ * sysdeps/unix/sysv/linux/lowlevelrobustlock.c: New file. + - 2006-02-17 Kaz Kojima + 2006-02-28 H.J. Lu - * sysdeps/unix/sysv/linux/sh/lowlevellock.h: Add lll_robust_mutex_* -@@ -582,6 +594,15 @@ + * sysdeps/unix/sysv/linux/ia64/clone2.S: Include +@@ -690,6 +698,15 @@ Use __sigfillset. Document that sigfillset does the right thing wrt to SIGSETXID. @@ -1190,7 +1116,7 @@ 2005-07-11 Jakub Jelinek [BZ #1102] -@@ -1318,6 +1339,11 @@ +@@ -1426,6 +1443,11 @@ Move definition inside libpthread, libc, librt check. Provide definition for rtld. @@ -1202,7 +1128,7 @@ 2004-09-02 Ulrich Drepper * sysdeps/alpha/jmpbuf-unwind.h: Define __libc_unwind_longjmp. -@@ -3392,6 +3418,11 @@ +@@ -3500,6 +3522,11 @@ * Makefile [$(build-shared) = yes] (tests): Depend on $(test-modules). @@ -1214,9 +1140,9 @@ 2003-07-25 Jakub Jelinek * tst-cancel17.c (do_test): Check if aio_cancel failed. ---- glibc-20060217T1609/nptl/Makefile 15 Feb 2006 16:52:28 -0000 1.177 -+++ glibc-20060217T1609-fedora/nptl/Makefile 17 Feb 2006 16:15:52 -0000 1.157.2.18 -@@ -514,15 +514,19 @@ $(addprefix $(objpfx), \ +--- glibc-20060301T0647/nptl/Makefile 28 Feb 2006 09:36:05 -0000 1.179 ++++ glibc-20060301T0647-fedora/nptl/Makefile 1 Mar 2006 06:55:40 -0000 1.157.2.19 +@@ -519,15 +519,19 @@ $(addprefix $(objpfx), \ $(tests) $(xtests) $(test-srcs))): $(objpfx)libpthread.so \ $(objpfx)libpthread_nonshared.a $(objpfx)tst-unload: $(common-objpfx)dlfcn/libdl.so @@ -1238,8 +1164,8 @@ else $(addprefix $(objpfx),$(tests) $(test-srcs)): $(objpfx)libpthread.a endif ---- glibc-20060217T1609/nptl/tst-stackguard1.c 26 Jun 2005 17:44:14 -0000 1.1 -+++ glibc-20060217T1609-fedora/nptl/tst-stackguard1.c 8 Aug 2005 21:24:28 -0000 1.1.2.3 +--- glibc-20060301T0647/nptl/tst-stackguard1.c 26 Jun 2005 17:44:14 -0000 1.1 ++++ glibc-20060301T0647-fedora/nptl/tst-stackguard1.c 8 Aug 2005 21:24:28 -0000 1.1.2.3 @@ -190,17 +190,21 @@ do_test (void) the 16 runs, something is very wrong. */ int ndifferences = 0; @@ -1264,8 +1190,8 @@ { puts ("stack guard canaries are not randomized enough"); puts ("nor equal to the default canary value"); ---- glibc-20060217T1609/nptl/sysdeps/unix/sysv/linux/kernel-features.h 1 Jan 1970 00:00:00 -0000 -+++ glibc-20060217T1609-fedora/nptl/sysdeps/unix/sysv/linux/kernel-features.h 22 Sep 2004 21:21:02 -0000 1.1.2.1 +--- glibc-20060301T0647/nptl/sysdeps/unix/sysv/linux/kernel-features.h 1 Jan 1970 00:00:00 -0000 ++++ glibc-20060301T0647-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 + @@ -1273,114 +1199,10 @@ +#ifndef __ASSUME_CLONE_THREAD_FLAGS +# define __ASSUME_CLONE_THREAD_FLAGS 1 +#endif ---- glibc-20060217T1609/nptl/sysdeps/unix/sysv/linux/lowlevelrobustlock.c 1 Jan 1970 00:00:00 -0000 -+++ glibc-20060217T1609-fedora/nptl/sysdeps/unix/sysv/linux/lowlevelrobustlock.c 17 Feb 2006 16:18:19 -0000 1.1.2.1 -@@ -0,0 +1,95 @@ -+/* Copyright (C) 2006 Free Software Foundation, Inc. -+ This file is part of the GNU C Library. -+ Contributed by Jakub Jelinek , 2006. -+ -+ The GNU C Library is free software; you can redistribute it and/or -+ modify it under the terms of the GNU Lesser General Public -+ License as published by the Free Software Foundation; either -+ version 2.1 of the License, or (at your option) any later version. -+ -+ The GNU C Library is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ Lesser General Public License for more details. -+ -+ You should have received a copy of the GNU Lesser General Public -+ License along with the GNU C Library; if not, write to the Free -+ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -+ 02111-1307 USA. */ -+ -+#include -+#include -+#include -+#include -+#include -+ -+ -+int -+__lll_robust_lock_wait (int *futex) -+{ -+ int oldval = *futex; -+ int tid = THREAD_GETMEM (THREAD_SELF, tid); -+ -+ do -+ { -+ if (__builtin_expect (oldval & FUTEX_OWNER_DIED, 0)) -+ return oldval; -+ -+ int newval = oldval | FUTEX_WAITERS; -+ if (oldval != newval -+ && atomic_compare_and_exchange_bool_acq (futex, newval, oldval)) -+ continue; -+ -+ lll_futex_wait (futex, newval); -+ } -+ while ((oldval = atomic_compare_and_exchange_val_acq (futex, tid, 0)) != 0); -+ return 0; -+} -+ -+ -+int -+__lll_robust_timedlock_wait (int *futex, const struct timespec *abstime) -+{ -+ /* Reject invalid timeouts. */ -+ if (abstime->tv_nsec < 0 || abstime->tv_nsec >= 1000000000) -+ return EINVAL; -+ -+ int tid = THREAD_GETMEM (THREAD_SELF, tid); -+ -+ do -+ { -+ struct timeval tv; -+ struct timespec rt; -+ -+ /* Get the current time. */ -+ (void) __gettimeofday (&tv, NULL); -+ -+ /* Compute relative timeout. */ -+ rt.tv_sec = abstime->tv_sec - tv.tv_sec; -+ rt.tv_nsec = abstime->tv_nsec - tv.tv_usec * 1000; -+ if (rt.tv_nsec < 0) -+ { -+ rt.tv_nsec += 1000000000; -+ --rt.tv_sec; -+ } -+ -+ /* Already timed out? */ -+ if (rt.tv_sec < 0) -+ return ETIMEDOUT; -+ -+ /* Wait. */ -+ int oldval = *futex; -+ if (__builtin_expect (oldval & FUTEX_OWNER_DIED, 0)) -+ return oldval; -+ -+ int newval = oldval | FUTEX_WAITERS; -+ if (oldval != newval -+ && atomic_compare_and_exchange_bool_acq (futex, newval, oldval)) -+ continue; -+ -+ lll_futex_timed_wait (futex, newval, &rt); -+ } -+ while (atomic_compare_and_exchange_bool_acq (futex, tid, 0)); -+ -+ return 0; -+} ---- glibc-20060217T1609/nptl/sysdeps/unix/sysv/linux/alpha/lowlevellock.h 8 Sep 2005 17:39:04 -0000 1.6 -+++ glibc-20060217T1609-fedora/nptl/sysdeps/unix/sysv/linux/alpha/lowlevellock.h 17 Feb 2006 16:18:19 -0000 1.5.2.2 -@@ -1,4 +1,4 @@ --/* Copyright (C) 2003, 2004 Free Software Foundation, Inc. -+/* Copyright (C) 2003, 2004, 2006 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or -@@ -64,6 +64,15 @@ - INTERNAL_SYSCALL_ERROR_P (__ret, __err)? -__ret : __ret; \ +--- glibc-20060301T0647/nptl/sysdeps/unix/sysv/linux/sparc/lowlevellock.h 3 Jan 2006 23:42:57 -0000 1.6 ++++ glibc-20060301T0647-fedora/nptl/sysdeps/unix/sysv/linux/sparc/lowlevellock.h 1 Mar 2006 07:44:57 -0000 1.4.2.3 +@@ -78,6 +78,15 @@ + INTERNAL_SYSCALL_ERROR_P (__ret, __err); \ }) +#define lll_robust_mutex_dead(futexv) \ @@ -1393,30 +1215,34 @@ + while (0) + /* Returns non-zero if error happened, zero if success. */ - #define lll_futex_requeue(futexp, nr_wake, nr_move, mutex, val) \ - ({ \ -@@ -106,7 +115,16 @@ __lll_mutex_cond_trylock(int *futex) - #define lll_mutex_cond_trylock(lock) __lll_mutex_cond_trylock (&(lock)) - + #ifdef __sparc32_atomic_do_lock + /* Avoid FUTEX_WAKE_OP if supporting pre-v9 CPUs. */ +@@ -112,9 +121,18 @@ __lll_mutex_cond_trylock (int *futex) + } + #define lll_mutex_cond_trylock(futex) __lll_mutex_cond_trylock (&(futex)) -+static inline int __attribute__((always_inline)) -+__lll_robust_mutex_trylock(int *futex, int id) ++static inline int ++__attribute__ ((always_inline)) ++__lll_robust_mutex_trylock (int *futex, int id) +{ + return atomic_compare_and_exchange_val_acq (futex, id, 0) != 0; +} -+#define lll_robust_mutex_trylock(lock, id) \ -+ __lll_robust_mutex_trylock (&(lock), id) ++#define lll_robust_mutex_trylock(futex, id) \ ++ __lll_robust_mutex_trylock (&(futex), id) + + extern void __lll_lock_wait (int *futex) attribute_hidden; +- +extern int __lll_robust_lock_wait (int *futex) attribute_hidden; - static inline void __attribute__((always_inline)) - __lll_mutex_lock(int *futex) -@@ -117,6 +135,18 @@ __lll_mutex_lock(int *futex) + static inline void + __attribute__ ((always_inline)) +@@ -127,6 +145,17 @@ __lll_mutex_lock (int *futex) + } #define lll_mutex_lock(futex) __lll_mutex_lock (&(futex)) - -+static inline int __attribute__ ((always_inline)) ++static inline int ++__attribute__ ((always_inline)) +__lll_robust_mutex_lock (int *futex, int id) +{ + int result = 0; @@ -1426,31 +1252,31 @@ +} +#define lll_robust_mutex_lock(futex, id) \ + __lll_robust_mutex_lock (&(futex), id) -+ -+ - static inline void __attribute__ ((always_inline)) - __lll_mutex_cond_lock (int *futex) - { -@@ -126,8 +156,14 @@ __lll_mutex_cond_lock (int *futex) - #define lll_mutex_cond_lock(futex) __lll_mutex_cond_lock (&(futex)) + static inline void + __attribute__ ((always_inline)) +@@ -139,10 +168,14 @@ __lll_mutex_cond_lock (int *futex) + } + #define lll_mutex_cond_lock(futex) __lll_mutex_cond_lock (&(futex)) +#define lll_robust_mutex_cond_lock(futex, id) \ + __lll_robust_mutex_lock (&(futex), (id) | FUTEX_WAITERS) + -+ + extern int __lll_timedlock_wait (int *futex, const struct timespec *) - attribute_hidden; + attribute_hidden; +- +extern int __lll_robust_timedlock_wait (int *futex, const struct timespec *) -+ attribute_hidden; ++ attribute_hidden; - static inline int __attribute__ ((always_inline)) - __lll_mutex_timedlock (int *futex, const struct timespec *abstime) -@@ -141,6 +177,19 @@ __lll_mutex_timedlock (int *futex, const + static inline int + __attribute__ ((always_inline)) +@@ -158,6 +191,19 @@ __lll_mutex_timedlock (int *futex, const + #define lll_mutex_timedlock(futex, abstime) \ __lll_mutex_timedlock (&(futex), abstime) - -+static inline int __attribute__ ((always_inline)) ++static inline int ++__attribute__ ((always_inline)) +__lll_robust_mutex_timedlock (int *futex, const struct timespec *abstime, + int id) +{ @@ -1462,291 +1288,10 @@ +#define lll_robust_mutex_timedlock(futex, abstime, id) \ + __lll_robust_mutex_timedlock (&(futex), abstime, id) + -+ - static inline void __attribute__ ((always_inline)) - __lll_mutex_unlock (int *futex) - { -@@ -152,6 +201,17 @@ __lll_mutex_unlock (int *futex) - - - static inline void __attribute__ ((always_inline)) -+__lll_robust_mutex_unlock (int *futex, int mask) -+{ -+ int val = atomic_exchange_rel (futex, 0); -+ if (__builtin_expect (val & mask, 0)) -+ lll_futex_wake (futex, 1); -+} -+#define lll_robust_mutex_unlock(futex) \ -+ __lll_robust_mutex_unlock(&(futex), FUTEX_WAITERS) -+ -+ -+static inline void __attribute__ ((always_inline)) - __lll_mutex_unlock_force (int *futex) - { - (void) atomic_exchange_rel (futex, 0); ---- glibc-20060217T1609/nptl/sysdeps/unix/sysv/linux/ia64/lowlevellock.h 8 Sep 2005 17:39:05 -0000 1.18 -+++ glibc-20060217T1609-fedora/nptl/sysdeps/unix/sysv/linux/ia64/lowlevellock.h 17 Feb 2006 16:18:19 -0000 1.17.2.2 -@@ -1,4 +1,4 @@ --/* Copyright (C) 2003, 2004 Free Software Foundation, Inc. -+/* Copyright (C) 2003, 2004, 2006 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Jakub Jelinek , 2003. - -@@ -55,6 +55,15 @@ - _r10 == -1 ? -_retval : _retval; \ - }) - -+#define lll_robust_mutex_dead(futexv) \ -+do \ -+ { \ -+ int *__futexp = &(futexv); \ -+ atomic_or (__futexp, FUTEX_OWNER_DIED); \ -+ DO_INLINE_SYSCALL(futex, 3, (long) __futexp, FUTEX_WAKE, 1); \ -+ } \ -+while (0) -+ - /* Returns non-zero if error happened, zero if success. */ - #define lll_futex_requeue(ftx, nr_wake, nr_move, mutex, val) \ - ({ \ -@@ -79,12 +88,19 @@ - #define lll_mutex_trylock(futex) __lll_mutex_trylock (&(futex)) - - -+#define __lll_robust_mutex_trylock(futex, id) \ -+ (atomic_compare_and_exchange_val_acq (futex, id, 0) != 0) -+#define lll_robust_mutex_trylock(futex, id) \ -+ __lll_robust_mutex_trylock (&(futex), id) -+ -+ - #define __lll_mutex_cond_trylock(futex) \ - (atomic_compare_and_exchange_val_acq (futex, 2, 0) != 0) - #define lll_mutex_cond_trylock(futex) __lll_mutex_cond_trylock (&(futex)) - - - extern void __lll_lock_wait (int *futex) attribute_hidden; -+extern int __lll_robust_lock_wait (int *futex) attribute_hidden; - - - #define __lll_mutex_lock(futex) \ -@@ -96,6 +112,18 @@ extern void __lll_lock_wait (int *futex) - #define lll_mutex_lock(futex) __lll_mutex_lock (&(futex)) - - -+#define __lll_robust_mutex_lock(futex, id) \ -+ ({ \ -+ int *__futex = (futex); \ -+ int __val = 0; \ -+ \ -+ if (atomic_compare_and_exchange_bool_acq (__futex, id, 0) != 0) \ -+ __val = __lll_robust_lock_wait (__futex); \ -+ __val; \ -+ }) -+#define lll_robust_mutex_lock(futex, id) __lll_robust_mutex_lock (&(futex), id) -+ -+ - #define __lll_mutex_cond_lock(futex) \ - ((void) ({ \ - int *__futex = (futex); \ -@@ -105,8 +133,24 @@ extern void __lll_lock_wait (int *futex) - #define lll_mutex_cond_lock(futex) __lll_mutex_cond_lock (&(futex)) - - -+#define __lll_robust_mutex_cond_lock(futex, id) \ -+ ({ \ -+ int *__futex = (futex); \ -+ int __val = 0; \ -+ int __id = (id) | FUTEX_WAITERS; \ -+ \ -+ if (atomic_compare_and_exchange_bool_acq (__futex, __id, 0) != 0) \ -+ __val = __lll_robust_lock_wait (__futex); \ -+ __val; \ -+ }) -+#define lll_robust_mutex_cond_lock(futex, id) \ -+ __lll_robust_mutex_cond_lock (&(futex), id) -+ -+ - extern int __lll_timedlock_wait (int *futex, const struct timespec *) - attribute_hidden; -+extern int __lll_robust_timedlock_wait (int *futex, const struct timespec *) -+ attribute_hidden; - - - #define __lll_mutex_timedlock(futex, abstime) \ -@@ -122,6 +166,19 @@ extern int __lll_timedlock_wait (int *fu - __lll_mutex_timedlock (&(futex), abstime) - - -+#define __lll_robust_mutex_timedlock(futex, abstime, id) \ -+ ({ \ -+ int *__futex = (futex); \ -+ int __val = 0; \ -+ \ -+ if (atomic_compare_and_exchange_bool_acq (__futex, id, 0) != 0) \ -+ __val = __lll_robust_timedlock_wait (__futex, abstime); \ -+ __val; \ -+ }) -+#define lll_robust_mutex_timedlock(futex, abstime, id) \ -+ __lll_robust_mutex_timedlock (&(futex), abstime, id) -+ -+ - #define __lll_mutex_unlock(futex) \ - ((void) ({ \ - int *__futex = (futex); \ -@@ -134,6 +191,18 @@ extern int __lll_timedlock_wait (int *fu - __lll_mutex_unlock(&(futex)) - - -+#define __lll_robust_mutex_unlock(futex) \ -+ ((void) ({ \ -+ int *__futex = (futex); \ -+ int __val = atomic_exchange_rel (__futex, 0); \ -+ \ -+ if (__builtin_expect (__val & FUTEX_WAITERS, 0)) \ -+ lll_futex_wake (__futex, 1); \ -+ })) -+#define lll_robust_mutex_unlock(futex) \ -+ __lll_robust_mutex_unlock(&(futex)) -+ -+ - #define __lll_mutex_unlock_force(futex) \ - ((void) ({ \ - int *__futex = (futex); \ ---- glibc-20060217T1609/nptl/sysdeps/unix/sysv/linux/powerpc/lowlevellock.h 8 Sep 2005 17:39:06 -0000 1.20 -+++ glibc-20060217T1609-fedora/nptl/sysdeps/unix/sysv/linux/powerpc/lowlevellock.h 17 Feb 2006 16:18:19 -0000 1.18.2.3 -@@ -1,4 +1,4 @@ --/* Copyright (C) 2003, 2004 Free Software Foundation, Inc. -+/* Copyright (C) 2003, 2004, 2006 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Paul Mackerras , 2003. - -@@ -69,6 +69,17 @@ - INTERNAL_SYSCALL_ERROR_P (__ret, __err) ? -__ret : __ret; \ - }) - -+#define lll_robust_mutex_dead(futexv) \ -+ do \ -+ { \ -+ INTERNAL_SYSCALL_DECL (__err); \ -+ int *__futexp = &(futexv); \ -+ \ -+ atomic_or (__futexp, FUTEX_OWNER_DIED); \ -+ INTERNAL_SYSCALL (futex, __err, 4, __futexp, FUTEX_WAKE, 1, 0); \ -+ } \ -+ while (0) -+ - /* Returns non-zero if error happened, zero if success. */ - #define lll_futex_requeue(futexp, nr_wake, nr_move, mutex, val) \ - ({ \ -@@ -102,8 +113,8 @@ - # define __lll_rel_instr "sync" - #endif - --/* Set *futex to 1 if it is 0, atomically. Returns the old value */ --#define __lll_trylock(futex) \ -+/* Set *futex to ID if it is 0, atomically. Returns the old value */ -+#define __lll_robust_trylock(futex, id) \ - ({ int __val; \ - __asm __volatile ("1: lwarx %0,0,%2\n" \ - " cmpwi 0,%0,0\n" \ -@@ -112,31 +123,26 @@ - " bne- 1b\n" \ - "2: " __lll_acq_instr \ - : "=&r" (__val), "=m" (*futex) \ -- : "r" (futex), "r" (1), "m" (*futex) \ -+ : "r" (futex), "r" (id), "m" (*futex) \ - : "cr0", "memory"); \ - __val; \ - }) - -+#define lll_robust_mutex_trylock(lock, id) __lll_robust_trylock (&(lock), id) -+ -+/* Set *futex to 1 if it is 0, atomically. Returns the old value */ -+#define __lll_trylock(futex) __lll_robust_trylock (futex, 1) -+ - #define lll_mutex_trylock(lock) __lll_trylock (&(lock)) - - /* Set *futex to 2 if it is 0, atomically. Returns the old value */ --#define __lll_cond_trylock(futex) \ -- ({ int __val; \ -- __asm __volatile ("1: lwarx %0,0,%2\n" \ -- " cmpwi 0,%0,0\n" \ -- " bne 2f\n" \ -- " stwcx. %3,0,%2\n" \ -- " bne- 1b\n" \ -- "2: " __lll_acq_instr \ -- : "=&r" (__val), "=m" (*futex) \ -- : "r" (futex), "r" (2), "m" (*futex) \ -- : "cr0", "memory"); \ -- __val; \ -- }) -+#define __lll_cond_trylock(futex) __lll_robust_trylock (futex, 2) -+ - #define lll_mutex_cond_trylock(lock) __lll_cond_trylock (&(lock)) - - - extern void __lll_lock_wait (int *futex) attribute_hidden; -+extern int __lll_robust_lock_wait (int *futex) attribute_hidden; - - #define lll_mutex_lock(lock) \ - (void) ({ \ -@@ -146,6 +152,16 @@ extern void __lll_lock_wait (int *futex) - __lll_lock_wait (__futex); \ - }) - -+#define lll_robust_mutex_lock(lock, id) \ -+ ({ \ -+ int *__futex = &(lock); \ -+ int __val = 0; \ -+ if (__builtin_expect (atomic_compare_and_exchange_bool_acq (__futex, id, \ -+ 0), 0)) \ -+ __val = __lll_robust_lock_wait (__futex); \ -+ __val; \ -+ }) -+ - #define lll_mutex_cond_lock(lock) \ - (void) ({ \ - int *__futex = &(lock); \ -@@ -154,8 +170,22 @@ extern void __lll_lock_wait (int *futex) - __lll_lock_wait (__futex); \ - }) - -+#define lll_robust_mutex_cond_lock(lock, id) \ -+ ({ \ -+ int *__futex = &(lock); \ -+ int __val = 0; \ -+ int __id = id | FUTEX_WAITERS; \ -+ if (__builtin_expect (atomic_compare_and_exchange_bool_acq (__futex, __id,\ -+ 0), 0)) \ -+ __val = __lll_robust_lock_wait (__futex); \ -+ __val; \ -+ }) -+ -+ - extern int __lll_timedlock_wait - (int *futex, const struct timespec *) attribute_hidden; -+extern int __lll_robust_timedlock_wait -+ (int *futex, const struct timespec *) attribute_hidden; - - #define lll_mutex_timedlock(lock, abstime) \ - ({ \ -@@ -167,6 +197,16 @@ extern int __lll_timedlock_wait - __val; \ - }) - -+#define lll_robust_mutex_timedlock(lock, abstime, id) \ -+ ({ \ -+ int *__futex = &(lock); \ -+ int __val = 0; \ -+ if (__builtin_expect (atomic_compare_and_exchange_bool_acq (__futex, id, \ -+ 0), 0)) \ -+ __val = __lll_robust_timedlock_wait (__futex, abstime); \ -+ __val; \ -+ }) -+ #define lll_mutex_unlock(lock) \ ((void) ({ \ int *__futex = &(lock); \ -@@ -175,6 +215,14 @@ extern int __lll_timedlock_wait +@@ -166,6 +212,14 @@ __lll_mutex_timedlock (int *futex, const lll_futex_wake (__futex, 1); \ })) @@ -1761,132 +1306,8 @@ #define lll_mutex_unlock_force(lock) \ ((void) ({ \ int *__futex = &(lock); \ ---- glibc-20060217T1609/nptl/sysdeps/unix/sysv/linux/s390/lowlevellock.h 8 Sep 2005 17:39:06 -0000 1.13 -+++ glibc-20060217T1609-fedora/nptl/sysdeps/unix/sysv/linux/s390/lowlevellock.h 17 Feb 2006 16:18:21 -0000 1.12.2.2 -@@ -1,4 +1,4 @@ --/* Copyright (C) 2003, 2004 Free Software Foundation, Inc. -+/* Copyright (C) 2003, 2004, 2006 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Martin Schwidefsky , 2003. - -@@ -85,6 +85,17 @@ - }) - - -+#define lll_robust_mutex_dead(futexv) \ -+ do \ -+ { \ -+ int *__futexp = &(futexv); \ -+ \ -+ atomic_or (__futexp, FUTEX_OWNER_DIED); \ -+ lll_futex_wake (__futexp, 1); \ -+ } \ -+ while (0) -+ -+ - /* Returns non-zero if error happened, zero if success. */ - #define lll_futex_requeue(futex, nr_wake, nr_move, mutex, val) \ - ({ \ -@@ -167,7 +178,23 @@ __lll_mutex_cond_trylock (int *futex) - #define lll_mutex_cond_trylock(futex) __lll_mutex_cond_trylock (&(futex)) - - -+static inline int -+__attribute__ ((always_inline)) -+__lll_robust_mutex_trylock (int *futex, int id) -+{ -+ unsigned int old; -+ -+ __asm __volatile ("cs %0,%3,%1" -+ : "=d" (old), "=Q" (*futex) -+ : "0" (0), "d" (id), "m" (*futex) : "cc", "memory" ); -+ return old != 0; -+} -+#define lll_robust_mutex_trylock(futex, id) \ -+ __lll_robust_mutex_trylock (&(futex), id) -+ -+ - extern void __lll_lock_wait (int *futex) attribute_hidden; -+extern int __lll_robust_lock_wait (int *futex) attribute_hidden; - - static inline void - __attribute__ ((always_inline)) -@@ -178,6 +205,17 @@ __lll_mutex_lock (int *futex) - } - #define lll_mutex_lock(futex) __lll_mutex_lock (&(futex)) - -+static inline int -+__attribute__ ((always_inline)) -+__lll_robust_mutex_lock (int *futex, int id) -+{ -+ int result = 0; -+ if (atomic_compare_and_exchange_bool_acq (futex, id, 0) != 0) -+ result = __lll_robust_lock_wait (futex); -+ return result; -+} -+#define lll_robust_mutex_lock(futex, id) __lll_robust_mutex_lock (&(futex), id) -+ - static inline void - __attribute__ ((always_inline)) - __lll_mutex_cond_lock (int *futex) -@@ -187,8 +225,13 @@ __lll_mutex_cond_lock (int *futex) - } - #define lll_mutex_cond_lock(futex) __lll_mutex_cond_lock (&(futex)) - -+#define lll_robust_mutex_cond_lock(futex, id) \ -+ __lll_robust_mutex_lock (&(futex), (id) | FUTEX_WAITERS) -+ - extern int __lll_timedlock_wait - (int *futex, const struct timespec *) attribute_hidden; -+extern int __lll_robust_timedlock_wait -+ (int *futex, const struct timespec *) attribute_hidden; - - static inline int - __attribute__ ((always_inline)) -@@ -202,6 +245,19 @@ __lll_mutex_timedlock (int *futex, const - #define lll_mutex_timedlock(futex, abstime) \ - __lll_mutex_timedlock (&(futex), abstime) - -+static inline int -+__attribute__ ((always_inline)) -+__lll_robust_mutex_timedlock (int *futex, const struct timespec *abstime, -+ int id) -+{ -+ int result = 0; -+ if (atomic_compare_and_exchange_bool_acq (futex, id, 0) != 0) -+ result = __lll_robust_timedlock_wait (futex, abstime); -+ return result; -+} -+#define lll_robust_mutex_timedlock(futex, abstime, id) \ -+ __lll_robust_mutex_timedlock (&(futex), abstime, id) -+ - - static inline void - __attribute__ ((always_inline)) -@@ -220,6 +276,21 @@ __lll_mutex_unlock (int *futex) - - static inline void - __attribute__ ((always_inline)) -+__lll_robust_mutex_unlock (int *futex, int mask) -+{ -+ int oldval; -+ int newval = 0; -+ -+ lll_compare_and_swap (futex, oldval, newval, "slr %2,%2"); -+ if (oldval & mask) -+ lll_futex_wake (futex, 1); -+} -+#define lll_robust_mutex_unlock(futex) \ -+ __lll_robust_mutex_unlock(&(futex), FUTEX_WAITERS) -+ -+ -+static inline void -+__attribute__ ((always_inline)) - __lll_mutex_unlock_force (int *futex) - { - *futex = 0; ---- glibc-20060217T1609/nscd/connections.c 3 Jan 2006 21:26:28 -0000 1.82 -+++ glibc-20060217T1609-fedora/nscd/connections.c 4 Jan 2006 07:58:21 -0000 1.55.2.19 +--- glibc-20060301T0647/nscd/connections.c 3 Jan 2006 21:26:28 -0000 1.82 ++++ glibc-20060301T0647-fedora/nscd/connections.c 4 Jan 2006 07:58:21 -0000 1.55.2.19 @@ -1873,3 +1873,18 @@ finish_drop_privileges (void) exit (4); } @@ -1906,8 +1327,8 @@ + prune_cache (&dbs[hstdb], LONG_MAX); +} + ---- glibc-20060217T1609/nscd/nscd.c 1 Jan 2006 19:15:56 -0000 1.51 -+++ glibc-20060217T1609-fedora/nscd/nscd.c 2 Jan 2006 10:52:53 -0000 1.38.2.11 +--- glibc-20060301T0647/nscd/nscd.c 1 Jan 2006 19:15:56 -0000 1.51 ++++ glibc-20060301T0647-fedora/nscd/nscd.c 2 Jan 2006 10:52:53 -0000 1.38.2.11 @@ -119,6 +119,9 @@ static struct argp argp = options, parse_opt, NULL, doc, }; @@ -1926,8 +1347,8 @@ signal (SIGPIPE, SIG_IGN); /* Cleanup files created by a previous 'bind'. */ ---- glibc-20060217T1609/nscd/nscd.conf 23 Aug 2005 23:17:32 -0000 1.11 -+++ glibc-20060217T1609-fedora/nscd/nscd.conf 24 Aug 2005 07:23:30 -0000 1.8.2.3 +--- glibc-20060301T0647/nscd/nscd.conf 23 Aug 2005 23:17:32 -0000 1.11 ++++ glibc-20060301T0647-fedora/nscd/nscd.conf 24 Aug 2005 07:23:30 -0000 1.8.2.3 @@ -32,8 +32,8 @@ # logfile /var/log/nscd.log # threads 6 @@ -1939,8 +1360,8 @@ debug-level 0 # reload-count 5 paranoia no ---- glibc-20060217T1609/nscd/nscd.init 20 Jun 2005 15:47:52 -0000 1.9 -+++ glibc-20060217T1609-fedora/nscd/nscd.init 12 Sep 2005 12:53:20 -0000 1.6.2.4 +--- glibc-20060301T0647/nscd/nscd.init 20 Jun 2005 15:47:52 -0000 1.9 ++++ glibc-20060301T0647-fedora/nscd/nscd.init 12 Sep 2005 12:53:20 -0000 1.6.2.4 @@ -9,6 +9,7 @@ # slow naming services like NIS, NIS+, LDAP, or hesiod. # processname: /usr/sbin/nscd @@ -1981,19 +1402,8 @@ RETVAL=$? echo [ $RETVAL -eq 0 ] && touch /var/lock/subsys/nscd ---- glibc-20060217T1609/nscd/selinux.c 29 Dec 2005 00:44:09 -0000 1.6 -+++ glibc-20060217T1609-fedora/nscd/selinux.c 2 Jan 2006 10:52:53 -0000 1.1.2.6 -@@ -147,7 +147,7 @@ audit_init (void) - if (audit_fd < 0 - /* If kernel doesn't support audit, bail out */ - && errno != EINVAL && errno != EPROTONOSUPPORT && errno != EAFNOSUPPORT) -- dbg_log (_("Failed opening connection to the audit subsystem")); -+ dbg_log (_("Failed opening connection to the audit subsystem: %m")); - } - #endif /* HAVE_LIBAUDIT */ - ---- glibc-20060217T1609/posix/Makefile 8 Jan 2006 09:39:15 -0000 1.188 -+++ glibc-20060217T1609-fedora/posix/Makefile 9 Jan 2006 21:55:00 -0000 1.171.2.16 +--- glibc-20060301T0647/posix/Makefile 8 Jan 2006 09:39:15 -0000 1.188 ++++ glibc-20060301T0647-fedora/posix/Makefile 9 Jan 2006 21:55:00 -0000 1.171.2.16 @@ -107,7 +107,8 @@ generated := $(addprefix wordexp-test-re bug-regex21-mem bug-regex21.mtrace \ tst-rxspencer-mem tst-rxspencer.mtrace tst-getconf.out \ @@ -2027,8 +1437,8 @@ + | sed -n -e '/START_OF_STRINGS/,$${/POSIX_V6_/{s/^[^"]*"//;s/".*$$//;p}}' \ + > $@.new + mv -f $@.new $@ ---- glibc-20060217T1609/posix/getconf.speclist.h 1 Jan 1970 00:00:00 -0000 -+++ glibc-20060217T1609-fedora/posix/getconf.speclist.h 13 Dec 2004 23:32:37 -0000 1.1.2.2 +--- glibc-20060301T0647/posix/getconf.speclist.h 1 Jan 1970 00:00:00 -0000 ++++ glibc-20060301T0647-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 = @@ -2045,8 +1455,8 @@ +"POSIX_V6_LPBIG_OFFBIG" +#endif +""; ---- glibc-20060217T1609/sysdeps/generic/dl-cache.h 25 Jun 2003 08:01:22 -0000 1.13 -+++ glibc-20060217T1609-fedora/sysdeps/generic/dl-cache.h 22 Sep 2004 21:21:07 -0000 1.13.2.1 +--- glibc-20060301T0647/sysdeps/generic/dl-cache.h 25 Jun 2003 08:01:22 -0000 1.13 ++++ glibc-20060301T0647-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 @@ -2062,8 +1472,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-20060217T1609/sysdeps/ia64/Makefile 16 Aug 2004 06:46:14 -0000 1.10 -+++ glibc-20060217T1609-fedora/sysdeps/ia64/Makefile 22 Sep 2004 21:21:07 -0000 1.10.2.1 +--- glibc-20060301T0647/sysdeps/ia64/Makefile 16 Aug 2004 06:46:14 -0000 1.10 ++++ glibc-20060301T0647-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)) @@ -2075,8 +1485,8 @@ endif endif ---- glibc-20060217T1609/sysdeps/ia64/ia64libgcc.S 11 May 2002 05:12:35 -0000 1.2 -+++ glibc-20060217T1609-fedora/sysdeps/ia64/ia64libgcc.S 22 Sep 2004 21:21:07 -0000 1.2.2.1 +--- glibc-20060301T0647/sysdeps/ia64/ia64libgcc.S 11 May 2002 05:12:35 -0000 1.2 ++++ glibc-20060301T0647-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. */ @@ -2428,8 +1838,8 @@ - .symver ___multi3, __multi3 at GLIBC_2.2 - -#endif ---- glibc-20060217T1609/sysdeps/ia64/libgcc-compat.c 1 Jan 1970 00:00:00 -0000 -+++ glibc-20060217T1609-fedora/sysdeps/ia64/libgcc-compat.c 22 Sep 2004 21:21:08 -0000 1.1.2.1 +--- glibc-20060301T0647/sysdeps/ia64/libgcc-compat.c 1 Jan 1970 00:00:00 -0000 ++++ glibc-20060301T0647-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. @@ -2515,8 +1925,8 @@ +symbol_version (INTUSE (__multi3), __multi3, GLIBC_2.2); + +#endif ---- glibc-20060217T1609/sysdeps/unix/nice.c 28 Sep 2002 19:13:13 -0000 1.6 -+++ glibc-20060217T1609-fedora/sysdeps/unix/nice.c 22 Sep 2004 21:21:08 -0000 1.6.2.1 +--- glibc-20060301T0647/sysdeps/unix/nice.c 28 Sep 2002 19:13:13 -0000 1.6 ++++ glibc-20060301T0647-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); } @@ -2531,8 +1941,8 @@ if (result != -1) return getpriority (PRIO_PROCESS, 0); else ---- glibc-20060217T1609/sysdeps/unix/sysv/linux/dl-osinfo.h 8 Jan 2006 08:21:15 -0000 1.22 -+++ glibc-20060217T1609-fedora/sysdeps/unix/sysv/linux/dl-osinfo.h 9 Jan 2006 21:55:08 -0000 1.14.2.8 +--- glibc-20060301T0647/sysdeps/unix/sysv/linux/dl-osinfo.h 8 Jan 2006 08:21:15 -0000 1.22 ++++ glibc-20060301T0647-fedora/sysdeps/unix/sysv/linux/dl-osinfo.h 9 Jan 2006 21:55:08 -0000 1.14.2.8 @@ -18,12 +18,15 @@ 02111-1307 USA. */ @@ -2581,8 +1991,8 @@ + ret ^= stk; return ret; } ---- glibc-20060217T1609/sysdeps/unix/sysv/linux/futimesat.c 3 Feb 2006 05:26:34 -0000 1.6 -+++ glibc-20060217T1609-fedora/sysdeps/unix/sysv/linux/futimesat.c 3 Feb 2006 09:43:55 -0000 1.1.2.7 +--- glibc-20060301T0647/sysdeps/unix/sysv/linux/futimesat.c 3 Feb 2006 05:26:34 -0000 1.6 ++++ glibc-20060301T0647-fedora/sysdeps/unix/sysv/linux/futimesat.c 3 Feb 2006 09:43:55 -0000 1.1.2.7 @@ -37,14 +37,14 @@ futimesat (fd, file, tvp) { int result; @@ -2625,8 +2035,8 @@ { size_t filelen = strlen (file); static const char procfd[] = "/proc/self/fd/%d/%s"; ---- glibc-20060217T1609/sysdeps/unix/sysv/linux/paths.h 15 Nov 2000 23:06:47 -0000 1.11 -+++ glibc-20060217T1609-fedora/sysdeps/unix/sysv/linux/paths.h 22 Sep 2004 21:21:08 -0000 1.11.4.1 +--- glibc-20060301T0647/sysdeps/unix/sysv/linux/paths.h 15 Nov 2000 23:06:47 -0000 1.11 ++++ glibc-20060301T0647-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" @@ -2636,8 +2046,8 @@ #define _PATH_WTMP "/var/log/wtmp" /* Provide trailing slash, since mostly used for building pathnames. */ ---- glibc-20060217T1609/sysdeps/unix/sysv/linux/tcsetattr.c 10 Sep 2003 19:16:07 -0000 1.16 -+++ glibc-20060217T1609-fedora/sysdeps/unix/sysv/linux/tcsetattr.c 22 Sep 2004 21:21:08 -0000 1.16.2.1 +--- glibc-20060301T0647/sysdeps/unix/sysv/linux/tcsetattr.c 10 Sep 2003 19:16:07 -0000 1.16 ++++ glibc-20060301T0647-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; @@ -2683,8 +2093,8 @@ + return retval; } libc_hidden_def (tcsetattr) ---- glibc-20060217T1609/sysdeps/unix/sysv/linux/i386/dl-cache.h 1 Jan 1970 00:00:00 -0000 -+++ glibc-20060217T1609-fedora/sysdeps/unix/sysv/linux/i386/dl-cache.h 22 Sep 2004 21:21:08 -0000 1.1.2.1 +--- glibc-20060301T0647/sysdeps/unix/sysv/linux/i386/dl-cache.h 1 Jan 1970 00:00:00 -0000 ++++ glibc-20060301T0647-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. @@ -2745,8 +2155,8 @@ + } while (0) + +#include_next ---- glibc-20060217T1609/sysdeps/unix/sysv/linux/ia64/dl-cache.h 6 Jul 2001 04:56:17 -0000 1.2 -+++ glibc-20060217T1609-fedora/sysdeps/unix/sysv/linux/ia64/dl-cache.h 22 Sep 2004 21:21:09 -0000 1.2.4.1 +--- glibc-20060301T0647/sysdeps/unix/sysv/linux/ia64/dl-cache.h 6 Jul 2001 04:56:17 -0000 1.2 ++++ glibc-20060301T0647-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) @@ -2779,24 +2189,24 @@ + } while (0) + #include_next ---- glibc-20060217T1609/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 1 Jan 1970 00:00:00 -0000 -+++ glibc-20060217T1609-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 22 Sep 2004 21:21:09 -0000 1.1.2.1 +--- glibc-20060301T0647/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 1 Jan 1970 00:00:00 -0000 ++++ glibc-20060301T0647-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-20060217T1609/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 1 Jan 1970 00:00:00 -0000 -+++ glibc-20060217T1609-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 22 Sep 2004 21:21:09 -0000 1.1.2.1 +--- glibc-20060301T0647/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 1 Jan 1970 00:00:00 -0000 ++++ glibc-20060301T0647-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-20060217T1609/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed 17 Jan 2002 06:49:28 -0000 1.2 -+++ glibc-20060217T1609-fedora/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed 22 Sep 2004 21:21:09 -0000 1.2.2.1 +--- glibc-20060301T0647/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed 17 Jan 2002 06:49:28 -0000 1.2 ++++ glibc-20060301T0647-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"_ Index: glibc.spec =================================================================== RCS file: /cvs/dist/rpms/glibc/devel/glibc.spec,v retrieving revision 1.224 retrieving revision 1.225 diff -u -r1.224 -r1.225 --- glibc.spec 17 Feb 2006 16:39:46 -0000 1.224 +++ glibc.spec 1 Mar 2006 09:47:51 -0000 1.225 @@ -1,9 +1,9 @@ -%define glibcdate 20060217T1609 +%define glibcdate 20060301T0647 %define glibcname glibc -%define glibcsrcdir glibc-20060217T1609 +%define glibcsrcdir glibc-20060301T0647 %define glibc_release_tarballs 0 %define glibcversion 2.3.90 -%define glibcrelease 38 +%define glibcrelease 39 %define auxarches i586 i686 athlon sparcv9 alphaev6 %define prelinkarches noarch %define xenarches i686 athlon @@ -631,10 +631,6 @@ #undef __NR_newfstatat #undef __NR_fstatat64 %endif -%ifarch s390 s390x -/* FIXME: Handle pselect6 on s390/s390x. */ -#undef __NR_pselect6 -%endif #endif EOF cat > override_headers/asm/errno.h < 2.3.90-39 +- update from CVS + * Fri Feb 17 2006 Jakub Jelinek 2.3.90-38 - update from CVS - robust mutexes rewrite Index: sources =================================================================== RCS file: /cvs/dist/rpms/glibc/devel/sources,v retrieving revision 1.161 retrieving revision 1.162 diff -u -r1.161 -r1.162 --- sources 17 Feb 2006 16:35:21 -0000 1.161 +++ sources 1 Mar 2006 09:47:51 -0000 1.162 @@ -1,2 +1,2 @@ -febd796b074b3b97004e3714f8ea27db glibc-20060217T1609.tar.bz2 -57911b3ed8d1af371b288d2cf55be3db glibc-fedora-20060217T1609.tar.bz2 +661cdfb8abebd6f892a18c3280f1add1 glibc-20060301T0647.tar.bz2 +7c4abda7310c1672d4a075c027670766 glibc-fedora-20060301T0647.tar.bz2 From fedora-cvs-commits at redhat.com Wed Mar 1 10:16:49 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 1 Mar 2006 05:16:49 -0500 Subject: rpms/squirrelmail/devel compilelocales, NONE, 1.1 .cvsignore, 1.13, 1.14 sources, 1.13, 1.14 squirrelmail.spec, 1.26, 1.27 squirrelmail-1.4.3-config.patch, 1.1, NONE squirrelmail-1.4.5-charset.patch, 1.1, NONE Message-ID: <200603011016.k21AGnGQ000580@cvs.devel.redhat.com> Author: dwmw2 Update of /cvs/dist/rpms/squirrelmail/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv364 Modified Files: .cvsignore sources squirrelmail.spec Added Files: compilelocales Removed Files: squirrelmail-1.4.3-config.patch squirrelmail-1.4.5-charset.patch Log Message: upgrade to 1.4.6 --- NEW FILE compilelocales --- #!/bin/sh for trans in `ls locale/`; do for string in `ls po/*.pot | sed 's/^po\///' | sed 's/.pot$//'` ; do if [ -f locale/${trans}/LC_MESSAGES/${string}.po ]; then msgfmt locale/${trans}/LC_MESSAGES/${string}.po \ -c -o locale/${trans}/LC_MESSAGES/${string}.mo fi done done for trans in `ls locale/`; do for string in `ls po/plugins/*.pot | sed 's/^po\/plugins\///' | sed 's/.pot$//'` ; do if [ -f locale/${trans}/LC_MESSAGES/plugins/${string}.po ]; then msgfmt locale/${trans}/LC_MESSAGES/plugins/${string}.po \ -c -o locale/${trans}/LC_MESSAGES/plugins/${string}.mo fi done done for trans in `ls locale/`; do for string in `ls po/extra/*.pot | sed 's/^po\/extra\///' | sed 's/.pot$//'` ; do if [ -f locale/${trans}/LC_MESSAGES/extra/${string}.po ]; then msgfmt locale/${trans}/LC_MESSAGES/extra/${string}.po \ -c -o locale/${trans}/LC_MESSAGES/extra/${string}.mo fi done done Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/squirrelmail/devel/.cvsignore,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- .cvsignore 15 Aug 2005 09:52:48 -0000 1.13 +++ .cvsignore 1 Mar 2006 10:16:46 -0000 1.14 @@ -1,3 +1,2 @@ -squirrelmail-1.4.5.tar.bz2 -squirrelmail-1.4.6-cvs20050812.patch -squirrelmail-20050812_1242-CVS.locales.tar.bz2 +all_locales-1.4.6-20060221.tar.bz2 +squirrelmail-1.4.6.tar.bz2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/squirrelmail/devel/sources,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- sources 15 Aug 2005 09:52:48 -0000 1.13 +++ sources 1 Mar 2006 10:16:46 -0000 1.14 @@ -1,3 +1,2 @@ -bcfe0c1d4049e9c26e0040b2fa3adb07 squirrelmail-1.4.5.tar.bz2 -601b361de5f2a5dd4c21e9f223400673 squirrelmail-1.4.6-cvs20050812.patch -8e9a2bdcfdb520f346c67ed791730e00 squirrelmail-20050812_1242-CVS.locales.tar.bz2 +29dfec2e0f71fba368a89c36c51881c2 all_locales-1.4.6-20060221.tar.bz2 +300ddcf66b7907a61b6e9404840e35de squirrelmail-1.4.6.tar.bz2 Index: squirrelmail.spec =================================================================== RCS file: /cvs/dist/rpms/squirrelmail/devel/squirrelmail.spec,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- squirrelmail.spec 17 Jan 2006 06:23:28 -0000 1.26 +++ squirrelmail.spec 1 Mar 2006 10:16:46 -0000 1.27 @@ -6,19 +6,17 @@ Summary: SquirrelMail webmail client Name: squirrelmail Version: 1.4.6 -Release: 0.cvs20050812.3.fc5 +Release: 1.fc5 License: GPL URL: http://www.squirrelmail.org/ Group: Applications/Internet #Source: %{name}-%{version}.tar.bz2 -Source0: %{name}-1.4.5.tar.bz2 +Source0: %{name}-%{version}.tar.bz2 Source1: squirrelmail.conf Source2: squirrelmail-splash-fedora.png Source3: squirrelmail-splash-rhel.png -Source4: squirrelmail-20050812_1242-CVS.locales.tar.bz2 -Patch2: squirrelmail-1.4.3-config.patch -Patch3: squirrelmail-1.4.6-cvs20050812.patch -Patch4: squirrelmail-1.4.5-charset.patch +Source4: all_locales-1.4.6-20060221.tar.bz2 +Source5: compilelocales BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildArch: noarch Requires: httpd, php >= 4.0.4, php-mbstring, perl, tmpwatch >= 2.8, aspell @@ -37,10 +35,7 @@ %prep #%setup -q -%setup -q -n squirrelmail-1.4.5 -%patch2 -p0 -%patch3 -p1 -%patch4 -p1 +%setup -q -n squirrelmail-%{version} rm -f plugins/make_archive.pl # Rearrange the documentation @@ -126,36 +121,45 @@ install -m 644 $RPM_SOURCE_DIR/squirrelmail.conf \ $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/ +# Switch all locales to UTF-8. +sed -i functions/i18n.php \ + -e "s/^\(\$languages\['\([^']*\)'\]\['CHARSET'].*= '\)\([^']*\)';/\1utf-8';/" \ + -e "s/^\(\$languages\['\([^']*\)'\]\['LOCALE'].*=\).*/\1 '\2.UTF-8';/" + + # install locales mkdir locale_tempdir cd locale_tempdir tar xfj %SOURCE4 -cd squirrelmail.locales # Convert all locales to utf-8. Not only is this probably the right thing # to do anyway, but SquirrelMail will corrupt charsets unless the charset # of the user's locale is a superset of the charset of any mail they reply to # https://sf.net/tracker/?func=detail&atid=423691&aid=1235345&group_id=311 for LOCALE in `ls locale/` ; do + SKIPINVALID= case $LOCALE in ja_JP) # ja_JP uses iso2022-jp for email but euc-jp in its interface. CHARSET=euc-jp ;; ko_KR) - # Not really, but I can't work out what charset the ko_KR help - # files are in, so we'll just leave it alone for now. - CHARSET=utf-8 + # ko_KR has broken help files in indeterminate charset. + # Assume it's _mostly_ EUC-KR as it's supposed to be, and let + # iconv drop invalid characters from the input. + SKIPINVALID=-c + CHARSET=`grep CHARSET locale/$LOCALE/setup.php | cut -f6 -d\'` ;; *) CHARSET=`grep CHARSET locale/$LOCALE/setup.php | cut -f6 -d\'` ;; esac + # Check for locales where CHARSET isn't in LOCALE. grep LOCALE locale/$LOCALE/setup.php | grep -vi $CHARSET || : if [ "$CHARSET" != "utf-8" -a "$CHARSET" != "UTF-8" ]; then for a in `ls help/$LOCALE/ 2>/dev/null` ; do - iconv -f $CHARSET -t utf-8 help/$LOCALE/$a > $a.new && mv $a.new help/$LOCALE/$a + iconv $SKIPINVALID -f $CHARSET -t utf-8 help/$LOCALE/$a > $a.new && mv $a.new help/$LOCALE/$a done sed -e "s/CHARSET..[ ]*= [^;]*;/CHARSET'] = 'utf-8';/" \ -e "s/LOCALE..[ ]*= [^;]*;/LOCALE'] = '$LOCALE.UTF-8';/" \ @@ -170,11 +174,11 @@ sed s/charset=$CHARSET/charset=utf-8/ $POFILE | iconv -f $CHARSET -t utf-8 > $POFILE.new && mv $POFILE.new $POFILE fi done -./compilelocales +sh $SOURCE5 cp -r locale/* $RPM_BUILD_ROOT%{_datadir}/squirrelmail/locale/ cp -r images/* $RPM_BUILD_ROOT%{_datadir}/squirrelmail/images/ cp -r help/* $RPM_BUILD_ROOT%{_datadir}/squirrelmail/help/ -cd ../.. +cd .. rm $RPM_BUILD_ROOT%{_datadir}/squirrelmail/locale/README.locales %clean @@ -207,6 +211,10 @@ %{_sysconfdir}/cron.daily/squirrelmail.cron %changelog +* Wed Mar 1 2006 David Woodhouse 1.4.6-1 +- Upgrade to 1.4.6 proper +- Script the charset changes instead of using a patch + * Tue Jan 17 2006 Warren Togami 1.4.6-0.cvs20050812.3 - do not remove mo files - require php-mbstring --- squirrelmail-1.4.3-config.patch DELETED --- --- squirrelmail-1.4.5-charset.patch DELETED --- From fedora-cvs-commits at redhat.com Wed Mar 1 11:46:55 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 1 Mar 2006 06:46:55 -0500 Subject: rpms/kernel/devel kernel-2.6.spec,1.1971.2.8,1.1971.2.9 Message-ID: <200603011146.k21Bktvw032234@cvs.devel.redhat.com> Author: quintela Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv32189 Modified Files: Tag: private-xen-rebased-1971-branch kernel-2.6.spec Log Message: ia64 time again Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.1971.2.8 retrieving revision 1.1971.2.9 diff -u -r1.1971.2.8 -r1.1971.2.9 --- kernel-2.6.spec 28 Feb 2006 22:53:14 -0000 1.1971.2.8 +++ kernel-2.6.spec 1 Mar 2006 11:46:53 -0000 1.1971.2.9 @@ -162,8 +162,7 @@ License: GPLv2 Version: %{rpmversion} Release: %{release} -#ExclusiveArch: noarch %{all_x86} x86_64 ppc ppc64 ia64 sparc sparc64 ppc64iseries s390 s390x -ExclusiveArch: noarch %{all_x86} x86_64 ppc ppc64 sparc sparc64 ppc64iseries s390 s390x +ExclusiveArch: noarch %{all_x86} x86_64 ppc ppc64 ia64 sparc sparc64 ppc64iseries s390 s390x ExclusiveOS: Linux Provides: kernel = %{version} Provides: kernel-drm = 4.3.0 @@ -1597,6 +1596,9 @@ %endif %changelog +* Wed Mar 1 2006 Juan Quintela +- enable ia64 again + * Tue Feb 28 2006 Juan Quintela - fix x86_64 xen build. From fedora-cvs-commits at redhat.com Wed Mar 1 11:59:46 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 1 Mar 2006 06:59:46 -0500 Subject: rpms/joe/devel joe-3.3-head.patch,NONE,1.1 joe.spec,1.27,1.28 Message-ID: <200603011159.k21Bxkpt005350@cvs.devel.redhat.com> Author: varekova Update of /cvs/dist/rpms/joe/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv5159 Modified Files: joe.spec Added Files: joe-3.3-head.patch Log Message: add forgotten header files - bug 183455 joe-3.3-head.patch: i18n.c | 1 + termcap.c | 1 + 2 files changed, 2 insertions(+) --- NEW FILE joe-3.3-head.patch --- --- joe-3.3/i18n.c.head 2004-06-21 16:47:36.000000000 +0200 +++ joe-3.3/i18n.c 2006-03-01 11:34:56.323539464 +0100 @@ -11,6 +11,7 @@ * was very easy to do with just the text editor. */ +#include "utils.h" #include "charmap.h" #include "utf8.h" #include "i18n.h" --- joe-3.3/termcap.c.head 2005-04-25 15:11:24.000000000 +0200 +++ joe-3.3/termcap.c 2006-03-01 11:35:38.892068064 +0100 @@ -8,6 +8,7 @@ #include "config.h" #include "types.h" +#include #include #ifdef HAVE_SYS_TYPES_H #include Index: joe.spec =================================================================== RCS file: /cvs/dist/rpms/joe/devel/joe.spec,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- joe.spec 11 Feb 2006 03:42:00 -0000 1.27 +++ joe.spec 1 Mar 2006 11:59:44 -0000 1.28 @@ -3,7 +3,7 @@ Summary: An easy to use, modeless text editor. Name: joe Version: 3.3 -Release: 1.2.1 +Release: 2 License: GPL Group: Applications/Editors Source: http://prdownloads.sourceforge.net/joe-editor/joe-%{version}.tar.gz @@ -14,6 +14,7 @@ Patch0: joe-3.1-joerc.patch Patch2: joe-3.1-selinux.patch Patch4: joe-3.1-ret.patch +Patch5: joe-3.3-head.patch %description Joe is a powerful, easy to use, modeless text editor. @@ -25,6 +26,7 @@ %patch0 -p1 -b .joerc %patch2 -p1 -b .selinux %patch4 -p1 -b .ret +%patch5 -p1 -b .head %build %configure @@ -54,6 +56,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Mar 1 2006 Ivana Varekova 3.3-2 +- add forgotten header files - bug 183455 + * Fri Feb 10 2006 Jesse Keating - 3.3-1.2.1 - bump again for double-long bug on ppc(64) From fedora-cvs-commits at redhat.com Wed Mar 1 12:04:00 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 1 Mar 2006 07:04:00 -0500 Subject: rpms/gnome-nettool/devel gnome-nettool.spec,1.8,1.9 Message-ID: <200603011204.k21C40Co005812@cvs.devel.redhat.com> Author: karsten Update of /cvs/dist/rpms/gnome-nettool/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv5766 Modified Files: gnome-nettool.spec Log Message: - BuildRequires: desktop-file-utils + desktop-file-install --vendor gnome --delete-original --dir /var/tmp/gnome-nettool-root/usr/share/applications --add-only-show-in GNOME --remove-category Network --add-category GNOME --add-category System --add-category Utility --add-category X-Red-Hat-Base /var/tmp/gnome-nettool-root/usr/share/applications/gnome-nettool.desktop /var/tmp/rpm-tmp.38994: line 46: desktop-file-install: command not found Index: gnome-nettool.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-nettool/devel/gnome-nettool.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- gnome-nettool.spec 11 Feb 2006 03:15:09 -0000 1.8 +++ gnome-nettool.spec 1 Mar 2006 12:03:43 -0000 1.9 @@ -6,7 +6,7 @@ Summary: A GNOME interface for various networking tools Name: gnome-nettool Version: 2.13.90 -Release: 1.2 +Release: 2 URL: http://www.gnome.org Source0: %{name}-%{version}.tar.bz2 License: GPL @@ -17,6 +17,7 @@ BuildRequires: libglade2-devel >= %{libglade2_version} BuildRequires: GConf2-devel >= %{gconf2_version} BuildRequires: libgnomeui-devel >= %{libgnomeui_version} +BuildRequires: desktop-file-utils %description GNOME Nettool is a set of front-ends to various networking command-line @@ -58,6 +59,9 @@ %{_datadir}/pixmaps/*.png %changelog +* Wed Mar 01 2006 Karsten Hopp 2.13.90-2 +- BuildRequires: desktop-file-utils for desktop-file-install + * Fri Feb 10 2006 Jesse Keating - 2.13.90-1.2 - bump again for double-long bug on ppc(64) From fedora-cvs-commits at redhat.com Wed Mar 1 12:18:03 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 1 Mar 2006 07:18:03 -0500 Subject: rpms/gstreamer-plugins-base/devel gstreamer-plugins-base.spec, 1.10, 1.11 Message-ID: <200603011218.k21CI2YX022274@cvs.devel.redhat.com> Author: karsten Update of /cvs/dist/rpms/gstreamer-plugins-base/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv22247 Modified Files: gstreamer-plugins-base.spec Log Message: - BuildRequires: cdparanoia-devel (#179034) Index: gstreamer-plugins-base.spec =================================================================== RCS file: /cvs/dist/rpms/gstreamer-plugins-base/devel/gstreamer-plugins-base.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- gstreamer-plugins-base.spec 20 Feb 2006 16:13:54 -0000 1.10 +++ gstreamer-plugins-base.spec 1 Mar 2006 12:18:00 -0000 1.11 @@ -5,7 +5,7 @@ Name: %{gstreamer}-plugins-base Version: 0.10.3 -Release: 2 +Release: 3 Summary: GStreamer streaming media framework base plug-ins Group: Applications/Multimedia @@ -29,6 +29,7 @@ BuildRequires: alsa-lib-devel BuildRequires: pango-devel BuildRequires: libXv-devel +BuildRequires: cdparanoia-devel Obsoletes: gstreamer-plugins # documentation @@ -189,6 +190,9 @@ %doc %{_datadir}/gtk-doc/html/gst-plugins-base-plugins-%{majorminor} %changelog +* Wed Mar 01 2006 Karsten Hopp 0.10.3-3 +- really add BuildRequires: cdparanoia-devel (#179034) + * Mon Feb 20 2006 John (J5) Palmieri - 0.10.3-2 - Obsolete gstreamer-plugins (Bug #182098) From fedora-cvs-commits at redhat.com Wed Mar 1 12:33:30 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 1 Mar 2006 07:33:30 -0500 Subject: rpms/glibc/devel glibc-fedora.patch,1.138,1.139 Message-ID: <200603011233.k21CXUFC027460@cvs.devel.redhat.com> Author: jakub Update of /cvs/dist/rpms/glibc/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv27430 Modified Files: glibc-fedora.patch Log Message: 2.3.90-39 glibc-fedora.patch: ChangeLog | 68 ++++ ChangeLog.11 | 21 + ChangeLog.12 | 12 ChangeLog.15 | 45 ++ csu/elf-init.c | 17 + debug/tst-chk1.c | 7 elf/ldconfig.c | 38 +- elf/tst-stackguard1.c | 8 iconv/iconvconfig.c | 55 +-- include/bits/stdlib-ldbl.h | 1 include/bits/wchar-ldbl.h | 1 include/features.h | 8 intl/locale.alias | 2 libc/sysdeps/unix/sysv/linux/s390/s390-64/sysdep.h | 2 libio/bits/stdio2.h | 19 - libio/stdio.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/no_NO | 69 ++++ localedata/locales/zh_TW | 6 malloc/mcheck.c | 30 + malloc/mtrace.c | 20 - nptl/ChangeLog | 27 + nptl/Makefile | 8 nptl/sysdeps/unix/sysv/linux/kernel-features.h | 6 nptl/sysdeps/unix/sysv/linux/sparc/lowlevellock.h | 58 +++ nptl/tst-stackguard1.c | 8 nscd/connections.c | 15 nscd/nscd.c | 4 nscd/nscd.conf | 4 nscd/nscd.init | 19 - posix/Makefile | 19 - posix/getconf.speclist.h | 15 sysdeps/generic/dl-cache.h | 8 sysdeps/ia64/Makefile | 4 sysdeps/ia64/ia64libgcc.S | 350 --------------------- sysdeps/ia64/libgcc-compat.c | 84 +++++ sysdeps/unix/nice.c | 7 sysdeps/unix/sysv/linux/dl-osinfo.h | 29 + sysdeps/unix/sysv/linux/futimesat.c | 23 - 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/tcsetattr.c | 32 + 51 files changed, 849 insertions(+), 469 deletions(-) Index: glibc-fedora.patch =================================================================== RCS file: /cvs/dist/rpms/glibc/devel/glibc-fedora.patch,v retrieving revision 1.138 retrieving revision 1.139 diff -u -r1.138 -r1.139 --- glibc-fedora.patch 1 Mar 2006 09:47:51 -0000 1.138 +++ glibc-fedora.patch 1 Mar 2006 12:33:03 -0000 1.139 @@ -2210,3 +2210,14 @@ @@ -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"_ +--- libc/sysdeps/unix/sysv/linux/s390/s390-64/sysdep.h.jj 2006-02-28 15:14:07.000000000 +0100 ++++ libc/sysdeps/unix/sysv/linux/s390/s390-64/sysdep.h 2006-03-01 13:31:48.000000000 +0100 +@@ -268,7 +268,7 @@ + register unsigned long gpr6 asm ("6") = (unsigned long)(arg5); + #define DECLARGS_6(arg1, arg2, arg3, arg4, arg5, arg6) \ + DECLARGS_5(arg1, arg2, arg3, arg4, arg5) \ +- register unsigned long gpr6 asm ("7") = (unsigned long)(arg6); ++ register unsigned long gpr7 asm ("7") = (unsigned long)(arg6); + + #define ASMFMT_0 + #define ASMFMT_1 , "0" (gpr2) From fedora-cvs-commits at redhat.com Wed Mar 1 12:34:00 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 1 Mar 2006 07:34:00 -0500 Subject: rpms/gnome-user-share/devel gnome-user-share.spec,1.9,1.10 Message-ID: <200603011234.k21CY0lC027504@cvs.devel.redhat.com> Author: karsten Update of /cvs/dist/rpms/gnome-user-share/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv27422 Modified Files: gnome-user-share.spec Log Message: - BuildRequires: gtk2-devel, libglade2-devel, libselinux-devel required to make it build in a minimal chroot with mock Index: gnome-user-share.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-user-share/devel/gnome-user-share.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- gnome-user-share.spec 11 Feb 2006 03:18:04 -0000 1.9 +++ gnome-user-share.spec 1 Mar 2006 12:33:29 -0000 1.10 @@ -1,7 +1,7 @@ Summary: Gnome user file sharing Name: gnome-user-share Version: 0.9 -Release: 2.2 +Release: 3 License: GPL Group: System Environment/Libraries URL: http://www.gnome.org @@ -10,7 +10,10 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root Requires: httpd >= 2.2.0 BuildRequires: GConf2-devel avahi-glib-devel >= 0.6 pkgconfig +BuildRequires: gtk2-devel >= 2.4.0 +BuildRequires: libglade2-devel >= 2.0.0 BuildRequires: desktop-file-utils +BuildRequires: libselinux-devel Prereq: GConf2 %description @@ -59,6 +62,9 @@ %{_sysconfdir}/gconf/schemas/* %changelog +* Wed Mar 01 2006 Karsten Hopp 0.9-3 +- BuildRequires: gtk2-devel, libglade2-devel, libselinux-devel + * Fri Feb 10 2006 Jesse Keating - 0.9-2.2 - bump again for double-long bug on ppc(64) From fedora-cvs-commits at redhat.com Wed Mar 1 12:45:30 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 1 Mar 2006 07:45:30 -0500 Subject: rpms/NetworkManager/devel .cvsignore, 1.31, 1.32 NetworkManager.spec, 1.94, 1.95 sources, 1.47, 1.48 three-scan-prune.patch, 1.2, NONE Message-ID: <200603011245.k21CjUZl022341@cvs.devel.redhat.com> Author: dcbw Update of /cvs/dist/rpms/NetworkManager/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv22326 Modified Files: .cvsignore NetworkManager.spec sources Removed Files: three-scan-prune.patch Log Message: * Wed Mar 1 2006 Dan Williams 0.5.1-18.cvs20060301 - Fix VPN-related crash - Fix issue where NM would refuse to activate a VPN connection once it had timed out - Log wpa_supplicant output for better debugging Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/NetworkManager/devel/.cvsignore,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- .cvsignore 27 Feb 2006 21:00:10 -0000 1.31 +++ .cvsignore 1 Mar 2006 12:45:27 -0000 1.32 @@ -1 +1,2 @@ NetworkManager-0.5.1.cvs20060227.tar.gz +NetworkManager-0.5.1.cvs20060301.tar.gz Index: NetworkManager.spec =================================================================== RCS file: /cvs/dist/rpms/NetworkManager/devel/NetworkManager.spec,v retrieving revision 1.94 retrieving revision 1.95 diff -u -r1.94 -r1.95 --- NetworkManager.spec 28 Feb 2006 20:14:40 -0000 1.94 +++ NetworkManager.spec 1 Mar 2006 12:45:27 -0000 1.95 @@ -9,13 +9,13 @@ %define bind_version 24:9.3.1-20 %if %{cvs_snapshot} -%define nm_cvs_version .cvs20060227 +%define nm_cvs_version .cvs20060301 %endif Name: NetworkManager Summary: Network connection manager and user applications Version: 0.5.1 -Release: 17%{?nm_cvs_version} +Release: 18%{?nm_cvs_version} Group: System Environment/Base License: GPL URL: http://www.gnome.org/projects/NetworkManager/ @@ -23,7 +23,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-root Patch0: special-case-madwifi.patch -Patch1: three-scan-prune.patch PreReq: chkconfig Requires: wireless-tools >= %{wireless_tools_version} @@ -118,7 +117,6 @@ %prep %setup -q %patch0 -p0 -b .madwifi -%patch1 -p0 -b .three-scan-prune %build %configure --with-named=/usr/sbin/named --with-named-dir=/var/named/data --with-named-user=named --enable-notify=yes @@ -216,6 +214,11 @@ %changelog +* Wed Mar 1 2006 Dan Williams 0.5.1-18.cvs20060301 +- Fix VPN-related crash +- Fix issue where NM would refuse to activate a VPN connection once it had timed out +- Log wpa_supplicant output for better debugging + * Tue Feb 28 2006 Christopher Aillon 0.5.1-17.cvs20060228 - Tweak three-scan-prune.patch Index: sources =================================================================== RCS file: /cvs/dist/rpms/NetworkManager/devel/sources,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- sources 27 Feb 2006 21:00:10 -0000 1.47 +++ sources 1 Mar 2006 12:45:27 -0000 1.48 @@ -1 +1 @@ -1ec085cf5956fd4d8aad70e2d2b86cc2 NetworkManager-0.5.1.cvs20060227.tar.gz +a3c6086c4c36a9110a0ea3914e6ef91d NetworkManager-0.5.1.cvs20060301.tar.gz --- three-scan-prune.patch DELETED --- From fedora-cvs-commits at redhat.com Wed Mar 1 12:47:50 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 1 Mar 2006 07:47:50 -0500 Subject: rpms/gnome-utils/devel gnome-utils.spec,1.97,1.98 Message-ID: <200603011247.k21CloZh002455@cvs.devel.redhat.com> Author: karsten Update of /cvs/dist/rpms/gnome-utils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv2441 Modified Files: gnome-utils.spec Log Message: - BuildRequires: gnome-doc-utils configure: error: Package requirements (gnome-doc-utils >= 0.3.2) were not met: Index: gnome-utils.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-utils/devel/gnome-utils.spec,v retrieving revision 1.97 retrieving revision 1.98 diff -u -r1.97 -r1.98 --- gnome-utils.spec 26 Feb 2006 01:53:42 -0000 1.97 +++ gnome-utils.spec 1 Mar 2006 12:47:47 -0000 1.98 @@ -8,6 +8,7 @@ %define desktop_file_utils_version 0.9 %define libgnomeprint_2_2_version 2.8.0 %define libgnomeprintui_2_2_version 2.8.0 +%define gnome_doc_utils_version 0.3.2 %define po_package gnome-utils-2.0 @@ -20,7 +21,7 @@ Summary: GNOME utility programs. Name: gnome-utils Version: 2.13.93 -Release: 1 +Release: 2 Epoch: 1 License: GPL Group: Applications/System @@ -61,6 +62,7 @@ BuildRequires: flex BuildRequires: hal-devel BuildRequires: dbus-devel >= %{dbus_version} +BuildRequires: gnome-doc-utils >= %{gnome_doc_utils_version} %description GNOME (GNU Network Object Model Environment) is a user-friendly set of GUI applications and desktop tools to be used in conjunction with a @@ -225,6 +227,9 @@ %{_sysconfdir}/pam.d/gnome-system-log %changelog +* Wed Mar 01 2006 Karsten Hopp 2.13.93-2 +- BuildRequires: gnome-doc-utils + * Sat Feb 25 2006 Matthias Clasen - 2.13.93-1 - Update to gnome-utils-2.13.93 - Update to gucharmap 1.5.3 From fedora-cvs-commits at redhat.com Wed Mar 1 12:53:09 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 1 Mar 2006 07:53:09 -0500 Subject: rpms/gnome-screensaver/devel gnome-screensaver.spec,1.60,1.61 Message-ID: <200603011253.k21Cr97P002549@cvs.devel.redhat.com> Author: karsten Update of /cvs/dist/rpms/gnome-screensaver/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv2534 Modified Files: gnome-screensaver.spec Log Message: - BuildRequires: libXmu-devel error: X11/Xmu/WinUtil.h: No such file or directory Index: gnome-screensaver.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-screensaver/devel/gnome-screensaver.spec,v retrieving revision 1.60 retrieving revision 1.61 diff -u -r1.60 -r1.61 --- gnome-screensaver.spec 28 Feb 2006 02:22:09 -0000 1.60 +++ gnome-screensaver.spec 1 Mar 2006 12:53:04 -0000 1.61 @@ -14,7 +14,7 @@ Summary: GNOME Sreensaver Name: gnome-screensaver Version: 2.13.92 -Release: 1 +Release: 2 License: GPL Group: Amusement/Graphics Source0: %{name}-%{version}.tar.bz2 @@ -41,7 +41,7 @@ BuildRequires: libexif-devel >= %{libexif_version} BuildRequires: pam-devel BuildRequires: libX11-devel, libXScrnSaver-devel, libXext-devel -BuildRequires: libXinerama-devel +BuildRequires: libXinerama-devel libXmu-devel # this is here because the configure tests look for protocol headers BuildRequires: xorg-x11-proto-devel Requires: gtk2 >= %{gtk2_version} @@ -162,6 +162,9 @@ %{_sysconfdir}/pam.d/* %changelog +* Wed Mar 01 2006 Karsten Hopp 2.13.92-2 +- BuildRequires: libXmu-devel + * Mon Feb 27 2006 Matthias Clasen - 2.13.92-1 - Update to 2.13.92 From fedora-cvs-commits at redhat.com Wed Mar 1 12:54:36 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 1 Mar 2006 07:54:36 -0500 Subject: rpms/gnome-session/devel gnome-session.spec,1.59,1.60 Message-ID: <200603011254.k21CsaD9010836@cvs.devel.redhat.com> Author: karsten Update of /cvs/dist/rpms/gnome-session/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv10755 Modified Files: gnome-session.spec Log Message: - BuildRequires: gnome-desktop-devel, libX11-devel, libXt-devel Index: gnome-session.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-session/devel/gnome-session.spec,v retrieving revision 1.59 retrieving revision 1.60 diff -u -r1.59 -r1.60 --- gnome-session.spec 28 Feb 2006 19:08:03 -0000 1.59 +++ gnome-session.spec 1 Mar 2006 12:54:32 -0000 1.60 @@ -7,13 +7,14 @@ %define libbonoboui_version 2.3.0 %define gnome_vfs2_version 2.3.0 %define gconf2_version 2.2.0 +%define gnome_desktop_version 2.2.0 %define po_package gnome-session-2.0 Summary: GNOME session manager Name: gnome-session Version: 2.13.92 -Release: 1 +Release: 2 URL: http://www.gnome.org Source0: %{name}-%{version}.tar.bz2 Source1: redhat-default-session @@ -60,11 +61,13 @@ BuildRequires: libbonobo-devel >= %{libbonobo_version} BuildRequires: libbonoboui-devel >= %{libbonoboui_version} BuildRequires: gnome-vfs2-devel >= %{gnome_vfs2_version} +BuildRequires: gnome-desktop-devel >= %{gnome_desktop_version} # this is so the configure checks find /usr/bin/halt etc. BuildRequires: usermode BuildRequires: automake14 autoconf gettext +BuildRequires: libX11-devel libXt-devel %description @@ -158,6 +161,9 @@ %{_datadir}/gnome/autostart %changelog +* Wed Mar 01 2006 Karsten Hopp 2.13.92-2 +- BuildRequires: gnome-desktop-devel, libX11-devel, libXt-devel + * Tue Feb 28 2006 Ray Strode - 2.13.92-1 - Update to 2.13.92 - Add patch from CVS HEAD to maintain compatibility with From fedora-cvs-commits at redhat.com Wed Mar 1 13:01:55 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 1 Mar 2006 08:01:55 -0500 Subject: rpms/mesa/devel mesa.spec,1.45,1.46 Message-ID: <200603011301.k21D1tSI013206@cvs.devel.redhat.com> Author: karsten Update of /cvs/dist/rpms/mesa/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv13147 Modified Files: mesa.spec Log Message: - Buildrequires: libXt-devel (#183479) Index: mesa.spec =================================================================== RCS file: /cvs/dist/rpms/mesa/devel/mesa.spec,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- mesa.spec 1 Mar 2006 06:16:10 -0000 1.45 +++ mesa.spec 1 Mar 2006 13:01:51 -0000 1.46 @@ -53,7 +53,7 @@ Summary: Mesa graphics libraries Name: mesa Version: 6.4.2 -Release: 5 +Release: 6 License: MIT/X11 Group: System Environment/Libraries URL: http://www.mesa3d.org @@ -91,6 +91,7 @@ BuildRequires: expat-devel BuildRequires: xorg-x11-proto-devel >= 7.0-3 BuildRequires: glut-devel +BuildRequires: libXt-devel %if %{with_motif} BuildRequires: openmotif-devel @@ -437,6 +438,9 @@ %{_bindir}/glxinfo %changelog +* Wed Mar 01 2006 Karsten Hopp 6.4.2-6 +- Buildrequires: libXt-devel (#183479) + * Sat Feb 25 2006 Mike A. Harris 6.4.2-5 - Disable the expeimental r300 DRI driver, as it has turned out to cause instability and system hangs for many users. From fedora-cvs-commits at redhat.com Wed Mar 1 13:03:08 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 1 Mar 2006 08:03:08 -0500 Subject: rpms/kernel/devel kernel-2.6.spec,1.1971.2.9,1.1971.2.10 Message-ID: <200603011303.k21D38dg013328@cvs.devel.redhat.com> Author: quintela Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv13295 Modified Files: Tag: private-xen-rebased-1971-branch kernel-2.6.spec Log Message: build only for ia64 for testing where it broke Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.1971.2.9 retrieving revision 1.1971.2.10 diff -u -r1.1971.2.9 -r1.1971.2.10 --- kernel-2.6.spec 1 Mar 2006 11:46:53 -0000 1.1971.2.9 +++ kernel-2.6.spec 1 Mar 2006 13:02:40 -0000 1.1971.2.10 @@ -162,7 +162,8 @@ License: GPLv2 Version: %{rpmversion} Release: %{release} -ExclusiveArch: noarch %{all_x86} x86_64 ppc ppc64 ia64 sparc sparc64 ppc64iseries s390 s390x +#ExclusiveArch: noarch %{all_x86} x86_64 ppc ppc64 ia64 sparc sparc64 ppc64iseries s390 s390x +ExclusiveArch: ia64 ExclusiveOS: Linux Provides: kernel = %{version} Provides: kernel-drm = 4.3.0 From fedora-cvs-commits at redhat.com Wed Mar 1 13:16:26 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 1 Mar 2006 08:16:26 -0500 Subject: rpms/kernel/devel kernel-2.6.spec,1.1971.2.10,1.1971.2.11 Message-ID: <200603011316.k21DGQj0022764@cvs.devel.redhat.com> Author: quintela Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv22547 Modified Files: Tag: private-xen-rebased-1971-branch kernel-2.6.spec Log Message: noarch is also needed Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.1971.2.10 retrieving revision 1.1971.2.11 diff -u -r1.1971.2.10 -r1.1971.2.11 --- kernel-2.6.spec 1 Mar 2006 13:02:40 -0000 1.1971.2.10 +++ kernel-2.6.spec 1 Mar 2006 13:16:22 -0000 1.1971.2.11 @@ -163,7 +163,7 @@ Version: %{rpmversion} Release: %{release} #ExclusiveArch: noarch %{all_x86} x86_64 ppc ppc64 ia64 sparc sparc64 ppc64iseries s390 s390x -ExclusiveArch: ia64 +ExclusiveArch: noarch ia64 ExclusiveOS: Linux Provides: kernel = %{version} Provides: kernel-drm = 4.3.0 From fedora-cvs-commits at redhat.com Wed Mar 1 13:25:32 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 1 Mar 2006 08:25:32 -0500 Subject: rpms/gok/devel gok.spec,1.29,1.30 Message-ID: <200603011325.k21DPWOS001113@cvs.devel.redhat.com> Author: karsten Update of /cvs/dist/rpms/gok/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv946 Modified Files: gok.spec Log Message: - BuildRequires: libXt-devel configure: error: X development libraries not found Index: gok.spec =================================================================== RCS file: /cvs/dist/rpms/gok/devel/gok.spec,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- gok.spec 13 Feb 2006 20:03:02 -0000 1.29 +++ gok.spec 1 Mar 2006 13:25:29 -0000 1.30 @@ -3,7 +3,7 @@ Summary: GNOME Onscreen Keyboard Name: gok Version: 1.0.6 -Release: 1 +Release: 2 License: GPL Group: Desktop/Accessibility URL: http://www.gok.ca/ @@ -25,6 +25,7 @@ BuildRequires: m4 BuildRequires: gettext BuildRequires: perl-XML-Parser +BuildRequires: libXt-devel %description The gok project aims to enable users to control their computer without @@ -103,6 +104,9 @@ %{_libdir}/pkgconfig/*pc %changelog +* Wed Mar 01 2006 Karsten Hopp 1.0.6-2 +- BuildRequires: libXt-devel + * Mon Feb 13 2006 Matthias Clasen - 1.0.6-1 - Update to 1.0.6 From fedora-cvs-commits at redhat.com Wed Mar 1 13:34:22 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 1 Mar 2006 08:34:22 -0500 Subject: rpms/gsf-sharp/devel gsf-sharp.spec,1.9,1.10 Message-ID: <200603011334.k21DYMob003095@cvs.devel.redhat.com> Author: karsten Update of /cvs/dist/rpms/gsf-sharp/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv2953 Modified Files: gsf-sharp.spec Log Message: - Buildrequires: gtk-sharp2 error: Package requirements (gtk-sharp-2.0 >= 1.9.5) were not met Index: gsf-sharp.spec =================================================================== RCS file: /cvs/dist/rpms/gsf-sharp/devel/gsf-sharp.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- gsf-sharp.spec 12 Feb 2006 16:39:31 -0000 1.9 +++ gsf-sharp.spec 1 Mar 2006 13:34:07 -0000 1.10 @@ -1,6 +1,6 @@ Name: gsf-sharp Version: 0.6 -Release: 7 +Release: 8 Summary: Mono bindings for libgsf Group: System Environment/Libraries @@ -9,7 +9,7 @@ Source0: %{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: mono-devel libgsf-devel gtk-sharp2-gapi +BuildRequires: mono-devel libgsf-devel gtk-sharp2-gapi gtk-sharp2 >= 1.9.5 Requires: libgsf # Mono only availible on these: @@ -50,6 +50,9 @@ %{_prefix}/share/gapi-2.0/gsf-api.xml %changelog +* Wed Mar 01 2006 Karsten Hopp 0.6-8 +- Buildrequires: gtk-sharp2 + * Sun Feb 12 2006 Christopher Aillon 0.6-7 - Rebuild From fedora-cvs-commits at redhat.com Wed Mar 1 13:52:27 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 1 Mar 2006 08:52:27 -0500 Subject: rpms/gnuplot/devel gnuplot.spec,1.25,1.26 Message-ID: <200603011352.k21DqR6e023120@cvs.devel.redhat.com> Author: karsten Update of /cvs/dist/rpms/gnuplot/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv22972 Modified Files: gnuplot.spec Log Message: - BuildRequires: libXt-devel error: X11/Intrinsic.h: No such file or directory checking for X... no ... File not found: /var/tmp/gnuplot-4.0.0-10.2.1-root/usr/libexec/gnuplot/4.0/gnupl ot_x11 Index: gnuplot.spec =================================================================== RCS file: /cvs/dist/rpms/gnuplot/devel/gnuplot.spec,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- gnuplot.spec 11 Feb 2006 03:19:18 -0000 1.25 +++ gnuplot.spec 1 Mar 2006 13:52:24 -0000 1.26 @@ -1,14 +1,14 @@ Summary: A program for plotting mathematical expressions and data. Name: gnuplot Version: 4.0.0 -Release: 10.2.1 +Release: 11 License: Redistributable, with restrictions Group: Applications/Engineering Source: http://prdownloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz Source2: gnuplot-init.el Patch0: gnuplot-4.0.0-x11segv.patch BuildPrereq: libpng-devel, tetex-latex, zlib-devel, libX11-devel, emacs -BuildRequires: texinfo, readline-devel +BuildRequires: texinfo, readline-devel, libXt-devel Requires: libpng BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root URL: http://www.gnuplot.info/ @@ -92,6 +92,9 @@ %changelog +* Wed Mar 01 2006 Karsten Hopp 4.0.0-11 +- BuildRequires: libXt-devel + * Fri Feb 10 2006 Jesse Keating - 4.0.0-10.2.1 - bump again for double-long bug on ppc(64) From fedora-cvs-commits at redhat.com Wed Mar 1 14:05:28 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 1 Mar 2006 09:05:28 -0500 Subject: rpms/gtk+/devel gtk+.spec,1.53,1.54 Message-ID: <200603011405.k21E5SmY026576@cvs.devel.redhat.com> Author: karsten Update of /cvs/dist/rpms/gtk+/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv26521 Modified Files: gtk+.spec Log Message: - BuildRequires: libXt-devel checking for X... no configure: error: *** X libraries or include files not found. Check 'config.log' for *** more details. Index: gtk+.spec =================================================================== RCS file: /cvs/dist/rpms/gtk+/devel/gtk+.spec,v retrieving revision 1.53 retrieving revision 1.54 diff -u -r1.53 -r1.54 --- gtk+.spec 11 Feb 2006 03:21:44 -0000 1.53 +++ gtk+.spec 1 Mar 2006 14:05:24 -0000 1.54 @@ -4,7 +4,7 @@ Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X. Name: gtk+ Version: 1.2.10 -Release: 49.2.1 +Release: 50 Epoch: 1 License: LGPL Group: System Environment/Libraries @@ -80,7 +80,7 @@ BuildPreReq: glib >= 1:%{version} BuildRequires: automake14 autoconf213 libtool BuildRequires: glib-devel -BuildRequires: libX11-devel, libXext-devel, libXi-devel +BuildRequires: libX11-devel, libXext-devel, libXi-devel, libXt-devel %description The gtk+ package contains the GIMP ToolKit (GTK+), a library for @@ -214,6 +214,9 @@ %changelog +* Wed Mar 01 2006 Karsten Hopp 1.2.10-50 +- BuildRequires: libXt-devel + * Fri Feb 10 2006 Jesse Keating - 1:1.2.10-49.2.1 - bump again for double-long bug on ppc(64) From fedora-cvs-commits at redhat.com Wed Mar 1 14:09:40 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 1 Mar 2006 09:09:40 -0500 Subject: rpms/gtk2/devel gtk2.spec,1.126,1.127 Message-ID: <200603011409.k21E9e9N027639@cvs.devel.redhat.com> Author: karsten Update of /cvs/dist/rpms/gtk2/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv27471 Modified Files: gtk2.spec Log Message: - BuildRequires: libXi-devel /usr/bin/ld: cannot find -lXi collect2: ld returned 1 exit status Index: gtk2.spec =================================================================== RCS file: /cvs/dist/rpms/gtk2/devel/gtk2.spec,v retrieving revision 1.126 retrieving revision 1.127 diff -u -r1.126 -r1.127 --- gtk2.spec 27 Feb 2006 20:55:38 -0000 1.126 +++ gtk2.spec 1 Mar 2006 14:09:35 -0000 1.127 @@ -16,7 +16,7 @@ Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X. Name: gtk2 Version: %{base_version} -Release: 2 +Release: 3 License: LGPL Group: System Environment/Libraries Source: gtk+-%{version}.tar.bz2 @@ -34,6 +34,7 @@ BuildPrereq: glib2-devel >= %{glib2_version} BuildPrereq: libtiff-devel BuildPrereq: libjpeg-devel +BuildPrereq: libXi-devel BuildPrereq: libpng-devel >= %{libpng_version} BuildPrereq: /usr/bin/automake-1.7 # needed for running aclocal @@ -263,6 +264,9 @@ %doc tmpdocs/examples %changelog +* Wed Mar 01 2006 Karsten Hopp 2.8.13-3 +- Buildrequires: libXi-devel + * Mon Feb 27 2006 Ray Strode - 2.8.13-2 - s/Prereq/Requires/ for hicolor dep From fedora-cvs-commits at redhat.com Wed Mar 1 14:27:21 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 1 Mar 2006 09:27:21 -0500 Subject: rpms/kernel/devel linux-2.6-xen-cpusteal-hv.patch,1.2.2.2,1.2.2.3 Message-ID: <200603011427.k21ERL0I014464@cvs.devel.redhat.com> Author: riel Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv14426 Modified Files: Tag: private-xen-rebased-1971-branch linux-2.6-xen-cpusteal-hv.patch Log Message: why did I assume Keir would check in working code? linux-2.6-xen-cpusteal-hv.patch: common/dom0_ops.c | 9 ++ common/domain.c | 13 ++++ common/keyhandler.c | 6 - common/sched_bvt.c | 13 +--- common/sched_sedf.c | 8 -- common/schedule.c | 152 +++++++++++++++++++++---------------------------- include/public/vcpu.h | 34 ++++++++++ include/xen/sched-if.h | 6 - include/xen/sched.h | 12 +-- 9 files changed, 134 insertions(+), 119 deletions(-) Index: linux-2.6-xen-cpusteal-hv.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-xen-cpusteal-hv.patch,v retrieving revision 1.2.2.2 retrieving revision 1.2.2.3 diff -u -r1.2.2.2 -r1.2.2.3 --- linux-2.6-xen-cpusteal-hv.patch 28 Feb 2006 21:45:29 -0000 1.2.2.2 +++ linux-2.6-xen-cpusteal-hv.patch 1 Mar 2006 14:27:17 -0000 1.2.2.3 @@ -207,7 +207,7 @@ + { + /* Fast lock-free path. */ + memcpy(runstate, &v->runstate, sizeof(*runstate)); -+ ASSERT(runstate->state = RUNSTATE_running); ++ ASSERT(runstate->state == RUNSTATE_running); + runstate->time[RUNSTATE_running] += NOW() - runstate->state_entry_time; + } + else From fedora-cvs-commits at redhat.com Wed Mar 1 14:28:30 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 1 Mar 2006 09:28:30 -0500 Subject: rpms/kernel/devel kernel-2.6.spec, 1.1997, 1.1998 linux-2.6-xen-cpusteal-hv.patch, 1.2, 1.3 Message-ID: <200603011428.k21ESUM1014959@cvs.devel.redhat.com> Author: riel Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv14926 Modified Files: kernel-2.6.spec linux-2.6-xen-cpusteal-hv.patch Log Message: just look at what gets checked in upstream Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.1997 retrieving revision 1.1998 diff -u -r1.1997 -r1.1998 --- kernel-2.6.spec 28 Feb 2006 23:23:24 -0000 1.1997 +++ kernel-2.6.spec 1 Mar 2006 14:28:25 -0000 1.1998 @@ -3,15 +3,15 @@ # What parts do we want to build? We must build at least one kernel. # These are the kernels that are built IF the architecture allows it. -%define buildup 1 -%define buildsmp 1 +%define buildup 0 +%define buildsmp 0 # Whether to apply the Xen patches, leave this enabled. %define includexen 1 # Whether to build the Xen kernels, disable if you want. -%define buildxen 0 +%define buildxen 1 %define buildxenPAE 0 %define builddoc 0 -%define buildkdump 1 +%define buildkdump 0 # Versions of various parts linux-2.6-xen-cpusteal-hv.patch: common/dom0_ops.c | 9 ++ common/domain.c | 13 ++++ common/keyhandler.c | 6 - common/sched_bvt.c | 13 +--- common/sched_sedf.c | 8 -- common/schedule.c | 152 +++++++++++++++++++++---------------------------- include/public/vcpu.h | 34 ++++++++++ include/xen/sched-if.h | 6 - include/xen/sched.h | 12 +-- 9 files changed, 134 insertions(+), 119 deletions(-) Index: linux-2.6-xen-cpusteal-hv.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-xen-cpusteal-hv.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- linux-2.6-xen-cpusteal-hv.patch 28 Feb 2006 16:28:16 -0000 1.2 +++ linux-2.6-xen-cpusteal-hv.patch 1 Mar 2006 14:28:26 -0000 1.3 @@ -207,7 +207,7 @@ + { + /* Fast lock-free path. */ + memcpy(runstate, &v->runstate, sizeof(*runstate)); -+ ASSERT(runstate->state = RUNSTATE_running); ++ ASSERT(runstate->state == RUNSTATE_running); + runstate->time[RUNSTATE_running] += NOW() - runstate->state_entry_time; + } + else From fedora-cvs-commits at redhat.com Wed Mar 1 14:34:42 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 1 Mar 2006 09:34:42 -0500 Subject: rpms/Guppi/devel Guppi.spec,1.23,1.24 Message-ID: <200603011434.k21EYgtP016155@cvs.devel.redhat.com> Author: karsten Update of /cvs/dist/rpms/Guppi/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv15783 Modified Files: Guppi.spec Log Message: - BuildPreReq: libSM-devel /usr/bin/ld: cannot find -lSM Index: Guppi.spec =================================================================== RCS file: /cvs/dist/rpms/Guppi/devel/Guppi.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- Guppi.spec 13 Feb 2006 16:12:12 -0000 1.23 +++ Guppi.spec 1 Mar 2006 14:34:39 -0000 1.24 @@ -1,7 +1,7 @@ Summary: GNOME Data Analysis and Visualization. Name: Guppi Version: 0.40.3 -Release: 24.2.1.1 +Release: 25 License: GPL Group: Applications/Engineering Source: ftp://ftp.gnome.org/pub/guppi/%{name}-%{version}.tar.bz2 @@ -18,6 +18,7 @@ BuildPrereq: libglade-devel BuildPrereq: gdk-pixbuf-devel, gnome-print-devel BuildPrereq: gal-devel +BuildPrereq: libSM-devel %description Guppi is a GNOME-based data analysis and visualization system. @@ -82,6 +83,9 @@ %{_datadir}/aclocal/libguppi.m4 %changelog +* Wed Mar 01 2006 Karsten Hopp 0.40.3-25 +- BuildPreReq: libSM-devel + * Mon Feb 13 2006 Bill Nottingham - 0.40.3-24.2.1.1 - again and again and again and again and again From fedora-cvs-commits at redhat.com Wed Mar 1 14:46:30 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 1 Mar 2006 09:46:30 -0500 Subject: rpms/gtkhtml/devel gtkhtml.spec,1.22,1.23 Message-ID: <200603011446.k21EkUFq021775@cvs.devel.redhat.com> Author: karsten Update of /cvs/dist/rpms/gtkhtml/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv21184 Modified Files: gtkhtml.spec Log Message: - Buildrequires: GConf-devel, freetype-devel, libSM-devel Index: gtkhtml.spec =================================================================== RCS file: /cvs/dist/rpms/gtkhtml/devel/gtkhtml.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- gtkhtml.spec 11 Feb 2006 03:22:26 -0000 1.22 +++ gtkhtml.spec 1 Mar 2006 14:46:27 -0000 1.23 @@ -1,7 +1,7 @@ Summary: gtkhtml library Name: gtkhtml Version: 1.1.9 -Release: 11.2.1 +Release: 12 License: LGPL Group: System Environment/Libraries Source: ftp://ftp.gnome.org/pub/GNOME/sources/gtkhtml/gtkhtml-%{version}.tar.bz2 @@ -21,6 +21,9 @@ BuildRequires: /usr/bin/autoconf-2.13 BuildRequires: gettext BuildRequires: libghttp-devel +BuildRequires: GConf-devel +BuildRequires: freetype-devel +BuildRequires: libSM-devel %description GtkHTML is a lightweight HTML rendering/printing/editing engine. It @@ -134,6 +137,9 @@ %{_libdir}/pkgconfig/*.pc %changelog +* Wed Mar 01 2006 Karsten Hopp 1.1.9-12 +- Buildrequires: GConf-devel, freetype-devel, libSM-devel + * Fri Feb 10 2006 Jesse Keating - 1.1.9-11.2.1 - bump again for double-long bug on ppc(64) From fedora-cvs-commits at redhat.com Wed Mar 1 14:48:48 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 1 Mar 2006 09:48:48 -0500 Subject: rpms/squirrelmail/devel squirrelmail.spec,1.27,1.28 Message-ID: <200603011448.k21EmmYK023916@cvs.devel.redhat.com> Author: dwmw2 Update of /cvs/dist/rpms/squirrelmail/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv23903 Modified Files: squirrelmail.spec Log Message: No need to compile .po files if we don't want them Index: squirrelmail.spec =================================================================== RCS file: /cvs/dist/rpms/squirrelmail/devel/squirrelmail.spec,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- squirrelmail.spec 1 Mar 2006 10:16:46 -0000 1.27 +++ squirrelmail.spec 1 Mar 2006 14:48:46 -0000 1.28 @@ -11,12 +11,11 @@ URL: http://www.squirrelmail.org/ Group: Applications/Internet #Source: %{name}-%{version}.tar.bz2 -Source0: %{name}-%{version}.tar.bz2 +Source0: http://prdownloads.sourceforge.net/squirrelmail/%{name}-%{version}.tar.bz2 Source1: squirrelmail.conf Source2: squirrelmail-splash-fedora.png Source3: squirrelmail-splash-rhel.png -Source4: all_locales-1.4.6-20060221.tar.bz2 -Source5: compilelocales +Source4: http://prdownloads.sourceforge.net/squirrelmail/all_locales-1.4.6-20060221.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildArch: noarch Requires: httpd, php >= 4.0.4, php-mbstring, perl, tmpwatch >= 2.8, aspell @@ -174,7 +173,6 @@ sed s/charset=$CHARSET/charset=utf-8/ $POFILE | iconv -f $CHARSET -t utf-8 > $POFILE.new && mv $POFILE.new $POFILE fi done -sh $SOURCE5 cp -r locale/* $RPM_BUILD_ROOT%{_datadir}/squirrelmail/locale/ cp -r images/* $RPM_BUILD_ROOT%{_datadir}/squirrelmail/images/ cp -r help/* $RPM_BUILD_ROOT%{_datadir}/squirrelmail/help/ @@ -214,6 +212,8 @@ * Wed Mar 1 2006 David Woodhouse 1.4.6-1 - Upgrade to 1.4.6 proper - Script the charset changes instead of using a patch +- Convert the ko_KR files to UTF-8, dropping invalid characters from + what's theoretically supposed to be EUC-KR in the original. * Tue Jan 17 2006 Warren Togami 1.4.6-0.cvs20050812.3 - do not remove mo files From fedora-cvs-commits at redhat.com Wed Mar 1 14:49:17 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 1 Mar 2006 09:49:17 -0500 Subject: rpms/eclipse/devel eclipse-webapp-tomcat55.patch,NONE,1.1 Message-ID: <200603011449.k21EnH9u023941@cvs.devel.redhat.com> Author: overholt Update of /cvs/dist/rpms/eclipse/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv23927 Added Files: eclipse-webapp-tomcat55.patch Log Message: Add webapp patch. eclipse-webapp-tomcat55.patch: build.properties | 2 +- build.xml | 15 +++++++++------ 2 files changed, 10 insertions(+), 7 deletions(-) --- NEW FILE eclipse-webapp-tomcat55.patch --- Index: build.properties =================================================================== RCS file: /cvsroot/eclipse/org.eclipse.help.webapp/build.properties,v retrieving revision 1.32 diff -u -r1.32 build.properties --- build.properties 18 Mar 2005 08:00:28 -0000 1.32 +++ build.properties 28 Feb 2006 22:52:35 -0000 @@ -33,5 +33,5 @@ ../org.eclipse.help.appserver/bin,\ ../org.eclipse.help.appserver,\ ../org.eclipse.help.appserver/@dot,\ - ../org.eclipse.tomcat/servlet.jar,\ + ../org.eclipse.tomcat/servletapi5.jar,\ ../org.eclipse.tomcat/jasper-runtime.jar Index: build.xml =================================================================== RCS file: /cvsroot/eclipse/org.eclipse.help.webapp/build.xml,v retrieving revision 1.65 diff -u -r1.65 build.xml --- build.xml 18 Mar 2005 07:55:40 -0000 1.65 +++ build.xml 28 Feb 2006 22:52:35 -0000 @@ -126,7 +126,7 @@ - + @@ -154,11 +154,14 @@ - + - - + + + + + @@ -168,7 +171,6 @@ failonerror="false" classpathref="jasper.classpath" output="${temp.folder}/WEB-INF/lib/jsp.jar.bin.log"> - @@ -202,8 +204,9 @@ - + + From fedora-cvs-commits at redhat.com Wed Mar 1 15:01:20 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 1 Mar 2006 10:01:20 -0500 Subject: rpms/squirrelmail/devel squirrelmail.spec,1.28,1.29 Message-ID: <200603011501.k21F1K5P002060@cvs.devel.redhat.com> Author: dwmw2 Update of /cvs/dist/rpms/squirrelmail/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv1906 Modified Files: squirrelmail.spec Log Message: Hm, the .po files are shipped, despite the changelog entry which suggests otherwise. Build them manually -- although aren't they actually arch-dependent files, and hence shouldn't be in a .noarch.rpm? From fedora-cvs-commits at redhat.com Wed Mar 1 15:07:37 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 1 Mar 2006 10:07:37 -0500 Subject: rpms/hplip/devel hplip.spec,1.48,1.49 Message-ID: <200603011507.k21F7blg002986@cvs.devel.redhat.com> Author: karsten Update of /cvs/dist/rpms/hplip/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv2917 Modified Files: hplip.spec Log Message: - Buildrequires: desktop-file-utils desktop-file-install --vendor HP --dir /var/tmp/hplip-0.9.8-buildroot/usr/share/applications --add-category X-Red-Hat-Extra --add-category Utility --add-category Application /var/tmp/hplip-0.9.8-buildroot/usr/share/hplip/data/hplip.desktop /var/tmp/rpm-tmp.12079: line 49: desktop-file-install: command not found error: Bad exit status from /var/tmp/rpm-tmp.12079 (%install) Index: hplip.spec =================================================================== RCS file: /cvs/dist/rpms/hplip/devel/hplip.spec,v retrieving revision 1.48 retrieving revision 1.49 diff -u -r1.48 -r1.49 --- hplip.spec 27 Feb 2006 15:58:51 -0000 1.48 +++ hplip.spec 1 Mar 2006 15:07:35 -0000 1.49 @@ -1,7 +1,7 @@ Summary: HP Linux Imaging and Printing Project Name: hplip Version: 0.9.8 -Release: 5 +Release: 6 License: GPL/MIT/BSD Group: System Environment/Daemons Conflicts: system-config-printer < 0.6.132 @@ -26,6 +26,7 @@ BuildRequires: cups-devel BuildRequires: python-devel BuildRequires: libjpeg-devel +BuildRequires: desktop-file-utils %description The Hewlett-Packard Linux Imaging and Printing Project provides @@ -159,6 +160,9 @@ fi %changelog +* Wed Mar 01 2006 Karsten Hopp 0.9.8-6 +- Buildrequires: desktop-file-utils + * Mon Feb 27 2006 Tim Waugh 0.9.8-5 - Patchlevel 4. From fedora-cvs-commits at redhat.com Wed Mar 1 15:15:36 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 1 Mar 2006 10:15:36 -0500 Subject: rpms/star/devel .cvsignore, 1.12, 1.13 sources, 1.12, 1.13 star.spec, 1.23, 1.24 Message-ID: <200603011515.k21FFa1D005982@cvs.devel.redhat.com> Author: pvrabec Update of /cvs/dist/rpms/star/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv5859 Modified Files: .cvsignore sources star.spec Log Message: upgrade Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/star/devel/.cvsignore,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- .cvsignore 22 Feb 2006 10:14:45 -0000 1.12 +++ .cvsignore 1 Mar 2006 15:15:34 -0000 1.13 @@ -1 +1 @@ -star-1.5a71.tar.bz2 +star-1.5a72.tar.bz2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/star/devel/sources,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- sources 22 Feb 2006 10:14:45 -0000 1.12 +++ sources 1 Mar 2006 15:15:34 -0000 1.13 @@ -1 +1 @@ -3e9742f364b5aab85c961017dce04957 star-1.5a71.tar.bz2 +405ac8b06de049c440a4ebc316472d1f star-1.5a72.tar.bz2 Index: star.spec =================================================================== RCS file: /cvs/dist/rpms/star/devel/star.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- star.spec 22 Feb 2006 10:38:56 -0000 1.23 +++ star.spec 1 Mar 2006 15:15:34 -0000 1.24 @@ -3,7 +3,7 @@ %endif Summary: An archiving tool with ACL support Name: star -Version: 1.5a71 +Version: 1.5a72 Release: 1 URL: http://cdrecord.berlios.de/old/private/star.html Source: ftp://ftp.berlios.de/pub/star/alpha/%{name}-%{version}.tar.bz2 @@ -97,6 +97,9 @@ %{_mandir}/man1/spax.1* %changelog +* Wed Mar 01 2006 Peter Vrabec 1.5a72-1 +- upgrade + * Wed Feb 22 2006 Peter Vrabec 1.5a71-1 - upgrade From fedora-cvs-commits at redhat.com Wed Mar 1 15:16:55 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 1 Mar 2006 10:16:55 -0500 Subject: rpms/kernel/devel linux-2.6-radeon-backlight.patch,1.11,1.12 Message-ID: <200603011516.k21FGt9e018970@cvs.devel.redhat.com> Author: pjones Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv13390 Modified Files: linux-2.6-radeon-backlight.patch Log Message: - Today, the children learned that keeping lists sorted makes keeping track of their contents easier. linux-2.6-radeon-backlight.patch: radeon_base.c | 11 + radeon_pm.c | 555 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 565 insertions(+), 1 deletion(-) Index: linux-2.6-radeon-backlight.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-radeon-backlight.patch,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- linux-2.6-radeon-backlight.patch 21 Feb 2006 20:47:21 -0000 1.11 +++ linux-2.6-radeon-backlight.patch 1 Mar 2006 15:16:52 -0000 1.12 @@ -3,7 +3,7 @@ --- vanilla/drivers/video/aty/radeon_pm.c 2005-10-27 20:02:08.000000000 -0400 +++ linux-2.6.14/drivers/video/aty/radeon_pm.c 2005-11-30 02:20:01.000000000 -0500 -@@ -25,8 +25,532 @@ +@@ -25,8 +25,530 @@ #include #endif @@ -21,126 +21,112 @@ + * vendor and product codes for Your laptop. + */ +static struct dmi_system_id __devinitdata radeonfb_dmi_table[] = { -+ + { -+ /* Reported by Stephan Gro?? */ -+ .ident = "IBM ThinkPad T30 (2366-97G)", ++ /* Reported by Borschuk Oleg */ ++ .ident = "IBM ThinkPad R50 (1829-7RG)", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "236697G"), ++ DMI_MATCH(DMI_PRODUCT_NAME, "18297RG"), + }, + }, + { -+ /* Reported by Phillip Jones */ -+ .ident = "IBM ThinkPad T30 (2366-MU9)", ++ /* Reported by Georges Herber */ ++ .ident = "IBM ThinkPad R51 (1829-9MG)", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "2366MU9"), ++ DMI_MATCH(DMI_PRODUCT_NAME, "18299MG"), + }, + }, + { -+ /* Reported by Jakob Schiotz */ -+ .ident = "IBM ThinkPad T30 (2366-96G)", ++ /* Reported by Wouter Cloetens */ ++ .ident = "IBM ThinkPad R51 (1829-EHG)", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "236696G"), ++ DMI_MATCH(DMI_PRODUCT_NAME, "1829EHG"), + }, + }, + { -+ /* Reported by Thomas M Steenholdt */ -+ .ident = "IBM ThinkPad T30 (2366-JBG)", ++ /* Reported by Sten Heinze */ ++ .ident = "IBM ThinkPad R51 (1829-R6G)", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "2366JBG"), ++ DMI_MATCH(DMI_PRODUCT_NAME, "1829R6G"), + }, + }, ++ + { -+ /* Reported by ChazeFroy */ -+ .ident = "IBM ThinkPad T30 (2366-QU5)", ++ /* Reported by Eugene Pavlovsky */ ++ .ident = "IBM ThinkPad R51 (1836-Q6U)", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "2366QU5"), ++ DMI_MATCH(DMI_PRODUCT_NAME, "1836Q6U"), + }, + }, + + { -+ /* Reported by George Avrunin */ -+ .ident = "IBM ThinkPad T40 (2372-9CU)", ++ /* Reported by Jakob Schiotz */ ++ .ident = "IBM ThinkPad T30 (2366-96G)", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "23729CU"), ++ DMI_MATCH(DMI_PRODUCT_NAME, "236696G"), + }, + }, + { -+ /* Reported by Dmitriy Zavin */ -+ .ident = "IBM ThinkPad T40 (2373-14U)", ++ /* Reported by Stephan Gro?? */ ++ .ident = "IBM ThinkPad T30 (2366-97G)", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "237314U"), ++ DMI_MATCH(DMI_PRODUCT_NAME, "236697G"), + }, + }, + { -+ /* Reported by Klaus Kurzmann */ -+ .ident = "IBM ThinkPad T40 (2373-25G)", ++ /* Reported by Thomas M Steenholdt */ ++ .ident = "IBM ThinkPad T30 (2366-JBG)", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "237325G"), ++ DMI_MATCH(DMI_PRODUCT_NAME, "2366JBG"), + }, + }, + { -+ /* Reported by Antti P Miettinen */ -+ .ident = "IBM ThinkPad T40 (2373-4G2)", -+ .matches = { -+ DMI_MATCH(DMI_SYS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "23734G2"), -+ }, -+ }, -+ { -+ /* Reported by Pete Toscano */ -+ .ident = "IBM ThinkPad T40 (2373-92G)", -+ .matches = { -+ DMI_MATCH(DMI_SYS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "237392G"), -+ }, -+ }, -+ { -+ /* Reported by Pete Toscano */ -+ .ident = "IBM ThinkPad T40 (2373-8CG)", ++ /* Reported by Phillip Jones */ ++ .ident = "IBM ThinkPad T30 (2366-MU9)", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "23738CG"), ++ DMI_MATCH(DMI_PRODUCT_NAME, "2366MU9"), + }, + }, + { -+ /* Reported by Pete Toscano */ -+ .ident = "IBM ThinkPad T40 (2373-94U)", ++ /* Reported by ChazeFroy */ ++ .ident = "IBM ThinkPad T30 (2366-QU5)", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "237394U"), ++ DMI_MATCH(DMI_PRODUCT_NAME, "2366QU5"), + }, + }, ++ + { -+ /* Reported by Manuel Carro */ -+ .ident = "IBM ThinkPad T40 (2373-94G)", ++ /* Reported by George Avrunin */ ++ .ident = "IBM ThinkPad T40 (2372-9CU)", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "237394G"), ++ DMI_MATCH(DMI_PRODUCT_NAME, "23729CU"), + }, + }, ++ + { -+ /* Reported by Peter Jones */ -+ .ident = "IBM ThinkPad T40 (2373-BU7)", ++ /* Reported by Dmitriy Zavin */ ++ .ident = "IBM ThinkPad T40 (2373-14U)", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "2373BU7"), ++ DMI_MATCH(DMI_PRODUCT_NAME, "237314U"), + }, + }, + { -+ /* Reported by Vernon Mauery */ -+ .ident = "IBM ThinkPad T40 (2373-MU4)", ++ /* Reported by Aivo Prykk */ ++ .ident = "IBM ThinkPad T41 (2373-1FG)", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "2373MU4"), ++ DMI_MATCH(DMI_PRODUCT_NAME, "23731FG"), + }, + }, + { @@ -152,150 +138,150 @@ + }, + }, + { -+ /* Reported by Adam Glasgall */ -+ .ident = "IBM ThinkPad T40 (2373-RU1)", ++ /* Reported by Klaus Kurzmann */ ++ .ident = "IBM ThinkPad T40 (2373-25G)", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "2373RU1"), ++ DMI_MATCH(DMI_PRODUCT_NAME, "237325G"), + }, + }, + { -+ /* Reported by Juerg Billeter */ -+ .ident = "IBM ThinkPad T40p (2373-G1G)", ++ /* Reported by Antti Andreimann */ ++ .ident = "IBM ThinkPad T41 (2373-2FG)", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "2373G1G"), ++ DMI_MATCH(DMI_PRODUCT_NAME, "23732FG"), + }, + }, + { -+ /* Reported by Bill Nottingham */ -+ .ident = "IBM ThinkPad T40p (2373-G1U)", ++ /* Reported by Grahame Bowland */ ++ .ident = "IBM ThinkPad T41 (2373-3HM)", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "2373G1U"), ++ DMI_MATCH(DMI_PRODUCT_NAME, "23733HM"), + }, + }, + { -+ /* Reported by Hartwig, Thomas */ -+ .ident = "IBM ThinkPad T40p (2373-G3G)", ++ /* Reported by Antti P Miettinen */ ++ .ident = "IBM ThinkPad T40 (2373-4G2)", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "2373G3G"), ++ DMI_MATCH(DMI_PRODUCT_NAME, "23734G2"), + }, + }, -+ + { -+ /* Reported by Antti Andreimann */ -+ .ident = "IBM ThinkPad T41 (2373-2FG)", ++ /* Reported by Matthew Saltzman */ ++ .ident = "IBM ThinkPad T41 (2373-7JU)", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "23732FG"), ++ DMI_MATCH(DMI_PRODUCT_NAME, "23737JU"), + }, + }, + { -+ /* Reported by Peter Jones */ -+ .ident = "IBM ThinkPad T41 (2373-9FU)", ++ /* Reported by Pete Toscano */ ++ .ident = "IBM ThinkPad T40 (2373-8CG)", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "23739FU"), ++ DMI_MATCH(DMI_PRODUCT_NAME, "23738CG"), + }, + }, + { -+ /* Reported by Ajay Ramaswamy */ -+ .ident = "IBM ThinkPad T41 (2373-9HU)", ++ /* Reported by Pete Toscano */ ++ .ident = "IBM ThinkPad T40 (2373-92G)", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "23739HU"), -+ }, ++ DMI_MATCH(DMI_PRODUCT_NAME, "237392G"), ++ }, + }, + { -+ /* Reported by Ajay Ramaswamy */ -+ .ident = "IBM ThinkPad T41 (2373-XNX)", ++ /* Reported by Manuel Carro */ ++ .ident = "IBM ThinkPad T40 (2373-94G)", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "2373XNX"), -+ }, ++ DMI_MATCH(DMI_PRODUCT_NAME, "237394G"), ++ }, + }, + { -+ /* Reported by obi */ -+ .ident = "IBM ThinkPad T41 (2378-DEU)", ++ /* Reported by Pete Toscano */ ++ .ident = "IBM ThinkPad T40 (2373-94U)", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "2378DEU"), ++ DMI_MATCH(DMI_PRODUCT_NAME, "237394U"), + }, + }, + { -+ /* Reported by Volker Braun */ -+ .ident = "IBM ThinkPad T41 (2379-DJU)", ++ /* Reported by Peter Jones */ ++ .ident = "IBM ThinkPad T41 (2373-9FU)", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "2379DJU"), ++ DMI_MATCH(DMI_PRODUCT_NAME, "23739FU"), + }, + }, + { -+ /* Reported by Paul Ionescu */ -+ .ident = "IBM ThinkPad T41 (2373-TG5)", ++ /* Reported by Chris Vanden Berghe */ ++ .ident = "IBM ThinkPad T41 (2373-9HG)", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "2373TG5"), ++ DMI_MATCH(DMI_PRODUCT_NAME, "23739HG"), + }, + }, + { -+ /* Reported by Matthew Saltzman */ -+ .ident = "IBM ThinkPad T41 (2373-7JU)", ++ /* Reported by Ajay Ramaswamy */ ++ .ident = "IBM ThinkPad T41 (2373-9HU)", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "23737JU"), ++ DMI_MATCH(DMI_PRODUCT_NAME, "23739HU"), + }, + }, + { -+ /* Reported by David Zeuthen */ -+ .ident = "IBM ThinkPad T41 (2373-HU6)", ++ /* Reported by Peter Jones */ ++ .ident = "IBM ThinkPad T40 (2373-BU7)", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "2373HU6"), ++ DMI_MATCH(DMI_PRODUCT_NAME, "2373BU7"), + }, + }, + { -+ /* Reported by Grahame Bowland */ -+ .ident = "IBM ThinkPad T41 (2373-3HM)", ++ /* Reported by Isaac Wilcox */ ++ .ident = "IBM ThinkPad T42 (2373-F2G)", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "23733HM"), ++ DMI_MATCH(DMI_PRODUCT_NAME, "2373F2G"), + }, + }, + { -+ /* Reported by Aivo Prykk */ -+ .ident = "IBM ThinkPad T41 (2373-1FG)", ++ /* Reported by Jerome Poggi ++ and Pete Toscano */ ++ .ident = "IBM ThinkPad T42 (2373-FWG)", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "23731FG"), ++ DMI_MATCH(DMI_PRODUCT_NAME, "2373FWG"), + }, -+ }, ++ } + { -+ /* Reported by Chris Vanden Berghe */ -+ .ident = "IBM ThinkPad T41 (2373-9HG)", ++ /* Reported by Juerg Billeter */ ++ .ident = "IBM ThinkPad T40p (2373-G1G)", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "23739HG"), ++ DMI_MATCH(DMI_PRODUCT_NAME, "2373G1G"), + }, + }, + { -+ /* Reported by Paul Stanisci */ -+ .ident = "IBM ThinkPad T41 (2378-DLU)", ++ /* Reported by Bill Nottingham */ ++ .ident = "IBM ThinkPad T40p (2373-G1U)", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "2378DLU"), ++ DMI_MATCH(DMI_PRODUCT_NAME, "2373G1U"), + }, + }, + { -+ .ident = "IBM ThinkPad T41 (2379-D6U)", ++ /* Reported by Hartwig, Thomas */ ++ .ident = "IBM ThinkPad T40p (2373-G3G)", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "2379D6U"), ++ DMI_MATCH(DMI_PRODUCT_NAME, "2373G3G"), + }, + }, -+ + { + /* Reported by Eric Benson */ + .ident = "IBM ThinkPad T41p (2373-GEU)", @@ -304,13 +290,12 @@ + DMI_MATCH(DMI_PRODUCT_NAME, "2373GEU"), + }, + }, -+ + { -+ /* Reported by Tim Hull */ -+ .ident = "IBM ThinkPad T42 (2374-6VU)", ++ /* Reported by David Zeuthen */ ++ .ident = "IBM ThinkPad T41 (2373-HU6)", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "23746VU"), ++ DMI_MATCH(DMI_PRODUCT_NAME, "2373HU6"), + }, + }, + { @@ -322,36 +307,44 @@ + }, + }, + { -+ /* Reported by Jerome Poggi -+ and Pete Toscano */ -+ .ident = "IBM ThinkPad T42 (2373-FWG)", ++ /* Reported by Vernon Mauery */ ++ .ident = "IBM ThinkPad T40 (2373-MU4)", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "2373FWG"), ++ DMI_MATCH(DMI_PRODUCT_NAME, "2373MU4"), + }, + }, + { -+ /* Reported by Ulrich Drepper */ -+ .ident = "IBM ThinkPad T42 (2378-R2U)", ++ /* Reported by Adam Glasgall */ ++ .ident = "IBM ThinkPad T40 (2373-RU1)", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "2378R2U"), ++ DMI_MATCH(DMI_PRODUCT_NAME, "2373RU1"), + }, + }, + { -+ /* Reported by Nicolas Dufresne */ -+ .ident = "IBM ThinkPad T42 (2378-RBF)", ++ /* Reported by Paul Ionescu */ ++ .ident = "IBM ThinkPad T41 (2373-TG5)", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "2378RBF"), ++ DMI_MATCH(DMI_PRODUCT_NAME, "2373TG5"), + }, + }, + { -+ /* Reported by Nicolas Dufresne */ -+ .ident = "IBM ThinkPad T42 (2378-RBU)", ++ /* Reported by Ajay Ramaswamy */ ++ .ident = "IBM ThinkPad T41 (2373-XNX)", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "2378RBU"), ++ DMI_MATCH(DMI_PRODUCT_NAME, "2373XNX"), ++ }, ++ }, ++ ++ { ++ /* Reported by Tim Hull */ ++ .ident = "IBM ThinkPad T42 (2374-6VU)", ++ .matches = { ++ DMI_MATCH(DMI_SYS_VENDOR, "IBM"), ++ DMI_MATCH(DMI_PRODUCT_NAME, "23746VU"), + }, + }, + { @@ -370,20 +363,21 @@ + DMI_MATCH(DMI_PRODUCT_NAME, "2374ZEP"), + }, + }, ++ + { -+ /* Reported by Tom Marshall */ -+ .ident = "IBM ThinkPad T42 (2378-XXE)", ++ /* Reported by obi */ ++ .ident = "IBM ThinkPad T41 (2378-DEU)", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "2378XXE"), ++ DMI_MATCH(DMI_PRODUCT_NAME, "2378DEU"), + }, + }, + { -+ /* Reported by Isaac Wilcox */ -+ .ident = "IBM ThinkPad T42 (2373-F2G)", ++ /* Reported by Paul Stanisci */ ++ .ident = "IBM ThinkPad T41 (2378-DLU)", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "2373F2G"), ++ DMI_MATCH(DMI_PRODUCT_NAME, "2378DLU"), + }, + }, + { @@ -394,140 +388,144 @@ + DMI_MATCH(DMI_PRODUCT_NAME, "2378DUU"), + }, + }, -+ + { -+ /* Reported by Frank Otto */ -+ .ident = "IBM ThinkPad R32 (2658-BQG)", ++ /* Reported by Ulrich Drepper */ ++ .ident = "IBM ThinkPad T42 (2378-R2U)", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "2658BQG"), ++ DMI_MATCH(DMI_PRODUCT_NAME, "2378R2U"), + }, + }, -+ + { -+ /* Reported by Frank Schmitt */ -+ .ident = "IBM ThinkPad R40 (2722-3GG)", ++ /* Reported by Nicolas Dufresne */ ++ .ident = "IBM ThinkPad T42 (2378-RBF)", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "27223GG"), ++ DMI_MATCH(DMI_PRODUCT_NAME, "2378RBF"), + }, + }, + { -+ /* Reported by Rushi Bhatt */ -+ .ident = "IBM ThinkPad R40 (2722-6YU)", ++ /* Reported by Nicolas Dufresne */ ++ .ident = "IBM ThinkPad T42 (2378-RBU)", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "27226YU"), ++ DMI_MATCH(DMI_PRODUCT_NAME, "2378RBU"), + }, + }, + { -+ /* Reported by Nils Trebing */ -+ .ident = "IBM ThinkPad R40 (2722-5MG)", ++ /* Reported by Tom Marshall */ ++ .ident = "IBM ThinkPad T42 (2378-XXE)", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "27225MG"), ++ DMI_MATCH(DMI_PRODUCT_NAME, "2378XXE"), + }, + }, ++ + { -+ /* Reported by Meik Hellmund */ -+ .ident = "IBM ThinkPad R40 (2722-CDG)", ++ .ident = "IBM ThinkPad T41 (2379-D6U)", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "2722CDG"), ++ DMI_MATCH(DMI_PRODUCT_NAME, "2379D6U"), + }, + }, + { -+ /* Reported by Pete Toscano */ -+ .ident = "IBM ThinkPad R40 (2722-B3G)", ++ /* Reported by Volker Braun */ ++ .ident = "IBM ThinkPad T41 (2379-DJU)", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "2722B3G"), ++ DMI_MATCH(DMI_PRODUCT_NAME, "2379DJU"), + }, + }, + -+ + { -+ /* Reported by Borschuk Oleg */ -+ .ident = "IBM ThinkPad R50 (1829-7RG)", ++ /* Reported by Frank Otto */ ++ .ident = "IBM ThinkPad R32 (2658-BQG)", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "18297RG"), ++ DMI_MATCH(DMI_PRODUCT_NAME, "2658BQG"), + }, + }, + + { -+ /* Reported by Georges Herber */ -+ .ident = "IBM ThinkPad R51 (1829-9MG)", ++ /* Reported by Chris Lee */ ++ .ident = "IBM ThinkPad X31 (2672-5KU)", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "18299MG"), ++ DMI_MATCH(DMI_PRODUCT_NAME, "26725KU"), + }, + }, + { -+ /* Reported by Eugene Pavlovsky */ -+ .ident = "IBM ThinkPad R51 (1836-Q6U)", ++ /* Reported by Jeremy Katz */ ++ .ident = "IBM ThinkPad X31 (2672-A9U)", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "1836Q6U"), ++ DMI_MATCH(DMI_PRODUCT_NAME, "2672A9U"), + }, + }, + { -+ /* Reported by Sten Heinze */ -+ .ident = "IBM ThinkPad R51 (1829-R6G)", ++ /* Reported by Chris Blizzard */ ++ .ident = "IBM ThinkPad X31 (2672-RU3)", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "1829R6G"), ++ DMI_MATCH(DMI_PRODUCT_NAME, "2672RU3"), + }, + }, + { -+ /* Reported by Wouter Cloetens */ -+ .ident = "IBM ThinkPad R51 (1829-EHG)", ++ /* IBM ThinkPad X31 2672-XXH -> works, but doesn't fix the LCD ++ backlight on during S3 issue. ++ Reported by: Henrik Brix Andersen */ ++ .ident = "IBM ThinkPad X31 (2672-XXH)", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "1829EHG"), ++ DMI_MATCH(DMI_PRODUCT_NAME, "2672XXH"), + }, + }, + -+ + { -+ /* Reported by Henrik Brix Andersen */ -+ .ident = "IBM ThinkPad X31 (2672-XXH)", ++ /* Reported by Frank Schmitt */ ++ .ident = "IBM ThinkPad R40 (2722-3GG)", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "2672XXH"), ++ DMI_MATCH(DMI_PRODUCT_NAME, "27223GG"), + }, + }, + { -+ /* Reported by Jeremy Katz */ -+ .ident = "IBM ThinkPad X31 (2672-A9U)", ++ /* Reported by Nils Trebing */ ++ .ident = "IBM ThinkPad R40 (2722-5MG)", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "2672A9U"), ++ DMI_MATCH(DMI_PRODUCT_NAME, "27225MG"), + }, + }, + { -+ /* Reported by Chris Lee */ -+ .ident = "IBM ThinkPad X31 (2672-5KU)", ++ /* Reported by Rushi Bhatt */ ++ .ident = "IBM ThinkPad R40 (2722-6YU)", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "26725KU"), ++ DMI_MATCH(DMI_PRODUCT_NAME, "27226YU"), + }, + }, + { -+ /* Reported by Chris Blizzard */ -+ .ident = "IBM ThinkPad X31 (2672-RU3)", ++ /* Reported by Pete Toscano */ ++ .ident = "IBM ThinkPad R40 (2722-B3G)", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "2672RU3"), ++ DMI_MATCH(DMI_PRODUCT_NAME, "2722B3G"), + }, + }, ++ { ++ /* Reported by Meik Hellmund */ ++ .ident = "IBM ThinkPad R40 (2722-CDG)", ++ .matches = { ++ DMI_MATCH(DMI_SYS_VENDOR, "IBM"), ++ DMI_MATCH(DMI_PRODUCT_NAME, "2722CDG"), ++ }, ++ }, ++ + { }, + /* Negative reports: */ + /* IBM thinkpad T42p 2373-KUU -> machine hangs as X starts + Reported by: Dax Kelson */ -+ /* IBM ThinkPad X31 2672-XXH -> works, but doesn't fix the LCD -+ backlight on during S3 issue. -+ Reported by: Henrik Brix Andersen */ +}; + +extern int radeon_force_sleep; @@ -536,7 +534,7 @@ static void radeon_pm_disable_dynamic_mode(struct radeonfb_info *rinfo) { u32 tmp; -@@ -852,7 +1376,14 @@ static void radeon_pm_setup_for_suspend( +@@ -852,7 +1367,14 @@ static void radeon_pm_setup_for_suspend( /* because both INPLL and OUTPLL take the same lock, that's why. */ tmp = INPLL( pllMCLK_MISC) | MCLK_MISC__EN_MCLK_TRISTATE_IN_SUSPEND; OUTPLL( pllMCLK_MISC, tmp); @@ -552,7 +550,7 @@ /* AGP PLL control */ if (rinfo->family <= CHIP_FAMILY_RV280) { OUTREG(BUS_CNTL1, INREG(BUS_CNTL1) | BUS_CNTL1__AGPCLK_VALID); -@@ -864,6 +1395,7 @@ static void radeon_pm_setup_for_suspend( +@@ -864,6 +1386,7 @@ static void radeon_pm_setup_for_suspend( OUTREG(BUS_CNTL1, INREG(BUS_CNTL1)); OUTREG(BUS_CNTL1, (INREG(BUS_CNTL1) & ~0x4000) | 0x8000); } @@ -560,7 +558,7 @@ OUTREG(CRTC_OFFSET_CNTL, (INREG(CRTC_OFFSET_CNTL) & ~CRTC_OFFSET_CNTL__CRTC_STEREO_SYNC_OUT_EN)); -@@ -3322,6 +3322,29 @@ void radeonfb_pm_init(struct radeonfb_in +@@ -2790,6 +3312,29 @@ void radeonfb_pm_init(struct radeonfb_in } #endif /* defined(CONFIG_PPC_PMAC) */ #endif /* defined(CONFIG_PM) */ @@ -602,7 +600,7 @@ /* * prototypes -@@ -2530,6 +2533,10 @@ +@@ -2615,6 +2618,10 @@ force_measure_pll = 1; } else if (!strncmp(this_opt, "ignore_edid", 11)) { ignore_edid = 1; @@ -613,7 +611,7 @@ } else mode_option = this_opt; } -@@ -2585,3 +2592,7 @@ +@@ -2670,3 +2674,7 @@ MODULE_PARM_DESC(panel_yres, "int: set panel yres"); module_param(mode_option, charp, 0); MODULE_PARM_DESC(mode_option, "Specify resolution as \"x[-][@]\" "); From fedora-cvs-commits at redhat.com Wed Mar 1 15:19:01 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 1 Mar 2006 10:19:01 -0500 Subject: rpms/jfsutils/devel jfsutils.spec,1.14,1.15 Message-ID: <200603011519.k21FJ1CJ019966@cvs.devel.redhat.com> Author: karsten Update of /cvs/dist/rpms/jfsutils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv19835 Modified Files: jfsutils.spec Log Message: - BuildRequires: e2fsprogs-devel checking for uuid/uuid.h... no configure: error: 'Install e2fsprogs-libs e2fsprogs-devel or uuid-dev' Index: jfsutils.spec =================================================================== RCS file: /cvs/dist/rpms/jfsutils/devel/jfsutils.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- jfsutils.spec 11 Feb 2006 03:41:50 -0000 1.14 +++ jfsutils.spec 1 Mar 2006 15:18:58 -0000 1.15 @@ -1,12 +1,13 @@ Summary: Utilities for managing the JFS filesystem. Name: jfsutils Version: 1.1.10 -Release: 3.2 +Release: 4 Source0: jfsutils-%{version}.tar.gz URL: http://oss.software.ibm.com/jfs Group: System Environment/Base License: GPL Buildroot: %{_tmppath}/%{name}-root +Buildrequires: e2fsprogs-devel %description The jfsutils package contains a number of utilities for creating, @@ -43,6 +44,9 @@ %doc AUTHORS COPYING INSTALL NEWS README ChangeLog %changelog +* Wed Mar 01 2006 Karsten Hopp 1.1.10-4 +- BuildRequires: e2fsprogs-devel + * Fri Feb 10 2006 Jesse Keating - 1.1.10-3.2 - bump again for double-long bug on ppc(64) From fedora-cvs-commits at redhat.com Wed Mar 1 15:22:48 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 1 Mar 2006 10:22:48 -0500 Subject: rpms/isdn4k-utils/devel isdn4k-utils.spec,1.51,1.52 Message-ID: <200603011522.k21FMmJn021715@cvs.devel.redhat.com> Author: karsten Update of /cvs/dist/rpms/isdn4k-utils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv21570 Modified Files: isdn4k-utils.spec Log Message: - Buildrequires: libXp-devel /usr/bin/ld: cannot find -lXp collect2: ld returned 1 exit status Index: isdn4k-utils.spec =================================================================== RCS file: /cvs/dist/rpms/isdn4k-utils/devel/isdn4k-utils.spec,v retrieving revision 1.51 retrieving revision 1.52 diff -u -r1.51 -r1.52 --- isdn4k-utils.spec 17 Feb 2006 17:02:53 -0000 1.51 +++ isdn4k-utils.spec 1 Mar 2006 15:22:46 -0000 1.52 @@ -15,7 +15,7 @@ Summary: Utilities for configuring an ISDN subsystem. Name: isdn4k-utils Version: 3.2 -Release: 39 +Release: 40 License: GPL Group: Applications/System @@ -57,6 +57,7 @@ BuildPrereq: libXmu-devel BuildPrereq: libXpm-devel BuildPrereq: libXt-devel +BuildPrereq: libXp-devel BuildPrereq: imake Prereq: /sbin/chkconfig @@ -478,6 +479,9 @@ %doc xmonisdn/README %changelog +* Wed Mar 01 2006 Karsten Hopp 3.2-40 +- Buildrequires: libXp-devel + * Fri Feb 17 2006 Than Ngo 3.2-39 - fix rpm file conflict #181854 From fedora-cvs-commits at redhat.com Wed Mar 1 15:27:02 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 1 Mar 2006 10:27:02 -0500 Subject: rpms/kernel/devel linux-2.6-radeon-backlight.patch,1.12,1.13 Message-ID: <200603011527.k21FR21O023753@cvs.devel.redhat.com> Author: pjones Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv23672 Modified Files: linux-2.6-radeon-backlight.patch Log Message: - fix typo - add another X31 entry linux-2.6-radeon-backlight.patch: radeon_base.c | 11 + radeon_pm.c | 563 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 573 insertions(+), 1 deletion(-) Index: linux-2.6-radeon-backlight.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-radeon-backlight.patch,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- linux-2.6-radeon-backlight.patch 1 Mar 2006 15:16:52 -0000 1.12 +++ linux-2.6-radeon-backlight.patch 1 Mar 2006 15:26:58 -0000 1.13 @@ -3,7 +3,7 @@ --- vanilla/drivers/video/aty/radeon_pm.c 2005-10-27 20:02:08.000000000 -0400 +++ linux-2.6.14/drivers/video/aty/radeon_pm.c 2005-11-30 02:20:01.000000000 -0500 -@@ -25,8 +25,530 @@ +@@ -25,8 +25,538 @@ #include #endif @@ -257,7 +257,7 @@ + DMI_MATCH(DMI_SYS_VENDOR, "IBM"), + DMI_MATCH(DMI_PRODUCT_NAME, "2373FWG"), + }, -+ } ++ }, + { + /* Reported by Juerg Billeter */ + .ident = "IBM ThinkPad T40p (2373-G1G)", @@ -463,6 +463,14 @@ + }, + }, + { ++ /* Reported by Daniel P. Berrange */ ++ .ident = "IBM ThinkPad X31 (2672-JHG)", ++ .matches = { ++ DMI_MATCH(DMI_SYS_VENDOR, "IBM"), ++ DMI_MATCH(DMI_PRODUCT_NAME, "2672JHG"), ++ }, ++ }, ++ { + /* Reported by Chris Blizzard */ + .ident = "IBM ThinkPad X31 (2672-RU3)", + .matches = { @@ -534,7 +542,7 @@ static void radeon_pm_disable_dynamic_mode(struct radeonfb_info *rinfo) { u32 tmp; -@@ -852,7 +1367,14 @@ static void radeon_pm_setup_for_suspend( +@@ -852,7 +1375,14 @@ static void radeon_pm_setup_for_suspend( /* because both INPLL and OUTPLL take the same lock, that's why. */ tmp = INPLL( pllMCLK_MISC) | MCLK_MISC__EN_MCLK_TRISTATE_IN_SUSPEND; OUTPLL( pllMCLK_MISC, tmp); @@ -550,7 +558,7 @@ /* AGP PLL control */ if (rinfo->family <= CHIP_FAMILY_RV280) { OUTREG(BUS_CNTL1, INREG(BUS_CNTL1) | BUS_CNTL1__AGPCLK_VALID); -@@ -864,6 +1386,7 @@ static void radeon_pm_setup_for_suspend( +@@ -864,6 +1394,7 @@ static void radeon_pm_setup_for_suspend( OUTREG(BUS_CNTL1, INREG(BUS_CNTL1)); OUTREG(BUS_CNTL1, (INREG(BUS_CNTL1) & ~0x4000) | 0x8000); } @@ -558,7 +566,7 @@ OUTREG(CRTC_OFFSET_CNTL, (INREG(CRTC_OFFSET_CNTL) & ~CRTC_OFFSET_CNTL__CRTC_STEREO_SYNC_OUT_EN)); -@@ -2790,6 +3312,29 @@ void radeonfb_pm_init(struct radeonfb_in +@@ -2790,6 +3320,29 @@ void radeonfb_pm_init(struct radeonfb_in } #endif /* defined(CONFIG_PPC_PMAC) */ #endif /* defined(CONFIG_PM) */ From fedora-cvs-commits at redhat.com Wed Mar 1 15:27:29 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 1 Mar 2006 10:27:29 -0500 Subject: rpms/pm-utils/devel pm-utils.spec,1.27,1.28 sources,1.18,1.19 Message-ID: <200603011527.k21FRT76023991@cvs.devel.redhat.com> Author: pknirsch Update of /cvs/dist/rpms/pm-utils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv23906 Modified Files: pm-utils.spec sources Log Message: - Use vbetool post instead of vbetool dpms on for ATI cards. Index: pm-utils.spec =================================================================== RCS file: /cvs/dist/rpms/pm-utils/devel/pm-utils.spec,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- pm-utils.spec 1 Mar 2006 03:27:12 -0000 1.27 +++ pm-utils.spec 1 Mar 2006 15:27:26 -0000 1.28 @@ -1,7 +1,7 @@ Name: pm-utils Summary: Power management utilities and scripts for Fedora Core License: GPL -Version: 0.11 +Version: 0.12 Release: 1 Group: System Environment/Base ExclusiveArch: %{ix86} x86_64 ia64 ppc ppc64 @@ -81,6 +81,9 @@ %{_mandir}/man*/* %changelog +* Wed Mar 01 2006 Phil Knirsch - 0.12-1 +- Use vbetool post instead of vbetool dpms on for ATI cards. + * Tue Feb 28 2006 Jeremy Katz - allow building on all x86 arches (#183175) Index: sources =================================================================== RCS file: /cvs/dist/rpms/pm-utils/devel/sources,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- sources 1 Mar 2006 03:20:16 -0000 1.18 +++ sources 1 Mar 2006 15:27:26 -0000 1.19 @@ -1,3 +1,3 @@ +424c372a353b9ece38967b72cdd6b7bd pm-utils-0.12.tar.gz 8065eebe5a2b163e43b40461bfe49a56 radeontool-1.5.tar.gz 950a87f99d17bc4f4ced73cec7103859 vbetool_0.5-1.tar.gz -790f6c189b9ed1c995373abc0b80f733 pm-utils-0.11.tar.gz From fedora-cvs-commits at redhat.com Wed Mar 1 15:31:12 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 1 Mar 2006 10:31:12 -0500 Subject: rpms/wpa_supplicant/devel wpa_supplicant.spec,1.9,1.10 Message-ID: <200603011531.k21FVC2e024832@cvs.devel.redhat.com> Author: dcbw Update of /cvs/dist/rpms/wpa_supplicant/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv24817 Modified Files: wpa_supplicant.spec Log Message: * Wed Mar 1 2006 Dan Williams - 0.4.8-3 - Install wpa_passphrase too #rh183480# Index: wpa_supplicant.spec =================================================================== RCS file: /cvs/dist/rpms/wpa_supplicant/devel/wpa_supplicant.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- wpa_supplicant.spec 28 Feb 2006 05:03:44 -0000 1.9 +++ wpa_supplicant.spec 1 Mar 2006 15:31:08 -0000 1.10 @@ -2,7 +2,7 @@ Name: wpa_supplicant Epoch: 1 Version: 0.4.8 -Release: 2 +Release: 3 License: GPL Group: System Environment/Base Source0: http://hostap.epitest.fi/releases/%{name}-%{version}.tar.gz @@ -60,6 +60,7 @@ # binary install -d %{buildroot}/%{_sbindir} +install -m 0755 -s wpa_passphrase %{buildroot}/%{_sbindir} install -m 0755 -s wpa_cli %{buildroot}/%{_sbindir} install -m 0755 -s wpa_supplicant %{buildroot}/%{_sbindir} @@ -101,6 +102,7 @@ %config(noreplace) %{_sysconfdir}/%{name}/%{name}.conf %config(noreplace) %{_sysconfdir}/sysconfig/%{name} %{_sysconfdir}/rc.d/init.d/%{name} +%{_sbindir}/wpa_passphrase %{_sbindir}/wpa_supplicant %{_sbindir}/wpa_cli %{_localstatedir}/run/%{name} @@ -112,6 +114,9 @@ %{_bindir}/wpa_gui %changelog +* Wed Mar 1 2006 Dan Williams - 0.4.8-3 +- Install wpa_passphrase too #rh183480# + * Mon Feb 27 2006 Dan Williams - 0.4.8-2 - Don't expose private data on the control interface unless requested From fedora-cvs-commits at redhat.com Wed Mar 1 15:34:26 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 1 Mar 2006 10:34:26 -0500 Subject: rpms/imake/devel imake.spec,1.18,1.19 Message-ID: <200603011534.k21FYQbX025039@cvs.devel.redhat.com> Author: karsten Update of /cvs/dist/rpms/imake/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv24981 Modified Files: imake.spec Log Message: - Buildrequires: xorg-x11-proto-devel checking for XPROTO... configure: error: Package requirements (xproto) were not met: No package 'xproto' found Index: imake.spec =================================================================== RCS file: /cvs/dist/rpms/imake/devel/imake.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- imake.spec 1 Mar 2006 06:11:42 -0000 1.18 +++ imake.spec 1 Mar 2006 15:34:21 -0000 1.19 @@ -1,7 +1,7 @@ Summary: imake source code configuration and build system Name: imake Version: 1.0.1 -Release: 1.2 +Release: 2 License: MIT/X11 Group: User Interface/X URL: http://www.x.org @@ -18,7 +18,7 @@ Patch2: xorg-cf-files-1.0.1-redhat.patch BuildRequires: pkgconfig -BuildRequires: xorg-x11-util-macros +BuildRequires: xorg-x11-util-macros xorg-x11-proto-devel # libxkbfile-devel needed for setxkbmap, xkbcomp, xkbevd, xkbprint #BuildRequires: libxkbfile-devel @@ -137,6 +137,9 @@ %{_mandir}/man1/xmkmf.1x* %changelog +* Wed Mar 01 2006 Karsten Hopp 1.0.1-2 +- Buildrequires: xorg-x11-proto-devel + * Fri Feb 10 2006 Jesse Keating 1.0.1-1.2 - bump again for double-long bug on ppc(64) From fedora-cvs-commits at redhat.com Wed Mar 1 15:35:54 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 1 Mar 2006 10:35:54 -0500 Subject: rpms/m17n-db/devel bn-itrans-t-182227.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 m17n-db.spec, 1.6, 1.7 sources, 1.5, 1.6 Message-ID: <200603011535.k21FZskX025257@cvs.devel.redhat.com> Author: petersen Update of /cvs/dist/rpms/m17n-db/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv25056 Modified Files: .cvsignore m17n-db.spec sources Added Files: bn-itrans-t-182227.patch Log Message: - update to 1.3.3 bugfix release - fixes to Bengali, Hindi, and Punjabi maps (runab, aalam) - Tamil phonetic map now works - new Tamil99 Government Standard map (I Felix) bn-itrans-t-182227.patch: bn-itrans.mim | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE bn-itrans-t-182227.patch --- --- m17n-db-1.3.3/bn-itrans.mim~ 2006-02-03 20:47:17.000000000 +0900 +++ m17n-db-1.3.3/bn-itrans.mim 2006-03-01 23:50:42.000000000 +0900 @@ -61,7 +61,7 @@ ("D" "??????") ("Dh" "??????") ("N" "??????") - ("t" "??????") + ("t" "???") ("th" "??????") ("d" "??????") ("dh" "??????") Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/m17n-db/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 13 Feb 2006 16:58:02 -0000 1.5 +++ .cvsignore 1 Mar 2006 15:35:39 -0000 1.6 @@ -1,2 +1,2 @@ -m17n-db-1.3.2.tar.gz -m17n-db-indic-0.1.tar.gz +m17n-db-1.3.3.tar.gz +m17n-db-indic-0.2.1.tar.gz Index: m17n-db.spec =================================================================== RCS file: /cvs/dist/rpms/m17n-db/devel/m17n-db.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- m17n-db.spec 13 Feb 2006 16:58:02 -0000 1.6 +++ m17n-db.spec 1 Mar 2006 15:35:39 -0000 1.7 @@ -1,14 +1,15 @@ Name: m17n-db Summary: Multilingualization datafiles for m17n-lib -Version: 1.3.2 -Release: 2%{?dist} +Version: 1.3.3 +Release: 1%{?dist} Group: System Environment/Libraries License: LGPL URL: http://www.m17n.org/m17n-lib/index.html Source0: %{name}-%{version}.tar.gz -Source1: %{name}-indic-0.1.tar.gz +Source1: %{name}-indic-0.2.tar.gz BuildArch: noarch Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Patch1: bn-itrans-t-182227.patch %description This package contains multilingualization (m17n) datafiles for m17n-lib @@ -348,7 +349,7 @@ %prep %setup -q -a1 - +%patch1 -p1 -b .1 %build %configure @@ -366,6 +367,8 @@ # don't need ispell or anthy rm $RPM_BUILD_ROOT%{_datadir}/m17n/{ispell.mim,icons/en-ispell.png} rm $RPM_BUILD_ROOT%{_datadir}/m17n/{ja-anthy.mim,icons/ja-anthy.png} +# don't ship unijoy map for now +rm $RPM_BUILD_ROOT%{_datadir}/m17n/{bn-unijoy.mim,icons/bn-unijoy.png} # drop pkgconfig file for now rm $RPM_BUILD_ROOT%{_libdir}/pkgconfig/m17n-db.pc @@ -675,6 +678,12 @@ %changelog +* Thu Mar 2 2006 Jens Petersen - 1.3.3-1 +- update to 1.3.3 bugfix release +- fixes to Bengali, Hindi, and Punjabi maps (runab, aalam) +- Tamil phonetic map now works +- new Tamil99 Government Standard map (I Felix) + * Tue Feb 14 2006 Jens Petersen - 1.3.2-2 - add Indian input maps ported from scim-tables - add Nepali subpackage Index: sources =================================================================== RCS file: /cvs/dist/rpms/m17n-db/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 13 Feb 2006 16:58:02 -0000 1.5 +++ sources 1 Mar 2006 15:35:39 -0000 1.6 @@ -1,2 +1,2 @@ -dae9f012cef26f8d58861e169f1d0b0f m17n-db-1.3.2.tar.gz -ebd752746a32d3f71f86ed3c1a7102c2 m17n-db-indic-0.1.tar.gz +a2aec22334c108565cc466d80a66292c m17n-db-1.3.3.tar.gz +ab520cead6d7078b75ca1dea1ef34592 m17n-db-indic-0.2.1.tar.gz From fedora-cvs-commits at redhat.com Wed Mar 1 15:41:30 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 1 Mar 2006 10:41:30 -0500 Subject: rpms/acpid/devel acpid.video.conf,NONE,1.1 acpid.spec,1.10,1.11 Message-ID: <200603011541.k21FfU3M027881@cvs.devel.redhat.com> Author: pknirsch Update of /cvs/dist/rpms/acpid/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv27747 Modified Files: acpid.spec Added Files: acpid.video.conf Log Message: - Added video.conf file to turn on DPMS when opening the laptop lid. Disabled by default. --- NEW FILE acpid.video.conf --- # Configuration to turn on DPMS again on video activity, needed for some # laptops. Disabled by default, uncomment if your laptop display stays blank # after you close and open the lid. #event=video.* #action=/usr/sbin/vbetool dpms on Index: acpid.spec =================================================================== RCS file: /cvs/dist/rpms/acpid/devel/acpid.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- acpid.spec 7 Feb 2006 10:51:48 -0000 1.10 +++ acpid.spec 1 Mar 2006 15:41:27 -0000 1.11 @@ -1,12 +1,13 @@ Summary: ACPI Event Daemon Name: acpid Version: 1.0.4 -Release: 1.2 +Release: 2 License: GPL Group: System Environment/Daemons Source: http://prdownloads.sourceforge.net/acpid/acpid-%{version}.tar.gz Source1: acpid.logrotate Source2: acpid.init +Source3: acpid.video.conf Patch1: acpid-1.0.3-conf.patch Patch2: acpid-1.0.3-makefile.patch Patch3: acpid-1.0.4-warning.patch @@ -39,6 +40,7 @@ mkdir -p $RPM_BUILD_ROOT/etc/acpi/actions chmod 755 $RPM_BUILD_ROOT/etc/acpi/events install -m 644 samples/sample.conf $RPM_BUILD_ROOT/etc/acpi/events +install -m 644 %{SOURCE3} $RPM_BUILD_ROOT/etc/acpi/events/video.conf mkdir -p $RPM_BUILD_ROOT/var/log touch $RPM_BUILD_ROOT/var/log/acpid @@ -61,6 +63,7 @@ %dir /etc/acpi/events %dir /etc/acpi/actions %config %attr(0644,root,root) /etc/acpi/events/sample.conf +%config %attr(0644,root,root) /etc/acpi/events/video.conf %config /etc/logrotate.d/acpid %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /var/log/acpid /usr/bin/acpi_listen @@ -85,6 +88,10 @@ fi %changelog +* Wed Mar 01 2006 Phil Knirsch - 1.0.4-2 +- Added video.conf file to turn on DPMS when opening the laptop lid. Disabled + by default. + * Tue Feb 07 2006 Jesse Keating - 1.0.4-1.2 - rebuilt for new gcc4.1 snapshot and glibc changes From fedora-cvs-commits at redhat.com Wed Mar 1 15:44:36 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 1 Mar 2006 10:44:36 -0500 Subject: rpms/m17n-db/devel m17n-db.spec,1.7,1.8 Message-ID: <200603011544.k21Fiag0029312@cvs.devel.redhat.com> Author: petersen Update of /cvs/dist/rpms/m17n-db/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv28990 Modified Files: m17n-db.spec Log Message: update the indic tables tarball version Index: m17n-db.spec =================================================================== RCS file: /cvs/dist/rpms/m17n-db/devel/m17n-db.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- m17n-db.spec 1 Mar 2006 15:35:39 -0000 1.7 +++ m17n-db.spec 1 Mar 2006 15:44:33 -0000 1.8 @@ -6,7 +6,7 @@ License: LGPL URL: http://www.m17n.org/m17n-lib/index.html Source0: %{name}-%{version}.tar.gz -Source1: %{name}-indic-0.2.tar.gz +Source1: %{name}-indic-0.2.1.tar.gz BuildArch: noarch Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Patch1: bn-itrans-t-182227.patch From fedora-cvs-commits at redhat.com Wed Mar 1 15:47:08 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 1 Mar 2006 10:47:08 -0500 Subject: rpms/kdeaccessibility/devel kdeaccessibility.spec,1.14,1.15 Message-ID: <200603011547.k21Fl8SD010450@cvs.devel.redhat.com> Author: karsten Update of /cvs/dist/rpms/kdeaccessibility/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv10304 Modified Files: kdeaccessibility.spec Log Message: - BuildRequires: libXtst-devel /usr/bin/ld: cannot find -lXtst collect2: ld returned 1 exit status Index: kdeaccessibility.spec =================================================================== RCS file: /cvs/dist/rpms/kdeaccessibility/devel/kdeaccessibility.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- kdeaccessibility.spec 11 Feb 2006 03:44:05 -0000 1.14 +++ kdeaccessibility.spec 1 Mar 2006 15:47:06 -0000 1.15 @@ -7,7 +7,7 @@ %define disable_gcc_check_and_hidden_visibility 1 Version: 3.5.1 -Release: 1.2 +Release: 2 Epoch: 1 Summary: K Desktop Environment - Accessibility Name: kdeaccessibility @@ -33,6 +33,7 @@ BuildRequires: gcc-c++ BuildRequires: libstdc++-devel BuildRequires: perl +BuildRequires: libXtst-devel %description Included with this package are: @@ -107,6 +108,9 @@ %changelog +* Wed Mar 01 2006 Karsten Hopp 3.5.1-2 +- BuildRequires: libXtst-devel + * Fri Feb 10 2006 Jesse Keating - 1:3.5.1-1.2 - bump again for double-long bug on ppc(64) From fedora-cvs-commits at redhat.com Wed Mar 1 15:59:32 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 1 Mar 2006 10:59:32 -0500 Subject: rpms/gphoto2/devel gphoto2.spec,1.54,1.55 Message-ID: <200603011559.k21FxWI4016011@cvs.devel.redhat.com> Author: rvokal Update of /cvs/dist/rpms/gphoto2/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv15982 Modified Files: gphoto2.spec Log Message: - spec file tweak, become self-building again Index: gphoto2.spec =================================================================== RCS file: /cvs/dist/rpms/gphoto2/devel/gphoto2.spec,v retrieving revision 1.54 retrieving revision 1.55 diff -u -r1.54 -r1.55 --- gphoto2.spec 11 Feb 2006 03:20:24 -0000 1.54 +++ gphoto2.spec 1 Mar 2006 15:59:25 -0000 1.55 @@ -5,7 +5,7 @@ %define libpkg libgphoto2 %define libver 2.1.99 Version: %{pkgver} -Release: 5.2 +Release: 5.4 License: LGPL Group: Applications/Multimedia BuildRoot: %{_tmppath}/%{name}-%{version}-root @@ -117,14 +117,15 @@ pushd %{libpkg}-%{libver} export tagname=CC +export LIBRARY_PATH=$RPM_BUILD_ROOT%{_libdir} make mandir=%{_mandir} DESTDIR=$RPM_BUILD_ROOT install -install -d -m755 %{buildroot}/usr/share/hal/fdi/information/20thirdparty/ - -#LIBDIR=%{buildroot}%{_libdir} %{SOURCE2} > %{buildroot}/usr/share/hal/fdi/information/20thirdparty/10-camera-libgphoto2.fdi -export LIBDIR=$RPM_BUILD_ROOT/%{_libdir} -export CAMLIBS=$RPM_BUILD_ROOT/%{_libdir}/%{libpkg}/%{libver} -$RPM_BUILD_ROOT/%{_libdir}/%{libpkg}/print-usb-usermap --fdi > $RPM_BUILD_ROOT/%{_datadir}/hal/fdi/information/20thirdparty/10-camera-libgphoto2.fdi + pushd packaging/linux-hotplug/ + install -d -m755 %{buildroot}/usr/share/hal/fdi/information/20thirdparty/ + export LIBDIR=$RPM_BUILD_ROOT%{_libdir} + export CAMLIBS=$RPM_BUILD_ROOT%{_libdir}/%{libpkg}/%{libver} + ./print-usb-usermap --fdi > $RPM_BUILD_ROOT/%{_datadir}/hal/fdi/information/20thirdparty/10-camera-libgphoto2.fdi + popd popd install -d -m755 %{buildroot}/usr/share/hal/fdi/policy/20thirdparty/ @@ -134,7 +135,6 @@ make mandir=%{_mandir} DESTDIR=$RPM_BUILD_ROOT install install -d -m755 $RPM_BUILD_ROOT%{_libexecdir}/ - install -m755 %{SOURCE4} $RPM_BUILD_ROOT%{_libexecdir}/gphoto-set-procperm mv -f %{buildroot}%{_docdir}/%{name} installed-doc @@ -212,6 +212,9 @@ # ChangeLog ######################################################################## %changelog +* Wed Mar 01 2006 Radek Vok??l 2.1.99-5.4 +- spec file tweak, become self-building again + * Fri Feb 10 2006 Jesse Keating - 2.1.99-5.2 - bump again for double-long bug on ppc(64) From fedora-cvs-commits at redhat.com Wed Mar 1 16:17:37 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 1 Mar 2006 11:17:37 -0500 Subject: rpms/eclipse/devel eclipse-tomcat55-build.patch,1.1,1.2 Message-ID: <200603011617.k21GHbML023008@cvs.devel.redhat.com> Author: overholt Update of /cvs/dist/rpms/eclipse/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv22863 Modified Files: eclipse-tomcat55-build.patch Log Message: s/jakarta-// in jar names eclipse-tomcat55-build.patch: build.xml | 88 ++++++++++++++++++++++++++++++++++++++------------------------ 1 files changed, 54 insertions(+), 34 deletions(-) Index: eclipse-tomcat55-build.patch =================================================================== RCS file: /cvs/dist/rpms/eclipse/devel/eclipse-tomcat55-build.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- eclipse-tomcat55-build.patch 28 Feb 2006 23:05:11 -0000 1.1 +++ eclipse-tomcat55-build.patch 1 Mar 2006 16:17:35 -0000 1.2 @@ -37,28 +37,28 @@ + + + -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + + + From fedora-cvs-commits at redhat.com Wed Mar 1 16:17:44 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 1 Mar 2006 11:17:44 -0500 Subject: rpms/hwdata/devel .cvsignore, 1.60, 1.61 hwdata.spec, 1.61, 1.62 sources, 1.63, 1.64 Message-ID: <200603011617.k21GHiCb023234@cvs.devel.redhat.com> Author: pknirsch Update of /cvs/dist/rpms/hwdata/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv22587 Modified Files: .cvsignore hwdata.spec sources Log Message: - Commented out the VT lines at the end of usb.ids as our tools don't handle them properly. Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/hwdata/devel/.cvsignore,v retrieving revision 1.60 retrieving revision 1.61 diff -u -r1.60 -r1.61 --- .cvsignore 24 Feb 2006 18:15:40 -0000 1.60 +++ .cvsignore 1 Mar 2006 16:17:41 -0000 1.61 @@ -1 +1 @@ -hwdata-0.177.tar.gz +hwdata-0.178.tar.gz Index: hwdata.spec =================================================================== RCS file: /cvs/dist/rpms/hwdata/devel/hwdata.spec,v retrieving revision 1.61 retrieving revision 1.62 diff -u -r1.61 -r1.62 --- hwdata.spec 24 Feb 2006 18:15:40 -0000 1.61 +++ hwdata.spec 1 Mar 2006 16:17:41 -0000 1.62 @@ -1,6 +1,6 @@ Name: hwdata Summary: Hardware identification and configuration data -Version: 0.177 +Version: 0.178 Release: 1 License: GPL/MIT Group: System Environment/Base @@ -33,6 +33,10 @@ %config /usr/share/hwdata/* %changelog +* Wed Mar 01 2006 Phil Knirsch - 0.178-1 +- Commented out the VT lines at the end of usb.ids as our tools don't handle + them properly. + * Fri Feb 24 2006 Bill Nottingham - 0.177-1 - remove stock videoaliases in favor of driver-specific ones in the X driver packages Index: sources =================================================================== RCS file: /cvs/dist/rpms/hwdata/devel/sources,v retrieving revision 1.63 retrieving revision 1.64 diff -u -r1.63 -r1.64 --- sources 24 Feb 2006 18:15:40 -0000 1.63 +++ sources 1 Mar 2006 16:17:41 -0000 1.64 @@ -1 +1 @@ -daa4c324ec57a56ff802fe01010bf849 hwdata-0.177.tar.gz +d9eeb885781552312b34113ab947a3b7 hwdata-0.178.tar.gz From fedora-cvs-commits at redhat.com Wed Mar 1 16:18:21 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 1 Mar 2006 11:18:21 -0500 Subject: rpms/gnome-mount/devel gnome-mount-0.4-no-media.patch, 1.1, 1.2 gnome-mount.spec, 1.13, 1.14 Message-ID: <200603011618.k21GIL77027133@cvs.devel.redhat.com> Author: davidz Update of /cvs/dist/rpms/gnome-mount/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv24903 Modified Files: gnome-mount-0.4-no-media.patch gnome-mount.spec Log Message: * Wed Mar 1 2006 David Zeuthen - 0.4-5 - Update for new patch in #183191 gnome-mount-0.4-no-media.patch: gnome-mount.c | 18 +++++++++++------- 1 files changed, 11 insertions(+), 7 deletions(-) Index: gnome-mount-0.4-no-media.patch =================================================================== RCS file: /cvs/dist/rpms/gnome-mount/devel/gnome-mount-0.4-no-media.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gnome-mount-0.4-no-media.patch 1 Mar 2006 05:42:13 -0000 1.1 +++ gnome-mount-0.4-no-media.patch 1 Mar 2006 16:18:17 -0000 1.2 @@ -1,24 +1,72 @@ ---- gnome-mount-0.4/src/gnome-mount.c.no-media 2006-03-01 00:34:49.000000000 -0500 -+++ gnome-mount-0.4/src/gnome-mount.c 2006-03-01 00:39:30.000000000 -0500 -@@ -463,9 +463,14 @@ +? config.guess +? config.sub +? gnome-mount-0.4-0.cvs20060213.tar.gz +? gnome-mount-0.4-drive-mount.patch +? gnome-mount-fix-segv-on-no-media.patch +? gnome-mount-nicknames.patch +? libtool +? ltmain.sh +? po/Makefile +? po/Makefile.in +? po/Makefile.in.in +? po/POTFILES +? po/it.gmo +? po/ja.gmo +? po/nb.gmo +? po/stamp-it +Index: src/gnome-mount.c +=================================================================== +RCS file: /cvs/gnome/gnome-mount/src/gnome-mount.c,v +retrieving revision 1.17 +diff -u -p -r1.17 gnome-mount.c +--- src/gnome-mount.c 25 Feb 2006 00:39:31 -0000 1.17 ++++ src/gnome-mount.c 1 Mar 2006 16:00:21 -0000 +@@ -238,7 +238,8 @@ show_error_dialog_unmount (const char *u + /* #define MOUNT_ERROR_DIALOG_RESPONSE_INSTALL_DRIVER 10 see below */ + + static void +-show_error_dialog_mount (LibHalVolume *volume, const char *error_name, const char *error_detail, ++show_error_dialog_mount (LibHalVolume *volume, LibHalDrive *drive, ++ const char *error_name, const char *error_detail, + const char *fstype_requested) + { + GtkWidget *w; +@@ -266,7 +267,10 @@ show_error_dialog_mount (LibHalVolume *v + 0, + _("Cannot mount volume")); + +- volume_name = libhal_volume_get_label (volume); ++ if (volume != NULL) ++ volume_name = libhal_volume_get_label (volume); ++ else ++ volume_name = NULL; + + if (strcmp (error_name, "org.freedesktop.Hal.Device.Volume.PermissionDenied") == 0) { + gtk_message_dialog_format_secondary_text ( +@@ -289,8 +293,8 @@ show_error_dialog_mount (LibHalVolume *v + volume_name != NULL ? + _("The volume '%s' uses the %s file system which is not supported by your system.") : + _("The volume uses the %s file system which is not supported by your system."), +- volume_name != NULL ? volume_name : fstype_requested, +- volume_name != NULL ? fstype_requested : ""); ++ volume_name != NULL ? volume_name : (fstype_requested != NULL ? fstype_requested : ""), ++ volume_name != NULL ? (fstype_requested != NULL ? fstype_requested : "") : ""); + + /* some day.. :-) + gtk_dialog_add_buttons (GTK_DIALOG (w), +@@ -463,9 +467,9 @@ volume_mount_with_options (const char *u notify_parent (FALSE); - show_error_dialog_mount (volume, error.name, error.message, -- (fstype != NULL && strlen (fstype) > 0) ? ++ show_error_dialog_mount (volume, drive, error.name, error.message, + (fstype != NULL && strlen (fstype) > 0) ? - fstype : libhal_volume_get_fstype (volume)); -+ if (fstype == NULL || fstype[0] == 0) { -+ if (volume) -+ fstype = libhal_volume_get_fstype (volume); -+ else -+ fstype = ""; -+ } -+ -+ show_error_dialog_mount (volume, error.name, error.message, fstype); ++ fstype : (volume != NULL ? libhal_volume_get_fstype (volume) : NULL)); dbus_error_free (&error); goto out; -@@ -1701,7 +1706,7 @@ +@@ -1701,7 +1705,7 @@ try_drive: out: if (drive != NULL) Index: gnome-mount.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-mount/devel/gnome-mount.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- gnome-mount.spec 1 Mar 2006 05:42:13 -0000 1.13 +++ gnome-mount.spec 1 Mar 2006 16:18:17 -0000 1.14 @@ -1,7 +1,7 @@ Summary: Mount replacement which uses HAL to do the mounting Name: gnome-mount Version: 0.4 -Release: 4 +Release: 5 License: GPL Group: Applications/System Source: %{name}-%{version}.tar.gz @@ -28,7 +28,7 @@ %setup -q %patch0 -p0 -b .drive-mount -%patch1 -p1 -b .no-media +%patch1 -p0 -b .no-media %build @@ -63,6 +63,9 @@ %{_libdir}/pkgconfig/gnome-mount.pc %changelog +* Wed Mar 1 2006 David Zeuthen - 0.4-5 +- Update for new patch in #183191 + * Wed Mar 1 2006 Matthias Clasen - 0.4-4 - Fix a crash without media (#183191) From fedora-cvs-commits at redhat.com Wed Mar 1 16:31:45 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 1 Mar 2006 11:31:45 -0500 Subject: rpms/udev/devel udev-extras.patch, 1.2, 1.3 udev-rules.patch, 1.5, 1.6 udev.spec, 1.155, 1.156 Message-ID: <200603011631.k21GVj0R003693@cvs.devel.redhat.com> Author: harald Update of /cvs/dist/rpms/udev/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv3634 Modified Files: udev-extras.patch udev-rules.patch udev.spec Log Message: - fixed ZIP drive thrashing (bz #181041 #182601) - fixed enumeration (%e does not work anymore) (bz #183288) udev-extras.patch: check-cdrom.sh | 39 +++++++++++++++++++++++++++++++++++++++ load_floppy_module.sh | 35 +++++++++++++++++++++++++++++++++++ run_directory/MAKEDEV.dev | 38 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 112 insertions(+) Index: udev-extras.patch =================================================================== RCS file: /cvs/dist/rpms/udev/devel/udev-extras.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- udev-extras.patch 7 Feb 2006 11:13:42 -0000 1.2 +++ udev-extras.patch 1 Mar 2006 16:31:21 -0000 1.3 @@ -41,16 +41,6 @@ + exit 1 +} --- /dev/null 2006-02-07 10:47:25.401206250 +0100 -+++ udev-084/extras/ide-media.sh 2006-02-07 10:58:51.000000000 +0100 -@@ -0,0 +1,7 @@ -+#!/bin/bash -+i=0 -+while [[ ! -a /proc/ide/$1/media && $i -lt 10 ]]; do -+ /bin/usleep 100000; -+ i=$[i+1]; -+done -+/bin/cat /proc/ide/$1/media ---- /dev/null 2006-02-07 10:47:25.401206250 +0100 +++ udev-084/extras/run_directory/MAKEDEV.dev 2006-02-07 10:58:51.000000000 +0100 @@ -0,0 +1,38 @@ +#!/bin/sh udev-rules.patch: 05-udev-early.rules | 9 ++ 95-pam-console.rules | 1 hotplug.rules | 13 +++ udev.rules | 166 ++++++++++++++++++++++++++++----------------------- 4 files changed, 113 insertions(+), 76 deletions(-) Index: udev-rules.patch =================================================================== RCS file: /cvs/dist/rpms/udev/devel/udev-rules.patch,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- udev-rules.patch 24 Feb 2006 16:14:11 -0000 1.5 +++ udev-rules.patch 1 Mar 2006 16:31:25 -0000 1.6 @@ -36,16 +36,17 @@ + +ACTION=="add", SUBSYSTEM=="firmware", ENV{FIRMWARE}=="*", RUN="/sbin/firmware_helper", OPTIONS="last_rule" --- udev-084/etc/udev/redhat/udev.rules.rhrules 2006-01-30 08:51:38.000000000 +0100 -+++ udev-084/etc/udev/redhat/udev.rules 2006-02-24 15:35:26.000000000 +0100 -@@ -3,6 +3,7 @@ ++++ udev-084/etc/udev/redhat/udev.rules 2006-03-01 17:18:34.000000000 +0100 +@@ -3,47 +3,52 @@ # # default is OWNER="root" GROUP="root", MODE="0600" # +-KERNEL="*", OWNER="root" GROUP="root", MODE="0600" + - KERNEL="*", OWNER="root" GROUP="root", MODE="0600" ++KERNEL=="*", OWNER="root" GROUP="root", MODE="0600" # all block devices -@@ -10,40 +11,44 @@ + SUBSYSTEM=="block", GROUP="disk", MODE="0640" KERNEL=="root", GROUP="disk", MODE="0640" # console devices @@ -136,82 +137,115 @@ # audio devices KERNEL=="dsp*", MODE="0660" -@@ -142,9 +153,10 @@ +@@ -142,9 +153,9 @@ KERNEL=="z90crypt", MODE="0666" # DVB -KERNEL=="dvb/*", MODE="0660" KERNEL=="dvb", MODE="0660" -KERNEL=="dvb/adapter*", MODE="0660" -+SUBSYSTEM=="dvb", PROGRAM="/bin/sh -c 'K=%k; K=$${K#dvb}; printf dvb/adapter%%i/%%s $${K%%%%.*} $${K#*.}'", NAME="%c", MODE="0660" -+ -+ ++SUBSYSTEM=="dvb", PROGRAM="/bin/sh -c 'K=%k; K=$${K#dvb}; printf dvb/adapter%%i/%%s $${K%%%%.*} $${K#*.}'", \ ++ NAME="%c", MODE="0660" # create a symlink named after the device map name # note devmap_name comes with extras/multipath -@@ -209,7 +221,7 @@ - KERNEL=="fd[0-9]*", SYMLINK+="floppy%e" - KERNEL=="nst[0-9]", BUS=="scsi", SYMLINK+="tape%e", MODE="0660" - KERNEL=="nosst[0-9]", BUS=="scsi", SYMLINK+="tape%e", MODE="0660" +@@ -179,8 +190,8 @@ + BUS=="usb", KERNEL=="lp[0-9]*", NAME="usb/%k" + + KERNEL=="microcode", NAME="cpu/%k" +-KERNEL="msr[0-9]*", NAME="cpu/%n/msr" +-KERNEL="cpu[0-9]*", NAME="cpu/%n/cpuid" ++KERNEL=="msr[0-9]*", NAME="cpu/%n/msr" ++KERNEL=="cpu[0-9]*", NAME="cpu/%n/cpuid" + + KERNEL=="ram1", SYMLINK+="ram" + KERNEL=="video0", SYMLINK+="video" +@@ -203,13 +214,12 @@ + KERNEL=="device-mapper", NAME="mapper/control" + + # old compat symlinks with enumeration +-KERNEL=="sr[0-9]*", SYMLINK+="cdrom%e" +-KERNEL=="scd[0-9]*", SYMLINK+="cdrom%e" +-KERNEL=="pcd[0-9]*", SYMLINK+="cdrom%e" +-KERNEL=="fd[0-9]*", SYMLINK+="floppy%e" +-KERNEL=="nst[0-9]", BUS=="scsi", SYMLINK+="tape%e", MODE="0660" +-KERNEL=="nosst[0-9]", BUS=="scsi", SYMLINK+="tape%e", MODE="0660" -KERNEL=="sg[0-9]*", BUS="scsi", SYSFS{type}=="6", SYMLINK+="scanner%e", MODE="0660" -+KERNEL=="sg[0-9]*", BUS="scsi", SYSFS{type}=="[36]", SYMLINK+="scanner%e", MODE="0660" ++KERNEL=="sr[0-9]*", SYMLINK+="cdrom-%k" ++KERNEL=="scd[0-9]*", SYMLINK+="cdrom-%k" ++KERNEL=="pcd[0-9]*", SYMLINK+="cdrom-%k" ++KERNEL=="fd[0-9]*", SYMLINK+="floppy-%k" ++KERNEL=="nst[0-9]", BUS=="scsi", SYMLINK+="tape-%k", MODE="0660" ++KERNEL=="nosst[0-9]", BUS=="scsi", SYMLINK+="tape-%k", MODE="0660" KERNEL=="umad*", NAME="infiniband/%k" KERNEL=="issm*", NAME="infiniband/%k" -@@ -221,27 +233,30 @@ +@@ -221,27 +231,30 @@ KERNEL=="zappseudo", NAME="zap/pseudo" KERNEL=="zap[0-9]*", NAME="zap/%n" -BUS=="scsi", KERNEL=="sg[0-9]*", SYSFS{type}=="6", NAME="%k", SYMLINK="scanner%e", MODE="0660" -+KERNEL="pktcdvd", NAME="%k/control" ++KERNEL=="pktcdvd", NAME="%k/control" + -+BUS=="scsi", KERNEL=="sg[0-9]*", SYSFS{type}=="6", NAME="%k", SYMLINK+="scanner%e", MODE="0660" + -+BUS=="scsi", KERNEL=="sg[0-9]*", SYSFS{type}=="8", SYMLINK+="changer%e", MODE="0660" - # do not seperate the next 2 lines!! +-# do not seperate the next 2 lines!! -KERNEL=="hd[a-z]", BUS=="ide", SYSFS{removable}=="1", PROGRAM=="/lib/udev/ide-media.sh %k", RESULT=="floppy", SYMLINK+="floppy%e", NAME{ignore_remove, all_partitions}="%k" -+KERNEL=="hd[a-z]", BUS=="ide", SYSFS{removable}=="1", PROGRAM=="ide-media.sh %k", RESULT=="floppy", SYMLINK+="floppy%e", NAME{ignore_remove, all_partitions}="%k" ++KERNEL=="hd[a-z]", BUS=="ide", SYSFS{removable}=="1", \ ++ SYSFS{device/media}=="floppy", \ ++ SYMLINK+="floppy-%k", OPTIONS+="ignore_remove, all_partitions" - KERNEL=="hd[a-z]", BUS=="ide", SYSFS{removable}=="1", RESULT=="cdrom", SYMLINK+="cdrom%e" +-KERNEL=="hd[a-z]", BUS=="ide", SYSFS{removable}=="1", RESULT=="cdrom", SYMLINK+="cdrom%e" ++KERNEL=="hd[a-z]", BUS=="ide", SYSFS{removable}=="1", PROGRAM=="check-cdrom.sh %k CDROM", SYMLINK+="cdrom-%k" -KERNEL=="hd[a-z]", BUS=="ide", SYSFS{removable}=="1", PROGRAM=="/lib/udev/check-cdrom.sh %k DVD", SYMLINK+="dvd%e" -KERNEL=="sr[0-9]*", BUS=="scsi", PROGRAM=="/lib/udev/check-cdrom.sh %k DVD", SYMLINK+="dvd%e" -+KERNEL=="hd[a-z]", BUS=="ide", SYSFS{removable}=="1", PROGRAM=="check-cdrom.sh %k DVD", SYMLINK+="dvd%e" -+KERNEL=="sr[0-9]*", BUS=="scsi", PROGRAM=="check-cdrom.sh %k DVD", SYMLINK+="dvd%e" ++KERNEL=="hd[a-z]", BUS=="ide", SYSFS{removable}=="1", PROGRAM=="check-cdrom.sh %k DVD", SYMLINK+="dvd-%k" ++KERNEL=="sr[0-9]*", BUS=="scsi", PROGRAM=="check-cdrom.sh %k DVD", SYMLINK+="dvd-%k" -KERNEL=="hd[a-z]", BUS=="ide", SYSFS{removable}=="1", PROGRAM=="/lib/udev/check-cdrom.sh %k CD-R", SYMLINK+="cdwriter%e" -KERNEL=="sr[0-9]*", BUS=="scsi", PROGRAM=="/lib/udev/check-cdrom.sh %k CD-R", SYMLINK+="cdwriter%e" -+KERNEL=="hd[a-z]", BUS=="ide", SYSFS{removable}=="1", PROGRAM=="check-cdrom.sh %k CD-R", SYMLINK+="cdwriter%e" -+KERNEL=="sr[0-9]*", BUS=="scsi", PROGRAM=="check-cdrom.sh %k CD-R", SYMLINK+="cdwriter%e" ++KERNEL=="hd[a-z]", BUS=="ide", SYSFS{removable}=="1", PROGRAM=="check-cdrom.sh %k CD-R", SYMLINK+="cdwriter-%k cdrw-%k" ++KERNEL=="sr[0-9]*", BUS=="scsi", PROGRAM=="check-cdrom.sh %k CD-R", SYMLINK+="cdwriter-%k cdrw-%k" -KERNEL=="hd[a-z]", BUS=="ide", SYSFS{removable}=="1", PROGRAM="/lib/udev/check-cdrom.sh %k DVD-R", SYMLINK+="dvdwriter%e" -KERNEL=="sr[0-9]*", BUS=="scsi", PROGRAM=="/lib/udev/check-cdrom.sh %k DVD-R", SYMLINK+="dvdwriter%e" -+KERNEL=="hd[a-z]", BUS=="ide", SYSFS{removable}=="1", PROGRAM="check-cdrom.sh %k DVD-R", SYMLINK+="dvdwriter%e" -+KERNEL=="sr[0-9]*", BUS=="scsi", PROGRAM=="check-cdrom.sh %k DVD-R", SYMLINK+="dvdwriter%e" ++KERNEL=="hd[a-z]", BUS=="ide", SYSFS{removable}=="1", PROGRAM="check-cdrom.sh %k DVD-R", SYMLINK+="dvdwriter-%k dvdrw-%k" ++KERNEL=="sr[0-9]*", BUS=="scsi", PROGRAM=="check-cdrom.sh %k DVD-R", SYMLINK+="dvdwriter-%k dvdrw-%k" # rename sr* to scd* KERNEL=="sr[0-9]*", BUS=="scsi", NAME="scd%n" - KERNEL=="hd[a-z]*", BUS=="ide", SYSFS{removable}=="1", NAME{ignore_remove}="%k" +-KERNEL=="hd[a-z]*", BUS=="ide", SYSFS{removable}=="1", NAME{ignore_remove}="%k" ++KERNEL=="hd*[0-9]", BUS=="ide", SYSFS{../removable}=="1", \ ++ OPTIONS+="ignore_remove" -KERNEL=="dvb*", PROGRAM=="/lib/udev/dvb.sh %k", NAME="%c" ####################################### # Persistent block device stuff - begin -@@ -297,37 +312,36 @@ +@@ -256,7 +269,8 @@ + KERNEL=="ram*|loop*|fd*|nbd*", GOTO="persistent_end" + + # never access removable ide devices, the drivers are causing event loops on open() +-BUS=="ide", DRIVER!="ide-cdrom", SYSFS{removable}="1", GOTO="persistent_end" ++BUS=="ide", DRIVER!="ide-cdrom", SYSFS{removable}=="1", GOTO="persistent_end" ++BUS=="ide", KERNEL=="hd*[0-9]", SYSFS{../removable}=="1", GOTO="persistent_end" + + # by-id (hardware serial number) + KERNEL=="hd*[!0-9]", IMPORT{program}="/sbin/ata_id --export $tempnode" +@@ -297,37 +311,43 @@ # Persistent block device stuff - end ##################################### -ACTION=="add", SUBSYSTEM=="usb_device", PROGRAM="/bin/sh -c 'X=%k X=$${X#usbdev} B=$${X%%%%.*} D=$${X#*.}; echo bus/usb/$$B/$$D'", SYMLINK+="%c" -+# workaround for devices which do not report media changes -+BUS=="ide", KERNEL=="hd[a-z]", SYSFS{removable}=="1", \ -+ ENV{ID_MODEL}=="IOMEGA_ZIP*", NAME="%k", OPTIONS+="all_partitions" ++ACTION=="add", SUBSYSTEM=="usb_device", \ ++ PROGRAM="/bin/sh -c 'K=%k; K=$${K#usbdev}; printf bus/usb/%%03i/%%03i $${K%%%%.*} $${K#*.}'", \ ++ NAME="%c", MODE="0644" -+ACTION=="add", SUBSYSTEM=="usb_device", PROGRAM="/bin/sh -c 'K=%k; K=$${K#usbdev}; printf bus/usb/%%03i/%%03i $${K%%%%.*} $${K#*.}'", NAME="%c", MODE="0644" - - # Perhaps this should just be for all subsystems? +ACTION=="add", SUBSYSTEM=="?*", MODALIAS=="?*", RUN+="/sbin/modprobe $modalias" +-# Perhaps this should just be for all subsystems? +- -ACTION=="add", SUBSYSTEM=="pci", MODALIAS=="*", \ - RUN+="/sbin/modprobe $modalias" -ACTION=="add", SUBSYSTEM=="usb", MODALIAS=="*", \ @@ -226,12 +260,17 @@ +# sd: 0 TYPE_DISK, 7 TYPE_MOD, 14 TYPE_RBC +# sr: 4 TYPE_WORM, 5 TYPE_ROM +# st/osst: 1 TYPE_TAPE -+ACTION=="add", SUBSYSTEM="scsi" , SYSFS{type}=="0|7|14", RUN+="/bin/sh -c 'echo 60 > /sys$$DEVPATH/timeout'" -+ACTION=="add", SUBSYSTEM="scsi" , SYSFS{type}=="1", RUN+="/bin/sh -c 'echo 900 > /sys$$DEVPATH/timeout'" ++# sg: 8 changer, [36] scanner ++ACTION=="add", SUBSYSTEM="scsi" , SYSFS{type}=="0|7|14", \ ++ RUN+="/bin/sh -c 'echo 60 > /sys$$DEVPATH/timeout'" ++ACTION=="add", SUBSYSTEM="scsi" , SYSFS{type}=="1", \ ++ RUN+="/bin/sh -c 'echo 900 > /sys$$DEVPATH/timeout'" -ACTION=="add", SUBSYSTEM=="scsi", SYSFS{type}=="[07]", \ - RUN+="/sbin/modprobe sd_mod" -ACTION=="add", SUBSYSTEM=="scsi", SYSFS{type}=="14", \ ++ ++ACTION=="add", SUBSYSTEM=="scsi_device" RUN+="/sbin/modprobe sg" +ACTION=="add", SUBSYSTEM=="scsi_device", SYSFS{type}=="0|7|14", \ RUN+="/sbin/modprobe sd_mod" -ACTION=="add", SUBSYSTEM=="scsi", SYSFS{type}=="[45]", \ @@ -239,6 +278,12 @@ RUN+="/sbin/modprobe sr_mod" -ACTION=="add", SUBSYSTEM=="scsi", SYSFS{type}=="1", SYSFS{vendor}=="On[sS]tream", \ + ++ACTION=="add", KERNEL=="sg[0-9]*", BUS=="scsi", SYSFS{type}=="[36]", \ ++ SYMLINK+="scanner-%k", MODE="0660" ++ ++ACTION=="add", KERNEL=="sg[0-9]*", BUS=="scsi", SYSFS{type}=="8", \ ++ SYMLINK+="changer-%k", MODE="0660", GROUP="disk" ++ +ACTION=="add", SUBSYSTEM=="scsi_device", SYSFS{type}=="1", SYSFS{device/vendor}=="On[sS]tream", \ SYSFS{model}!="ADR*", RUN+="/sbin/modprobe osst" -ACTION=="add", SUBSYSTEM=="scsi", SYSFS{type}=="1", SYSFS{vendor}=="On[sS]tream", \ @@ -249,9 +294,8 @@ RUN+="/sbin/modprobe st" -ACTION=="add", SUBSYSTEM=="scsi", SYSFS{type}=="[23689]", \ - RUN+="/sbin/modprobe sg" -+ACTION=="add", SUBSYSTEM=="scsi_device" RUN+="/sbin/modprobe sg" -+ -+RUN+="socket:/org/kernel/udev/monitor" -ACTION=="add", SUBSYSTEM=="firmware", ENV{FIRMWARE}=="*", \ - RUN+="/sbin/firmware_helper" ++RUN+="socket:/org/kernel/udev/monitor" ++ Index: udev.spec =================================================================== RCS file: /cvs/dist/rpms/udev/devel/udev.spec,v retrieving revision 1.155 retrieving revision 1.156 diff -u -r1.155 -r1.156 --- udev.spec 24 Feb 2006 23:40:51 -0000 1.155 +++ udev.spec 1 Mar 2006 16:31:25 -0000 1.156 @@ -5,7 +5,7 @@ Summary: A userspace implementation of devfs Name: udev Version: 084 -Release: 7 +Release: 8 License: GPL Group: System Environment/Base Provides: udev-persistent = 0:%{version}-%{release} @@ -153,7 +153,7 @@ mkdir -p $RPM_BUILD_ROOT%{udev_scriptdir}/{,devices} -for i in load_floppy_module.sh check-cdrom.sh ide-media.sh udevpermconv.sh; do +for i in load_floppy_module.sh check-cdrom.sh udevpermconv.sh; do install -m 0755 extras/$i $RPM_BUILD_ROOT%{udev_scriptdir} done @@ -258,7 +258,6 @@ %attr(0755,root,root) %dir %{_sysconfdir}/dev.d/ %attr(0755,root,root) %{udev_scriptdir}/MAKEDEV.dev %attr(0755,root,root) %{udev_scriptdir}/check-cdrom.sh -%attr(0755,root,root) %{udev_scriptdir}/ide-media.sh %attr(0755,root,root) %{udev_scriptdir}/udevpermconv.sh %attr(0755,root,root) %{udev_scriptdir}/create_floppy_devices %attr(0755,root,root) %{udev_scriptdir}/load_floppy_module.sh @@ -284,6 +283,10 @@ %attr(0644,root,root) %{_mandir}/man8/vol_id*.8* %changelog +* Wed Mar 01 2006 Harald Hoyer - 084-8 +- fixed ZIP drive thrashing (bz #181041 #182601) +- fixed enumeration (%%e does not work anymore) (bz #183288) + * Fri Feb 24 2006 Peter Jones - 084-7 - Don't start udevd in %%post unless it's already running - Stop udevd before chkconfig --del in %%preun From fedora-cvs-commits at redhat.com Wed Mar 1 16:50:34 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 1 Mar 2006 11:50:34 -0500 Subject: rpms/beagle/devel beagle-0.2.1-crawl-system-cron.patch, NONE, 1.1 beagle.spec, 1.35, 1.36 Message-ID: <200603011650.k21GoYmg013311@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/beagle/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv13296 Modified Files: beagle.spec Added Files: beagle-0.2.1-crawl-system-cron.patch Log Message: - add patch from Felipe Alfaro Solana to invote beagle indexing helper function with valid shell (bug 183360) beagle-0.2.1-crawl-system-cron.patch: beagle-crawl-system.in | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE beagle-0.2.1-crawl-system-cron.patch --- --- beagle-0.2.1/tools/beagle-crawl-system.in.crawl-system-cron 2005-12-12 14:10:14.000000000 -0500 +++ beagle-0.2.1/tools/beagle-crawl-system.in 2006-03-01 11:49:03.000000000 -0500 @@ -54,7 +54,7 @@ echo --deny-pattern $CRAWL_DENY_PATTERNS`" export TMPDIR=/tmp - eval nice -n 19 su $CRAWL_USER -c \"@sbindir@/beagle-build-index --target @localstatedir@/cache/beagle/indexes/$CRAWL_INDEX_NAME $OPTIONS $CRAWL_PATHS\" 2> /dev/null + eval nice -n 19 su $CRAWL_USER -s /bin/bash -c \"@sbindir@/beagle-build-index --target @localstatedir@/cache/beagle/indexes/$CRAWL_INDEX_NAME $OPTIONS $CRAWL_PATHS\" 2> /dev/null fi fi done Index: beagle.spec =================================================================== RCS file: /cvs/dist/rpms/beagle/devel/beagle.spec,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- beagle.spec 24 Feb 2006 06:34:29 -0000 1.35 +++ beagle.spec 1 Mar 2006 16:50:31 -0000 1.36 @@ -1,6 +1,6 @@ Name: beagle Version: 0.2.1 -Release: 12 +Release: 13 Summary: The Beagle Search Infrastructure Group: User Interface/Desktops @@ -28,6 +28,7 @@ Patch1: beagle-0.2.1-sqlite3.patch Patch2: beagle-0.2.1-crawl.patch Patch3: beagle-0.2.1-spew.patch +Patch4: beagle-0.2.1-crawl-system-cron.patch # Mono only available on these: ExclusiveArch: %ix86 x86_64 ppc ia64 armv4l sparc s390 s390x @@ -65,6 +66,7 @@ %patch1 -p1 -b .sqlite3 %patch2 -p1 -b .crawl %patch3 -p1 -b .spew +%patch4 -p1 -b .crawl-system-cron %build export MONO_SHARED_DIR=%{_builddir}/%{?buildsubdir} @@ -211,6 +213,11 @@ %{_prefix}/lib/python*/site-packages/beagle.so %changelog +* Wed Mar 1 2006 Ray Strode 0.2.1-13 +- add patch from Felipe Alfaro Solana + to invote beagle indexing helper function with valid shell + (bug 183360) + * Fri Feb 24 2006 Matthias Clasen 0.2.1-12 - Remove more "run from ." nonsense (#182709) - Don't spew tons of debug output (#182660) From fedora-cvs-commits at redhat.com Wed Mar 1 16:54:15 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 1 Mar 2006 11:54:15 -0500 Subject: rpms/kernel/devel .cvsignore, 1.366, 1.367 kernel-2.6.spec, 1.1998, 1.1999 linux-2.6-softmac-git.patch, 1.7, 1.8 sources, 1.308, 1.309 upstream, 1.283, 1.284 linux-2.6-x86-microcode-hotplug-cpu.patch, 1.1, NONE Message-ID: <200603011654.k21GsFqR013413@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv13400 Modified Files: .cvsignore kernel-2.6.spec linux-2.6-softmac-git.patch sources upstream Removed Files: linux-2.6-x86-microcode-hotplug-cpu.patch Log Message: git4 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v retrieving revision 1.366 retrieving revision 1.367 diff -u -r1.366 -r1.367 --- .cvsignore 28 Feb 2006 20:48:17 -0000 1.366 +++ .cvsignore 1 Mar 2006 16:54:11 -0000 1.367 @@ -5,3 +5,4 @@ xen-20060208.tar.bz2 patch-2.6.16-rc5.bz2 patch-2.6.16-rc5-git3.bz2 +patch-2.6.16-rc5-git4.bz2 Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.1998 retrieving revision 1.1999 diff -u -r1.1998 -r1.1999 --- kernel-2.6.spec 1 Mar 2006 14:28:25 -0000 1.1998 +++ kernel-2.6.spec 1 Mar 2006 16:54:12 -0000 1.1999 @@ -3,15 +3,15 @@ # What parts do we want to build? We must build at least one kernel. # These are the kernels that are built IF the architecture allows it. -%define buildup 0 -%define buildsmp 0 +%define buildup 1 +%define buildsmp 1 # Whether to apply the Xen patches, leave this enabled. %define includexen 1 # Whether to build the Xen kernels, disable if you want. -%define buildxen 1 +%define buildxen 0 %define buildxenPAE 0 %define builddoc 0 -%define buildkdump 0 +%define buildkdump 1 # Versions of various parts @@ -218,7 +218,7 @@ # Patches 0 through 100 are meant for core subsystem upgrades # Patch1: patch-2.6.16-rc5.bz2 -Patch2: patch-2.6.16-rc5-git3.bz2 +Patch2: patch-2.6.16-rc5-git4.bz2 # Patches 100 through 500 are meant for architecture patches Patch100: linux-2.6-bzimage.patch @@ -231,9 +231,8 @@ Patch203: linux-2.6-intel-cache-build.patch Patch204: linux-2.6-x86_64-silence-up-apic-errors.patch Patch205: linux-2.6-edid-check.patch -Patch206: linux-2.6-x86-microcode-hotplug-cpu.patch -Patch207: linux-2.6-x86_64-smp-on-uphw-cpucount.patch -Patch208: linux-2.6-x86-hp-reboot.patch +Patch206: linux-2.6-x86_64-smp-on-uphw-cpucount.patch +Patch207: linux-2.6-x86-hp-reboot.patch # 300 - 399 ppc(64) Patch300: linux-2.6-powermac-pfunc-noise.patch @@ -684,7 +683,7 @@ fi cp -rl vanilla linux-%{kversion}.%{_target_cpu} -%if %{includexen} +%if %{buildxen} cd xen %patch20000 -p1 %patch20010 -p2 @@ -698,7 +697,7 @@ # # Patches 10 through 100 are meant for core subsystem upgrades -# +# # # Patches to back out @@ -716,7 +715,7 @@ %patch200 -p1 # Keep UP APIC off by default. %patch201 -p1 -# add vidfail capability; +# add vidfail capability; # without this patch specifying a framebuffer on the kernel prompt would # make the boot stop if there's no supported framebuffer device; this is bad # for the installer cd that wants to automatically fall back to textmode @@ -728,14 +727,12 @@ %patch204 -p1 # Reboot thru bios on HP laptops. %patch205 -p1 -# Microcode driver hotplug cpu issue. -%patch206 -p1 # Workaround BIOSes that don't list CPU0 -%patch207 -p1 +%patch206 -p1 # Reboot through BIOS on HP systems,. -%patch208 -p1 +%patch207 -p1 -# +# # ppc64 # # Shut up the platform function stuff on pmac @@ -1582,6 +1579,9 @@ %endif %changelog +* Wed Mar 1 2006 Dave Jones +- 2.6.16rc5-git4 + * Tue Feb 28 2006 Dave Jones - 2.6.16rc5-git3 linux-2.6-softmac-git.patch: include/net/ieee80211.h | 8 include/net/ieee80211softmac.h | 292 ++++++++++++++ include/net/ieee80211softmac_wx.h | 94 ++++ net/ieee80211/Kconfig | 1 net/ieee80211/Makefile | 1 net/ieee80211/ieee80211_module.c | 2 net/ieee80211/ieee80211_wx.c | 89 ++++ net/ieee80211/softmac/Kconfig | 10 net/ieee80211/softmac/Makefile | 9 net/ieee80211/softmac/ieee80211softmac_assoc.c | 403 ++++++++++++++++++++ net/ieee80211/softmac/ieee80211softmac_auth.c | 376 +++++++++++++++++++ net/ieee80211/softmac/ieee80211softmac_event.c | 159 ++++++++ net/ieee80211/softmac/ieee80211softmac_io.c | 474 ++++++++++++++++++++++++ net/ieee80211/softmac/ieee80211softmac_module.c | 457 +++++++++++++++++++++++ net/ieee80211/softmac/ieee80211softmac_priv.h | 239 ++++++++++++ net/ieee80211/softmac/ieee80211softmac_scan.c | 237 ++++++++++++ net/ieee80211/softmac/ieee80211softmac_wx.c | 412 ++++++++++++++++++++ 17 files changed, 3262 insertions(+), 1 deletion(-) Index: linux-2.6-softmac-git.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-softmac-git.patch,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- linux-2.6-softmac-git.patch 15 Feb 2006 19:33:36 -0000 1.7 +++ linux-2.6-softmac-git.patch 1 Mar 2006 16:54:12 -0000 1.8 @@ -3231,20 +3231,6 @@ ieee80211_geo.o +obj-$(CONFIG_IEEE80211_SOFTMAC) += softmac/ ---- linux-2.6.15.noarch/net/ieee80211/ieee80211_rx.c.orig 2006-02-15 09:58:15.000000000 -0500 -+++ linux-2.6.15.noarch/net/ieee80211/ieee80211_rx.c 2006-02-15 10:21:29.000000000 -0500 -@@ -1375,9 +1375,9 @@ static void update_network(struct ieee80 - /* dst->last_associate is not overwritten */ - } - --static inline int is_beacon(int fc) -+static inline int is_beacon(__be16 fc) - { -- return (WLAN_FC_GET_STYPE(le16_to_cpu(fc)) == IEEE80211_STYPE_BEACON); -+ return (WLAN_FC_GET_STYPE(fc) == IEEE80211_STYPE_BEACON); - } - - static void ieee80211_process_probe_response(struct ieee80211_device --- linux-2.6.15.noarch/net/ieee80211/ieee80211_wx.c.orig 2006-02-15 09:58:15.000000000 -0500 +++ linux-2.6.15.noarch/net/ieee80211/ieee80211_wx.c 2006-02-15 09:58:21.000000000 -0500 @@ -734,9 +734,98 @@ int ieee80211_wx_get_encodeext(struct ie Index: sources =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/sources,v retrieving revision 1.308 retrieving revision 1.309 diff -u -r1.308 -r1.309 --- sources 28 Feb 2006 20:48:17 -0000 1.308 +++ sources 1 Mar 2006 16:54:12 -0000 1.309 @@ -1,4 +1,4 @@ cdf95e00f5111e31f78e1d97304d9522 linux-2.6.15.tar.bz2 30f4ef37dbc4d0bce9366e8716e8b51b xen-20060208.tar.bz2 1740ae34807f687a93adf2469ea5c4fc patch-2.6.16-rc5.bz2 -a1b2a5ce9754f7f778490eaf47ef0e92 patch-2.6.16-rc5-git3.bz2 +ab35d3814d795d61ad95aaa4b31ca034 patch-2.6.16-rc5-git4.bz2 Index: upstream =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/upstream,v retrieving revision 1.283 retrieving revision 1.284 diff -u -r1.283 -r1.284 --- upstream 28 Feb 2006 20:48:17 -0000 1.283 +++ upstream 1 Mar 2006 16:54:12 -0000 1.284 @@ -1,3 +1,3 @@ linux-2.6.15.tar.bz2 patch-2.6.16-rc5.bz2 -patch-2.6.16-rc5-git3.bz2 +patch-2.6.16-rc5-git4.bz2 --- linux-2.6-x86-microcode-hotplug-cpu.patch DELETED --- From fedora-cvs-commits at redhat.com Wed Mar 1 16:54:55 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 1 Mar 2006 11:54:55 -0500 Subject: rpms/kernel/devel kernel-2.6.spec, 1.1971.2.11, 1.1971.2.12 linux-2.6-xen.patch, 1.1.46.2, 1.1.46.3 Message-ID: <200603011654.k21GstrH013467@cvs.devel.redhat.com> Author: quintela Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv13424 Modified Files: Tag: private-xen-rebased-1971-branch kernel-2.6.spec linux-2.6-xen.patch Log Message: remove ia64 xen bits Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.1971.2.11 retrieving revision 1.1971.2.12 diff -u -r1.1971.2.11 -r1.1971.2.12 --- kernel-2.6.spec 1 Mar 2006 13:16:22 -0000 1.1971.2.11 +++ kernel-2.6.spec 1 Mar 2006 16:54:41 -0000 1.1971.2.12 @@ -162,8 +162,7 @@ License: GPLv2 Version: %{rpmversion} Release: %{release} -#ExclusiveArch: noarch %{all_x86} x86_64 ppc ppc64 ia64 sparc sparc64 ppc64iseries s390 s390x -ExclusiveArch: noarch ia64 +ExclusiveArch: noarch %{all_x86} x86_64 ppc ppc64 ia64 sparc sparc64 ppc64iseries s390 s390x ExclusiveOS: Linux Provides: kernel = %{version} Provides: kernel-drm = 4.3.0 @@ -1598,6 +1597,10 @@ %changelog * Wed Mar 1 2006 Juan Quintela +- remove xen ia64 bits, they break ia64 build. +- riel cpusteal hv fix. + +* Wed Mar 1 2006 Juan Quintela - enable ia64 again * Tue Feb 28 2006 Juan Quintela linux-2.6-xen.patch: linux-2.6.15.xen/include/xen/interface/version.h | 67 linux-2.6.16-rc4-xen0/arch/i386/Kconfig | 98 linux-2.6.16-rc4-xen0/arch/i386/Kconfig.cpu | 2 linux-2.6.16-rc4-xen0/arch/i386/Makefile | 18 linux-2.6.16-rc4-xen0/arch/i386/boot-xen/Makefile | 21 linux-2.6.16-rc4-xen0/arch/i386/kernel/Makefile | 33 linux-2.6.16-rc4-xen0/arch/i386/kernel/acpi/Makefile | 4 linux-2.6.16-rc4-xen0/arch/i386/kernel/acpi/boot-xen.c | 1164 ++++ linux-2.6.16-rc4-xen0/arch/i386/kernel/apic-xen.c | 140 linux-2.6.16-rc4-xen0/arch/i386/kernel/asm-offsets.c | 2 linux-2.6.16-rc4-xen0/arch/i386/kernel/cpu/Makefile | 5 linux-2.6.16-rc4-xen0/arch/i386/kernel/cpu/common-xen.c | 667 ++ linux-2.6.16-rc4-xen0/arch/i386/kernel/cpu/mtrr/Makefile | 7 linux-2.6.16-rc4-xen0/arch/i386/kernel/cpu/mtrr/main-xen.c | 187 linux-2.6.16-rc4-xen0/arch/i386/kernel/early_printk-xen.c | 2 linux-2.6.16-rc4-xen0/arch/i386/kernel/entry-xen.S | 857 +++ linux-2.6.16-rc4-xen0/arch/i386/kernel/fixup.c | 95 linux-2.6.16-rc4-xen0/arch/i386/kernel/head-xen.S | 208 linux-2.6.16-rc4-xen0/arch/i386/kernel/init_task-xen.c | 51 linux-2.6.16-rc4-xen0/arch/i386/kernel/io_apic-xen.c | 2728 ++++++++++ linux-2.6.16-rc4-xen0/arch/i386/kernel/ioport-xen.c | 122 linux-2.6.16-rc4-xen0/arch/i386/kernel/irq-xen.c | 306 + linux-2.6.16-rc4-xen0/arch/i386/kernel/ldt-xen.c | 269 linux-2.6.16-rc4-xen0/arch/i386/kernel/microcode-xen.c | 164 linux-2.6.16-rc4-xen0/arch/i386/kernel/mpparse-xen.c | 1182 ++++ linux-2.6.16-rc4-xen0/arch/i386/kernel/pci-dma-xen.c | 344 + linux-2.6.16-rc4-xen0/arch/i386/kernel/process-xen.c | 833 +++ linux-2.6.16-rc4-xen0/arch/i386/kernel/quirks-xen.c | 48 linux-2.6.16-rc4-xen0/arch/i386/kernel/setup-xen.c | 1888 ++++++ linux-2.6.16-rc4-xen0/arch/i386/kernel/smp-xen.c | 617 ++ linux-2.6.16-rc4-xen0/arch/i386/kernel/swiotlb.c | 674 ++ linux-2.6.16-rc4-xen0/arch/i386/kernel/sysenter.c | 14 linux-2.6.16-rc4-xen0/arch/i386/kernel/time-xen.c | 961 +++ linux-2.6.16-rc4-xen0/arch/i386/kernel/traps-xen.c | 1118 ++++ linux-2.6.16-rc4-xen0/arch/i386/kernel/vm86.c | 8 linux-2.6.16-rc4-xen0/arch/i386/kernel/vmlinux.lds.S | 4 linux-2.6.16-rc4-xen0/arch/i386/kernel/vsyscall-note-xen.S | 32 linux-2.6.16-rc4-xen0/arch/i386/kernel/vsyscall.S | 2 linux-2.6.16-rc4-xen0/arch/i386/mach-xen/Makefile | 7 linux-2.6.16-rc4-xen0/arch/i386/mach-xen/setup.c | 37 linux-2.6.16-rc4-xen0/arch/i386/mm/Makefile | 8 linux-2.6.16-rc4-xen0/arch/i386/mm/fault-xen.c | 617 ++ linux-2.6.16-rc4-xen0/arch/i386/mm/highmem-xen.c | 123 linux-2.6.16-rc4-xen0/arch/i386/mm/hypervisor.c | 468 + linux-2.6.16-rc4-xen0/arch/i386/mm/init-xen.c | 845 +++ linux-2.6.16-rc4-xen0/arch/i386/mm/ioremap-xen.c | 462 + linux-2.6.16-rc4-xen0/arch/i386/mm/pgtable-xen.c | 630 ++ linux-2.6.16-rc4-xen0/arch/i386/pci/Makefile | 9 linux-2.6.16-rc4-xen0/arch/i386/pci/irq-xen.c | 1202 ++++ linux-2.6.16-rc4-xen0/arch/i386/pci/pcifront.c | 55 linux-2.6.16-rc4-xen0/arch/i386/power/Makefile | 4 linux-2.6.16-rc4-xen0/arch/um/kernel/physmem.c | 4 linux-2.6.16-rc4-xen0/arch/x86_64/Kconfig | 60 linux-2.6.16-rc4-xen0/arch/x86_64/Makefile | 16 linux-2.6.16-rc4-xen0/arch/x86_64/ia32/Makefile | 20 linux-2.6.16-rc4-xen0/arch/x86_64/ia32/ia32entry-xen.S | 721 ++ linux-2.6.16-rc4-xen0/arch/x86_64/ia32/syscall32-xen.c | 128 linux-2.6.16-rc4-xen0/arch/x86_64/ia32/syscall32_syscall-xen.S | 28 linux-2.6.16-rc4-xen0/arch/x86_64/ia32/vsyscall-int80.S | 58 linux-2.6.16-rc4-xen0/arch/x86_64/ia32/vsyscall-sigreturn.S | 2 linux-2.6.16-rc4-xen0/arch/x86_64/kernel/Makefile | 18 linux-2.6.16-rc4-xen0/arch/x86_64/kernel/acpi/Makefile | 1 linux-2.6.16-rc4-xen0/arch/x86_64/kernel/apic-xen.c | 198 linux-2.6.16-rc4-xen0/arch/x86_64/kernel/asm-offsets.c | 2 linux-2.6.16-rc4-xen0/arch/x86_64/kernel/e820-xen.c | 744 ++ linux-2.6.16-rc4-xen0/arch/x86_64/kernel/early_printk-xen.c | 306 + linux-2.6.16-rc4-xen0/arch/x86_64/kernel/entry-xen.S | 1132 ++++ linux-2.6.16-rc4-xen0/arch/x86_64/kernel/genapic-xen.c | 144 linux-2.6.16-rc4-xen0/arch/x86_64/kernel/genapic_xen.c | 162 linux-2.6.16-rc4-xen0/arch/x86_64/kernel/head-xen.S | 152 linux-2.6.16-rc4-xen0/arch/x86_64/kernel/head64-xen.c | 140 linux-2.6.16-rc4-xen0/arch/x86_64/kernel/init_task.c | 3 linux-2.6.16-rc4-xen0/arch/x86_64/kernel/io_apic-xen.c | 2217 ++++++++ linux-2.6.16-rc4-xen0/arch/x86_64/kernel/ioport-xen.c | 58 linux-2.6.16-rc4-xen0/arch/x86_64/kernel/irq-xen.c | 168 linux-2.6.16-rc4-xen0/arch/x86_64/kernel/ldt-xen.c | 282 + linux-2.6.16-rc4-xen0/arch/x86_64/kernel/mpparse-xen.c | 1005 +++ linux-2.6.16-rc4-xen0/arch/x86_64/kernel/pci-swiotlb-xen.c | 54 linux-2.6.16-rc4-xen0/arch/x86_64/kernel/process-xen.c | 810 ++ linux-2.6.16-rc4-xen0/arch/x86_64/kernel/setup-xen.c | 1629 +++++ linux-2.6.16-rc4-xen0/arch/x86_64/kernel/setup64-xen.c | 360 + linux-2.6.16-rc4-xen0/arch/x86_64/kernel/smp-xen.c | 596 ++ linux-2.6.16-rc4-xen0/arch/x86_64/kernel/traps-xen.c | 1029 +++ linux-2.6.16-rc4-xen0/arch/x86_64/kernel/vsyscall-xen.c | 239 linux-2.6.16-rc4-xen0/arch/x86_64/kernel/x8664_ksyms-xen.c | 172 linux-2.6.16-rc4-xen0/arch/x86_64/kernel/xen_entry.S | 41 linux-2.6.16-rc4-xen0/arch/x86_64/mm/Makefile | 10 linux-2.6.16-rc4-xen0/arch/x86_64/mm/fault-xen.c | 595 ++ linux-2.6.16-rc4-xen0/arch/x86_64/mm/init-xen.c | 1107 ++++ linux-2.6.16-rc4-xen0/arch/x86_64/mm/pageattr-xen.c | 392 + linux-2.6.16-rc4-xen0/arch/x86_64/pci/Makefile | 12 linux-2.6.16-rc4-xen0/drivers/Makefile | 1 linux-2.6.16-rc4-xen0/drivers/acpi/Kconfig | 2 linux-2.6.16-rc4-xen0/drivers/acpi/tables.c | 7 linux-2.6.16-rc4-xen0/drivers/char/mem.c | 6 linux-2.6.16-rc4-xen0/drivers/char/tpm/Kconfig | 14 linux-2.6.16-rc4-xen0/drivers/char/tpm/Makefile | 1 linux-2.6.16-rc4-xen0/drivers/char/tpm/tpm.c | 44 linux-2.6.16-rc4-xen0/drivers/char/tpm/tpm.h | 7 linux-2.6.16-rc4-xen0/drivers/char/tpm/tpm_xen.c | 536 + linux-2.6.16-rc4-xen0/drivers/char/tty_io.c | 7 linux-2.6.16-rc4-xen0/drivers/firmware/Kconfig | 2 linux-2.6.16-rc4-xen0/drivers/pci/Kconfig | 1 linux-2.6.16-rc4-xen0/drivers/serial/Kconfig | 1 linux-2.6.16-rc4-xen0/drivers/video/Kconfig | 2 linux-2.6.16-rc4-xen0/drivers/xen/Kconfig | 192 linux-2.6.16-rc4-xen0/drivers/xen/Makefile | 22 linux-2.6.16-rc4-xen0/drivers/xen/balloon/Makefile | 2 linux-2.6.16-rc4-xen0/drivers/xen/balloon/balloon.c | 585 ++ linux-2.6.16-rc4-xen0/drivers/xen/blkback/Makefile | 2 linux-2.6.16-rc4-xen0/drivers/xen/blkback/blkback.c | 590 ++ linux-2.6.16-rc4-xen0/drivers/xen/blkback/common.h | 123 linux-2.6.16-rc4-xen0/drivers/xen/blkback/interface.c | 164 linux-2.6.16-rc4-xen0/drivers/xen/blkback/vbd.c | 102 linux-2.6.16-rc4-xen0/drivers/xen/blkback/xenbus.c | 421 + linux-2.6.16-rc4-xen0/drivers/xen/blkfront/Makefile | 5 linux-2.6.16-rc4-xen0/drivers/xen/blkfront/blkfront.c | 834 +++ linux-2.6.16-rc4-xen0/drivers/xen/blkfront/block.h | 162 linux-2.6.16-rc4-xen0/drivers/xen/blkfront/vbd.c | 323 + linux-2.6.16-rc4-xen0/drivers/xen/blktap/Makefile | 3 linux-2.6.16-rc4-xen0/drivers/xen/blktap/blktap.c | 910 +++ linux-2.6.16-rc4-xen0/drivers/xen/blktap/common.h | 110 linux-2.6.16-rc4-xen0/drivers/xen/blktap/interface.c | 146 linux-2.6.16-rc4-xen0/drivers/xen/blktap/xenbus.c | 234 linux-2.6.16-rc4-xen0/drivers/xen/char/Makefile | 2 linux-2.6.16-rc4-xen0/drivers/xen/char/mem.c | 156 linux-2.6.16-rc4-xen0/drivers/xen/console/Makefile | 2 linux-2.6.16-rc4-xen0/drivers/xen/console/console.c | 647 ++ linux-2.6.16-rc4-xen0/drivers/xen/console/xencons_ring.c | 125 linux-2.6.16-rc4-xen0/drivers/xen/core/Makefile | 9 linux-2.6.16-rc4-xen0/drivers/xen/core/evtchn.c | 823 +++ linux-2.6.16-rc4-xen0/drivers/xen/core/features.c | 29 linux-2.6.16-rc4-xen0/drivers/xen/core/gnttab.c | 432 + linux-2.6.16-rc4-xen0/drivers/xen/core/reboot.c | 442 + linux-2.6.16-rc4-xen0/drivers/xen/core/skbuff.c | 143 linux-2.6.16-rc4-xen0/drivers/xen/core/smpboot.c | 449 + linux-2.6.16-rc4-xen0/drivers/xen/core/xen_proc.c | 29 linux-2.6.16-rc4-xen0/drivers/xen/evtchn/Makefile | 2 linux-2.6.16-rc4-xen0/drivers/xen/evtchn/evtchn.c | 459 + linux-2.6.16-rc4-xen0/drivers/xen/net_driver_util.c | 67 linux-2.6.16-rc4-xen0/drivers/xen/netback/Makefile | 2 linux-2.6.16-rc4-xen0/drivers/xen/netback/common.h | 110 linux-2.6.16-rc4-xen0/drivers/xen/netback/interface.c | 320 + linux-2.6.16-rc4-xen0/drivers/xen/netback/loopback.c | 202 linux-2.6.16-rc4-xen0/drivers/xen/netback/netback.c | 833 +++ linux-2.6.16-rc4-xen0/drivers/xen/netback/xenbus.c | 327 + linux-2.6.16-rc4-xen0/drivers/xen/netfront/Makefile | 4 linux-2.6.16-rc4-xen0/drivers/xen/netfront/netfront.c | 1490 +++++ linux-2.6.16-rc4-xen0/drivers/xen/pciback/Makefile | 10 linux-2.6.16-rc4-xen0/drivers/xen/pciback/conf_space.c | 324 + linux-2.6.16-rc4-xen0/drivers/xen/pciback/conf_space.h | 97 linux-2.6.16-rc4-xen0/drivers/xen/pciback/conf_space_header.c | 269 linux-2.6.16-rc4-xen0/drivers/xen/pciback/passthrough.c | 116 linux-2.6.16-rc4-xen0/drivers/xen/pciback/pci_stub.c | 377 + linux-2.6.16-rc4-xen0/drivers/xen/pciback/pciback.h | 73 linux-2.6.16-rc4-xen0/drivers/xen/pciback/pciback_ops.c | 84 linux-2.6.16-rc4-xen0/drivers/xen/pciback/vpci.c | 163 linux-2.6.16-rc4-xen0/drivers/xen/pciback/xenbus.c | 439 + linux-2.6.16-rc4-xen0/drivers/xen/pcifront/Makefile | 7 linux-2.6.16-rc4-xen0/drivers/xen/pcifront/pci.c | 44 linux-2.6.16-rc4-xen0/drivers/xen/pcifront/pci_op.c | 245 linux-2.6.16-rc4-xen0/drivers/xen/pcifront/pcifront.h | 40 linux-2.6.16-rc4-xen0/drivers/xen/pcifront/xenbus.c | 295 + linux-2.6.16-rc4-xen0/drivers/xen/privcmd/Makefile | 2 linux-2.6.16-rc4-xen0/drivers/xen/privcmd/privcmd.c | 302 + linux-2.6.16-rc4-xen0/drivers/xen/tpmback/Makefile | 4 linux-2.6.16-rc4-xen0/drivers/xen/tpmback/common.h | 89 linux-2.6.16-rc4-xen0/drivers/xen/tpmback/interface.c | 197 linux-2.6.16-rc4-xen0/drivers/xen/tpmback/tpmback.c | 1105 ++++ linux-2.6.16-rc4-xen0/drivers/xen/tpmback/xenbus.c | 328 + linux-2.6.16-rc4-xen0/drivers/xen/tpmfront/Makefile | 2 linux-2.6.16-rc4-xen0/drivers/xen/tpmfront/tpmfront.c | 713 ++ linux-2.6.16-rc4-xen0/drivers/xen/tpmfront/tpmfront.h | 40 linux-2.6.16-rc4-xen0/drivers/xen/util.c | 80 linux-2.6.16-rc4-xen0/drivers/xen/xenbus/Makefile | 8 linux-2.6.16-rc4-xen0/drivers/xen/xenbus/xenbus_client.c | 403 + linux-2.6.16-rc4-xen0/drivers/xen/xenbus/xenbus_comms.c | 203 linux-2.6.16-rc4-xen0/drivers/xen/xenbus/xenbus_comms.h | 50 linux-2.6.16-rc4-xen0/drivers/xen/xenbus/xenbus_dev.c | 238 linux-2.6.16-rc4-xen0/drivers/xen/xenbus/xenbus_probe.c | 1015 +++ linux-2.6.16-rc4-xen0/drivers/xen/xenbus/xenbus_xs.c | 821 +++ linux-2.6.16-rc4-xen0/fs/Kconfig | 1 linux-2.6.16-rc4-xen0/include/asm-i386/apic.h | 2 linux-2.6.16-rc4-xen0/include/asm-i386/mach-xen/asm/agp.h | 37 linux-2.6.16-rc4-xen0/include/asm-i386/mach-xen/asm/desc.h | 162 linux-2.6.16-rc4-xen0/include/asm-i386/mach-xen/asm/dma-mapping.h | 156 linux-2.6.16-rc4-xen0/include/asm-i386/mach-xen/asm/fixmap.h | 165 linux-2.6.16-rc4-xen0/include/asm-i386/mach-xen/asm/floppy.h | 147 linux-2.6.16-rc4-xen0/include/asm-i386/mach-xen/asm/highmem.h | 81 linux-2.6.16-rc4-xen0/include/asm-i386/mach-xen/asm/hw_irq.h | 73 linux-2.6.16-rc4-xen0/include/asm-i386/mach-xen/asm/hypercall.h | 323 + linux-2.6.16-rc4-xen0/include/asm-i386/mach-xen/asm/hypervisor.h | 166 linux-2.6.16-rc4-xen0/include/asm-i386/mach-xen/asm/io.h | 401 + linux-2.6.16-rc4-xen0/include/asm-i386/mach-xen/asm/kmap_types.h | 32 linux-2.6.16-rc4-xen0/include/asm-i386/mach-xen/asm/mmu.h | 21 linux-2.6.16-rc4-xen0/include/asm-i386/mach-xen/asm/mmu_context.h | 105 linux-2.6.16-rc4-xen0/include/asm-i386/mach-xen/asm/page.h | 324 + linux-2.6.16-rc4-xen0/include/asm-i386/mach-xen/asm/param.h | 24 linux-2.6.16-rc4-xen0/include/asm-i386/mach-xen/asm/pci.h | 154 linux-2.6.16-rc4-xen0/include/asm-i386/mach-xen/asm/pgalloc.h | 64 linux-2.6.16-rc4-xen0/include/asm-i386/mach-xen/asm/pgtable-2level-defs.h | 21 linux-2.6.16-rc4-xen0/include/asm-i386/mach-xen/asm/pgtable-2level.h | 83 linux-2.6.16-rc4-xen0/include/asm-i386/mach-xen/asm/pgtable-3level-defs.h | 25 linux-2.6.16-rc4-xen0/include/asm-i386/mach-xen/asm/pgtable-3level.h | 181 linux-2.6.16-rc4-xen0/include/asm-i386/mach-xen/asm/pgtable.h | 512 + linux-2.6.16-rc4-xen0/include/asm-i386/mach-xen/asm/processor.h | 762 ++ linux-2.6.16-rc4-xen0/include/asm-i386/mach-xen/asm/ptrace.h | 90 linux-2.6.16-rc4-xen0/include/asm-i386/mach-xen/asm/scatterlist.h | 22 linux-2.6.16-rc4-xen0/include/asm-i386/mach-xen/asm/segment.h | 113 linux-2.6.16-rc4-xen0/include/asm-i386/mach-xen/asm/setup.h | 66 linux-2.6.16-rc4-xen0/include/asm-i386/mach-xen/asm/smp.h | 103 linux-2.6.16-rc4-xen0/include/asm-i386/mach-xen/asm/spinlock.h | 217 linux-2.6.16-rc4-xen0/include/asm-i386/mach-xen/asm/swiotlb.h | 43 linux-2.6.16-rc4-xen0/include/asm-i386/mach-xen/asm/synch_bitops.h | 141 linux-2.6.16-rc4-xen0/include/asm-i386/mach-xen/asm/system.h | 679 ++ linux-2.6.16-rc4-xen0/include/asm-i386/mach-xen/asm/tlbflush.h | 102 linux-2.6.16-rc4-xen0/include/asm-i386/mach-xen/asm/vga.h | 20 linux-2.6.16-rc4-xen0/include/asm-i386/mach-xen/irq_vectors.h | 125 linux-2.6.16-rc4-xen0/include/asm-i386/mach-xen/mach_traps.h | 33 linux-2.6.16-rc4-xen0/include/asm-i386/mach-xen/setup_arch_post.h | 43 linux-2.6.16-rc4-xen0/include/asm-i386/mach-xen/setup_arch_pre.h | 5 linux-2.6.16-rc4-xen0/include/asm-i386/spinlock.h | 6 linux-2.6.16-rc4-xen0/include/asm-i386/system.h | 2 linux-2.6.16-rc4-xen0/include/asm-um/page.h | 2 linux-2.6.16-rc4-xen0/include/asm-x86_64/apic.h | 2 linux-2.6.16-rc4-xen0/include/asm-x86_64/mach-xen/asm/arch_hooks.h | 27 linux-2.6.16-rc4-xen0/include/asm-x86_64/mach-xen/asm/bootsetup.h | 42 linux-2.6.16-rc4-xen0/include/asm-x86_64/mach-xen/asm/desc.h | 263 linux-2.6.16-rc4-xen0/include/asm-x86_64/mach-xen/asm/dma-mapping.h | 191 linux-2.6.16-rc4-xen0/include/asm-x86_64/mach-xen/asm/fixmap.h | 111 linux-2.6.16-rc4-xen0/include/asm-x86_64/mach-xen/asm/floppy.h | 206 linux-2.6.16-rc4-xen0/include/asm-x86_64/mach-xen/asm/hw_irq.h | 141 linux-2.6.16-rc4-xen0/include/asm-x86_64/mach-xen/asm/hypercall.h | 323 + linux-2.6.16-rc4-xen0/include/asm-x86_64/mach-xen/asm/hypervisor.h | 2 linux-2.6.16-rc4-xen0/include/asm-x86_64/mach-xen/asm/io.h | 359 + linux-2.6.16-rc4-xen0/include/asm-x86_64/mach-xen/asm/irq.h | 39 linux-2.6.16-rc4-xen0/include/asm-x86_64/mach-xen/asm/mmu.h | 33 linux-2.6.16-rc4-xen0/include/asm-x86_64/mach-xen/asm/mmu_context.h | 134 linux-2.6.16-rc4-xen0/include/asm-x86_64/mach-xen/asm/nmi.h | 75 linux-2.6.16-rc4-xen0/include/asm-x86_64/mach-xen/asm/page.h | 317 + linux-2.6.16-rc4-xen0/include/asm-x86_64/mach-xen/asm/pci.h | 176 linux-2.6.16-rc4-xen0/include/asm-x86_64/mach-xen/asm/pgalloc.h | 199 linux-2.6.16-rc4-xen0/include/asm-x86_64/mach-xen/asm/pgtable.h | 560 ++ linux-2.6.16-rc4-xen0/include/asm-x86_64/mach-xen/asm/processor.h | 503 + linux-2.6.16-rc4-xen0/include/asm-x86_64/mach-xen/asm/ptrace.h | 125 linux-2.6.16-rc4-xen0/include/asm-x86_64/mach-xen/asm/segment.h | 44 linux-2.6.16-rc4-xen0/include/asm-x86_64/mach-xen/asm/smp.h | 152 linux-2.6.16-rc4-xen0/include/asm-x86_64/mach-xen/asm/synch_bitops.h | 2 linux-2.6.16-rc4-xen0/include/asm-x86_64/mach-xen/asm/system.h | 434 + linux-2.6.16-rc4-xen0/include/asm-x86_64/mach-xen/asm/timer.h | 67 linux-2.6.16-rc4-xen0/include/asm-x86_64/mach-xen/asm/tlbflush.h | 104 linux-2.6.16-rc4-xen0/include/asm-x86_64/mach-xen/asm/vga.h | 20 linux-2.6.16-rc4-xen0/include/asm-x86_64/mach-xen/asm/xor.h | 328 + linux-2.6.16-rc4-xen0/include/asm-x86_64/mach-xen/irq_vectors.h | 123 linux-2.6.16-rc4-xen0/include/asm-x86_64/mach-xen/mach_time.h | 122 linux-2.6.16-rc4-xen0/include/asm-x86_64/mach-xen/mach_timer.h | 48 linux-2.6.16-rc4-xen0/include/asm-x86_64/mach-xen/setup_arch_post.h | 52 linux-2.6.16-rc4-xen0/include/asm-x86_64/mach-xen/setup_arch_pre.h | 5 linux-2.6.16-rc4-xen0/include/linux/gfp.h | 6 linux-2.6.16-rc4-xen0/include/linux/highmem.h | 6 linux-2.6.16-rc4-xen0/include/linux/irq.h | 3 linux-2.6.16-rc4-xen0/include/linux/mm.h | 13 linux-2.6.16-rc4-xen0/include/linux/skbuff.h | 13 linux-2.6.16-rc4-xen0/include/xen/balloon.h | 70 linux-2.6.16-rc4-xen0/include/xen/driver_util.h | 26 linux-2.6.16-rc4-xen0/include/xen/evtchn.h | 123 linux-2.6.16-rc4-xen0/include/xen/features.h | 20 linux-2.6.16-rc4-xen0/include/xen/foreign_page.h | 40 linux-2.6.16-rc4-xen0/include/xen/gnttab.h | 119 linux-2.6.16-rc4-xen0/include/xen/interface/COPYING | 28 linux-2.6.16-rc4-xen0/include/xen/interface/acm.h | 181 linux-2.6.16-rc4-xen0/include/xen/interface/acm_ops.h | 96 linux-2.6.16-rc4-xen0/include/xen/interface/arch-ia64.h | 314 + linux-2.6.16-rc4-xen0/include/xen/interface/arch-x86_32.h | 158 linux-2.6.16-rc4-xen0/include/xen/interface/arch-x86_64.h | 243 linux-2.6.16-rc4-xen0/include/xen/interface/dom0_ops.h | 488 + linux-2.6.16-rc4-xen0/include/xen/interface/event_channel.h | 203 linux-2.6.16-rc4-xen0/include/xen/interface/grant_table.h | 306 + linux-2.6.16-rc4-xen0/include/xen/interface/hvm/hvm_info_table.h | 24 linux-2.6.16-rc4-xen0/include/xen/interface/hvm/ioreq.h | 90 linux-2.6.16-rc4-xen0/include/xen/interface/hvm/vmx_assist.h | 97 linux-2.6.16-rc4-xen0/include/xen/interface/io/blkif.h | 85 linux-2.6.16-rc4-xen0/include/xen/interface/io/console.h | 33 linux-2.6.16-rc4-xen0/include/xen/interface/io/netif.h | 76 linux-2.6.16-rc4-xen0/include/xen/interface/io/pciif.h | 55 linux-2.6.16-rc4-xen0/include/xen/interface/io/ring.h | 270 linux-2.6.16-rc4-xen0/include/xen/interface/io/tpmif.h | 56 linux-2.6.16-rc4-xen0/include/xen/interface/io/xenbus.h | 44 linux-2.6.16-rc4-xen0/include/xen/interface/io/xs_wire.h | 97 linux-2.6.16-rc4-xen0/include/xen/interface/memory.h | 149 linux-2.6.16-rc4-xen0/include/xen/interface/nmi.h | 54 linux-2.6.16-rc4-xen0/include/xen/interface/physdev.h | 70 linux-2.6.16-rc4-xen0/include/xen/interface/sched.h | 60 linux-2.6.16-rc4-xen0/include/xen/interface/sched_ctl.h | 68 linux-2.6.16-rc4-xen0/include/xen/interface/trace.h | 90 linux-2.6.16-rc4-xen0/include/xen/interface/vcpu.h | 64 linux-2.6.16-rc4-xen0/include/xen/interface/xen.h | 447 + linux-2.6.16-rc4-xen0/include/xen/net_driver_util.h | 56 linux-2.6.16-rc4-xen0/include/xen/pcifront.h | 39 linux-2.6.16-rc4-xen0/include/xen/public/evtchn.h | 98 linux-2.6.16-rc4-xen0/include/xen/public/privcmd.h | 91 linux-2.6.16-rc4-xen0/include/xen/public/xenstored.h | 89 linux-2.6.16-rc4-xen0/include/xen/tpmfe.h | 40 linux-2.6.16-rc4-xen0/include/xen/xen_proc.h | 23 linux-2.6.16-rc4-xen0/include/xen/xenbus.h | 298 + linux-2.6.16-rc4-xen0/include/xen/xencons.h | 14 linux-2.6.16-rc4-xen0/kernel/Kconfig.preempt | 1 linux-2.6.16-rc4-xen0/kernel/irq/manage.c | 84 linux-2.6.16-rc4-xen0/lib/Kconfig.debug | 2 linux-2.6.16-rc4-xen0/lib/Makefile | 3 linux-2.6.16-rc4-xen0/mm/Kconfig | 3 linux-2.6.16-rc4-xen0/mm/highmem.c | 11 linux-2.6.16-rc4-xen0/mm/memory.c | 112 linux-2.6.16-rc4-xen0/mm/mmap.c | 4 linux-2.6.16-rc4-xen0/mm/page_alloc.c | 6 linux-2.6.16-rc4-xen0/net/core/dev.c | 50 linux-2.6.16-rc4-xen0/net/core/skbuff.c | 41 linux-2.6.16-rc4-xen0/scripts/Makefile.xen | 14 linux-2.6.16-rc4-xen0/scripts/kconfig/zconf.hash.c | 231 319 files changed, 71831 insertions(+), 99 deletions(-) View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.1.46.2 -r 1.1.46.3 linux-2.6-xen.patch Index: linux-2.6-xen.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/Attic/linux-2.6-xen.patch,v retrieving revision 1.1.46.2 retrieving revision 1.1.46.3 diff -u -r1.1.46.2 -r1.1.46.3 --- linux-2.6-xen.patch 28 Feb 2006 20:16:10 -0000 1.1.46.2 +++ linux-2.6-xen.patch 1 Mar 2006 16:54:41 -0000 1.1.46.3 @@ -19901,4715 +19901,6 @@ +obj-$(CONFIG_SOFTWARE_SUSPEND) += cpu.o +obj-$(CONFIG_ACPI_SLEEP) += cpu.o obj-$(CONFIG_SOFTWARE_SUSPEND) += swsusp.o -diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff ref-linux-2.6.16-rc4/arch/ia64/hp/sim/Makefile linux-2.6.16-rc4-xen0/arch/ia64/hp/sim/Makefile ---- ref-linux-2.6.16-rc4/arch/ia64/hp/sim/Makefile 2006-01-03 04:21:10.000000000 +0100 -+++ linux-2.6.16-rc4-xen0/arch/ia64/hp/sim/Makefile 2006-02-22 13:44:42.000000000 +0100 -@@ -14,3 +14,5 @@ obj-$(CONFIG_HP_SIMETH) += simeth.o - obj-$(CONFIG_HP_SIMSERIAL) += simserial.o - obj-$(CONFIG_HP_SIMSERIAL_CONSOLE) += hpsim_console.o - obj-$(CONFIG_HP_SIMSCSI) += simscsi.o -+obj-$(CONFIG_XEN) += simserial.o -+obj-$(CONFIG_XEN) += hpsim_console.o -diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff ref-linux-2.6.16-rc4/arch/ia64/Kconfig linux-2.6.16-rc4-xen0/arch/ia64/Kconfig ---- ref-linux-2.6.16-rc4/arch/ia64/Kconfig 2006-02-22 15:51:47.000000000 +0100 -+++ linux-2.6.16-rc4-xen0/arch/ia64/Kconfig 2006-02-22 13:44:42.000000000 +0100 -@@ -50,6 +50,48 @@ config GENERIC_IOMAP - bool - default y - -+config XEN -+ bool -+ default y -+ help -+ Enable Xen hypervisor support. Resulting kernel runs -+ both as a guest OS on Xen and natively on hardware. -+ -+config ARCH_XEN -+ bool -+ default y -+ help -+ TEMP ONLY. Needs to be on for drivers/xen to build. -+ -+config XEN_PRIVILEGED_GUEST -+ bool "Privileged Guest" -+ default n -+ help -+ Used in drivers/xen/privcmd.c. Should go away? -+ -+config XEN_BLKDEV_GRANT -+ depends on XEN -+ bool -+ default y -+ -+config XEN_BLKDEV_FRONTEND -+ depends on XEN -+ bool -+ default y -+ -+config XEN_VT -+ bool "Override for turning on CONFIG_VT for domU" -+ default y -+ help -+ Hack to turn off CONFIG_VT for domU -+ -+config VT -+ bool -+ default y if XEN && XEN_VT -+ default n if XEN && !XEN_VT -+ help -+ Hack to turn off CONFIG_VT for domU -+ - config SCHED_NO_NO_OMIT_FRAME_POINTER - bool - default y -diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff ref-linux-2.6.16-rc4/arch/ia64/kernel/entry.S linux-2.6.16-rc4-xen0/arch/ia64/kernel/entry.S ---- ref-linux-2.6.16-rc4/arch/ia64/kernel/entry.S 2006-02-22 15:51:47.000000000 +0100 -+++ linux-2.6.16-rc4-xen0/arch/ia64/kernel/entry.S 2006-02-22 13:44:42.000000000 +0100 -@@ -181,7 +181,7 @@ END(sys_clone) - * called. The code starting at .map relies on this. The rest of the code - * doesn't care about the interrupt masking status. - */ --GLOBAL_ENTRY(ia64_switch_to) -+GLOBAL_ENTRY(__ia64_switch_to) - .prologue - alloc r16=ar.pfs,1,0,0,0 - DO_SAVE_SWITCH_STACK -@@ -235,7 +235,7 @@ GLOBAL_ENTRY(ia64_switch_to) - ;; - srlz.d - br.cond.sptk .done --END(ia64_switch_to) -+END(__ia64_switch_to) - - /* - * Note that interrupts are enabled during save_switch_stack and load_switch_stack. This -@@ -376,7 +376,7 @@ END(save_switch_stack) - * - b7 holds address to return to - * - must not touch r8-r11 - */ --ENTRY(load_switch_stack) -+GLOBAL_ENTRY(load_switch_stack) - .prologue - .altrp b7 - -@@ -511,7 +511,7 @@ END(clone) - * because some system calls (such as ia64_execve) directly - * manipulate ar.pfs. - */ --GLOBAL_ENTRY(ia64_trace_syscall) -+GLOBAL_ENTRY(__ia64_trace_syscall) - PT_REGS_UNWIND_INFO(0) - /* - * We need to preserve the scratch registers f6-f11 in case the system -@@ -583,7 +583,7 @@ strace_error: - (p6) mov r10=-1 - (p6) mov r8=r9 - br.cond.sptk .strace_save_retval --END(ia64_trace_syscall) -+END(__ia64_trace_syscall) - - /* - * When traced and returning from sigreturn, we invoke syscall_trace but then -@@ -636,8 +636,11 @@ GLOBAL_ENTRY(ia64_ret_from_syscall) - adds r2=PT(R8)+16,sp // r2 = &pt_regs.r8 - mov r10=r0 // clear error indication in r10 - (p7) br.cond.spnt handle_syscall_error // handle potential syscall failure -+ ;; -+ // don't fall through, ia64_leave_syscall may be #define'd -+ br.cond.sptk.few ia64_leave_syscall -+ ;; - END(ia64_ret_from_syscall) -- // fall through - /* - * ia64_leave_syscall(): Same as ia64_leave_kernel, except that it doesn't - * need to switch to bank 0 and doesn't restore the scratch registers. -@@ -682,7 +685,7 @@ END(ia64_ret_from_syscall) - * ar.csd: cleared - * ar.ssd: cleared - */ --ENTRY(ia64_leave_syscall) -+GLOBAL_ENTRY(__ia64_leave_syscall) - PT_REGS_UNWIND_INFO(0) - /* - * work.need_resched etc. mustn't get changed by this CPU before it returns to -@@ -790,7 +793,7 @@ ENTRY(ia64_leave_syscall) - mov.m ar.ssd=r0 // M2 clear ar.ssd - mov f11=f0 // F clear f11 - br.cond.sptk.many rbs_switch // B --END(ia64_leave_syscall) -+END(__ia64_leave_syscall) - - #ifdef CONFIG_IA32_SUPPORT - GLOBAL_ENTRY(ia64_ret_from_ia32_execve) -@@ -802,10 +805,13 @@ GLOBAL_ENTRY(ia64_ret_from_ia32_execve) - st8.spill [r2]=r8 // store return value in slot for r8 and set unat bit - .mem.offset 8,0 - st8.spill [r3]=r0 // clear error indication in slot for r10 and set unat bit -+ ;; -+ // don't fall through, ia64_leave_kernel may be #define'd -+ br.cond.sptk.few ia64_leave_kernel -+ ;; - END(ia64_ret_from_ia32_execve) -- // fall through - #endif /* CONFIG_IA32_SUPPORT */ --GLOBAL_ENTRY(ia64_leave_kernel) -+GLOBAL_ENTRY(__ia64_leave_kernel) - PT_REGS_UNWIND_INFO(0) - /* - * work.need_resched etc. mustn't get changed by this CPU before it returns to -@@ -1150,7 +1156,7 @@ skip_rbs_switch: - ld8 r10=[r3] - br.cond.sptk.many .work_processed_syscall // re-check - --END(ia64_leave_kernel) -+END(__ia64_leave_kernel) - - ENTRY(handle_syscall_error) - /* -@@ -1190,7 +1196,7 @@ END(ia64_invoke_schedule_tail) - * be set up by the caller. We declare 8 input registers so the system call - * args get preserved, in case we need to restart a system call. - */ --ENTRY(notify_resume_user) -+GLOBAL_ENTRY(notify_resume_user) - .prologue ASM_UNW_PRLG_RP|ASM_UNW_PRLG_PFS, ASM_UNW_PRLG_GRSAVE(8) - alloc loc1=ar.pfs,8,2,3,0 // preserve all eight input regs in case of syscall restart! - mov r9=ar.unat -@@ -1278,7 +1284,7 @@ ENTRY(sys_rt_sigreturn) - adds sp=16,sp - ;; - ld8 r9=[sp] // load new ar.unat -- mov.sptk b7=r8,ia64_leave_kernel -+ mov.sptk b7=r8,__ia64_leave_kernel - ;; - mov ar.unat=r9 - br.many b7 -diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff ref-linux-2.6.16-rc4/arch/ia64/kernel/head.S linux-2.6.16-rc4-xen0/arch/ia64/kernel/head.S ---- ref-linux-2.6.16-rc4/arch/ia64/kernel/head.S 2006-02-22 15:51:47.000000000 +0100 -+++ linux-2.6.16-rc4-xen0/arch/ia64/kernel/head.S 2006-02-22 13:44:42.000000000 +0100 -@@ -371,6 +371,10 @@ start_ap: - [...5679 lines suppressed...] -+/* Instructions paravirtualized for performance */ -+/************************************************/ -+ -+/* Xen uses memory-mapped virtual privileged registers for access to many -+ * performance-sensitive privileged registers. Some, like the processor -+ * status register (psr), are broken up into multiple memory locations. -+ * Others, like "pend", are abstractions based on privileged registers. -+ * "Pend" is guaranteed to be set if reading cr.ivr would return a -+ * (non-spurious) interrupt. */ -+#define xen_get_virtual_psr_i() (*(int *)(XSI_PSR_I)) -+#define xen_set_virtual_psr_i(_val) ({ *(int *)(XSI_PSR_I) = _val ? 1:0; }) -+#define xen_set_virtual_psr_ic(_val) ({ *(int *)(XSI_PSR_IC) = _val ? 1:0; }) -+#define xen_get_virtual_pend() (*(int *)(XSI_PEND)) -+ -+/* Hyperprivops are "break" instructions with a well-defined API. -+ * In particular, the virtual psr.ic bit must be off; in this way -+ * it is guaranteed to never conflict with a linux break instruction. -+ * Normally, this is done in a xen stub but this one is frequent enough -+ * that we inline it */ -+#define xen_hyper_ssm_i() \ -+({ \ -+ xen_set_virtual_psr_i(0); \ -+ xen_set_virtual_psr_ic(0); \ -+ XEN_HYPER_SSM_I; \ -+}) -+ -+/* turning off interrupts can be paravirtualized simply by writing -+ * to a memory-mapped virtual psr.i bit (implemented as a 16-bit bool) */ -+#define xen_rsm_i() xen_set_virtual_psr_i(0) -+ -+/* turning on interrupts is a bit more complicated.. write to the -+ * memory-mapped virtual psr.i bit first (to avoid race condition), -+ * then if any interrupts were pending, we have to execute a hyperprivop -+ * to ensure the pending interrupt gets delivered; else we're done! */ -+#define xen_ssm_i() \ -+({ \ -+ int old = xen_get_virtual_psr_i(); \ -+ xen_set_virtual_psr_i(1); \ -+ if (!old && xen_get_virtual_pend()) xen_hyper_ssm_i(); \ -+}) -+ -+#define xen_ia64_intrin_local_irq_restore(x) \ -+{ \ -+ if (running_on_xen) { \ -+ if ((x) & IA64_PSR_I) { xen_ssm_i(); } \ -+ else { xen_rsm_i(); } \ -+ } \ -+ else __ia64_intrin_local_irq_restore((x)); \ -+} -+ -+#define xen_get_psr_i() \ -+( \ -+ (running_on_xen) ? \ -+ (xen_get_virtual_psr_i() ? IA64_PSR_I : 0) \ -+ : __ia64_get_psr_i() \ -+) -+ -+#define xen_ia64_ssm(mask) \ -+{ \ -+ if ((mask)==IA64_PSR_I) { \ -+ if (running_on_xen) { xen_ssm_i(); } \ -+ else { __ia64_ssm(mask); } \ -+ } \ -+ else { __ia64_ssm(mask); } \ -+} -+ -+#define xen_ia64_rsm(mask) \ -+{ \ -+ if ((mask)==IA64_PSR_I) { \ -+ if (running_on_xen) { xen_rsm_i(); } \ -+ else { __ia64_rsm(mask); } \ -+ } \ -+ else { __ia64_rsm(mask); } \ -+} -+ -+ -+/* Although all privileged operations can be left to trap and will -+ * be properly handled by Xen, some are frequent enough that we use -+ * hyperprivops for performance. */ -+ -+extern unsigned long xen_get_ivr(void); -+extern unsigned long xen_get_tpr(void); -+extern void xen_set_itm(unsigned long); -+extern void xen_set_tpr(unsigned long); -+extern void xen_eoi(void); -+extern void xen_set_rr(unsigned long index, unsigned long val); -+extern unsigned long xen_get_rr(unsigned long index); -+extern void xen_set_kr(unsigned long index, unsigned long val); -+ -+/* Note: It may look wrong to test for running_on_xen in each case. -+ * However regnum is always a constant so, as written, the compiler -+ * eliminates the switch statement, whereas running_on_xen must be -+ * tested dynamically. */ -+#define xen_ia64_getreg(regnum) \ -+({ \ -+ __u64 ia64_intri_res; \ -+ \ -+ switch(regnum) { \ -+ case _IA64_REG_CR_IVR: \ -+ ia64_intri_res = (running_on_xen) ? \ -+ xen_get_ivr() : \ -+ __ia64_getreg(regnum); \ -+ break; \ -+ case _IA64_REG_CR_TPR: \ -+ ia64_intri_res = (running_on_xen) ? \ -+ xen_get_tpr() : \ -+ __ia64_getreg(regnum); \ -+ break; \ -+ case _IA64_REG_AR_EFLAG: \ -+ ia64_intri_res = (running_on_xen) ? \ -+ xen_get_eflag() : \ -+ __ia64_getreg(regnum); \ -+ break; \ -+ default: \ -+ ia64_intri_res = __ia64_getreg(regnum); \ -+ break; \ -+ } \ -+ ia64_intri_res; \ -+}) -+ -+#define xen_ia64_setreg(regnum,val) \ -+({ \ -+ switch(regnum) { \ -+ case _IA64_REG_AR_KR0 ... _IA64_REG_AR_KR7: \ -+ (running_on_xen) ? \ -+ xen_set_kr((regnum-_IA64_REG_AR_KR0), val) : \ -+ __ia64_setreg(regnum,val); \ -+ break; \ -+ case _IA64_REG_CR_ITM: \ -+ (running_on_xen) ? \ -+ xen_set_itm(val) : \ -+ __ia64_setreg(regnum,val); \ -+ break; \ -+ case _IA64_REG_CR_TPR: \ -+ (running_on_xen) ? \ -+ xen_set_tpr(val) : \ -+ __ia64_setreg(regnum,val); \ -+ break; \ -+ case _IA64_REG_CR_EOI: \ -+ (running_on_xen) ? \ -+ xen_eoi() : \ -+ __ia64_setreg(regnum,val); \ -+ break; \ -+ case _IA64_REG_AR_EFLAG: \ -+ (running_on_xen) ? \ -+ xen_set_eflag(val) : \ -+ __ia64_setreg(regnum,val); \ -+ break; \ -+ default: \ -+ __ia64_setreg(regnum,val); \ -+ break; \ -+ } \ -+}) -+ -+#define ia64_ssm xen_ia64_ssm -+#define ia64_rsm xen_ia64_rsm -+#define ia64_intrin_local_irq_restore xen_ia64_intrin_local_irq_restore -+#define ia64_ptcga xen_ptcga -+#define ia64_set_rr(index,val) xen_set_rr(index,val) -+#define ia64_get_rr(index) xen_get_rr(index) -+#define ia64_getreg xen_ia64_getreg -+#define ia64_setreg xen_ia64_setreg -+#define ia64_get_psr_i xen_get_psr_i -+ -+/* the remainder of these are not performance-sensitive so its -+ * OK to not paravirtualize and just take a privop trap and emulate */ -+#define ia64_hint __ia64_hint -+#define ia64_set_pmd __ia64_set_pmd -+#define ia64_itci __ia64_itci -+#define ia64_itcd __ia64_itcd -+#define ia64_itri __ia64_itri -+#define ia64_itrd __ia64_itrd -+#define ia64_tpa __ia64_tpa -+#define ia64_set_ibr __ia64_set_ibr -+#define ia64_set_pkr __ia64_set_pkr -+#define ia64_set_pmc __ia64_set_pmc -+#define ia64_get_ibr __ia64_get_ibr -+#define ia64_get_pkr __ia64_get_pkr -+#define ia64_get_pmc __ia64_get_pmc -+#define ia64_ptce __ia64_ptce -+#define ia64_ptcl __ia64_ptcl -+#define ia64_ptri __ia64_ptri -+#define ia64_ptrd __ia64_ptrd -+ -+#endif /* !__ASSEMBLY__ */ -+ -+/* these routines utilize privilege-sensitive or performance-sensitive -+ * privileged instructions so the code must be replaced with -+ * paravirtualized versions */ -+#define ia64_pal_halt_light xen_pal_halt_light -+#define ia64_leave_kernel xen_leave_kernel -+#define ia64_leave_syscall xen_leave_syscall -+#define ia64_trace_syscall xen_trace_syscall -+#define ia64_switch_to xen_switch_to -+#define ia64_pal_call_static xen_pal_call_static -+ -+#endif /* _ASM_IA64_XEN_PRIVOP_H */ diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff ref-linux-2.6.16-rc4/include/asm-um/page.h linux-2.6.16-rc4-xen0/include/asm-um/page.h --- ref-linux-2.6.16-rc4/include/asm-um/page.h 2006-01-03 04:21:10.000000000 +0100 +++ linux-2.6.16-rc4-xen0/include/asm-um/page.h 2006-02-22 13:44:44.000000000 +0100 From fedora-cvs-commits at redhat.com Wed Mar 1 16:58:39 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 1 Mar 2006 11:58:39 -0500 Subject: rpms/usbutils/devel usbutils-0.71-VT.patch, NONE, 1.1 usbutils.spec, 1.18, 1.19 Message-ID: <200603011658.k21GwdLO013686@cvs.devel.redhat.com> Author: karsten Update of /cvs/dist/rpms/usbutils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv13663 Modified Files: usbutils.spec Added Files: usbutils-0.71-VT.patch Log Message: - add usbutils-0.71-VT.patch to fix warnings about unknown lines (#176903) usbutils-0.71-VT.patch: names.c | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 58 insertions(+) --- NEW FILE usbutils-0.71-VT.patch --- --- usbutils-0.71/names.c 2005-01-23 00:03:47.000000000 +0100 +++ usbutils-0.72/names.c 2005-10-22 07:59:50.000000000 +0200 @@ -79,6 +79,12 @@ char name[1]; }; +struct videoterminal { + struct videoterminal *next; + u_int16_t termt; + char name[1]; +}; + struct genericstrtable { struct genericstrtable *next; unsigned int num; @@ -109,6 +115,7 @@ static struct subclass *subclasses[HASHSZ] = { NULL, }; static struct protocol *protocols[HASHSZ] = { NULL, }; static struct audioterminal *audioterminals[HASHSZ] = { NULL, }; +static struct videoterminal *videoterminals[HASHSZ] = { NULL, }; static struct genericstrtable *hiddescriptors[HASHSZ] = { NULL, }; static struct genericstrtable *reports[HASHSZ] = { NULL, }; static struct genericstrtable *huts[HASHSZ] = { NULL, }; @@ -236,6 +243,17 @@ return NULL; } +const char *names_videoterminal(u_int16_t termt) +{ + struct videoterminal *vt; + + vt = videoterminals[hashnum(termt)]; + for (; vt; vt = vt->next) + if (vt->termt == termt) + return vt->name; + return NULL; +} + /* ---------------------------------------------------------------------- */ static int new_vendor(const char *name, u_int16_t vendorid) @@ -356,6 +374,25 @@ return 0; } +static int new_videoterminal(const char *name, u_int16_t termt) +{ + struct videoterminal *vt; + unsigned int h = hashnum(termt); + + vt = videoterminals[h]; + for (; vt; vt = vt->next) + if (vt->termt == termt) + return -1; + vt = malloc(sizeof(struct videoterminal) + strlen(name)); + if (!vt) + return -1; + strcpy(vt->name, name); + vt->termt = termt; + vt->next = videoterminals[h]; + videoterminals[h] = vt; + return 0; +} + static int new_genericstrtable(struct genericstrtable *t[HASHSZ], const char *name, unsigned int index) { struct genericstrtable *g; @@ -564,6 +601,27 @@ DBG(printf("line %5u audio terminal type %02x %s\n", linectr, u, cp)); continue; } + if (buf[0] == 'V' && buf[1] == 'T' && isspace(buf[2])) { + /* video terminal type spec */ + cp = buf+3; + while (isspace(*cp)) + cp++; + if (!isxdigit(*cp)) { + fprintf(stderr, "Invalid video terminal type at line %u\n", linectr); + continue; + } + u = strtoul(cp, &cp, 16); + while (isspace(*cp)) + cp++; + if (!*cp) { + fprintf(stderr, "Invalid video terminal type at line %u\n", linectr); + continue; + } + if (new_videoterminal(cp, u)) + fprintf(stderr, "Duplicate video terminal type spec at line %u terminal type %04x %s\n", linectr, u, cp); + DBG(printf("line %5u video terminal type %02x %s\n", linectr, u, cp)); + continue; + } if (buf[0] == 'H' && buf[1] == 'C' && buf[2] == 'C' && isspace(buf[3])) { /* HID Descriptor bCountryCode */ cp = buf+3; Index: usbutils.spec =================================================================== RCS file: /cvs/dist/rpms/usbutils/devel/usbutils.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- usbutils.spec 11 Feb 2006 05:55:57 -0000 1.18 +++ usbutils.spec 1 Mar 2006 16:58:37 -0000 1.19 @@ -1,8 +1,9 @@ Name: usbutils Version: 0.71 -Release: 1.2 +Release: 2 Source: http://prdownloads.sourceforge.net/linux-usb/%{name}-%{version}.tar.gz Patch1: usbutils-0.70-hwdata.patch +Patch2: usbutils-0.71-VT.patch URL: http://www.linux-usb.org/ License: GPL BuildRoot: %{_tmppath}/%{name}-%{version}-root @@ -20,6 +21,7 @@ %prep %setup -q %patch1 -p1 -b .hwdata +%patch2 -p1 -b .vt %build cp /usr/share/libtool/config.{sub,guess} . @@ -47,6 +49,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Mar 01 2006 Karsten Hopp 1.71-2 +- add usbutils-0.71-VT.patch to fix warnings about unknown lines + (#176903) + * Fri Feb 10 2006 Jesse Keating - 0.71-1.2 - bump again for double-long bug on ppc(64) From fedora-cvs-commits at redhat.com Wed Mar 1 17:08:26 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 1 Mar 2006 12:08:26 -0500 Subject: rpms/beagle/devel beagle-0.2.1-crawl.patch, 1.1, 1.2 beagle.spec, 1.36, 1.37 Message-ID: <200603011708.k21H8Qk6014044@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/beagle/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv14029 Modified Files: beagle-0.2.1-crawl.patch beagle.spec Log Message: fix a typo beagle-0.2.1-crawl.patch: Makefile.am | 1 - Makefile.in | 1 - crawl-rules/crawl-applications | 4 ++-- crawl-rules/crawl-documentation | 2 +- 4 files changed, 3 insertions(+), 5 deletions(-) Index: beagle-0.2.1-crawl.patch =================================================================== RCS file: /cvs/dist/rpms/beagle/devel/beagle-0.2.1-crawl.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- beagle-0.2.1-crawl.patch 21 Feb 2006 20:06:07 -0000 1.1 +++ beagle-0.2.1-crawl.patch 1 Mar 2006 17:08:22 -0000 1.2 @@ -25,7 +25,7 @@ CRAWL_INDEX_NAME="applications" -CRAWL_PATHS="/usr/share/applications /usr/local/shared/applications /opt/gnome/share/applications /opt/kde3/share/applications" -+CRAWL_PATHS="/usr/share/applications /usr/local/share/applications ++CRAWL_PATHS="/usr/share/applications /usr/local/share/applications" CRAWL_RECURSIVE="yes" Index: beagle.spec =================================================================== RCS file: /cvs/dist/rpms/beagle/devel/beagle.spec,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- beagle.spec 1 Mar 2006 16:50:31 -0000 1.36 +++ beagle.spec 1 Mar 2006 17:08:22 -0000 1.37 @@ -213,6 +213,9 @@ %{_prefix}/lib/python*/site-packages/beagle.so %changelog +* Wed Mar 1 2006 Matthias Clasen 0.2.1-14 +- Fix a typo in /etc/beagle/crawl-applications + * Wed Mar 1 2006 Ray Strode 0.2.1-13 - add patch from Felipe Alfaro Solana to invote beagle indexing helper function with valid shell From fedora-cvs-commits at redhat.com Wed Mar 1 17:09:19 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 1 Mar 2006 12:09:19 -0500 Subject: rpms/udev/devel udev-rules.patch,1.6,1.7 udev.spec,1.156,1.157 Message-ID: <200603011709.k21H9Jcg014076@cvs.devel.redhat.com> Author: harald Update of /cvs/dist/rpms/udev/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv13477 Modified Files: udev-rules.patch udev.spec Log Message: *docs* - Enumeration for cdrom, floppy, scanner, changer is gone (no more /dev/cdrom1). udev now creates one device (cdrom, floppy, scanner, changer) for compatibility (random device wins) and e.g. for cdrom: e.g. /dev/cdrom -> hdd /dev/cdrom-hdc -> hdc /dev/cdrom-hdd -> hdd udev-rules.patch: 05-udev-early.rules | 9 ++ 95-pam-console.rules | 1 hotplug.rules | 13 +++ udev.rules | 166 ++++++++++++++++++++++++++++----------------------- 4 files changed, 113 insertions(+), 76 deletions(-) Index: udev-rules.patch =================================================================== RCS file: /cvs/dist/rpms/udev/devel/udev-rules.patch,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- udev-rules.patch 1 Mar 2006 16:31:25 -0000 1.6 +++ udev-rules.patch 1 Mar 2006 17:09:12 -0000 1.7 @@ -36,7 +36,7 @@ + +ACTION=="add", SUBSYSTEM=="firmware", ENV{FIRMWARE}=="*", RUN="/sbin/firmware_helper", OPTIONS="last_rule" --- udev-084/etc/udev/redhat/udev.rules.rhrules 2006-01-30 08:51:38.000000000 +0100 -+++ udev-084/etc/udev/redhat/udev.rules 2006-03-01 17:18:34.000000000 +0100 ++++ udev-084/etc/udev/redhat/udev.rules 2006-03-01 17:49:38.000000000 +0100 @@ -3,47 +3,52 @@ # # default is OWNER="root" GROUP="root", MODE="0600" @@ -171,9 +171,9 @@ -KERNEL=="nst[0-9]", BUS=="scsi", SYMLINK+="tape%e", MODE="0660" -KERNEL=="nosst[0-9]", BUS=="scsi", SYMLINK+="tape%e", MODE="0660" -KERNEL=="sg[0-9]*", BUS="scsi", SYSFS{type}=="6", SYMLINK+="scanner%e", MODE="0660" -+KERNEL=="sr[0-9]*", SYMLINK+="cdrom-%k" -+KERNEL=="scd[0-9]*", SYMLINK+="cdrom-%k" -+KERNEL=="pcd[0-9]*", SYMLINK+="cdrom-%k" ++KERNEL=="sr[0-9]*", SYMLINK+="cdrom cdrom-%k" ++KERNEL=="scd[0-9]*", SYMLINK+="cdrom cdrom-%k" ++KERNEL=="pcd[0-9]*", SYMLINK+="cdrom cdrom-%k" +KERNEL=="fd[0-9]*", SYMLINK+="floppy-%k" +KERNEL=="nst[0-9]", BUS=="scsi", SYMLINK+="tape-%k", MODE="0660" +KERNEL=="nosst[0-9]", BUS=="scsi", SYMLINK+="tape-%k", MODE="0660" @@ -193,25 +193,25 @@ -KERNEL=="hd[a-z]", BUS=="ide", SYSFS{removable}=="1", PROGRAM=="/lib/udev/ide-media.sh %k", RESULT=="floppy", SYMLINK+="floppy%e", NAME{ignore_remove, all_partitions}="%k" +KERNEL=="hd[a-z]", BUS=="ide", SYSFS{removable}=="1", \ + SYSFS{device/media}=="floppy", \ -+ SYMLINK+="floppy-%k", OPTIONS+="ignore_remove, all_partitions" ++ SYMLINK+="floppy floppy-%k", OPTIONS+="ignore_remove, all_partitions" -KERNEL=="hd[a-z]", BUS=="ide", SYSFS{removable}=="1", RESULT=="cdrom", SYMLINK+="cdrom%e" -+KERNEL=="hd[a-z]", BUS=="ide", SYSFS{removable}=="1", PROGRAM=="check-cdrom.sh %k CDROM", SYMLINK+="cdrom-%k" ++KERNEL=="hd[a-z]", BUS=="ide", SYSFS{removable}=="1", PROGRAM=="check-cdrom.sh %k CDROM", SYMLINK+="cdrom cdrom-%k" -KERNEL=="hd[a-z]", BUS=="ide", SYSFS{removable}=="1", PROGRAM=="/lib/udev/check-cdrom.sh %k DVD", SYMLINK+="dvd%e" -KERNEL=="sr[0-9]*", BUS=="scsi", PROGRAM=="/lib/udev/check-cdrom.sh %k DVD", SYMLINK+="dvd%e" -+KERNEL=="hd[a-z]", BUS=="ide", SYSFS{removable}=="1", PROGRAM=="check-cdrom.sh %k DVD", SYMLINK+="dvd-%k" -+KERNEL=="sr[0-9]*", BUS=="scsi", PROGRAM=="check-cdrom.sh %k DVD", SYMLINK+="dvd-%k" ++KERNEL=="hd[a-z]", BUS=="ide", SYSFS{removable}=="1", PROGRAM=="check-cdrom.sh %k DVD", SYMLINK+="dvd dvd-%k" ++KERNEL=="sr[0-9]*", BUS=="scsi", PROGRAM=="check-cdrom.sh %k DVD", SYMLINK+="dvd dvd-%k" -KERNEL=="hd[a-z]", BUS=="ide", SYSFS{removable}=="1", PROGRAM=="/lib/udev/check-cdrom.sh %k CD-R", SYMLINK+="cdwriter%e" -KERNEL=="sr[0-9]*", BUS=="scsi", PROGRAM=="/lib/udev/check-cdrom.sh %k CD-R", SYMLINK+="cdwriter%e" -+KERNEL=="hd[a-z]", BUS=="ide", SYSFS{removable}=="1", PROGRAM=="check-cdrom.sh %k CD-R", SYMLINK+="cdwriter-%k cdrw-%k" -+KERNEL=="sr[0-9]*", BUS=="scsi", PROGRAM=="check-cdrom.sh %k CD-R", SYMLINK+="cdwriter-%k cdrw-%k" ++KERNEL=="hd[a-z]", BUS=="ide", SYSFS{removable}=="1", PROGRAM=="check-cdrom.sh %k CD-R", SYMLINK+="cdwriter cdwriter-%k cdrw cdrw-%k" ++KERNEL=="sr[0-9]*", BUS=="scsi", PROGRAM=="check-cdrom.sh %k CD-R", SYMLINK+="cdwriter cdwriter-%k cdrw cdrw-%k" -KERNEL=="hd[a-z]", BUS=="ide", SYSFS{removable}=="1", PROGRAM="/lib/udev/check-cdrom.sh %k DVD-R", SYMLINK+="dvdwriter%e" -KERNEL=="sr[0-9]*", BUS=="scsi", PROGRAM=="/lib/udev/check-cdrom.sh %k DVD-R", SYMLINK+="dvdwriter%e" -+KERNEL=="hd[a-z]", BUS=="ide", SYSFS{removable}=="1", PROGRAM="check-cdrom.sh %k DVD-R", SYMLINK+="dvdwriter-%k dvdrw-%k" -+KERNEL=="sr[0-9]*", BUS=="scsi", PROGRAM=="check-cdrom.sh %k DVD-R", SYMLINK+="dvdwriter-%k dvdrw-%k" ++KERNEL=="hd[a-z]", BUS=="ide", SYSFS{removable}=="1", PROGRAM="check-cdrom.sh %k DVD-R", SYMLINK+="dvdwriter dvdwriter-%k dvdrw dvdrw-%k" ++KERNEL=="sr[0-9]*", BUS=="scsi", PROGRAM=="check-cdrom.sh %k DVD-R", SYMLINK+="dvdwriter dvdwriter-%k dvdrw dvdrw-%k" # rename sr* to scd* KERNEL=="sr[0-9]*", BUS=="scsi", NAME="scd%n" @@ -279,10 +279,10 @@ -ACTION=="add", SUBSYSTEM=="scsi", SYSFS{type}=="1", SYSFS{vendor}=="On[sS]tream", \ + +ACTION=="add", KERNEL=="sg[0-9]*", BUS=="scsi", SYSFS{type}=="[36]", \ -+ SYMLINK+="scanner-%k", MODE="0660" ++ SYMLINK+="scanner scanner-%k", MODE="0660" + +ACTION=="add", KERNEL=="sg[0-9]*", BUS=="scsi", SYSFS{type}=="8", \ -+ SYMLINK+="changer-%k", MODE="0660", GROUP="disk" ++ SYMLINK+="changer changer-%k", MODE="0660", GROUP="disk" + +ACTION=="add", SUBSYSTEM=="scsi_device", SYSFS{type}=="1", SYSFS{device/vendor}=="On[sS]tream", \ SYSFS{model}!="ADR*", RUN+="/sbin/modprobe osst" Index: udev.spec =================================================================== RCS file: /cvs/dist/rpms/udev/devel/udev.spec,v retrieving revision 1.156 retrieving revision 1.157 diff -u -r1.156 -r1.157 --- udev.spec 1 Mar 2006 16:31:25 -0000 1.156 +++ udev.spec 1 Mar 2006 17:09:15 -0000 1.157 @@ -5,7 +5,7 @@ Summary: A userspace implementation of devfs Name: udev Version: 084 -Release: 8 +Release: 9 License: GPL Group: System Environment/Base Provides: udev-persistent = 0:%{version}-%{release} @@ -283,6 +283,13 @@ %attr(0644,root,root) %{_mandir}/man8/vol_id*.8* %changelog +* Wed Mar 01 2006 Harald Hoyer - 084-9 +- create non-enum device (cdrom, floppy, scanner, changer) + for compatibility (random device wins) + e.g. /dev/cdrom -> hdd + /dev/cdrom-hdc -> hdc + /dev/cdrom-hdd -> hdd + * Wed Mar 01 2006 Harald Hoyer - 084-8 - fixed ZIP drive thrashing (bz #181041 #182601) - fixed enumeration (%%e does not work anymore) (bz #183288) From fedora-cvs-commits at redhat.com Wed Mar 1 17:14:38 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 1 Mar 2006 12:14:38 -0500 Subject: rpms/beagle/devel beagle.spec,1.37,1.38 Message-ID: <200603011714.k21HEcjA014168@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/beagle/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv14147 Modified Files: beagle.spec Log Message: bump rev Index: beagle.spec =================================================================== RCS file: /cvs/dist/rpms/beagle/devel/beagle.spec,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- beagle.spec 1 Mar 2006 17:08:22 -0000 1.37 +++ beagle.spec 1 Mar 2006 17:14:36 -0000 1.38 @@ -1,6 +1,6 @@ Name: beagle Version: 0.2.1 -Release: 13 +Release: 14 Summary: The Beagle Search Infrastructure Group: User Interface/Desktops From fedora-cvs-commits at redhat.com Wed Mar 1 17:32:16 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 1 Mar 2006 12:32:16 -0500 Subject: rpms/eclipse/devel eclipse.spec,1.249,1.250 Message-ID: <200603011732.k21HWGXe005087@cvs.devel.redhat.com> Author: overholt Update of /cvs/dist/rpms/eclipse/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv5054 Modified Files: eclipse.spec Log Message: bump release Index: eclipse.spec =================================================================== RCS file: /cvs/dist/rpms/eclipse/devel/eclipse.spec,v retrieving revision 1.249 retrieving revision 1.250 diff -u -r1.249 -r1.250 --- eclipse.spec 28 Feb 2006 23:05:11 -0000 1.249 +++ eclipse.spec 1 Mar 2006 17:31:44 -0000 1.250 @@ -22,7 +22,7 @@ Summary: %{pkg_summary} Name: eclipse Version: %{eclipse_majmin}.%{eclipse_micro} -Release: 1jpp_11fc +Release: 1jpp_12fc License: EPL Group: Text Editors/Integrated Development Environments (IDE) URL: http://www.eclipse.org/ @@ -1267,7 +1267,7 @@ %{_datadir}/%{name}/plugins/org.eclipse.platform.source.linux.gtk.*_%{version} %changelog -* Tue Feb 28 2006 Andrew Overholt 3.1.2-1jpp_11fc +* Tue Feb 28 2006 Andrew Overholt 3.1.2-1jpp_12fc - Update to tomcat 5.5 (e.o#98371). * Fri Feb 17 2006 Igor Foox - 1:3.1.2-1jpp_10fc From fedora-cvs-commits at redhat.com Wed Mar 1 17:32:35 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 1 Mar 2006 12:32:35 -0500 Subject: rpms/beagle/devel beagle-0.2.1-spew.patch, 1.2, 1.3 beagle.spec, 1.38, 1.39 Message-ID: <200603011732.k21HWZ87005106@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/beagle/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv5053 Modified Files: beagle-0.2.1-spew.patch beagle.spec Log Message: Reduce log spew beagle-0.2.1-spew.patch: BeagleDaemon.cs | 2 +- IndexHelper/IndexHelper.cs | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) Index: beagle-0.2.1-spew.patch =================================================================== RCS file: /cvs/dist/rpms/beagle/devel/beagle-0.2.1-spew.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- beagle-0.2.1-spew.patch 24 Feb 2006 06:44:14 -0000 1.2 +++ beagle-0.2.1-spew.patch 1 Mar 2006 17:32:00 -0000 1.3 @@ -15,7 +15,7 @@ "IndexHelper", - //debug ? LogLevel.Debug : LogLevel.Warn, - LogLevel.Debug, -+ debug ? LogLevel.Debug : LogLevel.Warn, ++ debug ? LogLevel.Debug : LogLevel.Error, run_by_hand || log_in_fg); Application.InitCheck ("IndexHelper", ref args); @@ -26,7 +26,7 @@ // debugging this code, after all... //arg_debug ? LogLevel.Debug : LogLevel.Warn, - LogLevel.Debug, -+ LogLevel.Warn, ++ LogLevel.Error, arg_fg); Logger.Log.Info ("Starting Beagle Daemon (version {0})", ExternalStringsHack.Version); Index: beagle.spec =================================================================== RCS file: /cvs/dist/rpms/beagle/devel/beagle.spec,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- beagle.spec 1 Mar 2006 17:14:36 -0000 1.38 +++ beagle.spec 1 Mar 2006 17:32:15 -0000 1.39 @@ -1,6 +1,6 @@ Name: beagle Version: 0.2.1 -Release: 14 +Release: 15 Summary: The Beagle Search Infrastructure Group: User Interface/Desktops @@ -213,6 +213,10 @@ %{_prefix}/lib/python*/site-packages/beagle.so %changelog +* Wed Mar 1 2006 Matthias Clasen 0.2.1-15 +- Bump log level to "error" to avoid tons of + pointless warnings. (#183162) + * Wed Mar 1 2006 Matthias Clasen 0.2.1-14 - Fix a typo in /etc/beagle/crawl-applications From fedora-cvs-commits at redhat.com Wed Mar 1 17:49:23 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 1 Mar 2006 12:49:23 -0500 Subject: rpms/eclipse/devel eclipse.spec,1.250,1.251 Message-ID: <200603011749.k21HnNHK023321@cvs.devel.redhat.com> Author: overholt Update of /cvs/dist/rpms/eclipse/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv23290 Modified Files: eclipse.spec Log Message: foo Index: eclipse.spec =================================================================== RCS file: /cvs/dist/rpms/eclipse/devel/eclipse.spec,v retrieving revision 1.250 retrieving revision 1.251 diff -u -r1.250 -r1.251 --- eclipse.spec 1 Mar 2006 17:31:44 -0000 1.250 +++ eclipse.spec 1 Mar 2006 17:49:20 -0000 1.251 @@ -117,9 +117,9 @@ Patch51: %{name}-ppc64.patch %if %{gcj_support} -ExcludeArch: s390 s390x +ExcludeArch: s390 s390x ppc64 %else -ExclusiveArch: %{ix86} x86_64 ppc ia64 ppc64 +ExclusiveArch: %{ix86} x86_64 ppc ia64 %endif BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot BuildRequires: ant @@ -1269,6 +1269,7 @@ %changelog * Tue Feb 28 2006 Andrew Overholt 3.1.2-1jpp_12fc - Update to tomcat 5.5 (e.o#98371). +- Don't build on ppc64 until we get the tomcat situation straightened out. * Fri Feb 17 2006 Igor Foox - 1:3.1.2-1jpp_10fc - Added patch for ppc64. From fedora-cvs-commits at redhat.com Wed Mar 1 18:15:11 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 1 Mar 2006 13:15:11 -0500 Subject: rpms/kernel/devel linux-2.6-radeon-whitelist.patch, NONE, 1.1 kernel-2.6.spec, 1.1999, 1.2000 linux-2.6-radeon-backlight.patch, 1.13, 1.14 Message-ID: <200603011815.k21IFB7O031170@cvs.devel.redhat.com> Author: pjones Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv31074 Modified Files: kernel-2.6.spec linux-2.6-radeon-backlight.patch Added Files: linux-2.6-radeon-whitelist.patch Log Message: - put the radeon pm whitelist in its own patch file linux-2.6-radeon-whitelist.patch: radeon_pm.c | 511 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 511 insertions(+) --- NEW FILE linux-2.6-radeon-whitelist.patch --- --- vanilla/drivers/video/aty/radeon_pm.c.whitelist 2006-03-01 10:36:55.000000000 -0500 +++ linux-2.6.15/drivers/video/aty/radeon_pm.c 2006-03-01 10:38:01.000000000 -0500 @@ -39,7 +39,518 @@ * vendor and product codes for Your laptop. */ static struct dmi_system_id __devinitdata radeonfb_dmi_table[] = { + { + /* Reported by Borschuk Oleg */ + .ident = "IBM ThinkPad R50 (1829-7RG)", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "IBM"), + DMI_MATCH(DMI_PRODUCT_NAME, "18297RG"), + }, + }, + { + /* Reported by Georges Herber */ + .ident = "IBM ThinkPad R51 (1829-9MG)", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "IBM"), + DMI_MATCH(DMI_PRODUCT_NAME, "18299MG"), + }, + }, + { + /* Reported by Wouter Cloetens */ + .ident = "IBM ThinkPad R51 (1829-EHG)", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "IBM"), + DMI_MATCH(DMI_PRODUCT_NAME, "1829EHG"), + }, + }, + { + /* Reported by Sten Heinze */ + .ident = "IBM ThinkPad R51 (1829-R6G)", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "IBM"), + DMI_MATCH(DMI_PRODUCT_NAME, "1829R6G"), + }, + }, + + { + /* Reported by Eugene Pavlovsky */ + .ident = "IBM ThinkPad R51 (1836-Q6U)", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "IBM"), + DMI_MATCH(DMI_PRODUCT_NAME, "1836Q6U"), + }, + }, + + { + /* Reported by Jakob Schiotz */ + .ident = "IBM ThinkPad T30 (2366-96G)", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "IBM"), + DMI_MATCH(DMI_PRODUCT_NAME, "236696G"), + }, + }, + { + /* Reported by Stephan Gro?? */ + .ident = "IBM ThinkPad T30 (2366-97G)", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "IBM"), + DMI_MATCH(DMI_PRODUCT_NAME, "236697G"), + }, + }, + { + /* Reported by Thomas M Steenholdt */ + .ident = "IBM ThinkPad T30 (2366-JBG)", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "IBM"), + DMI_MATCH(DMI_PRODUCT_NAME, "2366JBG"), + }, + }, + { + /* Reported by Phillip Jones */ + .ident = "IBM ThinkPad T30 (2366-MU9)", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "IBM"), + DMI_MATCH(DMI_PRODUCT_NAME, "2366MU9"), + }, + }, + { + /* Reported by ChazeFroy */ + .ident = "IBM ThinkPad T30 (2366-QU5)", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "IBM"), + DMI_MATCH(DMI_PRODUCT_NAME, "2366QU5"), + }, + }, + + { + /* Reported by George Avrunin */ + .ident = "IBM ThinkPad T40 (2372-9CU)", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "IBM"), + DMI_MATCH(DMI_PRODUCT_NAME, "23729CU"), + }, + }, + + { + /* Reported by Dmitriy Zavin */ + .ident = "IBM ThinkPad T40 (2373-14U)", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "IBM"), + DMI_MATCH(DMI_PRODUCT_NAME, "237314U"), + }, + }, + { + /* Reported by Aivo Prykk */ + .ident = "IBM ThinkPad T41 (2373-1FG)", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "IBM"), + DMI_MATCH(DMI_PRODUCT_NAME, "23731FG"), + }, + }, + { + /* Reported by Michele Lamarca */ + .ident = "IBM ThinkPad T40 (2373-22G)", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "IBM"), + DMI_MATCH(DMI_PRODUCT_NAME, "237322G"), + }, + }, + { + /* Reported by Klaus Kurzmann */ + .ident = "IBM ThinkPad T40 (2373-25G)", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "IBM"), + DMI_MATCH(DMI_PRODUCT_NAME, "237325G"), + }, + }, + { + /* Reported by Antti Andreimann */ + .ident = "IBM ThinkPad T41 (2373-2FG)", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "IBM"), + DMI_MATCH(DMI_PRODUCT_NAME, "23732FG"), + }, + }, + { + /* Reported by Grahame Bowland */ + .ident = "IBM ThinkPad T41 (2373-3HM)", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "IBM"), + DMI_MATCH(DMI_PRODUCT_NAME, "23733HM"), + }, + }, + { + /* Reported by Antti P Miettinen */ + .ident = "IBM ThinkPad T40 (2373-4G2)", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "IBM"), + DMI_MATCH(DMI_PRODUCT_NAME, "23734G2"), + }, + }, + { + /* Reported by Matthew Saltzman */ + .ident = "IBM ThinkPad T41 (2373-7JU)", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "IBM"), + DMI_MATCH(DMI_PRODUCT_NAME, "23737JU"), + }, + }, + { + /* Reported by Pete Toscano */ + .ident = "IBM ThinkPad T40 (2373-8CG)", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "IBM"), + DMI_MATCH(DMI_PRODUCT_NAME, "23738CG"), + }, + }, + { + /* Reported by Pete Toscano */ + .ident = "IBM ThinkPad T40 (2373-92G)", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "IBM"), + DMI_MATCH(DMI_PRODUCT_NAME, "237392G"), + }, + }, + { + /* Reported by Manuel Carro */ + .ident = "IBM ThinkPad T40 (2373-94G)", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "IBM"), + DMI_MATCH(DMI_PRODUCT_NAME, "237394G"), + }, + }, + { + /* Reported by Pete Toscano */ + .ident = "IBM ThinkPad T40 (2373-94U)", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "IBM"), + DMI_MATCH(DMI_PRODUCT_NAME, "237394U"), + }, + }, + { + /* Reported by Peter Jones */ + .ident = "IBM ThinkPad T41 (2373-9FU)", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "IBM"), + DMI_MATCH(DMI_PRODUCT_NAME, "23739FU"), + }, + }, + { + /* Reported by Chris Vanden Berghe */ + .ident = "IBM ThinkPad T41 (2373-9HG)", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "IBM"), + DMI_MATCH(DMI_PRODUCT_NAME, "23739HG"), + }, + }, + { + /* Reported by Ajay Ramaswamy */ + .ident = "IBM ThinkPad T41 (2373-9HU)", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "IBM"), + DMI_MATCH(DMI_PRODUCT_NAME, "23739HU"), + }, + }, + { + /* Reported by Peter Jones */ + .ident = "IBM ThinkPad T40 (2373-BU7)", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "IBM"), + DMI_MATCH(DMI_PRODUCT_NAME, "2373BU7"), + }, + }, + { + /* Reported by Isaac Wilcox */ + .ident = "IBM ThinkPad T42 (2373-F2G)", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "IBM"), + DMI_MATCH(DMI_PRODUCT_NAME, "2373F2G"), + }, + }, + { + /* Reported by Jerome Poggi + and Pete Toscano */ + .ident = "IBM ThinkPad T42 (2373-FWG)", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "IBM"), + DMI_MATCH(DMI_PRODUCT_NAME, "2373FWG"), + }, + }, + { + /* Reported by Juerg Billeter */ + .ident = "IBM ThinkPad T40p (2373-G1G)", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "IBM"), + DMI_MATCH(DMI_PRODUCT_NAME, "2373G1G"), + }, + }, + { + /* Reported by Bill Nottingham */ + .ident = "IBM ThinkPad T40p (2373-G1U)", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "IBM"), + DMI_MATCH(DMI_PRODUCT_NAME, "2373G1U"), + }, + }, + { + /* Reported by Hartwig, Thomas */ + .ident = "IBM ThinkPad T40p (2373-G3G)", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "IBM"), + DMI_MATCH(DMI_PRODUCT_NAME, "2373G3G"), + }, + }, + { + /* Reported by Eric Benson */ + .ident = "IBM ThinkPad T41p (2373-GEU)", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "IBM"), + DMI_MATCH(DMI_PRODUCT_NAME, "2373GEU"), + }, + }, + { + /* Reported by David Zeuthen */ + .ident = "IBM ThinkPad T41 (2373-HU6)", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "IBM"), + DMI_MATCH(DMI_PRODUCT_NAME, "2373HU6"), + }, + }, + { + /* Reported by Dwight Barkley */ + .ident = "IBM ThinkPad T42 (2373-JTU)", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "IBM"), + DMI_MATCH(DMI_PRODUCT_NAME, "2373JTU"), + }, + }, + { + /* Reported by Vernon Mauery */ + .ident = "IBM ThinkPad T40 (2373-MU4)", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "IBM"), + DMI_MATCH(DMI_PRODUCT_NAME, "2373MU4"), + }, + }, + { + /* Reported by Adam Glasgall */ + .ident = "IBM ThinkPad T40 (2373-RU1)", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "IBM"), + DMI_MATCH(DMI_PRODUCT_NAME, "2373RU1"), + }, + }, + { + /* Reported by Paul Ionescu */ + .ident = "IBM ThinkPad T41 (2373-TG5)", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "IBM"), + DMI_MATCH(DMI_PRODUCT_NAME, "2373TG5"), + }, + }, + { + /* Reported by Ajay Ramaswamy */ + .ident = "IBM ThinkPad T41 (2373-XNX)", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "IBM"), + DMI_MATCH(DMI_PRODUCT_NAME, "2373XNX"), + }, + }, + + { + /* Reported by Tim Hull */ + .ident = "IBM ThinkPad T42 (2374-6VU)", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "IBM"), + DMI_MATCH(DMI_PRODUCT_NAME, "23746VU"), + }, + }, + { + /* Reported by Johannes Hansen */ + .ident = "IBM ThinkPad T42 (2374-CTO)", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "IBM"), + DMI_MATCH(DMI_PRODUCT_NAME, "2374CTO"), + }, + }, + { + /* Reported by Johannes Hansen */ + .ident = "IBM ThinkPad T42 (2374-ZEP)", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "IBM"), + DMI_MATCH(DMI_PRODUCT_NAME, "2374ZEP"), + }, + }, + + { + /* Reported by obi */ + .ident = "IBM ThinkPad T41 (2378-DEU)", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "IBM"), + DMI_MATCH(DMI_PRODUCT_NAME, "2378DEU"), + }, + }, + { + /* Reported by Paul Stanisci */ + .ident = "IBM ThinkPad T41 (2378-DLU)", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "IBM"), + DMI_MATCH(DMI_PRODUCT_NAME, "2378DLU"), + }, + }, + { + /* Reported by Austin Clements */ + .ident = "IBM ThinkPad T42 (2378-DUU)", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "IBM"), + DMI_MATCH(DMI_PRODUCT_NAME, "2378DUU"), + }, + }, + { + /* Reported by Ulrich Drepper */ + .ident = "IBM ThinkPad T42 (2378-R2U)", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "IBM"), + DMI_MATCH(DMI_PRODUCT_NAME, "2378R2U"), + }, + }, + { + /* Reported by Nicolas Dufresne */ + .ident = "IBM ThinkPad T42 (2378-RBF)", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "IBM"), + DMI_MATCH(DMI_PRODUCT_NAME, "2378RBF"), + }, + }, + { + /* Reported by Nicolas Dufresne */ + .ident = "IBM ThinkPad T42 (2378-RBU)", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "IBM"), + DMI_MATCH(DMI_PRODUCT_NAME, "2378RBU"), + }, + }, + { + /* Reported by Tom Marshall */ + .ident = "IBM ThinkPad T42 (2378-XXE)", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "IBM"), + DMI_MATCH(DMI_PRODUCT_NAME, "2378XXE"), + }, + }, + + { + .ident = "IBM ThinkPad T41 (2379-D6U)", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "IBM"), + DMI_MATCH(DMI_PRODUCT_NAME, "2379D6U"), + }, + }, + { + /* Reported by Volker Braun */ + .ident = "IBM ThinkPad T41 (2379-DJU)", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "IBM"), + DMI_MATCH(DMI_PRODUCT_NAME, "2379DJU"), + }, + }, + + { + /* Reported by Frank Otto */ + .ident = "IBM ThinkPad R32 (2658-BQG)", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "IBM"), + DMI_MATCH(DMI_PRODUCT_NAME, "2658BQG"), + }, + }, + + { + /* Reported by Chris Lee */ + .ident = "IBM ThinkPad X31 (2672-5KU)", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "IBM"), + DMI_MATCH(DMI_PRODUCT_NAME, "26725KU"), + }, + }, + { + /* Reported by Jeremy Katz */ + .ident = "IBM ThinkPad X31 (2672-A9U)", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "IBM"), + DMI_MATCH(DMI_PRODUCT_NAME, "2672A9U"), + }, + }, + { + /* Reported by Daniel P. Berrange */ + .ident = "IBM ThinkPad X31 (2672-JHG)", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "IBM"), + DMI_MATCH(DMI_PRODUCT_NAME, "2672JHG"), + }, + }, + { + /* Reported by Chris Blizzard */ + .ident = "IBM ThinkPad X31 (2672-RU3)", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "IBM"), + DMI_MATCH(DMI_PRODUCT_NAME, "2672RU3"), + }, + }, + { + /* IBM ThinkPad X31 2672-XXH -> works, but doesn't fix the LCD + backlight on during S3 issue. + Reported by: Henrik Brix Andersen */ + .ident = "IBM ThinkPad X31 (2672-XXH)", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "IBM"), + DMI_MATCH(DMI_PRODUCT_NAME, "2672XXH"), + }, + }, + + { + /* Reported by Frank Schmitt */ + .ident = "IBM ThinkPad R40 (2722-3GG)", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "IBM"), + DMI_MATCH(DMI_PRODUCT_NAME, "27223GG"), + }, + }, + { + /* Reported by Nils Trebing */ + .ident = "IBM ThinkPad R40 (2722-5MG)", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "IBM"), + DMI_MATCH(DMI_PRODUCT_NAME, "27225MG"), + }, + }, + { + /* Reported by Rushi Bhatt */ + .ident = "IBM ThinkPad R40 (2722-6YU)", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "IBM"), + DMI_MATCH(DMI_PRODUCT_NAME, "27226YU"), + }, + }, + { + /* Reported by Pete Toscano */ + .ident = "IBM ThinkPad R40 (2722-B3G)", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "IBM"), + DMI_MATCH(DMI_PRODUCT_NAME, "2722B3G"), + }, + }, + { + /* Reported by Meik Hellmund */ + .ident = "IBM ThinkPad R40 (2722-CDG)", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "IBM"), + DMI_MATCH(DMI_PRODUCT_NAME, "2722CDG"), + }, + }, { }, + /* Negative reports: */ + /* IBM thinkpad T42p 2373-KUU -> machine hangs as X starts + Reported by: Dax Kelson */ }; extern int radeon_force_sleep; Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.1999 retrieving revision 1.2000 diff -u -r1.1999 -r1.2000 --- kernel-2.6.spec 1 Mar 2006 16:54:12 -0000 1.1999 +++ kernel-2.6.spec 1 Mar 2006 18:15:08 -0000 1.2000 @@ -354,6 +354,7 @@ Patch1610: linux-2.6-input-kill-stupid-messages.patch Patch1620: linux-2.6-serial-tickle-nmi.patch Patch1630: linux-2.6-radeon-backlight.patch +Patch1632: linux-2.6-radeon-whitelist.patch Patch1640: linux-2.6-ide-tune-locking.patch Patch1641: linux-2.6-ide-cd-shutup.patch Patch1650: linux-2.6-autofs-pathlookup.patch @@ -913,6 +914,8 @@ %patch1620 -p1 # Radeon on thinkpad backlight power-management goodness. %patch1630 -p1 +# The whitelist for radeon thinkpad pm goodness. +%patch1632 -p1 # Fix IDE locking bug. %patch1640 -p1 # Silence noisy CD drive spew linux-2.6-radeon-backlight.patch: radeon_base.c | 11 +++++++++++ radeon_pm.c | 51 ++++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 61 insertions(+), 1 deletion(-) Index: linux-2.6-radeon-backlight.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-radeon-backlight.patch,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- linux-2.6-radeon-backlight.patch 1 Mar 2006 15:26:58 -0000 1.13 +++ linux-2.6-radeon-backlight.patch 1 Mar 2006 18:15:08 -0000 1.14 @@ -3,7 +3,7 @@ --- vanilla/drivers/video/aty/radeon_pm.c 2005-10-27 20:02:08.000000000 -0400 +++ linux-2.6.14/drivers/video/aty/radeon_pm.c 2005-11-30 02:20:01.000000000 -0500 -@@ -25,8 +25,538 @@ +@@ -25,8 +25,26 @@ #include #endif @@ -21,519 +21,7 @@ + * vendor and product codes for Your laptop. + */ +static struct dmi_system_id __devinitdata radeonfb_dmi_table[] = { -+ { -+ /* Reported by Borschuk Oleg */ -+ .ident = "IBM ThinkPad R50 (1829-7RG)", -+ .matches = { -+ DMI_MATCH(DMI_SYS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "18297RG"), -+ }, -+ }, -+ { -+ /* Reported by Georges Herber */ -+ .ident = "IBM ThinkPad R51 (1829-9MG)", -+ .matches = { -+ DMI_MATCH(DMI_SYS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "18299MG"), -+ }, -+ }, -+ { -+ /* Reported by Wouter Cloetens */ -+ .ident = "IBM ThinkPad R51 (1829-EHG)", -+ .matches = { -+ DMI_MATCH(DMI_SYS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "1829EHG"), -+ }, -+ }, -+ { -+ /* Reported by Sten Heinze */ -+ .ident = "IBM ThinkPad R51 (1829-R6G)", -+ .matches = { -+ DMI_MATCH(DMI_SYS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "1829R6G"), -+ }, -+ }, -+ -+ { -+ /* Reported by Eugene Pavlovsky */ -+ .ident = "IBM ThinkPad R51 (1836-Q6U)", -+ .matches = { -+ DMI_MATCH(DMI_SYS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "1836Q6U"), -+ }, -+ }, -+ -+ { -+ /* Reported by Jakob Schiotz */ -+ .ident = "IBM ThinkPad T30 (2366-96G)", -+ .matches = { -+ DMI_MATCH(DMI_SYS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "236696G"), -+ }, -+ }, -+ { -+ /* Reported by Stephan Gro?? */ -+ .ident = "IBM ThinkPad T30 (2366-97G)", -+ .matches = { -+ DMI_MATCH(DMI_SYS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "236697G"), -+ }, -+ }, -+ { -+ /* Reported by Thomas M Steenholdt */ -+ .ident = "IBM ThinkPad T30 (2366-JBG)", -+ .matches = { -+ DMI_MATCH(DMI_SYS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "2366JBG"), -+ }, -+ }, -+ { -+ /* Reported by Phillip Jones */ -+ .ident = "IBM ThinkPad T30 (2366-MU9)", -+ .matches = { -+ DMI_MATCH(DMI_SYS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "2366MU9"), -+ }, -+ }, -+ { -+ /* Reported by ChazeFroy */ -+ .ident = "IBM ThinkPad T30 (2366-QU5)", -+ .matches = { -+ DMI_MATCH(DMI_SYS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "2366QU5"), -+ }, -+ }, -+ -+ { -+ /* Reported by George Avrunin */ -+ .ident = "IBM ThinkPad T40 (2372-9CU)", -+ .matches = { -+ DMI_MATCH(DMI_SYS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "23729CU"), -+ }, -+ }, -+ -+ { -+ /* Reported by Dmitriy Zavin */ -+ .ident = "IBM ThinkPad T40 (2373-14U)", -+ .matches = { -+ DMI_MATCH(DMI_SYS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "237314U"), -+ }, -+ }, -+ { -+ /* Reported by Aivo Prykk */ -+ .ident = "IBM ThinkPad T41 (2373-1FG)", -+ .matches = { -+ DMI_MATCH(DMI_SYS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "23731FG"), -+ }, -+ }, -+ { -+ /* Reported by Michele Lamarca */ -+ .ident = "IBM ThinkPad T40 (2373-22G)", -+ .matches = { -+ DMI_MATCH(DMI_SYS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "237322G"), -+ }, -+ }, -+ { -+ /* Reported by Klaus Kurzmann */ -+ .ident = "IBM ThinkPad T40 (2373-25G)", -+ .matches = { -+ DMI_MATCH(DMI_SYS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "237325G"), -+ }, -+ }, -+ { -+ /* Reported by Antti Andreimann */ -+ .ident = "IBM ThinkPad T41 (2373-2FG)", -+ .matches = { -+ DMI_MATCH(DMI_SYS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "23732FG"), -+ }, -+ }, -+ { -+ /* Reported by Grahame Bowland */ -+ .ident = "IBM ThinkPad T41 (2373-3HM)", -+ .matches = { -+ DMI_MATCH(DMI_SYS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "23733HM"), -+ }, -+ }, -+ { -+ /* Reported by Antti P Miettinen */ -+ .ident = "IBM ThinkPad T40 (2373-4G2)", -+ .matches = { -+ DMI_MATCH(DMI_SYS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "23734G2"), -+ }, -+ }, -+ { -+ /* Reported by Matthew Saltzman */ -+ .ident = "IBM ThinkPad T41 (2373-7JU)", -+ .matches = { -+ DMI_MATCH(DMI_SYS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "23737JU"), -+ }, -+ }, -+ { -+ /* Reported by Pete Toscano */ -+ .ident = "IBM ThinkPad T40 (2373-8CG)", -+ .matches = { -+ DMI_MATCH(DMI_SYS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "23738CG"), -+ }, -+ }, -+ { -+ /* Reported by Pete Toscano */ -+ .ident = "IBM ThinkPad T40 (2373-92G)", -+ .matches = { -+ DMI_MATCH(DMI_SYS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "237392G"), -+ }, -+ }, -+ { -+ /* Reported by Manuel Carro */ -+ .ident = "IBM ThinkPad T40 (2373-94G)", -+ .matches = { -+ DMI_MATCH(DMI_SYS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "237394G"), -+ }, -+ }, -+ { -+ /* Reported by Pete Toscano */ -+ .ident = "IBM ThinkPad T40 (2373-94U)", -+ .matches = { -+ DMI_MATCH(DMI_SYS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "237394U"), -+ }, -+ }, -+ { -+ /* Reported by Peter Jones */ -+ .ident = "IBM ThinkPad T41 (2373-9FU)", -+ .matches = { -+ DMI_MATCH(DMI_SYS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "23739FU"), -+ }, -+ }, -+ { -+ /* Reported by Chris Vanden Berghe */ -+ .ident = "IBM ThinkPad T41 (2373-9HG)", -+ .matches = { -+ DMI_MATCH(DMI_SYS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "23739HG"), -+ }, -+ }, -+ { -+ /* Reported by Ajay Ramaswamy */ -+ .ident = "IBM ThinkPad T41 (2373-9HU)", -+ .matches = { -+ DMI_MATCH(DMI_SYS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "23739HU"), -+ }, -+ }, -+ { -+ /* Reported by Peter Jones */ -+ .ident = "IBM ThinkPad T40 (2373-BU7)", -+ .matches = { -+ DMI_MATCH(DMI_SYS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "2373BU7"), -+ }, -+ }, -+ { -+ /* Reported by Isaac Wilcox */ -+ .ident = "IBM ThinkPad T42 (2373-F2G)", -+ .matches = { -+ DMI_MATCH(DMI_SYS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "2373F2G"), -+ }, -+ }, -+ { -+ /* Reported by Jerome Poggi -+ and Pete Toscano */ -+ .ident = "IBM ThinkPad T42 (2373-FWG)", -+ .matches = { -+ DMI_MATCH(DMI_SYS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "2373FWG"), -+ }, -+ }, -+ { -+ /* Reported by Juerg Billeter */ -+ .ident = "IBM ThinkPad T40p (2373-G1G)", -+ .matches = { -+ DMI_MATCH(DMI_SYS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "2373G1G"), -+ }, -+ }, -+ { -+ /* Reported by Bill Nottingham */ -+ .ident = "IBM ThinkPad T40p (2373-G1U)", -+ .matches = { -+ DMI_MATCH(DMI_SYS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "2373G1U"), -+ }, -+ }, -+ { -+ /* Reported by Hartwig, Thomas */ -+ .ident = "IBM ThinkPad T40p (2373-G3G)", -+ .matches = { -+ DMI_MATCH(DMI_SYS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "2373G3G"), -+ }, -+ }, -+ { -+ /* Reported by Eric Benson */ -+ .ident = "IBM ThinkPad T41p (2373-GEU)", -+ .matches = { -+ DMI_MATCH(DMI_SYS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "2373GEU"), -+ }, -+ }, -+ { -+ /* Reported by David Zeuthen */ -+ .ident = "IBM ThinkPad T41 (2373-HU6)", -+ .matches = { -+ DMI_MATCH(DMI_SYS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "2373HU6"), -+ }, -+ }, -+ { -+ /* Reported by Dwight Barkley */ -+ .ident = "IBM ThinkPad T42 (2373-JTU)", -+ .matches = { -+ DMI_MATCH(DMI_SYS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "2373JTU"), -+ }, -+ }, -+ { -+ /* Reported by Vernon Mauery */ -+ .ident = "IBM ThinkPad T40 (2373-MU4)", -+ .matches = { -+ DMI_MATCH(DMI_SYS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "2373MU4"), -+ }, -+ }, -+ { -+ /* Reported by Adam Glasgall */ -+ .ident = "IBM ThinkPad T40 (2373-RU1)", -+ .matches = { -+ DMI_MATCH(DMI_SYS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "2373RU1"), -+ }, -+ }, -+ { -+ /* Reported by Paul Ionescu */ -+ .ident = "IBM ThinkPad T41 (2373-TG5)", -+ .matches = { -+ DMI_MATCH(DMI_SYS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "2373TG5"), -+ }, -+ }, -+ { -+ /* Reported by Ajay Ramaswamy */ -+ .ident = "IBM ThinkPad T41 (2373-XNX)", -+ .matches = { -+ DMI_MATCH(DMI_SYS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "2373XNX"), -+ }, -+ }, -+ -+ { -+ /* Reported by Tim Hull */ -+ .ident = "IBM ThinkPad T42 (2374-6VU)", -+ .matches = { -+ DMI_MATCH(DMI_SYS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "23746VU"), -+ }, -+ }, -+ { -+ /* Reported by Johannes Hansen */ -+ .ident = "IBM ThinkPad T42 (2374-CTO)", -+ .matches = { -+ DMI_MATCH(DMI_SYS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "2374CTO"), -+ }, -+ }, -+ { -+ /* Reported by Johannes Hansen */ -+ .ident = "IBM ThinkPad T42 (2374-ZEP)", -+ .matches = { -+ DMI_MATCH(DMI_SYS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "2374ZEP"), -+ }, -+ }, -+ -+ { -+ /* Reported by obi */ -+ .ident = "IBM ThinkPad T41 (2378-DEU)", -+ .matches = { -+ DMI_MATCH(DMI_SYS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "2378DEU"), -+ }, -+ }, -+ { -+ /* Reported by Paul Stanisci */ -+ .ident = "IBM ThinkPad T41 (2378-DLU)", -+ .matches = { -+ DMI_MATCH(DMI_SYS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "2378DLU"), -+ }, -+ }, -+ { -+ /* Reported by Austin Clements */ -+ .ident = "IBM ThinkPad T42 (2378-DUU)", -+ .matches = { -+ DMI_MATCH(DMI_SYS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "2378DUU"), -+ }, -+ }, -+ { -+ /* Reported by Ulrich Drepper */ -+ .ident = "IBM ThinkPad T42 (2378-R2U)", -+ .matches = { -+ DMI_MATCH(DMI_SYS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "2378R2U"), -+ }, -+ }, -+ { -+ /* Reported by Nicolas Dufresne */ -+ .ident = "IBM ThinkPad T42 (2378-RBF)", -+ .matches = { -+ DMI_MATCH(DMI_SYS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "2378RBF"), -+ }, -+ }, -+ { -+ /* Reported by Nicolas Dufresne */ -+ .ident = "IBM ThinkPad T42 (2378-RBU)", -+ .matches = { -+ DMI_MATCH(DMI_SYS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "2378RBU"), -+ }, -+ }, -+ { -+ /* Reported by Tom Marshall */ -+ .ident = "IBM ThinkPad T42 (2378-XXE)", -+ .matches = { -+ DMI_MATCH(DMI_SYS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "2378XXE"), -+ }, -+ }, -+ -+ { -+ .ident = "IBM ThinkPad T41 (2379-D6U)", -+ .matches = { -+ DMI_MATCH(DMI_SYS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "2379D6U"), -+ }, -+ }, -+ { -+ /* Reported by Volker Braun */ -+ .ident = "IBM ThinkPad T41 (2379-DJU)", -+ .matches = { -+ DMI_MATCH(DMI_SYS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "2379DJU"), -+ }, -+ }, -+ -+ { -+ /* Reported by Frank Otto */ -+ .ident = "IBM ThinkPad R32 (2658-BQG)", -+ .matches = { -+ DMI_MATCH(DMI_SYS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "2658BQG"), -+ }, -+ }, -+ -+ { -+ /* Reported by Chris Lee */ -+ .ident = "IBM ThinkPad X31 (2672-5KU)", -+ .matches = { -+ DMI_MATCH(DMI_SYS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "26725KU"), -+ }, -+ }, -+ { -+ /* Reported by Jeremy Katz */ -+ .ident = "IBM ThinkPad X31 (2672-A9U)", -+ .matches = { -+ DMI_MATCH(DMI_SYS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "2672A9U"), -+ }, -+ }, -+ { -+ /* Reported by Daniel P. Berrange */ -+ .ident = "IBM ThinkPad X31 (2672-JHG)", -+ .matches = { -+ DMI_MATCH(DMI_SYS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "2672JHG"), -+ }, -+ }, -+ { -+ /* Reported by Chris Blizzard */ -+ .ident = "IBM ThinkPad X31 (2672-RU3)", -+ .matches = { -+ DMI_MATCH(DMI_SYS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "2672RU3"), -+ }, -+ }, -+ { -+ /* IBM ThinkPad X31 2672-XXH -> works, but doesn't fix the LCD -+ backlight on during S3 issue. -+ Reported by: Henrik Brix Andersen */ -+ .ident = "IBM ThinkPad X31 (2672-XXH)", -+ .matches = { -+ DMI_MATCH(DMI_SYS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "2672XXH"), -+ }, -+ }, -+ -+ { -+ /* Reported by Frank Schmitt */ -+ .ident = "IBM ThinkPad R40 (2722-3GG)", -+ .matches = { -+ DMI_MATCH(DMI_SYS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "27223GG"), -+ }, -+ }, -+ { -+ /* Reported by Nils Trebing */ -+ .ident = "IBM ThinkPad R40 (2722-5MG)", -+ .matches = { -+ DMI_MATCH(DMI_SYS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "27225MG"), -+ }, -+ }, -+ { -+ /* Reported by Rushi Bhatt */ -+ .ident = "IBM ThinkPad R40 (2722-6YU)", -+ .matches = { -+ DMI_MATCH(DMI_SYS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "27226YU"), -+ }, -+ }, -+ { -+ /* Reported by Pete Toscano */ -+ .ident = "IBM ThinkPad R40 (2722-B3G)", -+ .matches = { -+ DMI_MATCH(DMI_SYS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "2722B3G"), -+ }, -+ }, -+ { -+ /* Reported by Meik Hellmund */ -+ .ident = "IBM ThinkPad R40 (2722-CDG)", -+ .matches = { -+ DMI_MATCH(DMI_SYS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "2722CDG"), -+ }, -+ }, -+ + { }, -+ /* Negative reports: */ -+ /* IBM thinkpad T42p 2373-KUU -> machine hangs as X starts -+ Reported by: Dax Kelson */ +}; + +extern int radeon_force_sleep; @@ -542,7 +30,7 @@ static void radeon_pm_disable_dynamic_mode(struct radeonfb_info *rinfo) { u32 tmp; -@@ -852,7 +1375,14 @@ static void radeon_pm_setup_for_suspend( +@@ -852,7 +870,14 @@ static void radeon_pm_setup_for_suspend( /* because both INPLL and OUTPLL take the same lock, that's why. */ tmp = INPLL( pllMCLK_MISC) | MCLK_MISC__EN_MCLK_TRISTATE_IN_SUSPEND; OUTPLL( pllMCLK_MISC, tmp); @@ -558,7 +46,7 @@ /* AGP PLL control */ if (rinfo->family <= CHIP_FAMILY_RV280) { OUTREG(BUS_CNTL1, INREG(BUS_CNTL1) | BUS_CNTL1__AGPCLK_VALID); -@@ -864,6 +1394,7 @@ static void radeon_pm_setup_for_suspend( +@@ -864,6 +889,7 @@ static void radeon_pm_setup_for_suspend( OUTREG(BUS_CNTL1, INREG(BUS_CNTL1)); OUTREG(BUS_CNTL1, (INREG(BUS_CNTL1) & ~0x4000) | 0x8000); } @@ -566,7 +54,7 @@ OUTREG(CRTC_OFFSET_CNTL, (INREG(CRTC_OFFSET_CNTL) & ~CRTC_OFFSET_CNTL__CRTC_STEREO_SYNC_OUT_EN)); -@@ -2790,6 +3320,29 @@ void radeonfb_pm_init(struct radeonfb_in +@@ -2790,6 +2816,29 @@ void radeonfb_pm_init(struct radeonfb_in } #endif /* defined(CONFIG_PPC_PMAC) */ #endif /* defined(CONFIG_PM) */ @@ -619,7 +107,7 @@ } else mode_option = this_opt; } -@@ -2670,3 +2674,7 @@ +@@ -2670,3 +2677,7 @@ MODULE_PARM_DESC(panel_yres, "int: set panel yres"); module_param(mode_option, charp, 0); MODULE_PARM_DESC(mode_option, "Specify resolution as \"x[-][@]\" "); From fedora-cvs-commits at redhat.com Wed Mar 1 18:35:25 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 1 Mar 2006 13:35:25 -0500 Subject: rpms/ltrace/devel ltrace.spec,1.23,1.24 Message-ID: <200603011835.k21IZPJ5017367@cvs.devel.redhat.com> Author: pmachata Update of /cvs/dist/rpms/ltrace/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv17303 Modified Files: ltrace.spec Log Message: Include %{ix86} to ExclusiveArch, instead of mere i386. Index: ltrace.spec =================================================================== RCS file: /cvs/dist/rpms/ltrace/devel/ltrace.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- ltrace.spec 11 Feb 2006 04:25:55 -0000 1.23 +++ ltrace.spec 1 Mar 2006 18:35:19 -0000 1.24 @@ -1,7 +1,7 @@ Summary: Tracks runtime library calls from dynamically linked executables. Name: ltrace Version: 0.3.36 -Release: 4.2 +Release: 4.3 Source: ftp://ftp.debian.org/debian/pool/main/l/ltrace/ltrace_%{version}.orig.tar.gz Patch1: ftp://ftp.debian.org/debian/pool/main/l/ltrace/ltrace_0.3.36-2.diff.gz Patch2: ltrace-ppc64.patch @@ -12,7 +12,7 @@ Patch7: ltrace-ia64.patch License: GPL Group: Development/Debuggers -ExclusiveArch: i386 x86_64 ia64 ppc ppc64 s390 s390x alpha sparc +ExclusiveArch: %{ix86} x86_64 ia64 ppc ppc64 s390 s390x alpha sparc Prefix: %{_prefix} BuildRoot: /var/tmp/%{name}-root BuildRequires: elfutils-libelf-devel @@ -59,6 +59,9 @@ %config /etc/ltrace.conf %changelog +* Fri Feb 10 2006 Jesse Keating - 0.3.36-4.3 +- include %{ix86} to ExclusiveArch, instead of mere i386 + * Fri Feb 10 2006 Jesse Keating - 0.3.36-4.2 - bump again for double-long bug on ppc(64) From fedora-cvs-commits at redhat.com Wed Mar 1 18:37:24 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 1 Mar 2006 13:37:24 -0500 Subject: rpms/tomcat5/devel tomcat5.spec,1.61,1.62 Message-ID: <200603011837.k21IbOBq017586@cvs.devel.redhat.com> Author: rafaels Update of /cvs/dist/rpms/tomcat5/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv17557 Modified Files: tomcat5.spec Log Message: Disabled juli in order to workaround some classpath bugs with java.util.logging. Index: tomcat5.spec =================================================================== RCS file: /cvs/dist/rpms/tomcat5/devel/tomcat5.spec,v retrieving revision 1.61 retrieving revision 1.62 diff -u -r1.61 -r1.62 --- tomcat5.spec 23 Feb 2006 21:16:41 -0000 1.61 +++ tomcat5.spec 1 Mar 2006 18:37:21 -0000 1.62 @@ -26,7 +26,7 @@ Summary: Apache Servlet/JSP Engine, RI for Servlet 2.4/JSP 2.0 API Name: tomcat5 Version: 5.5.15 -Release: 1jpp_3fc +Release: 1jpp_4fc Epoch: 0 License: Apache Software License #Vendor: JPackage Project @@ -628,6 +628,10 @@ ln -s %{jname}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{jname} popd +# disable the juli log manager until the classpath +# java.util.logging.LogManager is fixed +rm -f $RPM_BUILD_ROOT%{bindir}/tomcat-juli.jar + # sample.war is a malformed zip file aot-compile-rpm --exclude /var/lib/tomcat5/webapps/tomcat-docs/appdev/sample/sample.war @@ -883,7 +887,7 @@ %attr(-,root,root) %{_libdir}/gcj/%{name}/bootstrap* %attr(-,root,root) %{_libdir}/gcj/%{name}/commons-daemon* %attr(-,root,root) %{_libdir}/gcj/%{name}/commons-logging-api* -%attr(-,root,root) %{_libdir}/gcj/%{name}/tomcat-juli* +#%attr(-,root,root) %{_libdir}/gcj/%{name}/tomcat-juli* %attr(-,root,root) %{_libdir}/gcj/%{name}/tomcat-jkstatus-ant* %files common-lib @@ -982,6 +986,10 @@ %ghost %doc %{_javadocdir}/%{name}-jsp-%{jspspec}-api %changelog +* Wed Mar 1 2006 Rafael Schloming - 0:5.5.15-1jpp_4fc +- Disabled juli logging as a workaround for a number of classpath bugs +- in java.util.logging.* + * Thu Feb 23 2006 Rafael Schloming - 0:5.5.15-1jpp_3fc - Added jasper-foo symlinks for jars. From fedora-cvs-commits at redhat.com Wed Mar 1 18:51:53 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 1 Mar 2006 13:51:53 -0500 Subject: rpms/xorg-x11-xkbdata/devel xorg-x11-xkbdata.spec,1.10,1.11 Message-ID: <200603011851.k21IprFU003460@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/xorg-x11-xkbdata/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv3394 Modified Files: xorg-x11-xkbdata.spec Log Message: - Turn on compat symlink (bug 183521) Index: xorg-x11-xkbdata.spec =================================================================== RCS file: /cvs/dist/rpms/xorg-x11-xkbdata/devel/xorg-x11-xkbdata.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- xorg-x11-xkbdata.spec 1 Mar 2006 03:41:39 -0000 1.10 +++ xorg-x11-xkbdata.spec 1 Mar 2006 18:51:50 -0000 1.11 @@ -37,7 +37,8 @@ %configure \ --enable-compat-rules \ --with-xkb-base=%{_datadir}/X11/xkb \ - --disable-xkbcomp-symlink + --disable-xkbcomp-symlink \ + --with-xkb-rules-symlink=xorg make @@ -80,8 +81,14 @@ %files -f files.list %defattr(-,root,root,-) +%{_datadir}/X11/xkb/rules/xorg +%{_datadir}/X11/xkb/rules/xorg.lst +%{_datadir}/X11/xkb/rules/xorg.xml %changelog +* Wed Mar 01 2006 Ray Strode 1.0.1-6 +- Turn on compat symlink (bug 183521) + * Tue Feb 28 2006 Mike A. Harris 1.0.1-5 - Fixed rpm pre script upgrade/install testing - Rebuild package as 1.0.1-5 in rawhide, completing the transition to From fedora-cvs-commits at redhat.com Wed Mar 1 18:52:45 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 1 Mar 2006 13:52:45 -0500 Subject: rpms/xorg-x11-xkbdata/devel xorg-x11-xkbdata.spec,1.11,1.12 Message-ID: <200603011852.k21IqjEB003922@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/xorg-x11-xkbdata/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv3834 Modified Files: xorg-x11-xkbdata.spec Log Message: - Turn on compat symlink (bug 183521) Index: xorg-x11-xkbdata.spec =================================================================== RCS file: /cvs/dist/rpms/xorg-x11-xkbdata/devel/xorg-x11-xkbdata.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- xorg-x11-xkbdata.spec 1 Mar 2006 18:51:50 -0000 1.11 +++ xorg-x11-xkbdata.spec 1 Mar 2006 18:52:42 -0000 1.12 @@ -10,7 +10,7 @@ Name: xorg-x11-xkbdata Version: 1.0.1 # When rebuilding, bump the final digit only -Release: 5 +Release: 6 License: MIT Group: User Interface/X URL: http://www.x.org From fedora-cvs-commits at redhat.com Wed Mar 1 19:15:29 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 1 Mar 2006 14:15:29 -0500 Subject: rpms/kernel/devel kernel-2.6.spec, 1.2000, 1.2001 linux-2.6-radeon-backlight.patch, 1.14, 1.15 linux-2.6-radeon-whitelist.patch, 1.1, NONE Message-ID: <200603011915.k21JFT0R009112@cvs.devel.redhat.com> Author: pjones Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv8951 Modified Files: kernel-2.6.spec linux-2.6-radeon-backlight.patch Removed Files: linux-2.6-radeon-whitelist.patch Log Message: - actually, don't use a separate patch, use #include instead. Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.2000 retrieving revision 1.2001 diff -u -r1.2000 -r1.2001 --- kernel-2.6.spec 1 Mar 2006 18:15:08 -0000 1.2000 +++ kernel-2.6.spec 1 Mar 2006 19:15:24 -0000 1.2001 @@ -354,7 +354,6 @@ Patch1610: linux-2.6-input-kill-stupid-messages.patch Patch1620: linux-2.6-serial-tickle-nmi.patch Patch1630: linux-2.6-radeon-backlight.patch -Patch1632: linux-2.6-radeon-whitelist.patch Patch1640: linux-2.6-ide-tune-locking.patch Patch1641: linux-2.6-ide-cd-shutup.patch Patch1650: linux-2.6-autofs-pathlookup.patch @@ -914,8 +913,6 @@ %patch1620 -p1 # Radeon on thinkpad backlight power-management goodness. %patch1630 -p1 -# The whitelist for radeon thinkpad pm goodness. -%patch1632 -p1 # Fix IDE locking bug. %patch1640 -p1 # Silence noisy CD drive spew linux-2.6-radeon-backlight.patch: radeon_base.c | 11 +++++++ radeon_pm.c | 51 ++++++++++++++++++++++++++++++++- radeon_pm_whitelist.h | 76 ++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 137 insertions(+), 1 deletion(-) Index: linux-2.6-radeon-backlight.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-radeon-backlight.patch,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- linux-2.6-radeon-backlight.patch 1 Mar 2006 18:15:08 -0000 1.14 +++ linux-2.6-radeon-backlight.patch 1 Mar 2006 19:15:24 -0000 1.15 @@ -1,8 +1,84 @@ - -http://bugme.osdl.org/show_bug.cgi?id=3022 - ---- vanilla/drivers/video/aty/radeon_pm.c 2005-10-27 20:02:08.000000000 -0400 -+++ linux-2.6.14/drivers/video/aty/radeon_pm.c 2005-11-30 02:20:01.000000000 -0500 +--- linux-2.6.15.i686/drivers/video/aty/radeon_pm_whitelist.h.backlight 2006-03-01 13:22:58.000000000 -0500 ++++ linux-2.6.15.i686/drivers/video/aty/radeon_pm_whitelist.h 2006-03-01 13:56:54.000000000 -0500 +@@ -0,0 +1,76 @@ ++#define E(_vendor, _product, _ident, _reporter) \ ++{ /* _reporter */ \ ++ .ident = _ident, \ ++ .matches = { \ ++ DMI_MATCH(DMI_SYS_VENDOR, _vendor), \ ++ DMI_MATCH(DMI_PRODUCT_NAME, _product), \ ++ }, \ ++} ++E("IBM", "18297RG", "IBM ThinkPad R50", "Borschuk Oleg "), ++E("IBM", "18299MG", "IBM ThinkPad R51", "Georges Herber "), ++E("IBM", "1829EHG", "IBM ThinkPad R51", "Wouter Cloetens "), ++E("IBM", "1829R6G", "IBM ThinkPad R51", "Sten Heinze"), ++E("IBM", "1836Q6U", "IBM ThinkPad R51", "Eugene Pavlovsky"), ++E("IBM", "236696G", "IBM ThinkPad T30", "Jakob Schiotz "), ++E("IBM", "236697G", "IBM ThinkPad T30", "Stephan Gro?? "), ++E("IBM", "2366JBG", "IBM ThinkPad T30", "Thomas M Steenholdt "), ++E("IBM", "2366MU9", "IBM ThinkPad T30", "Phillip Jones "), ++E("IBM", "2366QU5", "IBM ThinkPad T30", "ChazeFroy "), ++E("IBM", "23729CU", "IBM ThinkPad T40", "George Avrunin "), ++E("IBM", "237314U", "IBM ThinkPad T40", "Dmitriy Zavin "), ++E("IBM", "23731FG", "IBM ThinkPad T41", "Aivo Prykk "), ++E("IBM", "237322G", "IBM ThinkPad T40", "Michele Lamarca "), ++E("IBM", "237325G", "IBM ThinkPad T40", "Klaus Kurzmann "), ++E("IBM", "23732FG", "IBM ThinkPad T41", "Antti Andreimann "), ++E("IBM", "23733HM", "IBM ThinkPad T41", "Grahame Bowland "), ++E("IBM", "23734G2", "IBM ThinkPad T40", "Antti P Miettinen "), ++E("IBM", "23737JU", "IBM ThinkPad T41", "Matthew Saltzman "), ++E("IBM", "23738CG", "IBM ThinkPad T40", "Pete Toscano "), ++E("IBM", "237392G", "IBM ThinkPad T40", "Pete Toscano "), ++E("IBM", "237394G", "IBM ThinkPad T40", "Manuel Carro "), ++E("IBM", "237394U", "IBM ThinkPad T40", "Pete Toscano "), ++E("IBM", "23739FU", "IBM ThinkPad T41", "Peter Jones "), ++E("IBM", "23739HG", "IBM ThinkPad T41", "Chris Vanden Berghe "), ++E("IBM", "23739HU", "IBM ThinkPad T41", "Ajay Ramaswamy "), ++E("IBM", "2373BU7", "IBM ThinkPad T40", "Peter Jones "), ++E("IBM", "2373F2G", "IBM ThinkPad T42", "Isaac Wilcox"), ++E("IBM", "2373FWG", "IBM ThinkPad T42", "Jerome Poggi and Pete Toscano "), ++E("IBM", "2373G1G", "IBM ThinkPad T40p", "Juerg Billeter "), ++E("IBM", "2373G1U", "IBM ThinkPad T40p", "Bill Nottingham "), ++E("IBM", "2373G3G", "IBM ThinkPad T40p", "Hartwig, Thomas "), ++E("IBM", "2373GEU", "IBM ThinkPad T41p", "Eric Benson "), ++E("IBM", "2373HU6", "IBM ThinkPad T41", "David Zeuthen "), ++E("IBM", "2373JTU", "IBM ThinkPad T42", "Dwight Barkley "), ++E("IBM", "2373MU4", "IBM ThinkPad T40", "Vernon Mauery "), ++E("IBM", "2373RU1", "IBM ThinkPad T40", "Adam Glasgall "), ++E("IBM", "2373TG5", "IBM ThinkPad T41", "Paul Ionescu "), ++E("IBM", "2373XNX", "IBM ThinkPad T41", "Ajay Ramaswamy "), ++E("IBM", "23746VU", "IBM ThinkPad T42", "Tim Hull "), ++E("IBM", "2374CTO", "IBM ThinkPad T42", "Johannes Hansen"), ++E("IBM", "2374ZEP", "IBM ThinkPad T42", "Johannes Hansen"), ++E("IBM", "2378DEU", "IBM ThinkPad T41", "obi "), ++E("IBM", "2378DLU", "IBM ThinkPad T41", "Paul Stanisci "), ++E("IBM", "2378DUU", "IBM ThinkPad T42", "Austin Clements "), ++E("IBM", "2378R2U", "IBM ThinkPad T42", "Ulrich Drepper "), ++E("IBM", "2378RBF", "IBM ThinkPad T42", "Nicolas Dufresne "), ++E("IBM", "2378RBU", "IBM ThinkPad T42", "Nicolas Dufresne "), ++E("IBM", "2378XXE", "IBM ThinkPad T42", "Tom Marshall"), ++E("IBM", "2379D6U", "IBM ThinkPad T41", "anonymous"), ++E("IBM", "2379DJU", "IBM ThinkPad T41", "Volker Braun "), ++E("IBM", "2658BQG", "IBM ThinkPad R32", "Frank Otto "), ++E("IBM", "26725KU", "IBM ThinkPad X31", "Chris Lee "), ++E("IBM", "2672A9U", "IBM ThinkPad X31", "Jeremy Katz "), ++E("IBM", "2672JHG", "IBM ThinkPad X31", "Daniel P. Berrange "), ++E("IBM", "2672RU3", "IBM ThinkPad X31", "Chris Blizzard "), ++ /* IBM ThinkPad X31 2672-XXH -> works, but doesn't fix the LCD ++ backlight on during S3 issue. */ ++E("IBM", "2672XXH", "IBM ThinkPad X31", "Henrik Brix Andersen "), ++E("IBM", "27223GG", "IBM ThinkPad R40", "Frank Schmitt "), ++E("IBM", "27225MG", "IBM ThinkPad R40", "Nils Trebing "), ++E("IBM", "27226YU", "IBM ThinkPad R40", "Rushi Bhatt"), ++E("IBM", "2722B3G", "IBM ThinkPad R40", "Pete Toscano "), ++E("IBM", "2722CDG", "IBM ThinkPad R40", "Meik Hellmund "), ++{ }, ++/* Negative reports: */ ++/* E("IBM", "2373KUU", "IBM ThinkPad T42p", "Dax Kelson "), */ ++#undef E +--- linux-2.6.15.i686/drivers/video/aty/radeon_pm.c.backlight 2006-03-01 13:22:06.000000000 -0500 ++++ linux-2.6.15.i686/drivers/video/aty/radeon_pm.c 2006-03-01 13:33:47.000000000 -0500 @@ -25,8 +25,26 @@ #include #endif @@ -21,7 +97,7 @@ + * vendor and product codes for Your laptop. + */ +static struct dmi_system_id __devinitdata radeonfb_dmi_table[] = { -+ { }, ++#include "radeon_pm_whitelist.h" +}; + +extern int radeon_force_sleep; @@ -30,7 +106,7 @@ static void radeon_pm_disable_dynamic_mode(struct radeonfb_info *rinfo) { u32 tmp; -@@ -852,7 +870,14 @@ static void radeon_pm_setup_for_suspend( +@@ -852,7 +870,14 @@ /* because both INPLL and OUTPLL take the same lock, that's why. */ tmp = INPLL( pllMCLK_MISC) | MCLK_MISC__EN_MCLK_TRISTATE_IN_SUSPEND; OUTPLL( pllMCLK_MISC, tmp); @@ -46,7 +122,7 @@ /* AGP PLL control */ if (rinfo->family <= CHIP_FAMILY_RV280) { OUTREG(BUS_CNTL1, INREG(BUS_CNTL1) | BUS_CNTL1__AGPCLK_VALID); -@@ -864,6 +889,7 @@ static void radeon_pm_setup_for_suspend( +@@ -864,6 +889,7 @@ OUTREG(BUS_CNTL1, INREG(BUS_CNTL1)); OUTREG(BUS_CNTL1, (INREG(BUS_CNTL1) & ~0x4000) | 0x8000); } @@ -54,7 +130,7 @@ OUTREG(CRTC_OFFSET_CNTL, (INREG(CRTC_OFFSET_CNTL) & ~CRTC_OFFSET_CNTL__CRTC_STEREO_SYNC_OUT_EN)); -@@ -2790,6 +2816,29 @@ void radeonfb_pm_init(struct radeonfb_in +@@ -2790,6 +2816,29 @@ } #endif /* defined(CONFIG_PPC_PMAC) */ #endif /* defined(CONFIG_PM) */ @@ -84,8 +160,8 @@ } void radeonfb_pm_exit(struct radeonfb_info *rinfo) ---- vanilla/drivers/video/aty/radeon_base.c 2005-02-20 20:08:15.000000000 +0200 -+++ linux-2.6.14/drivers/video/aty/radeon_base.c 2005-02-20 20:18:20.000000000 +0200 +--- linux-2.6.15.i686/drivers/video/aty/radeon_base.c.backlight 2006-03-01 13:22:06.000000000 -0500 ++++ linux-2.6.15.i686/drivers/video/aty/radeon_base.c 2006-03-01 13:22:27.000000000 -0500 @@ -272,6 +272,9 @@ #ifdef CONFIG_MTRR static int nomtrr = 0; --- linux-2.6-radeon-whitelist.patch DELETED --- From fedora-cvs-commits at redhat.com Wed Mar 1 19:20:07 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 1 Mar 2006 14:20:07 -0500 Subject: rpms/system-config-bind/devel .cvsignore, 1.23, 1.24 sources, 1.40, 1.41 system-config-bind.spec, 1.48, 1.49 Message-ID: <200603011920.k21JK7mh016189@cvs.devel.redhat.com> Author: jvdias Update of /cvs/dist/rpms/system-config-bind/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv16174 Modified Files: .cvsignore sources system-config-bind.spec Log Message: fix bug 182857: Requires(post):hicolor-icon-theme; ship updated translations Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/system-config-bind/devel/.cvsignore,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- .cvsignore 10 Jan 2006 15:21:38 -0000 1.23 +++ .cvsignore 1 Mar 2006 19:20:05 -0000 1.24 @@ -20,3 +20,4 @@ system-config-bind-4.0.0-33_FC5.tar.gz system-config-bind-4.0.0-34_FC5.tar.gz system-config-bind-4.0.0-36_FC5.tar.gz +system-config-bind-4.0.0-38_FC5.tar.gz Index: sources =================================================================== RCS file: /cvs/dist/rpms/system-config-bind/devel/sources,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- sources 10 Jan 2006 15:21:38 -0000 1.40 +++ sources 1 Mar 2006 19:20:05 -0000 1.41 @@ -1 +1 @@ -38c6f2c7a6bb00270b837b44ab6427a6 system-config-bind-4.0.0-36_FC5.tar.gz +6e055067c2df5dd217fdc16239d441cc system-config-bind-4.0.0-38_FC5.tar.gz Index: system-config-bind.spec =================================================================== RCS file: /cvs/dist/rpms/system-config-bind/devel/system-config-bind.spec,v retrieving revision 1.48 retrieving revision 1.49 diff -u -r1.48 -r1.49 --- system-config-bind.spec 10 Jan 2006 15:21:38 -0000 1.48 +++ system-config-bind.spec 1 Mar 2006 19:20:05 -0000 1.49 @@ -1,7 +1,7 @@ Summary: The Red Hat BIND DNS Configuration Tool. Name: system-config-bind Version: 4.0.0 -Release: 36_FC5 +Release: 38_FC5 License: GPL Group: Applications/System URL: http://people.redhat.com/~jvdias/system-config-bind @@ -12,6 +12,7 @@ Requires: python >= 2.2 Requires: pygtk2, gnome-python2, pygtk2-libglade, gnome-python2-canvas Requires: bind, bind-utils +Requires(post): hicolor-icon-theme Obsoletes: redhat-config-bind Obsoletes: bindconf @@ -90,6 +91,10 @@ fi %changelog +* Tue Mar 01 2006 Jason Vas Dias - 4.0.0-38 +- fix bug 182857: add Requires(post): hicolor-icon-them +- ship updated translations + * Tue Jan 10 2006 Jason Vas Dias - 4.0.0-36 - fix bug 176142 (final!) : ship the Serbian translations - fix str widget save (TXT records) From fedora-cvs-commits at redhat.com Wed Mar 1 19:30:05 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 1 Mar 2006 14:30:05 -0500 Subject: rpms/evince/devel .cvsignore,1.21,1.22 evince.spec,1.43,1.44 Message-ID: <200603011930.k21JU5gV016400@cvs.devel.redhat.com> Author: krh Update of /cvs/dist/rpms/evince/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv16371 Modified Files: .cvsignore evince.spec Log Message: Rebuild to pick up new poppler soname. Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/evince/devel/.cvsignore,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- .cvsignore 28 Feb 2006 02:45:33 -0000 1.21 +++ .cvsignore 1 Mar 2006 19:30:03 -0000 1.22 @@ -1,2 +1 @@ -evince-0.5.0.tar.bz2 evince-0.5.1.tar.bz2 Index: evince.spec =================================================================== RCS file: /cvs/dist/rpms/evince/devel/evince.spec,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- evince.spec 28 Feb 2006 02:47:13 -0000 1.43 +++ evince.spec 1 Mar 2006 19:30:03 -0000 1.44 @@ -4,7 +4,7 @@ Name: evince Version: 0.5.1 -Release: 1 +Release: 2 Summary: Document viewer License: GPL @@ -119,6 +119,9 @@ %changelog +* Wed Mar 1 2006 Kristian H??gsberg - 0.5.1-2 +- Rebuild to pick up new poppler soname. + * Mon Feb 27 2006 Matthias Clasen - 0.5.1-1 - Update to 0.5.1 - Drop upstreamed patch From fedora-cvs-commits at redhat.com Wed Mar 1 19:51:44 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 1 Mar 2006 14:51:44 -0500 Subject: rpms/eclipse/devel eclipse.spec,1.251,1.252 Message-ID: <200603011951.k21JpiJk029102@cvs.devel.redhat.com> Author: overholt Update of /cvs/dist/rpms/eclipse/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv29089 Modified Files: eclipse.spec Log Message: gah Index: eclipse.spec =================================================================== RCS file: /cvs/dist/rpms/eclipse/devel/eclipse.spec,v retrieving revision 1.251 retrieving revision 1.252 diff -u -r1.251 -r1.252 --- eclipse.spec 1 Mar 2006 17:49:20 -0000 1.251 +++ eclipse.spec 1 Mar 2006 19:51:42 -0000 1.252 @@ -518,7 +518,7 @@ ln -sf %{_javadir}/mx4j/mx4j-jmx.jar plugins/org.eclipse.tomcat/mx4j-jmx.jar ln -sf %{tomcatlibdir}/common/lib/naming-factory.jar plugins/org.eclipse.tomcat/naming-factory.jar ln -sf %{tomcatlibdir}/common/lib/naming-resources.jar plugins/org.eclipse.tomcat/naming-resources.jar -ln -sf %{_javadir}/regexp-1.3.jar plugins/org.eclipse.tomcat/jakarta-regexp-1.3.jar +ln -sf %{_javadir}/regexp-1.3.jar plugins/org.eclipse.tomcat/regexp-1.3.jar ln -sf %{_javadir}/servletapi5.jar plugins/org.eclipse.tomcat/servletapi5.jar ln -sf %{tomcatlibdir}/server/lib/servlets-default.jar plugins/org.eclipse.tomcat/servlets-default.jar ln -sf %{tomcatlibdir}/server/lib/servlets-invoker.jar plugins/org.eclipse.tomcat/servlets-invoker.jar From fedora-cvs-commits at redhat.com Wed Mar 1 19:59:03 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 1 Mar 2006 14:59:03 -0500 Subject: rpms/xen/devel .cvsignore, 1.13, 1.14 sources, 1.28, 1.29 xen.spec, 1.96, 1.97 xen-bl-domain-restart.patch, 1.1, NONE xen-bl-unique-fifo.patch, 1.1, NONE xen-default-network.patch, 1.1, NONE Message-ID: <200603011959.k21Jx3UD006992@cvs.devel.redhat.com> Author: sct Update of /cvs/dist/rpms/xen/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv6956 Modified Files: .cvsignore sources xen.spec Removed Files: xen-bl-domain-restart.patch xen-bl-unique-fifo.patch xen-default-network.patch Log Message: Update to xen-unstable cset 9015 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/xen/devel/.cvsignore,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- .cvsignore 8 Feb 2006 21:18:36 -0000 1.13 +++ .cvsignore 1 Mar 2006 19:59:01 -0000 1.14 @@ -1,3 +1,2 @@ LibVNCServer-0.7.1.tar.gz -xen-3.0.0-20060130.tar.bz2 -xen-3.0.1-20060208.tar.bz2 +xen-3.0.1-20060228.tar.bz2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/xen/devel/sources,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- sources 8 Feb 2006 21:18:36 -0000 1.28 +++ sources 1 Mar 2006 19:59:01 -0000 1.29 @@ -1,3 +1,2 @@ 54110288b3171551c03467cd60976d55 LibVNCServer-0.7.1.tar.gz -08d9b3c05fb2e4841121fefea8f9560f xen-3.0.0-20060130.tar.bz2 -61998ba61dc28a0df52a9dee293ad716 xen-3.0.1-20060208.tar.bz2 +e9e11baf392b7119739b2b1d92d19ee3 xen-3.0.1-20060228.tar.bz2 Index: xen.spec =================================================================== RCS file: /cvs/dist/rpms/xen/devel/xen.spec,v retrieving revision 1.96 retrieving revision 1.97 diff -u -r1.96 -r1.97 --- xen.spec 23 Feb 2006 23:25:35 -0000 1.96 +++ xen.spec 1 Mar 2006 19:59:01 -0000 1.97 @@ -5,24 +5,20 @@ Summary: Xen is a virtual machine monitor Name: xen Version: 3.0.1 -Release: 0.20060208.fc5.3 +Release: 0.20060228.fc5.1 Group: Development/Libraries License: GPL URL: http://www.cl.cam.ac.uk/Research/SRG/netos/xen/index.html -Source0: xen-3.0.1-20060208.tar.bz2 +Source0: xen-3.0.1-20060228.tar.bz2 Source1: http://download.sf.net/libvncserver/LibVNCServer-%{libvncver}.tar.gz Source2: xenguest-install.py Patch0: xen-misc-fixes.patch Patch1: xen-initscript.patch Patch3: xen-dom0-minmem.patch Patch4: xen-compile-fixes.patch -Patch5: xen-default-network.patch Patch6: xen-network-iptables-bridge.patch Patch8: xen-vmxballoon-hack.patch Patch9: xen-3.0.1-config-allow-http.patch -Patch10: xen-bl-unique-fifo.patch -Patch11: xen-pygrub-dont-read-disk.patch -Patch12: xen-bl-domain-restart.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: transfig libidn-devel zlib-devel texi2html SDL-devel curl-devel BuildRequires: libX11-devel python-devel ghostscript tetex-latex @@ -58,13 +54,9 @@ %patch1 -p1 -b .init %patch3 -p1 -b .mem-min %patch4 -p1 -b .compile -%patch5 -p1 %patch6 -p1 %patch8 -p1 %patch9 -p1 -%patch10 -p1 -%patch11 -p1 -%patch12 -p1 cp %{SOURCE2} . @@ -76,7 +68,9 @@ popd sed -i -e "s;libvncserver-config;${vncdir}/libvncserver-config;" tools/ioemu/configure -CFLAGS="$RPM_OPT_FLAGS" %{__make} XEN_PYTHON_NATIVE_INSTALL=1 DESTDIR=%{buildroot} tools docs +#CFLAGS="`echo $RPM_OPT_FLAGS | sed -e 's/ -m64//g'`" +unset CFLAGS +%{__make} XEN_PYTHON_NATIVE_INSTALL=1 DESTDIR=%{buildroot} tools docs %install rm -rf %{buildroot} @@ -162,6 +156,9 @@ %dir %{_localstatedir}/run/xenstored %changelog +* Tue Feb 28 2006 Stephen Tweedie - 3.0.1-0.20060228.fc5.1 +- Update to xen-unstable cset 9015 + * Thu Feb 23 2006 Jeremy Katz - 3.0.1-0.20060208.fc5.3 - add patch to ensure we get a unique fifo for boot loader (#182328) - don't try to read the whole disk if we can't find a partition table --- xen-bl-domain-restart.patch DELETED --- --- xen-bl-unique-fifo.patch DELETED --- --- xen-default-network.patch DELETED --- From fedora-cvs-commits at redhat.com Wed Mar 1 20:07:19 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 1 Mar 2006 15:07:19 -0500 Subject: rpms/kernel/devel linux-2.6-md-raid1-leak.patch, NONE, 1.1 kernel-2.6.spec, 1.2001, 1.2002 Message-ID: <200603012007.k21K7J9d007591@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv7537 Modified Files: kernel-2.6.spec Added Files: linux-2.6-md-raid1-leak.patch Log Message: fix raid1 leak linux-2.6-md-raid1-leak.patch: raid1.c | 13 ++++++++----- 1 files changed, 8 insertions(+), 5 deletions(-) --- NEW FILE linux-2.6-md-raid1-leak.patch --- Signed-off-by: Neil Brown ### Diffstat output ./drivers/md/raid1.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff ./drivers/md/raid1.c~current~ ./drivers/md/raid1.c --- ./drivers/md/raid1.c~current~ 2006-02-27 11:52:18.000000000 +1100 +++ ./drivers/md/raid1.c 2006-03-01 10:44:49.000000000 +1100 @@ -306,6 +306,7 @@ static int raid1_end_write_request(struc r1bio_t * r1_bio = (r1bio_t *)(bio->bi_private); int mirror, behind = test_bit(R1BIO_BehindIO, &r1_bio->state); conf_t *conf = mddev_to_conf(r1_bio->mddev); + struct bio *to_put = NULL; if (bio->bi_size) return 1; @@ -323,6 +324,7 @@ static int raid1_end_write_request(struc * this branch is our 'one mirror IO has finished' event handler: */ r1_bio->bios[mirror] = NULL; + to_put = bio; if (!uptodate) { md_error(r1_bio->mddev, conf->mirrors[mirror].rdev); /* an I/O failed, we can't clear the bitmap */ @@ -375,7 +377,7 @@ static int raid1_end_write_request(struc /* Don't dec_pending yet, we want to hold * the reference over the retry */ - return 0; + goto out; } if (test_bit(R1BIO_BehindIO, &r1_bio->state)) { /* free extra copy of the data pages */ @@ -392,10 +394,11 @@ static int raid1_end_write_request(struc raid_end_bio_io(r1_bio); } - if (r1_bio->bios[mirror]==NULL) - bio_put(bio); - rdev_dec_pending(conf->mirrors[mirror].rdev, conf->mddev); + out: + if (to_put) + bio_put(to_put); + return 0; } @@ -857,7 +860,7 @@ static int make_request(request_queue_t atomic_set(&r1_bio->remaining, 0); atomic_set(&r1_bio->behind_remaining, 0); - do_barriers = bio->bi_rw & BIO_RW_BARRIER; + do_barriers = bio_barrier(bio); if (do_barriers) set_bit(R1BIO_Barrier, &r1_bio->state); Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.2001 retrieving revision 1.2002 diff -u -r1.2001 -r1.2002 --- kernel-2.6.spec 1 Mar 2006 19:15:24 -0000 1.2001 +++ kernel-2.6.spec 1 Mar 2006 20:07:16 -0000 1.2002 @@ -363,6 +363,7 @@ Patch1690: linux-2.6-smsc-ircc2-pnp.patch Patch1700: linux-2.6-w1-hush-debug.patch Patch1710: linux-2.6-sched-up-migration-cost.patch +Patch1720: linux-2.6-md-raid1-leak.patch # SELinux/audit patches. Patch1800: linux-2.6-selinux-hush.patch @@ -931,6 +932,8 @@ %patch1700 -p1 # Only print migration info on SMP %patch1710 -p1 +# Fix RAID1 leak +%patch1720 -p1 # Silence some selinux messages. %patch1800 -p1 @@ -1581,6 +1584,7 @@ %changelog * Wed Mar 1 2006 Dave Jones - 2.6.16rc5-git4 +- Fix leak in RAID1 * Tue Feb 28 2006 Dave Jones - 2.6.16rc5-git3 From fedora-cvs-commits at redhat.com Wed Mar 1 20:12:37 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 1 Mar 2006 15:12:37 -0500 Subject: rpms/axis/devel axis-1.2.1-DH.patch,NONE,1.1 axis.spec,1.15,1.16 Message-ID: <200603012012.k21KCb5K009935@cvs.devel.redhat.com> Author: ashah Update of /cvs/dist/rpms/axis/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv9589 Modified Files: axis.spec Added Files: axis-1.2.1-DH.patch Log Message: - remove unnecessary build dependencies on jacorb and jonathan-rmi - include fix to Axis bug 2142 - merge from upstream 2jpp axis-1.2.1-DH.patch: encoding/ser/SourceDataHandlerDeserializer.java | 3 +-- utils/JavaUtils.java | 7 +++---- 2 files changed, 4 insertions(+), 6 deletions(-) --- NEW FILE axis-1.2.1-DH.patch --- Index: src/org/apache/axis/utils/JavaUtils.java =================================================================== RCS file: /home/cvspublic/ws-axis/java/src/org/apache/axis/utils/JavaUtils.java,v retrieving revision 1.118 diff -u -r1.118 JavaUtils.java --- src/org/apache/axis/utils/JavaUtils.java 26 Apr 2005 21:06:36 -0000 1.118 +++ src/org/apache/axis/utils/JavaUtils.java 15 Jul 2005 15:20:21 -0000 @@ -295,7 +295,7 @@ // attachment, but if the image would be null // (is.available == 0) then ImageIO component isn't needed // and we can return null. - InputStream is = (InputStream) handler.getContent(); + InputStream is = handler.getInputStream(); if (is.available() == 0) { return null; } @@ -314,15 +314,14 @@ // For a reason unknown to me, the handler's // content is a String. Convert it to a // StreamSource. - return new StreamSource(new StringReader( - (String) handler.getContent())); + return new StreamSource(handler.getInputStream()); } else if (destClass == OctetStream.class || destClass == byte[].class) { InputStream in = null; if (arg instanceof InputStream) { in = (InputStream) arg; } else { - in = (InputStream)handler.getContent(); + in = handler.getInputStream(); } ByteArrayOutputStream baos = new ByteArrayOutputStream(); int byte1 = -1; Index: src/org/apache/axis/encoding/ser/SourceDataHandlerDeserializer.java =================================================================== RCS file: /home/cvspublic/ws-axis/java/src/org/apache/axis/encoding/ser/SourceDataHandlerDeserializer.java,v retrieving revision 1.4 diff -u -r1.4 SourceDataHandlerDeserializer.java --- src/org/apache/axis/encoding/ser/SourceDataHandlerDeserializer.java 25 Feb 2004 14:02:37 -0000 1.4 +++ src/org/apache/axis/encoding/ser/SourceDataHandlerDeserializer.java 15 Jul 2005 15:20:21 -0000 @@ -45,8 +45,7 @@ if (getValue() instanceof DataHandler) { try { DataHandler dh = (DataHandler) getValue(); - StreamSource ss = new StreamSource(new StringReader( - (String) dh.getContent())); + StreamSource ss = new StreamSource(dh.getInputStream()); setValue(ss); } catch (IOException ioe) { Index: axis.spec =================================================================== RCS file: /cvs/dist/rpms/axis/devel/axis.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- axis.spec 9 Dec 2005 22:39:44 -0000 1.15 +++ axis.spec 1 Mar 2006 20:12:35 -0000 1.16 @@ -1,12 +1,12 @@ %define name axis %define version 1.2.1 %define archivever 1_2_1 -%define release 1jpp_1fc.1 +%define release 2jpp_1fc %define section free Name: %{name} Version: %{version} -Release: %{release}.1 +Release: %{release} Epoch: 0 Summary: A SOAP implementation in Java License: Apache Software License @@ -16,21 +16,20 @@ Patch1: %{name}-bz152255.patch Patch2: %{name}-imageio.patch Patch3: %{name}-objectweb.patch +Patch4: %{name}-%{version}-DH.patch BuildRequires: jpackage-utils >= 0:1.5 BuildRequires: java-devel -BuildRequires: ant >= 0:1.6 -BuildRequires: ant-nodeps +BuildRequires: ant >= 0:1.6, ant-nodeps # Mandatory requires BuildRequires: jaf BuildRequires: jakarta-commons-discovery BuildRequires: jakarta-commons-httpclient BuildRequires: jakarta-commons-logging BuildRequires: javamail +BuildRequires: jaxp_parser_impl BuildRequires: log4j BuildRequires: servletapi5 BuildRequires: wsdl4j -BuildRequires: jacorb -BuildRequires: jonathan-rmi # optional requires BuildRequires: jsse BuildRequires: junit @@ -46,6 +45,7 @@ Requires: jakarta-commons-logging Requires: jakarta-commons-httpclient Requires: javamail +Requires: jaxp_parser_impl Requires: log4j Requires: wsdl4j @@ -87,6 +87,7 @@ %patch1 -p1 -b .orig %patch2 -p1 -b .orig %patch3 -p1 -b .orig +%patch4 # Remove provided binaries find . -name "*.jar" -exec rm -f {} \; @@ -98,7 +99,6 @@ [ -z "$JAVA_HOME" ] && export JAVA_HOME=%{_jvmdir}/java CLASSPATH=$(build-classpath wsdl4j jakarta-commons-discovery jakarta-commons-httpclient jakarta-commons-logging log4j jaf javamail/mailapi servletapi5) -CLASSPATH=$CLASSPATH:$(build-classpath jacorb/jacorb jonathan-rmi) export CLASSPATH=$CLASSPATH:$(build-classpath oro junit jimi xml-security jsse httpunit jms castor 2>/dev/null) export OPT_JAR_LIST="ant/ant-nodeps" @@ -175,6 +175,11 @@ %doc docs/* %changelog +* Wed Mar 1 2006 Archit Shah 0:1.2.1-2jpp_1fc +- remove unnecessary build dependencies on jacorb and jonathan-rmi +- include fix to Axis bug 2142 +- merge from upstream 2jpp + * Fri Dec 09 2005 Jesse Keating - rebuilt From fedora-cvs-commits at redhat.com Wed Mar 1 20:16:44 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 1 Mar 2006 15:16:44 -0500 Subject: rpms/firstboot/devel .cvsignore, 1.47, 1.48 firstboot.spec, 1.66, 1.67 sources, 1.63, 1.64 Message-ID: <200603012016.k21KGiUS019156@cvs.devel.redhat.com> Author: clumens Update of /cvs/dist/rpms/firstboot/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv18347 Modified Files: .cvsignore firstboot.spec sources Log Message: Bump version. Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/firstboot/devel/.cvsignore,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- .cvsignore 8 Feb 2006 19:27:38 -0000 1.47 +++ .cvsignore 1 Mar 2006 20:16:41 -0000 1.48 @@ -19,3 +19,4 @@ firstboot-1.4.2.tar.bz2 firstboot-1.4.3.tar.bz2 firstboot-1.4.4.tar.bz2 +firstboot-1.4.5.tar.bz2 Index: firstboot.spec =================================================================== RCS file: /cvs/dist/rpms/firstboot/devel/firstboot.spec,v retrieving revision 1.66 retrieving revision 1.67 diff -u -r1.66 -r1.67 --- firstboot.spec 8 Feb 2006 19:27:38 -0000 1.66 +++ firstboot.spec 1 Mar 2006 20:16:41 -0000 1.67 @@ -1,6 +1,6 @@ Summary: Initial system configuration utility Name: firstboot -Version: 1.4.4 +Version: 1.4.5 Release: 1 URL: http://fedora.redhat.com/projects/config-tools/ License: GPL @@ -14,6 +14,7 @@ BuildPreReq: gettext Requires: pygtk2 Requires: metacity +Requires: rhpl Requires: rhpxl Requires: system-config-display Requires: system-config-language @@ -108,6 +109,11 @@ %changelog +* Wed Mar 01 2006 Chris Lumens 1.4.5-1 +- Run if RUN_FIRSTBOOT != "NO" (#180520). +- Don't let dialog windows hide behind the main window. +- Remove timeout waiting for server to start. + * Wed Feb 08 2006 Chris Lumens 1.4.4-1 - Get rid of chkconfig --off calls. - Smarter checking for if we need to reboot or not. Index: sources =================================================================== RCS file: /cvs/dist/rpms/firstboot/devel/sources,v retrieving revision 1.63 retrieving revision 1.64 diff -u -r1.63 -r1.64 --- sources 8 Feb 2006 19:27:38 -0000 1.63 +++ sources 1 Mar 2006 20:16:41 -0000 1.64 @@ -1 +1 @@ -239772c08b12679666a1af3ced0c266c firstboot-1.4.4.tar.bz2 +0042267b9f90bba0ed6f91a27bdc2bbe firstboot-1.4.5.tar.bz2 From fedora-cvs-commits at redhat.com Wed Mar 1 20:17:14 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 1 Mar 2006 15:17:14 -0500 Subject: rpms/cman/devel .cvsignore, 1.4, 1.5 cman.spec, 1.24, 1.25 sources, 1.8, 1.9 Message-ID: <200603012017.k21KHEbQ022410@cvs.devel.redhat.com> Author: cfeist Update of /cvs/dist/rpms/cman/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv21982 Modified Files: .cvsignore cman.spec sources Log Message: New upstream sources. Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/cman/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 22 Oct 2004 21:19:04 -0000 1.4 +++ .cvsignore 1 Mar 2006 20:17:12 -0000 1.5 @@ -1 +1 @@ -cman-1.0-pre3.tar.gz +cman-1.0.5.tar.gz Index: cman.spec =================================================================== RCS file: /cvs/dist/rpms/cman/devel/cman.spec,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- cman.spec 7 Feb 2006 11:14:51 -0000 1.24 +++ cman.spec 1 Mar 2006 20:17:12 -0000 1.25 @@ -11,8 +11,8 @@ ############################################################################### Name: cman -Version: 1.0.4 -Release: 0.FC5.1.1 +Version: 1.0.5 +Release: 0.FC5.0 License: GPL Group: System Environment/Base Summary: cman - The Cluster Manager @@ -81,6 +81,9 @@ %{_libdir}/libcman.a %changelog +* Wed Mar 1 2006 Chris Feist +- Rebuilt w/ new upstream sources + * Tue Feb 07 2006 Jesse Keating - 1.0.4-0.FC5.1.1 - rebuilt for new gcc4.1 snapshot and glibc changes Index: sources =================================================================== RCS file: /cvs/dist/rpms/cman/devel/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 16 Dec 2005 22:23:24 -0000 1.8 +++ sources 1 Mar 2006 20:17:12 -0000 1.9 @@ -1 +1 @@ -dcc302d0679b3e581d8d0880d989d3d7 cman-1.0.4.tar.gz +74f3876248cedccc76d32597be8cf0d4 cman-1.0.5.tar.gz From fedora-cvs-commits at redhat.com Wed Mar 1 20:51:06 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 1 Mar 2006 15:51:06 -0500 Subject: rpms/kernel/devel linux-2.6-debug-pm-pci.patch, NONE, 1.1 kernel-2.6.spec, 1.2002, 1.2003 Message-ID: <200603012051.k21Kp6YH016856@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv16606 Modified Files: kernel-2.6.spec Added Files: linux-2.6-debug-pm-pci.patch Log Message: tweak PCI config space restore to not do so much, and log what it is doing for further investigation. linux-2.6-debug-pm-pci.patch: pci.c | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) --- NEW FILE linux-2.6-debug-pm-pci.patch --- --- linux-2.6.15.noarch/drivers/pci/pci.c~ 2006-03-01 15:41:00.000000000 -0500 +++ linux-2.6.15.noarch/drivers/pci/pci.c 2006-03-01 15:47:37.000000000 -0500 @@ -454,9 +454,17 @@ int pci_restore_state(struct pci_dev *dev) { int i; + int val; - for (i = 0; i < 16; i++) - pci_write_config_dword(dev,i * 4, dev->saved_config_space[i]); + for (i = 0; i < 16; i++) { + pci_read_config_dword(dev, i * 4, &val); + if (val != dev->saved_config_space[i]) { + printk (KERN_DEBUG "PM: Writing back config space on device %s at offset %x. (Was %x, writing %x)\n", + pci_name(dev), i, + val, (int) dev->saved_config_space[i]); + pci_write_config_dword(dev,i * 4, dev->saved_config_space[i]); + } + } return 0; } Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.2002 retrieving revision 1.2003 diff -u -r1.2002 -r1.2003 --- kernel-2.6.spec 1 Mar 2006 20:07:16 -0000 1.2002 +++ kernel-2.6.spec 1 Mar 2006 20:51:03 -0000 1.2003 @@ -312,6 +312,7 @@ Patch1031: linux-2.6-debug-periodic-slab-check.patch Patch1032: linux-2.6-debug-boot-delay.patch Patch1033: linux-2.6-debug-must_check.patch +Patch1034: linux-2.6-debug-pm-pci.patch # Restrict /dev/mem usage. Patch1050: linux-2.6-devmem.patch @@ -840,6 +841,7 @@ %patch1031 -p1 %patch1032 -p1 %patch1033 -p1 +%patch1034 -p1 # # Make /dev/mem a need-to-know function From fedora-cvs-commits at redhat.com Wed Mar 1 21:07:12 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 1 Mar 2006 16:07:12 -0500 Subject: rpms/kernel/devel patch-2.6.16-rc5-git4.bz2.sign, NONE, 1.1 .cvsignore, 1.367, 1.368 patch-2.6.16-rc5-git3.bz2.sign, 1.1, NONE Message-ID: <200603012107.k21L7CSq020907@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv20884 Modified Files: .cvsignore Added Files: patch-2.6.16-rc5-git4.bz2.sign Removed Files: patch-2.6.16-rc5-git3.bz2.sign Log Message: signs --- NEW FILE patch-2.6.16-rc5-git4.bz2.sign --- -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.2.1 (GNU/Linux) Comment: See http://www.kernel.org/signature.html for info iD8DBQBEBUbryGugalF9Dw4RAsrFAJ0XNnQ4O4MnmyMGyjIXWeaOuqxKLgCfazxe /toKMp813e0N0K/74QhDXjQ= =pfRK -----END PGP SIGNATURE----- Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v retrieving revision 1.367 retrieving revision 1.368 diff -u -r1.367 -r1.368 --- .cvsignore 1 Mar 2006 16:54:11 -0000 1.367 +++ .cvsignore 1 Mar 2006 21:06:56 -0000 1.368 @@ -4,5 +4,4 @@ linux-2.6.15.tar.bz2 xen-20060208.tar.bz2 patch-2.6.16-rc5.bz2 -patch-2.6.16-rc5-git3.bz2 patch-2.6.16-rc5-git4.bz2 --- patch-2.6.16-rc5-git3.bz2.sign DELETED --- From fedora-cvs-commits at redhat.com Wed Mar 1 21:07:23 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 1 Mar 2006 16:07:23 -0500 Subject: rpms/rhpl/devel .cvsignore, 1.57, 1.58 rhpl.spec, 1.69, 1.70 sources, 1.62, 1.63 Message-ID: <200603012107.k21L7LMH020964@cvs.devel.redhat.com> Author: dcantrel Update of /cvs/dist/rpms/rhpl/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv20922 Modified Files: .cvsignore rhpl.spec sources Log Message: Bump version. Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/rhpl/devel/.cvsignore,v retrieving revision 1.57 retrieving revision 1.58 diff -u -r1.57 -r1.58 --- .cvsignore 24 Feb 2006 22:47:03 -0000 1.57 +++ .cvsignore 1 Mar 2006 21:07:15 -0000 1.58 @@ -5,3 +5,4 @@ rhpl-0.181.tar.gz rhpl-0.182.tar.gz rhpl-0.183.tar.gz +rhpl-0.184.tar.gz Index: rhpl.spec =================================================================== RCS file: /cvs/dist/rpms/rhpl/devel/rhpl.spec,v retrieving revision 1.69 retrieving revision 1.70 diff -u -r1.69 -r1.70 --- rhpl.spec 24 Feb 2006 22:47:03 -0000 1.69 +++ rhpl.spec 1 Mar 2006 21:07:16 -0000 1.70 @@ -1,6 +1,6 @@ Summary: Library of python code used by programs in Red Hat Linux Name: rhpl -Version: 0.183 +Version: 0.184 Release: 1 Source0: %{name}-%{version}.tar.gz License: GPL @@ -39,6 +39,9 @@ %{_libdir}/python?.?/site-packages/rhpl %changelog +* Wed Mar 01 2006 David Cantrell 0.184-1 +- Use ca(fr) without fr-legacy variant for Canadian French (#182007). + * Fri Feb 24 2006 Chris Lumens 0.183-1 - Fix keyboard layout switching (#173267). Index: sources =================================================================== RCS file: /cvs/dist/rpms/rhpl/devel/sources,v retrieving revision 1.62 retrieving revision 1.63 diff -u -r1.62 -r1.63 --- sources 24 Feb 2006 22:47:03 -0000 1.62 +++ sources 1 Mar 2006 21:07:16 -0000 1.63 @@ -1 +1 @@ -e93c6096585c1ab92c639734eeaf6533 rhpl-0.183.tar.gz +bdb742202575be09a2c6ab6d6ed8e43f rhpl-0.184.tar.gz From fedora-cvs-commits at redhat.com Wed Mar 1 21:13:09 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 1 Mar 2006 16:13:09 -0500 Subject: rpms/glib-java/devel .cvsignore, 1.7, 1.8 glib-java.spec, 1.26, 1.27 sources, 1.7, 1.8 Message-ID: <200603012113.k21LD9No023242@cvs.devel.redhat.com> Author: ajocksch Update of /cvs/dist/rpms/glib-java/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv22925 Modified Files: .cvsignore glib-java.spec sources Log Message: * Wed Mar 01 2006 Adam Jocksch - 0.2.3.0.20060301.rh1-1 - Imported new tarball to address bg #183538. Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/glib-java/devel/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 30 Jan 2006 16:12:13 -0000 1.7 +++ .cvsignore 1 Mar 2006 21:13:05 -0000 1.8 @@ -1,2 +1,3 @@ glib-java-0.2.2.tar.gz glib-java-0.2.3.tar.gz +glib-java-0.2.3.0.20060301.rh1.tar.gz Index: glib-java.spec =================================================================== RCS file: /cvs/dist/rpms/glib-java/devel/glib-java.spec,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- glib-java.spec 11 Feb 2006 03:12:05 -0000 1.26 +++ glib-java.spec 1 Mar 2006 21:13:05 -0000 1.27 @@ -14,8 +14,8 @@ %define name_base glib-java Summary: Base Library for the Java-GNOME libraries Name: %{java_pkg_prefix}%{name_base} -Version: 0.2.3 -Release: 1.2 +Version: 0.2.3.0.20060301.rh1 +Release: 1 URL: http://java-gnome.sourceforge.net Source0: %{name_base}-%{version}.tar.gz License: LGPL @@ -117,6 +117,9 @@ %{_datadir}/java/*.zip %changelog +* Wed Mar 01 2006 Adam Jocksch - 0.2.3.0.20060301.rh1-1 +- Imported new tarball to address bg #183538. + * Fri Feb 10 2006 Jesse Keating - 0.2.3-1.2 - bump again for double-long bug on ppc(64) Index: sources =================================================================== RCS file: /cvs/dist/rpms/glib-java/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 30 Jan 2006 16:12:13 -0000 1.7 +++ sources 1 Mar 2006 21:13:05 -0000 1.8 @@ -1,2 +1 @@ -46052b2c2aed6698275c54b7bd51cb38 glib-java-0.2.2.tar.gz -dabe425330fe2474d5e28afc08835a57 glib-java-0.2.3.tar.gz +6b81b808b4fb5e4fca9831277e607697 glib-java-0.2.3.0.20060301.rh1.tar.gz From fedora-cvs-commits at redhat.com Wed Mar 1 21:14:50 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 1 Mar 2006 16:14:50 -0500 Subject: rpms/frysk/devel .cvsignore, 1.10, 1.11 frysk.spec, 1.29, 1.30 sources, 1.10, 1.11 Message-ID: <200603012114.k21LEo9Q024059@cvs.devel.redhat.com> Author: cagney Update of /cvs/dist/rpms/frysk/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv23966 Modified Files: .cvsignore frysk.spec sources Log Message: * Wed Mar 01 2006 Andrew Cagney 0.0.1.2006.02.19.rh2-0.FC5.0 - Import frysk 0.0.1.2006.02.19.rh2; works around bug #180637. - Enable x86_64; fix bug #183538. Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/frysk/devel/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 20 Feb 2006 17:50:41 -0000 1.10 +++ .cvsignore 1 Mar 2006 21:14:47 -0000 1.11 @@ -1 +1 @@ -frysk-0.0.1.2006.02.19.rh1.tar.bz2 +frysk-0.0.1.2006.02.19.rh2.tar.bz2 Index: frysk.spec =================================================================== RCS file: /cvs/dist/rpms/frysk/devel/frysk.spec,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- frysk.spec 21 Feb 2006 13:01:22 -0000 1.29 +++ frysk.spec 1 Mar 2006 21:14:47 -0000 1.30 @@ -1,7 +1,7 @@ Summary: Frysk execution analysis tool Name: frysk -Version: 0.0.1.2006.02.19.rh1 -Release: 0.FC5.1 +Version: 0.0.1.2006.02.19.rh2 +Release: 0.FC5.0 License: GPL Group: Development/System URL: http://sourceware.org/frysk @@ -26,7 +26,7 @@ BuildRequires: xmlto # We can only build on i386 for now -ExclusiveArch: i386 +ExclusiveArch: %{ix86} x86_64 %description Frysk is an execution-analysis technology implemented using native Java and C++. @@ -87,6 +87,10 @@ %{_libexecdir}/frysk/* %changelog +* Wed Mar 01 2006 Andrew Cagney 0.0.1.2006.02.19.rh2-0.FC5.0 +- Import frysk 0.0.1.2006.02.19.rh2; works around bug #180637. +- Enable x86_64; fix bug #183538. + * Tue Feb 21 2006 Karsten Hopp 0.0.1.2006.02.19.rh1-0.FC5.1 - BuildRequires: xmlto Index: sources =================================================================== RCS file: /cvs/dist/rpms/frysk/devel/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 20 Feb 2006 17:50:41 -0000 1.10 +++ sources 1 Mar 2006 21:14:47 -0000 1.11 @@ -1 +1 @@ -b00e05b17b5d255411e726a8d23f20d1 frysk-0.0.1.2006.02.19.rh1.tar.bz2 +01dba74491b570ebbbfa7cc41ba9fe06 frysk-0.0.1.2006.02.19.rh2.tar.bz2 From fedora-cvs-commits at redhat.com Wed Mar 1 21:19:37 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 1 Mar 2006 16:19:37 -0500 Subject: rpms/cairo-java/devel .cvsignore, 1.5, 1.6 cairo-java.spec, 1.23, 1.24 sources, 1.7, 1.8 Message-ID: <200603012119.k21LJbcU006035@cvs.devel.redhat.com> Author: ajocksch Update of /cvs/dist/rpms/cairo-java/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv5819 Modified Files: .cvsignore cairo-java.spec sources Log Message: * Wed Mar 01 2006 Adam Jocksch - 1.0.2.0.20060301.rh1-0 - Imported new tarball to address bg #183538. Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/cairo-java/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 22 Dec 2005 22:16:29 -0000 1.5 +++ .cvsignore 1 Mar 2006 21:19:34 -0000 1.6 @@ -1 +1,2 @@ cairo-java-1.0.2.tar.gz +cairo-java-1.0.2.0.20060301.rh1.tar.gz Index: cairo-java.spec =================================================================== RCS file: /cvs/dist/rpms/cairo-java/devel/cairo-java.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- cairo-java.spec 11 Feb 2006 02:13:52 -0000 1.23 +++ cairo-java.spec 1 Mar 2006 21:19:34 -0000 1.24 @@ -11,8 +11,8 @@ %{!?java_pkg_prefix: %define java_pkg_prefix %{nil}} %define name_base cairo-java -%define version 1.0.2 -%define release 0.2 +%define version 1.0.2.0.20060301.rh1 +%define release 0 # exclude while s390x is borked on beehive #ExcludeArch: s390x @@ -113,6 +113,9 @@ %changelog +* Wed Mar 01 2006 Adam Jocksch - 1.0.2.0.20060301.rh1-0 +- Imported new tarball to address bg #183538. + * Fri Feb 10 2006 Jesse Keating - 1.0.2-0.2 - bump again for double-long bug on ppc(64) Index: sources =================================================================== RCS file: /cvs/dist/rpms/cairo-java/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 22 Dec 2005 22:16:29 -0000 1.7 +++ sources 1 Mar 2006 21:19:34 -0000 1.8 @@ -1 +1 @@ -cc2c90fec19cdcafd177463e85595120 cairo-java-1.0.2.tar.gz +0840da879f8a6fa4437023fec1d95635 cairo-java-1.0.2.0.20060301.rh1.tar.gz From fedora-cvs-commits at redhat.com Wed Mar 1 21:21:12 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 1 Mar 2006 16:21:12 -0500 Subject: rpms/frysk/devel frysk.spec,1.30,1.31 Message-ID: <200603012121.k21LLCbX006800@cvs.devel.redhat.com> Author: cagney Update of /cvs/dist/rpms/frysk/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv6612 Modified Files: frysk.spec Log Message: * Wed Mar 01 2006 Andrew Cagney 0.0.1.2006.02.19.rh2-0.FC5.0 - Enable x86_64, update *-java BuildRequires; fix bug #183538. Index: frysk.spec =================================================================== RCS file: /cvs/dist/rpms/frysk/devel/frysk.spec,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- frysk.spec 1 Mar 2006 21:14:47 -0000 1.30 +++ frysk.spec 1 Mar 2006 21:21:09 -0000 1.31 @@ -9,16 +9,16 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-root -Requires: libgtk-java >= 2.8.0 -Requires: libglade-java >= 2.12.0 +Requires: libgtk-java >= 2.8.3 +Requires: libglade-java >= 2.12.2 Requires: libvte-java >= 0.11.11 BuildRequires: junit >= 3.8.1 BuildRequires: antlr >= 2.7.4 BuildRequires: transfig >= 3.2.0 BuildRequires: jdom >= 1.0 -BuildRequires: libgtk-java-devel >= 2.8.0 -BuildRequires: libglade-java-devel >= 2.12.0 -BuildRequires: cairo-java-devel >= 1.0.0 +BuildRequires: libgtk-java-devel >= 2.8.3 +BuildRequires: libglade-java-devel >= 2.12.2 +BuildRequires: cairo-java-devel >= 1.0.2 BuildRequires: cairo-devel >= 1.0.0 BuildRequires: gtk2-devel >= 2.8.0 BuildRequires: libvte-java-devel >= 0.11.11 @@ -89,7 +89,7 @@ %changelog * Wed Mar 01 2006 Andrew Cagney 0.0.1.2006.02.19.rh2-0.FC5.0 - Import frysk 0.0.1.2006.02.19.rh2; works around bug #180637. -- Enable x86_64; fix bug #183538. +- Enable x86_64, update *-java BuildRequires; fix bug #183538. * Tue Feb 21 2006 Karsten Hopp 0.0.1.2006.02.19.rh1-0.FC5.1 - BuildRequires: xmlto From fedora-cvs-commits at redhat.com Wed Mar 1 21:24:41 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 1 Mar 2006 16:24:41 -0500 Subject: rpms/cairo-java/devel cairo-java.spec,1.24,1.25 Message-ID: <200603012124.k21LOfcW008450@cvs.devel.redhat.com> Author: ajocksch Update of /cvs/dist/rpms/cairo-java/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv8028 Modified Files: cairo-java.spec Log Message: * Wed Mar 01 2006 Adam Jocksch - 1.0.2.0.20060301.rh1-0 - Increased version of required glib-java to 0.2.3.0.20060301.rh1. Index: cairo-java.spec =================================================================== RCS file: /cvs/dist/rpms/cairo-java/devel/cairo-java.spec,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- cairo-java.spec 1 Mar 2006 21:19:34 -0000 1.24 +++ cairo-java.spec 1 Mar 2006 21:24:39 -0000 1.25 @@ -28,7 +28,7 @@ Requires: %{java_pkg_prefix}gtk2 >= 2.8.0 Requires: %{java_pkg_prefix}cairo >= 1.0.0 -Requires: %{java_pkg_prefix}glib-java >= 0.2 +Requires: %{java_pkg_prefix}glib-java >= 0.2.3.0.20060301.rh1 BuildRequires: %{java_pkg_prefix}glib-java >= 0.2 BuildRequires: %{c_pkg_prefix}gtk2-devel >= 2.8.0, gcc-java >= 3.3.3 BuildRequires: docbook-utils @@ -114,6 +114,7 @@ %changelog * Wed Mar 01 2006 Adam Jocksch - 1.0.2.0.20060301.rh1-0 +- Increased version of required glib-java to 0.2.3.0.20060301.rh1. - Imported new tarball to address bg #183538. * Fri Feb 10 2006 Jesse Keating - 1.0.2-0.2 From fedora-cvs-commits at redhat.com Wed Mar 1 21:35:20 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 1 Mar 2006 16:35:20 -0500 Subject: rpms/libgtk-java/devel .cvsignore, 1.16, 1.17 libgtk-java.spec, 1.42, 1.43 sources, 1.16, 1.17 Message-ID: <200603012135.k21LZKWk010903@cvs.devel.redhat.com> Author: ajocksch Update of /cvs/dist/rpms/libgtk-java/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv10826 Modified Files: .cvsignore libgtk-java.spec sources Log Message: * Web Mar 01 2006 Adam Jocksch - 2.8.3.0.20060301.rh1-0 - Imported new tarball to address bg #183538, updated dependancies. Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/libgtk-java/devel/.cvsignore,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- .cvsignore 30 Jan 2006 16:19:34 -0000 1.16 +++ .cvsignore 1 Mar 2006 21:35:17 -0000 1.17 @@ -1,2 +1,3 @@ libgtk-java-2.8.2.tar.gz libgtk-java-2.8.3.tar.gz +libgtk-java-2.8.3.0.20060301.rh1.tar.gz Index: libgtk-java.spec =================================================================== RCS file: /cvs/dist/rpms/libgtk-java/devel/libgtk-java.spec,v retrieving revision 1.42 retrieving revision 1.43 diff -u -r1.42 -r1.43 --- libgtk-java.spec 11 Feb 2006 04:07:04 -0000 1.42 +++ libgtk-java.spec 1 Mar 2006 21:35:17 -0000 1.43 @@ -12,8 +12,8 @@ %define name_base libgtk-java -%define version 2.8.3 -%define release 1.2 +%define version 2.8.3.0.20060301.rh1 +%define release 0 Summary: Java bindings for GTK+ @@ -28,8 +28,8 @@ BuildRoot: %{_tmppath}/%{name_base}-%{version}-root Requires: %{c_pkg_prefix}gtk2 >= 2.8.0 -Requires: %{java_pkg_prefix}cairo-java >= 1.0.0 -Requires: %{java_pkg_prefix}glib-java >= 0.2.3 +Requires: %{java_pkg_prefix}cairo-java >= 1.0.2.0.20060301.rh1 +Requires: %{java_pkg_prefix}glib-java >= 0.2.3.0.20060301.rh1 BuildRequires: %{java_pkg_prefix}cairo-java-devel >= 1.0.0 BuildRequires: %{java_pkg_prefix}glib-java-devel >= 0.2.3 BuildRequires: %{c_pkg_prefix}gtk2-devel >= 2.8.0 @@ -123,6 +123,9 @@ %changelog +* Web Mar 01 2006 Adam Jocksch - 2.8.3.0.20060301.rh1-0 +- Imported new tarball to address bg #183538, updated dependancies. + * Fri Feb 10 2006 Jesse Keating - 2.8.3-1.2 - bump again for double-long bug on ppc(64) Index: sources =================================================================== RCS file: /cvs/dist/rpms/libgtk-java/devel/sources,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- sources 30 Jan 2006 16:19:34 -0000 1.16 +++ sources 1 Mar 2006 21:35:17 -0000 1.17 @@ -1,2 +1 @@ -76e5048d11a71060a7cc08df8ef7018e libgtk-java-2.8.2.tar.gz -0bcf838a3220fdfa685c55c22d664874 libgtk-java-2.8.3.tar.gz +629c1c2b5f8398154a04a081539ad21f libgtk-java-2.8.3.0.20060301.rh1.tar.gz From fedora-cvs-commits at redhat.com Wed Mar 1 21:36:27 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 1 Mar 2006 16:36:27 -0500 Subject: rpms/libgtk-java/devel libgtk-java.spec,1.43,1.44 Message-ID: <200603012136.k21LaRJG010971@cvs.devel.redhat.com> Author: ajocksch Update of /cvs/dist/rpms/libgtk-java/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv10951 Modified Files: libgtk-java.spec Log Message: Fixed typo in specfile changelog. Index: libgtk-java.spec =================================================================== RCS file: /cvs/dist/rpms/libgtk-java/devel/libgtk-java.spec,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- libgtk-java.spec 1 Mar 2006 21:35:17 -0000 1.43 +++ libgtk-java.spec 1 Mar 2006 21:36:23 -0000 1.44 @@ -123,7 +123,7 @@ %changelog -* Web Mar 01 2006 Adam Jocksch - 2.8.3.0.20060301.rh1-0 +* Wed Mar 01 2006 Adam Jocksch - 2.8.3.0.20060301.rh1-0 - Imported new tarball to address bg #183538, updated dependancies. * Fri Feb 10 2006 Jesse Keating - 2.8.3-1.2 From fedora-cvs-commits at redhat.com Wed Mar 1 21:41:23 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 1 Mar 2006 16:41:23 -0500 Subject: rpms/libgnome-java/devel .cvsignore, 1.10, 1.11 libgnome-java.spec, 1.29, 1.30 sources, 1.11, 1.12 Message-ID: <200603012141.k21LfNLx005307@cvs.devel.redhat.com> Author: ajocksch Update of /cvs/dist/rpms/libgnome-java/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv5294 Modified Files: .cvsignore libgnome-java.spec sources Log Message: * Wed Mar 01 2006 Adam Jocksch - 2.12.1.0.20060301.rh1-0 - Imported new tarball to address bug 183538, updated dependancies. Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/libgnome-java/devel/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 26 Oct 2005 14:56:26 -0000 1.10 +++ .cvsignore 1 Mar 2006 21:41:20 -0000 1.11 @@ -1 +1,2 @@ libgnome-java-2.12.1.tar.gz +libgnome-java-2.12.1.0.20060301.rh1.tar.gz Index: libgnome-java.spec =================================================================== RCS file: /cvs/dist/rpms/libgnome-java/devel/libgnome-java.spec,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- libgnome-java.spec 11 Feb 2006 03:58:28 -0000 1.29 +++ libgnome-java.spec 1 Mar 2006 21:41:20 -0000 1.30 @@ -11,8 +11,8 @@ %{!?java_pkg_prefix: %define java_pkg_prefix %{nil}} %define name_base libgnome-java -%define version 2.12.1 -%define release 3.2 +%define version 2.12.1.0.20060301.rh1 +%define release 0 Summary: Java bindings for libgnome Name: %{java_pkg_prefix}%{name_base} @@ -25,8 +25,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-root Requires: libgnome >= 2.10.0 -Requires: libgtk-java >= 2.8.0 -Requires: glib-java >= 0.2 +Requires: libgtk-java >= 2.8.3.0.20060301.rh1 +Requires: glib-java >= 0.2.3.0.20060301.rh1 BuildRequires: libgnome-devel >= 2.10.0, gcc-java >= 3.3.3, docbook-utils BuildRequires: libgtk-java-devel >= 2.8.0, java-devel >= 1.4.2 BuildRequires: glib-java-devel >= 0.2 @@ -108,6 +108,9 @@ %{_datadir}/java/*.zip %changelog +* Wed Mar 01 2006 Adam Jocksch - 2.12.1.0.20060301.rh1-0 +- Imported new tarball to address bug 183538, updated dependancies. + * Fri Feb 10 2006 Jesse Keating - 2.12.1-3.2 - bump again for double-long bug on ppc(64) Index: sources =================================================================== RCS file: /cvs/dist/rpms/libgnome-java/devel/sources,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- sources 26 Oct 2005 14:56:26 -0000 1.11 +++ sources 1 Mar 2006 21:41:20 -0000 1.12 @@ -1 +1 @@ -30ec2b1404929aabe650e868b5b08ca7 libgnome-java-2.12.1.tar.gz +8bdee0a6e5c28dd18b3eb38cdc8a356a libgnome-java-2.12.1.0.20060301.rh1.tar.gz From fedora-cvs-commits at redhat.com Wed Mar 1 21:51:37 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 1 Mar 2006 16:51:37 -0500 Subject: rpms/libglade-java/devel .cvsignore, 1.11, 1.12 libglade-java.spec, 1.29, 1.30 sources, 1.12, 1.13 Message-ID: <200603012151.k21LpbbR017914@cvs.devel.redhat.com> Author: ajocksch Update of /cvs/dist/rpms/libglade-java/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv17887 Modified Files: .cvsignore libglade-java.spec sources Log Message: * Wed Mar 01 2006 Adam Jocksch - 2.12.2.0.20060301.rh1-0 - Imported new tarball to address bg #183538, updated dependancies. Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/libglade-java/devel/.cvsignore,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- .cvsignore 30 Jan 2006 16:57:35 -0000 1.11 +++ .cvsignore 1 Mar 2006 21:51:35 -0000 1.12 @@ -1,2 +1,3 @@ libglade-java-2.12.1.tar.gz libglade-java-2.12.2.tar.gz +libglade-java-2.12.2.0.20060301.rh1.tar.gz Index: libglade-java.spec =================================================================== RCS file: /cvs/dist/rpms/libglade-java/devel/libglade-java.spec,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- libglade-java.spec 11 Feb 2006 03:57:23 -0000 1.29 +++ libglade-java.spec 1 Mar 2006 21:51:35 -0000 1.30 @@ -11,8 +11,8 @@ %{!?java_pkg_prefix: %define java_pkg_prefix %{nil}} %define name_base libglade-java -%define version 2.12.2 -%define release 1.2 +%define version 2.12.2.0.20060301.rh1 +%define release 0 Summary: Java bindings for libglade Name: %{java_pkg_prefix}%{name_base} @@ -25,8 +25,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-root Requires: libglade2 >= 2.5.0 -Requires: %{java_pkg_prefix}libgtk-java >= 2.8.3 -Requires: %{java_pkg_prefix}libgnome-java >= 2.12.0 +Requires: %{java_pkg_prefix}libgtk-java >= 2.8.3.0.200602301.rh1 +Requires: %{java_pkg_prefix}libgnome-java >= 2.12.1.0.20060301.rh1 BuildRequires: %{java_pkg_prefix}libgtk-java-devel >= 2.8.3 BuildRequires: %{java_pkg_prefix}libgnome-java-devel >= 2.12.0 BuildRequires: libglade2-devel >= 2.5.0, gcc-java >= 3.3.3 @@ -113,6 +113,9 @@ %{_datadir}/java/*.zip %changelog +* Wed Mar 01 2006 Adam Jocksch - 2.12.2.0.20060301.rh1-0 +- Imported new tarball to address bg #183538, updated dependancies. + * Fri Feb 10 2006 Jesse Keating - 2.12.2-1.2 - bump again for double-long bug on ppc(64) Index: sources =================================================================== RCS file: /cvs/dist/rpms/libglade-java/devel/sources,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- sources 30 Jan 2006 16:57:35 -0000 1.12 +++ sources 1 Mar 2006 21:51:35 -0000 1.13 @@ -1,2 +1 @@ -44a223d1c6d66f15288360bbd2ed0c22 libglade-java-2.12.1.tar.gz -a0b11f2b7ed7c9f998e860212ed3a400 libglade-java-2.12.2.tar.gz +b396f44662ed22cde1f5a22220e663c0 libglade-java-2.12.2.0.20060301.rh1.tar.gz From fedora-cvs-commits at redhat.com Wed Mar 1 21:57:09 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 1 Mar 2006 16:57:09 -0500 Subject: rpms/comps-extras/devel .cvsignore, 1.11, 1.12 comps-extras.spec, 1.16, 1.17 sources, 1.15, 1.16 Message-ID: <200603012157.k21Lv9Yi027447@cvs.devel.redhat.com> Author: notting Update of /cvs/dist/rpms/comps-extras/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv27406/devel Modified Files: .cvsignore comps-extras.spec sources Log Message: auto-import comps-extras-11-1 on branch devel from comps-extras-11-1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/comps-extras/devel/.cvsignore,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- .cvsignore 5 May 2005 18:40:58 -0000 1.11 +++ .cvsignore 1 Mar 2006 21:57:07 -0000 1.12 @@ -1 +1 @@ -comps-extras-10.3.tar.gz +comps-extras-11.tar.gz Index: comps-extras.spec =================================================================== RCS file: /cvs/dist/rpms/comps-extras/devel/comps-extras.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- comps-extras.spec 9 Dec 2005 22:40:04 -0000 1.16 +++ comps-extras.spec 1 Mar 2006 21:57:07 -0000 1.17 @@ -1,7 +1,7 @@ Summary: Images for components and tools for working with the comps file Name: comps-extras -Version: 10.3 -Release: 1.1 +Version: 11 +Release: 1 Source0: %{name}-%{version}.tar.gz License: GPL Group: Applications/System @@ -9,8 +9,7 @@ BuildArch: noarch %description -This package contains images for the components included in Red Hat Linux -as well as some tools for working with the comps file +This package contains images for the components included in Fedora. %prep %setup -q @@ -29,12 +28,13 @@ %files %defattr(-,root,root) %{_datadir}/pixmaps/comps -%{_datadir}/comps-extras %changelog -* Fri Dec 09 2005 Jesse Keating -- rebuilt +* Wed Mar 1 2006 Bill Nottingham - 11-1 +- pirut/anaconda now use 24x24. update sizes +- various additions/removals +- python scripts aren't useful with current repositories, remove them * Thu May 5 2005 Bill Nottingham - 10.3-1 - updated icons () Index: sources =================================================================== RCS file: /cvs/dist/rpms/comps-extras/devel/sources,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- sources 5 May 2005 18:40:58 -0000 1.15 +++ sources 1 Mar 2006 21:57:07 -0000 1.16 @@ -1 +1 @@ -71fdc8b4a76e47150b24725dda2598c7 comps-extras-10.3.tar.gz +0f2ca0221284948d6ed1a8d2b1a5090c comps-extras-11.tar.gz From fedora-cvs-commits at redhat.com Wed Mar 1 21:58:44 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 1 Mar 2006 16:58:44 -0500 Subject: rpms/libvte-java/devel .cvsignore, 1.2, 1.3 libvte-java.spec, 1.10, 1.11 sources, 1.2, 1.3 Message-ID: <200603012158.k21Lwhgi028173@cvs.devel.redhat.com> Author: ajocksch Update of /cvs/dist/rpms/libvte-java/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv27958 Modified Files: .cvsignore libvte-java.spec sources Log Message: * Wed Mar 01 2006 Adam Jocksch - 0.11.11.0.20060301.rh1-0 - Imported new tarball to address bg #183538, updated dependancies. Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/libvte-java/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 10 Nov 2005 19:53:27 -0000 1.2 +++ .cvsignore 1 Mar 2006 21:58:40 -0000 1.3 @@ -1 +1,2 @@ libvte-java-0.11.11.tar.gz +libvte-java-0.11.11.0.20060301.rh1.tar.gz Index: libvte-java.spec =================================================================== RCS file: /cvs/dist/rpms/libvte-java/devel/libvte-java.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- libvte-java.spec 11 Feb 2006 04:15:55 -0000 1.10 +++ libvte-java.spec 1 Mar 2006 21:58:40 -0000 1.11 @@ -1,7 +1,7 @@ Summary: Wrapper library for GNOME VTE Name: libvte-java -Version: 0.11.11 -Release: 8.2 +Version: 0.11.11.0.20060301.rh1 +Release: 1 URL: http://java-gnome.sourceforge.net Source0: %{name}-%{version}.tar.gz License: LGPL @@ -10,8 +10,8 @@ Requires: /sbin/ldconfig -Requires: glib-java >= 0.2 -Requires: libgtk-java >= 2.8.0 +Requires: glib-java >= 0.23.0.20060301.rh1 +Requires: libgtk-java >= 2.8.3.0.20060301.rh1 Requires: vte >= 0.11.10 BuildRequires: java-devel >= 1.4.2, glib-java-devel >= 0.2 BuildRequires: libgtk-java-devel >= 2.8.0 @@ -97,6 +97,9 @@ %{_datadir}/java/*.zip %changelog +* Wed Mar 01 2006 Adam Jocksch - 0.11.11.0.20060301.rh1-0 +- Imported new tarball to address bg #183538, updated dependancies. + * Fri Feb 10 2006 Jesse Keating - 0.11.11-8.2 - bump again for double-long bug on ppc(64) Index: sources =================================================================== RCS file: /cvs/dist/rpms/libvte-java/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 10 Nov 2005 19:53:27 -0000 1.2 +++ sources 1 Mar 2006 21:58:40 -0000 1.3 @@ -1 +1 @@ -a81b9d7ca9a5dfbcbbb7524ca900cf69 libvte-java-0.11.11.tar.gz +69c84e4c712c2fcd7e5c4ea4dbe70c6c libvte-java-0.11.11.0.20060301.rh1.tar.gz From fedora-cvs-commits at redhat.com Wed Mar 1 22:05:54 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 1 Mar 2006 17:05:54 -0500 Subject: rpms/libgconf-java/devel .cvsignore, 1.10, 1.11 libgconf-java.spec, 1.22, 1.23 sources, 1.11, 1.12 Message-ID: <200603012205.k21M5sVY028885@cvs.devel.redhat.com> Author: ajocksch Update of /cvs/dist/rpms/libgconf-java/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv28814 Modified Files: .cvsignore libgconf-java.spec sources Log Message: * Wed Mar 01 2006 Adam Jocksch - 2.12.1.0.20060301.rh1-0 - Imported new tarball to address bg #183538, updated dependancies. Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/libgconf-java/devel/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 26 Oct 2005 15:00:40 -0000 1.10 +++ .cvsignore 1 Mar 2006 22:05:51 -0000 1.11 @@ -1 +1,2 @@ libgconf-java-2.12.1.tar.gz +libgconf-java-2.12.1.0.20060301.rh1.tar.gz Index: libgconf-java.spec =================================================================== RCS file: /cvs/dist/rpms/libgconf-java/devel/libgconf-java.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- libgconf-java.spec 11 Feb 2006 03:56:29 -0000 1.22 +++ libgconf-java.spec 1 Mar 2006 22:05:51 -0000 1.23 @@ -11,8 +11,8 @@ %{!?java_pkg_prefix: %define java_pkg_prefix %{nil}} %define name_base libgconf-java -%define version 2.12.1 -%define release 2.2 +%define version 2.12.1.0.20060301.rh1 +%define release 0 Summary: Java bindings for GConf Name: %{java_pkg_prefix}%{name_base} @@ -25,7 +25,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-root Requires: GConf2 >= 2.11.2 -Requires: %{java_pkg_prefix}libgtk-java >= 2.8.0 +Requires: %{java_pkg_prefix}libgtk-java >= 2.8.3.0.20060301.rh1 BuildRequires: %{java_pkg_prefix}libgtk-java-devel >= 2.8.0 BuildRequires: GConf2-devel >= 2.11.2, gcc-java >= 3.3.3 @@ -106,6 +106,9 @@ %{_datadir}/java/*.zip %changelog +* Wed Mar 01 2006 Adam Jocksch - 2.12.1.0.20060301.rh1-0 +- Imported new tarball to address bg #183538, updated dependancies. + * Fri Feb 10 2006 Jesse Keating - 2.12.1-2.2 - bump again for double-long bug on ppc(64) Index: sources =================================================================== RCS file: /cvs/dist/rpms/libgconf-java/devel/sources,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- sources 26 Oct 2005 15:00:57 -0000 1.11 +++ sources 1 Mar 2006 22:05:51 -0000 1.12 @@ -1 +1 @@ -0b696a7228f78f63fd897e64d1278955 libgconf-java-2.12.1.tar.gz +022ec1400619cd666a418388da41cdfd libgconf-java-2.12.1.0.20060301.rh1.tar.gz From fedora-cvs-commits at redhat.com Wed Mar 1 22:12:56 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 1 Mar 2006 17:12:56 -0500 Subject: rpms/kernel/devel/configs config-xen-generic,1.8.12.1,1.8.12.2 Message-ID: <200603012212.k21MCuox031257@cvs.devel.redhat.com> Author: quintela Update of /cvs/dist/rpms/kernel/devel/configs In directory cvs.devel.redhat.com:/tmp/cvs-serv30902/configs Modified Files: Tag: private-xen-rebased-1971-branch config-xen-generic Log Message: sct rebase 9022 xen Index: config-xen-generic =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/configs/config-xen-generic,v retrieving revision 1.8.12.1 retrieving revision 1.8.12.2 diff -u -r1.8.12.1 -r1.8.12.2 --- config-xen-generic 23 Feb 2006 21:36:18 -0000 1.8.12.1 +++ config-xen-generic 1 Mar 2006 22:12:54 -0000 1.8.12.2 @@ -18,6 +18,7 @@ # CONFIG_XEN_PCIDEV_BE_DEBUG is not set # CONFIG_XEN_PCIDEV_FRONTEND is not set # CONFIG_XEN_PCIDEV_FE_DEBUG is not set +CONFIG_XEN_NETDEV_LOOPBACK=m # # X86 Processor Configuration From fedora-cvs-commits at redhat.com Wed Mar 1 22:12:57 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 1 Mar 2006 17:12:57 -0500 Subject: rpms/kernel/devel/scripts rebase-xen.sh,NONE,1.1.2.1 Message-ID: <200603012212.k21MCvUe031263@cvs.devel.redhat.com> Author: quintela Update of /cvs/dist/rpms/kernel/devel/scripts In directory cvs.devel.redhat.com:/tmp/cvs-serv30902/scripts Added Files: Tag: private-xen-rebased-1971-branch rebase-xen.sh Log Message: sct rebase 9022 xen --- NEW FILE rebase-xen.sh --- #!/bin/bash set -x if [ ! -d linux-2.6.*-xen0 -o ! -d ref-linux-2.6.* ] ; then make prep-kernels || exit 1 fi pushd *xen0 || exit 1 make distclean || exit 1 popd pushd xen || exit 1 make clean popd # # The xen patches include diffs to linux/Makefile which conflict with # our own Makefile changes; exclude these the easy way by making the files # the same in both arms of the diff! # \cp -f *xen0/Makefile ref-linux-2.6.*/Makefile diff -Nru -p --exclude='.*' ref-linux-2.6.* *xen0 > linux-2.6-xen.patch if [ $? -gt 1 ] ; then exit $? fi DATE=`date +%Y%m%d` tar cvf xen-$DATE.tar xen || exit 1 rm -f xen-$DATE.tar.bz2 bzip2 -v9 xen-$DATE.tar || exit 1 set +x ls -l linux-2.6-xen.patch xen-$DATE.tar.bz2 From fedora-cvs-commits at redhat.com Wed Mar 1 22:14:11 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 1 Mar 2006 17:14:11 -0500 Subject: rpms/libglade-java/devel libglade-java.spec,1.30,1.31 Message-ID: <200603012214.k21MEB8Z031544@cvs.devel.redhat.com> Author: ajocksch Update of /cvs/dist/rpms/libglade-java/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv31415 Modified Files: libglade-java.spec Log Message: * Wed Mar 01 2006 Adam Jocksch - 2.12.2.0.20060301.rh1-1 - Bumped release, fixed typo in Requires. Index: libglade-java.spec =================================================================== RCS file: /cvs/dist/rpms/libglade-java/devel/libglade-java.spec,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- libglade-java.spec 1 Mar 2006 21:51:35 -0000 1.30 +++ libglade-java.spec 1 Mar 2006 22:14:05 -0000 1.31 @@ -12,7 +12,7 @@ %define name_base libglade-java %define version 2.12.2.0.20060301.rh1 -%define release 0 +%define release 1 Summary: Java bindings for libglade Name: %{java_pkg_prefix}%{name_base} @@ -25,7 +25,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-root Requires: libglade2 >= 2.5.0 -Requires: %{java_pkg_prefix}libgtk-java >= 2.8.3.0.200602301.rh1 +Requires: %{java_pkg_prefix}libgtk-java >= 2.8.3.0.20060301.rh1 Requires: %{java_pkg_prefix}libgnome-java >= 2.12.1.0.20060301.rh1 BuildRequires: %{java_pkg_prefix}libgtk-java-devel >= 2.8.3 BuildRequires: %{java_pkg_prefix}libgnome-java-devel >= 2.12.0 @@ -113,6 +113,9 @@ %{_datadir}/java/*.zip %changelog +* Wed Mar 01 2006 Adam Jocksch - 2.12.2.0.20060301.rh1-1 +- Bumped release, fixed typo in Requires. + * Wed Mar 01 2006 Adam Jocksch - 2.12.2.0.20060301.rh1-0 - Imported new tarball to address bg #183538, updated dependancies. From fedora-cvs-commits at redhat.com Wed Mar 1 22:12:56 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 1 Mar 2006 17:12:56 -0500 Subject: rpms/kernel/devel linux-2.6-xen-move-vdso-fixmap.patch, NONE, 1.1.2.1 .cvsignore, 1.357.2.1, 1.357.2.2 kernel-2.6.spec, 1.1971.2.12, 1.1971.2.13 linux-2.6-crashdump-common.patch, 1.9.12.1, 1.9.12.2 linux-2.6-execshield-xen.patch, 1.2.12.1, 1.2.12.2 linux-2.6-xen-compile-fixes.patch, 1.1.12.5, 1.1.12.6 linux-2.6-xen.patch, 1.1.46.3, 1.1.46.4 sources, 1.299.2.2, 1.299.2.3 linux-2.6-xen-cpusteal-kernel.patch, 1.2.2.2, NONE linux-2.6-xen_net_read_mac_export.patch, 1.1, NONE Message-ID: <200603012212.k21MCuqm031247@cvs.devel.redhat.com> Author: quintela Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv30902 Modified Files: Tag: private-xen-rebased-1971-branch .cvsignore kernel-2.6.spec linux-2.6-crashdump-common.patch linux-2.6-execshield-xen.patch linux-2.6-xen-compile-fixes.patch linux-2.6-xen.patch sources Added Files: Tag: private-xen-rebased-1971-branch linux-2.6-xen-move-vdso-fixmap.patch Removed Files: Tag: private-xen-rebased-1971-branch linux-2.6-xen-cpusteal-kernel.patch linux-2.6-xen_net_read_mac_export.patch Log Message: sct rebase 9022 xen linux-2.6-xen-move-vdso-fixmap.patch: arch/i386/kernel/asm-offsets.c | 3 - arch/i386/kernel/sysenter.c | 76 ++++++++++++++++++++++++++++++--- arch/i386/mm/pgtable-xen.c | 1 include/asm-i386/a.out.h | 2 include/asm-i386/elf.h | 7 ++- include/asm-i386/mach-xen/asm/fixmap.h | 9 --- include/asm-i386/mach-xen/asm/page.h | 2 7 files changed, 82 insertions(+), 18 deletions(-) --- NEW FILE linux-2.6-xen-move-vdso-fixmap.patch --- # HG changeset patch # User cl349 at firebug.cl.cam.ac.uk # Node ID 822a27d28afeab1ffdf8ca8e8e8a11de5e7c7aec # Parent 875e0e96e574cc8216394b7eb6eaa22474d0f216 Move the gate page (vsyscall) out of the fixmap area into user address space, just below PAGE_OFFSET. From: Gerd Hoffmann Signed-off-by: Christian Limpach diff -r 875e0e96e574 -r 822a27d28afe linux-2.6-xen-sparse/arch/i386/kernel/asm-offsets.c --- a/linux-2.6-xen-sparse/arch/i386/kernel/asm-offsets.c Thu Feb 23 15:22:17 2006 +0000 +++ b/linux-2.6-xen-sparse/arch/i386/kernel/asm-offsets.c Thu Feb 23 15:22:19 2006 +0000 @@ -13,6 +13,7 @@ #include #include #include +#include #define DEFINE(sym, val) \ asm volatile("\n->" #sym " %0 " #val : : "i" (val)) @@ -70,5 +71,5 @@ void foo(void) #endif DEFINE(PAGE_SIZE_asm, PAGE_SIZE); - DEFINE(VSYSCALL_BASE, __fix_to_virt(FIX_VSYSCALL)); + DEFINE(VSYSCALL_BASE, VSYSCALL_BASE); } diff -r 875e0e96e574 -r 822a27d28afe linux-2.6-xen-sparse/arch/i386/kernel/sysenter.c --- a/linux-2.6-xen-sparse/arch/i386/kernel/sysenter.c Thu Feb 23 15:22:17 2006 +0000 +++ b/linux-2.6-xen-sparse/arch/i386/kernel/sysenter.c Thu Feb 23 15:22:19 2006 +0000 @@ -13,6 +13,7 @@ #include #include #include +#include #include #include @@ -47,25 +48,90 @@ void enable_sep_cpu(void) */ extern const char vsyscall_int80_start, vsyscall_int80_end; extern const char vsyscall_sysenter_start, vsyscall_sysenter_end; +static void *syscall_page; int __init sysenter_setup(void) { - void *page = (void *)get_zeroed_page(GFP_ATOMIC); - - __set_fixmap(FIX_VSYSCALL, __pa(page), PAGE_READONLY_EXEC); + syscall_page = (void *)get_zeroed_page(GFP_ATOMIC); #ifdef CONFIG_X86_SYSENTER if (boot_cpu_has(X86_FEATURE_SEP)) { - memcpy(page, + memcpy(syscall_page, &vsyscall_sysenter_start, &vsyscall_sysenter_end - &vsyscall_sysenter_start); return 0; } #endif - memcpy(page, + memcpy(syscall_page, &vsyscall_int80_start, &vsyscall_int80_end - &vsyscall_int80_start); return 0; } + +static struct page* +syscall_nopage(struct vm_area_struct *vma, unsigned long adr, int *type) +{ + struct page *p = virt_to_page(adr - vma->vm_start + syscall_page); + get_page(p); + return p; +} + +/* Prevent VMA merging */ +static void syscall_vma_close(struct vm_area_struct *vma) +{ +} + +static struct vm_operations_struct syscall_vm_ops = { + .close = syscall_vma_close, + .nopage = syscall_nopage, +}; + +/* Setup a VMA at program startup for the vsyscall page */ +int arch_setup_additional_pages(struct linux_binprm *bprm, int exstack) +{ + struct vm_area_struct *vma; + struct mm_struct *mm = current->mm; + int ret; + + vma = kmem_cache_alloc(vm_area_cachep, SLAB_KERNEL); + if (!vma) + return -ENOMEM; + + memset(vma, 0, sizeof(struct vm_area_struct)); + /* Could randomize here */ + vma->vm_start = VSYSCALL_BASE; + vma->vm_end = VSYSCALL_BASE + PAGE_SIZE; + /* MAYWRITE to allow gdb to COW and set breakpoints */ + vma->vm_flags = VM_READ|VM_EXEC|VM_MAYREAD|VM_MAYEXEC|VM_MAYWRITE; + vma->vm_flags |= mm->def_flags; + vma->vm_page_prot = protection_map[vma->vm_flags & 7]; + vma->vm_ops = &syscall_vm_ops; + vma->vm_mm = mm; + + down_write(&mm->mmap_sem); + if ((ret = insert_vm_struct(mm, vma))) { + up_write(&mm->mmap_sem); + kmem_cache_free(vm_area_cachep, vma); + return ret; + } + mm->total_vm++; + up_write(&mm->mmap_sem); + return 0; +} + +struct vm_area_struct *get_gate_vma(struct task_struct *tsk) +{ + return NULL; +} + +int in_gate_area(struct task_struct *task, unsigned long addr) +{ + return 0; +} + +int in_gate_area_no_task(unsigned long addr) +{ + return 0; +} diff -r 875e0e96e574 -r 822a27d28afe linux-2.6-xen-sparse/arch/i386/mm/pgtable-xen.c --- a/linux-2.6-xen-sparse/arch/i386/mm/pgtable-xen.c Thu Feb 23 15:22:17 2006 +0000 +++ b/linux-2.6-xen-sparse/arch/i386/mm/pgtable-xen.c Thu Feb 23 15:22:19 2006 +0000 @@ -194,7 +194,6 @@ void __set_fixmap (enum fixed_addresses } switch (idx) { case FIX_WP_TEST: - case FIX_VSYSCALL: #ifdef CONFIG_X86_F00F_BUG case FIX_F00F_IDT: #endif diff -r 875e0e96e574 -r 822a27d28afe linux-2.6-xen-sparse/include/asm-i386/a.out.h --- a/linux-2.6-xen-sparse/include/asm-i386/a.out.h Thu Feb 23 15:22:17 2006 +0000 +++ b/linux-2.6-xen-sparse/include/asm-i386/a.out.h Thu Feb 23 15:22:19 2006 +0000 @@ -19,7 +19,7 @@ struct exec #ifdef __KERNEL__ -#define STACK_TOP TASK_SIZE +#define STACK_TOP (TASK_SIZE - 3*PAGE_SIZE) #endif diff -r 875e0e96e574 -r 822a27d28afe linux-2.6-xen-sparse/include/asm-i386/elf.h --- a/linux-2.6-xen-sparse/include/asm-i386/elf.h Thu Feb 23 15:22:17 2006 +0000 +++ b/linux-2.6-xen-sparse/include/asm-i386/elf.h Thu Feb 23 15:22:19 2006 +0000 @@ -129,10 +129,15 @@ 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_BASE (PAGE_OFFSET - 2*PAGE_SIZE) #define VSYSCALL_EHDR ((const struct elfhdr *) VSYSCALL_BASE) #define VSYSCALL_ENTRY ((unsigned long) &__kernel_vsyscall) extern void __kernel_vsyscall; + +#define ARCH_HAS_SETUP_ADDITIONAL_PAGES +struct linux_binprm; +extern int arch_setup_additional_pages(struct linux_binprm *bprm, + int executable_stack); #define ARCH_DLINFO \ do { \ diff -r 875e0e96e574 -r 822a27d28afe linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/fixmap.h --- a/linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/fixmap.h Thu Feb 23 15:22:17 2006 +0000 +++ b/linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/fixmap.h Thu Feb 23 15:22:19 2006 +0000 @@ -53,7 +53,6 @@ */ enum fixed_addresses { FIX_HOLE, - FIX_VSYSCALL, #ifdef CONFIG_X86_LOCAL_APIC FIX_APIC_BASE, /* local (CPU) APIC) -- required for SMP or not */ #endif @@ -123,14 +122,6 @@ extern void __set_fixmap( #define __fix_to_virt(x) (FIXADDR_TOP - ((x) << PAGE_SHIFT)) #define __virt_to_fix(x) ((FIXADDR_TOP - ((x)&PAGE_MASK)) >> PAGE_SHIFT) -/* - * This is the range that is readable by user mode, and things - * acting like user mode such as get_user_pages. - */ -#define FIXADDR_USER_START (__fix_to_virt(FIX_VSYSCALL)) -#define FIXADDR_USER_END (FIXADDR_USER_START + PAGE_SIZE) - - extern void __this_fixmap_does_not_exist(void); /* diff -r 875e0e96e574 -r 822a27d28afe linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/page.h --- a/linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/page.h Thu Feb 23 15:22:17 2006 +0000 +++ b/linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/page.h Thu Feb 23 15:22:19 2006 +0000 @@ -317,6 +317,8 @@ extern int page_is_ram(unsigned long pag #define virt_to_mfn(v) (pfn_to_mfn(__pa(v) >> PAGE_SHIFT)) #define mfn_to_virt(m) (__va(mfn_to_pfn(m) << PAGE_SHIFT)) +#define __HAVE_ARCH_GATE_AREA 1 + #endif /* __KERNEL__ */ #include Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v retrieving revision 1.357.2.1 retrieving revision 1.357.2.2 diff -u -r1.357.2.1 -r1.357.2.2 --- .cvsignore 28 Feb 2006 20:16:09 -0000 1.357.2.1 +++ .cvsignore 1 Mar 2006 22:12:41 -0000 1.357.2.2 @@ -2,6 +2,6 @@ temp-* kernel-2.6.15 linux-2.6.15.tar.bz2 -xen-20060208.tar.bz2 patch-2.6.16-rc5.bz2 patch-2.6.16-rc5-git1.bz2 +xen-20060301.tar.bz2 Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.1971.2.12 retrieving revision 1.1971.2.13 diff -u -r1.1971.2.12 -r1.1971.2.13 --- kernel-2.6.spec 1 Mar 2006 16:54:41 -0000 1.1971.2.12 +++ kernel-2.6.spec 1 Mar 2006 22:12:41 -0000 1.1971.2.13 @@ -185,7 +185,7 @@ Source0: ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-%{kversion}.tar.bz2 -Source1: xen-20060208.tar.bz2 +Source1: xen-20060301.tar.bz2 Source2: Config.mk Source10: COPYING.modules @@ -259,11 +259,10 @@ Patch700: linux-2.6-xen.patch Patch701: linux-2.6-xen-compile-fixes.patch Patch702: linux-2.6-xen-no-tls-warn.patch -Patch705: linux-2.6-xen_net_read_mac_export.patch +Patch703: linux-2.6-xen-move-vdso-fixmap.patch Patch706: linux-2.6-xen_remap_vma_flags.patch Patch709: linux-2.6-percpu-NR_CPUS-hotplug-fix.patch Patch710: linux-2.6-xen-module-fault.patch -Patch711: linux-2.6-xen-cpusteal-kernel.patch # # Patches 800 through 899 are reserved for bugfixes to the core system @@ -410,7 +409,6 @@ Patch10001: linux-2.6-random-patches.patch Patch20000: linux-2.6-xen-gcc-4.1-compile-fix.patch -Patch20010: linux-2.6-xen-cpusteal-hv.patch # END OF PATCH DEFINITIONS @@ -697,7 +695,6 @@ %if %{buildxen} cd xen %patch20000 -p1 -%patch20010 -p2 cd .. %endif cd linux-%{kversion}.%{_target_cpu} @@ -780,11 +777,21 @@ %patch700 -p1 %patch701 -p1 %patch702 -p1 -%patch705 -p1 %patch706 -p1 %patch709 -p1 #%patch710 -p1 -%patch711 -p2 + +# +# Xen includes a patch which moves the vsyscall fixmap into a user-space VA, +# freeing user-space from reliance on an absolute fixmap area and so allowing +# the fixmap area to become dynamic. +# +# Execshield already does this, making the fixmap area invisible to the user +# and adding a new randomised vdso for it in user VA, so there's no point in +# having both: revert the Xen changeset so that execsheild applies cleanly. +# +%patch703 -p2 -R + %endif # @@ -1596,6 +1603,12 @@ %endif %changelog +* Wed Mar 1 2006 Stephen Tweedie +- Rebase to xen kernel patches and HV from xen-unstable cset 9022 +- Delete xen cpu steal patches (now upstream) +- Delete xen_net_read_mac export patch (now upstream) +- Revert xen cset 8948 (vdso updates which execshield already performs) + * Wed Mar 1 2006 Juan Quintela - remove xen ia64 bits, they break ia64 build. - riel cpusteal hv fix. linux-2.6-crashdump-common.patch: linux-2.6.12/Documentation/sysrq.txt | 8 linux-2.6.12/arch/i386/kernel/nmi.c | 1 linux-2.6.12/arch/i386/kernel/traps.c | 3 linux-2.6.12/arch/i386/mm/init.c | 47 +++++ linux-2.6.12/arch/i386/mm/pgtable.c | 2 linux-2.6.12/arch/ia64/kernel/process.c | 30 ++- linux-2.6.12/arch/ia64/kernel/traps.c | 6 linux-2.6.12/arch/ia64/mm/contig.c | 3 linux-2.6.12/arch/ia64/mm/discontig.c | 3 linux-2.6.12/arch/ia64/mm/init.c | 90 +++++++++ linux-2.6.12/arch/powerpc/kernel/process.c | 1 linux-2.6.12/arch/powerpc/kernel/traps.c | 3 linux-2.6.12/arch/powerpc/mm/mem.c | 29 +++ linux-2.6.12/arch/s390/kernel/traps.c | 6 linux-2.6.12/arch/x86_64/kernel/process.c | 2 linux-2.6.12/arch/x86_64/kernel/traps.c | 6 linux-2.6.12/arch/x86_64/mm/init.c | 32 +++ linux-2.6.12/drivers/char/sysrq.c | 2 linux-2.6.12/include/asm-generic/crashdump.h | 47 +++++ linux-2.6.12/include/asm-i386/crashdump.h | 123 +++++++++++++ linux-2.6.12/include/asm-i386/kmap_types.h | 4 linux-2.6.12/include/asm-ia64/crashdump.h | 72 +++++++ linux-2.6.12/include/asm-powerpc/crashdump.h | 61 ++++++ linux-2.6.12/include/asm-x86_64/crashdump.h | 86 +++++++++ linux-2.6.12/include/linux/kernel.h | 18 + linux-2.6.12/kernel/Makefile | 2 linux-2.6.12/kernel/dump.c | 246 +++++++++++++++++++++++++++ linux-2.6.12/kernel/panic.c | 4 linux-2.6.12/kernel/printk.c | 20 ++ linux-2.6.12/kernel/sched.c | 2 linux-2.6.13/arch/x86_64/mm/fault.c | 1 linux-2.6.13/drivers/char/sysrq.c | 5 32 files changed, 951 insertions(+), 14 deletions(-) Index: linux-2.6-crashdump-common.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-crashdump-common.patch,v retrieving revision 1.9.12.1 retrieving revision 1.9.12.2 diff -u -r1.9.12.1 -r1.9.12.2 --- linux-2.6-crashdump-common.patch 23 Feb 2006 21:36:14 -0000 1.9.12.1 +++ linux-2.6-crashdump-common.patch 1 Mar 2006 22:12:41 -0000 1.9.12.2 @@ -889,14 +889,6 @@ * valid. The argument is a physical page number. --- linux-2.6.12/arch/i386/mm/pgtable.c.orig 2005-08-18 12:39:56.000000000 -0400 +++ linux-2.6.12/arch/i386/mm/pgtable.c 2005-08-18 14:23:58.000000000 -0400 -@@ -13,6 +13,7 @@ - #include - #include - #include -+#include - - #include - #include @@ -63,6 +64,8 @@ printk(KERN_INFO "%lu pages pagetables\n", ps.nr_page_table_pages); } linux-2.6-execshield-xen.patch: arch/i386/kernel/entry-xen.S | 8 - arch/i386/kernel/process-xen.c | 58 +++++++ arch/i386/kernel/smp-xen.c | 2 arch/i386/kernel/traps-xen.c | 92 +++++++++++- arch/i386/mm/init-xen.c | 11 + linux-2.6.15.i686/include/asm-x86_64/mach-xen/asm/pgtable.h | 2 linux-2.6.15.noarch/arch/x86_64/kernel/setup64-xen.c | 23 --- 7 files changed, 166 insertions(+), 30 deletions(-) Index: linux-2.6-execshield-xen.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-execshield-xen.patch,v retrieving revision 1.2.12.1 retrieving revision 1.2.12.2 diff -u -r1.2.12.1 -r1.2.12.2 --- linux-2.6-execshield-xen.patch 23 Feb 2006 21:36:14 -0000 1.2.12.1 +++ linux-2.6-execshield-xen.patch 1 Mar 2006 22:12:41 -0000 1.2.12.2 @@ -120,7 +120,7 @@ index 0f7199b..878c084 100644 --- a/arch/i386/kernel/traps-xen.c +++ b/arch/i386/kernel/traps-xen.c -@@ -459,11 +459,89 @@ DO_ERROR_INFO(17, SIGBUS, "alignment che +@@ -459,13 +459,99 @@ DO_ERROR_INFO(17, SIGBUS, "alignment che DO_ERROR(11, SIGBUS, "segment not present", segment_not_present) DO_ERROR(12, SIGBUS, "stack segment", stack_segment) DO_ERROR_INFO(17, SIGBUS, "alignment check", alignment_check, BUS_ADRALN, 0) @@ -205,24 +205,11 @@ fastcall void __kprobes do_general_protection(struct pt_regs * regs, long error_code) { +- current->thread.error_code = error_code; +- current->thread.trap_no = 13; + int cpu = get_cpu(); + int ok; + - /* - * If we trapped on an LDT access then ensure that the default_ldt is - * loaded, if nothing else. We load default_ldt lazily because LDT -@@ -473,13 +551,22 @@ fastcall void __kprobes do_general_prote - unsigned long ldt; - __asm__ __volatile__ ("sldt %0" : "=r" (ldt)); - if (ldt == 0) { -+ put_cpu(); - xen_set_ldt((unsigned long)&default_ldt[0], 5); - return; - } - } - -- current->thread.error_code = error_code; -- current->thread.trap_no = 13; + ok = check_lazy_exec_limit(cpu, regs, error_code); + put_cpu(); + linux-2.6-xen-compile-fixes.patch: linux-2.6.15.ia64/fs/Kconfig | 1 linux-2.6.15.xen/arch/i386/kernel/Makefile | 3 -- linux-2.6.15.xen/arch/i386/kernel/smp-xen.c | 1 linux-2.6.15.xen/arch/i386/mm/init-xen.c | 1 linux-2.6.15.xen/arch/x86_64/kernel/pmtimer.c | 2 + linux-2.6.15.xen/arch/x86_64/kernel/process-xen.c | 6 ---- linux-2.6.15.xen/arch/x86_64/mm/fault-xen.c | 2 - linux-2.6.15.xen/include/asm-i386/mach-xen/asm/desc.h | 14 +++++++++++ linux-2.6.15.xen/include/asm-i386/mach-xen/asm/mmu.h | 7 +++++ linux-2.6.15.xen/include/asm-i386/mach-xen/asm/pgalloc.h | 1 linux-2.6.15.xen/include/asm-i386/mach-xen/asm/processor.h | 7 ++++- linux-2.6.15.xen/include/asm-i386/mach-xen/asm/swiotlb.h | 1 linux-2.6.15.xen/include/asm-x86_64/acpi.h | 2 + linux-2.6.15.xen/include/asm-x86_64/mach-xen/asm/pgalloc.h | 7 +++++ linux-2.6.15.xen/include/asm-x86_64/mach-xen/asm/pgtable.h | 2 - linux-2.6.15.xen/include/asm-x86_64/mach-xen/asm/processor.h | 2 + 16 files changed, 47 insertions(+), 12 deletions(-) Index: linux-2.6-xen-compile-fixes.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-xen-compile-fixes.patch,v retrieving revision 1.1.12.5 retrieving revision 1.1.12.6 diff -u -r1.1.12.5 -r1.1.12.6 --- linux-2.6-xen-compile-fixes.patch 1 Mar 2006 00:20:54 -0000 1.1.12.5 +++ linux-2.6-xen-compile-fixes.patch 1 Mar 2006 22:12:41 -0000 1.1.12.6 @@ -1,14 +1,3 @@ -diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff linux-2.6.15.x86_64/arch/i386/mm/init-xen.c linux-2.6.15.new/arch/i386/mm/init-xen.c ---- linux-2.6.15.x86_64/arch/i386/mm/init-xen.c 2006-02-11 19:15:39.000000000 +0100 -+++ linux-2.6.15.new/arch/i386/mm/init-xen.c 2006-02-11 16:24:12.000000000 +0100 -@@ -459,6 +459,7 @@ void zap_low_mappings (void) - - static int disable_nx __initdata = 0; - u64 __supported_pte_mask __read_mostly = ~_PAGE_NX; -+EXPORT_SYMBOL(__supported_pte_mask); - - /* - * noexec = on|off diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff linux-2.6.15.orig/arch/i386/mm/init-xen.c linux-2.6.15.xen/arch/i386/mm/init-xen.c --- linux-2.6.15.orig/arch/i386/mm/init-xen.c 2006-02-22 15:56:24.000000000 +0100 +++ linux-2.6.15.xen/arch/i386/mm/init-xen.c 2006-02-22 18:56:27.000000000 +0100 @@ -215,29 +204,6 @@ config HUGETLB_PAGE def_bool HUGETLBFS -diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff linux-2.6.15.orig/arch/i386/mach-xen/Makefile linux-2.6.15.i686/arch/i386/mach-xen/Makefile ---- linux-2.6.15.orig/arch/i386/mach-xen/Makefile 2006-02-28 18:47:02.000000000 +0100 -+++ linux-2.6.15.i686/arch/i386/mach-xen/Makefile 2006-02-28 19:38:41.000000000 +0100 -@@ -3,5 +3,3 @@ - # - --obj-y := setup.o topology.o -+obj-y := setup.o -- --topology-y := ../mach-default/topology.o -diff -urNp --exclude-from=/home/mitica/quintela/config/misc/dontdiff kernel-2.6.15/linux-2.6.15.noarch/arch/i386/kernel/acpi/boot-xen.c linux-2.6.15.xen/arch/i386/kernel/acpi/boot-xen.c ---- kernel-2.6.15/linux-2.6.15.noarch/arch/i386/kernel/acpi/boot-xen.c 2006-02-28 22:47:30.000000000 +0100 -+++ linux-2.6.15.xen/arch/i386/kernel/acpi/boot-xen.c 2006-02-28 20:26:00.000000000 +0100 -@@ -44,9 +44,6 @@ extern void __init clustered_apic_check( - extern int gsi_irq_sharing(int gsi); - #include - --static inline int acpi_madt_oem_check(char *oem_id, char *oem_table_id) { return 0; } -- -- - #else /* X86 */ - - #ifdef CONFIG_X86_LOCAL_APIC diff -urNp --exclude-from=/home/mitica/quintela/config/misc/dontdiff kernel-2.6.15/linux-2.6.15.noarch/arch/x86_64/kernel/pmtimer.c linux-2.6.15.xen/arch/x86_64/kernel/pmtimer.c --- kernel-2.6.15/linux-2.6.15.noarch/arch/x86_64/kernel/pmtimer.c 2006-02-28 22:47:11.000000000 +0100 +++ linux-2.6.15.xen/arch/x86_64/kernel/pmtimer.c 2006-02-28 22:37:45.000000000 +0100 linux-2.6-xen.patch: arch/i386/Kconfig | 98 arch/i386/Kconfig.cpu | 2 arch/i386/Makefile | 18 arch/i386/boot-xen/Makefile | 21 arch/i386/kernel/Makefile | 33 arch/i386/kernel/acpi/Makefile | 4 arch/i386/kernel/acpi/boot-xen.c | 1161 ++++++++ arch/i386/kernel/apic-xen.c | 140 + arch/i386/kernel/asm-offsets.c | 5 arch/i386/kernel/cpu/Makefile | 5 arch/i386/kernel/cpu/common-xen.c | 719 +++++ arch/i386/kernel/cpu/mtrr/Makefile | 7 arch/i386/kernel/cpu/mtrr/main-xen.c | 187 + arch/i386/kernel/early_printk-xen.c | 2 arch/i386/kernel/entry-xen.S | 857 ++++++ arch/i386/kernel/fixup.c | 95 arch/i386/kernel/head-xen.S | 173 + arch/i386/kernel/init_task-xen.c | 51 arch/i386/kernel/io_apic-xen.c | 2730 ++++++++++++++++++++ arch/i386/kernel/ioport-xen.c | 122 arch/i386/kernel/irq-xen.c | 306 ++ arch/i386/kernel/ldt-xen.c | 269 + arch/i386/kernel/microcode-xen.c | 164 + arch/i386/kernel/mpparse-xen.c | 1188 ++++++++ arch/i386/kernel/pci-dma-xen.c | 344 ++ arch/i386/kernel/process-xen.c | 833 ++++++ arch/i386/kernel/quirks-xen.c | 48 arch/i386/kernel/setup-xen.c | 1888 +++++++++++++ arch/i386/kernel/smp-xen.c | 617 ++++ arch/i386/kernel/swiotlb.c | 674 ++++ arch/i386/kernel/sysenter.c | 90 arch/i386/kernel/time-xen.c | 1067 +++++++ arch/i386/kernel/traps-xen.c | 1094 ++++++++ arch/i386/kernel/vm86.c | 8 arch/i386/kernel/vmlinux.lds.S | 4 arch/i386/kernel/vsyscall-note-xen.S | 32 arch/i386/kernel/vsyscall.S | 2 arch/i386/mach-xen/Makefile | 5 arch/i386/mach-xen/setup.c | 37 arch/i386/mm/Makefile | 8 arch/i386/mm/fault-xen.c | 617 ++++ arch/i386/mm/highmem-xen.c | 123 arch/i386/mm/hypervisor.c | 471 +++ arch/i386/mm/init-xen.c | 846 ++++++ arch/i386/mm/ioremap-xen.c | 462 +++ arch/i386/mm/pgtable-xen.c | 646 ++++ arch/i386/mm/pgtable.c | 63 arch/i386/pci/Makefile | 9 arch/i386/pci/irq-xen.c | 1202 ++++++++ arch/i386/pci/pcifront.c | 55 arch/i386/power/Makefile | 4 arch/ia64/Kconfig | 43 arch/ia64/Makefile | 10 arch/ia64/hp/sim/Makefile | 2 arch/ia64/kernel/entry.S | 32 arch/ia64/kernel/head.S | 4 arch/ia64/kernel/pal.S | 5 arch/ia64/kernel/sal.c | 3 arch/ia64/kernel/setup.c | 4 arch/ia64/xen-mkbuildtree-post | 2 arch/ia64/xen-mkbuildtree-pre | 50 arch/ia64/xen/Makefile | 5 arch/ia64/xen/drivers/Makefile | 20 arch/ia64/xen/drivers/README | 2 arch/ia64/xen/drivers/coreMakefile | 24 arch/ia64/xen/drivers/evtchn_ia64.c | 266 + arch/ia64/xen/drivers/patches/blkback.c.patch | 33 arch/ia64/xen/drivers/patches/console.c.patch | 11 arch/ia64/xen/drivers/patches/devmem.c.patch | 2 arch/ia64/xen/drivers/patches/gnttab.c.patch | 33 arch/ia64/xen/drivers/patches/privcmd.c.patch | 30 arch/ia64/xen/drivers/xenia64_init.c | 55 arch/ia64/xen/hypercall.S | 323 ++ arch/ia64/xen/xen_ksyms.c | 12 arch/ia64/xen/xenconsole.c | 19 arch/ia64/xen/xenentry.S | 850 ++++++ arch/ia64/xen/xenhpski.c | 19 arch/ia64/xen/xenivt.S | 2044 ++++++++++++++ arch/ia64/xen/xenminstate.h | 367 ++ arch/ia64/xen/xenpal.S | 73 arch/ia64/xen/xensetup.S | 33 arch/um/kernel/physmem.c | 4 arch/x86_64/Kconfig | 60 arch/x86_64/Makefile | 16 arch/x86_64/ia32/Makefile | 20 arch/x86_64/ia32/ia32entry-xen.S | 721 +++++ arch/x86_64/ia32/syscall32-xen.c | 128 arch/x86_64/ia32/syscall32_syscall-xen.S | 28 arch/x86_64/ia32/vsyscall-int80.S | 58 arch/x86_64/ia32/vsyscall-sigreturn.S | 2 arch/x86_64/kernel/Makefile | 18 arch/x86_64/kernel/acpi/Makefile | 1 arch/x86_64/kernel/apic-xen.c | 200 + arch/x86_64/kernel/asm-offsets.c | 2 arch/x86_64/kernel/e820-xen.c | 744 +++++ arch/x86_64/kernel/early_printk-xen.c | 306 ++ arch/x86_64/kernel/entry-xen.S | 1140 ++++++++ arch/x86_64/kernel/genapic-xen.c | 144 + arch/x86_64/kernel/genapic_xen.c | 162 + arch/x86_64/kernel/head-xen.S | 156 + arch/x86_64/kernel/head64-xen.c | 140 + arch/x86_64/kernel/init_task.c | 3 arch/x86_64/kernel/io_apic-xen.c | 2231 ++++++++++++++++ arch/x86_64/kernel/ioport-xen.c | 58 arch/x86_64/kernel/irq-xen.c | 168 + arch/x86_64/kernel/ldt-xen.c | 282 ++ arch/x86_64/kernel/mpparse-xen.c | 1005 +++++++ arch/x86_64/kernel/pci-swiotlb-xen.c | 54 arch/x86_64/kernel/process-xen.c | 810 +++++ arch/x86_64/kernel/setup-xen.c | 1635 +++++++++++ arch/x86_64/kernel/setup64-xen.c | 360 ++ arch/x86_64/kernel/smp-xen.c | 596 ++++ arch/x86_64/kernel/traps-xen.c | 1023 +++++++ arch/x86_64/kernel/vsyscall-xen.c | 239 + arch/x86_64/kernel/x8664_ksyms-xen.c | 172 + arch/x86_64/kernel/xen_entry.S | 41 arch/x86_64/mm/Makefile | 10 arch/x86_64/mm/fault-xen.c | 595 ++++ arch/x86_64/mm/init-xen.c | 1107 ++++++++ arch/x86_64/mm/pageattr-xen.c | 392 ++ arch/x86_64/pci/Makefile | 12 drivers/Makefile | 1 drivers/acpi/Kconfig | 3 drivers/acpi/tables.c | 7 drivers/char/mem.c | 6 drivers/char/tpm/Kconfig | 14 drivers/char/tpm/Makefile | 1 drivers/char/tpm/tpm.c | 44 drivers/char/tpm/tpm.h | 7 drivers/char/tpm/tpm_xen.c | 536 +++ drivers/char/tty_io.c | 7 drivers/firmware/Kconfig | 2 drivers/pci/Kconfig | 1 drivers/serial/Kconfig | 1 drivers/video/Kconfig | 2 drivers/xen/Kconfig | 200 + drivers/xen/Makefile | 22 drivers/xen/balloon/Makefile | 2 drivers/xen/balloon/balloon.c | 585 ++++ drivers/xen/blkback/Makefile | 3 drivers/xen/blkback/blkback.c | 596 ++++ drivers/xen/blkback/common.h | 123 drivers/xen/blkback/interface.c | 164 + drivers/xen/blkback/vbd.c | 102 drivers/xen/blkback/xenbus.c | 421 +++ drivers/xen/blkfront/Makefile | 5 drivers/xen/blkfront/blkfront.c | 834 ++++++ drivers/xen/blkfront/block.h | 162 + drivers/xen/blkfront/vbd.c | 323 ++ drivers/xen/blktap/Makefile | 3 drivers/xen/blktap/blktap.c | 910 ++++++ drivers/xen/blktap/common.h | 110 drivers/xen/blktap/interface.c | 146 + drivers/xen/blktap/xenbus.c | 234 + drivers/xen/char/Makefile | 2 drivers/xen/char/mem.c | 156 + drivers/xen/console/Makefile | 2 drivers/xen/console/console.c | 647 ++++ drivers/xen/console/xencons_ring.c | 125 drivers/xen/core/Makefile | 9 drivers/xen/core/evtchn.c | 823 ++++++ drivers/xen/core/features.c | 29 drivers/xen/core/gnttab.c | 429 +++ drivers/xen/core/reboot.c | 442 +++ drivers/xen/core/skbuff.c | 144 + drivers/xen/core/smpboot.c | 464 +++ drivers/xen/core/xen_proc.c | 29 drivers/xen/evtchn/Makefile | 2 drivers/xen/evtchn/evtchn.c | 459 +++ drivers/xen/net_driver_util.c | 68 drivers/xen/netback/Makefile | 5 drivers/xen/netback/common.h | 110 drivers/xen/netback/interface.c | 320 ++ drivers/xen/netback/loopback.c | 231 + drivers/xen/netback/netback.c | 835 ++++++ drivers/xen/netback/xenbus.c | 327 ++ drivers/xen/netfront/Makefile | 4 drivers/xen/netfront/netfront.c | 1504 +++++++++++ drivers/xen/pciback/Makefile | 10 drivers/xen/pciback/conf_space.c | 324 ++ drivers/xen/pciback/conf_space.h | 97 drivers/xen/pciback/conf_space_header.c | 269 + drivers/xen/pciback/passthrough.c | 116 drivers/xen/pciback/pci_stub.c | 377 ++ drivers/xen/pciback/pciback.h | 73 drivers/xen/pciback/pciback_ops.c | 84 drivers/xen/pciback/vpci.c | 163 + drivers/xen/pciback/xenbus.c | 439 +++ drivers/xen/pcifront/Makefile | 7 drivers/xen/pcifront/pci.c | 44 drivers/xen/pcifront/pci_op.c | 245 + drivers/xen/pcifront/pcifront.h | 40 drivers/xen/pcifront/xenbus.c | 295 ++ drivers/xen/privcmd/Makefile | 2 drivers/xen/privcmd/privcmd.c | 302 ++ drivers/xen/tpmback/Makefile | 4 drivers/xen/tpmback/common.h | 91 drivers/xen/tpmback/interface.c | 203 + drivers/xen/tpmback/tpmback.c | 1118 ++++++++ drivers/xen/tpmback/xenbus.c | 333 ++ drivers/xen/tpmfront/Makefile | 2 drivers/xen/tpmfront/tpmfront.c | 729 +++++ drivers/xen/tpmfront/tpmfront.h | 40 drivers/xen/util.c | 80 drivers/xen/xenbus/Makefile | 8 drivers/xen/xenbus/xenbus_client.c | 403 ++ drivers/xen/xenbus/xenbus_comms.c | 203 + drivers/xen/xenbus/xenbus_comms.h | 50 drivers/xen/xenbus/xenbus_dev.c | 238 + drivers/xen/xenbus/xenbus_probe.c | 1015 +++++++ drivers/xen/xenbus/xenbus_xs.c | 821 ++++++ fs/Kconfig | 1 include/asm-i386/a.out.h | 2 include/asm-i386/apic.h | 2 include/asm-i386/elf.h | 7 include/asm-i386/fixmap.h | 13 include/asm-i386/mach-xen/asm/agp.h | 37 include/asm-i386/mach-xen/asm/desc.h | 164 + include/asm-i386/mach-xen/asm/dma-mapping.h | 156 + include/asm-i386/mach-xen/asm/fixmap.h | 158 + include/asm-i386/mach-xen/asm/floppy.h | 147 + include/asm-i386/mach-xen/asm/highmem.h | 81 include/asm-i386/mach-xen/asm/hw_irq.h | 73 include/asm-i386/mach-xen/asm/hypercall.h | 323 ++ include/asm-i386/mach-xen/asm/hypervisor.h | 163 + include/asm-i386/mach-xen/asm/io.h | 401 ++ include/asm-i386/mach-xen/asm/kmap_types.h | 32 include/asm-i386/mach-xen/asm/mmu.h | 21 include/asm-i386/mach-xen/asm/mmu_context.h | 105 include/asm-i386/mach-xen/asm/page.h | 326 ++ include/asm-i386/mach-xen/asm/param.h | 24 include/asm-i386/mach-xen/asm/pci.h | 154 + include/asm-i386/mach-xen/asm/pgalloc.h | 64 include/asm-i386/mach-xen/asm/pgtable-2level-defs.h | 21 include/asm-i386/mach-xen/asm/pgtable-2level.h | 83 include/asm-i386/mach-xen/asm/pgtable-3level-defs.h | 25 include/asm-i386/mach-xen/asm/pgtable-3level.h | 181 + include/asm-i386/mach-xen/asm/pgtable.h | 512 +++ include/asm-i386/mach-xen/asm/processor.h | 762 +++++ include/asm-i386/mach-xen/asm/ptrace.h | 90 include/asm-i386/mach-xen/asm/scatterlist.h | 22 include/asm-i386/mach-xen/asm/segment.h | 117 include/asm-i386/mach-xen/asm/setup.h | 66 include/asm-i386/mach-xen/asm/smp.h | 103 include/asm-i386/mach-xen/asm/spinlock.h | 217 + include/asm-i386/mach-xen/asm/swiotlb.h | 43 include/asm-i386/mach-xen/asm/synch_bitops.h | 141 + include/asm-i386/mach-xen/asm/system.h | 679 ++++ include/asm-i386/mach-xen/asm/tlbflush.h | 102 include/asm-i386/mach-xen/asm/vga.h | 20 include/asm-i386/mach-xen/irq_vectors.h | 125 include/asm-i386/mach-xen/mach_traps.h | 33 include/asm-i386/mach-xen/setup_arch_post.h | 50 include/asm-i386/mach-xen/setup_arch_pre.h | 5 include/asm-i386/page.h | 4 include/asm-i386/spinlock.h | 6 include/asm-i386/system.h | 2 include/asm-ia64/fixmap.h | 2 include/asm-ia64/gcc_intrin.h | 60 include/asm-ia64/hypercall.h | 500 +++ include/asm-ia64/hypervisor.h | 70 include/asm-ia64/intel_intrin.h | 68 include/asm-ia64/pal.h | 1 include/asm-ia64/privop.h | 59 include/asm-ia64/processor.h | 1 include/asm-ia64/synch_bitops.h | 61 include/asm-ia64/system.h | 4 include/asm-ia64/xen/privop.h | 272 + include/asm-um/page.h | 2 include/asm-x86_64/apic.h | 2 include/asm-x86_64/mach-xen/asm/arch_hooks.h | 27 include/asm-x86_64/mach-xen/asm/bootsetup.h | 42 include/asm-x86_64/mach-xen/asm/desc.h | 263 + include/asm-x86_64/mach-xen/asm/dma-mapping.h | 191 + include/asm-x86_64/mach-xen/asm/fixmap.h | 111 include/asm-x86_64/mach-xen/asm/floppy.h | 206 + include/asm-x86_64/mach-xen/asm/hw_irq.h | 141 + include/asm-x86_64/mach-xen/asm/hypercall.h | 323 ++ include/asm-x86_64/mach-xen/asm/hypervisor.h | 2 include/asm-x86_64/mach-xen/asm/io.h | 359 ++ include/asm-x86_64/mach-xen/asm/irq.h | 39 include/asm-x86_64/mach-xen/asm/mmu.h | 33 include/asm-x86_64/mach-xen/asm/mmu_context.h | 134 include/asm-x86_64/mach-xen/asm/nmi.h | 75 include/asm-x86_64/mach-xen/asm/page.h | 317 ++ include/asm-x86_64/mach-xen/asm/pci.h | 174 + include/asm-x86_64/mach-xen/asm/pgalloc.h | 199 + include/asm-x86_64/mach-xen/asm/pgtable.h | 560 ++++ include/asm-x86_64/mach-xen/asm/processor.h | 503 +++ include/asm-x86_64/mach-xen/asm/ptrace.h | 125 include/asm-x86_64/mach-xen/asm/smp.h | 152 + include/asm-x86_64/mach-xen/asm/synch_bitops.h | 2 include/asm-x86_64/mach-xen/asm/system.h | 434 +++ include/asm-x86_64/mach-xen/asm/timer.h | 67 include/asm-x86_64/mach-xen/asm/tlbflush.h | 104 include/asm-x86_64/mach-xen/asm/vga.h | 20 include/asm-x86_64/mach-xen/asm/xor.h | 328 ++ include/asm-x86_64/mach-xen/irq_vectors.h | 123 include/asm-x86_64/mach-xen/mach_time.h | 122 include/asm-x86_64/mach-xen/mach_timer.h | 48 include/asm-x86_64/mach-xen/setup_arch_post.h | 52 include/asm-x86_64/mach-xen/setup_arch_pre.h | 5 include/linux/gfp.h | 6 include/linux/highmem.h | 6 include/linux/irq.h | 3 include/linux/mm.h | 13 include/linux/skbuff.h | 13 include/xen/balloon.h | 70 include/xen/driver_util.h | 26 include/xen/evtchn.h | 123 include/xen/features.h | 20 include/xen/foreign_page.h | 40 include/xen/gnttab.h | 120 include/xen/interface/COPYING | 28 include/xen/interface/acm.h | 181 + include/xen/interface/acm_ops.h | 96 include/xen/interface/arch-ia64.h | 314 ++ include/xen/interface/arch-x86_32.h | 158 + include/xen/interface/arch-x86_64.h | 243 + include/xen/interface/dom0_ops.h | 488 +++ include/xen/interface/event_channel.h | 203 + include/xen/interface/features.h | 53 include/xen/interface/grant_table.h | 306 ++ include/xen/interface/hvm/hvm_info_table.h | 24 include/xen/interface/hvm/ioreq.h | 93 include/xen/interface/hvm/vmx_assist.h | 97 include/xen/interface/io/blkif.h | 85 include/xen/interface/io/console.h | 33 include/xen/interface/io/netif.h | 76 include/xen/interface/io/pciif.h | 55 include/xen/interface/io/ring.h | 270 + include/xen/interface/io/tpmif.h | 56 include/xen/interface/io/xenbus.h | 44 include/xen/interface/io/xs_wire.h | 97 include/xen/interface/memory.h | 153 + include/xen/interface/nmi.h | 54 include/xen/interface/physdev.h | 70 include/xen/interface/sched.h | 60 include/xen/interface/sched_ctl.h | 68 include/xen/interface/trace.h | 90 include/xen/interface/vcpu.h | 119 include/xen/interface/version.h | 64 include/xen/interface/xen.h | 463 +++ include/xen/net_driver_util.h | 56 include/xen/pcifront.h | 39 include/xen/public/evtchn.h | 98 include/xen/public/privcmd.h | 91 include/xen/public/xenstored.h | 89 include/xen/tpmfe.h | 40 include/xen/xen_proc.h | 23 include/xen/xenbus.h | 298 ++ include/xen/xencons.h | 14 kernel/Kconfig.preempt | 1 kernel/irq/manage.c | 84 lib/Kconfig.debug | 2 lib/Makefile | 3 mm/Kconfig | 3 mm/highmem.c | 11 mm/memory.c | 112 mm/mmap.c | 4 mm/page_alloc.c | 6 net/core/dev.c | 50 net/core/skbuff.c | 41 scripts/Makefile.xen | 14 364 files changed, 77454 insertions(+), 245 deletions(-) View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.1.46.3 -r 1.1.46.4 linux-2.6-xen.patch Index: linux-2.6-xen.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/Attic/linux-2.6-xen.patch,v retrieving revision 1.1.46.3 retrieving revision 1.1.46.4 diff -u -r1.1.46.3 -r1.1.46.4 --- linux-2.6-xen.patch 1 Mar 2006 16:54:41 -0000 1.1.46.3 +++ linux-2.6-xen.patch 1 Mar 2006 22:12:41 -0000 1.1.46.4 @@ -1,6 +1,6 @@ -diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff ref-linux-2.6.16-rc4/arch/i386/boot-xen/Makefile linux-2.6.16-rc4-xen0/arch/i386/boot-xen/Makefile ---- ref-linux-2.6.16-rc4/arch/i386/boot-xen/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.16-rc4-xen0/arch/i386/boot-xen/Makefile 2006-02-22 13:44:42.000000000 +0100 +diff -Nru -p --exclude='.*' ref-linux-2.6.16-rc5/arch/i386/boot-xen/Makefile linux-2.6.16-rc5-xen0/arch/i386/boot-xen/Makefile +--- ref-linux-2.6.16-rc5/arch/i386/boot-xen/Makefile 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.16-rc5-xen0/arch/i386/boot-xen/Makefile 2006-03-01 11:09:36.000000000 -0500 @@ -0,0 +1,21 @@ + +OBJCOPYFLAGS := -g --strip-unneeded @@ -23,9 +23,9 @@ + install -m0664 .config $(INSTALL_ROOT)/boot/config-$(XINSTALL_NAME)$(INSTALL_SUFFIX) + install -m0664 System.map $(INSTALL_ROOT)/boot/System.map-$(XINSTALL_NAME)$(INSTALL_SUFFIX) + ln -f -s vmlinuz-$(XINSTALL_NAME)$(INSTALL_SUFFIX) $(INSTALL_ROOT)/boot/vmlinuz-$(VERSION).$(PATCHLEVEL)$(XENGUEST)$(INSTALL_SUFFIX) -diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff ref-linux-2.6.16-rc4/arch/i386/Kconfig linux-2.6.16-rc4-xen0/arch/i386/Kconfig ---- ref-linux-2.6.16-rc4/arch/i386/Kconfig 2006-02-22 15:52:49.000000000 +0100 -+++ linux-2.6.16-rc4-xen0/arch/i386/Kconfig 2006-02-22 13:44:42.000000000 +0100 +diff -Nru -p --exclude='.*' ref-linux-2.6.16-rc5/arch/i386/Kconfig linux-2.6.16-rc5-xen0/arch/i386/Kconfig +--- ref-linux-2.6.16-rc5/arch/i386/Kconfig 2006-03-01 11:12:36.000000000 -0500 ++++ linux-2.6.16-rc5-xen0/arch/i386/Kconfig 2006-03-01 11:09:36.000000000 -0500 @@ -58,6 +58,15 @@ config X86_PC help Choose this option if your computer is a standard PC or compatible. @@ -289,7 +289,7 @@ config KPROBES bool "Kprobes (EXPERIMENTAL)" -@@ -1087,6 +1136,8 @@ source "security/Kconfig" +@@ -1088,6 +1137,8 @@ source "security/Kconfig" source "crypto/Kconfig" @@ -298,7 +298,7 @@ source "lib/Kconfig" # -@@ -1112,7 +1163,7 @@ config X86_SMP +@@ -1113,7 +1164,7 @@ config X86_SMP config X86_HT bool @@ -307,7 +307,7 @@ default y config X86_BIOS_REBOOT -@@ -1125,6 +1176,21 @@ config X86_TRAMPOLINE +@@ -1126,6 +1177,21 @@ config X86_TRAMPOLINE depends on X86_SMP || (X86_VOYAGER && SMP) default y @@ -329,9 +329,9 @@ config KTIME_SCALAR bool default y -diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff ref-linux-2.6.16-rc4/arch/i386/Kconfig.cpu linux-2.6.16-rc4-xen0/arch/i386/Kconfig.cpu ---- ref-linux-2.6.16-rc4/arch/i386/Kconfig.cpu 2006-02-22 15:51:46.000000000 +0100 -+++ linux-2.6.16-rc4-xen0/arch/i386/Kconfig.cpu 2006-02-22 13:44:42.000000000 +0100 +diff -Nru -p --exclude='.*' ref-linux-2.6.16-rc5/arch/i386/Kconfig.cpu linux-2.6.16-rc5-xen0/arch/i386/Kconfig.cpu +--- ref-linux-2.6.16-rc5/arch/i386/Kconfig.cpu 2006-03-01 11:12:26.000000000 -0500 ++++ linux-2.6.16-rc5-xen0/arch/i386/Kconfig.cpu 2006-03-01 11:09:36.000000000 -0500 @@ -251,7 +251,7 @@ config X86_PPRO_FENCE config X86_F00F_BUG @@ -341,10 +341,10 @@ default y config X86_WP_WORKS_OK -diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff ref-linux-2.6.16-rc4/arch/i386/kernel/acpi/boot-xen.c linux-2.6.16-rc4-xen0/arch/i386/kernel/acpi/boot-xen.c ---- ref-linux-2.6.16-rc4/arch/i386/kernel/acpi/boot-xen.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.16-rc4-xen0/arch/i386/kernel/acpi/boot-xen.c 2006-02-22 13:44:42.000000000 +0100 -@@ -0,0 +1,1164 @@ +diff -Nru -p --exclude='.*' ref-linux-2.6.16-rc5/arch/i386/kernel/acpi/boot-xen.c linux-2.6.16-rc5-xen0/arch/i386/kernel/acpi/boot-xen.c +--- ref-linux-2.6.16-rc5/arch/i386/kernel/acpi/boot-xen.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.16-rc5-xen0/arch/i386/kernel/acpi/boot-xen.c 2006-03-01 11:09:36.000000000 -0500 +@@ -0,0 +1,1161 @@ +/* + * boot.c - Architecture-Specific Low-Level ACPI Boot Support + * @@ -391,9 +391,6 @@ +extern int gsi_irq_sharing(int gsi); +#include + -+static inline int acpi_madt_oem_check(char *oem_id, char *oem_table_id) { return 0; } -+ -+ +#else /* X86 */ + +#ifdef CONFIG_X86_LOCAL_APIC @@ -1509,9 +1506,9 @@ + + return 0; +} -diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff ref-linux-2.6.16-rc4/arch/i386/kernel/acpi/Makefile linux-2.6.16-rc4-xen0/arch/i386/kernel/acpi/Makefile ---- ref-linux-2.6.16-rc4/arch/i386/kernel/acpi/Makefile 2006-02-22 15:51:46.000000000 +0100 -+++ linux-2.6.16-rc4-xen0/arch/i386/kernel/acpi/Makefile 2006-02-22 13:44:42.000000000 +0100 +diff -Nru -p --exclude='.*' ref-linux-2.6.16-rc5/arch/i386/kernel/acpi/Makefile linux-2.6.16-rc5-xen0/arch/i386/kernel/acpi/Makefile +--- ref-linux-2.6.16-rc5/arch/i386/kernel/acpi/Makefile 2006-03-01 11:12:26.000000000 -0500 ++++ linux-2.6.16-rc5-xen0/arch/i386/kernel/acpi/Makefile 2006-03-01 11:09:36.000000000 -0500 @@ -6,3 +6,7 @@ ifneq ($(CONFIG_ACPI_PROCESSOR),) obj-y += cstate.o processor.o endif @@ -1520,9 +1517,9 @@ +include $(srctree)/scripts/Makefile.xen +obj-y := $(call cherrypickxen, $(obj-y), $(src)) +endif -diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff ref-linux-2.6.16-rc4/arch/i386/kernel/apic-xen.c linux-2.6.16-rc4-xen0/arch/i386/kernel/apic-xen.c ---- ref-linux-2.6.16-rc4/arch/i386/kernel/apic-xen.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.16-rc4-xen0/arch/i386/kernel/apic-xen.c 2006-02-22 13:44:42.000000000 +0100 +diff -Nru -p --exclude='.*' ref-linux-2.6.16-rc5/arch/i386/kernel/apic-xen.c linux-2.6.16-rc5-xen0/arch/i386/kernel/apic-xen.c +--- ref-linux-2.6.16-rc5/arch/i386/kernel/apic-xen.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.16-rc5-xen0/arch/i386/kernel/apic-xen.c 2006-03-01 11:09:36.000000000 -0500 @@ -0,0 +1,140 @@ +/* + * Local APIC handling, local APIC timers @@ -1664,10 +1661,18 @@ + + return 0; +} -diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff ref-linux-2.6.16-rc4/arch/i386/kernel/asm-offsets.c linux-2.6.16-rc4-xen0/arch/i386/kernel/asm-offsets.c ---- ref-linux-2.6.16-rc4/arch/i386/kernel/asm-offsets.c 2006-01-03 04:21:10.000000000 +0100 -+++ linux-2.6.16-rc4-xen0/arch/i386/kernel/asm-offsets.c 2006-02-22 13:44:42.000000000 +0100 -@@ -63,9 +63,11 @@ void foo(void) +diff -Nru -p --exclude='.*' ref-linux-2.6.16-rc5/arch/i386/kernel/asm-offsets.c linux-2.6.16-rc5-xen0/arch/i386/kernel/asm-offsets.c +--- ref-linux-2.6.16-rc5/arch/i386/kernel/asm-offsets.c 2006-01-02 22:21:10.000000000 -0500 ++++ linux-2.6.16-rc5-xen0/arch/i386/kernel/asm-offsets.c 2006-03-01 11:09:36.000000000 -0500 +@@ -13,6 +13,7 @@ + #include + #include + #include ++#include + + #define DEFINE(sym, val) \ + asm volatile("\n->" #sym " %0 " #val : : "i" (val)) +@@ -63,10 +64,12 @@ void foo(void) OFFSET(pbe_orig_address, pbe, orig_address); OFFSET(pbe_next, pbe, next); @@ -1678,17 +1683,20 @@ +#endif DEFINE(PAGE_SIZE_asm, PAGE_SIZE); - DEFINE(VSYSCALL_BASE, __fix_to_virt(FIX_VSYSCALL)); -diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff ref-linux-2.6.16-rc4/arch/i386/kernel/cpu/common-xen.c linux-2.6.16-rc4-xen0/arch/i386/kernel/cpu/common-xen.c ---- ref-linux-2.6.16-rc4/arch/i386/kernel/cpu/common-xen.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.16-rc4-xen0/arch/i386/kernel/cpu/common-xen.c 2006-02-22 13:44:42.000000000 +0100 -@@ -0,0 +1,667 @@ +- DEFINE(VSYSCALL_BASE, __fix_to_virt(FIX_VSYSCALL)); ++ DEFINE(VSYSCALL_BASE, VSYSCALL_BASE); + } +diff -Nru -p --exclude='.*' ref-linux-2.6.16-rc5/arch/i386/kernel/cpu/common-xen.c linux-2.6.16-rc5-xen0/arch/i386/kernel/cpu/common-xen.c +--- ref-linux-2.6.16-rc5/arch/i386/kernel/cpu/common-xen.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.16-rc5-xen0/arch/i386/kernel/cpu/common-xen.c 2006-03-01 11:09:36.000000000 -0500 +@@ -0,0 +1,719 @@ +#include +#include +#include +#include +#include +#include ++#include +#include +#include +#include @@ -1704,6 +1712,9 @@ + +#include "cpu.h" + ++DEFINE_PER_CPU(struct Xgt_desc_struct, cpu_gdt_descr); ++EXPORT_PER_CPU_SYMBOL(cpu_gdt_descr); ++ +#ifndef CONFIG_XEN +DEFINE_PER_CPU(unsigned char, cpu_16bit_stack[CPU_16BIT_STACK_SIZE]); +EXPORT_PER_CPU_SYMBOL(cpu_16bit_stack); @@ -2268,7 +2279,6 @@ + } + if (HYPERVISOR_set_gdt(frames, gdt_descr->size / 8)) + BUG(); -+ lgdt_finish(); +} + +/* @@ -2284,6 +2294,8 @@ + struct tss_struct * t = &per_cpu(init_tss, cpu); +#endif + struct thread_struct *thread = ¤t->thread; ++ struct desc_struct *gdt; ++ struct Xgt_desc_struct *cpu_gdt_descr = &per_cpu(cpu_gdt_descr, cpu); + + if (cpu_test_and_set(cpu, cpu_initialized)) { + printk(KERN_WARNING "CPU#%d already initialized!\n", cpu); @@ -2300,7 +2312,54 @@ + set_in_cr4(X86_CR4_TSD); [...18311 lines suppressed...] -+ char kconf_id_strings_str33[sizeof("requires")]; -+ char kconf_id_strings_str34[sizeof("bool")]; -+ char kconf_id_strings_str37[sizeof("boolean")]; -+ char kconf_id_strings_str41[sizeof("choice")]; -+ char kconf_id_strings_str46[sizeof("prompt")]; -+ }; -+static struct kconf_id_strings_t kconf_id_strings_contents = -+ { -+ "if", -+ "int", -+ "help", -+ "endif", -+ "select", -+ "endmenu", -+ "tristate", -+ "endchoice", -+ "range", -+ "string", -+ "default", -+ "def_bool", -+ "menu", -+ "def_boolean", -+ "def_tristate", -+ "mainmenu", -+ "menuconfig", -+ "config", -+ "on", -+ "hex", -+ "source", -+ "depends", -+ "optional", -+ "enable", -+ "comment", -+ "requires", -+ "bool", -+ "boolean", -+ "choice", -+ "prompt" -+ }; -+#define kconf_id_strings ((const char *) &kconf_id_strings_contents) -+#ifdef __GNUC__ -+__inline -+#endif -+struct kconf_id * -+kconf_id_lookup (register const char *str, register unsigned int len) -+{ -+ enum -+ { -+ TOTAL_KEYWORDS = 30, -+ MIN_WORD_LENGTH = 2, -+ MAX_WORD_LENGTH = 12, -+ MIN_HASH_VALUE = 2, -+ MAX_HASH_VALUE = 46 -+ }; -+ -+ static struct kconf_id wordlist[] = -+ { -+ {-1}, {-1}, -+ {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str2, T_IF, TF_COMMAND|TF_PARAM}, -+ {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str3, T_TYPE, TF_COMMAND, S_INT}, -+ {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str4, T_HELP, TF_COMMAND}, -+ {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str5, T_ENDIF, TF_COMMAND}, -+ {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str6, T_SELECT, TF_COMMAND}, -+ {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str7, T_ENDMENU, TF_COMMAND}, -+ {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str8, T_TYPE, TF_COMMAND, S_TRISTATE}, -+ {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str9, T_ENDCHOICE, TF_COMMAND}, -+ {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str10, T_RANGE, TF_COMMAND}, -+ {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str11, T_TYPE, TF_COMMAND, S_STRING}, -+ {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str12, T_DEFAULT, TF_COMMAND, S_UNKNOWN}, -+ {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str13, T_DEFAULT, TF_COMMAND, S_BOOLEAN}, -+ {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str14, T_MENU, TF_COMMAND}, -+ {-1}, -+ {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str16, T_DEFAULT, TF_COMMAND, S_BOOLEAN}, -+ {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str17, T_DEFAULT, TF_COMMAND, S_TRISTATE}, -+ {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str18, T_MAINMENU, TF_COMMAND}, -+ {-1}, -+ {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str20, T_MENUCONFIG, TF_COMMAND}, -+ {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str21, T_CONFIG, TF_COMMAND}, -+ {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str22, T_ON, TF_PARAM}, -+ {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str23, T_TYPE, TF_COMMAND, S_HEX}, -+ {-1}, {-1}, -+ {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str26, T_SOURCE, TF_COMMAND}, -+ {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str27, T_DEPENDS, TF_COMMAND}, -+ {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str28, T_OPTIONAL, TF_COMMAND}, -+ {-1}, {-1}, -+ {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str31, T_SELECT, TF_COMMAND}, -+ {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str32, T_COMMENT, TF_COMMAND}, -+ {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str33, T_REQUIRES, TF_COMMAND}, -+ {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str34, T_TYPE, TF_COMMAND, S_BOOLEAN}, -+ {-1}, {-1}, -+ {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str37, T_TYPE, TF_COMMAND, S_BOOLEAN}, -+ {-1}, {-1}, {-1}, -+ {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str41, T_CHOICE, TF_COMMAND}, -+ {-1}, {-1}, {-1}, {-1}, -+ {(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str46, T_PROMPT, TF_COMMAND} -+ }; -+ -+ if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH) -+ { -+ register int key = kconf_id_hash (str, len); -+ -+ if (key <= MAX_HASH_VALUE && key >= 0) -+ { -+ register int o = wordlist[key].name; -+ if (o >= 0) -+ { -+ register const char *s = o + kconf_id_strings; -+ -+ if (*str == *s && !strncmp (str + 1, s + 1, len - 1) && s[len] == '\0') -+ return &wordlist[key]; -+ } -+ } -+ } -+ return 0; -+} -+ -diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff ref-linux-2.6.16-rc4/scripts/Makefile.xen linux-2.6.16-rc4-xen0/scripts/Makefile.xen ---- ref-linux-2.6.16-rc4/scripts/Makefile.xen 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.16-rc4-xen0/scripts/Makefile.xen 2006-02-22 13:44:45.000000000 +0100 +diff -Nru -p --exclude='.*' ref-linux-2.6.16-rc5/scripts/Makefile.xen linux-2.6.16-rc5-xen0/scripts/Makefile.xen +--- ref-linux-2.6.16-rc5/scripts/Makefile.xen 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.16-rc5-xen0/scripts/Makefile.xen 2006-03-01 11:09:39.000000000 -0500 @@ -0,0 +1,14 @@ + +# cherrypickxen($1 = allobj) @@ -74218,74 +80785,3 @@ + ) +# filterxen($1 = allobj, $2 = noobjs) +filterxen = $(filter-out $(2), $(1)) -diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff linux-2.6.15.orig/include/xen/interface/version.h linux-2.6.15.xen/include/xen/interface/version.h ---- linux-2.6.15.orig/include/xen/interface/version.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.15.xen/include/xen/interface/version.h 2006-02-22 18:08:33.000000000 +0100 -@@ -0,0 +1,67 @@ -+/****************************************************************************** -+ * version.h -+ * -+ * Xen version, type, and compile information. -+ * -+ * Copyright (c) 2005, Nguyen Anh Quynh -+ * Copyright (c) 2005, Keir Fraser -+ */ -+ -+#ifndef __XEN_PUBLIC_VERSION_H__ -+#define __XEN_PUBLIC_VERSION_H__ -+ -+/* NB. All ops return zero on success, except XENVER_version. */ -+ -+/* arg == NULL; returns major:minor (16:16). */ -+#define XENVER_version 0 -+ -+/* arg == xen_extraversion_t. */ -+#define XENVER_extraversion 1 -+typedef char xen_extraversion_t[16]; -+#define XEN_EXTRAVERSION_LEN (sizeof(xen_extraversion_t)) -+ -+/* arg == xen_compile_info_t. */ -+#define XENVER_compile_info 2 -+typedef struct xen_compile_info { -+ char compiler[64]; -+ char compile_by[16]; -+ char compile_domain[32]; -+ char compile_date[32]; -+} xen_compile_info_t; -+ -+#define XENVER_capabilities 3 -+typedef char xen_capabilities_info_t[1024]; -+#define XEN_CAPABILITIES_INFO_LEN (sizeof(xen_capabilities_info_t)) -+ -+#define XENVER_changeset 4 -+typedef char xen_changeset_info_t[64]; -+#define XEN_CHANGESET_INFO_LEN (sizeof(xen_changeset_info_t)) -+ -+#define XENVER_platform_parameters 5 -+typedef struct xen_platform_parameters { -+ unsigned long virt_start; -+} xen_platform_parameters_t; -+ -+#define XENVER_get_features 6 -+typedef struct xen_feature_info { -+ unsigned int submap_idx; /* IN: which 32-bit submap to return */ -+ uint32_t submap; /* OUT: 32-bit submap */ -+} xen_feature_info_t; -+ -+#define XENFEAT_writable_page_tables 0 -+#define XENFEAT_writable_descriptor_tables 1 -+#define XENFEAT_auto_translated_physmap 2 -+ -+#define XENFEAT_NR_SUBMAPS 1 -+ -+#endif /* __XEN_PUBLIC_VERSION_H__ */ -+ -+/* -+ * Local variables: -+ * mode: C -+ * c-set-style: "BSD" -+ * c-basic-offset: 4 -+ * tab-width: 4 -+ * indent-tabs-mode: nil -+ * End: -+ */ Index: sources =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/sources,v retrieving revision 1.299.2.2 retrieving revision 1.299.2.3 diff -u -r1.299.2.2 -r1.299.2.3 --- sources 28 Feb 2006 22:22:24 -0000 1.299.2.2 +++ sources 1 Mar 2006 22:12:53 -0000 1.299.2.3 @@ -1,4 +1,4 @@ cdf95e00f5111e31f78e1d97304d9522 linux-2.6.15.tar.bz2 -30f4ef37dbc4d0bce9366e8716e8b51b xen-20060208.tar.bz2 1740ae34807f687a93adf2469ea5c4fc patch-2.6.16-rc5.bz2 45d08cf9db21b2be6d13b4a27bb65196 patch-2.6.16-rc5-git1.bz2 +cdfde609af8adcf58d7ff626599b2d90 xen-20060301.tar.bz2 --- linux-2.6-xen-cpusteal-kernel.patch DELETED --- --- linux-2.6-xen_net_read_mac_export.patch DELETED --- From fedora-cvs-commits at redhat.com Wed Mar 1 22:16:14 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 1 Mar 2006 17:16:14 -0500 Subject: rpms/libvte-java/devel libvte-java.spec,1.11,1.12 Message-ID: <200603012216.k21MGE37001551@cvs.devel.redhat.com> Author: ajocksch Update of /cvs/dist/rpms/libvte-java/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv31960 Modified Files: libvte-java.spec Log Message: * Wed Mar 01 2006 Adam Jocksch - 0.11.11.0.20060301.rh1-1.1 - Fixed typo in Requires. Index: libvte-java.spec =================================================================== RCS file: /cvs/dist/rpms/libvte-java/devel/libvte-java.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- libvte-java.spec 1 Mar 2006 21:58:40 -0000 1.11 +++ libvte-java.spec 1 Mar 2006 22:16:12 -0000 1.12 @@ -1,7 +1,7 @@ Summary: Wrapper library for GNOME VTE Name: libvte-java Version: 0.11.11.0.20060301.rh1 -Release: 1 +Release: 1.2 URL: http://java-gnome.sourceforge.net Source0: %{name}-%{version}.tar.gz License: LGPL @@ -10,7 +10,7 @@ Requires: /sbin/ldconfig -Requires: glib-java >= 0.23.0.20060301.rh1 +Requires: glib-java >= 0.2.3.0.20060301.rh1 Requires: libgtk-java >= 2.8.3.0.20060301.rh1 Requires: vte >= 0.11.10 BuildRequires: java-devel >= 1.4.2, glib-java-devel >= 0.2 @@ -97,7 +97,10 @@ %{_datadir}/java/*.zip %changelog -* Wed Mar 01 2006 Adam Jocksch - 0.11.11.0.20060301.rh1-0 +* Wed Mar 01 2006 Adam Jocksch - 0.11.11.0.20060301.rh1-1.1 +- Fixed typo in Requires. + +* Wed Mar 01 2006 Adam Jocksch - 0.11.11.0.20060301.rh1-1 - Imported new tarball to address bg #183538, updated dependancies. * Fri Feb 10 2006 Jesse Keating - 0.11.11-8.2 From fedora-cvs-commits at redhat.com Wed Mar 1 22:18:16 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 1 Mar 2006 17:18:16 -0500 Subject: rpms/kernel/devel kernel-2.6.spec, 1.1971.2.13, 1.1971.2.14 linux-2.6-xen-gcc-4.1-compile-fix.patch, 1.1, NONE Message-ID: <200603012218.k21MIGY3013081@cvs.devel.redhat.com> Author: quintela Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv13032 Modified Files: Tag: private-xen-rebased-1971-branch kernel-2.6.spec Removed Files: Tag: private-xen-rebased-1971-branch linux-2.6-xen-gcc-4.1-compile-fix.patch Log Message: another fix from sct Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.1971.2.13 retrieving revision 1.1971.2.14 diff -u -r1.1971.2.13 -r1.1971.2.14 --- kernel-2.6.spec 1 Mar 2006 22:12:41 -0000 1.1971.2.13 +++ kernel-2.6.spec 1 Mar 2006 22:18:13 -0000 1.1971.2.14 @@ -408,8 +408,6 @@ # Do not add anything non-trivial here. Patch10001: linux-2.6-random-patches.patch -Patch20000: linux-2.6-xen-gcc-4.1-compile-fix.patch - # END OF PATCH DEFINITIONS BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root @@ -694,7 +692,7 @@ %if %{buildxen} cd xen -%patch20000 -p1 +# Any necessary hypervisor patches go here cd .. %endif cd linux-%{kversion}.%{_target_cpu} @@ -1608,6 +1606,7 @@ - Delete xen cpu steal patches (now upstream) - Delete xen_net_read_mac export patch (now upstream) - Revert xen cset 8948 (vdso updates which execshield already performs) +- Delete unneeded linux-2.6-xen-gcc-4.1-compile-fix.patch * Wed Mar 1 2006 Juan Quintela - remove xen ia64 bits, they break ia64 build. --- linux-2.6-xen-gcc-4.1-compile-fix.patch DELETED --- From fedora-cvs-commits at redhat.com Wed Mar 1 22:25:48 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 1 Mar 2006 17:25:48 -0500 Subject: rpms/gnome-applets/devel gnome-applets-2.13.90-stock-ticker.patch, NONE, 1.1 gnome-applets.spec, 1.118, 1.119 gnome-applets-2.13.4-stock-ticker.patch, 1.1, NONE Message-ID: <200603012225.k21MPmoc016093@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/gnome-applets/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv16000 Modified Files: gnome-applets.spec Added Files: gnome-applets-2.13.90-stock-ticker.patch Removed Files: gnome-applets-2.13.4-stock-ticker.patch Log Message: - More stock ticker fun (bug 179528) gnome-applets-2.13.90-stock-ticker.patch: gtik.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletion(-) --- NEW FILE gnome-applets-2.13.90-stock-ticker.patch --- --- gnome-applets-2.13.90/gtik/gtik.c.stock-ticker 2006-03-01 13:38:16.000000000 -0500 +++ gnome-applets-2.13.90/gtik/gtik.c 2006-03-01 17:23:10.000000000 -0500 @@ -238,7 +238,7 @@ } /*-----------------------------------------------------------------*/ -static void xfer_callback (GnomeVFSAsyncHandle *handle, GnomeVFSXferProgressInfo *info, gpointer data) +static gint xfer_callback (GnomeVFSAsyncHandle *handle, GnomeVFSXferProgressInfo *info, gpointer data) { StockData *stockdata = data; @@ -250,6 +250,8 @@ _("Could not retrieve the stock data.")); } } + + return TRUE; } /*-----------------------------------------------------------------*/ Index: gnome-applets.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-applets/devel/gnome-applets.spec,v retrieving revision 1.118 retrieving revision 1.119 diff -u -r1.118 -r1.119 --- gnome-applets.spec 28 Feb 2006 13:45:55 -0000 1.118 +++ gnome-applets.spec 1 Mar 2006 22:25:45 -0000 1.119 @@ -18,7 +18,7 @@ Summary: Small applications for the GNOME panel. Name: gnome-applets Version: 2.13.90 -Release: 2 +Release: 3 Epoch: 1 License: GPL Group: User Interface/Desktops @@ -29,7 +29,7 @@ Patch3: gnome-applets-2.3.6-ppp-command.patch Patch4: gnome-applets-2.11.1-cpufreq.patch Patch5: gnome-applets-2.13.4-warning.patch -Patch6: gnome-applets-2.13.4-stock-ticker.patch +Patch6: gnome-applets-2.13.90-stock-ticker.patch URL: http://www.gnome.org/ @@ -181,6 +181,9 @@ %{_libdir}/pkgconfig/gweather.pc %changelog +* Wed Mar 1 2006 Ray Strode - 2.13.90-3 +- More stock ticker fun (bug 179528) + * Tue Feb 28 2006 Karsten Hopp 2.13.90-2 - BuildRequires: which --- gnome-applets-2.13.4-stock-ticker.patch DELETED --- From fedora-cvs-commits at redhat.com Wed Mar 1 22:32:24 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 1 Mar 2006 17:32:24 -0500 Subject: rpms/kernel/devel kernel-2.6.spec,1.1971.2.14,1.1971.2.15 Message-ID: <200603012232.k21MWOAG017900@cvs.devel.redhat.com> Author: quintela Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv17795 Modified Files: Tag: private-xen-rebased-1971-branch kernel-2.6.spec Log Message: disable ia64 Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.1971.2.14 retrieving revision 1.1971.2.15 diff -u -r1.1971.2.14 -r1.1971.2.15 --- kernel-2.6.spec 1 Mar 2006 22:18:13 -0000 1.1971.2.14 +++ kernel-2.6.spec 1 Mar 2006 22:31:52 -0000 1.1971.2.15 @@ -162,7 +162,8 @@ License: GPLv2 Version: %{rpmversion} Release: %{release} -ExclusiveArch: noarch %{all_x86} x86_64 ppc ppc64 ia64 sparc sparc64 ppc64iseries s390 s390x +#ExclusiveArch: noarch %{all_x86} x86_64 ppc ppc64 ia64 sparc sparc64 ppc64iseries s390 s390x +ExclusiveArch: noarch %{all_x86} x86_64 ppc ppc64 sparc sparc64 ppc64iseries s390 s390x ExclusiveOS: Linux Provides: kernel = %{version} Provides: kernel-drm = 4.3.0 @@ -1601,6 +1602,9 @@ %endif %changelog +* Wed Mar 1 2006 Juan Quintela +- disable ia64 build again. + * Wed Mar 1 2006 Stephen Tweedie - Rebase to xen kernel patches and HV from xen-unstable cset 9022 - Delete xen cpu steal patches (now upstream) From fedora-cvs-commits at redhat.com Wed Mar 1 23:05:04 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 1 Mar 2006 18:05:04 -0500 Subject: rpms/xen/devel .cvsignore, 1.14, 1.15 sources, 1.29, 1.30 xen.spec, 1.97, 1.98 Message-ID: <200603012305.k21N54l9007862@cvs.devel.redhat.com> Author: sct Update of /cvs/dist/rpms/xen/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv7850 Modified Files: .cvsignore sources xen.spec Log Message: Update to xen-unstable cset 9022 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/xen/devel/.cvsignore,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- .cvsignore 1 Mar 2006 19:59:01 -0000 1.14 +++ .cvsignore 1 Mar 2006 23:04:59 -0000 1.15 @@ -1,2 +1,2 @@ LibVNCServer-0.7.1.tar.gz -xen-3.0.1-20060228.tar.bz2 +xen-3.0.1-20060301.tar.bz2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/xen/devel/sources,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- sources 1 Mar 2006 19:59:01 -0000 1.29 +++ sources 1 Mar 2006 23:04:59 -0000 1.30 @@ -1,2 +1,2 @@ 54110288b3171551c03467cd60976d55 LibVNCServer-0.7.1.tar.gz -e9e11baf392b7119739b2b1d92d19ee3 xen-3.0.1-20060228.tar.bz2 +b6de980106e996ef5fdb845022c69bca xen-3.0.1-20060301.tar.bz2 Index: xen.spec =================================================================== RCS file: /cvs/dist/rpms/xen/devel/xen.spec,v retrieving revision 1.97 retrieving revision 1.98 diff -u -r1.97 -r1.98 --- xen.spec 1 Mar 2006 19:59:01 -0000 1.97 +++ xen.spec 1 Mar 2006 23:04:59 -0000 1.98 @@ -5,11 +5,11 @@ Summary: Xen is a virtual machine monitor Name: xen Version: 3.0.1 -Release: 0.20060228.fc5.1 +Release: 0.20060301.fc5.1 Group: Development/Libraries License: GPL URL: http://www.cl.cam.ac.uk/Research/SRG/netos/xen/index.html -Source0: xen-3.0.1-20060228.tar.bz2 +Source0: xen-3.0.1-20060301.tar.bz2 Source1: http://download.sf.net/libvncserver/LibVNCServer-%{libvncver}.tar.gz Source2: xenguest-install.py Patch0: xen-misc-fixes.patch @@ -156,6 +156,9 @@ %dir %{_localstatedir}/run/xenstored %changelog +* Wed Mar 1 2006 Stephen Tweedie - 3.0.1-0.20060301.fc5.1 +- Update to xen-unstable cset 9022 + * Tue Feb 28 2006 Stephen Tweedie - 3.0.1-0.20060228.fc5.1 - Update to xen-unstable cset 9015 From fedora-cvs-commits at redhat.com Wed Mar 1 23:26:57 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 1 Mar 2006 18:26:57 -0500 Subject: rpms/perl/devel perl-5.8.8-bz183553_ubz38657.patch, NONE, 1.1 perl-5.8.8-up27284.patch, NONE, 1.1 perl.spec, 1.86, 1.87 Message-ID: <200603012326.k21NQvTm028353@cvs.devel.redhat.com> Author: jvdias Update of /cvs/dist/rpms/perl/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv28321 Modified Files: perl.spec Added Files: perl-5.8.8-bz183553_ubz38657.patch perl-5.8.8-up27284.patch Log Message: fix bug 183553 perl-5.8.8-bz183553_ubz38657.patch: perl.c | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE perl-5.8.8-bz183553_ubz38657.patch --- --- perl-5.8.8/perl.c.bz183553_ubz38657 2006-02-27 12:51:49.000000000 -0500 +++ perl-5.8.8/perl.c 2006-03-01 17:18:41.000000000 -0500 @@ -3110,7 +3110,7 @@ sv_catpv(sv, start); else { sv_catpvn(sv, start, s-start); - Perl_sv_catpvf(aTHX_ sv, " split(/,/,q%c%s%c)", 0, ++s, 0); + Perl_sv_catpvf(aTHX_ sv, " split(/,/,q(%s))", ++s); } s += strlen(s); my_setenv("PERL5DB", (char *)SvPV_nolen_const(sv)); perl-5.8.8-up27284.patch: pp.c | 2 +- t/op/gv.t | 15 ++++++++++++++- 2 files changed, 15 insertions(+), 2 deletions(-) --- NEW FILE perl-5.8.8-up27284.patch --- Change 27284 by nicholas at nicholas-saigo on 2006/02/23 14:49:22 Integrate: [ 27002] Code assumes that *FOO{SCALAR} will always return a scalar reference, so make it so, creating $FOO if necessary. (Effectively this is a policy decision that PERL_DONT_CREATE_GVSV is visible to XS code, but isn't visible to Perl code) Affected files ... ... //depot/maint-5.8/perl/pp.c#86 integrate ... //depot/maint-5.8/perl/t/op/gv.t#4 integrate Differences ... ==== //depot/maint-5.8/perl/pp.c#86 (text) ==== Index: perl/pp.c --- perl/pp.c#85~26738~ 2006-01-08 13:30:11.000000000 -0800 +++ perl/pp.c 2006-02-23 06:49:22.000000000 -0800 @@ -604,7 +604,7 @@ break; case 'S': if (strEQ(second_letter, "CALAR")) - tmpRef = GvSV(gv); + tmpRef = GvSVn(gv); break; } } ==== //depot/maint-5.8/perl/t/op/gv.t#4 (xtext) ==== Index: perl/t/op/gv.t --- perl/t/op/gv.t#3~25505~ 2005-09-19 15:20:52.000000000 -0700 +++ perl/t/op/gv.t 2006-02-23 06:49:22.000000000 -0800 @@ -12,7 +12,7 @@ use warnings; require './test.pl'; -plan( tests => 61 ); +plan( tests => 63 ); # type coersion on assignment $foo = 'foo'; @@ -218,6 +218,19 @@ is ($x, "Rules\n"); } + +{ + no warnings qw(once uninitialized); + my $g = \*clatter; + my $r = eval {no strict; ${*{$g}{SCALAR}}}; + is ($@, '', "PERL_DONT_CREATE_GVSV shouldn't affect thingy syntax"); + + $g = \*vowm; + $r = eval {use strict; ${*{$g}{SCALAR}}}; + is ($@, '', + "PERL_DONT_CREATE_GVSV shouldn't affect thingy syntax under strict"); +} + __END__ Perl Rules End of Patch. Index: perl.spec =================================================================== RCS file: /cvs/dist/rpms/perl/devel/perl.spec,v retrieving revision 1.86 retrieving revision 1.87 diff -u -r1.86 -r1.87 --- perl.spec 13 Feb 2006 20:01:15 -0000 1.86 +++ perl.spec 1 Mar 2006 23:26:55 -0000 1.87 @@ -5,7 +5,7 @@ %define multilib_64_archs x86_64 s390x ppc64 sparc64 %define perlver 5.8.8 -%define perlrel 3 +%define perlrel 4 %define perlepoch 4 %{?!perl_debugging: %define perl_debugging 0} @@ -150,6 +150,10 @@ # # Upstream patches 27133 and 27169 (27170): Patch33: perl-5.8.8-up27133_up27169.patch +# Upstream patch 27284: +Patch34: perl-5.8.8-up27284.patch +# Fix for bug 183553 / upstream bug 38657: +Patch35: perl-5.8.8-bz183553_ubz38657.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gawk, grep, tcsh, dos2unix, man, groff @@ -326,6 +330,10 @@ %patch33 -p1 +%patch34 -p1 + +%patch35 -p1 + # Candidates for doc recoding (need case by case review): # find . -name "*.pod" -o -name "README*" -o -name "*.pm" | xargs file -i | grep charset= | grep -v '\(us-ascii\|utf-8\)' recode() @@ -534,6 +542,13 @@ %endif %changelog +* Tue Mar 01 2006 Jason Vas Dias - 4:5.8.8-4 +- Fix bug 183553 / upstream bug 38657: fix -d:Foo=bar processing +- rebuild with new gcc-4.1.0-1, released today + +* Mon Feb 27 2006 Jason Vas Dias +- Apply upstream patch #28284 + * Mon Feb 13 2006 Jason Vas Dias - 4:5.8.8-3 - Apply upstream bugfix patch 27170 From fedora-cvs-commits at redhat.com Wed Mar 1 23:45:24 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 1 Mar 2006 18:45:24 -0500 Subject: rpms/kernel/FC-4 patch-2.6.15.5.bz2.sign, NONE, 1.1 .cvsignore, 1.174, 1.175 kernel-2.6.spec, 1.1606, 1.1607 sources, 1.158, 1.159 upstream, 1.99, 1.100 linux-2.6-i2c-it87-reboot.patch, 1.1, NONE patch-2.6.15.2.bz2.sign, 1.1, NONE patch-2.6.15.4.bz2.sign, 1.1, NONE Message-ID: <200603012345.k21NjOh7026594@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv26580 Modified Files: .cvsignore kernel-2.6.spec sources upstream Added Files: patch-2.6.15.5.bz2.sign Removed Files: linux-2.6-i2c-it87-reboot.patch patch-2.6.15.2.bz2.sign patch-2.6.15.4.bz2.sign Log Message: 15.5 --- NEW FILE patch-2.6.15.5.bz2.sign --- -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.2.1 (GNU/Linux) Comment: See http://www.kernel.org/signature.html for info iD8DBQBEBidNyGugalF9Dw4RApIiAJ0YjV0VCoRJH4+YZreaXkTKHwRPQgCfaQlT zFnH00pd6DuW3aE/dNiwSrw= =Yecv -----END PGP SIGNATURE----- Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-4/.cvsignore,v retrieving revision 1.174 retrieving revision 1.175 diff -u -r1.174 -r1.175 --- .cvsignore 10 Feb 2006 08:25:19 -0000 1.174 +++ .cvsignore 1 Mar 2006 23:45:20 -0000 1.175 @@ -2,4 +2,4 @@ temp-* kernel-2.6.15 linux-2.6.15.tar.bz2 -patch-2.6.15.4.bz2 +patch-2.6.15.5.bz2 Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-4/kernel-2.6.spec,v retrieving revision 1.1606 retrieving revision 1.1607 diff -u -r1.1606 -r1.1607 --- kernel-2.6.spec 21 Feb 2006 05:46:59 -0000 1.1606 +++ kernel-2.6.spec 1 Mar 2006 23:45:20 -0000 1.1607 @@ -206,7 +206,7 @@ # # Patches 0 through 100 are meant for core subsystem upgrades # -Patch1: patch-2.6.15.4.bz2 +Patch1: patch-2.6.15.5.bz2 # Patches 100 through 500 are meant for architecture patches Patch100: linux-2.6-bzimage.patch @@ -359,7 +359,6 @@ Patch1860: linux-2.6-posix-timers-sched_time-accumulation.patch Patch1870: linux-2.6-usb-find-interface.patch Patch1871: linux-2.6-usb-unusual-devices.patch -Patch1880: linux-2.6-i2c-it87-reboot.patch # Warn about usage of various obsolete functionality that may go away. Patch1900: linux-2.6-obsolete-idescsi-warning.patch @@ -811,8 +810,6 @@ %patch1870 -p1 # Add another mp3 player to the usb unusual device list. %patch1871 -p1 -# Some it87 probing causes reboots on some systems. -%patch1880 -p1 # Warn about obsolete functionality usage. %patch1900 -p1 @@ -1289,6 +1286,9 @@ %endif %changelog +* Wed Mar 1 2006 Dave Jones +- 2.6.15.5 + * Tue Feb 21 2006 Dave Jones - Add boot delay debug patch. Index: sources =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-4/sources,v retrieving revision 1.158 retrieving revision 1.159 diff -u -r1.158 -r1.159 --- sources 10 Feb 2006 08:25:19 -0000 1.158 +++ sources 1 Mar 2006 23:45:20 -0000 1.159 @@ -1,2 +1,2 @@ cdf95e00f5111e31f78e1d97304d9522 linux-2.6.15.tar.bz2 -16c9747058fa575886b32ca022667f60 patch-2.6.15.4.bz2 +c5a18151fc3e529a22f4c4451f23ef79 patch-2.6.15.5.bz2 Index: upstream =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-4/upstream,v retrieving revision 1.99 retrieving revision 1.100 diff -u -r1.99 -r1.100 --- upstream 10 Feb 2006 08:25:19 -0000 1.99 +++ upstream 1 Mar 2006 23:45:20 -0000 1.100 @@ -1,3 +1,3 @@ linux-2.6.15.tar.bz2 -patch-2.6.15.4.bz2 +patch-2.6.15.5.bz2 --- linux-2.6-i2c-it87-reboot.patch DELETED --- --- patch-2.6.15.2.bz2.sign DELETED --- --- patch-2.6.15.4.bz2.sign DELETED --- From fedora-cvs-commits at redhat.com Wed Mar 1 23:45:59 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 1 Mar 2006 18:45:59 -0500 Subject: rpms/kernel/FC-4 kernel-2.6.spec,1.1607,1.1608 Message-ID: <200603012345.k21NjxcG032161@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv31563 Modified Files: kernel-2.6.spec Log Message: bump Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-4/kernel-2.6.spec,v retrieving revision 1.1607 retrieving revision 1.1608 diff -u -r1.1607 -r1.1608 --- kernel-2.6.spec 1 Mar 2006 23:45:20 -0000 1.1607 +++ kernel-2.6.spec 1 Mar 2006 23:45:56 -0000 1.1608 @@ -1286,7 +1286,7 @@ %endif %changelog -* Wed Mar 1 2006 Dave Jones +* Wed Mar 1 2006 Dave Jones [2.6.15-1.1833_FC4] - 2.6.15.5 * Tue Feb 21 2006 Dave Jones From fedora-cvs-commits at redhat.com Thu Mar 2 00:46:45 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 1 Mar 2006 19:46:45 -0500 Subject: rpms/java-1.4.2-gcj-compat/devel java-1.4.2-gcj-compat.spec, 1.139, 1.140 Message-ID: <200603020046.k220kjD5011463@cvs.devel.redhat.com> Author: fitzsim Update of /cvs/dist/rpms/java-1.4.2-gcj-compat/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv9760 Modified Files: java-1.4.2-gcj-compat.spec Log Message: * Wed Mar 1 2006 Thomas Fitzsimmons - 0:1.4.2.0-40jpp_81rh - Natively compile BouncyCastle. 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.139 retrieving revision 1.140 diff -u -r1.139 -r1.140 --- java-1.4.2-gcj-compat.spec 11 Feb 2006 03:41:13 -0000 1.139 +++ java-1.4.2-gcj-compat.spec 2 Mar 2006 00:46:40 -0000 1.140 @@ -21,9 +21,10 @@ %define name java-%{javaver}-%{origin}-compat %define version %{javaver}.%{buildver} -%define release 40jpp_80rh +%define release 40jpp_81rh %define cname java-%{javaver}-%{origin} %define bcarchivever 131 +%define bcfullver 1.31 %define sdklnk java-%{javaver}-%{origin} %define jrelnk jre-%{javaver}-%{origin} @@ -177,10 +178,20 @@ %else ecj `find . -type f -name "*.java"` %endif - jar2="bcprov-%{bcarchivever}.jar" + jar2="bcprov-%{bcfullver}.jar" files="`find . -type f -name "*.class"`" test ! -d classes && mf="" || mf="`find classes/ -type f -name "*.mf" 2>/dev/null`" test -n "$mf" && fastjar cvfm $jar2 $mf $files || fastjar cvf $jar2 $files + + %if ! %{bootstrap} + # natively compile BouncyCastle + mkdir bctmp + mv bcprov-%{bcfullver}.jar bctmp + # close your eyes... + RPM_BUILD_ROOT=bctmp python ../../aot-compile-rpm + mv bctmp/bcprov-%{bcfullver}.jar bctmp%{_libdir}/gcj/%{name}/* ../.. + # (you can open them again now) + %endif popd %install @@ -252,8 +263,13 @@ # install bouncy castle provider install -dm 755 $RPM_BUILD_ROOT%{_javadir}/gcj-endorsed -install -pm 644 bcprov-jdk14-%{bcarchivever}/src/bcprov-%{bcarchivever}.jar \ - $RPM_BUILD_ROOT%{_javadir}/gcj-endorsed/bcprov-%{bcarchivever}.jar +install -pm 644 bcprov-%{bcfullver}.jar \ + $RPM_BUILD_ROOT%{_javadir}/gcj-endorsed/bcprov-%{bcfullver}.jar +%if ! %{bootstrap} +mkdir -p $RPM_BUILD_ROOT%{_libdir}/gcj/%{name} +install -m755 bcprov-%{bcfullver}.jar.so $RPM_BUILD_ROOT%{_libdir}/gcj/%{name} +install -m644 bcprov-%{bcfullver}.jar.db $RPM_BUILD_ROOT%{_libdir}/gcj/%{name} +%endif # classmap database directory install -dm 755 $RPM_BUILD_ROOT%{_libdir}/gcj @@ -371,6 +387,11 @@ %{_javadir}/libgcj-`gij%{gccsuffix} --version | head -n 2 | tail -n 1 | awk '{ print $5 }'`.jar 20 %endif +if [ -x %{_bindir}/rebuild-gcj-db ] +then + %{_bindir}/rebuild-gcj-db +fi + %post devel %if %{custom} @@ -458,6 +479,11 @@ %{_bindir}/rebuild-security-providers fi +if [ -x %{_bindir}/rebuild-gcj-db ] +then + %{_bindir}/rebuild-gcj-db +fi + %postun devel if [ $1 -eq 0 ] ; then @@ -567,11 +593,12 @@ %if ! %{custom} %{_sysconfdir}/java/security/security.d/1000-gnu.java.security.provider.Gnu %endif -%{_javadir}/gcj-endorsed/bcprov-%{bcarchivever}.jar +%{_javadir}/gcj-endorsed/bcprov-%{bcfullver}.jar %{_sysconfdir}/java/security/security.d/2000-org.bouncycastle.jce.provider.BouncyCastleProvider %ifarch x86_64 %{_jvmdir}/%{jredir}/lib/amd64 %endif +%attr(-,root,root) %{_libdir}/gcj/%{name} %files devel -f %{name}-%{version}-sdk-bin.files %defattr(-,root,root) @@ -606,6 +633,9 @@ %ghost %doc %{_javadocdir}/java %changelog +* Wed Mar 1 2006 Thomas Fitzsimmons - 0:1.4.2.0-40jpp_81rh +- Natively compile BouncyCastle. + * Fri Feb 10 2006 Jesse Keating - 0:1.4.2.0-40jpp_80rh - bump again for double-long bug on ppc(64) From fedora-cvs-commits at redhat.com Thu Mar 2 00:55:04 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 1 Mar 2006 19:55:04 -0500 Subject: rpms/java-1.4.2-gcj-compat/devel java-1.4.2-gcj-compat.spec, 1.140, 1.141 Message-ID: <200603020055.k220t4wt018231@cvs.devel.redhat.com> Author: fitzsim Update of /cvs/dist/rpms/java-1.4.2-gcj-compat/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv18175 Modified Files: java-1.4.2-gcj-compat.spec Log Message: - Do not install bcprov on bootstrap architectures. 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.140 retrieving revision 1.141 diff -u -r1.140 -r1.141 --- java-1.4.2-gcj-compat.spec 2 Mar 2006 00:46:40 -0000 1.140 +++ java-1.4.2-gcj-compat.spec 2 Mar 2006 00:55:01 -0000 1.141 @@ -261,11 +261,11 @@ find $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir}/bin -type f -o -type l \ | sed "s|^$RPM_BUILD_ROOT||" > %{name}-%{version}-sdk-bin.files +%if ! %{bootstrap} # install bouncy castle provider install -dm 755 $RPM_BUILD_ROOT%{_javadir}/gcj-endorsed install -pm 644 bcprov-%{bcfullver}.jar \ $RPM_BUILD_ROOT%{_javadir}/gcj-endorsed/bcprov-%{bcfullver}.jar -%if ! %{bootstrap} mkdir -p $RPM_BUILD_ROOT%{_libdir}/gcj/%{name} install -m755 bcprov-%{bcfullver}.jar.so $RPM_BUILD_ROOT%{_libdir}/gcj/%{name} install -m644 bcprov-%{bcfullver}.jar.db $RPM_BUILD_ROOT%{_libdir}/gcj/%{name} @@ -635,6 +635,7 @@ %changelog * Wed Mar 1 2006 Thomas Fitzsimmons - 0:1.4.2.0-40jpp_81rh - Natively compile BouncyCastle. +- Do not install bcprov on bootstrap architectures. * Fri Feb 10 2006 Jesse Keating - 0:1.4.2.0-40jpp_80rh - bump again for double-long bug on ppc(64) From fedora-cvs-commits at redhat.com Thu Mar 2 01:15:38 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 1 Mar 2006 20:15:38 -0500 Subject: rpms/java-1.4.2-gcj-compat/devel java-1.4.2-gcj-compat.spec, 1.141, 1.142 Message-ID: <200603020115.k221FcPP024267@cvs.devel.redhat.com> Author: fitzsim Update of /cvs/dist/rpms/java-1.4.2-gcj-compat/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv24201 Modified Files: java-1.4.2-gcj-compat.spec Log Message: - Move bcprov in the build section so that it is found by bootstrap architectures in the install section. 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.141 retrieving revision 1.142 diff -u -r1.141 -r1.142 --- java-1.4.2-gcj-compat.spec 2 Mar 2006 00:55:01 -0000 1.141 +++ java-1.4.2-gcj-compat.spec 2 Mar 2006 01:15:35 -0000 1.142 @@ -191,6 +191,8 @@ RPM_BUILD_ROOT=bctmp python ../../aot-compile-rpm mv bctmp/bcprov-%{bcfullver}.jar bctmp%{_libdir}/gcj/%{name}/* ../.. # (you can open them again now) + %else + mv bcprov-%{bcfullver}.jar ../.. %endif popd @@ -261,11 +263,11 @@ find $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir}/bin -type f -o -type l \ | sed "s|^$RPM_BUILD_ROOT||" > %{name}-%{version}-sdk-bin.files -%if ! %{bootstrap} # install bouncy castle provider install -dm 755 $RPM_BUILD_ROOT%{_javadir}/gcj-endorsed install -pm 644 bcprov-%{bcfullver}.jar \ $RPM_BUILD_ROOT%{_javadir}/gcj-endorsed/bcprov-%{bcfullver}.jar +%if ! %{bootstrap} mkdir -p $RPM_BUILD_ROOT%{_libdir}/gcj/%{name} install -m755 bcprov-%{bcfullver}.jar.so $RPM_BUILD_ROOT%{_libdir}/gcj/%{name} install -m644 bcprov-%{bcfullver}.jar.db $RPM_BUILD_ROOT%{_libdir}/gcj/%{name} @@ -635,7 +637,8 @@ %changelog * Wed Mar 1 2006 Thomas Fitzsimmons - 0:1.4.2.0-40jpp_81rh - Natively compile BouncyCastle. -- Do not install bcprov on bootstrap architectures. +- Move bcprov in the build section so that it is found by bootstrap + architectures in the install section. * Fri Feb 10 2006 Jesse Keating - 0:1.4.2.0-40jpp_80rh - bump again for double-long bug on ppc(64) From fedora-cvs-commits at redhat.com Thu Mar 2 01:24:41 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 1 Mar 2006 20:24:41 -0500 Subject: rpms/java-1.4.2-gcj-compat/devel java-1.4.2-gcj-compat.spec, 1.142, 1.143 Message-ID: <200603020124.k221OfoY008408@cvs.devel.redhat.com> Author: fitzsim Update of /cvs/dist/rpms/java-1.4.2-gcj-compat/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv8349 Modified Files: java-1.4.2-gcj-compat.spec Log Message: - Only include BC library directory on non-boostrap architectures. 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.142 retrieving revision 1.143 diff -u -r1.142 -r1.143 --- java-1.4.2-gcj-compat.spec 2 Mar 2006 01:15:35 -0000 1.142 +++ java-1.4.2-gcj-compat.spec 2 Mar 2006 01:24:38 -0000 1.143 @@ -600,7 +600,9 @@ %ifarch x86_64 %{_jvmdir}/%{jredir}/lib/amd64 %endif +%if ! %{bootstrap} %attr(-,root,root) %{_libdir}/gcj/%{name} +%endif %files devel -f %{name}-%{version}-sdk-bin.files %defattr(-,root,root) @@ -639,6 +641,7 @@ - Natively compile BouncyCastle. - Move bcprov in the build section so that it is found by bootstrap architectures in the install section. +- Only include BC library directory on non-boostrap architectures. * Fri Feb 10 2006 Jesse Keating - 0:1.4.2.0-40jpp_80rh - bump again for double-long bug on ppc(64) From fedora-cvs-commits at redhat.com Thu Mar 2 01:35:56 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 1 Mar 2006 20:35:56 -0500 Subject: rpms/poppler/devel poppler.spec,1.24,1.25 Message-ID: <200603020135.k221ZuL1010935@cvs.devel.redhat.com> Author: krh Update of /cvs/dist/rpms/poppler/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv10903 Modified Files: poppler.spec Log Message: * Wed Mar 1 2006 Kristian H??gsberg 0.5.1-2 - Rebuild the get rid of old soname dependency. Index: poppler.spec =================================================================== RCS file: /cvs/dist/rpms/poppler/devel/poppler.spec,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- poppler.spec 28 Feb 2006 23:50:34 -0000 1.24 +++ poppler.spec 2 Mar 2006 01:35:53 -0000 1.25 @@ -1,7 +1,7 @@ Summary: Pdf rendering library Name: poppler Version: 0.5.1 -Release: 1 +Release: 2 License: GPL Group: Development/Libraries Source0: %{name}-%{version}.tar.gz @@ -72,6 +72,9 @@ %{_mandir}/man1/* %changelog +* Wed Mar 1 2006 Kristian H??gsberg 0.5.1-2 +- Rebuild the get rid of old soname dependency. + * Tue Feb 28 2006 Kristian H??gsberg 0.5.1-1 - Update to version 0.5.1. From fedora-cvs-commits at redhat.com Thu Mar 2 01:44:25 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 1 Mar 2006 20:44:25 -0500 Subject: rpms/jessie/devel jessie.spec,1.21,1.22 Message-ID: <200603020144.k221iPIq014714@cvs.devel.redhat.com> Author: fitzsim Update of /cvs/dist/rpms/jessie/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv14591 Modified Files: jessie.spec Log Message: * Wed Mar 1 2006 Thomas Fitzsimmons - 0:1.0.1-2 - Add : to end of CLASSPATH. - Natively compile Jessie. Index: jessie.spec =================================================================== RCS file: /cvs/dist/rpms/jessie/devel/jessie.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- jessie.spec 3 Feb 2006 04:48:16 -0000 1.21 +++ jessie.spec 2 Mar 2006 01:44:21 -0000 1.22 @@ -2,7 +2,7 @@ Name: jessie Version: 1.0.1 -Release: 1 +Release: 2 Epoch: 0 Summary: A free implementation of the Java Secure Sockets Extension @@ -15,7 +15,6 @@ Patch1: jessie-1.0.0-dont-print-name.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root -BuildArch: noarch Requires: %{_bindir}/perl Requires: gnu-crypto >= 0:2.1.0 Requires: java-sasl @@ -39,11 +38,18 @@ %patch0 -p0 %patch1 -p0 -export CLASSPATH=%{_javadir}/gnu-crypto.jar:. +%build +export CLASSPATH=%{_javadir}/gnu-crypto.jar:.: %configure --enable-provider-only make -%build +%if %{gcj_support} +gcj-dbtool -n jsse-%{version}.jar.db 64 +gcj -shared $RPM_OPT_FLAGS -fPIC -findirect-dispatch -fjni -Wl,-Bsymbolic \ + lib/org-metastatic-jessie.jar -o jsse-%{version}.jar.so +gcj-dbtool -f jsse-%{version}.jar.db lib/org-metastatic-jessie.jar \ + %{_libdir}/gcj/%{name}/jsse-%{version}.jar.so +%endif %install rm -rf $RPM_BUILD_ROOT @@ -59,6 +65,10 @@ install -dm 755 $RPM_BUILD_ROOT%{_javadir}/gcj-endorsed ln -s %{_javadir}/jsse-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/gcj-endorsed/jsse.jar + +mkdir -p $RPM_BUILD_ROOT%{_libdir}/gcj/%{name} +install -m755 jsse-%{version}.jar.so $RPM_BUILD_ROOT%{_libdir}/gcj/%{name} +install -m644 jsse-%{version}.jar.db $RPM_BUILD_ROOT%{_libdir}/gcj/%{name} %endif %clean @@ -70,6 +80,11 @@ then %{_bindir}/rebuild-security-providers fi + +if [ -x %{_bindir}/rebuild-gcj-db ] +then + %{_bindir}/rebuild-gcj-db +fi %endif %postun @@ -78,6 +93,11 @@ then %{_bindir}/rebuild-security-providers fi + +if [ -x %{_bindir}/rebuild-gcj-db ] +then + %{_bindir}/rebuild-gcj-db +fi %endif %files @@ -88,9 +108,14 @@ %if %{gcj_support} %{_javadir}/gcj-endorsed/jsse*.jar %{_sysconfdir}/java/security/security.d/2000-org.metastatic.jessie.provider.Jessie +%attr(-,root,root) %{_libdir}/gcj/%{name} %endif %changelog +* Wed Mar 1 2006 Thomas Fitzsimmons - 0:1.0.1-2 +- Add : to end of CLASSPATH. +- Natively compile Jessie. + * Thu Feb 2 2006 Thomas Fitzsimmons - 0:1.0.1-1 - Revert back to 1.0.1 sources. From fedora-cvs-commits at redhat.com Thu Mar 2 01:52:48 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 1 Mar 2006 20:52:48 -0500 Subject: rpms/jessie/devel jessie.spec,1.22,1.23 Message-ID: <200603020152.k221qmZW030967@cvs.devel.redhat.com> Author: fitzsim Update of /cvs/dist/rpms/jessie/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv30907 Modified Files: jessie.spec Log Message: * Wed Mar 1 2006 Thomas Fitzsimmons - 0:1.0.1-3 - Bump release number. Index: jessie.spec =================================================================== RCS file: /cvs/dist/rpms/jessie/devel/jessie.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- jessie.spec 2 Mar 2006 01:44:21 -0000 1.22 +++ jessie.spec 2 Mar 2006 01:52:46 -0000 1.23 @@ -2,7 +2,7 @@ Name: jessie Version: 1.0.1 -Release: 2 +Release: 3 Epoch: 0 Summary: A free implementation of the Java Secure Sockets Extension @@ -112,6 +112,9 @@ %endif %changelog +* Wed Mar 1 2006 Thomas Fitzsimmons - 0:1.0.1-3 +- Bump release number. + * Wed Mar 1 2006 Thomas Fitzsimmons - 0:1.0.1-2 - Add : to end of CLASSPATH. - Natively compile Jessie. From fedora-cvs-commits at redhat.com Thu Mar 2 02:05:50 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 1 Mar 2006 21:05:50 -0500 Subject: rpms/java-1.4.2-gcj-compat/devel java-1.4.2-gcj-compat.spec, 1.143, 1.144 Message-ID: <200603020205.k2225oeT027259@cvs.devel.redhat.com> Author: fitzsim Update of /cvs/dist/rpms/java-1.4.2-gcj-compat/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv27246 Modified Files: java-1.4.2-gcj-compat.spec Log Message: * Wed Mar 1 2006 Thomas Fitzsimmons - 0:1.4.2.0-40jpp_82rh - Add chkconfig as a prerequisite. 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.143 retrieving revision 1.144 diff -u -r1.143 -r1.144 --- java-1.4.2-gcj-compat.spec 2 Mar 2006 01:24:38 -0000 1.143 +++ java-1.4.2-gcj-compat.spec 2 Mar 2006 02:05:46 -0000 1.144 @@ -21,7 +21,7 @@ %define name java-%{javaver}-%{origin}-compat %define version %{javaver}.%{buildver} -%define release 40jpp_81rh +%define release 40jpp_82rh %define cname java-%{javaver}-%{origin} %define bcarchivever 131 %define bcfullver 1.31 @@ -76,6 +76,7 @@ Provides: java-sasl Provides: jce Obsoletes: java-1.4.2-gcj4-compat <= 1.4.2.0-4jpp_2rh +PreReq: chkconfig %if %{custom} # prevent autogeneration of libjawt.so dependencies AutoReqProv: no @@ -637,6 +638,9 @@ %ghost %doc %{_javadocdir}/java %changelog +* Wed Mar 1 2006 Thomas Fitzsimmons - 0:1.4.2.0-40jpp_82rh +- Add chkconfig as a prerequisite. + * Wed Mar 1 2006 Thomas Fitzsimmons - 0:1.4.2.0-40jpp_81rh - Natively compile BouncyCastle. - Move bcprov in the build section so that it is found by bootstrap From fedora-cvs-commits at redhat.com Thu Mar 2 02:50:37 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 1 Mar 2006 21:50:37 -0500 Subject: rpms/xorg-x11-proto-devel/devel .cvsignore, 1.10, 1.11 sources, 1.9, 1.10 xorg-x11-proto-devel.spec, 1.22, 1.23 xorg-x11-proto-devel-7.0-buffer-values.patch, 1.2, NONE Message-ID: <200603020250.k222obM2004739@cvs.devel.redhat.com> Author: mharris Update of /cvs/dist/rpms/xorg-x11-proto-devel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv4707 Modified Files: .cvsignore sources xorg-x11-proto-devel.spec Removed Files: xorg-x11-proto-devel-7.0-buffer-values.patch Log Message: * Wed Mar 01 2006 Mike A. Harris 7.0-6 - Update to glproto-1.4.5 - Remove xorg-x11-proto-devel-7.0-buffer-values.patch which is in 1.4.5. Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/xorg-x11-proto-devel/devel/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 16 Feb 2006 23:11:58 -0000 1.10 +++ .cvsignore 2 Mar 2006 02:50:34 -0000 1.11 @@ -29,3 +29,4 @@ xproto-7.0.4.tar.bz2 xproxymanagementprotocol-1.0.2.tar.bz2 glproto-1.4.4.tar.bz2 +glproto-1.4.5.tar.bz2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/xorg-x11-proto-devel/devel/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 16 Feb 2006 23:11:58 -0000 1.9 +++ sources 2 Mar 2006 02:50:34 -0000 1.10 @@ -6,7 +6,7 @@ cc8916ab773525e9d16061edbd1c2472 fixesproto-3.0.2.tar.bz2 60df6b625074a9790e28543dcea71651 fontcacheproto-0.1.2.tar.bz2 c946f166107b016a21cc7a02e1132724 fontsproto-2.0.2.tar.bz2 -151a7df5535157bcdd92e47dbddd13aa glproto-1.4.4.tar.bz2 +bf3f623303876f0708b692eedd55d1a0 glproto-1.4.5.tar.bz2 e0b7df0fc69f0712aa7f2161faa94e1d inputproto-1.3.2.tar.bz2 3ae193c317a3621966c3c53d83a254f4 kbproto-1.0.2.tar.bz2 0f4e7982c6d4ec3b2cf38502dd1293a3 printproto-1.0.3.tar.bz2 Index: xorg-x11-proto-devel.spec =================================================================== RCS file: /cvs/dist/rpms/xorg-x11-proto-devel/devel/xorg-x11-proto-devel.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- xorg-x11-proto-devel.spec 1 Mar 2006 06:29:58 -0000 1.22 +++ xorg-x11-proto-devel.spec 2 Mar 2006 02:50:34 -0000 1.23 @@ -10,7 +10,7 @@ Summary: X.Org X11 Protocol headers Name: xorg-x11-proto-devel Version: 7.0 -Release: 5 +Release: 6 License: The Open Group License Group: Development/System URL: http://www.x.org @@ -23,7 +23,7 @@ Source5: %{sourceurl}/fixesproto-3.0.2.tar.bz2 Source6: %{sourceurl}/fontcacheproto-0.1.2.tar.bz2 Source7: %{sourceurl}/fontsproto-2.0.2.tar.bz2 -Source8: %{sourceurl}/glproto-1.4.4.tar.bz2 +Source8: %{sourceurl}/glproto-1.4.5.tar.bz2 Source9: %{sourceurl}/inputproto-1.3.2.tar.bz2 Source10: %{sourceurl}/kbproto-1.0.2.tar.bz2 # NOTE: What once was known as PanoramiX, is now known as Xinerama @@ -48,8 +48,6 @@ Source29: %{sourceurl}/xproto-7.0.4.tar.bz2 Source30: %{sourceurl}/xproxymanagementprotocol-1.0.2.tar.bz2 -Patch0: xorg-x11-proto-devel-7.0-buffer-values.patch - BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: pkgconfig @@ -77,8 +75,6 @@ %prep %setup -q -c %{name}-%{version} -a1 -a2 -a3 -a4 -a5 -a6 -a7 -a8 -a9 -a10 -a12 -a13 -a14 -a15 -a16 -a17 -a18 -a19 -a20 -a21 -a22 -a23 -a24 -a25 -a26 -a27 -a28 -a29 -a30 -%patch -p1 -b .buffer-values - %build #ls -al @@ -282,6 +278,10 @@ %{_libdir}/pkgconfig/xproxymngproto.pc %changelog +* Wed Mar 01 2006 Mike A. Harris 7.0-6 +- Update to glproto-1.4.5 +- Remove xorg-x11-proto-devel-7.0-buffer-values.patch which is in 1.4.5. + * Wed Feb 22 2006 Jeremy Katz 7.0-5 - require mesa-libGL-devel since it's needed by some of the headers --- xorg-x11-proto-devel-7.0-buffer-values.patch DELETED --- From fedora-cvs-commits at redhat.com Thu Mar 2 03:02:00 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 1 Mar 2006 22:02:00 -0500 Subject: rpms/xorg-x11-drv-citron/devel xorg-x11-drv-citron.spec,1.8,1.9 Message-ID: <200603020302.k2231xIr008800@cvs.devel.redhat.com> Author: mharris Update of /cvs/dist/rpms/xorg-x11-drv-citron/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv8746 Modified Files: xorg-x11-drv-citron.spec Log Message: * Wed Mar 01 2006 Mike A. Harris 2.1.5-1 - Updated to new upstream citron 2.1.5 driver. Index: xorg-x11-drv-citron.spec =================================================================== RCS file: /cvs/dist/rpms/xorg-x11-drv-citron/devel/xorg-x11-drv-citron.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- xorg-x11-drv-citron.spec 11 Feb 2006 06:15:53 -0000 1.8 +++ xorg-x11-drv-citron.spec 2 Mar 2006 03:01:40 -0000 1.9 @@ -6,10 +6,10 @@ Summary: Xorg X11 citron input driver Name: xorg-x11-drv-citron -Version: 2.1.1.5 -Release: 1.2 +Version: 2.1.5 +Release: 1 URL: http://www.x.org -Source0: http://xorg.freedesktop.org/X11R7.0/src/driver/%{tarball}-%{version}.tar.bz2 +Source0: http://xorg.freedesktop.org/releases/individual/driver/%{tarball}-%{version}.tar.bz2 License: MIT/X11 Group: User Interface/X Hardware Support BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -52,10 +52,13 @@ %{_mandir}/man4/citron.4* %changelog -* Fri Feb 10 2006 Jesse Keating - 2.1.1.5-1.2 +* Wed Mar 01 2006 Mike A. Harris 2.1.5-1 +- Updated to new upstream citron 2.1.5 driver. + +* Fri Feb 10 2006 Jesse Keating 2.1.1.5-1.2 - bump again for double-long bug on ppc(64) -* Tue Feb 07 2006 Jesse Keating - 2.1.1.5-1.1 +* Tue Feb 07 2006 Jesse Keating 2.1.1.5-1.1 - rebuilt for new gcc4.1 snapshot and glibc changes * Wed Jan 18 2006 Mike A. Harris 2.1.1.5-1 @@ -68,10 +71,10 @@ * Wed Nov 16 2005 Mike A. Harris 2.1.1.2-1 - Updated xorg-x11-drv-citron to version 2.1.1.2 from X11R7 RC2 -* Fri Nov 4 2005 Mike A. Harris 2.1.1.1-1 +* Fri Nov 04 2005 Mike A. Harris 2.1.1.1-1 - Updated xorg-x11-drv-citron to version 2.1.1.1 from X11R7 RC1 - Fix *.la file removal. -* Fri Sep 2 2005 Mike A. Harris 2.1.1-0 +* Fri Sep 02 2005 Mike A. Harris 2.1.1-0 - Initial spec file for citron input driver generated automatically by my xorg-driverspecgen script. From fedora-cvs-commits at redhat.com Thu Mar 2 03:05:18 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 1 Mar 2006 22:05:18 -0500 Subject: rpms/xorg-x11-drv-citron/devel .cvsignore,1.6,1.7 sources,1.6,1.7 Message-ID: <200603020305.k2235IeP008929@cvs.devel.redhat.com> Author: mharris Update of /cvs/dist/rpms/xorg-x11-drv-citron/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv8888 Modified Files: .cvsignore sources Log Message: * Wed Mar 01 2006 Mike A. Harris 2.1.5-1 - Updated to new upstream citron 2.1.5 driver. Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/xorg-x11-drv-citron/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 2 Feb 2006 09:38:57 -0000 1.6 +++ .cvsignore 2 Mar 2006 03:04:27 -0000 1.7 @@ -1 +1,2 @@ xf86-input-citron-2.1.1.5.tar.bz2 +xf86-input-citron-2.1.5.tar.bz2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/xorg-x11-drv-citron/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 2 Feb 2006 09:38:57 -0000 1.6 +++ sources 2 Mar 2006 03:04:41 -0000 1.7 @@ -1 +1 @@ -6416d38ff38e05882991b29608ffe56d xf86-input-citron-2.1.1.5.tar.bz2 +4a41237ebabaa115fa46a374dfd77e95 xf86-input-citron-2.1.5.tar.bz2 From fedora-cvs-commits at redhat.com Thu Mar 2 03:09:38 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 1 Mar 2006 22:09:38 -0500 Subject: rpms/xorg-x11-drv-mouse/devel .cvsignore, 1.6, 1.7 sources, 1.6, 1.7 xorg-x11-drv-mouse.spec, 1.9, 1.10 Message-ID: <200603020309.k2239cmu010027@cvs.devel.redhat.com> Author: mharris Update of /cvs/dist/rpms/xorg-x11-drv-mouse/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv9997 Modified Files: .cvsignore sources xorg-x11-drv-mouse.spec Log Message: * Wed Mar 01 2006 Mike A. Harris 1.0.4-1 - Updated to new upstream driver version mouse-1.0.4. Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/xorg-x11-drv-mouse/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 2 Feb 2006 09:50:00 -0000 1.6 +++ .cvsignore 2 Mar 2006 03:09:35 -0000 1.7 @@ -1 +1,2 @@ xf86-input-mouse-1.0.3.1.tar.bz2 +xf86-input-mouse-1.0.4.tar.bz2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/xorg-x11-drv-mouse/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 2 Feb 2006 09:50:00 -0000 1.6 +++ sources 2 Mar 2006 03:09:35 -0000 1.7 @@ -1 +1 @@ -c1235259ee9ecdcfe28e1365ef73f570 xf86-input-mouse-1.0.3.1.tar.bz2 +3e3289f99cb3ce6beccf42f6f413ac21 xf86-input-mouse-1.0.4.tar.bz2 Index: xorg-x11-drv-mouse.spec =================================================================== RCS file: /cvs/dist/rpms/xorg-x11-drv-mouse/devel/xorg-x11-drv-mouse.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- xorg-x11-drv-mouse.spec 11 Feb 2006 06:20:47 -0000 1.9 +++ xorg-x11-drv-mouse.spec 2 Mar 2006 03:09:35 -0000 1.10 @@ -6,10 +6,10 @@ Summary: Xorg X11 mouse input driver Name: xorg-x11-drv-mouse -Version: 1.0.3.1 -Release: 1.2 +Version: 1.0.4 +Release: 1 URL: http://www.x.org -Source0: http://xorg.freedesktop.org/X11R7.0/src/driver/%{tarball}-%{version}.tar.bz2 +Source0: http://xorg.freedesktop.org/releases/individual/driver/%{tarball}-%{version}.tar.bz2 License: MIT/X11 Group: User Interface/X Hardware Support BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -54,10 +54,13 @@ %{_mandir}/man4/mouse-driver.4* %changelog -* Fri Feb 10 2006 Jesse Keating - 1.0.3.1-1.2 +* Wed Mar 01 2006 Mike A. Harris 1.0.4-1 +- Updated to new upstream driver version mouse-1.0.4. + +* Fri Feb 10 2006 Jesse Keating 1.0.3.1-1.2 - bump again for double-long bug on ppc(64) -* Tue Feb 07 2006 Jesse Keating - 1.0.3.1-1.1 +* Tue Feb 07 2006 Jesse Keating 1.0.3.1-1.1 - rebuilt for new gcc4.1 snapshot and glibc changes * Wed Jan 18 2006 Mike A. Harris 1.0.3.1-1 @@ -78,10 +81,10 @@ * Wed Nov 16 2005 Mike A. Harris 1.0.1-1 - Updated xorg-x11-drv-mouse to version 1.0.1 from X11R7 RC2 -* Fri Nov 4 2005 Mike A. Harris 1.0.0.1-1 +* Fri Nov 04 2005 Mike A. Harris 1.0.0.1-1 - Updated xorg-x11-drv-mouse to version 1.0.0.1 from X11R7 RC1 - Fix *.la file removal. -* Fri Sep 2 2005 Mike A. Harris 1.0.0-0 +* Fri Sep 02 2005 Mike A. Harris 1.0.0-0 - Initial spec file for mouse input driver generated automatically by my xorg-driverspecgen script. From fedora-cvs-commits at redhat.com Thu Mar 2 03:11:53 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 1 Mar 2006 22:11:53 -0500 Subject: rpms/frysk/devel frysk.spec,1.31,1.32 Message-ID: <200603020311.k223BrPa010975@cvs.devel.redhat.com> Author: cagney Update of /cvs/dist/rpms/frysk/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv10161 Modified Files: frysk.spec Log Message: * Wed Mar 01 2006 Andrew Cagney 0.0.1.2006.02.19.rh2-0.FC5.1 - Add dependencies on latest Java-GNOME bindings. Index: frysk.spec =================================================================== RCS file: /cvs/dist/rpms/frysk/devel/frysk.spec,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- frysk.spec 1 Mar 2006 21:21:09 -0000 1.31 +++ frysk.spec 2 Mar 2006 03:11:50 -0000 1.32 @@ -1,7 +1,7 @@ Summary: Frysk execution analysis tool Name: frysk Version: 0.0.1.2006.02.19.rh2 -Release: 0.FC5.0 +Release: 0.FC5.1 License: GPL Group: Development/System URL: http://sourceware.org/frysk @@ -9,19 +9,19 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-root -Requires: libgtk-java >= 2.8.3 -Requires: libglade-java >= 2.12.2 -Requires: libvte-java >= 0.11.11 +Requires: libgtk-java >= 2.8.3.0.20060301.rh1 +Requires: libglade-java >= 2.12.2.0.20060301.rh1 +Requires: libvte-java >= 0.11.11.0.20060301.rh1 BuildRequires: junit >= 3.8.1 BuildRequires: antlr >= 2.7.4 BuildRequires: transfig >= 3.2.0 BuildRequires: jdom >= 1.0 -BuildRequires: libgtk-java-devel >= 2.8.3 -BuildRequires: libglade-java-devel >= 2.12.2 -BuildRequires: cairo-java-devel >= 1.0.2 +BuildRequires: libgtk-java-devel >= 2.8.3.0.20060301.rh1 +BuildRequires: libglade-java-devel >= 2.12.2.0.20060301.rh1 +BuildRequires: cairo-java-devel >= 1.0.2.0.20060301.rh1 BuildRequires: cairo-devel >= 1.0.0 BuildRequires: gtk2-devel >= 2.8.0 -BuildRequires: libvte-java-devel >= 0.11.11 +BuildRequires: libvte-java-devel >= 0.11.11.0.20060301.rh1 BuildRequires: vte-devel >= 0.11.11 BuildRequires: xmlto @@ -87,6 +87,9 @@ %{_libexecdir}/frysk/* %changelog +* Wed Mar 01 2006 Andrew Cagney 0.0.1.2006.02.19.rh2-0.FC5.1 +- Add dependencies on latest Java-GNOME bindings. + * Wed Mar 01 2006 Andrew Cagney 0.0.1.2006.02.19.rh2-0.FC5.0 - Import frysk 0.0.1.2006.02.19.rh2; works around bug #180637. - Enable x86_64, update *-java BuildRequires; fix bug #183538. From fedora-cvs-commits at redhat.com Thu Mar 2 04:06:53 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 1 Mar 2006 23:06:53 -0500 Subject: rpms/kernel/FC-4 kernel-2.6.spec, 1.1608, 1.1609 linux-2.6-compile-fixes.patch, 1.7, 1.8 Message-ID: <200603020406.k2246rjY015004@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv14987 Modified Files: kernel-2.6.spec linux-2.6-compile-fixes.patch Log Message: build fix Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-4/kernel-2.6.spec,v retrieving revision 1.1608 retrieving revision 1.1609 diff -u -r1.1608 -r1.1609 --- kernel-2.6.spec 1 Mar 2006 23:45:56 -0000 1.1608 +++ kernel-2.6.spec 2 Mar 2006 04:06:36 -0000 1.1609 @@ -846,7 +846,7 @@ # # misc small stuff to make things compile or otherwise improve performance # -#%patch10004 -p1 +%patch10004 -p1 # END OF PATCH APPLICATIONS linux-2.6-compile-fixes.patch: types.h | 1 + 1 files changed, 1 insertion(+) Index: linux-2.6-compile-fixes.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-4/linux-2.6-compile-fixes.patch,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- linux-2.6-compile-fixes.patch 6 Jan 2006 05:42:17 -0000 1.7 +++ linux-2.6-compile-fixes.patch 2 Mar 2006 04:06:50 -0000 1.8 @@ -0,0 +1,10 @@ +--- linux-2.6.15/include/linux/types.h~ 2006-03-01 23:05:24.000000000 -0500 ++++ linux-2.6.15/include/linux/types.h 2006-03-01 23:05:57.000000000 -0500 +@@ -8,6 +8,7 @@ + (((bits)+BITS_PER_LONG-1)/BITS_PER_LONG) + #define DECLARE_BITMAP(name,bits) \ + unsigned long name[BITS_TO_LONGS(bits)] ++#define BITS_PER_BYTE 8 + #endif + + #include From fedora-cvs-commits at redhat.com Thu Mar 2 04:33:50 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 1 Mar 2006 23:33:50 -0500 Subject: rpms/kernel/FC-4 linux-2.6-compile-fixes.patch,1.8,1.9 Message-ID: <200603020433.k224Xoc7005776@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv5731 Modified Files: linux-2.6-compile-fixes.patch Log Message: more fixing :-/ linux-2.6-compile-fixes.patch: fs/nfs/direct.c | 35 +++++++++++++++++------------------ include/linux/types.h | 1 + 2 files changed, 18 insertions(+), 18 deletions(-) Index: linux-2.6-compile-fixes.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-4/linux-2.6-compile-fixes.patch,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- linux-2.6-compile-fixes.patch 2 Mar 2006 04:06:50 -0000 1.8 +++ linux-2.6-compile-fixes.patch 2 Mar 2006 04:33:46 -0000 1.9 @@ -8,3 +8,55 @@ #endif #include + +--- linux-2.6.15/fs/nfs/direct.c~ 2006-03-01 23:31:37.000000000 -0500 ++++ linux-2.6.15/fs/nfs/direct.c 2006-03-01 23:32:01.000000000 -0500 +@@ -73,6 +73,23 @@ struct nfs_direct_req { + error; /* any reported error */ + }; + ++/** ++ * nfs_free_user_pages - tear down page struct array ++ * @pages: array of page struct pointers underlying target buffer ++ * @npages: number of pages in the array ++ * @do_dirty: dirty the pages as we release them ++ */ ++static void ++nfs_free_user_pages(struct page **pages, int npages, int do_dirty) ++{ ++ int i; ++ for (i = 0; i < npages; i++) { ++ if (do_dirty) ++ set_page_dirty_lock(pages[i]); ++ page_cache_release(pages[i]); ++ } ++ kfree(pages); ++} + + /** + * nfs_get_user_pages - find and set up pages underlying user's buffer +@@ -117,24 +134,6 @@ nfs_get_user_pages(int rw, unsigned long + } + + /** +- * nfs_free_user_pages - tear down page struct array +- * @pages: array of page struct pointers underlying target buffer +- * @npages: number of pages in the array +- * @do_dirty: dirty the pages as we release them +- */ +-static void +-nfs_free_user_pages(struct page **pages, int npages, int do_dirty) +-{ +- int i; +- for (i = 0; i < npages; i++) { +- if (do_dirty) +- set_page_dirty_lock(pages[i]); +- page_cache_release(pages[i]); +- } +- kfree(pages); +-} +- +-/** + * nfs_direct_req_release - release nfs_direct_req structure for direct read + * @kref: kref object embedded in an nfs_direct_req structure + * From fedora-cvs-commits at redhat.com Thu Mar 2 04:38:04 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 1 Mar 2006 23:38:04 -0500 Subject: rpms/kernel/devel kernel-2.6.spec, 1.2003, 1.2004 linux-2.6-selinux-selinuxfs-hard-link-count.patch, 1.1, 1.2 Message-ID: <200603020438.k224c3hI006729@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv6677 Modified Files: kernel-2.6.spec linux-2.6-selinux-selinuxfs-hard-link-count.patch Log Message: Further fixing of selinuxfs link count. (#182001) Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.2003 retrieving revision 1.2004 diff -u -r1.2003 -r1.2004 --- kernel-2.6.spec 1 Mar 2006 20:51:03 -0000 1.2003 +++ kernel-2.6.spec 2 Mar 2006 04:38:00 -0000 1.2004 @@ -1587,6 +1587,7 @@ * Wed Mar 1 2006 Dave Jones - 2.6.16rc5-git4 - Fix leak in RAID1 +- Further fixing of selinuxfs link count. (#182001) * Tue Feb 28 2006 Dave Jones - 2.6.16rc5-git3 linux-2.6-selinux-selinuxfs-hard-link-count.patch: linux-2.6.16-rc4-mm2.w/security/selinux/selinuxfs.c | 11 +++++++---- linux-2.6.16-rc4.w/security/selinux/selinuxfs.c | 4 ++++ 2 files changed, 11 insertions(+), 4 deletions(-) Index: linux-2.6-selinux-selinuxfs-hard-link-count.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-selinux-selinuxfs-hard-link-count.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- linux-2.6-selinux-selinuxfs-hard-link-count.patch 20 Feb 2006 19:06:58 -0000 1.1 +++ linux-2.6-selinux-selinuxfs-hard-link-count.patch 2 Mar 2006 04:38:00 -0000 1.2 @@ -1,4 +1,5 @@ Fix the hard link count for selinuxfs directories. +https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=182001 Signed-off-by: James Morris @@ -28,3 +29,58 @@ d_add(dentry, inode); bool_dir = dentry; ret = sel_make_bools(); + + +diff -purN -X dontdiff linux-2.6.16-rc4-mm2.o/security/selinux/selinuxfs.c linux-2.6.16-rc4-mm2.w/security/selinux/selinuxfs.c +--- linux-2.6.16-rc4-mm2.o/security/selinux/selinuxfs.c 2006-02-25 00:29:32.000000000 -0500 ++++ linux-2.6.16-rc4-mm2.w/security/selinux/selinuxfs.c 2006-02-25 12:35:26.000000000 -0500 +@@ -1177,12 +1177,12 @@ out: + return ret; + } + +-static int sel_make_dir(struct super_block *sb, struct dentry *dentry) ++static int sel_make_dir(struct inode *dir, struct dentry *dentry) + { + int ret = 0; + struct inode *inode; + +- inode = sel_make_inode(sb, S_IFDIR | S_IRUGO | S_IXUGO); ++ inode = sel_make_inode(dir->i_sb, S_IFDIR | S_IRUGO | S_IXUGO); + if (!inode) { + ret = -ENOMEM; + goto out; +@@ -1192,6 +1192,8 @@ static int sel_make_dir(struct super_blo + /* directory inodes start off with i_nlink == 2 (for "." entry) */ + inode->i_nlink++; + d_add(dentry, inode); ++ /* bump link count on parent directory, too */ ++ dir->i_nlink++; + out: + return ret; + } +@@ -1200,7 +1202,7 @@ static int sel_fill_super(struct super_b + { + int ret; + struct dentry *dentry; +- struct inode *inode; ++ struct inode *inode, *root_inode; + struct inode_security_struct *isec; + + static struct tree_descr selinux_files[] = { +@@ -1267,6 +1267,7 @@ static int sel_fill_super(struct super_b + d_add(dentry, inode); + selinux_null = dentry; + ++ root_inode = sb->s_root->d_inode; + dentry = d_alloc_name(sb->s_root, "avc"); + if (!dentry) + return -ENOMEM; +@@ -1272,7 +1272,7 @@ static int sel_fill_super(struct super_b + if (!dentry) + return -ENOMEM; + +- ret = sel_make_dir(sb, dentry); ++ ret = sel_make_dir(root_inode, dentry); + if (ret) + goto out; + From fedora-cvs-commits at redhat.com Thu Mar 2 04:47:20 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 1 Mar 2006 23:47:20 -0500 Subject: rpms/kernel/devel linux-2.6-sata-promise-pata-ports.patch, NONE, 1.1 kernel-2.6.spec, 1.2004, 1.2005 Message-ID: <200603020447.k224lK9i023315@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv23269 Modified Files: kernel-2.6.spec Added Files: linux-2.6-sata-promise-pata-ports.patch Log Message: Enable PATA ports on Promise SATA. (#179369) linux-2.6-sata-promise-pata-ports.patch: drivers/scsi/libata-core.c | 1 drivers/scsi/sata_promise.c | 52 ++++++++++++++++++++++++++++++++++++++------ include/linux/libata.h | 1 3 files changed, 48 insertions(+), 6 deletions(-) --- NEW FILE linux-2.6-sata-promise-pata-ports.patch --- This will update the following files: drivers/scsi/libata-core.c include/linux/libata.h drivers/scsi/sata_promise.c through these ChangeSets: o [libata sata_promise] support PATA ports on SATA controllers diff -Nru a/drivers/scsi/libata-core.c b/drivers/scsi/libata-core.c --- a/drivers/scsi/libata-core.c 2006-02-08 11:34:51.000000000 -0700 +++ b/drivers/scsi/libata-core.c 2006-02-08 11:37:11.000000000 -0700 @@ -4423,6 +4423,7 @@ ap->mwdma_mask = ent->mwdma_mask; ap->udma_mask = ent->udma_mask; ap->flags |= ent->host_flags; + ap->flags |= ent->port_flags[port_no]; /* pata fix */ ap->ops = ent->port_ops; ap->cbl = ATA_CBL_NONE; ap->active_tag = ATA_TAG_POISON; diff -Nru a/drivers/scsi/sata_promise.c b/drivers/scsi/sata_promise.c --- a/drivers/scsi/sata_promise.c 2006-02-08 10:08:08.000000000 -0700 +++ b/drivers/scsi/sata_promise.c 2006-02-08 11:26:47.000000000 -0700 @@ -165,7 +165,7 @@ /* board_2037x */ { .sht = &pdc_ata_sht, - .host_flags = PDC_COMMON_FLAGS | ATA_FLAG_SATA, + .host_flags = PDC_COMMON_FLAGS /* | ATA_FLAG_SATA */, /* pata fix */ .pio_mask = 0x1f, /* pio0-4 */ .mwdma_mask = 0x07, /* mwdma0-2 */ .udma_mask = 0x7f, /* udma0-6 ; FIXME */ @@ -322,15 +322,34 @@ static void pdc_sata_phy_reset(struct ata_port *ap) { - pdc_reset_port(ap); - sata_phy_reset(ap); +/* pdc_reset_port(ap); */ /* pata fix */ +/* sata_phy_reset(ap); */ /* pata fix */ + /* if no sata flag, test for pata drive */ /* pata fix */ + if (ap->flags & ATA_FLAG_SATA) /* pata fix */ + { /* pata fix */ + pdc_reset_port(ap); /* pata fix */ + sata_phy_reset(ap); /* pata fix */ + } /* pata fix */ + else /* pata fix */ + pdc_pata_phy_reset(ap); /* pata fix */ } static void pdc_pata_phy_reset(struct ata_port *ap) { /* FIXME: add cable detect. Don't assume 40-pin cable */ - ap->cbl = ATA_CBL_PATA40; - ap->udma_mask &= ATA_UDMA_MASK_40C; +/* ap->cbl = ATA_CBL_PATA40; */ /* pata fix */ +/* ap->udma_mask &= ATA_UDMA_MASK_40C; */ /* pata fix */ + /* add cable detection code for pata drives */ /* pata fix */ + u8 tmp; /* pata fix */ + void *mmio = (void *) ap->ioaddr.cmd_addr + PDC_CTLSTAT + 0x03; /* pata fix */ + tmp = readb(mmio); /* pata fix */ + if (tmp & 0x01) /* pata fix */ + { /* pata fix */ + ap->cbl = ATA_CBL_PATA40; /* pata fix */ + ap->udma_mask &= ATA_UDMA_MASK_40C; /* pata fix */ + } /* pata fix */ + else /* pata fix */ + ap->cbl = ATA_CBL_PATA80; /* pata fix */ pdc_reset_port(ap); ata_port_probe(ap); @@ -646,6 +665,7 @@ unsigned int board_idx = (unsigned int) ent->driver_data; int pci_dev_busy = 0; int rc; + u8 tmp; /* pata fix */ if (!printed_version++) dev_printk(KERN_DEBUG, &pdev->dev, "version " DRV_VERSION "\n"); @@ -705,6 +725,9 @@ probe_ent->port[0].scr_addr = base + 0x400; probe_ent->port[1].scr_addr = base + 0x500; + probe_ent->port_flags[0] = ATA_FLAG_SATA; /* pata fix */ + probe_ent->port_flags[1] = ATA_FLAG_SATA; /* pata fix */ + /* notice 4-port boards */ switch (board_idx) { case board_20319: @@ -715,9 +738,23 @@ probe_ent->port[2].scr_addr = base + 0x600; probe_ent->port[3].scr_addr = base + 0x700; + + probe_ent->port_flags[2] = ATA_FLAG_SATA; /* pata fix */ + probe_ent->port_flags[3] = ATA_FLAG_SATA; /* pata fix */ break; case board_2037x: - probe_ent->n_ports = 2; +/* probe_ent->n_ports = 2; */ /* pata fix */ + /* Some boards have also PATA port */ /* pata fix */ + tmp = readb(mmio_base + PDC_FLASH_CTL+1); /* pata fix */ + if (!(tmp & 0x80)) /* pata fix */ + { /* pata fix */ + probe_ent->n_ports = 3; /* pata fix */ + pdc_ata_setup_port(&probe_ent->port[2], base + 0x300); /* pata fix */ + probe_ent->port_flags[2] = ATA_FLAG_SLAVE_POSS; /* pata fix */ + printk(KERN_INFO DRV_NAME " PATA port found\n"); /* pata fix */ + } /* pata fix */ + else /* pata fix */ + probe_ent->n_ports = 2; /* pata fix */ break; case board_20771: probe_ent->n_ports = 2; @@ -730,6 +767,9 @@ probe_ent->port[2].scr_addr = base + 0x600; probe_ent->port[3].scr_addr = base + 0x700; + + probe_ent->port_flags[2] = ATA_FLAG_SATA; /* pata fix */ + probe_ent->port_flags[3] = ATA_FLAG_SATA; /* pata fix */ break; default: BUG(); diff -Nru a/include/linux/libata.h b/include/linux/libata.h --- a/include/linux/libata.h 2006-02-08 11:40:54.000000000 -0700 +++ b/include/linux/libata.h 2006-02-08 11:45:02.000000000 -0700 @@ -237,6 +237,7 @@ unsigned long irq; unsigned int irq_flags; unsigned long host_flags; + unsigned long port_flags[ATA_MAX_PORTS]; /* pata fix */ void __iomem *mmio_base; void *private_data; }; Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.2004 retrieving revision 1.2005 diff -u -r1.2004 -r1.2005 --- kernel-2.6.spec 2 Mar 2006 04:38:00 -0000 1.2004 +++ kernel-2.6.spec 2 Mar 2006 04:47:18 -0000 1.2005 @@ -390,6 +390,9 @@ Patch2102: linux-2.6-defaults-enable-sata-atapi.patch Patch2103: linux-2.6-defaults-firmware-loader-timeout.patch +# SATA Bits +Patch2200: linux-2.6-sata-promise-pata-ports.patch + # Broadcom wireless driver Patch5000: linux-2.6-softmac-git.patch Patch5001: linux-2.6-bcm43xx-git.patch @@ -397,7 +400,7 @@ # # 10000 to 20000 is for stuff that has to come last due to the -# amount of drivers they touch. But only these should go here. +# amount of drivers they touch. But only these should go here. # Not patches you're too lazy for to put in the proper place. # @@ -812,6 +815,10 @@ # Tux %patch910 -p1 +# SATA Patches +# Enable PATA ports on Promise. +%patch2200 -p1 + # # Patches 1000 to 5000 are reserved for bugfixes to drivers and filesystems # @@ -1588,6 +1595,7 @@ - 2.6.16rc5-git4 - Fix leak in RAID1 - Further fixing of selinuxfs link count. (#182001) +- Enable PATA ports on Promise SATA. (#179369) * Tue Feb 28 2006 Dave Jones - 2.6.16rc5-git3 From fedora-cvs-commits at redhat.com Thu Mar 2 05:00:05 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 2 Mar 2006 00:00:05 -0500 Subject: rpms/kernel/devel linux-2.6-NFSD-writes-shouldnt-clobber-utimes.patch, NONE, 1.1 kernel-2.6.spec, 1.2005, 1.2006 Message-ID: <200603020500.k22505Vm028712@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv28658 Modified Files: kernel-2.6.spec Added Files: linux-2.6-NFSD-writes-shouldnt-clobber-utimes.patch Log Message: NFS: writes should not clobber utimes() calls linux-2.6-NFSD-writes-shouldnt-clobber-utimes.patch: inode.c | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) --- NEW FILE linux-2.6-NFSD-writes-shouldnt-clobber-utimes.patch --- Author: Trond Myklebust NFS: writes should not clobber utimes() calls Ensure that we flush out writes in the case when someone calls utimes() in order to set the file times. Signed-off-by: Trond Myklebust --- fs/nfs/inode.c | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c index a77ee95..0524a20 100644 --- a/fs/nfs/inode.c +++ b/fs/nfs/inode.c @@ -859,11 +859,9 @@ nfs_setattr(struct dentry *dentry, struc lock_kernel(); nfs_begin_data_update(inode); - /* Write all dirty data if we're changing file permissions or size */ - if ((attr->ia_valid & (ATTR_MODE|ATTR_UID|ATTR_GID|ATTR_SIZE)) != 0) { - filemap_write_and_wait(inode->i_mapping); - nfs_wb_all(inode); - } + /* Write all dirty data */ + filemap_write_and_wait(inode->i_mapping); + nfs_wb_all(inode); /* * Return any delegations if we're going to change ACLs */ Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.2005 retrieving revision 1.2006 diff -u -r1.2005 -r1.2006 --- kernel-2.6.spec 2 Mar 2006 04:47:18 -0000 1.2005 +++ kernel-2.6.spec 2 Mar 2006 04:59:46 -0000 1.2006 @@ -332,6 +332,7 @@ Patch1200: linux-2.6-NFSD-non-null-getxattr.patch Patch1201: linux-2.6-NFSD-ctlbits.patch Patch1203: linux-2.6-NFSD-badness.patch +Patch1204: linux-2.6-NFSD-writes-shouldnt-clobber-utimes.patch # NIC driver updates Patch1301: linux-2.6-net-sundance-ip100A.patch @@ -888,6 +889,8 @@ %patch1201 -p1 # Fix badness. %patch1203 -p1 +# NFSD: writes should not clobber utimes() calls +%patch1204 -p1 # NIC driver fixes. # New PCI ID for sundance driver. @@ -1596,6 +1599,7 @@ - Fix leak in RAID1 - Further fixing of selinuxfs link count. (#182001) - Enable PATA ports on Promise SATA. (#179369) +- NFS: writes should not clobber utimes() calls. (#183208) * Tue Feb 28 2006 Dave Jones - 2.6.16rc5-git3 From fedora-cvs-commits at redhat.com Thu Mar 2 06:15:53 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 2 Mar 2006 01:15:53 -0500 Subject: rpms/kernel/devel linux-2.6-acpi_os_acquire_object-gfp_kernel-called-with-irqs.patch, NONE, 1.1 kernel-2.6.spec, 1.2006, 1.2007 Message-ID: <200603020615.k226FrBm007441@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv1476 Modified Files: kernel-2.6.spec Added Files: linux-2.6-acpi_os_acquire_object-gfp_kernel-called-with-irqs.patch Log Message: Fix acpi_os_acquire_object() with IRQs disabled debug msgs. linux-2.6-acpi_os_acquire_object-gfp_kernel-called-with-irqs.patch: osl.c | 7 ++++++- parser/psutils.c | 8 ++++++-- 2 files changed, 12 insertions(+), 3 deletions(-) --- NEW FILE linux-2.6-acpi_os_acquire_object-gfp_kernel-called-with-irqs.patch --- From: Davi Arnaut acpi_os_acquire_object() gets called, with IRQs disabled, from: Debug: sleeping function called from invalid context at mm/slab.c:2499 in_atomic():0, irqs_disabled():1 [] kmem_cache_alloc+0x40/0x4f [] acpi_os_acquire_object+0xb/0x3c [] acpi_ut_allocate_object_desc_dbg+0x13/0x49 [] acpi_ut_create_internal_object_dbg+0xf/0x5e [] acpi_rs_set_srs_method_data+0x3d/0xb9 [] acpi_pci_link_set+0x102/0x17b [] irqrouter_resume+0x1e/0x3c [] __sysdev_resume+0x11/0x6b [] sysdev_resume+0x34/0x52 [] device_power_up+0x5/0xa [] suspend_enter+0x44/0x46 [] suspend_prepare+0x63/0xc1 [] enter_state+0x5e/0x7c [] state_store+0x81/0x8f [] state_store+0x0/0x8f [] subsys_attr_store+0x1e/0x22 [] flush_write_buffer+0x22/0x28 [] sysfs_write_file+0x4c/0x71 [] sysfs_write_file+0x0/0x71 [] vfs_write+0xa2/0x15a [] sys_write+0x41/0x6a [] syscall_call+0x7/0xb The patch also fixes a missing check for NULL return from acpi_os_acquire_object(). Signed-off-by: Davi Arnaut Cc: "Brown, Len" Cc: Pavel Machek Signed-off-by: Andrew Morton --- drivers/acpi/osl.c | 7 ++++++- drivers/acpi/parser/psutils.c | 8 ++++++-- 2 files changed, 12 insertions(+), 3 deletions(-) diff -puN drivers/acpi/osl.c~acpi_os_acquire_object-gfp_kernel-called-with-irqs drivers/acpi/osl.c --- devel/drivers/acpi/osl.c~acpi_os_acquire_object-gfp_kernel-called-with-irqs 2006-02-13 16:59:30.000000000 -0800 +++ devel-akpm/drivers/acpi/osl.c 2006-02-13 16:59:30.000000000 -0800 @@ -1175,7 +1175,12 @@ acpi_status acpi_os_release_object(acpi_ void *acpi_os_acquire_object(acpi_cache_t * cache) { - void *object = kmem_cache_alloc(cache, GFP_KERNEL); + void *object; + + if (acpi_in_resume) + object = kmem_cache_alloc(cache, GFP_ATOMIC); + else + object = kmem_cache_alloc(cache, GFP_KERNEL); WARN_ON(!object); return object; } diff -puN drivers/acpi/parser/psutils.c~acpi_os_acquire_object-gfp_kernel-called-with-irqs drivers/acpi/parser/psutils.c --- devel/drivers/acpi/parser/psutils.c~acpi_os_acquire_object-gfp_kernel-called-with-irqs 2006-02-13 16:59:30.000000000 -0800 +++ devel-akpm/drivers/acpi/parser/psutils.c 2006-02-13 16:59:30.000000000 -0800 @@ -139,12 +139,16 @@ union acpi_parse_object *acpi_ps_alloc_o /* The generic op (default) is by far the most common (16 to 1) */ op = acpi_os_acquire_object(acpi_gbl_ps_node_cache); - memset(op, 0, sizeof(struct acpi_parse_obj_common)); + + if (op) + memset(op, 0, sizeof(struct acpi_parse_obj_common)); } else { /* Extended parseop */ op = acpi_os_acquire_object(acpi_gbl_ps_node_ext_cache); - memset(op, 0, sizeof(struct acpi_parse_obj_named)); + + if (op) + memset(op, 0, sizeof(struct acpi_parse_obj_named)); } /* Initialize the Op */ _ Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.2006 retrieving revision 1.2007 diff -u -r1.2006 -r1.2007 --- kernel-2.6.spec 2 Mar 2006 04:59:46 -0000 1.2006 +++ kernel-2.6.spec 2 Mar 2006 06:15:50 -0000 1.2007 @@ -394,6 +394,9 @@ # SATA Bits Patch2200: linux-2.6-sata-promise-pata-ports.patch +# ACPI bits +Patch2300: linux-2.6-acpi_os_acquire_object-gfp_kernel-called-with-irqs.patch + # Broadcom wireless driver Patch5000: linux-2.6-softmac-git.patch Patch5001: linux-2.6-bcm43xx-git.patch @@ -820,6 +823,9 @@ # Enable PATA ports on Promise. %patch2200 -p1 +# ACPI patches +%patch2300 -p1 + # # Patches 1000 to 5000 are reserved for bugfixes to drivers and filesystems # @@ -1594,6 +1600,9 @@ %endif %changelog +* Thu Mar 2 2006 Dave Jones +- Fix acpi_os_acquire_object() with IRQs disabled debug msgs. + * Wed Mar 1 2006 Dave Jones - 2.6.16rc5-git4 - Fix leak in RAID1 From fedora-cvs-commits at redhat.com Thu Mar 2 06:28:16 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 2 Mar 2006 01:28:16 -0500 Subject: rpms/kernel/devel linux-2.6-md-raid1-leak.patch,1.1,1.2 Message-ID: <200603020628.k226SGnN015146@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv15131 Modified Files: linux-2.6-md-raid1-leak.patch Log Message: Further raid1 fixing. linux-2.6-md-raid1-leak.patch: raid1.c | 13 ++++++++----- 1 files changed, 8 insertions(+), 5 deletions(-) Index: linux-2.6-md-raid1-leak.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-md-raid1-leak.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- linux-2.6-md-raid1-leak.patch 1 Mar 2006 20:07:16 -0000 1.1 +++ linux-2.6-md-raid1-leak.patch 2 Mar 2006 06:28:12 -0000 1.2 @@ -1,4 +1,23 @@ +On Wednesday March 1, mbrancaleoni at gmail.com wrote: +> Hi Neil. +> +> unfortunately the patch does nothing, the problem persists. +> Tested with 2.6.16-rc5. +> (I've double checked if the patch was applied correctly) +> +> Can I do anything to be of some more help? + +Yes, try another patch. :-) and tell me if you have CONFIG_DEBUG_SLAB +set... there was another use-after-free bug which CONFIG_DEBUG_SLAB +would have made worse. + +This patch should fix it all up. + +Thanks again, +NeilBrown + + Signed-off-by: Neil Brown ### Diffstat output From fedora-cvs-commits at redhat.com Thu Mar 2 07:33:34 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 2 Mar 2006 02:33:34 -0500 Subject: rpms/udev/devel udev-rules.patch,1.7,1.8 udev.spec,1.157,1.158 Message-ID: <200603020733.k227XYiI028301@cvs.devel.redhat.com> Author: harald Update of /cvs/dist/rpms/udev/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv28258 Modified Files: udev-rules.patch udev.spec Log Message: fixed cdrom rule udev-rules.patch: 05-udev-early.rules | 9 ++ 95-pam-console.rules | 1 hotplug.rules | 13 +++ udev.rules | 166 ++++++++++++++++++++++++++++----------------------- 4 files changed, 113 insertions(+), 76 deletions(-) Index: udev-rules.patch =================================================================== RCS file: /cvs/dist/rpms/udev/devel/udev-rules.patch,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- udev-rules.patch 1 Mar 2006 17:09:12 -0000 1.7 +++ udev-rules.patch 2 Mar 2006 07:33:00 -0000 1.8 @@ -1,5 +1,5 @@ --- udev-084/etc/udev/redhat/hotplug.rules.rhrules 2006-01-30 08:51:38.000000000 +0100 -+++ udev-084/etc/udev/redhat/hotplug.rules 2006-02-24 08:17:39.000000000 +0100 ++++ udev-084/etc/udev/redhat/hotplug.rules 2006-03-02 08:29:54.000000000 +0100 @@ -1,8 +1,15 @@ # do not call hotplug.d and dev.d for "drivers" and "module" events -SUBSYSTEM=="drivers", OPTIONS="last_rule" @@ -20,11 +20,11 @@ + +LABEL="hotplug_end" --- /dev/null 2006-02-15 18:27:05.942547250 +0100 -+++ udev-084/etc/udev/redhat/95-pam-console.rules 2006-02-24 08:17:39.000000000 +0100 ++++ udev-084/etc/udev/redhat/95-pam-console.rules 2006-03-02 08:29:54.000000000 +0100 @@ -0,0 +1 @@ +ACTION=="add", SYSFS{dev}="?*", KERNEL=="?*", RUN+="/sbin/pam_console_apply $env{DEVNAME} $env{DEVLINKS}" --- /dev/null 2006-02-15 18:27:05.942547250 +0100 -+++ udev-084/etc/udev/redhat/05-udev-early.rules 2006-02-24 17:11:23.000000000 +0100 ++++ udev-084/etc/udev/redhat/05-udev-early.rules 2006-03-02 08:29:54.000000000 +0100 @@ -0,0 +1,9 @@ +# sysfs is populated after the event is sent +ACTION=="add", DEVPATH=="/devices/*", ENV{PHYSDEVBUS}=="?*", WAIT_FOR_SYSFS="bus" @@ -36,7 +36,7 @@ + +ACTION=="add", SUBSYSTEM=="firmware", ENV{FIRMWARE}=="*", RUN="/sbin/firmware_helper", OPTIONS="last_rule" --- udev-084/etc/udev/redhat/udev.rules.rhrules 2006-01-30 08:51:38.000000000 +0100 -+++ udev-084/etc/udev/redhat/udev.rules 2006-03-01 17:49:38.000000000 +0100 ++++ udev-084/etc/udev/redhat/udev.rules 2006-03-02 08:30:33.000000000 +0100 @@ -3,47 +3,52 @@ # # default is OWNER="root" GROUP="root", MODE="0600" @@ -196,7 +196,7 @@ + SYMLINK+="floppy floppy-%k", OPTIONS+="ignore_remove, all_partitions" -KERNEL=="hd[a-z]", BUS=="ide", SYSFS{removable}=="1", RESULT=="cdrom", SYMLINK+="cdrom%e" -+KERNEL=="hd[a-z]", BUS=="ide", SYSFS{removable}=="1", PROGRAM=="check-cdrom.sh %k CDROM", SYMLINK+="cdrom cdrom-%k" ++KERNEL=="hd[a-z]", BUS=="ide", SYSFS{removable}=="1", SYSFS{device/media}=="cdrom", SYMLINK+="cdrom cdrom-%k" -KERNEL=="hd[a-z]", BUS=="ide", SYSFS{removable}=="1", PROGRAM=="/lib/udev/check-cdrom.sh %k DVD", SYMLINK+="dvd%e" -KERNEL=="sr[0-9]*", BUS=="scsi", PROGRAM=="/lib/udev/check-cdrom.sh %k DVD", SYMLINK+="dvd%e" Index: udev.spec =================================================================== RCS file: /cvs/dist/rpms/udev/devel/udev.spec,v retrieving revision 1.157 retrieving revision 1.158 diff -u -r1.157 -r1.158 --- udev.spec 1 Mar 2006 17:09:15 -0000 1.157 +++ udev.spec 2 Mar 2006 07:33:00 -0000 1.158 @@ -5,7 +5,7 @@ Summary: A userspace implementation of devfs Name: udev Version: 084 -Release: 9 +Release: 10 License: GPL Group: System Environment/Base Provides: udev-persistent = 0:%{version}-%{release} @@ -283,6 +283,9 @@ %attr(0644,root,root) %{_mandir}/man8/vol_id*.8* %changelog +* Thu Mar 02 2006 Harald Hoyer - 084-10 +- fixed cdrom rule + * Wed Mar 01 2006 Harald Hoyer - 084-9 - create non-enum device (cdrom, floppy, scanner, changer) for compatibility (random device wins) From fedora-cvs-commits at redhat.com Thu Mar 2 07:43:44 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 2 Mar 2006 02:43:44 -0500 Subject: rpms/kernel/devel linux-2.6-signal-trampolines-unwind-info.patch, NONE, 1.1 kernel-2.6.spec, 1.2007, 1.2008 Message-ID: <200603020743.k227hi4d032285@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv32225 Modified Files: kernel-2.6.spec Added Files: linux-2.6-signal-trampolines-unwind-info.patch Log Message: Mark unwind info for signal trampolines in vDSOs linux-2.6-signal-trampolines-unwind-info.patch: i386/kernel/vsyscall-sigreturn.S | 2 +- powerpc/kernel/vdso32/sigtramp.S | 2 +- powerpc/kernel/vdso64/sigtramp.S | 2 +- x86_64/ia32/vsyscall-sigreturn.S | 23 +++++++++++++++++++++-- 4 files changed, 24 insertions(+), 5 deletions(-) --- NEW FILE linux-2.6-signal-trampolines-unwind-info.patch --- --- linux-2.6.15/arch/i386/kernel/vsyscall-sigreturn.S.jj 2006-01-02 22:21:10.000000000 -0500 +++ linux-2.6.15/arch/i386/kernel/vsyscall-sigreturn.S 2006-02-21 05:10:31.000000000 -0500 @@ -44,7 +44,7 @@ __kernel_rt_sigreturn: .LSTARTCIEDLSI1: .long 0 /* CIE ID */ .byte 1 /* Version number */ - .string "zR" /* NUL-terminated augmentation string */ + .string "zRS" /* NUL-terminated augmentation string */ .uleb128 1 /* Code alignment factor */ .sleb128 -4 /* Data alignment factor */ .byte 8 /* Return address register column */ --- linux-2.6.15/arch/x86_64/ia32/vsyscall-sigreturn.S.jj 2006-01-02 22:21:10.000000000 -0500 +++ linux-2.6.15/arch/x86_64/ia32/vsyscall-sigreturn.S 2006-02-21 05:17:41.000000000 -0500 @@ -31,8 +31,27 @@ __kernel_rt_sigreturn: .size __kernel_rt_sigreturn,.-.LSTART_rt_sigreturn .section .eh_frame,"a", at progbits +.LSTARTFRAMES: + .long .LENDCIES-.LSTARTCIES +.LSTARTCIES: + .long 0 /* CIE ID */ + .byte 1 /* Version number */ + .string "zRS" /* NUL-terminated augmentation string */ + .uleb128 1 /* Code alignment factor */ + .sleb128 -4 /* Data alignment factor */ + .byte 8 /* Return address register column */ + .uleb128 1 /* Augmentation value length */ + .byte 0x1b /* DW_EH_PE_pcrel|DW_EH_PE_sdata4. */ + .byte 0x0c /* DW_CFA_def_cfa */ + .uleb128 4 + .uleb128 4 + .byte 0x88 /* DW_CFA_offset, column 0x8 */ + .uleb128 1 + .align 4 +.LENDCIES: + .long .LENDFDE2-.LSTARTFDE2 /* Length FDE */ .LSTARTFDE2: - .long .LSTARTFDE2-.LSTARTFRAME /* CIE pointer */ + .long .LSTARTFDE2-.LSTARTFRAMES /* CIE pointer */ /* HACK: The dwarf2 unwind routines will subtract 1 from the return address to get an address in the middle of the @@ -96,7 +116,7 @@ __kernel_rt_sigreturn: .long .LENDFDE3-.LSTARTFDE3 /* Length FDE */ .LSTARTFDE3: - .long .LSTARTFDE3-.LSTARTFRAME /* CIE pointer */ + .long .LSTARTFDE3-.LSTARTFRAMES /* CIE pointer */ /* HACK: See above wrt unwind library assumptions. */ .long .LSTART_rt_sigreturn-1-. /* PC-relative start address */ .long .LEND_rt_sigreturn-.LSTART_rt_sigreturn+1 --- linux-2.6.15/arch/powerpc/kernel/vdso32/sigtramp.S.jj 2006-01-02 22:21:10.000000000 -0500 +++ linux-2.6.15/arch/powerpc/kernel/vdso32/sigtramp.S 2006-02-21 05:24:12.000000000 -0500 @@ -261,7 +261,7 @@ V_FUNCTION_END(__kernel_sigtramp_rt32) .Lcie_start: .long 0 /* CIE ID */ .byte 1 /* Version number */ - .string "zR" /* NUL-terminated augmentation string */ + .string "zRS" /* NUL-terminated augmentation string */ .uleb128 4 /* Code alignment factor */ .sleb128 -4 /* Data alignment factor */ .byte 67 /* Return address register column, ap */ --- linux-2.6.15/arch/powerpc/kernel/vdso64/sigtramp.S.jj 2006-01-02 22:21:10.000000000 -0500 +++ linux-2.6.15/arch/powerpc/kernel/vdso64/sigtramp.S 2006-02-21 05:28:28.000000000 -0500 @@ -263,7 +263,7 @@ V_FUNCTION_END(__kernel_sigtramp_rt64) .Lcie_start: .long 0 /* CIE ID */ .byte 1 /* Version number */ - .string "zR" /* NUL-terminated augmentation string */ + .string "zRS" /* NUL-terminated augmentation string */ .uleb128 4 /* Code alignment factor */ .sleb128 -8 /* Data alignment factor */ .byte 67 /* Return address register column, ap */ Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.2007 retrieving revision 1.2008 diff -u -r1.2007 -r1.2008 --- kernel-2.6.spec 2 Mar 2006 06:15:50 -0000 1.2007 +++ kernel-2.6.spec 2 Mar 2006 07:43:41 -0000 1.2008 @@ -366,6 +366,7 @@ Patch1700: linux-2.6-w1-hush-debug.patch Patch1710: linux-2.6-sched-up-migration-cost.patch Patch1720: linux-2.6-md-raid1-leak.patch +Patch1730: linux-2.6-signal-trampolines-unwind-info.patch # SELinux/audit patches. Patch1800: linux-2.6-selinux-hush.patch @@ -952,6 +953,8 @@ %patch1710 -p1 # Fix RAID1 leak %patch1720 -p1 +# Mark unwind info for signal trampolines in vDSOs +%patch1730 -p1 # Silence some selinux messages. %patch1800 -p1 @@ -1602,6 +1605,7 @@ %changelog * Thu Mar 2 2006 Dave Jones - Fix acpi_os_acquire_object() with IRQs disabled debug msgs. +- Mark unwind info for signal trampolines in vDSOs * Wed Mar 1 2006 Dave Jones - 2.6.16rc5-git4 From fedora-cvs-commits at redhat.com Thu Mar 2 09:18:28 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 2 Mar 2006 04:18:28 -0500 Subject: rpms/bash/devel bash-ulimit.patch,1.6,1.7 bash.spec,1.110,1.111 Message-ID: <200603020918.k229ISBW012140@cvs.devel.redhat.com> Author: twaugh Update of /cvs/dist/rpms/bash/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv12085 Modified Files: bash-ulimit.patch bash.spec Log Message: * Thu Mar 2 2006 Tim Waugh - Fixed duplicate documentation of ulimit '-x' option introduced by ulimit patch (bug #183596). bash-ulimit.patch: builtins/ulimit.def | 8 ++++++++ doc/bash.1 | 8 +++++++- doc/bashref.texi | 8 +++++++- 3 files changed, 22 insertions(+), 2 deletions(-) Index: bash-ulimit.patch =================================================================== RCS file: /cvs/dist/rpms/bash/devel/bash-ulimit.patch,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- bash-ulimit.patch 10 Jan 2006 12:03:16 -0000 1.6 +++ bash-ulimit.patch 2 Mar 2006 09:18:26 -0000 1.7 @@ -36,16 +36,6 @@ #ifdef RLIMIT_STACK { 's', RLIMIT_STACK, 1024, "stack size", "kbytes" }, #endif -@@ -233,6 +241,9 @@ - #ifdef RLIMIT_LOCKS - { 'x', RLIMIT_LOCKS, 1, "file locks", (char *)NULL }, - #endif -+#ifdef RLIMIT_LOCKS -+ { 'x', RLIMIT_LOCKS, 1, "file locks", (char *)NULL}, -+#endif - { -1, -1, -1, (char *)NULL, (char *)NULL } - }; - #define NCMDS (sizeof(limits) / sizeof(limits[0])) --- bash-3.1/doc/bashref.texi.ulimit 2006-01-10 11:21:49.000000000 +0000 +++ bash-3.1/doc/bashref.texi 2006-01-10 11:25:06.000000000 +0000 @@ -3833,7 +3833,7 @@ @@ -77,16 +67,6 @@ @item -s The maximum stack size. -@@ -3890,6 +3896,9 @@ - @item -x - The maximum number of file locks. - -+ at item -x -+The maximum amount of file locks. -+ - @end table - - If @var{limit} is given, it is the new value of the specified resource; --- bash-3.1/doc/bash.1.ulimit 2006-01-10 11:21:49.000000000 +0000 +++ bash-3.1/doc/bash.1 2006-01-10 11:24:43.000000000 +0000 @@ -8496,7 +8496,7 @@ Index: bash.spec =================================================================== RCS file: /cvs/dist/rpms/bash/devel/bash.spec,v retrieving revision 1.110 retrieving revision 1.111 diff -u -r1.110 -r1.111 --- bash.spec 21 Feb 2006 10:36:42 -0000 1.110 +++ bash.spec 2 Mar 2006 09:18:26 -0000 1.111 @@ -220,6 +220,10 @@ %doc doc/*.ps doc/*.0 doc/*.html doc/article.txt %changelog +* Thu Mar 2 2006 Tim Waugh +- Fixed duplicate documentation of ulimit '-x' option introduced by + ulimit patch (bug #183596). + * Tue Feb 21 2006 Tim Waugh 3.1-8 - Patchlevel 10. From fedora-cvs-commits at redhat.com Thu Mar 2 09:18:35 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 2 Mar 2006 04:18:35 -0500 Subject: rpms/kexec-tools/devel kdump.init, 1.5, 1.6 kexec-tools.spec, 1.12, 1.13 Message-ID: <200603020918.k229IZrr012170@cvs.devel.redhat.com> Author: tgraf Update of /cvs/dist/rpms/kexec-tools/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv12069 Modified Files: kdump.init kexec-tools.spec Log Message: - Fix argument order when stopping kexec Index: kdump.init =================================================================== RCS file: /cvs/dist/rpms/kexec-tools/devel/kdump.init,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- kdump.init 27 Feb 2006 09:19:03 -0000 1.5 +++ kdump.init 2 Mar 2006 09:18:31 -0000 1.6 @@ -91,13 +91,13 @@ fi ;; stop) - $KEXEC -u -p + $KEXEC -p -u ;; status) echo "not implemented" ;; restart) - $KEXEC -u -p + $KEXEC -p -u load_kdump ;; condrestart) Index: kexec-tools.spec =================================================================== RCS file: /cvs/dist/rpms/kexec-tools/devel/kexec-tools.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- kexec-tools.spec 27 Feb 2006 09:19:03 -0000 1.12 +++ kexec-tools.spec 2 Mar 2006 09:18:31 -0000 1.13 @@ -1,6 +1,6 @@ Name: kexec-tools Version: 1.101 -Release: 10 +Release: 11 License: GPL Group: Applications/System Summary: The kexec/kdump userspace component. @@ -96,6 +96,9 @@ %doc TODO %changelog +* Thu Mar 02 2006 Thomas Graf - 1.101-11 +- Fix argument order when stopping kexec + * Mon Feb 27 2006 Thomas Graf - 1.101-10 - kdump7.patch o Remove elf32 core headers support for x86_64 From fedora-cvs-commits at redhat.com Thu Mar 2 09:18:57 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 2 Mar 2006 04:18:57 -0500 Subject: rpms/bash/devel bash.spec,1.111,1.112 Message-ID: <200603020918.k229IvhZ012392@cvs.devel.redhat.com> Author: twaugh Update of /cvs/dist/rpms/bash/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv12343 Modified Files: bash.spec Log Message: 3.1-9 Index: bash.spec =================================================================== RCS file: /cvs/dist/rpms/bash/devel/bash.spec,v retrieving revision 1.111 retrieving revision 1.112 diff -u -r1.111 -r1.112 --- bash.spec 2 Mar 2006 09:18:26 -0000 1.111 +++ bash.spec 2 Mar 2006 09:18:55 -0000 1.112 @@ -1,7 +1,7 @@ Version: 3.1 Name: bash Summary: The GNU Bourne Again shell (bash) version %{version}. -Release: 8 +Release: 9 Group: System Environment/Shells License: GPL Url: http://www.gnu.org/software/bash @@ -220,7 +220,7 @@ %doc doc/*.ps doc/*.0 doc/*.html doc/article.txt %changelog -* Thu Mar 2 2006 Tim Waugh +* Thu Mar 2 2006 Tim Waugh 3.1-9 - Fixed duplicate documentation of ulimit '-x' option introduced by ulimit patch (bug #183596). From fedora-cvs-commits at redhat.com Thu Mar 2 09:28:54 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 2 Mar 2006 04:28:54 -0500 Subject: rpms/emacs/devel emacs.spec,1.66,1.67 Message-ID: <200603020928.k229SsUT016631@cvs.devel.redhat.com> Author: petersen Update of /cvs/dist/rpms/emacs/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv23485 Modified Files: emacs.spec Log Message: revert re-enabling of ppc64 build (see #183304) Index: emacs.spec =================================================================== RCS file: /cvs/dist/rpms/emacs/devel/emacs.spec,v retrieving revision 1.66 retrieving revision 1.67 diff -u -r1.66 -r1.67 --- emacs.spec 28 Feb 2006 02:09:44 -0000 1.66 +++ emacs.spec 2 Mar 2006 09:28:51 -0000 1.67 @@ -1,4 +1,6 @@ # This file is encoded in UTF-8. -*- coding: utf-8 -*- +# FIXME: doesn't currently build on ppc64 +ExcludeArch: ppc64 %define emacs21 1 %define muleucs_ver current @@ -9,7 +11,7 @@ Summary: GNU Emacs text editor Name: emacs Version: 21.4 -Release: 14 +Release: 13 License: GPL URL: http://www.gnu.org/software/emacs/ Group: Applications/Editors @@ -220,7 +222,7 @@ %patch21 -p1 -b .21-leak %patch22 -p1 -b .22-iso2022 %patch23 -p1 -b .23-batch -%patch24 -p1 -b .24-x-nox +%patch24 -p1 %patch25 -p1 -b .25-scroll-margin %patch26 -p1 -b .26-xmodifier %patch27 -p1 -b .27-14.21 @@ -327,12 +329,6 @@ make -C texi tramp ) %endif -# update cc-mode manual -%if %{emacs21} -rm info/ccmode* -%else -rm -f info/cc-mode* -%endif ( cd cc-mode-%{cc_mode_ver} makeinfo cc-mode.texi ) @@ -416,6 +412,11 @@ %endif # cc-mode manual +%if %{emacs21} +rm $RPM_BUILD_ROOT%{_infodir}/ccmode* +%else +rm -f $RPM_BUILD_ROOT%{_infodir}/cc-mode* +%endif install -m 644 cc-mode-%{cc_mode_ver}/cc-mode.info* $RPM_BUILD_ROOT%{_infodir} # after everything is installed, remove info dir @@ -540,9 +541,6 @@ %endif %changelog -* Tue Feb 28 2006 Jens Petersen - 21.4-14 -- re-enable building on ppc64 - * Mon Feb 27 2006 Jens Petersen - 21.4-13 - buildrequire libXaw-devel for menus and scrollbar - pass -R to setarch to disable address randomization during dumping From fedora-cvs-commits at redhat.com Thu Mar 2 09:47:33 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 2 Mar 2006 04:47:33 -0500 Subject: rpms/emacs/devel emacs.spec,1.67,1.68 Message-ID: <200603020947.k229lXcD002413@cvs.devel.redhat.com> Author: petersen Update of /cvs/dist/rpms/emacs/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv29632 Modified Files: emacs.spec Log Message: update changelog for rest of previous commit Index: emacs.spec =================================================================== RCS file: /cvs/dist/rpms/emacs/devel/emacs.spec,v retrieving revision 1.67 retrieving revision 1.68 diff -u -r1.67 -r1.68 --- emacs.spec 2 Mar 2006 09:28:51 -0000 1.67 +++ emacs.spec 2 Mar 2006 09:47:31 -0000 1.68 @@ -541,6 +541,10 @@ %endif %changelog +* Thu Mar 2 2006 Jens Petersen +- avoid backup for fix-x-vs-no-x-diffs.dpatch (Ian Collier, #183503) +- remove the old ccmode info manual (#182084) + * Mon Feb 27 2006 Jens Petersen - 21.4-13 - buildrequire libXaw-devel for menus and scrollbar - pass -R to setarch to disable address randomization during dumping From fedora-cvs-commits at redhat.com Thu Mar 2 10:14:00 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 2 Mar 2006 05:14:00 -0500 Subject: rpms/distcache/devel distcache.spec,1.16,1.17 Message-ID: <200603021014.k22AE0SK010925@cvs.devel.redhat.com> Author: jorton Update of /cvs/dist/rpms/distcache/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv10890 Modified Files: distcache.spec Log Message: * Thu Mar 2 2006 Joe Orton 1.4.5-13 - avoid uid collision with exim (#182091) Index: distcache.spec =================================================================== RCS file: /cvs/dist/rpms/distcache/devel/distcache.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- distcache.spec 11 Feb 2006 02:26:40 -0000 1.16 +++ distcache.spec 2 Mar 2006 10:13:57 -0000 1.17 @@ -2,7 +2,7 @@ Summary: Distributed SSL session cache Name: distcache Version: 1.4.5 -Release: 12.2.1 +Release: 13 License: LGPL Group: System Environment/Daemons URL: http://www.distcache.org/ @@ -65,7 +65,7 @@ /sbin/chkconfig --add dc_client /sbin/ldconfig # Add the "distcache" user -/usr/sbin/useradd -c "Distcache" -u 93 \ +/usr/sbin/useradd -c "Distcache" -u 94 \ -s /sbin/nologin -r -d / distcache 2> /dev/null || : %preun @@ -101,6 +101,9 @@ %{_mandir}/man2/* %changelog +* Thu Mar 2 2006 Joe Orton 1.4.5-13 +- avoid uid collision with exim (#182091) + * Fri Feb 10 2006 Jesse Keating - 1.4.5-12.2.1 - bump again for double-long bug on ppc(64) From fedora-cvs-commits at redhat.com Thu Mar 2 11:47:28 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 2 Mar 2006 06:47:28 -0500 Subject: rpms/glibc/devel .cvsignore, 1.140, 1.141 glibc-fedora.patch, 1.139, 1.140 glibc.spec, 1.225, 1.226 sources, 1.162, 1.163 Message-ID: <200603021147.k22BlSeT022752@cvs.devel.redhat.com> Author: jakub Update of /cvs/dist/rpms/glibc/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv22708/devel Modified Files: .cvsignore glibc-fedora.patch glibc.spec sources Log Message: auto-import glibc-2.3.91-1 on branch devel from glibc-2.3.91-1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/glibc/devel/.cvsignore,v retrieving revision 1.140 retrieving revision 1.141 diff -u -r1.140 -r1.141 --- .cvsignore 1 Mar 2006 09:47:51 -0000 1.140 +++ .cvsignore 2 Mar 2006 11:47:25 -0000 1.141 @@ -1,2 +1,2 @@ -glibc-20060301T0647.tar.bz2 -glibc-fedora-20060301T0647.tar.bz2 +glibc-20060302T0855.tar.bz2 +glibc-fedora-20060302T0855.tar.bz2 glibc-fedora.patch: ChangeLog | 85 ++++++ ChangeLog.11 | 21 + ChangeLog.12 | 12 ChangeLog.15 | 45 +++ config.h.in | 3 csu/elf-init.c | 17 + debug/tst-chk1.c | 7 elf/check-textrel.c | 9 elf/ldconfig.c | 38 ++ elf/tst-stackguard1.c | 8 iconv/iconvconfig.c | 55 ++- include/bits/stdlib-ldbl.h | 1 include/bits/wchar-ldbl.h | 1 include/features.h | 8 intl/locale.alias | 2 libio/bits/stdio2.h | 19 + libio/stdio.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/no_NO | 69 ++++ localedata/locales/zh_TW | 6 malloc/malloc.c | 18 - malloc/mcheck.c | 30 +- malloc/mtrace.c | 20 + nptl/ChangeLog | 19 + nptl/Makefile | 8 nptl/sysdeps/unix/sysv/linux/kernel-features.h | 6 nptl/tst-stackguard1.c | 8 nscd/connections.c | 15 + nscd/nscd.c | 4 nscd/nscd.conf | 4 nscd/nscd.init | 19 - posix/Makefile | 19 - posix/getconf.speclist.h | 15 + sysdeps/generic/dl-cache.h | 8 sysdeps/ia64/Makefile | 4 sysdeps/ia64/ia64libgcc.S | 350 ------------------------- sysdeps/ia64/libgcc-compat.c | 84 ++++++ sysdeps/powerpc/powerpc32/configure | 29 ++ sysdeps/powerpc/powerpc32/configure.in | 14 + sysdeps/unix/nice.c | 7 sysdeps/unix/sysv/linux/dl-osinfo.h | 29 ++ sysdeps/unix/sysv/linux/futimesat.c | 23 - 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/tcsetattr.c | 32 ++ 54 files changed, 868 insertions(+), 472 deletions(-) Index: glibc-fedora.patch =================================================================== RCS file: /cvs/dist/rpms/glibc/devel/glibc-fedora.patch,v retrieving revision 1.139 retrieving revision 1.140 diff -u -r1.139 -r1.140 --- glibc-fedora.patch 1 Mar 2006 12:33:03 -0000 1.139 +++ glibc-fedora.patch 2 Mar 2006 11:47:25 -0000 1.140 @@ -1,6 +1,27 @@ ---- glibc-20060301T0647/ChangeLog 1 Mar 2006 06:38:57 -0000 1.10036 -+++ glibc-20060301T0647-fedora/ChangeLog 1 Mar 2006 06:55:37 -0000 1.8782.2.165 -@@ -804,6 +804,11 @@ +--- glibc-20060302T0855/ChangeLog 2 Mar 2006 04:49:45 -0000 1.10046 ++++ glibc-20060302T0855-fedora/ChangeLog 2 Mar 2006 09:59:46 -0000 1.8782.2.168 +@@ -1,3 +1,20 @@ ++2006-03-02 Jakub Jelinek ++ ++ * malloc/malloc.c (MALLOC_ALIGNMENT): Set to __alignof__ (long double) ++ if long double is more aligned than 2 * SIZE_SZ. ++ (misaligned_chunk): Define. ++ (public_rEALLOc, _int_free, _int_realloc): Use it. ++ ++2006-03-02 Jakub Jelinek ++ ++ * elf/check-textrel.c: Include config.h. ++ (AB(handle_file)): Don't fail if PF_X | PF_W on architectures known ++ to have executable writable PLT. ++ * sysdeps/powerpc/powerpc32/configure.in (HAVE_PPC_SECURE_PLT): New ++ test. ++ * sysdeps/powerpc/powerpc32/configure: Rebuilt. ++ * config.h.in (HAVE_PPC_SECURE_PLT): Add. ++ + 2006-01-05 H.J. Lu + + [BZ #2013] +@@ -859,6 +876,11 @@ (__MATHDECL_2): Use __REDIRECT_NTH instead of __REDIRECT followed by __THROW. @@ -12,7 +33,7 @@ 2006-02-02 Ulrich Drepper * sysdeps/unix/sysv/linux/futimesat.c [__NR_futimesat] -@@ -863,6 +868,11 @@ +@@ -918,6 +940,11 @@ * sysdeps/ieee754/ldbl-128/s_llrintl.c (__llrintl): Fix a typo. * sysdeps/s390/fpu/libm-test-ulps: Remove llrint ulps. @@ -24,7 +45,7 @@ 2006-01-19 Thomas Schwinge * libio/genops.c: Include . -@@ -3289,6 +3299,10 @@ +@@ -3344,6 +3371,10 @@ * elf/order2mod2.c (init): Cast ignored value to void. @@ -35,7 +56,7 @@ 2005-12-27 Ulrich Drepper * elf/tst-tls13.c (do_test): Avoid using the library path when -@@ -3572,6 +3586,26 @@ +@@ -3627,6 +3658,26 @@ * sysdeps/unix/sysv/linux/time.c: If __NR_time is not defined, use sysdeps/unix/time.c implementation. @@ -62,7 +83,7 @@ 2005-12-19 Ulrich Drepper [BZ #1955] -@@ -6690,6 +6724,11 @@ +@@ -6745,6 +6796,11 @@ R_ARM_TLS_TPOFF32, R_ARM_TLS_GD32, R_ARM_TLS_LDM32, R_ARM_TLS_LDO32, R_ARM_TLS_IE32, R_ARM_TLS_LE32): New macros. @@ -74,7 +95,7 @@ 2005-10-03 Roland McGrath * sysdeps/powerpc/nofpu: Directory removed, saved in ports repository. -@@ -7684,6 +7723,12 @@ +@@ -7739,6 +7795,12 @@ * argp/argp-help.c (__argp_error): __asprintf -> vasprintf. (__argp_failure): Likewise. @@ -87,7 +108,7 @@ 2005-08-08 Ulrich Drepper * nscd/cache.c (cache_add): Commit hash table and header to disk. -@@ -7808,6 +7853,17 @@ +@@ -7863,6 +7925,17 @@ __syslog_chk. * misc/Versions: Export __syslog_chk and __vsyslog_chk. @@ -105,7 +126,7 @@ 2005-07-28 Thomas Schwinge [BZ #1137] -@@ -10868,6 +10924,18 @@ +@@ -10923,6 +10996,18 @@ * scripts/soversions.awk: Fix default version set handling. @@ -124,8 +145,8 @@ 2005-02-10 Roland McGrath [BZ #157] ---- glibc-20060301T0647/ChangeLog.11 10 Nov 2000 03:31:36 -0000 1.1 -+++ glibc-20060301T0647-fedora/ChangeLog.11 22 Sep 2004 21:20:47 -0000 1.1.4.1 +--- glibc-20060302T0855/ChangeLog.11 10 Nov 2000 03:31:36 -0000 1.1 ++++ glibc-20060302T0855-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. @@ -175,8 +196,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-20060301T0647/ChangeLog.12 16 Aug 2001 05:24:54 -0000 1.1 -+++ glibc-20060301T0647-fedora/ChangeLog.12 22 Sep 2004 21:20:47 -0000 1.1.4.1 +--- glibc-20060302T0855/ChangeLog.12 16 Aug 2001 05:24:54 -0000 1.1 ++++ glibc-20060302T0855-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. @@ -203,8 +224,8 @@ 2001-01-02 Franz Sirl * sysdeps/powerpc/dl-machine.c (__process_machine_rela): Fix typo. ---- glibc-20060301T0647/ChangeLog.15 16 Feb 2005 07:34:17 -0000 1.1 -+++ glibc-20060301T0647-fedora/ChangeLog.15 3 Mar 2005 17:29:57 -0000 1.1.6.2 +--- glibc-20060302T0855/ChangeLog.15 16 Feb 2005 07:34:17 -0000 1.1 ++++ glibc-20060302T0855-fedora/ChangeLog.15 3 Mar 2005 17:29:57 -0000 1.1.6.2 @@ -477,6 +477,14 @@ 2004-11-26 Jakub Jelinek @@ -285,8 +306,20 @@ 2004-08-30 Roland McGrath * scripts/extract-abilist.awk: If `lastversion' variable defined, omit ---- glibc-20060301T0647/csu/elf-init.c 5 Nov 2005 17:41:38 -0000 1.8 -+++ glibc-20060301T0647-fedora/csu/elf-init.c 15 Nov 2005 09:54:10 -0000 1.3.2.6 +--- glibc-20060302T0855/config.h.in 22 Feb 2006 02:09:03 -0000 1.78 ++++ glibc-20060302T0855-fedora/config.h.in 2 Mar 2006 09:59:02 -0000 1.70.2.5 +@@ -200,6 +200,9 @@ + /* Define if your assembler and linker support R_PPC_REL16* relocs. */ + #undef HAVE_ASM_PPC_REL16 + ++/* Define if your compiler defaults to -msecure-plt mode on ppc. */ ++#undef HAVE_PPC_SECURE_PLT ++ + /* Define if __stack_chk_guard canary should be randomized at program startup. */ + #undef ENABLE_STACKGUARD_RANDOMIZE + +--- glibc-20060302T0855/csu/elf-init.c 5 Nov 2005 17:41:38 -0000 1.8 ++++ glibc-20060302T0855-fedora/csu/elf-init.c 15 Nov 2005 09:54:10 -0000 1.3.2.6 @@ -49,6 +49,23 @@ extern void (*__init_array_end []) (int, extern void (*__fini_array_start []) (void) attribute_hidden; extern void (*__fini_array_end []) (void) attribute_hidden; @@ -311,8 +344,8 @@ /* These function symbols are provided for the .init/.fini section entry points automagically by the linker. */ ---- glibc-20060301T0647/debug/tst-chk1.c 22 Aug 2005 15:12:34 -0000 1.14 -+++ glibc-20060301T0647-fedora/debug/tst-chk1.c 24 Aug 2005 07:23:26 -0000 1.1.2.15 +--- glibc-20060302T0855/debug/tst-chk1.c 22 Aug 2005 15:12:34 -0000 1.14 ++++ glibc-20060302T0855-fedora/debug/tst-chk1.c 24 Aug 2005 07:23:26 -0000 1.1.2.15 @@ -17,6 +17,9 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ @@ -341,8 +374,34 @@ # define O 0 #else # define O 1 ---- glibc-20060301T0647/elf/ldconfig.c 1 Jan 2006 19:15:56 -0000 1.52 -+++ glibc-20060301T0647-fedora/elf/ldconfig.c 2 Jan 2006 10:52:50 -0000 1.47.2.7 +--- glibc-20060302T0855/elf/check-textrel.c 12 Jan 2006 00:23:10 -0000 1.7 ++++ glibc-20060302T0855-fedora/elf/check-textrel.c 2 Mar 2006 09:59:03 -0000 1.5.2.2 +@@ -18,6 +18,7 @@ + Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA + 02111-1307 USA. */ + ++#include "config.h" + #include + #include + #include +@@ -88,7 +89,15 @@ AB(handle_file) (const char *fname, int + { + printf ("%s: segment %zu is executable and writable\n", + fname, cnt); ++#if !defined __sparc__ \ ++ && !defined __alpha__ \ ++ && (!defined __powerpc__ || defined __powerpc64__ || defined HAVE_PPC_SECURE_PLT) ++ /* sparc, sparc64, alpha and powerpc32 (the last one only when using ++ -mbss-plt) are expected to have PF_X | PF_W segment containing .plt ++ section, it is part of their ABI. It is bad security wise, nevertheless ++ this test shouldn't fail because of this. */ + return 1; ++#endif + } + + if (dynphdr == NULL) +--- glibc-20060302T0855/elf/ldconfig.c 1 Jan 2006 19:15:56 -0000 1.52 ++++ glibc-20060302T0855-fedora/elf/ldconfig.c 2 Jan 2006 10:52:50 -0000 1.47.2.7 @@ -693,7 +693,18 @@ search_dir (const struct dir_entry *entr #endif !is_hwcap_platform (direntry->d_name))) @@ -444,8 +503,8 @@ } search_dirs (); ---- glibc-20060301T0647/elf/tst-stackguard1.c 26 Jun 2005 18:08:36 -0000 1.1 -+++ glibc-20060301T0647-fedora/elf/tst-stackguard1.c 8 Aug 2005 21:24:27 -0000 1.1.2.3 +--- glibc-20060302T0855/elf/tst-stackguard1.c 26 Jun 2005 18:08:36 -0000 1.1 ++++ glibc-20060302T0855-fedora/elf/tst-stackguard1.c 8 Aug 2005 21:24:27 -0000 1.1.2.3 @@ -160,17 +160,21 @@ do_test (void) the 16 runs, something is very wrong. */ int ndifferences = 0; @@ -470,8 +529,8 @@ { puts ("stack guard canaries are not randomized enough"); puts ("nor equal to the default canary value"); ---- glibc-20060301T0647/iconv/iconvconfig.c 1 Jan 2006 19:15:56 -0000 1.25 -+++ glibc-20060301T0647-fedora/iconv/iconvconfig.c 2 Jan 2006 10:52:50 -0000 1.19.2.6 +--- glibc-20060302T0855/iconv/iconvconfig.c 1 Jan 2006 19:15:56 -0000 1.25 ++++ glibc-20060302T0855-fedora/iconv/iconvconfig.c 2 Jan 2006 10:52:50 -0000 1.19.2.6 @@ -1011,6 +1011,34 @@ next_prime (uint32_t seed) module name offset (following last entry with step count 0) @@ -548,8 +607,8 @@ /* Open the output file. */ if (output_file == NULL) { ---- glibc-20060301T0647/include/features.h 5 Jan 2006 12:25:35 -0000 1.42 -+++ glibc-20060301T0647-fedora/include/features.h 6 Jan 2006 09:23:23 -0000 1.35.2.11 +--- glibc-20060302T0855/include/features.h 5 Jan 2006 12:25:35 -0000 1.42 ++++ glibc-20060302T0855-fedora/include/features.h 6 Jan 2006 09:23:23 -0000 1.35.2.11 @@ -275,7 +275,13 @@ #endif @@ -565,16 +624,16 @@ # if _FORTIFY_SOURCE > 1 # define __USE_FORTIFY_LEVEL 2 # else ---- glibc-20060301T0647/include/bits/stdlib-ldbl.h 1 Jan 1970 00:00:00 -0000 -+++ glibc-20060301T0647-fedora/include/bits/stdlib-ldbl.h 1 Feb 2006 09:30:43 -0000 1.1.2.1 +--- glibc-20060302T0855/include/bits/stdlib-ldbl.h 1 Jan 1970 00:00:00 -0000 ++++ glibc-20060302T0855-fedora/include/bits/stdlib-ldbl.h 1 Feb 2006 09:30:43 -0000 1.1.2.1 @@ -0,0 +1 @@ +#include ---- glibc-20060301T0647/include/bits/wchar-ldbl.h 1 Jan 1970 00:00:00 -0000 -+++ glibc-20060301T0647-fedora/include/bits/wchar-ldbl.h 1 Feb 2006 09:30:43 -0000 1.1.2.1 +--- glibc-20060302T0855/include/bits/wchar-ldbl.h 1 Jan 1970 00:00:00 -0000 ++++ glibc-20060302T0855-fedora/include/bits/wchar-ldbl.h 1 Feb 2006 09:30:43 -0000 1.1.2.1 @@ -0,0 +1 @@ +#include ---- glibc-20060301T0647/intl/locale.alias 4 Dec 2003 07:57:47 -0000 1.23 -+++ glibc-20060301T0647-fedora/intl/locale.alias 22 Sep 2004 21:20:53 -0000 1.23.2.1 +--- glibc-20060302T0855/intl/locale.alias 4 Dec 2003 07:57:47 -0000 1.23 ++++ glibc-20060302T0855-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 @@ -584,8 +643,8 @@ norwegian nb_NO.ISO-8859-1 nynorsk nn_NO.ISO-8859-1 polish pl_PL.ISO-8859-2 ---- glibc-20060301T0647/libio/stdio.h 16 Jan 2006 20:12:21 -0000 1.86 -+++ glibc-20060301T0647-fedora/libio/stdio.h 30 Jan 2006 09:29:46 -0000 1.78.2.8 +--- glibc-20060302T0855/libio/stdio.h 16 Jan 2006 20:12:21 -0000 1.86 ++++ glibc-20060302T0855-fedora/libio/stdio.h 30 Jan 2006 09:29:46 -0000 1.78.2.8 @@ -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. */ @@ -599,8 +658,8 @@ __BEGIN_NAMESPACE_STD /* Remove file FILENAME. */ ---- glibc-20060301T0647/libio/bits/stdio2.h 19 Mar 2005 00:14:58 -0000 1.4 -+++ glibc-20060301T0647-fedora/libio/bits/stdio2.h 27 Jun 2005 13:04:16 -0000 1.1.2.6 +--- glibc-20060302T0855/libio/bits/stdio2.h 19 Mar 2005 00:14:58 -0000 1.4 ++++ glibc-20060302T0855-fedora/libio/bits/stdio2.h 27 Jun 2005 13:04:16 -0000 1.1.2.6 @@ -61,14 +61,25 @@ extern int __vfprintf_chk (FILE *__restr extern int __vprintf_chk (int __flag, __const char *__restrict __format, _G_va_list __ap); @@ -631,8 +690,8 @@ #endif ---- glibc-20060301T0647/locale/iso-4217.def 23 Sep 2005 19:07:54 -0000 1.18 -+++ glibc-20060301T0647-fedora/locale/iso-4217.def 3 Oct 2005 20:44:15 -0000 1.15.2.3 +--- glibc-20060302T0855/locale/iso-4217.def 23 Sep 2005 19:07:54 -0000 1.18 ++++ glibc-20060302T0855-fedora/locale/iso-4217.def 3 Oct 2005 20:44:15 -0000 1.15.2.3 @@ -8,6 +8,7 @@ * * !!! The list has to be sorted !!! @@ -724,8 +783,8 @@ DEFINE_INT_CURR("PYG") /* Paraguay Guarani */ DEFINE_INT_CURR("QAR") /* Qatar Rial */ DEFINE_INT_CURR("ROL") /* Romanian Leu */ ---- glibc-20060301T0647/locale/programs/3level.h 7 Dec 2005 05:47:27 -0000 1.6 -+++ glibc-20060301T0647-fedora/locale/programs/3level.h 19 Dec 2005 12:11:15 -0000 1.5.2.2 +--- glibc-20060302T0855/locale/programs/3level.h 7 Dec 2005 05:47:27 -0000 1.6 ++++ glibc-20060302T0855-fedora/locale/programs/3level.h 19 Dec 2005 12:11:15 -0000 1.5.2.2 @@ -202,6 +202,42 @@ CONCAT(TABLE,_iterate) (struct TABLE *t, } } @@ -769,8 +828,8 @@ #endif #ifndef NO_FINALIZE ---- glibc-20060301T0647/localedata/Makefile 25 Sep 2005 17:01:12 -0000 1.102 -+++ glibc-20060301T0647-fedora/localedata/Makefile 3 Oct 2005 20:44:15 -0000 1.101.2.2 +--- glibc-20060302T0855/localedata/Makefile 25 Sep 2005 17:01:12 -0000 1.102 ++++ glibc-20060302T0855-fedora/localedata/Makefile 3 Oct 2005 20:44:15 -0000 1.101.2.2 @@ -222,6 +222,7 @@ $(INSTALL-SUPPORTED-LOCALES): install-lo echo -n '...'; \ input=`echo $$locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; \ @@ -779,8 +838,8 @@ -i locales/$$input -c -f charmaps/$$charset \ $(addprefix --prefix=,$(install_root)) $$locale; \ echo ' done'; \ ---- glibc-20060301T0647/localedata/SUPPORTED 5 Nov 2005 16:25:49 -0000 1.87 -+++ glibc-20060301T0647-fedora/localedata/SUPPORTED 15 Nov 2005 08:21:56 -0000 1.71.2.8 +--- glibc-20060302T0855/localedata/SUPPORTED 5 Nov 2005 16:25:49 -0000 1.87 ++++ glibc-20060302T0855-fedora/localedata/SUPPORTED 15 Nov 2005 08:21:56 -0000 1.71.2.8 @@ -69,6 +69,7 @@ cy_GB.UTF-8/UTF-8 \ cy_GB/ISO-8859-14 \ da_DK.UTF-8/UTF-8 \ @@ -822,8 +881,8 @@ ta_IN/UTF-8 \ te_IN/UTF-8 \ tg_TJ.UTF-8/UTF-8 \ ---- glibc-20060301T0647/localedata/locales/cy_GB 28 Sep 2004 04:37:33 -0000 1.4 -+++ glibc-20060301T0647-fedora/localedata/locales/cy_GB 29 Sep 2004 08:48:23 -0000 1.3.2.2 +--- glibc-20060302T0855/localedata/locales/cy_GB 28 Sep 2004 04:37:33 -0000 1.4 ++++ glibc-20060302T0855-fedora/localedata/locales/cy_GB 29 Sep 2004 08:48:23 -0000 1.3.2.2 @@ -248,8 +248,11 @@ mon "" d_fmt "" @@ -838,8 +897,8 @@ END LC_TIME LC_MESSAGES ---- glibc-20060301T0647/localedata/locales/en_GB 31 Oct 2004 23:42:26 -0000 1.12 -+++ glibc-20060301T0647-fedora/localedata/locales/en_GB 2 Nov 2004 12:25:47 -0000 1.10.2.2 +--- glibc-20060302T0855/localedata/locales/en_GB 31 Oct 2004 23:42:26 -0000 1.12 ++++ glibc-20060302T0855-fedora/localedata/locales/en_GB 2 Nov 2004 12:25:47 -0000 1.10.2.2 @@ -112,8 +112,8 @@ mon "" d_fmt "" @@ -851,8 +910,8 @@ date_fmt "/ / " ---- glibc-20060301T0647/localedata/locales/no_NO 1 Jan 1970 00:00:00 -0000 -+++ glibc-20060301T0647-fedora/localedata/locales/no_NO 22 Sep 2004 21:21:01 -0000 1.11.2.1 +--- glibc-20060302T0855/localedata/locales/no_NO 1 Jan 1970 00:00:00 -0000 ++++ glibc-20060302T0855-fedora/localedata/locales/no_NO 22 Sep 2004 21:21:01 -0000 1.11.2.1 @@ -0,0 +1,69 @@ +escape_char / +comment_char % @@ -923,8 +982,8 @@ +LC_ADDRESS +copy "nb_NO" +END LC_ADDRESS ---- glibc-20060301T0647/localedata/locales/zh_TW 31 Oct 2004 23:42:28 -0000 1.7 -+++ glibc-20060301T0647-fedora/localedata/locales/zh_TW 2 Nov 2004 12:25:57 -0000 1.5.2.2 +--- glibc-20060302T0855/localedata/locales/zh_TW 31 Oct 2004 23:42:28 -0000 1.7 ++++ glibc-20060302T0855-fedora/localedata/locales/zh_TW 2 Nov 2004 12:25:57 -0000 1.5.2.2 @@ -1,7 +1,7 @@ comment_char % escape_char / @@ -952,8 +1011,70 @@ revision "0.2" date "2000-08-02" % ---- glibc-20060301T0647/malloc/mcheck.c 8 Sep 2004 20:36:02 -0000 1.18 -+++ glibc-20060301T0647-fedora/malloc/mcheck.c 20 Dec 2005 10:59:21 -0000 1.18.2.1 +--- glibc-20060302T0855/malloc/malloc.c 21 Nov 2005 15:43:03 -0000 1.155 ++++ glibc-20060302T0855-fedora/malloc/malloc.c 2 Mar 2006 09:59:46 -0000 1.127.2.23 +@@ -188,7 +188,8 @@ + Changing default word sizes: + + INTERNAL_SIZE_T size_t +- MALLOC_ALIGNMENT 2 * sizeof(INTERNAL_SIZE_T) ++ MALLOC_ALIGNMENT MAX (2 * sizeof(INTERNAL_SIZE_T), ++ __alignof__ (long double)) + + Configuration and functionality options: + +@@ -380,7 +381,8 @@ extern "C" { + + + #ifndef MALLOC_ALIGNMENT +-#define MALLOC_ALIGNMENT (2 * SIZE_SZ) ++#define MALLOC_ALIGNMENT (2 * SIZE_SZ < __alignof__ (long double) \ ++ ? __alignof__ (long double) : 2 * SIZE_SZ) + #endif + + /* The corresponding bit mask value */ +@@ -1807,7 +1809,11 @@ nextchunk-> +-+-+-+-+-+-+-+-+-+-+-+-+-+- + + /* Check if m has acceptable alignment */ + +-#define aligned_OK(m) (((unsigned long)((m)) & (MALLOC_ALIGN_MASK)) == 0) ++#define aligned_OK(m) (((unsigned long)(m) & MALLOC_ALIGN_MASK) == 0) ++ ++#define misaligned_chunk(p) \ ++ ((uintptr_t)(MALLOC_ALIGNMENT == 2 * SIZE_SZ ? (p) : chunk2mem (p)) \ ++ & MALLOC_ALIGN_MASK) + + + /* +@@ -3468,7 +3474,7 @@ public_rEALLOc(Void_t* oldmem, size_t by + Therefore we can exclude some size values which might appear + here by accident or by "design" from some intruder. */ + if (__builtin_expect ((uintptr_t) oldp > (uintptr_t) -oldsize, 0) +- || __builtin_expect ((uintptr_t) oldp & MALLOC_ALIGN_MASK, 0)) ++ || __builtin_expect (misaligned_chunk (oldp), 0)) + { + malloc_printerr (check_action, "realloc(): invalid pointer", oldmem); + return NULL; +@@ -4282,7 +4288,7 @@ _int_free(mstate av, Void_t* mem) + Therefore we can exclude some size values which might appear + here by accident or by "design" from some intruder. */ + if (__builtin_expect ((uintptr_t) p > (uintptr_t) -size, 0) +- || __builtin_expect ((uintptr_t) p & MALLOC_ALIGN_MASK, 0)) ++ || __builtin_expect (misaligned_chunk (p), 0)) + { + errstr = "free(): invalid pointer"; + errout: +@@ -4628,7 +4634,7 @@ _int_realloc(mstate av, Void_t* oldmem, + oldsize = chunksize(oldp); + + /* Simple tests for old block integrity. */ +- if (__builtin_expect ((uintptr_t) oldp & MALLOC_ALIGN_MASK, 0)) ++ if (__builtin_expect (misaligned_chunk (oldp), 0)) + { + errstr = "realloc(): invalid pointer"; + errout: +--- glibc-20060302T0855/malloc/mcheck.c 8 Sep 2004 20:36:02 -0000 1.18 ++++ glibc-20060302T0855-fedora/malloc/mcheck.c 20 Dec 2005 10:59:21 -0000 1.18.2.1 @@ -24,9 +24,25 @@ # include # include @@ -1029,8 +1150,8 @@ old_free_hook = __free_hook; __free_hook = freehook; ---- glibc-20060301T0647/malloc/mtrace.c 14 Sep 2004 04:24:46 -0000 1.41 -+++ glibc-20060301T0647-fedora/malloc/mtrace.c 20 Dec 2005 10:59:21 -0000 1.41.2.1 +--- glibc-20060302T0855/malloc/mtrace.c 14 Sep 2004 04:24:46 -0000 1.41 ++++ glibc-20060302T0855-fedora/malloc/mtrace.c 20 Dec 2005 10:59:21 -0000 1.41.2.1 @@ -40,6 +40,18 @@ # include # define setvbuf(s, b, f, l) INTUSE(_IO_setvbuf) (s, b, f, l) @@ -1086,21 +1207,9 @@ __memalign_hook = tr_memalignhook; __malloc_hook = tr_mallochook; ---- glibc-20060301T0647/nptl/ChangeLog 1 Mar 2006 03:37:59 -0000 1.874 -+++ glibc-20060301T0647-fedora/nptl/ChangeLog 1 Mar 2006 07:44:56 -0000 1.706.2.81 -@@ -1,3 +1,11 @@ -+2006-03-01 Jakub Jelinek -+ -+ * sysdeps/unix/sysv/linux/sparc/lowlevellock.h (lll_robust_mutex_dead, -+ lll_robust_mutex_trylock, lll_robust_mutex_lock, -+ lll_robust_mutex_cond_lock, lll_robust_mutex_timedlock, -+ lll_robust_mutex_unlock): Define. -+ (__lll_robust_lock_wait, __lll_robust_timedlock_wait): New prototypes. -+ - 2006-02-28 H.J. Lu - - * sysdeps/unix/sysv/linux/ia64/clone2.S: Include -@@ -690,6 +698,15 @@ +--- glibc-20060302T0855/nptl/ChangeLog 2 Mar 2006 00:28:24 -0000 1.876 ++++ glibc-20060302T0855-fedora/nptl/ChangeLog 2 Mar 2006 09:06:17 -0000 1.706.2.82 +@@ -711,6 +711,15 @@ Use __sigfillset. Document that sigfillset does the right thing wrt to SIGSETXID. @@ -1116,7 +1225,7 @@ 2005-07-11 Jakub Jelinek [BZ #1102] -@@ -1426,6 +1443,11 @@ +@@ -1447,6 +1456,11 @@ Move definition inside libpthread, libc, librt check. Provide definition for rtld. @@ -1128,7 +1237,7 @@ 2004-09-02 Ulrich Drepper * sysdeps/alpha/jmpbuf-unwind.h: Define __libc_unwind_longjmp. -@@ -3500,6 +3522,11 @@ +@@ -3521,6 +3535,11 @@ * Makefile [$(build-shared) = yes] (tests): Depend on $(test-modules). @@ -1140,8 +1249,8 @@ 2003-07-25 Jakub Jelinek * tst-cancel17.c (do_test): Check if aio_cancel failed. ---- glibc-20060301T0647/nptl/Makefile 28 Feb 2006 09:36:05 -0000 1.179 -+++ glibc-20060301T0647-fedora/nptl/Makefile 1 Mar 2006 06:55:40 -0000 1.157.2.19 +--- glibc-20060302T0855/nptl/Makefile 28 Feb 2006 09:36:05 -0000 1.179 ++++ glibc-20060302T0855-fedora/nptl/Makefile 1 Mar 2006 06:55:40 -0000 1.157.2.19 @@ -519,15 +519,19 @@ $(addprefix $(objpfx), \ $(tests) $(xtests) $(test-srcs))): $(objpfx)libpthread.so \ $(objpfx)libpthread_nonshared.a @@ -1164,8 +1273,8 @@ else $(addprefix $(objpfx),$(tests) $(test-srcs)): $(objpfx)libpthread.a endif ---- glibc-20060301T0647/nptl/tst-stackguard1.c 26 Jun 2005 17:44:14 -0000 1.1 -+++ glibc-20060301T0647-fedora/nptl/tst-stackguard1.c 8 Aug 2005 21:24:28 -0000 1.1.2.3 +--- glibc-20060302T0855/nptl/tst-stackguard1.c 26 Jun 2005 17:44:14 -0000 1.1 ++++ glibc-20060302T0855-fedora/nptl/tst-stackguard1.c 8 Aug 2005 21:24:28 -0000 1.1.2.3 @@ -190,17 +190,21 @@ do_test (void) the 16 runs, something is very wrong. */ int ndifferences = 0; @@ -1190,8 +1299,8 @@ { puts ("stack guard canaries are not randomized enough"); puts ("nor equal to the default canary value"); ---- glibc-20060301T0647/nptl/sysdeps/unix/sysv/linux/kernel-features.h 1 Jan 1970 00:00:00 -0000 -+++ glibc-20060301T0647-fedora/nptl/sysdeps/unix/sysv/linux/kernel-features.h 22 Sep 2004 21:21:02 -0000 1.1.2.1 +--- glibc-20060302T0855/nptl/sysdeps/unix/sysv/linux/kernel-features.h 1 Jan 1970 00:00:00 -0000 ++++ glibc-20060302T0855-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 + @@ -1199,115 +1308,8 @@ +#ifndef __ASSUME_CLONE_THREAD_FLAGS +# define __ASSUME_CLONE_THREAD_FLAGS 1 +#endif ---- glibc-20060301T0647/nptl/sysdeps/unix/sysv/linux/sparc/lowlevellock.h 3 Jan 2006 23:42:57 -0000 1.6 -+++ glibc-20060301T0647-fedora/nptl/sysdeps/unix/sysv/linux/sparc/lowlevellock.h 1 Mar 2006 07:44:57 -0000 1.4.2.3 -@@ -78,6 +78,15 @@ - INTERNAL_SYSCALL_ERROR_P (__ret, __err); \ - }) - -+#define lll_robust_mutex_dead(futexv) \ -+ do \ -+ { \ -+ int *__futexp = &(futexv); \ -+ atomic_or (__futexp, FUTEX_OWNER_DIED); \ -+ lll_futex_wake (__futexp, 1); \ -+ } \ -+ while (0) -+ - /* Returns non-zero if error happened, zero if success. */ - #ifdef __sparc32_atomic_do_lock - /* Avoid FUTEX_WAKE_OP if supporting pre-v9 CPUs. */ -@@ -112,9 +121,18 @@ __lll_mutex_cond_trylock (int *futex) - } - #define lll_mutex_cond_trylock(futex) __lll_mutex_cond_trylock (&(futex)) - -+static inline int -+__attribute__ ((always_inline)) -+__lll_robust_mutex_trylock (int *futex, int id) -+{ -+ return atomic_compare_and_exchange_val_acq (futex, id, 0) != 0; -+} -+#define lll_robust_mutex_trylock(futex, id) \ -+ __lll_robust_mutex_trylock (&(futex), id) -+ - - extern void __lll_lock_wait (int *futex) attribute_hidden; -- -+extern int __lll_robust_lock_wait (int *futex) attribute_hidden; - - static inline void - __attribute__ ((always_inline)) -@@ -127,6 +145,17 @@ __lll_mutex_lock (int *futex) - } - #define lll_mutex_lock(futex) __lll_mutex_lock (&(futex)) - -+static inline int -+__attribute__ ((always_inline)) -+__lll_robust_mutex_lock (int *futex, int id) -+{ -+ int result = 0; -+ if (atomic_compare_and_exchange_bool_acq (futex, id, 0) != 0) -+ result = __lll_robust_lock_wait (futex); -+ return result; -+} -+#define lll_robust_mutex_lock(futex, id) \ -+ __lll_robust_mutex_lock (&(futex), id) - - static inline void - __attribute__ ((always_inline)) -@@ -139,10 +168,14 @@ __lll_mutex_cond_lock (int *futex) - } - #define lll_mutex_cond_lock(futex) __lll_mutex_cond_lock (&(futex)) - -+#define lll_robust_mutex_cond_lock(futex, id) \ -+ __lll_robust_mutex_lock (&(futex), (id) | FUTEX_WAITERS) -+ - - extern int __lll_timedlock_wait (int *futex, const struct timespec *) - attribute_hidden; -- -+extern int __lll_robust_timedlock_wait (int *futex, const struct timespec *) -+ attribute_hidden; - - static inline int - __attribute__ ((always_inline)) -@@ -158,6 +191,19 @@ __lll_mutex_timedlock (int *futex, const - #define lll_mutex_timedlock(futex, abstime) \ - __lll_mutex_timedlock (&(futex), abstime) - -+static inline int -+__attribute__ ((always_inline)) -+__lll_robust_mutex_timedlock (int *futex, const struct timespec *abstime, -+ int id) -+{ -+ int result = 0; -+ if (atomic_compare_and_exchange_bool_acq (futex, id, 0) != 0) -+ result = __lll_robust_timedlock_wait (futex, abstime); -+ return result; -+} -+#define lll_robust_mutex_timedlock(futex, abstime, id) \ -+ __lll_robust_mutex_timedlock (&(futex), abstime, id) -+ - #define lll_mutex_unlock(lock) \ - ((void) ({ \ - int *__futex = &(lock); \ -@@ -166,6 +212,14 @@ __lll_mutex_timedlock (int *futex, const - lll_futex_wake (__futex, 1); \ - })) - -+#define lll_robust_mutex_unlock(lock) \ -+ ((void) ({ \ -+ int *__futex = &(lock); \ -+ int __val = atomic_exchange_rel (__futex, 0); \ -+ if (__builtin_expect (__val & FUTEX_WAITERS, 0)) \ -+ lll_futex_wake (__futex, 1); \ -+ })) -+ - #define lll_mutex_unlock_force(lock) \ - ((void) ({ \ - int *__futex = &(lock); \ ---- glibc-20060301T0647/nscd/connections.c 3 Jan 2006 21:26:28 -0000 1.82 -+++ glibc-20060301T0647-fedora/nscd/connections.c 4 Jan 2006 07:58:21 -0000 1.55.2.19 +--- glibc-20060302T0855/nscd/connections.c 3 Jan 2006 21:26:28 -0000 1.82 ++++ glibc-20060302T0855-fedora/nscd/connections.c 4 Jan 2006 07:58:21 -0000 1.55.2.19 @@ -1873,3 +1873,18 @@ finish_drop_privileges (void) exit (4); } @@ -1327,8 +1329,8 @@ + prune_cache (&dbs[hstdb], LONG_MAX); +} + ---- glibc-20060301T0647/nscd/nscd.c 1 Jan 2006 19:15:56 -0000 1.51 -+++ glibc-20060301T0647-fedora/nscd/nscd.c 2 Jan 2006 10:52:53 -0000 1.38.2.11 +--- glibc-20060302T0855/nscd/nscd.c 1 Jan 2006 19:15:56 -0000 1.51 ++++ glibc-20060302T0855-fedora/nscd/nscd.c 2 Jan 2006 10:52:53 -0000 1.38.2.11 @@ -119,6 +119,9 @@ static struct argp argp = options, parse_opt, NULL, doc, }; @@ -1347,8 +1349,8 @@ signal (SIGPIPE, SIG_IGN); /* Cleanup files created by a previous 'bind'. */ ---- glibc-20060301T0647/nscd/nscd.conf 23 Aug 2005 23:17:32 -0000 1.11 -+++ glibc-20060301T0647-fedora/nscd/nscd.conf 24 Aug 2005 07:23:30 -0000 1.8.2.3 +--- glibc-20060302T0855/nscd/nscd.conf 23 Aug 2005 23:17:32 -0000 1.11 ++++ glibc-20060302T0855-fedora/nscd/nscd.conf 24 Aug 2005 07:23:30 -0000 1.8.2.3 @@ -32,8 +32,8 @@ # logfile /var/log/nscd.log # threads 6 @@ -1360,8 +1362,8 @@ debug-level 0 # reload-count 5 paranoia no ---- glibc-20060301T0647/nscd/nscd.init 20 Jun 2005 15:47:52 -0000 1.9 -+++ glibc-20060301T0647-fedora/nscd/nscd.init 12 Sep 2005 12:53:20 -0000 1.6.2.4 +--- glibc-20060302T0855/nscd/nscd.init 20 Jun 2005 15:47:52 -0000 1.9 ++++ glibc-20060302T0855-fedora/nscd/nscd.init 12 Sep 2005 12:53:20 -0000 1.6.2.4 @@ -9,6 +9,7 @@ # slow naming services like NIS, NIS+, LDAP, or hesiod. # processname: /usr/sbin/nscd @@ -1402,8 +1404,8 @@ RETVAL=$? echo [ $RETVAL -eq 0 ] && touch /var/lock/subsys/nscd ---- glibc-20060301T0647/posix/Makefile 8 Jan 2006 09:39:15 -0000 1.188 -+++ glibc-20060301T0647-fedora/posix/Makefile 9 Jan 2006 21:55:00 -0000 1.171.2.16 +--- glibc-20060302T0855/posix/Makefile 8 Jan 2006 09:39:15 -0000 1.188 ++++ glibc-20060302T0855-fedora/posix/Makefile 9 Jan 2006 21:55:00 -0000 1.171.2.16 @@ -107,7 +107,8 @@ generated := $(addprefix wordexp-test-re bug-regex21-mem bug-regex21.mtrace \ tst-rxspencer-mem tst-rxspencer.mtrace tst-getconf.out \ @@ -1437,8 +1439,8 @@ + | sed -n -e '/START_OF_STRINGS/,$${/POSIX_V6_/{s/^[^"]*"//;s/".*$$//;p}}' \ + > $@.new + mv -f $@.new $@ ---- glibc-20060301T0647/posix/getconf.speclist.h 1 Jan 1970 00:00:00 -0000 -+++ glibc-20060301T0647-fedora/posix/getconf.speclist.h 13 Dec 2004 23:32:37 -0000 1.1.2.2 +--- glibc-20060302T0855/posix/getconf.speclist.h 1 Jan 1970 00:00:00 -0000 ++++ glibc-20060302T0855-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 = @@ -1455,8 +1457,8 @@ +"POSIX_V6_LPBIG_OFFBIG" +#endif +""; ---- glibc-20060301T0647/sysdeps/generic/dl-cache.h 25 Jun 2003 08:01:22 -0000 1.13 -+++ glibc-20060301T0647-fedora/sysdeps/generic/dl-cache.h 22 Sep 2004 21:21:07 -0000 1.13.2.1 +--- glibc-20060302T0855/sysdeps/generic/dl-cache.h 25 Jun 2003 08:01:22 -0000 1.13 ++++ glibc-20060302T0855-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 @@ -1472,8 +1474,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-20060301T0647/sysdeps/ia64/Makefile 16 Aug 2004 06:46:14 -0000 1.10 -+++ glibc-20060301T0647-fedora/sysdeps/ia64/Makefile 22 Sep 2004 21:21:07 -0000 1.10.2.1 +--- glibc-20060302T0855/sysdeps/ia64/Makefile 16 Aug 2004 06:46:14 -0000 1.10 ++++ glibc-20060302T0855-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)) @@ -1485,8 +1487,8 @@ endif endif ---- glibc-20060301T0647/sysdeps/ia64/ia64libgcc.S 11 May 2002 05:12:35 -0000 1.2 -+++ glibc-20060301T0647-fedora/sysdeps/ia64/ia64libgcc.S 22 Sep 2004 21:21:07 -0000 1.2.2.1 +--- glibc-20060302T0855/sysdeps/ia64/ia64libgcc.S 11 May 2002 05:12:35 -0000 1.2 ++++ glibc-20060302T0855-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. */ @@ -1838,8 +1840,8 @@ - .symver ___multi3, __multi3 at GLIBC_2.2 - -#endif ---- glibc-20060301T0647/sysdeps/ia64/libgcc-compat.c 1 Jan 1970 00:00:00 -0000 -+++ glibc-20060301T0647-fedora/sysdeps/ia64/libgcc-compat.c 22 Sep 2004 21:21:08 -0000 1.1.2.1 +--- glibc-20060302T0855/sysdeps/ia64/libgcc-compat.c 1 Jan 1970 00:00:00 -0000 ++++ glibc-20060302T0855-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. @@ -1925,8 +1927,63 @@ +symbol_version (INTUSE (__multi3), __multi3, GLIBC_2.2); + +#endif ---- glibc-20060301T0647/sysdeps/unix/nice.c 28 Sep 2002 19:13:13 -0000 1.6 -+++ glibc-20060301T0647-fedora/sysdeps/unix/nice.c 22 Sep 2004 21:21:08 -0000 1.6.2.1 +--- glibc-20060302T0855/sysdeps/powerpc/powerpc32/configure 17 Jun 2005 22:58:48 -0000 1.1 ++++ glibc-20060302T0855-fedora/sysdeps/powerpc/powerpc32/configure 2 Mar 2006 09:59:03 -0000 1.1.2.2 +@@ -31,3 +31,32 @@ if test $libc_cv_ppc_rel16 = yes; then + _ACEOF + + fi ++ ++# See whether GCC uses -msecure-plt. ++echo "$as_me:$LINENO: checking for -msecure-plt by default" >&5 ++echo $ECHO_N "checking for -msecure-plt by default... $ECHO_C" >&6 ++if test "${libc_cv_ppc_secure_plt+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ echo 'int foo (void) { extern int bar; return bar; }' > conftest.c ++libc_cv_ppc_secure_plt=no ++if { ac_try='${CC-cc} -S $CFLAGS conftest.c -fpic -o conftest.s 1>&5' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ if grep '_GLOBAL_OFFSET_TABLE_-.*@ha' conftest.s > /dev/null 2>&1; then ++ libc_cv_ppc_secure_plt=yes ++ fi ++fi ++rm -rf conftest* ++fi ++echo "$as_me:$LINENO: result: $libc_cv_ppc_secure_plt" >&5 ++echo "${ECHO_T}$libc_cv_ppc_secure_plt" >&6 ++if test $libc_cv_ppc_secure_plt = yes; then ++ cat >>confdefs.h <<\_ACEOF ++#define HAVE_PPC_SECURE_PLT 1 ++_ACEOF ++ ++fi +--- glibc-20060302T0855/sysdeps/powerpc/powerpc32/configure.in 17 Jun 2005 22:58:48 -0000 1.1 ++++ glibc-20060302T0855-fedora/sysdeps/powerpc/powerpc32/configure.in 2 Mar 2006 09:59:03 -0000 1.1.2.2 +@@ -16,3 +16,17 @@ rm -f conftest*]) + if test $libc_cv_ppc_rel16 = yes; then + AC_DEFINE(HAVE_ASM_PPC_REL16) + fi ++ ++# See whether GCC uses -msecure-plt. ++AC_CACHE_CHECK(for -msecure-plt by default, libc_cv_ppc_secure_plt, [dnl ++echo 'int foo (void) { extern int bar; return bar; }' > conftest.c ++libc_cv_ppc_secure_plt=no ++if AC_TRY_COMMAND(${CC-cc} -S $CFLAGS conftest.c -fpic -o conftest.s 1>&AS_MESSAGE_LOG_FD); then ++ if grep '_GLOBAL_OFFSET_TABLE_-.*@ha' conftest.s > /dev/null 2>&1; then ++ libc_cv_ppc_secure_plt=yes ++ fi ++fi ++rm -rf conftest*]) ++if test $libc_cv_ppc_secure_plt = yes; then ++ AC_DEFINE(HAVE_PPC_SECURE_PLT) ++fi +--- glibc-20060302T0855/sysdeps/unix/nice.c 28 Sep 2002 19:13:13 -0000 1.6 ++++ glibc-20060302T0855-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); } @@ -1941,8 +1998,8 @@ if (result != -1) return getpriority (PRIO_PROCESS, 0); else ---- glibc-20060301T0647/sysdeps/unix/sysv/linux/dl-osinfo.h 8 Jan 2006 08:21:15 -0000 1.22 -+++ glibc-20060301T0647-fedora/sysdeps/unix/sysv/linux/dl-osinfo.h 9 Jan 2006 21:55:08 -0000 1.14.2.8 +--- glibc-20060302T0855/sysdeps/unix/sysv/linux/dl-osinfo.h 8 Jan 2006 08:21:15 -0000 1.22 ++++ glibc-20060302T0855-fedora/sysdeps/unix/sysv/linux/dl-osinfo.h 9 Jan 2006 21:55:08 -0000 1.14.2.8 @@ -18,12 +18,15 @@ 02111-1307 USA. */ @@ -1991,8 +2048,8 @@ + ret ^= stk; return ret; } ---- glibc-20060301T0647/sysdeps/unix/sysv/linux/futimesat.c 3 Feb 2006 05:26:34 -0000 1.6 -+++ glibc-20060301T0647-fedora/sysdeps/unix/sysv/linux/futimesat.c 3 Feb 2006 09:43:55 -0000 1.1.2.7 +--- glibc-20060302T0855/sysdeps/unix/sysv/linux/futimesat.c 3 Feb 2006 05:26:34 -0000 1.6 ++++ glibc-20060302T0855-fedora/sysdeps/unix/sysv/linux/futimesat.c 3 Feb 2006 09:43:55 -0000 1.1.2.7 @@ -37,14 +37,14 @@ futimesat (fd, file, tvp) { int result; @@ -2035,8 +2092,8 @@ { size_t filelen = strlen (file); static const char procfd[] = "/proc/self/fd/%d/%s"; ---- glibc-20060301T0647/sysdeps/unix/sysv/linux/paths.h 15 Nov 2000 23:06:47 -0000 1.11 -+++ glibc-20060301T0647-fedora/sysdeps/unix/sysv/linux/paths.h 22 Sep 2004 21:21:08 -0000 1.11.4.1 +--- glibc-20060302T0855/sysdeps/unix/sysv/linux/paths.h 15 Nov 2000 23:06:47 -0000 1.11 ++++ glibc-20060302T0855-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" @@ -2046,8 +2103,8 @@ #define _PATH_WTMP "/var/log/wtmp" /* Provide trailing slash, since mostly used for building pathnames. */ ---- glibc-20060301T0647/sysdeps/unix/sysv/linux/tcsetattr.c 10 Sep 2003 19:16:07 -0000 1.16 -+++ glibc-20060301T0647-fedora/sysdeps/unix/sysv/linux/tcsetattr.c 22 Sep 2004 21:21:08 -0000 1.16.2.1 +--- glibc-20060302T0855/sysdeps/unix/sysv/linux/tcsetattr.c 10 Sep 2003 19:16:07 -0000 1.16 ++++ glibc-20060302T0855-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; @@ -2093,8 +2150,8 @@ + return retval; } libc_hidden_def (tcsetattr) ---- glibc-20060301T0647/sysdeps/unix/sysv/linux/i386/dl-cache.h 1 Jan 1970 00:00:00 -0000 -+++ glibc-20060301T0647-fedora/sysdeps/unix/sysv/linux/i386/dl-cache.h 22 Sep 2004 21:21:08 -0000 1.1.2.1 +--- glibc-20060302T0855/sysdeps/unix/sysv/linux/i386/dl-cache.h 1 Jan 1970 00:00:00 -0000 ++++ glibc-20060302T0855-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. @@ -2155,8 +2212,8 @@ + } while (0) + +#include_next ---- glibc-20060301T0647/sysdeps/unix/sysv/linux/ia64/dl-cache.h 6 Jul 2001 04:56:17 -0000 1.2 -+++ glibc-20060301T0647-fedora/sysdeps/unix/sysv/linux/ia64/dl-cache.h 22 Sep 2004 21:21:09 -0000 1.2.4.1 +--- glibc-20060302T0855/sysdeps/unix/sysv/linux/ia64/dl-cache.h 6 Jul 2001 04:56:17 -0000 1.2 ++++ glibc-20060302T0855-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) @@ -2189,35 +2246,24 @@ + } while (0) + #include_next ---- glibc-20060301T0647/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 1 Jan 1970 00:00:00 -0000 -+++ glibc-20060301T0647-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 22 Sep 2004 21:21:09 -0000 1.1.2.1 +--- glibc-20060302T0855/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 1 Jan 1970 00:00:00 -0000 ++++ glibc-20060302T0855-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-20060301T0647/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 1 Jan 1970 00:00:00 -0000 -+++ glibc-20060301T0647-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 22 Sep 2004 21:21:09 -0000 1.1.2.1 +--- glibc-20060302T0855/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 1 Jan 1970 00:00:00 -0000 ++++ glibc-20060302T0855-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-20060301T0647/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed 17 Jan 2002 06:49:28 -0000 1.2 -+++ glibc-20060301T0647-fedora/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed 22 Sep 2004 21:21:09 -0000 1.2.2.1 +--- glibc-20060302T0855/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed 17 Jan 2002 06:49:28 -0000 1.2 ++++ glibc-20060302T0855-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"_ ---- libc/sysdeps/unix/sysv/linux/s390/s390-64/sysdep.h.jj 2006-02-28 15:14:07.000000000 +0100 -+++ libc/sysdeps/unix/sysv/linux/s390/s390-64/sysdep.h 2006-03-01 13:31:48.000000000 +0100 -@@ -268,7 +268,7 @@ - register unsigned long gpr6 asm ("6") = (unsigned long)(arg5); - #define DECLARGS_6(arg1, arg2, arg3, arg4, arg5, arg6) \ - DECLARGS_5(arg1, arg2, arg3, arg4, arg5) \ -- register unsigned long gpr6 asm ("7") = (unsigned long)(arg6); -+ register unsigned long gpr7 asm ("7") = (unsigned long)(arg6); - - #define ASMFMT_0 - #define ASMFMT_1 , "0" (gpr2) Index: glibc.spec =================================================================== RCS file: /cvs/dist/rpms/glibc/devel/glibc.spec,v retrieving revision 1.225 retrieving revision 1.226 diff -u -r1.225 -r1.226 --- glibc.spec 1 Mar 2006 09:47:51 -0000 1.225 +++ glibc.spec 2 Mar 2006 11:47:25 -0000 1.226 @@ -1,9 +1,9 @@ -%define glibcdate 20060301T0647 +%define glibcdate 20060302T0855 %define glibcname glibc -%define glibcsrcdir glibc-20060301T0647 +%define glibcsrcdir glibc-20060302T0855 %define glibc_release_tarballs 0 -%define glibcversion 2.3.90 -%define glibcrelease 39 +%define glibcversion 2.3.91 +%define glibcrelease 1 %define auxarches i586 i686 athlon sparcv9 alphaev6 %define prelinkarches noarch %define xenarches i686 athlon @@ -1337,6 +1337,14 @@ %endif %changelog +* Thu Mar 2 2006 Jakub Jelinek 2.3.91-1 +- update from CVS + - fixes for various arches +- ensure malloc returns pointers aligned to at least + MIN (2 * sizeof (size_t), __alignof__ (long double)) + (only on ppc32 this has not been the case lately with addition + of 128-bit long double, #182742) + * Wed Mar 1 2006 Jakub Jelinek 2.3.90-39 - update from CVS Index: sources =================================================================== RCS file: /cvs/dist/rpms/glibc/devel/sources,v retrieving revision 1.162 retrieving revision 1.163 diff -u -r1.162 -r1.163 --- sources 1 Mar 2006 09:47:51 -0000 1.162 +++ sources 2 Mar 2006 11:47:25 -0000 1.163 @@ -1,2 +1,2 @@ -661cdfb8abebd6f892a18c3280f1add1 glibc-20060301T0647.tar.bz2 -7c4abda7310c1672d4a075c027670766 glibc-fedora-20060301T0647.tar.bz2 +7787f2784c74be230cbb307b44a8a883 glibc-20060302T0855.tar.bz2 +3dd6039e4a284e1cde38324db43f8ebb glibc-fedora-20060302T0855.tar.bz2 From fedora-cvs-commits at redhat.com Thu Mar 2 13:58:40 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 2 Mar 2006 08:58:40 -0500 Subject: rpms/aspell/devel aspell-0.60.3-man_page.patch, NONE, 1.1 aspell.spec, 1.29, 1.30 Message-ID: <200603021358.k22DweMN014768@cvs.devel.redhat.com> Author: varekova Update of /cvs/dist/rpms/aspell/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv14641 Modified Files: aspell.spec Added Files: aspell-0.60.3-man_page.patch Log Message: - update aspell man page (bug 183205) aspell-0.60.3-man_page.patch: aspell.1 | 10 ++-------- 1 files changed, 2 insertions(+), 8 deletions(-) --- NEW FILE aspell-0.60.3-man_page.patch --- --- aspell-0.60.3/manual/aspell.1.stacc 2004-03-05 05:05:02.000000000 +0100 +++ aspell-0.60.3/manual/aspell.1 2006-03-02 14:37:35.045200048 +0100 @@ -25,7 +25,7 @@ .I "ispell -a" compatibility mode .TP -.B \-l,list +.B \-list produce a list of misspelled words from standard input .TP .B [dump] config @@ -57,7 +57,7 @@ .BI "\-\-dict\-dir="dir location of the main word list .TP -.BI "\-\-lang="string +.BI "\-l,\-\-lang="string language to use, it follows the same format of the LANG environmental variable on most systems. It consists of the two letter ISO 639 language code and an optional two letter ISO 3166 country code after a dash or @@ -86,9 +86,6 @@ .TP .BI "\-\-extra\-dicts="list extra dictionaries to use. -.TP -.BI "\-\-strip\-accents="boolean -strip accents from all words in the dictionary .SH CHECKER OPTIONS These options control the behavior of Aspell when checking documents. .TP @@ -98,9 +95,6 @@ .BI "\-\-ignore\-case="boolean ignore case when checking words .TP -.BI "\-\-ignore\-accents="boolean -ignore accents when checking words -.TP .BI "\-\-ignore\-repl="boolean ignore commands to store replacement pairs .TP Index: aspell.spec =================================================================== RCS file: /cvs/dist/rpms/aspell/devel/aspell.spec,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- aspell.spec 21 Feb 2006 13:48:58 -0000 1.29 +++ aspell.spec 2 Mar 2006 13:58:36 -0000 1.30 @@ -1,7 +1,7 @@ Summary: A spelling checker. Name: aspell Version: 0.60.3 -Release: 4 +Release: 5 Epoch: 12 License: LGPL Group: Applications/Text @@ -12,6 +12,7 @@ Patch3: aspell-0.60.3-install_info.patch Patch4: aspell-0.60.3-gcc41.patch Patch5: aspell-0.60.3-fileconflict.patch +Patch6: aspell-0.60.3-man_page.patch Requires: aspell-en BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildRequires: gettext, ncurses-devel @@ -48,6 +49,7 @@ %patch3 -p1 -b .iinfo %patch4 -p1 -b .gcc41 %patch5 -p1 -b .fc +%patch6 -p1 -b .stacc %build %configure @@ -121,6 +123,9 @@ %{_mandir}/man1/pspell-config.1* %changelog +* Thu Mar 2 2006 Ivana Varekova - 12:0.60.3-5 +- update aspell man page (bug 183205) + * Tue Feb 21 2006 Ivana Varekova - 12:0.60.3-4 - fix multilib file conflict From fedora-cvs-commits at redhat.com Thu Mar 2 14:54:06 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 2 Mar 2006 09:54:06 -0500 Subject: rpms/eclipse-cdt/devel eclipse-cdt.spec, 1.36, 1.37 how-to-generate-the-cdt-tarball.txt, 1.1, 1.2 Message-ID: <200603021454.k22Es6ep011157@cvs.devel.redhat.com> Author: overholt Update of /cvs/dist/rpms/eclipse-cdt/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv11140 Modified Files: eclipse-cdt.spec how-to-generate-the-cdt-tarball.txt Log Message: * Mon Feb 13 2006 Andrew Overholt 3.0.2-1jpp_1fc - 3.0.2. Index: eclipse-cdt.spec =================================================================== RCS file: /cvs/dist/rpms/eclipse-cdt/devel/eclipse-cdt.spec,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- eclipse-cdt.spec 11 Feb 2006 02:30:30 -0000 1.36 +++ eclipse-cdt.spec 2 Mar 2006 14:54:00 -0000 1.37 @@ -7,7 +7,7 @@ %define major 3 %define minor 0 %define majmin %{major}.%{minor} -%define micro 1 +%define micro 2 %define eclipse_base %{_datadir}/%{eclipse_name} %define eclipse_lib_base %{_libdir}/%{eclipse_name} @@ -21,7 +21,7 @@ Summary: %{pkg_summary} Name: %{eclipse_name}-cdt Version: %{majmin}.%{micro} -Release: 1jpp_8fc +Release: 1jpp_1fc License: Eclipse Public License - v 1.0 (EPL) Group: Text Editors/Integrated Development Environments (IDE) URL: http://www.eclipse.org/cdt @@ -232,6 +232,9 @@ %changelog +* Mon Feb 13 2006 Andrew Overholt 3.0.2-1jpp_1fc +- 3.0.2. + * Fri Feb 10 2006 Jesse Keating - 1:3.0.1-1jpp_8fc - bump again for double-long bug on ppc(64) Index: how-to-generate-the-cdt-tarball.txt =================================================================== RCS file: /cvs/dist/rpms/eclipse-cdt/devel/how-to-generate-the-cdt-tarball.txt,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- how-to-generate-the-cdt-tarball.txt 12 Jan 2006 18:50:14 -0000 1.1 +++ how-to-generate-the-cdt-tarball.txt 2 Mar 2006 14:54:00 -0000 1.2 @@ -6,6 +6,7 @@ -r CDT_3_0_1 org.eclipse.cdt-releng/org.eclipse.cdt.releng % cd org.eclipse.cdt-releng/org.eclipse.cdt.releng % sed --in-place 's/@cdtTag@/CDT_3_0_1/' maps/cdt.map +% sed --in-place s/3.1.0/3.1.2/ build.xml % java -cp /usr/share/eclipse/startup.jar \ -Duser.home=../../home \ org.eclipse.core.launcher.Main \ From fedora-cvs-commits at redhat.com Thu Mar 2 14:58:19 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 2 Mar 2006 09:58:19 -0500 Subject: rpms/eclipse-cdt/devel .cvsignore,1.14,1.15 sources,1.15,1.16 Message-ID: <200603021458.k22EwJgB011203@cvs.devel.redhat.com> Author: overholt Update of /cvs/dist/rpms/eclipse-cdt/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv11189 Modified Files: .cvsignore sources Log Message: 3.0.2 source Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/eclipse-cdt/devel/.cvsignore,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- .cvsignore 15 Nov 2005 19:14:09 -0000 1.14 +++ .cvsignore 2 Mar 2006 14:58:16 -0000 1.15 @@ -1 +1 @@ -eclipse-cdt-fetched-src-3.0.1.tar.gz +eclipse-cdt-fetched-src-3.0.2.tar.gz Index: sources =================================================================== RCS file: /cvs/dist/rpms/eclipse-cdt/devel/sources,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- sources 15 Nov 2005 19:14:10 -0000 1.15 +++ sources 2 Mar 2006 14:58:17 -0000 1.16 @@ -1 +1 @@ -39cb6d52c9b469b44e6c14b832325e0f eclipse-cdt-fetched-src-3.0.1.tar.gz +87bc3ab942f6d747246c6623a292437a eclipse-cdt-fetched-src-3.0.2.tar.gz From fedora-cvs-commits at redhat.com Thu Mar 2 14:58:28 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 2 Mar 2006 09:58:28 -0500 Subject: rpms/ghostscript/devel ghostscript-krgb.patch, NONE, 1.1 ghostscript.spec, 1.101, 1.102 Message-ID: <200603021458.k22EwS2w011230@cvs.devel.redhat.com> Author: twaugh Update of /cvs/dist/rpms/ghostscript/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv11215 Modified Files: ghostscript.spec Added Files: ghostscript-krgb.patch Log Message: * Thu Mar 2 2006 Tim Waugh - BuildRequires: gnutls-devel - Updated KRGB patch for gdevijs. ghostscript-krgb.patch: gdevijs.c | 134 ++++++++++++++++++++++++++++++++++++++++++++++++++++---------- 1 files changed, 113 insertions(+), 21 deletions(-) --- NEW FILE ghostscript-krgb.patch --- --- espgs-8.15.1/src/gdevijs.c.krgb 2006-03-02 13:39:15.000000000 +0000 +++ espgs-8.15.1/src/gdevijs.c 2006-03-02 13:39:20.000000000 +0000 @@ -28,27 +28,34 @@ * You should use -dSAFER which sets .LockSafetyParams to true * before opening this device. * - * 11/26/03 David Suffield + * 11/26/03 David Suffield (gdevijs-krgb-1.0.patch) * (c) 2003-2004 Copyright Hewlett-Packard Development Company, LP * * 1. Removed hpijs 1.0-1.0.2 workarounds, use hpijs 1.0.3 or higher. * 2. Added krgb support. * - * 02/21/05 David Suffield + * 02/21/05 David Suffield (gdevijs-krgb-1.1.patch) * 1. Fixed segfault issue with 1-bit color space. * 2. Fixed z-order issue with colored text on black rectangle. * + * 02/22/06 David Suffield (gdevijs-krgb-1.2.patch) + * 1. Fixed krgb buffer overflow issue with out-of-band data in fill_rectangle and copy_mono. + * This buffer overflow condition occurred with fullbleed print jobs that had k-band images. + * 2. Added Dan Coby (artifex) fix for gsijs_read_string_malloc gs_free *str memory leak. + * */ #include "unistd_.h" /* for dup() */ #include -#include #include "gdevprn.h" #include "gp.h" #include "ijs.h" #include "ijs_client.h" /*#define KRGB_DEBUG*/ +#ifdef KRGB_DEBUG +#include +#endif /* This should go into gdevprn.h, or, better yet, gdevprn should acquire an API for changing resolution. */ @@ -183,24 +190,62 @@ if (ijsdev->krgb_mode && ijsdev->k_path && y >= 0 && x >= 0) { int raster = (ijsdev->k_width+7) >> 3; - register unsigned char *dest=ijsdev->k_band+(raster*y)+(x >> 3); - int dest_start_bit = x & 7; - int i,j,w1; + register unsigned char *dest; + int dest_start_bit; + int band_height = ijsdev->k_band_size/raster; + int i,j,x1,y1,w1,h1; if (h <= 0 || w <= 0) return 0; - if ((x+w) > ijsdev->k_width) - w1 = ijsdev->k_width - x; + /* Check for out-of-band graphic. */ + if (x >= ijsdev->k_width || y >= band_height) + return 0; /* out-of-band */ + + /* Check for x clipping. */ + if (x < 0) + { + x1 = 0; + w1 = w + x; + } + else if ((x+w) > ijsdev->k_width) + { + x1 = x; + w1 = ijsdev->k_width - x; + } else + { + x1 = x; w1 = w; + } + + dest_start_bit = x1 & 7; + + /* Check for y clipping. */ + if (y < 0) + { + y1 = 0; + h1 = h + y; + } + else if ((y+h) > band_height) + { + y1 = y; + h1 = band_height - y; + } + else + { + y1 = y; + h1 = h; + } + + dest=ijsdev->k_band+(raster*y1)+(x1 >> 3); /* Note x,y orgin 0,0 is stored first byte 0 left to right. */ if (color==0x0) { /* Color is black, store in k plane band instead of regular band. */ - for (j=0; j>3] |= xmask[(dest_start_bit+i)&7]; @@ -211,7 +256,7 @@ else { /* Color is not black, remove any k plane bits for z-order dependencies, store in regular band. */ - for (j=0; j>3] &= ~xmask[(dest_start_bit+i)&7]; @@ -229,26 +274,73 @@ { gx_device_ijs *ijsdev = (gx_device_ijs *)((gx_device_forward *)dev)->target; - /* if (ijsdev->krgb_mode && ijsdev->k_path && one==0x0) */ + // if (ijsdev->krgb_mode && ijsdev->k_path && one==0x0) if (ijsdev->krgb_mode && ijsdev->k_path) { /* Store in k plane band instead of regular band. */ int raster = (ijsdev->k_width+7) >> 3; /* raster width in bytes, byte aligned */ - register unsigned char *dest=ijsdev->k_band+(raster*y)+(x >> 3); - register const unsigned char *scan=data+(dx >> 3); - int dest_start_bit = x & 7; - int scan_start_bit = dx & 7; - int i, h=height; + register unsigned char *dest; + register const unsigned char *scan; + int dest_start_bit; + int scan_start_bit; + int band_height = ijsdev->k_band_size/raster; + int i,x1,y1,w1,h1,h=height; if (h <= 0 || w <= 0) return 0; + /* Check for out-of-band graphic. */ + if (x >= ijsdev->k_width || y >= band_height) + return 0; /* out-of-band */ + + /* Check for x clipping. */ + if (x < 0) + { + x1 = 0; + w1 = w + x; + /* adj dx here?? */ + } + else if ((x+w) > ijsdev->k_width) + { + x1 = x; + w1 = ijsdev->k_width - x; + } + else + { + x1 = x; + w1 = w; + } + + scan=data+(dx >> 3); + dest_start_bit = x1 & 7; + scan_start_bit = dx & 7; + + /* Check for y clipping. */ + if (y < 0) + { + y1 = 0; + h1 = h + y; + scan+=draster*(h-h1); + } + else if ((y+h) > band_height) + { + y1 = y; + h1 = band_height - y; + } + else + { + y1 = y; + h1 = h; + } + + dest=ijsdev->k_band+(raster*y1)+(x1 >> 3); + if (one==0x0) { /* Color is black, store in k plane band instead of regular band. */ - while (h-- > 0) + while (h1-- > 0) { - for (i=0; i>3] & xmask[(scan_start_bit+i)&7]) dest[(dest_start_bit+i)>>3] |= xmask[(dest_start_bit+i)&7]; @@ -261,9 +353,9 @@ else { /* Color is not black, remove any k plane bits for z-order dependencies, store in regular band. */ - while (h-- > 0) + while (h1-- > 0) { - for (i=0; i>3] & xmask[(scan_start_bit+i)&7]) dest[(dest_start_bit+i)>>3] &= ~xmask[(dest_start_bit+i)&7]; @@ -1131,7 +1223,7 @@ } if (new_value.size >= *size) { if (*str) - gs_free(str, *size, 1, "gsijs_read_string_malloc"); + gs_free(*str, *size, 1, "gsijs_read_string_malloc"); *str = NULL; *size = 0; } Index: ghostscript.spec =================================================================== RCS file: /cvs/dist/rpms/ghostscript/devel/ghostscript.spec,v retrieving revision 1.101 retrieving revision 1.102 diff -u -r1.101 -r1.102 --- ghostscript.spec 28 Feb 2006 13:29:52 -0000 1.101 +++ ghostscript.spec 2 Mar 2006 14:58:26 -0000 1.102 @@ -26,12 +26,13 @@ Patch8: ghostscript-use-external-freetype.patch Patch9: ghostscript-split-font-configuration.patch Patch10: ghostscript-big-cmap-post.patch +Patch11: ghostscript-krgb.patch Requires: zlib, libpng, glib2 Requires: urw-fonts >= 1.1, ghostscript-fonts BuildRequires: libjpeg-devel, libXt-devel BuildRequires: zlib, zlib-devel, libpng, libpng-devel, unzip, gtk2-devel -BuildRequires: glib2-devel +BuildRequires: glib2-devel, gnutls-devel # Omni requires libxml BuildRequires: libxml2-devel BuildRequires: libtiff-devel @@ -106,6 +107,9 @@ # Support reading a big cmap/post table from a TrueType font. %patch10 -p1 -b .big-cmap-post +# Updated KRGB patch for gdevijs. +%patch11 -p1 -b .krgb + # Convert manual pages to UTF-8 from8859_1() { iconv -f iso-8859-1 -t utf-8 < "$1" > "${1}_" @@ -263,6 +267,10 @@ %postun -p /sbin/ldconfig %changelog +* Thu Mar 2 2006 Tim Waugh +- BuildRequires: gnutls-devel +- Updated KRGB patch for gdevijs. + * Tue Feb 28 2006 Karsten Hopp 8.15.1-6 - BuildRequires: libXt-devel From fedora-cvs-commits at redhat.com Thu Mar 2 14:58:49 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 2 Mar 2006 09:58:49 -0500 Subject: rpms/ghostscript/devel ghostscript.spec,1.102,1.103 Message-ID: <200603021458.k22EwmXo011256@cvs.devel.redhat.com> Author: twaugh Update of /cvs/dist/rpms/ghostscript/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv11243 Modified Files: ghostscript.spec Log Message: 8.15.1-7 Index: ghostscript.spec =================================================================== RCS file: /cvs/dist/rpms/ghostscript/devel/ghostscript.spec,v retrieving revision 1.102 retrieving revision 1.103 diff -u -r1.102 -r1.103 --- ghostscript.spec 2 Mar 2006 14:58:26 -0000 1.102 +++ ghostscript.spec 2 Mar 2006 14:58:45 -0000 1.103 @@ -5,7 +5,7 @@ Name: ghostscript Version: %{gs_ver} -Release: 6 +Release: 7 License: GPL URL: http://www.cups.org/espgs/ @@ -267,7 +267,7 @@ %postun -p /sbin/ldconfig %changelog -* Thu Mar 2 2006 Tim Waugh +* Thu Mar 2 2006 Tim Waugh 8.15.1-7 - BuildRequires: gnutls-devel - Updated KRGB patch for gdevijs. From fedora-cvs-commits at redhat.com Thu Mar 2 15:30:11 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 2 Mar 2006 10:30:11 -0500 Subject: rpms/libxkbfile/devel .cvsignore, 1.6, 1.7 libxkbfile.spec, 1.12, 1.13 sources, 1.6, 1.7 Message-ID: <200603021530.k22FUB9g002159@cvs.devel.redhat.com> Author: ajackson Update of /cvs/dist/rpms/libxkbfile/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv2135/devel Modified Files: .cvsignore libxkbfile.spec sources Log Message: auto-import libxkbfile-1.0.2-1 on branch devel from libxkbfile-1.0.2-1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/libxkbfile/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 23 Jan 2006 22:37:42 -0000 1.6 +++ .cvsignore 2 Mar 2006 15:30:09 -0000 1.7 @@ -1 +1 @@ -libxkbfile-1.0.1.tar.bz2 +libxkbfile-1.0.2.tar.bz2 Index: libxkbfile.spec =================================================================== RCS file: /cvs/dist/rpms/libxkbfile/devel/libxkbfile.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- libxkbfile.spec 11 Feb 2006 04:20:12 -0000 1.12 +++ libxkbfile.spec 2 Mar 2006 15:30:09 -0000 1.13 @@ -1,11 +1,11 @@ Summary: X.Org X11 libxkbfile runtime library Name: libxkbfile -Version: 1.0.1 -Release: 1.2 +Version: 1.0.2 +Release: 1 License: MIT/X11 Group: System Environment/Libraries URL: http://www.x.org -Source0: http://xorg.freedesktop.org/X11R7.0/src/everything/%{name}-%{version}.tar.bz2 +Source0: http://xorg.freedesktop.org/releases/individual/lib/libxkbfile/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: xorg-x11-proto-devel @@ -62,7 +62,7 @@ %doc AUTHORS COPYING README INSTALL ChangeLog %dir %{_libdir} %{_libdir}/libxkbfile.so.1 -%{_libdir}/libxkbfile.so.1.0.0 +%{_libdir}/libxkbfile.so.1.0.2 %files devel %defattr(-,root,root,-) @@ -82,6 +82,9 @@ %{_libdir}/pkgconfig/xkbfile.pc %changelog +* Tue Feb 28 2006 Adam Jackson - 1.0.2-1 +- Updated libxkbfile to version 1.0.2 + * Fri Feb 10 2006 Jesse Keating - 1.0.1-1.2 - bump again for double-long bug on ppc(64) Index: sources =================================================================== RCS file: /cvs/dist/rpms/libxkbfile/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 23 Jan 2006 22:37:42 -0000 1.6 +++ sources 2 Mar 2006 15:30:09 -0000 1.7 @@ -1 +1 @@ -6a2e1686fe07b0302f339048e01fb3f7 libxkbfile-1.0.1.tar.bz2 +b7b2fd1eb3ccd5d1ed37cab1780b6013 libxkbfile-1.0.2.tar.bz2 From fedora-cvs-commits at redhat.com Thu Mar 2 15:37:53 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 2 Mar 2006 10:37:53 -0500 Subject: rpms/flex/devel flex.spec,1.22,1.23 Message-ID: <200603021537.k22FbrFI003197@cvs.devel.redhat.com> Author: pmachata Update of /cvs/dist/rpms/flex/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv3146 Modified Files: flex.spec Log Message: - rebuilt, no changes inside. In hunt for #183098 Index: flex.spec =================================================================== RCS file: /cvs/dist/rpms/flex/devel/flex.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- flex.spec 11 Feb 2006 02:44:48 -0000 1.22 +++ flex.spec 2 Mar 2006 15:37:50 -0000 1.23 @@ -1,7 +1,7 @@ Summary: A tool for creating scanners (text pattern recognizers). Name: flex Version: 2.5.4a -Release: 37.2 +Release: 37.3 License: BSD Group: Development/Tools URL: http://www.gnu.org/software/flex/ @@ -79,6 +79,9 @@ %{_includedir}/FlexLexer.h %changelog +* Fri Feb 10 2006 Petr Machata - 2.5.4a-37.3 +- rebuilt, no changes inside. In hunt for #183098 + * Fri Feb 10 2006 Jesse Keating - 2.5.4a-37.2 - bump again for double-long bug on ppc(64) From fedora-cvs-commits at redhat.com Thu Mar 2 15:47:01 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 2 Mar 2006 10:47:01 -0500 Subject: rpms/xen/devel xen-3.0.1-m64.patch,NONE,1.1 xen.spec,1.98,1.99 Message-ID: <200603021547.k22Fl1I1019771@cvs.devel.redhat.com> Author: riel Update of /cvs/dist/rpms/xen/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv19742 Modified Files: xen.spec Added Files: xen-3.0.1-m64.patch Log Message: fix 64 bit CFLAGS issue with vmxloader and hvmloader xen-3.0.1-m64.patch: hvmloader/Makefile | 3 +++ vmxassist/Makefile | 3 +++ 2 files changed, 6 insertions(+) --- NEW FILE xen-3.0.1-m64.patch --- --- xen-3.0.1/tools/firmware/vmxassist/Makefile.m64 2006-02-28 10:14:19.000000000 -0500 +++ xen-3.0.1/tools/firmware/vmxassist/Makefile 2006-03-02 10:49:53.000000000 -0500 @@ -27,6 +27,9 @@ DEFINES=-DDEBUG -DTEXTADDR=$(TEXTADDR) XENINC=-I$(XEN_ROOT)/tools/libxc +# vmxloader is a 32 bit program +CFLAGS=$(echo "$CFLAGS" | sed -e 's/ -m64//g') + # Disable PIE/SSP if GCC supports them. They can break us. CFLAGS += $(call test-gcc-flag,$(CC),-nopie) CFLAGS += $(call test-gcc-flag,$(CC),-fno-stack-protector) --- xen-3.0.1/tools/firmware/hvmloader/Makefile.m64 2006-03-02 10:52:21.000000000 -0500 +++ xen-3.0.1/tools/firmware/hvmloader/Makefile 2006-03-02 10:52:54.000000000 -0500 @@ -29,6 +29,9 @@ OBJECTS = hvmloader.o acpi_madt.o +# hvmloader is a 32 bit program +CFLAGS=$(echo "$CFLAGS" | sed -e 's/ -m64//g') + # Disable PIE/SSP if GCC supports them. They can break us. CFLAGS += $(call test-gcc-flag,$(CC),-nopie) CFLAGS += $(call test-gcc-flag,$(CC),-fno-stack-protector) Index: xen.spec =================================================================== RCS file: /cvs/dist/rpms/xen/devel/xen.spec,v retrieving revision 1.98 retrieving revision 1.99 diff -u -r1.98 -r1.99 --- xen.spec 1 Mar 2006 23:04:59 -0000 1.98 +++ xen.spec 2 Mar 2006 15:46:58 -0000 1.99 @@ -5,7 +5,7 @@ Summary: Xen is a virtual machine monitor Name: xen Version: 3.0.1 -Release: 0.20060301.fc5.1 +Release: 0.20060301.fc5.2 Group: Development/Libraries License: GPL URL: http://www.cl.cam.ac.uk/Research/SRG/netos/xen/index.html @@ -19,6 +19,7 @@ Patch6: xen-network-iptables-bridge.patch Patch8: xen-vmxballoon-hack.patch Patch9: xen-3.0.1-config-allow-http.patch +Patch10: xen-3.0.1-m64.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: transfig libidn-devel zlib-devel texi2html SDL-devel curl-devel BuildRequires: libX11-devel python-devel ghostscript tetex-latex @@ -57,6 +58,7 @@ %patch6 -p1 %patch8 -p1 %patch9 -p1 +%patch10 -p1 -b .m64 cp %{SOURCE2} . @@ -68,9 +70,7 @@ popd sed -i -e "s;libvncserver-config;${vncdir}/libvncserver-config;" tools/ioemu/configure -#CFLAGS="`echo $RPM_OPT_FLAGS | sed -e 's/ -m64//g'`" -unset CFLAGS -%{__make} XEN_PYTHON_NATIVE_INSTALL=1 DESTDIR=%{buildroot} tools docs +CFLAGS="`echo $RPM_OPT_FLAGS | sed -e 's/ -m64//g'`" %{__make} XEN_PYTHON_NATIVE_INSTALL=1 DESTDIR=%{buildroot} tools docs %install rm -rf %{buildroot} @@ -156,6 +156,9 @@ %dir %{_localstatedir}/run/xenstored %changelog +* Thu Mar 2 2006 Rik van Riel - 3.0.1-0.20060301.fc5.2 +- fix 64 bit CFLAGS issue with vmxloader and hvmloader + * Wed Mar 1 2006 Stephen Tweedie - 3.0.1-0.20060301.fc5.1 - Update to xen-unstable cset 9022 From fedora-cvs-commits at redhat.com Thu Mar 2 15:57:46 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 2 Mar 2006 10:57:46 -0500 Subject: rpms/xen/devel xen.spec,1.99,1.100 Message-ID: <200603021557.k22FvkXs024653@cvs.devel.redhat.com> Author: sct Update of /cvs/dist/rpms/xen/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv24619 Modified Files: xen.spec Log Message: Remove unneeded CFLAGS spec file hack Index: xen.spec =================================================================== RCS file: /cvs/dist/rpms/xen/devel/xen.spec,v retrieving revision 1.99 retrieving revision 1.100 diff -u -r1.99 -r1.100 --- xen.spec 2 Mar 2006 15:46:58 -0000 1.99 +++ xen.spec 2 Mar 2006 15:57:44 -0000 1.100 @@ -5,7 +5,7 @@ Summary: Xen is a virtual machine monitor Name: xen Version: 3.0.1 -Release: 0.20060301.fc5.2 +Release: 0.20060301.fc5.3 Group: Development/Libraries License: GPL URL: http://www.cl.cam.ac.uk/Research/SRG/netos/xen/index.html @@ -70,7 +70,7 @@ popd sed -i -e "s;libvncserver-config;${vncdir}/libvncserver-config;" tools/ioemu/configure -CFLAGS="`echo $RPM_OPT_FLAGS | sed -e 's/ -m64//g'`" %{__make} XEN_PYTHON_NATIVE_INSTALL=1 DESTDIR=%{buildroot} tools docs +CFLAGS="$RPM_OPT_FLAGS" %{__make} XEN_PYTHON_NATIVE_INSTALL=1 DESTDIR=%{buildroot} tools docs %install rm -rf %{buildroot} @@ -156,6 +156,9 @@ %dir %{_localstatedir}/run/xenstored %changelog +* Thu Mar 2 2006 Stephen Tweedie - 3.0.1-0.20060301.fc5.3 +- Remove unneeded CFLAGS spec file hack + * Thu Mar 2 2006 Rik van Riel - 3.0.1-0.20060301.fc5.2 - fix 64 bit CFLAGS issue with vmxloader and hvmloader From fedora-cvs-commits at redhat.com Thu Mar 2 16:34:25 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 2 Mar 2006 11:34:25 -0500 Subject: rpms/eclipse/devel eclipse.spec,1.252,1.253 Message-ID: <200603021634.k22GYPDe015177@cvs.devel.redhat.com> Author: overholt Update of /cvs/dist/rpms/eclipse/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv15152 Modified Files: eclipse.spec Log Message: Remove unnecessary tomcat jars so they're not natively-compiled. Index: eclipse.spec =================================================================== RCS file: /cvs/dist/rpms/eclipse/devel/eclipse.spec,v retrieving revision 1.252 retrieving revision 1.253 diff -u -r1.252 -r1.253 --- eclipse.spec 1 Mar 2006 19:51:42 -0000 1.252 +++ eclipse.spec 2 Mar 2006 16:34:08 -0000 1.253 @@ -496,6 +496,11 @@ ## BEGIN TOMCAT ## rm -f plugins/org.eclipse.tomcat/servlet.jar rm -f plugins/org.eclipse.tomcat/servlets-manager.jar +rm -f plugins/org.eclipse.tomcat/commons-collections.jar +rm -f plugins/org.eclipse.tomcat/commons-logging-api.jar +rm -f plugins/org.eclipse.tomcat/naming-common.jar +rm -f plugins/org.eclipse.tomcat/servlets-common.jar +rm -f plugins/org.eclipse.tomcat/tomcat-http11.jar ln -sf %{tomcatsharedir}/bin/bootstrap.jar plugins/org.eclipse.tomcat/bootstrap.jar ln -sf %{tomcatlibdir}/server/lib/catalina.jar plugins/org.eclipse.tomcat/catalina.jar ln -sf %{tomcatlibdir}/server/lib/catalina-optional.jar plugins/org.eclipse.tomcat/catalina-optional.jar @@ -859,6 +864,11 @@ ## BEGIN TOMCAT ## rm -f plugins/org.eclipse.tomcat_*/servlet.jar rm -f plugins/org.eclipse.tomcat_*/servlets-manager.jar +rm -f plugins/org.eclipse.tomcat_*/commons-collections.jar +rm -f plugins/org.eclipse.tomcat_*/commons-logging-api.jar +rm -f plugins/org.eclipse.tomcat_*/naming-common.jar +rm -f plugins/org.eclipse.tomcat_*/servlets-common.jar +rm -f plugins/org.eclipse.tomcat_*/tomcat-http11.jar ln -sf %{tomcatsharedir}/bin/bootstrap.jar plugins/org.eclipse.tomcat_*/bootstrap.jar ln -sf %{tomcatlibdir}/server/lib/catalina.jar plugins/org.eclipse.tomcat_*/catalina.jar ln -sf %{tomcatlibdir}/server/lib/catalina-optional.jar plugins/org.eclipse.tomcat_*/catalina-optional.jar From fedora-cvs-commits at redhat.com Thu Mar 2 17:19:33 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 2 Mar 2006 12:19:33 -0500 Subject: rpms/gnome-power-manager/devel gnome-power-manager-2.13.92-action-warning-type.patch, NONE, 1.1 gnome-power-manager.spec, 1.27, 1.28 Message-ID: <200603021719.k22HJXkt012873@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/gnome-power-manager/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv12856 Modified Files: gnome-power-manager.spec Added Files: gnome-power-manager-2.13.92-action-warning-type.patch Log Message: - Add patch from Richard Hughes to potentially fix a crasher bug (bug 183127) gnome-power-manager-2.13.92-action-warning-type.patch: gpm-manager.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletion(-) --- NEW FILE gnome-power-manager-2.13.92-action-warning-type.patch --- --- gnome-power-manager-2.13.92/src/gpm-manager.c 26 Feb 2006 13:18:28 -0000 1.73 +++ gnome-power-manager-2.13.92/src/gpm-manager.c 27 Feb 2006 12:50:24 -0000 @@ -1109,7 +1109,8 @@ { char *title = NULL; - if (warning_type == GPM_WARNING_CRITICAL) { + if (warning_type == GPM_WARNING_ACTION || + warning_type == GPM_WARNING_CRITICAL) { title = _("Power Critically Low"); Index: gnome-power-manager.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-power-manager/devel/gnome-power-manager.spec,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- gnome-power-manager.spec 28 Feb 2006 16:13:48 -0000 1.27 +++ gnome-power-manager.spec 2 Mar 2006 17:19:31 -0000 1.28 @@ -5,7 +5,7 @@ Summary: GNOME Power Manager Name: gnome-power-manager Version: 2.13.92 -Release: 2 +Release: 3 License: GPL Group: Applications/System Source: gnome-power-manager-%{version}.tar.bz2 @@ -26,6 +26,8 @@ Requires: dbus-x11 >= %{dbus_version} Requires: scrollkeeper +Patch0: gnome-power-manager-2.13.92-action-warning-type.patch + %description GNOME Power Manager uses the information and facilities provided by HAL displaying icons and handling user callbacks in an interactive GNOME session. @@ -34,6 +36,7 @@ %prep %setup -q +%patch0 -p1 -b .action-warning-type %build %configure --disable-scrollkeeper --disable-actions-menu @@ -80,6 +83,10 @@ %{_datadir}/applications/gnome-power-preferences.desktop %changelog +* Thu Mar 2 2006 Ray Strode - 2.13.92-3 +- Add patch from Richard Hughes to potentially fix a + crasher bug (bug 183127) + * Tue Feb 28 2006 Karsten Hopp 2.13.92-2 - Buildrequires: gnome-doc-utils From fedora-cvs-commits at redhat.com Thu Mar 2 17:39:42 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 2 Mar 2006 12:39:42 -0500 Subject: rpms/gstreamer-plugins/FC-4 gstreamer-plugins-0.8.12-execshield.patch, 1.1, 1.2 Message-ID: <200603021739.k22Hdgc6013180@cvs.devel.redhat.com> Author: cmontgom Update of /cvs/dist/rpms/gstreamer-plugins/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv13149 Modified Files: gstreamer-plugins-0.8.12-execshield.patch Log Message: Correct format of execshield patch gstreamer-plugins-0.8.12-execshield.patch: APU.Asm | 4 +++- DSP.Asm | 4 +++- SPC700.Asm | 4 +++- 3 files changed, 9 insertions(+), 3 deletions(-) Index: gstreamer-plugins-0.8.12-execshield.patch =================================================================== RCS file: /cvs/dist/rpms/gstreamer-plugins/FC-4/gstreamer-plugins-0.8.12-execshield.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gstreamer-plugins-0.8.12-execshield.patch 28 Feb 2006 21:35:11 -0000 1.1 +++ gstreamer-plugins-0.8.12-execshield.patch 2 Mar 2006 17:39:38 -0000 1.2 @@ -1,30 +1,33 @@ -*** gst-plugins-0.8.12/ext/spc/DSP.Asm~ 2005-03-26 10:18:02.000000000 -0500 ---- gst-plugins-0.8.12/ext/spc/DSP.Asm 2006-02-27 15:25:34.000000000 -0500 -*************** -*** 8138,8140 **** ---- 8138,8142 ---- - FStP ST - - ENDP VMax2dB -+ -+ section .note.GNU-stack progbits noalloc noexec nowrite align=1 -*** gst-plugins-0.8.12/ext/spc/APU.Asm~ 2006-02-20 17:51:34.000000000 -0500 ---- gst-plugins-0.8.12/ext/spc/APU.Asm 2006-02-27 15:32:24.000000000 -0500 -*************** -*** 421,423 **** ---- 421,425 ---- - PROC ShutAPU - - ENDP -+ -+ section .note.GNU-stack progbits noalloc noexec nowrite align=1 -*** gst-plugins-0.8.12/ext/spc/SPC700.Asm~ 2005-03-26 10:18:02.000000000 -0500 ---- gst-plugins-0.8.12/ext/spc/SPC700.Asm 2006-02-27 15:32:19.000000000 -0500 -*************** -*** 4434,4436 **** ---- 4434,4438 ---- - Mov [EDX+RAM+0F0h],DH ;Reset counter - %endif - Jmp EBP -+ -+ section .note.GNU-stack progbits noalloc noexec nowrite align=1 +--- gst-plugins-0.8.12/ext/spc/APU.Asm.orig 2006-02-20 17:51:34.000000000 -0500 ++++ gst-plugins-0.8.12/ext/spc/APU.Asm 2006-02-27 15:32:24.000000000 -0500 +@@ -420,4 +420,6 @@ + + PROC ShutAPU + +-ENDP +\ No newline at end of file ++ENDP ++ ++section .note.GNU-stack progbits noalloc noexec nowrite align=1 +--- gst-plugins-0.8.12/ext/spc/SPC700.Asm.orig 2005-03-26 10:18:02.000000000 -0500 ++++ gst-plugins-0.8.12/ext/spc/SPC700.Asm 2006-02-27 15:32:19.000000000 -0500 +@@ -4433,4 +4433,6 @@ + %else + Mov [EDX+RAM+0F0h],DH ;Reset counter + %endif +- Jmp EBP +\ No newline at end of file ++ Jmp EBP ++ ++section .note.GNU-stack progbits noalloc noexec nowrite align=1 +--- gst-plugins-0.8.12/ext/spc/DSP.Asm.orig 2005-03-26 10:18:02.000000000 -0500 ++++ gst-plugins-0.8.12/ext/spc/DSP.Asm 2006-02-27 15:25:34.000000000 -0500 +@@ -8137,4 +8137,6 @@ + FStP ST + FStP ST + +-ENDP VMax2dB +\ No newline at end of file ++ENDP VMax2dB ++ ++section .note.GNU-stack progbits noalloc noexec nowrite align=1 From fedora-cvs-commits at redhat.com Thu Mar 2 17:40:43 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 2 Mar 2006 12:40:43 -0500 Subject: rpms/yum/devel yum-2.5.3-conditionalgroups.patch, NONE, 1.1 yum.spec, 1.82, 1.83 Message-ID: <200603021740.k22HehWk013215@cvs.devel.redhat.com> Author: pnasrat Update of /cvs/dist/rpms/yum/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv13204 Modified Files: yum.spec Added Files: yum-2.5.3-conditionalgroups.patch Log Message: conditional groups yum-2.5.3-conditionalgroups.patch: docs/yum.conf.5 | 4 ++++ output.py | 5 +++++ yum/__init__.py | 18 ++++++++++++++++++ yum/config.py | 1 + yum/transactioninfo.py | 23 +++++++++++++++++++---- 5 files changed, 47 insertions(+), 4 deletions(-) --- NEW FILE yum-2.5.3-conditionalgroups.patch --- --- yum-2.5.3/yum/transactioninfo.py.cond 2006-02-10 00:08:59.000000000 -0500 +++ yum-2.5.3/yum/transactioninfo.py 2006-03-02 11:25:13.000000000 -0500 @@ -295,7 +295,22 @@ self.add(txmbr) return txmbr -class SortableTransactionData(TransactionData): +class ConditionalTransactionData(TransactionData): + """A transaction data implementing conditional package addition""" + def __init__(self): + # Key: package name to trigger condition + # Value: list of package objects to add + self.conditionals = {} + TransactionData.__init__(self) + + def add(self, txmember): + TransactionData.add(self, txmember) + if self.conditionals.has_key(txmember.name): + for po in self.conditionals[txmember.name]: + condtxmbr = self.addInstall(po) + condtxmbr.setAsDep(po=txmember.po) + +class SortableTransactionData(ConditionalTransactionData): """A transaction data implementing topological sort on it's members""" def __init__(self): # Cache of sort @@ -306,7 +321,7 @@ self.loops = [] # Only resort if transaction data changed self.changed = True - TransactionData.__init__(self) + ConditionalTransactionData.__init__(self) def _visit(self, txmbr): self.path.append(txmbr.name) @@ -328,11 +343,11 @@ def add(self, txmember): txmember.sortColour = TX_WHITE - TransactionData.add(self, txmember) + ConditionalTransactionData.add(self, txmember) self.changed = True def remove(self, pkgtup): - TransactionData.remove(self, pkgtup) + ConditionalTransactionData.remove(self, pkgtup) self.changed = True def sort(self): --- yum-2.5.3/yum/config.py.cond 2006-02-13 15:40:21.000000000 -0500 +++ yum-2.5.3/yum/config.py 2006-03-02 11:25:13.000000000 -0500 @@ -508,6 +508,7 @@ enabled = BoolOption(True) plugins = BoolOption(False) enablegroups = BoolOption(True) + enable_group_conditionals = BoolOption(True) timeout = FloatOption(30.0) --- yum-2.5.3/yum/__init__.py.cond 2006-02-22 17:07:19.000000000 -0500 +++ yum-2.5.3/yum/__init__.py 2006-03-02 11:25:13.000000000 -0500 @@ -70,6 +70,8 @@ def _transactionDataFactory(self): """Factory method returning TransactionData object""" + if self.conf.enable_group_conditionals: + return transactioninfo.ConditionalTransactionData() return transactioninfo.TransactionData() def log(self, value, msg): @@ -1373,6 +1375,22 @@ for txmbr in txmbrs: txmbr.groups.append(thisgroup.groupid) + if self.conf.enable_group_conditionals: + for condreq, cond in thisgroup.conditional_packages.iteritems(): + if self.rpmdb.installed(name = cond): + txmbrs = self.install(name = condreq) + txmbrs_used.extend(txmbrs) + for txmbr in txmbrs: + txmbr.groups.append(thisgroup.groupid) + continue + pkgs = self.pkgSack.searchNevra(name=condreq) + if pkgs: + pkgs = self.bestPackagesFromList(pkgs) + if self.tsInfo.conditionals.has_key(cond): + self.tsInfo.conditionals[cond].extend(pkgs) + else: + self.tsInfo.conditionals[cond] = pkgs + return txmbrs_used def deselectGroup(self, grpid): --- yum-2.5.3/docs/yum.conf.5.cond 2006-02-10 00:19:10.000000000 -0500 +++ yum-2.5.3/docs/yum.conf.5 2006-03-02 11:25:13.000000000 -0500 @@ -110,6 +110,10 @@ repository will be used. If \fBoverwrite_groups\fR is `0' then the groups from all matching repositories will be merged together as one large group. +.IP \fBenable_group_conditionals\fR +Either `0' or `1'. Determines whether yum will allow the use of conditionals +packages. Default is `1' (package conditionals are allowed). + .IP \fBinstallroot \fR Specifies an alternative installroot, relative to which all packages will be installed. --- yum-2.5.3/output.py.cond 2005-12-08 03:01:37.000000000 -0500 +++ yum-2.5.3/output.py 2006-03-02 11:25:23.000000000 -0500 @@ -142,6 +142,11 @@ for item in group.optional_packages.keys(): print ' %s' % item + if len(group.conditional_packages.keys()) > 0: + print ' Conditional Packages:' + for item, cond in group.conditional_packages.iteritems(): + print ' %s' % (item,) + def depListOutput(self, results): """take a list of findDeps results and 'pretty print' the output""" Index: yum.spec =================================================================== RCS file: /cvs/dist/rpms/yum/devel/yum.spec,v retrieving revision 1.82 retrieving revision 1.83 diff -u -r1.82 -r1.83 --- yum.spec 24 Feb 2006 23:39:32 -0000 1.82 +++ yum.spec 2 Mar 2006 17:40:29 -0000 1.83 @@ -3,7 +3,7 @@ Summary: RPM installer/updater Name: yum Version: 2.5.3 -Release: 2 +Release: 3 License: GPL Group: System Environment/Base Source0: http://linux.duke.edu/projects/yum/download/2.5/yum-%{version}.tar.gz @@ -12,6 +12,7 @@ Source99: plugin.conf # default plugins here Source100: installonlyn.py +Patch0: yum-2.5.3-conditionalgroups.patch URL: http://linux.duke.edu/yum/ BuildArchitectures: noarch BuildRequires: python @@ -31,6 +32,7 @@ %prep %setup -q +%patch0 -p1 -b .cond %build make @@ -92,6 +94,9 @@ /usr/lib/yum-plugins/* %changelog +* Thu Mar 02 2006 Paul Nasrat - 2.5.3-3 +- Conditional group support (#181858) + * Fri Feb 24 2006 Jeremy Katz - 2.5.3-2 - fix installyonlyn bug with tokeep > 2 (#176704) From fedora-cvs-commits at redhat.com Thu Mar 2 17:45:00 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 2 Mar 2006 12:45:00 -0500 Subject: rpms/gstreamer-plugins/FC-4 gstreamer-plugins.spec,1.52,1.53 Message-ID: <200603021745.k22Hj0GC013255@cvs.devel.redhat.com> Author: cmontgom Update of /cvs/dist/rpms/gstreamer-plugins/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv13242 Modified Files: gstreamer-plugins.spec Log Message: Correct filename typo in spec Index: gstreamer-plugins.spec =================================================================== RCS file: /cvs/dist/rpms/gstreamer-plugins/FC-4/gstreamer-plugins.spec,v retrieving revision 1.52 retrieving revision 1.53 diff -u -r1.52 -r1.53 --- gstreamer-plugins.spec 28 Feb 2006 21:35:10 -0000 1.52 +++ gstreamer-plugins.spec 2 Mar 2006 17:44:57 -0000 1.53 @@ -17,7 +17,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-root Patch1: gstreamer-plugins-0.8.7-alsa.patch -Patch2: gstreamer-plugins-0.8.12-execsheild.patch +Patch2: gstreamer-plugins-0.8.12-execshield.patch Requires: glib2 >= %_glib2 Requires: gstreamer >= %{version} From fedora-cvs-commits at redhat.com Thu Mar 2 18:06:52 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 2 Mar 2006 13:06:52 -0500 Subject: rpms/kernel/devel linux-2.6-xen-vsyscall_base.patch, NONE, 1.1.2.1 kernel-2.6.spec, 1.1971.2.15, 1.1971.2.16 linux-2.6-xen-move-vdso-fixmap.patch, 1.1.2.1, 1.1.2.2 Message-ID: <200603021806.k22I6qKQ004048@cvs.devel.redhat.com> Author: sct Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv3942 Modified Files: Tag: private-xen-rebased-1971-branch kernel-2.6.spec linux-2.6-xen-move-vdso-fixmap.patch Added Files: Tag: private-xen-rebased-1971-branch linux-2.6-xen-vsyscall_base.patch Log Message: More fixes for VSYSCALL conflicts: Add a second xen-unstable changeset (8982) to the vdso-move patch that we revert. Delete the FIX_VSYSCALL define from arch/i386/kernel/asm-offsets.c: it ends up in a nasty conflict between Xen and execshield, but with the vsyscall area being moved into a per-thread vdso anyway, we don't need to export the constant address to assembly any more. linux-2.6-xen-vsyscall_base.patch: asm-offsets.c | 1 - 1 files changed, 1 deletion(-) --- NEW FILE linux-2.6-xen-vsyscall_base.patch --- Xen's patches to make the fixmap area movable cause conflicts with non-xen builds, as the FIX_VSYSCALL define is no longer constant so cannot sensibly be handled by asm-offsets.c. But with execshield/vdso, we've got per-process maps to get to this memory, so we don't actually need the fixmap area's base address from assembly any more. Nuke it. --sct --- linux-2.6.15.i586/arch/i386/kernel/asm-offsets.c.vsys 2006-03-02 12:13:23.000000000 -0500 +++ linux-2.6.15.i586/arch/i386/kernel/asm-offsets.c 2006-03-02 12:13:33.000000000 -0500 @@ -71,5 +71,4 @@ #endif DEFINE(PAGE_SIZE_asm, PAGE_SIZE); - DEFINE(VSYSCALL_BASE, __fix_to_virt(FIX_VSYSCALL)); } Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.1971.2.15 retrieving revision 1.1971.2.16 diff -u -r1.1971.2.15 -r1.1971.2.16 --- kernel-2.6.spec 1 Mar 2006 22:31:52 -0000 1.1971.2.15 +++ kernel-2.6.spec 2 Mar 2006 18:06:39 -0000 1.1971.2.16 @@ -261,6 +261,7 @@ Patch701: linux-2.6-xen-compile-fixes.patch Patch702: linux-2.6-xen-no-tls-warn.patch Patch703: linux-2.6-xen-move-vdso-fixmap.patch +Patch704: linux-2.6-xen-vsyscall_base.patch Patch706: linux-2.6-xen_remap_vma_flags.patch Patch709: linux-2.6-percpu-NR_CPUS-hotplug-fix.patch Patch710: linux-2.6-xen-module-fault.patch @@ -774,11 +775,6 @@ %patch692 -p1 %patch693 -p1 %patch700 -p1 -%patch701 -p1 -%patch702 -p1 -%patch706 -p1 -%patch709 -p1 -#%patch710 -p1 # # Xen includes a patch which moves the vsyscall fixmap into a user-space VA, @@ -791,6 +787,13 @@ # %patch703 -p2 -R +%patch701 -p1 +%patch702 -p1 +%patch704 -p1 +%patch706 -p1 +%patch709 -p1 +#%patch710 -p1 + %endif # @@ -1602,6 +1605,9 @@ %endif %changelog +* Thu Mar 2 2006 Stephen Tweedie +- Fix xen/execshield VSYSCALL_BASE conflict + * Wed Mar 1 2006 Juan Quintela - disable ia64 build again. linux-2.6-xen-move-vdso-fixmap.patch: arch/i386/kernel/asm-offsets.c | 3 - arch/i386/kernel/sysenter.c | 76 ++++++++++++++++++++++++++++++--- arch/i386/mm/pgtable-xen.c | 1 include/asm-i386/a.out.h | 2 include/asm-i386/elf.h | 7 ++- include/asm-i386/fixmap.h | 9 --- include/asm-i386/mach-xen/asm/fixmap.h | 9 --- include/asm-i386/mach-xen/asm/page.h | 2 include/asm-i386/page.h | 2 9 files changed, 84 insertions(+), 27 deletions(-) Index: linux-2.6-xen-move-vdso-fixmap.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/Attic/linux-2.6-xen-move-vdso-fixmap.patch,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -r1.1.2.1 -r1.1.2.2 --- linux-2.6-xen-move-vdso-fixmap.patch 1 Mar 2006 22:12:41 -0000 1.1.2.1 +++ linux-2.6-xen-move-vdso-fixmap.patch 2 Mar 2006 18:06:40 -0000 1.1.2.2 @@ -214,3 +214,51 @@ #endif /* __KERNEL__ */ #include +# HG changeset patch +# User cl349 at firebug.cl.cam.ac.uk +# Node ID 55f597e929f341eade781048db9da77a0352820d +# Parent dbec76a720f8d79aa9dfcdb9e91684b7426a23f9 +Fix non-xen build for: Move the gate page (vsyscall) out of the fixmap area +into user address space, just below PAGE_OFFSET. + +From: Gerd Hoffmann +Signed-off-by: Christian Limpach + +diff -r dbec76a720f8 -r 55f597e929f3 linux-2.6-xen-sparse/include/asm-i386/fixmap.h +--- a/linux-2.6-xen-sparse/include/asm-i386/fixmap.h Mon Feb 27 10:26:01 2006 +0000 ++++ b/linux-2.6-xen-sparse/include/asm-i386/fixmap.h Mon Feb 27 10:27:57 2006 +0000 +@@ -52,7 +52,6 @@ + */ + enum fixed_addresses { + FIX_HOLE, +- FIX_VSYSCALL, + #ifdef CONFIG_X86_LOCAL_APIC + FIX_APIC_BASE, /* local (CPU) APIC) -- required for SMP or not */ + #endif +@@ -116,14 +115,6 @@ extern void __set_fixmap (enum fixed_add + #define __fix_to_virt(x) (FIXADDR_TOP - ((x) << PAGE_SHIFT)) + #define __virt_to_fix(x) ((FIXADDR_TOP - ((x)&PAGE_MASK)) >> PAGE_SHIFT) + +-/* +- * This is the range that is readable by user mode, and things +- * acting like user mode such as get_user_pages. +- */ +-#define FIXADDR_USER_START (__fix_to_virt(FIX_VSYSCALL)) +-#define FIXADDR_USER_END (FIXADDR_USER_START + PAGE_SIZE) +- +- + extern void __this_fixmap_does_not_exist(void); + + /* +diff -r dbec76a720f8 -r 55f597e929f3 linux-2.6-xen-sparse/include/asm-i386/page.h +--- a/linux-2.6-xen-sparse/include/asm-i386/page.h Mon Feb 27 10:26:01 2006 +0000 ++++ b/linux-2.6-xen-sparse/include/asm-i386/page.h Mon Feb 27 10:27:57 2006 +0000 +@@ -139,6 +139,8 @@ extern int page_is_ram(unsigned long pag + ((current->personality & READ_IMPLIES_EXEC) ? VM_EXEC : 0 ) | \ + VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC) + ++#define __HAVE_ARCH_GATE_AREA 1 ++ + #endif /* __KERNEL__ */ + + #include From fedora-cvs-commits at redhat.com Thu Mar 2 19:05:06 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 2 Mar 2006 14:05:06 -0500 Subject: rpms/postgresql/devel README.rpm-dist,1.10,1.11 Message-ID: <200603021905.k22J56KS017597@cvs.devel.redhat.com> Author: tgl Update of /cvs/dist/rpms/postgresql/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv17576 Modified Files: README.rpm-dist Log Message: Minor updates to sync README with the upstream (PGDG) RPM distribution. Index: README.rpm-dist =================================================================== RCS file: /cvs/dist/rpms/postgresql/devel/README.rpm-dist,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- README.rpm-dist 7 Nov 2005 21:54:56 -0000 1.10 +++ README.rpm-dist 2 Mar 2006 19:04:52 -0000 1.11 @@ -1,6 +1,6 @@ README.rpm-dist ----------------------------------------------------------------------------- -Version 8.1, for the PostgreSQL 8.1.0-1 RPMset. +Version 8.1, for the PostgreSQL 8.1.1-1 RPMset. Lamar Owen ----------------------------------------------------------------------------- @@ -23,9 +23,7 @@ with these RPMs. Please do NOT modify the initscript to add the '-i' back in -- it will get overwritten on the next package upgrade. Rather, see the section below on the Grand Unified Configuration file, which includes the -recommended way to get '-i' functionality. Note that as of PostgreSQL 8.0, -you don't need '-i' anyway if all you want to allow is local TCP/IP -connections. +recommended way to get '-i' functionality. INTRODUCTION ----------------------------------------------------------------------------- @@ -173,7 +171,7 @@ for you. These RPMs are designed to be LSB-compliant -- if you find this not to be the -case, please let us know by way of the pgsqlrpms-hackers at PostgreSQL.org +case, please let us know by way of the pgsqlrpms-hackers at pgfoundry.org mailing list. MULTIPLE POSTMASTERS @@ -280,7 +278,6 @@ sets of packages. The parameters, their defaults, and the meanings are: beta 0 #build with cassert and do not strip the binaries -perl 1 #build the postgresql-perl package. tcl 1 #build the postgresql-tcl package. jdbc 1 #build the postgresql-jdbc package. pls 1 #build the postgresql-pl package. @@ -293,12 +290,14 @@ nls 1 #build with national language support. pam 1 #build with PAM support. runselftest 1 #do "make check" during the build. +xml 1 #build contrib/xml2 +pgfts 1 #build with --enable-thread-safety To use these defines, invoke a rebuild like this: -rpm --rebuild --define 'perl 0' --define 'tcl 0' \ +rpmbuild --rebuild --define 'python 0' --define 'tcl 0' \ --define 'test 0' --define 'runselftest 1' --define 'kerberos 0' \ - postgresql-8.1.0-1.src.rpm -This line would disable the perl, tcl, and test subpackages, enable the + postgresql-8.1.1-1.src.rpm +This line would disable the python, tcl, and test subpackages, enable the regression test run during build, and disable kerberos support. You might need to disable runselftest if there is an installed version of @@ -320,11 +319,12 @@ MORE INFORMATION ------------------------------------------------------------------------------- -You can get more information at http://www.postgresql.org +You can get more information at http://www.postgresql.org and +http://pgfoundry.org/projects/pgsqlrpms Please help make this packaging better -- let us know if you find problems, or better ways of doing things. You can reach us by e-mail at -pgsqlrpms-hackers at PostgreSQL.org . +pgsqlrpms-hackers at pgfoundry.org SUSE products usually ship with the latest version of PostgreSQL that was available at the time they were released. RPMs for newer versions From fedora-cvs-commits at redhat.com Thu Mar 2 19:22:03 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 2 Mar 2006 14:22:03 -0500 Subject: rpms/gthumb/devel gthumb-2.7.3-use-local-filename.patch, NONE, 1.1 gthumb.spec, 1.37, 1.38 Message-ID: <200603021922.k22JM3pd003691@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/gthumb/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv3622 Modified Files: gthumb.spec Added Files: gthumb-2.7.3-use-local-filename.patch Log Message: - Make saving work again (bug 183141) gthumb-2.7.3-use-local-filename.patch: gth-window-actions-callbacks.c | 15 ++++++++++++++- 1 files changed, 14 insertions(+), 1 deletion(-) --- NEW FILE gthumb-2.7.3-use-local-filename.patch --- --- gthumb-2.7.3/src/gth-window-actions-callbacks.c.use-local-filename 2006-03-02 14:08:18.000000000 -0500 +++ gthumb-2.7.3/src/gth-window-actions-callbacks.c 2006-03-02 14:15:53.000000000 -0500 @@ -32,6 +32,8 @@ #include #include #include +#include +#include #include "async-pixbuf-ops.h" #include "catalog.h" @@ -131,10 +133,21 @@ { GthWindow *window = GTH_WINDOW (data); ImageViewer *image_viewer = gth_window_get_image_viewer (window); + GnomeVFSURI *uri; + char *str_uri, *unescaped_str_uri; + + uri = gnome_vfs_uri_new (gth_window_get_image_filename (window)); + + str_uri = gnome_vfs_uri_to_string (uri, + GNOME_VFS_URI_HIDE_TOPLEVEL_METHOD); + unescaped_str_uri = gnome_vfs_unescape_string (str_uri, NULL); + g_free (str_uri); gth_window_save_pixbuf (window, image_viewer_get_current_pixbuf (image_viewer), - gth_window_get_image_filename (window)); + unescaped_str_uri); + g_free (unescaped_str_uri); + gnome_vfs_uri_unref (uri); } Index: gthumb.spec =================================================================== RCS file: /cvs/dist/rpms/gthumb/devel/gthumb.spec,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- gthumb.spec 15 Feb 2006 06:31:29 -0000 1.37 +++ gthumb.spec 2 Mar 2006 19:22:00 -0000 1.38 @@ -10,7 +10,7 @@ Summary: Image viewer, editor, organizer Name: gthumb Version: 2.7.3 -Release: 1 +Release: 2 URL: http://gthumb.sourceforge.net Source0: ftp://ftp.gnome.org/pub/GNOME/sources/gthumb/2.4/%{name}-%{version}.tar.bz2 License: GPL @@ -36,12 +36,15 @@ Requires: scrollkeeper +Patch0: gthumb-2.7.3-use-local-filename.patch + %description gthumb is an application for viewing, editing, and organizing collections of images. %prep %setup -q +%patch0 -p1 -b .use-local-filename %build @@ -97,6 +100,9 @@ %{_datadir}/pixmaps %changelog +* Thu Mar 2 2006 Ray Strode - 2.7.3-2 +- Make saving work again (bug 183141) + * Wed Feb 15 2006 Matthias Clasen - 2.7.3-1 - Update to 2.7.3 - BuildRequire libgphoto2 From fedora-cvs-commits at redhat.com Thu Mar 2 19:26:14 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 2 Mar 2006 14:26:14 -0500 Subject: rpms/kernel/devel patch-2.6.16-rc5-git6.bz2.sign, NONE, 1.1 .cvsignore, 1.368, 1.369 kernel-2.6.spec, 1.2008, 1.2009 sources, 1.309, 1.310 upstream, 1.284, 1.285 patch-2.6.16-rc5-git4.bz2.sign, 1.1, NONE Message-ID: <200603021926.k22JQE8F005719@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv5645 Modified Files: .cvsignore kernel-2.6.spec sources upstream Added Files: patch-2.6.16-rc5-git6.bz2.sign Removed Files: patch-2.6.16-rc5-git4.bz2.sign Log Message: 2.6.16rc5-git6 --- NEW FILE patch-2.6.16-rc5-git6.bz2.sign --- -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.2.1 (GNU/Linux) Comment: See http://www.kernel.org/signature.html for info iD8DBQBEBphsyGugalF9Dw4RAtP+AJ9GMgKEKljuROxq/c8uYM8rSBQUXACghXFw SGu8zLO0mdGTM/vLYCwNz0E= =i8+9 -----END PGP SIGNATURE----- Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v retrieving revision 1.368 retrieving revision 1.369 diff -u -r1.368 -r1.369 --- .cvsignore 1 Mar 2006 21:06:56 -0000 1.368 +++ .cvsignore 2 Mar 2006 19:26:10 -0000 1.369 @@ -4,4 +4,4 @@ linux-2.6.15.tar.bz2 xen-20060208.tar.bz2 patch-2.6.16-rc5.bz2 -patch-2.6.16-rc5-git4.bz2 +patch-2.6.16-rc5-git6.bz2 Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.2008 retrieving revision 1.2009 diff -u -r1.2008 -r1.2009 --- kernel-2.6.spec 2 Mar 2006 07:43:41 -0000 1.2008 +++ kernel-2.6.spec 2 Mar 2006 19:26:10 -0000 1.2009 @@ -218,7 +218,7 @@ # Patches 0 through 100 are meant for core subsystem upgrades # Patch1: patch-2.6.16-rc5.bz2 -Patch2: patch-2.6.16-rc5-git4.bz2 +Patch2: patch-2.6.16-rc5-git6.bz2 # Patches 100 through 500 are meant for architecture patches Patch100: linux-2.6-bzimage.patch @@ -1604,6 +1604,7 @@ %changelog * Thu Mar 2 2006 Dave Jones +- 2.6.16rc5-git6 - Fix acpi_os_acquire_object() with IRQs disabled debug msgs. - Mark unwind info for signal trampolines in vDSOs Index: sources =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/sources,v retrieving revision 1.309 retrieving revision 1.310 diff -u -r1.309 -r1.310 --- sources 1 Mar 2006 16:54:12 -0000 1.309 +++ sources 2 Mar 2006 19:26:10 -0000 1.310 @@ -1,4 +1,4 @@ cdf95e00f5111e31f78e1d97304d9522 linux-2.6.15.tar.bz2 30f4ef37dbc4d0bce9366e8716e8b51b xen-20060208.tar.bz2 1740ae34807f687a93adf2469ea5c4fc patch-2.6.16-rc5.bz2 -ab35d3814d795d61ad95aaa4b31ca034 patch-2.6.16-rc5-git4.bz2 +57537f7ff1c1cf1534df4a0986956feb patch-2.6.16-rc5-git6.bz2 Index: upstream =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/upstream,v retrieving revision 1.284 retrieving revision 1.285 diff -u -r1.284 -r1.285 --- upstream 1 Mar 2006 16:54:12 -0000 1.284 +++ upstream 2 Mar 2006 19:26:10 -0000 1.285 @@ -1,3 +1,3 @@ linux-2.6.15.tar.bz2 patch-2.6.16-rc5.bz2 -patch-2.6.16-rc5-git4.bz2 +patch-2.6.16-rc5-git6.bz2 --- patch-2.6.16-rc5-git4.bz2.sign DELETED --- From fedora-cvs-commits at redhat.com Thu Mar 2 19:36:30 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 2 Mar 2006 14:36:30 -0500 Subject: rpms/comps-extras/devel .cvsignore, 1.12, 1.13 comps-extras.spec, 1.17, 1.18 sources, 1.16, 1.17 Message-ID: <200603021936.k22JaUeO012535@cvs.devel.redhat.com> Author: notting Update of /cvs/dist/rpms/comps-extras/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv10151/devel Modified Files: .cvsignore comps-extras.spec sources Log Message: auto-import comps-extras-11.1-1 on branch devel from comps-extras-11.1-1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/comps-extras/devel/.cvsignore,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- .cvsignore 1 Mar 2006 21:57:07 -0000 1.12 +++ .cvsignore 2 Mar 2006 19:36:27 -0000 1.13 @@ -1 +1 @@ -comps-extras-11.tar.gz +comps-extras-11.1.tar.gz Index: comps-extras.spec =================================================================== RCS file: /cvs/dist/rpms/comps-extras/devel/comps-extras.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- comps-extras.spec 1 Mar 2006 21:57:07 -0000 1.17 +++ comps-extras.spec 2 Mar 2006 19:36:27 -0000 1.18 @@ -1,6 +1,6 @@ Summary: Images for components and tools for working with the comps file Name: comps-extras -Version: 11 +Version: 11.1 Release: 1 Source0: %{name}-%{version}.tar.gz License: GPL @@ -31,6 +31,10 @@ %changelog +* Thu Mar 2 2006 Bill Nottingham - 11.1-1 +- new education icon from Diana Fong +- update XFCE icon + * Wed Mar 1 2006 Bill Nottingham - 11-1 - pirut/anaconda now use 24x24. update sizes - various additions/removals Index: sources =================================================================== RCS file: /cvs/dist/rpms/comps-extras/devel/sources,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- sources 1 Mar 2006 21:57:07 -0000 1.16 +++ sources 2 Mar 2006 19:36:28 -0000 1.17 @@ -1 +1 @@ -0f2ca0221284948d6ed1a8d2b1a5090c comps-extras-11.tar.gz +8e15d2ea7a7d07b16b0f2170f5c9dca4 comps-extras-11.1.tar.gz From fedora-cvs-commits at redhat.com Thu Mar 2 19:59:35 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 2 Mar 2006 14:59:35 -0500 Subject: rpms/squirrelmail/devel squirrelmail.spec,1.29,1.30 Message-ID: <200603021959.k22JxZIP024858@cvs.devel.redhat.com> Author: wtogami Update of /cvs/dist/rpms/squirrelmail/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv24734 Modified Files: squirrelmail.spec Log Message: Upgrade to 1.4.6 proper for CVE-2006-0377 CVE-2006-0195 CVE-2006-0188 (include CVE numbers in changelog) Index: squirrelmail.spec =================================================================== RCS file: /cvs/dist/rpms/squirrelmail/devel/squirrelmail.spec,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- squirrelmail.spec 1 Mar 2006 15:01:08 -0000 1.29 +++ squirrelmail.spec 2 Mar 2006 19:59:32 -0000 1.30 @@ -213,7 +213,7 @@ %changelog * Wed Mar 1 2006 David Woodhouse 1.4.6-1 -- Upgrade to 1.4.6 proper +- Upgrade to 1.4.6 proper for CVE-2006-0377 CVE-2006-0195 CVE-2006-0188 - Script the charset changes instead of using a patch - Convert the ko_KR files to UTF-8, dropping invalid characters from what's theoretically supposed to be EUC-KR in the original. From fedora-cvs-commits at redhat.com Thu Mar 2 20:23:50 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 2 Mar 2006 15:23:50 -0500 Subject: rpms/mono/devel mono-1.1.13.2-work-with-selinux.patch, 1.2, 1.3 mono.spec, 1.29, 1.30 Message-ID: <200603022023.k22KNoYv012569@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/mono/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv12478 Modified Files: mono-1.1.13.2-work-with-selinux.patch mono.spec Log Message: - Updated patch from Jakub (1.1.13.2-3 to 1.1.13.2-5 are for bug 182965) mono-1.1.13.2-work-with-selinux.patch: mono-compiler.h | 22 +++++++++++++++------- 1 files changed, 15 insertions(+), 7 deletions(-) Index: mono-1.1.13.2-work-with-selinux.patch =================================================================== RCS file: /cvs/dist/rpms/mono/devel/mono-1.1.13.2-work-with-selinux.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- mono-1.1.13.2-work-with-selinux.patch 28 Feb 2006 15:55:00 -0000 1.2 +++ mono-1.1.13.2-work-with-selinux.patch 2 Mar 2006 20:23:46 -0000 1.3 @@ -1,5 +1,5 @@ --- mono-1.1.13.2/mono/utils/mono-compiler.h.work-with-selinux 2006-02-27 12:38:30.000000000 -0500 -+++ mono-1.1.13.2/mono/utils/mono-compiler.h 2006-02-28 10:53:01.000000000 -0500 ++++ mono-1.1.13.2/mono/utils/mono-compiler.h 2006-03-02 15:21:16.000000000 -0500 @@ -9,10 +9,10 @@ #ifdef HAVE_KW_THREAD #if HAVE_TLS_MODEL_ATTR @@ -14,7 +14,7 @@ #else #define MONO_TLS_FAST __attribute__((tls_model("local-exec"))) #endif -@@ -22,15 +22,19 @@ +@@ -22,15 +22,23 @@ #endif #if defined(__GNUC__) && defined(__i386__) @@ -34,7 +34,11 @@ #endif #elif defined(__ia64__) && !defined(__INTEL_COMPILER) -#define MONO_THREAD_VAR_OFFSET(var,offset) __asm ("addl %0 = @tprel(" #var "#), r0 ;;\n" : "=r" (offset)); ++#if defined(PIC) ++#define MONO_THREAD_VAR_OFFSET(var,offset) __asm ("addl %0 = @ltoff(@tprel(" #var "#)), gp ;; ld8 %0 = [%0]\n" : "=r" (offset)) ++#else +#define MONO_THREAD_VAR_OFFSET(var,offset) __asm ("addl %0 = @tprel(" #var "#), r0 ;;\n" : "=r" (offset)) ++#endif #else #define MONO_THREAD_VAR_OFFSET(var,offset) (offset) = -1 #endif Index: mono.spec =================================================================== RCS file: /cvs/dist/rpms/mono/devel/mono.spec,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- mono.spec 28 Feb 2006 15:55:00 -0000 1.29 +++ mono.spec 2 Mar 2006 20:23:46 -0000 1.30 @@ -1,6 +1,6 @@ Name: mono Version: 1.1.13.2 -Release: 4 +Release: 5 Summary: a .NET runtime environment Group: Development/Languages @@ -493,6 +493,10 @@ %gac_dll IBM.Data.DB2 %changelog +* Thu Mar 2 2006 Ray Strode - 1.1.13.2-5 +- Updated patch from Jakub (1.1.13.2-3 to 1.1.13.2-5 are + for bug 182965) + * Tue Feb 28 2006 Ray Strode - 1.1.13.2-4 - Updated patch from Paolo Molaro From fedora-cvs-commits at redhat.com Thu Mar 2 21:35:10 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 2 Mar 2006 16:35:10 -0500 Subject: rpms/yum/devel yum-2.5.3-conditionalgroups.patch,1.1,1.2 Message-ID: <200603022135.k22LZAns022355@cvs.devel.redhat.com> Author: pnasrat Update of /cvs/dist/rpms/yum/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv22334 Modified Files: yum-2.5.3-conditionalgroups.patch Log Message: Cover pkg selected then group yum-2.5.3-conditionalgroups.patch: docs/yum.conf.5 | 4 ++++ output.py | 5 +++++ yum/__init__.py | 35 +++++++++++++++++++++++++++++++++++ yum/config.py | 1 + yum/transactioninfo.py | 23 +++++++++++++++++++---- 5 files changed, 64 insertions(+), 4 deletions(-) Index: yum-2.5.3-conditionalgroups.patch =================================================================== RCS file: /cvs/dist/rpms/yum/devel/yum-2.5.3-conditionalgroups.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- yum-2.5.3-conditionalgroups.patch 2 Mar 2006 17:40:29 -0000 1.1 +++ yum-2.5.3-conditionalgroups.patch 2 Mar 2006 21:35:06 -0000 1.2 @@ -1,5 +1,5 @@ --- yum-2.5.3/yum/transactioninfo.py.cond 2006-02-10 00:08:59.000000000 -0500 -+++ yum-2.5.3/yum/transactioninfo.py 2006-03-02 11:25:13.000000000 -0500 ++++ yum-2.5.3/yum/transactioninfo.py 2006-03-02 15:51:43.000000000 -0500 @@ -295,7 +295,22 @@ self.add(txmbr) return txmbr @@ -48,7 +48,7 @@ def sort(self): --- yum-2.5.3/yum/config.py.cond 2006-02-13 15:40:21.000000000 -0500 -+++ yum-2.5.3/yum/config.py 2006-03-02 11:25:13.000000000 -0500 ++++ yum-2.5.3/yum/config.py 2006-03-02 15:51:43.000000000 -0500 @@ -508,6 +508,7 @@ enabled = BoolOption(True) plugins = BoolOption(False) @@ -58,7 +58,7 @@ timeout = FloatOption(30.0) --- yum-2.5.3/yum/__init__.py.cond 2006-02-22 17:07:19.000000000 -0500 -+++ yum-2.5.3/yum/__init__.py 2006-03-02 11:25:13.000000000 -0500 ++++ yum-2.5.3/yum/__init__.py 2006-03-02 16:31:44.000000000 -0500 @@ -70,6 +70,8 @@ def _transactionDataFactory(self): @@ -68,18 +68,19 @@ return transactioninfo.TransactionData() def log(self, value, msg): -@@ -1373,6 +1375,22 @@ +@@ -1373,6 +1375,23 @@ for txmbr in txmbrs: txmbr.groups.append(thisgroup.groupid) + if self.conf.enable_group_conditionals: + for condreq, cond in thisgroup.conditional_packages.iteritems(): -+ if self.rpmdb.installed(name = cond): ++ if self._isPackageInstalled(cond): + txmbrs = self.install(name = condreq) + txmbrs_used.extend(txmbrs) + for txmbr in txmbrs: + txmbr.groups.append(thisgroup.groupid) + continue ++ # Otherwise we hook into tsInfo.add + pkgs = self.pkgSack.searchNevra(name=condreq) + if pkgs: + pkgs = self.bestPackagesFromList(pkgs) @@ -91,8 +92,28 @@ return txmbrs_used def deselectGroup(self, grpid): +@@ -1869,3 +1888,19 @@ + + return returndict + ++ def _isPackageInstalled(self, pkgname): ++ # FIXME: Taken from anaconda/pirut ++ # clean up and make public ++ installed = False ++ if self.rpmdb.installed(name = pkgname): ++ installed = True ++ ++ lst = self.tsInfo.matchNaevr(name = pkgname) ++ for txmbr in lst: ++ if txmbr.output_state in TS_INSTALL_STATES: ++ return True ++ if installed and len(lst) > 0: ++ # if we get here, then it was installed, but it's in the tsInfo ++ # for an erase or obsoleted --> not going to be installed at end ++ return False ++ return installed --- yum-2.5.3/docs/yum.conf.5.cond 2006-02-10 00:19:10.000000000 -0500 -+++ yum-2.5.3/docs/yum.conf.5 2006-03-02 11:25:13.000000000 -0500 ++++ yum-2.5.3/docs/yum.conf.5 2006-03-02 15:51:43.000000000 -0500 @@ -110,6 +110,10 @@ repository will be used. If \fBoverwrite_groups\fR is `0' then the groups from all matching repositories will be merged together as one large group. @@ -105,7 +126,7 @@ Specifies an alternative installroot, relative to which all packages will be installed. --- yum-2.5.3/output.py.cond 2005-12-08 03:01:37.000000000 -0500 -+++ yum-2.5.3/output.py 2006-03-02 11:25:23.000000000 -0500 ++++ yum-2.5.3/output.py 2006-03-02 15:51:43.000000000 -0500 @@ -142,6 +142,11 @@ for item in group.optional_packages.keys(): print ' %s' % item From fedora-cvs-commits at redhat.com Thu Mar 2 21:36:58 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 2 Mar 2006 16:36:58 -0500 Subject: rpms/yum/devel yum.spec,1.83,1.84 Message-ID: <200603022136.k22Lawmi022398@cvs.devel.redhat.com> Author: pnasrat Update of /cvs/dist/rpms/yum/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv22383 Modified Files: yum.spec Log Message: cover all cases (#181858) Index: yum.spec =================================================================== RCS file: /cvs/dist/rpms/yum/devel/yum.spec,v retrieving revision 1.83 retrieving revision 1.84 diff -u -r1.83 -r1.84 --- yum.spec 2 Mar 2006 17:40:29 -0000 1.83 +++ yum.spec 2 Mar 2006 21:36:56 -0000 1.84 @@ -3,7 +3,7 @@ Summary: RPM installer/updater Name: yum Version: 2.5.3 -Release: 3 +Release: 4 License: GPL Group: System Environment/Base Source0: http://linux.duke.edu/projects/yum/download/2.5/yum-%{version}.tar.gz @@ -94,6 +94,9 @@ /usr/lib/yum-plugins/* %changelog +* Thu Mar 02 2006 Paul Nasrat - 2.5.3-4 +- Cover pkg then group selection in conditional group support (#181858) + * Thu Mar 02 2006 Paul Nasrat - 2.5.3-3 - Conditional group support (#181858) From fedora-cvs-commits at redhat.com Thu Mar 2 21:37:06 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 2 Mar 2006 16:37:06 -0500 Subject: rpms/hal/devel hal.spec,1.85,1.86 Message-ID: <200603022137.k22Lb645022422@cvs.devel.redhat.com> Author: johnp Update of /cvs/dist/rpms/hal/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv22406 Modified Files: hal.spec Log Message: - clear out fstab of all fstab-sync entries if previous hal < 0.5.7-2 Index: hal.spec =================================================================== RCS file: /cvs/dist/rpms/hal/devel/hal.spec,v retrieving revision 1.85 retrieving revision 1.86 diff -u -r1.85 -r1.86 --- hal.spec 24 Feb 2006 17:17:34 -0000 1.85 +++ hal.spec 2 Mar 2006 21:37:03 -0000 1.86 @@ -19,7 +19,7 @@ Summary: Hardware Abstraction Layer Name: hal Version: 0.5.7 -Release: 1 +Release: 2 URL: http://www.freedesktop.org/Software/hal Source0: %{name}-%{version}.tar.gz Source1: 99-redhat-storage-policy-fixed-drives.fdi @@ -123,6 +123,15 @@ # service haldaemon condrestart > /dev/null 2>&1 #fi +%triggerpostun -- hal < 0.5.7-2 +#remove lingering fstab-sync entries from /etc/fstab +/bin/cp -f /etc/fstab /etc/fstab.hal-save +while read line; do echo $line | awk '{print $4}' | grep -q managed || echo $line | grep -q "^#.*fstab-sync" || echo $line; done < /etc/fstab > fstab.replace + +if [ -s fstab.replace ]; then + /bin/cp -f fstab.replace /etc/fstab +fi + %files %defattr(-,root,root) #%doc COPYING ChangeLog NEWS @@ -181,6 +190,9 @@ %{_bindir}/hal-device-manager %changelog +* Thu Mar 02 2006 John (J5) Palmieri - 0.5.7-2 +- clear out fstab of all fstab-sync entries if previous hal < 0.5.7-2 + * Fri Feb 24 2006 David Zeuthen - 0.5.7-1 - New upstream version 0.5.7 with several bug fixes - Don't restart hald on package upgrade From fedora-cvs-commits at redhat.com Thu Mar 2 21:37:32 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 2 Mar 2006 16:37:32 -0500 Subject: rpms/openssh/devel openssh-4.3p1-audit.patch, 1.2, 1.3 openssh.spec, 1.89, 1.90 Message-ID: <200603022137.k22LbWR7022512@cvs.devel.redhat.com> Author: tmraz Update of /cvs/dist/rpms/openssh/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv22492 Modified Files: openssh-4.3p1-audit.patch openssh.spec Log Message: * Thu Mar 2 2006 Tomas Mraz - 4.3p2-4 - allow access if audit is not compiled in kernel (#183243) openssh-4.3p1-audit.patch: Makefile.in | 3 ++- auth.c | 10 ++++++++++ config.h.in | 3 +++ configure.ac | 15 +++++++++++++++ loginrec.c | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ loginrec.h | 4 ++++ 6 files changed, 90 insertions(+), 1 deletion(-) Index: openssh-4.3p1-audit.patch =================================================================== RCS file: /cvs/dist/rpms/openssh/devel/openssh-4.3p1-audit.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- openssh-4.3p1-audit.patch 24 Feb 2006 14:07:41 -0000 1.2 +++ openssh-4.3p1-audit.patch 2 Mar 2006 21:37:28 -0000 1.3 @@ -59,7 +59,7 @@ + rc = audit_log_user_message(audit_fd, AUDIT_USER_LOGIN, + buf, hostname, ip, ttyn, success); + close(audit_fd); -+ if (rc > 0) ++ if (rc >= 0) + return 1; + else + return 0; Index: openssh.spec =================================================================== RCS file: /cvs/dist/rpms/openssh/devel/openssh.spec,v retrieving revision 1.89 retrieving revision 1.90 diff -u -r1.89 -r1.90 --- openssh.spec 24 Feb 2006 14:07:41 -0000 1.89 +++ openssh.spec 2 Mar 2006 21:37:28 -0000 1.90 @@ -58,7 +58,7 @@ Summary: The OpenSSH implementation of SSH protocol versions 1 and 2. Name: openssh Version: 4.3p2 -%define rel 3 +%define rel 4 %if %{rescue} %define %{rel}rescue %else @@ -454,6 +454,9 @@ %endif %changelog +* Thu Mar 2 2006 Tomas Mraz - 4.3p2-4 +- allow access if audit is not compiled in kernel (#183243) + * Fri Feb 24 2006 Tomas Mraz - 4.3p2-3 - enable the subprocess in chroot to send messages to system log - sshd should prevent login if audit call fails From fedora-cvs-commits at redhat.com Thu Mar 2 21:53:35 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 2 Mar 2006 16:53:35 -0500 Subject: rpms/kernel/devel linux-2.6-NFSD-writes-shouldnt-clobber-utimes.patch, NONE, 1.1.4.1 linux-2.6-acpi_os_acquire_object-gfp_kernel-called-with-irqs.patch, NONE, 1.1.4.1 linux-2.6-debug-pm-pci.patch, NONE, 1.1.4.1 linux-2.6-md-raid1-leak.patch, NONE, 1.2.4.1 linux-2.6-sata-promise-pata-ports.patch, NONE, 1.1.4.1 linux-2.6-signal-trampolines-unwind-info.patch, NONE, 1.1.4.1 patch-2.6.16-rc5-git4.bz2.sign, NONE, 1.2.2.1 .cvsignore, 1.357.2.2, 1.357.2.3 kernel-2.6.spec, 1.1971.2.16, 1.1971.2.17 linux-2.6-radeon-backlight.patch, 1.10.20.1, 1.10.20.2 linux-2.6-selinux-selinuxfs-hard-link-count.patch, 1.1, 1.1.2.1 linux-2.6-softmac-git.patch, 1.7, 1.7.8.1 linux-2.6-xen-compile-fixes.patch, 1.1.12.6, 1.1.12.7 sources, 1.299.2.3, 1.299.2.4 upstream, 1.274.2.1, 1.274.2.2 Message-ID: <200603022153.k22LrZA9002834@cvs.devel.redhat.com> Author: quintela Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv2814 Modified Files: Tag: private-xen-rebased-1971-branch .cvsignore kernel-2.6.spec linux-2.6-radeon-backlight.patch linux-2.6-selinux-selinuxfs-hard-link-count.patch linux-2.6-softmac-git.patch linux-2.6-xen-compile-fixes.patch sources upstream Added Files: Tag: private-xen-rebased-1971-branch linux-2.6-NFSD-writes-shouldnt-clobber-utimes.patch linux-2.6-acpi_os_acquire_object-gfp_kernel-called-with-irqs.patch linux-2.6-debug-pm-pci.patch linux-2.6-md-raid1-leak.patch linux-2.6-sata-promise-pata-ports.patch linux-2.6-signal-trampolines-unwind-info.patch patch-2.6.16-rc5-git4.bz2.sign Log Message: merge with 1.2008 rawhide linux-2.6-NFSD-writes-shouldnt-clobber-utimes.patch: inode.c | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) --- NEW FILE linux-2.6-NFSD-writes-shouldnt-clobber-utimes.patch --- Author: Trond Myklebust NFS: writes should not clobber utimes() calls Ensure that we flush out writes in the case when someone calls utimes() in order to set the file times. Signed-off-by: Trond Myklebust --- fs/nfs/inode.c | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c index a77ee95..0524a20 100644 --- a/fs/nfs/inode.c +++ b/fs/nfs/inode.c @@ -859,11 +859,9 @@ nfs_setattr(struct dentry *dentry, struc lock_kernel(); nfs_begin_data_update(inode); - /* Write all dirty data if we're changing file permissions or size */ - if ((attr->ia_valid & (ATTR_MODE|ATTR_UID|ATTR_GID|ATTR_SIZE)) != 0) { - filemap_write_and_wait(inode->i_mapping); - nfs_wb_all(inode); - } + /* Write all dirty data */ + filemap_write_and_wait(inode->i_mapping); + nfs_wb_all(inode); /* * Return any delegations if we're going to change ACLs */ linux-2.6-acpi_os_acquire_object-gfp_kernel-called-with-irqs.patch: osl.c | 7 ++++++- parser/psutils.c | 8 ++++++-- 2 files changed, 12 insertions(+), 3 deletions(-) --- NEW FILE linux-2.6-acpi_os_acquire_object-gfp_kernel-called-with-irqs.patch --- From: Davi Arnaut acpi_os_acquire_object() gets called, with IRQs disabled, from: Debug: sleeping function called from invalid context at mm/slab.c:2499 in_atomic():0, irqs_disabled():1 [] kmem_cache_alloc+0x40/0x4f [] acpi_os_acquire_object+0xb/0x3c [] acpi_ut_allocate_object_desc_dbg+0x13/0x49 [] acpi_ut_create_internal_object_dbg+0xf/0x5e [] acpi_rs_set_srs_method_data+0x3d/0xb9 [] acpi_pci_link_set+0x102/0x17b [] irqrouter_resume+0x1e/0x3c [] __sysdev_resume+0x11/0x6b [] sysdev_resume+0x34/0x52 [] device_power_up+0x5/0xa [] suspend_enter+0x44/0x46 [] suspend_prepare+0x63/0xc1 [] enter_state+0x5e/0x7c [] state_store+0x81/0x8f [] state_store+0x0/0x8f [] subsys_attr_store+0x1e/0x22 [] flush_write_buffer+0x22/0x28 [] sysfs_write_file+0x4c/0x71 [] sysfs_write_file+0x0/0x71 [] vfs_write+0xa2/0x15a [] sys_write+0x41/0x6a [] syscall_call+0x7/0xb The patch also fixes a missing check for NULL return from acpi_os_acquire_object(). Signed-off-by: Davi Arnaut Cc: "Brown, Len" Cc: Pavel Machek Signed-off-by: Andrew Morton --- drivers/acpi/osl.c | 7 ++++++- drivers/acpi/parser/psutils.c | 8 ++++++-- 2 files changed, 12 insertions(+), 3 deletions(-) diff -puN drivers/acpi/osl.c~acpi_os_acquire_object-gfp_kernel-called-with-irqs drivers/acpi/osl.c --- devel/drivers/acpi/osl.c~acpi_os_acquire_object-gfp_kernel-called-with-irqs 2006-02-13 16:59:30.000000000 -0800 +++ devel-akpm/drivers/acpi/osl.c 2006-02-13 16:59:30.000000000 -0800 @@ -1175,7 +1175,12 @@ acpi_status acpi_os_release_object(acpi_ void *acpi_os_acquire_object(acpi_cache_t * cache) { - void *object = kmem_cache_alloc(cache, GFP_KERNEL); + void *object; + + if (acpi_in_resume) + object = kmem_cache_alloc(cache, GFP_ATOMIC); + else + object = kmem_cache_alloc(cache, GFP_KERNEL); WARN_ON(!object); return object; } diff -puN drivers/acpi/parser/psutils.c~acpi_os_acquire_object-gfp_kernel-called-with-irqs drivers/acpi/parser/psutils.c --- devel/drivers/acpi/parser/psutils.c~acpi_os_acquire_object-gfp_kernel-called-with-irqs 2006-02-13 16:59:30.000000000 -0800 +++ devel-akpm/drivers/acpi/parser/psutils.c 2006-02-13 16:59:30.000000000 -0800 @@ -139,12 +139,16 @@ union acpi_parse_object *acpi_ps_alloc_o /* The generic op (default) is by far the most common (16 to 1) */ op = acpi_os_acquire_object(acpi_gbl_ps_node_cache); - memset(op, 0, sizeof(struct acpi_parse_obj_common)); + + if (op) + memset(op, 0, sizeof(struct acpi_parse_obj_common)); } else { /* Extended parseop */ op = acpi_os_acquire_object(acpi_gbl_ps_node_ext_cache); - memset(op, 0, sizeof(struct acpi_parse_obj_named)); + + if (op) + memset(op, 0, sizeof(struct acpi_parse_obj_named)); } /* Initialize the Op */ _ linux-2.6-debug-pm-pci.patch: pci.c | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) --- NEW FILE linux-2.6-debug-pm-pci.patch --- --- linux-2.6.15.noarch/drivers/pci/pci.c~ 2006-03-01 15:41:00.000000000 -0500 +++ linux-2.6.15.noarch/drivers/pci/pci.c 2006-03-01 15:47:37.000000000 -0500 @@ -454,9 +454,17 @@ int pci_restore_state(struct pci_dev *dev) { int i; + int val; - for (i = 0; i < 16; i++) - pci_write_config_dword(dev,i * 4, dev->saved_config_space[i]); + for (i = 0; i < 16; i++) { + pci_read_config_dword(dev, i * 4, &val); + if (val != dev->saved_config_space[i]) { + printk (KERN_DEBUG "PM: Writing back config space on device %s at offset %x. (Was %x, writing %x)\n", + pci_name(dev), i, + val, (int) dev->saved_config_space[i]); + pci_write_config_dword(dev,i * 4, dev->saved_config_space[i]); + } + } return 0; } linux-2.6-md-raid1-leak.patch: raid1.c | 13 ++++++++----- 1 files changed, 8 insertions(+), 5 deletions(-) --- NEW FILE linux-2.6-md-raid1-leak.patch --- On Wednesday March 1, mbrancaleoni at gmail.com wrote: > Hi Neil. > > unfortunately the patch does nothing, the problem persists. > Tested with 2.6.16-rc5. > (I've double checked if the patch was applied correctly) > > Can I do anything to be of some more help? Yes, try another patch. :-) and tell me if you have CONFIG_DEBUG_SLAB set... there was another use-after-free bug which CONFIG_DEBUG_SLAB would have made worse. This patch should fix it all up. Thanks again, NeilBrown Signed-off-by: Neil Brown ### Diffstat output ./drivers/md/raid1.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff ./drivers/md/raid1.c~current~ ./drivers/md/raid1.c --- ./drivers/md/raid1.c~current~ 2006-02-27 11:52:18.000000000 +1100 +++ ./drivers/md/raid1.c 2006-03-01 10:44:49.000000000 +1100 @@ -306,6 +306,7 @@ static int raid1_end_write_request(struc r1bio_t * r1_bio = (r1bio_t *)(bio->bi_private); int mirror, behind = test_bit(R1BIO_BehindIO, &r1_bio->state); conf_t *conf = mddev_to_conf(r1_bio->mddev); + struct bio *to_put = NULL; if (bio->bi_size) return 1; @@ -323,6 +324,7 @@ static int raid1_end_write_request(struc * this branch is our 'one mirror IO has finished' event handler: */ r1_bio->bios[mirror] = NULL; + to_put = bio; if (!uptodate) { md_error(r1_bio->mddev, conf->mirrors[mirror].rdev); /* an I/O failed, we can't clear the bitmap */ @@ -375,7 +377,7 @@ static int raid1_end_write_request(struc /* Don't dec_pending yet, we want to hold * the reference over the retry */ - return 0; + goto out; } if (test_bit(R1BIO_BehindIO, &r1_bio->state)) { /* free extra copy of the data pages */ @@ -392,10 +394,11 @@ static int raid1_end_write_request(struc raid_end_bio_io(r1_bio); } - if (r1_bio->bios[mirror]==NULL) - bio_put(bio); - rdev_dec_pending(conf->mirrors[mirror].rdev, conf->mddev); + out: + if (to_put) + bio_put(to_put); + return 0; } @@ -857,7 +860,7 @@ static int make_request(request_queue_t atomic_set(&r1_bio->remaining, 0); atomic_set(&r1_bio->behind_remaining, 0); - do_barriers = bio->bi_rw & BIO_RW_BARRIER; + do_barriers = bio_barrier(bio); if (do_barriers) set_bit(R1BIO_Barrier, &r1_bio->state); linux-2.6-sata-promise-pata-ports.patch: drivers/scsi/libata-core.c | 1 drivers/scsi/sata_promise.c | 52 ++++++++++++++++++++++++++++++++++++++------ include/linux/libata.h | 1 3 files changed, 48 insertions(+), 6 deletions(-) --- NEW FILE linux-2.6-sata-promise-pata-ports.patch --- This will update the following files: drivers/scsi/libata-core.c include/linux/libata.h drivers/scsi/sata_promise.c through these ChangeSets: o [libata sata_promise] support PATA ports on SATA controllers diff -Nru a/drivers/scsi/libata-core.c b/drivers/scsi/libata-core.c --- a/drivers/scsi/libata-core.c 2006-02-08 11:34:51.000000000 -0700 +++ b/drivers/scsi/libata-core.c 2006-02-08 11:37:11.000000000 -0700 @@ -4423,6 +4423,7 @@ ap->mwdma_mask = ent->mwdma_mask; ap->udma_mask = ent->udma_mask; ap->flags |= ent->host_flags; + ap->flags |= ent->port_flags[port_no]; /* pata fix */ ap->ops = ent->port_ops; ap->cbl = ATA_CBL_NONE; ap->active_tag = ATA_TAG_POISON; diff -Nru a/drivers/scsi/sata_promise.c b/drivers/scsi/sata_promise.c --- a/drivers/scsi/sata_promise.c 2006-02-08 10:08:08.000000000 -0700 +++ b/drivers/scsi/sata_promise.c 2006-02-08 11:26:47.000000000 -0700 @@ -165,7 +165,7 @@ /* board_2037x */ { .sht = &pdc_ata_sht, - .host_flags = PDC_COMMON_FLAGS | ATA_FLAG_SATA, + .host_flags = PDC_COMMON_FLAGS /* | ATA_FLAG_SATA */, /* pata fix */ .pio_mask = 0x1f, /* pio0-4 */ .mwdma_mask = 0x07, /* mwdma0-2 */ .udma_mask = 0x7f, /* udma0-6 ; FIXME */ @@ -322,15 +322,34 @@ static void pdc_sata_phy_reset(struct ata_port *ap) { - pdc_reset_port(ap); - sata_phy_reset(ap); +/* pdc_reset_port(ap); */ /* pata fix */ +/* sata_phy_reset(ap); */ /* pata fix */ + /* if no sata flag, test for pata drive */ /* pata fix */ + if (ap->flags & ATA_FLAG_SATA) /* pata fix */ + { /* pata fix */ + pdc_reset_port(ap); /* pata fix */ + sata_phy_reset(ap); /* pata fix */ + } /* pata fix */ + else /* pata fix */ + pdc_pata_phy_reset(ap); /* pata fix */ } static void pdc_pata_phy_reset(struct ata_port *ap) { /* FIXME: add cable detect. Don't assume 40-pin cable */ - ap->cbl = ATA_CBL_PATA40; - ap->udma_mask &= ATA_UDMA_MASK_40C; +/* ap->cbl = ATA_CBL_PATA40; */ /* pata fix */ +/* ap->udma_mask &= ATA_UDMA_MASK_40C; */ /* pata fix */ + /* add cable detection code for pata drives */ /* pata fix */ + u8 tmp; /* pata fix */ + void *mmio = (void *) ap->ioaddr.cmd_addr + PDC_CTLSTAT + 0x03; /* pata fix */ + tmp = readb(mmio); /* pata fix */ + if (tmp & 0x01) /* pata fix */ + { /* pata fix */ + ap->cbl = ATA_CBL_PATA40; /* pata fix */ + ap->udma_mask &= ATA_UDMA_MASK_40C; /* pata fix */ + } /* pata fix */ + else /* pata fix */ + ap->cbl = ATA_CBL_PATA80; /* pata fix */ pdc_reset_port(ap); ata_port_probe(ap); @@ -646,6 +665,7 @@ unsigned int board_idx = (unsigned int) ent->driver_data; int pci_dev_busy = 0; int rc; + u8 tmp; /* pata fix */ if (!printed_version++) dev_printk(KERN_DEBUG, &pdev->dev, "version " DRV_VERSION "\n"); @@ -705,6 +725,9 @@ probe_ent->port[0].scr_addr = base + 0x400; probe_ent->port[1].scr_addr = base + 0x500; + probe_ent->port_flags[0] = ATA_FLAG_SATA; /* pata fix */ + probe_ent->port_flags[1] = ATA_FLAG_SATA; /* pata fix */ + /* notice 4-port boards */ switch (board_idx) { case board_20319: @@ -715,9 +738,23 @@ probe_ent->port[2].scr_addr = base + 0x600; probe_ent->port[3].scr_addr = base + 0x700; + + probe_ent->port_flags[2] = ATA_FLAG_SATA; /* pata fix */ + probe_ent->port_flags[3] = ATA_FLAG_SATA; /* pata fix */ break; case board_2037x: - probe_ent->n_ports = 2; +/* probe_ent->n_ports = 2; */ /* pata fix */ + /* Some boards have also PATA port */ /* pata fix */ + tmp = readb(mmio_base + PDC_FLASH_CTL+1); /* pata fix */ + if (!(tmp & 0x80)) /* pata fix */ + { /* pata fix */ + probe_ent->n_ports = 3; /* pata fix */ + pdc_ata_setup_port(&probe_ent->port[2], base + 0x300); /* pata fix */ + probe_ent->port_flags[2] = ATA_FLAG_SLAVE_POSS; /* pata fix */ + printk(KERN_INFO DRV_NAME " PATA port found\n"); /* pata fix */ + } /* pata fix */ + else /* pata fix */ + probe_ent->n_ports = 2; /* pata fix */ break; case board_20771: probe_ent->n_ports = 2; @@ -730,6 +767,9 @@ probe_ent->port[2].scr_addr = base + 0x600; probe_ent->port[3].scr_addr = base + 0x700; + + probe_ent->port_flags[2] = ATA_FLAG_SATA; /* pata fix */ + probe_ent->port_flags[3] = ATA_FLAG_SATA; /* pata fix */ break; default: BUG(); diff -Nru a/include/linux/libata.h b/include/linux/libata.h --- a/include/linux/libata.h 2006-02-08 11:40:54.000000000 -0700 +++ b/include/linux/libata.h 2006-02-08 11:45:02.000000000 -0700 @@ -237,6 +237,7 @@ unsigned long irq; unsigned int irq_flags; unsigned long host_flags; + unsigned long port_flags[ATA_MAX_PORTS]; /* pata fix */ void __iomem *mmio_base; void *private_data; }; linux-2.6-signal-trampolines-unwind-info.patch: i386/kernel/vsyscall-sigreturn.S | 2 +- powerpc/kernel/vdso32/sigtramp.S | 2 +- powerpc/kernel/vdso64/sigtramp.S | 2 +- x86_64/ia32/vsyscall-sigreturn.S | 23 +++++++++++++++++++++-- 4 files changed, 24 insertions(+), 5 deletions(-) --- NEW FILE linux-2.6-signal-trampolines-unwind-info.patch --- --- linux-2.6.15/arch/i386/kernel/vsyscall-sigreturn.S.jj 2006-01-02 22:21:10.000000000 -0500 +++ linux-2.6.15/arch/i386/kernel/vsyscall-sigreturn.S 2006-02-21 05:10:31.000000000 -0500 @@ -44,7 +44,7 @@ __kernel_rt_sigreturn: .LSTARTCIEDLSI1: .long 0 /* CIE ID */ .byte 1 /* Version number */ - .string "zR" /* NUL-terminated augmentation string */ + .string "zRS" /* NUL-terminated augmentation string */ .uleb128 1 /* Code alignment factor */ .sleb128 -4 /* Data alignment factor */ .byte 8 /* Return address register column */ --- linux-2.6.15/arch/x86_64/ia32/vsyscall-sigreturn.S.jj 2006-01-02 22:21:10.000000000 -0500 +++ linux-2.6.15/arch/x86_64/ia32/vsyscall-sigreturn.S 2006-02-21 05:17:41.000000000 -0500 @@ -31,8 +31,27 @@ __kernel_rt_sigreturn: .size __kernel_rt_sigreturn,.-.LSTART_rt_sigreturn .section .eh_frame,"a", at progbits +.LSTARTFRAMES: + .long .LENDCIES-.LSTARTCIES +.LSTARTCIES: + .long 0 /* CIE ID */ + .byte 1 /* Version number */ + .string "zRS" /* NUL-terminated augmentation string */ + .uleb128 1 /* Code alignment factor */ + .sleb128 -4 /* Data alignment factor */ + .byte 8 /* Return address register column */ + .uleb128 1 /* Augmentation value length */ + .byte 0x1b /* DW_EH_PE_pcrel|DW_EH_PE_sdata4. */ + .byte 0x0c /* DW_CFA_def_cfa */ + .uleb128 4 + .uleb128 4 + .byte 0x88 /* DW_CFA_offset, column 0x8 */ + .uleb128 1 + .align 4 +.LENDCIES: + .long .LENDFDE2-.LSTARTFDE2 /* Length FDE */ .LSTARTFDE2: - .long .LSTARTFDE2-.LSTARTFRAME /* CIE pointer */ + .long .LSTARTFDE2-.LSTARTFRAMES /* CIE pointer */ /* HACK: The dwarf2 unwind routines will subtract 1 from the return address to get an address in the middle of the @@ -96,7 +116,7 @@ __kernel_rt_sigreturn: .long .LENDFDE3-.LSTARTFDE3 /* Length FDE */ .LSTARTFDE3: - .long .LSTARTFDE3-.LSTARTFRAME /* CIE pointer */ + .long .LSTARTFDE3-.LSTARTFRAMES /* CIE pointer */ /* HACK: See above wrt unwind library assumptions. */ .long .LSTART_rt_sigreturn-1-. /* PC-relative start address */ .long .LEND_rt_sigreturn-.LSTART_rt_sigreturn+1 --- linux-2.6.15/arch/powerpc/kernel/vdso32/sigtramp.S.jj 2006-01-02 22:21:10.000000000 -0500 +++ linux-2.6.15/arch/powerpc/kernel/vdso32/sigtramp.S 2006-02-21 05:24:12.000000000 -0500 @@ -261,7 +261,7 @@ V_FUNCTION_END(__kernel_sigtramp_rt32) .Lcie_start: .long 0 /* CIE ID */ .byte 1 /* Version number */ - .string "zR" /* NUL-terminated augmentation string */ + .string "zRS" /* NUL-terminated augmentation string */ .uleb128 4 /* Code alignment factor */ .sleb128 -4 /* Data alignment factor */ .byte 67 /* Return address register column, ap */ --- linux-2.6.15/arch/powerpc/kernel/vdso64/sigtramp.S.jj 2006-01-02 22:21:10.000000000 -0500 +++ linux-2.6.15/arch/powerpc/kernel/vdso64/sigtramp.S 2006-02-21 05:28:28.000000000 -0500 @@ -263,7 +263,7 @@ V_FUNCTION_END(__kernel_sigtramp_rt64) .Lcie_start: .long 0 /* CIE ID */ .byte 1 /* Version number */ - .string "zR" /* NUL-terminated augmentation string */ + .string "zRS" /* NUL-terminated augmentation string */ .uleb128 4 /* Code alignment factor */ .sleb128 -8 /* Data alignment factor */ .byte 67 /* Return address register column, ap */ --- NEW FILE patch-2.6.16-rc5-git4.bz2.sign --- -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.2.1 (GNU/Linux) Comment: See http://www.kernel.org/signature.html for info iD8DBQBEBUbryGugalF9Dw4RAsrFAJ0XNnQ4O4MnmyMGyjIXWeaOuqxKLgCfazxe /toKMp813e0N0K/74QhDXjQ= =pfRK -----END PGP SIGNATURE----- Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v retrieving revision 1.357.2.2 retrieving revision 1.357.2.3 diff -u -r1.357.2.2 -r1.357.2.3 --- .cvsignore 1 Mar 2006 22:12:41 -0000 1.357.2.2 +++ .cvsignore 2 Mar 2006 21:53:32 -0000 1.357.2.3 @@ -3,5 +3,5 @@ kernel-2.6.15 linux-2.6.15.tar.bz2 patch-2.6.16-rc5.bz2 -patch-2.6.16-rc5-git1.bz2 xen-20060301.tar.bz2 +patch-2.6.16-rc5-git4.bz2 Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.1971.2.16 retrieving revision 1.1971.2.17 diff -u -r1.1971.2.16 -r1.1971.2.17 --- kernel-2.6.spec 2 Mar 2006 18:06:39 -0000 1.1971.2.16 +++ kernel-2.6.spec 2 Mar 2006 21:53:32 -0000 1.1971.2.17 @@ -219,7 +219,7 @@ # Patches 0 through 100 are meant for core subsystem upgrades # Patch1: patch-2.6.16-rc5.bz2 -Patch2: patch-2.6.16-rc5-git1.bz2 +Patch2: patch-2.6.16-rc5-git4.bz2 # Patches 100 through 500 are meant for architecture patches Patch100: linux-2.6-bzimage.patch @@ -232,14 +232,12 @@ Patch203: linux-2.6-intel-cache-build.patch Patch204: linux-2.6-x86_64-silence-up-apic-errors.patch Patch205: linux-2.6-edid-check.patch -Patch206: linux-2.6-x86-microcode-hotplug-cpu.patch -Patch207: linux-2.6-x86_64-smp-on-uphw-cpucount.patch -Patch208: linux-2.6-x86-hp-reboot.patch +Patch206: linux-2.6-x86_64-smp-on-uphw-cpucount.patch +Patch207: linux-2.6-x86-hp-reboot.patch # 300 - 399 ppc(64) Patch300: linux-2.6-powermac-pfunc-noise.patch Patch301: linux-2.6-cell-numa-init.patch -Patch302: linux-2.6.15-powerpc-gettimeofday.patch Patch305: linux-2.6-cell-mambo-drivers.patch Patch306: linux-2.6-hvc-console.patch Patch310: linux-2.6-cell-spiderpic-no-devtree.patch @@ -317,6 +315,7 @@ Patch1031: linux-2.6-debug-periodic-slab-check.patch Patch1032: linux-2.6-debug-boot-delay.patch Patch1033: linux-2.6-debug-must_check.patch +Patch1034: linux-2.6-debug-pm-pci.patch # Restrict /dev/mem usage. Patch1050: linux-2.6-devmem.patch @@ -336,6 +335,7 @@ Patch1200: linux-2.6-NFSD-non-null-getxattr.patch Patch1201: linux-2.6-NFSD-ctlbits.patch Patch1203: linux-2.6-NFSD-badness.patch +Patch1204: linux-2.6-NFSD-writes-shouldnt-clobber-utimes.patch # NIC driver updates Patch1301: linux-2.6-net-sundance-ip100A.patch @@ -368,6 +368,8 @@ Patch1690: linux-2.6-smsc-ircc2-pnp.patch Patch1700: linux-2.6-w1-hush-debug.patch Patch1710: linux-2.6-sched-up-migration-cost.patch +Patch1720: linux-2.6-md-raid1-leak.patch +Patch1730: linux-2.6-signal-trampolines-unwind-info.patch # SELinux/audit patches. Patch1800: linux-2.6-selinux-hush.patch @@ -393,6 +395,12 @@ Patch2102: linux-2.6-defaults-enable-sata-atapi.patch Patch2103: linux-2.6-defaults-firmware-loader-timeout.patch +# SATA Bits +Patch2200: linux-2.6-sata-promise-pata-ports.patch + +# ACPI bits +Patch2300: linux-2.6-acpi_os_acquire_object-gfp_kernel-called-with-irqs.patch + # Broadcom wireless driver Patch5000: linux-2.6-softmac-git.patch Patch5001: linux-2.6-bcm43xx-git.patch @@ -400,7 +408,7 @@ # # 10000 to 20000 is for stuff that has to come last due to the -# amount of drivers they touch. But only these should go here. +# amount of drivers they touch. But only these should go here. # Not patches you're too lazy for to put in the proper place. # @@ -705,7 +713,7 @@ # # Patches 10 through 100 are meant for core subsystem upgrades -# +# # # Patches to back out @@ -723,7 +731,7 @@ %patch200 -p1 # Keep UP APIC off by default. %patch201 -p1 -# add vidfail capability; +# add vidfail capability; # without this patch specifying a framebuffer on the kernel prompt would # make the boot stop if there's no supported framebuffer device; this is bad # for the installer cd that wants to automatically fall back to textmode @@ -735,22 +743,18 @@ %patch204 -p1 # Reboot thru bios on HP laptops. %patch205 -p1 -# Microcode driver hotplug cpu issue. -%patch206 -p1 # Workaround BIOSes that don't list CPU0 -%patch207 -p1 +%patch206 -p1 # Reboot through BIOS on HP systems,. -%patch208 -p1 +%patch207 -p1 -# +# # ppc64 # # Shut up the platform function stuff on pmac %patch300 -p1 # Arnd says don't call cell_spumem_init() till he fixes it. %patch301 -p1 -# Fix gettimeofday in the 64bit vDSO. -%patch302 -p1 # Support the IBM Mambo simulator; core as well as disk and network drivers. %patch305 -p1 # Make HVC console generic; support simulator console device using it. @@ -836,6 +840,13 @@ # Tux %patch910 -p1 +# SATA Patches +# Enable PATA ports on Promise. +%patch2200 -p1 + +# ACPI patches +%patch2300 -p1 + # # Patches 1000 to 5000 are reserved for bugfixes to drivers and filesystems # @@ -865,6 +876,7 @@ %patch1031 -p1 %patch1032 -p1 %patch1033 -p1 +%patch1034 -p1 # # Make /dev/mem a need-to-know function @@ -904,6 +916,8 @@ %patch1201 -p1 # Fix badness. %patch1203 -p1 +# NFSD: writes should not clobber utimes() calls +%patch1204 -p1 # NIC driver fixes. # New PCI ID for sundance driver. @@ -957,6 +971,10 @@ %patch1700 -p1 # Only print migration info on SMP %patch1710 -p1 +# Fix RAID1 leak +%patch1720 -p1 +# Mark unwind info for signal trampolines in vDSOs +%patch1730 -p1 # Silence some selinux messages. %patch1800 -p1 @@ -1605,9 +1623,16 @@ %endif %changelog +* Thu Mar 2 2006 Juan Quintela +- rebase with rawhide 2008. + * Thu Mar 2 2006 Stephen Tweedie - Fix xen/execshield VSYSCALL_BASE conflict +* Thu Mar 2 2006 Dave Jones +- Fix acpi_os_acquire_object() with IRQs disabled debug msgs. +- Mark unwind info for signal trampolines in vDSOs + * Wed Mar 1 2006 Juan Quintela - disable ia64 build again. @@ -1625,6 +1650,13 @@ * Wed Mar 1 2006 Juan Quintela - enable ia64 again +* Wed Mar 1 2006 Dave Jones +- 2.6.16rc5-git4 +- Fix leak in RAID1 +- Further fixing of selinuxfs link count. (#182001) +- Enable PATA ports on Promise SATA. (#179369) +- NFS: writes should not clobber utimes() calls. (#183208) + * Tue Feb 28 2006 Juan Quintela - fix x86_64 xen build. @@ -1633,6 +1665,9 @@ - enable ia64 again. - rebase with rawhide 1.1991. +* Tue Feb 28 2006 Dave Jones +- 2.6.16rc5-git3 + * Tue Feb 28 2006 David Woodhouse - Fix gettimeofday() in the 64-bit PowerPC vDSO linux-2.6-radeon-backlight.patch: radeon_base.c | 11 +++++++ radeon_pm.c | 51 ++++++++++++++++++++++++++++++++- radeon_pm_whitelist.h | 76 ++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 137 insertions(+), 1 deletion(-) Index: linux-2.6-radeon-backlight.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-radeon-backlight.patch,v retrieving revision 1.10.20.1 retrieving revision 1.10.20.2 diff -u -r1.10.20.1 -r1.10.20.2 --- linux-2.6-radeon-backlight.patch 28 Feb 2006 20:16:10 -0000 1.10.20.1 +++ linux-2.6-radeon-backlight.patch 2 Mar 2006 21:53:32 -0000 1.10.20.2 @@ -1,9 +1,85 @@ - -http://bugme.osdl.org/show_bug.cgi?id=3022 - ---- vanilla/drivers/video/aty/radeon_pm.c 2005-10-27 20:02:08.000000000 -0400 -+++ linux-2.6.14/drivers/video/aty/radeon_pm.c 2005-11-30 02:20:01.000000000 -0500 -@@ -25,8 +25,532 @@ +--- linux-2.6.15.i686/drivers/video/aty/radeon_pm_whitelist.h.backlight 2006-03-01 13:22:58.000000000 -0500 ++++ linux-2.6.15.i686/drivers/video/aty/radeon_pm_whitelist.h 2006-03-01 13:56:54.000000000 -0500 +@@ -0,0 +1,76 @@ ++#define E(_vendor, _product, _ident, _reporter) \ ++{ /* _reporter */ \ ++ .ident = _ident, \ ++ .matches = { \ ++ DMI_MATCH(DMI_SYS_VENDOR, _vendor), \ ++ DMI_MATCH(DMI_PRODUCT_NAME, _product), \ ++ }, \ ++} ++E("IBM", "18297RG", "IBM ThinkPad R50", "Borschuk Oleg "), ++E("IBM", "18299MG", "IBM ThinkPad R51", "Georges Herber "), ++E("IBM", "1829EHG", "IBM ThinkPad R51", "Wouter Cloetens "), ++E("IBM", "1829R6G", "IBM ThinkPad R51", "Sten Heinze"), ++E("IBM", "1836Q6U", "IBM ThinkPad R51", "Eugene Pavlovsky"), ++E("IBM", "236696G", "IBM ThinkPad T30", "Jakob Schiotz "), ++E("IBM", "236697G", "IBM ThinkPad T30", "Stephan Gro?? "), ++E("IBM", "2366JBG", "IBM ThinkPad T30", "Thomas M Steenholdt "), ++E("IBM", "2366MU9", "IBM ThinkPad T30", "Phillip Jones "), ++E("IBM", "2366QU5", "IBM ThinkPad T30", "ChazeFroy "), ++E("IBM", "23729CU", "IBM ThinkPad T40", "George Avrunin "), ++E("IBM", "237314U", "IBM ThinkPad T40", "Dmitriy Zavin "), ++E("IBM", "23731FG", "IBM ThinkPad T41", "Aivo Prykk "), ++E("IBM", "237322G", "IBM ThinkPad T40", "Michele Lamarca "), ++E("IBM", "237325G", "IBM ThinkPad T40", "Klaus Kurzmann "), ++E("IBM", "23732FG", "IBM ThinkPad T41", "Antti Andreimann "), ++E("IBM", "23733HM", "IBM ThinkPad T41", "Grahame Bowland "), ++E("IBM", "23734G2", "IBM ThinkPad T40", "Antti P Miettinen "), ++E("IBM", "23737JU", "IBM ThinkPad T41", "Matthew Saltzman "), ++E("IBM", "23738CG", "IBM ThinkPad T40", "Pete Toscano "), ++E("IBM", "237392G", "IBM ThinkPad T40", "Pete Toscano "), ++E("IBM", "237394G", "IBM ThinkPad T40", "Manuel Carro "), ++E("IBM", "237394U", "IBM ThinkPad T40", "Pete Toscano "), ++E("IBM", "23739FU", "IBM ThinkPad T41", "Peter Jones "), ++E("IBM", "23739HG", "IBM ThinkPad T41", "Chris Vanden Berghe "), ++E("IBM", "23739HU", "IBM ThinkPad T41", "Ajay Ramaswamy "), ++E("IBM", "2373BU7", "IBM ThinkPad T40", "Peter Jones "), ++E("IBM", "2373F2G", "IBM ThinkPad T42", "Isaac Wilcox"), ++E("IBM", "2373FWG", "IBM ThinkPad T42", "Jerome Poggi and Pete Toscano "), ++E("IBM", "2373G1G", "IBM ThinkPad T40p", "Juerg Billeter "), ++E("IBM", "2373G1U", "IBM ThinkPad T40p", "Bill Nottingham "), ++E("IBM", "2373G3G", "IBM ThinkPad T40p", "Hartwig, Thomas "), ++E("IBM", "2373GEU", "IBM ThinkPad T41p", "Eric Benson "), ++E("IBM", "2373HU6", "IBM ThinkPad T41", "David Zeuthen "), ++E("IBM", "2373JTU", "IBM ThinkPad T42", "Dwight Barkley "), ++E("IBM", "2373MU4", "IBM ThinkPad T40", "Vernon Mauery "), ++E("IBM", "2373RU1", "IBM ThinkPad T40", "Adam Glasgall "), ++E("IBM", "2373TG5", "IBM ThinkPad T41", "Paul Ionescu "), ++E("IBM", "2373XNX", "IBM ThinkPad T41", "Ajay Ramaswamy "), ++E("IBM", "23746VU", "IBM ThinkPad T42", "Tim Hull "), ++E("IBM", "2374CTO", "IBM ThinkPad T42", "Johannes Hansen"), ++E("IBM", "2374ZEP", "IBM ThinkPad T42", "Johannes Hansen"), ++E("IBM", "2378DEU", "IBM ThinkPad T41", "obi "), ++E("IBM", "2378DLU", "IBM ThinkPad T41", "Paul Stanisci "), ++E("IBM", "2378DUU", "IBM ThinkPad T42", "Austin Clements "), ++E("IBM", "2378R2U", "IBM ThinkPad T42", "Ulrich Drepper "), ++E("IBM", "2378RBF", "IBM ThinkPad T42", "Nicolas Dufresne "), ++E("IBM", "2378RBU", "IBM ThinkPad T42", "Nicolas Dufresne "), ++E("IBM", "2378XXE", "IBM ThinkPad T42", "Tom Marshall"), ++E("IBM", "2379D6U", "IBM ThinkPad T41", "anonymous"), ++E("IBM", "2379DJU", "IBM ThinkPad T41", "Volker Braun "), ++E("IBM", "2658BQG", "IBM ThinkPad R32", "Frank Otto "), ++E("IBM", "26725KU", "IBM ThinkPad X31", "Chris Lee "), ++E("IBM", "2672A9U", "IBM ThinkPad X31", "Jeremy Katz "), ++E("IBM", "2672JHG", "IBM ThinkPad X31", "Daniel P. Berrange "), ++E("IBM", "2672RU3", "IBM ThinkPad X31", "Chris Blizzard "), ++ /* IBM ThinkPad X31 2672-XXH -> works, but doesn't fix the LCD ++ backlight on during S3 issue. */ ++E("IBM", "2672XXH", "IBM ThinkPad X31", "Henrik Brix Andersen "), ++E("IBM", "27223GG", "IBM ThinkPad R40", "Frank Schmitt "), ++E("IBM", "27225MG", "IBM ThinkPad R40", "Nils Trebing "), ++E("IBM", "27226YU", "IBM ThinkPad R40", "Rushi Bhatt"), ++E("IBM", "2722B3G", "IBM ThinkPad R40", "Pete Toscano "), ++E("IBM", "2722CDG", "IBM ThinkPad R40", "Meik Hellmund "), ++{ }, ++/* Negative reports: */ ++/* E("IBM", "2373KUU", "IBM ThinkPad T42p", "Dax Kelson "), */ ++#undef E +--- linux-2.6.15.i686/drivers/video/aty/radeon_pm.c.backlight 2006-03-01 13:22:06.000000000 -0500 ++++ linux-2.6.15.i686/drivers/video/aty/radeon_pm.c 2006-03-01 13:33:47.000000000 -0500 +@@ -25,8 +25,26 @@ #include #endif @@ -21,513 +97,7 @@ + * vendor and product codes for Your laptop. + */ +static struct dmi_system_id __devinitdata radeonfb_dmi_table[] = { -+ -+ { -+ /* Reported by Stephan Gro?? */ -+ .ident = "IBM ThinkPad T30 (2366-97G)", -+ .matches = { -+ DMI_MATCH(DMI_SYS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "236697G"), -+ }, -+ }, -+ { -+ /* Reported by Phillip Jones */ -+ .ident = "IBM ThinkPad T30 (2366-MU9)", -+ .matches = { -+ DMI_MATCH(DMI_SYS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "2366MU9"), -+ }, -+ }, -+ { -+ /* Reported by Jakob Schiotz */ -+ .ident = "IBM ThinkPad T30 (2366-96G)", -+ .matches = { -+ DMI_MATCH(DMI_SYS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "236696G"), -+ }, -+ }, -+ { -+ /* Reported by Thomas M Steenholdt */ -+ .ident = "IBM ThinkPad T30 (2366-JBG)", -+ .matches = { -+ DMI_MATCH(DMI_SYS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "2366JBG"), -+ }, -+ }, -+ { -+ /* Reported by ChazeFroy */ -+ .ident = "IBM ThinkPad T30 (2366-QU5)", -+ .matches = { -+ DMI_MATCH(DMI_SYS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "2366QU5"), -+ }, -+ }, -+ -+ { -+ /* Reported by George Avrunin */ -+ .ident = "IBM ThinkPad T40 (2372-9CU)", -+ .matches = { -+ DMI_MATCH(DMI_SYS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "23729CU"), -+ }, -+ }, -+ { -+ /* Reported by Dmitriy Zavin */ -+ .ident = "IBM ThinkPad T40 (2373-14U)", -+ .matches = { -+ DMI_MATCH(DMI_SYS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "237314U"), -+ }, -+ }, -+ { -+ /* Reported by Klaus Kurzmann */ -+ .ident = "IBM ThinkPad T40 (2373-25G)", -+ .matches = { -+ DMI_MATCH(DMI_SYS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "237325G"), -+ }, -+ }, -+ { -+ /* Reported by Antti P Miettinen */ -+ .ident = "IBM ThinkPad T40 (2373-4G2)", -+ .matches = { -+ DMI_MATCH(DMI_SYS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "23734G2"), -+ }, -+ }, -+ { -+ /* Reported by Pete Toscano */ -+ .ident = "IBM ThinkPad T40 (2373-92G)", -+ .matches = { -+ DMI_MATCH(DMI_SYS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "237392G"), -+ }, -+ }, -+ { -+ /* Reported by Pete Toscano */ -+ .ident = "IBM ThinkPad T40 (2373-8CG)", -+ .matches = { -+ DMI_MATCH(DMI_SYS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "23738CG"), -+ }, -+ }, -+ { -+ /* Reported by Pete Toscano */ -+ .ident = "IBM ThinkPad T40 (2373-94U)", -+ .matches = { -+ DMI_MATCH(DMI_SYS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "237394U"), -+ }, -+ }, -+ { -+ /* Reported by Manuel Carro */ -+ .ident = "IBM ThinkPad T40 (2373-94G)", -+ .matches = { -+ DMI_MATCH(DMI_SYS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "237394G"), -+ }, -+ }, -+ { -+ /* Reported by Peter Jones */ -+ .ident = "IBM ThinkPad T40 (2373-BU7)", -+ .matches = { -+ DMI_MATCH(DMI_SYS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "2373BU7"), -+ }, -+ }, -+ { -+ /* Reported by Vernon Mauery */ -+ .ident = "IBM ThinkPad T40 (2373-MU4)", -+ .matches = { -+ DMI_MATCH(DMI_SYS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "2373MU4"), -+ }, -+ }, -+ { -+ /* Reported by Michele Lamarca */ -+ .ident = "IBM ThinkPad T40 (2373-22G)", -+ .matches = { -+ DMI_MATCH(DMI_SYS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "237322G"), -+ }, -+ }, -+ { -+ /* Reported by Adam Glasgall */ -+ .ident = "IBM ThinkPad T40 (2373-RU1)", -+ .matches = { -+ DMI_MATCH(DMI_SYS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "2373RU1"), -+ }, -+ }, -+ { -+ /* Reported by Juerg Billeter */ -+ .ident = "IBM ThinkPad T40p (2373-G1G)", -+ .matches = { -+ DMI_MATCH(DMI_SYS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "2373G1G"), -+ }, -+ }, -+ { -+ /* Reported by Bill Nottingham */ -+ .ident = "IBM ThinkPad T40p (2373-G1U)", -+ .matches = { -+ DMI_MATCH(DMI_SYS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "2373G1U"), -+ }, -+ }, -+ { -+ /* Reported by Hartwig, Thomas */ -+ .ident = "IBM ThinkPad T40p (2373-G3G)", -+ .matches = { -+ DMI_MATCH(DMI_SYS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "2373G3G"), -+ }, -+ }, -+ -+ { -+ /* Reported by Antti Andreimann */ -+ .ident = "IBM ThinkPad T41 (2373-2FG)", -+ .matches = { -+ DMI_MATCH(DMI_SYS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "23732FG"), -+ }, -+ }, -+ { -+ /* Reported by Peter Jones */ -+ .ident = "IBM ThinkPad T41 (2373-9FU)", -+ .matches = { -+ DMI_MATCH(DMI_SYS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "23739FU"), -+ }, -+ }, -+ { -+ /* Reported by Ajay Ramaswamy */ -+ .ident = "IBM ThinkPad T41 (2373-9HU)", -+ .matches = { -+ DMI_MATCH(DMI_SYS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "23739HU"), -+ }, -+ }, -+ { -+ /* Reported by Ajay Ramaswamy */ -+ .ident = "IBM ThinkPad T41 (2373-XNX)", -+ .matches = { -+ DMI_MATCH(DMI_SYS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "2373XNX"), -+ }, -+ }, -+ { -+ /* Reported by obi */ -+ .ident = "IBM ThinkPad T41 (2378-DEU)", -+ .matches = { -+ DMI_MATCH(DMI_SYS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "2378DEU"), -+ }, -+ }, -+ { -+ /* Reported by Volker Braun */ -+ .ident = "IBM ThinkPad T41 (2379-DJU)", -+ .matches = { -+ DMI_MATCH(DMI_SYS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "2379DJU"), -+ }, -+ }, -+ { -+ /* Reported by Paul Ionescu */ -+ .ident = "IBM ThinkPad T41 (2373-TG5)", -+ .matches = { -+ DMI_MATCH(DMI_SYS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "2373TG5"), -+ }, -+ }, -+ { -+ /* Reported by Matthew Saltzman */ -+ .ident = "IBM ThinkPad T41 (2373-7JU)", -+ .matches = { -+ DMI_MATCH(DMI_SYS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "23737JU"), -+ }, -+ }, -+ { -+ /* Reported by David Zeuthen */ -+ .ident = "IBM ThinkPad T41 (2373-HU6)", -+ .matches = { -+ DMI_MATCH(DMI_SYS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "2373HU6"), -+ }, -+ }, -+ { -+ /* Reported by Grahame Bowland */ -+ .ident = "IBM ThinkPad T41 (2373-3HM)", -+ .matches = { -+ DMI_MATCH(DMI_SYS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "23733HM"), -+ }, -+ }, -+ { -+ /* Reported by Aivo Prykk */ -+ .ident = "IBM ThinkPad T41 (2373-1FG)", -+ .matches = { -+ DMI_MATCH(DMI_SYS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "23731FG"), -+ }, -+ }, -+ { -+ /* Reported by Chris Vanden Berghe */ -+ .ident = "IBM ThinkPad T41 (2373-9HG)", -+ .matches = { -+ DMI_MATCH(DMI_SYS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "23739HG"), -+ }, -+ }, -+ { -+ /* Reported by Paul Stanisci */ -+ .ident = "IBM ThinkPad T41 (2378-DLU)", -+ .matches = { -+ DMI_MATCH(DMI_SYS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "2378DLU"), -+ }, -+ }, -+ { -+ .ident = "IBM ThinkPad T41 (2379-D6U)", -+ .matches = { -+ DMI_MATCH(DMI_SYS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "2379D6U"), -+ }, -+ }, -+ -+ { -+ /* Reported by Eric Benson */ -+ .ident = "IBM ThinkPad T41p (2373-GEU)", -+ .matches = { -+ DMI_MATCH(DMI_SYS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "2373GEU"), -+ }, -+ }, -+ -+ { -+ /* Reported by Tim Hull */ -+ .ident = "IBM ThinkPad T42 (2374-6VU)", -+ .matches = { -+ DMI_MATCH(DMI_SYS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "23746VU"), -+ }, -+ }, -+ { -+ /* Reported by Dwight Barkley */ -+ .ident = "IBM ThinkPad T42 (2373-JTU)", -+ .matches = { -+ DMI_MATCH(DMI_SYS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "2373JTU"), -+ }, -+ }, -+ { -+ /* Reported by Jerome Poggi -+ and Pete Toscano */ -+ .ident = "IBM ThinkPad T42 (2373-FWG)", -+ .matches = { -+ DMI_MATCH(DMI_SYS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "2373FWG"), -+ }, -+ }, -+ { -+ /* Reported by Ulrich Drepper */ -+ .ident = "IBM ThinkPad T42 (2378-R2U)", -+ .matches = { -+ DMI_MATCH(DMI_SYS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "2378R2U"), -+ }, -+ }, -+ { -+ /* Reported by Nicolas Dufresne */ -+ .ident = "IBM ThinkPad T42 (2378-RBF)", -+ .matches = { -+ DMI_MATCH(DMI_SYS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "2378RBF"), -+ }, -+ }, -+ { -+ /* Reported by Nicolas Dufresne */ -+ .ident = "IBM ThinkPad T42 (2378-RBU)", -+ .matches = { -+ DMI_MATCH(DMI_SYS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "2378RBU"), -+ }, -+ }, -+ { -+ /* Reported by Johannes Hansen */ -+ .ident = "IBM ThinkPad T42 (2374-CTO)", -+ .matches = { -+ DMI_MATCH(DMI_SYS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "2374CTO"), -+ }, -+ }, -+ { -+ /* Reported by Johannes Hansen */ -+ .ident = "IBM ThinkPad T42 (2374-ZEP)", -+ .matches = { -+ DMI_MATCH(DMI_SYS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "2374ZEP"), -+ }, -+ }, -+ { -+ /* Reported by Tom Marshall */ -+ .ident = "IBM ThinkPad T42 (2378-XXE)", -+ .matches = { -+ DMI_MATCH(DMI_SYS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "2378XXE"), -+ }, -+ }, -+ { -+ /* Reported by Isaac Wilcox */ -+ .ident = "IBM ThinkPad T42 (2373-F2G)", -+ .matches = { -+ DMI_MATCH(DMI_SYS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "2373F2G"), -+ }, -+ }, -+ { -+ /* Reported by Austin Clements */ -+ .ident = "IBM ThinkPad T42 (2378-DUU)", -+ .matches = { -+ DMI_MATCH(DMI_SYS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "2378DUU"), -+ }, -+ }, -+ -+ { -+ /* Reported by Frank Otto */ -+ .ident = "IBM ThinkPad R32 (2658-BQG)", -+ .matches = { -+ DMI_MATCH(DMI_SYS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "2658BQG"), -+ }, -+ }, -+ -+ { -+ /* Reported by Frank Schmitt */ -+ .ident = "IBM ThinkPad R40 (2722-3GG)", -+ .matches = { -+ DMI_MATCH(DMI_SYS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "27223GG"), -+ }, -+ }, -+ { -+ /* Reported by Rushi Bhatt */ -+ .ident = "IBM ThinkPad R40 (2722-6YU)", -+ .matches = { -+ DMI_MATCH(DMI_SYS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "27226YU"), -+ }, -+ }, -+ { -+ /* Reported by Nils Trebing */ -+ .ident = "IBM ThinkPad R40 (2722-5MG)", -+ .matches = { -+ DMI_MATCH(DMI_SYS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "27225MG"), -+ }, -+ }, -+ { -+ /* Reported by Meik Hellmund */ -+ .ident = "IBM ThinkPad R40 (2722-CDG)", -+ .matches = { -+ DMI_MATCH(DMI_SYS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "2722CDG"), -+ }, -+ }, -+ { -+ /* Reported by Pete Toscano */ -+ .ident = "IBM ThinkPad R40 (2722-B3G)", -+ .matches = { -+ DMI_MATCH(DMI_SYS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "2722B3G"), -+ }, -+ }, -+ -+ -+ { -+ /* Reported by Borschuk Oleg */ -+ .ident = "IBM ThinkPad R50 (1829-7RG)", -+ .matches = { -+ DMI_MATCH(DMI_SYS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "18297RG"), -+ }, -+ }, -+ -+ { -+ /* Reported by Georges Herber */ -+ .ident = "IBM ThinkPad R51 (1829-9MG)", -+ .matches = { -+ DMI_MATCH(DMI_SYS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "18299MG"), -+ }, -+ }, -+ { -+ /* Reported by Eugene Pavlovsky */ -+ .ident = "IBM ThinkPad R51 (1836-Q6U)", -+ .matches = { -+ DMI_MATCH(DMI_SYS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "1836Q6U"), -+ }, -+ }, -+ { -+ /* Reported by Sten Heinze */ -+ .ident = "IBM ThinkPad R51 (1829-R6G)", -+ .matches = { -+ DMI_MATCH(DMI_SYS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "1829R6G"), -+ }, -+ }, -+ { -+ /* Reported by Wouter Cloetens */ -+ .ident = "IBM ThinkPad R51 (1829-EHG)", -+ .matches = { -+ DMI_MATCH(DMI_SYS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "1829EHG"), -+ }, -+ }, -+ -+ -+ { -+ /* Reported by Henrik Brix Andersen */ -+ .ident = "IBM ThinkPad X31 (2672-XXH)", -+ .matches = { -+ DMI_MATCH(DMI_SYS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "2672XXH"), -+ }, -+ }, -+ { -+ /* Reported by Jeremy Katz */ -+ .ident = "IBM ThinkPad X31 (2672-A9U)", -+ .matches = { -+ DMI_MATCH(DMI_SYS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "2672A9U"), -+ }, -+ }, -+ { -+ /* Reported by Chris Lee */ -+ .ident = "IBM ThinkPad X31 (2672-5KU)", -+ .matches = { -+ DMI_MATCH(DMI_SYS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "26725KU"), -+ }, -+ }, -+ { -+ /* Reported by Chris Blizzard */ -+ .ident = "IBM ThinkPad X31 (2672-RU3)", -+ .matches = { -+ DMI_MATCH(DMI_SYS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "2672RU3"), -+ }, -+ }, -+ { }, -+ /* Negative reports: */ -+ /* IBM thinkpad T42p 2373-KUU -> machine hangs as X starts -+ Reported by: Dax Kelson */ -+ /* IBM ThinkPad X31 2672-XXH -> works, but doesn't fix the LCD -+ backlight on during S3 issue. -+ Reported by: Henrik Brix Andersen */ ++#include "radeon_pm_whitelist.h" +}; + +extern int radeon_force_sleep; @@ -536,7 +106,7 @@ static void radeon_pm_disable_dynamic_mode(struct radeonfb_info *rinfo) { u32 tmp; -@@ -852,7 +1376,14 @@ static void radeon_pm_setup_for_suspend( +@@ -852,7 +870,14 @@ /* because both INPLL and OUTPLL take the same lock, that's why. */ tmp = INPLL( pllMCLK_MISC) | MCLK_MISC__EN_MCLK_TRISTATE_IN_SUSPEND; OUTPLL( pllMCLK_MISC, tmp); @@ -552,7 +122,7 @@ /* AGP PLL control */ if (rinfo->family <= CHIP_FAMILY_RV280) { OUTREG(BUS_CNTL1, INREG(BUS_CNTL1) | BUS_CNTL1__AGPCLK_VALID); -@@ -864,6 +1395,7 @@ static void radeon_pm_setup_for_suspend( +@@ -864,6 +889,7 @@ OUTREG(BUS_CNTL1, INREG(BUS_CNTL1)); OUTREG(BUS_CNTL1, (INREG(BUS_CNTL1) & ~0x4000) | 0x8000); } @@ -560,7 +130,7 @@ OUTREG(CRTC_OFFSET_CNTL, (INREG(CRTC_OFFSET_CNTL) & ~CRTC_OFFSET_CNTL__CRTC_STEREO_SYNC_OUT_EN)); -@@ -3322,6 +3322,29 @@ void radeonfb_pm_init(struct radeonfb_in +@@ -2790,6 +2816,29 @@ } #endif /* defined(CONFIG_PPC_PMAC) */ #endif /* defined(CONFIG_PM) */ @@ -590,8 +160,8 @@ } void radeonfb_pm_exit(struct radeonfb_info *rinfo) ---- vanilla/drivers/video/aty/radeon_base.c 2005-02-20 20:08:15.000000000 +0200 -+++ linux-2.6.14/drivers/video/aty/radeon_base.c 2005-02-20 20:18:20.000000000 +0200 +--- linux-2.6.15.i686/drivers/video/aty/radeon_base.c.backlight 2006-03-01 13:22:06.000000000 -0500 ++++ linux-2.6.15.i686/drivers/video/aty/radeon_base.c 2006-03-01 13:22:27.000000000 -0500 @@ -272,6 +272,9 @@ #ifdef CONFIG_MTRR static int nomtrr = 0; @@ -602,7 +172,7 @@ /* * prototypes -@@ -2530,6 +2533,10 @@ +@@ -2615,6 +2618,10 @@ force_measure_pll = 1; } else if (!strncmp(this_opt, "ignore_edid", 11)) { ignore_edid = 1; @@ -613,7 +183,7 @@ } else mode_option = this_opt; } -@@ -2585,3 +2592,7 @@ +@@ -2670,3 +2677,7 @@ MODULE_PARM_DESC(panel_yres, "int: set panel yres"); module_param(mode_option, charp, 0); MODULE_PARM_DESC(mode_option, "Specify resolution as \"x[-][@]\" "); linux-2.6-selinux-selinuxfs-hard-link-count.patch: linux-2.6.16-rc4-mm2.w/security/selinux/selinuxfs.c | 11 +++++++---- linux-2.6.16-rc4.w/security/selinux/selinuxfs.c | 4 ++++ 2 files changed, 11 insertions(+), 4 deletions(-) Index: linux-2.6-selinux-selinuxfs-hard-link-count.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-selinux-selinuxfs-hard-link-count.patch,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -u -r1.1 -r1.1.2.1 --- linux-2.6-selinux-selinuxfs-hard-link-count.patch 20 Feb 2006 19:06:58 -0000 1.1 +++ linux-2.6-selinux-selinuxfs-hard-link-count.patch 2 Mar 2006 21:53:32 -0000 1.1.2.1 @@ -1,4 +1,5 @@ Fix the hard link count for selinuxfs directories. +https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=182001 Signed-off-by: James Morris @@ -28,3 +29,58 @@ d_add(dentry, inode); bool_dir = dentry; ret = sel_make_bools(); + + +diff -purN -X dontdiff linux-2.6.16-rc4-mm2.o/security/selinux/selinuxfs.c linux-2.6.16-rc4-mm2.w/security/selinux/selinuxfs.c +--- linux-2.6.16-rc4-mm2.o/security/selinux/selinuxfs.c 2006-02-25 00:29:32.000000000 -0500 ++++ linux-2.6.16-rc4-mm2.w/security/selinux/selinuxfs.c 2006-02-25 12:35:26.000000000 -0500 +@@ -1177,12 +1177,12 @@ out: + return ret; + } + +-static int sel_make_dir(struct super_block *sb, struct dentry *dentry) ++static int sel_make_dir(struct inode *dir, struct dentry *dentry) + { + int ret = 0; + struct inode *inode; + +- inode = sel_make_inode(sb, S_IFDIR | S_IRUGO | S_IXUGO); ++ inode = sel_make_inode(dir->i_sb, S_IFDIR | S_IRUGO | S_IXUGO); + if (!inode) { + ret = -ENOMEM; + goto out; +@@ -1192,6 +1192,8 @@ static int sel_make_dir(struct super_blo + /* directory inodes start off with i_nlink == 2 (for "." entry) */ + inode->i_nlink++; + d_add(dentry, inode); ++ /* bump link count on parent directory, too */ ++ dir->i_nlink++; + out: + return ret; + } +@@ -1200,7 +1202,7 @@ static int sel_fill_super(struct super_b + { + int ret; + struct dentry *dentry; +- struct inode *inode; ++ struct inode *inode, *root_inode; + struct inode_security_struct *isec; + + static struct tree_descr selinux_files[] = { +@@ -1267,6 +1267,7 @@ static int sel_fill_super(struct super_b + d_add(dentry, inode); + selinux_null = dentry; + ++ root_inode = sb->s_root->d_inode; + dentry = d_alloc_name(sb->s_root, "avc"); + if (!dentry) + return -ENOMEM; +@@ -1272,7 +1272,7 @@ static int sel_fill_super(struct super_b + if (!dentry) + return -ENOMEM; + +- ret = sel_make_dir(sb, dentry); ++ ret = sel_make_dir(root_inode, dentry); + if (ret) + goto out; + linux-2.6-softmac-git.patch: include/net/ieee80211.h | 8 include/net/ieee80211softmac.h | 292 ++++++++++++++ include/net/ieee80211softmac_wx.h | 94 ++++ net/ieee80211/Kconfig | 1 net/ieee80211/Makefile | 1 net/ieee80211/ieee80211_module.c | 2 net/ieee80211/ieee80211_wx.c | 89 ++++ net/ieee80211/softmac/Kconfig | 10 net/ieee80211/softmac/Makefile | 9 net/ieee80211/softmac/ieee80211softmac_assoc.c | 403 ++++++++++++++++++++ net/ieee80211/softmac/ieee80211softmac_auth.c | 376 +++++++++++++++++++ net/ieee80211/softmac/ieee80211softmac_event.c | 159 ++++++++ net/ieee80211/softmac/ieee80211softmac_io.c | 474 ++++++++++++++++++++++++ net/ieee80211/softmac/ieee80211softmac_module.c | 457 +++++++++++++++++++++++ net/ieee80211/softmac/ieee80211softmac_priv.h | 239 ++++++++++++ net/ieee80211/softmac/ieee80211softmac_scan.c | 237 ++++++++++++ net/ieee80211/softmac/ieee80211softmac_wx.c | 412 ++++++++++++++++++++ 17 files changed, 3262 insertions(+), 1 deletion(-) Index: linux-2.6-softmac-git.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-softmac-git.patch,v retrieving revision 1.7 retrieving revision 1.7.8.1 diff -u -r1.7 -r1.7.8.1 --- linux-2.6-softmac-git.patch 15 Feb 2006 19:33:36 -0000 1.7 +++ linux-2.6-softmac-git.patch 2 Mar 2006 21:53:32 -0000 1.7.8.1 @@ -3231,20 +3231,6 @@ ieee80211_geo.o +obj-$(CONFIG_IEEE80211_SOFTMAC) += softmac/ ---- linux-2.6.15.noarch/net/ieee80211/ieee80211_rx.c.orig 2006-02-15 09:58:15.000000000 -0500 -+++ linux-2.6.15.noarch/net/ieee80211/ieee80211_rx.c 2006-02-15 10:21:29.000000000 -0500 -@@ -1375,9 +1375,9 @@ static void update_network(struct ieee80 - /* dst->last_associate is not overwritten */ - } - --static inline int is_beacon(int fc) -+static inline int is_beacon(__be16 fc) - { -- return (WLAN_FC_GET_STYPE(le16_to_cpu(fc)) == IEEE80211_STYPE_BEACON); -+ return (WLAN_FC_GET_STYPE(fc) == IEEE80211_STYPE_BEACON); - } - - static void ieee80211_process_probe_response(struct ieee80211_device --- linux-2.6.15.noarch/net/ieee80211/ieee80211_wx.c.orig 2006-02-15 09:58:15.000000000 -0500 +++ linux-2.6.15.noarch/net/ieee80211/ieee80211_wx.c 2006-02-15 09:58:21.000000000 -0500 @@ -734,9 +734,98 @@ int ieee80211_wx_get_encodeext(struct ie linux-2.6-xen-compile-fixes.patch: arch/i386/kernel/acpi/boot-xen.c | 3 +- linux-2.6.15.ia64/fs/Kconfig | 1 linux-2.6.15.xen/arch/i386/kernel/Makefile | 3 -- linux-2.6.15.xen/arch/i386/kernel/smp-xen.c | 1 linux-2.6.15.xen/arch/i386/mm/init-xen.c | 1 linux-2.6.15.xen/arch/x86_64/kernel/pmtimer.c | 2 + linux-2.6.15.xen/arch/x86_64/kernel/process-xen.c | 6 ---- linux-2.6.15.xen/arch/x86_64/mm/fault-xen.c | 2 - linux-2.6.15.xen/include/asm-i386/mach-xen/asm/desc.h | 14 +++++++++++ linux-2.6.15.xen/include/asm-i386/mach-xen/asm/mmu.h | 7 +++++ linux-2.6.15.xen/include/asm-i386/mach-xen/asm/pgalloc.h | 1 linux-2.6.15.xen/include/asm-i386/mach-xen/asm/processor.h | 7 ++++- linux-2.6.15.xen/include/asm-i386/mach-xen/asm/swiotlb.h | 1 linux-2.6.15.xen/include/asm-x86_64/mach-xen/asm/pgalloc.h | 7 +++++ linux-2.6.15.xen/include/asm-x86_64/mach-xen/asm/pgtable.h | 2 - linux-2.6.15.xen/include/asm-x86_64/mach-xen/asm/processor.h | 2 + 16 files changed, 47 insertions(+), 13 deletions(-) Index: linux-2.6-xen-compile-fixes.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-xen-compile-fixes.patch,v retrieving revision 1.1.12.6 retrieving revision 1.1.12.7 diff -u -r1.1.12.6 -r1.1.12.7 --- linux-2.6-xen-compile-fixes.patch 1 Mar 2006 22:12:41 -0000 1.1.12.6 +++ linux-2.6-xen-compile-fixes.patch 2 Mar 2006 21:53:32 -0000 1.1.12.7 @@ -207,7 +207,7 @@ diff -urNp --exclude-from=/home/mitica/quintela/config/misc/dontdiff kernel-2.6.15/linux-2.6.15.noarch/arch/x86_64/kernel/pmtimer.c linux-2.6.15.xen/arch/x86_64/kernel/pmtimer.c --- kernel-2.6.15/linux-2.6.15.noarch/arch/x86_64/kernel/pmtimer.c 2006-02-28 22:47:11.000000000 +0100 +++ linux-2.6.15.xen/arch/x86_64/kernel/pmtimer.c 2006-02-28 22:37:45.000000000 +0100 -@@ -60,7 +60,9 @@ int pmtimer_mark_offset(void) +@@ -60,8 +60,10 @@ int pmtimer_mark_offset(void) delta = cyc2us((tick - last_pmtmr_tick) & ACPI_PM_MASK); last_pmtmr_tick = tick; @@ -217,22 +217,17 @@ delta += offset_delay; -diff -urNp --exclude-from=/home/mitica/quintela/config/misc/dontdiff kernel-2.6.15/linux-2.6.15.noarch/include/asm-x86_64/acpi.h linux-2.6.15.xen/include/asm-x86_64/acpi.h ---- kernel-2.6.15/linux-2.6.15.noarch/include/asm-x86_64/acpi.h 2006-02-28 22:47:25.000000000 +0100 -+++ linux-2.6.15.xen/include/asm-x86_64/acpi.h 2006-02-28 21:24:34.000000000 +0100 -@@ -168,6 +168,7 @@ extern int unsync_tsc_on_multicluster; - static inline int acpi_madt_oem_check(char *oem, char *productid) - { -+#ifndef CONFIG_XEN - /* Copied from i386. Probably has too many entries. */ - if (!strncmp(oem, "IBM ENSW", 8) && - (!strncmp(productid, "VIGIL SMP", 9) -@@ -175,6 +176,7 @@ static inline int acpi_madt_oem_check(ch - || !strncmp(productid, "RUTHLESS SMP", 12))) { - unsync_tsc_on_multicluster = 1; - } +--- linux-2.6.15.i686/arch/i386/kernel/acpi/boot-xen.c 2006-03-02 19:47:26.000000000 +0100 ++++ linux-2.6.15.noarch/arch/i386/kernel/acpi/boot-xen.c 2006-03-02 22:00:11.000000000 +0100 +@@ -230,8 +230,9 @@ static int __init acpi_parse_madt(unsign + madt->lapic_address); + } + ++#ifndef CONFIG_X86_64 + acpi_madt_oem_check(madt->header.oem_id, madt->header.oem_table_id); +- +#endif - return 0; + return 0; } Index: sources =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/sources,v retrieving revision 1.299.2.3 retrieving revision 1.299.2.4 diff -u -r1.299.2.3 -r1.299.2.4 --- sources 1 Mar 2006 22:12:53 -0000 1.299.2.3 +++ sources 2 Mar 2006 21:53:32 -0000 1.299.2.4 @@ -1,4 +1,5 @@ cdf95e00f5111e31f78e1d97304d9522 linux-2.6.15.tar.bz2 1740ae34807f687a93adf2469ea5c4fc patch-2.6.16-rc5.bz2 -45d08cf9db21b2be6d13b4a27bb65196 patch-2.6.16-rc5-git1.bz2 cdfde609af8adcf58d7ff626599b2d90 xen-20060301.tar.bz2 + +ab35d3814d795d61ad95aaa4b31ca034 patch-2.6.16-rc5-git4.bz2 Index: upstream =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/upstream,v retrieving revision 1.274.2.1 retrieving revision 1.274.2.2 diff -u -r1.274.2.1 -r1.274.2.2 --- upstream 28 Feb 2006 20:16:28 -0000 1.274.2.1 +++ upstream 2 Mar 2006 21:53:32 -0000 1.274.2.2 @@ -1 +1,4 @@ linux-2.6.15.tar.bz2 +patch-2.6.16-rc5.bz2 +patch-2.6.16-rc5-git4.bz2 + From fedora-cvs-commits at redhat.com Thu Mar 2 21:58:13 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 2 Mar 2006 16:58:13 -0500 Subject: rpms/kernel/devel/configs config-xen-generic,1.8.12.2,1.8.12.3 Message-ID: <200603022158.k22LwDWm012698@cvs.devel.redhat.com> Author: quintela Update of /cvs/dist/rpms/kernel/devel/configs In directory cvs.devel.redhat.com:/tmp/cvs-serv12661/configs Modified Files: Tag: private-xen-rebased-1971-branch config-xen-generic Log Message: make XEN_NETDEV_LOOPBACK=y Index: config-xen-generic =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/configs/config-xen-generic,v retrieving revision 1.8.12.2 retrieving revision 1.8.12.3 diff -u -r1.8.12.2 -r1.8.12.3 --- config-xen-generic 1 Mar 2006 22:12:54 -0000 1.8.12.2 +++ config-xen-generic 2 Mar 2006 21:58:10 -0000 1.8.12.3 @@ -18,7 +18,7 @@ # CONFIG_XEN_PCIDEV_BE_DEBUG is not set # CONFIG_XEN_PCIDEV_FRONTEND is not set # CONFIG_XEN_PCIDEV_FE_DEBUG is not set -CONFIG_XEN_NETDEV_LOOPBACK=m +CONFIG_XEN_NETDEV_LOOPBACK=y # # X86 Processor Configuration From fedora-cvs-commits at redhat.com Thu Mar 2 22:06:08 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 2 Mar 2006 17:06:08 -0500 Subject: rpms/gphoto2/devel gphoto-set-procperm, 1.2, 1.3 gphoto2.spec, 1.55, 1.56 Message-ID: <200603022206.k22M68ie013661@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/gphoto2/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv13584 Modified Files: gphoto-set-procperm gphoto2.spec Log Message: - potentially work around bug 183371 by looping/checking for 5 seconds. Index: gphoto-set-procperm =================================================================== RCS file: /cvs/dist/rpms/gphoto2/devel/gphoto-set-procperm,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- gphoto-set-procperm 30 Jan 2006 18:38:23 -0000 1.2 +++ gphoto-set-procperm 2 Mar 2006 22:06:05 -0000 1.3 @@ -7,16 +7,31 @@ fi if [ -z "$HAL_PROP_USB_BUS_NUMBER" -o -z "$HAL_PROP_USB_LINUX_DEVICE_NUMBER" ] ; then - exit 1 + exit 2 fi if [ $HAL_PROP_USB_BUS_NUMBER -lt 0 -o $HAL_PROP_USB_LINUX_DEVICE_NUMBER -lt 0 ] ; then - exit 1 + exit 3 fi bus_num=`printf %.3u $HAL_PROP_USB_BUS_NUMBER` dev_num=`printf %.3u $HAL_PROP_USB_LINUX_DEVICE_NUMBER` +NUM_TRIES_LEFT=5 +while [ $NUM_TRIES_LEFT -ge 0 ] && [ ! -c /dev/bus/usb/$bus_num/$dev_num ]; do + sleep 1 + NUM_TRIES_LEFT=$(($NUM_TRIES_LEFT - 1)) +done +[ -c /dev/bus/usb/$bus_num/$dev_num ] || exit 4 + chown $console_user /dev/bus/usb/$bus_num/$dev_num + +NUM_TRIES_LEFT=5 +while [ $NUM_TRIES_LEFT -ge 0 ] && [ ! -f /proc/bus/usb/$bus_num/$dev_num ]; do + sleep 1 + NUM_TRIES_LEFT=$(($NUM_TRIES_LEFT - 1)) +done +[ -f /proc/bus/usb/$bus_num/$dev_num ] || exit 5 + chown $console_user /proc/bus/usb/$bus_num/$dev_num Index: gphoto2.spec =================================================================== RCS file: /cvs/dist/rpms/gphoto2/devel/gphoto2.spec,v retrieving revision 1.55 retrieving revision 1.56 diff -u -r1.55 -r1.56 --- gphoto2.spec 1 Mar 2006 15:59:25 -0000 1.55 +++ gphoto2.spec 2 Mar 2006 22:06:05 -0000 1.56 @@ -5,7 +5,7 @@ %define libpkg libgphoto2 %define libver 2.1.99 Version: %{pkgver} -Release: 5.4 +Release: 6 License: LGPL Group: Applications/Multimedia BuildRoot: %{_tmppath}/%{name}-%{version}-root @@ -212,6 +212,10 @@ # ChangeLog ######################################################################## %changelog +* Wed Mar 02 2006 Ray Strode 2.1.99-6 +- potentially work around bug 183371 by looping/checking for + 5 seconds. + * Wed Mar 01 2006 Radek Vok??l 2.1.99-5.4 - spec file tweak, become self-building again From fedora-cvs-commits at redhat.com Thu Mar 2 22:25:39 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 2 Mar 2006 17:25:39 -0500 Subject: rpms/gstreamer-plugins/FC-4 gstreamer-plugins-0.8.4-vorbis-seek-workaround.patch, 1.3, NONE Message-ID: <200603022225.k22MPdCS002037@cvs.devel.redhat.com> Author: cmontgom Update of /cvs/dist/rpms/gstreamer-plugins/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv1875 Removed Files: gstreamer-plugins-0.8.4-vorbis-seek-workaround.patch Log Message: remove long-obsolete patch --- gstreamer-plugins-0.8.4-vorbis-seek-workaround.patch DELETED --- From fedora-cvs-commits at redhat.com Thu Mar 2 22:41:23 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 2 Mar 2006 17:41:23 -0500 Subject: rpms/gstreamer-plugins/FC-4 gstreamer-plugins.spec,1.53,1.54 Message-ID: <200603022241.k22MfNP6006880@cvs.devel.redhat.com> Author: cmontgom Update of /cvs/dist/rpms/gstreamer-plugins/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv6593 Modified Files: gstreamer-plugins.spec Log Message: Correct a specfile omission (new library file) Index: gstreamer-plugins.spec =================================================================== RCS file: /cvs/dist/rpms/gstreamer-plugins/FC-4/gstreamer-plugins.spec,v retrieving revision 1.53 retrieving revision 1.54 diff -u -r1.53 -r1.54 --- gstreamer-plugins.spec 2 Mar 2006 17:44:57 -0000 1.53 +++ gstreamer-plugins.spec 2 Mar 2006 22:41:20 -0000 1.54 @@ -177,6 +177,9 @@ %ifarch %{ix86} ia64 ppc ppc64 x86_64 %{_libdir}/gstreamer-%{majmin}/libgst1394.* %endif +%ifarch %{ix86} +%{_libdir}/gstreamer-%{majmin}/libgstspc.* +%endif %{_libdir}/gstreamer-%{majmin}/libgstac3parse.* %{_libdir}/gstreamer-%{majmin}/libgstadder.* %{_libdir}/gstreamer-%{majmin}/libgstalpha.* From fedora-cvs-commits at redhat.com Thu Mar 2 22:45:22 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 2 Mar 2006 17:45:22 -0500 Subject: rpms/kernel/devel/configs config-xen-generic,1.9,1.9.4.1 Message-ID: <200603022245.k22MjMg1008721@cvs.devel.redhat.com> Author: sct Update of /cvs/dist/rpms/kernel/devel/configs In directory cvs.devel.redhat.com:/tmp/cvs-serv8639/configs Modified Files: Tag: private-xen-rebased-2009-branch config-xen-generic Log Message: Merge rawhide 1.2009 and xen-unstable cset 9022 rebase Index: config-xen-generic =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/configs/config-xen-generic,v retrieving revision 1.9 retrieving revision 1.9.4.1 diff -u -r1.9 -r1.9.4.1 --- config-xen-generic 28 Feb 2006 20:16:29 -0000 1.9 +++ config-xen-generic 2 Mar 2006 22:45:19 -0000 1.9.4.1 @@ -18,6 +18,7 @@ # CONFIG_XEN_PCIDEV_BE_DEBUG is not set # CONFIG_XEN_PCIDEV_FRONTEND is not set # CONFIG_XEN_PCIDEV_FE_DEBUG is not set +CONFIG_XEN_NETDEV_LOOPBACK=y # # X86 Processor Configuration From fedora-cvs-commits at redhat.com Thu Mar 2 22:45:22 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 2 Mar 2006 17:45:22 -0500 Subject: rpms/kernel/devel linux-2.6-xen-i386-mach-io-check-nmi.patch, NONE, 1.1.4.1 linux-2.6-xen-move-vdso-fixmap.patch, NONE, 1.1.4.1 linux-2.6-xen-net-csum.patch, NONE, 1.1.4.1 linux-2.6-xen-pmd-shared.patch, NONE, 1.1.4.1 linux-2.6-xen-smp-alts.patch, NONE, 1.1.4.1 linux-2.6-xen-vsyscall_base.patch, NONE, 1.1.4.1 linux-2.6-xen.patch, NONE, 1.3.2.1 .cvsignore, 1.369, 1.369.4.1 kernel-2.6.spec, 1.2009, 1.2009.4.1 linux-2.6-crashdump-common.patch, 1.9, 1.9.18.1 linux-2.6-execshield-fixes.patch, 1.5, 1.5.14.1 linux-2.6-execshield-vdso.patch, 1.2, 1.2.26.1 linux-2.6-execshield-xen.patch, 1.2, 1.2.18.1 linux-2.6-execshield.patch, 1.10, 1.10.26.1 linux-2.6-xen-compile-fixes.patch, 1.1, 1.1.18.1 sources, 1.310, 1.310.4.1 linux-2.6-xen-acpi.patch, 1.1, NONE linux-2.6-xen-cpusteal-kernel.patch, 1.2, NONE linux-2.6-xen-gcc-4.1-compile-fix.patch, 1.1, NONE linux-2.6-xen-guest-enable-char-devices.patch, 1.1, NONE linux-2.6-xen-merge.patch, 1.3, NONE linux-2.6-xen-x86_64-fixes.patch, 1.1, NONE linux-2.6-xen_net_read_mac_export! .patch,1.1,NONE Message-ID: <200603022245.k22MjMNM008706@cvs.devel.redhat.com> Author: sct Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv8639 Modified Files: Tag: private-xen-rebased-2009-branch .cvsignore kernel-2.6.spec linux-2.6-crashdump-common.patch linux-2.6-execshield-fixes.patch linux-2.6-execshield-vdso.patch linux-2.6-execshield-xen.patch linux-2.6-execshield.patch linux-2.6-xen-compile-fixes.patch sources Added Files: Tag: private-xen-rebased-2009-branch linux-2.6-xen-i386-mach-io-check-nmi.patch linux-2.6-xen-move-vdso-fixmap.patch linux-2.6-xen-net-csum.patch linux-2.6-xen-pmd-shared.patch linux-2.6-xen-smp-alts.patch linux-2.6-xen-vsyscall_base.patch linux-2.6-xen.patch Removed Files: Tag: private-xen-rebased-2009-branch linux-2.6-xen-acpi.patch linux-2.6-xen-cpusteal-kernel.patch linux-2.6-xen-gcc-4.1-compile-fix.patch linux-2.6-xen-guest-enable-char-devices.patch linux-2.6-xen-merge.patch linux-2.6-xen-x86_64-fixes.patch linux-2.6-xen_net_read_mac_export.patch Log Message: Merge rawhide 1.2009 and xen-unstable cset 9022 rebase linux-2.6-xen-i386-mach-io-check-nmi.patch: arch/i386/kernel/traps.c | 9 +-------- include/asm-i386/mach-default/mach_traps.h | 12 ++++++++++++ 2 files changed, 13 insertions(+), 8 deletions(-) --- NEW FILE linux-2.6-xen-i386-mach-io-check-nmi.patch --- diff -pruN ../pristine-linux-2.6.16-rc3/arch/i386/kernel/traps.c ./arch/i386/kernel/traps.c --- ../pristine-linux-2.6.16-rc3/arch/i386/kernel/traps.c 2006-02-15 20:38:51.000000000 +0000 +++ ./arch/i386/kernel/traps.c 2006-02-15 20:40:43.000000000 +0000 @@ -567,18 +567,11 @@ static void mem_parity_error(unsigned ch static void io_check_error(unsigned char reason, struct pt_regs * regs) { - unsigned long i; - printk(KERN_EMERG "NMI: IOCK error (debug interrupt?)\n"); show_registers(regs); /* Re-enable the IOCK line, wait for a few seconds */ - reason = (reason & 0xf) | 8; - outb(reason, 0x61); - i = 2000; - while (--i) udelay(1000); - reason &= ~8; - outb(reason, 0x61); + clear_io_check_error(reason); } static void unknown_nmi_error(unsigned char reason, struct pt_regs * regs) diff -pruN ../pristine-linux-2.6.16-rc3/include/asm-i386/mach-default/mach_traps.h ./include/asm-i386/mach-default/mach_traps.h --- ../pristine-linux-2.6.16-rc3/include/asm-i386/mach-default/mach_traps.h 2006-01-03 03:21:10.000000000 +0000 +++ ./include/asm-i386/mach-default/mach_traps.h 2006-02-15 20:40:43.000000000 +0000 @@ -15,6 +15,18 @@ static inline void clear_mem_error(unsig outb(reason, 0x61); } +static inline void clear_io_check_error(unsigned char reason) +{ + unsigned long i; + + reason = (reason & 0xf) | 8; + outb(reason, 0x61); + i = 2000; + while (--i) udelay(1000); + reason &= ~8; + outb(reason, 0x61); +} + static inline unsigned char get_nmi_reason(void) { return inb(0x61); linux-2.6-xen-move-vdso-fixmap.patch: arch/i386/kernel/asm-offsets.c | 3 - arch/i386/kernel/sysenter.c | 76 ++++++++++++++++++++++++++++++--- arch/i386/mm/pgtable-xen.c | 1 include/asm-i386/a.out.h | 2 include/asm-i386/elf.h | 7 ++- include/asm-i386/fixmap.h | 9 --- include/asm-i386/mach-xen/asm/fixmap.h | 9 --- include/asm-i386/mach-xen/asm/page.h | 2 include/asm-i386/page.h | 2 9 files changed, 84 insertions(+), 27 deletions(-) --- NEW FILE linux-2.6-xen-move-vdso-fixmap.patch --- # HG changeset patch # User cl349 at firebug.cl.cam.ac.uk # Node ID 822a27d28afeab1ffdf8ca8e8e8a11de5e7c7aec # Parent 875e0e96e574cc8216394b7eb6eaa22474d0f216 Move the gate page (vsyscall) out of the fixmap area into user address space, just below PAGE_OFFSET. From: Gerd Hoffmann Signed-off-by: Christian Limpach diff -r 875e0e96e574 -r 822a27d28afe linux-2.6-xen-sparse/arch/i386/kernel/asm-offsets.c --- a/linux-2.6-xen-sparse/arch/i386/kernel/asm-offsets.c Thu Feb 23 15:22:17 2006 +0000 +++ b/linux-2.6-xen-sparse/arch/i386/kernel/asm-offsets.c Thu Feb 23 15:22:19 2006 +0000 @@ -13,6 +13,7 @@ #include #include #include +#include #define DEFINE(sym, val) \ asm volatile("\n->" #sym " %0 " #val : : "i" (val)) @@ -70,5 +71,5 @@ void foo(void) #endif DEFINE(PAGE_SIZE_asm, PAGE_SIZE); - DEFINE(VSYSCALL_BASE, __fix_to_virt(FIX_VSYSCALL)); + DEFINE(VSYSCALL_BASE, VSYSCALL_BASE); } diff -r 875e0e96e574 -r 822a27d28afe linux-2.6-xen-sparse/arch/i386/kernel/sysenter.c --- a/linux-2.6-xen-sparse/arch/i386/kernel/sysenter.c Thu Feb 23 15:22:17 2006 +0000 +++ b/linux-2.6-xen-sparse/arch/i386/kernel/sysenter.c Thu Feb 23 15:22:19 2006 +0000 @@ -13,6 +13,7 @@ #include #include #include +#include #include #include @@ -47,25 +48,90 @@ void enable_sep_cpu(void) */ extern const char vsyscall_int80_start, vsyscall_int80_end; extern const char vsyscall_sysenter_start, vsyscall_sysenter_end; +static void *syscall_page; int __init sysenter_setup(void) { - void *page = (void *)get_zeroed_page(GFP_ATOMIC); - - __set_fixmap(FIX_VSYSCALL, __pa(page), PAGE_READONLY_EXEC); + syscall_page = (void *)get_zeroed_page(GFP_ATOMIC); #ifdef CONFIG_X86_SYSENTER if (boot_cpu_has(X86_FEATURE_SEP)) { - memcpy(page, + memcpy(syscall_page, &vsyscall_sysenter_start, &vsyscall_sysenter_end - &vsyscall_sysenter_start); return 0; } #endif - memcpy(page, + memcpy(syscall_page, &vsyscall_int80_start, &vsyscall_int80_end - &vsyscall_int80_start); return 0; } + +static struct page* +syscall_nopage(struct vm_area_struct *vma, unsigned long adr, int *type) +{ + struct page *p = virt_to_page(adr - vma->vm_start + syscall_page); + get_page(p); + return p; +} + +/* Prevent VMA merging */ +static void syscall_vma_close(struct vm_area_struct *vma) +{ +} + +static struct vm_operations_struct syscall_vm_ops = { + .close = syscall_vma_close, + .nopage = syscall_nopage, +}; + +/* Setup a VMA at program startup for the vsyscall page */ +int arch_setup_additional_pages(struct linux_binprm *bprm, int exstack) +{ + struct vm_area_struct *vma; + struct mm_struct *mm = current->mm; + int ret; + + vma = kmem_cache_alloc(vm_area_cachep, SLAB_KERNEL); + if (!vma) + return -ENOMEM; + + memset(vma, 0, sizeof(struct vm_area_struct)); + /* Could randomize here */ + vma->vm_start = VSYSCALL_BASE; + vma->vm_end = VSYSCALL_BASE + PAGE_SIZE; + /* MAYWRITE to allow gdb to COW and set breakpoints */ + vma->vm_flags = VM_READ|VM_EXEC|VM_MAYREAD|VM_MAYEXEC|VM_MAYWRITE; + vma->vm_flags |= mm->def_flags; + vma->vm_page_prot = protection_map[vma->vm_flags & 7]; + vma->vm_ops = &syscall_vm_ops; + vma->vm_mm = mm; + + down_write(&mm->mmap_sem); + if ((ret = insert_vm_struct(mm, vma))) { + up_write(&mm->mmap_sem); + kmem_cache_free(vm_area_cachep, vma); + return ret; + } + mm->total_vm++; + up_write(&mm->mmap_sem); + return 0; +} + +struct vm_area_struct *get_gate_vma(struct task_struct *tsk) +{ + return NULL; +} + +int in_gate_area(struct task_struct *task, unsigned long addr) +{ + return 0; +} + +int in_gate_area_no_task(unsigned long addr) +{ + return 0; +} diff -r 875e0e96e574 -r 822a27d28afe linux-2.6-xen-sparse/arch/i386/mm/pgtable-xen.c --- a/linux-2.6-xen-sparse/arch/i386/mm/pgtable-xen.c Thu Feb 23 15:22:17 2006 +0000 +++ b/linux-2.6-xen-sparse/arch/i386/mm/pgtable-xen.c Thu Feb 23 15:22:19 2006 +0000 @@ -194,7 +194,6 @@ void __set_fixmap (enum fixed_addresses } switch (idx) { case FIX_WP_TEST: - case FIX_VSYSCALL: #ifdef CONFIG_X86_F00F_BUG case FIX_F00F_IDT: #endif diff -r 875e0e96e574 -r 822a27d28afe linux-2.6-xen-sparse/include/asm-i386/a.out.h --- a/linux-2.6-xen-sparse/include/asm-i386/a.out.h Thu Feb 23 15:22:17 2006 +0000 +++ b/linux-2.6-xen-sparse/include/asm-i386/a.out.h Thu Feb 23 15:22:19 2006 +0000 @@ -19,7 +19,7 @@ struct exec #ifdef __KERNEL__ -#define STACK_TOP TASK_SIZE +#define STACK_TOP (TASK_SIZE - 3*PAGE_SIZE) #endif diff -r 875e0e96e574 -r 822a27d28afe linux-2.6-xen-sparse/include/asm-i386/elf.h --- a/linux-2.6-xen-sparse/include/asm-i386/elf.h Thu Feb 23 15:22:17 2006 +0000 +++ b/linux-2.6-xen-sparse/include/asm-i386/elf.h Thu Feb 23 15:22:19 2006 +0000 @@ -129,10 +129,15 @@ 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_BASE (PAGE_OFFSET - 2*PAGE_SIZE) #define VSYSCALL_EHDR ((const struct elfhdr *) VSYSCALL_BASE) #define VSYSCALL_ENTRY ((unsigned long) &__kernel_vsyscall) extern void __kernel_vsyscall; + +#define ARCH_HAS_SETUP_ADDITIONAL_PAGES +struct linux_binprm; +extern int arch_setup_additional_pages(struct linux_binprm *bprm, + int executable_stack); #define ARCH_DLINFO \ do { \ diff -r 875e0e96e574 -r 822a27d28afe linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/fixmap.h --- a/linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/fixmap.h Thu Feb 23 15:22:17 2006 +0000 +++ b/linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/fixmap.h Thu Feb 23 15:22:19 2006 +0000 @@ -53,7 +53,6 @@ */ enum fixed_addresses { FIX_HOLE, - FIX_VSYSCALL, #ifdef CONFIG_X86_LOCAL_APIC FIX_APIC_BASE, /* local (CPU) APIC) -- required for SMP or not */ #endif @@ -123,14 +122,6 @@ extern void __set_fixmap( #define __fix_to_virt(x) (FIXADDR_TOP - ((x) << PAGE_SHIFT)) #define __virt_to_fix(x) ((FIXADDR_TOP - ((x)&PAGE_MASK)) >> PAGE_SHIFT) -/* - * This is the range that is readable by user mode, and things - * acting like user mode such as get_user_pages. - */ -#define FIXADDR_USER_START (__fix_to_virt(FIX_VSYSCALL)) -#define FIXADDR_USER_END (FIXADDR_USER_START + PAGE_SIZE) - - extern void __this_fixmap_does_not_exist(void); /* diff -r 875e0e96e574 -r 822a27d28afe linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/page.h --- a/linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/page.h Thu Feb 23 15:22:17 2006 +0000 +++ b/linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/page.h Thu Feb 23 15:22:19 2006 +0000 @@ -317,6 +317,8 @@ extern int page_is_ram(unsigned long pag #define virt_to_mfn(v) (pfn_to_mfn(__pa(v) >> PAGE_SHIFT)) #define mfn_to_virt(m) (__va(mfn_to_pfn(m) << PAGE_SHIFT)) +#define __HAVE_ARCH_GATE_AREA 1 + #endif /* __KERNEL__ */ #include # HG changeset patch # User cl349 at firebug.cl.cam.ac.uk # Node ID 55f597e929f341eade781048db9da77a0352820d # Parent dbec76a720f8d79aa9dfcdb9e91684b7426a23f9 Fix non-xen build for: Move the gate page (vsyscall) out of the fixmap area into user address space, just below PAGE_OFFSET. From: Gerd Hoffmann Signed-off-by: Christian Limpach diff -r dbec76a720f8 -r 55f597e929f3 linux-2.6-xen-sparse/include/asm-i386/fixmap.h --- a/linux-2.6-xen-sparse/include/asm-i386/fixmap.h Mon Feb 27 10:26:01 2006 +0000 +++ b/linux-2.6-xen-sparse/include/asm-i386/fixmap.h Mon Feb 27 10:27:57 2006 +0000 @@ -52,7 +52,6 @@ */ enum fixed_addresses { FIX_HOLE, - FIX_VSYSCALL, #ifdef CONFIG_X86_LOCAL_APIC FIX_APIC_BASE, /* local (CPU) APIC) -- required for SMP or not */ #endif @@ -116,14 +115,6 @@ extern void __set_fixmap (enum fixed_add #define __fix_to_virt(x) (FIXADDR_TOP - ((x) << PAGE_SHIFT)) #define __virt_to_fix(x) ((FIXADDR_TOP - ((x)&PAGE_MASK)) >> PAGE_SHIFT) -/* - * This is the range that is readable by user mode, and things - * acting like user mode such as get_user_pages. - */ -#define FIXADDR_USER_START (__fix_to_virt(FIX_VSYSCALL)) -#define FIXADDR_USER_END (FIXADDR_USER_START + PAGE_SIZE) - - extern void __this_fixmap_does_not_exist(void); /* diff -r dbec76a720f8 -r 55f597e929f3 linux-2.6-xen-sparse/include/asm-i386/page.h --- a/linux-2.6-xen-sparse/include/asm-i386/page.h Mon Feb 27 10:26:01 2006 +0000 +++ b/linux-2.6-xen-sparse/include/asm-i386/page.h Mon Feb 27 10:27:57 2006 +0000 @@ -139,6 +139,8 @@ extern int page_is_ram(unsigned long pag ((current->personality & READ_IMPLIES_EXEC) ? VM_EXEC : 0 ) | \ VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC) +#define __HAVE_ARCH_GATE_AREA 1 + #endif /* __KERNEL__ */ #include linux-2.6-xen-net-csum.patch: ip_nat_proto_tcp.c | 6 +++++- ip_nat_proto_udp.c | 9 +++++++-- 2 files changed, 12 insertions(+), 3 deletions(-) --- NEW FILE linux-2.6-xen-net-csum.patch --- diff -pruN ../pristine-linux-2.6.16-rc1-git4/net/ipv4/netfilter/ip_nat_proto_tcp.c ./net/ipv4/netfilter/ip_nat_proto_tcp.c --- ../pristine-linux-2.6.16-rc1-git4/net/ipv4/netfilter/ip_nat_proto_tcp.c 2006-02-02 17:39:51.000000000 +0000 +++ ./net/ipv4/netfilter/ip_nat_proto_tcp.c 2006-02-02 17:44:18.000000000 +0000 @@ -129,10 +129,14 @@ tcp_manip_pkt(struct sk_buff **pskb, if (hdrsize < sizeof(*hdr)) return 1; - hdr->check = ip_nat_cheat_check(~oldip, newip, + if ((*pskb)->proto_csum_blank) { + hdr->check = ip_nat_cheat_check(oldip, ~newip, hdr->check); + } else { + hdr->check = ip_nat_cheat_check(~oldip, newip, ip_nat_cheat_check(oldport ^ 0xFFFF, newport, hdr->check)); + } return 1; } diff -pruN ../pristine-linux-2.6.16-rc1-git4/net/ipv4/netfilter/ip_nat_proto_udp.c ./net/ipv4/netfilter/ip_nat_proto_udp.c --- ../pristine-linux-2.6.16-rc1-git4/net/ipv4/netfilter/ip_nat_proto_udp.c 2006-02-02 17:39:51.000000000 +0000 +++ ./net/ipv4/netfilter/ip_nat_proto_udp.c 2006-02-02 17:44:18.000000000 +0000 @@ -113,11 +113,16 @@ udp_manip_pkt(struct sk_buff **pskb, newport = tuple->dst.u.udp.port; portptr = &hdr->dest; } - if (hdr->check) /* 0 is a special case meaning no checksum */ - hdr->check = ip_nat_cheat_check(~oldip, newip, + if (hdr->check) { /* 0 is a special case meaning no checksum */ + if ((*pskb)->proto_csum_blank) { + hdr->check = ip_nat_cheat_check(oldip, ~newip, hdr->check); + } else { + hdr->check = ip_nat_cheat_check(~oldip, newip, ip_nat_cheat_check(*portptr ^ 0xFFFF, newport, hdr->check)); + } + } *portptr = newport; return 1; } linux-2.6-xen-pmd-shared.patch: arch/i386/mm/pageattr.c | 2 - arch/i386/mm/pgtable.c | 51 +++++++++++++++++++++++++++++---- include/asm-i386/pgtable-2level-defs.h | 2 + include/asm-i386/pgtable-3level-defs.h | 2 + 4 files changed, 50 insertions(+), 7 deletions(-) --- NEW FILE linux-2.6-xen-pmd-shared.patch --- diff -pruN ../pristine-linux-2.6.16-rc1-git4/arch/i386/mm/pageattr.c ./arch/i386/mm/pageattr.c --- ../pristine-linux-2.6.16-rc1-git4/arch/i386/mm/pageattr.c 2006-02-02 17:39:29.000000000 +0000 +++ ./arch/i386/mm/pageattr.c 2006-02-02 17:45:14.000000000 +0000 @@ -78,7 +78,7 @@ static void set_pmd_pte(pte_t *kpte, uns unsigned long flags; set_pte_atomic(kpte, pte); /* change init_mm */ - if (PTRS_PER_PMD > 1) + if (HAVE_SHARED_KERNEL_PMD) return; spin_lock_irqsave(&pgd_lock, flags); diff -pruN ../pristine-linux-2.6.16-rc1-git4/arch/i386/mm/pgtable.c ./arch/i386/mm/pgtable.c --- ../pristine-linux-2.6.16-rc1-git4/arch/i386/mm/pgtable.c 2006-01-03 03:21:10.000000000 +0000 +++ ./arch/i386/mm/pgtable.c 2006-02-02 17:45:14.000000000 +0000 @@ -215,9 +215,10 @@ void pgd_ctor(void *pgd, kmem_cache_t *c spin_lock_irqsave(&pgd_lock, flags); } - clone_pgd_range((pgd_t *)pgd + USER_PTRS_PER_PGD, - swapper_pg_dir + USER_PTRS_PER_PGD, - KERNEL_PGD_PTRS); + if (PTRS_PER_PMD == 1 || HAVE_SHARED_KERNEL_PMD) + clone_pgd_range((pgd_t *)pgd + USER_PTRS_PER_PGD, + swapper_pg_dir + USER_PTRS_PER_PGD, + KERNEL_PGD_PTRS); if (PTRS_PER_PMD > 1) return; @@ -249,6 +250,30 @@ pgd_t *pgd_alloc(struct mm_struct *mm) goto out_oom; set_pgd(&pgd[i], __pgd(1 + __pa(pmd))); } + + if (!HAVE_SHARED_KERNEL_PMD) { + unsigned long flags; + + for (i = USER_PTRS_PER_PGD; i < PTRS_PER_PGD; i++) { + pmd_t *pmd = kmem_cache_alloc(pmd_cache, GFP_KERNEL); + if (!pmd) + goto out_oom; + set_pgd(&pgd[USER_PTRS_PER_PGD], __pgd(1 + __pa(pmd))); + } + + spin_lock_irqsave(&pgd_lock, flags); + for (i = USER_PTRS_PER_PGD; i < PTRS_PER_PGD; i++) { + unsigned long v = (unsigned long)i << PGDIR_SHIFT; + pgd_t *kpgd = pgd_offset_k(v); + pud_t *kpud = pud_offset(kpgd, v); + pmd_t *kpmd = pmd_offset(kpud, v); + pmd_t *pmd = (void *)__va(pgd_val(pgd[i])-1); + memcpy(pmd, kpmd, PAGE_SIZE); + } + pgd_list_add(pgd); + spin_unlock_irqrestore(&pgd_lock, flags); + } + return pgd; out_oom: @@ -263,9 +288,23 @@ void pgd_free(pgd_t *pgd) int i; /* in the PAE case user pgd entries are overwritten before usage */ - if (PTRS_PER_PMD > 1) - for (i = 0; i < USER_PTRS_PER_PGD; ++i) - kmem_cache_free(pmd_cache, (void *)__va(pgd_val(pgd[i])-1)); + if (PTRS_PER_PMD > 1) { + for (i = 0; i < USER_PTRS_PER_PGD; ++i) { + pmd_t *pmd = (void *)__va(pgd_val(pgd[i])-1); + kmem_cache_free(pmd_cache, pmd); + } + if (!HAVE_SHARED_KERNEL_PMD) { + unsigned long flags; + spin_lock_irqsave(&pgd_lock, flags); + pgd_list_del(pgd); + spin_unlock_irqrestore(&pgd_lock, flags); + for (i = USER_PTRS_PER_PGD; i < PTRS_PER_PGD; i++) { + pmd_t *pmd = (void *)__va(pgd_val(pgd[i])-1); + memset(pmd, 0, PTRS_PER_PMD*sizeof(pmd_t)); + kmem_cache_free(pmd_cache, pmd); + } + } + } /* in the non-PAE case, free_pgtables() clears user pgd entries */ kmem_cache_free(pgd_cache, pgd); } diff -pruN ../pristine-linux-2.6.16-rc1-git4/include/asm-i386/pgtable-2level-defs.h ./include/asm-i386/pgtable-2level-defs.h --- ../pristine-linux-2.6.16-rc1-git4/include/asm-i386/pgtable-2level-defs.h 2006-01-03 03:21:10.000000000 +0000 +++ ./include/asm-i386/pgtable-2level-defs.h 2006-02-02 17:45:14.000000000 +0000 @@ -1,6 +1,8 @@ #ifndef _I386_PGTABLE_2LEVEL_DEFS_H #define _I386_PGTABLE_2LEVEL_DEFS_H +#define HAVE_SHARED_KERNEL_PMD 0 + /* * traditional i386 two-level paging structure: */ diff -pruN ../pristine-linux-2.6.16-rc1-git4/include/asm-i386/pgtable-3level-defs.h ./include/asm-i386/pgtable-3level-defs.h --- ../pristine-linux-2.6.16-rc1-git4/include/asm-i386/pgtable-3level-defs.h 2006-01-03 03:21:10.000000000 +0000 +++ ./include/asm-i386/pgtable-3level-defs.h 2006-02-02 17:45:14.000000000 +0000 @@ -1,6 +1,8 @@ #ifndef _I386_PGTABLE_3LEVEL_DEFS_H #define _I386_PGTABLE_3LEVEL_DEFS_H +#define HAVE_SHARED_KERNEL_PMD 1 + /* * PGDIR_SHIFT determines what a top-level page table entry can map */ linux-2.6-xen-smp-alts.patch: arch/i386/Kconfig | 13 ++++++ arch/i386/kernel/Makefile | 1 arch/i386/kernel/smpalts.c | 85 +++++++++++++++++++++++++++++++++++++++++ arch/i386/kernel/smpboot.c | 10 ++++ arch/i386/kernel/vmlinux.lds.S | 7 +++ include/asm-i386/atomic.h | 7 --- include/asm-i386/bitops.h | 19 +++------ include/asm-i386/futex.h | 4 - include/asm-i386/rwsem.h | 17 ++++---- include/asm-i386/smp_alt.h | 32 +++++++++++++++ include/asm-i386/spinlock.h | 37 +++++++++++++++-- include/asm-i386/system.h | 56 ++++++++++++++++++++++++--- 12 files changed, 249 insertions(+), 39 deletions(-) --- NEW FILE linux-2.6-xen-smp-alts.patch --- diff -pruN ../pristine-linux-2.6.16-rc3/arch/i386/Kconfig ./arch/i386/Kconfig --- ../pristine-linux-2.6.16-rc3/arch/i386/Kconfig 2006-02-15 20:38:51.000000000 +0000 +++ ./arch/i386/Kconfig 2006-02-15 20:45:57.000000000 +0000 @@ -202,6 +202,19 @@ config SMP If you don't know what to do here, say N. +config SMP_ALTERNATIVES + bool "SMP alternatives support (EXPERIMENTAL)" + depends on SMP && EXPERIMENTAL + help + Try to reduce the overhead of running an SMP kernel on a uniprocessor + host slightly by replacing certain key instruction sequences + according to whether we currently have more than one CPU available. + This should provide a noticeable boost to performance when + running SMP kernels on UP machines, and have negligible impact + when running on an true SMP host. + + If unsure, say N. + config NR_CPUS int "Maximum number of CPUs (2-255)" range 2 255 diff -pruN ../pristine-linux-2.6.16-rc3/arch/i386/kernel/Makefile ./arch/i386/kernel/Makefile --- ../pristine-linux-2.6.16-rc3/arch/i386/kernel/Makefile 2006-02-15 20:38:51.000000000 +0000 +++ ./arch/i386/kernel/Makefile 2006-02-15 20:45:57.000000000 +0000 @@ -37,6 +37,7 @@ obj-$(CONFIG_EFI) += efi.o efi_stub.o obj-$(CONFIG_DOUBLEFAULT) += doublefault.o obj-$(CONFIG_VM86) += vm86.o obj-$(CONFIG_EARLY_PRINTK) += early_printk.o +obj-$(CONFIG_SMP_ALTERNATIVES) += smpalts.o EXTRA_AFLAGS := -traditional diff -pruN ../pristine-linux-2.6.16-rc3/arch/i386/kernel/smpalts.c ./arch/i386/kernel/smpalts.c --- ../pristine-linux-2.6.16-rc3/arch/i386/kernel/smpalts.c 1970-01-01 01:00:00.000000000 +0100 +++ ./arch/i386/kernel/smpalts.c 2006-02-15 20:45:57.000000000 +0000 @@ -0,0 +1,85 @@ +#include +#include +#include +#include +#include + +struct smp_replacement_record { + unsigned char targ_size; + unsigned char smp1_size; + unsigned char smp2_size; + unsigned char up_size; + unsigned char feature; + unsigned char data[0]; +}; + +struct smp_alternative_record { + void *targ_start; + struct smp_replacement_record *repl; +}; + +extern struct smp_alternative_record __start_smp_alternatives_table, + __stop_smp_alternatives_table; +extern unsigned long __init_begin, __init_end; + +void prepare_for_smp(void) +{ + struct smp_alternative_record *r; + printk(KERN_INFO "Enabling SMP...\n"); + for (r = &__start_smp_alternatives_table; + r != &__stop_smp_alternatives_table; + r++) { + BUG_ON(r->repl->targ_size < r->repl->smp1_size); + BUG_ON(r->repl->targ_size < r->repl->smp2_size); + BUG_ON(r->repl->targ_size < r->repl->up_size); + if (system_state == SYSTEM_RUNNING && + r->targ_start >= (void *)&__init_begin && + r->targ_start < (void *)&__init_end) + continue; + if (r->repl->feature != (unsigned char)-1 && + boot_cpu_has(r->repl->feature)) { + memcpy(r->targ_start, + r->repl->data + r->repl->smp1_size, + r->repl->smp2_size); + memset(r->targ_start + r->repl->smp2_size, + 0x90, + r->repl->targ_size - r->repl->smp2_size); + } else { + memcpy(r->targ_start, + r->repl->data, + r->repl->smp1_size); + memset(r->targ_start + r->repl->smp1_size, + 0x90, + r->repl->targ_size - r->repl->smp1_size); + } + } + /* Paranoia */ + asm volatile ("jmp 1f\n1:"); + mb(); +} + +void unprepare_for_smp(void) +{ + struct smp_alternative_record *r; + printk(KERN_INFO "Disabling SMP...\n"); + for (r = &__start_smp_alternatives_table; + r != &__stop_smp_alternatives_table; + r++) { + BUG_ON(r->repl->targ_size < r->repl->smp1_size); + BUG_ON(r->repl->targ_size < r->repl->smp2_size); + BUG_ON(r->repl->targ_size < r->repl->up_size); + if (system_state == SYSTEM_RUNNING && + r->targ_start >= (void *)&__init_begin && + r->targ_start < (void *)&__init_end) + continue; + memcpy(r->targ_start, + r->repl->data + r->repl->smp1_size + r->repl->smp2_size, + r->repl->up_size); + memset(r->targ_start + r->repl->up_size, + 0x90, + r->repl->targ_size - r->repl->up_size); + } + /* Paranoia */ + asm volatile ("jmp 1f\n1:"); + mb(); +} diff -pruN ../pristine-linux-2.6.16-rc3/arch/i386/kernel/smpboot.c ./arch/i386/kernel/smpboot.c --- ../pristine-linux-2.6.16-rc3/arch/i386/kernel/smpboot.c 2006-02-15 20:38:51.000000000 +0000 +++ ./arch/i386/kernel/smpboot.c 2006-02-15 20:45:57.000000000 +0000 @@ -1214,6 +1214,11 @@ static void __init smp_boot_cpus(unsigne if (max_cpus <= cpucount+1) continue; +#ifdef CONFIG_SMP_ALTERNATIVES + if (kicked == 1) + prepare_for_smp(); +#endif + if (((cpu = alloc_cpu_id()) <= 0) || do_boot_cpu(apicid, cpu)) printk("CPU #%d not responding - cannot use it.\n", apicid); @@ -1392,6 +1397,11 @@ int __devinit __cpu_up(unsigned int cpu) return -EIO; } +#ifdef CONFIG_SMP_ALTERNATIVES + if (num_online_cpus() == 1) + prepare_for_smp(); +#endif + local_irq_enable(); per_cpu(cpu_state, cpu) = CPU_UP_PREPARE; /* Unleash the CPU! */ diff -pruN ../pristine-linux-2.6.16-rc3/arch/i386/kernel/vmlinux.lds.S ./arch/i386/kernel/vmlinux.lds.S --- ../pristine-linux-2.6.16-rc3/arch/i386/kernel/vmlinux.lds.S 2006-01-03 03:21:10.000000000 +0000 +++ ./arch/i386/kernel/vmlinux.lds.S 2006-02-15 20:45:57.000000000 +0000 @@ -34,6 +34,13 @@ SECTIONS __ex_table : AT(ADDR(__ex_table) - LOAD_OFFSET) { *(__ex_table) } __stop___ex_table = .; + . = ALIGN(16); + __start_smp_alternatives_table = .; + __smp_alternatives : { *(__smp_alternatives) } + __stop_smp_alternatives_table = .; + + __smp_replacements : { *(__smp_replacements) } + RODATA /* writeable */ diff -pruN ../pristine-linux-2.6.16-rc3/include/asm-i386/atomic.h ./include/asm-i386/atomic.h --- ../pristine-linux-2.6.16-rc3/include/asm-i386/atomic.h 2006-02-15 20:38:57.000000000 +0000 +++ ./include/asm-i386/atomic.h 2006-02-15 20:45:57.000000000 +0000 @@ -4,18 +4,13 @@ #include #include #include +#include /* * Atomic operations that C can't guarantee us. Useful for * resource counting etc.. */ -#ifdef CONFIG_SMP -#define LOCK "lock ; " -#else -#define LOCK "" -#endif - /* * Make sure gcc doesn't try to be clever and move things around * on us. We need to use _exactly_ the address the user gave us, diff -pruN ../pristine-linux-2.6.16-rc3/include/asm-i386/bitops.h ./include/asm-i386/bitops.h --- ../pristine-linux-2.6.16-rc3/include/asm-i386/bitops.h 2006-02-15 20:38:57.000000000 +0000 +++ ./include/asm-i386/bitops.h 2006-02-15 20:45:57.000000000 +0000 @@ -7,6 +7,7 @@ #include #include +#include /* * These have to be done with inline assembly: that way the bit-setting @@ -16,12 +17,6 @@ * bit 0 is the LSB of addr; bit 32 is the LSB of (addr+1). */ -#ifdef CONFIG_SMP -#define LOCK_PREFIX "lock ; " -#else -#define LOCK_PREFIX "" -#endif - #define ADDR (*(volatile long *) addr) /** @@ -41,7 +36,7 @@ */ static inline void set_bit(int nr, volatile unsigned long * addr) { - __asm__ __volatile__( LOCK_PREFIX + __asm__ __volatile__( LOCK "btsl %1,%0" :"+m" (ADDR) :"Ir" (nr)); @@ -76,7 +71,7 @@ static inline void __set_bit(int nr, vol */ static inline void clear_bit(int nr, volatile unsigned long * addr) { - __asm__ __volatile__( LOCK_PREFIX + __asm__ __volatile__( LOCK "btrl %1,%0" :"+m" (ADDR) :"Ir" (nr)); @@ -121,7 +116,7 @@ static inline void __change_bit(int nr, */ static inline void change_bit(int nr, volatile unsigned long * addr) { - __asm__ __volatile__( LOCK_PREFIX + __asm__ __volatile__( LOCK "btcl %1,%0" :"+m" (ADDR) :"Ir" (nr)); @@ -140,7 +135,7 @@ static inline int test_and_set_bit(int n { int oldbit; - __asm__ __volatile__( LOCK_PREFIX + __asm__ __volatile__( LOCK "btsl %2,%1\n\tsbbl %0,%0" :"=r" (oldbit),"+m" (ADDR) :"Ir" (nr) : "memory"); @@ -180,7 +175,7 @@ static inline int test_and_clear_bit(int { int oldbit; - __asm__ __volatile__( LOCK_PREFIX + __asm__ __volatile__( LOCK "btrl %2,%1\n\tsbbl %0,%0" :"=r" (oldbit),"+m" (ADDR) :"Ir" (nr) : "memory"); @@ -231,7 +226,7 @@ static inline int test_and_change_bit(in { int oldbit; - __asm__ __volatile__( LOCK_PREFIX + __asm__ __volatile__( LOCK "btcl %2,%1\n\tsbbl %0,%0" :"=r" (oldbit),"+m" (ADDR) :"Ir" (nr) : "memory"); diff -pruN ../pristine-linux-2.6.16-rc3/include/asm-i386/futex.h ./include/asm-i386/futex.h --- ../pristine-linux-2.6.16-rc3/include/asm-i386/futex.h 2006-02-15 20:38:57.000000000 +0000 +++ ./include/asm-i386/futex.h 2006-02-15 20:45:57.000000000 +0000 @@ -28,7 +28,7 @@ "1: movl %2, %0\n\ movl %0, %3\n" \ insn "\n" \ -"2: " LOCK_PREFIX "cmpxchgl %3, %2\n\ +"2: " LOCK "cmpxchgl %3, %2\n\ jnz 1b\n\ 3: .section .fixup,\"ax\"\n\ 4: mov %5, %1\n\ @@ -68,7 +68,7 @@ futex_atomic_op_inuser (int encoded_op, #endif switch (op) { case FUTEX_OP_ADD: - __futex_atomic_op1(LOCK_PREFIX "xaddl %0, %2", ret, + __futex_atomic_op1(LOCK "xaddl %0, %2", ret, oldval, uaddr, oparg); break; case FUTEX_OP_OR: diff -pruN ../pristine-linux-2.6.16-rc3/include/asm-i386/rwsem.h ./include/asm-i386/rwsem.h --- ../pristine-linux-2.6.16-rc3/include/asm-i386/rwsem.h 2006-01-03 03:21:10.000000000 +0000 +++ ./include/asm-i386/rwsem.h 2006-02-15 20:45:57.000000000 +0000 @@ -40,6 +40,7 @@ #include #include +#include struct rwsem_waiter; @@ -99,7 +100,7 @@ static inline void __down_read(struct rw { __asm__ __volatile__( "# beginning down_read\n\t" -LOCK_PREFIX " incl (%%eax)\n\t" /* adds 0x00000001, returns the old value */ +LOCK " incl (%%eax)\n\t" /* adds 0x00000001, returns the old value */ " js 2f\n\t" /* jump if we weren't granted the lock */ "1:\n\t" LOCK_SECTION_START("") @@ -130,7 +131,7 @@ static inline int __down_read_trylock(st " movl %1,%2\n\t" " addl %3,%2\n\t" " jle 2f\n\t" -LOCK_PREFIX " cmpxchgl %2,%0\n\t" +LOCK " cmpxchgl %2,%0\n\t" " jnz 1b\n\t" "2:\n\t" "# ending __down_read_trylock\n\t" @@ -150,7 +151,7 @@ static inline void __down_write(struct r tmp = RWSEM_ACTIVE_WRITE_BIAS; __asm__ __volatile__( "# beginning down_write\n\t" -LOCK_PREFIX " xadd %%edx,(%%eax)\n\t" /* subtract 0x0000ffff, returns the old value */ +LOCK " xadd %%edx,(%%eax)\n\t" /* subtract 0x0000ffff, returns the old value */ " testl %%edx,%%edx\n\t" /* was the count 0 before? */ " jnz 2f\n\t" /* jump if we weren't granted the lock */ "1:\n\t" @@ -188,7 +189,7 @@ static inline void __up_read(struct rw_s __s32 tmp = -RWSEM_ACTIVE_READ_BIAS; __asm__ __volatile__( "# beginning __up_read\n\t" -LOCK_PREFIX " xadd %%edx,(%%eax)\n\t" /* subtracts 1, returns the old value */ +LOCK " xadd %%edx,(%%eax)\n\t" /* subtracts 1, returns the old value */ " js 2f\n\t" /* jump if the lock is being waited upon */ "1:\n\t" LOCK_SECTION_START("") @@ -214,7 +215,7 @@ static inline void __up_write(struct rw_ __asm__ __volatile__( "# beginning __up_write\n\t" " movl %2,%%edx\n\t" -LOCK_PREFIX " xaddl %%edx,(%%eax)\n\t" /* tries to transition 0xffff0001 -> 0x00000000 */ +LOCK " xaddl %%edx,(%%eax)\n\t" /* tries to transition 0xffff0001 -> 0x00000000 */ " jnz 2f\n\t" /* jump if the lock is being waited upon */ "1:\n\t" LOCK_SECTION_START("") @@ -239,7 +240,7 @@ static inline void __downgrade_write(str { __asm__ __volatile__( "# beginning __downgrade_write\n\t" -LOCK_PREFIX " addl %2,(%%eax)\n\t" /* transitions 0xZZZZ0001 -> 0xYYYY0001 */ +LOCK " addl %2,(%%eax)\n\t" /* transitions 0xZZZZ0001 -> 0xYYYY0001 */ " js 2f\n\t" /* jump if the lock is being waited upon */ "1:\n\t" LOCK_SECTION_START("") @@ -263,7 +264,7 @@ LOCK_PREFIX " addl %2,(%%eax)\n\t" static inline void rwsem_atomic_add(int delta, struct rw_semaphore *sem) { __asm__ __volatile__( -LOCK_PREFIX "addl %1,%0" +LOCK "addl %1,%0" : "=m"(sem->count) : "ir"(delta), "m"(sem->count)); } @@ -276,7 +277,7 @@ static inline int rwsem_atomic_update(in int tmp = delta; __asm__ __volatile__( -LOCK_PREFIX "xadd %0,(%2)" +LOCK "xadd %0,(%2)" : "+r"(tmp), "=m"(sem->count) : "r"(sem), "m"(sem->count) : "memory"); diff -pruN ../pristine-linux-2.6.16-rc3/include/asm-i386/smp_alt.h ./include/asm-i386/smp_alt.h --- ../pristine-linux-2.6.16-rc3/include/asm-i386/smp_alt.h 1970-01-01 01:00:00.000000000 +0100 +++ ./include/asm-i386/smp_alt.h 2006-02-15 20:45:57.000000000 +0000 @@ -0,0 +1,32 @@ +#ifndef __ASM_SMP_ALT_H__ +#define __ASM_SMP_ALT_H__ + +#include + +#ifdef CONFIG_SMP +#if defined(CONFIG_SMP_ALTERNATIVES) && !defined(MODULE) +#define LOCK \ + "6677: nop\n" \ + ".section __smp_alternatives,\"a\"\n" \ + ".long 6677b\n" \ + ".long 6678f\n" \ + ".previous\n" \ + ".section __smp_replacements,\"a\"\n" \ + "6678: .byte 1\n" \ + ".byte 1\n" \ + ".byte 0\n" \ + ".byte 1\n" \ + ".byte -1\n" \ + "lock\n" \ + "nop\n" \ + ".previous\n" +void prepare_for_smp(void); +void unprepare_for_smp(void); +#else +#define LOCK "lock ; " +#endif +#else +#define LOCK "" +#endif + +#endif /* __ASM_SMP_ALT_H__ */ diff -pruN ../pristine-linux-2.6.16-rc3/include/asm-i386/spinlock.h ./include/asm-i386/spinlock.h --- ../pristine-linux-2.6.16-rc3/include/asm-i386/spinlock.h 2006-01-03 03:21:10.000000000 +0000 +++ ./include/asm-i386/spinlock.h 2006-02-15 20:45:57.000000000 +0000 @@ -6,6 +6,7 @@ #include #include #include +#include /* * Your basic SMP spinlocks, allowing only a single CPU anywhere @@ -23,7 +24,8 @@ #define __raw_spin_lock_string \ "\n1:\t" \ - "lock ; decb %0\n\t" \ + LOCK \ + "decb %0\n\t" \ "jns 3f\n" \ "2:\t" \ "rep;nop\n\t" \ @@ -34,7 +36,8 @@ #define __raw_spin_lock_string_flags \ "\n1:\t" \ - "lock ; decb %0\n\t" \ + LOCK \ + "decb %0\n\t" \ "jns 4f\n\t" \ "2:\t" \ "testl $0x200, %1\n\t" \ @@ -65,10 +68,34 @@ static inline void __raw_spin_lock_flags static inline int __raw_spin_trylock(raw_spinlock_t *lock) { char oldval; +#ifdef CONFIG_SMP_ALTERNATIVES __asm__ __volatile__( - "xchgb %b0,%1" + "1:movb %1,%b0\n" + "movb $0,%1\n" + "2:" + ".section __smp_alternatives,\"a\"\n" + ".long 1b\n" + ".long 3f\n" + ".previous\n" + ".section __smp_replacements,\"a\"\n" + "3: .byte 2b - 1b\n" + ".byte 5f-4f\n" + ".byte 0\n" + ".byte 6f-5f\n" + ".byte -1\n" + "4: xchgb %b0,%1\n" + "5: movb %1,%b0\n" + "movb $0,%1\n" + "6:\n" + ".previous\n" :"=q" (oldval), "=m" (lock->slock) :"0" (0) : "memory"); +#else + __asm__ __volatile__( + "xchgb %b0,%1\n" + :"=q" (oldval), "=m" (lock->slock) + :"0" (0) : "memory"); +#endif return oldval > 0; } @@ -178,12 +205,12 @@ static inline int __raw_write_trylock(ra static inline void __raw_read_unlock(raw_rwlock_t *rw) { - asm volatile("lock ; incl %0" :"=m" (rw->lock) : : "memory"); + asm volatile(LOCK "incl %0" :"=m" (rw->lock) : : "memory"); } static inline void __raw_write_unlock(raw_rwlock_t *rw) { - asm volatile("lock ; addl $" RW_LOCK_BIAS_STR ", %0" + asm volatile(LOCK "addl $" RW_LOCK_BIAS_STR ", %0" : "=m" (rw->lock) : : "memory"); } diff -pruN ../pristine-linux-2.6.16-rc3/include/asm-i386/system.h ./include/asm-i386/system.h --- ../pristine-linux-2.6.16-rc3/include/asm-i386/system.h 2006-02-15 20:38:57.000000000 +0000 +++ ./include/asm-i386/system.h 2006-02-15 20:45:57.000000000 +0000 @@ -5,7 +5,7 @@ #include #include #include -#include /* for LOCK_PREFIX */ +#include #ifdef __KERNEL__ @@ -271,19 +271,19 @@ static inline unsigned long __cmpxchg(vo unsigned long prev; switch (size) { case 1: - __asm__ __volatile__(LOCK_PREFIX "cmpxchgb %b1,%2" + __asm__ __volatile__(LOCK "cmpxchgb %b1,%2" : "=a"(prev) : "q"(new), "m"(*__xg(ptr)), "0"(old) : "memory"); return prev; case 2: - __asm__ __volatile__(LOCK_PREFIX "cmpxchgw %w1,%2" + __asm__ __volatile__(LOCK "cmpxchgw %w1,%2" : "=a"(prev) : "r"(new), "m"(*__xg(ptr)), "0"(old) : "memory"); return prev; case 4: - __asm__ __volatile__(LOCK_PREFIX "cmpxchgl %1,%2" + __asm__ __volatile__(LOCK "cmpxchgl %1,%2" : "=a"(prev) : "r"(new), "m"(*__xg(ptr)), "0"(old) : "memory"); @@ -336,7 +336,7 @@ static inline unsigned long long __cmpxc unsigned long long new) { unsigned long long prev; - __asm__ __volatile__(LOCK_PREFIX "cmpxchg8b %3" + __asm__ __volatile__(LOCK "cmpxchg8b %3" : "=A"(prev) : "b"((unsigned long)new), "c"((unsigned long)(new >> 32)), @@ -503,11 +503,55 @@ struct alt_instr { #endif #ifdef CONFIG_SMP +#if defined(CONFIG_SMP_ALTERNATIVES) && !defined(MODULE) +#define smp_alt_mb(instr) \ +__asm__ __volatile__("6667:\nnop\nnop\nnop\nnop\nnop\nnop\n6668:\n" \ + ".section __smp_alternatives,\"a\"\n" \ + ".long 6667b\n" \ + ".long 6673f\n" \ + ".previous\n" \ + ".section __smp_replacements,\"a\"\n" \ + "6673:.byte 6668b-6667b\n" \ + ".byte 6670f-6669f\n" \ + ".byte 6671f-6670f\n" \ + ".byte 0\n" \ + ".byte %c0\n" \ + "6669:lock;addl $0,0(%%esp)\n" \ + "6670:" instr "\n" \ + "6671:\n" \ + ".previous\n" \ + : \ + : "i" (X86_FEATURE_XMM2) \ + : "memory") +#define smp_rmb() smp_alt_mb("lfence") +#define smp_mb() smp_alt_mb("mfence") +#define set_mb(var, value) do { \ +unsigned long __set_mb_temp; \ +__asm__ __volatile__("6667:movl %1, %0\n6668:\n" \ + ".section __smp_alternatives,\"a\"\n" \ + ".long 6667b\n" \ + ".long 6673f\n" \ + ".previous\n" \ + ".section __smp_replacements,\"a\"\n" \ + "6673: .byte 6668b-6667b\n" \ + ".byte 6670f-6669f\n" \ + ".byte 0\n" \ + ".byte 6671f-6670f\n" \ + ".byte -1\n" \ + "6669: xchg %1, %0\n" \ + "6670:movl %1, %0\n" \ + "6671:\n" \ + ".previous\n" \ + : "=m" (var), "=r" (__set_mb_temp) \ + : "1" (value) \ + : "memory"); } while (0) +#else #define smp_mb() mb() #define smp_rmb() rmb() +#define set_mb(var, value) do { (void) xchg(&var, value); } while (0) +#endif #define smp_wmb() wmb() #define smp_read_barrier_depends() read_barrier_depends() -#define set_mb(var, value) do { (void) xchg(&var, value); } while (0) #else #define smp_mb() barrier() #define smp_rmb() barrier() linux-2.6-xen-vsyscall_base.patch: asm-offsets.c | 1 - 1 files changed, 1 deletion(-) --- NEW FILE linux-2.6-xen-vsyscall_base.patch --- Xen's patches to make the fixmap area movable cause conflicts with non-xen builds, as the FIX_VSYSCALL define is no longer constant so cannot sensibly be handled by asm-offsets.c. But with execshield/vdso, we've got per-process maps to get to this memory, so we don't actually need the fixmap area's base address from assembly any more. Nuke it. --sct --- linux-2.6.15.i586/arch/i386/kernel/asm-offsets.c.vsys 2006-03-02 12:13:23.000000000 -0500 +++ linux-2.6.15.i586/arch/i386/kernel/asm-offsets.c 2006-03-02 12:13:33.000000000 -0500 @@ -71,5 +71,4 @@ #endif DEFINE(PAGE_SIZE_asm, PAGE_SIZE); - DEFINE(VSYSCALL_BASE, __fix_to_virt(FIX_VSYSCALL)); } linux-2.6-xen.patch: arch/i386/Kconfig | 98 arch/i386/Kconfig.cpu | 2 arch/i386/Makefile | 18 arch/i386/boot-xen/Makefile | 21 arch/i386/kernel/Makefile | 33 arch/i386/kernel/acpi/Makefile | 4 arch/i386/kernel/acpi/boot-xen.c | 1161 ++++++++ arch/i386/kernel/apic-xen.c | 140 + arch/i386/kernel/asm-offsets.c | 5 arch/i386/kernel/cpu/Makefile | 5 arch/i386/kernel/cpu/common-xen.c | 719 +++++ arch/i386/kernel/cpu/mtrr/Makefile | 7 arch/i386/kernel/cpu/mtrr/main-xen.c | 187 + arch/i386/kernel/early_printk-xen.c | 2 arch/i386/kernel/entry-xen.S | 857 ++++++ arch/i386/kernel/fixup.c | 95 arch/i386/kernel/head-xen.S | 173 + arch/i386/kernel/init_task-xen.c | 51 arch/i386/kernel/io_apic-xen.c | 2730 ++++++++++++++++++++ arch/i386/kernel/ioport-xen.c | 122 arch/i386/kernel/irq-xen.c | 306 ++ arch/i386/kernel/ldt-xen.c | 269 + arch/i386/kernel/microcode-xen.c | 164 + arch/i386/kernel/mpparse-xen.c | 1188 ++++++++ arch/i386/kernel/pci-dma-xen.c | 344 ++ arch/i386/kernel/process-xen.c | 833 ++++++ arch/i386/kernel/quirks-xen.c | 48 arch/i386/kernel/setup-xen.c | 1888 +++++++++++++ arch/i386/kernel/smp-xen.c | 617 ++++ arch/i386/kernel/swiotlb.c | 674 ++++ arch/i386/kernel/sysenter.c | 90 arch/i386/kernel/time-xen.c | 1067 +++++++ arch/i386/kernel/traps-xen.c | 1094 ++++++++ arch/i386/kernel/vm86.c | 8 arch/i386/kernel/vmlinux.lds.S | 4 arch/i386/kernel/vsyscall-note-xen.S | 32 arch/i386/kernel/vsyscall.S | 2 arch/i386/mach-xen/Makefile | 5 arch/i386/mach-xen/setup.c | 37 arch/i386/mm/Makefile | 8 arch/i386/mm/fault-xen.c | 617 ++++ arch/i386/mm/highmem-xen.c | 123 arch/i386/mm/hypervisor.c | 471 +++ arch/i386/mm/init-xen.c | 846 ++++++ arch/i386/mm/ioremap-xen.c | 462 +++ arch/i386/mm/pgtable-xen.c | 646 ++++ arch/i386/mm/pgtable.c | 63 arch/i386/pci/Makefile | 9 arch/i386/pci/irq-xen.c | 1202 ++++++++ arch/i386/pci/pcifront.c | 55 arch/i386/power/Makefile | 4 arch/ia64/Kconfig | 43 arch/ia64/Makefile | 10 arch/ia64/hp/sim/Makefile | 2 arch/ia64/kernel/entry.S | 32 arch/ia64/kernel/head.S | 4 arch/ia64/kernel/pal.S | 5 arch/ia64/kernel/sal.c | 3 arch/ia64/kernel/setup.c | 4 arch/ia64/xen-mkbuildtree-post | 2 arch/ia64/xen-mkbuildtree-pre | 50 arch/ia64/xen/Makefile | 5 arch/ia64/xen/drivers/Makefile | 20 arch/ia64/xen/drivers/README | 2 arch/ia64/xen/drivers/coreMakefile | 24 arch/ia64/xen/drivers/evtchn_ia64.c | 266 + arch/ia64/xen/drivers/patches/blkback.c.patch | 33 arch/ia64/xen/drivers/patches/console.c.patch | 11 arch/ia64/xen/drivers/patches/devmem.c.patch | 2 arch/ia64/xen/drivers/patches/gnttab.c.patch | 33 arch/ia64/xen/drivers/patches/privcmd.c.patch | 30 arch/ia64/xen/drivers/xenia64_init.c | 55 arch/ia64/xen/hypercall.S | 323 ++ arch/ia64/xen/xen_ksyms.c | 12 arch/ia64/xen/xenconsole.c | 19 arch/ia64/xen/xenentry.S | 850 ++++++ arch/ia64/xen/xenhpski.c | 19 arch/ia64/xen/xenivt.S | 2044 ++++++++++++++ arch/ia64/xen/xenminstate.h | 367 ++ arch/ia64/xen/xenpal.S | 73 arch/ia64/xen/xensetup.S | 33 arch/um/kernel/physmem.c | 4 arch/x86_64/Kconfig | 60 arch/x86_64/Makefile | 16 arch/x86_64/ia32/Makefile | 20 arch/x86_64/ia32/ia32entry-xen.S | 721 +++++ arch/x86_64/ia32/syscall32-xen.c | 128 arch/x86_64/ia32/syscall32_syscall-xen.S | 28 arch/x86_64/ia32/vsyscall-int80.S | 58 arch/x86_64/ia32/vsyscall-sigreturn.S | 2 arch/x86_64/kernel/Makefile | 18 arch/x86_64/kernel/acpi/Makefile | 1 arch/x86_64/kernel/apic-xen.c | 200 + arch/x86_64/kernel/asm-offsets.c | 2 arch/x86_64/kernel/e820-xen.c | 744 +++++ arch/x86_64/kernel/early_printk-xen.c | 306 ++ arch/x86_64/kernel/entry-xen.S | 1140 ++++++++ arch/x86_64/kernel/genapic-xen.c | 144 + arch/x86_64/kernel/genapic_xen.c | 162 + arch/x86_64/kernel/head-xen.S | 156 + arch/x86_64/kernel/head64-xen.c | 140 + arch/x86_64/kernel/init_task.c | 3 arch/x86_64/kernel/io_apic-xen.c | 2231 ++++++++++++++++ arch/x86_64/kernel/ioport-xen.c | 58 arch/x86_64/kernel/irq-xen.c | 168 + arch/x86_64/kernel/ldt-xen.c | 282 ++ arch/x86_64/kernel/mpparse-xen.c | 1005 +++++++ arch/x86_64/kernel/pci-swiotlb-xen.c | 54 arch/x86_64/kernel/process-xen.c | 810 +++++ arch/x86_64/kernel/setup-xen.c | 1635 +++++++++++ arch/x86_64/kernel/setup64-xen.c | 360 ++ arch/x86_64/kernel/smp-xen.c | 596 ++++ arch/x86_64/kernel/traps-xen.c | 1023 +++++++ arch/x86_64/kernel/vsyscall-xen.c | 239 + arch/x86_64/kernel/x8664_ksyms-xen.c | 172 + arch/x86_64/kernel/xen_entry.S | 41 arch/x86_64/mm/Makefile | 10 arch/x86_64/mm/fault-xen.c | 595 ++++ arch/x86_64/mm/init-xen.c | 1107 ++++++++ arch/x86_64/mm/pageattr-xen.c | 392 ++ arch/x86_64/pci/Makefile | 12 drivers/Makefile | 1 drivers/acpi/Kconfig | 3 drivers/acpi/tables.c | 7 drivers/char/mem.c | 6 drivers/char/tpm/Kconfig | 14 drivers/char/tpm/Makefile | 1 drivers/char/tpm/tpm.c | 44 drivers/char/tpm/tpm.h | 7 drivers/char/tpm/tpm_xen.c | 536 +++ drivers/char/tty_io.c | 7 drivers/firmware/Kconfig | 2 drivers/pci/Kconfig | 1 drivers/serial/Kconfig | 1 drivers/video/Kconfig | 2 drivers/xen/Kconfig | 200 + drivers/xen/Makefile | 22 drivers/xen/balloon/Makefile | 2 drivers/xen/balloon/balloon.c | 585 ++++ drivers/xen/blkback/Makefile | 3 drivers/xen/blkback/blkback.c | 596 ++++ drivers/xen/blkback/common.h | 123 drivers/xen/blkback/interface.c | 164 + drivers/xen/blkback/vbd.c | 102 drivers/xen/blkback/xenbus.c | 421 +++ drivers/xen/blkfront/Makefile | 5 drivers/xen/blkfront/blkfront.c | 834 ++++++ drivers/xen/blkfront/block.h | 162 + drivers/xen/blkfront/vbd.c | 323 ++ drivers/xen/blktap/Makefile | 3 drivers/xen/blktap/blktap.c | 910 ++++++ drivers/xen/blktap/common.h | 110 drivers/xen/blktap/interface.c | 146 + drivers/xen/blktap/xenbus.c | 234 + drivers/xen/char/Makefile | 2 drivers/xen/char/mem.c | 156 + drivers/xen/console/Makefile | 2 drivers/xen/console/console.c | 647 ++++ drivers/xen/console/xencons_ring.c | 125 drivers/xen/core/Makefile | 9 drivers/xen/core/evtchn.c | 823 ++++++ drivers/xen/core/features.c | 29 drivers/xen/core/gnttab.c | 429 +++ drivers/xen/core/reboot.c | 442 +++ drivers/xen/core/skbuff.c | 144 + drivers/xen/core/smpboot.c | 464 +++ drivers/xen/core/xen_proc.c | 29 drivers/xen/evtchn/Makefile | 2 drivers/xen/evtchn/evtchn.c | 459 +++ drivers/xen/net_driver_util.c | 68 drivers/xen/netback/Makefile | 5 drivers/xen/netback/common.h | 110 drivers/xen/netback/interface.c | 320 ++ drivers/xen/netback/loopback.c | 231 + drivers/xen/netback/netback.c | 835 ++++++ drivers/xen/netback/xenbus.c | 327 ++ drivers/xen/netfront/Makefile | 4 drivers/xen/netfront/netfront.c | 1504 +++++++++++ drivers/xen/pciback/Makefile | 10 drivers/xen/pciback/conf_space.c | 324 ++ drivers/xen/pciback/conf_space.h | 97 drivers/xen/pciback/conf_space_header.c | 269 + drivers/xen/pciback/passthrough.c | 116 drivers/xen/pciback/pci_stub.c | 377 ++ drivers/xen/pciback/pciback.h | 73 drivers/xen/pciback/pciback_ops.c | 84 drivers/xen/pciback/vpci.c | 163 + drivers/xen/pciback/xenbus.c | 439 +++ drivers/xen/pcifront/Makefile | 7 drivers/xen/pcifront/pci.c | 44 drivers/xen/pcifront/pci_op.c | 245 + drivers/xen/pcifront/pcifront.h | 40 drivers/xen/pcifront/xenbus.c | 295 ++ drivers/xen/privcmd/Makefile | 2 drivers/xen/privcmd/privcmd.c | 302 ++ drivers/xen/tpmback/Makefile | 4 drivers/xen/tpmback/common.h | 91 drivers/xen/tpmback/interface.c | 203 + drivers/xen/tpmback/tpmback.c | 1118 ++++++++ drivers/xen/tpmback/xenbus.c | 333 ++ drivers/xen/tpmfront/Makefile | 2 drivers/xen/tpmfront/tpmfront.c | 729 +++++ drivers/xen/tpmfront/tpmfront.h | 40 drivers/xen/util.c | 80 drivers/xen/xenbus/Makefile | 8 drivers/xen/xenbus/xenbus_client.c | 403 ++ drivers/xen/xenbus/xenbus_comms.c | 203 + drivers/xen/xenbus/xenbus_comms.h | 50 drivers/xen/xenbus/xenbus_dev.c | 238 + drivers/xen/xenbus/xenbus_probe.c | 1015 +++++++ drivers/xen/xenbus/xenbus_xs.c | 821 ++++++ fs/Kconfig | 1 include/asm-i386/a.out.h | 2 include/asm-i386/apic.h | 2 include/asm-i386/elf.h | 7 include/asm-i386/fixmap.h | 13 include/asm-i386/mach-xen/asm/agp.h | 37 include/asm-i386/mach-xen/asm/desc.h | 164 + include/asm-i386/mach-xen/asm/dma-mapping.h | 156 + include/asm-i386/mach-xen/asm/fixmap.h | 158 + include/asm-i386/mach-xen/asm/floppy.h | 147 + include/asm-i386/mach-xen/asm/highmem.h | 81 include/asm-i386/mach-xen/asm/hw_irq.h | 73 include/asm-i386/mach-xen/asm/hypercall.h | 323 ++ include/asm-i386/mach-xen/asm/hypervisor.h | 163 + include/asm-i386/mach-xen/asm/io.h | 401 ++ include/asm-i386/mach-xen/asm/kmap_types.h | 32 include/asm-i386/mach-xen/asm/mmu.h | 21 include/asm-i386/mach-xen/asm/mmu_context.h | 105 include/asm-i386/mach-xen/asm/page.h | 326 ++ include/asm-i386/mach-xen/asm/param.h | 24 include/asm-i386/mach-xen/asm/pci.h | 154 + include/asm-i386/mach-xen/asm/pgalloc.h | 64 include/asm-i386/mach-xen/asm/pgtable-2level-defs.h | 21 include/asm-i386/mach-xen/asm/pgtable-2level.h | 83 include/asm-i386/mach-xen/asm/pgtable-3level-defs.h | 25 include/asm-i386/mach-xen/asm/pgtable-3level.h | 181 + include/asm-i386/mach-xen/asm/pgtable.h | 512 +++ include/asm-i386/mach-xen/asm/processor.h | 762 +++++ include/asm-i386/mach-xen/asm/ptrace.h | 90 include/asm-i386/mach-xen/asm/scatterlist.h | 22 include/asm-i386/mach-xen/asm/segment.h | 117 include/asm-i386/mach-xen/asm/setup.h | 66 include/asm-i386/mach-xen/asm/smp.h | 103 include/asm-i386/mach-xen/asm/spinlock.h | 217 + include/asm-i386/mach-xen/asm/swiotlb.h | 43 include/asm-i386/mach-xen/asm/synch_bitops.h | 141 + include/asm-i386/mach-xen/asm/system.h | 679 ++++ include/asm-i386/mach-xen/asm/tlbflush.h | 102 include/asm-i386/mach-xen/asm/vga.h | 20 include/asm-i386/mach-xen/irq_vectors.h | 125 include/asm-i386/mach-xen/mach_traps.h | 33 include/asm-i386/mach-xen/setup_arch_post.h | 50 include/asm-i386/mach-xen/setup_arch_pre.h | 5 include/asm-i386/page.h | 4 include/asm-i386/spinlock.h | 6 include/asm-i386/system.h | 2 include/asm-ia64/fixmap.h | 2 include/asm-ia64/gcc_intrin.h | 60 include/asm-ia64/hypercall.h | 500 +++ include/asm-ia64/hypervisor.h | 70 include/asm-ia64/intel_intrin.h | 68 include/asm-ia64/pal.h | 1 include/asm-ia64/privop.h | 59 include/asm-ia64/processor.h | 1 include/asm-ia64/synch_bitops.h | 61 include/asm-ia64/system.h | 4 include/asm-ia64/xen/privop.h | 272 + include/asm-um/page.h | 2 include/asm-x86_64/apic.h | 2 include/asm-x86_64/mach-xen/asm/arch_hooks.h | 27 include/asm-x86_64/mach-xen/asm/bootsetup.h | 42 include/asm-x86_64/mach-xen/asm/desc.h | 263 + include/asm-x86_64/mach-xen/asm/dma-mapping.h | 191 + include/asm-x86_64/mach-xen/asm/fixmap.h | 111 include/asm-x86_64/mach-xen/asm/floppy.h | 206 + include/asm-x86_64/mach-xen/asm/hw_irq.h | 141 + include/asm-x86_64/mach-xen/asm/hypercall.h | 323 ++ include/asm-x86_64/mach-xen/asm/hypervisor.h | 2 include/asm-x86_64/mach-xen/asm/io.h | 359 ++ include/asm-x86_64/mach-xen/asm/irq.h | 39 include/asm-x86_64/mach-xen/asm/mmu.h | 33 include/asm-x86_64/mach-xen/asm/mmu_context.h | 134 include/asm-x86_64/mach-xen/asm/nmi.h | 75 include/asm-x86_64/mach-xen/asm/page.h | 317 ++ include/asm-x86_64/mach-xen/asm/pci.h | 174 + include/asm-x86_64/mach-xen/asm/pgalloc.h | 199 + include/asm-x86_64/mach-xen/asm/pgtable.h | 560 ++++ include/asm-x86_64/mach-xen/asm/processor.h | 503 +++ include/asm-x86_64/mach-xen/asm/ptrace.h | 125 include/asm-x86_64/mach-xen/asm/smp.h | 152 + include/asm-x86_64/mach-xen/asm/synch_bitops.h | 2 include/asm-x86_64/mach-xen/asm/system.h | 434 +++ include/asm-x86_64/mach-xen/asm/timer.h | 67 include/asm-x86_64/mach-xen/asm/tlbflush.h | 104 include/asm-x86_64/mach-xen/asm/vga.h | 20 include/asm-x86_64/mach-xen/asm/xor.h | 328 ++ include/asm-x86_64/mach-xen/irq_vectors.h | 123 include/asm-x86_64/mach-xen/mach_time.h | 122 include/asm-x86_64/mach-xen/mach_timer.h | 48 include/asm-x86_64/mach-xen/setup_arch_post.h | 52 include/asm-x86_64/mach-xen/setup_arch_pre.h | 5 include/linux/gfp.h | 6 include/linux/highmem.h | 6 include/linux/irq.h | 3 include/linux/mm.h | 13 include/linux/skbuff.h | 13 include/xen/balloon.h | 70 include/xen/driver_util.h | 26 include/xen/evtchn.h | 123 include/xen/features.h | 20 include/xen/foreign_page.h | 40 include/xen/gnttab.h | 120 include/xen/interface/COPYING | 28 include/xen/interface/acm.h | 181 + include/xen/interface/acm_ops.h | 96 include/xen/interface/arch-ia64.h | 314 ++ include/xen/interface/arch-x86_32.h | 158 + include/xen/interface/arch-x86_64.h | 243 + include/xen/interface/dom0_ops.h | 488 +++ include/xen/interface/event_channel.h | 203 + include/xen/interface/features.h | 53 include/xen/interface/grant_table.h | 306 ++ include/xen/interface/hvm/hvm_info_table.h | 24 include/xen/interface/hvm/ioreq.h | 93 include/xen/interface/hvm/vmx_assist.h | 97 include/xen/interface/io/blkif.h | 85 include/xen/interface/io/console.h | 33 include/xen/interface/io/netif.h | 76 include/xen/interface/io/pciif.h | 55 include/xen/interface/io/ring.h | 270 + include/xen/interface/io/tpmif.h | 56 include/xen/interface/io/xenbus.h | 44 include/xen/interface/io/xs_wire.h | 97 include/xen/interface/memory.h | 153 + include/xen/interface/nmi.h | 54 include/xen/interface/physdev.h | 70 include/xen/interface/sched.h | 60 include/xen/interface/sched_ctl.h | 68 include/xen/interface/trace.h | 90 include/xen/interface/vcpu.h | 119 include/xen/interface/version.h | 64 include/xen/interface/xen.h | 463 +++ include/xen/net_driver_util.h | 56 include/xen/pcifront.h | 39 include/xen/public/evtchn.h | 98 include/xen/public/privcmd.h | 91 include/xen/public/xenstored.h | 89 include/xen/tpmfe.h | 40 include/xen/xen_proc.h | 23 include/xen/xenbus.h | 298 ++ include/xen/xencons.h | 14 kernel/Kconfig.preempt | 1 kernel/irq/manage.c | 84 lib/Kconfig.debug | 2 lib/Makefile | 3 mm/Kconfig | 3 mm/highmem.c | 11 mm/memory.c | 112 mm/mmap.c | 4 mm/page_alloc.c | 6 net/core/dev.c | 50 net/core/skbuff.c | 41 scripts/Makefile.xen | 14 364 files changed, 77454 insertions(+), 245 deletions(-) --- NEW FILE linux-2.6-xen.patch --- diff -Nru -p --exclude='.*' ref-linux-2.6.16-rc5/arch/i386/boot-xen/Makefile linux-2.6.16-rc5-xen0/arch/i386/boot-xen/Makefile --- ref-linux-2.6.16-rc5/arch/i386/boot-xen/Makefile 1969-12-31 19:00:00.000000000 -0500 +++ linux-2.6.16-rc5-xen0/arch/i386/boot-xen/Makefile 2006-03-01 11:09:36.000000000 -0500 @@ -0,0 +1,21 @@ + +OBJCOPYFLAGS := -g --strip-unneeded + +vmlinuz: vmlinux-stripped FORCE + $(call if_changed,gzip) + +vmlinux-stripped: vmlinux FORCE + $(call if_changed,objcopy) + +INSTALL_ROOT := $(patsubst %/boot,%,$(INSTALL_PATH)) + +XINSTALL_NAME ?= $(KERNELRELEASE) +install: + mkdir -p $(INSTALL_ROOT)/boot + ln -f -s vmlinuz-$(XINSTALL_NAME)$(INSTALL_SUFFIX) $(INSTALL_ROOT)/boot/vmlinuz-$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(XENGUEST)$(INSTALL_SUFFIX) + rm -f $(INSTALL_ROOT)/boot/vmlinuz-$(XINSTALL_NAME)$(INSTALL_SUFFIX) + install -m0644 vmlinuz $(INSTALL_ROOT)/boot/vmlinuz-$(XINSTALL_NAME)$(INSTALL_SUFFIX) + install -m0644 vmlinux $(INSTALL_ROOT)/boot/vmlinux-syms-$(XINSTALL_NAME)$(INSTALL_SUFFIX) + install -m0664 .config $(INSTALL_ROOT)/boot/config-$(XINSTALL_NAME)$(INSTALL_SUFFIX) + install -m0664 System.map $(INSTALL_ROOT)/boot/System.map-$(XINSTALL_NAME)$(INSTALL_SUFFIX) + ln -f -s vmlinuz-$(XINSTALL_NAME)$(INSTALL_SUFFIX) $(INSTALL_ROOT)/boot/vmlinuz-$(VERSION).$(PATCHLEVEL)$(XENGUEST)$(INSTALL_SUFFIX) diff -Nru -p --exclude='.*' ref-linux-2.6.16-rc5/arch/i386/Kconfig linux-2.6.16-rc5-xen0/arch/i386/Kconfig --- ref-linux-2.6.16-rc5/arch/i386/Kconfig 2006-03-01 11:12:36.000000000 -0500 +++ linux-2.6.16-rc5-xen0/arch/i386/Kconfig 2006-03-01 11:09:36.000000000 -0500 @@ -58,6 +58,15 @@ config X86_PC help Choose this option if your computer is a standard PC or compatible. +config X86_XEN + bool "Xen-compatible" + select X86_UP_APIC if !SMP && XEN_PRIVILEGED_GUEST + select X86_UP_IOAPIC if !SMP && XEN_PRIVILEGED_GUEST + select SWIOTLB + help + Choose this option if you plan to run this kernel on top of the + Xen Hypervisor. + config X86_ELAN bool "AMD Elan" help @@ -159,6 +168,7 @@ source "arch/i386/Kconfig.cpu" config HPET_TIMER bool "HPET Timer Support" + depends on !X86_XEN help This enables the use of the HPET for the kernel's internal timer. HPET is the next generation timer replacing legacy 8254s. @@ -231,7 +241,7 @@ config NR_CPUS config SCHED_SMT bool "SMT (Hyperthreading) scheduler support" - depends on SMP + depends on SMP && !X86_XEN default off help SMT scheduler support improves the CPU scheduler's decision making @@ -243,7 +253,7 @@ source "kernel/Kconfig.preempt" config X86_UP_APIC bool "Local APIC support on uniprocessors" - depends on !SMP && !(X86_VISWS || X86_VOYAGER) + depends on !SMP && !(X86_VISWS || X86_VOYAGER || XEN_UNPRIVILEGED_GUEST) help A local APIC (Advanced Programmable Interrupt Controller) is an integrated interrupt controller in the CPU. If you have a single-CPU @@ -268,12 +278,12 @@ config X86_UP_IOAPIC config X86_LOCAL_APIC bool - depends on X86_UP_APIC || ((X86_VISWS || SMP) && !X86_VOYAGER) + depends on X86_UP_APIC || ((X86_VISWS || SMP) && !(X86_VOYAGER || XEN_UNPRIVILEGED_GUEST)) default y config X86_IO_APIC bool - depends on X86_UP_IOAPIC || (SMP && !(X86_VISWS || X86_VOYAGER)) + depends on X86_UP_IOAPIC || (SMP && !(X86_VISWS || X86_VOYAGER || XEN_UNPRIVILEGED_GUEST)) default y config X86_VISWS_APIC @@ -281,9 +291,14 @@ config X86_VISWS_APIC depends on X86_VISWS default y +config X86_TSC + bool + depends on (MWINCHIP3D || MWINCHIP2 || MCRUSOE || MEFFICEON || MCYRIXIII || MK7 || MK6 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || M586TSC || MK8 || MVIAC3_2 || MGEODEGX1) && !X86_NUMAQ && !X86_XEN + default y + config X86_MCE bool "Machine Check Exception" - depends on !X86_VOYAGER + depends on !(X86_VOYAGER || X86_XEN) ---help--- Machine Check Exception support allows the processor to notify the kernel if it detects a problem (e.g. overheating, component failure). @@ -373,6 +388,7 @@ config X86_REBOOTFIXUPS config MICROCODE tristate "/dev/cpu/microcode - Intel IA32 CPU microcode support" + depends on !XEN_UNPRIVILEGED_GUEST ---help--- If you say Y here and also to "/dev file system support" in the 'File systems' section, you will be able to update the microcode on @@ -390,6 +406,7 @@ config MICROCODE config X86_MSR tristate "/dev/cpu/*/msr - Model-specific register support" + depends on !X86_XEN help This device gives privileged processes access to the x86 Model-Specific Registers (MSRs). It is a character device with @@ -405,6 +422,10 @@ config X86_CPUID with major 203 and minors 0 to 31 for /dev/cpu/0/cpuid to /dev/cpu/31/cpuid. +config SWIOTLB + bool + default n + source "drivers/firmware/Kconfig" choice @@ -573,7 +594,7 @@ config HAVE_ARCH_EARLY_PFN_TO_NID config HIGHPTE bool "Allocate 3rd-level pagetables from highmem" - depends on HIGHMEM4G || HIGHMEM64G + depends on (HIGHMEM4G || HIGHMEM64G) && !X86_XEN help The VM uses one page table entry for each page of physical memory. For systems with a lot of RAM, this can be wasteful of precious @@ -582,6 +603,7 @@ config HIGHPTE config MATH_EMULATION bool "Math emulation" + depends on !X86_XEN ---help--- Linux can emulate a math coprocessor (used for floating point operations) if you don't have one. 486DX and Pentium processors have @@ -607,6 +629,8 @@ config MATH_EMULATION config MTRR bool "MTRR (Memory Type Range Register) support" + depends on !XEN_UNPRIVILEGED_GUEST + default y if X86_XEN ---help--- On Intel P6 family processors (Pentium Pro, Pentium II and later) the Memory Type Range Registers (MTRRs) may be used to control @@ -641,7 +665,7 @@ config MTRR config EFI bool "Boot from EFI support (EXPERIMENTAL)" - depends on ACPI + depends on ACPI && !X86_XEN default n ---help--- This enables the the kernel to boot on EFI platforms using @@ -659,7 +683,7 @@ config EFI config IRQBALANCE bool "Enable kernel irq balancing" - depends on SMP && X86_IO_APIC + depends on SMP && X86_IO_APIC && !X86_XEN default y help The default yes will allow the kernel to do irq load balancing. @@ -702,7 +726,7 @@ source kernel/Kconfig.hz config KEXEC bool "kexec system call (EXPERIMENTAL)" - depends on EXPERIMENTAL + depends on EXPERIMENTAL && !X86_XEN help kexec is a system call that implements the ability to shutdown your current kernel, and to start another kernel. It is like a reboot @@ -756,6 +780,7 @@ config HOTPLUG_CPU config DOUBLEFAULT default y bool "Enable doublefault exception handler" if EMBEDDED + depends on !X86_NO_TSS help This option allows trapping of rare doublefault exceptions that would otherwise cause a system to silently reboot. Disabling this @@ -766,18 +791,20 @@ endmenu menu "Power management options (ACPI, APM)" - depends on !X86_VOYAGER + depends on !(X86_VOYAGER || XEN_UNPRIVILEGED_GUEST) +if !X86_XEN source kernel/power/Kconfig +endif [...80388 lines suppressed...] @@ -418,7 +418,8 @@ static void __free_pages_ok(struct page int i; int reserved = 0; - arch_free_page(page, order); + if (arch_free_page(page, order)) + return; if (!PageHighMem(page)) mutex_debug_check_no_locks_freed(page_address(page), PAGE_SIZE<mapping = NULL; diff -Nru -p --exclude='.*' ref-linux-2.6.16-rc5/net/core/dev.c linux-2.6.16-rc5-xen0/net/core/dev.c --- ref-linux-2.6.16-rc5/net/core/dev.c 2006-03-01 11:12:32.000000000 -0500 +++ linux-2.6.16-rc5-xen0/net/core/dev.c 2006-03-01 11:09:38.000000000 -0500 @@ -116,6 +116,12 @@ #endif /* CONFIG_NET_RADIO */ #include +#ifdef CONFIG_XEN +#include +#include +#include +#endif + /* * The list of packet types we will receive (as opposed to discard) * and the routines to invoke. @@ -1260,6 +1266,37 @@ int dev_queue_xmit(struct sk_buff *skb) __skb_linearize(skb, GFP_ATOMIC)) goto out_kfree_skb; +#ifdef CONFIG_XEN + /* If a checksum-deferred packet is forwarded to a device that needs a + * checksum, correct the pointers and force checksumming. + */ + if (skb->proto_csum_blank) { + if (skb->protocol != htons(ETH_P_IP)) + goto out_kfree_skb; + skb->h.raw = (unsigned char *)skb->nh.iph + 4*skb->nh.iph->ihl; + if (skb->h.raw >= skb->tail) + goto out_kfree_skb; + switch (skb->nh.iph->protocol) { + case IPPROTO_TCP: + skb->csum = offsetof(struct tcphdr, check); + break; + case IPPROTO_UDP: + skb->csum = offsetof(struct udphdr, check); + break; + default: + if (net_ratelimit()) + printk(KERN_ERR "Attempting to checksum a non-" + "TCP/UDP packet, dropping a protocol" + " %d packet", skb->nh.iph->protocol); + rc = -EPROTO; + goto out_kfree_skb; + } + if ((skb->h.raw + skb->csum + 2) > skb->tail) + goto out_kfree_skb; + skb->ip_summed = CHECKSUM_HW; + } +#endif + /* If packet is not checksummed and device does not support * checksumming for this protocol, complete checksumming here. */ @@ -1609,6 +1646,19 @@ int netif_receive_skb(struct sk_buff *sk } #endif +#ifdef CONFIG_XEN + switch (skb->ip_summed) { + case CHECKSUM_UNNECESSARY: + skb->proto_csum_valid = 1; + break; + case CHECKSUM_HW: + /* XXX Implement me. */ + default: + skb->proto_csum_valid = 0; + break; + } +#endif + list_for_each_entry_rcu(ptype, &ptype_all, list) { if (!ptype->dev || ptype->dev == skb->dev) { if (pt_prev) diff -Nru -p --exclude='.*' ref-linux-2.6.16-rc5/net/core/skbuff.c linux-2.6.16-rc5-xen0/net/core/skbuff.c --- ref-linux-2.6.16-rc5/net/core/skbuff.c 2006-03-01 11:12:32.000000000 -0500 +++ linux-2.6.16-rc5-xen0/net/core/skbuff.c 2006-03-01 11:09:39.000000000 -0500 @@ -132,6 +132,7 @@ void skb_under_panic(struct sk_buff *skb * Buffers may only be allocated from interrupts using a @gfp_mask of * %GFP_ATOMIC. */ +#ifndef CONFIG_HAVE_ARCH_ALLOC_SKB struct sk_buff *__alloc_skb(unsigned int size, gfp_t gfp_mask, int fclone) { @@ -186,6 +187,7 @@ nodata: skb = NULL; goto out; } +#endif /* !CONFIG_HAVE_ARCH_ALLOC_SKB */ /** * alloc_skb_from_cache - allocate a network buffer @@ -203,14 +205,18 @@ nodata: */ struct sk_buff *alloc_skb_from_cache(kmem_cache_t *cp, unsigned int size, - gfp_t gfp_mask) + gfp_t gfp_mask, + int fclone) { + kmem_cache_t *cache; + struct skb_shared_info *shinfo; struct sk_buff *skb; u8 *data; + cache = fclone ? skbuff_fclone_cache : skbuff_head_cache; + /* Get the HEAD */ - skb = kmem_cache_alloc(skbuff_head_cache, - gfp_mask & ~__GFP_DMA); + skb = kmem_cache_alloc(cache, gfp_mask & ~__GFP_DMA); if (!skb) goto out; @@ -227,16 +233,29 @@ struct sk_buff *alloc_skb_from_cache(kme skb->data = data; skb->tail = data; skb->end = data + size; + /* make sure we initialize shinfo sequentially */ + shinfo = skb_shinfo(skb); + atomic_set(&shinfo->dataref, 1); + shinfo->nr_frags = 0; + shinfo->tso_size = 0; + shinfo->tso_segs = 0; + shinfo->ufo_size = 0; + shinfo->ip6_frag_id = 0; + shinfo->frag_list = NULL; - atomic_set(&(skb_shinfo(skb)->dataref), 1); - skb_shinfo(skb)->nr_frags = 0; - skb_shinfo(skb)->tso_size = 0; - skb_shinfo(skb)->tso_segs = 0; - skb_shinfo(skb)->frag_list = NULL; + if (fclone) { + struct sk_buff *child = skb + 1; + atomic_t *fclone_ref = (atomic_t *) (child + 1); + + skb->fclone = SKB_FCLONE_ORIG; + atomic_set(fclone_ref, 1); + + child->fclone = SKB_FCLONE_UNAVAILABLE; + } out: return skb; nodata: - kmem_cache_free(skbuff_head_cache, skb); + kmem_cache_free(cache, skb); skb = NULL; goto out; } @@ -408,6 +427,10 @@ struct sk_buff *skb_clone(struct sk_buff C(local_df); n->cloned = 1; n->nohdr = 0; +#ifdef CONFIG_XEN + C(proto_csum_valid); + C(proto_csum_blank); +#endif C(pkt_type); C(ip_summed); C(priority); diff -Nru -p --exclude='.*' ref-linux-2.6.16-rc5/scripts/Makefile.xen linux-2.6.16-rc5-xen0/scripts/Makefile.xen --- ref-linux-2.6.16-rc5/scripts/Makefile.xen 1969-12-31 19:00:00.000000000 -0500 +++ linux-2.6.16-rc5-xen0/scripts/Makefile.xen 2006-03-01 11:09:39.000000000 -0500 @@ -0,0 +1,14 @@ + +# cherrypickxen($1 = allobj) +cherrypickxen = $(foreach var, $(1), \ + $(shell o=$(var); \ + c=$${o/%.o/-xen.c}; \ + s=$${o/%.o/-xen.S}; \ + oxen=$${o/%.o/-xen.o}; \ + [ -f $(srctree)/$(src)/$${c} ] || \ + [ -f $(srctree)/$(src)/$${s} ] \ + && echo $$oxen \ + || echo $(var) ) \ + ) +# filterxen($1 = allobj, $2 = noobjs) +filterxen = $(filter-out $(2), $(1)) Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v retrieving revision 1.369 retrieving revision 1.369.4.1 diff -u -r1.369 -r1.369.4.1 --- .cvsignore 2 Mar 2006 19:26:10 -0000 1.369 +++ .cvsignore 2 Mar 2006 22:45:15 -0000 1.369.4.1 @@ -2,6 +2,6 @@ temp-* kernel-2.6.15 linux-2.6.15.tar.bz2 -xen-20060208.tar.bz2 patch-2.6.16-rc5.bz2 +xen-20060301.tar.bz2 patch-2.6.16-rc5-git6.bz2 Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.2009 retrieving revision 1.2009.4.1 diff -u -r1.2009 -r1.2009.4.1 --- kernel-2.6.spec 2 Mar 2006 19:26:10 -0000 1.2009 +++ kernel-2.6.spec 2 Mar 2006 22:45:15 -0000 1.2009.4.1 @@ -8,8 +8,8 @@ # Whether to apply the Xen patches, leave this enabled. %define includexen 1 # Whether to build the Xen kernels, disable if you want. -%define buildxen 0 -%define buildxenPAE 0 +%define buildxen 1 +%define buildxenPAE 1 %define builddoc 0 %define buildkdump 1 @@ -162,7 +162,8 @@ License: GPLv2 Version: %{rpmversion} Release: %{release} -ExclusiveArch: noarch %{all_x86} x86_64 ppc ppc64 ia64 sparc sparc64 ppc64iseries s390 s390x +#ExclusiveArch: noarch %{all_x86} x86_64 ppc ppc64 ia64 sparc sparc64 ppc64iseries s390 s390x +ExclusiveArch: noarch %{all_x86} x86_64 ppc ppc64 sparc sparc64 ppc64iseries s390 s390x ExclusiveOS: Linux Provides: kernel = %{version} Provides: kernel-drm = 4.3.0 @@ -185,7 +186,7 @@ Source0: ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-%{kversion}.tar.bz2 -Source1: xen-20060208.tar.bz2 +Source1: xen-20060301.tar.bz2 Source2: Config.mk Source10: COPYING.modules @@ -248,18 +249,20 @@ # 500 - 599 s390(x) # 600 - 699 sparc(64) +# 690 - 699 xen patches already split in their system +Patch690: linux-2.6-xen-i386-mach-io-check-nmi.patch +Patch691: linux-2.6-xen-net-csum.patch +Patch692: linux-2.6-xen-pmd-shared.patch +Patch693: linux-2.6-xen-smp-alts.patch # 700 - 799 Xen -Patch700: linux-2.6-xen-merge.patch +Patch700: linux-2.6-xen.patch Patch701: linux-2.6-xen-compile-fixes.patch Patch702: linux-2.6-xen-no-tls-warn.patch -Patch704: linux-2.6-xen-guest-enable-char-devices.patch -Patch705: linux-2.6-xen_net_read_mac_export.patch +Patch703: linux-2.6-xen-move-vdso-fixmap.patch +Patch704: linux-2.6-xen-vsyscall_base.patch Patch706: linux-2.6-xen_remap_vma_flags.patch -Patch707: linux-2.6-xen-acpi.patch -Patch708: linux-2.6-xen-x86_64-fixes.patch Patch709: linux-2.6-percpu-NR_CPUS-hotplug-fix.patch Patch710: linux-2.6-xen-module-fault.patch -Patch711: linux-2.6-xen-cpusteal-kernel.patch # # Patches 800 through 899 are reserved for bugfixes to the core system @@ -415,9 +418,6 @@ # Do not add anything non-trivial here. Patch10001: linux-2.6-random-patches.patch -Patch20000: linux-2.6-xen-gcc-4.1-compile-fix.patch -Patch20010: linux-2.6-xen-cpusteal-hv.patch - # END OF PATCH DEFINITIONS BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root @@ -679,10 +679,12 @@ %prep if [ ! -d kernel-%{kversion}/vanilla ]; then # Ok, first time we do a make prep. -%setup -q -n %{name}-%{version} -c -a1 rm -f pax_global_header +%setup -q -n %{name}-%{version} -c -a1 cp %{SOURCE2} . mv linux-%{kversion} vanilla + mv xen xen-vanilla + cp %{SOURCE2} . else # We already have a vanilla dir. cd kernel-%{kversion} @@ -690,13 +692,17 @@ mv linux-%{kversion}.%{_target_cpu} deleteme rm -rf deleteme & fi + if [ -d xen ]; then + mv xen deleteme2 + rm -rf deleteme2 & + fi fi cp -rl vanilla linux-%{kversion}.%{_target_cpu} +cp -rl xen-vanilla xen %if %{buildxen} cd xen -%patch20000 -p1 -%patch20010 -p2 +# Any necessary hypervisor patches go here cd .. %endif cd linux-%{kversion}.%{_target_cpu} @@ -767,17 +773,31 @@ # %if %{includexen} # Base Xen patch from linux-2.6-merge.hg +%patch690 -p1 +# Conflict with non-xen kernels +#%patch691 -p1 +%patch692 -p1 +%patch693 -p1 %patch700 -p1 + +# +# Xen includes a patch which moves the vsyscall fixmap into a user-space VA, +# freeing user-space from reliance on an absolute fixmap area and so allowing +# the fixmap area to become dynamic. +# +# Execshield already does this, making the fixmap area invisible to the user +# and adding a new randomised vdso for it in user VA, so there's no point in +# having both: revert the Xen changeset so that execsheild applies cleanly. +# +%patch703 -p2 -R + %patch701 -p1 %patch702 -p1 %patch704 -p1 -%patch705 -p1 %patch706 -p1 -%patch707 -p1 -%patch708 -p2 %patch709 -p1 -%patch710 -p1 -%patch711 -p2 +#%patch710 -p1 + %endif # @@ -1608,6 +1628,33 @@ - Fix acpi_os_acquire_object() with IRQs disabled debug msgs. - Mark unwind info for signal trampolines in vDSOs +* Thu Mar 2 2006 Juan Quintela +- rebase with rawhide 2008. + +* Thu Mar 2 2006 Stephen Tweedie +- Fix xen/execshield VSYSCALL_BASE conflict + +* Thu Mar 2 2006 Dave Jones +- Fix acpi_os_acquire_object() with IRQs disabled debug msgs. +- Mark unwind info for signal trampolines in vDSOs + +* Wed Mar 1 2006 Juan Quintela +- disable ia64 build again. + +* Wed Mar 1 2006 Stephen Tweedie +- Rebase to xen kernel patches and HV from xen-unstable cset 9022 +- Delete xen cpu steal patches (now upstream) +- Delete xen_net_read_mac export patch (now upstream) +- Revert xen cset 8948 (vdso updates which execshield already performs) +- Delete unneeded linux-2.6-xen-gcc-4.1-compile-fix.patch + +* Wed Mar 1 2006 Juan Quintela +- remove xen ia64 bits, they break ia64 build. +- riel cpusteal hv fix. + +* Wed Mar 1 2006 Juan Quintela +- enable ia64 again + * Wed Mar 1 2006 Dave Jones - 2.6.16rc5-git4 - Fix leak in RAID1 @@ -1615,6 +1662,14 @@ - Enable PATA ports on Promise SATA. (#179369) - NFS: writes should not clobber utimes() calls. (#183208) +* Tue Feb 28 2006 Juan Quintela +- fix x86_64 xen build. + +* Tue Feb 28 2006 Juan Quintela +- rebase with rawhide 1.1993. +- enable ia64 again. +- rebase with rawhide 1.1991. + * Tue Feb 28 2006 Dave Jones - 2.6.16rc5-git3 @@ -1631,6 +1686,11 @@ * Sat Feb 25 2006 Dave Jones - 2.6.16rc4-git8 +* Fri Feb 24 2006 Stephen Tweedie +- Disable ia64 until we work out the Xen interactions +- Fix config confusion on ia64 +- Execshield/vdso fixes (quintela at redhat.com) + * Fri Feb 24 2006 Dave Jones - 2.6.16rc4-git7 @@ -1653,6 +1713,9 @@ - Make it possible to disable xen and kdump builds. - Add Xen cpu steal accounting code. +* Mon Feb 20 2006 Stephen Tweedie +- Rebase kernel xen patches to xen-unstable cset 8907 + * Sun Feb 20 2006 Dave Jones - Fix incorrect hardlink count in selinuxfs (#182001) linux-2.6-crashdump-common.patch: linux-2.6.12/Documentation/sysrq.txt | 8 linux-2.6.12/arch/i386/kernel/nmi.c | 1 linux-2.6.12/arch/i386/kernel/traps.c | 3 linux-2.6.12/arch/i386/mm/init.c | 47 +++++ linux-2.6.12/arch/i386/mm/pgtable.c | 2 linux-2.6.12/arch/ia64/kernel/process.c | 30 ++- linux-2.6.12/arch/ia64/kernel/traps.c | 6 linux-2.6.12/arch/ia64/mm/contig.c | 3 linux-2.6.12/arch/ia64/mm/discontig.c | 3 linux-2.6.12/arch/ia64/mm/init.c | 90 +++++++++ linux-2.6.12/arch/powerpc/kernel/process.c | 1 linux-2.6.12/arch/powerpc/kernel/traps.c | 3 linux-2.6.12/arch/powerpc/mm/mem.c | 29 +++ linux-2.6.12/arch/s390/kernel/traps.c | 6 linux-2.6.12/arch/x86_64/kernel/process.c | 2 linux-2.6.12/arch/x86_64/kernel/traps.c | 6 linux-2.6.12/arch/x86_64/mm/init.c | 32 +++ linux-2.6.12/drivers/char/sysrq.c | 2 linux-2.6.12/include/asm-generic/crashdump.h | 47 +++++ linux-2.6.12/include/asm-i386/crashdump.h | 123 +++++++++++++ linux-2.6.12/include/asm-i386/kmap_types.h | 4 linux-2.6.12/include/asm-ia64/crashdump.h | 72 +++++++ linux-2.6.12/include/asm-powerpc/crashdump.h | 61 ++++++ linux-2.6.12/include/asm-x86_64/crashdump.h | 86 +++++++++ linux-2.6.12/include/linux/kernel.h | 18 + linux-2.6.12/kernel/Makefile | 2 linux-2.6.12/kernel/dump.c | 246 +++++++++++++++++++++++++++ linux-2.6.12/kernel/panic.c | 4 linux-2.6.12/kernel/printk.c | 20 ++ linux-2.6.12/kernel/sched.c | 2 linux-2.6.13/arch/x86_64/mm/fault.c | 1 linux-2.6.13/drivers/char/sysrq.c | 5 32 files changed, 951 insertions(+), 14 deletions(-) Index: linux-2.6-crashdump-common.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-crashdump-common.patch,v retrieving revision 1.9 retrieving revision 1.9.18.1 diff -u -r1.9 -r1.9.18.1 --- linux-2.6-crashdump-common.patch 13 Feb 2006 21:17:47 -0000 1.9 +++ linux-2.6-crashdump-common.patch 2 Mar 2006 22:45:15 -0000 1.9.18.1 @@ -239,15 +239,14 @@ +#endif /* _ASM_X86_64_CRASHDUMP_H */ --- linux-2.6.12/include/asm-i386/kmap_types.h.orig 2005-06-17 15:48:29.000000000 -0400 +++ linux-2.6.12/include/asm-i386/kmap_types.h 2005-08-18 14:23:59.000000000 -0400 -@@ -23,8 +23,10 @@ +@@ -23,7 +23,9 @@ D(10) KM_IRQ1, D(11) KM_SOFTIRQ0, D(12) KM_SOFTIRQ1, - D(13) KM_SWIOTLB, --D(14) KM_TYPE_NR -+D(14) KM_CRASHDUMP, -+D(15) KM_UNUSED, -+D(16) KM_TYPE_NR +-D(13) KM_TYPE_NR ++D(13) KM_CRASHDUMP, ++D(14) KM_UNUSED, ++D(15) KM_TYPE_NR }; #undef D @@ -890,14 +889,6 @@ * valid. The argument is a physical page number. --- linux-2.6.12/arch/i386/mm/pgtable.c.orig 2005-08-18 12:39:56.000000000 -0400 +++ linux-2.6.12/arch/i386/mm/pgtable.c 2005-08-18 14:23:58.000000000 -0400 -@@ -13,6 +13,7 @@ - #include - #include - #include -+#include - - #include - #include @@ -63,6 +64,8 @@ printk(KERN_INFO "%lu pages pagetables\n", ps.nr_page_table_pages); } linux-2.6-execshield-fixes.patch: linux-2.6.15.noarch/include/asm-i386/desc.h | 2 +- linux-exec-shield-curr.q/arch/i386/kernel/traps.c | 2 +- linux-exec-shield-curr.q/fs/proc/base.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) Index: linux-2.6-execshield-fixes.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-execshield-fixes.patch,v retrieving revision 1.5 retrieving revision 1.5.14.1 diff -u -r1.5 -r1.5.14.1 --- linux-2.6-execshield-fixes.patch 15 Feb 2006 17:44:53 -0000 1.5 +++ linux-2.6-execshield-fixes.patch 2 Mar 2006 22:45:15 -0000 1.5.14.1 @@ -30,15 +30,15 @@ #endif #ifdef CONFIG_SECURITY E(PROC_TGID_ATTR, "attr", S_IFDIR|S_IRUGO|S_IXUGO), -diff -uNp linux-2.6.15.i686/include/asm-i386/desc.h.orig linux-2.6.15.i686/include/asm-i386/desc.h ---- linux-2.6.15.i686/include/asm-i386/desc.h.orig 2006-01-25 17:57:49.000000000 -0500 -+++ linux-2.6.15.i686/include/asm-i386/desc.h 2006-01-25 18:00:02.000000000 -0500 -@@ -208,7 +208,7 @@ static inline void set_user_cs(struct de +diff -uNp linux-2.6.15.noarch/include/asm-i386/desc.h.orig linux-2.6.15.noarch/include/asm-i386/desc.h +--- linux-2.6.15.noarch/include/asm-i386/desc.h.orig 2006-02-22 21:05:44.000000000 +0100 ++++ linux-2.6.15.noarch/include/asm-i386/desc.h 2006-02-22 21:09:15.000000000 +0100 +@@ -168,7 +168,7 @@ static inline void set_user_cs(struct de + } - #ifndef CONFIG_X86_XEN #define load_user_cs_desc(cpu, mm) \ - per_cpu(cpu_gdt_table, (cpu))[GDT_ENTRY_DEFAULT_USER_CS] = (mm)->context.user_cs -+ get_cpu_gdt_table(cpu)[GDT_ENTRY_DEFAULT_USER_CS] = (mm)->context.user_cs - #else - #define load_user_cs_desc(cpu, mm) \ - HYPERVISOR_update_descriptor(virt_to_machine(&get_cpu_gdt_table(cpu)[GDT_ENTRY_DEFAULT_USER_CS]), (u64)(mm)->context.user_cs.a | ((u64)(mm)->context.user_cs.b) << 32); ++ get_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); linux-2.6-execshield-vdso.patch: linux-2.6.15.noarch/arch/i386/kernel/sysenter.c | 71 +++++++++++-------- linux-2.6.15.xen/arch/i386/kernel/cpu/common-xen.c | 6 + linux/fs/binfmt_elf.c | 15 +--- linux/fs/proc/task_mmu.c | 9 +- linux/include/asm-i386/elf.h | 7 + linux/include/asm-i386/page.h | 5 + linux/include/linux/mm.h | 5 + linux/kernel/sysctl.c | 10 ++ linux/mm/mmap.c | 78 +++++++++++++++++++++ 9 files changed, 163 insertions(+), 43 deletions(-) Index: linux-2.6-execshield-vdso.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-execshield-vdso.patch,v retrieving revision 1.2 retrieving revision 1.2.26.1 diff -u -r1.2 -r1.2.26.1 --- linux-2.6-execshield-vdso.patch 9 Jan 2006 19:24:08 -0000 1.2 +++ linux-2.6-execshield-vdso.patch 2 Mar 2006 22:45:15 -0000 1.2.26.1 @@ -8,11 +8,10 @@ mm/mmap.c | 78 ++++++++++++++++++++++++++++++++++++++++++++ 8 files changed, 155 insertions(+), 43 deletions(-) -Index: linux/arch/i386/kernel/sysenter.c -=================================================================== ---- linux.orig/arch/i386/kernel/sysenter.c -+++ linux/arch/i386/kernel/sysenter.c -@@ -47,20 +47,13 @@ void enable_sep_cpu(void) +diff -uNp linux-2.6.15.noarch/arch/i386/kernel/sysenter.c.orig linux-2.6.15.noarch/arch/i386/kernel/sysenter.c +--- linux-2.6.15.noarch/arch/i386/kernel/sysenter.c.orig 2006-02-22 20:56:56.000000000 +0100 ++++ linux-2.6.15.noarch/arch/i386/kernel/sysenter.c 2006-02-22 21:04:49.000000000 +0100 +@@ -49,20 +49,13 @@ void enable_sep_cpu(void) extern const char vsyscall_int80_start, vsyscall_int80_end; extern const char vsyscall_sysenter_start, vsyscall_sysenter_end; @@ -33,9 +32,9 @@ - sysenter_page = virt_to_page(page); + sysenter_pages[0] = virt_to_page(page); - if (!boot_cpu_has(X86_FEATURE_SEP)) { - memcpy(page, -@@ -78,42 +71,58 @@ int __init sysenter_setup(void) + #ifdef CONFIG_X86_SYSENTER + if (boot_cpu_has(X86_FEATURE_SEP)) { +@@ -78,42 +71,60 @@ int __init sysenter_setup(void) extern void SYSENTER_RETURN_OFFSET; @@ -98,6 +97,7 @@ } -static int __init vdso_setup(char *str) ++#ifndef CONFIG_XEN +int in_gate_area_no_task(unsigned long addr) { - vdso_enabled = simple_strtoul(str, NULL, 0); @@ -115,6 +115,23 @@ +{ + return NULL; +} ++#endif +diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff linux-2.6.15.orig/arch/i386/kernel/cpu/common-xen.c linux-2.6.15.xen/arch/i386/kernel/cpu/common-xen.c +--- linux-2.6.15.orig/arch/i386/kernel/cpu/common-xen.c 2006-02-22 15:56:20.000000000 +0100 ++++ linux-2.6.15.xen/arch/i386/kernel/cpu/common-xen.c 2006-02-22 18:26:45.000000000 +0100 +@@ -409,6 +409,12 @@ void __devinit identify_cpu(struct cpuin + if (disable_pse) + clear_bit(X86_FEATURE_PSE, c->x86_capability); + ++ if (exec_shield != 0) { ++#ifdef CONFIG_HIGHMEM64G /* NX implies PAE */ ++ if (!test_bit(X86_FEATURE_NX, c->x86_capability)) ++#endif ++ clear_bit(X86_FEATURE_SEP, c->x86_capability); ++ } + /* If the model name is still unset, do table lookup. */ + if ( !c->x86_model_id[0] ) { + char *p; Index: linux/fs/binfmt_elf.c =================================================================== --- linux.orig/fs/binfmt_elf.c linux-2.6-execshield-xen.patch: arch/i386/kernel/entry-xen.S | 8 - arch/i386/kernel/process-xen.c | 58 +++++++ arch/i386/kernel/smp-xen.c | 2 arch/i386/kernel/traps-xen.c | 92 +++++++++++- arch/i386/mm/init-xen.c | 11 + linux-2.6.15.i686/include/asm-x86_64/mach-xen/asm/pgtable.h | 2 linux-2.6.15.noarch/arch/x86_64/kernel/setup64-xen.c | 23 --- 7 files changed, 166 insertions(+), 30 deletions(-) Index: linux-2.6-execshield-xen.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-execshield-xen.patch,v retrieving revision 1.2 retrieving revision 1.2.18.1 diff -u -r1.2 -r1.2.18.1 --- linux-2.6-execshield-xen.patch 13 Feb 2006 21:17:47 -0000 1.2 +++ linux-2.6-execshield-xen.patch 2 Mar 2006 22:45:15 -0000 1.2.18.1 @@ -120,10 +120,10 @@ index 0f7199b..878c084 100644 --- a/arch/i386/kernel/traps-xen.c +++ b/arch/i386/kernel/traps-xen.c -@@ -459,11 +459,89 @@ DO_ERROR_INFO(17, SIGBUS, "alignment che - #ifdef CONFIG_X86_MCE - DO_ERROR(18, SIGBUS, "machine check", machine_check) - #endif +@@ -459,13 +459,99 @@ DO_ERROR_INFO(17, SIGBUS, "alignment che + DO_ERROR(11, SIGBUS, "segment not present", segment_not_present) + DO_ERROR(12, SIGBUS, "stack segment", stack_segment) + DO_ERROR_INFO(17, SIGBUS, "alignment check", alignment_check, BUS_ADRALN, 0) -DO_ERROR_INFO(32, SIGSEGV, "iret exception", iret_error, ILL_BADSTK, 0) + + @@ -205,24 +205,11 @@ fastcall void __kprobes do_general_protection(struct pt_regs * regs, long error_code) { +- current->thread.error_code = error_code; +- current->thread.trap_no = 13; + int cpu = get_cpu(); + int ok; + - /* - * If we trapped on an LDT access then ensure that the default_ldt is - * loaded, if nothing else. We load default_ldt lazily because LDT -@@ -473,13 +551,22 @@ fastcall void __kprobes do_general_prote - unsigned long ldt; - __asm__ __volatile__ ("sldt %0" : "=r" (ldt)); - if (ldt == 0) { -+ put_cpu(); - xen_set_ldt((unsigned long)&default_ldt[0], 5); - return; - } - } - -- current->thread.error_code = error_code; -- current->thread.trap_no = 13; + ok = check_lazy_exec_limit(cpu, regs, error_code); + put_cpu(); + @@ -280,22 +267,6 @@ pagetable_init(); ---- linux-2.6.14/include/asm-i386/desc.h~ 2006-01-06 17:09:44.000000000 -0500 -+++ linux-2.6.14/include/asm-i386/desc.h 2006-01-06 17:22:41.000000000 -0500 -@@ -210,8 +210,13 @@ - desc->b = (limit & 0xf0000) | 0x00c0fb00; - } - -+#ifndef CONFIG_X86_XEN - #define load_user_cs_desc(cpu, mm) \ - per_cpu(cpu_gdt_table, (cpu))[GDT_ENTRY_DEFAULT_USER_CS] = (mm)->context.user_cs -+#else -+#define load_user_cs_desc(cpu, mm) \ -+ HYPERVISOR_update_descriptor(virt_to_machine(&get_cpu_gdt_table(cpu)[GDT_ENTRY_DEFAULT_USER_CS]), (u64)(mm)->context.user_cs.a | ((u64)(mm)->context.user_cs.b) << 32); -+#endif - - 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); diff -urNp --exclude-from=/home/mitica/quintela/config/misc/dontdiff linux-2.6.15.orig/arch/x86_64/kernel/setup64-xen.c linux-2.6.15.noarch/arch/x86_64/kernel/setup64-xen.c --- linux-2.6.15.orig/arch/x86_64/kernel/setup64-xen.c 2006-02-10 20:25:28.000000000 +0100 +++ linux-2.6.15.noarch/arch/x86_64/kernel/setup64-xen.c 2006-02-10 21:27:22.000000000 +0100 @@ -337,3 +308,15 @@ /* * Great future plan: +diff -uNp linux-2.6.15.i686/include/asm-x86_64/mach-xen/asm/pgtable.h.orig linux-2.6.15.i686/include/asm-x86_64/mach-xen/asm/pgtable.h +--- linux-2.6.15.i686/include/asm-x86_64/mach-xen/asm/pgtable.h.orig 2006-02-23 16:50:14.000000000 +0100 ++++ linux-2.6.15.i686/include/asm-x86_64/mach-xen/asm/pgtable.h 2006-02-23 16:59:04.000000000 +0100 +@@ -44,7 +44,7 @@ extern unsigned long __supported_pte_mas + + #define swapper_pg_dir init_level4_pgt + +-extern void nonx_setup(char *str); ++extern void nonx_setup(const char *str); + extern void paging_init(void); + extern void clear_kernel_mapping(unsigned long addr, unsigned long size); + linux-2.6-execshield.patch: arch/i386/kernel/asm-offsets.c | 1 arch/i386/kernel/cpu/common.c | 7 + 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 | 56 ++++++++++++++- arch/i386/kernel/traps.c | 93 ++++++++++++++++++++++++- 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 | 4 - arch/x86_64/kernel/process.c | 6 - arch/x86_64/kernel/setup64.c | 23 ------ arch/x86_64/mm/fault.c | 2 drivers/char/random.c | 7 + fs/binfmt_elf.c | 130 ++++++++++++++++++++++++++++------- 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 | 7 + include/asm-i386/thread_info.h | 1 include/asm-ia64/pgalloc.h | 4 + include/asm-powerpc/pgalloc.h | 5 + include/asm-ppc/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/pgtable.h | 2 include/asm-x86_64/processor.h | 2 include/linux/mm.h | 11 ++ 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 | 16 ++-- mm/mmap.c | 105 ++++++++++++++++++++++++++-- mm/mprotect.c | 5 + mm/mremap.c | 4 - 47 files changed, 684 insertions(+), 123 deletions(-) Index: linux-2.6-execshield.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-execshield.patch,v retrieving revision 1.10 retrieving revision 1.10.26.1 diff -u -r1.10 -r1.10.26.1 --- linux-2.6-execshield.patch 18 Jan 2006 06:03:01 -0000 1.10 +++ linux-2.6-execshield.patch 2 Mar 2006 22:45:15 -0000 1.10.26.1 @@ -227,12 +227,13 @@ #include #include -@@ -36,7 +37,7 @@ void enable_sep_cpu(void) +@@ -36,8 +37,8 @@ void enable_sep_cpu(void) wrmsr(MSR_IA32_SYSENTER_CS, __KERNEL_CS, 0); wrmsr(MSR_IA32_SYSENTER_ESP, tss->esp1, 0); wrmsr(MSR_IA32_SYSENTER_EIP, (unsigned long) sysenter_entry, 0); - put_cpu(); + put_cpu(); + #endif } /* linux-2.6-xen-compile-fixes.patch: arch/i386/kernel/acpi/boot-xen.c | 3 +- linux-2.6.15.ia64/fs/Kconfig | 1 linux-2.6.15.xen/arch/i386/kernel/Makefile | 3 -- linux-2.6.15.xen/arch/i386/kernel/smp-xen.c | 1 linux-2.6.15.xen/arch/i386/mm/init-xen.c | 1 linux-2.6.15.xen/arch/x86_64/kernel/pmtimer.c | 2 + linux-2.6.15.xen/arch/x86_64/kernel/process-xen.c | 6 ---- linux-2.6.15.xen/arch/x86_64/mm/fault-xen.c | 2 - linux-2.6.15.xen/include/asm-i386/mach-xen/asm/desc.h | 14 +++++++++++ linux-2.6.15.xen/include/asm-i386/mach-xen/asm/mmu.h | 7 +++++ linux-2.6.15.xen/include/asm-i386/mach-xen/asm/pgalloc.h | 1 linux-2.6.15.xen/include/asm-i386/mach-xen/asm/processor.h | 7 ++++- linux-2.6.15.xen/include/asm-i386/mach-xen/asm/swiotlb.h | 1 linux-2.6.15.xen/include/asm-x86_64/mach-xen/asm/pgalloc.h | 7 +++++ linux-2.6.15.xen/include/asm-x86_64/mach-xen/asm/pgtable.h | 2 - linux-2.6.15.xen/include/asm-x86_64/mach-xen/asm/processor.h | 2 + 16 files changed, 47 insertions(+), 13 deletions(-) Index: linux-2.6-xen-compile-fixes.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-xen-compile-fixes.patch,v retrieving revision 1.1 retrieving revision 1.1.18.1 diff -u -r1.1 -r1.1.18.1 --- linux-2.6-xen-compile-fixes.patch 13 Feb 2006 21:17:47 -0000 1.1 +++ linux-2.6-xen-compile-fixes.patch 2 Mar 2006 22:45:15 -0000 1.1.18.1 @@ -1,51 +1,233 @@ -diff -urNp --exclude-from=/home/mitica/quintela/config/misc/dontdiff linux-2.6.15.orig/arch/x86_64/kernel/apic-xen.c linux-2.6.15.noarch/arch/x86_64/kernel/apic-xen.c ---- linux-2.6.15.orig/arch/x86_64/kernel/apic-xen.c 2006-02-10 20:25:27.000000000 +0100 -+++ linux-2.6.15.noarch/arch/x86_64/kernel/apic-xen.c 2006-02-11 03:11:49.000000000 +0100 -@@ -42,6 +42,15 @@ - int apic_verbosity; - int disable_apic; - -+/* -+ * 'what should we do if we get a hw irq event on an illegal vector'. -+ * each architecture has to answer this themselves. -+ */ -+void ack_bad_irq(unsigned int irq) +diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff linux-2.6.15.orig/arch/i386/mm/init-xen.c linux-2.6.15.xen/arch/i386/mm/init-xen.c +--- linux-2.6.15.orig/arch/i386/mm/init-xen.c 2006-02-22 15:56:24.000000000 +0100 ++++ linux-2.6.15.xen/arch/i386/mm/init-xen.c 2006-02-22 18:56:27.000000000 +0100 +@@ -34,6 +34,7 @@ + #include + #include + #include ++#include + #include + #include + #include +diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff linux-2.6.15.orig/arch/x86_64/kernel/process-xen.c linux-2.6.15.xen/arch/x86_64/kernel/process-xen.c +--- linux-2.6.15.orig/arch/x86_64/kernel/process-xen.c 2006-02-22 15:56:20.000000000 +0100 ++++ linux-2.6.15.xen/arch/x86_64/kernel/process-xen.c 2006-02-22 18:32:50.000000000 +0100 +@@ -618,12 +618,6 @@ void set_personality_64bit(void) + + /* Make sure to be in 64bit mode */ + clear_thread_flag(TIF_IA32); +- +- /* TBD: overwrites user setup. Should have two bits. +- But 64bit processes have always behaved this way, +- so it's not too bad. The main problem is just that +- 32bit childs are affected again. */ +- current->personality &= ~READ_IMPLIES_EXEC; + } + + asmlinkage long sys_fork(struct pt_regs *regs) +diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff linux-2.6.15.orig/arch/x86_64/mm/fault-xen.c linux-2.6.15.xen/arch/x86_64/mm/fault-xen.c +--- linux-2.6.15.orig/arch/x86_64/mm/fault-xen.c 2006-02-22 15:56:20.000000000 +0100 ++++ linux-2.6.15.xen/arch/x86_64/mm/fault-xen.c 2006-02-22 18:34:19.000000000 +0100 +@@ -80,7 +80,7 @@ static noinline int is_prefetch(struct p + instr = (unsigned char *)convert_rip_to_linear(current, regs); + max_instr = instr + 15; + +- if (user_mode(regs) && instr >= (unsigned char *)TASK_SIZE) ++ if (user_mode(regs) && instr >= (unsigned char *)TASK_SIZE64) + return 0; + + while (scan_more && instr < max_instr) { +diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff linux-2.6.15.orig/include/asm-i386/mach-xen/asm/desc.h linux-2.6.15.xen/include/asm-i386/mach-xen/asm/desc.h +--- linux-2.6.15.orig/include/asm-i386/mach-xen/asm/desc.h 2006-02-22 15:56:20.000000000 +0100 ++++ linux-2.6.15.xen/include/asm-i386/mach-xen/asm/desc.h 2006-02-22 18:46:35.000000000 +0100 +@@ -157,6 +157,20 @@ static inline unsigned long get_desc_bas + return base; + } + ++static inline void set_user_cs(struct desc_struct *desc, unsigned long limit) +{ -+ printk("unexpected IRQ trap at vector %02x\n", irq); ++ limit = (limit - 1) / PAGE_SIZE; ++ desc->a = limit & 0xffff; ++ desc->b = (limit & 0xf0000) | 0x00c0fb00; +} + - void smp_local_timer_interrupt(struct pt_regs *regs) - { - profile_tick(CPU_PROFILING, regs); -diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff linux-2.6.15.x86_64/arch/i386/mm/init-xen.c linux-2.6.15.new/arch/i386/mm/init-xen.c ---- linux-2.6.15.x86_64/arch/i386/mm/init-xen.c 2006-02-11 19:15:39.000000000 +0100 -+++ linux-2.6.15.new/arch/i386/mm/init-xen.c 2006-02-11 16:24:12.000000000 +0100 -@@ -459,6 +459,7 @@ void zap_low_mappings (void) - - static int disable_nx __initdata = 0; - u64 __supported_pte_mask __read_mostly = ~_PAGE_NX; -+EXPORT_SYMBOL(__supported_pte_mask); ++#define load_user_cs_desc(cpu, mm) \ ++ HYPERVISOR_update_descriptor(virt_to_machine(&get_cpu_gdt_table(cpu)[GDT_ENTRY_DEFAULT_USER_CS]), (u64)(mm)->context.user_cs.a | ((u64)(mm)->context.user_cs.b) << 32); ++ ++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__ */ - /* - * noexec = on|off -diff -uNp linux-2.6.15.noarch/arch/x86_64/kernel/genapic-xen.c.orig linux-2.6.15.noarch/arch/x86_64/kernel/genapic-xen.c ---- linux-2.6.15.noarch/arch/x86_64/kernel/genapic-xen.c.orig 2006-02-11 20:17:49.000000000 +0100 -+++ linux-2.6.15.noarch/arch/x86_64/kernel/genapic-xen.c 2006-02-11 20:18:09.000000000 +0100 -@@ -39,6 +39,17 @@ extern struct genapic apic_xen; - struct genapic *genapic = &apic_xen; #endif +diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff linux-2.6.15.orig/include/asm-i386/mach-xen/asm/mmu.h linux-2.6.15.xen/include/asm-i386/mach-xen/asm/mmu.h +--- linux-2.6.15.orig/include/asm-i386/mach-xen/asm/mmu.h 2006-02-22 15:56:20.000000000 +0100 ++++ linux-2.6.15.xen/include/asm-i386/mach-xen/asm/mmu.h 2006-02-22 18:17:34.000000000 +0100 +@@ -7,11 +7,18 @@ + * 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; -+#ifndef CONFIG_X86_LOCAL_APIC -+/* -+ * 'what should we do if we get a hw irq event on an illegal vector'. -+ * each architecture has to answer this themselves. -+ */ -+void ack_bad_irq(unsigned int irq) -+{ -+ printk("unexpected IRQ trap at vector %02x\n", irq); -+} -+#endif + /* mm/memory.c:exit_mmap hook */ +diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff linux-2.6.15.orig/include/asm-i386/mach-xen/asm/pgalloc.h linux-2.6.15.xen/include/asm-i386/mach-xen/asm/pgalloc.h +--- linux-2.6.15.orig/include/asm-i386/mach-xen/asm/pgalloc.h 2006-02-22 15:56:20.000000000 +0100 ++++ linux-2.6.15.xen/include/asm-i386/mach-xen/asm/pgalloc.h 2006-02-22 18:17:59.000000000 +0100 +@@ -3,6 +3,7 @@ + + #include + #include ++#include + #include + #include /* for struct page */ + #include /* for phys_to_virt and page_to_pseudophys */ +diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff linux-2.6.15.orig/include/asm-i386/mach-xen/asm/processor.h linux-2.6.15.xen/include/asm-i386/mach-xen/asm/processor.h +--- linux-2.6.15.orig/include/asm-i386/mach-xen/asm/processor.h 2006-02-22 15:56:20.000000000 +0100 ++++ linux-2.6.15.xen/include/asm-i386/mach-xen/asm/processor.h 2006-02-22 18:42:49.000000000 +0100 +@@ -335,7 +335,9 @@ 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 + + #define HAVE_ARCH_PICK_MMAP_LAYOUT + +@@ -530,6 +532,9 @@ static inline void __load_esp0(struct ts + 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) /* - * Check the APIC IDs in bios_cpu_apicid and choose the APIC mode. +diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff linux-2.6.15.orig/include/asm-i386/mach-xen/asm/swiotlb.h linux-2.6.15.xen/include/asm-i386/mach-xen/asm/swiotlb.h +--- linux-2.6.15.orig/include/asm-i386/mach-xen/asm/swiotlb.h 2006-02-22 15:56:20.000000000 +0100 ++++ linux-2.6.15.xen/include/asm-i386/mach-xen/asm/swiotlb.h 2006-02-22 19:53:16.000000000 +0100 +@@ -2,6 +2,7 @@ + #define _ASM_SWIOTLB_H 1 + + #include ++#include + + /* SWIOTLB interface */ + +diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff linux-2.6.15.orig/include/asm-x86_64/mach-xen/asm/pgalloc.h linux-2.6.15.xen/include/asm-x86_64/mach-xen/asm/pgalloc.h +--- linux-2.6.15.orig/include/asm-x86_64/mach-xen/asm/pgalloc.h 2006-02-22 15:56:20.000000000 +0100 ++++ linux-2.6.15.xen/include/asm-x86_64/mach-xen/asm/pgalloc.h 2006-02-22 18:24:18.000000000 +0100 +@@ -7,6 +7,13 @@ + #include + #include /* for phys_to_virt and page_to_pseudophys */ + ++#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) ++ + #include + void make_page_readonly(void *va, unsigned int feature); + void make_page_writable(void *va, unsigned int feature); +diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff linux-2.6.15.orig/include/asm-x86_64/mach-xen/asm/pgtable.h linux-2.6.15.xen/include/asm-x86_64/mach-xen/asm/pgtable.h +--- linux-2.6.15.orig/include/asm-x86_64/mach-xen/asm/pgtable.h 2006-02-22 15:56:20.000000000 +0100 ++++ linux-2.6.15.xen/include/asm-x86_64/mach-xen/asm/pgtable.h 2006-02-22 18:24:57.000000000 +0100 +@@ -44,7 +44,7 @@ extern unsigned long __supported_pte_mas + + #define swapper_pg_dir init_level4_pgt + +-extern int nonx_setup(char *str); ++extern void nonx_setup(char *str); + extern void paging_init(void); + extern void clear_kernel_mapping(unsigned long addr, unsigned long size); + +diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff linux-2.6.15.orig/include/asm-x86_64/mach-xen/asm/processor.h linux-2.6.15.xen/include/asm-x86_64/mach-xen/asm/processor.h +--- linux-2.6.15.orig/include/asm-x86_64/mach-xen/asm/processor.h 2006-02-22 15:56:20.000000000 +0100 ++++ linux-2.6.15.xen/include/asm-x86_64/mach-xen/asm/processor.h 2006-02-22 18:25:18.000000000 +0100 +@@ -180,6 +180,8 @@ static inline void clear_in_cr4 (unsigne + */ + #define TASK_SIZE64 (0x800000000000UL - 4096) + ++#define __HAVE_ARCH_ALIGN_STACK ++ + /* This decides where the kernel will search for a free chunk of vm + * space during mmap's. + */ +diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff linux-2.6.15.orig/arch/i386/kernel/Makefile linux-2.6.15.xen/arch/i386/kernel/Makefile +--- linux-2.6.15.orig/arch/i386/kernel/Makefile 2006-02-22 15:56:20.000000000 +0100 ++++ linux-2.6.15.xen/arch/i386/kernel/Makefile 2006-02-22 17:08:31.000000000 +0100 +@@ -83,8 +83,7 @@ $(obj)/built-in.o: ld_flags += -R $(obj) + + SYSCFLAGS_vsyscall-syms.o = -r + $(obj)/vsyscall-syms.o: $(src)/vsyscall.lds \ +- $(foreach F,$(VSYSCALL_TYPES-y),$(obj)/vsyscall-$F.o) \ +- $(obj)/$(vsyscall_note) FORCE ++ $(obj)/vsyscall-sysenter.o $(obj)/$(vsyscall_note) FORCE + $(call if_changed,syscall) + + ifdef CONFIG_XEN +diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff linux-2.6.15.orig/arch/i386/kernel/smp-xen.c linux-2.6.15.xen/arch/i386/kernel/smp-xen.c +--- linux-2.6.15.orig/arch/i386/kernel/smp-xen.c 2006-02-22 15:56:21.000000000 +0100 ++++ linux-2.6.15.xen/arch/i386/kernel/smp-xen.c 2006-02-22 18:29:12.000000000 +0100 +@@ -23,6 +23,7 @@ + + #include + #include ++#include + #if 0 + #include + #endif +--- linux-2.6.15.ia64/fs/Kconfig~ 2006-02-24 14:14:42.000000000 -0500 ++++ linux-2.6.15.ia64/fs/Kconfig 2006-02-24 14:38:17.000000000 -0500 +@@ -841,7 +841,6 @@ + config HUGETLBFS + bool "HugeTLB file system support" + depends X86 || IA64 || PPC64 || SPARC64 || SUPERH || BROKEN +- depends !XEN + + config HUGETLB_PAGE + def_bool HUGETLBFS +diff -urNp --exclude-from=/home/mitica/quintela/config/misc/dontdiff kernel-2.6.15/linux-2.6.15.noarch/arch/x86_64/kernel/pmtimer.c linux-2.6.15.xen/arch/x86_64/kernel/pmtimer.c +--- kernel-2.6.15/linux-2.6.15.noarch/arch/x86_64/kernel/pmtimer.c 2006-02-28 22:47:11.000000000 +0100 ++++ linux-2.6.15.xen/arch/x86_64/kernel/pmtimer.c 2006-02-28 22:37:45.000000000 +0100 +@@ -60,8 +60,10 @@ int pmtimer_mark_offset(void) + delta = cyc2us((tick - last_pmtmr_tick) & ACPI_PM_MASK); + + last_pmtmr_tick = tick; ++#ifndef CONFIG_XEN + monotonic_base += delta * NSEC_PER_USEC; ++#endif + + delta += offset_delay; + + +--- linux-2.6.15.i686/arch/i386/kernel/acpi/boot-xen.c 2006-03-02 19:47:26.000000000 +0100 ++++ linux-2.6.15.noarch/arch/i386/kernel/acpi/boot-xen.c 2006-03-02 22:00:11.000000000 +0100 +@@ -230,8 +230,9 @@ static int __init acpi_parse_madt(unsign + madt->lapic_address); + } + ++#ifndef CONFIG_X86_64 + acpi_madt_oem_check(madt->header.oem_id, madt->header.oem_table_id); +- ++#endif + return 0; + } + Index: sources =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/sources,v retrieving revision 1.310 retrieving revision 1.310.4.1 diff -u -r1.310 -r1.310.4.1 --- sources 2 Mar 2006 19:26:10 -0000 1.310 +++ sources 2 Mar 2006 22:45:19 -0000 1.310.4.1 @@ -1,4 +1,4 @@ cdf95e00f5111e31f78e1d97304d9522 linux-2.6.15.tar.bz2 -30f4ef37dbc4d0bce9366e8716e8b51b xen-20060208.tar.bz2 1740ae34807f687a93adf2469ea5c4fc patch-2.6.16-rc5.bz2 +cdfde609af8adcf58d7ff626599b2d90 xen-20060301.tar.bz2 57537f7ff1c1cf1534df4a0986956feb patch-2.6.16-rc5-git6.bz2 --- linux-2.6-xen-acpi.patch DELETED --- --- linux-2.6-xen-cpusteal-kernel.patch DELETED --- --- linux-2.6-xen-gcc-4.1-compile-fix.patch DELETED --- --- linux-2.6-xen-guest-enable-char-devices.patch DELETED --- --- linux-2.6-xen-merge.patch DELETED --- --- linux-2.6-xen-x86_64-fixes.patch DELETED --- --- linux-2.6-xen_net_read_mac_export.patch DELETED --- From fedora-cvs-commits at redhat.com Thu Mar 2 22:47:49 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 2 Mar 2006 17:47:49 -0500 Subject: rpms/kernel/devel kernel-2.6.spec,1.2009.4.1,1.2009.4.2 Message-ID: <200603022247.k22Mlns8022260@cvs.devel.redhat.com> Author: sct Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv22223 Modified Files: Tag: private-xen-rebased-2009-branch kernel-2.6.spec Log Message: Disable xen PAE build again Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.2009.4.1 retrieving revision 1.2009.4.2 diff -u -r1.2009.4.1 -r1.2009.4.2 --- kernel-2.6.spec 2 Mar 2006 22:45:15 -0000 1.2009.4.1 +++ kernel-2.6.spec 2 Mar 2006 22:47:46 -0000 1.2009.4.2 @@ -9,7 +9,7 @@ %define includexen 1 # Whether to build the Xen kernels, disable if you want. %define buildxen 1 -%define buildxenPAE 1 +%define buildxenPAE 0 %define builddoc 0 %define buildkdump 1 @@ -1623,6 +1623,10 @@ %endif %changelog +* Thu Mar 2 2006 Stephen Tweedie +- Rebase to rawhide 1.2009 +- Disable xen PAE build again + * Thu Mar 2 2006 Dave Jones - 2.6.16rc5-git6 - Fix acpi_os_acquire_object() with IRQs disabled debug msgs. From fedora-cvs-commits at redhat.com Thu Mar 2 22:48:49 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 2 Mar 2006 17:48:49 -0500 Subject: rpms/kernel/devel/scripts rebase-xen.sh,NONE,1.1.4.1 Message-ID: <200603022248.k22MmnRd022748@cvs.devel.redhat.com> Author: sct Update of /cvs/dist/rpms/kernel/devel/scripts In directory cvs.devel.redhat.com:/tmp/cvs-serv22717/scripts Added Files: Tag: private-xen-rebased-2009-branch rebase-xen.sh Log Message: Add scripts/rebase-xen.sh script on this branch --- NEW FILE rebase-xen.sh --- #!/bin/bash set -x if [ ! -d linux-2.6.*-xen0 -o ! -d ref-linux-2.6.* ] ; then make prep-kernels || exit 1 fi pushd *xen0 || exit 1 make distclean || exit 1 popd pushd xen || exit 1 make clean popd # # The xen patches include diffs to linux/Makefile which conflict with # our own Makefile changes; exclude these the easy way by making the files # the same in both arms of the diff! # \cp -f *xen0/Makefile ref-linux-2.6.*/Makefile diff -Nru -p --exclude='.*' ref-linux-2.6.* *xen0 > linux-2.6-xen.patch if [ $? -gt 1 ] ; then exit $? fi DATE=`date +%Y%m%d` tar cvf xen-$DATE.tar xen || exit 1 rm -f xen-$DATE.tar.bz2 bzip2 -v9 xen-$DATE.tar || exit 1 set +x ls -l linux-2.6-xen.patch xen-$DATE.tar.bz2 From fedora-cvs-commits at redhat.com Thu Mar 2 22:51:40 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 2 Mar 2006 17:51:40 -0500 Subject: rpms/dhcp/devel dhcp-3.0.3-dhclient_ibmzSeries_broadcast.patch, NONE, 1.1 Message-ID: <200603022251.k22Mpeqv024082@cvs.devel.redhat.com> Author: jvdias Update of /cvs/dist/rpms/dhcp/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv24051 Added Files: dhcp-3.0.3-dhclient_ibmzSeries_broadcast.patch Log Message: fix bug 181908: fix dhclient IBM zSeries linux guest operation - add -B "always broadcast" option dhcp-3.0.3-dhclient_ibmzSeries_broadcast.patch: client/clparse.c | 11 ++++++++++- client/dhclient.8 | 11 +++++++++++ client/dhclient.c | 29 ++++++++++++++++++----------- client/dhclient.conf.5 | 12 ++++++++++++ common/conflex.c | 2 ++ includes/dhcpd.h | 3 +++ includes/dhctoken.h | 3 ++- 7 files changed, 58 insertions(+), 13 deletions(-) --- NEW FILE dhcp-3.0.3-dhclient_ibmzSeries_broadcast.patch --- --- dhcp-3.0.3/common/conflex.c.dhclient_ibmzSeries_broadcast 2005-03-03 11:55:22.000000000 -0500 +++ dhcp-3.0.3/common/conflex.c 2006-03-02 13:58:09.000000000 -0500 @@ -599,6 +599,8 @@ return BALANCE; if (!strcasecmp (atom + 1, "ound")) return BOUND; + if (!strcasecmp (atom + 1, "ootp-broadcast-always")) + return BOOTP_BROADCAST_ALWAYS; break; case 'c': if (!strcasecmp (atom + 1, "ase")) --- dhcp-3.0.3/client/dhclient.8.dhclient_ibmzSeries_broadcast 2006-03-02 13:58:08.000000000 -0500 +++ dhcp-3.0.3/client/dhclient.8 2006-03-02 13:58:09.000000000 -0500 @@ -81,6 +81,9 @@ .B -x ] [ +.B -B +] +[ .I if0 [ .I ...ifN @@ -259,6 +262,14 @@ The -x argument enables eXtended option information to be created in the -s dhclient-script environment, which would allow applications running in that environment to handle options they do not know about in advance. +.PP +The -B option instructs dhclient to set the bootp broadcast flag in request +packets, so that servers will always broadcast replies . This is equivalent +to specifying the 'bootp-broadcast-always' option in dhclient.conf, and has +the same effect as specifying 'always-broadcast' in the server's dhcpd.conf. +This option is provided as a Red Hat extension to enable dhclient to work +on IBM zSeries z/OS Linux guests . +.PP .SH CONFIGURATION The syntax of the dhclient.conf(5) file is discussed separately. .SH OMAPI --- dhcp-3.0.3/client/dhclient.c.dhclient_ibmzSeries_broadcast 2006-03-02 13:58:08.000000000 -0500 +++ dhcp-3.0.3/client/dhclient.c 2006-03-02 13:58:09.000000000 -0500 @@ -77,6 +77,8 @@ #ifdef EXTENDED_NEW_OPTION_INFO int extended_option_environment = 0; #endif +int bootp_broadcast_always = 0; + static void usage PROTO ((void)); void do_release(struct client_state *); @@ -211,9 +213,11 @@ exit (0); #ifdef EXTENDED_NEW_OPTION_INFO } else if (!strcmp (argv [i], "-x")) { - extended_option_environment = 1; - new_option_info_tree = GENERATE_NEW_OPTION_INFO; + extended_option_environment = 1; + new_option_info_tree = GENERATE_NEW_OPTION_INFO; #endif + } else if (!strcmp (argv [i], "-B")) { + bootp_broadcast_always = 1; } else if (argv [i][0] == '-') { usage (); } else { @@ -580,9 +584,9 @@ log_info (url); #ifdef EXTENDED_NEW_OPTION_INFO - log_error ("Usage: dhclient [-1dqr] [-nwx] [-p ] %s", + log_error ("Usage: dhclient [-1dqr] [-nwx] [-p ] [-B] %s", #else - log_error ("Usage: dhclient [-1dqr] [-nw] [-p ] %s", + log_error ("Usage: dhclient [-1dqr] [-nw] [-p ] [-B] %s", #endif "[-s server]"); log_error (" [-cf config-file] [-lf lease-file]%s", @@ -2028,9 +2032,10 @@ client -> packet.xid = random (); client -> packet.secs = 0; /* filled in by send_discover. */ - if (can_receive_unicast_unconfigured (client -> interface)) - client -> packet.flags = 0; - else + if ( (!(bootp_broadcast_always || client -> config -> bootp_broadcast_always)) + && can_receive_unicast_unconfigured (client -> interface) + ) client -> packet.flags = 0; + else client -> packet.flags = htons (BOOTP_BROADCAST); memset (&(client -> packet.ciaddr), @@ -2115,8 +2120,9 @@ } else { memset (&client -> packet.ciaddr, 0, sizeof client -> packet.ciaddr); - if (can_receive_unicast_unconfigured (client -> interface)) - client -> packet.flags = 0; + if ( (!(bootp_broadcast_always || client -> config -> bootp_broadcast_always)) + && can_receive_unicast_unconfigured (client -> interface) + ) client -> packet.flags = 0; else client -> packet.flags = htons (BOOTP_BROADCAST); } @@ -2175,8 +2181,9 @@ client -> packet.hops = 0; client -> packet.xid = client -> xid; client -> packet.secs = 0; /* Filled in by send_request. */ - if (can_receive_unicast_unconfigured (client -> interface)) - client -> packet.flags = 0; + if ( (!(bootp_broadcast_always || client -> config -> bootp_broadcast_always)) + && can_receive_unicast_unconfigured (client -> interface) + ) client -> packet.flags = 0; else client -> packet.flags = htons (BOOTP_BROADCAST); --- dhcp-3.0.3/client/dhclient.conf.5.dhclient_ibmzSeries_broadcast 2006-03-02 13:58:08.000000000 -0500 +++ dhcp-3.0.3/client/dhclient.conf.5 2006-03-02 14:09:04.000000000 -0500 @@ -582,6 +582,18 @@ Whenever the client tries to renew the lease, it will use that same media type. The lease must expire before the client will go back to cycling through media types. +.PP + \fBbootp-broadcast-always;\fR +.PP +The +.B bootp-broadcast-always +statement instructs dhclient to always set the bootp broadcast flag in +request packets, so that servers will always broadcast replies. +This is equivalent to supplying the dhclient -B argument, and has +the same effect as specifying 'always-broadcast' in the server's dhcpd.conf. +This option is provided as a Red Hat extension to enable dhclient to work +on IBM zSeries z/OS Linux guests . +.PP .SH SAMPLE The following configuration file is used on a laptop running NetBSD 1.3. The laptop has an IP alias of 192.5.5.213, and has one --- dhcp-3.0.3/client/clparse.c.dhclient_ibmzSeries_broadcast 2006-03-02 13:58:08.000000000 -0500 +++ dhcp-3.0.3/client/clparse.c 2006-03-02 13:58:09.000000000 -0500 @@ -87,6 +87,7 @@ top_level_config.requested_options = default_requested_options; top_level_config.omapi_port = -1; top_level_config.do_forward_update = 1; + top_level_config.bootp_broadcast_always = 0; group_allocate (&top_level_config.on_receipt, MDL); if (!top_level_config.on_receipt) @@ -235,7 +236,9 @@ interface-declaration | LEASE client-lease-statement | ALIAS client-lease-statement | - KEY key-definition */ + KEY key-definition | + BOOTP_BROADCAST_ALWAYS +*/ void parse_client_statement (cfile, ip, config) struct parse *cfile; @@ -558,6 +561,12 @@ token = next_token (&val, (unsigned *)0, cfile); parse_reject_statement (cfile, config); return; + + case BOOTP_BROADCAST_ALWAYS: + token = next_token(&val, (unsigned*)0, cfile); + config -> bootp_broadcast_always = 1; + parse_semi (cfile); + return; default: lose = 0; --- dhcp-3.0.3/includes/dhcpd.h.dhclient_ibmzSeries_broadcast 2006-03-02 13:58:09.000000000 -0500 +++ dhcp-3.0.3/includes/dhcpd.h 2006-03-02 13:58:09.000000000 -0500 @@ -724,6 +724,9 @@ int do_forward_update; /* If nonzero, and if we have the information we need, update the A record for the address we get. */ + int bootp_broadcast_always; /* If nonzero, always set the BOOTP_BROADCAST + flag in requests + */ }; /* Per-interface state used in the dhcp client... */ --- dhcp-3.0.3/includes/dhctoken.h.dhclient_ibmzSeries_broadcast 2004-09-21 15:25:38.000000000 -0400 +++ dhcp-3.0.3/includes/dhctoken.h 2006-03-02 13:58:09.000000000 -0500 @@ -308,7 +308,8 @@ REFRESH = 612, DOMAIN_NAME = 613, DO_FORWARD_UPDATE = 614, - KNOWN_CLIENTS = 615 + KNOWN_CLIENTS = 615, + BOOTP_BROADCAST_ALWAYS = 616 }; #define is_identifier(x) ((x) >= FIRST_TOKEN && \ From fedora-cvs-commits at redhat.com Thu Mar 2 22:52:27 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 2 Mar 2006 17:52:27 -0500 Subject: rpms/dhcp/devel dhcp-3.0.3-dhclient_ibmzSeries_-I_option.patch, NONE, 1.1 Message-ID: <200603022252.k22MqRSE024467@cvs.devel.redhat.com> Author: jvdias Update of /cvs/dist/rpms/dhcp/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv24418 Added Files: dhcp-3.0.3-dhclient_ibmzSeries_-I_option.patch Log Message: fix bug 181908: fix dhclient IBM zSeries linux guest operation - add -I option dhcp-3.0.3-dhclient_ibmzSeries_-I_option.patch: dhclient.8 | 19 ++++++++++++++++++- dhclient.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 64 insertions(+), 3 deletions(-) --- NEW FILE dhcp-3.0.3-dhclient_ibmzSeries_-I_option.patch --- --- dhcp-3.0.3/client/dhclient.8.dhclient_ibmzSeries_-I_option 2006-03-02 17:29:07.000000000 -0500 +++ dhcp-3.0.3/client/dhclient.8 2006-03-02 17:37:11.000000000 -0500 @@ -81,6 +81,10 @@ .B -x ] [ +.B -I +.I dhcp-client-identifier +] +[ .B -B ] [ @@ -261,7 +265,20 @@ .PP The -x argument enables eXtended option information to be created in the -s dhclient-script environment, which would allow applications running -in that environment to handle options they do not know about in advance. +in that environment to handle options they do not know about in advance - +this is a Red Hat extension to support dhcdbd and NetworkManager. +.PP +The -I argument allow you to specify the dhcp-client-identifier string, , +to be sent to the dhcp server on the command line. It is equivalent to the +top level dhclient.conf statement: +.br + \fBsend dhcp-client-identifier "";\fR +The -I command line option will override any top level dhclient.conf +'send dhcp-client-identifier' statement, but more specific per-interface +'interface "X" { send dhcp-client-identifier...; }' statements in dhclient.conf +will override the -I command line option for interface "X". +This option is provided as a Red Hat extension to enable dhclient to work +on IBM zSeries z/OS Linux guests . .PP The -B option instructs dhclient to set the bootp broadcast flag in request packets, so that servers will always broadcast replies . This is equivalent --- dhcp-3.0.3/client/dhclient.c.dhclient_ibmzSeries_-I_option 2006-03-02 17:29:07.000000000 -0500 +++ dhcp-3.0.3/client/dhclient.c 2006-03-02 17:36:02.000000000 -0500 @@ -107,6 +107,7 @@ int no_dhclient_pid = 0; int no_dhclient_script = 0; char *s; + char *dhcp_client_identifier_arg = 0L; /* Make sure we have stdin, stdout and stderr. */ i = open ("/dev/null", O_RDWR); @@ -216,6 +217,17 @@ extended_option_environment = 1; new_option_info_tree = GENERATE_NEW_OPTION_INFO; #endif + } else if (!strcmp (argv [i], "-I")) { + if ((++i == argc) || (argv[i] == 0L) || (*(argv[i])=='\0')) + usage (); + if (strlen(argv[i]) >= DHCP_OPTION_LEN) + { + log_error("-I option dhcp-client-identifier string \"%s\" is too long -" + "maximum length is: %d", argv[i], DHCP_OPTION_LEN-1); + exit(1); + } + dhcp_client_identifier_arg = argv[i]; + } else if (!strcmp (argv [i], "-B")) { bootp_broadcast_always = 1; } else if (argv [i][0] == '-') { @@ -440,6 +452,38 @@ /* Parse the dhclient.conf file. */ read_client_conf (); + if ( (dhcp_client_identifier_arg != 0L) && (*dhcp_client_identifier_arg != '\0') ) + { + /* parse the dhcp client identifier option + * as a 'send' statement at top level scope: + */ + struct parse *cfile = (struct parse *)0; + char send_dhcid_stmt[ DHCP_OPTION_LEN + 40 ]; + const char *val=0L; + int token, send_dhcid_stmt_len = + sprintf (send_dhcid_stmt, "send dhcp-client-identifier \"%s\";", + dhcp_client_identifier_arg + ); + + status = new_parse (&cfile, -1, send_dhcid_stmt, send_dhcid_stmt_len, + "dhcp-client-identifier option", 0); + + if (status != ISC_R_SUCCESS) + log_fatal ("Cannot parse dhcp-client-identifier send statement!"); + + do { + token = peek_token (&val, (unsigned *)0, cfile); + if (token == END_OF_FILE) + break; + + parse_client_statement (cfile, + (struct interface_info *)0, + &top_level_config); + + } while (1); + end_parse (&cfile); + } + /* Parse the lease database. */ read_client_leases (); @@ -584,9 +628,9 @@ log_info (url); #ifdef EXTENDED_NEW_OPTION_INFO - log_error ("Usage: dhclient [-1dqr] [-nwx] [-p ] [-B] %s", + log_error ("Usage: dhclient [-1dqr] [-nwx] [-p ] [-I ] [-B] %s", #else - log_error ("Usage: dhclient [-1dqr] [-nw] [-p ] [-B] %s", + log_error ("Usage: dhclient [-1dqr] [-nw] [-p ] [-I ] [-B] %s", #endif "[-s server]"); log_error (" [-cf config-file] [-lf lease-file]%s", From fedora-cvs-commits at redhat.com Thu Mar 2 22:55:34 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 2 Mar 2006 17:55:34 -0500 Subject: rpms/dhcp/devel dhcp.spec,1.87,1.88 Message-ID: <200603022255.k22MtYNb025976@cvs.devel.redhat.com> Author: jvdias Update of /cvs/dist/rpms/dhcp/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv25944 Modified Files: dhcp.spec Log Message: dhcp.spec Index: dhcp.spec =================================================================== RCS file: /cvs/dist/rpms/dhcp/devel/dhcp.spec,v retrieving revision 1.87 retrieving revision 1.88 diff -u -r1.87 -r1.88 --- dhcp.spec 20 Feb 2006 22:14:58 -0000 1.87 +++ dhcp.spec 2 Mar 2006 22:55:31 -0000 1.88 @@ -2,7 +2,7 @@ Summary: A DHCP (Dynamic Host Configuration Protocol) server and relay agent. Name: dhcp Version: 3.0.3 -Release: 24 +Release: 26 Epoch: 11 License: distributable Group: System Environment/Daemons @@ -76,6 +76,8 @@ Patch169: dhcp-3.0.3-bz176615.patch Patch170: dhcp-3.0.3-bz177845.patch Patch171: dhcp-3.0.3-bz181482.patch +Patch172: dhcp-3.0.3-dhclient_ibmzSeries_broadcast.patch +Patch173: dhcp-3.0.3-dhclient_ibmzSeries_-I_option.patch URL: http://isc.org/products/DHCP/ BuildRoot: %{_tmppath}/%{name}-%{version}-root Prereq: /sbin/chkconfig @@ -194,6 +196,8 @@ %patch169 -p1 -b .bz176615 %patch170 -p1 -b .bz177845 %patch171 -p1 -b .bz181482 +%patch172 -p1 -b .dhclient_ibmzSeries_broadcast +%patch173 -p1 -b .dhclient_ibmzSeries_-I_option cp %SOURCE1 . cat <site.conf VARDB=%{_localstatedir}/lib/dhcpd @@ -233,6 +237,8 @@ #make %{?_smp_mflags} CC="gcc33" make %{?_smp_mflags} CC="%{__cc}" +%define debug_package %{nil} + %install rm -rf %{buildroot} mkdir -p %{buildroot}/etc/sysconfig @@ -265,6 +271,8 @@ touch debugfiles.list :; +/usr/lib/rpm/brp-compress +exit 0 %clean rm -rf %{buildroot} @@ -327,6 +335,12 @@ %{_mandir}/man3/* %changelog +* Thu Mar 02 2006 Jason Vas Dias - 11:3.0.3-26 +- fix bug 181908: enable dhclient to operate on IBM zSeries z/OS linux guests: + o add -I dhclient command line option + o add -B "always broadcast" dhclient command line option + o add 'bootp-broadcast-always;' dhclient.conf statement + * Mon Feb 20 2006 Jason Vas Dias - 11:3.0.3-24 - Apply upstream fix for bug 176615 / ISC RT#15811 From fedora-cvs-commits at redhat.com Thu Mar 2 23:13:16 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 2 Mar 2006 18:13:16 -0500 Subject: rpms/libnotify/devel libnotify-0.3.0-remove-config-h.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 libnotify.spec, 1.8, 1.9 sources, 1.5, 1.6 Message-ID: <200603022313.k22NDGCJ030545@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/libnotify/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv30458 Modified Files: .cvsignore libnotify.spec sources Added Files: libnotify-0.3.0-remove-config-h.patch Log Message: - patch out config.h include from public header libnotify-0.3.0-remove-config-h.patch: notifynotification.h | 1 - 1 files changed, 1 deletion(-) --- NEW FILE libnotify-0.3.0-remove-config-h.patch --- --- libnotify-0.3.0/libnotify/notifynotification.h.remove-config-h 2006-03-02 18:11:49.000000000 -0500 +++ libnotify-0.3.0/libnotify/notifynotification.h 2006-03-02 18:11:52.000000000 -0500 @@ -18,7 +18,6 @@ #ifndef NOTIFY_NOTIFICATION_H #define NOTIFY_NOTIFICATION_H -#include "config.h" #include #include Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/libnotify/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 27 Feb 2006 22:20:28 -0000 1.4 +++ .cvsignore 2 Mar 2006 23:13:13 -0000 1.5 @@ -1 +1,2 @@ -libnotify-0.3.2.tar.gz +libnotify-0.0.2.tar.gz +libnotify-0.3.0.tar.gz Index: libnotify.spec =================================================================== RCS file: /cvs/dist/rpms/libnotify/devel/libnotify.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- libnotify.spec 27 Feb 2006 22:20:28 -0000 1.8 +++ libnotify.spec 2 Mar 2006 23:13:13 -0000 1.9 @@ -2,8 +2,8 @@ Summary: libnotify notification library Name: libnotify -Version: 0.3.2 -Release: 1 +Version: 0.3.0 +Release: 5 URL: http://www.galago-project.org/specs/notification/ Source0: %{name}-%{version}.tar.gz License: LGPL @@ -24,6 +24,7 @@ Group: Development/Libraries Requires: %{name} = %{version}-%{release} Requires: glib2-devel >= %{glib2_version} +Patch0: libnotify-0.3.0-remove-config-h.patch %description devel @@ -32,6 +33,7 @@ %prep %setup -q +%patch0 -p1 -b .remove-config-h %build @@ -69,8 +71,8 @@ %changelog -* Mon Feb 27 2006 Ray Strode - 0.3.2-1 -- update to 0.3.2-1 +* Thu Mar 2 2006 Ray Strode - 0.3.0-5 +- patch out config.h include from public header * Fri Feb 10 2006 Jesse Keating - 0.3.0-4.2 - bump again for double-long bug on ppc(64) Index: sources =================================================================== RCS file: /cvs/dist/rpms/libnotify/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 27 Feb 2006 22:20:28 -0000 1.5 +++ sources 2 Mar 2006 23:13:13 -0000 1.6 @@ -1 +1 @@ -12bcb4949e4be783a2db388e9155afac libnotify-0.3.2.tar.gz +98f723508b318f0c32578f5bca6c91d7 libnotify-0.3.0.tar.gz From fedora-cvs-commits at redhat.com Thu Mar 2 23:21:18 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 2 Mar 2006 18:21:18 -0500 Subject: rpms/libnotify/devel libnotify-0.3.0-remove-config-h.patch,1.1,1.2 Message-ID: <200603022321.k22NLINE014156@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/libnotify/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv14001 Modified Files: libnotify-0.3.0-remove-config-h.patch Log Message: - deal with the fall out of config.h not getting included in public headers libnotify-0.3.0-remove-config-h.patch: libnotify/notifynotification.h | 1 - tests/test-basic.c | 1 + tests/test-error.c | 1 + tests/test-markup.c | 1 + tests/test-replace-widget.c | 2 ++ tests/test-replace.c | 2 ++ tests/test-xy-stress.c | 1 + tests/test-xy.c | 1 + 8 files changed, 9 insertions(+), 1 deletion(-) Index: libnotify-0.3.0-remove-config-h.patch =================================================================== RCS file: /cvs/dist/rpms/libnotify/devel/libnotify-0.3.0-remove-config-h.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- libnotify-0.3.0-remove-config-h.patch 2 Mar 2006 23:13:13 -0000 1.1 +++ libnotify-0.3.0-remove-config-h.patch 2 Mar 2006 23:21:14 -0000 1.2 @@ -1,3 +1,69 @@ +--- libnotify-0.3.0/tests/test-xy-stress.c.remove-config-h 2006-03-02 18:18:14.000000000 -0500 ++++ libnotify-0.3.0/tests/test-xy-stress.c 2006-03-02 18:18:20.000000000 -0500 +@@ -18,6 +18,7 @@ + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + */ ++#include "config.h" + + #include + #include +--- libnotify-0.3.0/tests/test-basic.c.remove-config-h 2006-03-02 18:16:39.000000000 -0500 ++++ libnotify-0.3.0/tests/test-basic.c 2006-03-02 18:16:46.000000000 -0500 +@@ -18,6 +18,7 @@ + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + */ ++#include "config.h" + + #include + #include +--- libnotify-0.3.0/tests/test-error.c.remove-config-h 2006-03-02 18:16:58.000000000 -0500 ++++ libnotify-0.3.0/tests/test-error.c 2006-03-02 18:17:04.000000000 -0500 +@@ -18,6 +18,7 @@ + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + */ ++#include "config.h" + + #include + #include +--- libnotify-0.3.0/tests/test-markup.c.remove-config-h 2006-03-02 18:17:13.000000000 -0500 ++++ libnotify-0.3.0/tests/test-markup.c 2006-03-02 18:17:19.000000000 -0500 +@@ -18,6 +18,7 @@ + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + */ ++#include "config.h" + + #include + #include +--- libnotify-0.3.0/tests/test-replace.c.remove-config-h 2006-03-02 18:17:35.000000000 -0500 ++++ libnotify-0.3.0/tests/test-replace.c 2006-03-02 18:17:40.000000000 -0500 +@@ -1,3 +1,5 @@ ++#include "config.h" ++ + #include + #include + #include +--- libnotify-0.3.0/tests/test-replace-widget.c.remove-config-h 2006-03-02 18:17:51.000000000 -0500 ++++ libnotify-0.3.0/tests/test-replace-widget.c 2006-03-02 18:17:56.000000000 -0500 +@@ -1,3 +1,5 @@ ++#include "config.h" ++ + #include + #include + #include +--- libnotify-0.3.0/tests/test-xy.c.remove-config-h 2006-03-02 18:18:02.000000000 -0500 ++++ libnotify-0.3.0/tests/test-xy.c 2006-03-02 18:18:06.000000000 -0500 +@@ -18,6 +18,7 @@ + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + */ ++#include "config.h" + + #include + #include --- libnotify-0.3.0/libnotify/notifynotification.h.remove-config-h 2006-03-02 18:11:49.000000000 -0500 +++ libnotify-0.3.0/libnotify/notifynotification.h 2006-03-02 18:11:52.000000000 -0500 @@ -18,7 +18,6 @@ From fedora-cvs-commits at redhat.com Thu Mar 2 23:42:25 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 2 Mar 2006 18:42:25 -0500 Subject: rpms/kernel/devel jwltest-e1000-7_0_33-k2.patch, NONE, 1.1.10.1 jwltest-ipw2200-hwcrypto-off.patch, NONE, 1.1.8.1 jwltest-sk98lin-neuter.patch, NONE, 1.1.16.1 jwltest-tg3-3_50.patch, NONE, 1.1.4.1 kernel-2.6.spec, 1.2009, 1.2009.2.1 linux-2.6-bcm43xx-git.patch, 1.2, 1.2.12.1 linux-2.6-softmac-git.patch, 1.8, 1.8.2.1 linux-2.6-bcm-warnings.patch, 1.1, NONE Message-ID: <200603022342.k22NgP47011492@cvs.devel.redhat.com> Author: linville Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv11478 Modified Files: Tag: private-linville-jwltest-fc5-12-branch kernel-2.6.spec linux-2.6-bcm43xx-git.patch linux-2.6-softmac-git.patch Added Files: Tag: private-linville-jwltest-fc5-12-branch jwltest-e1000-7_0_33-k2.patch jwltest-ipw2200-hwcrypto-off.patch jwltest-sk98lin-neuter.patch jwltest-tg3-3_50.patch Removed Files: Tag: private-linville-jwltest-fc5-12-branch linux-2.6-bcm-warnings.patch Log Message: jwltest-e1000-7_0_33-k2.patch: e1000.h | 52 +-- e1000_ethtool.c | 113 +++---- e1000_hw.c | 861 ++++++++++++++++++++++++++++++++++++++++++++++++-------- e1000_hw.h | 366 ++++++++++++++++++++++- e1000_main.c | 674 +++++++++++++++++++------------------------ e1000_osdep.h | 4 e1000_param.c | 78 +---- 7 files changed, 1508 insertions(+), 640 deletions(-) --- NEW FILE jwltest-e1000-7_0_33-k2.patch --- --- linux-2.6.15.noarch/drivers/net/e1000/e1000_param.c.orig 2006-02-13 11:48:40.000000000 -0500 +++ linux-2.6.15.noarch/drivers/net/e1000/e1000_param.c 2006-02-13 11:54:16.000000000 -0500 @@ -44,10 +44,19 @@ */ #define E1000_PARAM_INIT { [0 ... E1000_MAX_NIC] = OPTION_UNSET } +/* Module Parameters are always initialized to -1, so that the driver + * can tell the difference between no user specified value or the + * user asking for the default value. + * The true default values are loaded in when e1000_check_options is called. + * + * This is a GCC extension to ANSI C. + * See the item "Labeled Elements in Initializers" in the section + * "Extensions to the C Language Family" of the GCC documentation. + */ + #define E1000_PARAM(X, desc) \ - static int __devinitdata X[E1000_MAX_NIC+1] = E1000_PARAM_INIT; \ - static int num_##X = 0; \ - module_param_array_named(X, X, int, &num_##X, 0); \ + static const int __devinitdata X[E1000_MAX_NIC+1] = E1000_PARAM_INIT; \ + MODULE_PARM(X, "1-" __MODULE_STRING(E1000_MAX_NIC) "i"); \ MODULE_PARM_DESC(X, desc); /* Transmit Descriptor Count @@ -268,7 +277,7 @@ e1000_validate_option(int *value, struct BUG(); } - DPRINTK(PROBE, INFO, "Invalid %s specified (%i) %s\n", + DPRINTK(PROBE, INFO, "Invalid %s value specified (%i) %s\n", opt->name, *value, opt->err); *value = opt->def; return -1; @@ -295,6 +304,7 @@ e1000_check_options(struct e1000_adapter DPRINTK(PROBE, NOTICE, "Warning: no configuration for board #%i\n", bd); DPRINTK(PROBE, NOTICE, "Using defaults for all values\n"); + bd = E1000_MAX_NIC; } { /* Transmit Descriptor Count */ @@ -312,14 +322,10 @@ e1000_check_options(struct e1000_adapter opt.arg.r.max = mac_type < e1000_82544 ? E1000_MAX_TXD : E1000_MAX_82544_TXD; - if (num_TxDescriptors > bd) { tx_ring->count = TxDescriptors[bd]; e1000_validate_option(&tx_ring->count, &opt, adapter); E1000_ROUNDUP(tx_ring->count, REQ_TX_DESCRIPTOR_MULTIPLE); - } else { - tx_ring->count = opt.def; - } for (i = 0; i < adapter->num_tx_queues; i++) tx_ring[i].count = tx_ring->count; } @@ -338,14 +344,10 @@ e1000_check_options(struct e1000_adapter opt.arg.r.max = mac_type < e1000_82544 ? E1000_MAX_RXD : E1000_MAX_82544_RXD; - if (num_RxDescriptors > bd) { rx_ring->count = RxDescriptors[bd]; e1000_validate_option(&rx_ring->count, &opt, adapter); E1000_ROUNDUP(rx_ring->count, REQ_RX_DESCRIPTOR_MULTIPLE); - } else { - rx_ring->count = opt.def; - } for (i = 0; i < adapter->num_rx_queues; i++) rx_ring[i].count = rx_ring->count; } @@ -357,13 +359,9 @@ e1000_check_options(struct e1000_adapter .def = OPTION_ENABLED }; - if (num_XsumRX > bd) { int rx_csum = XsumRX[bd]; e1000_validate_option(&rx_csum, &opt, adapter); adapter->rx_csum = rx_csum; - } else { - adapter->rx_csum = opt.def; - } } { /* Flow Control */ @@ -383,13 +381,9 @@ e1000_check_options(struct e1000_adapter .p = fc_list }} }; - if (num_FlowControl > bd) { int fc = FlowControl[bd]; e1000_validate_option(&fc, &opt, adapter); adapter->hw.fc = adapter->hw.original_fc = fc; - } else { - adapter->hw.fc = adapter->hw.original_fc = opt.def; - } } { /* Transmit Interrupt Delay */ struct e1000_option opt = { @@ -401,13 +395,9 @@ e1000_check_options(struct e1000_adapter .max = MAX_TXDELAY }} }; - if (num_TxIntDelay > bd) { adapter->tx_int_delay = TxIntDelay[bd]; e1000_validate_option(&adapter->tx_int_delay, &opt, adapter); - } else { - adapter->tx_int_delay = opt.def; - } } { /* Transmit Absolute Interrupt Delay */ struct e1000_option opt = { @@ -419,13 +409,9 @@ e1000_check_options(struct e1000_adapter .max = MAX_TXABSDELAY }} }; - if (num_TxAbsIntDelay > bd) { adapter->tx_abs_int_delay = TxAbsIntDelay[bd]; e1000_validate_option(&adapter->tx_abs_int_delay, &opt, adapter); - } else { - adapter->tx_abs_int_delay = opt.def; - } } { /* Receive Interrupt Delay */ struct e1000_option opt = { @@ -437,13 +423,9 @@ e1000_check_options(struct e1000_adapter .max = MAX_RXDELAY }} }; - if (num_RxIntDelay > bd) { adapter->rx_int_delay = RxIntDelay[bd]; e1000_validate_option(&adapter->rx_int_delay, &opt, adapter); - } else { - adapter->rx_int_delay = opt.def; - } } { /* Receive Absolute Interrupt Delay */ struct e1000_option opt = { @@ -455,13 +437,9 @@ e1000_check_options(struct e1000_adapter .max = MAX_RXABSDELAY }} }; - if (num_RxAbsIntDelay > bd) { adapter->rx_abs_int_delay = RxAbsIntDelay[bd]; e1000_validate_option(&adapter->rx_abs_int_delay, &opt, adapter); - } else { - adapter->rx_abs_int_delay = opt.def; - } } { /* Interrupt Throttling Rate */ struct e1000_option opt = { @@ -473,7 +451,6 @@ e1000_check_options(struct e1000_adapter .max = MAX_ITR }} }; - if (num_InterruptThrottleRate > bd) { adapter->itr = InterruptThrottleRate[bd]; switch (adapter->itr) { case 0: @@ -489,9 +466,6 @@ e1000_check_options(struct e1000_adapter adapter); break; } - } else { - adapter->itr = opt.def; - } } switch (adapter->hw.media_type) { @@ -518,17 +492,18 @@ static void __devinit e1000_check_fiber_options(struct e1000_adapter *adapter) { int bd = adapter->bd_number; - if (num_Speed > bd) { + bd = bd > E1000_MAX_NIC ? E1000_MAX_NIC : bd; + if ((Speed[bd] != OPTION_UNSET)) { DPRINTK(PROBE, INFO, "Speed not valid for fiber adapters, " "parameter ignored\n"); } - if (num_Duplex > bd) { + if ((Duplex[bd] != OPTION_UNSET)) { DPRINTK(PROBE, INFO, "Duplex not valid for fiber adapters, " "parameter ignored\n"); } - if ((num_AutoNeg > bd) && (AutoNeg[bd] != 0x20)) { + if ((AutoNeg[bd] != OPTION_UNSET) && (AutoNeg[bd] != 0x20)) { DPRINTK(PROBE, INFO, "AutoNeg other than 1000/Full is " "not valid for fiber adapters, " "parameter ignored\n"); @@ -547,6 +522,7 @@ e1000_check_copper_options(struct e1000_ { int speed, dplx, an; [...3966 lines suppressed...] - rxdr->count = max(ring->rx_pending,(uint32_t)E1000_MIN_RXD); rxdr->count = min(rxdr->count,(uint32_t)(mac_type < e1000_82544 ? E1000_MAX_RXD : E1000_MAX_82544_RXD)); @@ -767,6 +767,7 @@ e1000_reg_test(struct e1000_adapter *ada /* there are several bits on newer hardware that are r/w */ case e1000_82571: case e1000_82572: + case e1000_80003es2lan: toggle = 0x7FFFF3FF; break; case e1000_82573: @@ -1256,6 +1257,10 @@ e1000_integrated_phy_loopback(struct e10 e1000_write_phy_reg(&adapter->hw, PHY_CTRL, 0x9140); /* autoneg off */ e1000_write_phy_reg(&adapter->hw, PHY_CTRL, 0x8140); + } else if (adapter->hw.phy_type == e1000_phy_gg82563) { + e1000_write_phy_reg(&adapter->hw, + GG82563_PHY_KMRN_MODE_CTRL, + 0x1CE); } /* force 1000, set loopback */ e1000_write_phy_reg(&adapter->hw, PHY_CTRL, 0x4140); @@ -1325,6 +1330,7 @@ e1000_set_phy_loopback(struct e1000_adap case e1000_82571: case e1000_82572: case e1000_82573: + case e1000_80003es2lan: return e1000_integrated_phy_loopback(adapter); break; @@ -1405,6 +1411,11 @@ e1000_loopback_cleanup(struct e1000_adap case e1000_82546_rev_3: default: hw->autoneg = TRUE; + if (hw->phy_type == e1000_phy_gg82563) { + e1000_write_phy_reg(hw, + GG82563_PHY_KMRN_MODE_CTRL, + 0x180); + } e1000_read_phy_reg(hw, PHY_CTRL, &phy_reg); if (phy_reg & MII_CR_LOOPBACK) { phy_reg &= ~MII_CR_LOOPBACK; @@ -1640,10 +1651,26 @@ e1000_get_wol(struct net_device *netdev, case E1000_DEV_ID_82546EB_QUAD_COPPER: case E1000_DEV_ID_82545EM_FIBER: case E1000_DEV_ID_82545EM_COPPER: + case E1000_DEV_ID_82546GB_QUAD_COPPER: wol->supported = 0; wol->wolopts = 0; return; + case E1000_DEV_ID_82546GB_QUAD_COPPER_KSP3: + /* device id 10B5 port-A supports wol */ + if (!adapter->ksp3_port_a) { + wol->supported = 0; + return; + } + /* KSP3 does not suppport UCAST wake-ups for any interface */ + wol->supported = WAKE_MCAST | WAKE_BCAST | WAKE_MAGIC; + + if (adapter->wol & E1000_WUFC_EX) + DPRINTK(DRV, ERR, "Interface does not support " + "directed (unicast) frame wake-up packets\n"); + wol->wolopts = 0; + goto do_defaults; + case E1000_DEV_ID_82546EB_FIBER: case E1000_DEV_ID_82546GB_FIBER: case E1000_DEV_ID_82571EB_FIBER: @@ -1658,8 +1685,9 @@ e1000_get_wol(struct net_device *netdev, default: wol->supported = WAKE_UCAST | WAKE_MCAST | WAKE_BCAST | WAKE_MAGIC; - wol->wolopts = 0; + +do_defaults: if (adapter->wol & E1000_WUFC_EX) wol->wolopts |= WAKE_UCAST; if (adapter->wol & E1000_WUFC_MC) @@ -1684,10 +1712,22 @@ e1000_set_wol(struct net_device *netdev, case E1000_DEV_ID_82543GC_COPPER: case E1000_DEV_ID_82544EI_FIBER: case E1000_DEV_ID_82546EB_QUAD_COPPER: + case E1000_DEV_ID_82546GB_QUAD_COPPER: case E1000_DEV_ID_82545EM_FIBER: case E1000_DEV_ID_82545EM_COPPER: return wol->wolopts ? -EOPNOTSUPP : 0; + case E1000_DEV_ID_82546GB_QUAD_COPPER_KSP3: + /* device id 10B5 port-A supports wol */ + if (!adapter->ksp3_port_a) + return wol->wolopts ? -EOPNOTSUPP : 0; + + if (wol->wolopts & WAKE_UCAST) { + DPRINTK(DRV, ERR, "Interface does not support " + "directed (unicast) frame wake-up packets\n"); + return -EOPNOTSUPP; + } + case E1000_DEV_ID_82546EB_FIBER: case E1000_DEV_ID_82546GB_FIBER: case E1000_DEV_ID_82571EB_FIBER: @@ -1710,6 +1750,7 @@ e1000_set_wol(struct net_device *netdev, adapter->wol |= E1000_WUFC_BC; if (wol->wolopts & WAKE_MAGIC) adapter->wol |= E1000_WUFC_MAG; + } return 0; @@ -1799,11 +1840,6 @@ e1000_get_ethtool_stats(struct net_devic struct ethtool_stats *stats, uint64_t *data) { struct e1000_adapter *adapter = netdev_priv(netdev); -#ifdef CONFIG_E1000_MQ - uint64_t *queue_stat; - int stat_count = sizeof(struct e1000_queue_stats) / sizeof(uint64_t); - int j, k; -#endif int i; e1000_update_stats(adapter); @@ -1812,29 +1848,12 @@ e1000_get_ethtool_stats(struct net_devic data[i] = (e1000_gstrings_stats[i].sizeof_stat == sizeof(uint64_t)) ? *(uint64_t *)p : *(uint32_t *)p; } -#ifdef CONFIG_E1000_MQ - for (j = 0; j < adapter->num_tx_queues; j++) { - queue_stat = (uint64_t *)&adapter->tx_ring[j].tx_stats; - for (k = 0; k < stat_count; k++) - data[i + k] = queue_stat[k]; - i += k; - } - for (j = 0; j < adapter->num_rx_queues; j++) { - queue_stat = (uint64_t *)&adapter->rx_ring[j].rx_stats; - for (k = 0; k < stat_count; k++) - data[i + k] = queue_stat[k]; - i += k; - } -#endif /* BUG_ON(i != E1000_STATS_LEN); */ } static void e1000_get_strings(struct net_device *netdev, uint32_t stringset, uint8_t *data) { -#ifdef CONFIG_E1000_MQ - struct e1000_adapter *adapter = netdev_priv(netdev); -#endif uint8_t *p = data; int i; @@ -1849,20 +1868,6 @@ e1000_get_strings(struct net_device *net ETH_GSTRING_LEN); p += ETH_GSTRING_LEN; } -#ifdef CONFIG_E1000_MQ - for (i = 0; i < adapter->num_tx_queues; i++) { - sprintf(p, "tx_queue_%u_packets", i); - p += ETH_GSTRING_LEN; - sprintf(p, "tx_queue_%u_bytes", i); - p += ETH_GSTRING_LEN; - } - for (i = 0; i < adapter->num_rx_queues; i++) { - sprintf(p, "rx_queue_%u_packets", i); - p += ETH_GSTRING_LEN; - sprintf(p, "rx_queue_%u_bytes", i); - p += ETH_GSTRING_LEN; - } -#endif /* BUG_ON(p - data != E1000_STATS_LEN * ETH_GSTRING_LEN); */ break; } @@ -1889,7 +1894,7 @@ static struct ethtool_ops e1000_ethtool_ .set_pauseparam = e1000_set_pauseparam, .get_rx_csum = e1000_get_rx_csum, .set_rx_csum = e1000_set_rx_csum, - .get_tx_csum = e1000_get_tx_csum, + .get_tx_csum = e1000_get_tx_csum, .set_tx_csum = e1000_set_tx_csum, .get_sg = ethtool_op_get_sg, .set_sg = ethtool_op_set_sg, @@ -1903,10 +1908,12 @@ static struct ethtool_ops e1000_ethtool_ .phys_id = e1000_phys_id, .get_stats_count = e1000_get_stats_count, .get_ethtool_stats = e1000_get_ethtool_stats, - .get_perm_addr = ethtool_op_get_perm_addr, +#ifdef ETHTOOL_GPERMADDR + .get_perm_addr = ethtool_op_get_perm_addr, +#endif }; - -void e1000_set_ethtool_ops(struct net_device *netdev) + +void set_ethtool_ops(struct net_device *netdev) { SET_ETHTOOL_OPS(netdev, &e1000_ethtool_ops); } jwltest-ipw2200-hwcrypto-off.patch: ipw2200.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) --- NEW FILE jwltest-ipw2200-hwcrypto-off.patch --- --- linux-2.6.15.noarch/drivers/net/wireless/ipw2200.c.orig 2006-02-14 14:43:12.000000000 -0500 +++ linux-2.6.15.noarch/drivers/net/wireless/ipw2200.c 2006-02-14 14:55:29.000000000 -0500 @@ -55,7 +55,7 @@ static int associate = 1; static int auto_create = 1; static int led = 0; static int disable = 0; -static int hwcrypto = 1; +static int hwcrypto = 0; static const char ipw_modes[] = { 'a', 'b', 'g', '?' }; @@ -7058,8 +7058,7 @@ static int ipw_associate_network(struct priv->assoc_request.auth_key = priv->ieee->sec.active_key; if ((priv->capability & CAP_PRIVACY_ON) && - (priv->ieee->sec.level == SEC_LEVEL_1) && - !(priv->ieee->host_encrypt || priv->ieee->host_decrypt)) + (priv->ieee->sec.level == SEC_LEVEL_1)) ipw_send_wep_keys(priv, DCW_WEP_KEY_SEC_TYPE_WEP); } else { priv->assoc_request.auth_type = AUTH_OPEN; @@ -11285,7 +11284,7 @@ MODULE_PARM_DESC(mode, "network mode (0= #endif module_param(hwcrypto, int, 0444); -MODULE_PARM_DESC(hwcrypto, "enable hardware crypto (default on)"); +MODULE_PARM_DESC(hwcrypto, "enable hardware crypto (default off)"); module_param(cmdlog, int, 0444); MODULE_PARM_DESC(cmdlog, jwltest-sk98lin-neuter.patch: skge.c | 2 -- 1 files changed, 2 deletions(-) --- NEW FILE jwltest-sk98lin-neuter.patch --- --- linux-2.6.13/drivers/net/sk98lin/skge.c.orig 2005-10-20 15:19:17.000000000 -0400 +++ linux-2.6.13/drivers/net/sk98lin/skge.c 2005-10-20 15:19:25.000000000 -0400 @@ -5227,8 +5227,6 @@ { 0 } }; -MODULE_DEVICE_TABLE(pci, skge_pci_tbl); - static struct pci_driver skge_driver = { .name = "sk98lin", .id_table = skge_pci_tbl, jwltest-tg3-3_50.patch: drivers/net/tg3.c | 100 +++++++++++++++++++++++++++++++++++++++--------- include/linux/pci_ids.h | 2 2 files changed, 84 insertions(+), 18 deletions(-) --- NEW FILE jwltest-tg3-3_50.patch --- --- linux-2.6.15.noarch/include/linux/pci_ids.h.orig 2006-02-16 15:56:23.000000000 -0500 +++ linux-2.6.15.noarch/include/linux/pci_ids.h 2006-02-16 15:56:17.000000000 -0500 @@ -1861,12 +1861,14 @@ #define PCI_DEVICE_ID_TIGON3_5705M 0x165d #define PCI_DEVICE_ID_TIGON3_5705M_2 0x165e #define PCI_DEVICE_ID_TIGON3_5714 0x1668 +#define PCI_DEVICE_ID_TIGON3_5714S 0x1669 #define PCI_DEVICE_ID_TIGON3_5780 0x166a #define PCI_DEVICE_ID_TIGON3_5780S 0x166b #define PCI_DEVICE_ID_TIGON3_5705F 0x166e #define PCI_DEVICE_ID_TIGON3_5750 0x1676 #define PCI_DEVICE_ID_TIGON3_5751 0x1677 #define PCI_DEVICE_ID_TIGON3_5715 0x1678 +#define PCI_DEVICE_ID_TIGON3_5715S 0x1679 #define PCI_DEVICE_ID_TIGON3_5750M 0x167c #define PCI_DEVICE_ID_TIGON3_5751M 0x167d #define PCI_DEVICE_ID_TIGON3_5751F 0x167e --- linux-2.6.15.noarch/drivers/net/tg3.c.orig 2006-02-16 15:55:22.000000000 -0500 +++ linux-2.6.15.noarch/drivers/net/tg3.c 2006-02-16 15:55:22.000000000 -0500 @@ -69,8 +69,8 @@ #define DRV_MODULE_NAME "tg3" #define PFX DRV_MODULE_NAME ": " -#define DRV_MODULE_VERSION "3.49" -#define DRV_MODULE_RELDATE "Feb 2, 2006" +#define DRV_MODULE_VERSION "3.50" +#define DRV_MODULE_RELDATE "Feb 4, 2006" #define TG3_DEF_MAC_MODE 0 #define TG3_DEF_RX_MODE 0 @@ -223,8 +223,12 @@ static struct pci_device_id tg3_pci_tbl[ PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL }, { PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5714, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL }, + { PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5714S, + PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL }, { PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5715, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL }, + { PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5715S, + PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL }, { PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5780, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL }, { PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5780S, @@ -1038,9 +1042,11 @@ static void tg3_frob_aux_power(struct tg struct net_device *dev_peer; dev_peer = pci_get_drvdata(tp->pdev_peer); + /* remove_one() may have been run on the peer. */ if (!dev_peer) - BUG(); - tp_peer = netdev_priv(dev_peer); + tp_peer = tp; + else + tp_peer = netdev_priv(dev_peer); } if ((tp->tg3_flags & TG3_FLAG_WOL_ENABLE) != 0 || @@ -1131,7 +1137,7 @@ static int tg3_halt_cpu(struct tg3 *, u3 static int tg3_nvram_lock(struct tg3 *); static void tg3_nvram_unlock(struct tg3 *); -static int tg3_set_power_state(struct tg3 *tp, int state) +static int tg3_set_power_state(struct tg3 *tp, pci_power_t state) { u32 misc_host_ctrl; u16 power_control, power_caps; @@ -1150,7 +1156,7 @@ static int tg3_set_power_state(struct tg power_control |= PCI_PM_CTRL_PME_STATUS; power_control &= ~(PCI_PM_CTRL_STATE_MASK); switch (state) { - case 0: + case PCI_D0: power_control |= 0; pci_write_config_word(tp->pdev, pm + PCI_PM_CTRL, @@ -1163,15 +1169,15 @@ static int tg3_set_power_state(struct tg return 0; - case 1: + case PCI_D1: power_control |= 1; break; - case 2: + case PCI_D2: power_control |= 2; break; - case 3: + case PCI_D3hot: power_control |= 3; break; @@ -2680,6 +2686,12 @@ static int tg3_setup_fiber_mii_phy(struc err |= tg3_readphy(tp, MII_BMSR, &bmsr); err |= tg3_readphy(tp, MII_BMSR, &bmsr); + if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5714) { + if (tr32(MAC_TX_STATUS) & TX_STATUS_LINK_UP) + bmsr |= BMSR_LSTATUS; + else + bmsr &= ~BMSR_LSTATUS; + } err |= tg3_readphy(tp, MII_BMCR, &bmcr); @@ -2748,6 +2760,13 @@ static int tg3_setup_fiber_mii_phy(struc bmcr = new_bmcr; err |= tg3_readphy(tp, MII_BMSR, &bmsr); err |= tg3_readphy(tp, MII_BMSR, &bmsr); + if (GET_ASIC_REV(tp->pci_chip_rev_id) == + ASIC_REV_5714) { + if (tr32(MAC_TX_STATUS) & TX_STATUS_LINK_UP) + bmsr |= BMSR_LSTATUS; + else + bmsr &= ~BMSR_LSTATUS; + } tp->tg3_flags2 &= ~TG3_FLG2_PARALLEL_DETECT; } } @@ -5568,6 +5587,9 @@ static int tg3_reset_hw(struct tg3 *tp) tg3_abort_hw(tp, 1); } + if (tp->tg3_flags2 & TG3_FLG2_MII_SERDES) + tg3_phy_reset(tp); + err = tg3_chip_reset(tp); if (err) return err; @@ -6080,6 +6102,17 @@ static int tg3_reset_hw(struct tg3 *tp) tp->tg3_flags2 |= TG3_FLG2_HW_AUTONEG; } + if ((tp->tg3_flags2 & TG3_FLG2_MII_SERDES) && + (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5714)) { + u32 tmp; + + tmp = tr32(SERDES_RX_CTRL); + tw32(SERDES_RX_CTRL, tmp | SERDES_RX_SIG_DETECT); + tp->grc_local_ctrl &= ~GRC_LCLCTRL_USE_EXT_SIG_DETECT; + tp->grc_local_ctrl |= GRC_LCLCTRL_USE_SIG_DETECT; + tw32(GRC_LOCAL_CTRL, tp->grc_local_ctrl); + } + err = tg3_setup_phy(tp, 1); if (err) return err; @@ -6158,7 +6191,7 @@ static int tg3_init_hw(struct tg3 *tp) int err; /* Force the chip into D0. */ - err = tg3_set_power_state(tp, 0); + err = tg3_set_power_state(tp, PCI_D0); if (err) goto out; @@ -6445,6 +6478,10 @@ static int tg3_open(struct net_device *d tg3_full_lock(tp, 0); + err = tg3_set_power_state(tp, PCI_D0); + if (err) + return err; + tg3_disable_ints(tp); tp->tg3_flags &= ~TG3_FLAG_INIT_COMPLETE; @@ -6459,7 +6496,9 @@ static int tg3_open(struct net_device *d if ((tp->tg3_flags2 & TG3_FLG2_5750_PLUS) && (GET_CHIP_REV(tp->pci_chip_rev_id) != CHIPREV_5750_AX) && - (GET_CHIP_REV(tp->pci_chip_rev_id) != CHIPREV_5750_BX)) { + (GET_CHIP_REV(tp->pci_chip_rev_id) != CHIPREV_5750_BX) && + !((GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5714) && + (tp->pdev_peer == tp->pdev))) { /* All MSI supporting chips should support tagged * status. Assert that this is the case. */ @@ -6822,7 +6861,6 @@ static int tg3_close(struct net_device * tp->tg3_flags &= ~(TG3_FLAG_INIT_COMPLETE | TG3_FLAG_GOT_SERDES_FLOWCTL); - netif_carrier_off(tp->dev); tg3_full_unlock(tp); @@ -6839,6 +6877,10 @@ static int tg3_close(struct net_device * tg3_free_consistent(tp); + tg3_set_power_state(tp, PCI_D3hot); + + netif_carrier_off(tp->dev); + return 0; } @@ -7157,6 +7199,9 @@ static void tg3_get_regs(struct net_devi memset(p, 0, TG3_REGDUMP_LEN); + if (tp->link_config.phy_is_low_power) + return; + tg3_full_lock(tp, 0); #define __GET_REG32(reg) (*(p)++ = tr32(reg)) @@ -7231,6 +7276,9 @@ static int tg3_get_eeprom(struct net_dev u8 *pd; u32 i, offset, len, val, b_offset, b_count; + if (tp->link_config.phy_is_low_power) + return -EAGAIN; + offset = eeprom->offset; len = eeprom->len; eeprom->len = 0; @@ -7292,6 +7340,9 @@ static int tg3_set_eeprom(struct net_dev u32 offset, len, b_offset, odd_len, start, end; u8 *buf; + if (tp->link_config.phy_is_low_power) + return -EAGAIN; + if (eeprom->magic != TG3_EEPROM_MAGIC) return -EINVAL; @@ -8212,6 +8263,9 @@ static void tg3_self_test(struct net_dev { struct tg3 *tp = netdev_priv(dev); + if (tp->link_config.phy_is_low_power) + tg3_set_power_state(tp, PCI_D0); + memset(data, 0, sizeof(u64) * TG3_NUM_TEST); if (tg3_test_nvram(tp) != 0) { @@ -8269,6 +8323,9 @@ static void tg3_self_test(struct net_dev tg3_full_unlock(tp); } + if (tp->link_config.phy_is_low_power) + tg3_set_power_state(tp, PCI_D3hot); + } static int tg3_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) @@ -8288,6 +8345,9 @@ static int tg3_ioctl(struct net_device * if (tp->tg3_flags2 & TG3_FLG2_PHY_SERDES) break; /* We have no PHY */ + if (tp->link_config.phy_is_low_power) + return -EAGAIN; + spin_lock_bh(&tp->lock); err = tg3_readphy(tp, data->reg_num & 0x1f, &mii_regval); spin_unlock_bh(&tp->lock); @@ -8304,6 +8364,9 @@ static int tg3_ioctl(struct net_device * if (!capable(CAP_NET_ADMIN)) return -EPERM; + if (tp->link_config.phy_is_low_power) + return -EAGAIN; + spin_lock_bh(&tp->lock); err = tg3_writephy(tp, data->reg_num & 0x1f, data->val_in); spin_unlock_bh(&tp->lock); @@ -9718,7 +9781,7 @@ static int __devinit tg3_get_invariants( tp->grc_local_ctrl |= GRC_LCLCTRL_GPIO_OE3; /* Force the chip into D0. */ - err = tg3_set_power_state(tp, 0); + err = tg3_set_power_state(tp, PCI_D0); if (err) { printk(KERN_ERR PFX "(%s) transition to D0 failed\n", pci_name(tp->pdev)); @@ -10771,11 +10834,12 @@ static int __devinit tg3_init_one(struct tp->tg3_flags2 |= TG3_FLG2_TSO_CAPABLE; } - /* TSO is off by default, user can enable using ethtool. */ -#if 0 - if (tp->tg3_flags2 & TG3_FLG2_TSO_CAPABLE) + /* TSO is on by default on chips that support hardware TSO. + * Firmware TSO on older chips gives lower performance, so it + * is off by default, but can be enabled using ethtool. + */ + if (tp->tg3_flags2 & TG3_FLG2_HW_TSO) dev->features |= NETIF_F_TSO; -#endif #endif @@ -10968,7 +11032,7 @@ static int tg3_resume(struct pci_dev *pd pci_restore_state(tp->pdev); - err = tg3_set_power_state(tp, 0); + err = tg3_set_power_state(tp, PCI_D0); if (err) return err; Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.2009 retrieving revision 1.2009.2.1 diff -u -r1.2009 -r1.2009.2.1 --- kernel-2.6.spec 2 Mar 2006 19:26:10 -0000 1.2009 +++ kernel-2.6.spec 2 Mar 2006 23:42:23 -0000 1.2009.2.1 @@ -24,7 +24,8 @@ %define sublevel 15 %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.12 %define release %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})_FC5%{rhbsys} %define signmodules 0 %define make_target bzImage @@ -162,7 +163,8 @@ License: GPLv2 Version: %{rpmversion} Release: %{release} -ExclusiveArch: noarch %{all_x86} x86_64 ppc ppc64 ia64 sparc sparc64 ppc64iseries s390 s390x +#ExclusiveArch: noarch %{all_x86} x86_64 ppc ppc64 ia64 sparc sparc64 ppc64iseries s390 s390x +ExclusiveArch: noarch %{all_x86} x86_64 ppc ppc64 ExclusiveOS: Linux Provides: kernel = %{version} Provides: kernel-drm = 4.3.0 @@ -245,6 +247,7 @@ Patch317: linux-2.6-ppc-iseries-input-layer.patch # 400 - 499 ia64 + # 500 - 599 s390(x) # 600 - 699 sparc(64) @@ -339,6 +342,10 @@ Patch1302: linux-2.6-net-wireless-features.patch Patch1303: linux-2.6-net-ipw2200-hwcrypto.patch Patch1304: linux-2.6-net-ipw2200-monitor.patch +Patch1305: jwltest-sk98lin-neuter.patch +Patch1306: jwltest-e1000-7_0_33-k2.patch +Patch1307: jwltest-tg3-3_50.patch +Patch1308: jwltest-sky2-1_0.patch # Squashfs Patch1400: linux-2.6-squashfs.patch @@ -401,7 +408,6 @@ # Broadcom wireless driver Patch5000: linux-2.6-softmac-git.patch Patch5001: linux-2.6-bcm43xx-git.patch -Patch5002: linux-2.6-bcm-warnings.patch # # 10000 to 20000 is for stuff that has to come last due to the @@ -908,6 +914,14 @@ %patch1303 -p1 # add IPW2200_MONITOR config option %patch1304 -p1 +# neuter sk98lin (as far as userland is concerned) +%patch1305 -p1 +# update e1000 to 7.0.33-k2(-pre) +#%patch1306 -p1 +# update tg3 to 3.50 +%patch1307 -p1 +# update sky2 to 1.0-pre1 +%patch1308 -p1 # Squashfs %patch1400 -p1 @@ -1000,8 +1014,6 @@ %patch5000 -p1 # ... and bcm43xx driver too %patch5001 -p1 -# warning fix. -%patch5002 -p1 # # final stuff linux-2.6-bcm43xx-git.patch: Documentation/networking/bcm43xx.txt | 36 drivers/net/wireless/Kconfig | 6 drivers/net/wireless/Makefile | 1 drivers/net/wireless/bcm43xx/Kconfig | 62 drivers/net/wireless/bcm43xx/Makefile | 11 drivers/net/wireless/bcm43xx/bcm43xx.h | 955 +++++ drivers/net/wireless/bcm43xx/bcm43xx_debugfs.c | 503 ++ drivers/net/wireless/bcm43xx/bcm43xx_debugfs.h | 117 drivers/net/wireless/bcm43xx/bcm43xx_dma.c | 989 +++++ drivers/net/wireless/bcm43xx/bcm43xx_dma.h | 221 + drivers/net/wireless/bcm43xx/bcm43xx_ethtool.c | 50 drivers/net/wireless/bcm43xx/bcm43xx_ethtool.h | 8 drivers/net/wireless/bcm43xx/bcm43xx_ilt.c | 367 ++ drivers/net/wireless/bcm43xx/bcm43xx_ilt.h | 34 drivers/net/wireless/bcm43xx/bcm43xx_leds.c | 287 + drivers/net/wireless/bcm43xx/bcm43xx_leds.h | 56 drivers/net/wireless/bcm43xx/bcm43xx_main.c | 4364 +++++++++++++++++++++++++ drivers/net/wireless/bcm43xx/bcm43xx_main.h | 283 + drivers/net/wireless/bcm43xx/bcm43xx_phy.c | 2122 ++++++++++++ drivers/net/wireless/bcm43xx/bcm43xx_phy.h | 74 drivers/net/wireless/bcm43xx/bcm43xx_pio.c | 603 +++ drivers/net/wireless/bcm43xx/bcm43xx_pio.h | 138 drivers/net/wireless/bcm43xx/bcm43xx_power.c | 358 ++ drivers/net/wireless/bcm43xx/bcm43xx_power.h | 47 drivers/net/wireless/bcm43xx/bcm43xx_radio.c | 1766 ++++++++++ drivers/net/wireless/bcm43xx/bcm43xx_radio.h | 94 drivers/net/wireless/bcm43xx/bcm43xx_wx.c | 1070 ++++++ drivers/net/wireless/bcm43xx/bcm43xx_wx.h | 36 net/ieee80211/ieee80211_rx.c | 74 29 files changed, 14731 insertions(+), 1 deletion(-) View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.2 -r 1.2.12.1 linux-2.6-bcm43xx-git.patch Index: linux-2.6-bcm43xx-git.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-bcm43xx-git.patch,v retrieving revision 1.2 retrieving revision 1.2.12.1 diff -u -r1.2 -r1.2.12.1 --- linux-2.6-bcm43xx-git.patch 15 Feb 2006 19:33:35 -0000 1.2 +++ linux-2.6-bcm43xx-git.patch 2 Mar 2006 23:42:23 -0000 1.2.12.1 @@ -1,5 +1,5 @@ ---- /dev/null 2006-01-05 13:17:15.134352320 -0500 -+++ linux-2.6.15.noarch/Documentation/networking/bcm43xx.txt 2006-02-14 17:01:37.000000000 -0500 +--- /dev/null 2006-02-23 13:53:30.750106688 -0500 ++++ linux-2.6.15.noarch/Documentation/networking/bcm43xx.txt 2006-03-02 18:25:19.000000000 -0500 @@ -0,0 +1,36 @@ + + BCM43xx Linux Driver Project @@ -37,8 +37,8 @@ + binary driver files. It supports driver files from Windows, MacOS and + Linux. You can get fwcutter from http://bcm43xx.berlios.de/. + Also, fwcutter comes with a README file for further instructions. ---- /dev/null 2006-01-05 13:17:15.134352320 -0500 -+++ linux-2.6.15.noarch/drivers/net/wireless/bcm43xx/bcm43xx_wx.h 2006-02-14 17:02:06.000000000 -0500 +--- /dev/null 2006-02-23 13:53:30.750106688 -0500 ++++ linux-2.6.15.noarch/drivers/net/wireless/bcm43xx/bcm43xx_wx.h 2006-03-02 18:26:08.000000000 -0500 @@ -0,0 +1,36 @@ +/* + @@ -76,9 +76,9 @@ +extern const struct iw_handler_def bcm43xx_wx_handlers_def; + +#endif /* BCM43xx_WX_H_ */ ---- /dev/null 2006-01-05 13:17:15.134352320 -0500 -+++ linux-2.6.15.noarch/drivers/net/wireless/bcm43xx/bcm43xx.h 2006-02-14 17:02:06.000000000 -0500 -@@ -0,0 +1,934 @@ +--- /dev/null 2006-02-23 13:53:30.750106688 -0500 ++++ linux-2.6.15.noarch/drivers/net/wireless/bcm43xx/bcm43xx.h 2006-03-02 18:26:08.000000000 -0500 +@@ -0,0 +1,955 @@ +#ifndef BCM43xx_H_ +#define BCM43xx_H_ + @@ -100,16 +100,17 @@ + +#define PFX KBUILD_MODNAME ": " + -+#define BCM43xx_SWITCH_CORE_MAX_RETRIES 10 ++#define BCM43xx_SWITCH_CORE_MAX_RETRIES 50 +#define BCM43xx_IRQWAIT_MAX_RETRIES 50 + +#define BCM43xx_IO_SIZE 8192 -+#define BCM43xx_REG_ACTIVE_CORE 0x80 + -+/* Interrupt Control PCI Configuration Register. (Only on PCI cores with rev >= 6) */ -+#define BCM43xx_PCICFG_ICR 0x94 ++/* Active Core PCI Configuration Register. */ ++#define BCM43xx_PCICFG_ACTIVE_CORE 0x80 +/* SPROM control register. */ +#define BCM43xx_PCICFG_SPROMCTL 0x88 ++/* Interrupt Control PCI Configuration Register. (Only on PCI cores with rev >= 6) */ ++#define BCM43xx_PCICFG_ICR 0x94 + +/* MMIO offsets */ +#define BCM43xx_MMIO_DMA1_REASON 0x20 @@ -499,7 +500,6 @@ + +struct net_device; +struct pci_dev; -+struct workqueue_struct; +struct bcm43xx_dmaring; +struct bcm43xx_pioqueue; + @@ -606,6 +606,8 @@ + * 3: tx_CTL2 + */ + u16 txpower[4]; ++ /* Desired TX power in dBm Q5.2 */ ++ u16 txpower_desired; + /* Current Interference Mitigation mode */ + int interfmode; + /* Stack of saved values from the Interference Mitigation code */ @@ -718,7 +720,7 @@ + u32 initialized:1, /* init_board() succeed */ + was_initialized:1, /* for PCI suspend/resume. */ + shutting_down:1, /* free_board() in progress */ -+ pio_mode:1, /* PIO (if true), or DMA (if false) used. */ ++ __using_pio:1, /* Internal, use bcm43xx_using_pio(). */ + bad_frames_preempt:1, /* Use "Bad Frames Preemption" (default off) */ + reg124_set_0x4:1, /* Some variable to keep track of IRQ stuff. */ + powersaving:1, /* TRUE if we are in PowerSaving mode. FALSE otherwise. */ @@ -785,18 +787,10 @@ + + /* Interrupt Service Routine tasklet (bottom-half) */ + struct tasklet_struct isr_tasklet; -+ /* Custom driver work queue. */ -+ struct workqueue_struct *workqueue; + + /* Periodic tasks */ -+ struct work_struct periodic_work0; -+#define BCM43xx_PERIODIC_0_DELAY (HZ * 15) -+ struct work_struct periodic_work1; -+#define BCM43xx_PERIODIC_1_DELAY ((HZ * 60) + HZ / 2) -+ struct work_struct periodic_work2; -+#define BCM43xx_PERIODIC_2_DELAY ((HZ * 120) + HZ) -+ struct work_struct periodic_work3; -+#define BCM43xx_PERIODIC_3_DELAY ((HZ * 30) + HZ / 5) ++ struct timer_list periodic_tasks; ++ unsigned int periodic_state; + + struct work_struct restart_work; + @@ -828,6 +822,33 @@ + return ieee80211softmac_priv(dev); +} + ++ ++/* Helper function, which returns a boolean. ++ * TRUE, if PIO is used; FALSE, if DMA is used. ++ */ ++#if defined(CONFIG_BCM43XX_DMA) && defined(CONFIG_BCM43XX_PIO) ++static inline ++int bcm43xx_using_pio(struct bcm43xx_private *bcm) ++{ ++ return bcm->__using_pio; ++} ++#elif defined(CONFIG_BCM43XX_DMA) ++static inline ++int bcm43xx_using_pio(struct bcm43xx_private *bcm) ++{ ++ return 0; ++} ++#elif defined(CONFIG_BCM43XX_PIO) ++static inline ++int bcm43xx_using_pio(struct bcm43xx_private *bcm) ++{ ++ return 1; ++} ++#else ++# error "Using neither DMA nor PIO? Confused..." ++#endif ++ ++ +static inline +int bcm43xx_num_80211_cores(struct bcm43xx_private *bcm) +{ @@ -1013,8 +1034,8 @@ + }) + +#endif /* BCM43xx_H_ */ ---- /dev/null 2006-01-05 13:17:15.134352320 -0500 -+++ linux-2.6.15.noarch/drivers/net/wireless/bcm43xx/bcm43xx_radio.h 2006-02-14 17:02:06.000000000 -0500 +--- /dev/null 2006-02-23 13:53:30.750106688 -0500 ++++ linux-2.6.15.noarch/drivers/net/wireless/bcm43xx/bcm43xx_radio.h 2006-03-02 18:26:08.000000000 -0500 @@ -0,0 +1,94 @@ +/* + @@ -1110,9 +1131,9 @@ +u16 bcm43xx_radio_calibrationvalue(struct bcm43xx_private *bcm); + +#endif /* BCM43xx_RADIO_H_ */ ---- /dev/null 2006-01-05 13:17:15.134352320 -0500 -+++ linux-2.6.15.noarch/drivers/net/wireless/bcm43xx/bcm43xx_leds.h 2006-02-14 17:02:06.000000000 -0500 -@@ -0,0 +1,47 @@ +--- /dev/null 2006-02-23 13:53:30.750106688 -0500 ++++ linux-2.6.15.noarch/drivers/net/wireless/bcm43xx/bcm43xx_leds.h 2006-03-02 18:26:08.000000000 -0500 +@@ -0,0 +1,56 @@ +#ifndef BCM43xx_LEDS_H_ +#define BCM43xx_LEDS_H_ + @@ -1131,7 +1152,7 @@ +#define bcm43xx_led_index(led) ((int)((led) - (led)->bcm->leds)) + +/* Delay between state changes when blinking in jiffies */ -+#define BCM43xx_LEDBLINK_SLOW (HZ / 2) ++#define BCM43xx_LEDBLINK_SLOW (HZ / 1) +#define BCM43xx_LEDBLINK_MEDIUM (HZ / 4) +#define BCM43xx_LEDBLINK_FAST (HZ / 8) + @@ -1152,6 +1173,15 @@ + BCM43xx_LED_WEIRD,//FIXME + BCM43xx_LED_ASSOC, + BCM43xx_LED_INACTIVE, ++ ++ /* Behaviour values for testing. ++ * With these values it is easier to figure out ++ * the real behaviour of leds, in case the SPROM ++ * is missing information. ++ */ ++ BCM43xx_LED_TEST_BLINKSLOW, ++ BCM43xx_LED_TEST_BLINKMEDIUM, ++ BCM43xx_LED_TEST_BLINKFAST, +}; + +int bcm43xx_leds_init(struct bcm43xx_private *bcm); @@ -1160,8 +1190,8 @@ +void bcm43xx_leds_turn_off(struct bcm43xx_private *bcm); + +#endif /* BCM43xx_LEDS_H_ */ ---- /dev/null 2006-01-05 13:17:15.134352320 -0500 -+++ linux-2.6.15.noarch/drivers/net/wireless/bcm43xx/bcm43xx_ilt.h 2006-02-14 17:02:06.000000000 -0500 +--- /dev/null 2006-02-23 13:53:30.750106688 -0500 ++++ linux-2.6.15.noarch/drivers/net/wireless/bcm43xx/bcm43xx_ilt.h 2006-03-02 18:26:08.000000000 -0500 [...2661 lines suppressed...] + turn_on = 1; @@ -12169,12 +12211,22 @@ + continue; + case BCM43xx_LED_WEIRD: + //TODO -+ turn_on = 0; + break; + case BCM43xx_LED_ASSOC: -+ if (1/*TODO: associated*/) ++ if (bcm->softmac->associated) + turn_on = 1; + break; ++#ifdef CONFIG_BCM43XX_DEBUG ++ case BCM43xx_LED_TEST_BLINKSLOW: ++ bcm43xx_led_blink_start(led, BCM43xx_LEDBLINK_SLOW); ++ continue; ++ case BCM43xx_LED_TEST_BLINKMEDIUM: ++ bcm43xx_led_blink_start(led, BCM43xx_LEDBLINK_MEDIUM); ++ continue; ++ case BCM43xx_LED_TEST_BLINKFAST: ++ bcm43xx_led_blink_start(led, BCM43xx_LEDBLINK_FAST); ++ continue; ++#endif /* CONFIG_BCM43XX_DEBUG */ + default: + assert(0); + }; @@ -12206,9 +12258,9 @@ +} + +/* vim: set ts=8 sw=8 sts=8: */ ---- /dev/null 2006-01-05 13:17:15.134352320 -0500 -+++ linux-2.6.15.noarch/drivers/net/wireless/bcm43xx/bcm43xx_phy.c 2006-02-14 17:02:06.000000000 -0500 -@@ -0,0 +1,2127 @@ +--- /dev/null 2006-02-23 13:53:30.750106688 -0500 ++++ linux-2.6.15.noarch/drivers/net/wireless/bcm43xx/bcm43xx_phy.c 2006-03-02 18:26:08.000000000 -0500 +@@ -0,0 +1,2122 @@ +/* + + Broadcom BCM43xx wireless driver @@ -13979,14 +14031,9 @@ + where REG is the max power as per the regulatory domain + */ + -+ /*TODO: Get desired_pwr from wx_handlers or the stack -+ limit_value(desired_pwr, 0, max_pwr); -+ */ -+ -+ desired_pwr = max_pwr; /* remove this when we have a real desired_pwr */ -+ ++ desired_pwr = limit_value(radio->txpower_desired, 0, max_pwr); ++ /* Check if we need to adjust the current power. */ + pwr_adjust = desired_pwr - estimated_pwr; -+ + radio_att_delta = -(pwr_adjust + 7) >> 3; + baseband_att_delta = -(pwr_adjust >> 1) - (4 * radio_att_delta); + if ((radio_att_delta == 0) && (baseband_att_delta == 0)) { @@ -14336,9 +14383,9 @@ + + phy->antenna_diversity = antennadiv; +} ---- /dev/null 2006-01-05 13:17:15.134352320 -0500 -+++ linux-2.6.15.noarch/drivers/net/wireless/bcm43xx/bcm43xx_dma.h 2006-02-14 17:02:06.000000000 -0500 -@@ -0,0 +1,175 @@ +--- /dev/null 2006-02-23 13:53:30.750106688 -0500 ++++ linux-2.6.15.noarch/drivers/net/wireless/bcm43xx/bcm43xx_dma.h 2006-03-02 18:26:08.000000000 -0500 +@@ -0,0 +1,221 @@ +#ifndef BCM43xx_DMA_H_ +#define BCM43xx_DMA_H_ + @@ -14435,6 +14482,10 @@ +#define BCM43xx_TXRESUME_PERCENT 50 + + ++ ++#ifdef CONFIG_BCM43XX_DMA ++ ++ +struct sk_buff; +struct bcm43xx_private; +struct bcm43xx_xmitstatus; @@ -14513,9 +14564,51 @@ + struct ieee80211_txb *txb); +void bcm43xx_dma_rx(struct bcm43xx_dmaring *ring); + ++ ++#else /* CONFIG_BCM43XX_DMA */ ++ ++ ++static inline ++int bcm43xx_dma_init(struct bcm43xx_private *bcm) ++{ ++ return 0; ++} ++static inline ++void bcm43xx_dma_free(struct bcm43xx_private *bcm) ++{ ++} ++static inline ++int bcm43xx_dmacontroller_rx_reset(struct bcm43xx_private *bcm, ++ u16 dmacontroller_mmio_base) ++{ ++ return 0; ++} ++static inline ++int bcm43xx_dmacontroller_tx_reset(struct bcm43xx_private *bcm, ++ u16 dmacontroller_mmio_base) ++{ ++ return 0; ++} ++static inline ++int bcm43xx_dma_tx(struct bcm43xx_private *bcm, ++ struct ieee80211_txb *txb) ++{ ++ return 0; ++} ++static inline ++void bcm43xx_dma_handle_xmitstatus(struct bcm43xx_private *bcm, ++ struct bcm43xx_xmitstatus *status) ++{ ++} ++static inline ++void bcm43xx_dma_rx(struct bcm43xx_dmaring *ring) ++{ ++} ++ ++#endif /* CONFIG_BCM43XX_DMA */ +#endif /* BCM43xx_DMA_H_ */ ---- /dev/null 2006-01-05 13:17:15.134352320 -0500 -+++ linux-2.6.15.noarch/drivers/net/wireless/bcm43xx/bcm43xx_debugfs.h 2006-02-14 17:02:06.000000000 -0500 +--- /dev/null 2006-02-23 13:53:30.750106688 -0500 ++++ linux-2.6.15.noarch/drivers/net/wireless/bcm43xx/bcm43xx_debugfs.h 2006-03-02 18:26:08.000000000 -0500 @@ -0,0 +1,117 @@ +#ifndef BCM43xx_DEBUGFS_H_ +#define BCM43xx_DEBUGFS_H_ @@ -14634,9 +14727,9 @@ + } while (0) + +#endif /* BCM43xx_DEBUGFS_H_ */ ---- linux-2.6.15.noarch/drivers/net/wireless/Makefile.orig 2006-02-14 17:01:26.000000000 -0500 -+++ linux-2.6.15.noarch/drivers/net/wireless/Makefile 2006-02-14 17:02:17.000000000 -0500 -@@ -35,6 +35,7 @@ obj-$(CONFIG_PCI_ATMEL) += atmel +--- linux-2.6.15.noarch/drivers/net/wireless/Makefile.orig 2006-03-02 18:24:56.000000000 -0500 ++++ linux-2.6.15.noarch/drivers/net/wireless/Makefile 2006-03-02 18:31:34.000000000 -0500 +@@ -35,6 +35,7 @@ obj-$(CONFIG_PCMCIA_ATMEL) += atmel obj-$(CONFIG_PRISM54) += prism54/ obj-$(CONFIG_HOSTAP) += hostap/ @@ -14644,34 +14737,30 @@ # 16-bit wireless PCMCIA client drivers obj-$(CONFIG_PCMCIA_RAYCS) += ray_cs.o ---- linux-2.6.15.noarch/drivers/net/wireless/Kconfig.orig 2006-02-14 17:01:26.000000000 -0500 -+++ linux-2.6.15.noarch/drivers/net/wireless/Kconfig 2006-02-14 17:02:17.000000000 -0500 -@@ -471,6 +489,23 @@ config PRISM54 +--- linux-2.6.15.noarch/drivers/net/wireless/Kconfig.orig 2006-03-02 18:24:56.000000000 -0500 ++++ linux-2.6.15.noarch/drivers/net/wireless/Kconfig 2006-03-02 18:31:01.000000000 -0500 +@@ -291,7 +291,10 @@ config APPLE_AIRPORT + Say Y here to support the Airport 802.11b wireless Ethernet hardware + built into the Macintosh iBook and other recent PowerPC-based + Macintosh machines. This is essentially a Lucent Orinoco card with +- a non-standard interface ++ a non-standard interface. ++ ++ This driver does not support the Airport Extreme (802.11b/g). Use ++ the BCM43xx driver for Airport Extreme cards. + + config PLX_HERMES + tristate "Hermes in PLX9052 based PCI adaptor support (Netgear MA301 etc.)" +@@ -481,6 +484,7 @@ config PRISM54 will be called prism54.ko. source "drivers/net/wireless/hostap/Kconfig" -+ -+config BCM43XX -+ tristate "Broadcom BCM43xx wireless support" -+ depends on PCI && IEEE80211 && NET_RADIO && IEEE80211_SOFTMAC && EXPERIMENTAL -+ select FW_LOADER -+ ---help--- -+ This is an experimental driver for the Broadcom 43xx wireless chip, -+ found in the Apple Airport Extreme and various other devices. -+ -+config BCM43XX_DEBUG -+ bool "Broadcom BCM43xx debugging (RECOMMENDED)" -+ depends on BCM43XX -+ default y -+ ---help--- -+ Broadcom 43xx debugging messages. -+ Say Y, because the driver is still very experimental and -+ this will help you get it running. ++source "drivers/net/wireless/bcm43xx/Kconfig" # yes, this works even when no drivers are selected config NET_WIRELESS ---- linux-2.6.15.noarch/net/ieee80211/ieee80211_rx.c.orig 2006-02-14 16:59:31.000000000 -0500 -+++ linux-2.6.15.noarch/net/ieee80211/ieee80211_rx.c 2006-02-14 17:01:12.000000000 -0500 +--- linux-2.6.15.noarch/net/ieee80211/ieee80211_rx.c.orig 2006-03-02 18:24:56.000000000 -0500 ++++ linux-2.6.15.noarch/net/ieee80211/ieee80211_rx.c 2006-03-02 18:25:19.000000000 -0500 @@ -773,6 +773,80 @@ int ieee80211_rx(struct ieee80211_device return 0; } linux-2.6-softmac-git.patch: include/net/ieee80211.h | 8 include/net/ieee80211softmac.h | 292 ++++++++++++++ include/net/ieee80211softmac_wx.h | 94 ++++ net/ieee80211/Kconfig | 1 net/ieee80211/Makefile | 1 net/ieee80211/ieee80211_crypt_ccmp.c | 8 net/ieee80211/ieee80211_crypt_tkip.c | 53 +- net/ieee80211/ieee80211_module.c | 2 net/ieee80211/ieee80211_wx.c | 89 ++++ net/ieee80211/softmac/Kconfig | 10 net/ieee80211/softmac/Makefile | 9 net/ieee80211/softmac/ieee80211softmac_assoc.c | 403 ++++++++++++++++++++ net/ieee80211/softmac/ieee80211softmac_auth.c | 376 +++++++++++++++++++ net/ieee80211/softmac/ieee80211softmac_event.c | 159 ++++++++ net/ieee80211/softmac/ieee80211softmac_io.c | 474 ++++++++++++++++++++++++ net/ieee80211/softmac/ieee80211softmac_module.c | 457 +++++++++++++++++++++++ net/ieee80211/softmac/ieee80211softmac_priv.h | 239 ++++++++++++ net/ieee80211/softmac/ieee80211softmac_scan.c | 237 ++++++++++++ net/ieee80211/softmac/ieee80211softmac_wx.c | 412 ++++++++++++++++++++ 19 files changed, 3290 insertions(+), 34 deletions(-) Index: linux-2.6-softmac-git.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-softmac-git.patch,v retrieving revision 1.8 retrieving revision 1.8.2.1 diff -u -r1.8 -r1.8.2.1 --- linux-2.6-softmac-git.patch 1 Mar 2006 16:54:12 -0000 1.8 +++ linux-2.6-softmac-git.patch 2 Mar 2006 23:42:23 -0000 1.8.2.1 @@ -1,5 +1,5 @@ ---- /dev/null 2006-02-15 08:17:09.135048168 -0500 -+++ linux-2.6.15.noarch/include/net/ieee80211softmac_wx.h 2006-02-15 10:04:26.000000000 -0500 +--- /dev/null 2006-02-23 13:53:30.750106688 -0500 ++++ linux-2.6.15.noarch/include/net/ieee80211softmac_wx.h 2006-03-02 18:06:48.000000000 -0500 @@ -0,0 +1,94 @@ +/* + * This file contains the prototypes for the wireless extension @@ -95,8 +95,8 @@ + union iwreq_data *wrqu, + char *extra); +#endif /* _IEEE80211SOFTMAC_WX */ ---- linux-2.6.15.noarch/include/net/ieee80211.h.orig 2006-02-15 09:58:15.000000000 -0500 -+++ linux-2.6.15.noarch/include/net/ieee80211.h 2006-02-15 09:58:21.000000000 -0500 +--- linux-2.6.15.noarch/include/net/ieee80211.h.orig 2006-03-02 18:06:39.000000000 -0500 ++++ linux-2.6.15.noarch/include/net/ieee80211.h 2006-03-02 18:06:48.000000000 -0500 @@ -1122,6 +1122,14 @@ extern int ieee80211_wx_set_encodeext(st extern int ieee80211_wx_get_encodeext(struct ieee80211_device *ieee, struct iw_request_info *info, @@ -112,8 +112,8 @@ static inline void ieee80211_increment_scans(struct ieee80211_device *ieee) { ---- /dev/null 2006-02-15 08:17:09.135048168 -0500 -+++ linux-2.6.15.noarch/include/net/ieee80211softmac.h 2006-02-15 10:04:26.000000000 -0500 +--- /dev/null 2006-02-23 13:53:30.750106688 -0500 ++++ linux-2.6.15.noarch/include/net/ieee80211softmac.h 2006-03-02 18:06:48.000000000 -0500 @@ -0,0 +1,292 @@ +/* + * ieee80211softmac.h - public interface to the softmac @@ -407,8 +407,8 @@ +ieee80211softmac_clear_pending_work(struct ieee80211softmac_device *sm); + +#endif /* IEEE80211SOFTMAC_H_ */ ---- linux-2.6.15.noarch/net/ieee80211/ieee80211_module.c.orig 2006-02-15 09:58:15.000000000 -0500 -+++ linux-2.6.15.noarch/net/ieee80211/ieee80211_module.c 2006-02-15 09:58:21.000000000 -0500 +--- linux-2.6.15.noarch/net/ieee80211/ieee80211_module.c.orig 2006-03-02 18:06:39.000000000 -0500 ++++ linux-2.6.15.noarch/net/ieee80211/ieee80211_module.c 2006-03-02 18:06:48.000000000 -0500 @@ -195,7 +195,7 @@ void free_ieee80211(struct net_device *d static int debug = 0; @@ -418,8 +418,8 @@ static int show_debug_level(char *page, char **start, off_t offset, int count, int *eof, void *data) ---- /dev/null 2006-02-15 08:17:09.135048168 -0500 -+++ linux-2.6.15.noarch/net/ieee80211/softmac/ieee80211softmac_auth.c 2006-02-15 10:34:17.000000000 -0500 +--- /dev/null 2006-02-23 13:53:30.750106688 -0500 ++++ linux-2.6.15.noarch/net/ieee80211/softmac/ieee80211softmac_auth.c 2006-03-02 18:10:51.000000000 -0500 @@ -0,0 +1,376 @@ +/* + * This file contains the softmac's authentication logic. @@ -797,8 +797,8 @@ + ieee80211softmac_deauth_from_net(mac, net); + return 0; +} ---- /dev/null 2006-02-15 08:17:09.135048168 -0500 -+++ linux-2.6.15.noarch/net/ieee80211/softmac/ieee80211softmac_module.c 2006-02-15 10:05:40.000000000 -0500 +--- /dev/null 2006-02-23 13:53:30.750106688 -0500 ++++ linux-2.6.15.noarch/net/ieee80211/softmac/ieee80211softmac_module.c 2006-03-02 18:09:17.000000000 -0500 @@ -0,0 +1,457 @@ +/* + * Contains some basic softmac functions along with module registration code etc. @@ -1257,8 +1257,8 @@ +MODULE_AUTHOR("Danny van Dyk"); +MODULE_AUTHOR("Michael Buesch"); +MODULE_DESCRIPTION("802.11 software MAC"); ---- /dev/null 2006-02-15 08:17:09.135048168 -0500 -+++ linux-2.6.15.noarch/net/ieee80211/softmac/ieee80211softmac_priv.h 2006-02-15 10:35:09.000000000 -0500 +--- /dev/null 2006-02-23 13:53:30.750106688 -0500 ++++ linux-2.6.15.noarch/net/ieee80211/softmac/ieee80211softmac_priv.h 2006-03-02 18:11:02.000000000 -0500 @@ -0,0 +1,239 @@ +/* + * Internal softmac API definitions. @@ -1499,8 +1499,8 @@ + int event, void *event_context, notify_function_ptr fun, void *context, gfp_t gfp_mask); + +#endif /* IEEE80211SOFTMAC_PRIV_H_ */ ---- /dev/null 2006-02-15 08:17:09.135048168 -0500 -+++ linux-2.6.15.noarch/net/ieee80211/softmac/Makefile 2006-02-15 10:05:40.000000000 -0500 +--- /dev/null 2006-02-23 13:53:30.750106688 -0500 ++++ linux-2.6.15.noarch/net/ieee80211/softmac/Makefile 2006-03-02 18:09:17.000000000 -0500 @@ -0,0 +1,9 @@ +obj-$(CONFIG_IEEE80211_SOFTMAC) += ieee80211softmac.o +ieee80211softmac-objs := \ @@ -1511,8 +1511,8 @@ + ieee80211softmac_wx.o \ + ieee80211softmac_assoc.o \ + ieee80211softmac_event.o ---- /dev/null 2006-02-15 08:17:09.135048168 -0500 -+++ linux-2.6.15.noarch/net/ieee80211/softmac/ieee80211softmac_io.c 2006-02-15 10:05:40.000000000 -0500 +--- /dev/null 2006-02-23 13:53:30.750106688 -0500 ++++ linux-2.6.15.noarch/net/ieee80211/softmac/ieee80211softmac_io.c 2006-03-02 18:09:17.000000000 -0500 @@ -0,0 +1,474 @@ +/* + * Some parts based on code from net80211 @@ -1988,8 +1988,8 @@ + kfree(pkt); + return 0; +} ---- /dev/null 2006-02-15 08:17:09.135048168 -0500 -+++ linux-2.6.15.noarch/net/ieee80211/softmac/ieee80211softmac_wx.c 2006-02-15 10:05:40.000000000 -0500 +--- /dev/null 2006-02-23 13:53:30.750106688 -0500 ++++ linux-2.6.15.noarch/net/ieee80211/softmac/ieee80211softmac_wx.c 2006-03-02 18:09:17.000000000 -0500 @@ -0,0 +1,412 @@ +/* + * This file contains our _wx handlers. Make sure you EXPORT_SYMBOL_GPL them @@ -2403,8 +2403,8 @@ +} +EXPORT_SYMBOL_GPL(ieee80211softmac_wx_get_genie); + ---- /dev/null 2006-02-15 08:17:09.135048168 -0500 -+++ linux-2.6.15.noarch/net/ieee80211/softmac/Kconfig 2006-02-15 10:05:40.000000000 -0500 +--- /dev/null 2006-02-23 13:53:30.750106688 -0500 ++++ linux-2.6.15.noarch/net/ieee80211/softmac/Kconfig 2006-03-02 18:09:17.000000000 -0500 @@ -0,0 +1,10 @@ +config IEEE80211_SOFTMAC + tristate "Software MAC add-on to the IEEE 802.11 networking stack" @@ -2416,8 +2416,8 @@ +config IEEE80211_SOFTMAC_DEBUG + bool "Enable full debugging output" + depends on IEEE80211_SOFTMAC ---- /dev/null 2006-02-15 08:17:09.135048168 -0500 -+++ linux-2.6.15.noarch/net/ieee80211/softmac/ieee80211softmac_assoc.c 2006-02-15 10:05:40.000000000 -0500 +--- /dev/null 2006-02-23 13:53:30.750106688 -0500 ++++ linux-2.6.15.noarch/net/ieee80211/softmac/ieee80211softmac_assoc.c 2006-03-02 18:09:17.000000000 -0500 @@ -0,0 +1,403 @@ +/* + * This file contains the softmac's association logic. @@ -2822,8 +2822,8 @@ + ieee80211softmac_assoc(mac, network); + return 0; +} ---- /dev/null 2006-02-15 08:17:09.135048168 -0500 -+++ linux-2.6.15.noarch/net/ieee80211/softmac/ieee80211softmac_scan.c 2006-02-15 10:05:40.000000000 -0500 +--- /dev/null 2006-02-23 13:53:30.750106688 -0500 ++++ linux-2.6.15.noarch/net/ieee80211/softmac/ieee80211softmac_scan.c 2006-03-02 18:09:17.000000000 -0500 @@ -0,0 +1,237 @@ +/* + * Scanning routines. @@ -3062,8 +3062,8 @@ + ieee80211softmac_call_events(sm, IEEE80211SOFTMAC_EVENT_SCAN_FINISHED, NULL); +} +EXPORT_SYMBOL_GPL(ieee80211softmac_scan_finished); ---- /dev/null 2006-02-15 08:17:09.135048168 -0500 -+++ linux-2.6.15.noarch/net/ieee80211/softmac/ieee80211softmac_event.c 2006-02-15 10:05:40.000000000 -0500 +--- /dev/null 2006-02-23 13:53:30.750106688 -0500 ++++ linux-2.6.15.noarch/net/ieee80211/softmac/ieee80211softmac_event.c 2006-03-02 18:09:17.000000000 -0500 @@ -0,0 +1,159 @@ +/* + * Event system @@ -3224,15 +3224,146 @@ + + spin_unlock_irqrestore(&mac->lock, flags); +} ---- linux-2.6.15.noarch/net/ieee80211/Makefile.orig 2006-02-15 09:58:15.000000000 -0500 -+++ linux-2.6.15.noarch/net/ieee80211/Makefile 2006-02-15 09:58:21.000000000 -0500 +--- linux-2.6.15.noarch/net/ieee80211/Makefile.orig 2006-03-02 18:06:39.000000000 -0500 ++++ linux-2.6.15.noarch/net/ieee80211/Makefile 2006-03-02 18:06:48.000000000 -0500 @@ -10,3 +10,4 @@ ieee80211-objs := \ ieee80211_wx.o \ ieee80211_geo.o +obj-$(CONFIG_IEEE80211_SOFTMAC) += softmac/ ---- linux-2.6.15.noarch/net/ieee80211/ieee80211_wx.c.orig 2006-02-15 09:58:15.000000000 -0500 -+++ linux-2.6.15.noarch/net/ieee80211/ieee80211_wx.c 2006-02-15 09:58:21.000000000 -0500 +--- linux-2.6.15.noarch/net/ieee80211/ieee80211_crypt_tkip.c.orig 2006-03-02 17:30:49.000000000 -0500 ++++ linux-2.6.15.noarch/net/ieee80211/ieee80211_crypt_tkip.c 2006-03-02 18:06:52.000000000 -0500 +@@ -270,33 +270,34 @@ static void tkip_mixing_phase2(u8 * WEPS + #endif + } + +-static int ieee80211_tkip_hdr(struct sk_buff *skb, int hdr_len, +- u8 * rc4key, int keylen, void *priv) ++static u8 *ieee80211_tkip_hdr(struct sk_buff *skb, int hdr_len, void *priv) + { + struct ieee80211_tkip_data *tkey = priv; + int len; +- u8 *pos; ++ u8 *rc4key, *pos, *icv; + struct ieee80211_hdr_4addr *hdr; ++ u32 crc; + + hdr = (struct ieee80211_hdr_4addr *)skb->data; + + if (skb_headroom(skb) < 8 || skb->len < hdr_len) +- return -1; +- +- if (rc4key == NULL || keylen < 16) +- return -1; ++ return NULL; + + if (!tkey->tx_phase1_done) { + tkip_mixing_phase1(tkey->tx_ttak, tkey->key, hdr->addr2, + tkey->tx_iv32); + tkey->tx_phase1_done = 1; + } ++ rc4key = kmalloc(16, GFP_ATOMIC); ++ if (!rc4key) ++ return NULL; + tkip_mixing_phase2(rc4key, tkey->key, tkey->tx_ttak, tkey->tx_iv16); + + len = skb->len - hdr_len; + pos = skb_push(skb, 8); + memmove(pos, pos + 8, hdr_len); + pos += hdr_len; ++ icv = skb_put(skb, 4); + + *pos++ = *rc4key; + *pos++ = *(rc4key + 1); +@@ -307,28 +308,28 @@ static int ieee80211_tkip_hdr(struct sk_ + *pos++ = (tkey->tx_iv32 >> 16) & 0xff; + *pos++ = (tkey->tx_iv32 >> 24) & 0xff; + +- tkey->tx_iv16++; +- if (tkey->tx_iv16 == 0) { +- tkey->tx_phase1_done = 0; +- tkey->tx_iv32++; +- } ++ crc = ~crc32_le(~0, pos, len); ++ icv[0] = crc; ++ icv[1] = crc >> 8; ++ icv[2] = crc >> 16; ++ icv[3] = crc >> 24; + +- return 8; ++ return rc4key; + } + + static int ieee80211_tkip_encrypt(struct sk_buff *skb, int hdr_len, void *priv) + { + struct ieee80211_tkip_data *tkey = priv; + int len; +- u8 rc4key[16], *pos, *icv; +- u32 crc; ++ const u8 *rc4key; ++ u8 *pos; + struct scatterlist sg; + + if (tkey->flags & IEEE80211_CRYPTO_TKIP_COUNTERMEASURES) { + if (net_ratelimit()) { + struct ieee80211_hdr_4addr *hdr = + (struct ieee80211_hdr_4addr *)skb->data; +- printk(KERN_DEBUG ": TKIP countermeasures: dropped " ++ printk(KERN_DEBUG "TKIP countermeasures: dropped " + "TX packet to " MAC_FMT "\n", + MAC_ARG(hdr->addr1)); + } +@@ -341,23 +342,22 @@ static int ieee80211_tkip_encrypt(struct + len = skb->len - hdr_len; + pos = skb->data + hdr_len; + +- if ((ieee80211_tkip_hdr(skb, hdr_len, rc4key, 16, priv)) < 0) ++ rc4key = ieee80211_tkip_hdr(skb, hdr_len, priv); ++ if (!rc4key) + return -1; + +- icv = skb_put(skb, 4); +- +- crc = ~crc32_le(~0, pos, len); +- icv[0] = crc; +- icv[1] = crc >> 8; +- icv[2] = crc >> 16; +- icv[3] = crc >> 24; +- + crypto_cipher_setkey(tkey->tfm_arc4, rc4key, 16); + sg.page = virt_to_page(pos); + sg.offset = offset_in_page(pos); + sg.length = len + 4; + crypto_cipher_encrypt(tkey->tfm_arc4, &sg, &sg, len + 4); + ++ tkey->tx_iv16++; ++ if (tkey->tx_iv16 == 0) { ++ tkey->tx_phase1_done = 0; ++ tkey->tx_iv32++; ++ } ++ + return 0; + } + +@@ -378,7 +378,7 @@ static int ieee80211_tkip_decrypt(struct + + if (tkey->flags & IEEE80211_CRYPTO_TKIP_COUNTERMEASURES) { + if (net_ratelimit()) { +- printk(KERN_DEBUG ": TKIP countermeasures: dropped " ++ printk(KERN_DEBUG "TKIP countermeasures: dropped " + "received packet from " MAC_FMT "\n", + MAC_ARG(hdr->addr2)); + } +@@ -694,7 +694,6 @@ static struct ieee80211_crypto_ops ieee8 + .name = "TKIP", + .init = ieee80211_tkip_init, + .deinit = ieee80211_tkip_deinit, +- .build_iv = ieee80211_tkip_hdr, + .encrypt_mpdu = ieee80211_tkip_encrypt, + .decrypt_mpdu = ieee80211_tkip_decrypt, + .encrypt_msdu = ieee80211_michael_mic_add, +--- linux-2.6.15.noarch/net/ieee80211/ieee80211_wx.c.orig 2006-03-02 18:06:39.000000000 -0500 ++++ linux-2.6.15.noarch/net/ieee80211/ieee80211_wx.c 2006-03-02 18:06:48.000000000 -0500 @@ -734,9 +734,98 @@ int ieee80211_wx_get_encodeext(struct ie return 0; } @@ -3332,10 +3463,41 @@ + +EXPORT_SYMBOL_GPL(ieee80211_wx_set_auth); +EXPORT_SYMBOL_GPL(ieee80211_wx_get_auth); ---- linux-2.6.15.noarch/net/ieee80211/Kconfig.orig 2006-02-15 09:58:15.000000000 -0500 -+++ linux-2.6.15.noarch/net/ieee80211/Kconfig 2006-02-15 09:58:21.000000000 -0500 +--- linux-2.6.15.noarch/net/ieee80211/Kconfig.orig 2006-03-02 18:06:39.000000000 -0500 ++++ linux-2.6.15.noarch/net/ieee80211/Kconfig 2006-03-02 18:06:48.000000000 -0500 @@ -66,3 +66,4 @@ config IEEE80211_CRYPT_TKIP This can be compiled as a modules and it will be called "ieee80211_crypt_tkip". +source "net/ieee80211/softmac/Kconfig" +--- linux-2.6.15.noarch/net/ieee80211/ieee80211_crypt_ccmp.c.orig 2006-03-02 17:30:49.000000000 -0500 ++++ linux-2.6.15.noarch/net/ieee80211/ieee80211_crypt_ccmp.c 2006-03-02 18:06:52.000000000 -0500 +@@ -190,8 +190,7 @@ static void ccmp_init_blocks(struct cryp + ieee80211_ccmp_aes_encrypt(tfm, b0, s0); + } + +-static int ieee80211_ccmp_hdr(struct sk_buff *skb, int hdr_len, +- u8 *aeskey, int keylen, void *priv) ++static int ieee80211_ccmp_hdr(struct sk_buff *skb, int hdr_len, void *priv) + { + struct ieee80211_ccmp_data *key = priv; + int i; +@@ -200,9 +199,6 @@ static int ieee80211_ccmp_hdr(struct sk_ + if (skb_headroom(skb) < CCMP_HDR_LEN || skb->len < hdr_len) + return -1; + +- if (aeskey != NULL && keylen >= CCMP_TK_LEN) +- memcpy(aeskey, key->key, CCMP_TK_LEN); +- + pos = skb_push(skb, CCMP_HDR_LEN); + memmove(pos, pos + CCMP_HDR_LEN, hdr_len); + pos += hdr_len; +@@ -242,7 +238,7 @@ static int ieee80211_ccmp_encrypt(struct + return -1; + + data_len = skb->len - hdr_len; +- len = ieee80211_ccmp_hdr(skb, hdr_len, NULL, 0, priv); ++ len = ieee80211_ccmp_hdr(skb, hdr_len, priv); + if (len < 0) + return -1; + --- linux-2.6-bcm-warnings.patch DELETED --- From fedora-cvs-commits at redhat.com Thu Mar 2 23:42:57 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 2 Mar 2006 18:42:57 -0500 Subject: rpms/kernel/devel jwltest-sky2-1_0.patch,NONE,1.1.2.1 Message-ID: <200603022342.k22NgvPT011605@cvs.devel.redhat.com> Author: linville Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv11591 Added Files: Tag: private-linville-jwltest-fc5-12-branch jwltest-sky2-1_0.patch Log Message: jwltest-sky2-1_0.patch: sky2.c | 480 +++++++++++++++++++++++++++++++---------------------------------- sky2.h | 20 -- 2 files changed, 243 insertions(+), 257 deletions(-) --- NEW FILE jwltest-sky2-1_0.patch --- --- linux-2.6.15.noarch/drivers/net/sky2.h.orig 2006-03-02 17:12:16.000000000 -0500 +++ linux-2.6.15.noarch/drivers/net/sky2.h 2006-03-02 17:12:01.000000000 -0500 @@ -278,13 +278,9 @@ enum { Y2_IS_CHK_TXS1 = 1<<1, /* Descriptor error TXS 1 */ Y2_IS_CHK_TXA1 = 1<<0, /* Descriptor error TXA 1 */ - Y2_IS_BASE = Y2_IS_HW_ERR | Y2_IS_STAT_BMU | - Y2_IS_POLL_CHK | Y2_IS_TWSI_RDY | - Y2_IS_IRQ_SW | Y2_IS_TIMINT, - Y2_IS_PORT_1 = Y2_IS_IRQ_PHY1 | Y2_IS_IRQ_MAC1 | - Y2_IS_CHK_RX1 | Y2_IS_CHK_TXA1 | Y2_IS_CHK_TXS1, - Y2_IS_PORT_2 = Y2_IS_IRQ_PHY2 | Y2_IS_IRQ_MAC2 | - Y2_IS_CHK_RX2 | Y2_IS_CHK_TXA2 | Y2_IS_CHK_TXS2, + Y2_IS_BASE = Y2_IS_HW_ERR | Y2_IS_STAT_BMU, + Y2_IS_PORT_1 = Y2_IS_IRQ_PHY1 | Y2_IS_IRQ_MAC1, + Y2_IS_PORT_2 = Y2_IS_IRQ_PHY2 | Y2_IS_IRQ_MAC2, }; /* B2_IRQM_HWE_MSK 32 bit IRQ Moderation HW Error Mask */ @@ -1832,6 +1828,7 @@ struct sky2_port { struct net_device *netdev; unsigned port; u32 msg_enable; + spinlock_t phy_lock; spinlock_t tx_lock ____cacheline_aligned_in_smp; struct tx_ring_info *tx_ring; @@ -1840,7 +1837,6 @@ struct sky2_port { u16 tx_prod; /* next le to use */ u32 tx_addr64; u16 tx_pending; - u16 tx_last_put; u16 tx_last_mss; struct ring_info *rx_ring ____cacheline_aligned_in_smp; @@ -1849,7 +1845,6 @@ struct sky2_port { u16 rx_next; /* next re to check */ u16 rx_put; /* next le index to use */ u16 rx_pending; - u16 rx_last_put; u16 rx_bufsize; #ifdef SKY2_VLAN_TAG_USED u16 rx_tag; @@ -1869,18 +1864,16 @@ struct sky2_port { struct net_device_stats net_stats; - struct work_struct phy_task; - struct semaphore phy_sema; }; struct sky2_hw { void __iomem *regs; struct pci_dev *pdev; struct net_device *dev[2]; - spinlock_t hw_lock; - u32 intr_mask; + u32 istatus; int pm_cap; + int msi_detected; u8 chip_id; u8 chip_rev; u8 copper; @@ -1889,6 +1882,7 @@ struct sky2_hw { struct sky2_status_le *st_le; u32 st_idx; dma_addr_t st_dma; + wait_queue_head_t msi_wait; }; /* Register accessor for memory mapped device */ --- linux-2.6.15.noarch/drivers/net/sky2.c.orig 2006-03-02 17:12:13.000000000 -0500 +++ linux-2.6.15.noarch/drivers/net/sky2.c 2006-03-02 17:12:01.000000000 -0500 @@ -51,7 +51,7 @@ #include "sky2.h" #define DRV_NAME "sky2" -#define DRV_VERSION "0.15" +#define DRV_VERSION "1.0-pre1" #define PFX DRV_NAME " " /* @@ -61,10 +61,6 @@ * a receive requires one (or two if using 64 bit dma). */ -#define is_ec_a1(hw) \ - unlikely((hw)->chip_id == CHIP_ID_YUKON_EC && \ - (hw)->chip_rev == CHIP_REV_YU_EC_A1) - #define RX_LE_SIZE 512 #define RX_LE_BYTES (RX_LE_SIZE*sizeof(struct sky2_rx_le)) #define RX_MAX_PENDING (RX_LE_SIZE/2 - 2) @@ -74,14 +70,14 @@ #define TX_RING_SIZE 512 #define TX_DEF_PENDING (TX_RING_SIZE - 1) #define TX_MIN_PENDING 64 -#define MAX_SKB_TX_LE (4 + 2*MAX_SKB_FRAGS) +#define MAX_SKB_TX_LE (4 + (sizeof(dma_addr_t)/sizeof(u32))*MAX_SKB_FRAGS) #define STATUS_RING_SIZE 2048 /* 2 ports * (TX + 2*RX) */ #define STATUS_LE_BYTES (STATUS_RING_SIZE*sizeof(struct sky2_status_le)) #define ETH_JUMBO_MTU 9000 #define TX_WATCHDOG (5 * HZ) #define NAPI_WEIGHT 64 -#define PHY_RETRIES 1000 +#define PHY_RETRIES 100 static const u32 default_msg = NETIF_MSG_DRV | NETIF_MSG_PROBE | NETIF_MSG_LINK @@ -96,6 +92,10 @@ static int copybreak __read_mostly = 256 module_param(copybreak, int, 0); MODULE_PARM_DESC(copybreak, "Receive copy threshold"); +static int disable_msi = 0; +module_param(disable_msi, int, 0); +MODULE_PARM_DESC(disable_msi, "Disable Message Signaled Interrupt (MSI)"); + static const struct pci_device_id sky2_id_table[] = { { PCI_DEVICE(PCI_VENDOR_ID_SYSKONNECT, 0x9000) }, { PCI_DEVICE(PCI_VENDOR_ID_SYSKONNECT, 0x9E00) }, @@ -146,7 +146,7 @@ static int gm_phy_write(struct sky2_hw * for (i = 0; i < PHY_RETRIES; i++) { if (!(gma_read16(hw, port, GM_SMI_CTRL) & GM_SMI_CT_BUSY)) return 0; - udelay(1); + udelay(10); } printk(KERN_WARNING PFX "%s: phy write timeout\n", hw->dev[port]->name); @@ -166,7 +166,7 @@ static int __gm_phy_read(struct sky2_hw return 0; } - udelay(1); + udelay(10); } return -ETIMEDOUT; @@ -504,9 +504,9 @@ static void sky2_phy_init(struct sky2_hw /* Force a renegotiation */ static void sky2_phy_reinit(struct sky2_port *sky2) { - down(&sky2->phy_sema); + spin_lock_bh(&sky2->phy_lock); sky2_phy_init(sky2->hw, sky2->port); - up(&sky2->phy_sema); + spin_unlock_bh(&sky2->phy_lock); } static void sky2_mac_init(struct sky2_hw *hw, unsigned port) @@ -571,9 +571,9 @@ static void sky2_mac_init(struct sky2_hw sky2_read16(hw, SK_REG(port, GMAC_IRQ_SRC)); - down(&sky2->phy_sema); + spin_lock_bh(&sky2->phy_lock); sky2_phy_init(hw, port); - up(&sky2->phy_sema); + spin_unlock_bh(&sky2->phy_lock); /* MIB clear */ reg = gma_read16(hw, port, GM_PHY_ADDR); @@ -622,8 +622,8 @@ static void sky2_mac_init(struct sky2_hw /* Configure Rx MAC FIFO */ sky2_write8(hw, SK_REG(port, RX_GMF_CTRL_T), GMF_RST_CLR); - sky2_write16(hw, SK_REG(port, RX_GMF_CTRL_T), - GMF_RX_CTRL_DEF); + sky2_write32(hw, SK_REG(port, RX_GMF_CTRL_T), + GMF_OPER_ON | GMF_RX_F_FL_ON); /* Flush Rx MAC FIFO on any flow control or error */ sky2_write16(hw, SK_REG(port, RX_GMF_FL_MSK), GMR_FS_ANY_ERR); @@ -729,33 +729,10 @@ static inline struct sky2_tx_le *get_tx_ * This is a workaround code taken from SysKonnect sk98lin driver * to deal with chip bug on Yukon EC rev 0 in the wraparound case. */ -static void sky2_put_idx(struct sky2_hw *hw, unsigned q, - u16 idx, u16 *last, u16 size) +static inline void sky2_put_idx(struct sky2_hw *hw, unsigned q, u16 idx) { wmb(); - if (is_ec_a1(hw) && idx < *last) { - u16 hwget = sky2_read16(hw, Y2_QADDR(q, PREF_UNIT_GET_IDX)); - - if (hwget == 0) { - /* Start prefetching again */ - sky2_write8(hw, Y2_QADDR(q, PREF_UNIT_FIFO_WM), 0xe0); - goto setnew; - } - - if (hwget == size - 1) { - /* set watermark to one list element */ - sky2_write8(hw, Y2_QADDR(q, PREF_UNIT_FIFO_WM), 8); - - /* set put index to first list element */ - sky2_write16(hw, Y2_QADDR(q, PREF_UNIT_PUT_IDX), 0); - } else /* have hardware go to end of list */ - sky2_write16(hw, Y2_QADDR(q, PREF_UNIT_PUT_IDX), - size - 1); - } else { -setnew: - sky2_write16(hw, Y2_QADDR(q, PREF_UNIT_PUT_IDX), idx); - } - *last = idx; + sky2_write16(hw, Y2_QADDR(q, PREF_UNIT_PUT_IDX), idx); mmiowb(); } @@ -886,9 +863,9 @@ static int sky2_ioctl(struct net_device case SIOCGMIIREG: { u16 val = 0; - down(&sky2->phy_sema); + spin_lock_bh(&sky2->phy_lock); err = __gm_phy_read(hw, sky2->port, data->reg_num & 0x1f, &val); - up(&sky2->phy_sema); + spin_unlock_bh(&sky2->phy_lock); data->val_out = val; break; @@ -898,10 +875,10 @@ static int sky2_ioctl(struct net_device if (!capable(CAP_NET_ADMIN)) return -EPERM; - down(&sky2->phy_sema); + spin_lock_bh(&sky2->phy_lock); err = gm_phy_write(hw, sky2->port, data->reg_num & 0x1f, data->val_in); - up(&sky2->phy_sema); + spin_unlock_bh(&sky2->phy_lock); break; } return err; @@ -995,9 +972,12 @@ static int sky2_rx_start(struct sky2_por sky2_rx_add(sky2, re->mapaddr); } + /* Truncate oversize frames */ + sky2_write16(hw, SK_REG(sky2->port, RX_GMF_TR_THR), sky2->rx_bufsize - 8); + sky2_write32(hw, SK_REG(sky2->port, RX_GMF_CTRL_T), RX_TRUNC_ON); + /* Tell chip about available buffers */ - sky2_write16(hw, Y2_QADDR(rxq, PREF_UNIT_PUT_IDX), sky2->rx_put); - sky2->rx_last_put = sky2_read16(hw, Y2_QADDR(rxq, PREF_UNIT_PUT_IDX)); + sky2_put_idx(hw, rxq, sky2->rx_put); return 0; nomem: sky2_rx_clean(sky2); @@ -1010,7 +990,7 @@ static int sky2_up(struct net_device *de struct sky2_port *sky2 = netdev_priv(dev); struct sky2_hw *hw = sky2->hw; unsigned port = sky2->port; - u32 ramsize, rxspace; + u32 ramsize, rxspace, imask; int err = -ENOMEM; if (netif_msg_ifup(sky2)) @@ -1075,10 +1055,10 @@ static int sky2_up(struct net_device *de goto err_out; /* Enable interrupts from phy/mac for port */ - spin_lock_irq(&hw->hw_lock); - hw->intr_mask |= (port == 0) ? Y2_IS_PORT_1 : Y2_IS_PORT_2; - sky2_write32(hw, B0_IMSK, hw->intr_mask); - spin_unlock_irq(&hw->hw_lock); + imask = sky2_read32(hw, B0_IMSK); + imask |= (port == 0) ? Y2_IS_PORT_1 : Y2_IS_PORT_2; + sky2_write32(hw, B0_IMSK, imask); + return 0; err_out: @@ -1145,6 +1125,7 @@ static int sky2_xmit_frame(struct sk_buf struct sky2_tx_le *le = NULL; struct tx_ring_info *re; unsigned i, len; + int avail; dma_addr_t mapping; u32 addr64; u16 mss; @@ -1287,11 +1268,14 @@ static int sky2_xmit_frame(struct sk_buf re->idx = sky2->tx_prod; le->ctrl |= EOP; - sky2_put_idx(hw, txqaddr[sky2->port], sky2->tx_prod, - &sky2->tx_last_put, TX_RING_SIZE); + avail = tx_avail(sky2); + if (avail < TX_MIN_PENDING) { + le->ctrl |= FRC_STAT; + if (avail <= MAX_SKB_TX_LE) + netif_stop_queue(dev); + } - if (tx_avail(sky2) <= MAX_SKB_TX_LE) - netif_stop_queue(dev); + sky2_put_idx(hw, txqaddr[sky2->port], sky2->tx_prod); out_unlock: spin_unlock(&sky2->tx_lock); @@ -1366,6 +1350,7 @@ static int sky2_down(struct net_device * struct sky2_hw *hw = sky2->hw; unsigned port = sky2->port; u16 ctrl; + u32 imask; /* Never really got started! */ if (!sky2->tx_le) @@ -1377,14 +1362,6 @@ static int sky2_down(struct net_device * /* Stop more packets from being queued */ netif_stop_queue(dev); - /* Disable port IRQ */ - spin_lock_irq(&hw->hw_lock); - hw->intr_mask &= ~((sky2->port == 0) ? Y2_IS_IRQ_PHY1 : Y2_IS_IRQ_PHY2); - sky2_write32(hw, B0_IMSK, hw->intr_mask); - spin_unlock_irq(&hw->hw_lock); - - flush_scheduled_work(); - sky2_phy_reset(hw, port); /* Stop transmitter */ @@ -1428,6 +1405,11 @@ static int sky2_down(struct net_device * sky2_write8(hw, SK_REG(port, RX_GMF_CTRL_T), GMF_RST_SET); sky2_write8(hw, SK_REG(port, TX_GMF_CTRL_T), GMF_RST_SET); + /* Disable port IRQ */ + imask = sky2_read32(hw, B0_IMSK); + imask &= ~(sky2->port == 0) ? Y2_IS_PORT_1 : Y2_IS_PORT_2; + sky2_write32(hw, B0_IMSK, imask); + /* turn off LED's */ sky2_write16(hw, B0_Y2LED, LED_STAT_OFF); @@ -1622,20 +1604,19 @@ static int sky2_autoneg_done(struct sky2 return 0; } -/* - * Interrupt from PHY are handled outside of interrupt context - * because accessing phy registers requires spin wait which might - * cause excess interrupt latency. - */ -static void sky2_phy_task(void *arg) +/* Interrupt from PHY */ +static void sky2_phy_intr(struct sky2_hw *hw, unsigned port) { - struct sky2_port *sky2 = arg; - struct sky2_hw *hw = sky2->hw; + struct net_device *dev = hw->dev[port]; + struct sky2_port *sky2 = netdev_priv(dev); u16 istatus, phystat; - down(&sky2->phy_sema); - istatus = gm_phy_read(hw, sky2->port, PHY_MARV_INT_STAT); - phystat = gm_phy_read(hw, sky2->port, PHY_MARV_PHY_STAT); + spin_lock(&sky2->phy_lock); + istatus = gm_phy_read(hw, port, PHY_MARV_INT_STAT); + phystat = gm_phy_read(hw, port, PHY_MARV_PHY_STAT); + + if (!netif_running(dev)) + goto out; if (netif_msg_intr(sky2)) printk(KERN_INFO PFX "%s: phy interrupt status 0x%x 0x%x\n", @@ -1661,12 +1642,7 @@ static void sky2_phy_task(void *arg) sky2_link_down(sky2); } out: - up(&sky2->phy_sema); - - spin_lock_irq(&hw->hw_lock); - hw->intr_mask |= (sky2->port == 0) ? Y2_IS_IRQ_PHY1 : Y2_IS_IRQ_PHY2; - sky2_write32(hw, B0_IMSK, hw->intr_mask); - spin_unlock_irq(&hw->hw_lock); + spin_unlock(&sky2->phy_lock); } @@ -1678,20 +1654,6 @@ static void sky2_tx_timeout(struct net_d struct sky2_port *sky2 = netdev_priv(dev); struct sky2_hw *hw = sky2->hw; unsigned txq = txqaddr[sky2->port]; - u16 ridx; - - /* Maybe we just missed an status interrupt */ - spin_lock(&sky2->tx_lock); - ridx = sky2_read16(hw, - sky2->port == 0 ? STAT_TXA1_RIDX : STAT_TXA2_RIDX); - sky2_tx_complete(sky2, ridx); - spin_unlock(&sky2->tx_lock); - - if (!netif_queue_stopped(dev)) { - if (net_ratelimit()) - pr_info(PFX "transmit interrupt missed? recovered\n"); - return; - } if (netif_msg_timer(sky2)) printk(KERN_ERR PFX "%s: tx timeout\n", dev->name); @@ -1707,10 +1669,12 @@ static void sky2_tx_timeout(struct net_d #define roundup(x, y) ((((x)+((y)-1))/(y))*(y)) -/* Want receive buffer size to be multiple of 64 bits, and incl room for vlan */ +/* Want receive buffer size to be multiple of 64 bits + * and incl room for vlan and truncation + */ static inline unsigned sky2_buf_size(int mtu) { - return roundup(mtu + ETH_HLEN + 4, 8); + return roundup(mtu + ETH_HLEN + VLAN_HLEN, 8) + 8; } static int sky2_change_mtu(struct net_device *dev, int new_mtu) @@ -1719,6 +1683,7 @@ static int sky2_change_mtu(struct net_de struct sky2_hw *hw = sky2->hw; int err; u16 ctl, mode; + u32 imask; if (new_mtu < ETH_ZLEN || new_mtu > ETH_JUMBO_MTU) return -EINVAL; @@ -1731,12 +1696,15 @@ static int sky2_change_mtu(struct net_de return 0; } + imask = sky2_read32(hw, B0_IMSK); sky2_write32(hw, B0_IMSK, 0); dev->trans_start = jiffies; /* prevent tx timeout */ netif_stop_queue(dev); netif_poll_disable(hw->dev[0]); + synchronize_irq(hw->pdev->irq); + ctl = gma_read16(hw, sky2->port, GM_GP_CTRL); gma_write16(hw, sky2->port, GM_GP_CTRL, ctl & ~GM_GPCR_RX_ENA); sky2_rx_stop(sky2); @@ -1755,7 +1723,7 @@ static int sky2_change_mtu(struct net_de sky2_write8(hw, RB_ADDR(rxqaddr[sky2->port], RB_CTRL), RB_ENA_OP_MD); err = sky2_rx_start(sky2); - sky2_write32(hw, B0_IMSK, hw->intr_mask); + sky2_write32(hw, B0_IMSK, imask); if (err) dev_close(dev); @@ -1793,7 +1761,7 @@ static struct sk_buff *sky2_receive(stru if (!(status & GMR_FS_RX_OK)) goto resubmit; - if ((status >> 16) != length || length > sky2->rx_bufsize) + if (length > sky2->netdev->mtu + ETH_HLEN) goto oversize; if (length < copybreak) { @@ -1832,8 +1800,7 @@ resubmit: sky2_rx_add(sky2, re->mapaddr); /* Tell receiver about new buffers. */ - sky2_put_idx(sky2->hw, rxqaddr[sky2->port], sky2->rx_put, - &sky2->rx_last_put, RX_LE_SIZE); + sky2_put_idx(sky2->hw, rxqaddr[sky2->port], sky2->rx_put); return skb; @@ -1860,76 +1827,49 @@ error: goto resubmit; } -/* - * Check for transmit complete - */ -#define TX_NO_STATUS 0xffff - -static void sky2_tx_check(struct sky2_hw *hw, int port, u16 last) +/* Transmit complete */ +static inline void sky2_tx_done(struct sky2_hw *hw, int port, u16 last) { - if (last != TX_NO_STATUS) { - struct net_device *dev = hw->dev[port]; - if (dev && netif_running(dev)) { - struct sky2_port *sky2 = netdev_priv(dev); + struct net_device *dev = hw->dev[port]; + if (dev && netif_running(dev)) { + struct sky2_port *sky2 = netdev_priv(dev); - spin_lock(&sky2->tx_lock); - sky2_tx_complete(sky2, last); - spin_unlock(&sky2->tx_lock); - } + spin_lock(&sky2->tx_lock); + sky2_tx_complete(sky2, last); + spin_unlock(&sky2->tx_lock); } } -/* - * Both ports share the same status interrupt, therefore there is only - * one poll routine. - */ -static int sky2_poll(struct net_device *dev0, int *budget) +/* Process status response ring */ +static int sky2_status_intr(struct sky2_hw *hw, int to_do) { - struct sky2_hw *hw = ((struct sky2_port *) netdev_priv(dev0))->hw; - unsigned int to_do = min(dev0->quota, *budget); - unsigned int work_done = 0; + int work_done = 0; u16 hwidx; - u16 tx_done[2] = { TX_NO_STATUS, TX_NO_STATUS }; - - sky2_write32(hw, STAT_CTRL, SC_STAT_CLR_IRQ); - - /* - * Kick the STAT_LEV_TIMER_CTRL timer. - * This fixes my hangs on Yukon-EC (0xb6) rev 1. - * The if clause is there to start the timer only if it has been - * configured correctly and not been disabled via ethtool. - */ - if (sky2_read8(hw, STAT_LEV_TIMER_CTRL) == TIM_START) { - sky2_write8(hw, STAT_LEV_TIMER_CTRL, TIM_STOP); - sky2_write8(hw, STAT_LEV_TIMER_CTRL, TIM_START); - } hwidx = sky2_read16(hw, STAT_PUT_IDX); - BUG_ON(hwidx >= STATUS_RING_SIZE); rmb(); while (hwidx != hw->st_idx) { - struct sky2_status_le *le = hw->st_le + hw->st_idx; + const struct sky2_status_le *le = hw->st_le + hw->st_idx; struct net_device *dev; struct sky2_port *sky2; struct sk_buff *skb; u32 status; u16 length; + u8 link, opcode; - le = hw->st_le + hw->st_idx; hw->st_idx = (hw->st_idx + 1) % STATUS_RING_SIZE; - prefetch(hw->st_le + hw->st_idx); - BUG_ON(le->link >= 2); - dev = hw->dev[le->link]; - if (dev == NULL || !netif_running(dev)) - continue; + link = le->link; + BUG_ON(link >= 2); + dev = hw->dev[link]; sky2 = netdev_priv(dev); - status = le32_to_cpu(le->status); - length = le16_to_cpu(le->length); + length = le->length; + status = le->status; + opcode = le->opcode & ~HW_OWNER; - switch (le->opcode & ~HW_OWNER) { + switch (opcode) { case OP_RXSTAT: skb = sky2_receive(sky2, length, status); if (!skb) @@ -1967,44 +1907,25 @@ static int sky2_poll(struct net_device * skb->csum = le16_to_cpu(status); break; + case OP_TXINDEXLE: /* TX index reports status for both ports */ - tx_done[0] = status & 0xffff; - tx_done[1] = ((status >> 24) & 0xff) - | (u16)(length & 0xf) << 8; - break; + sky2_tx_done(hw, 0, status & 0xffff); + sky2_tx_done(hw, 1, + ((status >> 24) & 0xff) + | (u16)(length & 0xf) << 8); + goto exit_loop; default: if (net_ratelimit()) printk(KERN_WARNING PFX - "unknown status opcode 0x%x\n", le->opcode); + "unknown status opcode 0x%x\n", opcode); break; } } exit_loop: - sky2_tx_check(hw, 0, tx_done[0]); - sky2_tx_check(hw, 1, tx_done[1]); - - if (sky2_read8(hw, STAT_TX_TIMER_CTRL) == TIM_START) { - sky2_write8(hw, STAT_TX_TIMER_CTRL, TIM_STOP); - sky2_write8(hw, STAT_TX_TIMER_CTRL, TIM_START); - } - - if (likely(work_done < to_do)) { - spin_lock_irq(&hw->hw_lock); - __netif_rx_complete(dev0); - - hw->intr_mask |= Y2_IS_STAT_BMU; - sky2_write32(hw, B0_IMSK, hw->intr_mask); - spin_unlock_irq(&hw->hw_lock); - - return 0; - } else { - *budget -= work_done; - dev0->quota -= work_done; - return 1; - } + return work_done; } static void sky2_hw_error(struct sky2_hw *hw, unsigned port, u32 status) @@ -2123,58 +2044,66 @@ static void sky2_mac_intr(struct sky2_hw } } -static void sky2_phy_intr(struct sky2_hw *hw, unsigned port) -{ - struct net_device *dev = hw->dev[port]; - struct sky2_port *sky2 = netdev_priv(dev); - - hw->intr_mask &= ~(port == 0 ? Y2_IS_IRQ_PHY1 : Y2_IS_IRQ_PHY2); - sky2_write32(hw, B0_IMSK, hw->intr_mask); - schedule_work(&sky2->phy_task); -} - -static irqreturn_t sky2_intr(int irq, void *dev_id, struct pt_regs *regs) +static int sky2_poll(struct net_device *dev0, int *budget) { - struct sky2_hw *hw = dev_id; - struct net_device *dev0 = hw->dev[0]; - u32 status; - - status = sky2_read32(hw, B0_Y2_SP_ISRC2); - if (status == 0 || status == ~0) - return IRQ_NONE; + struct sky2_hw *hw = ((struct sky2_port *) netdev_priv(dev0))->hw; + int work_limit = min(dev0->quota, *budget); + int work_done = 0; - spin_lock(&hw->hw_lock); - if (status & Y2_IS_HW_ERR) + if (hw->istatus & Y2_IS_HW_ERR) sky2_hw_intr(hw); - /* Do NAPI for Rx and Tx status */ - if (status & Y2_IS_STAT_BMU) { - hw->intr_mask &= ~Y2_IS_STAT_BMU; - sky2_write32(hw, B0_IMSK, hw->intr_mask); - - if (likely(__netif_rx_schedule_prep(dev0))) { - prefetch(&hw->st_le[hw->st_idx]); - __netif_rx_schedule(dev0); - } - } - - if (status & Y2_IS_IRQ_PHY1) + if (hw->istatus & Y2_IS_IRQ_PHY1) sky2_phy_intr(hw, 0); - if (status & Y2_IS_IRQ_PHY2) + if (hw->istatus & Y2_IS_IRQ_PHY2) sky2_phy_intr(hw, 1); - if (status & Y2_IS_IRQ_MAC1) + if (hw->istatus & Y2_IS_IRQ_MAC1) sky2_mac_intr(hw, 0); - if (status & Y2_IS_IRQ_MAC2) + if (hw->istatus & Y2_IS_IRQ_MAC2) sky2_mac_intr(hw, 1); + if (hw->istatus & Y2_IS_STAT_BMU) { + work_done = sky2_status_intr(hw, work_limit); + *budget -= work_done; + dev0->quota -= work_done; + + if (work_done >= work_limit) { + hw->istatus = Y2_IS_STAT_BMU; + return 1; + } + + sky2_write32(hw, STAT_CTRL, SC_STAT_CLR_IRQ); + } + + netif_rx_complete(dev0); + + /* Ack interrupt and re-enable */ + hw->istatus = 0; sky2_write32(hw, B0_Y2_SP_ICR, 2); + return 0; +} - spin_unlock(&hw->hw_lock); +static irqreturn_t sky2_intr(int irq, void *dev_id, struct pt_regs *regs) +{ + struct sky2_hw *hw = dev_id; + struct net_device *dev0 = hw->dev[0]; + u32 status; + /* Reading this mask interrupts as side effect */ + status = sky2_read32(hw, B0_Y2_SP_ISRC2); + if (status == 0 || status == ~0) + return IRQ_NONE; + + if (likely(__netif_rx_schedule_prep(dev0))) { + hw->istatus = status; + prefetch(&hw->st_le[hw->st_idx]); + __netif_rx_schedule(dev0); + } else + printk(PFX "irq but schedule failed??\n"); return IRQ_HANDLED; } @@ -2227,6 +2156,16 @@ static int sky2_reset(struct sky2_hw *hw return -EOPNOTSUPP; } + hw->chip_rev = (sky2_read8(hw, B2_MAC_CFG) & CFG_CHIP_R_MSK) >> 4; + + /* This rev is really old, and requires untested workarounds */ + if (hw->chip_id == CHIP_ID_YUKON_EC && hw->chip_rev == CHIP_REV_YU_EC_A1) { + printk(KERN_ERR PFX "%s: unsupported revision Yukon-%s (0x%x) rev %d\n", + pci_name(hw->pdev), yukon2_name[hw->chip_id - CHIP_ID_YUKON_XL], + hw->chip_id, hw->chip_rev); + return -EOPNOTSUPP; + } + /* disable ASF */ if (hw->chip_id <= CHIP_ID_YUKON_EC) { sky2_write8(hw, B28_Y2_ASF_STAT_CMD, Y2_ASF_RESET); @@ -2260,7 +2199,6 @@ static int sky2_reset(struct sky2_hw *hw if (!(sky2_read8(hw, B2_Y2_CLK_GATE) & Y2_STATUS_LNK2_INAC)) ++hw->ports; } - hw->chip_rev = (sky2_read8(hw, B2_MAC_CFG) & CFG_CHIP_R_MSK) >> 4; sky2_set_power_state(hw, PCI_D0); @@ -2327,29 +2265,17 @@ static int sky2_reset(struct sky2_hw *hw sky2_write16(hw, STAT_LAST_IDX, STATUS_RING_SIZE - 1); /* These status setup values are copied from SysKonnect's driver */ - if (is_ec_a1(hw)) { - /* WA for dev. #4.3 */ - sky2_write16(hw, STAT_TX_IDX_TH, 0xfff); /* Tx Threshold */ - - /* set Status-FIFO watermark */ - sky2_write8(hw, STAT_FIFO_WM, 0x21); /* WA for dev. #4.18 */ - - /* set Status-FIFO ISR watermark */ - sky2_write8(hw, STAT_FIFO_ISR_WM, 0x07); /* WA for dev. #4.18 */ - sky2_write32(hw, STAT_TX_TIMER_INI, sky2_us2clk(hw, 10000)); - } else { - sky2_write16(hw, STAT_TX_IDX_TH, 10); - sky2_write8(hw, STAT_FIFO_WM, 16); + sky2_write16(hw, STAT_TX_IDX_TH, 10); + sky2_write8(hw, STAT_FIFO_WM, 16); - /* set Status-FIFO ISR watermark */ - if (hw->chip_id == CHIP_ID_YUKON_XL && hw->chip_rev == 0) - sky2_write8(hw, STAT_FIFO_ISR_WM, 4); - else - sky2_write8(hw, STAT_FIFO_ISR_WM, 16); + /* set Status-FIFO ISR watermark */ + if (hw->chip_id == CHIP_ID_YUKON_XL && hw->chip_rev == 0) + sky2_write8(hw, STAT_FIFO_ISR_WM, 4); + else + sky2_write8(hw, STAT_FIFO_ISR_WM, 16); - sky2_write32(hw, STAT_TX_TIMER_INI, sky2_us2clk(hw, 1000)); - sky2_write32(hw, STAT_ISR_TIMER_INI, sky2_us2clk(hw, 7)); - } + sky2_write32(hw, STAT_TX_TIMER_INI, sky2_us2clk(hw, 1000)); + sky2_write32(hw, STAT_ISR_TIMER_INI, sky2_us2clk(hw, 7)); /* enable status unit */ sky2_write32(hw, STAT_CTRL, SC_STAT_OP_ON); @@ -2732,7 +2658,7 @@ static int sky2_phys_id(struct net_devic ms = data * 1000; /* save initial values */ - down(&sky2->phy_sema); + spin_lock_bh(&sky2->phy_lock); if (hw->chip_id == CHIP_ID_YUKON_XL) { u16 pg = gm_phy_read(hw, port, PHY_MARV_EXT_ADR); gm_phy_write(hw, port, PHY_MARV_EXT_ADR, 3); @@ -2748,9 +2674,9 @@ static int sky2_phys_id(struct net_devic sky2_led(hw, port, onoff); onoff = !onoff; - up(&sky2->phy_sema); + spin_unlock_bh(&sky2->phy_lock); interrupted = msleep_interruptible(250); - down(&sky2->phy_sema); + spin_lock_bh(&sky2->phy_lock); ms -= 250; } @@ -2765,7 +2691,7 @@ static int sky2_phys_id(struct net_devic gm_phy_write(hw, port, PHY_MARV_LED_CTRL, ledctrl); gm_phy_write(hw, port, PHY_MARV_LED_OVER, ledover); } - up(&sky2->phy_sema); + spin_unlock_bh(&sky2->phy_lock); return 0; } @@ -3077,10 +3003,9 @@ static __devinit struct net_device *sky2 */ sky2->rx_csum = (hw->chip_id != CHIP_ID_YUKON_XL); - INIT_WORK(&sky2->phy_task, sky2_phy_task, sky2); - init_MUTEX(&sky2->phy_sema); + spin_lock_init(&sky2->phy_lock); sky2->tx_pending = TX_DEF_PENDING; - sky2->rx_pending = is_ec_a1(hw) ? 8 : RX_DEF_PENDING; + sky2->rx_pending = RX_DEF_PENDING; sky2->rx_bufsize = sky2_buf_size(ETH_DATA_LEN); hw->dev[port] = dev; @@ -3122,6 +3047,66 @@ static void __devinit sky2_show_addr(str dev->dev_addr[3], dev->dev_addr[4], dev->dev_addr[5]); } +/* Handle software interrupt used during MSI test */ +static irqreturn_t __devinit sky2_test_intr(int irq, void *dev_id, + struct pt_regs *regs) +{ + struct sky2_hw *hw = dev_id; + u32 status = sky2_read32(hw, B0_Y2_SP_ISRC2); + + if (status == 0) + return IRQ_NONE; + + if (status & Y2_IS_IRQ_SW) { + hw->msi_detected = 1; + wake_up(&hw->msi_wait); + sky2_write8(hw, B0_CTST, CS_CL_SW_IRQ); + } + sky2_write32(hw, B0_Y2_SP_ICR, 2); + + return IRQ_HANDLED; +} + +/* Test interrupt path by forcing a a software IRQ */ +static int __devinit sky2_test_msi(struct sky2_hw *hw) +{ + struct pci_dev *pdev = hw->pdev; + int err; + + sky2_write32(hw, B0_IMSK, Y2_IS_IRQ_SW); + + err = request_irq(pdev->irq, sky2_test_intr, SA_SHIRQ, DRV_NAME, hw); + if (err) { + printk(KERN_ERR PFX "%s: cannot assign irq %d\n", + pci_name(pdev), pdev->irq); + return err; + } + + init_waitqueue_head (&hw->msi_wait); + + sky2_write8(hw, B0_CTST, CS_ST_SW_IRQ); + wmb(); + + wait_event_timeout(hw->msi_wait, hw->msi_detected, HZ/10); + + if (!hw->msi_detected) { + /* MSI test failed, go back to INTx mode */ + printk(KERN_WARNING PFX "%s: No interrupt was generated using MSI, " + "switching to INTx mode. Please report this failure to " + "the PCI maintainer and include system chipset information.\n", + pci_name(pdev)); + + err = -EOPNOTSUPP; + sky2_write8(hw, B0_CTST, CS_CL_SW_IRQ); + } + + sky2_write32(hw, B0_IMSK, 0); + + free_irq(pdev->irq, hw); + + return err; +} + static int __devinit sky2_probe(struct pci_dev *pdev, const struct pci_device_id *ent) { @@ -3190,7 +3175,6 @@ static int __devinit sky2_probe(struct p goto err_out_free_hw; } hw->pm_cap = pm_cap; - spin_lock_init(&hw->hw_lock); #ifdef __BIG_ENDIAN /* byte swap descriptors in hardware */ @@ -3243,22 +3227,29 @@ static int __devinit sky2_probe(struct p } } - err = request_irq(pdev->irq, sky2_intr, SA_SHIRQ | SA_SAMPLE_RANDOM, - DRV_NAME, hw); + if (!disable_msi && pci_enable_msi(pdev) == 0) { + err = sky2_test_msi(hw); + if (err == -EOPNOTSUPP) + pci_disable_msi(pdev); + else if (err) + goto err_out_unregister; + } + + err = request_irq(pdev->irq, sky2_intr, SA_SHIRQ, DRV_NAME, hw); if (err) { printk(KERN_ERR PFX "%s: cannot assign irq %d\n", pci_name(pdev), pdev->irq); goto err_out_unregister; } - hw->intr_mask = Y2_IS_BASE; - sky2_write32(hw, B0_IMSK, hw->intr_mask); + sky2_write32(hw, B0_IMSK, Y2_IS_BASE); pci_set_drvdata(pdev, hw); return 0; err_out_unregister: + pci_disable_msi(pdev); if (dev1) { unregister_netdev(dev1); free_netdev(dev1); @@ -3301,6 +3292,7 @@ static void __devexit sky2_remove(struct sky2_read8(hw, B0_CTST); free_irq(pdev->irq, hw); + pci_disable_msi(pdev); pci_free_consistent(pdev, STATUS_LE_BYTES, hw->st_le, hw->st_dma); pci_release_regions(pdev); pci_disable_device(pdev); From fedora-cvs-commits at redhat.com Fri Mar 3 01:34:25 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 2 Mar 2006 20:34:25 -0500 Subject: rpms/xorg-x11-xbitmaps/devel xorg-x11-xbitmaps.spec,1.11,1.12 Message-ID: <200603030134.k231YPto031448@cvs.devel.redhat.com> Author: mharris Update of /cvs/dist/rpms/xorg-x11-xbitmaps/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv31426 Modified Files: xorg-x11-xbitmaps.spec Log Message: * Thu Mar 02 2006 Mike A. Harris 1.0.1-3 - Made package arch specific due to pkgconfig files being placed in lib64 if the noarch packages manage to get built on x86_64/ppc64/s390x. Index: xorg-x11-xbitmaps.spec =================================================================== RCS file: /cvs/dist/rpms/xorg-x11-xbitmaps/devel/xorg-x11-xbitmaps.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- xorg-x11-xbitmaps.spec 1 Mar 2006 06:51:05 -0000 1.11 +++ xorg-x11-xbitmaps.spec 3 Mar 2006 01:34:10 -0000 1.12 @@ -5,15 +5,13 @@ Summary: X.Org X11 application bitmaps Name: xorg-x11-%{pkgname} Version: 1.0.1 -Release: 2 +Release: 3 License: MIT/X11 Group: User Interface/X URL: http://www.x.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot Source0: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/%{pkgname}-%{version}.tar.bz2 -BuildArch: noarch - # NOTE: This dependency on xorg-x11-filesystem is required to work around # a nasty upgrade problem when going from FC4->FC5 or monolithic to # modular X.Org. Bug #173384. @@ -52,6 +50,10 @@ %{_libdir}/pkgconfig/xbitmaps.pc %changelog +* Thu Mar 02 2006 Mike A. Harris 1.0.1-3 +- Made package arch specific due to pkgconfig files being placed in lib64 + if the noarch packages manage to get built on x86_64/ppc64/s390x. + * Wed Mar 01 2006 Mike A. Harris 1.0.1-2 - Cleaned up file manifest. - Made package noarch, as it is just header files. From fedora-cvs-commits at redhat.com Fri Mar 3 01:34:25 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 2 Mar 2006 20:34:25 -0500 Subject: rpms/kernel/devel linux-2.6-softmac-git.patch,1.8.2.1,1.8.2.2 Message-ID: <200603030134.k231YPD0031444@cvs.devel.redhat.com> Author: linville Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv31422 Modified Files: Tag: private-linville-jwltest-fc5-12-branch linux-2.6-softmac-git.patch Log Message: linux-2.6-softmac-git.patch: include/net/ieee80211.h | 8 include/net/ieee80211softmac.h | 292 ++++++++++++++ include/net/ieee80211softmac_wx.h | 94 ++++ net/ieee80211/Kconfig | 1 net/ieee80211/Makefile | 1 net/ieee80211/ieee80211_module.c | 2 net/ieee80211/ieee80211_wx.c | 89 ++++ net/ieee80211/softmac/Kconfig | 10 net/ieee80211/softmac/Makefile | 9 net/ieee80211/softmac/ieee80211softmac_assoc.c | 403 ++++++++++++++++++++ net/ieee80211/softmac/ieee80211softmac_auth.c | 376 +++++++++++++++++++ net/ieee80211/softmac/ieee80211softmac_event.c | 159 ++++++++ net/ieee80211/softmac/ieee80211softmac_io.c | 474 ++++++++++++++++++++++++ net/ieee80211/softmac/ieee80211softmac_module.c | 457 +++++++++++++++++++++++ net/ieee80211/softmac/ieee80211softmac_priv.h | 239 ++++++++++++ net/ieee80211/softmac/ieee80211softmac_scan.c | 237 ++++++++++++ net/ieee80211/softmac/ieee80211softmac_wx.c | 412 ++++++++++++++++++++ 17 files changed, 3262 insertions(+), 1 deletion(-) Index: linux-2.6-softmac-git.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-softmac-git.patch,v retrieving revision 1.8.2.1 retrieving revision 1.8.2.2 diff -u -r1.8.2.1 -r1.8.2.2 --- linux-2.6-softmac-git.patch 2 Mar 2006 23:42:23 -0000 1.8.2.1 +++ linux-2.6-softmac-git.patch 3 Mar 2006 01:34:08 -0000 1.8.2.2 @@ -3231,137 +3231,6 @@ ieee80211_geo.o +obj-$(CONFIG_IEEE80211_SOFTMAC) += softmac/ ---- linux-2.6.15.noarch/net/ieee80211/ieee80211_crypt_tkip.c.orig 2006-03-02 17:30:49.000000000 -0500 -+++ linux-2.6.15.noarch/net/ieee80211/ieee80211_crypt_tkip.c 2006-03-02 18:06:52.000000000 -0500 -@@ -270,33 +270,34 @@ static void tkip_mixing_phase2(u8 * WEPS - #endif - } - --static int ieee80211_tkip_hdr(struct sk_buff *skb, int hdr_len, -- u8 * rc4key, int keylen, void *priv) -+static u8 *ieee80211_tkip_hdr(struct sk_buff *skb, int hdr_len, void *priv) - { - struct ieee80211_tkip_data *tkey = priv; - int len; -- u8 *pos; -+ u8 *rc4key, *pos, *icv; - struct ieee80211_hdr_4addr *hdr; -+ u32 crc; - - hdr = (struct ieee80211_hdr_4addr *)skb->data; - - if (skb_headroom(skb) < 8 || skb->len < hdr_len) -- return -1; -- -- if (rc4key == NULL || keylen < 16) -- return -1; -+ return NULL; - - if (!tkey->tx_phase1_done) { - tkip_mixing_phase1(tkey->tx_ttak, tkey->key, hdr->addr2, - tkey->tx_iv32); - tkey->tx_phase1_done = 1; - } -+ rc4key = kmalloc(16, GFP_ATOMIC); -+ if (!rc4key) -+ return NULL; - tkip_mixing_phase2(rc4key, tkey->key, tkey->tx_ttak, tkey->tx_iv16); - - len = skb->len - hdr_len; - pos = skb_push(skb, 8); - memmove(pos, pos + 8, hdr_len); - pos += hdr_len; -+ icv = skb_put(skb, 4); - - *pos++ = *rc4key; - *pos++ = *(rc4key + 1); -@@ -307,28 +308,28 @@ static int ieee80211_tkip_hdr(struct sk_ - *pos++ = (tkey->tx_iv32 >> 16) & 0xff; - *pos++ = (tkey->tx_iv32 >> 24) & 0xff; - -- tkey->tx_iv16++; -- if (tkey->tx_iv16 == 0) { -- tkey->tx_phase1_done = 0; -- tkey->tx_iv32++; -- } -+ crc = ~crc32_le(~0, pos, len); -+ icv[0] = crc; -+ icv[1] = crc >> 8; -+ icv[2] = crc >> 16; -+ icv[3] = crc >> 24; - -- return 8; -+ return rc4key; - } - - static int ieee80211_tkip_encrypt(struct sk_buff *skb, int hdr_len, void *priv) - { - struct ieee80211_tkip_data *tkey = priv; - int len; -- u8 rc4key[16], *pos, *icv; -- u32 crc; -+ const u8 *rc4key; -+ u8 *pos; - struct scatterlist sg; - - if (tkey->flags & IEEE80211_CRYPTO_TKIP_COUNTERMEASURES) { - if (net_ratelimit()) { - struct ieee80211_hdr_4addr *hdr = - (struct ieee80211_hdr_4addr *)skb->data; -- printk(KERN_DEBUG ": TKIP countermeasures: dropped " -+ printk(KERN_DEBUG "TKIP countermeasures: dropped " - "TX packet to " MAC_FMT "\n", - MAC_ARG(hdr->addr1)); - } -@@ -341,23 +342,22 @@ static int ieee80211_tkip_encrypt(struct - len = skb->len - hdr_len; - pos = skb->data + hdr_len; - -- if ((ieee80211_tkip_hdr(skb, hdr_len, rc4key, 16, priv)) < 0) -+ rc4key = ieee80211_tkip_hdr(skb, hdr_len, priv); -+ if (!rc4key) - return -1; - -- icv = skb_put(skb, 4); -- -- crc = ~crc32_le(~0, pos, len); -- icv[0] = crc; -- icv[1] = crc >> 8; -- icv[2] = crc >> 16; -- icv[3] = crc >> 24; -- - crypto_cipher_setkey(tkey->tfm_arc4, rc4key, 16); - sg.page = virt_to_page(pos); - sg.offset = offset_in_page(pos); - sg.length = len + 4; - crypto_cipher_encrypt(tkey->tfm_arc4, &sg, &sg, len + 4); - -+ tkey->tx_iv16++; -+ if (tkey->tx_iv16 == 0) { -+ tkey->tx_phase1_done = 0; -+ tkey->tx_iv32++; -+ } -+ - return 0; - } - -@@ -378,7 +378,7 @@ static int ieee80211_tkip_decrypt(struct - - if (tkey->flags & IEEE80211_CRYPTO_TKIP_COUNTERMEASURES) { - if (net_ratelimit()) { -- printk(KERN_DEBUG ": TKIP countermeasures: dropped " -+ printk(KERN_DEBUG "TKIP countermeasures: dropped " - "received packet from " MAC_FMT "\n", - MAC_ARG(hdr->addr2)); - } -@@ -694,7 +694,6 @@ static struct ieee80211_crypto_ops ieee8 - .name = "TKIP", - .init = ieee80211_tkip_init, - .deinit = ieee80211_tkip_deinit, -- .build_iv = ieee80211_tkip_hdr, - .encrypt_mpdu = ieee80211_tkip_encrypt, - .decrypt_mpdu = ieee80211_tkip_decrypt, - .encrypt_msdu = ieee80211_michael_mic_add, --- linux-2.6.15.noarch/net/ieee80211/ieee80211_wx.c.orig 2006-03-02 18:06:39.000000000 -0500 +++ linux-2.6.15.noarch/net/ieee80211/ieee80211_wx.c 2006-03-02 18:06:48.000000000 -0500 @@ -734,9 +734,98 @@ int ieee80211_wx_get_encodeext(struct ie @@ -3470,34 +3339,3 @@ "ieee80211_crypt_tkip". +source "net/ieee80211/softmac/Kconfig" ---- linux-2.6.15.noarch/net/ieee80211/ieee80211_crypt_ccmp.c.orig 2006-03-02 17:30:49.000000000 -0500 -+++ linux-2.6.15.noarch/net/ieee80211/ieee80211_crypt_ccmp.c 2006-03-02 18:06:52.000000000 -0500 -@@ -190,8 +190,7 @@ static void ccmp_init_blocks(struct cryp - ieee80211_ccmp_aes_encrypt(tfm, b0, s0); - } - --static int ieee80211_ccmp_hdr(struct sk_buff *skb, int hdr_len, -- u8 *aeskey, int keylen, void *priv) -+static int ieee80211_ccmp_hdr(struct sk_buff *skb, int hdr_len, void *priv) - { - struct ieee80211_ccmp_data *key = priv; - int i; -@@ -200,9 +199,6 @@ static int ieee80211_ccmp_hdr(struct sk_ - if (skb_headroom(skb) < CCMP_HDR_LEN || skb->len < hdr_len) - return -1; - -- if (aeskey != NULL && keylen >= CCMP_TK_LEN) -- memcpy(aeskey, key->key, CCMP_TK_LEN); -- - pos = skb_push(skb, CCMP_HDR_LEN); - memmove(pos, pos + CCMP_HDR_LEN, hdr_len); - pos += hdr_len; -@@ -242,7 +238,7 @@ static int ieee80211_ccmp_encrypt(struct - return -1; - - data_len = skb->len - hdr_len; -- len = ieee80211_ccmp_hdr(skb, hdr_len, NULL, 0, priv); -+ len = ieee80211_ccmp_hdr(skb, hdr_len, priv); - if (len < 0) - return -1; - From fedora-cvs-commits at redhat.com Fri Mar 3 01:37:14 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 2 Mar 2006 20:37:14 -0500 Subject: rpms/xorg-x11-apps/devel x11perf-1.4.1-x11perf-datadir-cleanups.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 xorg-x11-apps.spec, 1.11, 1.12 x11perf-1.0.1-x11perf-datadir-cleanups.patch, 1.1, NONE Message-ID: <200603030137.k231bEb8031645@cvs.devel.redhat.com> Author: ajackson Update of /cvs/dist/rpms/xorg-x11-apps/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv31621/devel Modified Files: .cvsignore sources xorg-x11-apps.spec Added Files: x11perf-1.4.1-x11perf-datadir-cleanups.patch Removed Files: x11perf-1.0.1-x11perf-datadir-cleanups.patch Log Message: auto-import xorg-x11-apps-1.0.2-1 on branch devel from xorg-x11-apps-1.0.2-1.src.rpm x11perf-1.4.1-x11perf-datadir-cleanups.patch: Makefile.am | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE x11perf-1.4.1-x11perf-datadir-cleanups.patch --- --- x11perf-0.99.1/Makefile.am.x11perf-datadir-cleanups 2005-11-23 13:03:27.000000000 -0500 +++ x11perf-1.4.1/Makefile.am 2005-11-23 13:03:57.000000000 -0500 @@ -23,7 +23,7 @@ bin_SCRIPTS = x11perfcomp -LIBPATH = $(libdir)/X11/x11perfcomp +LIBPATH = $(datadir)/X11/x11perfcomp x11perfcompdir = $(LIBPATH) dist_x11perfcomp_SCRIPTS = fillblnk perfboth perfratio Xmark Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/xorg-x11-apps/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 31 Jan 2006 16:29:41 -0000 1.4 +++ .cvsignore 3 Mar 2006 01:37:12 -0000 1.5 @@ -1,6 +1,5 @@ luit-1.0.1.tar.bz2 oclock-1.0.1.tar.bz2 -x11perf-1.0.1.tar.bz2 xbiff-1.0.1.tar.bz2 xclipboard-1.0.1.tar.bz2 xclock-1.0.1.tar.bz2 @@ -15,3 +14,4 @@ xpr-1.0.1.tar.bz2 xwd-1.0.1.tar.bz2 xwud-1.0.1.tar.bz2 +x11perf-1.4.1.tar.bz2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/xorg-x11-apps/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 31 Jan 2006 16:29:41 -0000 1.4 +++ sources 3 Mar 2006 01:37:12 -0000 1.5 @@ -1,6 +1,5 @@ fbe44e739590d3d73f711bfc8a0e33fd luit-1.0.1.tar.bz2 91f49547f9ed3cd0137c8b7c3183e360 oclock-1.0.1.tar.bz2 -d13b4eb920b0f51dc538c34d1b3afbce x11perf-1.0.1.tar.bz2 404f5add4537d22dd109c33e518a5190 xbiff-1.0.1.tar.bz2 2c6ecedb10dc51adbb64c95f22fd99c2 xclipboard-1.0.1.tar.bz2 81af93fb9bd06319fd16b694b0f03aeb xclock-1.0.1.tar.bz2 @@ -15,3 +14,4 @@ 01c0a14755fc91369e8c011c9f881d5d xpr-1.0.1.tar.bz2 911addfb7fa402217ddac63e5c1d97c7 xwd-1.0.1.tar.bz2 6e3c5d0297d88e890b6f5df31f73dd60 xwud-1.0.1.tar.bz2 +fd06c8b8e3572a0e14af65a49e0dd7d1 x11perf-1.4.1.tar.bz2 Index: xorg-x11-apps.spec =================================================================== RCS file: /cvs/dist/rpms/xorg-x11-apps/devel/xorg-x11-apps.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- xorg-x11-apps.spec 1 Mar 2006 06:18:26 -0000 1.11 +++ xorg-x11-apps.spec 3 Mar 2006 01:37:12 -0000 1.12 @@ -2,8 +2,8 @@ Summary: X.Org X11 applications Name: xorg-x11-%{pkgname} -Version: 1.0.1 -Release: 2 +Version: 1.0.2 +Release: 1 License: MIT/X11 Group: User Interface/X URL: http://www.x.org @@ -18,7 +18,7 @@ Source4: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/xpr-1.0.1.tar.bz2 # Miscellaneous other applications Source5: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/luit-1.0.1.tar.bz2 -Source6: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/x11perf-1.0.1.tar.bz2 +Source6: http://xorg.freedesktop.org/releases/individual/app/x11perf-1.4.1.tar.bz2 Source7: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/xbiff-1.0.1.tar.bz2 Source8: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/xclipboard-1.0.1.tar.bz2 Source9: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/xconsole-1.0.1.tar.bz2 @@ -30,7 +30,7 @@ Source15: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/xmag-1.0.1.tar.bz2 Source16: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/xmessage-1.0.1.tar.bz2 -Patch0: x11perf-1.0.1-x11perf-datadir-cleanups.patch +Patch0: x11perf-1.4.1-x11perf-datadir-cleanups.patch Patch1: luit-1.0.1-locale.alias-datadir.patch BuildRequires: pkgconfig @@ -155,6 +155,9 @@ %{_mandir}/man1/xwud.1x* %changelog +* Thu Mar 2 2006 Adam Jackson 1.0.2-1 +- Bump x11perf to 1.4.1 from upstream. + * Fri Feb 24 2006 Mike A. Harris 1.0.1-2 - Added luit-1.0.1-locale.alias-datadir.patch to fix bug (#181785) --- x11perf-1.0.1-x11perf-datadir-cleanups.patch DELETED --- From fedora-cvs-commits at redhat.com Fri Mar 3 01:52:37 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 2 Mar 2006 20:52:37 -0500 Subject: rpms/rhpl/devel .cvsignore, 1.58, 1.59 rhpl.spec, 1.70, 1.71 sources, 1.63, 1.64 Message-ID: <200603030152.k231qbkh011942@cvs.devel.redhat.com> Author: katzj Update of /cvs/dist/rpms/rhpl/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv11918/devel Modified Files: .cvsignore rhpl.spec sources Log Message: auto-import rhpl-0.185-1 on branch devel from rhpl-0.185-1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/rhpl/devel/.cvsignore,v retrieving revision 1.58 retrieving revision 1.59 diff -u -r1.58 -r1.59 --- .cvsignore 1 Mar 2006 21:07:15 -0000 1.58 +++ .cvsignore 3 Mar 2006 01:52:35 -0000 1.59 @@ -1,8 +1 @@ -rhpl-0.177.tar.gz -rhpl-0.178.tar.gz -rhpl-0.179.tar.gz -rhpl-0.180.tar.gz -rhpl-0.181.tar.gz -rhpl-0.182.tar.gz -rhpl-0.183.tar.gz -rhpl-0.184.tar.gz +rhpl-0.185.tar.gz Index: rhpl.spec =================================================================== RCS file: /cvs/dist/rpms/rhpl/devel/rhpl.spec,v retrieving revision 1.70 retrieving revision 1.71 diff -u -r1.70 -r1.71 --- rhpl.spec 1 Mar 2006 21:07:16 -0000 1.70 +++ rhpl.spec 3 Mar 2006 01:52:35 -0000 1.71 @@ -1,6 +1,6 @@ Summary: Library of python code used by programs in Red Hat Linux Name: rhpl -Version: 0.184 +Version: 0.185 Release: 1 Source0: %{name}-%{version}.tar.gz License: GPL @@ -39,6 +39,9 @@ %{_libdir}/python?.?/site-packages/rhpl %changelog +* Thu Mar 2 2006 Jeremy Katz - 0.185-1 +- fix serbian keyboard (#182591) + * Wed Mar 01 2006 David Cantrell 0.184-1 - Use ca(fr) without fr-legacy variant for Canadian French (#182007). Index: sources =================================================================== RCS file: /cvs/dist/rpms/rhpl/devel/sources,v retrieving revision 1.63 retrieving revision 1.64 diff -u -r1.63 -r1.64 --- sources 1 Mar 2006 21:07:16 -0000 1.63 +++ sources 3 Mar 2006 01:52:35 -0000 1.64 @@ -1 +1 @@ -bdb742202575be09a2c6ab6d6ed8e43f rhpl-0.184.tar.gz +b05fdb494405fa077fc0eec6514edcdb rhpl-0.185.tar.gz From fedora-cvs-commits at redhat.com Fri Mar 3 03:36:25 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 2 Mar 2006 22:36:25 -0500 Subject: rpms/kernel/devel kernel-2.6.spec, 1.2009, 1.2010 linux-2.6-bcm43xx-git.patch, 1.2, 1.3 linux-2.6-bcm-warnings.patch, 1.1, NONE Message-ID: <200603030336.k233aP8u024739@cvs.devel.redhat.com> Author: linville Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv24723 Modified Files: kernel-2.6.spec linux-2.6-bcm43xx-git.patch Removed Files: linux-2.6-bcm-warnings.patch Log Message: update bcm43xx from upstream Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.2009 retrieving revision 1.2010 diff -u -r1.2009 -r1.2010 --- kernel-2.6.spec 2 Mar 2006 19:26:10 -0000 1.2009 +++ kernel-2.6.spec 3 Mar 2006 03:36:21 -0000 1.2010 @@ -401,7 +401,6 @@ # Broadcom wireless driver Patch5000: linux-2.6-softmac-git.patch Patch5001: linux-2.6-bcm43xx-git.patch -Patch5002: linux-2.6-bcm-warnings.patch # # 10000 to 20000 is for stuff that has to come last due to the @@ -1000,8 +999,6 @@ %patch5000 -p1 # ... and bcm43xx driver too %patch5001 -p1 -# warning fix. -%patch5002 -p1 # # final stuff @@ -1603,6 +1600,9 @@ %endif %changelog +* Thu Mar 2 2006 John W. Linville +- Update to current bcm43xx code + * Thu Mar 2 2006 Dave Jones - 2.6.16rc5-git6 - Fix acpi_os_acquire_object() with IRQs disabled debug msgs. linux-2.6-bcm43xx-git.patch: Documentation/networking/bcm43xx.txt | 36 drivers/net/wireless/Kconfig | 6 drivers/net/wireless/Makefile | 1 drivers/net/wireless/bcm43xx/Kconfig | 62 drivers/net/wireless/bcm43xx/Makefile | 11 drivers/net/wireless/bcm43xx/bcm43xx.h | 955 +++++ drivers/net/wireless/bcm43xx/bcm43xx_debugfs.c | 503 ++ drivers/net/wireless/bcm43xx/bcm43xx_debugfs.h | 117 drivers/net/wireless/bcm43xx/bcm43xx_dma.c | 989 +++++ drivers/net/wireless/bcm43xx/bcm43xx_dma.h | 221 + drivers/net/wireless/bcm43xx/bcm43xx_ethtool.c | 50 drivers/net/wireless/bcm43xx/bcm43xx_ethtool.h | 8 drivers/net/wireless/bcm43xx/bcm43xx_ilt.c | 367 ++ drivers/net/wireless/bcm43xx/bcm43xx_ilt.h | 34 drivers/net/wireless/bcm43xx/bcm43xx_leds.c | 287 + drivers/net/wireless/bcm43xx/bcm43xx_leds.h | 56 drivers/net/wireless/bcm43xx/bcm43xx_main.c | 4364 +++++++++++++++++++++++++ drivers/net/wireless/bcm43xx/bcm43xx_main.h | 283 + drivers/net/wireless/bcm43xx/bcm43xx_phy.c | 2122 ++++++++++++ drivers/net/wireless/bcm43xx/bcm43xx_phy.h | 74 drivers/net/wireless/bcm43xx/bcm43xx_pio.c | 603 +++ drivers/net/wireless/bcm43xx/bcm43xx_pio.h | 138 drivers/net/wireless/bcm43xx/bcm43xx_power.c | 358 ++ drivers/net/wireless/bcm43xx/bcm43xx_power.h | 47 drivers/net/wireless/bcm43xx/bcm43xx_radio.c | 1766 ++++++++++ drivers/net/wireless/bcm43xx/bcm43xx_radio.h | 94 drivers/net/wireless/bcm43xx/bcm43xx_wx.c | 1070 ++++++ drivers/net/wireless/bcm43xx/bcm43xx_wx.h | 36 net/ieee80211/ieee80211_rx.c | 74 29 files changed, 14731 insertions(+), 1 deletion(-) View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.2 -r 1.3 linux-2.6-bcm43xx-git.patch Index: linux-2.6-bcm43xx-git.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-bcm43xx-git.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- linux-2.6-bcm43xx-git.patch 15 Feb 2006 19:33:35 -0000 1.2 +++ linux-2.6-bcm43xx-git.patch 3 Mar 2006 03:36:21 -0000 1.3 @@ -1,5 +1,5 @@ ---- /dev/null 2006-01-05 13:17:15.134352320 -0500 -+++ linux-2.6.15.noarch/Documentation/networking/bcm43xx.txt 2006-02-14 17:01:37.000000000 -0500 +--- /dev/null 2006-02-23 13:53:30.750106688 -0500 ++++ linux-2.6.15.noarch/Documentation/networking/bcm43xx.txt 2006-03-02 18:25:19.000000000 -0500 @@ -0,0 +1,36 @@ + + BCM43xx Linux Driver Project @@ -37,8 +37,8 @@ + binary driver files. It supports driver files from Windows, MacOS and + Linux. You can get fwcutter from http://bcm43xx.berlios.de/. + Also, fwcutter comes with a README file for further instructions. ---- /dev/null 2006-01-05 13:17:15.134352320 -0500 -+++ linux-2.6.15.noarch/drivers/net/wireless/bcm43xx/bcm43xx_wx.h 2006-02-14 17:02:06.000000000 -0500 +--- /dev/null 2006-02-23 13:53:30.750106688 -0500 ++++ linux-2.6.15.noarch/drivers/net/wireless/bcm43xx/bcm43xx_wx.h 2006-03-02 18:26:08.000000000 -0500 @@ -0,0 +1,36 @@ +/* + @@ -76,9 +76,9 @@ +extern const struct iw_handler_def bcm43xx_wx_handlers_def; + +#endif /* BCM43xx_WX_H_ */ ---- /dev/null 2006-01-05 13:17:15.134352320 -0500 -+++ linux-2.6.15.noarch/drivers/net/wireless/bcm43xx/bcm43xx.h 2006-02-14 17:02:06.000000000 -0500 -@@ -0,0 +1,934 @@ +--- /dev/null 2006-02-23 13:53:30.750106688 -0500 ++++ linux-2.6.15.noarch/drivers/net/wireless/bcm43xx/bcm43xx.h 2006-03-02 18:26:08.000000000 -0500 +@@ -0,0 +1,955 @@ +#ifndef BCM43xx_H_ +#define BCM43xx_H_ + @@ -100,16 +100,17 @@ + +#define PFX KBUILD_MODNAME ": " + -+#define BCM43xx_SWITCH_CORE_MAX_RETRIES 10 ++#define BCM43xx_SWITCH_CORE_MAX_RETRIES 50 +#define BCM43xx_IRQWAIT_MAX_RETRIES 50 + +#define BCM43xx_IO_SIZE 8192 -+#define BCM43xx_REG_ACTIVE_CORE 0x80 + -+/* Interrupt Control PCI Configuration Register. (Only on PCI cores with rev >= 6) */ -+#define BCM43xx_PCICFG_ICR 0x94 ++/* Active Core PCI Configuration Register. */ ++#define BCM43xx_PCICFG_ACTIVE_CORE 0x80 +/* SPROM control register. */ +#define BCM43xx_PCICFG_SPROMCTL 0x88 ++/* Interrupt Control PCI Configuration Register. (Only on PCI cores with rev >= 6) */ ++#define BCM43xx_PCICFG_ICR 0x94 + +/* MMIO offsets */ +#define BCM43xx_MMIO_DMA1_REASON 0x20 @@ -499,7 +500,6 @@ + +struct net_device; +struct pci_dev; -+struct workqueue_struct; +struct bcm43xx_dmaring; +struct bcm43xx_pioqueue; + @@ -606,6 +606,8 @@ + * 3: tx_CTL2 + */ + u16 txpower[4]; ++ /* Desired TX power in dBm Q5.2 */ ++ u16 txpower_desired; + /* Current Interference Mitigation mode */ + int interfmode; + /* Stack of saved values from the Interference Mitigation code */ @@ -718,7 +720,7 @@ + u32 initialized:1, /* init_board() succeed */ + was_initialized:1, /* for PCI suspend/resume. */ + shutting_down:1, /* free_board() in progress */ -+ pio_mode:1, /* PIO (if true), or DMA (if false) used. */ ++ __using_pio:1, /* Internal, use bcm43xx_using_pio(). */ + bad_frames_preempt:1, /* Use "Bad Frames Preemption" (default off) */ + reg124_set_0x4:1, /* Some variable to keep track of IRQ stuff. */ + powersaving:1, /* TRUE if we are in PowerSaving mode. FALSE otherwise. */ @@ -785,18 +787,10 @@ + + /* Interrupt Service Routine tasklet (bottom-half) */ + struct tasklet_struct isr_tasklet; -+ /* Custom driver work queue. */ -+ struct workqueue_struct *workqueue; + + /* Periodic tasks */ -+ struct work_struct periodic_work0; -+#define BCM43xx_PERIODIC_0_DELAY (HZ * 15) -+ struct work_struct periodic_work1; -+#define BCM43xx_PERIODIC_1_DELAY ((HZ * 60) + HZ / 2) -+ struct work_struct periodic_work2; -+#define BCM43xx_PERIODIC_2_DELAY ((HZ * 120) + HZ) -+ struct work_struct periodic_work3; -+#define BCM43xx_PERIODIC_3_DELAY ((HZ * 30) + HZ / 5) ++ struct timer_list periodic_tasks; ++ unsigned int periodic_state; + + struct work_struct restart_work; + @@ -828,6 +822,33 @@ + return ieee80211softmac_priv(dev); +} + ++ ++/* Helper function, which returns a boolean. ++ * TRUE, if PIO is used; FALSE, if DMA is used. ++ */ ++#if defined(CONFIG_BCM43XX_DMA) && defined(CONFIG_BCM43XX_PIO) ++static inline ++int bcm43xx_using_pio(struct bcm43xx_private *bcm) ++{ ++ return bcm->__using_pio; ++} ++#elif defined(CONFIG_BCM43XX_DMA) ++static inline ++int bcm43xx_using_pio(struct bcm43xx_private *bcm) ++{ ++ return 0; ++} ++#elif defined(CONFIG_BCM43XX_PIO) ++static inline ++int bcm43xx_using_pio(struct bcm43xx_private *bcm) ++{ ++ return 1; ++} ++#else ++# error "Using neither DMA nor PIO? Confused..." ++#endif ++ ++ +static inline +int bcm43xx_num_80211_cores(struct bcm43xx_private *bcm) +{ @@ -1013,8 +1034,8 @@ + }) + +#endif /* BCM43xx_H_ */ ---- /dev/null 2006-01-05 13:17:15.134352320 -0500 -+++ linux-2.6.15.noarch/drivers/net/wireless/bcm43xx/bcm43xx_radio.h 2006-02-14 17:02:06.000000000 -0500 +--- /dev/null 2006-02-23 13:53:30.750106688 -0500 ++++ linux-2.6.15.noarch/drivers/net/wireless/bcm43xx/bcm43xx_radio.h 2006-03-02 18:26:08.000000000 -0500 @@ -0,0 +1,94 @@ +/* + @@ -1110,9 +1131,9 @@ +u16 bcm43xx_radio_calibrationvalue(struct bcm43xx_private *bcm); + +#endif /* BCM43xx_RADIO_H_ */ ---- /dev/null 2006-01-05 13:17:15.134352320 -0500 -+++ linux-2.6.15.noarch/drivers/net/wireless/bcm43xx/bcm43xx_leds.h 2006-02-14 17:02:06.000000000 -0500 -@@ -0,0 +1,47 @@ +--- /dev/null 2006-02-23 13:53:30.750106688 -0500 ++++ linux-2.6.15.noarch/drivers/net/wireless/bcm43xx/bcm43xx_leds.h 2006-03-02 18:26:08.000000000 -0500 +@@ -0,0 +1,56 @@ +#ifndef BCM43xx_LEDS_H_ +#define BCM43xx_LEDS_H_ + @@ -1131,7 +1152,7 @@ +#define bcm43xx_led_index(led) ((int)((led) - (led)->bcm->leds)) + +/* Delay between state changes when blinking in jiffies */ -+#define BCM43xx_LEDBLINK_SLOW (HZ / 2) ++#define BCM43xx_LEDBLINK_SLOW (HZ / 1) +#define BCM43xx_LEDBLINK_MEDIUM (HZ / 4) +#define BCM43xx_LEDBLINK_FAST (HZ / 8) + @@ -1152,6 +1173,15 @@ + BCM43xx_LED_WEIRD,//FIXME + BCM43xx_LED_ASSOC, + BCM43xx_LED_INACTIVE, ++ ++ /* Behaviour values for testing. ++ * With these values it is easier to figure out ++ * the real behaviour of leds, in case the SPROM ++ * is missing information. ++ */ ++ BCM43xx_LED_TEST_BLINKSLOW, ++ BCM43xx_LED_TEST_BLINKMEDIUM, ++ BCM43xx_LED_TEST_BLINKFAST, +}; + +int bcm43xx_leds_init(struct bcm43xx_private *bcm); @@ -1160,8 +1190,8 @@ +void bcm43xx_leds_turn_off(struct bcm43xx_private *bcm); + +#endif /* BCM43xx_LEDS_H_ */ ---- /dev/null 2006-01-05 13:17:15.134352320 -0500 -+++ linux-2.6.15.noarch/drivers/net/wireless/bcm43xx/bcm43xx_ilt.h 2006-02-14 17:02:06.000000000 -0500 +--- /dev/null 2006-02-23 13:53:30.750106688 -0500 ++++ linux-2.6.15.noarch/drivers/net/wireless/bcm43xx/bcm43xx_ilt.h 2006-03-02 18:26:08.000000000 -0500 [...2661 lines suppressed...] + turn_on = 1; @@ -12169,12 +12211,22 @@ + continue; + case BCM43xx_LED_WEIRD: + //TODO -+ turn_on = 0; + break; + case BCM43xx_LED_ASSOC: -+ if (1/*TODO: associated*/) ++ if (bcm->softmac->associated) + turn_on = 1; + break; ++#ifdef CONFIG_BCM43XX_DEBUG ++ case BCM43xx_LED_TEST_BLINKSLOW: ++ bcm43xx_led_blink_start(led, BCM43xx_LEDBLINK_SLOW); ++ continue; ++ case BCM43xx_LED_TEST_BLINKMEDIUM: ++ bcm43xx_led_blink_start(led, BCM43xx_LEDBLINK_MEDIUM); ++ continue; ++ case BCM43xx_LED_TEST_BLINKFAST: ++ bcm43xx_led_blink_start(led, BCM43xx_LEDBLINK_FAST); ++ continue; ++#endif /* CONFIG_BCM43XX_DEBUG */ + default: + assert(0); + }; @@ -12206,9 +12258,9 @@ +} + +/* vim: set ts=8 sw=8 sts=8: */ ---- /dev/null 2006-01-05 13:17:15.134352320 -0500 -+++ linux-2.6.15.noarch/drivers/net/wireless/bcm43xx/bcm43xx_phy.c 2006-02-14 17:02:06.000000000 -0500 -@@ -0,0 +1,2127 @@ +--- /dev/null 2006-02-23 13:53:30.750106688 -0500 ++++ linux-2.6.15.noarch/drivers/net/wireless/bcm43xx/bcm43xx_phy.c 2006-03-02 18:26:08.000000000 -0500 +@@ -0,0 +1,2122 @@ +/* + + Broadcom BCM43xx wireless driver @@ -13979,14 +14031,9 @@ + where REG is the max power as per the regulatory domain + */ + -+ /*TODO: Get desired_pwr from wx_handlers or the stack -+ limit_value(desired_pwr, 0, max_pwr); -+ */ -+ -+ desired_pwr = max_pwr; /* remove this when we have a real desired_pwr */ -+ ++ desired_pwr = limit_value(radio->txpower_desired, 0, max_pwr); ++ /* Check if we need to adjust the current power. */ + pwr_adjust = desired_pwr - estimated_pwr; -+ + radio_att_delta = -(pwr_adjust + 7) >> 3; + baseband_att_delta = -(pwr_adjust >> 1) - (4 * radio_att_delta); + if ((radio_att_delta == 0) && (baseband_att_delta == 0)) { @@ -14336,9 +14383,9 @@ + + phy->antenna_diversity = antennadiv; +} ---- /dev/null 2006-01-05 13:17:15.134352320 -0500 -+++ linux-2.6.15.noarch/drivers/net/wireless/bcm43xx/bcm43xx_dma.h 2006-02-14 17:02:06.000000000 -0500 -@@ -0,0 +1,175 @@ +--- /dev/null 2006-02-23 13:53:30.750106688 -0500 ++++ linux-2.6.15.noarch/drivers/net/wireless/bcm43xx/bcm43xx_dma.h 2006-03-02 18:26:08.000000000 -0500 +@@ -0,0 +1,221 @@ +#ifndef BCM43xx_DMA_H_ +#define BCM43xx_DMA_H_ + @@ -14435,6 +14482,10 @@ +#define BCM43xx_TXRESUME_PERCENT 50 + + ++ ++#ifdef CONFIG_BCM43XX_DMA ++ ++ +struct sk_buff; +struct bcm43xx_private; +struct bcm43xx_xmitstatus; @@ -14513,9 +14564,51 @@ + struct ieee80211_txb *txb); +void bcm43xx_dma_rx(struct bcm43xx_dmaring *ring); + ++ ++#else /* CONFIG_BCM43XX_DMA */ ++ ++ ++static inline ++int bcm43xx_dma_init(struct bcm43xx_private *bcm) ++{ ++ return 0; ++} ++static inline ++void bcm43xx_dma_free(struct bcm43xx_private *bcm) ++{ ++} ++static inline ++int bcm43xx_dmacontroller_rx_reset(struct bcm43xx_private *bcm, ++ u16 dmacontroller_mmio_base) ++{ ++ return 0; ++} ++static inline ++int bcm43xx_dmacontroller_tx_reset(struct bcm43xx_private *bcm, ++ u16 dmacontroller_mmio_base) ++{ ++ return 0; ++} ++static inline ++int bcm43xx_dma_tx(struct bcm43xx_private *bcm, ++ struct ieee80211_txb *txb) ++{ ++ return 0; ++} ++static inline ++void bcm43xx_dma_handle_xmitstatus(struct bcm43xx_private *bcm, ++ struct bcm43xx_xmitstatus *status) ++{ ++} ++static inline ++void bcm43xx_dma_rx(struct bcm43xx_dmaring *ring) ++{ ++} ++ ++#endif /* CONFIG_BCM43XX_DMA */ +#endif /* BCM43xx_DMA_H_ */ ---- /dev/null 2006-01-05 13:17:15.134352320 -0500 -+++ linux-2.6.15.noarch/drivers/net/wireless/bcm43xx/bcm43xx_debugfs.h 2006-02-14 17:02:06.000000000 -0500 +--- /dev/null 2006-02-23 13:53:30.750106688 -0500 ++++ linux-2.6.15.noarch/drivers/net/wireless/bcm43xx/bcm43xx_debugfs.h 2006-03-02 18:26:08.000000000 -0500 @@ -0,0 +1,117 @@ +#ifndef BCM43xx_DEBUGFS_H_ +#define BCM43xx_DEBUGFS_H_ @@ -14634,9 +14727,9 @@ + } while (0) + +#endif /* BCM43xx_DEBUGFS_H_ */ ---- linux-2.6.15.noarch/drivers/net/wireless/Makefile.orig 2006-02-14 17:01:26.000000000 -0500 -+++ linux-2.6.15.noarch/drivers/net/wireless/Makefile 2006-02-14 17:02:17.000000000 -0500 -@@ -35,6 +35,7 @@ obj-$(CONFIG_PCI_ATMEL) += atmel +--- linux-2.6.15.noarch/drivers/net/wireless/Makefile.orig 2006-03-02 18:24:56.000000000 -0500 ++++ linux-2.6.15.noarch/drivers/net/wireless/Makefile 2006-03-02 18:31:34.000000000 -0500 +@@ -35,6 +35,7 @@ obj-$(CONFIG_PCMCIA_ATMEL) += atmel obj-$(CONFIG_PRISM54) += prism54/ obj-$(CONFIG_HOSTAP) += hostap/ @@ -14644,34 +14737,30 @@ # 16-bit wireless PCMCIA client drivers obj-$(CONFIG_PCMCIA_RAYCS) += ray_cs.o ---- linux-2.6.15.noarch/drivers/net/wireless/Kconfig.orig 2006-02-14 17:01:26.000000000 -0500 -+++ linux-2.6.15.noarch/drivers/net/wireless/Kconfig 2006-02-14 17:02:17.000000000 -0500 -@@ -471,6 +489,23 @@ config PRISM54 +--- linux-2.6.15.noarch/drivers/net/wireless/Kconfig.orig 2006-03-02 18:24:56.000000000 -0500 ++++ linux-2.6.15.noarch/drivers/net/wireless/Kconfig 2006-03-02 18:31:01.000000000 -0500 +@@ -291,7 +291,10 @@ config APPLE_AIRPORT + Say Y here to support the Airport 802.11b wireless Ethernet hardware + built into the Macintosh iBook and other recent PowerPC-based + Macintosh machines. This is essentially a Lucent Orinoco card with +- a non-standard interface ++ a non-standard interface. ++ ++ This driver does not support the Airport Extreme (802.11b/g). Use ++ the BCM43xx driver for Airport Extreme cards. + + config PLX_HERMES + tristate "Hermes in PLX9052 based PCI adaptor support (Netgear MA301 etc.)" +@@ -481,6 +484,7 @@ config PRISM54 will be called prism54.ko. source "drivers/net/wireless/hostap/Kconfig" -+ -+config BCM43XX -+ tristate "Broadcom BCM43xx wireless support" -+ depends on PCI && IEEE80211 && NET_RADIO && IEEE80211_SOFTMAC && EXPERIMENTAL -+ select FW_LOADER -+ ---help--- -+ This is an experimental driver for the Broadcom 43xx wireless chip, -+ found in the Apple Airport Extreme and various other devices. -+ -+config BCM43XX_DEBUG -+ bool "Broadcom BCM43xx debugging (RECOMMENDED)" -+ depends on BCM43XX -+ default y -+ ---help--- -+ Broadcom 43xx debugging messages. -+ Say Y, because the driver is still very experimental and -+ this will help you get it running. ++source "drivers/net/wireless/bcm43xx/Kconfig" # yes, this works even when no drivers are selected config NET_WIRELESS ---- linux-2.6.15.noarch/net/ieee80211/ieee80211_rx.c.orig 2006-02-14 16:59:31.000000000 -0500 -+++ linux-2.6.15.noarch/net/ieee80211/ieee80211_rx.c 2006-02-14 17:01:12.000000000 -0500 +--- linux-2.6.15.noarch/net/ieee80211/ieee80211_rx.c.orig 2006-03-02 18:24:56.000000000 -0500 ++++ linux-2.6.15.noarch/net/ieee80211/ieee80211_rx.c 2006-03-02 18:25:19.000000000 -0500 @@ -773,6 +773,80 @@ int ieee80211_rx(struct ieee80211_device return 0; } --- linux-2.6-bcm-warnings.patch DELETED --- From fedora-cvs-commits at redhat.com Fri Mar 3 04:09:29 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 2 Mar 2006 23:09:29 -0500 Subject: rpms/specspo/devel .cvsignore, 1.16, 1.17 sources, 1.25, 1.26 specspo.spec, 1.30, 1.31 Message-ID: <200603030409.k2349TUm010662@cvs.devel.redhat.com> Author: notting Update of /cvs/dist/rpms/specspo/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv10618 Modified Files: .cvsignore sources specspo.spec Log Message: update Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/specspo/devel/.cvsignore,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- .cvsignore 9 Sep 2004 12:43:16 -0000 1.16 +++ .cvsignore 3 Mar 2006 04:09:19 -0000 1.17 @@ -1 +1 @@ -specspo-9.0.92.tar.bz2 +specspo-10.tar.bz2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/specspo/devel/sources,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- sources 9 Sep 2004 12:43:16 -0000 1.25 +++ sources 3 Mar 2006 04:09:19 -0000 1.26 @@ -1 +1 @@ -73f4807763e1dda1484fc365303f2f5a specspo-9.0.92.tar.bz2 +7ea77743f8d250f344f2708fdbe6b2b1 specspo-10.tar.bz2 Index: specspo.spec =================================================================== RCS file: /cvs/dist/rpms/specspo/devel/specspo.spec,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- specspo.spec 9 Dec 2005 22:43:16 -0000 1.30 +++ specspo.spec 3 Mar 2006 04:09:19 -0000 1.31 @@ -1,9 +1,9 @@ %define builtin_release_version @VERSION@ -Summary: Red Hat package descriptions, summaries, and groups. +Summary: Fedora package descriptions, summaries, and groups. Name: specspo -Version: 9.0.92 -Release: 1.3.1 +Version: 10 +Release: 1 Group: Documentation Source: specspo-%{version}.tar.bz2 License: GPL @@ -12,10 +12,10 @@ %description The specspo package contains the portable object catalogues used to -internationalize Red Hat packages. +internationalize Fedora packages. %prep -%setup -c -q +%setup -q %build make @@ -23,10 +23,10 @@ %install rm -rf %{buildroot} -make LOCALEDIR="%{buildroot}%{_datadir}/locale" install +make install DESTDIR=%{buildroot} mkdir -p %{buildroot}%{_sysconfdir}/rpm -echo '%_i18ndomains redhat-dist' > %{buildroot}%{_sysconfdir}/rpm/macros.specspo +echo '%%_i18ndomains redhat-dist' > %{buildroot}%{_sysconfdir}/rpm/macros.specspo /usr/lib/rpm/find-lang.sh %{buildroot} redhat-dist @@ -35,18 +35,11 @@ %files -f redhat-dist.lang %defattr(-,root,root) -%doc dist/dist.pot %config(noreplace) %{_sysconfdir}/rpm/macros.specspo %changelog -* Fri Dec 09 2005 Jesse Keating -- rebuilt - -* Thu Sep 30 2004 Bernd Groh -- rebuilt - -* Fri Feb 13 2004 Elliot Lee -- rebuilt +* Thu Mar 02 2006 Bill Nottingham 10-1 +- update * Thu Jul 03 2003 Paul Gampe 9.0.92 - Update translations From fedora-cvs-commits at redhat.com Fri Mar 3 04:21:48 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 2 Mar 2006 23:21:48 -0500 Subject: rpms/beagle/devel beagle.spec,1.39,1.40 Message-ID: <200603030421.k234Lmss028464@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/beagle/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv28352 Modified Files: beagle.spec Log Message: Make beagled find systemwide indexes Index: beagle.spec =================================================================== RCS file: /cvs/dist/rpms/beagle/devel/beagle.spec,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- beagle.spec 1 Mar 2006 17:32:15 -0000 1.39 +++ beagle.spec 3 Mar 2006 04:21:46 -0000 1.40 @@ -1,6 +1,6 @@ Name: beagle Version: 0.2.1 -Release: 15 +Release: 16 Summary: The Beagle Search Infrastructure Group: User Interface/Desktops @@ -70,7 +70,7 @@ %build export MONO_SHARED_DIR=%{_builddir}/%{?buildsubdir} -%configure +%configure --localstatedir=/var make %{?_smp_mflags} # Generate the beagle.xpi for mozilla/firefox @@ -213,6 +213,10 @@ %{_prefix}/lib/python*/site-packages/beagle.so %changelog +* Thu Mar 2 2006 Matthias Clasen 0.2.1-16 +- Make sure beagled looks for systemwide static + indexes in the right place. + * Wed Mar 1 2006 Matthias Clasen 0.2.1-15 - Bump log level to "error" to avoid tons of pointless warnings. (#183162) From fedora-cvs-commits at redhat.com Fri Mar 3 04:22:52 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 2 Mar 2006 23:22:52 -0500 Subject: rpms/redhat-menus/devel .cvsignore, 1.36, 1.37 redhat-menus.spec, 1.58, 1.59 sources, 1.38, 1.39 Message-ID: <200603030422.k234MqhB029012@cvs.devel.redhat.com> Author: notting Update of /cvs/dist/rpms/redhat-menus/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv28947 Modified Files: .cvsignore redhat-menus.spec sources Log Message: bump, add locales Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/redhat-menus/devel/.cvsignore,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- .cvsignore 9 Feb 2006 05:58:19 -0000 1.36 +++ .cvsignore 3 Mar 2006 04:22:49 -0000 1.37 @@ -1,2 +1 @@ -redhat-menus-6.6.4.tar.gz -redhat-menus-6.6.5.tar.gz +redhat-menus-6.7.5.tar.gz Index: redhat-menus.spec =================================================================== RCS file: /cvs/dist/rpms/redhat-menus/devel/redhat-menus.spec,v retrieving revision 1.58 retrieving revision 1.59 diff -u -r1.58 -r1.59 --- redhat-menus.spec 9 Feb 2006 05:58:19 -0000 1.58 +++ redhat-menus.spec 3 Mar 2006 04:22:49 -0000 1.59 @@ -3,7 +3,7 @@ Summary: Configuration and data files for the desktop menus Name: redhat-menus -Version: 6.6.5 +Version: 6.7.5 Release: 1 URL: http://www.redhat.com Source0: %{name}-%{version}.tar.gz @@ -66,6 +66,9 @@ %{_datadir}/desktop-directories/*.directory %changelog +* Thu Mar 2 2006 Bill Nottingham - 6.7.5-1 +- add locales (#176139) + * Thu Feb 9 2006 Matthias Clasen - 6.6.5-1 - Really move pirut to toplevel Index: sources =================================================================== RCS file: /cvs/dist/rpms/redhat-menus/devel/sources,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- sources 9 Feb 2006 05:58:19 -0000 1.38 +++ sources 3 Mar 2006 04:22:49 -0000 1.39 @@ -1 +1 @@ -aff5ac40612ccad298972431abe4e192 redhat-menus-6.6.5.tar.gz +2ea6d8eda699af7a0ba517beb1128ff3 redhat-menus-6.7.5.tar.gz From fedora-cvs-commits at redhat.com Fri Mar 3 04:45:42 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 2 Mar 2006 23:45:42 -0500 Subject: rpms/beagle/devel beagle.spec,1.40,1.41 Message-ID: <200603030445.k234jgaG005096@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/beagle/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv4124 Modified Files: beagle.spec Log Message: Remove pointless change Index: beagle.spec =================================================================== RCS file: /cvs/dist/rpms/beagle/devel/beagle.spec,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- beagle.spec 3 Mar 2006 04:21:46 -0000 1.40 +++ beagle.spec 3 Mar 2006 04:45:38 -0000 1.41 @@ -70,7 +70,7 @@ %build export MONO_SHARED_DIR=%{_builddir}/%{?buildsubdir} -%configure --localstatedir=/var +%configure make %{?_smp_mflags} # Generate the beagle.xpi for mozilla/firefox @@ -213,10 +213,6 @@ %{_prefix}/lib/python*/site-packages/beagle.so %changelog -* Thu Mar 2 2006 Matthias Clasen 0.2.1-16 -- Make sure beagled looks for systemwide static - indexes in the right place. - * Wed Mar 1 2006 Matthias Clasen 0.2.1-15 - Bump log level to "error" to avoid tons of pointless warnings. (#183162) From fedora-cvs-commits at redhat.com Fri Mar 3 04:51:53 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 2 Mar 2006 23:51:53 -0500 Subject: rpms/NetworkManager/devel NetworkManager.spec,1.95,1.96 Message-ID: <200603030451.k234prW5019441@cvs.devel.redhat.com> Author: caillon Update of /cvs/dist/rpms/NetworkManager/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv19404 Modified Files: NetworkManager.spec Log Message: * Thu Mar 2 2006 Christopher Aillon - Move the unversioned libnm_glib.so to the -devel package Index: NetworkManager.spec =================================================================== RCS file: /cvs/dist/rpms/NetworkManager/devel/NetworkManager.spec,v retrieving revision 1.95 retrieving revision 1.96 diff -u -r1.95 -r1.96 --- NetworkManager.spec 1 Mar 2006 12:45:27 -0000 1.95 +++ NetworkManager.spec 3 Mar 2006 04:51:50 -0000 1.96 @@ -206,14 +206,18 @@ %files glib %defattr(-,root,root,0755) -%{_libdir}/libnm_glib.so* +%{_libdir}/libnm_glib.so.* %files glib-devel %{_includedir}/%{name}/libnm_glib.h %{_libdir}/pkgconfig/libnm_glib.pc +%{_libdir}/libnm_glib.so %changelog +* Thu Mar 2 2006 Christopher Aillon +- Move the unversioned libnm_glib.so to the -devel package + * Wed Mar 1 2006 Dan Williams 0.5.1-18.cvs20060301 - Fix VPN-related crash - Fix issue where NM would refuse to activate a VPN connection once it had timed out From fedora-cvs-commits at redhat.com Fri Mar 3 05:13:32 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 3 Mar 2006 00:13:32 -0500 Subject: rpms/pirut/devel .cvsignore, 1.17, 1.18 pirut.spec, 1.18, 1.19 sources, 1.18, 1.19 Message-ID: <200603030513.k235DWEp024774@cvs.devel.redhat.com> Author: katzj Update of /cvs/dist/rpms/pirut/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv24704/devel Modified Files: .cvsignore pirut.spec sources Log Message: auto-import pirut-1.0.0-1 on branch devel from pirut-1.0.0-1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/pirut/devel/.cvsignore,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- .cvsignore 28 Feb 2006 23:58:41 -0000 1.17 +++ .cvsignore 3 Mar 2006 05:13:15 -0000 1.18 @@ -1 +1 @@ -pirut-0.9.17.tar.gz +pirut-1.0.0.tar.gz Index: pirut.spec =================================================================== RCS file: /cvs/dist/rpms/pirut/devel/pirut.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- pirut.spec 28 Feb 2006 23:58:41 -0000 1.18 +++ pirut.spec 3 Mar 2006 05:13:15 -0000 1.19 @@ -2,14 +2,14 @@ Summary: Package Installation, Removal and Update Tools Name: pirut -Version: 0.9.17 +Version: 1.0.0 Release: 1 License: GPL Group: Applications/System URL: http://fedoraproject.org Source0: %{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root -Requires: pygtk2, pygtk2-libglade, yum >= 2.5.3 +Requires: pygtk2, pygtk2-libglade, yum >= 2.5.3, comps-extras Requires(post): desktop-file-utils >= 0.8 Requires(postun): desktop-file-utils >= 0.8 Obsoletes: system-config-packages, redhat-config-packages, pup @@ -67,6 +67,12 @@ %changelog +* Fri Mar 3 2006 Jeremy Katz - 1.0.0-1 +- Fix formatting in reboot dialog (#183597) +- Show category pixbuf if there's not one for the group (#183545) +- Ensure groups are shown as selected +- Catch locking error (#183685) + * Tue Feb 28 2006 Jeremy Katz - 0.9.17-1 - Fix package selection traceback (#183310) - Lock the yum pid file when pirut tools are running (#183311) Index: sources =================================================================== RCS file: /cvs/dist/rpms/pirut/devel/sources,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- sources 28 Feb 2006 23:58:41 -0000 1.18 +++ sources 3 Mar 2006 05:13:15 -0000 1.19 @@ -1 +1 @@ -598d6bb306871413b9139919b1d6b415 pirut-0.9.17.tar.gz +bfa52dc10c7614b7c719842a445c94d5 pirut-1.0.0.tar.gz From fedora-cvs-commits at redhat.com Fri Mar 3 05:16:17 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 3 Mar 2006 00:16:17 -0500 Subject: rpms/anaconda/devel .cvsignore, 1.230, 1.231 anaconda.spec, 1.351, 1.352 sources, 1.350, 1.351 Message-ID: <200603030516.k235GHZI025549@cvs.devel.redhat.com> Author: katzj Update of /cvs/dist/rpms/anaconda/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv25202/devel Modified Files: .cvsignore anaconda.spec sources Log Message: auto-import anaconda-10.92.15-1 on branch devel from anaconda-10.92.15-1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/anaconda/devel/.cvsignore,v retrieving revision 1.230 retrieving revision 1.231 diff -u -r1.230 -r1.231 --- .cvsignore 1 Mar 2006 03:27:10 -0000 1.230 +++ .cvsignore 3 Mar 2006 05:16:14 -0000 1.231 @@ -1 +1 @@ -anaconda-10.92.14.tar.bz2 +anaconda-10.92.15.tar.bz2 Index: anaconda.spec =================================================================== RCS file: /cvs/dist/rpms/anaconda/devel/anaconda.spec,v retrieving revision 1.351 retrieving revision 1.352 diff -u -r1.351 -r1.352 --- anaconda.spec 1 Mar 2006 03:27:10 -0000 1.351 +++ anaconda.spec 3 Mar 2006 05:16:14 -0000 1.352 @@ -1,5 +1,5 @@ Name: anaconda -Version: 10.92.14 +Version: 10.92.15 Release: 1 License: GPL Summary: Graphical system installer @@ -79,6 +79,12 @@ /sbin/chkconfig --del reconfig >/dev/null 2>&1 || : %changelog +* Fri Mar 3 2006 Jeremy Katz - 10.92.15-1 +- conditional code is now in yum (pnasrat) +- sort network devices smarter (clumens, #166842) +- select needed fs entries (#183271) +- more serbian fixes (#182591) + * Tue Feb 28 2006 Jeremy Katz - 10.92.14-1 - fix traceback in pkgorder - don't display xen Index: sources =================================================================== RCS file: /cvs/dist/rpms/anaconda/devel/sources,v retrieving revision 1.350 retrieving revision 1.351 diff -u -r1.350 -r1.351 --- sources 1 Mar 2006 03:27:10 -0000 1.350 +++ sources 3 Mar 2006 05:16:14 -0000 1.351 @@ -1 +1 @@ -08c3d8d6cf7e2ce5e0da682c0e83d2e4 anaconda-10.92.14.tar.bz2 +e63da53f347bbe79ef95db800b9449a1 anaconda-10.92.15.tar.bz2 From fedora-cvs-commits at redhat.com Fri Mar 3 07:38:34 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 3 Mar 2006 02:38:34 -0500 Subject: rpms/gimp/devel gimp-2.2.10-htmlview.patch, NONE, 1.1 gimp.spec, 1.88, 1.89 Message-ID: <200603030738.k237cYRq024501@cvs.devel.redhat.com> Author: nphilipp Update of /cvs/dist/rpms/gimp/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv24420 Modified Files: gimp.spec Added Files: gimp-2.2.10-htmlview.patch Log Message: use htmlview as default web browser (#183730, patch by Ben Levenson) gimp-2.2.10-htmlview.patch: app/config/gimpguiconfig.c | 2 +- etc/gimprc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) --- NEW FILE gimp-2.2.10-htmlview.patch --- --- gimp-2.2.10/app/config/gimpguiconfig.c.htmlview 2004-10-31 10:41:17.000000000 -0500 +++ gimp-2.2.10/app/config/gimpguiconfig.c 2006-03-03 00:38:45.000000000 -0500 @@ -56,7 +56,7 @@ # define DEFAULT_WEB_BROWSER "not used on Windows" #else # define DEFAULT_GIMP_HELP_BROWSER GIMP_HELP_BROWSER_GIMP -# define DEFAULT_WEB_BROWSER "mozilla %s" +# define DEFAULT_WEB_BROWSER "htmlview %s" #endif enum --- gimp-2.2.10/etc/gimprc.htmlview 2006-03-03 00:39:50.000000000 -0500 +++ gimp-2.2.10/etc/gimprc 2006-03-03 00:40:00.000000000 -0500 @@ -585,7 +585,7 @@ # appended to the command with a space separating the two. This is a single # filename. # -# (web-browser "mozilla %s") +# (web-browser "htmlview %s") # The window type hint that is set on the toolbox. This may affect how your # window manager decorates and handles the toolbox window. Possible values Index: gimp.spec =================================================================== RCS file: /cvs/dist/rpms/gimp/devel/gimp.spec,v retrieving revision 1.88 retrieving revision 1.89 diff -u -r1.88 -r1.89 --- gimp.spec 11 Feb 2006 03:08:02 -0000 1.88 +++ gimp.spec 3 Mar 2006 07:38:32 -0000 1.89 @@ -19,7 +19,7 @@ %define minorver 200 %define microver %(ver=%{version}; echo ${ver##*.*.}) #define prever pre2 -Release: %{?prever:0.0.%{prever}.}2.2 +Release: %{?prever:0.0.%{prever}.}3 Epoch: 2 License: GPL, LGPL Group: Applications/Multimedia @@ -73,6 +73,7 @@ Patch2: gimp-2.2.3-icontheme.patch Patch3: gimp-2.2.7-gcc4.patch Patch4: gimp-2.2.4-gifload.patch +Patch5: gimp-2.2.10-htmlview.patch %description The GIMP (GNU Image Manipulation Program) is a powerful image @@ -101,6 +102,7 @@ %patch2 -p1 -b .icontheme %patch3 -p1 -b .gcc4 %patch4 -p1 -b .gifload +%patch5 -p1 -b .htmlview %build libtoolize --copy --force @@ -348,6 +350,9 @@ %{_libdir}/pkgconfig/* %changelog +* Fri Mar 03 2006 Nils Philippsen - 2:2.2.10-3 +- use htmlview as default web browser (#183730, patch by Ben Levenson) + * Fri Feb 10 2006 Jesse Keating - 2:2.2.10-2.2 - bump again for double-long bug on ppc(64) From fedora-cvs-commits at redhat.com Fri Mar 3 09:43:53 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 3 Mar 2006 04:43:53 -0500 Subject: rpms/system-config-display/devel system-config-display-1.0.36-pam.patch, NONE, 1.1 system-config-display.spec, 1.32, 1.33 Message-ID: <200603030943.k239hrDr003927@cvs.devel.redhat.com> Author: stransky Update of /cvs/dist/rpms/system-config-display/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv3890 Modified Files: system-config-display.spec Added Files: system-config-display-1.0.36-pam.patch Log Message: some minor fixes - #170625,#182861,#182862 system-config-display-1.0.36-pam.patch: system-config-display.pam | 10 +++------- 1 files changed, 3 insertions(+), 7 deletions(-) --- NEW FILE system-config-display-1.0.36-pam.patch --- --- system-config-display-1.0.36/system-config-display.pam.old 2003-11-19 22:35:32.000000000 +0100 +++ system-config-display-1.0.36/system-config-display.pam 2006-03-03 10:04:23.000000000 +0100 @@ -1,8 +1,4 @@ #%PAM-1.0 -auth sufficient pam_rootok.so -auth sufficient pam_timestamp.so -auth required pam_stack.so service=system-auth -session required pam_permit.so -session optional pam_xauth.so -session optional pam_timestamp.so -account required pam_permit.so +auth include config-util +account include config-util +session include config-util Index: system-config-display.spec =================================================================== RCS file: /cvs/dist/rpms/system-config-display/devel/system-config-display.spec,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- system-config-display.spec 22 Feb 2006 18:17:11 -0000 1.32 +++ system-config-display.spec 3 Mar 2006 09:43:50 -0000 1.33 @@ -1,7 +1,7 @@ Summary: A graphical interface for configuring the X Window System display Name: system-config-display Version: 1.0.36 -Release: 2 +Release: 3 URL: http://fedora.redhat.com/projects/config-tools/ License: GPL ExclusiveOS: Linux @@ -9,6 +9,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildArch: noarch Source0: %{name}-%{version}.tar.bz2 +Patch0: system-config-display-1.0.36-pam.patch ExcludeArch: s390 s390x ppc64 Obsoletes: redhat-config-xfree86 BuildRequires: desktop-file-utils @@ -28,6 +29,7 @@ Requires: metacity Prereq: gtk2 >= 2.6 Obsoletes: Xconfigurator +PreReq: hicolor-icon-theme %description system-config-display is a graphical application for configuring an @@ -35,6 +37,7 @@ %prep %setup -q +%patch0 -p1 -b .pam %build make @@ -80,6 +83,10 @@ %attr(0644,root,root) %{_datadir}/icons/hicolor/48x48/apps/system-config-display.png %changelog +* Fri Mar 03 2006 Martin Stransky 1.0.36-3 +- added pam fix (#170625) +- fix prereq (#182861, #182862) + * Wed Feb 22 2006 Chris Lumens 1.0.36-2 - Add rhpxl to requires From fedora-cvs-commits at redhat.com Fri Mar 3 10:05:52 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 3 Mar 2006 05:05:52 -0500 Subject: rpms/system-config-display/devel system-config-display.spec, 1.33, 1.34 Message-ID: <200603031005.k23A5qve024036@cvs.devel.redhat.com> Author: stransky Update of /cvs/dist/rpms/system-config-display/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv23992 Modified Files: system-config-display.spec Log Message: backup file change Index: system-config-display.spec =================================================================== RCS file: /cvs/dist/rpms/system-config-display/devel/system-config-display.spec,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- system-config-display.spec 3 Mar 2006 09:43:50 -0000 1.33 +++ system-config-display.spec 3 Mar 2006 10:05:49 -0000 1.34 @@ -37,7 +37,7 @@ %prep %setup -q -%patch0 -p1 -b .pam +%patch0 -p1 -b .pm %build make From fedora-cvs-commits at redhat.com Fri Mar 3 10:47:42 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 3 Mar 2006 05:47:42 -0500 Subject: rpms/aspell-en/devel aspell-en-6.0-offencive.patch, NONE, 1.1 aspell-en-6.0-practise.patch, NONE, 1.1 aspell-en.spec, 1.10, 1.11 Message-ID: <200603031047.k23Algtl020433@cvs.devel.redhat.com> Author: varekova Update of /cvs/dist/rpms/aspell-en/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv20416 Modified Files: aspell-en.spec Added Files: aspell-en-6.0-offencive.patch aspell-en-6.0-practise.patch Log Message: - removed "offencive" (#154352), add "practice" (#62225) aspell-en-6.0-offencive.patch: en_CA-w_accents-only.cwl | 2 +- en_CA-wo_accents-only.cwl | 2 +- en_GB-ise-w_accents-only.cwl | 2 +- en_GB-ise-wo_accents-only.cwl | 2 +- en_GB-ize-w_accents-only.cwl | 2 +- en_GB-ize-wo_accents-only.cwl | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) --- NEW FILE aspell-en-6.0-offencive.patch --- --- en_CA-w_accents-only.cwl 2006-03-01 15:14:34.648129608 +0100 +++ en_CA-w_accents-only.cwl.pom 2004-08-10 10:47:20.000000000 +0200 @@ -305,7 +305,7 @@ d r s s ingsey'serststarizatione d singught'ssvelization se d singnae?eochre'ssdour'sedlesssecumenismsdema'ssrsophagus 's estrogen +'susus'sesffence'ssl?ptimization 's se d r -'susus'sesffence'ssivel?ptimization 's se d r s singrganizable tion 's ally se d r 's s singthopaedic s 's st 's sstracize --- en_CA-wo_accents-only.cwl 2006-03-01 15:14:55.703928640 +0100 +++ en_CA-wo_accents-only.cwl.pom 2004-08-10 10:47:20.000000000 +0200 @@ -305,7 +305,7 @@ d r s s ingsey'serststarizatione d singught'ssvelization se d singnaeochre'ssdour'sedlesssecumenismsdema'ssrsophagus 's estrogen +'susus'sesffence'ssleptimization 's se d r -'susus'sesffence'ssiveleptimization 's se d r s singrganizable tion 's ally se d r 's s singthopaedic s 's st 's sstracize --- en_GB-ise-w_accents-only.cwl 2006-03-01 15:15:14.790027112 +0100 +++ en_GB-ise-w_accents-only.cwl.pom 2004-08-10 10:47:20.000000000 +0200 @@ -299,7 +299,7 @@ d r s s ingsey'serststarisatione d singught'ssvelisation se d singnae?eochre'ssdour'sedlesssecumenismsdema'ssrsophagus 's estrogen +'susus'sesffence'ssl?ptimisation 's se d r -'susus'sesffence'ssivel?ptimisation 's se d r s singrganisable tion 's ally se d r 's s singthopaedic s 's st 's sstracise --- en_GB-ise-wo_accents-only.cwl 2006-03-01 15:18:29.834375864 +0100 +++ en_GB-ise-wo_accents-only.cwl.pom 2004-08-10 10:47:20.000000000 +0200 @@ -299,7 +299,7 @@ d r s s ingsey'serststarisatione d singught'ssvelisation se d singnaeochre'ssdour'sedlesssecumenismsdema'ssrsophagus 's estrogen +'susus'sesffence'ssleptimisation 's se d r -'susus'sesffence'ssiveleptimisation 's se d r s singrganisable tion 's ally se d r 's s singthopaedic s 's st 's sstracise --- en_GB-ize-w_accents-only.cwl 2006-03-01 15:18:51.474086128 +0100 +++ en_GB-ize-w_accents-only.cwl.pom 2004-08-10 10:47:20.000000000 +0200 @@ -299,7 +299,7 @@ d r s s ingsey'serststarizatione d singught'ssvelization se d singnae?eochre'ssdour'sedlesssecumenismsdema'ssrsophagus 's estrogen +'susus'sesffence'ssl?ptimization 's se d r -'susus'sesffence'ssivel?ptimization 's se d r s singrganizable tion 's ally se d r 's s singthopaedic s 's st 's sstracize --- en_GB-ize-wo_accents-only.cwl 2006-03-01 15:19:11.894981680 +0100 +++ en_GB-ize-wo_accents-only.cwl.pom 2004-08-10 10:47:21.000000000 +0200 @@ -299,7 +299,7 @@ d r s s ingsey'serststarizatione d singught'ssvelization se d singnaeochre'ssdour'sedlesssecumenismsdema'ssrsophagus 's estrogen +'susus'sesffence'ssleptimization 's se d r -'susus'sesffence'ssiveleptimization 's se d r s singrganizable tion 's ally se d r 's s singthopaedic s 's st 's sstracize aspell-en-6.0-practise.patch: en_CA-w_accents-only.cwl | 2 +- en_CA-wo_accents-only.cwl | 2 +- en_GB-ise-w_accents-only.cwl | 2 +- en_GB-ise-wo_accents-only.cwl | 2 +- en_GB-ize-w_accents-only.cwl | 2 +- en_GB-ize-wo_accents-only.cwl | 2 +- en_US-w_accents-only.cwl | 2 +- en_US-wo_accents-only.cwl | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) --- NEW FILE aspell-en-6.0-practise.patch --- --- en_GB-ise-w_accents-only.cwl 2006-03-02 17:19:19.085961616 +0100 +++ en_GB-ise-w_accents-only.cwl.prac 2006-03-02 17:12:52.000000000 +0100 @@ -329,7 +329,7 @@ e d s ingmmelledingpularisation'ss e d s +ingrti?re 's sractise 's d singracticeeauthorisejudgement 's sssurisation's -ingrti?re 's sractise 's d singeauthorisejudgement 's sssurisation's e d r s s ingtence 's sion 's svioritisation e d s --- en_GB-ise-wo_accents-only.cwl 2006-03-02 17:19:40.226747728 +0100 +++ en_GB-ise-wo_accents-only.cwl.prac 2006-03-02 17:12:52.000000000 +0100 @@ -329,7 +329,7 @@ e d s ingmmelledingpularisation'ss e d s +ingrtiere 's sractise 's d singracticeeauthorisecis'sedingjudgement 's sssurisation's -ingrtiere 's sractise 's d singeauthorisecis'sedingjudgement 's sssurisation's e d r s s ingtence 's sion 's svioritisation e d s --- en_GB-ize-wo_accents-only.cwl 2006-03-02 17:20:36.503192408 +0100 +++ en_GB-ize-wo_accents-only.cwl.prac 2006-03-02 17:12:52.000000000 +0100 @@ -329,7 +329,7 @@ e d s ingmmelledingpularization'ss e d s +ingrtiere 's sractise 's d singracticeeauthorizecis'sedingjudgement 's sssurization's -ingrtiere 's sractise 's d singeauthorizecis'sedingjudgement 's sssurization's e d r s s ingtence 's sion 's svioritization e d s --- en_GB-ize-w_accents-only.cwl 2006-03-02 17:20:16.400248520 +0100 +++ en_GB-ize-w_accents-only.cwl.prac 2006-03-02 17:12:52.000000000 +0100 @@ -329,7 +329,7 @@ e d s ingmmelledingpularization'ss e d s +ingrti?re 's sractise 's d singracticeeauthorizejudgement 's sssurization's -ingrti?re 's sractise 's d singeauthorizejudgement 's sssurization's e d r s s ingtence 's sion 's svioritization e d s --- en_CA-w_accents-only.cwl 2006-03-02 16:57:25.535651616 +0100 +++ en_CA-w_accents-only.cwl.prac 2006-03-02 16:48:18.000000000 +0100 @@ -335,7 +335,7 @@ e d s ingmmelledingpularization'ss e d s +ingrti?re 's sractise 's d singracticeeauthorizejudgement 's sssurization's -ingrti?re 's sractise 's d singeauthorizejudgement 's sssurization's e d r s s ingtence 's sion 's svioritization e d s --- en_CA-wo_accents-only.cwl 2006-03-02 16:57:59.440497296 +0100 +++ en_CA-wo_accents-only.cwl.prac 2006-03-02 16:48:18.000000000 +0100 @@ -335,7 +335,7 @@ e d s ingmmelledingpularization'ss e d s +ingrtiere 's sractise 's d singracticeeauthorizecis'sedingjudgement 's sssurization's -ingrtiere 's sractise 's d singeauthorizecis'sedingjudgement 's sssurization's e d r s s ingtence 's sion 's svioritization e d s --- en_US-wo_accents-only.cwl 2006-03-03 09:11:15.526686376 +0100 +++ en_US-wo_accents-only.cwl.prac 2004-08-10 10:47:21.000000000 +0200 @@ -283,7 +283,7 @@ e d s ingmmeledingpularization'ss e d s +ingrtiere 's sractice 's d singractiseeauthorizecis'sedingjudgment 's sssurization's -ingrtiere 's sractice 's d singeauthorizecis'sedingjudgment 's sssurization's e d r s s ingtense 's sion 's sioritization e d s --- en_US-w_accents-only.cwl 2006-03-03 09:11:36.814450144 +0100 +++ en_US-w_accents-only.cwl.prac 2004-08-10 10:47:21.000000000 +0200 @@ -283,7 +283,7 @@ e d s ingmmeledingpularization'ss e d s +ingrti?re 's sractice 's d singractiseeauthorizejudgment 's sssurization's -ingrti?re 's sractice 's d singeauthorizejudgment 's sssurization's e d r s s ingtense 's sion 's sioritization e d s Index: aspell-en.spec =================================================================== RCS file: /cvs/dist/rpms/aspell-en/devel/aspell-en.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- aspell-en.spec 11 Feb 2006 01:53:30 -0000 1.10 +++ aspell-en.spec 3 Mar 2006 10:47:39 -0000 1.11 @@ -4,11 +4,13 @@ Name: aspell-%{lang} Epoch: 50 Version: 6.0 -Release: 1.2.1 +Release: 2 License: distributable Group: Applications/Text URL: http://aspell.net/ Source: ftp://ftp.gnu.org/gnu/aspell/dict/%{lang}/aspell5-%{lang}-%{version}-%{langrelease}.tar.bz2 +Patch0: aspell-en-6.0-offencive.patch +Patch1: aspell-en-6.0-practise.patch Buildrequires: aspell >= 12:0.60 Requires: aspell >= 12:0.60 Obsoletes: aspell-en-gb, aspell-en-ca, @@ -23,6 +25,8 @@ %prep rm -rf $RPM_BUILD_ROOT %setup -q -n aspell5-%{lang}-%{version}-%{langrelease} +%patch0 -p0 -b .off +%patch1 -p0 -b .prac %build echo "ASPELL = aspell" > Makefile @@ -46,6 +50,9 @@ #%{_datadir}/aspell/* %changelog +* Fri Mar 3 2006 Ivana Varekova - 50:6.0-2 +- removed "offencive" (#154352), add "practice" (#62225) + * Fri Feb 10 2006 Jesse Keating - 50:6.0-1.2.1 - bump again for double-long bug on ppc(64) From fedora-cvs-commits at redhat.com Fri Mar 3 11:08:13 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 3 Mar 2006 06:08:13 -0500 Subject: rpms/beagle/devel beagle.spec,1.41,1.42 Message-ID: <200603031108.k23B8ALC031912@cvs.devel.redhat.com> Author: alexl Update of /cvs/dist/rpms/beagle/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv31862 Modified Files: beagle.spec Log Message: * Fri Mar 3 2006 Alexander Larsson 0.2.1-17 - Change beagle user to uid/gid 58 (registered), because nut was already using 57 (unregistred!) Index: beagle.spec =================================================================== RCS file: /cvs/dist/rpms/beagle/devel/beagle.spec,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- beagle.spec 3 Mar 2006 04:45:38 -0000 1.41 +++ beagle.spec 3 Mar 2006 11:08:07 -0000 1.42 @@ -1,6 +1,6 @@ Name: beagle Version: 0.2.1 -Release: 16 +Release: 17 Summary: The Beagle Search Infrastructure Group: User Interface/Desktops @@ -136,7 +136,7 @@ %postun -n libbeagle -p /sbin/ldconfig %pre -%define beagle_user_uid 57 +%define beagle_user_uid 58 /usr/sbin/groupadd -g %{beagle_user_uid} -r beagleindex 2> /dev/null || : /usr/sbin/useradd -r -u %{beagle_user_uid} -s /bin/false -c "User for Beagle indexing" -d /var/cache/beagle -g beagleindex beagleindex 2> /dev/null || : @@ -213,6 +213,10 @@ %{_prefix}/lib/python*/site-packages/beagle.so %changelog +* Fri Mar 3 2006 Alexander Larsson 0.2.1-17 +- Change beagle user to uid/gid 58 (registered), because + nut was already using 57 (unregistred!) + * Wed Mar 1 2006 Matthias Clasen 0.2.1-15 - Bump log level to "error" to avoid tons of pointless warnings. (#183162) From fedora-cvs-commits at redhat.com Fri Mar 3 12:28:41 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 3 Mar 2006 07:28:41 -0500 Subject: rpms/gsl/devel gsl.spec,1.20,1.21 Message-ID: <200603031228.k23CSfMh027473@cvs.devel.redhat.com> Author: varekova Update of /cvs/dist/rpms/gsl/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv27456 Modified Files: gsl.spec Log Message: - fix multilib problem Index: gsl.spec =================================================================== RCS file: /cvs/dist/rpms/gsl/devel/gsl.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- gsl.spec 11 Feb 2006 03:21:03 -0000 1.20 +++ gsl.spec 3 Mar 2006 12:28:38 -0000 1.21 @@ -1,7 +1,7 @@ Summary: The GNU Scientific Library for numerical analysis. Name: gsl Version: 1.7 -Release: 1.2.1 +Release: 2 URL: http://sources.redhat.com/gsl/ Source: ftp://sources.redhat.com/pub/gsl/%{name}-%{version}.tar.gz Patch0: gsl-1.1-nousr.patch @@ -45,6 +45,20 @@ rm -rf $RPM_BUILD_ROOT%{_sysconfdir} rm -rf $RPM_BUILD_ROOT%{_libdir}/pkgconfig +gslcsuffix=`echo "%{_libdir}" | sed s,/usr/,,` +mv $RPM_BUILD_ROOT%{_bindir}/gsl-config $RPM_BUILD_ROOT%{_bindir}/gsl-config-$gslcsuffix +cat > $RPM_BUILD_ROOT%{_bindir}/gsl-config << EOF +#!/bin/sh +if [ -e %{_bindir}/gsl-config-lib64 ]; then + exec %{_bindir}/gsl-config-lib64 "\$@" +elif [ -e %{_bindir}/gsl-config-* ]; then + gslcfile="\`ls %{_bindir}/gsl-config-* | head -n1\`" + exec \$gslcfile "\$@" +fi +EOF +chmod 755 $RPM_BUILD_ROOT%{_bindir}/gsl-config + + %post -p /sbin/ldconfig %postun -p /sbin/ldconfig @@ -71,7 +85,7 @@ %files devel %defattr(-,root,root) %doc AUTHORS COPYING -%{_bindir}/gsl-config +%{_bindir}/gsl-config* %{_datadir}/aclocal/* %{_includedir}/* %{_infodir}/*info* @@ -79,6 +93,9 @@ %{_libdir}/*.so %changelog +* Fri Mar 3 2006 Ivana Varekova - 1.7-2 +- fix multilib problem + * Fri Feb 10 2006 Jesse Keating - 1.7-1.2.1 - bump again for double-long bug on ppc(64) From fedora-cvs-commits at redhat.com Fri Mar 3 12:57:59 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 3 Mar 2006 07:57:59 -0500 Subject: rpms/gphoto2/devel gphoto2.spec,1.56,1.57 Message-ID: <200603031257.k23Cvxgb017372@cvs.devel.redhat.com> Author: rvokal Update of /cvs/dist/rpms/gphoto2/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv17328 Modified Files: gphoto2.spec Log Message: - remove .la files (#183367) Index: gphoto2.spec =================================================================== RCS file: /cvs/dist/rpms/gphoto2/devel/gphoto2.spec,v retrieving revision 1.56 retrieving revision 1.57 diff -u -r1.56 -r1.57 --- gphoto2.spec 2 Mar 2006 22:06:05 -0000 1.56 +++ gphoto2.spec 3 Mar 2006 12:57:55 -0000 1.57 @@ -5,7 +5,7 @@ %define libpkg libgphoto2 %define libver 2.1.99 Version: %{pkgver} -Release: 6 +Release: 7 License: LGPL Group: Applications/Multimedia BuildRoot: %{_tmppath}/%{name}-%{version}-root @@ -146,6 +146,7 @@ rm -rf %{buildroot}%{_libdir}/libgphoto2/*/*a rm -rf %{buildroot}%{_libdir}/libgphoto2_port/*/*a rm -rf %{buildroot}%{_libdir}/*.a +rm -rf %{buildroot}%{_libdir}/*.la eval `grep ^LIBGPHOTO2_CURRENT %{libpkg}-%{libver}/configure.in` eval `grep ^LIBGPHOTO2_PORT_CURRENT %{libpkg}-%{libver}/libgphoto2_port/configure.in` @@ -203,7 +204,7 @@ %{_bindir}/gphoto2-config %{_bindir}/gphoto2-port-config %{_includedir}/gphoto2 -%{_libdir}/*.la +#%{_libdir}/*.la %{_libdir}/*.so %{_libdir}/pkgconfig/* %{_mandir}/man3/* @@ -212,6 +213,9 @@ # ChangeLog ######################################################################## %changelog +* Fri Mar 03 2006 Radek Vok??l 2.1.99-7 +- remove .la files (#183367) + * Wed Mar 02 2006 Ray Strode 2.1.99-6 - potentially work around bug 183371 by looping/checking for 5 seconds. From fedora-cvs-commits at redhat.com Fri Mar 3 13:32:10 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 3 Mar 2006 08:32:10 -0500 Subject: rpms/pm-utils/devel .cvsignore, 1.15, 1.16 pm-utils.spec, 1.28, 1.29 sources, 1.19, 1.20 Message-ID: <200603031332.k23DWAQN008125@cvs.devel.redhat.com> Author: pknirsch Update of /cvs/dist/rpms/pm-utils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv8085 Modified Files: .cvsignore pm-utils.spec sources Log Message: - Reverted last changes for ATI graphics chips as they cause more problems. Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/pm-utils/devel/.cvsignore,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- .cvsignore 1 Mar 2006 03:20:16 -0000 1.15 +++ .cvsignore 3 Mar 2006 13:31:34 -0000 1.16 @@ -4,3 +4,5 @@ pm-utils-0.09.tar.gz pm-utils-0.10.tar.gz pm-utils-0.11.tar.gz +pm-utils-0.12.tar.gz +pm-utils-0.13.tar.gz Index: pm-utils.spec =================================================================== RCS file: /cvs/dist/rpms/pm-utils/devel/pm-utils.spec,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- pm-utils.spec 1 Mar 2006 15:27:26 -0000 1.28 +++ pm-utils.spec 3 Mar 2006 13:31:34 -0000 1.29 @@ -1,7 +1,7 @@ Name: pm-utils Summary: Power management utilities and scripts for Fedora Core License: GPL -Version: 0.12 +Version: 0.13 Release: 1 Group: System Environment/Base ExclusiveArch: %{ix86} x86_64 ia64 ppc ppc64 @@ -81,6 +81,10 @@ %{_mandir}/man*/* %changelog +* Fri Mar 03 2006 Phil Knirsch - 0.13-1 +- Revert last changes for ATI graphics chips as they seem to cause more + problems than they solved. + * Wed Mar 01 2006 Phil Knirsch - 0.12-1 - Use vbetool post instead of vbetool dpms on for ATI cards. Index: sources =================================================================== RCS file: /cvs/dist/rpms/pm-utils/devel/sources,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- sources 1 Mar 2006 15:27:26 -0000 1.19 +++ sources 3 Mar 2006 13:31:34 -0000 1.20 @@ -1,3 +1,3 @@ -424c372a353b9ece38967b72cdd6b7bd pm-utils-0.12.tar.gz 8065eebe5a2b163e43b40461bfe49a56 radeontool-1.5.tar.gz 950a87f99d17bc4f4ced73cec7103859 vbetool_0.5-1.tar.gz +015375259b58847d11d1ad65975b4d5a pm-utils-0.13.tar.gz From fedora-cvs-commits at redhat.com Fri Mar 3 14:52:50 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 3 Mar 2006 09:52:50 -0500 Subject: rpms/gimp/devel gimp.spec,1.89,1.90 Message-ID: <200603031452.k23EqoI1027480@cvs.devel.redhat.com> Author: nphilipp Update of /cvs/dist/rpms/gimp/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv27465 Modified Files: gimp.spec Log Message: require hicolor-icon-theme (#182784) Index: gimp.spec =================================================================== RCS file: /cvs/dist/rpms/gimp/devel/gimp.spec,v retrieving revision 1.89 retrieving revision 1.90 diff -u -r1.89 -r1.90 --- gimp.spec 3 Mar 2006 07:38:32 -0000 1.89 +++ gimp.spec 3 Mar 2006 14:52:47 -0000 1.90 @@ -19,7 +19,7 @@ %define minorver 200 %define microver %(ver=%{version}; echo ${ver##*.*.}) #define prever pre2 -Release: %{?prever:0.0.%{prever}.}3 +Release: %{?prever:0.0.%{prever}.}4 Epoch: 2 License: GPL, LGPL Group: Applications/Multimedia @@ -65,8 +65,12 @@ Requires: pango >= 1.6.0 Requires: fontconfig >= 2.2.0 Requires: gimp-print >= 4.2.0 -Requires(post): /sbin/ldconfig /usr/bin/update-desktop-database -Requires(postun): /sbin/ldconfig /usr/bin/update-desktop-database +Requires(post): /sbin/ldconfig +Requires(post): /usr/bin/update-desktop-database +Requires(post): hicolor-icon-theme +Requires(postun): /sbin/ldconfig +Requires(postun): /usr/bin/update-desktop-database +Requires(postun): hicolor-icon-theme Source0: ftp://ftp.gimp.org/pub/gimp/v%{binver}/%{?prever:testing/}gimp-%{version}%{?prever:-%{prever}}.tar.bz2 Patch0: gimp-2.0pre3-buildroot.patch Patch1: gimp-2.0.1-gimphelpmissing.patch @@ -350,8 +354,9 @@ %{_libdir}/pkgconfig/* %changelog -* Fri Mar 03 2006 Nils Philippsen - 2:2.2.10-3 +* Fri Mar 03 2006 Nils Philippsen - 2:2.2.10-4 - use htmlview as default web browser (#183730, patch by Ben Levenson) +- require hicolor-icon-theme (#182784) * Fri Feb 10 2006 Jesse Keating - 2:2.2.10-2.2 - bump again for double-long bug on ppc(64) From fedora-cvs-commits at redhat.com Fri Mar 3 14:59:32 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 3 Mar 2006 09:59:32 -0500 Subject: rpms/gimp/devel gimp.spec,1.90,1.91 Message-ID: <200603031459.k23ExV4U005348@cvs.devel.redhat.com> Author: nphilipp Update of /cvs/dist/rpms/gimp/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv5299 Modified Files: gimp.spec Log Message: mention all BZ entries Index: gimp.spec =================================================================== RCS file: /cvs/dist/rpms/gimp/devel/gimp.spec,v retrieving revision 1.90 retrieving revision 1.91 diff -u -r1.90 -r1.91 --- gimp.spec 3 Mar 2006 14:52:47 -0000 1.90 +++ gimp.spec 3 Mar 2006 14:59:29 -0000 1.91 @@ -356,7 +356,7 @@ %changelog * Fri Mar 03 2006 Nils Philippsen - 2:2.2.10-4 - use htmlview as default web browser (#183730, patch by Ben Levenson) -- require hicolor-icon-theme (#182784) +- require hicolor-icon-theme (#182784, #182785) * Fri Feb 10 2006 Jesse Keating - 2:2.2.10-2.2 - bump again for double-long bug on ppc(64) From fedora-cvs-commits at redhat.com Fri Mar 3 15:04:07 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 3 Mar 2006 10:04:07 -0500 Subject: rpms/system-config-date/devel .cvsignore, 1.39, 1.40 sources, 1.42, 1.43 system-config-date.spec, 1.47, 1.48 Message-ID: <200603031504.k23F47LK005882@cvs.devel.redhat.com> Author: nphilipp Update of /cvs/dist/rpms/system-config-date/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv5835 Modified Files: .cvsignore sources system-config-date.spec Log Message: require hicolor-icon-theme (#182859, #182860) Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/system-config-date/devel/.cvsignore,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- .cvsignore 30 Jan 2006 12:39:17 -0000 1.39 +++ .cvsignore 3 Mar 2006 15:04:04 -0000 1.40 @@ -1 +1 @@ -system-config-date-1.8.0.tar.bz2 +system-config-date-1.8.1.tar.bz2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/system-config-date/devel/sources,v retrieving revision 1.42 retrieving revision 1.43 diff -u -r1.42 -r1.43 --- sources 30 Jan 2006 12:39:17 -0000 1.42 +++ sources 3 Mar 2006 15:04:04 -0000 1.43 @@ -1 +1 @@ -4719629449303b2b8312328b97001d1d system-config-date-1.8.0.tar.bz2 +e5f27e07c88de4e52640edc976e820bd system-config-date-1.8.1.tar.bz2 Index: system-config-date.spec =================================================================== RCS file: /cvs/dist/rpms/system-config-date/devel/system-config-date.spec,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- system-config-date.spec 30 Jan 2006 12:39:17 -0000 1.47 +++ system-config-date.spec 3 Mar 2006 15:04:04 -0000 1.48 @@ -1,6 +1,6 @@ Summary: A graphical interface for modifying system date and time Name: system-config-date -Version: 1.8.0 +Version: 1.8.1 Release: 1 URL: http://fedora.redhat.com/projects/config-tools/ License: GPL @@ -26,6 +26,8 @@ Requires: rhpl Requires: newt Requires: htmlview +Requires(post): hicolor-icon-theme +Requires(postun): hicolor-icon-theme Conflicts: firstboot <= 1.3.26 %description @@ -95,6 +97,9 @@ %attr(0644,root,root) %config(noreplace) /usr/share/system-config-date/ntp.template %changelog +* Fri Mar 03 2006 Nils Philippsen 1.8.1 +- require hicolor-icon-theme (#182859, #182860) + * Mon Jan 30 2006 Nils Philippsen 1.8.0 - bump minor version - add requirements for pygtk2-libglade, gnome-python2-canvas (#179215) From fedora-cvs-commits at redhat.com Fri Mar 3 15:10:55 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 3 Mar 2006 10:10:55 -0500 Subject: rpms/system-config-nfs/devel .cvsignore, 1.25, 1.26 sources, 1.28, 1.29 system-config-nfs.spec, 1.31, 1.32 Message-ID: <200603031510.k23FAtO6007218@cvs.devel.redhat.com> Author: nphilipp Update of /cvs/dist/rpms/system-config-nfs/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv7161 Modified Files: .cvsignore sources system-config-nfs.spec Log Message: require hicolor-icon-theme (#182870, #182871) Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/system-config-nfs/devel/.cvsignore,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- .cvsignore 2 Feb 2006 16:45:07 -0000 1.25 +++ .cvsignore 3 Mar 2006 15:10:52 -0000 1.26 @@ -1 +1 @@ -system-config-nfs-1.3.18.tar.bz2 +system-config-nfs-1.3.19.tar.bz2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/system-config-nfs/devel/sources,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- sources 2 Feb 2006 16:45:07 -0000 1.28 +++ sources 3 Mar 2006 15:10:52 -0000 1.29 @@ -1 +1 @@ -f76dbc29f2f713f7a5fd806821036a32 system-config-nfs-1.3.18.tar.bz2 +dd49bc95aebef3a46061362766baabd5 system-config-nfs-1.3.19.tar.bz2 Index: system-config-nfs.spec =================================================================== RCS file: /cvs/dist/rpms/system-config-nfs/devel/system-config-nfs.spec,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- system-config-nfs.spec 2 Feb 2006 16:45:07 -0000 1.31 +++ system-config-nfs.spec 3 Mar 2006 15:10:52 -0000 1.32 @@ -1,6 +1,6 @@ Summary: NFS server configuration tool Name: system-config-nfs -Version: 1.3.18 +Version: 1.3.19 Release: 1 URL: http://fedora.redhat.com/projects/config-tools/ License: GPL @@ -20,6 +20,8 @@ Requires: usermode >= 1.36 Requires: rhpl Requires: htmlview +Requires(post): hicolor-icon-theme +Requires(postun): hicolor-icon-theme %description system-config-nfs is a graphical user interface for creating, @@ -70,6 +72,9 @@ %attr(0644,root,root) %config /etc/pam.d/system-config-nfs %changelog +* Fri Mar 03 2006 Nils Philippsen 1.3.19 +- require hicolor-icon-theme (#182870, #182871) + * Thu Feb 02 2006 Nils Philippsen 1.3.18 - don't complain when trying to edit a share (#179687) - handle wildcards in warning messages for duplicates From fedora-cvs-commits at redhat.com Fri Mar 3 15:17:28 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 3 Mar 2006 10:17:28 -0500 Subject: rpms/system-config-samba/devel .cvsignore, 1.28, 1.29 sources, 1.28, 1.29 system-config-samba.spec, 1.31, 1.32 Message-ID: <200603031517.k23FHSE8022533@cvs.devel.redhat.com> Author: nphilipp Update of /cvs/dist/rpms/system-config-samba/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv22453 Modified Files: .cvsignore sources system-config-samba.spec Log Message: require hicolor-icon-theme (#182874, #182875) Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/system-config-samba/devel/.cvsignore,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- .cvsignore 6 Feb 2006 14:57:00 -0000 1.28 +++ .cvsignore 3 Mar 2006 15:17:25 -0000 1.29 @@ -1 +1 @@ -system-config-samba-1.2.33.tar.bz2 +system-config-samba-1.2.34.tar.bz2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/system-config-samba/devel/sources,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- sources 6 Feb 2006 14:57:00 -0000 1.28 +++ sources 3 Mar 2006 15:17:25 -0000 1.29 @@ -1 +1 @@ -4e1a0603fbf3f27e6c7222f02a47987e system-config-samba-1.2.33.tar.bz2 +a0c3e4681fb09676c0bdea5a9f07963a system-config-samba-1.2.34.tar.bz2 Index: system-config-samba.spec =================================================================== RCS file: /cvs/dist/rpms/system-config-samba/devel/system-config-samba.spec,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- system-config-samba.spec 6 Feb 2006 14:57:00 -0000 1.31 +++ system-config-samba.spec 3 Mar 2006 15:17:25 -0000 1.32 @@ -1,6 +1,6 @@ Summary: Samba server configuration tool Name: system-config-samba -Version: 1.2.33 +Version: 1.2.34 Release: 1 URL: http://www.redhat.com/ License: GPL @@ -20,6 +20,8 @@ Requires: samba Requires: libuser Requires: htmlview +Requires(post): hicolor-icon-theme +Requires(postun): hicolor-icon-theme %description system-config-samba is a graphical user interface for creating, @@ -75,6 +77,9 @@ %attr(0644,root,root) %config /etc/pam.d/system-config-samba %changelog +* Fri Mar 03 2006 Nils Philippsen - 1.2.34 +- require hicolor-icon-theme (#182874, #182875) + * Mon Feb 06 2006 Nils Philippsen - 1.2.33 - fix typo in PAM file (#179937) From fedora-cvs-commits at redhat.com Fri Mar 3 15:45:18 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 3 Mar 2006 10:45:18 -0500 Subject: rpms/system-config-services/devel .cvsignore, 1.24, 1.25 sources, 1.28, 1.29 system-config-services.spec, 1.31, 1.32 Message-ID: <200603031545.k23FjIFE031959@cvs.devel.redhat.com> Author: nphilipp Update of /cvs/dist/rpms/system-config-services/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv31844 Modified Files: .cvsignore sources system-config-services.spec Log Message: require hicolor-icon-theme (#182878, #182879) Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/system-config-services/devel/.cvsignore,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- .cvsignore 27 Jan 2006 16:14:46 -0000 1.24 +++ .cvsignore 3 Mar 2006 15:45:15 -0000 1.25 @@ -1 +1 @@ -system-config-services-0.8.99.2.tar.gz +system-config-services-0.9.0.tar.gz Index: sources =================================================================== RCS file: /cvs/dist/rpms/system-config-services/devel/sources,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- sources 27 Jan 2006 16:14:46 -0000 1.28 +++ sources 3 Mar 2006 15:45:15 -0000 1.29 @@ -1 +1 @@ -30ac683a1d2fcc7e3782350635fa7147 system-config-services-0.8.99.2.tar.gz +d05e1cf9ee54752953ff7ee6da746a81 system-config-services-0.9.0.tar.gz Index: system-config-services.spec =================================================================== RCS file: /cvs/dist/rpms/system-config-services/devel/system-config-services.spec,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- system-config-services.spec 27 Jan 2006 16:14:46 -0000 1.31 +++ system-config-services.spec 3 Mar 2006 15:45:15 -0000 1.32 @@ -1,7 +1,7 @@ # -*- RPM-SPEC -*- Summary: system-config-services is an initscript and xinetd configuration utility Name: system-config-services -Version: 0.8.99.2 +Version: 0.9.0 Release: 1 URL: http://www.redhat.com/ Source0: %{name}-%{version}.tar.gz @@ -14,6 +14,8 @@ Requires: usermode >= 1.36, usermode-gtk Requires: htmlview Requires: python >= 2.3.0 +Requires(post): hicolor-icon-theme +Requires(postun): hicolor-icon-theme BuildRequires: automake Obsoletes: serviceconf Obsoletes: redhat-config-services @@ -71,6 +73,16 @@ %{_mandir}/*/system-config-services.8* %changelog +* Fri Mar 03 2006 Nils Philippsen - 0.9.0 +- require hicolor-icon-theme (#182878, #182879) + +* Wed Feb 28 2006 Florian Festi +- rewrote large parts of servicemethods (OO design, better handling of old/new + settings, read headers of init scripts completely) +- first implementation of widgets to control services (intended for tools + configuring single services like nfs, samba, bind, ...), still missing: i18n, + dependencies on other services (like portmap) + * Fri Jan 27 2006 Nils Philippsen - 0.8.99.2 - fix saving xinetd services From fedora-cvs-commits at redhat.com Fri Mar 3 15:49:59 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 3 Mar 2006 10:49:59 -0500 Subject: rpms/system-config-users/devel .cvsignore, 1.29, 1.30 sources, 1.29, 1.30 system-config-users.spec, 1.34, 1.35 Message-ID: <200603031549.k23Fnx9f014068@cvs.devel.redhat.com> Author: nphilipp Update of /cvs/dist/rpms/system-config-users/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv14014 Modified Files: .cvsignore sources system-config-users.spec Log Message: require hicolor-icon-theme (#182882, #182883) Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/system-config-users/devel/.cvsignore,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- .cvsignore 4 Oct 2005 15:05:27 -0000 1.29 +++ .cvsignore 3 Mar 2006 15:49:56 -0000 1.30 @@ -1 +1 @@ -system-config-users-1.2.41.tar.bz2 +system-config-users-1.2.42.tar.bz2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/system-config-users/devel/sources,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- sources 4 Oct 2005 15:05:27 -0000 1.29 +++ sources 3 Mar 2006 15:49:56 -0000 1.30 @@ -1 +1 @@ -c81333b06e56e718d2b5cb592d23221b system-config-users-1.2.41.tar.bz2 +59734ff1805c478fc3cd34ec05da71fe system-config-users-1.2.42.tar.bz2 Index: system-config-users.spec =================================================================== RCS file: /cvs/dist/rpms/system-config-users/devel/system-config-users.spec,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- system-config-users.spec 9 Dec 2005 22:43:29 -0000 1.34 +++ system-config-users.spec 3 Mar 2006 15:49:56 -0000 1.35 @@ -1,7 +1,7 @@ Summary: A graphical interface for administering users and groups Name: system-config-users -Version: 1.2.41 -Release: 1.1 +Version: 1.2.42 +Release: 1 URL: http://fedora.redhat.com/projects/config-tools/ License: GPL ExclusiveOS: Linux @@ -22,6 +22,8 @@ Requires: rpm-python Requires: /usr/bin/pgrep Requires: rhpl +Requires(post): hicolor-icon-theme +Requires(postun): hicolor-icon-theme BuildPrereq: python2 %description @@ -75,8 +77,11 @@ %attr(0644,root,root) %config (noreplace) /etc/sysconfig/system-config-users %changelog -* Fri Dec 09 2005 Jesse Keating -- rebuilt +* Fri Mar 03 2006 Nils Philippsen - 1.2.42 +- require hicolor-icon-theme (#182882, #182883) + +* Fri Oct 14 2005 Nils Philippsen +- don't use pam_stack (#170649) * Tue Oct 04 2005 Nils Philippsen - 1.2.41 - fix variable names to prevent hangs when adding a group (#169730) From fedora-cvs-commits at redhat.com Fri Mar 3 16:50:07 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 3 Mar 2006 11:50:07 -0500 Subject: rpms/cman/devel cman.spec,1.25,1.26 sources,1.9,1.10 Message-ID: <200603031650.k23Go7Ph013239@cvs.devel.redhat.com> Author: cfeist Update of /cvs/dist/rpms/cman/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv13068 Modified Files: cman.spec sources Log Message: New upstream source." Index: cman.spec =================================================================== RCS file: /cvs/dist/rpms/cman/devel/cman.spec,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- cman.spec 1 Mar 2006 20:17:12 -0000 1.25 +++ cman.spec 3 Mar 2006 16:49:55 -0000 1.26 @@ -12,7 +12,7 @@ Name: cman Version: 1.0.5 -Release: 0.FC5.0 +Release: 0.FC5.1 License: GPL Group: System Environment/Base Summary: cman - The Cluster Manager Index: sources =================================================================== RCS file: /cvs/dist/rpms/cman/devel/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 1 Mar 2006 20:17:12 -0000 1.9 +++ sources 3 Mar 2006 16:49:55 -0000 1.10 @@ -1 +1 @@ -74f3876248cedccc76d32597be8cf0d4 cman-1.0.5.tar.gz +28093928d8ea68c10ade13525c6342cd cman-1.0.5.tar.gz From fedora-cvs-commits at redhat.com Fri Mar 3 17:10:59 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 3 Mar 2006 12:10:59 -0500 Subject: rpms/squirrelmail/FC-4 compilelocales, NONE, 1.1 .cvsignore, 1.12, 1.13 sources, 1.12, 1.13 squirrelmail.spec, 1.21, 1.22 squirrelmail-1.4.3-config.patch, 1.1, NONE squirrelmail-1.4.6-cvs20050812.patch, 1.1, NONE Message-ID: <200603031710.k23HAxiP016401@cvs.devel.redhat.com> Author: wtogami Update of /cvs/dist/rpms/squirrelmail/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv13906 Modified Files: .cvsignore sources squirrelmail.spec Added Files: compilelocales Removed Files: squirrelmail-1.4.3-config.patch squirrelmail-1.4.6-cvs20050812.patch Log Message: Upgrade to 1.4.6 proper for CVE-2006-0377 CVE-2006-0195 CVE-2006-0188 - Script the charset changes instead of using a patch - Convert the ko_KR files to UTF-8, dropping invalid characters from what's theoretically supposed to be EUC-KR in the original. --- NEW FILE compilelocales --- #!/bin/sh for trans in `ls locale/`; do for string in `ls po/*.pot | sed 's/^po\///' | sed 's/.pot$//'` ; do if [ -f locale/${trans}/LC_MESSAGES/${string}.po ]; then msgfmt locale/${trans}/LC_MESSAGES/${string}.po \ -c -o locale/${trans}/LC_MESSAGES/${string}.mo fi done done for trans in `ls locale/`; do for string in `ls po/plugins/*.pot | sed 's/^po\/plugins\///' | sed 's/.pot$//'` ; do if [ -f locale/${trans}/LC_MESSAGES/plugins/${string}.po ]; then msgfmt locale/${trans}/LC_MESSAGES/plugins/${string}.po \ -c -o locale/${trans}/LC_MESSAGES/plugins/${string}.mo fi done done for trans in `ls locale/`; do for string in `ls po/extra/*.pot | sed 's/^po\/extra\///' | sed 's/.pot$//'` ; do if [ -f locale/${trans}/LC_MESSAGES/extra/${string}.po ]; then msgfmt locale/${trans}/LC_MESSAGES/extra/${string}.po \ -c -o locale/${trans}/LC_MESSAGES/extra/${string}.mo fi done done Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/squirrelmail/FC-4/.cvsignore,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- .cvsignore 22 Aug 2005 05:38:38 -0000 1.12 +++ .cvsignore 3 Mar 2006 17:10:41 -0000 1.13 @@ -1,2 +1,2 @@ -squirrelmail-1.4.5.tar.bz2 -squirrelmail-20050812_1242-CVS.locales.tar.bz2 +all_locales-1.4.6-20060221.tar.bz2 +squirrelmail-1.4.6.tar.bz2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/squirrelmail/FC-4/sources,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- sources 22 Aug 2005 05:38:38 -0000 1.12 +++ sources 3 Mar 2006 17:10:41 -0000 1.13 @@ -1,2 +1,2 @@ -bcfe0c1d4049e9c26e0040b2fa3adb07 squirrelmail-1.4.5.tar.bz2 -8e9a2bdcfdb520f346c67ed791730e00 squirrelmail-20050812_1242-CVS.locales.tar.bz2 +29dfec2e0f71fba368a89c36c51881c2 all_locales-1.4.6-20060221.tar.bz2 +300ddcf66b7907a61b6e9404840e35de squirrelmail-1.4.6.tar.bz2 Index: squirrelmail.spec =================================================================== RCS file: /cvs/dist/rpms/squirrelmail/FC-4/squirrelmail.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- squirrelmail.spec 22 Aug 2005 05:38:38 -0000 1.21 +++ squirrelmail.spec 3 Mar 2006 17:10:41 -0000 1.22 @@ -6,21 +6,19 @@ Summary: SquirrelMail webmail client Name: squirrelmail Version: 1.4.6 -Release: 0.cvs20050812.1.fc4 +Release: 1.fc4 License: GPL URL: http://www.squirrelmail.org/ Group: Applications/Internet #Source: %{name}-%{version}.tar.bz2 -Source0: %{name}-1.4.5.tar.bz2 +Source0: http://prdownloads.sourceforge.net/squirrelmail/%{name}-%{version}.tar.bz2 Source1: squirrelmail.conf Source2: squirrelmail-splash-fedora.png Source3: squirrelmail-splash-rhel.png -Source4: squirrelmail-20050812_1242-CVS.locales.tar.bz2 -Patch2: squirrelmail-1.4.3-config.patch -Patch3: squirrelmail-1.4.6-cvs20050812.patch +Source4: http://prdownloads.sourceforge.net/squirrelmail/all_locales-1.4.6-20060221.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildArch: noarch -Requires: httpd, php >= 4.0.4, perl, tmpwatch >= 2.8, aspell +Requires: httpd, php >= 4.0.4, php-mbstring, perl, tmpwatch >= 2.8, aspell Requires: /usr/sbin/sendmail Prereq: httpd, perl Provides: squirrelmail-i18n @@ -36,9 +34,7 @@ %prep #%setup -q -%setup -q -n squirrelmail-1.4.5 -%patch2 -p0 -%patch3 -p1 +%setup -q -n squirrelmail-%{version} rm -f plugins/make_archive.pl # Rearrange the documentation @@ -124,16 +120,66 @@ install -m 644 $RPM_SOURCE_DIR/squirrelmail.conf \ $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/ +# Switch all locales to UTF-8. +sed -i functions/i18n.php \ + -e "s/^\(\$languages\['\([^']*\)'\]\['CHARSET'].*= '\)\([^']*\)';/\1utf-8';/" \ + -e "s/^\(\$languages\['\([^']*\)'\]\['LOCALE'].*=\).*/\1 '\2.UTF-8';/" + + # install locales mkdir locale_tempdir cd locale_tempdir tar xfj %SOURCE4 -find -name '*.po' |xargs rm -cd squirrelmail.locales +# Convert all locales to utf-8. Not only is this probably the right thing +# to do anyway, but SquirrelMail will corrupt charsets unless the charset +# of the user's locale is a superset of the charset of any mail they reply to +# https://sf.net/tracker/?func=detail&atid=423691&aid=1235345&group_id=311 +for LOCALE in `ls locale/` ; do + SKIPINVALID= + case $LOCALE in + ja_JP) + # ja_JP uses iso2022-jp for email but euc-jp in its interface. + CHARSET=euc-jp + ;; + ko_KR) + # ko_KR has broken help files in indeterminate charset. + # Assume it's _mostly_ EUC-KR as it's supposed to be, and let + # iconv drop invalid characters from the input. + SKIPINVALID=-c + CHARSET=`grep CHARSET locale/$LOCALE/setup.php | cut -f6 -d\'` + ;; + *) + CHARSET=`grep CHARSET locale/$LOCALE/setup.php | cut -f6 -d\'` + ;; + esac + + # Check for locales where CHARSET isn't in LOCALE. + grep LOCALE locale/$LOCALE/setup.php | grep -vi $CHARSET || : + + if [ "$CHARSET" != "utf-8" -a "$CHARSET" != "UTF-8" ]; then + for a in `ls help/$LOCALE/ 2>/dev/null` ; do + iconv $SKIPINVALID -f $CHARSET -t utf-8 help/$LOCALE/$a > $a.new && mv $a.new help/$LOCALE/$a + done + sed -e "s/CHARSET..[ ]*= [^;]*;/CHARSET'] = 'utf-8';/" \ + -e "s/LOCALE..[ ]*= [^;]*;/LOCALE'] = '$LOCALE.UTF-8';/" \ + locale/$LOCALE/setup.php > setup.php.new ; mv setup.php.new locale/$LOCALE/setup.php + fi +done + +# do the pofiles separately since they each specify their own charset +for POFILE in `find locale -name \*.po` ; do + CHARSET=`grep charset= $POFILE | cut -f2 -d= | cut -f1 -d\\\\` + if [ "$CHARSET" != "utf-8" -a "$CHARSET" != "UTF-8" ]; then + sed s/charset=$CHARSET/charset=utf-8/ $POFILE | iconv -f $CHARSET -t utf-8 > $POFILE.new && mv $POFILE.new $POFILE + fi +done +for POFILE in `find . -name \*.po` ; do + msgfmt $POFILE -c -o `echo $POFILE | sed s/\.po\$/.mo/` +done cp -r locale/* $RPM_BUILD_ROOT%{_datadir}/squirrelmail/locale/ cp -r images/* $RPM_BUILD_ROOT%{_datadir}/squirrelmail/images/ cp -r help/* $RPM_BUILD_ROOT%{_datadir}/squirrelmail/help/ -cd ../.. +cd .. rm $RPM_BUILD_ROOT%{_datadir}/squirrelmail/locale/README.locales %clean @@ -166,6 +212,24 @@ %{_sysconfdir}/cron.daily/squirrelmail.cron %changelog +* Wed Mar 1 2006 David Woodhouse 1.4.6-1 +- Upgrade to 1.4.6 proper for CVE-2006-0377 CVE-2006-0195 CVE-2006-0188 +- Script the charset changes instead of using a patch +- Convert the ko_KR files to UTF-8, dropping invalid characters from + what's theoretically supposed to be EUC-KR in the original. + +* Tue Jan 17 2006 Warren Togami 1.4.6-0.cvs20050812.3 +- do not remove mo files +- require php-mbstring + +* Fri Dec 09 2005 Jesse Keating +- rebuilt + +* Mon Sep 12 2005 David Woodhouse 1.4.6-0.cvs20050812.2 +- Convert all locales to UTF-8 instead of legacy character sets to + work around bug #162852. Except for ko_KR, because iconv doesn't + believe its help files are actually in EUC-KR as claimed. + * Sun Aug 14 2005 Warren Togami 1.4.6-0.cvs20050812.1 - snapshot of 1.4.6 because 1.4.5 upstream was a bad release this hopefully will also work on PHP5 too... --- squirrelmail-1.4.3-config.patch DELETED --- --- squirrelmail-1.4.6-cvs20050812.patch DELETED --- From fedora-cvs-commits at redhat.com Fri Mar 3 18:48:30 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 3 Mar 2006 13:48:30 -0500 Subject: rpms/hal/devel hal.spec,1.86,1.87 Message-ID: <200603031848.k23ImUJV028804@cvs.devel.redhat.com> Author: johnp Update of /cvs/dist/rpms/hal/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv28262 Modified Files: hal.spec Log Message: - Fix fstab clearing script to not strip whitespace Index: hal.spec =================================================================== RCS file: /cvs/dist/rpms/hal/devel/hal.spec,v retrieving revision 1.86 retrieving revision 1.87 diff -u -r1.86 -r1.87 --- hal.spec 2 Mar 2006 21:37:03 -0000 1.86 +++ hal.spec 3 Mar 2006 18:48:27 -0000 1.87 @@ -19,7 +19,7 @@ Summary: Hardware Abstraction Layer Name: hal Version: 0.5.7 -Release: 2 +Release: 3 URL: http://www.freedesktop.org/Software/hal Source0: %{name}-%{version}.tar.gz Source1: 99-redhat-storage-policy-fixed-drives.fdi @@ -123,10 +123,11 @@ # service haldaemon condrestart > /dev/null 2>&1 #fi -%triggerpostun -- hal < 0.5.7-2 +%triggerpostun -- hal < 0.5.7-3 #remove lingering fstab-sync entries from /etc/fstab /bin/cp -f /etc/fstab /etc/fstab.hal-save -while read line; do echo $line | awk '{print $4}' | grep -q managed || echo $line | grep -q "^#.*fstab-sync" || echo $line; done < /etc/fstab > fstab.replace +(IFS=" +"; while read line; do echo $line | awk '{print $4}' | grep -q managed || echo $line | grep -q "^#.*fstab-sync" || echo $line; done < /etc/fstab > fstab.replace) if [ -s fstab.replace ]; then /bin/cp -f fstab.replace /etc/fstab @@ -190,6 +191,9 @@ %{_bindir}/hal-device-manager %changelog +* Fri Mar 03 2006 John (J5) Palmieri - 0.5.7-3 +- Fix fstab clearing script to not strip whitespace + * Thu Mar 02 2006 John (J5) Palmieri - 0.5.7-2 - clear out fstab of all fstab-sync entries if previous hal < 0.5.7-2 From fedora-cvs-commits at redhat.com Fri Mar 3 18:58:28 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 3 Mar 2006 13:58:28 -0500 Subject: rpms/kernel/devel .cvsignore, 1.369, 1.370 kernel-2.6.spec, 1.2010, 1.2011 sources, 1.310, 1.311 upstream, 1.285, 1.286 Message-ID: <200603031858.k23IwSF0013005@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv12961 Modified Files: .cvsignore kernel-2.6.spec sources upstream Log Message: git7 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v retrieving revision 1.369 retrieving revision 1.370 diff -u -r1.369 -r1.370 --- .cvsignore 2 Mar 2006 19:26:10 -0000 1.369 +++ .cvsignore 3 Mar 2006 18:58:25 -0000 1.370 @@ -4,4 +4,4 @@ linux-2.6.15.tar.bz2 xen-20060208.tar.bz2 patch-2.6.16-rc5.bz2 -patch-2.6.16-rc5-git6.bz2 +patch-2.6.16-rc5-git7.bz2 Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.2010 retrieving revision 1.2011 diff -u -r1.2010 -r1.2011 --- kernel-2.6.spec 3 Mar 2006 03:36:21 -0000 1.2010 +++ kernel-2.6.spec 3 Mar 2006 18:58:25 -0000 1.2011 @@ -218,7 +218,7 @@ # Patches 0 through 100 are meant for core subsystem upgrades # Patch1: patch-2.6.16-rc5.bz2 -Patch2: patch-2.6.16-rc5-git6.bz2 +Patch2: patch-2.6.16-rc5-git7.bz2 # Patches 100 through 500 are meant for architecture patches Patch100: linux-2.6-bzimage.patch @@ -1600,6 +1600,9 @@ %endif %changelog +* Fri Mar 3 2006 Dave Jones +- 2.6.16rc5-git7 + * Thu Mar 2 2006 John W. Linville - Update to current bcm43xx code Index: sources =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/sources,v retrieving revision 1.310 retrieving revision 1.311 diff -u -r1.310 -r1.311 --- sources 2 Mar 2006 19:26:10 -0000 1.310 +++ sources 3 Mar 2006 18:58:25 -0000 1.311 @@ -1,4 +1,4 @@ cdf95e00f5111e31f78e1d97304d9522 linux-2.6.15.tar.bz2 30f4ef37dbc4d0bce9366e8716e8b51b xen-20060208.tar.bz2 1740ae34807f687a93adf2469ea5c4fc patch-2.6.16-rc5.bz2 -57537f7ff1c1cf1534df4a0986956feb patch-2.6.16-rc5-git6.bz2 +9998826270c7881c350ce4e36eca35c6 patch-2.6.16-rc5-git7.bz2 Index: upstream =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/upstream,v retrieving revision 1.285 retrieving revision 1.286 diff -u -r1.285 -r1.286 --- upstream 2 Mar 2006 19:26:10 -0000 1.285 +++ upstream 3 Mar 2006 18:58:25 -0000 1.286 @@ -1,3 +1,3 @@ linux-2.6.15.tar.bz2 patch-2.6.16-rc5.bz2 -patch-2.6.16-rc5-git6.bz2 +patch-2.6.16-rc5-git7.bz2 From fedora-cvs-commits at redhat.com Fri Mar 3 18:59:17 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 3 Mar 2006 13:59:17 -0500 Subject: rpms/kernel/devel/configs config-x86_64-generic,1.32,1.33 Message-ID: <200603031859.k23IxHKx013290@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel/configs In directory cvs.devel.redhat.com:/tmp/cvs-serv13246/configs Modified Files: config-x86_64-generic Log Message: NR_CPUS=255 for x86-64 Index: config-x86_64-generic =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/configs/config-x86_64-generic,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- config-x86_64-generic 24 Feb 2006 19:13:38 -0000 1.32 +++ config-x86_64-generic 3 Mar 2006 18:59:15 -0000 1.33 @@ -10,14 +10,14 @@ CONFIG_K8_NUMA=y CONFIG_X86_64_ACPI_NUMA=y # CONFIG_NUMA_EMU is not set -CONFIG_NR_CPUS=256 +CONFIG_NR_CPUS=255 CONFIG_GART_IOMMU=y CONFIG_X86_POWERNOW_K8=y CONFIG_IA32_EMULATION=y # CONFIG_IA32_AOUT is not set # CONFIG_IOMMU_DEBUG is not set CONFIG_DEBUG_RODATA=y -CONFIG_MICROCODE=m +CONFIG_MICROCODE=m CONFIG_SWIOTLB=y CONFIG_X86_PM_TIMER=y CONFIG_EDD=m @@ -55,7 +55,7 @@ CONFIG_CPU_FREQ_DEBUG=y CONFIG_X86_SPEEDSTEP_CENTRINO=y CONFIG_X86_ACPI_CPUFREQ=m -CONFIG_X86_SPEEDSTEP_CENTRINO_ACPI=y +CONFIG_X86_SPEEDSTEP_CENTRINO_ACPI=y # CONFIG_X86_ACPI_CPUFREQ_PROC_INTF is not set CONFIG_CPU_FREQ_STAT=m CONFIG_CPU_FREQ_STAT_DETAILS=y @@ -84,7 +84,7 @@ CONFIG_HOTPLUG_PCI_COMPAQ=m # CONFIG_HOTPLUG_PCI_COMPAQ_NVRAM is not set CONFIG_HOTPLUG_PCI_IBM=m -CONFIG_HOTPLUG_PCI_ACPI=m +CONFIG_HOTPLUG_PCI_ACPI=m CONFIG_HOTPLUG_PCI_ACPI_IBM=m # CONFIG_HOTPLUG_PCI_CPCI is not set CONFIG_HOTPLUG_PCI_PCIE=m From fedora-cvs-commits at redhat.com Fri Mar 3 19:00:01 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 3 Mar 2006 14:00:01 -0500 Subject: rpms/kernel/devel patch-2.6.16-rc5-git7.bz2.sign, NONE, 1.1 patch-2.6.16-rc5-git6.bz2.sign, 1.1, NONE Message-ID: <200603031900.k23J01C8013408@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv13369 Added Files: patch-2.6.16-rc5-git7.bz2.sign Removed Files: patch-2.6.16-rc5-git6.bz2.sign Log Message: sign --- NEW FILE patch-2.6.16-rc5-git7.bz2.sign --- -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.2.1 (GNU/Linux) Comment: See http://www.kernel.org/signature.html for info iD8DBQBEB0EsyGugalF9Dw4RApEYAJ4ozC0rlA4DjpOYHlvq/jQN9oD7fACglfN4 CurCHp7TyJj5SpBOFVtHc5M= =IdMT -----END PGP SIGNATURE----- --- patch-2.6.16-rc5-git6.bz2.sign DELETED --- From fedora-cvs-commits at redhat.com Fri Mar 3 19:10:50 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 3 Mar 2006 14:10:50 -0500 Subject: rpms/gdb/devel gdb-6.3-augmS-20060303.patch, NONE, 1.1 gdb-6.3-cfaval-20060303.patch, NONE, 1.1 gdb-6.3-prelink-core-20060223.patch, 1.1, 1.2 gdb.spec, 1.174, 1.175 Message-ID: <200603031910.k23JAoKU015303@cvs.devel.redhat.com> Author: aoliva Update of /cvs/dist/rpms/gdb/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv15135/gdb-devel Modified Files: gdb-6.3-prelink-core-20060223.patch gdb.spec Added Files: gdb-6.3-augmS-20060303.patch gdb-6.3-cfaval-20060303.patch Log Message: * Fri Mar 3 2006 Alexandre Oliva - 6.3.0.0-1.111 - Add support for "S" augmentation for signal stack frames. - Add support for CFA value expressions and encodings. - Various improvements to the prelink test. gdb-6.3-augmS-20060303.patch: dwarf2-frame.c | 34 +++++ dwarf2-frame.h | 8 + testsuite/gdb.dwarf2/signal-augm.S | 207 +++++++++++++++++++++++++++++++++++ testsuite/gdb.dwarf2/signal-augm.c | 198 +++++++++++++++++++++++++++++++++ testsuite/gdb.dwarf2/signal-augm.exp | 77 +++++++++++++ 5 files changed, 521 insertions(+), 3 deletions(-) --- NEW FILE gdb-6.3-augmS-20060303.patch --- for gdb/ChangeLog 2006-03-03 Alexandre Oliva * dwarf2-frame.c (struct dwarf2_cie): Add signal_frame field. (dwarf2_frame_sniffer): Use it. (decode_frame_entry_1): Set it according to augmentation "S". 2004-11-07 Daniel Jacobowitz * dwarf2-frame.c (struct dwarf2_frame_ops): Add signal_frame_p. (dwarf2_frame_set_signal_frame_p, dwarf2_frame_signal_frame_p) (dwarf2_signal_frame_unwind): New. (dwarf2_frame_sniffer): Use dwarf2_frame_signal_frame_p. * dwarf2-frame.h (dwarf2_frame_set_signal_frame_p): New prototype. for gdb/testsuite/ChangeLog 2006-03-03 Alexandre Oliva * gdb.dwarf2/signal-augm.exp: New test. * gdb.dwarf2/signal-augm.c, gdb.dwarf2/signal-augm.S: Its sources. Index: gdb-6.3/gdb/dwarf2-frame.c =================================================================== --- gdb-6.3.orig/gdb/dwarf2-frame.c 2006-02-14 17:21:07.000000000 -0200 +++ gdb-6.3/gdb/dwarf2-frame.c 2006-03-03 13:48:20.000000000 -0300 @@ -69,6 +69,9 @@ struct dwarf2_cie /* True if a 'z' augmentation existed. */ unsigned char saw_z_augmentation; + /* True if an 'S' augmentation existed. */ + unsigned char signal_frame; + struct dwarf2_cie *next; }; @@ -849,10 +852,20 @@ dwarf2_frame_sniffer (struct frame_info function. frame_pc_unwind(), for a no-return next function, can end up returning something past the end of this function's body. */ CORE_ADDR block_addr = frame_unwind_address_in_block (next_frame); - if (dwarf2_frame_find_fde (&block_addr)) - return &dwarf2_frame_unwind; + struct dwarf2_fde *fde = dwarf2_frame_find_fde (&block_addr); + if (!fde) + return NULL; - return NULL; + /* On some targets, signal trampolines may have unwind information. + We need to recognize them so that we set the frame type + correctly. */ + + if (fde->cie->signal_frame + || dwarf2_frame_signal_frame_p (get_frame_arch (next_frame), + next_frame)) + return &dwarf2_signal_frame_unwind; + + return &dwarf2_frame_unwind; } @@ -1296,6 +1309,10 @@ decode_frame_entry_1 (struct comp_unit * depends on the target address size. */ cie->encoding = DW_EH_PE_absptr; + /* We'll determine the final value later, but we need to + initialize it conservatively. */ + cie->signal_frame = 0; + /* Check version number. */ cie_version = read_1_byte (unit->abfd, buf); if (cie_version != 1 && cie_version != 3) @@ -1373,6 +1390,17 @@ decode_frame_entry_1 (struct comp_unit * augmentation++; } + /* "S" indicates a signal frame, such that the return + address must not be decremented to locate the call frame + info for the previous frame; it might even be the first + instruction of a function, so decrementing it would take + us to a different function. */ + else if (*augmentation == 'S') + { + cie->signal_frame = 1; + augmentation++; + } + /* Otherwise we have an unknown augmentation. Bail out unless we saw a 'z' prefix. */ else Index: gdb-6.3/gdb/testsuite/gdb.dwarf2/signal-augm.S =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 +++ gdb-6.3/gdb/testsuite/gdb.dwarf2/signal-augm.S 2006-03-03 13:31:10.000000000 -0300 @@ -0,0 +1,207 @@ +/* This testcase is part of GDB, the GNU debugger. + + Copyright 2006 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 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. + + Written by Jakub Jelinek, as testcase for GCC PR 26208. */ + + .globl fn3 + .type fn3, @function +#ifdef __powerpc64__ + .section ".opd","aw" + .align 3 +fn3: + .quad .L.fn3,.TOC. at tocbase,0 + .text +.L.fn3: +#else + .text + .p2align 4,,15 +fn3: +#endif + .cfi_startproc +#if defined __x86_64__ + movl $10, %eax + movl $11, %ecx +1: pushq %rax + .cfi_adjust_cfa_offset 8 + pushq %rcx + .cfi_adjust_cfa_offset 8 + popq %rax + .cfi_adjust_cfa_offset -8 + popq %rcx + .cfi_adjust_cfa_offset -8 + pushq %rax + .cfi_adjust_cfa_offset 8 + pushq %rcx + .cfi_adjust_cfa_offset 8 + popq %rax + .cfi_adjust_cfa_offset -8 + popq %rcx + .cfi_adjust_cfa_offset -8 + pushq %rax + .cfi_adjust_cfa_offset 8 + pushq %rcx + .cfi_adjust_cfa_offset 8 + popq %rax + .cfi_adjust_cfa_offset -8 + popq %rcx + .cfi_adjust_cfa_offset -8 + pushq %rax + .cfi_adjust_cfa_offset 8 + pushq %rcx + .cfi_adjust_cfa_offset 8 + popq %rax + .cfi_adjust_cfa_offset -8 + popq %rcx + .cfi_adjust_cfa_offset -8 + jmp 1b +#elif defined __i386__ + movl $10, %eax + movl $11, %ecx +1: pushl %eax + .cfi_adjust_cfa_offset 4 + pushl %ecx + .cfi_adjust_cfa_offset 4 + popl %eax + .cfi_adjust_cfa_offset -4 + popl %ecx + .cfi_adjust_cfa_offset -4 + pushl %eax + .cfi_adjust_cfa_offset 4 + pushl %ecx + .cfi_adjust_cfa_offset 4 + popl %eax + .cfi_adjust_cfa_offset -4 + popl %ecx + .cfi_adjust_cfa_offset -4 + pushl %eax + .cfi_adjust_cfa_offset 4 + pushl %ecx + .cfi_adjust_cfa_offset 4 + popl %eax + .cfi_adjust_cfa_offset -4 + popl %ecx + .cfi_adjust_cfa_offset -4 + pushl %eax + .cfi_adjust_cfa_offset 4 + pushl %ecx + .cfi_adjust_cfa_offset 4 + popl %eax + .cfi_adjust_cfa_offset -4 + popl %ecx + .cfi_adjust_cfa_offset -4 + jmp 1b +#elif defined __powerpc64__ + mflr 0 + mr 9,1 + std 0,16(1) + .cfi_offset lr, 8 + bl 1f +1: stdu 1,-64(1) + .cfi_adjust_cfa_offset 64 + stdu 9,-64(1) + .cfi_adjust_cfa_offset 64 + addi 1,1,64 + .cfi_adjust_cfa_offset -64 + addi 1,1,64 + .cfi_adjust_cfa_offset -64 + stdu 1,-64(1) + .cfi_adjust_cfa_offset 64 + stdu 9,-64(1) + .cfi_adjust_cfa_offset 64 + addi 1,1,64 + .cfi_adjust_cfa_offset -64 + addi 1,1,64 + .cfi_adjust_cfa_offset -64 + b 1b +#elif defined __powerpc__ + mflr 0 + mr 9,1 + stwu 1,-16(1) + .cfi_adjust_cfa_offset 16 + stw 0,20(1) + .cfi_offset lr, 4 + bl 1f +1: stwu 9,-64(1) + .cfi_adjust_cfa_offset 64 + stwu 9,-64(1) + .cfi_adjust_cfa_offset 64 + addi 1,1,64 + .cfi_adjust_cfa_offset -64 + addi 1,1,64 + .cfi_adjust_cfa_offset -64 + stwu 9,-64(1) + .cfi_adjust_cfa_offset 64 + stwu 9,-64(1) + .cfi_adjust_cfa_offset 64 + addi 1,1,64 + .cfi_adjust_cfa_offset -64 + addi 1,1,64 + .cfi_adjust_cfa_offset -64 + b 1b +#elif defined __s390x__ + stmg %r14,%r15,112(%r15) + .cfi_offset %r14, -48 + .cfi_offset %r15, -40 + lghi %r14,6 +1: aghi %r15,-160 + .cfi_adjust_cfa_offset 160 + aghi %r15,-160 + .cfi_adjust_cfa_offset 160 + aghi %r15,160 + .cfi_adjust_cfa_offset -160 + aghi %r15,160 + .cfi_adjust_cfa_offset -160 + aghi %r15,-160 + .cfi_adjust_cfa_offset 160 + aghi %r15,-160 + .cfi_adjust_cfa_offset 160 + aghi %r15,160 + .cfi_adjust_cfa_offset -160 + aghi %r15,160 + .cfi_adjust_cfa_offset -160 + j 1b +#elif defined __s390__ + stm %r14,%r15,56(%r15) + .cfi_offset %r14, -40 + .cfi_offset %r15, -36 + lgi %r14,6 +1: ahi %r15,-96 + .cfi_adjust_cfa_offset 96 + ahi %r15,-96 + .cfi_adjust_cfa_offset 96 + ahi %r15,96 + .cfi_adjust_cfa_offset -96 + ahi %r15,96 + .cfi_adjust_cfa_offset -96 + ahi %r15,-96 + .cfi_adjust_cfa_offset 96 + ahi %r15,-96 + .cfi_adjust_cfa_offset 96 + ahi %r15,96 + .cfi_adjust_cfa_offset -96 + ahi %r15,96 + .cfi_adjust_cfa_offset -96 + j 1b +#endif + .cfi_endproc +#ifdef __powerpc64__ + .size fn3, . - .L.fn3 +#else + .size fn3, .-fn3 +#endif + .section .note.GNU-stack,"", at progbits Index: gdb-6.3/gdb/testsuite/gdb.dwarf2/signal-augm.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 +++ gdb-6.3/gdb/testsuite/gdb.dwarf2/signal-augm.c 2006-03-03 13:31:10.000000000 -0300 @@ -0,0 +1,198 @@ +/* This testcase is part of GDB, the GNU debugger. + + Copyright 2006 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 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. + + Written by Jakub Jelinek, as testcase for GCC PR 26208. GDB does + not need all of it, since all we do is to try to recognize signal + stack frames. If the compiler does not support the S augmentation + used to denote stack frames, and GDB does not otherwise recognize + stack frames, the test fails. */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +static _Unwind_Reason_Code +force_unwind_stop (int version, _Unwind_Action actions, + _Unwind_Exception_Class exc_class, + struct _Unwind_Exception *exc_obj, + struct _Unwind_Context *context, + void *stop_parameter) +{ + if (actions & _UA_END_OF_STACK) + abort (); + return _URC_NO_REASON; +} + +static void +force_unwind () +{ + struct _Unwind_Exception *exc = malloc (sizeof (*exc)); + memset (&exc->exception_class, 0, sizeof (exc->exception_class)); + exc->exception_cleanup = 0; + +#ifndef __USING_SJLJ_EXCEPTIONS__ + _Unwind_ForcedUnwind (exc, force_unwind_stop, 0); +#else + _Unwind_SjLj_ForcedUnwind (exc, force_unwind_stop, 0); +#endif + + abort (); +} + +int count; + +static void +counter (void *p __attribute__((unused))) +{ + ++count; +} + +static void +handler (void *p __attribute__((unused))) +{ + if (count != 2) + abort (); + _exit (0); +} + +static int __attribute__((noinline)) +fn5 (void) +{ + char dummy __attribute__((cleanup (counter))); + force_unwind (); + return 0; +} + +static void +fn4 (int sig, siginfo_t *info, void *ctx) +{ + char dummy __attribute__((cleanup (counter))); + fn5 (); +} + +extern void fn3 (long a, long b, long c, long d, long e, long f, long g); + +static int __attribute__((noinline)) +fn2 (void) +{ + fn3 (1, 2, 3, 4, 5, 6, 7); + return 0; +} + +static int __attribute__((noinline)) +fn1 (void) +{ +#if defined __i386__ && defined SIGACTION_DIRECT_SYSCALL + struct i386_kernel_sigaction + { + void (*k_sa_handler) (int, siginfo_t *, void *); + unsigned long k_sa_flags; + void (*sa_restorer) (void); + unsigned long long k_sa_mask; + } s; + extern void __cleanup12_rt_sigreturn (void); + s.k_sa_handler = fn4; + s.k_sa_mask = 0; + s.k_sa_flags = 0x4000000 | SA_RESETHAND | SA_SIGINFO; + s.sa_restorer = __cleanup12_rt_sigreturn; + asm volatile (".subsection 1; nop; __cleanup12_rt_sigreturn:" + "movl %0, %%eax; int $0x80; .previous" + : : "i" (__NR_rt_sigreturn)); + syscall (SYS_rt_sigaction, SIGUSR1, &s, NULL, 8); +#else + struct sigaction s; + sigemptyset (&s.sa_mask); + s.sa_sigaction = fn4; + s.sa_flags = SA_RESETHAND | SA_SIGINFO; + sigaction (SIGUSR1, &s, NULL); +#endif + fn2 (); + return 0; +} + +static void * +tf (void *arg) +{ + char dummy __attribute__((cleanup (handler))); + (void) arg; + fn1 (); + return 0; +} + +void +do_test (void) +{ + pthread_t th; + struct timespec ts; + if (pthread_create (&th, 0, tf, 0)) + { + fputs ("pthread_create failed\n", stderr); + _exit (1); + } + ts.tv_sec = 1; + ts.tv_nsec = 0; + nanosleep (&ts, NULL); + if (pthread_kill (th, SIGUSR1)) + { + fputs ("pthread_kill failed\n", stderr); + _exit (1); + } + ts.tv_sec = 3; + ts.tv_nsec = 0; + nanosleep (&ts, NULL); + _exit (1); +} + +int +main (int argc, char **argv) +{ + int i, failures = 0, status; + if (argc == 2 && strcmp (argv[1], "-d") == 0) + do_test (); + else + for (i = 0; i < 50; i++) + { + pid_t pid = fork (); + if (pid < 0) + { + perror ("fork"); + failures++; + } + else if (pid == 0) + do_test (); + else if (waitpid (pid, &status, 0) < 0) + { + perror ("waitpid"); + failures++; + } + else if (! WIFEXITED (status) || WEXITSTATUS (status)) + { + fprintf (stderr, "Failure in round %d\n", i); + failures++; + } + } + if (failures) + abort (); + return 0; +} Index: gdb-6.3/gdb/testsuite/gdb.dwarf2/signal-augm.exp =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 +++ gdb-6.3/gdb/testsuite/gdb.dwarf2/signal-augm.exp 2006-03-03 13:31:10.000000000 -0300 @@ -0,0 +1,77 @@ +# Copyright 2006 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 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. + +# Please email any bugs, comments, and/or additions to this file to: +# bug-gdb at prep.ai.mit.edu + +# This file was written by Alexandre Oliva + +if $tracelevel then { + strace $tracelevel + } + +set prms_id 0 +set bug_id 0 + +# signal-augm.S needs hand-coded assembly +if {![istarget i*86-*-linux*] + && ![istarget x86_64-*-linux*] + && ![istarget powerpc*-*-linux*] + && ![istarget s390*-*-linux*]} { + return -1; +} + +if [get_compiler_info "ignored"] { + return -1 +} + +if {$gcc_compiled == 0} { + return -1 +} + +set testfile "signal-augm" + +set srcbasename ${srcdir}/${subdir}/${testfile} +set binfile ${objdir}/${subdir}/${testfile} +if { [gdb_compile "${srcbasename}.c ${srcbasename}.S" "${binfile}" executable [list debug "additional_flags=-pthread -fexceptions -fnon-call-exceptions -fasynchronous-unwind-tables -O2"]] != ""} { + return -1; +} + +gdb_exit +gdb_start +gdb_reinitialize_dir $srcdir/$subdir +gdb_load ${binfile} + +if [target_info exists gdb_stub] { + gdb_step_for_stub; +} + +gdb_test "break fn5" "Breakpoint.*at.*" "breakpoint fn5" + +set test "stop at fn5" +gdb_test_multiple "run -d" "$test" { + -re "received signal" { + send_gdb "continue\n" + } + -re "Breakpoint 1" { + pass "$test" + } +} + +gdb_test "backtrace" ".*\#0 .* fn5 .*\#1 .* fn4 .*\#2 .*signal handler.*\#3 .* fn3 .*\#4 .* fn2 .*\#5 .* fn1 .*\#6 .* tf.*" "$test" + +return 0 + Index: gdb-6.3/gdb/dwarf2-frame.h =================================================================== --- gdb-6.3.orig/gdb/dwarf2-frame.h 2006-02-14 17:21:06.000000000 -0200 +++ gdb-6.3/gdb/dwarf2-frame.h 2006-03-03 13:45:42.000000000 -0300 @@ -84,6 +84,14 @@ extern void dwarf2_frame_set_init_reg (s void (*init_reg) (struct gdbarch *, int, struct dwarf2_frame_state_reg *)); +/* Set the architecture-specific signal trampoline recognition + function for GDBARCH to SIGNAL_FRAME_P. */ + +extern void + dwarf2_frame_set_signal_frame_p (struct gdbarch *gdbarch, + int (*signal_frame_p) (struct gdbarch *, + struct frame_info *)); + /* Return the frame unwind methods for the function that contains PC, or NULL if it can't be handled by DWARF CFI frame unwinder. */ gdb-6.3-cfaval-20060303.patch: gdb/dwarf2-frame.c | 88 ++++++++++ gdb/dwarf2-frame.h | 4 gdb/testsuite/gdb.dwarf2/cfa-val-expr-1.c | 261 ++++++++++++++++++++++++++++++ gdb/testsuite/gdb.dwarf2/cfa-val-expr-2.c | 226 +++++++++++++++++++++++++ gdb/testsuite/gdb.dwarf2/cfa-val-expr.exp | 87 ++++++++++ gdb/valarith.c | 9 - include/elf/dwarf2.h | 68 +++++++ 7 files changed, 738 insertions(+), 5 deletions(-) --- NEW FILE gdb-6.3-cfaval-20060303.patch --- for include/elf/ChangeLog 2006-03-02 Ben Elliston Import from the GCC tree: 2006-03-01 Jakub Jelinek * dwarf2.h (DW_TAG_condition, DW_TAG_shared_type): New constants from DWARF 3. (DW_AT_description, DW_AT_binary_scale, DW_AT_decimal_scale, DW_AT_small, DW_AT_decimal_sign, DW_AT_digit_count, DW_AT_picture_string, DW_AT_mutable, DW_AT_threads_scaled, DW_AT_explicit, DW_AT_object_pointer, DW_AT_endianity, DW_AT_elemental, DW_AT_pure, DW_AT_recursive): New. (DW_OP_form_tls_address, DW_OP_call_frame_cfa, DW_OP_bit_piece): New. (DW_ATE_packed_decimal, DW_ATE_numeric_string, DW_ATE_edited, DW_ATE_signed_fixed, DW_ATE_unsigned_fixed): New. (DW_DS_unsigned, DW_DS_leading_overpunch, DW_DS_trailing_overpunch, DW_DS_leading_separate, DW_DS_trailing_separate): New. (DW_END_default, DW_END_big, DW_END_little): New. (DW_END_lo_user, DW_END_hi_user): Define. (DW_LNE_lo_user, DW_LNE_hi_user): Define. (DW_CFA_val_offset, DW_CFA_val_offset_sf, DW_CFA_val_expression): New. (DW_LANG_PLI, DW_LANG_ObjC, DW_LANG_ObjC_plus_plus, DW_LANG_UPC, DW_LANG_D): New. 2005-07-18 Ben Elliston * dwarf2.h (enum dwarf_type): Add DW_ATE_decimal_float (now in DWARF 3). for gdb/ChangeLog 2006-03-03 Alexandre Oliva * dwarf2-frame.h (enum dwarf2_frame_reg_rule): Add DWARF2_FRAME_REG_SAVED_VAL_OFFSET and DWARF2_FRAME_REG_SAVED_VAL_EXP. * dwarf2-frame.c (execute_cfa_program): Handle val_offset, val_offset_sf and val_expression. (dwarf2_frame_prev_register): Handle the new reg rules. 2005-08-11 Andreas Schwab PR exp/1978 * valarith.c (value_binop): Fix result type for the shift operators. for gdb/testsuite/ChangeLog 2006-03-03 Alexandre Oliva * gdb.dwarf2/cfa-val-expr.exp: New test. * gdb.dwarf2/cfa-val-expr-1.c, gdb.dwarf2/cfa-val-expr-2.c: Its sources. Index: gdb-6.3/gdb/dwarf2-frame.c =================================================================== --- gdb-6.3.orig/gdb/dwarf2-frame.c 2006-03-03 13:51:53.000000000 -0300 +++ gdb-6.3/gdb/dwarf2-frame.c 2006-03-03 14:28:03.000000000 -0300 @@ -435,6 +435,34 @@ bad CFI data; mismatched DW_CFA_restore_ fs->regs.reg[reg].loc.offset = offset; break; + case DW_CFA_val_offset: + insn_ptr = read_uleb128 (insn_ptr, insn_end, ®); + dwarf2_frame_state_alloc_regs (&fs->regs, reg + 1); + insn_ptr = read_uleb128 (insn_ptr, insn_end, &utmp); + offset = utmp * fs->data_align; + fs->regs.reg[reg].how = DWARF2_FRAME_REG_SAVED_VAL_OFFSET; + fs->regs.reg[reg].loc.offset = offset; + break; + + case DW_CFA_val_offset_sf: + insn_ptr = read_uleb128 (insn_ptr, insn_end, ®); + dwarf2_frame_state_alloc_regs (&fs->regs, reg + 1); + insn_ptr = read_sleb128 (insn_ptr, insn_end, &offset); + offset *= fs->data_align; + fs->regs.reg[reg].how = DWARF2_FRAME_REG_SAVED_VAL_OFFSET; + fs->regs.reg[reg].loc.offset = offset; + break; + + case DW_CFA_val_expression: + insn_ptr = read_uleb128 (insn_ptr, insn_end, ®); + dwarf2_frame_state_alloc_regs (&fs->regs, reg + 1); + insn_ptr = read_uleb128 (insn_ptr, insn_end, &utmp); + fs->regs.reg[reg].loc.exp = insn_ptr; + fs->regs.reg[reg].exp_len = utmp; + fs->regs.reg[reg].how = DWARF2_FRAME_REG_SAVED_VAL_EXP; + insn_ptr += utmp; + break; + case DW_CFA_def_cfa_sf: insn_ptr = read_uleb128 (insn_ptr, insn_end, &fs->cfa_reg); insn_ptr = read_sleb128 (insn_ptr, insn_end, &offset); @@ -474,6 +502,10 @@ struct dwarf2_frame_ops { /* Pre-initialize the register state REG for register REGNUM. */ void (*init_reg) (struct gdbarch *, int, struct dwarf2_frame_state_reg *); + + /* Check whether the frame preceding NEXT_FRAME will be a signal + trampoline. */ + int (*signal_frame_p) (struct gdbarch *, struct frame_info *); }; /* Default architecture-specific register state initialization @@ -550,6 +582,33 @@ dwarf2_frame_init_reg (struct gdbarch *g ops->init_reg (gdbarch, regnum, reg); } + +/* Set the architecture-specific signal trampoline recognition + function for GDBARCH to SIGNAL_FRAME_P. */ + +void +dwarf2_frame_set_signal_frame_p (struct gdbarch *gdbarch, + int (*signal_frame_p) (struct gdbarch *, + struct frame_info *)) +{ + struct dwarf2_frame_ops *ops = gdbarch_data (gdbarch, dwarf2_frame_data); + + ops->signal_frame_p = signal_frame_p; +} + +/* Query the architecture-specific signal frame recognizer for + NEXT_FRAME. */ + +static int +dwarf2_frame_signal_frame_p (struct gdbarch *gdbarch, + struct frame_info *next_frame) +{ + struct dwarf2_frame_ops *ops = gdbarch_data (gdbarch, dwarf2_frame_data); + + if (ops->signal_frame_p == NULL) + return 0; + return ops->signal_frame_p (gdbarch, next_frame); +} struct dwarf2_frame_cache @@ -797,6 +856,28 @@ dwarf2_frame_prev_register (struct frame } break; + case DWARF2_FRAME_REG_SAVED_VAL_OFFSET: + *optimizedp = 0; + *lvalp = not_lval; + *addrp = 0; + *realnump = -1; + if (valuep) + store_unsigned_integer (valuep, register_size (gdbarch, regnum), + cache->cfa + cache->reg[regnum].loc.offset); + break; + + case DWARF2_FRAME_REG_SAVED_VAL_EXP: + *optimizedp = 0; + *lvalp = not_lval; + *addrp = 0; + *realnump = -1; + if (valuep) + store_unsigned_integer (valuep, register_size (gdbarch, regnum), + execute_stack_op (cache->reg[regnum].loc.exp, + cache->reg[regnum].exp_len, + next_frame, cache->cfa)); + break; + case DWARF2_FRAME_REG_UNSPECIFIED: /* GCC, in its infinite wisdom decided to not provide unwind information for registers that are "same value". Since @@ -845,6 +926,13 @@ static const struct frame_unwind dwarf2_ dwarf2_frame_prev_register }; +static const struct frame_unwind dwarf2_signal_frame_unwind = +{ + SIGTRAMP_FRAME, + dwarf2_frame_this_id, + dwarf2_frame_prev_register +}; + const struct frame_unwind * dwarf2_frame_sniffer (struct frame_info *next_frame) { Index: gdb-6.3/gdb/dwarf2-frame.h =================================================================== --- gdb-6.3.orig/gdb/dwarf2-frame.h 2006-03-03 13:51:53.000000000 -0300 +++ gdb-6.3/gdb/dwarf2-frame.h 2006-03-03 13:51:55.000000000 -0300 @@ -55,6 +55,10 @@ enum dwarf2_frame_reg_rule register. */ DWARF2_FRAME_REG_INDIRECT, + /* These are defined in Dwarf3. */ + DWARF2_FRAME_REG_SAVED_VAL_OFFSET, + DWARF2_FRAME_REG_SAVED_VAL_EXP, + /* These aren't defined by the DWARF2 CFI specification, but are used internally by GDB. These should be superseeded by REG_INDIRECT. */ Index: gdb-6.3/gdb/testsuite/gdb.dwarf2/cfa-val-expr-1.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 +++ gdb-6.3/gdb/testsuite/gdb.dwarf2/cfa-val-expr-1.c 2006-03-03 13:51:55.000000000 -0300 @@ -0,0 +1,261 @@ +/* This testcase is part of GDB, the GNU debugger. + + Copyright 2006 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 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. + + Written by Jakub Jelinek, as testcase for Dwarf3 value expression + support in GCC unwinders. GDB does not need all of it, since all + we do is to try to get correct backtraces. No compiler or binutils + support is required. */ + +/* Test complex CFA value expressions. */ + +#include +#include +#include +#include +#include + +static _Unwind_Reason_Code +force_unwind_stop (int version, _Unwind_Action actions, + _Unwind_Exception_Class exc_class, + struct _Unwind_Exception *exc_obj, + struct _Unwind_Context *context, + void *stop_parameter) +{ + if (actions & _UA_END_OF_STACK) + abort (); + return _URC_NO_REASON; +} + +static void +force_unwind () +{ + struct _Unwind_Exception *exc = malloc (sizeof (*exc)); + memset (&exc->exception_class, 0, sizeof (exc->exception_class)); + exc->exception_cleanup = 0; + + _Unwind_ForcedUnwind (exc, force_unwind_stop, 0); + abort (); +} + +int count; + +static void +counter (void *p __attribute__((unused))) +{ + ++count; +} + +static void +handler (void *p __attribute__((unused))) +{ + if (count != 2) + abort (); + _exit (0); +} + +static int __attribute__((noinline)) +fn5 (void) +{ + char dummy __attribute__((cleanup (counter))); + force_unwind (); + return 0; +} + +void +bar (void) +{ + char dummy __attribute__((cleanup (counter))); + fn5 (); +} + +void __attribute__((noinline)) +foo (int x) +{ + char buf[256]; +#ifdef __i386__ + __asm ( + "testl %0, %0\n\t" + "jnz 1f\n\t" + ".subsection 1\n\t" + ".type _L_mutex_lock_%=, @function\n" +"_L_mutex_lock_%=:\n" +"1:\t" "leal %1, %%ecx\n" +"2:\t" "call bar\n" +"3:\t" "jmp 18f\n" +"4:\t" ".size _L_mutex_lock_%=, .-_L_mutex_lock_%=\n\t" + ".previous\n\t" + ".section .eh_frame,\"a\", at progbits\n" +"5:\t" ".long 7f-6f # Length of Common Information Entry\n" +"6:\t" ".long 0x0 # CIE Identifier Tag\n\t" + ".byte 0x1 # CIE Version\n\t" + ".ascii \"zR\\0\" # CIE Augmentation\n\t" + ".uleb128 0x1 # CIE Code Alignment Factor\n\t" + ".sleb128 -4 # CIE Data Alignment Factor\n\t" + ".byte 0x8 # CIE RA Column\n\t" + ".uleb128 0x1 # Augmentation size\n\t" + ".byte 0x1b # FDE Encoding (pcrel sdata4)\n\t" + ".byte 0xc # DW_CFA_def_cfa\n\t" + ".uleb128 0x4\n\t" + ".uleb128 0x0\n\t" + ".align 4\n" +"7:\t" ".long 17f-8f # FDE Length\n" +"8:\t" ".long 8b-5b # FDE CIE offset\n\t" + ".long 1b-. # FDE initial location\n\t" + ".long 4b-1b # FDE address range\n\t" + ".uleb128 0x0 # Augmentation size\n\t" + ".byte 0x16 # DW_CFA_val_expression\n\t" + ".uleb128 0x8\n\t" + ".uleb128 10f-9f\n" +"9:\t" ".byte 0x78 # DW_OP_breg8\n\t" + ".sleb128 3b-1b\n" +"10:\t" ".byte 0x40 + (2b-1b) # DW_CFA_advance_loc\n\t" + ".byte 0x16 # DW_CFA_val_expression\n\t" + ".uleb128 0x8\n\t" + ".uleb128 12f-11f\n" +"11:\t" ".byte 0x78 # DW_OP_breg8\n\t" + ".sleb128 3b-2b\n" +"12:\t" ".byte 0x40 + (3b-2b-1) # DW_CFA_advance_loc\n\t" + ".byte 0x16 # DW_CFA_val_expression\n\t" + ".uleb128 0x8\n\t" + ".uleb128 16f-13f\n" +"13:\t" ".byte 0x78 # DW_OP_breg8\n\t" + ".sleb128 15f-14f\n\t" + ".byte 0x0d # DW_OP_const4s\n" +"14:\t" ".4byte 3b-.\n\t" + ".byte 0x1c # DW_OP_minus\n\t" + ".byte 0x0d # DW_OP_const4s\n" +"15:\t" ".4byte 18f-.\n\t" + ".byte 0x22 # DW_OP_plus\n" +"16:\t" ".align 4\n" +"17:\t" ".previous\n" +"18:" + : : "r" (x), "m" (x), "r" (buf) + : "memory", "eax", "edx", "ecx"); +#elif defined __x86_64__ + __asm ( + "testl %0, %0\n\t" + "jnz 1f\n\t" + ".subsection 1\n\t" + ".type _L_mutex_lock_%=, @function\n" +"_L_mutex_lock_%=:\n" +"1:\t" "leaq %1, %%rdi\n" +"2:\t" "subq $128, %%rsp\n" +"3:\t" "call bar\n" +"4:\t" "addq $128, %%rsp\n" +"5:\t" "jmp 24f\n" +"6:\t" ".size _L_mutex_lock_%=, .-_L_mutex_lock_%=\n\t" + ".previous\n\t" + ".section .eh_frame,\"a\", at progbits\n" +"7:\t" ".long 9f-8f # Length of Common Information Entry\n" +"8:\t" ".long 0x0 # CIE Identifier Tag\n\t" + ".byte 0x1 # CIE Version\n\t" + ".ascii \"zR\\0\" # CIE Augmentation\n\t" + ".uleb128 0x1 # CIE Code Alignment Factor\n\t" + ".sleb128 -8 # CIE Data Alignment Factor\n\t" + ".byte 0x10 # CIE RA Column\n\t" + ".uleb128 0x1 # Augmentation size\n\t" + ".byte 0x1b # FDE Encoding (pcrel sdata4)\n\t" + ".byte 0x12 # DW_CFA_def_cfa_sf\n\t" + ".uleb128 0x7\n\t" + ".sleb128 16\n\t" + ".align 8\n" +"9:\t" ".long 23f-10f # FDE Length\n" +"10:\t" ".long 10b-7b # FDE CIE offset\n\t" + ".long 1b-. # FDE initial location\n\t" + ".long 6b-1b # FDE address range\n\t" + ".uleb128 0x0 # Augmentation size\n\t" + ".byte 0x16 # DW_CFA_val_expression\n\t" + ".uleb128 0x10\n\t" + ".uleb128 12f-11f\n" +"11:\t" ".byte 0x80 # DW_OP_breg16\n\t" + ".sleb128 4b-1b\n" +"12:\t" ".byte 0x40 + (2b-1b) # DW_CFA_advance_loc\n\t" + ".byte 0x16 # DW_CFA_val_expression\n\t" + ".uleb128 0x10\n\t" + ".uleb128 14f-13f\n" +"13:\t" ".byte 0x80 # DW_OP_breg16\n\t" + ".sleb128 4b-2b\n" +"14:\t" ".byte 0x40 + (3b-2b) # DW_CFA_advance_loc\n\t" + ".byte 0x0e # DW_CFA_def_cfa_offset\n\t" + ".uleb128 0\n\t" + ".byte 0x16 # DW_CFA_val_expression\n\t" + ".uleb128 0x10\n\t" + ".uleb128 16f-15f\n" +"15:\t" ".byte 0x80 # DW_OP_breg16\n\t" + ".sleb128 4b-3b\n" +"16:\t" ".byte 0x40 + (4b-3b-1) # DW_CFA_advance_loc\n\t" + ".byte 0x0e # DW_CFA_def_cfa_offset\n\t" + ".uleb128 128\n\t" + ".byte 0x16 # DW_CFA_val_expression\n\t" + ".uleb128 0x10\n\t" + ".uleb128 20f-17f\n" +"17:\t" ".byte 0x80 # DW_OP_breg16\n\t" + ".sleb128 19f-18f\n\t" + ".byte 0x0d # DW_OP_const4s\n" +"18:\t" ".4byte 4b-.\n\t" + ".byte 0x1c # DW_OP_minus\n\t" + ".byte 0x0d # DW_OP_const4s\n" +"19:\t" ".4byte 24f-.\n\t" + ".byte 0x22 # DW_OP_plus\n" +"20:\t" ".byte 0x40 + (5b-4b+1) # DW_CFA_advance_loc\n\t" + ".byte 0x13 # DW_CFA_def_cfa_offset_sf\n\t" + ".sleb128 16\n\t" + ".byte 0x16 # DW_CFA_val_expression\n\t" + ".uleb128 0x10\n\t" + ".uleb128 22f-21f\n" +"21:\t" ".byte 0x80 # DW_OP_breg16\n\t" + ".sleb128 4b-5b\n" +"22:\t" ".align 8\n" +"23:\t" ".previous\n" +"24:" + : : "r" (x), "m" (x), "r" (buf) + : "memory", "rax", "rdx", "rcx", "rsi", "rdi", + "r8", "r9", "r10", "r11"); +#else +# error Unsupported test architecture +#endif +} + +static int __attribute__((noinline)) +fn2 (void) +{ + foo (3); + return 0; +} + +static int __attribute__((noinline)) +fn1 (void) +{ + fn2 (); + return 0; +} + +static void * +fn0 (void) +{ + char dummy __attribute__((cleanup (handler))); + fn1 (); + return 0; +} + +int +main (void) +{ + fn0 (); + return 0; +} Index: gdb-6.3/gdb/testsuite/gdb.dwarf2/cfa-val-expr-2.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 +++ gdb-6.3/gdb/testsuite/gdb.dwarf2/cfa-val-expr-2.c 2006-03-03 13:51:55.000000000 -0300 @@ -0,0 +1,226 @@ +/* This testcase is part of GDB, the GNU debugger. + + Copyright 2006 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 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. + + Written by Jakub Jelinek, as testcase for Dwarf3 value expression + support in GCC unwinders. GDB does not need all of it, since all + we do is to try to get correct backtraces. No compiler or binutils + support is required. */ + +/* Test complex CFA value expressions. */ + +#include +#include +#include +#include +#include + +static _Unwind_Reason_Code +force_unwind_stop (int version, _Unwind_Action actions, + _Unwind_Exception_Class exc_class, + struct _Unwind_Exception *exc_obj, + struct _Unwind_Context *context, + void *stop_parameter) +{ + if (actions & _UA_END_OF_STACK) + abort (); + return _URC_NO_REASON; +} + +static void +force_unwind () +{ + struct _Unwind_Exception *exc = malloc (sizeof (*exc)); + memset (&exc->exception_class, 0, sizeof (exc->exception_class)); + exc->exception_cleanup = 0; + + _Unwind_ForcedUnwind (exc, force_unwind_stop, 0); + abort (); +} + +int count; + +static void +counter (void *p __attribute__((unused))) +{ + ++count; +} + +static void +handler (void *p __attribute__((unused))) +{ + if (count != 2) + abort (); + _exit (0); +} + +static int __attribute__((noinline)) +fn5 (void) +{ + char dummy __attribute__((cleanup (counter))); + force_unwind (); + return 0; +} + +void +bar (void) +{ + char dummy __attribute__((cleanup (counter))); + fn5 (); +} + +void __attribute__((noinline)) +foo (int x) +{ + char buf[256]; +#ifdef __x86_64__ + __asm ( + "testl %0, %0\n\t" + "jnz 1f\n\t" + ".subsection 1\n\t" + ".type _L_mutex_lock_%=, @function\n" +"_L_mutex_lock_%=:\n" +"1:\t" "leaq %1, %%rdi\n" +"2:\t" "subq $128, %%rsp\n" +"3:\t" "call bar\n" +"4:\t" "addq $128, %%rsp\n" +"5:\t" "jmp 21f\n" +"6:\t" ".size _L_mutex_lock_%=, .-_L_mutex_lock_%=\n\t" + ".previous\n\t" + ".section .eh_frame,\"a\", at progbits\n" +"7:\t" ".long 9f-8f # Length of Common Information Entry\n" +"8:\t" ".long 0x0 # CIE Identifier Tag\n\t" + ".byte 0x1 # CIE Version\n\t" + ".ascii \"zR\\0\" # CIE Augmentation\n\t" + ".uleb128 0x1 # CIE Code Alignment Factor\n\t" + ".sleb128 -8 # CIE Data Alignment Factor\n\t" + ".byte 0x10 # CIE RA Column\n\t" + ".uleb128 0x1 # Augmentation size\n\t" + ".byte 0x1b # FDE Encoding (pcrel sdata4)\n\t" + ".byte 0xc # DW_CFA_def_cfa\n\t" + ".uleb128 0x7\n\t" + ".uleb128 0x0\n\t" + ".align 8\n" +"9:\t" ".long 20f-10f # FDE Length\n" +"10:\t" ".long 10b-7b # FDE CIE offset\n\t" + ".long 1b-. # FDE initial location\n\t" + ".long 6b-1b # FDE address range\n\t" + ".uleb128 0x0 # Augmentation size\n\t" + /* This CFA expression computes the address right + past the jnz instruction above, from %rip somewhere + within the _L_mutex_lock_%= subsection. */ + ".byte 0x16 # DW_CFA_val_expression\n\t" + ".uleb128 0x10\n\t" + ".uleb128 19f-11f\n" +"11:\t" ".byte 0x80 # DW_OP_breg16\n\t" + ".sleb128 0\n" +"12:\t" ".byte 0x12 # DW_OP_dup\n\t" + ".byte 0x94 # DW_OP_deref_size\n\t" + ".byte 1\n\t" + ".byte 0x12 # DW_OP_dup\n\t" + ".byte 0x08 # DW_OP_const1u\n\t" + ".byte 0x48\n\t" + ".byte 0x2e # DW_OP_ne\n\t" + ".byte 0x28 # DW_OP_bra\n\t" + ".2byte 16f-13f\n" +"13:\t" ".byte 0x13 # DW_OP_drop\n\t" + ".byte 0x23 # DW_OP_plus_uconst\n\t" + ".uleb128 1\n\t" + ".byte 0x12 # DW_OP_dup\n\t" + ".byte 0x94 # DW_OP_deref_size\n\t" + ".byte 1\n\t" + ".byte 0x08 # DW_OP_const1u\n\t" + ".byte 0x81\n\t" + ".byte 0x2e # DW_OP_ne\n\t" + ".byte 0x28 # DW_OP_bra\n\t" + ".2byte 15f-14f\n" +"14:\t" ".byte 0x23 # DW_OP_plus_uconst\n\t" + ".uleb128 3b-2b-1\n\t" + ".byte 0x2f # DW_OP_skip\n\t" + ".2byte 12b-15f\n" +"15:\t" ".byte 0x23 # DW_OP_plus_uconst\n\t" + ".uleb128 2b-1b-1\n\t" + ".byte 0x2f # DW_OP_skip\n\t" + ".2byte 12b-16f\n" +"16:\t" ".byte 0x08 # DW_OP_const1u\n\t" + ".byte 0xe8\n\t" + ".byte 0x2e # DW_OP_ne\n\t" + ".byte 0x28 # DW_OP_bra\n\t" + ".2byte 18f-17f\n" +"17:\t" ".byte 0x23 # DW_OP_plus_uconst\n\t" + ".uleb128 4b-3b\n\t" + ".byte 0x2f # DW_OP_skip\n\t" + ".2byte 12b-18f\n" +"18:\t" ".byte 0x23 # DW_OP_plus_uconst\n\t" + ".uleb128 1\n\t" + ".byte 0x12 # DW_OP_dup\n\t" + ".byte 0x94 # DW_OP_deref_size\n\t" + ".byte 4\n\t" + ".byte 0x08 # DW_OP_const1u\n\t" + ".byte 72 - (6b-5b) * 8 # (6b-5b) == 5 ? 32 : 56\n\t" + ".byte 0x24 # DW_OP_shl\n\t" + ".byte 0x08 # DW_OP_const1u\n\t" + ".byte 72 - (6b-5b) * 8 # (6b-5b) == 5 ? 32 : 56\n\t" + ".byte 0x26 # DW_OP_shra\n\t" + ".byte 0x22 # DW_OP_plus\n\t" + ".byte 0x23 # DW_OP_plus_uconst\n\t" + ".uleb128 6b-5b-1\n" +"19:\t" ".byte 0x40 + (3b-1b) # DW_CFA_advance_loc\n\t" + ".byte 0xe # DW_CFA_def_cfa_offset\n\t" + ".uleb128 128\n\t" + ".byte 0x40 + (5b-3b) # DW_CFA_advance_loc\n\t" + ".byte 0xe # DW_CFA_def_cfa_offset\n\t" + ".uleb128 0\n\t" + ".align 8\n" +"20:\t" ".previous\n" +"21:" + : : "r" (x), "m" (x), "r" (buf) + : "memory", "rax", "rdx", "rcx", "rsi", "rdi", + "r8", "r9", "r10", "r11"); +#else +# error Unsupported test architecture +#endif +} + +static int __attribute__((noinline)) +fn2 (void) +{ + foo (3); + return 0; +} + +static int __attribute__((noinline)) +fn1 (void) +{ + fn2 (); + return 0; +} + +static void * +fn0 (void) +{ + char dummy __attribute__((cleanup (handler))); + fn1 (); + return 0; +} + +int +main (void) +{ + fn0 (); + return 0; +} Index: gdb-6.3/gdb/testsuite/gdb.dwarf2/cfa-val-expr.exp =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 +++ gdb-6.3/gdb/testsuite/gdb.dwarf2/cfa-val-expr.exp 2006-03-03 13:51:55.000000000 -0300 @@ -0,0 +1,87 @@ +# Copyright 2006 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 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. + +# Please email any bugs, comments, and/or additions to this file to: +# bug-gdb at prep.ai.mit.edu + +# This file was written by Alexandre Oliva + +if $tracelevel then { + strace $tracelevel + } + +set prms_id 0 +set bug_id 0 + +# signal-augm.S needs hand-coded assembly +if {![istarget i*86-*-linux*] + && ![istarget x86_64-*-linux*]} { + return -1; +} + +if [get_compiler_info "ignored"] { + return -1 +} + +if {$gcc_compiled == 0} { + return -1 +} + +set tnum 1 +set testfile "cfa-val-expr-$tnum" + +set srcfile ${srcdir}/${subdir}/${testfile}.c +set binfile ${objdir}/${subdir}/${testfile} +if { [gdb_compile "${srcfile}" "${binfile}" executable [list debug "additional_flags=-fexceptions -fnon-call-exceptions -fasynchronous-unwind-tables -O2"]] != ""} { + return -1; +} + +gdb_exit +gdb_start +gdb_reinitialize_dir $srcdir/$subdir +gdb_load ${binfile} + +if [target_info exists gdb_stub] { + gdb_step_for_stub; +} + +gdb_test "break fn5" "Breakpoint.*at.*" "breakpoint fn5 ($tnum)" +gdb_test "run" ".*Breakpoint 1.*" "stopped at fn5 ($tnum)" +gdb_test "backtrace" ".*\#0 .* fn5 .*\#1 .* bar .*\#2 .* _L_mutex.* .*\#3 .* foo .*\#4 .* fn2 .*\#5 .* fn1 .*\#6 .* main.*" "backtrace ($tnum)" + +set tnum 2 +set testfile "cfa-val-expr-$tnum" + +set srcfile ${srcdir}/${subdir}/${testfile}.c +set binfile ${objdir}/${subdir}/${testfile} +if { [gdb_compile "${srcfile}" "${binfile}" executable [list debug "additional_flags=-fexceptions -fnon-call-exceptions -fasynchronous-unwind-tables -O2"]] != ""} { + return -1; +} + +gdb_exit +gdb_start +gdb_reinitialize_dir $srcdir/$subdir +gdb_load ${binfile} + +if [target_info exists gdb_stub] { + gdb_step_for_stub; +} + +gdb_test "break fn5" "Breakpoint.*at.*" "breakpoint fn5 ($tnum)" +gdb_test "run" ".*Breakpoint 1.*" "stopped at fn5 ($tnum)" +gdb_test "backtrace" ".*\#0 .* fn5 .*\#1 .* bar .*\#2 .* _L_mutex.* .*\#3 .* foo .*\#4 .* fn2 .*\#5 .* fn1 .*\#6 .* main.*" "backtrace ($tnum)" + +return 0 Index: gdb-6.3/include/elf/dwarf2.h =================================================================== --- gdb-6.3.orig/include/elf/dwarf2.h 2006-03-03 13:55:48.000000000 -0300 +++ gdb-6.3/include/elf/dwarf2.h 2006-03-03 14:27:03.000000000 -0300 @@ -1,7 +1,7 @@ -/* Declarations and definitions of codes relating to the DWARF2 symbolic - debugging information format. +/* Declarations and definitions of codes relating to the DWARF2 and + DWARF3 symbolic debugging information formats. Copyright (C) 1992, 1993, 1995, 1996, 1997, 1999, 2000, 2001, 2002, - 2003 Free Software Foundation, Inc. + 2003, 2004, 2005, 2006 Free Software Foundation, Inc. Written by Gary Funck (gary at intrepid.com) The Ada Joint Program Office (AJPO), Florida State University and Silicon Graphics Inc. @@ -187,6 +187,8 @@ enum dwarf_tag DW_TAG_unspecified_type = 0x3b, DW_TAG_partial_unit = 0x3c, DW_TAG_imported_unit = 0x3d, + DW_TAG_condition = 0x3f, + DW_TAG_shared_type = 0x40, /* SGI/MIPS Extensions. */ DW_TAG_MIPS_loop = 0x4081, /* HP extensions. See: ftp://ftp.hp.com/pub/lang/tools/WDB/wdb-4.0.tar.gz . */ @@ -317,6 +319,21 @@ enum dwarf_attribute DW_AT_call_column = 0x57, DW_AT_call_file = 0x58, DW_AT_call_line = 0x59, + DW_AT_description = 0x5a, + DW_AT_binary_scale = 0x5b, + DW_AT_decimal_scale = 0x5c, + DW_AT_small = 0x5d, + DW_AT_decimal_sign = 0x5e, + DW_AT_digit_count = 0x5f, + DW_AT_picture_string = 0x60, + DW_AT_mutable = 0x61, + DW_AT_threads_scaled = 0x62, + DW_AT_explicit = 0x63, + DW_AT_object_pointer = 0x64, + DW_AT_endianity = 0x65, + DW_AT_elemental = 0x66, + DW_AT_pure = 0x67, + DW_AT_recursive = 0x68, /* SGI/MIPS extensions. */ DW_AT_MIPS_fde = 0x2001, DW_AT_MIPS_loop_begin = 0x2002, @@ -518,6 +535,9 @@ enum dwarf_location_atom DW_OP_call2 = 0x98, DW_OP_call4 = 0x99, DW_OP_call_ref = 0x9a, + DW_OP_form_tls_address = 0x9b, + DW_OP_call_frame_cfa = 0x9c, + DW_OP_bit_piece = 0x9d, /* GNU extensions. */ DW_OP_GNU_push_tls_address = 0xe0, /* HP extensions. */ @@ -547,6 +567,12 @@ enum dwarf_type DW_ATE_unsigned_char = 0x8, /* DWARF 3. */ DW_ATE_imaginary_float = 0x9, + DW_ATE_packed_decimal = 0xa, + DW_ATE_numeric_string = 0xb, + DW_ATE_edited = 0xc, + DW_ATE_signed_fixed = 0xd, + DW_ATE_unsigned_fixed = 0xe, + DW_ATE_decimal_float = 0xf, /* HP extensions. */ DW_ATE_HP_float80 = 0x80, /* Floating-point (80 bit). */ DW_ATE_HP_complex_float80 = 0x81, /* Complex floating-point (80 bit). */ @@ -560,6 +586,29 @@ enum dwarf_type #define DW_ATE_lo_user 0x80 #define DW_ATE_hi_user 0xff +/* Decimal sign encodings. */ +enum dwarf_decimal_sign_encoding + { + /* DWARF 3. */ + DW_DS_unsigned = 0x01, + DW_DS_leading_overpunch = 0x02, + DW_DS_trailing_overpunch = 0x03, + DW_DS_leading_separate = 0x04, + DW_DS_trailing_separate = 0x05 + }; + +/* Endianity encodings. */ +enum dwarf_endianity_encoding + { + /* DWARF 3. */ + DW_END_default = 0x00, + DW_END_big = 0x01, + DW_END_little = 0x02 + }; + +#define DW_END_lo_user 0x40 +#define DW_END_hi_user 0xff + /* Array ordering names and codes. */ enum dwarf_array_dim_ordering { @@ -666,6 +715,9 @@ enum dwarf_line_number_x_ops DW_LNE_HP_define_proc = 0x20 }; +#define DW_LNE_lo_user 0x80 +#define DW_LNE_hi_user 0xff + /* Call frame information. */ enum dwarf_call_frame_info { @@ -693,6 +745,9 @@ enum dwarf_call_frame_info DW_CFA_offset_extended_sf = 0x11, DW_CFA_def_cfa_sf = 0x12, DW_CFA_def_cfa_offset_sf = 0x13, + DW_CFA_val_offset = 0x14, + DW_CFA_val_offset_sf = 0x15, + DW_CFA_val_expression = 0x16, /* SGI/MIPS specific. */ DW_CFA_MIPS_advance_loc8 = 0x1d, /* GNU extensions. */ @@ -726,11 +781,16 @@ enum dwarf_source_language DW_LANG_Fortran90 = 0x0008, DW_LANG_Pascal83 = 0x0009, DW_LANG_Modula2 = 0x000a, - DW_LANG_Java = 0x000b, /* DWARF 3. */ + DW_LANG_Java = 0x000b, DW_LANG_C99 = 0x000c, DW_LANG_Ada95 = 0x000d, DW_LANG_Fortran95 = 0x000e, + DW_LANG_PLI = 0x000f, + DW_LANG_ObjC = 0x0010, + DW_LANG_ObjC_plus_plus = 0x0011, + DW_LANG_UPC = 0x0012, + DW_LANG_D = 0x0013, /* MIPS. */ DW_LANG_Mips_Assembler = 0x8001, /* UPC. */ Index: gdb-6.3/gdb/valarith.c =================================================================== --- gdb-6.3.orig/gdb/valarith.c 2004-09-20 17:18:39.000000000 -0300 +++ gdb-6.3/gdb/valarith.c 2006-03-03 15:45:05.000000000 -0300 @@ -881,7 +881,14 @@ value_binop (struct value *arg1, struct Use the signedness of the operand with the greater length. If both operands are of equal length, use unsigned operation if one of the operands is unsigned. */ - if (promoted_len1 > promoted_len2) + if (op == BINOP_RSH || op == BINOP_LSH) + { + /* In case of the shift operators the type of the result only + depends on the type of the left operand. */ + unsigned_operation = is_unsigned1; + result_len = promoted_len1; + } + else if (promoted_len1 > promoted_len2) { unsigned_operation = is_unsigned1; result_len = promoted_len1; gdb-6.3-prelink-core-20060223.patch: Makefile.in | 2 mipsnbsd-tdep.c | 6 + solib-legacy.c | 11 +++ solib-svr4.c | 124 +++++++++++++++++++++++++++++++++++---- solib-svr4.h | 6 + testsuite/gdb.base/prelink-lib.c | 15 ++++ testsuite/gdb.base/prelink.c | 11 +++ testsuite/gdb.base/prelink.exp | 115 ++++++++++++++++++++++++++++++++++++ 8 files changed, 279 insertions(+), 11 deletions(-) Index: gdb-6.3-prelink-core-20060223.patch =================================================================== RCS file: /cvs/dist/rpms/gdb/devel/gdb-6.3-prelink-core-20060223.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gdb-6.3-prelink-core-20060223.patch 23 Feb 2006 20:47:29 -0000 1.1 +++ gdb-6.3-prelink-core-20060223.patch 3 Mar 2006 19:10:47 -0000 1.2 @@ -1,5 +1,5 @@ for gdb/ChangeLog -from Alexandre Oliva +2006-02-28 Alexandre Oliva * solib-svr4.h (struct link_map_offsets): Add l_ld_offset and l_ld_size fields. @@ -18,15 +18,22 @@ * Makefile.in (solib-svr4.o): Depend on $(elf_bfd_h). for gdb/testsuite/ChangeLog -from Alexandre Oliva +2006-03-03 Alexandre Oliva + + * gdb.base/prelink.exp: Add -q to prelink runs. Rename + executable to prelinkt. Don't re-prelink if we didn't get a + core file. Test prelink -u exit status to tell whether + prelinking failed. Use gdb_test_multiple. + +2006-02-28 Alexandre Oliva * gdb.base/prelink.exp: New test. * gdb.base/prelink.c, gdb.base/prelink-lib.c: New sources. Index: gdb-6.3/gdb/mipsnbsd-tdep.c =================================================================== ---- gdb-6.3.orig/gdb/mipsnbsd-tdep.c 2004-07-23 22:00:19.000000000 -0300 -+++ gdb-6.3/gdb/mipsnbsd-tdep.c 2006-02-23 17:28:05.000000000 -0300 +--- gdb-6.3.orig/gdb/mipsnbsd-tdep.c 2006-02-23 17:39:41.000000000 -0300 ++++ gdb-6.3/gdb/mipsnbsd-tdep.c 2006-02-23 17:39:57.000000000 -0300 @@ -295,6 +295,9 @@ mipsnbsd_ilp32_solib_svr4_fetch_link_map lmo.l_name_offset = 8; lmo.l_name_size = 4; @@ -49,8 +56,8 @@ Index: gdb-6.3/gdb/solib-legacy.c =================================================================== ---- gdb-6.3.orig/gdb/solib-legacy.c 2003-06-11 10:16:29.000000000 -0300 -+++ gdb-6.3/gdb/solib-legacy.c 2006-02-23 17:28:05.000000000 -0300 +--- gdb-6.3.orig/gdb/solib-legacy.c 2006-02-23 17:39:41.000000000 -0300 ++++ gdb-6.3/gdb/solib-legacy.c 2006-02-23 17:39:57.000000000 -0300 @@ -68,6 +68,9 @@ legacy_svr4_fetch_link_map_offsets (void lmo.l_next_offset = offsetof (struct link_map, l_next); lmo.l_next_size = fieldsize (struct link_map, l_next); @@ -85,8 +92,8 @@ #endif /* HAVE_STRUCT_LINK_MAP_WITH_L_MEMBERS */ Index: gdb-6.3/gdb/solib-svr4.c =================================================================== ---- gdb-6.3.orig/gdb/solib-svr4.c 2006-02-14 17:21:06.000000000 -0200 -+++ gdb-6.3/gdb/solib-svr4.c 2006-02-23 17:28:05.000000000 -0300 +--- gdb-6.3.orig/gdb/solib-svr4.c 2006-02-23 17:39:41.000000000 -0300 ++++ gdb-6.3/gdb/solib-svr4.c 2006-02-23 17:39:57.000000000 -0300 @@ -36,10 +36,13 @@ #include "inferior.h" #include "command.h" @@ -293,8 +300,8 @@ SO_NAME_MAX_PATH_SIZE - 1, &errcode); Index: gdb-6.3/gdb/solib-svr4.h =================================================================== ---- gdb-6.3.orig/gdb/solib-svr4.h 2004-03-12 19:01:39.000000000 -0300 -+++ gdb-6.3/gdb/solib-svr4.h 2006-02-23 17:28:05.000000000 -0300 +--- gdb-6.3.orig/gdb/solib-svr4.h 2006-02-23 17:39:41.000000000 -0300 ++++ gdb-6.3/gdb/solib-svr4.h 2006-02-23 17:39:57.000000000 -0300 @@ -51,6 +51,12 @@ struct link_map_offsets /* Size of l_addr field in struct link_map. */ int l_addr_size; @@ -310,8 +317,8 @@ Index: gdb-6.3/gdb/Makefile.in =================================================================== ---- gdb-6.3.orig/gdb/Makefile.in 2006-02-14 17:21:08.000000000 -0200 -+++ gdb-6.3/gdb/Makefile.in 2006-02-23 17:28:05.000000000 -0300 +--- gdb-6.3.orig/gdb/Makefile.in 2006-02-23 17:39:41.000000000 -0300 ++++ gdb-6.3/gdb/Makefile.in 2006-02-23 17:39:57.000000000 -0300 @@ -2535,7 +2535,7 @@ solib-sunos.o: solib-sunos.c $(defs_h) $ solib-svr4.o: solib-svr4.c $(defs_h) $(elf_external_h) $(elf_common_h) \ $(elf_mips_h) $(symtab_h) $(bfd_h) $(symfile_h) $(objfiles_h) \ @@ -324,7 +331,7 @@ Index: gdb-6.3/gdb/testsuite/gdb.base/prelink-lib.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ gdb-6.3/gdb/testsuite/gdb.base/prelink-lib.c 2006-02-23 17:28:05.000000000 -0300 ++++ gdb-6.3/gdb/testsuite/gdb.base/prelink-lib.c 2006-02-23 17:39:57.000000000 -0300 @@ -0,0 +1,15 @@ +int +g (void (*p)(void)) @@ -344,7 +351,7 @@ Index: gdb-6.3/gdb/testsuite/gdb.base/prelink.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ gdb-6.3/gdb/testsuite/gdb.base/prelink.c 2006-02-23 17:28:05.000000000 -0300 ++++ gdb-6.3/gdb/testsuite/gdb.base/prelink.c 2006-02-23 17:39:57.000000000 -0300 @@ -0,0 +1,11 @@ +#include + @@ -360,8 +367,8 @@ Index: gdb-6.3/gdb/testsuite/gdb.base/prelink.exp =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ gdb-6.3/gdb/testsuite/gdb.base/prelink.exp 2006-02-23 17:28:05.000000000 -0300 -@@ -0,0 +1,128 @@ ++++ gdb-6.3/gdb/testsuite/gdb.base/prelink.exp 2006-03-03 14:35:19.000000000 -0300 +@@ -0,0 +1,115 @@ +# Copyright 2006 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify @@ -395,9 +402,15 @@ + return +} + ++if [get_compiler_info "ignored"] { ++ return -1 ++} ++ ++if {$gcc_compiled == 0} { ++ return -1 ++} ++ +set testfile "prelink" -+set srcfile ${testfile}.c -+set binfile ${objdir}/${subdir}/${testfile} + +set libsrcfile ${testfile}-lib.c +set libfile ${objdir}/${subdir}/${testfile}.so @@ -406,25 +419,17 @@ + return -1 +} + -+if {[catch "system \"prelink -NR ${libfile}\""] != 0} { ++if {[catch "system \"prelink -qNR ${libfile}\""] != 0} { + # Maybe we don't have prelink. + return -1 +} + +set srcfile ${testfile}.c -+set binfile ${objdir}/${subdir}/${testfile} ++set binfile ${objdir}/${subdir}/${testfile}t +if { [gdb_compile "${srcdir}/${subdir}/${srcfile} ${libfile}" "${binfile}" executable [list debug "additional_flags=-Wl,-rpath,${objdir}/${subdir}"]] != ""} { + return -1; +} + -+if [get_compiler_info ${binfile}] { -+ return -1 -+} -+ -+if {$gcc_compiled == 0} { -+ return -1 -+} -+ +set found 0 +set coredir "${objdir}/${subdir}/coredir.[getpid]" +file mkdir $coredir @@ -446,9 +451,6 @@ + } +} + -+catch "system \"prelink -u ${libfile}\"" -+catch "system \"prelink -NR ${libfile}\"" -+ +# Try to clean up after ourselves. +remote_file build delete [file join $coredir coremmap.data] +remote_exec build "rmdir $coredir" @@ -458,6 +460,12 @@ + return 0 +} + ++if {[catch "system \"prelink -uN ${libfile}\""] != 0} { ++ warning "${libfile} was not prelinked, maybe system libraries are not prelinked?" ++ return 0 ++} ++catch "system \"prelink -qNR ${libfile}\"" ++ +# Start with a fresh gdb + +gdb_exit @@ -465,26 +473,12 @@ +gdb_reinitialize_dir $srcdir/$subdir +gdb_load ${binfile} + -+set oldtimeout $timeout -+set timeout [expr "$timeout + 60"] -+verbose "Timeout is now $timeout seconds" 2 -+send_gdb "core-file $objdir/$subdir/prelink.core\n" -+gdb_expect { -+ -re "warning: \.dynamic section.*not at the expected address" { -+ pass "changed base address" -+ } -+ -re ".*$gdb_prompt $" { fail "changed base address" } -+ timeout { fail "(timeout) changed base address" } -+} -+gdb_expect { -+ -re "warning: difference.*caused by prelink, adjusting" { -+ pass "prelink adjustment" ++set test "prelink" ++gdb_test_multiple "core-file $objdir/$subdir/prelink.core" "$test" { ++ -re "warning: \.dynamic section.*not at the expected address.*warning: difference.*caused by prelink, adjusting expectations." { ++ pass "$test" + } -+ -re ".*$gdb_prompt $" { fail "prelink adjustment" } -+ timeout { fail "(timeout) prelink adjustment" } +} -+set timeout $oldtimeout -+verbose "Timeout is now $timeout seconds" 2 + +gdb_exit + Index: gdb.spec =================================================================== RCS file: /cvs/dist/rpms/gdb/devel/gdb.spec,v retrieving revision 1.174 retrieving revision 1.175 diff -u -r1.174 -r1.175 --- gdb.spec 23 Feb 2006 20:48:51 -0000 1.174 +++ gdb.spec 3 Mar 2006 19:10:47 -0000 1.175 @@ -11,7 +11,7 @@ Version: 6.3.0.0 # The release always contains a leading reserved number, start it at 0. -Release: 1.110 +Release: 1.114 License: GPL Group: Development/Debuggers @@ -269,6 +269,12 @@ # prelink base addresses. Patch172: gdb-6.3-prelink-core-20060223.patch +# Enable gdb to recognize stack frames annotated with the "S" augmentation. +Patch173: gdb-6.3-augmS-20060303.patch + +# Enable gdb to recognize CFA value expressions introduced in Dwarf3. +Patch174: gdb-6.3-cfaval-20060303.patch + %ifarch ia64 BuildRequires: ncurses-devel glibc-devel gcc make gzip texinfo dejagnu libunwind >= 0.96-3 %else @@ -373,6 +379,8 @@ %patch170 -p1 %patch171 -p1 %patch172 -p1 +%patch173 -p1 +%patch174 -p1 # Change the version that gets printed at GDB startup, so it is RedHat # specific. @@ -541,6 +549,14 @@ # don't include the files in include, they are part of binutils %changelog +* Fri Mar 3 2006 Alexandre Oliva - 6.3.0.0-1.114 +- Bump up release number. + +* Fri Mar 3 2006 Alexandre Oliva - 6.3.0.0-1.111 +- Add support for "S" augmentation for signal stack frames. +- Add support for CFA value expressions and encodings. +- Various improvements to the prelink test. + * Thu Feb 23 2006 Alexandre Oliva - 6.3.0.0-1.110 - Bump up release number. From fedora-cvs-commits at redhat.com Fri Mar 3 19:10:52 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 3 Mar 2006 14:10:52 -0500 Subject: rpms/gdb/FC-4 gdb-6.3-augmS-20060303.patch, NONE, 1.1 gdb-6.3-cfaval-20060303.patch, NONE, 1.1 gdb-6.3-prelink-core-20060223.patch, 1.1, 1.2 gdb.spec, 1.171, 1.172 Message-ID: <200603031910.k23JAqJd015321@cvs.devel.redhat.com> Author: aoliva Update of /cvs/dist/rpms/gdb/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv15135/gdb-FC-4 Modified Files: gdb-6.3-prelink-core-20060223.patch gdb.spec Added Files: gdb-6.3-augmS-20060303.patch gdb-6.3-cfaval-20060303.patch Log Message: * Fri Mar 3 2006 Alexandre Oliva - 6.3.0.0-1.111 - Add support for "S" augmentation for signal stack frames. - Add support for CFA value expressions and encodings. - Various improvements to the prelink test. gdb-6.3-augmS-20060303.patch: dwarf2-frame.c | 34 +++++ dwarf2-frame.h | 8 + testsuite/gdb.dwarf2/signal-augm.S | 207 +++++++++++++++++++++++++++++++++++ testsuite/gdb.dwarf2/signal-augm.c | 198 +++++++++++++++++++++++++++++++++ testsuite/gdb.dwarf2/signal-augm.exp | 77 +++++++++++++ 5 files changed, 521 insertions(+), 3 deletions(-) --- NEW FILE gdb-6.3-augmS-20060303.patch --- for gdb/ChangeLog 2006-03-03 Alexandre Oliva * dwarf2-frame.c (struct dwarf2_cie): Add signal_frame field. (dwarf2_frame_sniffer): Use it. (decode_frame_entry_1): Set it according to augmentation "S". 2004-11-07 Daniel Jacobowitz * dwarf2-frame.c (struct dwarf2_frame_ops): Add signal_frame_p. (dwarf2_frame_set_signal_frame_p, dwarf2_frame_signal_frame_p) (dwarf2_signal_frame_unwind): New. (dwarf2_frame_sniffer): Use dwarf2_frame_signal_frame_p. * dwarf2-frame.h (dwarf2_frame_set_signal_frame_p): New prototype. for gdb/testsuite/ChangeLog 2006-03-03 Alexandre Oliva * gdb.dwarf2/signal-augm.exp: New test. * gdb.dwarf2/signal-augm.c, gdb.dwarf2/signal-augm.S: Its sources. Index: gdb-6.3/gdb/dwarf2-frame.c =================================================================== --- gdb-6.3.orig/gdb/dwarf2-frame.c 2006-02-14 17:21:07.000000000 -0200 +++ gdb-6.3/gdb/dwarf2-frame.c 2006-03-03 13:48:20.000000000 -0300 @@ -69,6 +69,9 @@ struct dwarf2_cie /* True if a 'z' augmentation existed. */ unsigned char saw_z_augmentation; + /* True if an 'S' augmentation existed. */ + unsigned char signal_frame; + struct dwarf2_cie *next; }; @@ -849,10 +852,20 @@ dwarf2_frame_sniffer (struct frame_info function. frame_pc_unwind(), for a no-return next function, can end up returning something past the end of this function's body. */ CORE_ADDR block_addr = frame_unwind_address_in_block (next_frame); - if (dwarf2_frame_find_fde (&block_addr)) - return &dwarf2_frame_unwind; + struct dwarf2_fde *fde = dwarf2_frame_find_fde (&block_addr); + if (!fde) + return NULL; - return NULL; + /* On some targets, signal trampolines may have unwind information. + We need to recognize them so that we set the frame type + correctly. */ + + if (fde->cie->signal_frame + || dwarf2_frame_signal_frame_p (get_frame_arch (next_frame), + next_frame)) + return &dwarf2_signal_frame_unwind; + + return &dwarf2_frame_unwind; } @@ -1296,6 +1309,10 @@ decode_frame_entry_1 (struct comp_unit * depends on the target address size. */ cie->encoding = DW_EH_PE_absptr; + /* We'll determine the final value later, but we need to + initialize it conservatively. */ + cie->signal_frame = 0; + /* Check version number. */ cie_version = read_1_byte (unit->abfd, buf); if (cie_version != 1 && cie_version != 3) @@ -1373,6 +1390,17 @@ decode_frame_entry_1 (struct comp_unit * augmentation++; } + /* "S" indicates a signal frame, such that the return + address must not be decremented to locate the call frame + info for the previous frame; it might even be the first + instruction of a function, so decrementing it would take + us to a different function. */ + else if (*augmentation == 'S') + { + cie->signal_frame = 1; + augmentation++; + } + /* Otherwise we have an unknown augmentation. Bail out unless we saw a 'z' prefix. */ else Index: gdb-6.3/gdb/testsuite/gdb.dwarf2/signal-augm.S =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 +++ gdb-6.3/gdb/testsuite/gdb.dwarf2/signal-augm.S 2006-03-03 13:31:10.000000000 -0300 @@ -0,0 +1,207 @@ +/* This testcase is part of GDB, the GNU debugger. + + Copyright 2006 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 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. + + Written by Jakub Jelinek, as testcase for GCC PR 26208. */ + + .globl fn3 + .type fn3, @function +#ifdef __powerpc64__ + .section ".opd","aw" + .align 3 +fn3: + .quad .L.fn3,.TOC. at tocbase,0 + .text +.L.fn3: +#else + .text + .p2align 4,,15 +fn3: +#endif + .cfi_startproc +#if defined __x86_64__ + movl $10, %eax + movl $11, %ecx +1: pushq %rax + .cfi_adjust_cfa_offset 8 + pushq %rcx + .cfi_adjust_cfa_offset 8 + popq %rax + .cfi_adjust_cfa_offset -8 + popq %rcx + .cfi_adjust_cfa_offset -8 + pushq %rax + .cfi_adjust_cfa_offset 8 + pushq %rcx + .cfi_adjust_cfa_offset 8 + popq %rax + .cfi_adjust_cfa_offset -8 + popq %rcx + .cfi_adjust_cfa_offset -8 + pushq %rax + .cfi_adjust_cfa_offset 8 + pushq %rcx + .cfi_adjust_cfa_offset 8 + popq %rax + .cfi_adjust_cfa_offset -8 + popq %rcx + .cfi_adjust_cfa_offset -8 + pushq %rax + .cfi_adjust_cfa_offset 8 + pushq %rcx + .cfi_adjust_cfa_offset 8 + popq %rax + .cfi_adjust_cfa_offset -8 + popq %rcx + .cfi_adjust_cfa_offset -8 + jmp 1b +#elif defined __i386__ + movl $10, %eax + movl $11, %ecx +1: pushl %eax + .cfi_adjust_cfa_offset 4 + pushl %ecx + .cfi_adjust_cfa_offset 4 + popl %eax + .cfi_adjust_cfa_offset -4 + popl %ecx + .cfi_adjust_cfa_offset -4 + pushl %eax + .cfi_adjust_cfa_offset 4 + pushl %ecx + .cfi_adjust_cfa_offset 4 + popl %eax + .cfi_adjust_cfa_offset -4 + popl %ecx + .cfi_adjust_cfa_offset -4 + pushl %eax + .cfi_adjust_cfa_offset 4 + pushl %ecx + .cfi_adjust_cfa_offset 4 + popl %eax + .cfi_adjust_cfa_offset -4 + popl %ecx + .cfi_adjust_cfa_offset -4 + pushl %eax + .cfi_adjust_cfa_offset 4 + pushl %ecx + .cfi_adjust_cfa_offset 4 + popl %eax + .cfi_adjust_cfa_offset -4 + popl %ecx + .cfi_adjust_cfa_offset -4 + jmp 1b +#elif defined __powerpc64__ + mflr 0 + mr 9,1 + std 0,16(1) + .cfi_offset lr, 8 + bl 1f +1: stdu 1,-64(1) + .cfi_adjust_cfa_offset 64 + stdu 9,-64(1) + .cfi_adjust_cfa_offset 64 + addi 1,1,64 + .cfi_adjust_cfa_offset -64 + addi 1,1,64 + .cfi_adjust_cfa_offset -64 + stdu 1,-64(1) + .cfi_adjust_cfa_offset 64 + stdu 9,-64(1) + .cfi_adjust_cfa_offset 64 + addi 1,1,64 + .cfi_adjust_cfa_offset -64 + addi 1,1,64 + .cfi_adjust_cfa_offset -64 + b 1b +#elif defined __powerpc__ + mflr 0 + mr 9,1 + stwu 1,-16(1) + .cfi_adjust_cfa_offset 16 + stw 0,20(1) + .cfi_offset lr, 4 + bl 1f +1: stwu 9,-64(1) + .cfi_adjust_cfa_offset 64 + stwu 9,-64(1) + .cfi_adjust_cfa_offset 64 + addi 1,1,64 + .cfi_adjust_cfa_offset -64 + addi 1,1,64 + .cfi_adjust_cfa_offset -64 + stwu 9,-64(1) + .cfi_adjust_cfa_offset 64 + stwu 9,-64(1) + .cfi_adjust_cfa_offset 64 + addi 1,1,64 + .cfi_adjust_cfa_offset -64 + addi 1,1,64 + .cfi_adjust_cfa_offset -64 + b 1b +#elif defined __s390x__ + stmg %r14,%r15,112(%r15) + .cfi_offset %r14, -48 + .cfi_offset %r15, -40 + lghi %r14,6 +1: aghi %r15,-160 + .cfi_adjust_cfa_offset 160 + aghi %r15,-160 + .cfi_adjust_cfa_offset 160 + aghi %r15,160 + .cfi_adjust_cfa_offset -160 + aghi %r15,160 + .cfi_adjust_cfa_offset -160 + aghi %r15,-160 + .cfi_adjust_cfa_offset 160 + aghi %r15,-160 + .cfi_adjust_cfa_offset 160 + aghi %r15,160 + .cfi_adjust_cfa_offset -160 + aghi %r15,160 + .cfi_adjust_cfa_offset -160 + j 1b +#elif defined __s390__ + stm %r14,%r15,56(%r15) + .cfi_offset %r14, -40 + .cfi_offset %r15, -36 + lgi %r14,6 +1: ahi %r15,-96 + .cfi_adjust_cfa_offset 96 + ahi %r15,-96 + .cfi_adjust_cfa_offset 96 + ahi %r15,96 + .cfi_adjust_cfa_offset -96 + ahi %r15,96 + .cfi_adjust_cfa_offset -96 + ahi %r15,-96 + .cfi_adjust_cfa_offset 96 + ahi %r15,-96 + .cfi_adjust_cfa_offset 96 + ahi %r15,96 + .cfi_adjust_cfa_offset -96 + ahi %r15,96 + .cfi_adjust_cfa_offset -96 + j 1b +#endif + .cfi_endproc +#ifdef __powerpc64__ + .size fn3, . - .L.fn3 +#else + .size fn3, .-fn3 +#endif + .section .note.GNU-stack,"", at progbits Index: gdb-6.3/gdb/testsuite/gdb.dwarf2/signal-augm.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 +++ gdb-6.3/gdb/testsuite/gdb.dwarf2/signal-augm.c 2006-03-03 13:31:10.000000000 -0300 @@ -0,0 +1,198 @@ +/* This testcase is part of GDB, the GNU debugger. + + Copyright 2006 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 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. + + Written by Jakub Jelinek, as testcase for GCC PR 26208. GDB does + not need all of it, since all we do is to try to recognize signal + stack frames. If the compiler does not support the S augmentation + used to denote stack frames, and GDB does not otherwise recognize + stack frames, the test fails. */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +static _Unwind_Reason_Code +force_unwind_stop (int version, _Unwind_Action actions, + _Unwind_Exception_Class exc_class, + struct _Unwind_Exception *exc_obj, + struct _Unwind_Context *context, + void *stop_parameter) +{ + if (actions & _UA_END_OF_STACK) + abort (); + return _URC_NO_REASON; +} + +static void +force_unwind () +{ + struct _Unwind_Exception *exc = malloc (sizeof (*exc)); + memset (&exc->exception_class, 0, sizeof (exc->exception_class)); + exc->exception_cleanup = 0; + +#ifndef __USING_SJLJ_EXCEPTIONS__ + _Unwind_ForcedUnwind (exc, force_unwind_stop, 0); +#else + _Unwind_SjLj_ForcedUnwind (exc, force_unwind_stop, 0); +#endif + + abort (); +} + +int count; + +static void +counter (void *p __attribute__((unused))) +{ + ++count; +} + +static void +handler (void *p __attribute__((unused))) +{ + if (count != 2) + abort (); + _exit (0); +} + +static int __attribute__((noinline)) +fn5 (void) +{ + char dummy __attribute__((cleanup (counter))); + force_unwind (); + return 0; +} + +static void +fn4 (int sig, siginfo_t *info, void *ctx) +{ + char dummy __attribute__((cleanup (counter))); + fn5 (); +} + +extern void fn3 (long a, long b, long c, long d, long e, long f, long g); + +static int __attribute__((noinline)) +fn2 (void) +{ + fn3 (1, 2, 3, 4, 5, 6, 7); + return 0; +} + +static int __attribute__((noinline)) +fn1 (void) +{ +#if defined __i386__ && defined SIGACTION_DIRECT_SYSCALL + struct i386_kernel_sigaction + { + void (*k_sa_handler) (int, siginfo_t *, void *); + unsigned long k_sa_flags; + void (*sa_restorer) (void); + unsigned long long k_sa_mask; + } s; + extern void __cleanup12_rt_sigreturn (void); + s.k_sa_handler = fn4; + s.k_sa_mask = 0; + s.k_sa_flags = 0x4000000 | SA_RESETHAND | SA_SIGINFO; + s.sa_restorer = __cleanup12_rt_sigreturn; + asm volatile (".subsection 1; nop; __cleanup12_rt_sigreturn:" + "movl %0, %%eax; int $0x80; .previous" + : : "i" (__NR_rt_sigreturn)); + syscall (SYS_rt_sigaction, SIGUSR1, &s, NULL, 8); +#else + struct sigaction s; + sigemptyset (&s.sa_mask); + s.sa_sigaction = fn4; + s.sa_flags = SA_RESETHAND | SA_SIGINFO; + sigaction (SIGUSR1, &s, NULL); +#endif + fn2 (); + return 0; +} + +static void * +tf (void *arg) +{ + char dummy __attribute__((cleanup (handler))); + (void) arg; + fn1 (); + return 0; +} + +void +do_test (void) +{ + pthread_t th; + struct timespec ts; + if (pthread_create (&th, 0, tf, 0)) + { + fputs ("pthread_create failed\n", stderr); + _exit (1); + } + ts.tv_sec = 1; + ts.tv_nsec = 0; + nanosleep (&ts, NULL); + if (pthread_kill (th, SIGUSR1)) + { + fputs ("pthread_kill failed\n", stderr); + _exit (1); + } + ts.tv_sec = 3; + ts.tv_nsec = 0; + nanosleep (&ts, NULL); + _exit (1); +} + +int +main (int argc, char **argv) +{ + int i, failures = 0, status; + if (argc == 2 && strcmp (argv[1], "-d") == 0) + do_test (); + else + for (i = 0; i < 50; i++) + { + pid_t pid = fork (); + if (pid < 0) + { + perror ("fork"); + failures++; + } + else if (pid == 0) + do_test (); + else if (waitpid (pid, &status, 0) < 0) + { + perror ("waitpid"); + failures++; + } + else if (! WIFEXITED (status) || WEXITSTATUS (status)) + { + fprintf (stderr, "Failure in round %d\n", i); + failures++; + } + } + if (failures) + abort (); + return 0; +} Index: gdb-6.3/gdb/testsuite/gdb.dwarf2/signal-augm.exp =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 +++ gdb-6.3/gdb/testsuite/gdb.dwarf2/signal-augm.exp 2006-03-03 13:31:10.000000000 -0300 @@ -0,0 +1,77 @@ +# Copyright 2006 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 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. + +# Please email any bugs, comments, and/or additions to this file to: +# bug-gdb at prep.ai.mit.edu + +# This file was written by Alexandre Oliva + +if $tracelevel then { + strace $tracelevel + } + +set prms_id 0 +set bug_id 0 + +# signal-augm.S needs hand-coded assembly +if {![istarget i*86-*-linux*] + && ![istarget x86_64-*-linux*] + && ![istarget powerpc*-*-linux*] + && ![istarget s390*-*-linux*]} { + return -1; +} + +if [get_compiler_info "ignored"] { + return -1 +} + +if {$gcc_compiled == 0} { + return -1 +} + +set testfile "signal-augm" + +set srcbasename ${srcdir}/${subdir}/${testfile} +set binfile ${objdir}/${subdir}/${testfile} +if { [gdb_compile "${srcbasename}.c ${srcbasename}.S" "${binfile}" executable [list debug "additional_flags=-pthread -fexceptions -fnon-call-exceptions -fasynchronous-unwind-tables -O2"]] != ""} { + return -1; +} + +gdb_exit +gdb_start +gdb_reinitialize_dir $srcdir/$subdir +gdb_load ${binfile} + +if [target_info exists gdb_stub] { + gdb_step_for_stub; +} + +gdb_test "break fn5" "Breakpoint.*at.*" "breakpoint fn5" + +set test "stop at fn5" +gdb_test_multiple "run -d" "$test" { + -re "received signal" { + send_gdb "continue\n" + } + -re "Breakpoint 1" { + pass "$test" + } +} + +gdb_test "backtrace" ".*\#0 .* fn5 .*\#1 .* fn4 .*\#2 .*signal handler.*\#3 .* fn3 .*\#4 .* fn2 .*\#5 .* fn1 .*\#6 .* tf.*" "$test" + +return 0 + Index: gdb-6.3/gdb/dwarf2-frame.h =================================================================== --- gdb-6.3.orig/gdb/dwarf2-frame.h 2006-02-14 17:21:06.000000000 -0200 +++ gdb-6.3/gdb/dwarf2-frame.h 2006-03-03 13:45:42.000000000 -0300 @@ -84,6 +84,14 @@ extern void dwarf2_frame_set_init_reg (s void (*init_reg) (struct gdbarch *, int, struct dwarf2_frame_state_reg *)); +/* Set the architecture-specific signal trampoline recognition + function for GDBARCH to SIGNAL_FRAME_P. */ + +extern void + dwarf2_frame_set_signal_frame_p (struct gdbarch *gdbarch, + int (*signal_frame_p) (struct gdbarch *, + struct frame_info *)); + /* Return the frame unwind methods for the function that contains PC, or NULL if it can't be handled by DWARF CFI frame unwinder. */ gdb-6.3-cfaval-20060303.patch: gdb/dwarf2-frame.c | 88 ++++++++++ gdb/dwarf2-frame.h | 4 gdb/testsuite/gdb.dwarf2/cfa-val-expr-1.c | 261 ++++++++++++++++++++++++++++++ gdb/testsuite/gdb.dwarf2/cfa-val-expr-2.c | 226 +++++++++++++++++++++++++ gdb/testsuite/gdb.dwarf2/cfa-val-expr.exp | 87 ++++++++++ gdb/valarith.c | 9 - include/elf/dwarf2.h | 68 +++++++ 7 files changed, 738 insertions(+), 5 deletions(-) --- NEW FILE gdb-6.3-cfaval-20060303.patch --- for include/elf/ChangeLog 2006-03-02 Ben Elliston Import from the GCC tree: 2006-03-01 Jakub Jelinek * dwarf2.h (DW_TAG_condition, DW_TAG_shared_type): New constants from DWARF 3. (DW_AT_description, DW_AT_binary_scale, DW_AT_decimal_scale, DW_AT_small, DW_AT_decimal_sign, DW_AT_digit_count, DW_AT_picture_string, DW_AT_mutable, DW_AT_threads_scaled, DW_AT_explicit, DW_AT_object_pointer, DW_AT_endianity, DW_AT_elemental, DW_AT_pure, DW_AT_recursive): New. (DW_OP_form_tls_address, DW_OP_call_frame_cfa, DW_OP_bit_piece): New. (DW_ATE_packed_decimal, DW_ATE_numeric_string, DW_ATE_edited, DW_ATE_signed_fixed, DW_ATE_unsigned_fixed): New. (DW_DS_unsigned, DW_DS_leading_overpunch, DW_DS_trailing_overpunch, DW_DS_leading_separate, DW_DS_trailing_separate): New. (DW_END_default, DW_END_big, DW_END_little): New. (DW_END_lo_user, DW_END_hi_user): Define. (DW_LNE_lo_user, DW_LNE_hi_user): Define. (DW_CFA_val_offset, DW_CFA_val_offset_sf, DW_CFA_val_expression): New. (DW_LANG_PLI, DW_LANG_ObjC, DW_LANG_ObjC_plus_plus, DW_LANG_UPC, DW_LANG_D): New. 2005-07-18 Ben Elliston * dwarf2.h (enum dwarf_type): Add DW_ATE_decimal_float (now in DWARF 3). for gdb/ChangeLog 2006-03-03 Alexandre Oliva * dwarf2-frame.h (enum dwarf2_frame_reg_rule): Add DWARF2_FRAME_REG_SAVED_VAL_OFFSET and DWARF2_FRAME_REG_SAVED_VAL_EXP. * dwarf2-frame.c (execute_cfa_program): Handle val_offset, val_offset_sf and val_expression. (dwarf2_frame_prev_register): Handle the new reg rules. 2005-08-11 Andreas Schwab PR exp/1978 * valarith.c (value_binop): Fix result type for the shift operators. for gdb/testsuite/ChangeLog 2006-03-03 Alexandre Oliva * gdb.dwarf2/cfa-val-expr.exp: New test. * gdb.dwarf2/cfa-val-expr-1.c, gdb.dwarf2/cfa-val-expr-2.c: Its sources. Index: gdb-6.3/gdb/dwarf2-frame.c =================================================================== --- gdb-6.3.orig/gdb/dwarf2-frame.c 2006-03-03 13:51:53.000000000 -0300 +++ gdb-6.3/gdb/dwarf2-frame.c 2006-03-03 14:28:03.000000000 -0300 @@ -435,6 +435,34 @@ bad CFI data; mismatched DW_CFA_restore_ fs->regs.reg[reg].loc.offset = offset; break; + case DW_CFA_val_offset: + insn_ptr = read_uleb128 (insn_ptr, insn_end, ®); + dwarf2_frame_state_alloc_regs (&fs->regs, reg + 1); + insn_ptr = read_uleb128 (insn_ptr, insn_end, &utmp); + offset = utmp * fs->data_align; + fs->regs.reg[reg].how = DWARF2_FRAME_REG_SAVED_VAL_OFFSET; + fs->regs.reg[reg].loc.offset = offset; + break; + + case DW_CFA_val_offset_sf: + insn_ptr = read_uleb128 (insn_ptr, insn_end, ®); + dwarf2_frame_state_alloc_regs (&fs->regs, reg + 1); + insn_ptr = read_sleb128 (insn_ptr, insn_end, &offset); + offset *= fs->data_align; + fs->regs.reg[reg].how = DWARF2_FRAME_REG_SAVED_VAL_OFFSET; + fs->regs.reg[reg].loc.offset = offset; + break; + + case DW_CFA_val_expression: + insn_ptr = read_uleb128 (insn_ptr, insn_end, ®); + dwarf2_frame_state_alloc_regs (&fs->regs, reg + 1); + insn_ptr = read_uleb128 (insn_ptr, insn_end, &utmp); + fs->regs.reg[reg].loc.exp = insn_ptr; + fs->regs.reg[reg].exp_len = utmp; + fs->regs.reg[reg].how = DWARF2_FRAME_REG_SAVED_VAL_EXP; + insn_ptr += utmp; + break; + case DW_CFA_def_cfa_sf: insn_ptr = read_uleb128 (insn_ptr, insn_end, &fs->cfa_reg); insn_ptr = read_sleb128 (insn_ptr, insn_end, &offset); @@ -474,6 +502,10 @@ struct dwarf2_frame_ops { /* Pre-initialize the register state REG for register REGNUM. */ void (*init_reg) (struct gdbarch *, int, struct dwarf2_frame_state_reg *); + + /* Check whether the frame preceding NEXT_FRAME will be a signal + trampoline. */ + int (*signal_frame_p) (struct gdbarch *, struct frame_info *); }; /* Default architecture-specific register state initialization @@ -550,6 +582,33 @@ dwarf2_frame_init_reg (struct gdbarch *g ops->init_reg (gdbarch, regnum, reg); } + +/* Set the architecture-specific signal trampoline recognition + function for GDBARCH to SIGNAL_FRAME_P. */ + +void +dwarf2_frame_set_signal_frame_p (struct gdbarch *gdbarch, + int (*signal_frame_p) (struct gdbarch *, + struct frame_info *)) +{ + struct dwarf2_frame_ops *ops = gdbarch_data (gdbarch, dwarf2_frame_data); + + ops->signal_frame_p = signal_frame_p; +} + +/* Query the architecture-specific signal frame recognizer for + NEXT_FRAME. */ + +static int +dwarf2_frame_signal_frame_p (struct gdbarch *gdbarch, + struct frame_info *next_frame) +{ + struct dwarf2_frame_ops *ops = gdbarch_data (gdbarch, dwarf2_frame_data); + + if (ops->signal_frame_p == NULL) + return 0; + return ops->signal_frame_p (gdbarch, next_frame); +} struct dwarf2_frame_cache @@ -797,6 +856,28 @@ dwarf2_frame_prev_register (struct frame } break; + case DWARF2_FRAME_REG_SAVED_VAL_OFFSET: + *optimizedp = 0; + *lvalp = not_lval; + *addrp = 0; + *realnump = -1; + if (valuep) + store_unsigned_integer (valuep, register_size (gdbarch, regnum), + cache->cfa + cache->reg[regnum].loc.offset); + break; + + case DWARF2_FRAME_REG_SAVED_VAL_EXP: + *optimizedp = 0; + *lvalp = not_lval; + *addrp = 0; + *realnump = -1; + if (valuep) + store_unsigned_integer (valuep, register_size (gdbarch, regnum), + execute_stack_op (cache->reg[regnum].loc.exp, + cache->reg[regnum].exp_len, + next_frame, cache->cfa)); + break; + case DWARF2_FRAME_REG_UNSPECIFIED: /* GCC, in its infinite wisdom decided to not provide unwind information for registers that are "same value". Since @@ -845,6 +926,13 @@ static const struct frame_unwind dwarf2_ dwarf2_frame_prev_register }; +static const struct frame_unwind dwarf2_signal_frame_unwind = +{ + SIGTRAMP_FRAME, + dwarf2_frame_this_id, + dwarf2_frame_prev_register +}; + const struct frame_unwind * dwarf2_frame_sniffer (struct frame_info *next_frame) { Index: gdb-6.3/gdb/dwarf2-frame.h =================================================================== --- gdb-6.3.orig/gdb/dwarf2-frame.h 2006-03-03 13:51:53.000000000 -0300 +++ gdb-6.3/gdb/dwarf2-frame.h 2006-03-03 13:51:55.000000000 -0300 @@ -55,6 +55,10 @@ enum dwarf2_frame_reg_rule register. */ DWARF2_FRAME_REG_INDIRECT, + /* These are defined in Dwarf3. */ + DWARF2_FRAME_REG_SAVED_VAL_OFFSET, + DWARF2_FRAME_REG_SAVED_VAL_EXP, + /* These aren't defined by the DWARF2 CFI specification, but are used internally by GDB. These should be superseeded by REG_INDIRECT. */ Index: gdb-6.3/gdb/testsuite/gdb.dwarf2/cfa-val-expr-1.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 +++ gdb-6.3/gdb/testsuite/gdb.dwarf2/cfa-val-expr-1.c 2006-03-03 13:51:55.000000000 -0300 @@ -0,0 +1,261 @@ +/* This testcase is part of GDB, the GNU debugger. + + Copyright 2006 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 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. + + Written by Jakub Jelinek, as testcase for Dwarf3 value expression + support in GCC unwinders. GDB does not need all of it, since all + we do is to try to get correct backtraces. No compiler or binutils + support is required. */ + +/* Test complex CFA value expressions. */ + +#include +#include +#include +#include +#include + +static _Unwind_Reason_Code +force_unwind_stop (int version, _Unwind_Action actions, + _Unwind_Exception_Class exc_class, + struct _Unwind_Exception *exc_obj, + struct _Unwind_Context *context, + void *stop_parameter) +{ + if (actions & _UA_END_OF_STACK) + abort (); + return _URC_NO_REASON; +} + +static void +force_unwind () +{ + struct _Unwind_Exception *exc = malloc (sizeof (*exc)); + memset (&exc->exception_class, 0, sizeof (exc->exception_class)); + exc->exception_cleanup = 0; + + _Unwind_ForcedUnwind (exc, force_unwind_stop, 0); + abort (); +} + +int count; + +static void +counter (void *p __attribute__((unused))) +{ + ++count; +} + +static void +handler (void *p __attribute__((unused))) +{ + if (count != 2) + abort (); + _exit (0); +} + +static int __attribute__((noinline)) +fn5 (void) +{ + char dummy __attribute__((cleanup (counter))); + force_unwind (); + return 0; +} + +void +bar (void) +{ + char dummy __attribute__((cleanup (counter))); + fn5 (); +} + +void __attribute__((noinline)) +foo (int x) +{ + char buf[256]; +#ifdef __i386__ + __asm ( + "testl %0, %0\n\t" + "jnz 1f\n\t" + ".subsection 1\n\t" + ".type _L_mutex_lock_%=, @function\n" +"_L_mutex_lock_%=:\n" +"1:\t" "leal %1, %%ecx\n" +"2:\t" "call bar\n" +"3:\t" "jmp 18f\n" +"4:\t" ".size _L_mutex_lock_%=, .-_L_mutex_lock_%=\n\t" + ".previous\n\t" + ".section .eh_frame,\"a\", at progbits\n" +"5:\t" ".long 7f-6f # Length of Common Information Entry\n" +"6:\t" ".long 0x0 # CIE Identifier Tag\n\t" + ".byte 0x1 # CIE Version\n\t" + ".ascii \"zR\\0\" # CIE Augmentation\n\t" + ".uleb128 0x1 # CIE Code Alignment Factor\n\t" + ".sleb128 -4 # CIE Data Alignment Factor\n\t" + ".byte 0x8 # CIE RA Column\n\t" + ".uleb128 0x1 # Augmentation size\n\t" + ".byte 0x1b # FDE Encoding (pcrel sdata4)\n\t" + ".byte 0xc # DW_CFA_def_cfa\n\t" + ".uleb128 0x4\n\t" + ".uleb128 0x0\n\t" + ".align 4\n" +"7:\t" ".long 17f-8f # FDE Length\n" +"8:\t" ".long 8b-5b # FDE CIE offset\n\t" + ".long 1b-. # FDE initial location\n\t" + ".long 4b-1b # FDE address range\n\t" + ".uleb128 0x0 # Augmentation size\n\t" + ".byte 0x16 # DW_CFA_val_expression\n\t" + ".uleb128 0x8\n\t" + ".uleb128 10f-9f\n" +"9:\t" ".byte 0x78 # DW_OP_breg8\n\t" + ".sleb128 3b-1b\n" +"10:\t" ".byte 0x40 + (2b-1b) # DW_CFA_advance_loc\n\t" + ".byte 0x16 # DW_CFA_val_expression\n\t" + ".uleb128 0x8\n\t" + ".uleb128 12f-11f\n" +"11:\t" ".byte 0x78 # DW_OP_breg8\n\t" + ".sleb128 3b-2b\n" +"12:\t" ".byte 0x40 + (3b-2b-1) # DW_CFA_advance_loc\n\t" + ".byte 0x16 # DW_CFA_val_expression\n\t" + ".uleb128 0x8\n\t" + ".uleb128 16f-13f\n" +"13:\t" ".byte 0x78 # DW_OP_breg8\n\t" + ".sleb128 15f-14f\n\t" + ".byte 0x0d # DW_OP_const4s\n" +"14:\t" ".4byte 3b-.\n\t" + ".byte 0x1c # DW_OP_minus\n\t" + ".byte 0x0d # DW_OP_const4s\n" +"15:\t" ".4byte 18f-.\n\t" + ".byte 0x22 # DW_OP_plus\n" +"16:\t" ".align 4\n" +"17:\t" ".previous\n" +"18:" + : : "r" (x), "m" (x), "r" (buf) + : "memory", "eax", "edx", "ecx"); +#elif defined __x86_64__ + __asm ( + "testl %0, %0\n\t" + "jnz 1f\n\t" + ".subsection 1\n\t" + ".type _L_mutex_lock_%=, @function\n" +"_L_mutex_lock_%=:\n" +"1:\t" "leaq %1, %%rdi\n" +"2:\t" "subq $128, %%rsp\n" +"3:\t" "call bar\n" +"4:\t" "addq $128, %%rsp\n" +"5:\t" "jmp 24f\n" +"6:\t" ".size _L_mutex_lock_%=, .-_L_mutex_lock_%=\n\t" + ".previous\n\t" + ".section .eh_frame,\"a\", at progbits\n" +"7:\t" ".long 9f-8f # Length of Common Information Entry\n" +"8:\t" ".long 0x0 # CIE Identifier Tag\n\t" + ".byte 0x1 # CIE Version\n\t" + ".ascii \"zR\\0\" # CIE Augmentation\n\t" + ".uleb128 0x1 # CIE Code Alignment Factor\n\t" + ".sleb128 -8 # CIE Data Alignment Factor\n\t" + ".byte 0x10 # CIE RA Column\n\t" + ".uleb128 0x1 # Augmentation size\n\t" + ".byte 0x1b # FDE Encoding (pcrel sdata4)\n\t" + ".byte 0x12 # DW_CFA_def_cfa_sf\n\t" + ".uleb128 0x7\n\t" + ".sleb128 16\n\t" + ".align 8\n" +"9:\t" ".long 23f-10f # FDE Length\n" +"10:\t" ".long 10b-7b # FDE CIE offset\n\t" + ".long 1b-. # FDE initial location\n\t" + ".long 6b-1b # FDE address range\n\t" + ".uleb128 0x0 # Augmentation size\n\t" + ".byte 0x16 # DW_CFA_val_expression\n\t" + ".uleb128 0x10\n\t" + ".uleb128 12f-11f\n" +"11:\t" ".byte 0x80 # DW_OP_breg16\n\t" + ".sleb128 4b-1b\n" +"12:\t" ".byte 0x40 + (2b-1b) # DW_CFA_advance_loc\n\t" + ".byte 0x16 # DW_CFA_val_expression\n\t" + ".uleb128 0x10\n\t" + ".uleb128 14f-13f\n" +"13:\t" ".byte 0x80 # DW_OP_breg16\n\t" + ".sleb128 4b-2b\n" +"14:\t" ".byte 0x40 + (3b-2b) # DW_CFA_advance_loc\n\t" + ".byte 0x0e # DW_CFA_def_cfa_offset\n\t" + ".uleb128 0\n\t" + ".byte 0x16 # DW_CFA_val_expression\n\t" + ".uleb128 0x10\n\t" + ".uleb128 16f-15f\n" +"15:\t" ".byte 0x80 # DW_OP_breg16\n\t" + ".sleb128 4b-3b\n" +"16:\t" ".byte 0x40 + (4b-3b-1) # DW_CFA_advance_loc\n\t" + ".byte 0x0e # DW_CFA_def_cfa_offset\n\t" + ".uleb128 128\n\t" + ".byte 0x16 # DW_CFA_val_expression\n\t" + ".uleb128 0x10\n\t" + ".uleb128 20f-17f\n" +"17:\t" ".byte 0x80 # DW_OP_breg16\n\t" + ".sleb128 19f-18f\n\t" + ".byte 0x0d # DW_OP_const4s\n" +"18:\t" ".4byte 4b-.\n\t" + ".byte 0x1c # DW_OP_minus\n\t" + ".byte 0x0d # DW_OP_const4s\n" +"19:\t" ".4byte 24f-.\n\t" + ".byte 0x22 # DW_OP_plus\n" +"20:\t" ".byte 0x40 + (5b-4b+1) # DW_CFA_advance_loc\n\t" + ".byte 0x13 # DW_CFA_def_cfa_offset_sf\n\t" + ".sleb128 16\n\t" + ".byte 0x16 # DW_CFA_val_expression\n\t" + ".uleb128 0x10\n\t" + ".uleb128 22f-21f\n" +"21:\t" ".byte 0x80 # DW_OP_breg16\n\t" + ".sleb128 4b-5b\n" +"22:\t" ".align 8\n" +"23:\t" ".previous\n" +"24:" + : : "r" (x), "m" (x), "r" (buf) + : "memory", "rax", "rdx", "rcx", "rsi", "rdi", + "r8", "r9", "r10", "r11"); +#else +# error Unsupported test architecture +#endif +} + +static int __attribute__((noinline)) +fn2 (void) +{ + foo (3); + return 0; +} + +static int __attribute__((noinline)) +fn1 (void) +{ + fn2 (); + return 0; +} + +static void * +fn0 (void) +{ + char dummy __attribute__((cleanup (handler))); + fn1 (); + return 0; +} + +int +main (void) +{ + fn0 (); + return 0; +} Index: gdb-6.3/gdb/testsuite/gdb.dwarf2/cfa-val-expr-2.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 +++ gdb-6.3/gdb/testsuite/gdb.dwarf2/cfa-val-expr-2.c 2006-03-03 13:51:55.000000000 -0300 @@ -0,0 +1,226 @@ +/* This testcase is part of GDB, the GNU debugger. + + Copyright 2006 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 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. + + Written by Jakub Jelinek, as testcase for Dwarf3 value expression + support in GCC unwinders. GDB does not need all of it, since all + we do is to try to get correct backtraces. No compiler or binutils + support is required. */ + +/* Test complex CFA value expressions. */ + +#include +#include +#include +#include +#include + +static _Unwind_Reason_Code +force_unwind_stop (int version, _Unwind_Action actions, + _Unwind_Exception_Class exc_class, + struct _Unwind_Exception *exc_obj, + struct _Unwind_Context *context, + void *stop_parameter) +{ + if (actions & _UA_END_OF_STACK) + abort (); + return _URC_NO_REASON; +} + +static void +force_unwind () +{ + struct _Unwind_Exception *exc = malloc (sizeof (*exc)); + memset (&exc->exception_class, 0, sizeof (exc->exception_class)); + exc->exception_cleanup = 0; + + _Unwind_ForcedUnwind (exc, force_unwind_stop, 0); + abort (); +} + +int count; + +static void +counter (void *p __attribute__((unused))) +{ + ++count; +} + +static void +handler (void *p __attribute__((unused))) +{ + if (count != 2) + abort (); + _exit (0); +} + +static int __attribute__((noinline)) +fn5 (void) +{ + char dummy __attribute__((cleanup (counter))); + force_unwind (); + return 0; +} + +void +bar (void) +{ + char dummy __attribute__((cleanup (counter))); + fn5 (); +} + +void __attribute__((noinline)) +foo (int x) +{ + char buf[256]; +#ifdef __x86_64__ + __asm ( + "testl %0, %0\n\t" + "jnz 1f\n\t" + ".subsection 1\n\t" + ".type _L_mutex_lock_%=, @function\n" +"_L_mutex_lock_%=:\n" +"1:\t" "leaq %1, %%rdi\n" +"2:\t" "subq $128, %%rsp\n" +"3:\t" "call bar\n" +"4:\t" "addq $128, %%rsp\n" +"5:\t" "jmp 21f\n" +"6:\t" ".size _L_mutex_lock_%=, .-_L_mutex_lock_%=\n\t" + ".previous\n\t" + ".section .eh_frame,\"a\", at progbits\n" +"7:\t" ".long 9f-8f # Length of Common Information Entry\n" +"8:\t" ".long 0x0 # CIE Identifier Tag\n\t" + ".byte 0x1 # CIE Version\n\t" + ".ascii \"zR\\0\" # CIE Augmentation\n\t" + ".uleb128 0x1 # CIE Code Alignment Factor\n\t" + ".sleb128 -8 # CIE Data Alignment Factor\n\t" + ".byte 0x10 # CIE RA Column\n\t" + ".uleb128 0x1 # Augmentation size\n\t" + ".byte 0x1b # FDE Encoding (pcrel sdata4)\n\t" + ".byte 0xc # DW_CFA_def_cfa\n\t" + ".uleb128 0x7\n\t" + ".uleb128 0x0\n\t" + ".align 8\n" +"9:\t" ".long 20f-10f # FDE Length\n" +"10:\t" ".long 10b-7b # FDE CIE offset\n\t" + ".long 1b-. # FDE initial location\n\t" + ".long 6b-1b # FDE address range\n\t" + ".uleb128 0x0 # Augmentation size\n\t" + /* This CFA expression computes the address right + past the jnz instruction above, from %rip somewhere + within the _L_mutex_lock_%= subsection. */ + ".byte 0x16 # DW_CFA_val_expression\n\t" + ".uleb128 0x10\n\t" + ".uleb128 19f-11f\n" +"11:\t" ".byte 0x80 # DW_OP_breg16\n\t" + ".sleb128 0\n" +"12:\t" ".byte 0x12 # DW_OP_dup\n\t" + ".byte 0x94 # DW_OP_deref_size\n\t" + ".byte 1\n\t" + ".byte 0x12 # DW_OP_dup\n\t" + ".byte 0x08 # DW_OP_const1u\n\t" + ".byte 0x48\n\t" + ".byte 0x2e # DW_OP_ne\n\t" + ".byte 0x28 # DW_OP_bra\n\t" + ".2byte 16f-13f\n" +"13:\t" ".byte 0x13 # DW_OP_drop\n\t" + ".byte 0x23 # DW_OP_plus_uconst\n\t" + ".uleb128 1\n\t" + ".byte 0x12 # DW_OP_dup\n\t" + ".byte 0x94 # DW_OP_deref_size\n\t" + ".byte 1\n\t" + ".byte 0x08 # DW_OP_const1u\n\t" + ".byte 0x81\n\t" + ".byte 0x2e # DW_OP_ne\n\t" + ".byte 0x28 # DW_OP_bra\n\t" + ".2byte 15f-14f\n" +"14:\t" ".byte 0x23 # DW_OP_plus_uconst\n\t" + ".uleb128 3b-2b-1\n\t" + ".byte 0x2f # DW_OP_skip\n\t" + ".2byte 12b-15f\n" +"15:\t" ".byte 0x23 # DW_OP_plus_uconst\n\t" + ".uleb128 2b-1b-1\n\t" + ".byte 0x2f # DW_OP_skip\n\t" + ".2byte 12b-16f\n" +"16:\t" ".byte 0x08 # DW_OP_const1u\n\t" + ".byte 0xe8\n\t" + ".byte 0x2e # DW_OP_ne\n\t" + ".byte 0x28 # DW_OP_bra\n\t" + ".2byte 18f-17f\n" +"17:\t" ".byte 0x23 # DW_OP_plus_uconst\n\t" + ".uleb128 4b-3b\n\t" + ".byte 0x2f # DW_OP_skip\n\t" + ".2byte 12b-18f\n" +"18:\t" ".byte 0x23 # DW_OP_plus_uconst\n\t" + ".uleb128 1\n\t" + ".byte 0x12 # DW_OP_dup\n\t" + ".byte 0x94 # DW_OP_deref_size\n\t" + ".byte 4\n\t" + ".byte 0x08 # DW_OP_const1u\n\t" + ".byte 72 - (6b-5b) * 8 # (6b-5b) == 5 ? 32 : 56\n\t" + ".byte 0x24 # DW_OP_shl\n\t" + ".byte 0x08 # DW_OP_const1u\n\t" + ".byte 72 - (6b-5b) * 8 # (6b-5b) == 5 ? 32 : 56\n\t" + ".byte 0x26 # DW_OP_shra\n\t" + ".byte 0x22 # DW_OP_plus\n\t" + ".byte 0x23 # DW_OP_plus_uconst\n\t" + ".uleb128 6b-5b-1\n" +"19:\t" ".byte 0x40 + (3b-1b) # DW_CFA_advance_loc\n\t" + ".byte 0xe # DW_CFA_def_cfa_offset\n\t" + ".uleb128 128\n\t" + ".byte 0x40 + (5b-3b) # DW_CFA_advance_loc\n\t" + ".byte 0xe # DW_CFA_def_cfa_offset\n\t" + ".uleb128 0\n\t" + ".align 8\n" +"20:\t" ".previous\n" +"21:" + : : "r" (x), "m" (x), "r" (buf) + : "memory", "rax", "rdx", "rcx", "rsi", "rdi", + "r8", "r9", "r10", "r11"); +#else +# error Unsupported test architecture +#endif +} + +static int __attribute__((noinline)) +fn2 (void) +{ + foo (3); + return 0; +} + +static int __attribute__((noinline)) +fn1 (void) +{ + fn2 (); + return 0; +} + +static void * +fn0 (void) +{ + char dummy __attribute__((cleanup (handler))); + fn1 (); + return 0; +} + +int +main (void) +{ + fn0 (); + return 0; +} Index: gdb-6.3/gdb/testsuite/gdb.dwarf2/cfa-val-expr.exp =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 +++ gdb-6.3/gdb/testsuite/gdb.dwarf2/cfa-val-expr.exp 2006-03-03 13:51:55.000000000 -0300 @@ -0,0 +1,87 @@ +# Copyright 2006 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 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. + +# Please email any bugs, comments, and/or additions to this file to: +# bug-gdb at prep.ai.mit.edu + +# This file was written by Alexandre Oliva + +if $tracelevel then { + strace $tracelevel + } + +set prms_id 0 +set bug_id 0 + +# signal-augm.S needs hand-coded assembly +if {![istarget i*86-*-linux*] + && ![istarget x86_64-*-linux*]} { + return -1; +} + +if [get_compiler_info "ignored"] { + return -1 +} + +if {$gcc_compiled == 0} { + return -1 +} + +set tnum 1 +set testfile "cfa-val-expr-$tnum" + +set srcfile ${srcdir}/${subdir}/${testfile}.c +set binfile ${objdir}/${subdir}/${testfile} +if { [gdb_compile "${srcfile}" "${binfile}" executable [list debug "additional_flags=-fexceptions -fnon-call-exceptions -fasynchronous-unwind-tables -O2"]] != ""} { + return -1; +} + +gdb_exit +gdb_start +gdb_reinitialize_dir $srcdir/$subdir +gdb_load ${binfile} + +if [target_info exists gdb_stub] { + gdb_step_for_stub; +} + +gdb_test "break fn5" "Breakpoint.*at.*" "breakpoint fn5 ($tnum)" +gdb_test "run" ".*Breakpoint 1.*" "stopped at fn5 ($tnum)" +gdb_test "backtrace" ".*\#0 .* fn5 .*\#1 .* bar .*\#2 .* _L_mutex.* .*\#3 .* foo .*\#4 .* fn2 .*\#5 .* fn1 .*\#6 .* main.*" "backtrace ($tnum)" + +set tnum 2 +set testfile "cfa-val-expr-$tnum" + +set srcfile ${srcdir}/${subdir}/${testfile}.c +set binfile ${objdir}/${subdir}/${testfile} +if { [gdb_compile "${srcfile}" "${binfile}" executable [list debug "additional_flags=-fexceptions -fnon-call-exceptions -fasynchronous-unwind-tables -O2"]] != ""} { + return -1; +} + +gdb_exit +gdb_start +gdb_reinitialize_dir $srcdir/$subdir +gdb_load ${binfile} + +if [target_info exists gdb_stub] { + gdb_step_for_stub; +} + +gdb_test "break fn5" "Breakpoint.*at.*" "breakpoint fn5 ($tnum)" +gdb_test "run" ".*Breakpoint 1.*" "stopped at fn5 ($tnum)" +gdb_test "backtrace" ".*\#0 .* fn5 .*\#1 .* bar .*\#2 .* _L_mutex.* .*\#3 .* foo .*\#4 .* fn2 .*\#5 .* fn1 .*\#6 .* main.*" "backtrace ($tnum)" + +return 0 Index: gdb-6.3/include/elf/dwarf2.h =================================================================== --- gdb-6.3.orig/include/elf/dwarf2.h 2006-03-03 13:55:48.000000000 -0300 +++ gdb-6.3/include/elf/dwarf2.h 2006-03-03 14:27:03.000000000 -0300 @@ -1,7 +1,7 @@ -/* Declarations and definitions of codes relating to the DWARF2 symbolic - debugging information format. +/* Declarations and definitions of codes relating to the DWARF2 and + DWARF3 symbolic debugging information formats. Copyright (C) 1992, 1993, 1995, 1996, 1997, 1999, 2000, 2001, 2002, - 2003 Free Software Foundation, Inc. + 2003, 2004, 2005, 2006 Free Software Foundation, Inc. Written by Gary Funck (gary at intrepid.com) The Ada Joint Program Office (AJPO), Florida State University and Silicon Graphics Inc. @@ -187,6 +187,8 @@ enum dwarf_tag DW_TAG_unspecified_type = 0x3b, DW_TAG_partial_unit = 0x3c, DW_TAG_imported_unit = 0x3d, + DW_TAG_condition = 0x3f, + DW_TAG_shared_type = 0x40, /* SGI/MIPS Extensions. */ DW_TAG_MIPS_loop = 0x4081, /* HP extensions. See: ftp://ftp.hp.com/pub/lang/tools/WDB/wdb-4.0.tar.gz . */ @@ -317,6 +319,21 @@ enum dwarf_attribute DW_AT_call_column = 0x57, DW_AT_call_file = 0x58, DW_AT_call_line = 0x59, + DW_AT_description = 0x5a, + DW_AT_binary_scale = 0x5b, + DW_AT_decimal_scale = 0x5c, + DW_AT_small = 0x5d, + DW_AT_decimal_sign = 0x5e, + DW_AT_digit_count = 0x5f, + DW_AT_picture_string = 0x60, + DW_AT_mutable = 0x61, + DW_AT_threads_scaled = 0x62, + DW_AT_explicit = 0x63, + DW_AT_object_pointer = 0x64, + DW_AT_endianity = 0x65, + DW_AT_elemental = 0x66, + DW_AT_pure = 0x67, + DW_AT_recursive = 0x68, /* SGI/MIPS extensions. */ DW_AT_MIPS_fde = 0x2001, DW_AT_MIPS_loop_begin = 0x2002, @@ -518,6 +535,9 @@ enum dwarf_location_atom DW_OP_call2 = 0x98, DW_OP_call4 = 0x99, DW_OP_call_ref = 0x9a, + DW_OP_form_tls_address = 0x9b, + DW_OP_call_frame_cfa = 0x9c, + DW_OP_bit_piece = 0x9d, /* GNU extensions. */ DW_OP_GNU_push_tls_address = 0xe0, /* HP extensions. */ @@ -547,6 +567,12 @@ enum dwarf_type DW_ATE_unsigned_char = 0x8, /* DWARF 3. */ DW_ATE_imaginary_float = 0x9, + DW_ATE_packed_decimal = 0xa, + DW_ATE_numeric_string = 0xb, + DW_ATE_edited = 0xc, + DW_ATE_signed_fixed = 0xd, + DW_ATE_unsigned_fixed = 0xe, + DW_ATE_decimal_float = 0xf, /* HP extensions. */ DW_ATE_HP_float80 = 0x80, /* Floating-point (80 bit). */ DW_ATE_HP_complex_float80 = 0x81, /* Complex floating-point (80 bit). */ @@ -560,6 +586,29 @@ enum dwarf_type #define DW_ATE_lo_user 0x80 #define DW_ATE_hi_user 0xff +/* Decimal sign encodings. */ +enum dwarf_decimal_sign_encoding + { + /* DWARF 3. */ + DW_DS_unsigned = 0x01, + DW_DS_leading_overpunch = 0x02, + DW_DS_trailing_overpunch = 0x03, + DW_DS_leading_separate = 0x04, + DW_DS_trailing_separate = 0x05 + }; + +/* Endianity encodings. */ +enum dwarf_endianity_encoding + { + /* DWARF 3. */ + DW_END_default = 0x00, + DW_END_big = 0x01, + DW_END_little = 0x02 + }; + +#define DW_END_lo_user 0x40 +#define DW_END_hi_user 0xff + /* Array ordering names and codes. */ enum dwarf_array_dim_ordering { @@ -666,6 +715,9 @@ enum dwarf_line_number_x_ops DW_LNE_HP_define_proc = 0x20 }; +#define DW_LNE_lo_user 0x80 +#define DW_LNE_hi_user 0xff + /* Call frame information. */ enum dwarf_call_frame_info { @@ -693,6 +745,9 @@ enum dwarf_call_frame_info DW_CFA_offset_extended_sf = 0x11, DW_CFA_def_cfa_sf = 0x12, DW_CFA_def_cfa_offset_sf = 0x13, + DW_CFA_val_offset = 0x14, + DW_CFA_val_offset_sf = 0x15, + DW_CFA_val_expression = 0x16, /* SGI/MIPS specific. */ DW_CFA_MIPS_advance_loc8 = 0x1d, /* GNU extensions. */ @@ -726,11 +781,16 @@ enum dwarf_source_language DW_LANG_Fortran90 = 0x0008, DW_LANG_Pascal83 = 0x0009, DW_LANG_Modula2 = 0x000a, - DW_LANG_Java = 0x000b, /* DWARF 3. */ + DW_LANG_Java = 0x000b, DW_LANG_C99 = 0x000c, DW_LANG_Ada95 = 0x000d, DW_LANG_Fortran95 = 0x000e, + DW_LANG_PLI = 0x000f, + DW_LANG_ObjC = 0x0010, + DW_LANG_ObjC_plus_plus = 0x0011, + DW_LANG_UPC = 0x0012, + DW_LANG_D = 0x0013, /* MIPS. */ DW_LANG_Mips_Assembler = 0x8001, /* UPC. */ Index: gdb-6.3/gdb/valarith.c =================================================================== --- gdb-6.3.orig/gdb/valarith.c 2004-09-20 17:18:39.000000000 -0300 +++ gdb-6.3/gdb/valarith.c 2006-03-03 15:45:05.000000000 -0300 @@ -881,7 +881,14 @@ value_binop (struct value *arg1, struct Use the signedness of the operand with the greater length. If both operands are of equal length, use unsigned operation if one of the operands is unsigned. */ - if (promoted_len1 > promoted_len2) + if (op == BINOP_RSH || op == BINOP_LSH) + { + /* In case of the shift operators the type of the result only + depends on the type of the left operand. */ + unsigned_operation = is_unsigned1; + result_len = promoted_len1; + } + else if (promoted_len1 > promoted_len2) { unsigned_operation = is_unsigned1; result_len = promoted_len1; gdb-6.3-prelink-core-20060223.patch: Makefile.in | 2 mipsnbsd-tdep.c | 6 + solib-legacy.c | 11 +++ solib-svr4.c | 124 +++++++++++++++++++++++++++++++++++---- solib-svr4.h | 6 + testsuite/gdb.base/prelink-lib.c | 15 ++++ testsuite/gdb.base/prelink.c | 11 +++ testsuite/gdb.base/prelink.exp | 115 ++++++++++++++++++++++++++++++++++++ 8 files changed, 279 insertions(+), 11 deletions(-) Index: gdb-6.3-prelink-core-20060223.patch =================================================================== RCS file: /cvs/dist/rpms/gdb/FC-4/gdb-6.3-prelink-core-20060223.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gdb-6.3-prelink-core-20060223.patch 23 Feb 2006 20:47:30 -0000 1.1 +++ gdb-6.3-prelink-core-20060223.patch 3 Mar 2006 19:10:48 -0000 1.2 @@ -1,5 +1,5 @@ for gdb/ChangeLog -from Alexandre Oliva +2006-02-28 Alexandre Oliva * solib-svr4.h (struct link_map_offsets): Add l_ld_offset and l_ld_size fields. @@ -18,15 +18,22 @@ * Makefile.in (solib-svr4.o): Depend on $(elf_bfd_h). for gdb/testsuite/ChangeLog -from Alexandre Oliva +2006-03-03 Alexandre Oliva + + * gdb.base/prelink.exp: Add -q to prelink runs. Rename + executable to prelinkt. Don't re-prelink if we didn't get a + core file. Test prelink -u exit status to tell whether + prelinking failed. Use gdb_test_multiple. + +2006-02-28 Alexandre Oliva * gdb.base/prelink.exp: New test. * gdb.base/prelink.c, gdb.base/prelink-lib.c: New sources. Index: gdb-6.3/gdb/mipsnbsd-tdep.c =================================================================== ---- gdb-6.3.orig/gdb/mipsnbsd-tdep.c 2004-07-23 22:00:19.000000000 -0300 -+++ gdb-6.3/gdb/mipsnbsd-tdep.c 2006-02-23 17:28:05.000000000 -0300 +--- gdb-6.3.orig/gdb/mipsnbsd-tdep.c 2006-02-23 17:39:41.000000000 -0300 ++++ gdb-6.3/gdb/mipsnbsd-tdep.c 2006-02-23 17:39:57.000000000 -0300 @@ -295,6 +295,9 @@ mipsnbsd_ilp32_solib_svr4_fetch_link_map lmo.l_name_offset = 8; lmo.l_name_size = 4; @@ -49,8 +56,8 @@ Index: gdb-6.3/gdb/solib-legacy.c =================================================================== ---- gdb-6.3.orig/gdb/solib-legacy.c 2003-06-11 10:16:29.000000000 -0300 -+++ gdb-6.3/gdb/solib-legacy.c 2006-02-23 17:28:05.000000000 -0300 +--- gdb-6.3.orig/gdb/solib-legacy.c 2006-02-23 17:39:41.000000000 -0300 ++++ gdb-6.3/gdb/solib-legacy.c 2006-02-23 17:39:57.000000000 -0300 @@ -68,6 +68,9 @@ legacy_svr4_fetch_link_map_offsets (void lmo.l_next_offset = offsetof (struct link_map, l_next); lmo.l_next_size = fieldsize (struct link_map, l_next); @@ -85,8 +92,8 @@ #endif /* HAVE_STRUCT_LINK_MAP_WITH_L_MEMBERS */ Index: gdb-6.3/gdb/solib-svr4.c =================================================================== ---- gdb-6.3.orig/gdb/solib-svr4.c 2006-02-14 17:21:06.000000000 -0200 -+++ gdb-6.3/gdb/solib-svr4.c 2006-02-23 17:28:05.000000000 -0300 +--- gdb-6.3.orig/gdb/solib-svr4.c 2006-02-23 17:39:41.000000000 -0300 ++++ gdb-6.3/gdb/solib-svr4.c 2006-02-23 17:39:57.000000000 -0300 @@ -36,10 +36,13 @@ #include "inferior.h" #include "command.h" @@ -293,8 +300,8 @@ SO_NAME_MAX_PATH_SIZE - 1, &errcode); Index: gdb-6.3/gdb/solib-svr4.h =================================================================== ---- gdb-6.3.orig/gdb/solib-svr4.h 2004-03-12 19:01:39.000000000 -0300 -+++ gdb-6.3/gdb/solib-svr4.h 2006-02-23 17:28:05.000000000 -0300 +--- gdb-6.3.orig/gdb/solib-svr4.h 2006-02-23 17:39:41.000000000 -0300 ++++ gdb-6.3/gdb/solib-svr4.h 2006-02-23 17:39:57.000000000 -0300 @@ -51,6 +51,12 @@ struct link_map_offsets /* Size of l_addr field in struct link_map. */ int l_addr_size; @@ -310,8 +317,8 @@ Index: gdb-6.3/gdb/Makefile.in =================================================================== ---- gdb-6.3.orig/gdb/Makefile.in 2006-02-14 17:21:08.000000000 -0200 -+++ gdb-6.3/gdb/Makefile.in 2006-02-23 17:28:05.000000000 -0300 +--- gdb-6.3.orig/gdb/Makefile.in 2006-02-23 17:39:41.000000000 -0300 ++++ gdb-6.3/gdb/Makefile.in 2006-02-23 17:39:57.000000000 -0300 @@ -2535,7 +2535,7 @@ solib-sunos.o: solib-sunos.c $(defs_h) $ solib-svr4.o: solib-svr4.c $(defs_h) $(elf_external_h) $(elf_common_h) \ $(elf_mips_h) $(symtab_h) $(bfd_h) $(symfile_h) $(objfiles_h) \ @@ -324,7 +331,7 @@ Index: gdb-6.3/gdb/testsuite/gdb.base/prelink-lib.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ gdb-6.3/gdb/testsuite/gdb.base/prelink-lib.c 2006-02-23 17:28:05.000000000 -0300 ++++ gdb-6.3/gdb/testsuite/gdb.base/prelink-lib.c 2006-02-23 17:39:57.000000000 -0300 @@ -0,0 +1,15 @@ +int +g (void (*p)(void)) @@ -344,7 +351,7 @@ Index: gdb-6.3/gdb/testsuite/gdb.base/prelink.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ gdb-6.3/gdb/testsuite/gdb.base/prelink.c 2006-02-23 17:28:05.000000000 -0300 ++++ gdb-6.3/gdb/testsuite/gdb.base/prelink.c 2006-02-23 17:39:57.000000000 -0300 @@ -0,0 +1,11 @@ +#include + @@ -360,8 +367,8 @@ Index: gdb-6.3/gdb/testsuite/gdb.base/prelink.exp =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ gdb-6.3/gdb/testsuite/gdb.base/prelink.exp 2006-02-23 17:28:05.000000000 -0300 -@@ -0,0 +1,128 @@ ++++ gdb-6.3/gdb/testsuite/gdb.base/prelink.exp 2006-03-03 14:35:19.000000000 -0300 +@@ -0,0 +1,115 @@ +# Copyright 2006 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify @@ -395,9 +402,15 @@ + return +} + ++if [get_compiler_info "ignored"] { ++ return -1 ++} ++ ++if {$gcc_compiled == 0} { ++ return -1 ++} ++ +set testfile "prelink" -+set srcfile ${testfile}.c -+set binfile ${objdir}/${subdir}/${testfile} + +set libsrcfile ${testfile}-lib.c +set libfile ${objdir}/${subdir}/${testfile}.so @@ -406,25 +419,17 @@ + return -1 +} + -+if {[catch "system \"prelink -NR ${libfile}\""] != 0} { ++if {[catch "system \"prelink -qNR ${libfile}\""] != 0} { + # Maybe we don't have prelink. + return -1 +} + +set srcfile ${testfile}.c -+set binfile ${objdir}/${subdir}/${testfile} ++set binfile ${objdir}/${subdir}/${testfile}t +if { [gdb_compile "${srcdir}/${subdir}/${srcfile} ${libfile}" "${binfile}" executable [list debug "additional_flags=-Wl,-rpath,${objdir}/${subdir}"]] != ""} { + return -1; +} + -+if [get_compiler_info ${binfile}] { -+ return -1 -+} -+ -+if {$gcc_compiled == 0} { -+ return -1 -+} -+ +set found 0 +set coredir "${objdir}/${subdir}/coredir.[getpid]" +file mkdir $coredir @@ -446,9 +451,6 @@ + } +} + -+catch "system \"prelink -u ${libfile}\"" -+catch "system \"prelink -NR ${libfile}\"" -+ +# Try to clean up after ourselves. +remote_file build delete [file join $coredir coremmap.data] +remote_exec build "rmdir $coredir" @@ -458,6 +460,12 @@ + return 0 +} + ++if {[catch "system \"prelink -uN ${libfile}\""] != 0} { ++ warning "${libfile} was not prelinked, maybe system libraries are not prelinked?" ++ return 0 ++} ++catch "system \"prelink -qNR ${libfile}\"" ++ +# Start with a fresh gdb + +gdb_exit @@ -465,26 +473,12 @@ +gdb_reinitialize_dir $srcdir/$subdir +gdb_load ${binfile} + -+set oldtimeout $timeout -+set timeout [expr "$timeout + 60"] -+verbose "Timeout is now $timeout seconds" 2 -+send_gdb "core-file $objdir/$subdir/prelink.core\n" -+gdb_expect { -+ -re "warning: \.dynamic section.*not at the expected address" { -+ pass "changed base address" -+ } -+ -re ".*$gdb_prompt $" { fail "changed base address" } -+ timeout { fail "(timeout) changed base address" } -+} -+gdb_expect { -+ -re "warning: difference.*caused by prelink, adjusting" { -+ pass "prelink adjustment" ++set test "prelink" ++gdb_test_multiple "core-file $objdir/$subdir/prelink.core" "$test" { ++ -re "warning: \.dynamic section.*not at the expected address.*warning: difference.*caused by prelink, adjusting expectations." { ++ pass "$test" + } -+ -re ".*$gdb_prompt $" { fail "prelink adjustment" } -+ timeout { fail "(timeout) prelink adjustment" } +} -+set timeout $oldtimeout -+verbose "Timeout is now $timeout seconds" 2 + +gdb_exit + Index: gdb.spec =================================================================== RCS file: /cvs/dist/rpms/gdb/FC-4/gdb.spec,v retrieving revision 1.171 retrieving revision 1.172 diff -u -r1.171 -r1.172 --- gdb.spec 23 Feb 2006 20:48:51 -0000 1.171 +++ gdb.spec 3 Mar 2006 19:10:48 -0000 1.172 @@ -11,7 +11,7 @@ Version: 6.3.0.0 # The release always contains a leading reserved number, start it at 0. -Release: 1.109 +Release: 1.113 License: GPL Group: Development/Debuggers @@ -269,6 +269,12 @@ # prelink base addresses. Patch172: gdb-6.3-prelink-core-20060223.patch +# Enable gdb to recognize stack frames annotated with the "S" augmentation. +Patch173: gdb-6.3-augmS-20060303.patch + +# Enable gdb to recognize CFA value expressions introduced in Dwarf3. +Patch174: gdb-6.3-cfaval-20060303.patch + %ifarch ia64 BuildRequires: ncurses-devel glibc-devel gcc make gzip texinfo dejagnu libunwind >= 0.96-3 %else @@ -373,6 +379,8 @@ %patch170 -p1 %patch171 -p1 %patch172 -p1 +%patch173 -p1 +%patch174 -p1 # Change the version that gets printed at GDB startup, so it is RedHat # specific. @@ -541,7 +549,15 @@ # don't include the files in include, they are part of binutils %changelog -* Thu Feb 23 2006 Alexandre Oliva - 6.3.0.0-1.109 +* Fri Mar 3 2006 Alexandre Oliva - 6.3.0.0-1.113 +- Bump up release number. + +* Fri Mar 3 2006 Alexandre Oliva - 6.3.0.0-1.111 +- Add support for "S" augmentation for signal stack frames. +- Add support for CFA value expressions and encodings. +- Various improvements to the prelink test. + +* Thu Feb 23 2006 Alexandre Oliva - 6.3.0.0-1.110 - Bump up release number. * Thu Feb 23 2006 Alexandre Oliva - 6.3.0.0-1.107 From fedora-cvs-commits at redhat.com Fri Mar 3 19:44:01 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 3 Mar 2006 14:44:01 -0500 Subject: rpms/hwdata/devel .cvsignore, 1.61, 1.62 hwdata.spec, 1.62, 1.63 sources, 1.64, 1.65 Message-ID: <200603031944.k23Ji1M6006388@cvs.devel.redhat.com> Author: notting Update of /cvs/dist/rpms/hwdata/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv6351 Modified Files: .cvsignore hwdata.spec sources Log Message: update Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/hwdata/devel/.cvsignore,v retrieving revision 1.61 retrieving revision 1.62 diff -u -r1.61 -r1.62 --- .cvsignore 1 Mar 2006 16:17:41 -0000 1.61 +++ .cvsignore 3 Mar 2006 19:43:59 -0000 1.62 @@ -1 +1 @@ -hwdata-0.178.tar.gz +hwdata-0.146.18.EL.tar.gz Index: hwdata.spec =================================================================== RCS file: /cvs/dist/rpms/hwdata/devel/hwdata.spec,v retrieving revision 1.62 retrieving revision 1.63 diff -u -r1.62 -r1.63 --- hwdata.spec 1 Mar 2006 16:17:41 -0000 1.62 +++ hwdata.spec 3 Mar 2006 19:43:59 -0000 1.63 @@ -1,18 +1,17 @@ Name: hwdata Summary: Hardware identification and configuration data -Version: 0.178 +Version: 0.146.18.EL Release: 1 License: GPL/MIT Group: System Environment/Base Source: hwdata-%{version}.tar.gz BuildArch: noarch -Conflicts: Xconfigurator, system-config-display < 1.0.31, pcmcia-cs, kudzu < 1.2.0 -Requires: module-init-tools >= 3.2 +Conflicts: Xconfigurator < 4.9.42-1, kernel-pcmcia-cs < 3.1.31-11, kudzu < 1.1.86 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root %description hwdata contains various hardware identification and configuration data, -such as the pci.ids database and MonitorsDb databases. +such as the pci.ids database, the XFree86 Cards and MonitorsDb databases. %prep @@ -29,127 +28,86 @@ %defattr(-,root,root) %doc LICENSE COPYING %dir /usr/share/hwdata -%config(noreplace) /etc/modprobe.d/blacklist +%dir /etc/pcmcia +%config(noreplace) /etc/hotplug/blacklist +%config /etc/pcmcia/config %config /usr/share/hwdata/* +# This file is screaming to be moved into /usr/share/hwdata sometime +/usr/X11R6/lib/X11/Cards %changelog -* Wed Mar 01 2006 Phil Knirsch - 0.178-1 -- Commented out the VT lines at the end of usb.ids as our tools don't handle - them properly. +* Fri Mar 3 2006 Bill Nottingham 0.146.18.EL-1 +- blacklist EDAC modules (#183232) -* Fri Feb 24 2006 Bill Nottingham - 0.177-1 -- remove stock videoaliases in favor of driver-specific ones in - the X driver packages +* Thu Feb 09 2006 Phil Knirsch 0.146.17.EL-1 +- Added fix to detect the new ATI ES1000 chip properly (#180523) -* Wed Feb 22 2006 Phil Knirsch - 0.176-1 -- More entries from Dell to MonitorsDB (#181008) +* Fri Feb 03 2006 Phil Knirsch 0.146.16.EL-1 +- Fixed typo in upgradelist (#169783) -* Fri Feb 10 2006 Phil Knirsch - 0.175-1 -- Added a few more entries to MonitorsDB +* Fri Jan 27 2006 Phil Knirsch 0.146.15.EL-1 +- Updated pci.ids according to our schedule (#179097) -* Wed Feb 01 2006 Phil Knirsch - 0.174-1 -- Some cleanup and adds to the MonitorDB which closes several db related bugs. +* Thu Jan 19 2006 Phil Knirsch 0.146.14.EL-1 +- Fixed regression of missing line in pci.ids (#177169) -* Tue Dec 13 2005 Bill Nottingham - 0.173-1 -- add some IDs to the generic display entries for matching laptops +* Mon Nov 28 2005 Bill Nottingham 0.146.13.EL-1 +- update pci.ids, usb.ids from upstream (#168602) +- add support for Intel 915/945 (#170517) -* Fri Nov 18 2005 Bill Nottingham - 0.172-1 -- ditto for radeon +* Wed Aug 31 2005 Bill Nottingham 0.146.12.EL-1 +- update pci.ids (#156948) -* Fri Nov 18 2005 Jeremy Katz - 0.171-1 -- r128 -> ati. should fix the unresolved symbol and kem says its more - generally the "right" thing to do +* Thu Aug 25 2005 Bill Nottingham +- /etc/pcmcia/config: fix typo (#166635) -* Wed Nov 16 2005 Bill Nottingham - 0.170-1 -- handle mptsas for migration as well -- move videoaliases file to a subdir +* Thu Jul 21 2005 Bill Nottingham 0.146.11.EL-1 +- update usb.ids, MonitorsDB (#158961) -* Fri Sep 16 2005 Bill Nottingham -- add Iiyama monitor (#168143) +* Tue Jul 19 2005 Bill Nottingham +- fix qlogic mapping -* Tue Sep 13 2005 Bill Nottingham -- add IBM monitor (#168080) +* Thu Jun 30 2005 Bill Nottingham +- add more mptfusion cards (#107088) -* Thu Sep 8 2005 Bill Nottingham - 0.169-1 -- remove Cards, pcitable. Add videodrivers +* Wed Jun 22 2005 Bill Nottingham +- add hisax modules to blacklist (#154799, #159068) -* Fri Sep 2 2005 Dan Williams - 0.168-1 -- Add more Gateway monitors +* Fri Jun 10 2005 Bill Nottingham +- fix ATI branding (#160047) -* Fri Sep 2 2005 Dan Williams - 0.167-1 -- Add some ADI monitors, one BenQ, and and DPMS codes for two Apples - -* Fri Sep 2 2005 Bill Nottingham - 0.166-1 -- add videoaliases file -- remove CardMonitorCombos, as nothing uses it - -* Thu Aug 25 2005 Dan Williams - 0.165-1 -- Add a bunch of Acer monitors - -* Tue Aug 9 2005 Jeremy Katz - 0.164-1 -- migrate sk98lin -> skge - -* Sat Jul 30 2005 Bill Nottingham -- migrate mpt module names (#161420) -- remove pcitable entries for drivers in modules.pcimap -- switch lone remaining 'Server' entry - that can't work right - -* Tue Jul 26 2005 Bill Nottingham -- add Daytek monitor (#164339) - -* Wed Jul 13 2005 Bill Nottingham - 0.162-1 -- remove /etc/pcmcia/config, conflict with pcmcia-cs - -* Fri Jul 7 2005 Bill Nottingham - 0.160-1 -- move blacklist to /etc/modprobe.d, require new module-init-tools -- add LG monitors (#162466, #161734) -- add orinoco card (#161696) -- more mptfusion stuff (#107088) - -* Thu Jun 23 2005 Bill Nottingham -- add Samsung monitor (#161013) - -* Wed Jun 22 2005 Bill Nottingham - 0.159-1 -- pcitable: make branding happy (#160047) -- Cards: add required blank line (#157972) -- add some monitors -- add JVC CD-ROM (#160907, ) -- add hisax stuff to blacklist (#154799, #159068) - -* Mon May 16 2005 Bill Nottingham - 0.158-1 -- add a orinoco card (#157482) - -* Thu May 5 2005 Jeremy Katz - 0.157-1 -- add 20" Apple Cinema Display +* Wed May 4 2005 Bill Nottingham 0.146.10.EL-1 +- update pci.ids -* Sun Apr 10 2005 Mike A. Harris 0.156-1 -- Update SiS entries in Cards/pcitable to match what Xorg X11 6.8.2 supports +* Fri Apr 8 2005 Mike A. Harris 0.146.9.EL-1 +- Updated Cards to change the default driver for Nvidia FX1400 or FX540 to + "vesa" (#140601) -* Wed Mar 30 2005 Dan Williams 0.155-1 -- Add a boatload of BenQ, Acer, Sony, NEC, Mitsubishi, and Dell monitors +* Wed Mar 23 2005 Bill Nottingham 0.146.8.EL-1 +- fix qla6322 mapping (correction of fix for #150621) -* Wed Mar 30 2005 Dan Williams 0.154-1 -- Add Typhoon Speednet Wireless PCMCIA Card mapping to atmel_cs driver +* Mon Mar 14 2005 Bill Nottingham 0.146.7.EL-1 +- update pci.ids -* Mon Mar 28 2005 Bill Nottingham 0.153-1 -- update the framebuffer blacklist +* Wed Mar 9 2005 Bill Nottingham 0.146.6.EL-1 +- fix qlaXXXX mappings, add migration entries (#150621) -* Wed Mar 9 2005 Bill Nottingham 0.152-1 -- fix qlogic driver mappings, add upgradelist mappings for the modules - that changed names (#150621) +* Mon Mar 7 2005 Bill Nottingham 0.146.5.EL-1 +- more aic79xx entries (IT%67884) -* Wed Mar 2 2005 Mike A. Harris 0.151-1 -- Added one hundred billion new nvidia PCI IDs to pcitable and Cards to - synchronize it with X.Org X11 6.8.2. (#140601) +* Wed Mar 2 2005 Mike A. Harris 0.146.4.EL-1 +- Bump and rebuild to fix build problem -* Tue Jan 11 2005 Dan Williams - 0.150-1 -- Add Dell UltraSharp 1704FPV (Analog & Digital) +* Wed Mar 2 2005 Mike A. Harris 0.146.3.EL-1 +- Added many new nvidia PCI IDs to pcitable and Cards to synchronize it + with X.Org X11 6.8.2. (#140601) -* Sun Nov 21 2004 Bill Nottingham - 0.148-1 -- add Amptron monitors (#139142) +* Tue Mar 1 2005 Bill Nottingham - 0.146.2.EL-1 +- add sk98lin mapping (#145538) +- fix emu10k1x mapping (#147787) +- update usb.ids, pci.ids, MonitorsDB -* Wed Nov 10 2004 Bill Nottingham - 0.147-1 -- update usb.ids (#138533) +* Wed Nov 10 2004 Bill Nottingham - 0.146.1.EL-1 - migrate dpt_i2o to i2o_block (#138603) * Tue Nov 9 2004 Bill Nottingham - 0.146-1 Index: sources =================================================================== RCS file: /cvs/dist/rpms/hwdata/devel/sources,v retrieving revision 1.64 retrieving revision 1.65 diff -u -r1.64 -r1.65 --- sources 1 Mar 2006 16:17:41 -0000 1.64 +++ sources 3 Mar 2006 19:43:59 -0000 1.65 @@ -1 +1 @@ -d9eeb885781552312b34113ab947a3b7 hwdata-0.178.tar.gz +7c898a0b61a8f90c52b62d5c2d9f9e0e hwdata-0.146.18.EL.tar.gz From fedora-cvs-commits at redhat.com Fri Mar 3 19:45:00 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 3 Mar 2006 14:45:00 -0500 Subject: rpms/eclipse/devel eclipse.spec,1.253,1.254 Message-ID: <200603031945.k23Jj0Pk006901@cvs.devel.redhat.com> Author: overholt Update of /cvs/dist/rpms/eclipse/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv6871 Modified Files: eclipse.spec Log Message: Log environment. Index: eclipse.spec =================================================================== RCS file: /cvs/dist/rpms/eclipse/devel/eclipse.spec,v retrieving revision 1.253 retrieving revision 1.254 diff -u -r1.253 -r1.254 --- eclipse.spec 2 Mar 2006 16:34:08 -0000 1.253 +++ eclipse.spec 3 Mar 2006 19:44:58 -0000 1.254 @@ -543,6 +543,7 @@ %build +env ORIGCLASSPATH=$CLASSPATH %if %{gcj_support} From fedora-cvs-commits at redhat.com Fri Mar 3 19:48:29 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 3 Mar 2006 14:48:29 -0500 Subject: rpms/hwdata/devel .cvsignore, 1.62, 1.63 hwdata.spec, 1.63, 1.64 sources, 1.65, 1.66 Message-ID: <200603031948.k23JmTUp021040@cvs.devel.redhat.com> Author: notting Update of /cvs/dist/rpms/hwdata/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv20988 Modified Files: .cvsignore hwdata.spec sources Log Message: whoops. wrong branch Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/hwdata/devel/.cvsignore,v retrieving revision 1.62 retrieving revision 1.63 diff -u -r1.62 -r1.63 --- .cvsignore 3 Mar 2006 19:43:59 -0000 1.62 +++ .cvsignore 3 Mar 2006 19:48:27 -0000 1.63 @@ -1 +1 @@ -hwdata-0.146.18.EL.tar.gz +hwdata-0.178.tar.gz Index: hwdata.spec =================================================================== RCS file: /cvs/dist/rpms/hwdata/devel/hwdata.spec,v retrieving revision 1.63 retrieving revision 1.64 diff -u -r1.63 -r1.64 --- hwdata.spec 3 Mar 2006 19:43:59 -0000 1.63 +++ hwdata.spec 3 Mar 2006 19:48:27 -0000 1.64 @@ -1,17 +1,18 @@ Name: hwdata Summary: Hardware identification and configuration data -Version: 0.146.18.EL +Version: 0.178 Release: 1 License: GPL/MIT Group: System Environment/Base Source: hwdata-%{version}.tar.gz BuildArch: noarch -Conflicts: Xconfigurator < 4.9.42-1, kernel-pcmcia-cs < 3.1.31-11, kudzu < 1.1.86 +Conflicts: Xconfigurator, system-config-display < 1.0.31, pcmcia-cs, kudzu < 1.2.0 +Requires: module-init-tools >= 3.2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root %description hwdata contains various hardware identification and configuration data, -such as the pci.ids database, the XFree86 Cards and MonitorsDb databases. +such as the pci.ids database and MonitorsDb databases. %prep @@ -28,86 +29,127 @@ %defattr(-,root,root) %doc LICENSE COPYING %dir /usr/share/hwdata -%dir /etc/pcmcia -%config(noreplace) /etc/hotplug/blacklist -%config /etc/pcmcia/config +%config(noreplace) /etc/modprobe.d/blacklist %config /usr/share/hwdata/* -# This file is screaming to be moved into /usr/share/hwdata sometime -/usr/X11R6/lib/X11/Cards %changelog -* Fri Mar 3 2006 Bill Nottingham 0.146.18.EL-1 -- blacklist EDAC modules (#183232) +* Wed Mar 01 2006 Phil Knirsch - 0.178-1 +- Commented out the VT lines at the end of usb.ids as our tools don't handle + them properly. -* Thu Feb 09 2006 Phil Knirsch 0.146.17.EL-1 -- Added fix to detect the new ATI ES1000 chip properly (#180523) +* Fri Feb 24 2006 Bill Nottingham - 0.177-1 +- remove stock videoaliases in favor of driver-specific ones in + the X driver packages -* Fri Feb 03 2006 Phil Knirsch 0.146.16.EL-1 -- Fixed typo in upgradelist (#169783) +* Wed Feb 22 2006 Phil Knirsch - 0.176-1 +- More entries from Dell to MonitorsDB (#181008) -* Fri Jan 27 2006 Phil Knirsch 0.146.15.EL-1 -- Updated pci.ids according to our schedule (#179097) +* Fri Feb 10 2006 Phil Knirsch - 0.175-1 +- Added a few more entries to MonitorsDB -* Thu Jan 19 2006 Phil Knirsch 0.146.14.EL-1 -- Fixed regression of missing line in pci.ids (#177169) +* Wed Feb 01 2006 Phil Knirsch - 0.174-1 +- Some cleanup and adds to the MonitorDB which closes several db related bugs. -* Mon Nov 28 2005 Bill Nottingham 0.146.13.EL-1 -- update pci.ids, usb.ids from upstream (#168602) -- add support for Intel 915/945 (#170517) +* Tue Dec 13 2005 Bill Nottingham - 0.173-1 +- add some IDs to the generic display entries for matching laptops -* Wed Aug 31 2005 Bill Nottingham 0.146.12.EL-1 -- update pci.ids (#156948) +* Fri Nov 18 2005 Bill Nottingham - 0.172-1 +- ditto for radeon -* Thu Aug 25 2005 Bill Nottingham -- /etc/pcmcia/config: fix typo (#166635) +* Fri Nov 18 2005 Jeremy Katz - 0.171-1 +- r128 -> ati. should fix the unresolved symbol and kem says its more + generally the "right" thing to do -* Thu Jul 21 2005 Bill Nottingham 0.146.11.EL-1 -- update usb.ids, MonitorsDB (#158961) +* Wed Nov 16 2005 Bill Nottingham - 0.170-1 +- handle mptsas for migration as well +- move videoaliases file to a subdir -* Tue Jul 19 2005 Bill Nottingham -- fix qlogic mapping +* Fri Sep 16 2005 Bill Nottingham +- add Iiyama monitor (#168143) -* Thu Jun 30 2005 Bill Nottingham -- add more mptfusion cards (#107088) +* Tue Sep 13 2005 Bill Nottingham +- add IBM monitor (#168080) -* Wed Jun 22 2005 Bill Nottingham -- add hisax modules to blacklist (#154799, #159068) +* Thu Sep 8 2005 Bill Nottingham - 0.169-1 +- remove Cards, pcitable. Add videodrivers -* Fri Jun 10 2005 Bill Nottingham -- fix ATI branding (#160047) +* Fri Sep 2 2005 Dan Williams - 0.168-1 +- Add more Gateway monitors -* Wed May 4 2005 Bill Nottingham 0.146.10.EL-1 -- update pci.ids +* Fri Sep 2 2005 Dan Williams - 0.167-1 +- Add some ADI monitors, one BenQ, and and DPMS codes for two Apples -* Fri Apr 8 2005 Mike A. Harris 0.146.9.EL-1 -- Updated Cards to change the default driver for Nvidia FX1400 or FX540 to - "vesa" (#140601) +* Fri Sep 2 2005 Bill Nottingham - 0.166-1 +- add videoaliases file +- remove CardMonitorCombos, as nothing uses it -* Wed Mar 23 2005 Bill Nottingham 0.146.8.EL-1 -- fix qla6322 mapping (correction of fix for #150621) +* Thu Aug 25 2005 Dan Williams - 0.165-1 +- Add a bunch of Acer monitors -* Mon Mar 14 2005 Bill Nottingham 0.146.7.EL-1 -- update pci.ids +* Tue Aug 9 2005 Jeremy Katz - 0.164-1 +- migrate sk98lin -> skge + +* Sat Jul 30 2005 Bill Nottingham +- migrate mpt module names (#161420) +- remove pcitable entries for drivers in modules.pcimap +- switch lone remaining 'Server' entry - that can't work right + +* Tue Jul 26 2005 Bill Nottingham +- add Daytek monitor (#164339) + +* Wed Jul 13 2005 Bill Nottingham - 0.162-1 +- remove /etc/pcmcia/config, conflict with pcmcia-cs + +* Fri Jul 7 2005 Bill Nottingham - 0.160-1 +- move blacklist to /etc/modprobe.d, require new module-init-tools +- add LG monitors (#162466, #161734) +- add orinoco card (#161696) +- more mptfusion stuff (#107088) + +* Thu Jun 23 2005 Bill Nottingham +- add Samsung monitor (#161013) + +* Wed Jun 22 2005 Bill Nottingham - 0.159-1 +- pcitable: make branding happy (#160047) +- Cards: add required blank line (#157972) +- add some monitors +- add JVC CD-ROM (#160907, ) +- add hisax stuff to blacklist (#154799, #159068) + +* Mon May 16 2005 Bill Nottingham - 0.158-1 +- add a orinoco card (#157482) + +* Thu May 5 2005 Jeremy Katz - 0.157-1 +- add 20" Apple Cinema Display + +* Sun Apr 10 2005 Mike A. Harris 0.156-1 +- Update SiS entries in Cards/pcitable to match what Xorg X11 6.8.2 supports + +* Wed Mar 30 2005 Dan Williams 0.155-1 +- Add a boatload of BenQ, Acer, Sony, NEC, Mitsubishi, and Dell monitors + +* Wed Mar 30 2005 Dan Williams 0.154-1 +- Add Typhoon Speednet Wireless PCMCIA Card mapping to atmel_cs driver -* Wed Mar 9 2005 Bill Nottingham 0.146.6.EL-1 -- fix qlaXXXX mappings, add migration entries (#150621) +* Mon Mar 28 2005 Bill Nottingham 0.153-1 +- update the framebuffer blacklist -* Mon Mar 7 2005 Bill Nottingham 0.146.5.EL-1 -- more aic79xx entries (IT%67884) +* Wed Mar 9 2005 Bill Nottingham 0.152-1 +- fix qlogic driver mappings, add upgradelist mappings for the modules + that changed names (#150621) -* Wed Mar 2 2005 Mike A. Harris 0.146.4.EL-1 -- Bump and rebuild to fix build problem +* Wed Mar 2 2005 Mike A. Harris 0.151-1 +- Added one hundred billion new nvidia PCI IDs to pcitable and Cards to + synchronize it with X.Org X11 6.8.2. (#140601) -* Wed Mar 2 2005 Mike A. Harris 0.146.3.EL-1 -- Added many new nvidia PCI IDs to pcitable and Cards to synchronize it - with X.Org X11 6.8.2. (#140601) +* Tue Jan 11 2005 Dan Williams - 0.150-1 +- Add Dell UltraSharp 1704FPV (Analog & Digital) -* Tue Mar 1 2005 Bill Nottingham - 0.146.2.EL-1 -- add sk98lin mapping (#145538) -- fix emu10k1x mapping (#147787) -- update usb.ids, pci.ids, MonitorsDB +* Sun Nov 21 2004 Bill Nottingham - 0.148-1 +- add Amptron monitors (#139142) -* Wed Nov 10 2004 Bill Nottingham - 0.146.1.EL-1 +* Wed Nov 10 2004 Bill Nottingham - 0.147-1 +- update usb.ids (#138533) - migrate dpt_i2o to i2o_block (#138603) * Tue Nov 9 2004 Bill Nottingham - 0.146-1 Index: sources =================================================================== RCS file: /cvs/dist/rpms/hwdata/devel/sources,v retrieving revision 1.65 retrieving revision 1.66 diff -u -r1.65 -r1.66 --- sources 3 Mar 2006 19:43:59 -0000 1.65 +++ sources 3 Mar 2006 19:48:27 -0000 1.66 @@ -1 +1 @@ -7c898a0b61a8f90c52b62d5c2d9f9e0e hwdata-0.146.18.EL.tar.gz +d9eeb885781552312b34113ab947a3b7 hwdata-0.178.tar.gz From fedora-cvs-commits at redhat.com Fri Mar 3 20:03:52 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 3 Mar 2006 15:03:52 -0500 Subject: rpms/frysk/devel frysk.spec,1.32,1.33 Message-ID: <200603032003.k23K3qpr026110@cvs.devel.redhat.com> Author: cagney Update of /cvs/dist/rpms/frysk/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv26035 Modified Files: frysk.spec Log Message: * Fri Mar 03 2006 Andrew Cagney 0.0.1.2006.02.19.rh2-0.FC5.2 - Add Hidden=true to frysk.desktop file; from halfline. Index: frysk.spec =================================================================== RCS file: /cvs/dist/rpms/frysk/devel/frysk.spec,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- frysk.spec 2 Mar 2006 03:11:50 -0000 1.32 +++ frysk.spec 3 Mar 2006 20:03:24 -0000 1.33 @@ -1,7 +1,7 @@ Summary: Frysk execution analysis tool Name: frysk Version: 0.0.1.2006.02.19.rh2 -Release: 0.FC5.1 +Release: 0.FC5.2 License: GPL Group: Development/System URL: http://sourceware.org/frysk @@ -64,6 +64,10 @@ rm -rf %{buildroot} make DESTDIR=$RPM_BUILD_ROOT install %{?_smp_mflags} +# For moment, keep off menu (but if someone wants to enable it they +# can). +echo "Hidden=true" >> %{_datadir}/applications/frysk.desktop + %post /sbin/ldconfig @@ -87,6 +91,9 @@ %{_libexecdir}/frysk/* %changelog +* Fri Mar 03 2006 Andrew Cagney 0.0.1.2006.02.19.rh2-0.FC5.2 +- Add Hidden=true to frysk.desktop file; from halfline. + * Wed Mar 01 2006 Andrew Cagney 0.0.1.2006.02.19.rh2-0.FC5.1 - Add dependencies on latest Java-GNOME bindings. From fedora-cvs-commits at redhat.com Fri Mar 3 20:14:45 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 3 Mar 2006 15:14:45 -0500 Subject: rpms/eclipse/devel eclipse.spec,1.254,1.255 Message-ID: <200603032014.k23KEjE0029160@cvs.devel.redhat.com> Author: overholt Update of /cvs/dist/rpms/eclipse/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv29030 Modified Files: eclipse.spec Log Message: * Fri Mar 03 2006 Andrew Overholt 3.1.2-1jpp_12fc - Only build with a native ecj on x86{,_64} - Make /usr/bin/ecj native again as it's slow as a script with gij and the chances of a someone using a proprietary JDK and not seeing their javac alternative are slim. Index: eclipse.spec =================================================================== RCS file: /cvs/dist/rpms/eclipse/devel/eclipse.spec,v retrieving revision 1.254 retrieving revision 1.255 diff -u -r1.254 -r1.255 --- eclipse.spec 3 Mar 2006 19:44:58 -0000 1.254 +++ eclipse.spec 3 Mar 2006 20:14:42 -0000 1.255 @@ -18,6 +18,11 @@ %else %define eclipse_arch %{_arch} %endif +%ifarch %{ix86} x86_64 +%define native_ecj 1 +%else +%define native_ecj 0 +%endif Summary: %{pkg_summary} Name: eclipse @@ -38,7 +43,6 @@ Source16: %{name}-copy-platform.sh Source17: %{name}-efj-wrapper.sh Source19: %{name}-filenamepatterns.txt -Source20: ecj.sh.in Source21: rebuild-sdk-features # Build libswt-mozilla and libswt-cairo and use O2 @@ -543,7 +547,6 @@ %build -env ORIGCLASSPATH=$CLASSPATH %if %{gcj_support} @@ -570,20 +573,25 @@ # Delete our modified ecj and restore the backup rm -rf ecj-bootstrap-tmp +%if %{native_ecj} # 1b. Natively-compile it gcj -fPIC -fjni -findirect-dispatch -shared -Wl,-Bsymbolic \ -o ecj-bootstrap.jar.so ecj-bootstrap.jar gcj-dbtool -n ecj-bootstrap.db 30000 gcj-dbtool -a ecj-bootstrap.db ecj-bootstrap.jar{,.so} +%endif # 2a. Build ecj export CLASSPATH=ecj-bootstrap.jar:$ORIGCLASSPATH +%if %{native_ecj} export ANT_OPTS="-Dgnu.gcj.precompiled.db.path=`pwd`/ecj-bootstrap.db" %endif +%endif ant -buildfile jdtcoresrc/compilejdtcorewithjavac.xml %if %{gcj_support} +%if %{native_ecj} # 2b. Natively-compile ecj gcj -fPIC -fjni -findirect-dispatch -shared -Wl,-Bsymbolic \ -o jdtcoresrc/ecj.jar.so jdtcoresrc/ecj.jar @@ -597,12 +605,14 @@ # To enSURE we're not using any pre-compiled ecj on the build system, set this export ANT_OPTS="-Dgnu.gcj.precompiled.db.path=`pwd`/jdtcoresrc/ecj.db" %endif +%endif # 3. Use this ecj to rebuild itself export CLASSPATH=`pwd`/jdtcoresrc/ecj.jar:$ORIGCLASSPATH ant -buildfile jdtcoresrc/compilejdtcore.xml %if %{gcj_support} +%if %{native_ecj} # Natively-compile it gcj -fPIC -fjni -findirect-dispatch -shared -Wl,-Bsymbolic \ -o ecj.jar.so ecj.jar @@ -613,6 +623,7 @@ # Remove old native bits rm jdtcoresrc/ecj.db jdtcoresrc/ecj.jar.so %endif +%endif # Build the rest of Eclipse export CLASSPATH=`pwd`/ecj.jar:$ORIGCLASSPATH @@ -651,6 +662,8 @@ result/linux-gtk-%{eclipse_arch}-sdk.tar.gz pushd $RPM_BUILD_ROOT%{_datadir}/%{name} +# extract jdtCompilerAdapter.jar from org.eclipse.jdt.core_3.1.2.jar +unzip -d plugins plugins/org.eclipse.jdt.core_3.1.2.jar jdtCompilerAdapter.jar # Extract .so files # https://bugs.eclipse.org/bugs/show_bug.cgi?id=90535 @@ -908,13 +921,18 @@ ln -s %{_datadir}/%{name}/plugins/org.eclipse.jdt.core_%{eclipse_majmin}.%{eclipse_micro}.jar \ $RPM_BUILD_ROOT%{_datadir}/java/eclipse-ecj.jar -# Install /usr/bin/ecj script -sed 's:@JAVADIR@:%{_javadir}:g' < %{SOURCE20} > ecj -install -m755 ecj $RPM_BUILD_ROOT%{_bindir} -rm ecj - %if %{gcj_support} aot-compile-rpm + +# Build and install ecj binary +pushd $RPM_BUILD_ROOT%{_libdir}/gcj/%{name} + gcj -g -O2 --main=org.eclipse.jdt.internal.compiler.batch.Main \ + -Wl,-R,%{_libdir}/gcj/%{name} \ + org.eclipse.jdt.core_3.1.2.jar.so jdtCompilerAdapter.jar.so -o \ + $RPM_BUILD_ROOT%{_bindir}/ecj +popd +chmod a+x $RPM_BUILD_ROOT%{_bindir}/ecj + %endif %clean @@ -1041,12 +1059,15 @@ %dir %{_datadir}/%{name}/features %dir %{_datadir}/%{name}/configuration %{_datadir}/%{name}/plugins/org.eclipse.jdt.core_3.* +%{_datadir}/%{name}/plugins/jdtCompilerAdapter.jar %{_datadir}/java/eclipse-ecj.jar %if %{gcj_support} # Native bits %dir %{_libdir}/gcj/%{name} %{_libdir}/gcj/%{name}/org.eclipse.jdt.core_3.1.2.jar.so %{_libdir}/gcj/%{name}/org.eclipse.jdt.core_3.1.2.jar.db +%{_libdir}/gcj/%{name}/jdtCompilerAdapter.jar.so +%{_libdir}/gcj/%{name}/jdtCompilerAdapter.jar.db %{_bindir}/ecj %endif @@ -1278,6 +1299,12 @@ %{_datadir}/%{name}/plugins/org.eclipse.platform.source.linux.gtk.*_%{version} %changelog +* Fri Mar 03 2006 Andrew Overholt 3.1.2-1jpp_12fc +- Only build with a native ecj on x86{,_64} +- Make /usr/bin/ecj native again as it's slow as a script with gij and + the chances of a someone using a proprietary JDK and not seeing their + javac alternative are slim. + * Tue Feb 28 2006 Andrew Overholt 3.1.2-1jpp_12fc - Update to tomcat 5.5 (e.o#98371). - Don't build on ppc64 until we get the tomcat situation straightened out. From fedora-cvs-commits at redhat.com Fri Mar 3 20:19:19 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 3 Mar 2006 15:19:19 -0500 Subject: rpms/frysk/devel frysk.spec,1.33,1.34 Message-ID: <200603032019.k23KJJj3010958@cvs.devel.redhat.com> Author: cagney Update of /cvs/dist/rpms/frysk/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv10779 Modified Files: frysk.spec Log Message: * Fri Mar 03 2006 Andrew Cagney 0.0.1.2006.02.19.rh2-0.FC5.2 - Add Hidden=true to frysk.desktop file; from halfline. - Make frysk.desktop writeable during add operation. Index: frysk.spec =================================================================== RCS file: /cvs/dist/rpms/frysk/devel/frysk.spec,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- frysk.spec 3 Mar 2006 20:03:24 -0000 1.33 +++ frysk.spec 3 Mar 2006 20:19:17 -0000 1.34 @@ -66,7 +66,9 @@ # For moment, keep off menu (but if someone wants to enable it they # can). +chmod u+w %{_datadir}/applications/frysk.desktop echo "Hidden=true" >> %{_datadir}/applications/frysk.desktop +chmod u-w %{_datadir}/applications/frysk.desktop %post /sbin/ldconfig @@ -93,6 +95,7 @@ %changelog * Fri Mar 03 2006 Andrew Cagney 0.0.1.2006.02.19.rh2-0.FC5.2 - Add Hidden=true to frysk.desktop file; from halfline. +- Make frysk.desktop writeable during add operation. * Wed Mar 01 2006 Andrew Cagney 0.0.1.2006.02.19.rh2-0.FC5.1 - Add dependencies on latest Java-GNOME bindings. From fedora-cvs-commits at redhat.com Fri Mar 3 20:20:35 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 3 Mar 2006 15:20:35 -0500 Subject: rpms/wpa_supplicant/devel wpa_supplicant.spec,1.10,1.11 Message-ID: <200603032020.k23KKZ6C011569@cvs.devel.redhat.com> Author: dcbw Update of /cvs/dist/rpms/wpa_supplicant/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv11353 Modified Files: wpa_supplicant.spec Log Message: * Fri Mar 3 2006 Dan Williams - 0.4.8-4 - Add additional BuildRequires #rh181914# - Add prereq on chkconfig #rh182905# #rh182906# - Own /var/run/wpa_supplicant and /etc/wpa_supplicant #rh183696# Index: wpa_supplicant.spec =================================================================== RCS file: /cvs/dist/rpms/wpa_supplicant/devel/wpa_supplicant.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- wpa_supplicant.spec 1 Mar 2006 15:31:08 -0000 1.10 +++ wpa_supplicant.spec 3 Mar 2006 20:20:33 -0000 1.11 @@ -2,7 +2,7 @@ Name: wpa_supplicant Epoch: 1 Version: 0.4.8 -Release: 3 +Release: 4 License: GPL Group: System Environment/Base Source0: http://hostap.epitest.fi/releases/%{name}-%{version}.tar.gz @@ -18,6 +18,10 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: qt-devel +BuildRequires: openssl-devel +BuildRequires: readline-devel + +PreReq: chkconfig %description wpa_supplicant is a WPA Supplicant for Linux, BSD and Windows with support @@ -105,7 +109,8 @@ %{_sbindir}/wpa_passphrase %{_sbindir}/wpa_supplicant %{_sbindir}/wpa_cli -%{_localstatedir}/run/%{name} +%dir %{_localstatedir}/run/%{name} +%dir %{_sysconfdir}/%{name} %{_mandir}/man8/* %{_mandir}/man5/* @@ -114,6 +119,11 @@ %{_bindir}/wpa_gui %changelog +* Fri Mar 3 2006 Dan Williams - 0.4.8-4 +- Add additional BuildRequires #rh181914# +- Add prereq on chkconfig #rh182905# #rh182906# +- Own /var/run/wpa_supplicant and /etc/wpa_supplicant #rh183696# + * Wed Mar 1 2006 Dan Williams - 0.4.8-3 - Install wpa_passphrase too #rh183480# From fedora-cvs-commits at redhat.com Fri Mar 3 20:34:49 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 3 Mar 2006 15:34:49 -0500 Subject: rpms/eclipse/devel eclipse.spec,1.255,1.256 Message-ID: <200603032034.k23KYnno015945@cvs.devel.redhat.com> Author: overholt Update of /cvs/dist/rpms/eclipse/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv15913 Modified Files: eclipse.spec Log Message: Only build /usr/bin/ecj natively on x86{,_64} Index: eclipse.spec =================================================================== RCS file: /cvs/dist/rpms/eclipse/devel/eclipse.spec,v retrieving revision 1.255 retrieving revision 1.256 diff -u -r1.255 -r1.256 --- eclipse.spec 3 Mar 2006 20:14:42 -0000 1.255 +++ eclipse.spec 3 Mar 2006 20:34:46 -0000 1.256 @@ -43,6 +43,7 @@ Source16: %{name}-copy-platform.sh Source17: %{name}-efj-wrapper.sh Source19: %{name}-filenamepatterns.txt +Source20: ecj.sh.in Source21: rebuild-sdk-features # Build libswt-mozilla and libswt-cairo and use O2 @@ -662,8 +663,10 @@ result/linux-gtk-%{eclipse_arch}-sdk.tar.gz pushd $RPM_BUILD_ROOT%{_datadir}/%{name} +%if %{native_ecj} # extract jdtCompilerAdapter.jar from org.eclipse.jdt.core_3.1.2.jar unzip -d plugins plugins/org.eclipse.jdt.core_3.1.2.jar jdtCompilerAdapter.jar +%endif # Extract .so files # https://bugs.eclipse.org/bugs/show_bug.cgi?id=90535 @@ -924,14 +927,21 @@ %if %{gcj_support} aot-compile-rpm -# Build and install ecj binary -pushd $RPM_BUILD_ROOT%{_libdir}/gcj/%{name} - gcj -g -O2 --main=org.eclipse.jdt.internal.compiler.batch.Main \ - -Wl,-R,%{_libdir}/gcj/%{name} \ - org.eclipse.jdt.core_3.1.2.jar.so jdtCompilerAdapter.jar.so -o \ - $RPM_BUILD_ROOT%{_bindir}/ecj -popd -chmod a+x $RPM_BUILD_ROOT%{_bindir}/ecj +%if %{native_ecj} + # Build and install ecj binary + pushd $RPM_BUILD_ROOT%{_libdir}/gcj/%{name} + gcj -g -O2 --main=org.eclipse.jdt.internal.compiler.batch.Main \ + -Wl,-R,%{_libdir}/gcj/%{name} \ + org.eclipse.jdt.core_3.1.2.jar.so jdtCompilerAdapter.jar.so -o \ + $RPM_BUILD_ROOT%{_bindir}/ecj + popd + chmod a+x $RPM_BUILD_ROOT%{_bindir}/ecj +%else + # Install /usr/bin/ecj script + sed 's:@JAVADIR@:%{_javadir}:g' < %{SOURCE20} > ecj + install -m755 ecj $RPM_BUILD_ROOT%{_bindir} + rm ecj +%endif %endif @@ -1059,15 +1069,19 @@ %dir %{_datadir}/%{name}/features %dir %{_datadir}/%{name}/configuration %{_datadir}/%{name}/plugins/org.eclipse.jdt.core_3.* +%if %{native_ecj} %{_datadir}/%{name}/plugins/jdtCompilerAdapter.jar +%endif %{_datadir}/java/eclipse-ecj.jar %if %{gcj_support} # Native bits %dir %{_libdir}/gcj/%{name} %{_libdir}/gcj/%{name}/org.eclipse.jdt.core_3.1.2.jar.so %{_libdir}/gcj/%{name}/org.eclipse.jdt.core_3.1.2.jar.db +%if %{native_ecj} %{_libdir}/gcj/%{name}/jdtCompilerAdapter.jar.so %{_libdir}/gcj/%{name}/jdtCompilerAdapter.jar.db +%endif %{_bindir}/ecj %endif From fedora-cvs-commits at redhat.com Fri Mar 3 20:36:40 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 3 Mar 2006 15:36:40 -0500 Subject: rpms/frysk/devel frysk-Makefile-rules-noxmltest.patch, NONE, 1.1 frysk.spec, 1.34, 1.35 Message-ID: <200603032036.k23Kaeqg016239@cvs.devel.redhat.com> Author: cagney Update of /cvs/dist/rpms/frysk/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv16115 Modified Files: frysk.spec Added Files: frysk-Makefile-rules-noxmltest.patch Log Message: * Fri Mar 03 2006 Andrew Cagney 0.0.1.2006.02.19.rh2-0.FC5.2 - Add Hidden=true to frysk.desktop file; from halfline. - Make frysk.desktop writeable during add operation. - Disable xml check in frysk-gui/. frysk-Makefile-rules-noxmltest.patch: Makefile.rules | 22 ---------------------- 1 files changed, 22 deletions(-) --- NEW FILE frysk-Makefile-rules-noxmltest.patch --- Index: frysk-gui/common/Makefile.rules =================================================================== RCS file: /cvs/frysk/frysk-common/Makefile.rules,v retrieving revision 1.102 diff -u -r1.102 Makefile.rules --- frysk-gui/common/Makefile.rules 10 Feb 2006 16:54:05 -0000 1.102 +++ frysk-gui/common/Makefile.rules 20 Feb 2006 03:46:44 -0000 @@ -521,25 +521,3 @@ clean-local: clean-ecj-dir clean-ecj-dir: rm -rf ecj - -# Run through the glade files and check to see that they don't contain -# references to glade libraries - -all-local: glade.checked -glade.checked: $(glade_DATA) - for f in $(glade_DATA) ; do \ - test $$f = x && continue; \ - echo checking $(srcdir)/$$f; \ - if xmllint --noout --valid $(srcdir)/$$f; then \ - if grep 'lib="gnome"' $(srcdir)/$$f; then \ - echo Gnome library found in $(srcdir)/$$f;\ - exit 1; \ - fi; \ - else \ - echo Malformed glade xml file: $(srcdir)/$$f; \ - exit 1; \ - fi; \ - done - touch glade.checked - -CLEANFILES += glade.checked Index: frysk.spec =================================================================== RCS file: /cvs/dist/rpms/frysk/devel/frysk.spec,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- frysk.spec 3 Mar 2006 20:19:17 -0000 1.34 +++ frysk.spec 3 Mar 2006 20:36:37 -0000 1.35 @@ -6,6 +6,7 @@ Group: Development/System URL: http://sourceware.org/frysk Source: %{name}-%{version}.tar.bz2 +Patch1: frysk-Makefile-rules-noxmltest.patch BuildRoot: %{_tmppath}/%{name}-%{version}-root @@ -39,6 +40,7 @@ %prep %setup -q -n %{name}-%{version} +%patch1 -p0 -b .noxmltest ./autogen.sh %build @@ -96,6 +98,7 @@ * Fri Mar 03 2006 Andrew Cagney 0.0.1.2006.02.19.rh2-0.FC5.2 - Add Hidden=true to frysk.desktop file; from halfline. - Make frysk.desktop writeable during add operation. +- Disable xml check in frysk-gui/. * Wed Mar 01 2006 Andrew Cagney 0.0.1.2006.02.19.rh2-0.FC5.1 - Add dependencies on latest Java-GNOME bindings. From fedora-cvs-commits at redhat.com Fri Mar 3 20:42:30 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 3 Mar 2006 15:42:30 -0500 Subject: rpms/cairo/devel cairo-1.0.2-chunk-glyphs-CVE-2006-0528.patch, NONE, 1.1 cairo.spec, 1.32, 1.33 Message-ID: <200603032042.k23KgUBP012237@cvs.devel.redhat.com> Author: cworth Update of /cvs/dist/rpms/cairo/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv12222 Modified Files: cairo.spec Added Files: cairo-1.0.2-chunk-glyphs-CVE-2006-0528.patch Log Message: Add chunk-glyphs-CVE-2006-0528 patch. Bump release to 5. cairo-1.0.2-chunk-glyphs-CVE-2006-0528.patch: cairo-xlib-surface.c | 61 +++++++++++++++++++++++++++++++++++---------------- 1 files changed, 42 insertions(+), 19 deletions(-) --- NEW FILE cairo-1.0.2-chunk-glyphs-CVE-2006-0528.patch --- diff-tree 7d498ca91279a4e793d704c5b878f070be4c878f (from 3aac0bf670facd6523e64b3585a93f29da7ffba2) Author: Carl Worth Date: Fri Mar 3 11:13:36 2006 -0800 _cairo_xlib_surface_show_glyphs: Break up rendering into chunks to fit into X max request length protocol limits. This fixes bug #5528: _XError from XRenderCompositeText8 https://bugs.freedesktop.org/show_bug.cgi?id=5528 diff --git a/src/cairo-xlib-surface.c b/src/cairo-xlib-surface.c index e5ffc6e..0efabf4 100644 --- a/src/cairo-xlib-surface.c +++ b/src/cairo-xlib-surface.c @@ -41,6 +41,7 @@ #include "cairo-xlib-test.h" #include "cairo-xlib-private.h" #include +#include /* Xlib doesn't define a typedef, so define one ourselves */ typedef int (*cairo_xlib_error_func_t) (Display *display, @@ -2710,7 +2711,9 @@ _cairo_xlib_surface_show_glyphs (cairo_s cairo_xlib_surface_t *src; glyphset_cache_t *cache; cairo_glyph_cache_key_t key; - glyphset_cache_entry_t **entries; + const cairo_glyph_t *glyphs_chunk; + glyphset_cache_entry_t **entries, **entries_chunk; + int glyphs_remaining, chunk_size, max_chunk_size; glyphset_cache_entry_t *stack_entries [N_STACK_BUF]; composite_operation_t operation; int i; @@ -2777,26 +2780,46 @@ _cairo_xlib_surface_show_glyphs (cairo_s /* Call the appropriate sub-function. */ _cairo_xlib_surface_ensure_dst_picture (self); + + max_chunk_size = XMaxRequestSize (self->dpy); if (elt_size == 8) + max_chunk_size -= sz_xRenderCompositeGlyphs8Req; + if (elt_size == 16) + max_chunk_size -= sz_xRenderCompositeGlyphs16Req; + if (elt_size == 32) + max_chunk_size -= sz_xRenderCompositeGlyphs32Req; + max_chunk_size /= sz_xGlyphElt; + + for (glyphs_remaining = num_glyphs, glyphs_chunk = glyphs, entries_chunk = entries; + glyphs_remaining; + glyphs_remaining -= chunk_size, glyphs_chunk += chunk_size, entries_chunk += chunk_size) { - status = _cairo_xlib_surface_show_glyphs8 (scaled_font, operator, cache, &key, src, self, - source_x + attributes.x_offset - dest_x, - source_y + attributes.y_offset - dest_y, - glyphs, entries, num_glyphs); - } - else if (elt_size == 16) - { - status = _cairo_xlib_surface_show_glyphs16 (scaled_font, operator, cache, &key, src, self, - source_x + attributes.x_offset - dest_x, - source_y + attributes.y_offset - dest_y, - glyphs, entries, num_glyphs); - } - else - { - status = _cairo_xlib_surface_show_glyphs32 (scaled_font, operator, cache, &key, src, self, - source_x + attributes.x_offset - dest_x, - source_y + attributes.y_offset - dest_y, - glyphs, entries, num_glyphs); + chunk_size = MIN (glyphs_remaining, max_chunk_size); + + if (elt_size == 8) + { + status = _cairo_xlib_surface_show_glyphs8 (scaled_font, operator, cache, &key, src, self, + source_x + attributes.x_offset - dest_x, + source_y + attributes.y_offset - dest_y, + glyphs_chunk, entries_chunk, chunk_size); + } + else if (elt_size == 16) + { + status = _cairo_xlib_surface_show_glyphs16 (scaled_font, operator, cache, &key, src, self, + source_x + attributes.x_offset - dest_x, + source_y + attributes.y_offset - dest_y, + glyphs_chunk, entries_chunk, chunk_size); + } + else + { + status = _cairo_xlib_surface_show_glyphs32 (scaled_font, operator, cache, &key, src, self, + source_x + attributes.x_offset - dest_x, + source_y + attributes.y_offset - dest_y, + glyphs_chunk, entries_chunk, chunk_size); + } + + if (status != CAIRO_STATUS_SUCCESS) + break; } if (status == CAIRO_STATUS_SUCCESS && Index: cairo.spec =================================================================== RCS file: /cvs/dist/rpms/cairo/devel/cairo.spec,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- cairo.spec 11 Feb 2006 02:13:39 -0000 1.32 +++ cairo.spec 3 Mar 2006 20:42:28 -0000 1.33 @@ -4,7 +4,7 @@ Summary: A vector graphics library Name: cairo Version: 1.0.2 -Release: 4.2 +Release: 5 URL: http://cairographics.org Source0: %{name}-%{version}.tar.gz License: LGPL/MPL @@ -25,6 +25,7 @@ Patch0: cairo-1.0.2-embedded-bitmaps.patch Patch1: cairo-1.0.2-fix-build.patch +Patch2: cairo-1.0.2-chunk-glyphs-CVE-2006-0528.patch %description Cairo is a vector graphics library designed to provide high-quality @@ -53,6 +54,7 @@ %setup -q %patch0 -p1 -b .embedded-bitmaps %patch1 -p1 -b .fix-build +%patch2 -p1 -b .chunk-glyphs-CVS-2006-0528 %build %configure --enable-warnings --disable-glitz --disable-quartz \ @@ -87,6 +89,10 @@ %{_datadir}/gtk-doc/* %changelog +* Fri Mar 3 2006 Carl Worth - 1.0.2-5 +- add patch to chunk Xlib glyph compositing (bug 182416 and + CVE-20060528) + * Fri Feb 10 2006 Jesse Keating - 1.0.2-4.2 - bump again for double-long bug on ppc(64) From fedora-cvs-commits at redhat.com Fri Mar 3 21:00:55 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 3 Mar 2006 16:00:55 -0500 Subject: rpms/kernel/FC-4/configs config-generic, 1.54, 1.54.2.1 config-ia64-generic, 1.6, 1.6.24.1 config-x86-generic, 1.20, 1.20.2.1 config-x86_64-generic, 1.18, 1.18.2.1 Message-ID: <200603032100.k23L0tim025020@cvs.devel.redhat.com> Author: linville Update of /cvs/dist/rpms/kernel/FC-4/configs In directory cvs.devel.redhat.com:/tmp/cvs-serv24995/configs Modified Files: Tag: private-linville-jwltest-fc4-32-branch config-generic config-ia64-generic config-x86-generic config-x86_64-generic Log Message: Index: config-generic =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-4/configs/config-generic,v retrieving revision 1.54 retrieving revision 1.54.2.1 diff -u -r1.54 -r1.54.2.1 --- config-generic 21 Feb 2006 05:47:00 -0000 1.54 +++ config-generic 3 Mar 2006 21:00:42 -0000 1.54.2.1 @@ -1035,6 +1035,8 @@ CONFIG_NS83820=m CONFIG_HAMACHI=m CONFIG_YELLOWFIN=m +CONFIG_SKY2=m +CONFIG_SKY2_EC_A1=y CONFIG_R8169=m CONFIG_R8169_NAPI=y CONFIG_R8169_VLAN=y Index: config-ia64-generic =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-4/configs/config-ia64-generic,v retrieving revision 1.6 retrieving revision 1.6.24.1 diff -u -r1.6 -r1.6.24.1 --- config-ia64-generic 6 Dec 2005 23:12:21 -0000 1.6 +++ config-ia64-generic 3 Mar 2006 21:00:42 -0000 1.6.24.1 @@ -124,6 +124,7 @@ CONFIG_ACPI_SYSTEM=y CONFIG_ACPI_NUMA=y CONFIG_ACPI_BLACKLIST_YEAR=0 +CONFIG_ACPI_INITRD=y CONFIG_SERIAL_SGI_L1_CONSOLE=y CONFIG_PM=y # CONFIG_PM_DEBUG is not set Index: config-x86-generic =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-4/configs/config-x86-generic,v retrieving revision 1.20 retrieving revision 1.20.2.1 diff -u -r1.20 -r1.20.2.1 --- config-x86-generic 21 Feb 2006 02:35:46 -0000 1.20 +++ config-x86-generic 3 Mar 2006 21:00:42 -0000 1.20.2.1 @@ -150,6 +150,7 @@ CONFIG_ACPI_BLACKLIST_YEAR=2001 CONFIG_ACPI_VIDEO=m CONFIG_ACPI_IBM=m +CONFIG_ACPI_INITRD=y CONFIG_PNPACPI=y # Index: config-x86_64-generic =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-4/configs/config-x86_64-generic,v retrieving revision 1.18 retrieving revision 1.18.2.1 diff -u -r1.18 -r1.18.2.1 --- config-x86_64-generic 21 Feb 2006 02:35:46 -0000 1.18 +++ config-x86_64-generic 3 Mar 2006 21:00:42 -0000 1.18.2.1 @@ -79,6 +79,7 @@ CONFIG_ACPI_BLACKLIST_YEAR=0 CONFIG_ACPI_VIDEO=m CONFIG_ACPI_IBM=m +CONFIG_ACPI_INITRD=y CONFIG_HOTPLUG_PCI=y # CONFIG_HOTPLUG_PCI_FAKE is not set From fedora-cvs-commits at redhat.com Fri Mar 3 21:00:56 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 3 Mar 2006 16:00:56 -0500 Subject: rpms/kernel/FC-4 jwltest-acpi-dsdt-initrd.patch, NONE, 1.1.52.1 jwltest-hostap_cs-intersil.patch, NONE, 1.1.2.1 jwltest-mii-force_media.patch, NONE, 1.1.8.1 jwltest-rhine-mdelay-undo.patch, NONE, 1.1.6.1 jwltest-sky2.patch, NONE, 1.1.20.1 jwltest-tulip-last_irq.patch, NONE, 1.1.10.1 jwltest-via-velocity-tx_csum.patch, NONE, 1.1.18.1 kernel-2.6.spec, 1.1609, 1.1609.2.1 Message-ID: <200603032100.k23L0uT2025034@cvs.devel.redhat.com> Author: linville Update of /cvs/dist/rpms/kernel/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv24995 Modified Files: Tag: private-linville-jwltest-fc4-32-branch kernel-2.6.spec Added Files: Tag: private-linville-jwltest-fc4-32-branch jwltest-acpi-dsdt-initrd.patch jwltest-hostap_cs-intersil.patch jwltest-mii-force_media.patch jwltest-rhine-mdelay-undo.patch jwltest-sky2.patch jwltest-tulip-last_irq.patch jwltest-via-velocity-tx_csum.patch Log Message: jwltest-acpi-dsdt-initrd.patch: drivers/acpi/Kconfig | 13 +++++ drivers/acpi/osl.c | 104 +++++++++++++++++++++++++++++++++++++++----- drivers/acpi/tables/tbget.c | 5 ++ init/main.c | 16 +++--- 4 files changed, 120 insertions(+), 18 deletions(-) --- NEW FILE jwltest-acpi-dsdt-initrd.patch --- --- linux-2.6.14/drivers/acpi/Kconfig.orig 2005-11-07 15:45:19.000000000 -0500 +++ linux-2.6.14/drivers/acpi/Kconfig 2005-11-07 15:45:27.000000000 -0500 @@ -341,4 +341,17 @@ config ACPI_HOTPLUG_MEMORY $>modprobe acpi_memhotplug endif # ACPI +config ACPI_INITRD + bool "Read DSDT from initrd or initramfs" + depends on ACPI && BLK_DEV_INITRD && !ACPI_CUSTOM_DSDT + default n + help + The DSDT (Differentiated System Description Table) often needs to be + overridden because of broken BIOS implementations. If you want to use + a customized DSDT, please use the mkinitrd tool (mkinitrd package) to + attach the DSDT to the initrd or initramfs + (see http://gaugusch.at/kernel.shtml for details) + If there is no DSDT found in the initrd, the DSDT from the BIOS is + used. It is save to say yes here. + endmenu --- linux-2.6.14/drivers/acpi/osl.c.orig 2005-11-07 15:45:19.000000000 -0500 +++ linux-2.6.14/drivers/acpi/osl.c 2005-11-07 15:45:27.000000000 -0500 @@ -44,6 +44,10 @@ #include #include +#ifdef CONFIG_ACPI_INITRD +#include +#include +#endif #define _COMPONENT ACPI_OS_SERVICES ACPI_MODULE_NAME("osl") @@ -244,24 +248,104 @@ acpi_os_predefined_override(const struct return AE_OK; } +#ifdef CONFIG_ACPI_INITRD +static char * +acpi_find_dsdt_initrd(void) +{ + static const char signature[] = "INITRDDSDT123DSDT123"; + char *dsdt_start = NULL; + char *dsdt_buffer = NULL; + unsigned long len = 0, len2 = 0; + int fd; + char ramfs_dsdt_name[10] = "/DSDT.aml"; + struct kstat stat; + + /* try to get dsdt from tail of initrd */ + if ((fd = sys_open(ramfs_dsdt_name, O_RDONLY, 0)) < 0) { + if (initrd_start) { + char *data = (char *)initrd_start; + + printk(KERN_INFO PREFIX "Looking for DSDT in initrd..."); + + /* Search for the start signature */ + while (data < (char *)initrd_end - sizeof(signature) - 4) { + if (!memcmp(data, signature, sizeof(signature))) { + data += sizeof(signature); + if (!memcmp(data, "DSDT", 4)) + dsdt_start = data; + break; + } + data++; + } + + if (dsdt_start){ + printk(PREFIX " found at offset %zu", + dsdt_start - (char *)initrd_start); + len = (char*) initrd_end - dsdt_start; + printk(", size: %zu bytes\n", len); + dsdt_buffer = ACPI_MEM_ALLOCATE(len + 1); + memcpy(dsdt_buffer, dsdt_start, len); + *(dsdt_buffer + len + 1)= '\0'; + } + else + printk(" not found!\n"); + } + } + /* get dsdt from initramfs */ + else{ + printk(KERN_INFO PREFIX "Looking for DSDT in initramfs..."); + if (vfs_stat(ramfs_dsdt_name, &stat) < 0){ + printk ("error getting stats for file %s\n", ramfs_dsdt_name); + return NULL; + } + + len = stat.size; + dsdt_buffer = ACPI_MEM_ALLOCATE(len + 1); + if (!dsdt_buffer) { + printk("Could not allocate %lu bytes of memory\n", len); + return NULL; + } + printk (" found %s ...", ramfs_dsdt_name); + + len2 = sys_read (fd, (char __user *) dsdt_buffer, len); + if (len2 < len ){ + printk(PREFIX "\nError trying to read %lu bytes from %s\n", + len, ramfs_dsdt_name); + ACPI_MEM_FREE (dsdt_buffer); + dsdt_buffer = NULL; + } + else{ + printk(" successfully read %lu bytes from %s\n", + len, ramfs_dsdt_name); + *(dsdt_buffer + len + 1) = '\0'; + } + } + if (!dsdt_buffer) + printk(" not found!\n"); + return dsdt_buffer; +} +#endif + acpi_status -acpi_os_table_override(struct acpi_table_header * existing_table, - struct acpi_table_header ** new_table) +acpi_os_table_override (struct acpi_table_header *existing_table, + struct acpi_table_header **new_table) { if (!existing_table || !new_table) return AE_BAD_PARAMETER; - -#ifdef CONFIG_ACPI_CUSTOM_DSDT - if (strncmp(existing_table->signature, "DSDT", 4) == 0) - *new_table = (struct acpi_table_header *)AmlCode; - else - *new_table = NULL; -#else + *new_table = NULL; + if (strncmp(existing_table->signature, "DSDT", 4) == 0) { +#ifdef CONFIG_ACPI_CUSTOM_DSDT + *new_table = (struct acpi_table_header*)AmlCode; +#elif defined(CONFIG_ACPI_INITRD) + *new_table = (struct acpi_table_header*)acpi_find_dsdt_initrd(); #endif + if (*new_table) + printk(KERN_INFO PREFIX "Using customized DSDT\n"); + } return AE_OK; } - + static irqreturn_t acpi_irq(int irq, void *dev_id, struct pt_regs *regs) { return (*acpi_irq_handler) (acpi_irq_context) ? IRQ_HANDLED : IRQ_NONE; --- linux-2.6.14/drivers/acpi/tables/tbget.c.orig 2005-11-07 15:46:15.000000000 -0500 +++ linux-2.6.14/drivers/acpi/tables/tbget.c 2005-11-07 15:46:08.000000000 -0500 @@ -283,6 +283,11 @@ acpi_tb_table_override(struct acpi_table ACPI_REPORT_INFO(("Table [%4.4s] replaced by host OS\n", table_info->pointer->signature)); +#ifdef CONFIG_ACPI_INITRD + if (new_table) + ACPI_MEM_FREE(new_table); +#endif + return_ACPI_STATUS(AE_OK); } --- linux-2.6.14/init/main.c.orig 2005-11-07 15:45:19.000000000 -0500 +++ linux-2.6.14/init/main.c 2005-11-07 15:45:27.000000000 -0500 @@ -540,8 +540,6 @@ asmlinkage void __init start_kernel(void check_bugs(); - acpi_early_init(); /* before LAPIC and SMP init */ - /* Do the rest non-__init'ed, we're now alive */ rest_init(); } @@ -671,6 +669,14 @@ static int init(void * unused) */ child_reaper = current; + /* + * Do this before initcalls, because some drivers want to access + * firmware files. + */ + populate_rootfs(); + + acpi_early_init(); /* before LAPIC and SMP init */ + /* Sets up cpus_possible() */ smp_prepare_cpus(max_cpus); @@ -682,12 +688,6 @@ static int init(void * unused) cpuset_init_smp(); - /* - * Do this before initcalls, because some drivers want to access - * firmware files. - */ - populate_rootfs(); - do_basic_setup(); /* jwltest-hostap_cs-intersil.patch: drivers/net/wireless/hostap/hostap_cs.c | 5 ++++- include/pcmcia/device_id.h | 9 +++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) --- NEW FILE jwltest-hostap_cs-intersil.patch --- --- linux-2.6.15/include/pcmcia/device_id.h.orig 2006-01-02 22:21:10.000000000 -0500 +++ linux-2.6.15/include/pcmcia/device_id.h 2006-03-03 14:55:15.000000000 -0500 @@ -72,6 +72,15 @@ .prod_id = { (v1), (v2), (v3), (v4) }, \ .prod_id_hash = { (vh1), (vh2), (vh3), (vh4) }, } +#define PCMCIA_DEVICE_MANF_CARD_PROD_ID1(manf, card, v1, vh1) { \ + .match_flags = PCMCIA_DEV_ID_MATCH_MANF_ID| \ + PCMCIA_DEV_ID_MATCH_CARD_ID| \ + PCMCIA_DEV_ID_MATCH_PROD_ID1, \ + .manf_id = (manf), \ + .card_id = (card), \ + .prod_id = { (v1), NULL, NULL, NULL }, \ + .prod_id_hash = { (vh1), 0, 0, 0 }, } + /* multi-function devices */ --- linux-2.6.15/drivers/net/wireless/hostap/hostap_cs.c.orig 2006-01-02 22:21:10.000000000 -0500 +++ linux-2.6.15/drivers/net/wireless/hostap/hostap_cs.c 2006-03-03 14:55:15.000000000 -0500 @@ -930,7 +930,6 @@ static struct pcmcia_device_id hostap_cs PCMCIA_DEVICE_MANF_CARD(0x0101, 0x0777), PCMCIA_DEVICE_MANF_CARD(0x0126, 0x8000), PCMCIA_DEVICE_MANF_CARD(0x0138, 0x0002), - PCMCIA_DEVICE_MANF_CARD(0x0156, 0x0002), PCMCIA_DEVICE_MANF_CARD(0x0250, 0x0002), PCMCIA_DEVICE_MANF_CARD(0x026f, 0x030b), PCMCIA_DEVICE_MANF_CARD(0x0274, 0x1612), @@ -944,6 +943,10 @@ static struct pcmcia_device_id hostap_cs PCMCIA_DEVICE_MANF_CARD(0xd601, 0x0002), PCMCIA_DEVICE_MANF_CARD(0xd601, 0x0005), PCMCIA_DEVICE_MANF_CARD(0xd601, 0x0010), + PCMCIA_DEVICE_MANF_CARD_PROD_ID1(0x0156, 0x0002, "INTERSIL", + 0x74c5e40d), + PCMCIA_DEVICE_MANF_CARD_PROD_ID1(0x0156, 0x0002, "Intersil", + 0x4b801a17), PCMCIA_MFC_DEVICE_PROD_ID12(0, "SanDisk", "ConnectPlus", 0x7a954bd9, 0x74be00c6), PCMCIA_DEVICE_PROD_ID1234( jwltest-mii-force_media.patch: mii.c | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) --- NEW FILE jwltest-mii-force_media.patch --- --- linux-2.6.15/drivers/net/mii.c.orig 2006-01-02 22:21:10.000000000 -0500 +++ linux-2.6.15/drivers/net/mii.c 2006-01-09 13:49:32.000000000 -0500 @@ -266,10 +266,6 @@ unsigned int mii_check_media (struct mii int advertise, lpa, media, duplex; int lpa2 = 0; - /* if forced media, go no further */ - if (mii->force_media) - return 0; /* duplex did not change */ - /* check current and old link status */ old_carrier = netif_carrier_ok(mii->dev) ? 1 : 0; new_carrier = (unsigned int) mii_link_ok(mii); @@ -293,6 +289,13 @@ unsigned int mii_check_media (struct mii */ netif_carrier_on(mii->dev); + /* if forced media, go no further */ + if (mii->force_media) { + if (ok_to_print) + printk(KERN_INFO "%s: link up\n", mii->dev->name); + return 0; /* duplex did not change */ + } + /* get MII advertise and LPA values */ if ((!init_media) && (mii->advertising)) advertise = mii->advertising; jwltest-rhine-mdelay-undo.patch: via-rhine.c | 34 +++------------------------------- 1 files changed, 3 insertions(+), 31 deletions(-) --- NEW FILE jwltest-rhine-mdelay-undo.patch --- --- linux-2.6.15/drivers/net/via-rhine.c.orig 2006-01-02 22:21:10.000000000 -0500 +++ linux-2.6.15/drivers/net/via-rhine.c 2006-02-09 10:52:37.000000000 -0500 @@ -490,8 +490,6 @@ struct rhine_private { u8 tx_thresh, rx_thresh; struct mii_if_info mii_if; - struct work_struct tx_timeout_task; - struct work_struct check_media_task; void __iomem *base; }; @@ -499,8 +497,6 @@ static int mdio_read(struct net_device static void mdio_write(struct net_device *dev, int phy_id, int location, int value); static int rhine_open(struct net_device *dev); static void rhine_tx_timeout(struct net_device *dev); -static void rhine_tx_timeout_task(struct net_device *dev); -static void rhine_check_media_task(struct net_device *dev); static int rhine_start_tx(struct sk_buff *skb, struct net_device *dev); static irqreturn_t rhine_interrupt(int irq, void *dev_instance, struct pt_regs *regs); static void rhine_tx(struct net_device *dev); @@ -855,12 +851,6 @@ static int __devinit rhine_init_one(stru if (rp->quirks & rqRhineI) dev->features |= NETIF_F_SG|NETIF_F_HW_CSUM; - INIT_WORK(&rp->tx_timeout_task, - (void (*)(void *))rhine_tx_timeout_task, dev); - - INIT_WORK(&rp->check_media_task, - (void (*)(void *))rhine_check_media_task, dev); - /* dev->name not defined before register_netdev()! */ rc = register_netdev(dev); if (rc) @@ -1087,11 +1077,6 @@ static void rhine_check_media(struct net ioaddr + ChipCmd1); } -static void rhine_check_media_task(struct net_device *dev) -{ - rhine_check_media(dev, 0); -} - static void init_registers(struct net_device *dev) { struct rhine_private *rp = netdev_priv(dev); @@ -1145,8 +1130,8 @@ static void rhine_disable_linkmon(void _ if (quirks & rqRhineI) { iowrite8(0x01, ioaddr + MIIRegAddr); // MII_BMSR - /* Do not call from ISR! */ - msleep(1); + /* Can be called from ISR. Evil. */ + mdelay(1); /* 0x80 must be set immediately before turning it off */ iowrite8(0x80, ioaddr + MIICmd); @@ -1236,16 +1221,6 @@ static int rhine_open(struct net_device static void rhine_tx_timeout(struct net_device *dev) { struct rhine_private *rp = netdev_priv(dev); - - /* - * Move bulk of work outside of interrupt context - */ - schedule_work(&rp->tx_timeout_task); -} - -static void rhine_tx_timeout_task(struct net_device *dev) -{ - struct rhine_private *rp = netdev_priv(dev); void __iomem *ioaddr = rp->base; printk(KERN_WARNING "%s: Transmit timed out, status %4.4x, PHY status " @@ -1651,7 +1626,7 @@ static void rhine_error(struct net_devic spin_lock(&rp->lock); if (intr_status & IntrLinkChange) - schedule_work(&rp->check_media_task); + rhine_check_media(dev, 0); if (intr_status & IntrStatsMax) { rp->stats.rx_crc_errors += ioread16(ioaddr + RxCRCErrs); rp->stats.rx_missed_errors += ioread16(ioaddr + RxMissed); @@ -1899,9 +1874,6 @@ static int rhine_close(struct net_device spin_unlock_irq(&rp->lock); free_irq(rp->pdev->irq, dev); - - flush_scheduled_work(); - free_rbufs(dev); free_tbufs(dev); free_ring(dev); jwltest-sky2.patch: Kconfig | 18 Makefile | 1 sky2.c | 3040 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ sky2.h | 1910 ++++++++++++++++++++++++++++++++++++ sky2_compat.h | 6 5 files changed, 4975 insertions(+) --- NEW FILE jwltest-sky2.patch --- --- linux-2.6.14/drivers/net/sky2.h.orig 2005-11-14 09:45:48.000000000 -0500 +++ linux-2.6.14/drivers/net/sky2.h 2005-11-14 09:45:56.000000000 -0500 @@ -0,0 +1,1910 @@ +/* + * Definitions for the new Marvell Yukon 2 driver. + */ +#ifndef _SKY2_H +#define _SKY2_H + +/* PCI config registers */ +#define PCI_DEV_REG1 0x40 +#define PCI_DEV_REG2 0x44 +#define PCI_DEV_STATUS 0x7c +#define PCI_OS_PCI_X (1<<26) + +#define PEX_LNK_STAT 0xf2 +#define PEX_UNC_ERR_STAT 0x104 +#define PEX_DEV_CTRL 0xe8 + +/* Yukon-2 */ +enum pci_dev_reg_1 { + PCI_Y2_PIG_ENA = 1<<31, /* Enable Plug-in-Go (YUKON-2) */ + PCI_Y2_DLL_DIS = 1<<30, /* Disable PCI DLL (YUKON-2) */ + PCI_Y2_PHY2_COMA = 1<<29, /* Set PHY 2 to Coma Mode (YUKON-2) */ + PCI_Y2_PHY1_COMA = 1<<28, /* Set PHY 1 to Coma Mode (YUKON-2) */ + PCI_Y2_PHY2_POWD = 1<<27, /* Set PHY 2 to Power Down (YUKON-2) */ + PCI_Y2_PHY1_POWD = 1<<26, /* Set PHY 1 to Power Down (YUKON-2) */ +}; + +enum pci_dev_reg_2 { + PCI_VPD_WR_THR = 0xffL<<24, /* Bit 31..24: VPD Write Threshold */ + PCI_DEV_SEL = 0x7fL<<17, /* Bit 23..17: EEPROM Device Select */ + PCI_VPD_ROM_SZ = 7L<<14, /* Bit 16..14: VPD ROM Size */ + + PCI_PATCH_DIR = 0xfL<<8, /* Bit 11.. 8: Ext Patches dir 3..0 */ + PCI_EXT_PATCHS = 0xfL<<4, /* Bit 7.. 4: Extended Patches 3..0 */ + PCI_EN_DUMMY_RD = 1<<3, /* Enable Dummy Read */ + PCI_REV_DESC = 1<<2, /* Reverse Desc. Bytes */ + + PCI_USEDATA64 = 1<<0, /* Use 64Bit Data bus ext */ +}; + + +#define PCI_STATUS_ERROR_BITS (PCI_STATUS_DETECTED_PARITY | \ + PCI_STATUS_SIG_SYSTEM_ERROR | \ + PCI_STATUS_REC_MASTER_ABORT | \ + PCI_STATUS_REC_TARGET_ABORT | \ + PCI_STATUS_PARITY) + +enum pex_dev_ctrl { + PEX_DC_MAX_RRS_MSK = 7<<12, /* Bit 14..12: Max. Read Request Size */ + PEX_DC_EN_NO_SNOOP = 1<<11,/* Enable No Snoop */ + PEX_DC_EN_AUX_POW = 1<<10,/* Enable AUX Power */ + PEX_DC_EN_PHANTOM = 1<<9, /* Enable Phantom Functions */ + PEX_DC_EN_EXT_TAG = 1<<8, /* Enable Extended Tag Field */ + PEX_DC_MAX_PLS_MSK = 7<<5, /* Bit 7.. 5: Max. Payload Size Mask */ + PEX_DC_EN_REL_ORD = 1<<4, /* Enable Relaxed Ordering */ + PEX_DC_EN_UNS_RQ_RP = 1<<3, /* Enable Unsupported Request Reporting */ + PEX_DC_EN_FAT_ER_RP = 1<<2, /* Enable Fatal Error Reporting */ + PEX_DC_EN_NFA_ER_RP = 1<<1, /* Enable Non-Fatal Error Reporting */ + PEX_DC_EN_COR_ER_RP = 1<<0, /* Enable Correctable Error Reporting */ +}; +#define PEX_DC_MAX_RD_RQ_SIZE(x) (((x)<<12) & PEX_DC_MAX_RRS_MSK) + +/* PEX_UNC_ERR_STAT PEX Uncorrectable Errors Status Register (Yukon-2) */ +enum pex_err { + PEX_UNSUP_REQ = 1<<20, /* Unsupported Request Error */ + + PEX_MALFOR_TLP = 1<<18, /* Malformed TLP */ + + PEX_UNEXP_COMP = 1<<16, /* Unexpected Completion */ + + PEX_COMP_TO = 1<<14, /* Completion Timeout */ + PEX_FLOW_CTRL_P = 1<<13, /* Flow Control Protocol Error */ + PEX_POIS_TLP = 1<<12, /* Poisoned TLP */ + + PEX_DATA_LINK_P = 1<<4, /* Data Link Protocol Error */ + PEX_FATAL_ERRORS= (PEX_MALFOR_TLP | PEX_FLOW_CTRL_P | PEX_DATA_LINK_P), +}; + + +enum csr_regs { + B0_RAP = 0x0000, + B0_CTST = 0x0004, + B0_Y2LED = 0x0005, + B0_POWER_CTRL = 0x0007, + B0_ISRC = 0x0008, + B0_IMSK = 0x000c, + B0_HWE_ISRC = 0x0010, + B0_HWE_IMSK = 0x0014, + + /* Special ISR registers (Yukon-2 only) */ + B0_Y2_SP_ISRC2 = 0x001c, + B0_Y2_SP_ISRC3 = 0x0020, + B0_Y2_SP_EISR = 0x0024, + B0_Y2_SP_LISR = 0x0028, + B0_Y2_SP_ICR = 0x002c, + + B2_MAC_1 = 0x0100, + B2_MAC_2 = 0x0108, + B2_MAC_3 = 0x0110, + B2_CONN_TYP = 0x0118, + B2_PMD_TYP = 0x0119, + B2_MAC_CFG = 0x011a, + B2_CHIP_ID = 0x011b, + B2_E_0 = 0x011c, + + B2_Y2_CLK_GATE = 0x011d, + B2_Y2_HW_RES = 0x011e, + B2_E_3 = 0x011f, + B2_Y2_CLK_CTRL = 0x0120, + + B2_TI_INI = 0x0130, + B2_TI_VAL = 0x0134, + B2_TI_CTRL = 0x0138, + B2_TI_TEST = 0x0139, + + B2_TST_CTRL1 = 0x0158, + B2_TST_CTRL2 = 0x0159, + B2_GP_IO = 0x015c, + + B2_I2C_CTRL = 0x0160, + B2_I2C_DATA = 0x0164, + B2_I2C_IRQ = 0x0168, + B2_I2C_SW = 0x016c, + + B3_RAM_ADDR = 0x0180, + B3_RAM_DATA_LO = 0x0184, + B3_RAM_DATA_HI = 0x0188, + +/* RAM Interface Registers */ +/* Yukon-2: use RAM_BUFFER() to access the RAM buffer */ +/* + * The HW-Spec. calls this registers Timeout Value 0..11. But this names are + * not usable in SW. Please notice these are NOT real timeouts, these are + * the number of qWords transferred continuously. + */ +#define RAM_BUFFER(port, reg) (reg | (port <<6)) + + B3_RI_WTO_R1 = 0x0190, + B3_RI_WTO_XA1 = 0x0191, + B3_RI_WTO_XS1 = 0x0192, + B3_RI_RTO_R1 = 0x0193, + B3_RI_RTO_XA1 = 0x0194, + B3_RI_RTO_XS1 = 0x0195, + B3_RI_WTO_R2 = 0x0196, + B3_RI_WTO_XA2 = 0x0197, + B3_RI_WTO_XS2 = 0x0198, + B3_RI_RTO_R2 = 0x0199, + B3_RI_RTO_XA2 = 0x019a, + B3_RI_RTO_XS2 = 0x019b, + B3_RI_TO_VAL = 0x019c, + B3_RI_CTRL = 0x01a0, + B3_RI_TEST = 0x01a2, + B3_MA_TOINI_RX1 = 0x01b0, + B3_MA_TOINI_RX2 = 0x01b1, + B3_MA_TOINI_TX1 = 0x01b2, + B3_MA_TOINI_TX2 = 0x01b3, + B3_MA_TOVAL_RX1 = 0x01b4, + B3_MA_TOVAL_RX2 = 0x01b5, + B3_MA_TOVAL_TX1 = 0x01b6, + B3_MA_TOVAL_TX2 = 0x01b7, + B3_MA_TO_CTRL = 0x01b8, + B3_MA_TO_TEST = 0x01ba, + B3_MA_RCINI_RX1 = 0x01c0, + B3_MA_RCINI_RX2 = 0x01c1, + B3_MA_RCINI_TX1 = 0x01c2, + B3_MA_RCINI_TX2 = 0x01c3, + B3_MA_RCVAL_RX1 = 0x01c4, + B3_MA_RCVAL_RX2 = 0x01c5, + B3_MA_RCVAL_TX1 = 0x01c6, + B3_MA_RCVAL_TX2 = 0x01c7, + B3_MA_RC_CTRL = 0x01c8, + B3_MA_RC_TEST = 0x01ca, + B3_PA_TOINI_RX1 = 0x01d0, + B3_PA_TOINI_RX2 = 0x01d4, + B3_PA_TOINI_TX1 = 0x01d8, + B3_PA_TOINI_TX2 = 0x01dc, + B3_PA_TOVAL_RX1 = 0x01e0, + B3_PA_TOVAL_RX2 = 0x01e4, + B3_PA_TOVAL_TX1 = 0x01e8, + B3_PA_TOVAL_TX2 = 0x01ec, + B3_PA_CTRL = 0x01f0, + B3_PA_TEST = 0x01f2, + + Y2_CFG_SPC = 0x1c00, +}; + +/* B0_CTST 16 bit Control/Status register */ +enum { + Y2_VMAIN_AVAIL = 1<<17,/* VMAIN available (YUKON-2 only) */ + Y2_VAUX_AVAIL = 1<<16,/* VAUX available (YUKON-2 only) */ + Y2_ASF_ENABLE = 1<<13,/* ASF Unit Enable (YUKON-2 only) */ + Y2_ASF_DISABLE = 1<<12,/* ASF Unit Disable (YUKON-2 only) */ + Y2_CLK_RUN_ENA = 1<<11,/* CLK_RUN Enable (YUKON-2 only) */ + Y2_CLK_RUN_DIS = 1<<10,/* CLK_RUN Disable (YUKON-2 only) */ + Y2_LED_STAT_ON = 1<<9, /* Status LED On (YUKON-2 only) */ + Y2_LED_STAT_OFF = 1<<8, /* Status LED Off (YUKON-2 only) */ + [...4603 lines suppressed...] + goto err_out_free_regions; + } + + memset(hw, 0, sizeof(*hw)); + hw->pdev = pdev; + spin_lock_init(&hw->phy_lock); + + hw->regs = ioremap_nocache(pci_resource_start(pdev, 0), 0x4000); + if (!hw->regs) { + printk(KERN_ERR PFX "%s: cannot map device registers\n", + pci_name(pdev)); + goto err_out_free_hw; + } + hw->pm_cap = pm_cap; + + err = sky2_reset(hw); + if (err) + goto err_out_iounmap; + + printk(KERN_INFO PFX "addr 0x%lx irq %d Yukon-%s (0x%x) rev %d\n", + pci_resource_start(pdev, 0), pdev->irq, + yukon_name[hw->chip_id - CHIP_ID_YUKON], + hw->chip_id, hw->chip_rev); + + dev = sky2_init_netdev(hw, 0, using_dac); + if (!dev) + goto err_out_free_pci; + + err = register_netdev(dev); + if (err) { + printk(KERN_ERR PFX "%s: cannot register net device\n", + pci_name(pdev)); + goto err_out_free_netdev; + } + + sky2_show_addr(dev); + + if (hw->ports > 1 && (dev1 = sky2_init_netdev(hw, 1, using_dac))) { + if (register_netdev(dev1) == 0) + sky2_show_addr(dev1); + else { + /* Failure to register second port need not be fatal */ + printk(KERN_WARNING PFX + "register of second port failed\n"); + hw->dev[1] = NULL; + free_netdev(dev1); + } + } + + err = request_irq(pdev->irq, sky2_intr, SA_SHIRQ, DRV_NAME, hw); + if (err) { + printk(KERN_ERR PFX "%s: cannot assign irq %d\n", + pci_name(pdev), pdev->irq); + goto err_out_unregister; + } + + hw->intr_mask = Y2_IS_BASE; + sky2_write32(hw, B0_IMSK, hw->intr_mask); + + pci_set_drvdata(pdev, hw); + + return 0; + +err_out_unregister: + if (dev1) { + unregister_netdev(dev1); + free_netdev(dev1); + } + unregister_netdev(dev); +err_out_free_netdev: + free_netdev(dev); +err_out_free_pci: + sky2_write8(hw, B0_CTST, CS_RST_SET); + pci_free_consistent(hw->pdev, STATUS_LE_BYTES, hw->st_le, hw->st_dma); +err_out_iounmap: + iounmap(hw->regs); +err_out_free_hw: + kfree(hw); +err_out_free_regions: + pci_release_regions(pdev); + pci_disable_device(pdev); +err_out: + return err; +} + +static void __devexit sky2_remove(struct pci_dev *pdev) +{ + struct sky2_hw *hw = pci_get_drvdata(pdev); + struct net_device *dev0, *dev1; + + if (!hw) + return; + + dev0 = hw->dev[0]; + dev1 = hw->dev[1]; + if (dev1) + unregister_netdev(dev1); + unregister_netdev(dev0); + + sky2_write32(hw, B0_IMSK, 0); + sky2_set_power_state(hw, PCI_D3hot); + sky2_write16(hw, B0_Y2LED, LED_STAT_OFF); + sky2_write8(hw, B0_CTST, CS_RST_SET); + sky2_read8(hw, B0_CTST); + + free_irq(pdev->irq, hw); + pci_free_consistent(pdev, STATUS_LE_BYTES, hw->st_le, hw->st_dma); + pci_release_regions(pdev); + pci_disable_device(pdev); + + if (dev1) + free_netdev(dev1); + free_netdev(dev0); + iounmap(hw->regs); + kfree(hw); + + pci_set_drvdata(pdev, NULL); +} + +#ifdef CONFIG_PM +static int sky2_suspend(struct pci_dev *pdev, pm_message_t state) +{ + struct sky2_hw *hw = pci_get_drvdata(pdev); + int i; + + for (i = 0; i < 2; i++) { + struct net_device *dev = hw->dev[i]; + + if (dev) { + if (!netif_running(dev)) + continue; + + sky2_down(dev); + netif_device_detach(dev); + } + } + + return sky2_set_power_state(hw, pci_choose_state(pdev, state)); +} + +static int sky2_resume(struct pci_dev *pdev) +{ + struct sky2_hw *hw = pci_get_drvdata(pdev); + int i; + + pci_restore_state(pdev); + pci_enable_wake(pdev, PCI_D0, 0); + sky2_set_power_state(hw, PCI_D0); + + sky2_reset(hw); + + for (i = 0; i < 2; i++) { + struct net_device *dev = hw->dev[i]; + if (dev) { + if (netif_running(dev)) { + netif_device_attach(dev); + sky2_up(dev); + } + } + } + return 0; +} +#endif + +static struct pci_driver sky2_driver = { + .name = DRV_NAME, + .id_table = sky2_id_table, + .probe = sky2_probe, + .remove = __devexit_p(sky2_remove), +#ifdef CONFIG_PM + .suspend = sky2_suspend, + .resume = sky2_resume, +#endif +}; + +static int __init sky2_init_module(void) +{ + return pci_module_init(&sky2_driver); +} + +static void __exit sky2_cleanup_module(void) +{ + pci_unregister_driver(&sky2_driver); +} + +module_init(sky2_init_module); +module_exit(sky2_cleanup_module); + +MODULE_DESCRIPTION("Marvell Yukon 2 Gigabit Ethernet driver"); +MODULE_AUTHOR("Stephen Hemminger "); +MODULE_LICENSE("GPL"); --- linux-2.6.14/drivers/net/sky2_compat.h.orig 2005-11-14 09:56:09.000000000 -0500 +++ linux-2.6.14/drivers/net/sky2_compat.h 2005-11-14 09:56:02.000000000 -0500 @@ -0,0 +1,6 @@ +#ifndef __SKY2_COMPAT_H__ +#define __SKY2_COMPAT_H__ + +#define netif_rx_schedule_test(dev) netif_rx_schedule_prep(dev) + +#endif /* __SKY2_COMPAT_H__ */ jwltest-tulip-last_irq.patch: tulip_core.c | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE jwltest-tulip-last_irq.patch --- --- linux-2.6.14/drivers/net/tulip/tulip_core.c.orig 2005-12-13 15:31:26.000000000 -0500 +++ linux-2.6.14/drivers/net/tulip/tulip_core.c 2005-12-13 15:31:20.000000000 -0500 @@ -1564,7 +1564,7 @@ static int __devinit tulip_init_one (str dev->dev_addr, 6); } #endif -#if defined(__i386__) /* Patch up x86 BIOS bug. */ +#if defined(__i386__) || defined(__x86_64__) /* Patch up x86 BIOS bug. */ if (last_irq) irq = last_irq; #endif jwltest-via-velocity-tx_csum.patch: via-velocity.c | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE jwltest-via-velocity-tx_csum.patch --- --- linux-2.6.14/drivers/net/via-velocity.c.orig 2005-11-29 15:41:12.000000000 -0500 +++ linux-2.6.14/drivers/net/via-velocity.c 2005-11-29 15:41:47.000000000 -0500 @@ -792,7 +792,7 @@ static int __devinit velocity_found1(str #endif if (vptr->flags & VELOCITY_FLAGS_TX_CSUM) { - dev->features |= NETIF_F_HW_CSUM; + dev->features |= NETIF_F_IP_CSUM; } ret = register_netdev(dev); Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-4/kernel-2.6.spec,v retrieving revision 1.1609 retrieving revision 1.1609.2.1 diff -u -r1.1609 -r1.1609.2.1 --- kernel-2.6.spec 2 Mar 2006 04:06:36 -0000 1.1609 +++ kernel-2.6.spec 3 Mar 2006 21:00:42 -0000 1.1609.2.1 @@ -19,7 +19,8 @@ %define sublevel 15 %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.32 %define release %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})_FC4%{rhbsys} %define signmodules 0 %define make_target bzImage @@ -157,7 +158,8 @@ License: GPLv2 Version: %{rpmversion} Release: %{release} -ExclusiveArch: noarch %{all_x86} x86_64 ppc ppc64 sparc sparc64 +#ExclusiveArch: noarch %{all_x86} x86_64 ppc ppc64 sparc sparc64 +ExclusiveArch: noarch %{all_x86} x86_64 ppc ppc64 ExclusiveOS: Linux Provides: kernel = %{version} Provides: kernel-drm = 4.3.0 @@ -230,6 +232,7 @@ Patch306: linux-2.6-powerpc64-fpexc.patch # 400 - 499 ia64 + # 500 - 599 s390(x) # 600 - 699 sparc(64) @@ -315,6 +318,12 @@ Patch1301: linux-2.6-net-sundance-ip100A.patch Patch1302: linux-2.6-ipw2200-hwcrypto.patch Patch1303: linux-2.6-net-ipw2200-monitor.patch +Patch1304: jwltest-sky2.patch +Patch1305: jwltest-via-velocity-tx_csum.patch +Patch1306: jwltest-tulip-last_irq.patch +Patch1307: jwltest-mii-force_media.patch +Patch1308: jwltest-rhine-mdelay-undo.patch +Patch1309: jwltest-hostap_cs-intersil.patch # Squashfs Patch1400: linux-2.6-squashfs.patch @@ -376,6 +385,8 @@ # ACPI patches. Patch2100: linux-2.6-acpi-thinkpad-c2c3.patch +Patch2200: jwltest-acpi-dsdt-initrd.patch + # # 10000 to 20000 is for stuff that has to come last due to the # amount of drivers they touch. But only these should go here. @@ -597,6 +608,10 @@ %patch305 -p1 %patch306 -p1 +# +# ia64 +# + # # Xen # @@ -731,6 +746,18 @@ %patch1302 -p1 # Make monitor mode work for ipw2200 %patch1303 -p1 +# add sky2 driver from upstream +%patch1304 -p1 +# via-velocity tx_csum only works for IPv4 +%patch1305 -p1 +# apply bios work-around for tulip to x86_64 as well as i386 +%patch1306 -p1 +# fix link state change bug w/ generic mii +%patch1307 -p1 +# undo via-rhine mdelay elimination patch +%patch1308 -p1 +# keep hostap_cs from binding to non-intersil cards w/ PCI ID 0x0156:0x0002 +%patch1309 -p1 # Squashfs %patch1400 -p1 @@ -833,6 +860,9 @@ # Blacklist another 'No C2/C3 states' Thinkpad R40e BIOS. %patch2100 -p1 +# Add DSDT override from initrd +%patch2200 -p1 + # # Patches 5000 to 6000 are reserved for new drivers that are about to # be merged upstream From fedora-cvs-commits at redhat.com Fri Mar 3 21:03:30 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 3 Mar 2006 16:03:30 -0500 Subject: rpms/frysk/devel frysk.spec,1.35,1.36 Message-ID: <200603032103.k23L3UNf025129@cvs.devel.redhat.com> Author: cagney Update of /cvs/dist/rpms/frysk/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv25115 Modified Files: frysk.spec Log Message: * Fri Mar 03 2006 Andrew Cagney 0.0.1.2006.02.19.rh2-0.FC5.2 - Add Hidden=true to frysk.desktop file; from halfline; with fixes. - Disable xml check in frysk-gui/. Index: frysk.spec =================================================================== RCS file: /cvs/dist/rpms/frysk/devel/frysk.spec,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- frysk.spec 3 Mar 2006 20:36:37 -0000 1.35 +++ frysk.spec 3 Mar 2006 21:03:28 -0000 1.36 @@ -68,9 +68,7 @@ # For moment, keep off menu (but if someone wants to enable it they # can). -chmod u+w %{_datadir}/applications/frysk.desktop -echo "Hidden=true" >> %{_datadir}/applications/frysk.desktop -chmod u-w %{_datadir}/applications/frysk.desktop +echo "Hidden=true" >> $RPM_BUILD_ROOT%{_datadir}/applications/frysk.desktop %post /sbin/ldconfig @@ -96,8 +94,7 @@ %changelog * Fri Mar 03 2006 Andrew Cagney 0.0.1.2006.02.19.rh2-0.FC5.2 -- Add Hidden=true to frysk.desktop file; from halfline. -- Make frysk.desktop writeable during add operation. +- Add Hidden=true to frysk.desktop file; from halfline; with fixes. - Disable xml check in frysk-gui/. * Wed Mar 01 2006 Andrew Cagney 0.0.1.2006.02.19.rh2-0.FC5.1 From fedora-cvs-commits at redhat.com Fri Mar 3 21:37:04 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 3 Mar 2006 16:37:04 -0500 Subject: rpms/yum/devel yum-2.5.3-installglob.patch, NONE, 1.1 yum.spec, 1.84, 1.85 Message-ID: <200603032137.k23Lb4gK016318@cvs.devel.redhat.com> Author: pnasrat Update of /cvs/dist/rpms/yum/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv16280 Modified Files: yum.spec Added Files: yum-2.5.3-installglob.patch Log Message: Install globs yum-2.5.3-installglob.patch: __init__.py | 21 ++++++++++++++------- 1 files changed, 14 insertions(+), 7 deletions(-) --- NEW FILE yum-2.5.3-installglob.patch --- --- yum-2.5.3/yum/__init__.py.instglob 2006-03-03 16:35:15.000000000 -0500 +++ yum-2.5.3/yum/__init__.py 2006-03-03 16:35:23.000000000 -0500 @@ -1653,14 +1653,21 @@ if not kwargs.keys(): raise Errors.InstallError, 'Nothing specified to install' - nevra_dict = self._nevra_kwarg_parse(kwargs) + if kwargs.has_key('pattern'): + exactmatch, matched, unmatched = \ + parsePackages(self.pkgSack.returnPackages(),[kwargs['pattern']] , casematch=1) + pkgs.extend(exactmatch) + pkgs.extend(matched) - pkgs = self.pkgSack.searchNevra(name=nevra_dict['name'], - epoch=nevra_dict['epoch'], arch=nevra_dict['arch'], - ver=nevra_dict['version'], rel=nevra_dict['release']) - - if pkgs: - pkgs = self.bestPackagesFromList(pkgs) + else: + nevra_dict = self._nevra_kwarg_parse(kwargs) + + pkgs = self.pkgSack.searchNevra(name=nevra_dict['name'], + epoch=nevra_dict['epoch'], arch=nevra_dict['arch'], + ver=nevra_dict['version'], rel=nevra_dict['release']) + + if pkgs: + pkgs = self.bestPackagesFromList(pkgs) if len(pkgs) == 0: #FIXME - this is where we could check to see if it already installed Index: yum.spec =================================================================== RCS file: /cvs/dist/rpms/yum/devel/yum.spec,v retrieving revision 1.84 retrieving revision 1.85 diff -u -r1.84 -r1.85 --- yum.spec 2 Mar 2006 21:36:56 -0000 1.84 +++ yum.spec 3 Mar 2006 21:37:01 -0000 1.85 @@ -3,7 +3,7 @@ Summary: RPM installer/updater Name: yum Version: 2.5.3 -Release: 4 +Release: 5 License: GPL Group: System Environment/Base Source0: http://linux.duke.edu/projects/yum/download/2.5/yum-%{version}.tar.gz @@ -13,6 +13,7 @@ # default plugins here Source100: installonlyn.py Patch0: yum-2.5.3-conditionalgroups.patch +Patch1: yum-2.5.3-installglob.patch URL: http://linux.duke.edu/yum/ BuildArchitectures: noarch BuildRequires: python @@ -33,6 +34,7 @@ %prep %setup -q %patch0 -p1 -b .cond +%patch1 -p1 -b .instglob %build make @@ -94,6 +96,9 @@ /usr/lib/yum-plugins/* %changelog +* Fri Mar 03 2006 Paul Nasrat - 2.5.3-5 +- Add support for patterns in YumBase.install() + * Thu Mar 02 2006 Paul Nasrat - 2.5.3-4 - Cover pkg then group selection in conditional group support (#181858) From fedora-cvs-commits at redhat.com Fri Mar 3 21:50:26 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 3 Mar 2006 16:50:26 -0500 Subject: rpms/binutils/devel binutils-2.16.91.0.6-cfaval.patch, NONE, 1.1 binutils.spec, 1.76, 1.77 Message-ID: <200603032150.k23LoQRB001994@cvs.devel.redhat.com> Author: jakub Update of /cvs/dist/rpms/binutils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv1904 Modified Files: binutils.spec Added Files: binutils-2.16.91.0.6-cfaval.patch Log Message: 2.16.91.0.6-3 binutils-2.16.91.0.6-cfaval.patch: binutils/dwarf.c | 45 +++++++++++++++++++++++++++++++++- include/elf/dwarf2.h | 67 +++++++++++++++++++++++++++++++++++++++++++++++---- 2 files changed, 107 insertions(+), 5 deletions(-) --- NEW FILE binutils-2.16.91.0.6-cfaval.patch --- 2006-03-03 Jakub Jelinek * dwarf.c (frame_display_row, display_debug_frames): Handle DW_CFA_val_offset, DW_CFA_val_offset_sf and DW_CFA_val_expression. 2006-03-02 Ben Elliston Import from the GCC tree: 2006-03-01 Jakub Jelinek * dwarf2.h (DW_TAG_condition, DW_TAG_shared_type): New constants from DWARF 3. (DW_AT_description, DW_AT_binary_scale, DW_AT_decimal_scale, DW_AT_small, DW_AT_decimal_sign, DW_AT_digit_count, DW_AT_picture_string, DW_AT_mutable, DW_AT_threads_scaled, DW_AT_explicit, DW_AT_object_pointer, DW_AT_endianity, DW_AT_elemental, DW_AT_pure, DW_AT_recursive): New. (DW_OP_form_tls_address, DW_OP_call_frame_cfa, DW_OP_bit_piece): New. (DW_ATE_packed_decimal, DW_ATE_numeric_string, DW_ATE_edited, DW_ATE_signed_fixed, DW_ATE_unsigned_fixed): New. (DW_DS_unsigned, DW_DS_leading_overpunch, DW_DS_trailing_overpunch, DW_DS_leading_separate, DW_DS_trailing_separate): New. (DW_END_default, DW_END_big, DW_END_little): New. (DW_END_lo_user, DW_END_hi_user): Define. (DW_LNE_lo_user, DW_LNE_hi_user): Define. (DW_CFA_val_offset, DW_CFA_val_offset_sf, DW_CFA_val_expression): New. (DW_LANG_PLI, DW_LANG_ObjC, DW_LANG_ObjC_plus_plus, DW_LANG_UPC, DW_LANG_D): New. --- binutils/dwarf.c 30 Sep 2005 14:57:52 -0000 1.2 +++ binutils/dwarf.c 3 Mar 2006 18:29:40 -0000 1.3 @@ -1,5 +1,5 @@ /* dwarf.c -- display DWARF contents of a BFD binary file - Copyright 2005 + Copyright 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Binutils. @@ -2904,12 +2904,18 @@ frame_display_row (Frame_Chunk *fc, int case DW_CFA_offset: sprintf (tmp, "c%+d", fc->col_offset[r]); break; + case DW_CFA_val_offset: + sprintf (tmp, "v%+d", fc->col_offset[r]); + break; case DW_CFA_register: sprintf (tmp, "r%d", fc->col_offset[r]); break; case DW_CFA_expression: strcpy (tmp, "exp"); break; + case DW_CFA_val_expression: + strcpy (tmp, "vexp"); + break; default: strcpy (tmp, "n/a"); break; @@ -3252,6 +3258,7 @@ display_debug_frames (struct dwarf_secti start += 4; break; case DW_CFA_offset_extended: + case DW_CFA_val_offset: reg = LEB (); LEB (); frame_need_space (fc, reg); fc->col_type[reg] = DW_CFA_undefined; @@ -3290,6 +3297,7 @@ display_debug_frames (struct dwarf_secti start += tmp; break; case DW_CFA_expression: + case DW_CFA_val_expression: reg = LEB (); tmp = LEB (); start += tmp; @@ -3297,6 +3305,7 @@ display_debug_frames (struct dwarf_secti fc->col_type[reg] = DW_CFA_undefined; break; case DW_CFA_offset_extended_sf: + case DW_CFA_val_offset_sf: reg = LEB (); SLEB (); frame_need_space (fc, reg); fc->col_type[reg] = DW_CFA_undefined; @@ -3426,6 +3435,16 @@ display_debug_frames (struct dwarf_secti fc->col_offset[reg] = roffs * fc->data_factor; break; + case DW_CFA_val_offset: + reg = LEB (); + roffs = LEB (); + if (! do_debug_frames_interp) + printf (" DW_CFA_val_offset: r%ld at cfa%+ld\n", + reg, roffs * fc->data_factor); + fc->col_type[reg] = DW_CFA_val_offset; + fc->col_offset[reg] = roffs * fc->data_factor; + break; + case DW_CFA_restore_extended: reg = LEB (); if (! do_debug_frames_interp) @@ -3543,6 +3562,19 @@ display_debug_frames (struct dwarf_secti start += ul; break; + case DW_CFA_val_expression: + reg = LEB (); + ul = LEB (); + if (! do_debug_frames_interp) + { + printf (" DW_CFA_val_expression: r%ld (", reg); + decode_location_expression (start, eh_addr_size, ul, 0); + printf (")\n"); + } + fc->col_type[reg] = DW_CFA_val_expression; + start += ul; + break; + case DW_CFA_offset_extended_sf: reg = LEB (); l = SLEB (); @@ -3554,6 +3586,17 @@ display_debug_frames (struct dwarf_secti fc->col_offset[reg] = l * fc->data_factor; break; + case DW_CFA_val_offset_sf: + reg = LEB (); + l = SLEB (); + frame_need_space (fc, reg); + if (! do_debug_frames_interp) + printf (" DW_CFA_val_offset_sf: r%ld at cfa%+ld\n", + reg, l * fc->data_factor); + fc->col_type[reg] = DW_CFA_val_offset; + fc->col_offset[reg] = l * fc->data_factor; + break; + case DW_CFA_def_cfa_sf: fc->cfa_reg = LEB (); fc->cfa_offset = SLEB (); --- include/elf/dwarf2.h 18 Jul 2005 04:13:05 -0000 1.18 +++ include/elf/dwarf2.h 2 Mar 2006 00:54:27 -0000 1.19 @@ -1,7 +1,7 @@ -/* Declarations and definitions of codes relating to the DWARF2 symbolic - debugging information format. +/* Declarations and definitions of codes relating to the DWARF2 and + DWARF3 symbolic debugging information formats. Copyright (C) 1992, 1993, 1995, 1996, 1997, 1999, 2000, 2001, 2002, - 2003, 2005 Free Software Foundation, Inc. + 2003, 2004, 2005, 2006 Free Software Foundation, Inc. Written by Gary Funck (gary at intrepid.com) The Ada Joint Program Office (AJPO), Florida State University and Silicon Graphics Inc. @@ -187,6 +187,8 @@ enum dwarf_tag DW_TAG_unspecified_type = 0x3b, DW_TAG_partial_unit = 0x3c, DW_TAG_imported_unit = 0x3d, + DW_TAG_condition = 0x3f, + DW_TAG_shared_type = 0x40, /* SGI/MIPS Extensions. */ DW_TAG_MIPS_loop = 0x4081, /* HP extensions. See: ftp://ftp.hp.com/pub/lang/tools/WDB/wdb-4.0.tar.gz . */ @@ -317,6 +319,21 @@ enum dwarf_attribute DW_AT_call_column = 0x57, DW_AT_call_file = 0x58, DW_AT_call_line = 0x59, + DW_AT_description = 0x5a, + DW_AT_binary_scale = 0x5b, + DW_AT_decimal_scale = 0x5c, + DW_AT_small = 0x5d, + DW_AT_decimal_sign = 0x5e, + DW_AT_digit_count = 0x5f, + DW_AT_picture_string = 0x60, + DW_AT_mutable = 0x61, + DW_AT_threads_scaled = 0x62, + DW_AT_explicit = 0x63, + DW_AT_object_pointer = 0x64, + DW_AT_endianity = 0x65, + DW_AT_elemental = 0x66, + DW_AT_pure = 0x67, + DW_AT_recursive = 0x68, /* SGI/MIPS extensions. */ DW_AT_MIPS_fde = 0x2001, DW_AT_MIPS_loop_begin = 0x2002, @@ -518,6 +535,9 @@ enum dwarf_location_atom DW_OP_call2 = 0x98, DW_OP_call4 = 0x99, DW_OP_call_ref = 0x9a, + DW_OP_form_tls_address = 0x9b, + DW_OP_call_frame_cfa = 0x9c, + DW_OP_bit_piece = 0x9d, /* GNU extensions. */ DW_OP_GNU_push_tls_address = 0xe0, /* HP extensions. */ @@ -547,6 +567,11 @@ enum dwarf_type DW_ATE_unsigned_char = 0x8, /* DWARF 3. */ DW_ATE_imaginary_float = 0x9, + DW_ATE_packed_decimal = 0xa, + DW_ATE_numeric_string = 0xb, + DW_ATE_edited = 0xc, + DW_ATE_signed_fixed = 0xd, + DW_ATE_unsigned_fixed = 0xe, DW_ATE_decimal_float = 0xf, /* HP extensions. */ DW_ATE_HP_float80 = 0x80, /* Floating-point (80 bit). */ @@ -561,6 +586,29 @@ enum dwarf_type #define DW_ATE_lo_user 0x80 #define DW_ATE_hi_user 0xff +/* Decimal sign encodings. */ +enum dwarf_decimal_sign_encoding + { + /* DWARF 3. */ + DW_DS_unsigned = 0x01, + DW_DS_leading_overpunch = 0x02, + DW_DS_trailing_overpunch = 0x03, + DW_DS_leading_separate = 0x04, + DW_DS_trailing_separate = 0x05 + }; + +/* Endianity encodings. */ +enum dwarf_endianity_encoding + { + /* DWARF 3. */ + DW_END_default = 0x00, + DW_END_big = 0x01, + DW_END_little = 0x02 + }; + +#define DW_END_lo_user 0x40 +#define DW_END_hi_user 0xff + /* Array ordering names and codes. */ enum dwarf_array_dim_ordering { @@ -667,6 +715,9 @@ enum dwarf_line_number_x_ops DW_LNE_HP_define_proc = 0x20 }; +#define DW_LNE_lo_user 0x80 +#define DW_LNE_hi_user 0xff + /* Call frame information. */ enum dwarf_call_frame_info { @@ -694,6 +745,9 @@ enum dwarf_call_frame_info DW_CFA_offset_extended_sf = 0x11, DW_CFA_def_cfa_sf = 0x12, DW_CFA_def_cfa_offset_sf = 0x13, + DW_CFA_val_offset = 0x14, + DW_CFA_val_offset_sf = 0x15, + DW_CFA_val_expression = 0x16, /* SGI/MIPS specific. */ DW_CFA_MIPS_advance_loc8 = 0x1d, /* GNU extensions. */ @@ -727,11 +781,16 @@ enum dwarf_source_language DW_LANG_Fortran90 = 0x0008, DW_LANG_Pascal83 = 0x0009, DW_LANG_Modula2 = 0x000a, - DW_LANG_Java = 0x000b, /* DWARF 3. */ + DW_LANG_Java = 0x000b, DW_LANG_C99 = 0x000c, DW_LANG_Ada95 = 0x000d, DW_LANG_Fortran95 = 0x000e, + DW_LANG_PLI = 0x000f, + DW_LANG_ObjC = 0x0010, + DW_LANG_ObjC_plus_plus = 0x0011, + DW_LANG_UPC = 0x0012, + DW_LANG_D = 0x0013, /* MIPS. */ DW_LANG_Mips_Assembler = 0x8001, /* UPC. */ Index: binutils.spec =================================================================== RCS file: /cvs/dist/rpms/binutils/devel/binutils.spec,v retrieving revision 1.76 retrieving revision 1.77 diff -u -r1.76 -r1.77 --- binutils.spec 27 Feb 2006 23:28:39 -0000 1.76 +++ binutils.spec 3 Mar 2006 21:50:23 -0000 1.77 @@ -1,7 +1,7 @@ Summary: A GNU collection of binary utilities. Name: binutils Version: 2.16.91.0.6 -Release: 2 +Release: 3 License: GPL Group: Development/Tools URL: http://sources.redhat.com/binutils @@ -15,6 +15,7 @@ Patch7: binutils-2.16.91.0.6-build-fixes.patch Patch8: binutils-2.16.91.0.6-pr26208.patch Patch9: binutils-2.16.91.0.6-mni.patch +Patch10: binutils-2.16.91.0.6-cfaval.patch Buildroot: %{_tmppath}/binutils-root BuildRequires: texinfo >= 4.0, dejagnu, gettext, flex, bison @@ -53,6 +54,7 @@ %patch7 -p0 -b .build-fixes~ %patch8 -p0 -b .pr26208~ %patch9 -p0 -b .mni~ +%patch10 -p0 -b .cfaval~ # libtool sucks perl -pi -e 'm/LIBADD/ && s/(\.\.\/bfd\/libbfd.la)/-L\.\.\/bfd\/\.libs \1/' opcodes/Makefile.{am,in} # LTP sucks @@ -163,6 +165,9 @@ %{_infodir}/*info* %changelog +* Fri Mar 3 2006 Jakub Jelinek 2.16.91.0.6-3 +- support DW_CFA_val_{offset,offset_sf,expression} in readelf/objdump + * Tue Feb 28 2006 Jakub Jelinek 2.16.91.0.6-2 - add MNI support on i?86/x86_64 (#183080) - support S signal frame augmentation flag in .eh_frame, From fedora-cvs-commits at redhat.com Fri Mar 3 22:20:47 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 3 Mar 2006 17:20:47 -0500 Subject: rpms/system-config-soundcard/devel system-config-soundcard-1.2.16-log.patch, NONE, 1.1 system-config-soundcard.spec, 1.29, 1.30 Message-ID: <200603032220.k23MKlqb024457@cvs.devel.redhat.com> Author: stransky Update of /cvs/dist/rpms/system-config-soundcard/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv24410 Modified Files: system-config-soundcard.spec Added Files: system-config-soundcard-1.2.16-log.patch Log Message: fix for #183524 - scsound.log file not created system-config-soundcard-1.2.16-log.patch: Makefile | 1 + src/soundcard.py | 1 + src/soundcardBackend.py | 11 +++++++++++ src/system-config-soundcard | 19 +------------------ src/system-config-soundcard.logger | 16 ++++++++++++++++ 5 files changed, 30 insertions(+), 18 deletions(-) --- NEW FILE system-config-soundcard-1.2.16-log.patch --- --- system-config-soundcard-1.2.16/Makefile.old 2006-01-30 09:46:57.000000000 +0100 +++ system-config-soundcard-1.2.16/Makefile 2006-03-03 22:11:14.000000000 +0100 @@ -29,6 +29,7 @@ mkdir -p $(INSTROOT)/usr/share/icons/hicolor/48x48/apps mkdir -p $(INSTROOT)/usr/share/applications install src/*.py $(INSTROOT)$(PKGDATADIR) + install src/*.logger $(INSTROOT)$(PKGDATADIR) install src/${PKGNAME} $(INSTROOT)$(PKGDATADIR)/${PKGNAME} install src/sound-sample.wav $(INSTROOT)$(PKGDATADIR)/sound-sample.wav install ${PKGNAME}.pam $(INSTROOT)$(PAMD_DIR)/${PKGNAME} --- /dev/null 2006-03-03 20:50:29.888481500 +0100 +++ system-config-soundcard-1.2.16/src/system-config-soundcard.logger 2006-03-03 22:11:14.000000000 +0100 @@ -0,0 +1,16 @@ +#!/bin/sh + +LOG_FILE="/root/scsound.log" + +echo -e "------- System Config Soundcard --------\n`date`\n" > $LOG_FILE 2>&1 +echo -e "------- lspci --------\n`lspci`\n" >> $LOG_FILE 2>&1 +echo -e "------- lsmod --------\n`lsmod`\n" >> $LOG_FILE 2>&1 +echo -e "------- /etc/modprobe.conf --------\n`cat /etc/modprobe.conf`\n" >> $LOG_FILE 2>&1 +echo -e "------- /etc/asound.conf --------\n`cat /etc/asound.conf`\n" >> $LOG_FILE 2>&1 +echo -e "------- aplay -l --------\n`aplay -l 2>&1`\n" >> $LOG_FILE 2>&1 +echo -e "------- amixer --------\n`amixer`\n" >> $LOG_FILE 2>&1 +echo -e "------- /proc/asound/version --------\n`cat /proc/asound/version`\n" >> $LOG_FILE 2>&1 +echo -e "------- rpm -q alsa-lib --------\n`rpm -q alsa-lib`\n" >> $LOG_FILE 2>&1 +echo -e "------- rpm -q alsa-utils --------\n`rpm -q alsa-utils`\n" >> $LOG_FILE 2>&1 +echo -e "------- /proc/asound/modules --------\n`cat /proc/asound/modules`\n" >> $LOG_FILE 2>&1 +echo -e "------- /proc/asound/pcm --------\n`cat /proc/asound/pcm`\n" >> $LOG_FILE 2>&1 --- system-config-soundcard-1.2.16/src/soundcardBackend.py.old 2006-02-07 13:09:59.000000000 +0100 +++ system-config-soundcard-1.2.16/src/soundcardBackend.py 2006-03-03 22:17:20.000000000 +0100 @@ -483,3 +483,14 @@ return self.defaultModule return 0 + + def writeLog(self): + amixer_pid = os.fork() + if (not amixer_pid): + try: + os.execv(amixer_path, amixer_args) + except: + sys.exit(0) + else: + os.waitpid(amixer_pid,0) + return 0 --- system-config-soundcard-1.2.16/src/soundcard.py.old 2006-02-07 13:26:51.000000000 +0100 +++ system-config-soundcard-1.2.16/src/soundcard.py 2006-03-03 22:11:14.000000000 +0100 @@ -469,6 +469,7 @@ dlg.destroy() if rc == gtk.RESPONSE_NO: + self.soundcardBackend.writeLog() #Oh well, they couldn't hear the sound. Notify the user and then quit. We did our best self.showErrorDialog(_("Automatic detection of the sound card did not work. " \ "Audio will not be available on the system.\n" \ --- system-config-soundcard-1.2.16/src/system-config-soundcard.old 2006-02-07 13:09:59.000000000 +0100 +++ system-config-soundcard-1.2.16/src/system-config-soundcard 2006-03-03 22:11:14.000000000 +0100 @@ -1,21 +1,4 @@ #!/bin/sh -LOG_FILE="/root/scsound.log" - -echo -e "------- System Config Soundcard --------\n`date`\n" > $LOG_FILE 2>&1 -echo -e "------- lspci --------\n`lspci`\n" >> $LOG_FILE 2>&1 -echo -e "------- lsmod --------\n`lsmod`\n" >> $LOG_FILE 2>&1 -echo -e "------- /etc/modprobe.conf --------\n`cat /etc/modprobe.conf`\n" >> $LOG_FILE 2>&1 -echo -e "------- /etc/asound.conf --------\n`cat /etc/asound.conf`\n" >> $LOG_FILE 2>&1 -echo -e "------- aplay -l --------\n`aplay -l 2>&1`\n" >> $LOG_FILE 2>&1 -echo -e "------- amixer --------\n`amixer`\n" >> $LOG_FILE 2>&1 -echo -e "------- /proc/asound/version --------\n`cat /proc/asound/version`\n" >> $LOG_FILE 2>&1 -echo -e "------- rpm -q alsa-lib --------\n`rpm -q alsa-lib`\n" >> $LOG_FILE 2>&1 -echo -e "------- rpm -q alsa-utils --------\n`rpm -q alsa-utils`\n" >> $LOG_FILE 2>&1 -echo -e "------- /proc/asound/modules --------\n`cat /proc/asound/modules`\n" >> $LOG_FILE 2>&1 -echo -e "------- /proc/asound/pcm --------\n`cat /proc/asound/pcm`\n" >> $LOG_FILE 2>&1 - -echo -e "------- system-config-soundcard --------\n" >> $LOG_FILE 2>&1 - export PYTHONPATH=/usr/share/system-config-soundcard -/usr/bin/python2 /usr/share/system-config-soundcard/system-config-soundcard.py >> $LOG_FILE 2>&1 +/usr/bin/python2 /usr/share/system-config-soundcard/system-config-soundcard.py Index: system-config-soundcard.spec =================================================================== RCS file: /cvs/dist/rpms/system-config-soundcard/devel/system-config-soundcard.spec,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- system-config-soundcard.spec 27 Feb 2006 13:42:06 -0000 1.29 +++ system-config-soundcard.spec 3 Mar 2006 22:20:44 -0000 1.30 @@ -1,7 +1,7 @@ Summary: A graphical interface for detecting and configuring soundcards Name: system-config-soundcard Version: 1.2.16 -Release: 2 +Release: 3 URL: http://fedora.redhat.com/projects/config-tools/redhat-config-soundcard.html License: GPL ExclusiveOS: Linux @@ -9,6 +9,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildArch: noarch Source0: %{name}-%{version}.tar.bz2 +Patch0: system-config-soundcard-1.2.16-log.patch BuildRequires: desktop-file-utils BuildRequires: gettext ExcludeArch: s390 s390x @@ -29,6 +30,7 @@ %prep %setup -q +%patch0 -p1 %build make @@ -79,9 +81,14 @@ %attr(0644,root,root) %{_datadir}/icons/hicolor/48x48/apps/system-config-soundcard.png %attr(0644,root,root) %config /etc/security/console.apps/system-config-soundcard %attr(0644,root,root) %config /etc/pam.d/system-config-soundcard +%attr(0755,root,root) /usr/share/system-config-soundcard/system-config-soundcard.logger %ghost /root/scsound.log %changelog +* Fri Mar 03 2006 Martin Stransky 1.2.16-3 +- fix for #183524 - scsound.log file not created after + failing to configure sound card + * Mon Feb 27 2006 Martin Stransky 1.2.16-2 - added hicolor-icon-theme to PreReq, (#182880, #182881) From fedora-cvs-commits at redhat.com Fri Mar 3 22:24:22 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 3 Mar 2006 17:24:22 -0500 Subject: rpms/eclipse/devel eclipse.spec,1.256,1.257 Message-ID: <200603032224.k23MOMwJ026101@cvs.devel.redhat.com> Author: overholt Update of /cvs/dist/rpms/eclipse/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv26069 Modified Files: eclipse.spec Log Message: foo Index: eclipse.spec =================================================================== RCS file: /cvs/dist/rpms/eclipse/devel/eclipse.spec,v retrieving revision 1.256 retrieving revision 1.257 diff -u -r1.256 -r1.257 --- eclipse.spec 3 Mar 2006 20:34:46 -0000 1.256 +++ eclipse.spec 3 Mar 2006 22:24:20 -0000 1.257 @@ -18,7 +18,7 @@ %else %define eclipse_arch %{_arch} %endif -%ifarch %{ix86} x86_64 +%ifarch %{ix86} x86_64 ppc %define native_ecj 1 %else %define native_ecj 0 @@ -548,6 +548,7 @@ %build +env ORIGCLASSPATH=$CLASSPATH %if %{gcj_support} @@ -1316,7 +1317,7 @@ * Fri Mar 03 2006 Andrew Overholt 3.1.2-1jpp_12fc - Only build with a native ecj on x86{,_64} - Make /usr/bin/ecj native again as it's slow as a script with gij and - the chances of a someone using a proprietary JDK and not seeing their + the chances of a someone using a proprietary JDK and not setting their javac alternative are slim. * Tue Feb 28 2006 Andrew Overholt 3.1.2-1jpp_12fc From fedora-cvs-commits at redhat.com Fri Mar 3 22:32:58 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 3 Mar 2006 17:32:58 -0500 Subject: rpms/squirrelmail/devel squirrelmail.spec,1.30,1.31 Message-ID: <200603032232.k23MWwls028474@cvs.devel.redhat.com> Author: dwmw2 Update of /cvs/dist/rpms/squirrelmail/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv28456 Modified Files: squirrelmail.spec Log Message: Add %build and move the file mangling to it Index: squirrelmail.spec =================================================================== RCS file: /cvs/dist/rpms/squirrelmail/devel/squirrelmail.spec,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- squirrelmail.spec 2 Mar 2006 19:59:32 -0000 1.30 +++ squirrelmail.spec 3 Mar 2006 22:32:32 -0000 1.31 @@ -6,7 +6,7 @@ Summary: SquirrelMail webmail client Name: squirrelmail Version: 1.4.6 -Release: 1.fc5 +Release: 2.fc5 License: GPL URL: http://www.squirrelmail.org/ Group: Applications/Internet @@ -35,6 +35,11 @@ %prep #%setup -q %setup -q -n squirrelmail-%{version} +mkdir locale_tempdir +cd locale_tempdir +tar xfj %SOURCE4 + +%build rm -f plugins/make_archive.pl # Rearrange the documentation @@ -63,7 +68,7 @@ # Fix the version %{__perl} -pi -e "s|^(\s*\\\$version\s*=\s*'[^']+)'|\1-%{release}'|g"\ functions/strings.php - + # replace splash screen %if %{fedora_splash} cp %{SOURCE2} images/sm_logo.png @@ -71,6 +76,59 @@ cp %{SOURCE3} images/sm_logo.png %endif +# Convert all locales to utf-8. Not only is this probably the right thing +# to do anyway, but SquirrelMail will corrupt charsets unless the charset +# of the user's locale is a superset of the charset of any mail they reply to +# https://sf.net/tracker/?func=detail&atid=423691&aid=1235345&group_id=311 +sed -i functions/i18n.php \ + -e "s/^\(\$languages\['\([^']*\)'\]\['CHARSET'].*= '\)\([^']*\)';/\1utf-8';/" \ + -e "s/^\(\$languages\['\([^']*\)'\]\['LOCALE'].*=\).*/\1 '\2.UTF-8';/" + +cd locale_tempdir +for LOCALE in `ls locale/` ; do + SKIPINVALID= + case $LOCALE in + ja_JP) + # ja_JP uses iso2022-jp for email but euc-jp in its interface. + CHARSET=euc-jp + ;; + ko_KR) + # ko_KR has broken help files in indeterminate charset. + # Assume it's _mostly_ EUC-KR as it's supposed to be, and let + # iconv drop invalid characters from the input. + SKIPINVALID=-c + CHARSET=`grep CHARSET locale/$LOCALE/setup.php | cut -f6 -d\'` + ;; + *) + CHARSET=`grep CHARSET locale/$LOCALE/setup.php | cut -f6 -d\'` + ;; + esac + + # Check for locales where CHARSET isn't in LOCALE. + grep LOCALE locale/$LOCALE/setup.php | grep -vi $CHARSET || : + + if [ "$CHARSET" != "utf-8" -a "$CHARSET" != "UTF-8" ]; then + for a in `ls help/$LOCALE/ 2>/dev/null` ; do + iconv $SKIPINVALID -f $CHARSET -t utf-8 help/$LOCALE/$a > $a.new && mv $a.new help/$LOCALE/$a + done + sed -e "s/CHARSET..[ ]*= [^;]*;/CHARSET'] = 'utf-8';/" \ + -e "s/LOCALE..[ ]*= [^;]*;/LOCALE'] = '$LOCALE.UTF-8';/" \ + locale/$LOCALE/setup.php > setup.php.new ; mv setup.php.new locale/$LOCALE/setup.php + fi +done + +# do the pofiles separately since they each specify their own charset +for POFILE in `find locale -name \*.po` ; do + CHARSET=`grep charset= $POFILE | cut -f2 -d= | cut -f1 -d\\\\` + if [ "$CHARSET" != "utf-8" -a "$CHARSET" != "UTF-8" ]; then + sed s/charset=$CHARSET/charset=utf-8/ $POFILE | iconv -f $CHARSET -t utf-8 > $POFILE.new && mv $POFILE.new $POFILE + fi +done +for POFILE in `find . -name \*.po` ; do + msgfmt $POFILE -c -o `echo $POFILE | sed s/\.po\$/.mo/` +done +cd .. + %install rm -rf $RPM_BUILD_ROOT mkdir -p -m0755 $RPM_BUILD_ROOT%{_sysconfdir}/squirrelmail @@ -120,62 +178,7 @@ install -m 644 $RPM_SOURCE_DIR/squirrelmail.conf \ $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/ -# Switch all locales to UTF-8. -sed -i functions/i18n.php \ - -e "s/^\(\$languages\['\([^']*\)'\]\['CHARSET'].*= '\)\([^']*\)';/\1utf-8';/" \ - -e "s/^\(\$languages\['\([^']*\)'\]\['LOCALE'].*=\).*/\1 '\2.UTF-8';/" - - -# install locales -mkdir locale_tempdir cd locale_tempdir -tar xfj %SOURCE4 -# Convert all locales to utf-8. Not only is this probably the right thing -# to do anyway, but SquirrelMail will corrupt charsets unless the charset -# of the user's locale is a superset of the charset of any mail they reply to -# https://sf.net/tracker/?func=detail&atid=423691&aid=1235345&group_id=311 -for LOCALE in `ls locale/` ; do - SKIPINVALID= - case $LOCALE in - ja_JP) - # ja_JP uses iso2022-jp for email but euc-jp in its interface. - CHARSET=euc-jp - ;; - ko_KR) - # ko_KR has broken help files in indeterminate charset. - # Assume it's _mostly_ EUC-KR as it's supposed to be, and let - # iconv drop invalid characters from the input. - SKIPINVALID=-c - CHARSET=`grep CHARSET locale/$LOCALE/setup.php | cut -f6 -d\'` - ;; - *) - CHARSET=`grep CHARSET locale/$LOCALE/setup.php | cut -f6 -d\'` - ;; - esac - - # Check for locales where CHARSET isn't in LOCALE. - grep LOCALE locale/$LOCALE/setup.php | grep -vi $CHARSET || : - - if [ "$CHARSET" != "utf-8" -a "$CHARSET" != "UTF-8" ]; then - for a in `ls help/$LOCALE/ 2>/dev/null` ; do - iconv $SKIPINVALID -f $CHARSET -t utf-8 help/$LOCALE/$a > $a.new && mv $a.new help/$LOCALE/$a - done - sed -e "s/CHARSET..[ ]*= [^;]*;/CHARSET'] = 'utf-8';/" \ - -e "s/LOCALE..[ ]*= [^;]*;/LOCALE'] = '$LOCALE.UTF-8';/" \ - locale/$LOCALE/setup.php > setup.php.new ; mv setup.php.new locale/$LOCALE/setup.php - fi -done - -# do the pofiles separately since they each specify their own charset -for POFILE in `find locale -name \*.po` ; do - CHARSET=`grep charset= $POFILE | cut -f2 -d= | cut -f1 -d\\\\` - if [ "$CHARSET" != "utf-8" -a "$CHARSET" != "UTF-8" ]; then - sed s/charset=$CHARSET/charset=utf-8/ $POFILE | iconv -f $CHARSET -t utf-8 > $POFILE.new && mv $POFILE.new $POFILE - fi -done -for POFILE in `find . -name \*.po` ; do - msgfmt $POFILE -c -o `echo $POFILE | sed s/\.po\$/.mo/` -done cp -r locale/* $RPM_BUILD_ROOT%{_datadir}/squirrelmail/locale/ cp -r images/* $RPM_BUILD_ROOT%{_datadir}/squirrelmail/images/ cp -r help/* $RPM_BUILD_ROOT%{_datadir}/squirrelmail/help/ @@ -212,6 +215,9 @@ %{_sysconfdir}/cron.daily/squirrelmail.cron %changelog +* Fri Mar 3 2006 David Woodhouse 1.4.6-2 +- Add a %%build section, move the file mangling to it. + * Wed Mar 1 2006 David Woodhouse 1.4.6-1 - Upgrade to 1.4.6 proper for CVE-2006-0377 CVE-2006-0195 CVE-2006-0188 - Script the charset changes instead of using a patch From fedora-cvs-commits at redhat.com Fri Mar 3 22:58:51 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 3 Mar 2006 17:58:51 -0500 Subject: rpms/gnome-power-manager/devel gnome-power-manager-2.13.93-ignore-timeout.patch, NONE, 1.1 .cvsignore, 1.13, 1.14 gnome-power-manager.spec, 1.28, 1.29 sources, 1.13, 1.14 gnome-power-manager-2.13.92-action-warning-type.patch, 1.1, NONE Message-ID: <200603032258.k23MwpNV018855@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/gnome-power-manager/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv18757 Modified Files: .cvsignore gnome-power-manager.spec sources Added Files: gnome-power-manager-2.13.93-ignore-timeout.patch Removed Files: gnome-power-manager-2.13.92-action-warning-type.patch Log Message: - Update to 2.13.93 - ignore d-bus timeout errors gnome-power-manager-2.13.93-ignore-timeout.patch: gpm-hal.c | 32 +++++++++++++++++++++----------- 1 files changed, 21 insertions(+), 11 deletions(-) --- NEW FILE gnome-power-manager-2.13.93-ignore-timeout.patch --- --- gnome-power-manager-2.13.93/src/gpm-hal.c.ignore-timeout 2006-03-03 17:27:35.000000000 -0500 +++ gnome-power-manager-2.13.93/src/gpm-hal.c 2006-03-03 17:37:51.000000000 -0500 @@ -182,7 +182,7 @@ gpm_hal_can_hibernate (void) gboolean gpm_hal_suspend (gint wakeup) { - gint ret; + guint ret; DBusGConnection *system_connection = NULL; DBusGProxy *hal_proxy = NULL; GError *error = NULL; @@ -195,15 +195,21 @@ gpm_hal_suspend (gint wakeup) HAL_ROOT_COMPUTER, HAL_DBUS_INTERFACE_POWER); retval = TRUE; + ret = 0; if (!dbus_g_proxy_call (hal_proxy, "Suspend", &error, G_TYPE_INT, wakeup, G_TYPE_INVALID, G_TYPE_UINT, &ret, G_TYPE_INVALID)) { - if (error) { - gpm_warning ("%s", error->message); + + if (error && g_error_matches (error, DBUS_GERROR, DBUS_GERROR_NO_REPLY)) { g_error_free (error); + } else { + if (error) { + gpm_warning ("%s", error->message); + g_error_free (error); + } + gpm_warning (HAL_DBUS_INTERFACE_POWER ".Suspend failed (HAL error)"); + retval = FALSE; } - gpm_warning (HAL_DBUS_INTERFACE_POWER ".Suspend failed (HAL error)"); - retval = FALSE; } if (ret != 0) retval = FALSE; @@ -220,7 +226,7 @@ gpm_hal_suspend (gint wakeup) static gboolean hal_pm_method_void (const gchar* method) { - gint ret; + guint ret; DBusGConnection *system_connection = NULL; DBusGProxy *hal_proxy = NULL; GError *error = NULL; @@ -233,16 +239,20 @@ hal_pm_method_void (const gchar* method) HAL_ROOT_COMPUTER, HAL_DBUS_INTERFACE_POWER); retval = TRUE; + ret = 0; if (!dbus_g_proxy_call (hal_proxy, method, &error, G_TYPE_INVALID, G_TYPE_UINT, &ret, G_TYPE_INVALID)) { - if (error) { - gpm_warning ("%s", error->message); + if (error && g_error_matches (error, DBUS_GERROR, DBUS_GERROR_NO_REPLY)) { g_error_free (error); + } else { + if (error) { + gpm_warning ("%s", error->message); + g_error_free (error); + } + gpm_warning (HAL_DBUS_INTERFACE_POWER ".%s failed (HAL error)", method); + retval = FALSE; } - gpm_warning (HAL_DBUS_INTERFACE_POWER - ".%s failed (HAL error)", method); - retval = FALSE; } if (ret != 0) retval = FALSE; Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/gnome-power-manager/devel/.cvsignore,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- .cvsignore 26 Feb 2006 15:44:59 -0000 1.13 +++ .cvsignore 3 Mar 2006 22:58:49 -0000 1.14 @@ -1 +1 @@ -gnome-power-manager-2.13.92.tar.bz2 +gnome-power-manager-2.13.93.tar.bz2 Index: gnome-power-manager.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-power-manager/devel/gnome-power-manager.spec,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- gnome-power-manager.spec 2 Mar 2006 17:19:31 -0000 1.28 +++ gnome-power-manager.spec 3 Mar 2006 22:58:49 -0000 1.29 @@ -4,8 +4,8 @@ Summary: GNOME Power Manager Name: gnome-power-manager -Version: 2.13.92 -Release: 3 +Version: 2.13.93 +Release: 1 License: GPL Group: Applications/System Source: gnome-power-manager-%{version}.tar.bz2 @@ -25,8 +25,7 @@ Requires: dbus-glib >= %{dbus_version} Requires: dbus-x11 >= %{dbus_version} Requires: scrollkeeper - -Patch0: gnome-power-manager-2.13.92-action-warning-type.patch +Patch0: gnome-power-manager-2.13.93-ignore-timeout.patch %description GNOME Power Manager uses the information and facilities provided by HAL @@ -36,7 +35,7 @@ %prep %setup -q -%patch0 -p1 -b .action-warning-type +%patch0 -p1 -b .ignore-timeout %build %configure --disable-scrollkeeper --disable-actions-menu @@ -49,8 +48,8 @@ unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL desktop-file-install --vendor gnome --delete-original \ - --dir $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart \ - $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/gnome-power-manager.desktop + --dir $RPM_BUILD_ROOT%{_datadir}/gnome/autostart \ + $RPM_BUILD_ROOT%{_datadir}/gnome/autostart/gnome-power-manager.desktop %find_lang %name @@ -76,13 +75,17 @@ %{_datadir}/man/* %{_sysconfdir}/gconf/schemas/*.schemas %{_sysconfdir}/dbus-1/system.d/gnome-power-manager.conf -%{_sysconfdir}/xdg/autostart/* %{_datadir}/dbus-1/services/gnome-power-manager.service %{_datadir}/gnome/help/gnome-power-manager/* %{_datadir}/omf/gnome-power-manager/gnome-power-manager-C.omf +%{_datadir}/gnome/autostart/* %{_datadir}/applications/gnome-power-preferences.desktop %changelog +* Fri Mar 3 2006 Ray Strode - 2.13.93-1 +- Update to 2.13.93 +- ignore d-bus timeout errors + * Thu Mar 2 2006 Ray Strode - 2.13.92-3 - Add patch from Richard Hughes to potentially fix a crasher bug (bug 183127) Index: sources =================================================================== RCS file: /cvs/dist/rpms/gnome-power-manager/devel/sources,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- sources 26 Feb 2006 15:44:59 -0000 1.13 +++ sources 3 Mar 2006 22:58:49 -0000 1.14 @@ -1 +1 @@ -2fe426848b901006cb3bda7859b03f1d gnome-power-manager-2.13.92.tar.bz2 +ac50df4b39c883ed0c402ea53307a066 gnome-power-manager-2.13.93.tar.bz2 --- gnome-power-manager-2.13.92-action-warning-type.patch DELETED --- From fedora-cvs-commits at redhat.com Fri Mar 3 23:15:14 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 3 Mar 2006 18:15:14 -0500 Subject: rpms/java-1.4.2-gcj-compat/devel java-1.4.2-gcj-compat.spec, 1.144, 1.145 Message-ID: <200603032315.k23NFEL1013364@cvs.devel.redhat.com> Author: fitzsim Update of /cvs/dist/rpms/java-1.4.2-gcj-compat/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv13352 Modified Files: java-1.4.2-gcj-compat.spec Log Message: * Fri Mar 3 2006 Thomas Fitzsimmons - 0:1.4.2.0-40jpp_83rh - Add jpackage-utils 1.6.6-1jpp_1rh as a prerequisite. - Make javadoc post scriplet pass unconditionally. - Force symlinks in javadoc post scriptlet. 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.144 retrieving revision 1.145 diff -u -r1.144 -r1.145 --- java-1.4.2-gcj-compat.spec 2 Mar 2006 02:05:46 -0000 1.144 +++ java-1.4.2-gcj-compat.spec 3 Mar 2006 23:15:12 -0000 1.145 @@ -21,7 +21,7 @@ %define name java-%{javaver}-%{origin}-compat %define version %{javaver}.%{buildver} -%define release 40jpp_82rh +%define release 40jpp_83rh %define cname java-%{javaver}-%{origin} %define bcarchivever 131 %define bcfullver 1.31 @@ -77,6 +77,8 @@ Provides: jce Obsoletes: java-1.4.2-gcj4-compat <= 1.4.2.0-4jpp_2rh PreReq: chkconfig +# ensure that %{_javadocdir}/java is gone +PreReq: jpackage-utils >= 0:1.6.6-1jpp_1rh %if %{custom} # prevent autogeneration of libjawt.so dependencies AutoReqProv: no @@ -454,9 +456,11 @@ %{_jvmdir}/%{cname}-%{version}/src.zip %post javadoc -rm -f %{_javadocdir}/%{name} %{_javadocdir}/java -ln -s %{name}-%{version} %{_javadocdir}/%{name} -ln -s %{name}-%{version} %{_javadocdir}/java +{ + rm -f %{_javadocdir}/%{name} %{_javadocdir}/java + ln -sf %{name}-%{version} %{_javadocdir}/%{name} + ln -sf %{name}-%{version} %{_javadocdir}/java +} || : %postun if [ $1 -eq 0 ] ; then @@ -638,6 +642,11 @@ %ghost %doc %{_javadocdir}/java %changelog +* Fri Mar 3 2006 Thomas Fitzsimmons - 0:1.4.2.0-40jpp_83rh +- Add jpackage-utils 1.6.6-1jpp_1rh as a prerequisite. +- Make javadoc post scriplet pass unconditionally. +- Force symlinks in javadoc post scriptlet. + * Wed Mar 1 2006 Thomas Fitzsimmons - 0:1.4.2.0-40jpp_82rh - Add chkconfig as a prerequisite. From fedora-cvs-commits at redhat.com Fri Mar 3 23:26:03 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 3 Mar 2006 18:26:03 -0500 Subject: rpms/firstboot/devel .cvsignore, 1.48, 1.49 firstboot.spec, 1.67, 1.68 sources, 1.64, 1.65 Message-ID: <200603032326.k23NQ3Id002351@cvs.devel.redhat.com> Author: clumens Update of /cvs/dist/rpms/firstboot/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv2281 Modified Files: .cvsignore firstboot.spec sources Log Message: Bump version. Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/firstboot/devel/.cvsignore,v retrieving revision 1.48 retrieving revision 1.49 diff -u -r1.48 -r1.49 --- .cvsignore 1 Mar 2006 20:16:41 -0000 1.48 +++ .cvsignore 3 Mar 2006 23:26:01 -0000 1.49 @@ -20,3 +20,4 @@ firstboot-1.4.3.tar.bz2 firstboot-1.4.4.tar.bz2 firstboot-1.4.5.tar.bz2 +firstboot-1.4.6.tar.bz2 Index: firstboot.spec =================================================================== RCS file: /cvs/dist/rpms/firstboot/devel/firstboot.spec,v retrieving revision 1.67 retrieving revision 1.68 diff -u -r1.67 -r1.68 --- firstboot.spec 1 Mar 2006 20:16:41 -0000 1.67 +++ firstboot.spec 3 Mar 2006 23:26:01 -0000 1.68 @@ -1,6 +1,6 @@ Summary: Initial system configuration utility Name: firstboot -Version: 1.4.5 +Version: 1.4.6 Release: 1 URL: http://fedora.redhat.com/projects/config-tools/ License: GPL @@ -109,6 +109,9 @@ %changelog +* Fri Mar 03 2006 Chris Lumens 1.4.6-1 +- Revert UI changes that broke s-c-keyboard (#183718). + * Wed Mar 01 2006 Chris Lumens 1.4.5-1 - Run if RUN_FIRSTBOOT != "NO" (#180520). - Don't let dialog windows hide behind the main window. Index: sources =================================================================== RCS file: /cvs/dist/rpms/firstboot/devel/sources,v retrieving revision 1.64 retrieving revision 1.65 diff -u -r1.64 -r1.65 --- sources 1 Mar 2006 20:16:41 -0000 1.64 +++ sources 3 Mar 2006 23:26:01 -0000 1.65 @@ -1 +1 @@ -0042267b9f90bba0ed6f91a27bdc2bbe firstboot-1.4.5.tar.bz2 +bea227cd82be988b9638e239f3380dfb firstboot-1.4.6.tar.bz2 From fedora-cvs-commits at redhat.com Fri Mar 3 23:26:47 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 3 Mar 2006 18:26:47 -0500 Subject: rpms/rhythmbox/devel rhythmbox-0.9.3.1-playlist.patch, NONE, 1.1 rhythmbox.spec, 1.51, 1.52 Message-ID: <200603032326.k23NQl9B002741@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/rhythmbox/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv2654 Modified Files: rhythmbox.spec Added Files: rhythmbox-0.9.3.1-playlist.patch Log Message: - add patch from James "Doc" Livingston to stop a hang for new users (bug 183883) rhythmbox-0.9.3.1-playlist.patch: shell/rb-playlist-manager.c | 4 +++- shell/rb-shell.c | 4 +++- sources/rb-iradio-source.c | 4 +++- 3 files changed, 9 insertions(+), 3 deletions(-) --- NEW FILE rhythmbox-0.9.3.1-playlist.patch --- diff -ur rhythmbox-0.9.3.1/shell/rb-playlist-manager.c rhythmbox-0.9.3.1-fix/shell/rb-playlist-manager.c --- rhythmbox-0.9.3.1/shell/rb-playlist-manager.c 2006-01-14 15:07:02.000000000 +1100 +++ rhythmbox-0.9.3.1-fix/shell/rb-playlist-manager.c 2006-03-03 23:40:39.000000000 +1100 @@ -615,7 +615,9 @@ G_CALLBACK (playlist_load_end_cb), mgr, 0); - if (totem_pl_parser_parse (parser, uri, FALSE) != TOTEM_PL_PARSER_RESULT_SUCCESS) { + if (g_object_class_find_property (G_OBJECT_GET_CLASS (parser), "recurse")) + g_object_set (G_OBJECT (parser), "recurse", FALSE, NULL); + if (totem_pl_parser_parse (parser, uri, TRUE) != TOTEM_PL_PARSER_RESULT_SUCCESS) { g_set_error (error, RB_PLAYLIST_MANAGER_ERROR, RB_PLAYLIST_MANAGER_ERROR_PARSE, diff -ur rhythmbox-0.9.3.1/shell/rb-shell.c rhythmbox-0.9.3.1-fix/shell/rb-shell.c --- rhythmbox-0.9.3.1/shell/rb-shell.c 2006-01-26 12:58:16.000000000 +1100 +++ rhythmbox-0.9.3.1-fix/shell/rb-shell.c 2006-03-03 23:40:18.000000000 +1100 @@ -2846,7 +2846,9 @@ parser = totem_pl_parser_new (); totem_pl_parser_add_ignored_mimetype (parser, "x-directory/normal"); - result = totem_pl_parser_parse (parser, uri, FALSE); + if (g_object_class_find_property (G_OBJECT_GET_CLASS (parser), "recurse")) + g_object_set (G_OBJECT (parser), "recurse", FALSE, NULL); + result = totem_pl_parser_parse (parser, uri, TRUE); g_object_unref (parser); if (result == TOTEM_PL_PARSER_RESULT_SUCCESS) { diff -ur rhythmbox-0.9.3.1/sources/rb-iradio-source.c rhythmbox-0.9.3.1-fix/sources/rb-iradio-source.c --- rhythmbox-0.9.3.1/sources/rb-iradio-source.c 2006-02-01 02:57:36.000000000 +1100 +++ rhythmbox-0.9.3.1-fix/sources/rb-iradio-source.c 2006-03-03 23:41:08.000000000 +1100 @@ -761,7 +761,9 @@ g_signal_connect_object (G_OBJECT (parser), "entry", G_CALLBACK (handle_playlist_entry_cb), source, 0); - switch (totem_pl_parser_parse (parser, uri, FALSE)) { + if (g_object_class_find_property (G_OBJECT_GET_CLASS (parser), "recurse")) + g_object_set (G_OBJECT (parser), "recurse", FALSE, NULL); + switch (totem_pl_parser_parse (parser, uri, TRUE)) { case TOTEM_PL_PARSER_RESULT_UNHANDLED: case TOTEM_PL_PARSER_RESULT_IGNORED: /* maybe it's the actual stream URL, then */ Index: rhythmbox.spec =================================================================== RCS file: /cvs/dist/rpms/rhythmbox/devel/rhythmbox.spec,v retrieving revision 1.51 retrieving revision 1.52 diff -u -r1.51 -r1.52 --- rhythmbox.spec 11 Feb 2006 05:34:26 -0000 1.51 +++ rhythmbox.spec 3 Mar 2006 23:26:44 -0000 1.52 @@ -3,7 +3,7 @@ Name: rhythmbox Summary: Music Management Application Version: 0.9.3.1 -Release: 1.2 +Release: 2 License: GPL Group: Applications/Multimedia Source: ftp://ftp.gnome.org/pub/GNOME/sources/rhythmbox/0.8/%{name}-%{version}.tar.bz2 @@ -26,6 +26,7 @@ PreReq: desktop-file-utils >= %{desktop_file_utils_version} # no nautilus-cd-burner on s390 ExcludeArch: s390 s390x +Patch0: rhythmbox-0.9.3.1-playlist.patch %description Rhythmbox is an integrated music management application based on the powerful @@ -35,6 +36,7 @@ %prep %setup -q +%patch0 -p1 -b .playlist %build @@ -96,6 +98,10 @@ %{_libdir}/pkgconfig/rhythmbox.pc %changelog +* Fri Mar 03 2006 Ray Strode - 0.9.3.1-2 +- add patch from James "Doc" Livingston to stop a hang + for new users (bug 183883) + * Fri Feb 10 2006 Jesse Keating - 0.9.3.1-1.2 - bump again for double-long bug on ppc(64) From fedora-cvs-commits at redhat.com Fri Mar 3 23:55:35 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 3 Mar 2006 18:55:35 -0500 Subject: rpms/anaconda/devel .cvsignore, 1.231, 1.232 anaconda.spec, 1.352, 1.353 sources, 1.351, 1.352 Message-ID: <200603032355.k23NtZNO026039@cvs.devel.redhat.com> Author: pnasrat Update of /cvs/dist/rpms/anaconda/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv25997/devel Modified Files: .cvsignore anaconda.spec sources Log Message: auto-import anaconda-10.92.16-1 on branch devel from anaconda-10.92.16-1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/anaconda/devel/.cvsignore,v retrieving revision 1.231 retrieving revision 1.232 diff -u -r1.231 -r1.232 --- .cvsignore 3 Mar 2006 05:16:14 -0000 1.231 +++ .cvsignore 3 Mar 2006 23:55:32 -0000 1.232 @@ -1 +1 @@ -anaconda-10.92.15.tar.bz2 +anaconda-10.92.16.tar.bz2 Index: anaconda.spec =================================================================== RCS file: /cvs/dist/rpms/anaconda/devel/anaconda.spec,v retrieving revision 1.352 retrieving revision 1.353 diff -u -r1.352 -r1.353 --- anaconda.spec 3 Mar 2006 05:16:14 -0000 1.352 +++ anaconda.spec 3 Mar 2006 23:55:32 -0000 1.353 @@ -1,5 +1,5 @@ Name: anaconda -Version: 10.92.15 +Version: 10.92.16 Release: 1 License: GPL Summary: Graphical system installer @@ -79,6 +79,12 @@ /sbin/chkconfig --del reconfig >/dev/null 2>&1 || : %changelog +* Fri Mar 3 2006 Paul Nasrat - 10.92.16-1 +- Support Everything/globs in ks (pnasrat, clumens, #177621) +- Allow changes if not enough disk space (clumens, #183878) +- Set controlling tty in rescue mode (dcantrel,#182222) +- Sort list of languages (dcantrel) + * Fri Mar 3 2006 Jeremy Katz - 10.92.15-1 - conditional code is now in yum (pnasrat) - sort network devices smarter (clumens, #166842) Index: sources =================================================================== RCS file: /cvs/dist/rpms/anaconda/devel/sources,v retrieving revision 1.351 retrieving revision 1.352 diff -u -r1.351 -r1.352 --- sources 3 Mar 2006 05:16:14 -0000 1.351 +++ sources 3 Mar 2006 23:55:32 -0000 1.352 @@ -1 +1 @@ -e63da53f347bbe79ef95db800b9449a1 anaconda-10.92.15.tar.bz2 +cac9a4faf01bf6a982bf4c04d8131d7f anaconda-10.92.16.tar.bz2 From fedora-cvs-commits at redhat.com Sat Mar 4 00:56:50 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 3 Mar 2006 19:56:50 -0500 Subject: rpms/pirut/devel .cvsignore, 1.18, 1.19 pirut.spec, 1.19, 1.20 sources, 1.19, 1.20 Message-ID: <200603040056.k240uoci000760@cvs.devel.redhat.com> Author: katzj Update of /cvs/dist/rpms/pirut/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv736/devel Modified Files: .cvsignore pirut.spec sources Log Message: auto-import pirut-1.0.1-1 on branch devel from pirut-1.0.1-1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/pirut/devel/.cvsignore,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- .cvsignore 3 Mar 2006 05:13:15 -0000 1.18 +++ .cvsignore 4 Mar 2006 00:56:47 -0000 1.19 @@ -1 +1 @@ -pirut-1.0.0.tar.gz +pirut-1.0.1.tar.gz Index: pirut.spec =================================================================== RCS file: /cvs/dist/rpms/pirut/devel/pirut.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- pirut.spec 3 Mar 2006 05:13:15 -0000 1.19 +++ pirut.spec 4 Mar 2006 00:56:47 -0000 1.20 @@ -2,7 +2,7 @@ Summary: Package Installation, Removal and Update Tools Name: pirut -Version: 1.0.0 +Version: 1.0.1 Release: 1 License: GPL Group: Applications/System @@ -67,6 +67,9 @@ %changelog +* Fri Mar 3 2006 Jeremy Katz - 1.0.1-1 +- Ensure we unlock things on exit (#183882) + * Fri Mar 3 2006 Jeremy Katz - 1.0.0-1 - Fix formatting in reboot dialog (#183597) - Show category pixbuf if there's not one for the group (#183545) Index: sources =================================================================== RCS file: /cvs/dist/rpms/pirut/devel/sources,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- sources 3 Mar 2006 05:13:15 -0000 1.19 +++ sources 4 Mar 2006 00:56:47 -0000 1.20 @@ -1 +1 @@ -bfa52dc10c7614b7c719842a445c94d5 pirut-1.0.0.tar.gz +b628cc41256fa48dfb77c54085823eb6 pirut-1.0.1.tar.gz From fedora-cvs-commits at redhat.com Sat Mar 4 01:16:17 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 3 Mar 2006 20:16:17 -0500 Subject: rpms/libgdiplus/devel .cvsignore, 1.5, 1.6 libgdiplus.spec, 1.12, 1.13 sources, 1.5, 1.6 Message-ID: <200603040116.k241GHWq005967@cvs.devel.redhat.com> Author: caillon Update of /cvs/dist/rpms/libgdiplus/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv5408 Modified Files: .cvsignore libgdiplus.spec sources Log Message: * Fri Mar 3 2006 Christopher Aillon - 1.1.13.4-1 - Update to 1.1.13.4 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/libgdiplus/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 31 Jan 2006 21:21:51 -0000 1.5 +++ .cvsignore 4 Mar 2006 01:16:15 -0000 1.6 @@ -1,2 +1 @@ -libgdiplus-1.1.13.tar.gz -libgdiplus-1.1.13.2.tar.gz +libgdiplus-1.1.13.4.tar.gz Index: libgdiplus.spec =================================================================== RCS file: /cvs/dist/rpms/libgdiplus/devel/libgdiplus.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- libgdiplus.spec 11 Feb 2006 01:36:06 -0000 1.12 +++ libgdiplus.spec 4 Mar 2006 01:16:15 -0000 1.13 @@ -1,6 +1,6 @@ Name: libgdiplus -Version: 1.1.13.2 -Release: 2 +Version: 1.1.13.4 +Release: 1 Summary: libgdiplus: An Open Source implementation of the GDI+ API Group: System Environment/Libraries @@ -14,6 +14,7 @@ # We don't actually use the external cairo yet, but this is an easy way # to pull in the right cairo requirements for the internal copy BuildRequires: cairo-devel +BuildRequires: zlib-devel %description An Open Source implementation of the GDI+ @@ -45,6 +46,9 @@ %{_libdir}/pkgconfig/* %changelog +* Fri Mar 3 2006 Christopher Aillon - 1.1.13.4-1 +- Update to 1.1.13.4 + * Fri Feb 10 2006 Christopher Aillon - 1.1.13.2-2 - Rebuild Index: sources =================================================================== RCS file: /cvs/dist/rpms/libgdiplus/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 31 Jan 2006 21:21:51 -0000 1.5 +++ sources 4 Mar 2006 01:16:15 -0000 1.6 @@ -1 +1 @@ -97da26e08454a08e64c3936800efdfa5 libgdiplus-1.1.13.2.tar.gz +3ea5e3ee01f1f43459e2c2d0b52ece1a libgdiplus-1.1.13.4.tar.gz From fedora-cvs-commits at redhat.com Sat Mar 4 01:25:11 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 3 Mar 2006 20:25:11 -0500 Subject: rpms/mono/devel mono-1.1.13.4-selinux-ia64.patch, NONE, 1.1 .cvsignore, 1.6, 1.7 mono.spec, 1.30, 1.31 sources, 1.6, 1.7 mono-1.1.13.2-work-with-selinux.patch, 1.3, NONE Message-ID: <200603040125.k241PBBF022086@cvs.devel.redhat.com> Author: caillon Update of /cvs/dist/rpms/mono/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv22045 Modified Files: .cvsignore mono.spec sources Added Files: mono-1.1.13.4-selinux-ia64.patch Removed Files: mono-1.1.13.2-work-with-selinux.patch Log Message: * Fri Mar 3 2006 Christopher Aillon - 1.1.13.4-1 - Update to 1.1.13.4 - Add patch so mono doesn't segfault on PPC SMP machines - Minor spec cleanup mono-1.1.13.4-selinux-ia64.patch: mono-compiler.h | 4 ++++ 1 files changed, 4 insertions(+) --- NEW FILE mono-1.1.13.4-selinux-ia64.patch --- --- mono-1.1.13.4/mono/utils/mono-compiler.h.selinux-ia64 2006-03-03 13:12:32.000000000 -0500 +++ mono-1.1.13.4/mono/utils/mono-compiler.h 2006-03-03 13:12:51.000000000 -0500 @@ -34,7 +34,11 @@ #define MONO_THREAD_VAR_OFFSET(var,offset) do { guint64 foo; __asm ("movq $" #var "@TPOFF, %0" : "=r" (foo)); offset = foo; } while (0) #endif #elif defined(__ia64__) && !defined(__INTEL_COMPILER) +#if defined(PIC) +#define MONO_THREAD_VAR_OFFSET(var,offset) __asm ("addl %0 = @ltoff(@tprel(" #var "#)), gp ;; ld8 %0 = [%0]\n" : "=r" (offset)) +#else #define MONO_THREAD_VAR_OFFSET(var,offset) __asm ("addl %0 = @tprel(" #var "#), r0 ;;\n" : "=r" (offset)) +#endif #else #define MONO_THREAD_VAR_OFFSET(var,offset) (offset) = -1 #endif Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/mono/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 31 Jan 2006 21:31:43 -0000 1.6 +++ .cvsignore 4 Mar 2006 01:25:08 -0000 1.7 @@ -1,2 +1 @@ -mono-1.1.13.tar.gz -mono-1.1.13.2.tar.gz +mono-1.1.13.4.tar.gz Index: mono.spec =================================================================== RCS file: /cvs/dist/rpms/mono/devel/mono.spec,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- mono.spec 2 Mar 2006 20:23:46 -0000 1.30 +++ mono.spec 4 Mar 2006 01:25:08 -0000 1.31 @@ -1,20 +1,26 @@ Name: mono -Version: 1.1.13.2 -Release: 5 +Version: 1.1.13.4 +Release: 1 Summary: a .NET runtime environment Group: Development/Languages License: GPL, LGPL, MIT X11 URL: http://www.mono-project.com/ -Source0: mono-%{version}.tar.gz +Source0: %{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: bison, glib2-devel, pkgconfig, libicu-devel libgdiplus +BuildRequires: bison +BuildRequires: glib2-devel +BuildRequires: pkgconfig +BuildRequires: libicu-devel +BuildRequires: libgdiplus +BuildRequires: zlib-devel # JIT only availible on these: ExclusiveArch: %ix86 x86_64 ppc ia64 s390 s390x armv4l sparc -Patch0: mono-1.1.13.2-work-with-selinux.patch +Patch1: mono-1.1.13.4-selinux-ia64.patch +Patch2: mono-1.1.13.4-ppc-threading.patch %description The Mono runtime implements a JIT engine for the ECMA CLI @@ -36,7 +42,7 @@ %package devel Summary: Development tools and headers for Mono Group: Development/Languages -Requires: mono-core == %version-%release +Requires: mono-core = %{version}-%{release} Requires: glib2-devel %description devel @@ -47,7 +53,7 @@ %package nunit Summary: NUnit Testing Framework Group: Development/Languages -Requires: mono-core == %version-%release +Requires: mono-core = %{version}-%{release} Requires: glib2-devel %description nunit @@ -62,7 +68,7 @@ %package locale-extras Summary: Extra locale information for Mono Group: Development/Languages -Requires: mono-core == %version-%release +Requires: mono-core = %{version}-%{release} %description locale-extras This package contains assemblies to support I18N applications for @@ -73,7 +79,7 @@ %package jscript Summary: JScript .NET support for Mono Group: Development/Languages -Requires: mono-core == %version-%release +Requires: mono-core = %{version}-%{release} %description jscript This package contains the JScript .NET compiler and language runtime. @@ -83,7 +89,7 @@ %package basic Summary: Visual Basic .NET support for Mono Group: Development/Languages -Requires: mono-core == %version-%release +Requires: mono-core = %{version}-%{release} %description basic This package contains the Visual Basic .NET compiler and language @@ -93,7 +99,7 @@ %package extras Summary: Provides the infrastructure for running and building daemons and services with Mono as well as various stub assemblies Group: Development/Languages -Requires: mono-core == %version-%release +Requires: mono-core = %{version}-%{release} %description extras This package provides the libary and application to run services @@ -104,7 +110,7 @@ %package winforms Summary: Windows Forms implementation for Mono Group: Development/Languages -Requires: mono-core == %version-%release +Requires: mono-core = %{version}-%{release} %description winforms This package provides a fully managed implementation of @@ -114,7 +120,7 @@ %package web Summary: ASP.NET, Remoting, and Web Services for Mono Group: Development/Languages -Requires: mono-core == %version-%release +Requires: mono-core = %{version}-%{release} %description web This package provides the ASP.NET libraries and runtime for @@ -123,7 +129,7 @@ %package data Summary: Database connectivity for Mono Group: Development/Languages -Requires: mono-core == %version-%release +Requires: mono-core = %{version}-%{release} %description data This package provides a Mono assembly to facilitate data access @@ -136,7 +142,7 @@ %package data-sqlite Summary: sqlite database connectivity for Mono Group: Development/Languages -Requires: mono-core == %version-%release +Requires: mono-core = %{version}-%{release} Requires: sqlite %description data-sqlite @@ -146,7 +152,7 @@ %package data-sybase Summary: Sybase database connectivity for Mono Group: Development/Languages -Requires: mono-core == %version-%release +Requires: mono-core = %{version}-%{release} %description data-sybase This package contains the ADO.NET Data provider for the Sybase @@ -155,7 +161,7 @@ %package data-oracle Summary: Oracle database connectivity for Mono Group: Development/Languages -Requires: mono-core == %version-%release +Requires: mono-core = %{version}-%{release} %description data-oracle This package contains the ADO.NET Data provider for the Oracle @@ -164,7 +170,7 @@ %package data-postgresql Summary: Postgresql database connectivity for Mono Group: Development/Languages -Requires: mono-core == %version-%release +Requires: mono-core = %{version}-%{release} %description data-postgresql This package contains the ADO.NET Data provider for the PostgreSQL @@ -173,7 +179,7 @@ %package data-firebird Summary: Firebird database connectivity for Mono Group: Development/Languages -Requires: mono-core == %version-%release +Requires: mono-core = %{version}-%{release} %description data-firebird This package contains the ADO.NET Data provider for the Firebird @@ -183,7 +189,7 @@ %package -n ibm-data-db2 Summary: IBM DB2 database connectivity for Mono Group: Development/Languages -Requires: mono-core == %version-%release +Requires: mono-core = %{version}-%{release} %description -n ibm-data-db2 This package contains the ADO.NET Data provider for the IBM DB2 @@ -193,7 +199,7 @@ %package -n bytefx-data-mysql Summary: MySQL database connectivity for Mono Group: Development/Languages -Requires: mono-core == %version-%release +Requires: mono-core = %{version}-%{release} %description -n bytefx-data-mysql This package contains the ADO.NET Data provider for MySQL. This is @@ -219,7 +225,8 @@ %prep %setup -q -%patch0 -p1 -b .work-with-selinux +%patch1 -p1 -b .selinux-ia64 +%patch2 -p1 -b .ppc-threading %build %ifarch ia64 s390 @@ -232,50 +239,50 @@ make %install -rm -rf $RPM_BUILD_ROOT +%{__rm} -rf $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT install # Libtool is on crack, installing the shell wrappers cp mono/dis/.libs/monodis $RPM_BUILD_ROOT%{_bindir} cp mono/monograph/.libs/monograph $RPM_BUILD_ROOT%{_bindir} -rm $RPM_BUILD_ROOT%{_libdir}/*.a -rm $RPM_BUILD_ROOT%{_libdir}/*.la +%{__rm} $RPM_BUILD_ROOT%{_libdir}/*.a +%{__rm} $RPM_BUILD_ROOT%{_libdir}/*.la # We put these inside rpm -rm $RPM_BUILD_ROOT%{_bindir}/mono-find-provides -rm $RPM_BUILD_ROOT%{_bindir}/mono-find-requires +%{__rm} $RPM_BUILD_ROOT%{_bindir}/mono-find-provides +%{__rm} $RPM_BUILD_ROOT%{_bindir}/mono-find-requires # This was removed upstream: -rm -fr $RPM_BUILD_ROOT%{monodir}/gac/Mono.Security.Win32/[12]* -rm $RPM_BUILD_ROOT%{monodir}/*/Mono.Security.Win32.dll -rm $RPM_BUILD_ROOT%{_datadir}/libgc-mono/README* -rm $RPM_BUILD_ROOT%{_datadir}/libgc-mono/barrett_diagram -rm $RPM_BUILD_ROOT%{_datadir}/libgc-mono/*.html -rm $RPM_BUILD_ROOT%{_datadir}/libgc-mono/gc.man -rm $RPM_BUILD_ROOT%{_mandir}/man1/cilc.1 -rm $RPM_BUILD_ROOT/%_bindir/cilc -rm $RPM_BUILD_ROOT%{monodir}/1.0/cilc* -rm $RPM_BUILD_ROOT/%_bindir/jay -rm -r $RPM_BUILD_ROOT%{_datadir}/jay -rm $RPM_BUILD_ROOT%{_mandir}/man1/jay.1 -rm $RPM_BUILD_ROOT%{_mandir}/man1/monostyle.1 -rm $RPM_BUILD_ROOT%{_mandir}/man1/oldmono.1 -rm $RPM_BUILD_ROOT%{_mandir}/man1/mint.1 -rm $RPM_BUILD_ROOT%{_libdir}/pkgconfig/mint.pc -rm $RPM_BUILD_ROOT%{monodir}/1.0/CorCompare.exe -rm $RPM_BUILD_ROOT%{monodir}/1.0/browsercaps-updater.exe* -rm $RPM_BUILD_ROOT%{monodir}/1.0/mono-api-diff.exe -rm $RPM_BUILD_ROOT%{monodir}/*/mono-api-info.exe -rm -f $RPM_BUILD_ROOT%{_bindir}/monop2 -rm -f $RPM_BUILD_ROOT%{monodir}/2.0/monop.exe* -rm -f $RPM_BUILD_ROOT%{_bindir}/nunit-console -rm -f $RPM_BUILD_ROOT%{monodir}/*/nunit-console.exe* -rm -f $RPM_BUILD_ROOT%{_libdir}/libMonoSupportW* -rm -f $RPM_BUILD_ROOT%{monodir}/1.0/mono-shlib-cop.exe.config +%{__rm} -fr $RPM_BUILD_ROOT%{monodir}/gac/Mono.Security.Win32/[12]* +%{__rm} $RPM_BUILD_ROOT%{monodir}/*/Mono.Security.Win32.dll +%{__rm} $RPM_BUILD_ROOT%{_datadir}/libgc-mono/README* +%{__rm} $RPM_BUILD_ROOT%{_datadir}/libgc-mono/barrett_diagram +%{__rm} $RPM_BUILD_ROOT%{_datadir}/libgc-mono/*.html +%{__rm} $RPM_BUILD_ROOT%{_datadir}/libgc-mono/gc.man +%{__rm} $RPM_BUILD_ROOT%{_mandir}/man1/cilc.1 +%{__rm} $RPM_BUILD_ROOT/%_bindir/cilc +%{__rm} $RPM_BUILD_ROOT%{monodir}/1.0/cilc* +%{__rm} $RPM_BUILD_ROOT/%_bindir/jay +%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/jay +%{__rm} $RPM_BUILD_ROOT%{_mandir}/man1/jay.1 +%{__rm} $RPM_BUILD_ROOT%{_mandir}/man1/monostyle.1 +%{__rm} $RPM_BUILD_ROOT%{_mandir}/man1/oldmono.1 +%{__rm} $RPM_BUILD_ROOT%{_mandir}/man1/mint.1 +%{__rm} $RPM_BUILD_ROOT%{_libdir}/pkgconfig/mint.pc +%{__rm} $RPM_BUILD_ROOT%{monodir}/1.0/CorCompare.exe +%{__rm} $RPM_BUILD_ROOT%{monodir}/1.0/browsercaps-updater.exe* +%{__rm} $RPM_BUILD_ROOT%{monodir}/1.0/mono-api-diff.exe +%{__rm} $RPM_BUILD_ROOT%{monodir}/*/mono-api-info.exe +%{__rm} -f $RPM_BUILD_ROOT%{_bindir}/monop2 +%{__rm} -f $RPM_BUILD_ROOT%{monodir}/2.0/monop.exe* +%{__rm} -f $RPM_BUILD_ROOT%{_bindir}/nunit-console +%{__rm} -f $RPM_BUILD_ROOT%{monodir}/*/nunit-console.exe* +%{__rm} -f $RPM_BUILD_ROOT%{_libdir}/libMonoSupportW* +%{__rm} -f $RPM_BUILD_ROOT%{monodir}/1.0/mono-shlib-cop.exe.config %clean -rm -rf $RPM_BUILD_ROOT +%{__rm} -rf $RPM_BUILD_ROOT %files core %defattr(-,root,root,-) @@ -493,6 +500,11 @@ %gac_dll IBM.Data.DB2 %changelog +* Fri Mar 3 2006 Christopher Aillon - 1.1.13.4-1 +- Update to 1.1.13.4 +- Add patch so mono doesn't segfault on PPC SMP machines +- Minor spec cleanup + * Thu Mar 2 2006 Ray Strode - 1.1.13.2-5 - Updated patch from Jakub (1.1.13.2-3 to 1.1.13.2-5 are for bug 182965) Index: sources =================================================================== RCS file: /cvs/dist/rpms/mono/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 31 Jan 2006 21:31:57 -0000 1.6 +++ sources 4 Mar 2006 01:25:08 -0000 1.7 @@ -1 +1 @@ -3542a83b2743b189b3422b9f40266258 mono-1.1.13.2.tar.gz +a8c58b1d0722771745c228adbb27f3c1 mono-1.1.13.4.tar.gz --- mono-1.1.13.2-work-with-selinux.patch DELETED --- From fedora-cvs-commits at redhat.com Sat Mar 4 01:25:48 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 3 Mar 2006 20:25:48 -0500 Subject: rpms/mono/devel mono-1.1.13.4-ppc-threading.patch,NONE,1.1 Message-ID: <200603040125.k241Pmhm022424@cvs.devel.redhat.com> Author: caillon Update of /cvs/dist/rpms/mono/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv22383 Added Files: mono-1.1.13.4-ppc-threading.patch Log Message: * Fri Mar 3 2006 Christopher Aillon - 1.1.13.4-1 - Update to 1.1.13.4 - Add patch so mono doesn't segfault on PPC SMP machines - Minor spec cleanup mono-1.1.13.4-ppc-threading.patch: main.c | 7 +++++++ 1 files changed, 7 insertions(+) --- NEW FILE mono-1.1.13.4-ppc-threading.patch --- #! /bin/sh /usr/share/dpatch/dpatch-run ## ppc-sched-affinity.dpatch by ## ## All lines beginning with `## DP:' are a description of the patch. ## DP: No description. @DPATCH@ diff -urNad mono-1.1.13.2~/mono/mini/main.c mono-1.1.13.2/mono/mini/main.c --- mono-1.1.13.2~/mono/mini/main.c 2004-12-10 19:01:25.000000000 -0500 +++ mono-1.1.13.2/mono/mini/main.c 2006-02-16 12:04:28.000000000 -0500 @@ -1,8 +1,15 @@ #include "mini.h" +#include int main (int argc, char* argv[]) { + /* On PowerPC call sched_setaffinity to bind to one CPU only + * to work around parallelism bug on G5 SMP */ + #ifdef __powerpc__ + unsigned long mask = 1; + sched_setaffinity(0, sizeof(mask), &mask); + #endif return mono_main (argc, argv); } From fedora-cvs-commits at redhat.com Sat Mar 4 02:15:48 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 3 Mar 2006 21:15:48 -0500 Subject: rpms/java-1.4.2-gcj-compat/devel java-1.4.2-gcj-compat.spec, 1.145, 1.146 Message-ID: <200603040215.k242Fmcq019497@cvs.devel.redhat.com> Author: fitzsim Update of /cvs/dist/rpms/java-1.4.2-gcj-compat/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv19053 Modified Files: java-1.4.2-gcj-compat.spec Log Message: * Fri Mar 3 2006 Thomas Fitzsimmons - 0:1.4.2.0-40jpp_83rh - Make javadoc post scriplet pass unconditionally. - Force symlinks in javadoc post scriptlet. 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.145 retrieving revision 1.146 diff -u -r1.145 -r1.146 --- java-1.4.2-gcj-compat.spec 3 Mar 2006 23:15:12 -0000 1.145 +++ java-1.4.2-gcj-compat.spec 4 Mar 2006 02:15:45 -0000 1.146 @@ -77,8 +77,6 @@ Provides: jce Obsoletes: java-1.4.2-gcj4-compat <= 1.4.2.0-4jpp_2rh PreReq: chkconfig -# ensure that %{_javadocdir}/java is gone -PreReq: jpackage-utils >= 0:1.6.6-1jpp_1rh %if %{custom} # prevent autogeneration of libjawt.so dependencies AutoReqProv: no @@ -643,7 +641,6 @@ %changelog * Fri Mar 3 2006 Thomas Fitzsimmons - 0:1.4.2.0-40jpp_83rh -- Add jpackage-utils 1.6.6-1jpp_1rh as a prerequisite. - Make javadoc post scriplet pass unconditionally. - Force symlinks in javadoc post scriptlet. From fedora-cvs-commits at redhat.com Sat Mar 4 02:22:25 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 3 Mar 2006 21:22:25 -0500 Subject: rpms/gtk-sharp2/devel .cvsignore, 1.4, 1.5 gtk-sharp2.spec, 1.11, 1.12 sources, 1.4, 1.5 Message-ID: <200603040222.k242MOvj000997@cvs.devel.redhat.com> Author: caillon Update of /cvs/dist/rpms/gtk-sharp2/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv962 Modified Files: .cvsignore gtk-sharp2.spec sources Log Message: * Fri Mar 3 2006 Christopher Aillon - 2.8.2-1 - Update to 2.8.2 to fix an issue with marshalling on x86-64 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/gtk-sharp2/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 10 Feb 2006 20:56:37 -0000 1.4 +++ .cvsignore 4 Mar 2006 02:22:18 -0000 1.5 @@ -1,3 +1 @@ -gtk-sharp-2.4.0.tar.gz -gtk-sharp-2.8.0.tar.gz -gtk-sharp-2.8.1.tar.gz +gtk-sharp-2.8.2.tar.gz Index: gtk-sharp2.spec =================================================================== RCS file: /cvs/dist/rpms/gtk-sharp2/devel/gtk-sharp2.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- gtk-sharp2.spec 10 Feb 2006 20:56:37 -0000 1.11 +++ gtk-sharp2.spec 4 Mar 2006 02:22:18 -0000 1.12 @@ -1,5 +1,5 @@ Name: gtk-sharp2 -Version: 2.8.1 +Version: 2.8.2 Release: 1 Summary: GTK+ and GNOME bindings for Mono @@ -56,15 +56,15 @@ make %install -rm -rf $RPM_BUILD_ROOT +%{__rm} -rf $RPM_BUILD_ROOT export MONO_SHARED_DIR=%{_builddir}/%{?buildsubdir} make install DESTDIR=$RPM_BUILD_ROOT GACUTIL_FLAGS="/package gtk-sharp /gacdir %{_prefix}/lib /root ${RPM_BUILD_ROOT}%{_prefix}/lib" -rm $RPM_BUILD_ROOT%{_libdir}/*.*a +%{__rm} $RPM_BUILD_ROOT%{_libdir}/*.*a mv $RPM_BUILD_ROOT%{_prefix}/lib/mono/gtk-sharp $RPM_BUILD_ROOT%{_prefix}/lib/mono/gtk-sharp-2.0 %clean -rm -rf $RPM_BUILD_ROOT +%{__rm} -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) @@ -92,6 +92,9 @@ %{_prefix}/share/gapi-2.0 %changelog +* Fri Mar 3 2006 Christopher Aillon - 2.8.2-1 +- Update to 2.8.2 to fix an issue with marshalling on x86-64 + * Fri Feb 10 2006 Christopher Aillon - 2.8.1-1 - Update to 2.8.1 Index: sources =================================================================== RCS file: /cvs/dist/rpms/gtk-sharp2/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 10 Feb 2006 20:56:37 -0000 1.4 +++ sources 4 Mar 2006 02:22:18 -0000 1.5 @@ -1 +1 @@ -4ac4f371b13b7e3cfad26eaadb0c9eeb gtk-sharp-2.8.1.tar.gz +e7b68519ede7fd7521b2c6e10410aefa gtk-sharp-2.8.2.tar.gz From fedora-cvs-commits at redhat.com Sat Mar 4 03:04:53 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 3 Mar 2006 22:04:53 -0500 Subject: rpms/tomcat5/devel tomcat5.spec,1.62,1.63 Message-ID: <200603040304.k2434rw7020919@cvs.devel.redhat.com> Author: fitzsim Update of /cvs/dist/rpms/tomcat5/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv20896 Modified Files: tomcat5.spec Log Message: * Fri Mar 3 2006 Thomas Fitzsimmons - 0:5.5.15-1jpp_5fc - Require java-gcj-compat for post and postun sections of servlet-%{servletspec}-api, jsp-%{jspspec}-api-javadoc and server-lib sub-packages, since these three packages call %{_bindir}/rebuild-gcj-db in their post and/or postun sections. Index: tomcat5.spec =================================================================== RCS file: /cvs/dist/rpms/tomcat5/devel/tomcat5.spec,v retrieving revision 1.62 retrieving revision 1.63 diff -u -r1.62 -r1.63 --- tomcat5.spec 1 Mar 2006 18:37:21 -0000 1.62 +++ tomcat5.spec 4 Mar 2006 03:04:33 -0000 1.63 @@ -26,7 +26,7 @@ Summary: Apache Servlet/JSP Engine, RI for Servlet 2.4/JSP 2.0 API Name: tomcat5 Version: 5.5.15 -Release: 1jpp_4fc +Release: 1jpp_5fc Epoch: 0 License: Apache Software License #Vendor: JPackage Project @@ -164,6 +164,9 @@ Provides: servlet5 Provides: servlet24 Provides: servletapi5 +# libgcj aot-compiled native libraries +Requires(post): java-gcj-compat >= 1.0.31 +Requires(postun): java-gcj-compat >= 1.0.31 %description servlet-%{servletspec}-api Contains the implementation classes @@ -202,6 +205,9 @@ %package jsp-%{jspspec}-api-javadoc Group: Development/Documentation Summary: Javadoc generated documentation for %{name}-jsp-%{jspspec}-api +# libgcj aot-compiled native libraries +Requires(post): java-gcj-compat >= 1.0.31 +Requires(postun): java-gcj-compat >= 1.0.31 %description jsp-%{jspspec}-api-javadoc Contains the javadoc generated documentation for the implementation classes @@ -254,6 +260,9 @@ PreReq: regexp >= 0:1.3 # Other subpackages must go in first PreReq: %{name}-%{jname} = %{epoch}:%{version}-%{release} +# libgcj aot-compiled native libraries +Requires(post): java-gcj-compat >= 1.0.31 +Requires(postun): java-gcj-compat >= 1.0.31 %description server-lib Libraries needed to run the Tomcat Web container (part) @@ -986,6 +995,12 @@ %ghost %doc %{_javadocdir}/%{name}-jsp-%{jspspec}-api %changelog +* Fri Mar 3 2006 Thomas Fitzsimmons - 0:5.5.15-1jpp_5fc +- Require java-gcj-compat for post and postun sections of + servlet-%{servletspec}-api, jsp-%{jspspec}-api-javadoc and + server-lib sub-packages, since these three packages call + %{_bindir}/rebuild-gcj-db in their post and/or postun sections. + * Wed Mar 1 2006 Rafael Schloming - 0:5.5.15-1jpp_4fc - Disabled juli logging as a workaround for a number of classpath bugs - in java.util.logging.* From fedora-cvs-commits at redhat.com Sat Mar 4 03:31:50 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 3 Mar 2006 22:31:50 -0500 Subject: rpms/kernel/devel linux-2.6-x86-cpu_index-false.patch, NONE, 1.1 kernel-2.6.spec, 1.2011, 1.2012 Message-ID: <200603040331.k243VoER011462@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv11341 Modified Files: kernel-2.6.spec Added Files: linux-2.6-x86-cpu_index-false.patch Log Message: heopfully fix the odd cpu numbering problem in acpi linux-2.6-x86-cpu_index-false.patch: processor_core.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) --- NEW FILE linux-2.6-x86-cpu_index-false.patch --- Local apic entries are only 8 bits, but it seemed to not be caught with u8 return value result in the check cpu_index >= NR_CPUS becomming always false. drivers/acpi/processor_core.c: In function `acpi_processor_get_info': drivers/acpi/processor_core.c:483: warning: comparison is always false due to limited range of data type Signed-off-by: Ashok Raj ----------------------------------------------------- drivers/acpi/processor_core.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) Index: linux-2.6.16-rc5-mm1/drivers/acpi/processor_core.c =================================================================== --- linux-2.6.16-rc5-mm1.orig/drivers/acpi/processor_core.c +++ linux-2.6.16-rc5-mm1/drivers/acpi/processor_core.c @@ -382,7 +382,7 @@ static int acpi_processor_remove_fs(stru /* Use the acpiid in MADT to map cpus in case of SMP */ #ifndef CONFIG_SMP -#define convert_acpiid_to_cpu(acpi_id) (0xff) +#define convert_acpiid_to_cpu(acpi_id) (-1) #else #ifdef CONFIG_IA64 @@ -395,7 +395,7 @@ static int acpi_processor_remove_fs(stru #define ARCH_BAD_APICID (0xff) #endif -static u8 convert_acpiid_to_cpu(u8 acpi_id) +static int convert_acpiid_to_cpu(u8 acpi_id) { u16 apic_id; int i; @@ -421,7 +421,7 @@ static int acpi_processor_get_info(struc acpi_status status = 0; union acpi_object object = { 0 }; struct acpi_buffer buffer = { sizeof(union acpi_object), &object }; - u8 cpu_index; + int cpu_index; static int cpu0_initialized; ACPI_FUNCTION_TRACE("acpi_processor_get_info"); @@ -466,7 +466,7 @@ static int acpi_processor_get_info(struc cpu_index = convert_acpiid_to_cpu(pr->acpi_id); /* Handle UP system running SMP kernel, with no LAPIC in MADT */ - if (!cpu0_initialized && (cpu_index == 0xff) && + if (!cpu0_initialized && (cpu_index == -1) && (num_online_cpus() == 1)) { cpu_index = 0; } @@ -480,7 +480,7 @@ static int acpi_processor_get_info(struc * less than the max # of CPUs. They should be ignored _iff * they are physically not present. */ - if (cpu_index >= NR_CPUS) { + if (cpu_index == -1) { if (ACPI_FAILURE (acpi_processor_hotadd_init(pr->handle, &pr->id))) { ACPI_ERROR((AE_INFO, Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.2011 retrieving revision 1.2012 diff -u -r1.2011 -r1.2012 --- kernel-2.6.spec 3 Mar 2006 18:58:25 -0000 1.2011 +++ kernel-2.6.spec 4 Mar 2006 03:31:05 -0000 1.2012 @@ -233,6 +233,7 @@ Patch205: linux-2.6-edid-check.patch Patch206: linux-2.6-x86_64-smp-on-uphw-cpucount.patch Patch207: linux-2.6-x86-hp-reboot.patch +Patch208: linux-2.6-x86-cpu_index-false.patch # 300 - 399 ppc(64) Patch300: linux-2.6-powermac-pfunc-noise.patch @@ -740,6 +741,8 @@ %patch206 -p1 # Reboot through BIOS on HP systems,. %patch207 -p1 +# cpu_index >= NR_CPUS becomming always false. +%patch208 -p1 # # ppc64 @@ -1602,6 +1605,7 @@ %changelog * Fri Mar 3 2006 Dave Jones - 2.6.16rc5-git7 +- Fix cpu_index >= NR_CPUS always false warnings. * Thu Mar 2 2006 John W. Linville - Update to current bcm43xx code From fedora-cvs-commits at redhat.com Sat Mar 4 03:36:44 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 3 Mar 2006 22:36:44 -0500 Subject: rpms/nautilus-cd-burner/devel nautilus-cd-burner.spec,1.50,1.51 Message-ID: <200603040336.k243aiMc012320@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/nautilus-cd-burner/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv11644 Modified Files: nautilus-cd-burner.spec Log Message: add gnome-mount req Index: nautilus-cd-burner.spec =================================================================== RCS file: /cvs/dist/rpms/nautilus-cd-burner/devel/nautilus-cd-burner.spec,v retrieving revision 1.50 retrieving revision 1.51 diff -u -r1.50 -r1.51 --- nautilus-cd-burner.spec 28 Feb 2006 02:08:50 -0000 1.50 +++ nautilus-cd-burner.spec 4 Mar 2006 03:36:33 -0000 1.51 @@ -1,7 +1,7 @@ Summary: Easy to use CD burning for Gnome Name: nautilus-cd-burner Version: 2.13.92 -Release: 1 +Release: 2 Source0: %{name}-%{version}.tar.bz2 License: LGPL/GPL Group: User Interface/Desktops @@ -10,6 +10,7 @@ Requires: mkisofs Requires: cdrecord Requires: hal >= 0.5.0 +Requires: gnome-mount >= 0.4 BuildRequires: gnome-vfs2-devel >= 2.1.3.1 BuildRequires: libgnome-devel BuildRequires: glib2-devel >= 2.1.0 @@ -101,6 +102,9 @@ %changelog +* Mon Feb 27 2006 Matthias Clasen - 2.13.92-2 +- Add a Req for gnome-mount + * Mon Feb 27 2006 Matthias Clasen - 2.13.92-1 - Update to 2.13.92 - Drop upstreamed patch From fedora-cvs-commits at redhat.com Sat Mar 4 05:06:04 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sat, 4 Mar 2006 00:06:04 -0500 Subject: rpms/policycoreutils/devel policycoreutils-rhat.patch, 1.165, 1.166 policycoreutils.spec, 1.238, 1.239 Message-ID: <200603040506.k24564fG008136@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/policycoreutils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv8122 Modified Files: policycoreutils-rhat.patch policycoreutils.spec Log Message: * Fri Mar 3 2006 Dan Walsh 1.29.26-4 - Minor fixes to chcat and semanage policycoreutils-rhat.patch: audit2allow/audit2allow | 180 ++++++++++++++- audit2allow/audit2allow.1 | 3 scripts/chcat | 2 scripts/fixfiles | 5 semanage/semanage | 11 semanage/semanage.8 | 4 semanage/seobject.py | 528 +++++++++++++++++++++++++++------------------- setsebool/Makefile | 2 8 files changed, 506 insertions(+), 229 deletions(-) Index: policycoreutils-rhat.patch =================================================================== RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v retrieving revision 1.165 retrieving revision 1.166 diff -u -r1.165 -r1.166 --- policycoreutils-rhat.patch 23 Feb 2006 21:33:36 -0000 1.165 +++ policycoreutils-rhat.patch 4 Mar 2006 05:05:58 -0000 1.166 @@ -1,6 +1,6 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/audit2allow/audit2allow policycoreutils-1.29.26/audit2allow/audit2allow --- nsapolicycoreutils/audit2allow/audit2allow 2005-12-08 12:52:44.000000000 -0500 -+++ policycoreutils-1.29.26/audit2allow/audit2allow 2006-02-21 13:48:01.000000000 -0500 ++++ policycoreutils-1.29.26/audit2allow/audit2allow 2006-02-23 16:32:45.000000000 -0500 @@ -25,6 +25,118 @@ # # @@ -284,7 +284,7 @@ sys.exit(0) diff --exclude-from=exclude -N -u -r nsapolicycoreutils/audit2allow/audit2allow.1 policycoreutils-1.29.26/audit2allow/audit2allow.1 --- nsapolicycoreutils/audit2allow/audit2allow.1 2005-12-01 10:11:27.000000000 -0500 -+++ policycoreutils-1.29.26/audit2allow/audit2allow.1 2006-02-21 13:48:54.000000000 -0500 ++++ policycoreutils-1.29.26/audit2allow/audit2allow.1 2006-02-23 16:32:45.000000000 -0500 @@ -65,6 +65,9 @@ .B "\-r" | "\-\-requires" Generate require output syntax for loadable modules. @@ -295,9 +295,36 @@ .B "\-t " | "\-\-tefile" Indicates input file is a te (type enforcement) file. This can be used to translate old te format to new policy format. .TP +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/scripts/chcat policycoreutils-1.29.26/scripts/chcat +--- nsapolicycoreutils/scripts/chcat 2006-01-27 01:16:33.000000000 -0500 ++++ policycoreutils-1.29.26/scripts/chcat 2006-03-03 18:21:05.000000000 -0500 +@@ -320,7 +320,7 @@ + if len(cats) > 1 and cats[1] != "s0": + print "%s: %s" % (u, cats[1]) + else: +- print "%s:" % u ++ print "%s: %s" % (u, cats[0]) + + def error(msg): + print "%s: %s" % (sys.argv[0], msg) +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/scripts/fixfiles policycoreutils-1.29.26/scripts/fixfiles +--- nsapolicycoreutils/scripts/fixfiles 2006-01-04 13:07:46.000000000 -0500 ++++ policycoreutils-1.29.26/scripts/fixfiles 2006-02-23 17:12:53.000000000 -0500 +@@ -124,7 +124,10 @@ + exit $? + fi + if [ ! -z "$DIRS" ]; then +- ${RESTORECON} ${OUTFILES} ${FORCEFLAG} -R $1 -v $DIRS 2>&1 >> $LOGFILE ++ for d in ${DIRS} ; do find $d \ ++ ! \( -fstype ext2 -o -fstype ext3 -o -fstype jfs -o -fstype xfs \) -prune -o -print; \ ++ ${RESTORECON} ${OUTFILES} ${FORCEFLAG} $1 -v -f - 2>&1 >> $LOGFILE ++ done + exit $? + fi + LogReadOnly diff --exclude-from=exclude -N -u -r nsapolicycoreutils/semanage/semanage policycoreutils-1.29.26/semanage/semanage --- nsapolicycoreutils/semanage/semanage 2006-02-16 13:35:28.000000000 -0500 -+++ policycoreutils-1.29.26/semanage/semanage 2006-02-21 13:57:04.000000000 -0500 ++++ policycoreutils-1.29.26/semanage/semanage 2006-02-23 16:32:45.000000000 -0500 @@ -22,6 +22,9 @@ # import os, sys, getopt @@ -343,7 +370,7 @@ if o == "-p" or o == '--proto': diff --exclude-from=exclude -N -u -r nsapolicycoreutils/semanage/semanage.8 policycoreutils-1.29.26/semanage/semanage.8 --- nsapolicycoreutils/semanage/semanage.8 2006-01-27 01:16:33.000000000 -0500 -+++ policycoreutils-1.29.26/semanage/semanage.8 2006-02-20 23:21:37.000000000 -0500 ++++ policycoreutils-1.29.26/semanage/semanage.8 2006-02-23 16:32:45.000000000 -0500 @@ -46,7 +46,7 @@ List the OBJECTS .TP @@ -364,7 +391,7 @@ SELinux Roles. You must enclose multiple roles within quotes, separate by spaces. Or specify \-R multiple times. diff --exclude-from=exclude -N -u -r nsapolicycoreutils/semanage/seobject.py policycoreutils-1.29.26/semanage/seobject.py --- nsapolicycoreutils/semanage/seobject.py 2006-02-16 13:35:28.000000000 -0500 -+++ policycoreutils-1.29.26/semanage/seobject.py 2006-02-20 23:21:42.000000000 -0500 ++++ policycoreutils-1.29.26/semanage/seobject.py 2006-03-03 18:20:37.000000000 -0500 @@ -21,9 +21,43 @@ # # @@ -592,10 +619,10 @@ + raise ValueError("Could not modify login mapping for %s" % name) + except ValueError, error: -+ mylog.log(0,"modify selinux user mapping", name, sename, "", serange, "", oldsename, "", oldserange); ++ mylog.log(0,"modify selinux user mapping", name, sename,"", serange, oldsename, "", oldserange); + raise error + -+ mylog.log(1,"modify selinux user mapping", name, sename, "", serange, "", oldsename, "", oldserange); ++ mylog.log(1,"modify selinux user mapping", name, sename, "", serange, oldsename, "", oldserange); semanage_seuser_key_free(k) semanage_seuser_free(u) @@ -1036,3 +1063,15 @@ if type == "": raise ValueError("SELinux Type is required") +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/setsebool/Makefile policycoreutils-1.29.26/setsebool/Makefile +--- nsapolicycoreutils/setsebool/Makefile 2005-11-04 15:37:49.000000000 -0500 ++++ policycoreutils-1.29.26/setsebool/Makefile 2006-02-25 06:56:54.000000000 -0500 +@@ -17,6 +17,8 @@ + install: all + -mkdir -p $(SBINDIR) + install -m 755 setsebool $(SBINDIR) ++ -mkdir -p $(MANDIR)/man8 ++ install -m 644 setsebool.8 $(MANDIR)/man8/ + + relabel: + Index: policycoreutils.spec =================================================================== RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils.spec,v retrieving revision 1.238 retrieving revision 1.239 diff -u -r1.238 -r1.239 --- policycoreutils.spec 23 Feb 2006 21:33:37 -0000 1.238 +++ policycoreutils.spec 4 Mar 2006 05:05:58 -0000 1.239 @@ -5,7 +5,7 @@ Summary: SELinux policy core utilities. Name: policycoreutils Version: 1.29.26 -Release: 2 +Release: 4 License: GPL Group: System Environment/Base Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz @@ -89,6 +89,7 @@ %{_mandir}/man8/audit2why.8.gz %{_mandir}/man8/genhomedircon.8.gz %{_mandir}/man8/open_init_pty.8.gz +%{_mandir}/man8/setsebool.8.gz %{_mandir}/man8/run_init.8.gz %{_mandir}/man1/audit2allow.1.gz %{_mandir}/man1/newrole.1.gz @@ -98,6 +99,12 @@ %{_libdir}/python2.4/site-packages/seobject.py* %changelog +* Fri Mar 3 2006 Dan Walsh 1.29.26-4 +- Minor fixes to chcat and semanage + +* Sat Feb 24 2006 Dan Walsh 1.29.26-3 +- Add missing setsebool man page + * Thu Feb 23 2006 Dan Walsh 1.29.26-2 - Change audit2allow to use devel instead of refpolicy From fedora-cvs-commits at redhat.com Sat Mar 4 05:11:01 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sat, 4 Mar 2006 00:11:01 -0500 Subject: rpms/selinux-policy/devel policy-20060207.patch, 1.31, 1.32 selinux-policy.spec, 1.133, 1.134 Message-ID: <200603040511.k245B195008219@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/selinux-policy/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv8204 Modified Files: policy-20060207.patch selinux-policy.spec Log Message: * Tue Feb 28 2006 Dan Walsh 2.2.23-1 - add policyhelp to point at policy html pages policy-20060207.patch: Rules.modular | 2 +- policy/modules/admin/readahead.te | 2 +- policy/modules/admin/su.fc | 1 + policy/modules/admin/su.if | 6 +++--- policy/modules/kernel/corenetwork.te.in | 2 +- policy/modules/kernel/devices.if | 2 +- policy/modules/kernel/files.fc | 2 +- policy/modules/kernel/files.if | 20 ++++++++++++++++++-- policy/modules/services/apache.fc | 2 ++ policy/modules/services/apache.if | 5 +++++ policy/modules/services/bluetooth.te | 5 +++++ policy/modules/services/cron.te | 3 +++ policy/modules/services/cups.fc | 2 +- policy/modules/services/cups.te | 6 ++++-- policy/modules/services/cvs.te | 2 +- policy/modules/services/ktalk.te | 2 ++ policy/modules/services/nscd.if | 2 +- policy/modules/services/samba.te | 2 +- policy/modules/system/init.te | 5 +++++ policy/modules/system/libraries.fc | 2 ++ policy/modules/system/locallogin.te | 1 + policy/modules/system/lvm.fc | 1 + policy/modules/system/selinuxutil.fc | 6 +++--- policy/modules/system/selinuxutil.te | 1 + policy/modules/system/udev.te | 2 +- support/Makefile.devel | 5 +---- 26 files changed, 67 insertions(+), 24 deletions(-) Index: policy-20060207.patch =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20060207.patch,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- policy-20060207.patch 27 Feb 2006 23:23:06 -0000 1.31 +++ policy-20060207.patch 4 Mar 2006 05:10:54 -0000 1.32 @@ -1,6 +1,6 @@ -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/readahead.te serefpolicy-2.2.22/policy/modules/admin/readahead.te ---- nsaserefpolicy/policy/modules/admin/readahead.te 2006-02-21 14:40:22.000000000 -0500 -+++ serefpolicy-2.2.22/policy/modules/admin/readahead.te 2006-02-27 17:33:49.000000000 -0500 +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/readahead.te serefpolicy-2.2.23/policy/modules/admin/readahead.te +--- nsaserefpolicy/policy/modules/admin/readahead.te 2006-03-04 00:06:33.000000000 -0500 ++++ serefpolicy-2.2.23/policy/modules/admin/readahead.te 2006-03-04 00:08:36.000000000 -0500 @@ -18,7 +18,7 @@ # Local policy # @@ -10,17 +10,17 @@ allow readahead_t self:process signal_perms; allow readahead_t readahead_var_run_t:file create_file_perms; -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/su.fc serefpolicy-2.2.22/policy/modules/admin/su.fc +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/su.fc serefpolicy-2.2.23/policy/modules/admin/su.fc --- nsaserefpolicy/policy/modules/admin/su.fc 2005-11-14 18:24:06.000000000 -0500 -+++ serefpolicy-2.2.22/policy/modules/admin/su.fc 2006-02-27 17:33:49.000000000 -0500 ++++ serefpolicy-2.2.23/policy/modules/admin/su.fc 2006-03-04 00:08:36.000000000 -0500 @@ -2,3 +2,4 @@ /bin/su -- gen_context(system_u:object_r:su_exec_t,s0) /usr(/local)?/bin/ksu -- gen_context(system_u:object_r:su_exec_t,s0) +/usr/bin/kdesu -- gen_context(system_u:object_r:su_exec_t,s0) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/su.if serefpolicy-2.2.22/policy/modules/admin/su.if ---- nsaserefpolicy/policy/modules/admin/su.if 2006-02-23 09:25:07.000000000 -0500 -+++ serefpolicy-2.2.22/policy/modules/admin/su.if 2006-02-27 17:33:49.000000000 -0500 +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/su.if serefpolicy-2.2.23/policy/modules/admin/su.if +--- nsaserefpolicy/policy/modules/admin/su.if 2006-03-04 00:06:33.000000000 -0500 ++++ serefpolicy-2.2.23/policy/modules/admin/su.if 2006-03-04 00:08:36.000000000 -0500 @@ -141,10 +141,10 @@ # By default, revert to the calling domain when a shell is executed. @@ -35,9 +35,9 @@ kernel_read_system_state($1_su_t) kernel_read_kernel_sysctls($1_su_t) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corenetwork.te.in serefpolicy-2.2.22/policy/modules/kernel/corenetwork.te.in +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corenetwork.te.in serefpolicy-2.2.23/policy/modules/kernel/corenetwork.te.in --- nsaserefpolicy/policy/modules/kernel/corenetwork.te.in 2006-02-20 14:07:36.000000000 -0500 -+++ serefpolicy-2.2.22/policy/modules/kernel/corenetwork.te.in 2006-02-27 17:33:49.000000000 -0500 ++++ serefpolicy-2.2.23/policy/modules/kernel/corenetwork.te.in 2006-03-04 00:08:36.000000000 -0500 @@ -66,7 +66,7 @@ network_port(giftd, tcp,1213,s0) network_port(gopher, tcp,70,s0, udp,70,s0) @@ -47,9 +47,9 @@ network_port(howl, tcp,5335,s0, udp,5353,s0) network_port(hplip, tcp,50000,s0, tcp,50002,s0) network_port(i18n_input, tcp,9010,s0) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.if serefpolicy-2.2.22/policy/modules/kernel/devices.if +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.if serefpolicy-2.2.23/policy/modules/kernel/devices.if --- nsaserefpolicy/policy/modules/kernel/devices.if 2006-02-23 09:25:08.000000000 -0500 -+++ serefpolicy-2.2.22/policy/modules/kernel/devices.if 2006-02-27 17:33:49.000000000 -0500 ++++ serefpolicy-2.2.23/policy/modules/kernel/devices.if 2006-03-04 00:08:36.000000000 -0500 @@ -2384,7 +2384,7 @@ ') @@ -59,10 +59,10 @@ ') ######################################## -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.fc serefpolicy-2.2.22/policy/modules/kernel/files.fc ---- nsaserefpolicy/policy/modules/kernel/files.fc 2006-02-14 07:20:25.000000000 -0500 -+++ serefpolicy-2.2.22/policy/modules/kernel/files.fc 2006-02-27 17:33:49.000000000 -0500 -@@ -89,7 +89,7 @@ +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.fc serefpolicy-2.2.23/policy/modules/kernel/files.fc +--- nsaserefpolicy/policy/modules/kernel/files.fc 2006-03-04 00:06:34.000000000 -0500 ++++ serefpolicy-2.2.23/policy/modules/kernel/files.fc 2006-03-04 00:08:36.000000000 -0500 +@@ -93,7 +93,7 @@ # HOME_ROOT # expanded by genhomedircon # @@ -71,10 +71,10 @@ HOME_ROOT/\.journal <> HOME_ROOT/lost\+found -d gen_context(system_u:object_r:lost_found_t,s15:c0.c255) HOME_ROOT/lost\+found/.* <> -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.if serefpolicy-2.2.22/policy/modules/kernel/files.if ---- nsaserefpolicy/policy/modules/kernel/files.if 2006-02-21 14:40:23.000000000 -0500 -+++ serefpolicy-2.2.22/policy/modules/kernel/files.if 2006-02-27 17:33:49.000000000 -0500 -@@ -1416,6 +1416,21 @@ +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.if serefpolicy-2.2.23/policy/modules/kernel/files.if +--- nsaserefpolicy/policy/modules/kernel/files.if 2006-03-04 00:06:34.000000000 -0500 ++++ serefpolicy-2.2.23/policy/modules/kernel/files.if 2006-03-04 00:08:36.000000000 -0500 +@@ -1648,6 +1648,21 @@ ') ######################################## @@ -96,7 +96,7 @@ ## ## Read files in /etc that are dynamically ## created on boot, such as mtab. -@@ -3356,12 +3371,13 @@ +@@ -3789,12 +3804,13 @@ # Need to give permission to create directories where applicable allow $1 self:process setfscreate; @@ -112,9 +112,9 @@ ') ######################################## -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.fc serefpolicy-2.2.22/policy/modules/services/apache.fc +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.fc serefpolicy-2.2.23/policy/modules/services/apache.fc --- nsaserefpolicy/policy/modules/services/apache.fc 2006-02-27 17:17:23.000000000 -0500 -+++ serefpolicy-2.2.22/policy/modules/services/apache.fc 2006-02-27 17:46:08.000000000 -0500 ++++ serefpolicy-2.2.23/policy/modules/services/apache.fc 2006-03-04 00:08:36.000000000 -0500 @@ -15,6 +15,7 @@ /etc/vhosts -- gen_context(system_u:object_r:httpd_config_t,s0) @@ -123,9 +123,14 @@ /usr/bin/htsslpass -- gen_context(system_u:object_r:httpd_helper_exec_t,s0) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.if serefpolicy-2.2.22/policy/modules/services/apache.if ---- nsaserefpolicy/policy/modules/services/apache.if 2006-02-27 17:17:23.000000000 -0500 -+++ serefpolicy-2.2.22/policy/modules/services/apache.if 2006-02-27 17:33:49.000000000 -0500 +@@ -75,3 +76,4 @@ + /var/www/cgi-bin(/.*)? gen_context(system_u:object_r:httpd_sys_script_exec_t,s0) + /var/www/icons(/.*)? gen_context(system_u:object_r:httpd_sys_content_t,s0) + /var/www/perl(/.*)? gen_context(system_u:object_r:httpd_sys_script_exec_t,s0) ++/usr/share/selinux-policy([^/]*)?/html(/.*)? gen_context(system_u:object_r:httpd_sys_content_t,s0) +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.if serefpolicy-2.2.23/policy/modules/services/apache.if +--- nsaserefpolicy/policy/modules/services/apache.if 2006-03-04 00:06:35.000000000 -0500 ++++ serefpolicy-2.2.23/policy/modules/services/apache.if 2006-03-04 00:08:36.000000000 -0500 @@ -12,6 +12,11 @@ ## # @@ -138,9 +143,38 @@ # allow write access to public file transfer # services files. gen_tunable(allow_httpd_$1_script_anon_write,false) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.te serefpolicy-2.2.22/policy/modules/services/cron.te ---- nsaserefpolicy/policy/modules/services/cron.te 2006-02-27 17:17:24.000000000 -0500 -+++ serefpolicy-2.2.22/policy/modules/services/cron.te 2006-02-27 17:33:49.000000000 -0500 +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bluetooth.te serefpolicy-2.2.23/policy/modules/services/bluetooth.te +--- nsaserefpolicy/policy/modules/services/bluetooth.te 2006-03-04 00:06:35.000000000 -0500 ++++ serefpolicy-2.2.23/policy/modules/services/bluetooth.te 2006-03-04 00:08:36.000000000 -0500 +@@ -115,6 +115,7 @@ + corecmd_exec_shell(bluetooth_t) + + domain_use_interactive_fds(bluetooth_t) ++domain_dontaudit_search_all_domains_state(bluetooth_t) + + files_read_etc_files(bluetooth_t) + files_read_etc_runtime_files(bluetooth_t) +@@ -170,6 +171,7 @@ + allow bluetooth_helper_t self:fifo_file rw_file_perms; + allow bluetooth_helper_t self:shm create_shm_perms; + allow bluetooth_helper_t self:unix_stream_socket { create_stream_socket_perms connectto }; ++allow bluetooth_helper_t self:tcp_socket create_socket_perms; + + allow bluetooth_helper_t bluetooth_t:socket { read write }; + +@@ -214,6 +216,9 @@ + ifdef(`xserver.te', ` + allow bluetooth_helper_t xserver_log_t:dir search; + allow bluetooth_helper_t xserver_log_t:file { getattr read }; ++ optional_policy(`xserver', ` ++ xserver_stream_connect_xdm(bluetooth_helper_t) ++ '); + ') + + ifdef(`strict_policy',` +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.te serefpolicy-2.2.23/policy/modules/services/cron.te +--- nsaserefpolicy/policy/modules/services/cron.te 2006-03-04 00:06:35.000000000 -0500 ++++ serefpolicy-2.2.23/policy/modules/services/cron.te 2006-03-04 00:08:36.000000000 -0500 @@ -166,6 +166,9 @@ allow crond_t unconfined_t:dbus send_msg; @@ -151,9 +185,9 @@ ',` allow crond_t crond_tmp_t:dir create_dir_perms; allow crond_t crond_tmp_t:file create_file_perms; -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.fc serefpolicy-2.2.22/policy/modules/services/cups.fc +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.fc serefpolicy-2.2.23/policy/modules/services/cups.fc --- nsaserefpolicy/policy/modules/services/cups.fc 2005-11-14 18:24:08.000000000 -0500 -+++ serefpolicy-2.2.22/policy/modules/services/cups.fc 2006-02-27 17:33:49.000000000 -0500 ++++ serefpolicy-2.2.23/policy/modules/services/cups.fc 2006-03-04 00:08:36.000000000 -0500 @@ -43,7 +43,7 @@ /var/log/cups(/.*)? gen_context(system_u:object_r:cupsd_log_t,s0) /var/log/turboprint_cups\.log.* -- gen_context(system_u:object_r:cupsd_log_t,s0) @@ -163,9 +197,9 @@ /var/run/hp.*\.pid -- gen_context(system_u:object_r:hplip_var_run_t,s0) /var/run/hp.*\.port -- gen_context(system_u:object_r:hplip_var_run_t,s0) /var/run/ptal-printd(/.*)? gen_context(system_u:object_r:ptal_var_run_t,s0) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.te serefpolicy-2.2.22/policy/modules/services/cups.te ---- nsaserefpolicy/policy/modules/services/cups.te 2006-02-23 09:25:09.000000000 -0500 -+++ serefpolicy-2.2.22/policy/modules/services/cups.te 2006-02-27 18:19:19.000000000 -0500 +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.te serefpolicy-2.2.23/policy/modules/services/cups.te +--- nsaserefpolicy/policy/modules/services/cups.te 2006-03-04 00:06:35.000000000 -0500 ++++ serefpolicy-2.2.23/policy/modules/services/cups.te 2006-03-04 00:09:52.000000000 -0500 @@ -77,7 +77,7 @@ dontaudit cupsd_t self:capability { sys_tty_config net_admin }; allow cupsd_t self:process { setsched signal_perms }; @@ -180,7 +214,7 @@ allow cupsd_t cupsd_var_run_t:file create_file_perms; allow cupsd_t cupsd_var_run_t:dir rw_dir_perms; +allow cupsd_t cupsd_var_run_t:sock_file create_file_perms; - files_pid_filetrans(cupsd_t,cupsd_var_run_t) + files_pid_filetrans(cupsd_t,cupsd_var_run_t,file) allow cupsd_t hplip_var_run_t:file { read getattr }; @@ -119,6 +120,7 @@ @@ -200,9 +234,21 @@ ') ######################################## -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ktalk.te serefpolicy-2.2.22/policy/modules/services/ktalk.te ---- nsaserefpolicy/policy/modules/services/ktalk.te 2006-02-21 14:40:24.000000000 -0500 -+++ serefpolicy-2.2.22/policy/modules/services/ktalk.te 2006-02-27 17:33:49.000000000 -0500 +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cvs.te serefpolicy-2.2.23/policy/modules/services/cvs.te +--- nsaserefpolicy/policy/modules/services/cvs.te 2006-03-04 00:06:35.000000000 -0500 ++++ serefpolicy-2.2.23/policy/modules/services/cvs.te 2006-03-04 00:08:36.000000000 -0500 +@@ -11,7 +11,7 @@ + inetd_tcp_service_domain(cvs_t,cvs_exec_t) + role system_r types cvs_t; + +-type cvs_data_t; #, customizable; ++type cvs_data_t; # customizable + files_type(cvs_data_t) + + type cvs_tmp_t; +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ktalk.te serefpolicy-2.2.23/policy/modules/services/ktalk.te +--- nsaserefpolicy/policy/modules/services/ktalk.te 2006-03-04 00:06:36.000000000 -0500 ++++ serefpolicy-2.2.23/policy/modules/services/ktalk.te 2006-03-04 00:08:36.000000000 -0500 @@ -68,6 +68,8 @@ files_read_etc_files(ktalkd_t) @@ -212,9 +258,9 @@ libs_use_ld_so(ktalkd_t) libs_use_shared_libs(ktalkd_t) logging_send_syslog_msg(ktalkd_t) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nscd.if serefpolicy-2.2.22/policy/modules/services/nscd.if +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nscd.if serefpolicy-2.2.23/policy/modules/services/nscd.if --- nsaserefpolicy/policy/modules/services/nscd.if 2006-02-10 21:34:14.000000000 -0500 -+++ serefpolicy-2.2.22/policy/modules/services/nscd.if 2006-02-27 17:33:49.000000000 -0500 ++++ serefpolicy-2.2.23/policy/modules/services/nscd.if 2006-03-04 00:08:36.000000000 -0500 @@ -49,8 +49,8 @@ dontaudit $1 nscd_t:nscd { shmempwd shmemgrp shmemhost }; @@ -225,9 +271,21 @@ dontaudit $1 nscd_var_run_t:file { getattr read }; ') -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.te serefpolicy-2.2.22/policy/modules/system/init.te ---- nsaserefpolicy/policy/modules/system/init.te 2006-02-21 14:40:25.000000000 -0500 -+++ serefpolicy-2.2.22/policy/modules/system/init.te 2006-02-27 17:33:49.000000000 -0500 +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/samba.te serefpolicy-2.2.23/policy/modules/services/samba.te +--- nsaserefpolicy/policy/modules/services/samba.te 2006-03-04 00:06:36.000000000 -0500 ++++ serefpolicy-2.2.23/policy/modules/services/samba.te 2006-03-04 00:08:36.000000000 -0500 +@@ -32,7 +32,7 @@ + type samba_secrets_t; + files_type(samba_secrets_t) + +-type samba_share_t; ++type samba_share_t; # customizable + files_config_file(samba_share_t) + + type samba_var_t; +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.te serefpolicy-2.2.23/policy/modules/system/init.te +--- nsaserefpolicy/policy/modules/system/init.te 2006-03-04 00:06:37.000000000 -0500 ++++ serefpolicy-2.2.23/policy/modules/system/init.te 2006-03-04 00:08:36.000000000 -0500 @@ -349,6 +349,7 @@ files_mounton_isid_type_dirs(initrc_t) files_list_default(initrc_t) @@ -236,7 +294,7 @@ libs_rw_ld_so_cache(initrc_t) libs_use_ld_so(initrc_t) -@@ -480,6 +481,10 @@ +@@ -482,6 +483,10 @@ ifdef(`targeted_policy',` domain_subj_id_change_exemption(initrc_t) unconfined_domain(initrc_t) @@ -247,9 +305,9 @@ ',` # cjp: require doesnt work in optionals :\ # this also would result in a type transition -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.fc serefpolicy-2.2.22/policy/modules/system/libraries.fc +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.fc serefpolicy-2.2.23/policy/modules/system/libraries.fc --- nsaserefpolicy/policy/modules/system/libraries.fc 2006-02-20 14:07:38.000000000 -0500 -+++ serefpolicy-2.2.22/policy/modules/system/libraries.fc 2006-02-27 18:10:56.000000000 -0500 ++++ serefpolicy-2.2.23/policy/modules/system/libraries.fc 2006-03-04 00:08:36.000000000 -0500 @@ -65,6 +65,7 @@ /usr/lib(64)?/(nvidia/)?libGL(core)?\.so(\.[^/]*)* -- gen_context(system_u:object_r:textrel_shlib_t,s0) /usr/lib(64)?/libGLU\.so(\.[^/]*)* -- gen_context(system_u:object_r:textrel_shlib_t,s0) @@ -266,9 +324,9 @@ ifdef(`distro_redhat',` /usr/lib(64)?/.*/program/.*\.so.* gen_context(system_u:object_r:shlib_t,s0) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/locallogin.te serefpolicy-2.2.22/policy/modules/system/locallogin.te ---- nsaserefpolicy/policy/modules/system/locallogin.te 2006-02-21 14:40:25.000000000 -0500 -+++ serefpolicy-2.2.22/policy/modules/system/locallogin.te 2006-02-27 17:33:49.000000000 -0500 +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/locallogin.te serefpolicy-2.2.23/policy/modules/system/locallogin.te +--- nsaserefpolicy/policy/modules/system/locallogin.te 2006-03-04 00:06:37.000000000 -0500 ++++ serefpolicy-2.2.23/policy/modules/system/locallogin.te 2006-03-04 00:08:36.000000000 -0500 @@ -20,6 +20,7 @@ type local_login_tmp_t; @@ -277,9 +335,9 @@ type sulogin_t; type sulogin_exec_t; -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/lvm.fc serefpolicy-2.2.22/policy/modules/system/lvm.fc +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/lvm.fc serefpolicy-2.2.23/policy/modules/system/lvm.fc --- nsaserefpolicy/policy/modules/system/lvm.fc 2005-11-14 18:24:06.000000000 -0500 -+++ serefpolicy-2.2.22/policy/modules/system/lvm.fc 2006-02-27 17:33:49.000000000 -0500 ++++ serefpolicy-2.2.23/policy/modules/system/lvm.fc 2006-03-04 00:08:36.000000000 -0500 @@ -25,6 +25,7 @@ # /sbin # @@ -288,9 +346,9 @@ /sbin/dmsetup -- gen_context(system_u:object_r:lvm_exec_t,s0) /sbin/dmsetup\.static -- gen_context(system_u:object_r:lvm_exec_t,s0) /sbin/e2fsadm -- gen_context(system_u:object_r:lvm_exec_t,s0) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.fc serefpolicy-2.2.22/policy/modules/system/selinuxutil.fc +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.fc serefpolicy-2.2.23/policy/modules/system/selinuxutil.fc --- nsaserefpolicy/policy/modules/system/selinuxutil.fc 2006-02-23 09:25:09.000000000 -0500 -+++ serefpolicy-2.2.22/policy/modules/system/selinuxutil.fc 2006-02-27 17:33:49.000000000 -0500 ++++ serefpolicy-2.2.23/policy/modules/system/selinuxutil.fc 2006-03-04 00:08:36.000000000 -0500 @@ -8,9 +8,9 @@ /etc/selinux/([^/]*/)?contexts/files(/.*)? gen_context(system_u:object_r:file_context_t,s0) /etc/selinux/([^/]*/)?policy(/.*)? gen_context(system_u:object_r:policy_config_t,s15:c0.c255) @@ -304,9 +362,9 @@ /etc/selinux/([^/]*/)?users(/.*)? -- gen_context(system_u:object_r:selinux_config_t,s15:c0.c255) # -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.te serefpolicy-2.2.22/policy/modules/system/selinuxutil.te ---- nsaserefpolicy/policy/modules/system/selinuxutil.te 2006-02-27 17:17:27.000000000 -0500 -+++ serefpolicy-2.2.22/policy/modules/system/selinuxutil.te 2006-02-27 17:33:49.000000000 -0500 +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.te serefpolicy-2.2.23/policy/modules/system/selinuxutil.te +--- nsaserefpolicy/policy/modules/system/selinuxutil.te 2006-03-04 00:06:37.000000000 -0500 ++++ serefpolicy-2.2.23/policy/modules/system/selinuxutil.te 2006-03-04 00:08:36.000000000 -0500 @@ -263,6 +263,7 @@ selinux_compute_relabel_context(newrole_t) selinux_compute_user_contexts(newrole_t) @@ -315,9 +373,9 @@ term_use_all_user_ttys(newrole_t) term_use_all_user_ptys(newrole_t) term_relabel_all_user_ttys(newrole_t) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.te serefpolicy-2.2.22/policy/modules/system/udev.te ---- nsaserefpolicy/policy/modules/system/udev.te 2006-02-21 14:40:25.000000000 -0500 -+++ serefpolicy-2.2.22/policy/modules/system/udev.te 2006-02-27 17:33:49.000000000 -0500 +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.te serefpolicy-2.2.23/policy/modules/system/udev.te +--- nsaserefpolicy/policy/modules/system/udev.te 2006-03-04 00:06:37.000000000 -0500 ++++ serefpolicy-2.2.23/policy/modules/system/udev.te 2006-03-04 00:08:36.000000000 -0500 @@ -39,7 +39,7 @@ # Local policy # @@ -327,9 +385,21 @@ dontaudit udev_t self:capability sys_tty_config; allow udev_t self:process ~{ ptrace setcurrent setexec setfscreate setrlimit execmem execstack execheap }; allow udev_t self:process { execmem setfscreate }; -diff --exclude-from=exclude -N -u -r nsaserefpolicy/support/Makefile.devel serefpolicy-2.2.22/support/Makefile.devel +diff --exclude-from=exclude -N -u -r nsaserefpolicy/Rules.modular serefpolicy-2.2.23/Rules.modular +--- nsaserefpolicy/Rules.modular 2006-02-17 14:46:10.000000000 -0500 ++++ serefpolicy-2.2.23/Rules.modular 2006-03-04 00:08:36.000000000 -0500 +@@ -204,7 +204,7 @@ + # + $(APPDIR)/customizable_types: $(BASE_CONF) + @mkdir -p $(APPDIR) +- $(verbose) grep "^type .*customizable" $< | cut -d',' -f1 | cut -d' ' -f2 > $(TMPDIR)/customizable_types ++ $(verbose) grep '^[^[:print:]]*type .*customizable' $< | cut -d',' -f1 | cut -d' ' -f2 | sort -u > $(TMPDIR)/customizable_types + $(verbose) install -m 644 $(TMPDIR)/customizable_types $@ + + ######################################## +diff --exclude-from=exclude -N -u -r nsaserefpolicy/support/Makefile.devel serefpolicy-2.2.23/support/Makefile.devel --- nsaserefpolicy/support/Makefile.devel 2006-02-22 14:09:04.000000000 -0500 -+++ serefpolicy-2.2.22/support/Makefile.devel 2006-02-27 17:33:49.000000000 -0500 ++++ serefpolicy-2.2.23/support/Makefile.devel 2006-03-04 00:08:36.000000000 -0500 @@ -6,10 +6,7 @@ SED ?= sed EINFO ?= echo Index: selinux-policy.spec =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v retrieving revision 1.133 retrieving revision 1.134 diff -u -r1.133 -r1.134 --- selinux-policy.spec 27 Feb 2006 23:23:06 -0000 1.133 +++ selinux-policy.spec 4 Mar 2006 05:10:54 -0000 1.134 @@ -9,8 +9,8 @@ %define CHECKPOLICYVER 1.29.4-1 Summary: SELinux policy configuration Name: selinux-policy -Version: 2.2.22 -Release: 2 +Version: 2.2.23 +Release: 1 License: GPL Group: System Environment/Base Source: serefpolicy-%{version}.tgz @@ -51,27 +51,27 @@ %{_usr}/share/selinux/devel/Makefile %{_usr}/share/selinux/devel/policygentool %{_usr}/share/selinux/devel/example.* - +%attr(755,root,root) %{_usr}/share/selinux/devel/policyhelp %define setupCmds() \ -make NAME=%1 TYPE=%2 DISTRO=%{distro} DIRECT_INITRC=%3 MONOLITHIC=%{monolithic} POLY=%{polyinstatiate} bare \ -make NAME=%1 TYPE=%2 DISTRO=%{distro} DIRECT_INITRC=%3 MONOLITHIC=%{monolithic} POLY=%{polyinstatiate} conf \ +make NAME=%1 TYPE=%2 DISTRO=%{distro} DIRECT_INITRC=%3 MONOLITHIC=%{monolithic} POLY=%3 bare \ +make NAME=%1 TYPE=%2 DISTRO=%{distro} DIRECT_INITRC=%3 MONOLITHIC=%{monolithic} POLY=%3 conf \ cp -f ${RPM_SOURCE_DIR}/modules-%1.conf ./policy/modules.conf \ cp -f ${RPM_SOURCE_DIR}/booleans-%1.conf ./policy/booleans.conf \ %define installCmds() \ -make NAME=%1 TYPE=%2 DISTRO=%{distro} DIRECT_INITRC=%3 MONOLITHIC=%{monolithic} POLY=%{polyinstatiate} base.pp \ -make NAME=%1 TYPE=%2 DISTRO=%{distro} DIRECT_INITRC=%3 MONOLITHIC=%{monolithic} POLY=%{polyinstatiate} modules \ -make NAME=%1 TYPE=%2 DISTRO=%{distro} DIRECT_INITRC=%3 MONOLITHIC=%{monolithic} DESTDIR=$RPM_BUILD_ROOT POLY=%{polyinstatiate} install \ -make NAME=%1 TYPE=%2 DISTRO=%{distro} DIRECT_INITRC=%3 MONOLITHIC=%{monolithic} DESTDIR=$RPM_BUILD_ROOT POLY=%{polyinstatiate} install-appconfig \ +make NAME=%1 TYPE=%2 DISTRO=%{distro} DIRECT_INITRC=%3 MONOLITHIC=%{monolithic} POLY=%3 base.pp \ +make NAME=%1 TYPE=%2 DISTRO=%{distro} DIRECT_INITRC=%3 MONOLITHIC=%{monolithic} POLY=%3 modules \ +make NAME=%1 TYPE=%2 DISTRO=%{distro} DIRECT_INITRC=%3 MONOLITHIC=%{monolithic} DESTDIR=$RPM_BUILD_ROOT POLY=%3 install \ +make NAME=%1 TYPE=%2 DISTRO=%{distro} DIRECT_INITRC=%3 MONOLITHIC=%{monolithic} DESTDIR=$RPM_BUILD_ROOT POLY=%3 install-appconfig \ #%{__cp} *.pp $RPM_BUILD_ROOT/%{_usr}/share/selinux/%1/ \ %{__mkdir} -p $RPM_BUILD_ROOT/%{_sysconfdir}/selinux/%1/policy \ %{__mkdir} -p $RPM_BUILD_ROOT/%{_sysconfdir}/selinux/%1/modules/active \ %{__mkdir} -p $RPM_BUILD_ROOT/%{_sysconfdir}/selinux/%1/contexts/files \ touch $RPM_BUILD_ROOT/%{_sysconfdir}/selinux/%1/modules/semanage.read.LOCK \ touch $RPM_BUILD_ROOT/%{_sysconfdir}/selinux/%1/modules/semanage.trans.LOCK \ -make NAME=%1 TYPE=%2 DISTRO=%{distro} DIRECT_INITRC=%3 MONOLITHIC=%{monolithic} POLY=%{polyinstatiate} enableaudit \ -make NAME=%1 TYPE=%2 DISTRO=%{distro} DIRECT_INITRC=%3 MONOLITHIC=%{monolithic} POLY=%{polyinstatiate} base.pp \ +make NAME=%1 TYPE=%2 DISTRO=%{distro} DIRECT_INITRC=%3 MONOLITHIC=%{monolithic} POLY=%3 enableaudit \ +make NAME=%1 TYPE=%2 DISTRO=%{distro} DIRECT_INITRC=%3 MONOLITHIC=%{monolithic} POLY=%3 base.pp \ install -m0644 base.pp ${RPM_BUILD_ROOT}%{_usr}/share/selinux/%1/enableaudit.pp \ rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/selinux/%1/booleans \ touch $RPM_BUILD_ROOT%{_sysconfdir}/selinux/%1/seusers \ @@ -98,7 +98,7 @@ %dir %{_sysconfdir}/selinux/%1/policy/ \ %ghost %{_sysconfdir}/selinux/%1/policy/policy.* \ %dir %{_sysconfdir}/selinux/%1/contexts \ -%config(noreplace) %{_sysconfdir}/selinux/%1/contexts/customizable_types \ +%config %{_sysconfdir}/selinux/%1/contexts/customizable_types \ %config(noreplace) %{_sysconfdir}/selinux/%1/contexts/dbus_contexts \ %config %{_sysconfdir}/selinux/%1/contexts/default_contexts \ %config(noreplace) %{_sysconfdir}/selinux/%1/contexts/default_type \ @@ -157,28 +157,31 @@ # Install devel make clean -make NAME=targeted TYPE=targeted-mcs DISTRO=%{distro} DIRECT_INITRC=y MONOLITHIC=%{monolithic} DESTDIR=$RPM_BUILD_ROOT PKGNAME=%{name}-%{version} POLY=%{polyinstatiate} install-headers install-docs +make NAME=targeted TYPE=targeted-mcs DISTRO=%{distro} DIRECT_INITRC=y MONOLITHIC=%{monolithic} DESTDIR=$RPM_BUILD_ROOT PKGNAME=%{name}-%{version} POLY=%3 install-headers install-docs mkdir ${RPM_BUILD_ROOT}%{_usr}/share/selinux/devel/ mv ${RPM_BUILD_ROOT}%{_usr}/share/selinux/targeted/include ${RPM_BUILD_ROOT}%{_usr}/share/selinux/devel/include rm -f ${RPM_BUILD_ROOT}%{_usr}/share/selinux/devel/include/include install -m 755 ${RPM_SOURCE_DIR}/policygentool ${RPM_BUILD_ROOT}%{_usr}/share/selinux/devel/ install -m 644 ${RPM_SOURCE_DIR}/Makefile.devel ${RPM_BUILD_ROOT}%{_usr}/share/selinux/devel/Makefile install -m 644 doc/example.* ${RPM_BUILD_ROOT}%{_usr}/share/selinux/devel/ +echo "htmlview file:///usr/share/doc/selinux-policy-%{version}/html/index.html" +> ${RPM_BUILD_ROOT}%{_usr}/share/selinux/devel/policyhelp +chmod +x ${RPM_BUILD_ROOT}%{_usr}/share/selinux/devel/policyhelp # Build targeted policy # Commented out because only targeted ref policy currently builds -%setupCmds targeted targeted-mcs y -%installCmds targeted targeted-mcs y +%setupCmds targeted targeted-mcs y n +%installCmds targeted targeted-mcs y n # Build strict policy # Commented out because only targeted ref policy currently builds -make NAME=strict TYPE=strict-mcs DISTRO=%{distro} DIRECT_INITRC=y MONOLITHIC=%{monolithic} POLY=%{polyinstatiate} bare -make NAME=strict TYPE=strict-mcs DISTRO=%{distro} DIRECT_INITRC=y MONOLITHIC=%{monolithic} POLY=%{polyinstatiate} conf -%installCmds strict strict-mcs y +make NAME=strict TYPE=strict-mcs DISTRO=%{distro} DIRECT_INITRC=y MONOLITHIC=%{monolithic} POLY=n bare +make NAME=strict TYPE=strict-mcs DISTRO=%{distro} DIRECT_INITRC=y MONOLITHIC=%{monolithic} POLY=n conf +%installCmds strict strict-mcs y n # Build mls policy -%setupCmds mls strict-mls n -%installCmds mls strict-mls n +%setupCmds mls strict-mls n y +%installCmds mls strict-mls n y %clean %{__rm} -fR $RPM_BUILD_ROOT @@ -293,6 +296,9 @@ %fileList strict %changelog +* Tue Feb 28 2006 Dan Walsh 2.2.23-1 +- add policyhelp to point at policy html pages + * Mon Feb 27 2006 Dan Walsh 2.2.22-2 - Additional fixes for nvidia and cups From fedora-cvs-commits at redhat.com Sat Mar 4 05:27:26 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sat, 4 Mar 2006 00:27:26 -0500 Subject: rpms/squirrelmail/devel squirrelmail.spec,1.31,1.32 Message-ID: <200603040527.k245RQhj020837@cvs.devel.redhat.com> Author: wtogami Update of /cvs/dist/rpms/squirrelmail/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv20823 Modified Files: squirrelmail.spec Log Message: Fix regex in doc mangling (#183943 Michal Jaegermann) Index: squirrelmail.spec =================================================================== RCS file: /cvs/dist/rpms/squirrelmail/devel/squirrelmail.spec,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- squirrelmail.spec 3 Mar 2006 22:32:32 -0000 1.31 +++ squirrelmail.spec 4 Mar 2006 05:27:18 -0000 1.32 @@ -6,7 +6,7 @@ Summary: SquirrelMail webmail client Name: squirrelmail Version: 1.4.6 -Release: 2.fc5 +Release: 3.fc5 License: GPL URL: http://www.squirrelmail.org/ Group: Applications/Internet @@ -56,7 +56,7 @@ mv plugins/squirrelspell/doc/* doc/plugins/squirrelspell rm -f doc/plugins/squirrelspell/index.php rmdir plugins/squirrelspell/doc -perl -pi -e "s/\.\.//g" doc/index.html +perl -pi -e "s{\.\./}{}g" doc/index.html # Fixup various files echo "left_refresh=300" >> data/default_pref @@ -215,8 +215,12 @@ %{_sysconfdir}/cron.daily/squirrelmail.cron %changelog +* Fri Mar 3 2006 Warren Togami 1.4.6-3 +- Fix regex in doc mangling (#183943 Michal Jaegermann) + * Fri Mar 3 2006 David Woodhouse 1.4.6-2 -- Add a %%build section, move the file mangling to it. +- Add a %%build section, move the file mangling to it. + (#162852 Nicolas Mailhot) * Wed Mar 1 2006 David Woodhouse 1.4.6-1 - Upgrade to 1.4.6 proper for CVE-2006-0377 CVE-2006-0195 CVE-2006-0188 From fedora-cvs-commits at redhat.com Sat Mar 4 05:30:58 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sat, 4 Mar 2006 00:30:58 -0500 Subject: rpms/gnome-terminal/devel .cvsignore, 1.21, 1.22 gnome-terminal.spec, 1.34, 1.35 sources, 1.21, 1.22 Message-ID: <200603040530.k245UwxX020960@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/gnome-terminal/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv20948 Modified Files: .cvsignore gnome-terminal.spec sources Log Message: 2.13.92 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/gnome-terminal/devel/.cvsignore,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- .cvsignore 12 Feb 2006 19:17:51 -0000 1.21 +++ .cvsignore 4 Mar 2006 05:30:56 -0000 1.22 @@ -6,3 +6,4 @@ gnome-terminal-2.13.3.tar.bz2 gnome-terminal-2.13.90.tar.bz2 gnome-terminal-2.13.91.tar.bz2 +gnome-terminal-2.13.92.tar.bz2 Index: gnome-terminal.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-terminal/devel/gnome-terminal.spec,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- gnome-terminal.spec 12 Feb 2006 19:17:51 -0000 1.34 +++ gnome-terminal.spec 4 Mar 2006 05:30:56 -0000 1.35 @@ -12,7 +12,7 @@ Summary: GNOME Terminal Name: gnome-terminal -Version: 2.13.91 +Version: 2.13.92 Release: 1 URL: http://www.gnome.org/ Source0: gnome-terminal-%{version}.tar.bz2 @@ -101,6 +101,9 @@ %{_libdir}/bonobo %changelog +* Sun Mar 4 2006 Matthias Clasen - 2.13.92-1 +- Update to 2.13.92 + * Sun Feb 12 2006 Matthias Clasen - 2.13.91-1 - Update to 2.13.91 Index: sources =================================================================== RCS file: /cvs/dist/rpms/gnome-terminal/devel/sources,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- sources 12 Feb 2006 19:17:51 -0000 1.21 +++ sources 4 Mar 2006 05:30:56 -0000 1.22 @@ -1 +1 @@ -817d89adda4f2be80240582c65873a27 gnome-terminal-2.13.91.tar.bz2 +0cf3d04aabae7534e39d9271a42c046d gnome-terminal-2.13.92.tar.bz2 From fedora-cvs-commits at redhat.com Sat Mar 4 05:37:11 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sat, 4 Mar 2006 00:37:11 -0500 Subject: rpms/gnome-utils/devel .cvsignore, 1.40, 1.41 gnome-utils.spec, 1.98, 1.99 sources, 1.43, 1.44 Message-ID: <200603040537.k245bBDd021122@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/gnome-utils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv21107 Modified Files: .cvsignore gnome-utils.spec sources Log Message: 2.13.95 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/gnome-utils/devel/.cvsignore,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- .cvsignore 26 Feb 2006 01:53:42 -0000 1.40 +++ .cvsignore 4 Mar 2006 05:37:09 -0000 1.41 @@ -11,3 +11,4 @@ gucharmap-1.5.2.tar.bz2 gucharmap-1.5.3.tar.bz2 gnome-utils-2.13.93.tar.bz2 +gnome-utils-2.13.95.tar.bz2 Index: gnome-utils.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-utils/devel/gnome-utils.spec,v retrieving revision 1.98 retrieving revision 1.99 diff -u -r1.98 -r1.99 --- gnome-utils.spec 1 Mar 2006 12:47:47 -0000 1.98 +++ gnome-utils.spec 4 Mar 2006 05:37:09 -0000 1.99 @@ -20,8 +20,8 @@ Summary: GNOME utility programs. Name: gnome-utils -Version: 2.13.93 -Release: 2 +Version: 2.13.95 +Release: 1 Epoch: 1 License: GPL Group: Applications/System @@ -227,6 +227,9 @@ %{_sysconfdir}/pam.d/gnome-system-log %changelog +* Sat Mar 4 2006 Matthias Clasen 2.13.95-1 +- Update to gnome-utils-2.13.95 + * Wed Mar 01 2006 Karsten Hopp 2.13.93-2 - BuildRequires: gnome-doc-utils Index: sources =================================================================== RCS file: /cvs/dist/rpms/gnome-utils/devel/sources,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- sources 26 Feb 2006 01:53:42 -0000 1.43 +++ sources 4 Mar 2006 05:37:09 -0000 1.44 @@ -1,4 +1,4 @@ a5f7d3d6524f7f2da0978541c74aa40b zenity-2.13.90.tar.bz2 f9d4cb8177abfbd17e53908bad65404e gcalctool-5.7.29.tar.bz2 7eb9026fce8db2e8e82ee4a5be27eea9 gucharmap-1.5.3.tar.bz2 -d4b821cd0fff8b161d6d834ded220daf gnome-utils-2.13.93.tar.bz2 +e8c6416d9921d11d8c41f30ab9d6b6de gnome-utils-2.13.95.tar.bz2 From fedora-cvs-commits at redhat.com Sat Mar 4 05:40:46 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sat, 4 Mar 2006 00:40:46 -0500 Subject: rpms/eog/devel .cvsignore, 1.26, 1.27 eog.spec, 1.43, 1.44 sources, 1.26, 1.27 Message-ID: <200603040540.k245ekuQ021258@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/eog/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv21246 Modified Files: .cvsignore eog.spec sources Log Message: 2.13.92 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/eog/devel/.cvsignore,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- .cvsignore 15 Feb 2006 06:35:37 -0000 1.26 +++ .cvsignore 4 Mar 2006 05:40:44 -0000 1.27 @@ -13,3 +13,4 @@ eog-2.13.5.tar.bz2 eog-2.13.90.tar.bz2 eog-2.13.91.tar.bz2 +eog-2.13.92.tar.bz2 Index: eog.spec =================================================================== RCS file: /cvs/dist/rpms/eog/devel/eog.spec,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- eog.spec 16 Feb 2006 03:38:09 -0000 1.43 +++ eog.spec 4 Mar 2006 05:40:44 -0000 1.44 @@ -12,8 +12,8 @@ Summary: Eye of GNOME image viewer Name: eog -Version: 2.13.91 -Release: 2 +Version: 2.13.92 +Release: 1 URL: http://www.gnome.org Source: ftp://ftp.gnome.org/pub/GNOME/pre-gnome2/sources/eog/%{name}-%{version}.tar.bz2 License: GPL @@ -39,16 +39,12 @@ # Needed for gconftool Prereq: GConf2 -# http://bugzilla.gnome.org/show_bug.cgi?id=331362 -Patch0: eog-2.13.91-spew.patch - %description Eye of GNOME (EOG) is an image viewer component used by Nautilus. %prep %setup -q -%patch0 -p1 -b .spew echo "NoDisplay=true" >> eog.desktop.in.in @@ -102,6 +98,10 @@ %{_sysconfdir}/gconf/schemas/*.schemas %changelog +* Sat Mar 4 2006 Matthias Clasen - 2.13.92-1 +- Update to 2.13.92 +- Drop upstreamed patch + * Wed Feb 15 2006 Matthias Clasen - 2.13.91-2 - silence excessive debug output Index: sources =================================================================== RCS file: /cvs/dist/rpms/eog/devel/sources,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- sources 15 Feb 2006 06:35:37 -0000 1.26 +++ sources 4 Mar 2006 05:40:44 -0000 1.27 @@ -1 +1 @@ -ced2bda133914373bc41827765227363 eog-2.13.91.tar.bz2 +9dfe7a92cd2aada2ef3800b1ae39c6fb eog-2.13.92.tar.bz2 From fedora-cvs-commits at redhat.com Sat Mar 4 05:47:29 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sat, 4 Mar 2006 00:47:29 -0500 Subject: rpms/libsoup/devel .cvsignore, 1.15, 1.16 libsoup.spec, 1.30, 1.31 sources, 1.15, 1.16 Message-ID: <200603040547.k245lT7p001415@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/libsoup/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv1400 Modified Files: .cvsignore libsoup.spec sources Log Message: 2.2.91 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/libsoup/devel/.cvsignore,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- .cvsignore 30 Nov 2005 00:11:11 -0000 1.15 +++ .cvsignore 4 Mar 2006 05:47:27 -0000 1.16 @@ -1 +1,2 @@ libsoup-2.2.7.tar.bz2 +libsoup-2.2.91.tar.bz2 Index: libsoup.spec =================================================================== RCS file: /cvs/dist/rpms/libsoup/devel/libsoup.spec,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- libsoup.spec 15 Feb 2006 14:45:47 -0000 1.30 +++ libsoup.spec 4 Mar 2006 05:47:27 -0000 1.31 @@ -1,7 +1,7 @@ Summary: Soup, an HTTP library implementation Name: libsoup -Version: 2.2.7 -Release: 2 +Version: 2.2.91 +Release: 1 License: LGPL Group: Development/Libraries Source0: ftp://ftp.gnome.org/pub/gnome/sources/libsoup/2.2/%{name}-%{version}.tar.bz2 @@ -9,7 +9,7 @@ BuildRoot: %{_tmppath}/%{name}-root Requires: glib2 >= 2.0, gnutls, libxml2 -BuildRequires: glib2-devel, pkgconfig, gtk-doc, gnutls-devel, libxml2-devel +BuildRequires: glib2-devel, pkgconfig, gnutls-devel, libxml2-devel %description Libsoup is an HTTP library implementation in C. It was originally part @@ -36,7 +36,7 @@ %setup -q %build -%configure --enable-gtk-doc +%configure --disable-gtk-doc make %install @@ -66,6 +66,9 @@ %{_datadir}/gtk-doc/html/libsoup %changelog +* Sat Mar 4 2006 Matthias Clasen - 2.2.91-1 +- Update to 2.2.91 + * Wed Feb 15 2006 Matthias Clasen - 2.2.7-2 - Remove excessive Requires for the -devel package Index: sources =================================================================== RCS file: /cvs/dist/rpms/libsoup/devel/sources,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- sources 30 Nov 2005 00:11:11 -0000 1.15 +++ sources 4 Mar 2006 05:47:27 -0000 1.16 @@ -1 +1 @@ -fd1d6bf0ec3e57c8a1498b935d13ace4 libsoup-2.2.7.tar.bz2 +61541fd6df42b718e84eab8c654a6c25 libsoup-2.2.91.tar.bz2 From fedora-cvs-commits at redhat.com Sat Mar 4 06:08:15 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sat, 4 Mar 2006 01:08:15 -0500 Subject: rpms/libsoup/devel libsoup.spec,1.31,1.32 Message-ID: <200603040608.k2468FP5012495@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/libsoup/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv12416 Modified Files: libsoup.spec Log Message: Fix file lists Index: libsoup.spec =================================================================== RCS file: /cvs/dist/rpms/libsoup/devel/libsoup.spec,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- libsoup.spec 4 Mar 2006 05:47:27 -0000 1.31 +++ libsoup.spec 4 Mar 2006 06:08:12 -0000 1.32 @@ -55,7 +55,7 @@ %files %defattr(-, root, root) -%doc README COPYING ChangeLog NEWS TODO AUTHORS INSTALL +%doc README COPYING ChangeLog NEWS AUTHORS INSTALL %{_libdir}/lib*.so.* %files devel From fedora-cvs-commits at redhat.com Sat Mar 4 07:24:21 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sat, 4 Mar 2006 02:24:21 -0500 Subject: rpms/wpa_supplicant/devel wpa_supplicant-assoc-timeout.patch, NONE, 1.1 wpa_supplicant-driver-wext-debug.patch, NONE, 1.1 wpa_supplicant.spec, 1.11, 1.12 Message-ID: <200603040724.k247OLim012904@cvs.devel.redhat.com> Author: dcbw Update of /cvs/dist/rpms/wpa_supplicant/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv12789 Modified Files: wpa_supplicant.spec Added Files: wpa_supplicant-assoc-timeout.patch wpa_supplicant-driver-wext-debug.patch Log Message: * Fri Mar 3 2006 Dan Williams - 0.4.8-5 - Increase association timeout, mainly for drivers that don't fully support WPA ioctls yet wpa_supplicant-assoc-timeout.patch: wpa_supplicant.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) --- NEW FILE wpa_supplicant-assoc-timeout.patch --- --- wpa_supplicant-0.4.8/wpa_supplicant.c.timeout 2006-03-03 22:26:13.000000000 -0500 +++ wpa_supplicant-0.4.8/wpa_supplicant.c 2006-03-03 22:26:45.000000000 -0500 @@ -1252,9 +1252,9 @@ /* Timeout for IEEE 802.11 authentication and association */ int timeout; if (assoc_failed) - timeout = 5; + timeout = 15; else if (wpa_s->conf->ap_scan == 1) - timeout = 10; + timeout = 15; else timeout = 60; wpa_supplicant_req_auth_timeout(wpa_s, timeout, 0); wpa_supplicant-driver-wext-debug.patch: driver_wext.c | 41 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 41 insertions(+) --- NEW FILE wpa_supplicant-driver-wext-debug.patch --- --- wpa_supplicant-0.4.8/driver_wext.c.debug 2006-03-03 22:57:59.000000000 -0500 +++ wpa_supplicant-0.4.8/driver_wext.c 2006-03-03 22:58:41.000000000 -0500 @@ -1612,20 +1612,32 @@ */ if (drv->auth_alg_fallback && wpa_driver_wext_auth_alg_fallback(drv, params) < 0) +{ +wpa_printf(MSG_DEBUG, "%s: assoc failed because auth_alg_fallback failed", __FUNCTION__); ret = -1; +} if (!params->bssid && wpa_driver_wext_set_bssid(drv, NULL) < 0) +{ +wpa_printf(MSG_DEBUG, "%s: assoc failed because set_bssid failed", __FUNCTION__); ret = -1; +} if (wpa_driver_wext_set_mode(drv, params->mode) < 0) +{ +wpa_printf(MSG_DEBUG, "%s: assoc failed because set_mode failed", __FUNCTION__); ret = -1; +} /* TODO: should consider getting wpa version and cipher/key_mgmt suites * from configuration, not from here, where only the selected suite is * available */ if (wpa_driver_wext_set_gen_ie(drv, params->wpa_ie, params->wpa_ie_len) < 0) +{ +wpa_printf(MSG_DEBUG, "%s: assoc failed because set_gen_ie failed", __FUNCTION__); ret = -1; +} if (params->wpa_ie == NULL || params->wpa_ie_len == 0) value = IW_AUTH_WPA_VERSION_DISABLED; else if (params->wpa_ie[0] == RSN_INFO_ELEM) @@ -1634,23 +1646,38 @@ value = IW_AUTH_WPA_VERSION_WPA; if (wpa_driver_wext_set_auth_param(drv, IW_AUTH_WPA_VERSION, value) < 0) +{ +wpa_printf(MSG_DEBUG, "%s: assoc failed because set_auth_param(WPA_VERSION) failed", __FUNCTION__); ret = -1; +} value = wpa_driver_wext_cipher2wext(params->pairwise_suite); if (wpa_driver_wext_set_auth_param(drv, IW_AUTH_CIPHER_PAIRWISE, value) < 0) +{ +wpa_printf(MSG_DEBUG, "%s: assoc failed because set_auth_param(CIPHER_PAIRWISE) failed", __FUNCTION__); ret = -1; +} value = wpa_driver_wext_cipher2wext(params->group_suite); if (wpa_driver_wext_set_auth_param(drv, IW_AUTH_CIPHER_GROUP, value) < 0) +{ +wpa_printf(MSG_DEBUG, "%s: assoc failed because set_auth_param(CIPHER_GROUP) failed", __FUNCTION__); ret = -1; +} value = wpa_driver_wext_keymgmt2wext(params->key_mgmt_suite); if (wpa_driver_wext_set_auth_param(drv, IW_AUTH_KEY_MGMT, value) < 0) +{ +wpa_printf(MSG_DEBUG, "%s: assoc failed because set_auth_param(KEY_MGMT) failed", __FUNCTION__); ret = -1; +} value = params->key_mgmt_suite != KEY_MGMT_NONE; if (wpa_driver_wext_set_auth_param(drv, IW_AUTH_PRIVACY_INVOKED, value) < 0) +{ +wpa_printf(MSG_DEBUG, "%s: assoc failed because set_auth_param(PRIVACY_INVOKED) failed", __FUNCTION__); ret = -1; +} /* Allow unencrypted EAPOL messages even if pairwise keys are set when * not using WPA. IEEE 802.1X specifies that these frames are not @@ -1664,14 +1691,26 @@ if (wpa_driver_wext_set_auth_param(drv, IW_AUTH_RX_UNENCRYPTED_EAPOL, allow_unencrypted_eapol) < 0) +{ +wpa_printf(MSG_DEBUG, "%s: assoc failed because set_auth_param(RX_UNENCRYPTED_EAPOL) failed", __FUNCTION__); ret = -1; +} if (params->freq && wpa_driver_wext_set_freq(drv, params->freq) < 0) +{ +wpa_printf(MSG_DEBUG, "%s: assoc failed because set_freq failed", __FUNCTION__); ret = -1; +} if (wpa_driver_wext_set_ssid(drv, params->ssid, params->ssid_len) < 0) +{ +wpa_printf(MSG_DEBUG, "%s: assoc failed because set_ssid failed", __FUNCTION__); ret = -1; +} if (params->bssid && wpa_driver_wext_set_bssid(drv, params->bssid) < 0) +{ +wpa_printf(MSG_DEBUG, "%s: assoc failed because set_bssid2 failed", __FUNCTION__); ret = -1; +} return ret; } @@ -1696,6 +1735,8 @@ res = wpa_driver_wext_set_auth_param(drv, IW_AUTH_80211_AUTH_ALG, algs); drv->auth_alg_fallback = res == -2; +if (res == -2) +wpa_printf(MSG_DEBUG, "%s: falling back to ENCODE for AUTH", __FUNCTION__); return res; } Index: wpa_supplicant.spec =================================================================== RCS file: /cvs/dist/rpms/wpa_supplicant/devel/wpa_supplicant.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- wpa_supplicant.spec 3 Mar 2006 20:20:33 -0000 1.11 +++ wpa_supplicant.spec 4 Mar 2006 07:24:19 -0000 1.12 @@ -2,7 +2,7 @@ Name: wpa_supplicant Epoch: 1 Version: 0.4.8 -Release: 4 +Release: 5 License: GPL Group: System Environment/Base Source0: http://hostap.epitest.fi/releases/%{name}-%{version}.tar.gz @@ -14,6 +14,8 @@ Patch0: wpa_supplicant-auth-fallback-v4.patch Patch1: wpa_supplicant-ctrl-iface-ap-scan.patch Patch2: wpa_supplicant-ctrl-iface-hide-keys.patch +Patch3: wpa_supplicant-assoc-timeout.patch +Patch4: wpa_supplicant-driver-wext-debug.patch URL: http://hostap.epitest.fi/wpa_supplicant/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -42,6 +44,8 @@ %patch0 -p0 -b .we-auth-fallback %patch1 -p1 -b .ap-scan %patch2 -p1 -b .ctrl-iface-hide-keys +%patch3 -p1 -b .assoc-timeout +%patch4 -p1 -b .driver-wext-debug %build cp %{SOURCE1} ./.config @@ -119,6 +123,10 @@ %{_bindir}/wpa_gui %changelog +* Fri Mar 3 2006 Dan Williams - 0.4.8-5 +- Increase association timeout, mainly for drivers that don't + fully support WPA ioctls yet + * Fri Mar 3 2006 Dan Williams - 0.4.8-4 - Add additional BuildRequires #rh181914# - Add prereq on chkconfig #rh182905# #rh182906# From fedora-cvs-commits at redhat.com Sat Mar 4 08:09:09 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sat, 4 Mar 2006 03:09:09 -0500 Subject: rpms/gcc/devel gcc41-cfaval.patch, NONE, 1.1 .cvsignore, 1.138, 1.139 gcc41.spec, 1.42, 1.43 sources, 1.140, 1.141 gcc41-floatunXiYf.patch, 1.1, NONE gcc41-fortran-matmul.patch, 1.1, NONE gcc41-fortran-where-opt.patch, 1.1, NONE gcc41-pr26208.patch, 1.1, NONE Message-ID: <200603040809.k24899PW001106@cvs.devel.redhat.com> Author: jakub Update of /cvs/dist/rpms/gcc/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv1042 Modified Files: .cvsignore gcc41.spec sources Added Files: gcc41-cfaval.patch Removed Files: gcc41-floatunXiYf.patch gcc41-fortran-matmul.patch gcc41-fortran-where-opt.patch gcc41-pr26208.patch Log Message: 4.1.0-2 gcc41-cfaval.patch: testsuite/gcc.target/i386/cleanup-1.c | 240 ++++++++++++++++++++++++++++++++++ testsuite/gcc.target/i386/cleanup-2.c | 205 +++++++++++++++++++++++++++++ unwind-dw2.c | 124 ++++++++++++++++- unwind-dw2.h | 4 4 files changed, 563 insertions(+), 10 deletions(-) --- NEW FILE gcc41-cfaval.patch --- 2006-03-03 Jakub Jelinek * unwind-dw2.h (_Unwind_FrameState): Add REG_SAVED_VAL_OFFSET and REG_SAVED_VAL_EXP constants. * unwind-dw2.c (struct _Unwind_Context): Add by_value array. (_Unwind_GetGR, _Unwind_SetGR, _Unwind_GetGRPtr, _Unwind_SetGRPtr): Handle regs stored by value. (_Unwind_SetGRValue, _Unwind_GRByValue): New functions. (execute_cfa_program): Handle DW_CFA_val_offset, DW_CFA_val_offset_sf and DW_CFA_val_expression. (uw_update_context_1): Handle REG_SAVED_REG with regs stored by value specially. Handle REG_SAVED_VAL_OFFSET and REG_SAVED_VAL_EXP. (uw_install_context_1): Handle target regs stored by value. * gcc.target/i386/cleanup-1.c: New test. * gcc.target/i386/cleanup-2.c: New test. --- gcc/unwind-dw2.h.jj 2006-03-01 14:43:03.000000000 +0100 +++ gcc/unwind-dw2.h 2006-03-01 15:02:51.000000000 +0100 @@ -53,7 +53,9 @@ typedef struct REG_UNSAVED, REG_SAVED_OFFSET, REG_SAVED_REG, - REG_SAVED_EXP + REG_SAVED_EXP, + REG_SAVED_VAL_OFFSET, + REG_SAVED_VAL_EXP } how; } reg[DWARF_FRAME_REGISTERS+1]; --- gcc/unwind-dw2.c.jj 2006-03-01 14:43:03.000000000 +0100 +++ gcc/unwind-dw2.c 2006-03-02 18:59:34.000000000 +0100 @@ -72,6 +72,7 @@ struct _Unwind_Context struct dwarf_eh_bases bases; _Unwind_Word args_size; char signal_frame; + char by_value[DWARF_FRAME_REGISTERS+1]; }; /* Byte size of every register managed by these routines. */ @@ -118,7 +119,7 @@ read_8u (const void *p) { const union un static inline unsigned long read_8s (const void *p) { const union unaligned *up = p; return up->s8; } -/* Get the value of register REG as saved in CONTEXT. */ +/* Get the value of register INDEX as saved in CONTEXT. */ inline _Unwind_Word _Unwind_GetGR (struct _Unwind_Context *context, int index) @@ -136,6 +137,9 @@ _Unwind_GetGR (struct _Unwind_Context *c size = dwarf_reg_size_table[index]; ptr = context->reg[index]; + if (context->by_value[index]) + return (_Unwind_Word) (_Unwind_Internal_Ptr) ptr; + /* This will segfault if the register hasn't been saved. */ if (size == sizeof(_Unwind_Ptr)) return * (_Unwind_Ptr *) ptr; @@ -160,7 +164,7 @@ _Unwind_GetCFA (struct _Unwind_Context * return (_Unwind_Ptr) context->cfa; } -/* Overwrite the saved value for register REG in CONTEXT with VAL. */ +/* Overwrite the saved value for register INDEX in CONTEXT with VAL. */ inline void _Unwind_SetGR (struct _Unwind_Context *context, int index, _Unwind_Word val) @@ -171,6 +175,13 @@ _Unwind_SetGR (struct _Unwind_Context *c index = DWARF_REG_TO_UNWIND_COLUMN (index); gcc_assert (index < (int) sizeof(dwarf_reg_size_table)); size = dwarf_reg_size_table[index]; + + if (context->by_value[index]) + { + context->reg[index] = (void *) (_Unwind_Internal_Ptr) val; + return; + } + ptr = context->reg[index]; if (size == sizeof(_Unwind_Ptr)) @@ -188,6 +199,8 @@ static inline void * _Unwind_GetGRPtr (struct _Unwind_Context *context, int index) { index = DWARF_REG_TO_UNWIND_COLUMN (index); + if (context->by_value[index]) + return &context->reg[index]; return context->reg[index]; } @@ -197,9 +210,34 @@ static inline void _Unwind_SetGRPtr (struct _Unwind_Context *context, int index, void *p) { index = DWARF_REG_TO_UNWIND_COLUMN (index); + context->by_value[index] = 0; context->reg[index] = p; } +/* Overwrite the saved value for register INDEX in CONTEXT with VAL. */ + +static inline void +_Unwind_SetGRValue (struct _Unwind_Context *context, int index, + _Unwind_Word val) +{ + index = DWARF_REG_TO_UNWIND_COLUMN (index); + gcc_assert (index < (int) sizeof(dwarf_reg_size_table)); + gcc_assert (dwarf_reg_size_table[index] == sizeof (_Unwind_Ptr)); + + context->by_value[index] = 1; + context->reg[index] = (void *) (_Unwind_Internal_Ptr) val; +} + +/* Return non-zero if register INDEX is stored by value rather than + by reference. */ + +static inline int +_Unwind_GRByValue (struct _Unwind_Context *context, int index) +{ + index = DWARF_REG_TO_UNWIND_COLUMN (index); + return context->by_value[index]; +} + /* Retrieve the return address for CONTEXT. */ inline _Unwind_Ptr @@ -922,7 +960,7 @@ execute_cfa_program (const unsigned char insn_ptr += utmp; break; - /* From the dwarf3 draft. */ + /* Dwarf3. */ case DW_CFA_offset_extended_sf: insn_ptr = read_uleb128 (insn_ptr, ®); insn_ptr = read_sleb128 (insn_ptr, &stmp); @@ -945,6 +983,33 @@ execute_cfa_program (const unsigned char /* cfa_how deliberately not set. */ break; + case DW_CFA_val_offset: + insn_ptr = read_uleb128 (insn_ptr, ®); + insn_ptr = read_uleb128 (insn_ptr, &utmp); + offset = (_Unwind_Sword) utmp * fs->data_align; + fs->regs.reg[DWARF_REG_TO_UNWIND_COLUMN (reg)].how + = REG_SAVED_VAL_OFFSET; + fs->regs.reg[DWARF_REG_TO_UNWIND_COLUMN (reg)].loc.offset = offset; + break; + + case DW_CFA_val_offset_sf: + insn_ptr = read_uleb128 (insn_ptr, ®); + insn_ptr = read_sleb128 (insn_ptr, &stmp); + offset = stmp * fs->data_align; + fs->regs.reg[DWARF_REG_TO_UNWIND_COLUMN (reg)].how + = REG_SAVED_VAL_OFFSET; + fs->regs.reg[DWARF_REG_TO_UNWIND_COLUMN (reg)].loc.offset = offset; + break; + + case DW_CFA_val_expression: + insn_ptr = read_uleb128 (insn_ptr, ®); + fs->regs.reg[DWARF_REG_TO_UNWIND_COLUMN (reg)].how + = REG_SAVED_VAL_EXP; + fs->regs.reg[DWARF_REG_TO_UNWIND_COLUMN (reg)].loc.exp = insn_ptr; + insn_ptr = read_uleb128 (insn_ptr, &utmp); + insn_ptr += utmp; + break; + case DW_CFA_GNU_window_save: /* ??? Hardcoded for SPARC register window configuration. */ for (reg = 16; reg < 32; ++reg) @@ -1113,7 +1178,7 @@ typedef union { _Unwind_Ptr ptr; _Unwind static inline void _Unwind_SetSpColumn (struct _Unwind_Context *context, void *cfa, - _Unwind_SpTmp *tmp_sp) + _Unwind_SpTmp *tmp_sp) { int size = dwarf_reg_size_table[__builtin_dwarf_sp_column ()]; @@ -1194,9 +1259,14 @@ uw_update_context_1 (struct _Unwind_Cont break; case REG_SAVED_REG: - _Unwind_SetGRPtr - (context, i, - _Unwind_GetGRPtr (&orig_context, fs->regs.reg[i].loc.reg)); + if (_Unwind_GRByValue (&orig_context, fs->regs.reg[i].loc.reg)) + _Unwind_SetGRValue (context, i, + _Unwind_GetGR (&orig_context, + fs->regs.reg[i].loc.reg)); + else + _Unwind_SetGRPtr (context, i, + _Unwind_GetGRPtr (&orig_context, + fs->regs.reg[i].loc.reg)); break; case REG_SAVED_EXP: @@ -1211,6 +1281,25 @@ uw_update_context_1 (struct _Unwind_Cont _Unwind_SetGRPtr (context, i, (void *) val); } break; + + case REG_SAVED_VAL_OFFSET: + _Unwind_SetGRValue (context, i, + (_Unwind_Internal_Ptr) + (cfa + fs->regs.reg[i].loc.offset)); + break; + + case REG_SAVED_VAL_EXP: + { + const unsigned char *exp = fs->regs.reg[i].loc.exp; + _Unwind_Word len; + _Unwind_Ptr val; + + exp = read_uleb128 (exp, &len); + val = execute_stack_op (exp, exp + len, &orig_context, + (_Unwind_Ptr) cfa); + _Unwind_SetGRValue (context, i, val); + } + break; } context->signal_frame = fs->signal_frame; @@ -1327,14 +1416,31 @@ uw_install_context_1 (struct _Unwind_Con /* If the target frame does not have a saved stack pointer, then set up the target's CFA. */ if (!_Unwind_GetGRPtr (target, __builtin_dwarf_sp_column ())) - _Unwind_SetSpColumn (target, target->cfa, &sp_slot); + _Unwind_SetSpColumn (target, target->cfa, &sp_slot); for (i = 0; i < DWARF_FRAME_REGISTERS; ++i) { void *c = current->reg[i]; void *t = target->reg[i]; - if (t && c && t != c) + gcc_assert (current->by_value[i] == 0); + if (target->by_value[i] && c) + { + _Unwind_Word w; + _Unwind_Ptr p; + if (dwarf_reg_size_table[i] == sizeof (_Unwind_Word)) + { + w = (_Unwind_Internal_Ptr) t; + memcpy (c, &w, sizeof (_Unwind_Word)); + } + else + { + gcc_assert (dwarf_reg_size_table[i] == sizeof (_Unwind_Ptr)); + p = (_Unwind_Internal_Ptr) t; + memcpy (c, &p, sizeof (_Unwind_Ptr)); + } + } + else if (t && c && t != c) memcpy (c, t, dwarf_reg_size_table[i]); } --- gcc/testsuite/gcc.target/i386/cleanup-1.c.jj 2006-03-03 11:25:14.000000000 +0100 +++ gcc/testsuite/gcc.target/i386/cleanup-1.c 2006-03-03 11:25:48.000000000 +0100 @@ -0,0 +1,240 @@ +/* { dg-do run { target i?86-*-linux* x86_64-*-linux* } } */ +/* { dg-options "-fexceptions -fnon-call-exceptions -fasynchronous-unwind-tables -O2" } */ +/* Test complex CFA value expressions. */ + +#include +#include +#include +#include +#include + +static _Unwind_Reason_Code +force_unwind_stop (int version, _Unwind_Action actions, + _Unwind_Exception_Class exc_class, + struct _Unwind_Exception *exc_obj, + struct _Unwind_Context *context, + void *stop_parameter) +{ + if (actions & _UA_END_OF_STACK) + abort (); + return _URC_NO_REASON; +} + +static void +force_unwind () +{ + struct _Unwind_Exception *exc = malloc (sizeof (*exc)); + memset (&exc->exception_class, 0, sizeof (exc->exception_class)); + exc->exception_cleanup = 0; + + _Unwind_ForcedUnwind (exc, force_unwind_stop, 0); + abort (); +} + +int count; + +static void +counter (void *p __attribute__((unused))) +{ + ++count; +} + +static void +handler (void *p __attribute__((unused))) +{ + if (count != 2) + abort (); + _exit (0); +} + +static int __attribute__((noinline)) +fn5 (void) +{ + char dummy __attribute__((cleanup (counter))); + force_unwind (); + return 0; +} + +void +bar (void) +{ + char dummy __attribute__((cleanup (counter))); + fn5 (); +} + +void __attribute__((noinline)) +foo (int x) +{ + char buf[256]; +#ifdef __i386__ + __asm ( + "testl %0, %0\n\t" + "jnz 1f\n\t" + ".subsection 1\n\t" + ".type _L_mutex_lock_%=, @function\n" +"_L_mutex_lock_%=:\n" +"1:\t" "leal %1, %%ecx\n" +"2:\t" "call bar\n" +"3:\t" "jmp 18f\n" +"4:\t" ".size _L_mutex_lock_%=, .-_L_mutex_lock_%=\n\t" + ".previous\n\t" + ".section .eh_frame,\"a\", at progbits\n" +"5:\t" ".long 7f-6f # Length of Common Information Entry\n" +"6:\t" ".long 0x0 # CIE Identifier Tag\n\t" + ".byte 0x1 # CIE Version\n\t" + ".ascii \"zR\\0\" # CIE Augmentation\n\t" + ".uleb128 0x1 # CIE Code Alignment Factor\n\t" + ".sleb128 -4 # CIE Data Alignment Factor\n\t" + ".byte 0x8 # CIE RA Column\n\t" + ".uleb128 0x1 # Augmentation size\n\t" + ".byte 0x1b # FDE Encoding (pcrel sdata4)\n\t" + ".byte 0xc # DW_CFA_def_cfa\n\t" + ".uleb128 0x4\n\t" + ".uleb128 0x0\n\t" + ".align 4\n" +"7:\t" ".long 17f-8f # FDE Length\n" +"8:\t" ".long 8b-5b # FDE CIE offset\n\t" + ".long 1b-. # FDE initial location\n\t" + ".long 4b-1b # FDE address range\n\t" + ".uleb128 0x0 # Augmentation size\n\t" + ".byte 0x16 # DW_CFA_val_expression\n\t" + ".uleb128 0x8\n\t" + ".uleb128 10f-9f\n" +"9:\t" ".byte 0x78 # DW_OP_breg8\n\t" + ".sleb128 3b-1b\n" +"10:\t" ".byte 0x40 + (2b-1b) # DW_CFA_advance_loc\n\t" + ".byte 0x16 # DW_CFA_val_expression\n\t" + ".uleb128 0x8\n\t" + ".uleb128 12f-11f\n" +"11:\t" ".byte 0x78 # DW_OP_breg8\n\t" + ".sleb128 3b-2b\n" +"12:\t" ".byte 0x40 + (3b-2b-1) # DW_CFA_advance_loc\n\t" + ".byte 0x16 # DW_CFA_val_expression\n\t" + ".uleb128 0x8\n\t" + ".uleb128 16f-13f\n" +"13:\t" ".byte 0x78 # DW_OP_breg8\n\t" + ".sleb128 15f-14f\n\t" + ".byte 0x0d # DW_OP_const4s\n" +"14:\t" ".4byte 3b-.\n\t" + ".byte 0x1c # DW_OP_minus\n\t" + ".byte 0x0d # DW_OP_const4s\n" +"15:\t" ".4byte 18f-.\n\t" + ".byte 0x22 # DW_OP_plus\n" +"16:\t" ".align 4\n" +"17:\t" ".previous\n" +"18:" + : : "r" (x), "m" (x), "r" (buf) + : "memory", "eax", "edx", "ecx"); +#elif defined __x86_64__ + __asm ( + "testl %0, %0\n\t" + "jnz 1f\n\t" + ".subsection 1\n\t" + ".type _L_mutex_lock_%=, @function\n" +"_L_mutex_lock_%=:\n" +"1:\t" "leaq %1, %%rdi\n" +"2:\t" "subq $128, %%rsp\n" +"3:\t" "call bar\n" +"4:\t" "addq $128, %%rsp\n" +"5:\t" "jmp 24f\n" +"6:\t" ".size _L_mutex_lock_%=, .-_L_mutex_lock_%=\n\t" + ".previous\n\t" + ".section .eh_frame,\"a\", at progbits\n" +"7:\t" ".long 9f-8f # Length of Common Information Entry\n" +"8:\t" ".long 0x0 # CIE Identifier Tag\n\t" + ".byte 0x1 # CIE Version\n\t" + ".ascii \"zR\\0\" # CIE Augmentation\n\t" + ".uleb128 0x1 # CIE Code Alignment Factor\n\t" + ".sleb128 -8 # CIE Data Alignment Factor\n\t" + ".byte 0x10 # CIE RA Column\n\t" + ".uleb128 0x1 # Augmentation size\n\t" + ".byte 0x1b # FDE Encoding (pcrel sdata4)\n\t" + ".byte 0x12 # DW_CFA_def_cfa_sf\n\t" + ".uleb128 0x7\n\t" + ".sleb128 16\n\t" + ".align 8\n" +"9:\t" ".long 23f-10f # FDE Length\n" +"10:\t" ".long 10b-7b # FDE CIE offset\n\t" + ".long 1b-. # FDE initial location\n\t" + ".long 6b-1b # FDE address range\n\t" + ".uleb128 0x0 # Augmentation size\n\t" + ".byte 0x16 # DW_CFA_val_expression\n\t" + ".uleb128 0x10\n\t" + ".uleb128 12f-11f\n" +"11:\t" ".byte 0x80 # DW_OP_breg16\n\t" + ".sleb128 4b-1b\n" +"12:\t" ".byte 0x40 + (2b-1b) # DW_CFA_advance_loc\n\t" + ".byte 0x16 # DW_CFA_val_expression\n\t" + ".uleb128 0x10\n\t" + ".uleb128 14f-13f\n" +"13:\t" ".byte 0x80 # DW_OP_breg16\n\t" + ".sleb128 4b-2b\n" +"14:\t" ".byte 0x40 + (3b-2b) # DW_CFA_advance_loc\n\t" + ".byte 0x0e # DW_CFA_def_cfa_offset\n\t" + ".uleb128 0\n\t" + ".byte 0x16 # DW_CFA_val_expression\n\t" + ".uleb128 0x10\n\t" + ".uleb128 16f-15f\n" +"15:\t" ".byte 0x80 # DW_OP_breg16\n\t" + ".sleb128 4b-3b\n" +"16:\t" ".byte 0x40 + (4b-3b-1) # DW_CFA_advance_loc\n\t" + ".byte 0x0e # DW_CFA_def_cfa_offset\n\t" + ".uleb128 128\n\t" + ".byte 0x16 # DW_CFA_val_expression\n\t" + ".uleb128 0x10\n\t" + ".uleb128 20f-17f\n" +"17:\t" ".byte 0x80 # DW_OP_breg16\n\t" + ".sleb128 19f-18f\n\t" + ".byte 0x0d # DW_OP_const4s\n" +"18:\t" ".4byte 4b-.\n\t" + ".byte 0x1c # DW_OP_minus\n\t" + ".byte 0x0d # DW_OP_const4s\n" +"19:\t" ".4byte 24f-.\n\t" + ".byte 0x22 # DW_OP_plus\n" +"20:\t" ".byte 0x40 + (5b-4b+1) # DW_CFA_advance_loc\n\t" + ".byte 0x13 # DW_CFA_def_cfa_offset_sf\n\t" + ".sleb128 16\n\t" + ".byte 0x16 # DW_CFA_val_expression\n\t" + ".uleb128 0x10\n\t" + ".uleb128 22f-21f\n" +"21:\t" ".byte 0x80 # DW_OP_breg16\n\t" + ".sleb128 4b-5b\n" +"22:\t" ".align 8\n" +"23:\t" ".previous\n" +"24:" + : : "r" (x), "m" (x), "r" (buf) + : "memory", "rax", "rdx", "rcx", "rsi", "rdi", + "r8", "r9", "r10", "r11"); +#else +# error Unsupported test architecture +#endif +} + +static int __attribute__((noinline)) +fn2 (void) +{ + foo (3); + return 0; +} + +static int __attribute__((noinline)) +fn1 (void) +{ + fn2 (); + return 0; +} + +static void * +fn0 (void) +{ + char dummy __attribute__((cleanup (handler))); + fn1 (); + return 0; +} + +int +main (void) +{ + fn0 (); + return 0; +} --- gcc/testsuite/gcc.target/i386/cleanup-2.c.jj 2006-03-03 11:25:26.000000000 +0100 +++ gcc/testsuite/gcc.target/i386/cleanup-2.c 2006-03-03 11:27:06.000000000 +0100 @@ -0,0 +1,205 @@ +/* { dg-do run { target { { i?86-*-linux* x86_64-*-linux* } && lp64 } } } */ +/* { dg-options "-fexceptions -fnon-call-exceptions -fasynchronous-unwind-tables -O2" } */ +/* Test complex CFA value expressions. */ + +#include +#include +#include +#include +#include + +static _Unwind_Reason_Code +force_unwind_stop (int version, _Unwind_Action actions, + _Unwind_Exception_Class exc_class, + struct _Unwind_Exception *exc_obj, + struct _Unwind_Context *context, + void *stop_parameter) +{ + if (actions & _UA_END_OF_STACK) + abort (); + return _URC_NO_REASON; +} + +static void +force_unwind () +{ + struct _Unwind_Exception *exc = malloc (sizeof (*exc)); + memset (&exc->exception_class, 0, sizeof (exc->exception_class)); + exc->exception_cleanup = 0; + + _Unwind_ForcedUnwind (exc, force_unwind_stop, 0); + abort (); +} + +int count; + +static void +counter (void *p __attribute__((unused))) +{ + ++count; +} + +static void +handler (void *p __attribute__((unused))) +{ + if (count != 2) + abort (); + _exit (0); +} + +static int __attribute__((noinline)) +fn5 (void) +{ + char dummy __attribute__((cleanup (counter))); + force_unwind (); + return 0; +} + +void +bar (void) +{ + char dummy __attribute__((cleanup (counter))); + fn5 (); +} + +void __attribute__((noinline)) +foo (int x) +{ + char buf[256]; +#ifdef __x86_64__ + __asm ( + "testl %0, %0\n\t" + "jnz 1f\n\t" + ".subsection 1\n\t" + ".type _L_mutex_lock_%=, @function\n" +"_L_mutex_lock_%=:\n" +"1:\t" "leaq %1, %%rdi\n" +"2:\t" "subq $128, %%rsp\n" +"3:\t" "call bar\n" +"4:\t" "addq $128, %%rsp\n" +"5:\t" "jmp 21f\n" +"6:\t" ".size _L_mutex_lock_%=, .-_L_mutex_lock_%=\n\t" + ".previous\n\t" + ".section .eh_frame,\"a\", at progbits\n" +"7:\t" ".long 9f-8f # Length of Common Information Entry\n" +"8:\t" ".long 0x0 # CIE Identifier Tag\n\t" + ".byte 0x1 # CIE Version\n\t" + ".ascii \"zR\\0\" # CIE Augmentation\n\t" + ".uleb128 0x1 # CIE Code Alignment Factor\n\t" + ".sleb128 -8 # CIE Data Alignment Factor\n\t" + ".byte 0x10 # CIE RA Column\n\t" + ".uleb128 0x1 # Augmentation size\n\t" + ".byte 0x1b # FDE Encoding (pcrel sdata4)\n\t" + ".byte 0xc # DW_CFA_def_cfa\n\t" + ".uleb128 0x7\n\t" + ".uleb128 0x0\n\t" + ".align 8\n" +"9:\t" ".long 20f-10f # FDE Length\n" +"10:\t" ".long 10b-7b # FDE CIE offset\n\t" + ".long 1b-. # FDE initial location\n\t" + ".long 6b-1b # FDE address range\n\t" + ".uleb128 0x0 # Augmentation size\n\t" + /* This CFA expression computes the address right + past the jnz instruction above, from %rip somewhere + within the _L_mutex_lock_%= subsection. */ + ".byte 0x16 # DW_CFA_val_expression\n\t" + ".uleb128 0x10\n\t" + ".uleb128 19f-11f\n" +"11:\t" ".byte 0x80 # DW_OP_breg16\n\t" + ".sleb128 0\n" +"12:\t" ".byte 0x12 # DW_OP_dup\n\t" + ".byte 0x94 # DW_OP_deref_size\n\t" + ".byte 1\n\t" + ".byte 0x12 # DW_OP_dup\n\t" + ".byte 0x08 # DW_OP_const1u\n\t" + ".byte 0x48\n\t" + ".byte 0x2e # DW_OP_ne\n\t" + ".byte 0x28 # DW_OP_bra\n\t" + ".2byte 16f-13f\n" +"13:\t" ".byte 0x13 # DW_OP_drop\n\t" + ".byte 0x23 # DW_OP_plus_uconst\n\t" + ".uleb128 1\n\t" + ".byte 0x12 # DW_OP_dup\n\t" + ".byte 0x94 # DW_OP_deref_size\n\t" + ".byte 1\n\t" + ".byte 0x08 # DW_OP_const1u\n\t" + ".byte 0x81\n\t" + ".byte 0x2e # DW_OP_ne\n\t" + ".byte 0x28 # DW_OP_bra\n\t" + ".2byte 15f-14f\n" +"14:\t" ".byte 0x23 # DW_OP_plus_uconst\n\t" + ".uleb128 3b-2b-1\n\t" + ".byte 0x2f # DW_OP_skip\n\t" + ".2byte 12b-15f\n" +"15:\t" ".byte 0x23 # DW_OP_plus_uconst\n\t" + ".uleb128 2b-1b-1\n\t" + ".byte 0x2f # DW_OP_skip\n\t" + ".2byte 12b-16f\n" +"16:\t" ".byte 0x08 # DW_OP_const1u\n\t" + ".byte 0xe8\n\t" + ".byte 0x2e # DW_OP_ne\n\t" + ".byte 0x28 # DW_OP_bra\n\t" + ".2byte 18f-17f\n" +"17:\t" ".byte 0x23 # DW_OP_plus_uconst\n\t" + ".uleb128 4b-3b\n\t" + ".byte 0x2f # DW_OP_skip\n\t" + ".2byte 12b-18f\n" +"18:\t" ".byte 0x23 # DW_OP_plus_uconst\n\t" + ".uleb128 1\n\t" + ".byte 0x12 # DW_OP_dup\n\t" + ".byte 0x94 # DW_OP_deref_size\n\t" + ".byte 4\n\t" + ".byte 0x08 # DW_OP_const1u\n\t" + ".byte 72 - (6b-5b) * 8 # (6b-5b) == 5 ? 32 : 56\n\t" + ".byte 0x24 # DW_OP_shl\n\t" + ".byte 0x08 # DW_OP_const1u\n\t" + ".byte 72 - (6b-5b) * 8 # (6b-5b) == 5 ? 32 : 56\n\t" + ".byte 0x26 # DW_OP_shra\n\t" + ".byte 0x22 # DW_OP_plus\n\t" + ".byte 0x23 # DW_OP_plus_uconst\n\t" + ".uleb128 6b-5b-1\n" +"19:\t" ".byte 0x40 + (3b-1b) # DW_CFA_advance_loc\n\t" + ".byte 0xe # DW_CFA_def_cfa_offset\n\t" + ".uleb128 128\n\t" + ".byte 0x40 + (5b-3b) # DW_CFA_advance_loc\n\t" + ".byte 0xe # DW_CFA_def_cfa_offset\n\t" + ".uleb128 0\n\t" + ".align 8\n" +"20:\t" ".previous\n" +"21:" + : : "r" (x), "m" (x), "r" (buf) + : "memory", "rax", "rdx", "rcx", "rsi", "rdi", + "r8", "r9", "r10", "r11"); +#else +# error Unsupported test architecture +#endif +} + +static int __attribute__((noinline)) +fn2 (void) +{ + foo (3); + return 0; +} + +static int __attribute__((noinline)) +fn1 (void) +{ + fn2 (); + return 0; +} + +static void * +fn0 (void) +{ + char dummy __attribute__((cleanup (handler))); + fn1 (); + return 0; +} + +int +main (void) +{ + fn0 (); + return 0; +} Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/gcc/devel/.cvsignore,v retrieving revision 1.138 retrieving revision 1.139 diff -u -r1.138 -r1.139 --- .cvsignore 28 Feb 2006 23:06:23 -0000 1.138 +++ .cvsignore 4 Mar 2006 08:09:07 -0000 1.139 @@ -1 +1 @@ -gcc-4.1.0-20060228.tar.bz2 +gcc-4.1.0-20060304.tar.bz2 Index: gcc41.spec =================================================================== RCS file: /cvs/dist/rpms/gcc/devel/gcc41.spec,v retrieving revision 1.42 retrieving revision 1.43 diff -u -r1.42 -r1.43 --- gcc41.spec 28 Feb 2006 23:06:24 -0000 1.42 +++ gcc41.spec 4 Mar 2006 08:09:07 -0000 1.43 @@ -1,6 +1,6 @@ -%define DATE 20060228 +%define DATE 20060304 %define gcc_version 4.1.0 -%define gcc_release 1 +%define gcc_release 2 %define _unpackaged_files_terminate_build 0 %define multilib_64_archs sparc64 ppc64 s390x x86_64 %ifarch %{ix86} x86_64 ia64 @@ -106,6 +106,7 @@ Patch9: gcc41-ppc32-retaddr.patch Patch10: gcc41-x86_64-sse3.patch Patch11: gcc41-mni.patch +Patch12: gcc41-cfaval.patch %define _gnu %{nil} %ifarch sparc @@ -396,6 +397,7 @@ %patch9 -p0 -b .ppc32-retaddr~ %patch10 -p0 -b .x86_64-sse3~ %patch11 -p0 -b .mni~ +%patch12 -p0 -b .cfaval~ sed -i -e 's/4\.1\.1/4.1.0/' gcc/BASE-VER gcc/version.c sed -i -e 's/" (Red Hat[^)]*)"/" (Red Hat %{version}-%{gcc_release})"/' gcc/version.c @@ -1413,6 +1415,12 @@ %doc rpm.doc/changelogs/libmudflap/ChangeLog* %changelog +* Sat Mar 4 2006 Jakub Jelinek 4.1.0-2 +- update from -gcc-4_1-branch (-r111570:111697) + - PRs c++/26291, libgfortran/26136, libgfortran/26423, libgfortran/26464, + libstdc++/26526, rtl-optimization/26345, target/19061, target/26453 +- handle DW_CFA_val_{offset,offset_sf,expression} in the libgcc{,_s} unwinder + * Tue Feb 28 2006 Jakub Jelinek 4.1.0-1 - update from gcc-4_1-branch (-r111466:111570) - GCC 4.1.0 release Index: sources =================================================================== RCS file: /cvs/dist/rpms/gcc/devel/sources,v retrieving revision 1.140 retrieving revision 1.141 diff -u -r1.140 -r1.141 --- sources 28 Feb 2006 23:06:24 -0000 1.140 +++ sources 4 Mar 2006 08:09:07 -0000 1.141 @@ -1 +1 @@ -a561810585dda4f9990a0dc8e8355f01 gcc-4.1.0-20060228.tar.bz2 +cc39dd702c70d0a784c7ecdedbb503b7 gcc-4.1.0-20060304.tar.bz2 --- gcc41-floatunXiYf.patch DELETED --- --- gcc41-fortran-matmul.patch DELETED --- --- gcc41-fortran-where-opt.patch DELETED --- --- gcc41-pr26208.patch DELETED --- From fedora-cvs-commits at redhat.com Sat Mar 4 11:04:47 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sat, 4 Mar 2006 06:04:47 -0500 Subject: rpms/xorg-x11-fonts/devel xorg-x11-fonts.spec,1.11,1.12 Message-ID: <200603041104.k24B4lAu021985@cvs.devel.redhat.com> Author: mharris Update of /cvs/dist/rpms/xorg-x11-fonts/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv21936 Modified Files: xorg-x11-fonts.spec Log Message: * Sat Mar 04 2006 Mike A. Harris 7.0-3 - Ensure upgrade-only section of fonts-base rpm post script only executes on upgrades using -gt instead of -ge. Index: xorg-x11-fonts.spec =================================================================== RCS file: /cvs/dist/rpms/xorg-x11-fonts/devel/xorg-x11-fonts.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- xorg-x11-fonts.spec 24 Feb 2006 15:11:40 -0000 1.11 +++ xorg-x11-fonts.spec 4 Mar 2006 11:04:29 -0000 1.12 @@ -30,7 +30,7 @@ Summary: X.Org X11 fonts Name: xorg-x11-fonts Version: 7.0 -Release: 2 +Release: 3 License: Various licenses Group: User Interface/X URL: http://www.x.org @@ -495,36 +495,24 @@ %post base { - ENCODINGSDIR=%{_datadir}/X11/fonts/encodings - # Generate the encodings.dir files in the encodings directories during - # install time to work around bugs in upstream Makefiles. This is more - # consistent with how we generate fonts.dir files anyway. Fixes bugs: - # https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=173875 - # https://bugs.freedesktop.org/show_bug.cgi?id=6028 - { - for each in "${ENCODINGSDIR}" "${ENCODINGSDIR}/large" ; do - pushd $each &> /dev/null - mkfontscale -n -e "${each}" - popd &> /dev/null - done - } - FONTDIR=%{_x11fontdir}/misc - mkfontdir $FONTDIR - - # NOTE: We add the ":unscaled" suffix to avoid ugly bitmap fonts. - /usr/sbin/chkfontpath -qa %{_x11fontdir}/misc:unscaled + ENCODINGSDIR=%{_datadir}/X11/fonts/encodings + XFSCONFIG=/etc/X11/fs/config - if [ "$1" -ge "1" ] ; then + #------------------------------------------------------------------- + # Upgrade section - during upgrades only + if [ "$1" -gt "1" ] ; then # Remove the Speedo directory from xfs config as X.Org no longer provides # Speedo font support. /usr/sbin/chkfontpath -qr %{_x11fontdir}/Speedo # NOTE: Remove the non :unscaled version of misc font directory from # configuration to undo a temporary workaround that was added in 0.99.0-5 - XFSCONFIG=/etc/X11/fs/config # XFS config file upgrade munging if [ -f $XFSCONFIG ] ; then + # FIXME: chkfontpath is broken, and removes both misc and misc:unscaled + # /usr/sbin/chkfontpath -qr %{_x11fontdir}/misc + # On upgrades, remove 'misc' without :unscaled from the XFS config # file to avoid ugly scaled bitmap fonts. chkfontpath can't be used # as it is buggy and will remove the :unscaled entry also. @@ -535,9 +523,26 @@ fi fi fi -# FIXME: chkfontpath is broken, and removes both misc and misc:unscaled -# /usr/sbin/chkfontpath -qr %{_x11fontdir}/misc + #------------------------------------------------------------------- + # Both installs and upgrades + + # Generate the encodings.dir files in the encodings directories during + # install time to work around bugs in upstream Makefiles. This is more + # consistent with how we generate fonts.dir files anyway. Fixes bugs: + # https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=173875 + # https://bugs.freedesktop.org/show_bug.cgi?id=6028 + { + for each in "${ENCODINGSDIR}" "${ENCODINGSDIR}/large" ; do + pushd $each &> /dev/null + mkfontscale -n -e "${each}" + popd &> /dev/null + done + } + + mkfontdir $FONTDIR + # NOTE: We add the ":unscaled" suffix to avoid ugly bitmap fonts. + /usr/sbin/chkfontpath -qa %{_x11fontdir}/misc:unscaled fc-cache $FONTDIR } # || : @@ -1523,6 +1528,10 @@ %ghost %verify(not md5 size mtime) %{_x11fontdir}/cyrillic/fonts.cache-* %changelog +* Sat Mar 04 2006 Mike A. Harris 7.0-3 +- Ensure upgrade-only section of fonts-base rpm post script only executes on + upgrades using -gt instead of -ge. + * Fri Feb 24 2006 Mike A. Harris 7.0-2 - Generate encodings.dir files in the encodings dirs with mkfontscale from the base fonts package post install script, to work around bug (#173875) From fedora-cvs-commits at redhat.com Sat Mar 4 14:49:39 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sat, 4 Mar 2006 09:49:39 -0500 Subject: rpms/selinux-policy/devel .cvsignore, 1.46, 1.47 modules-targeted.conf, 1.15, 1.16 policy-20060207.patch, 1.32, 1.33 selinux-policy.spec, 1.134, 1.135 sources, 1.50, 1.51 Message-ID: <200603041449.k24EndXx009261@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/selinux-policy/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv9245 Modified Files: .cvsignore modules-targeted.conf policy-20060207.patch selinux-policy.spec sources Log Message: * Sat Mar 4 2006 Dan Walsh 2.2.23-1 - Add hal changes suggested by Jeremy - add policyhelp to point at policy html pages Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/.cvsignore,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- .cvsignore 27 Feb 2006 23:00:38 -0000 1.46 +++ .cvsignore 4 Mar 2006 14:49:35 -0000 1.47 @@ -47,3 +47,4 @@ serefpolicy-2.2.20.tgz serefpolicy-2.2.21.tgz serefpolicy-2.2.22.tgz +serefpolicy-2.2.23.tgz Index: modules-targeted.conf =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/modules-targeted.conf,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- modules-targeted.conf 19 Feb 2006 12:17:15 -0000 1.15 +++ modules-targeted.conf 4 Mar 2006 14:49:35 -0000 1.16 @@ -224,7 +224,7 @@ # # run real-mode video BIOS code to alter hardware state # -vbetool = off +vbetool = base # Layer: admin # Module: firstboot policy-20060207.patch: Rules.modular | 2 +- policy/modules/admin/readahead.te | 2 +- policy/modules/admin/su.fc | 1 + policy/modules/admin/su.if | 6 +++--- policy/modules/admin/vbetool.te | 5 +++++ policy/modules/kernel/corenetwork.te.in | 2 +- policy/modules/kernel/devices.if | 2 +- policy/modules/kernel/files.fc | 2 +- policy/modules/kernel/files.if | 20 ++++++++++++++++++-- policy/modules/services/apache.fc | 2 ++ policy/modules/services/apache.if | 5 +++++ policy/modules/services/bluetooth.te | 5 +++++ policy/modules/services/cron.te | 3 +++ policy/modules/services/cups.fc | 2 +- policy/modules/services/cups.te | 6 ++++-- policy/modules/services/cvs.te | 2 +- policy/modules/services/hal.if | 21 +++++++++++++++++++++ policy/modules/services/hal.te | 2 ++ policy/modules/services/ktalk.te | 2 ++ policy/modules/services/nscd.if | 2 +- policy/modules/services/samba.te | 2 +- policy/modules/system/init.te | 5 +++++ policy/modules/system/libraries.fc | 2 ++ policy/modules/system/locallogin.te | 1 + policy/modules/system/lvm.fc | 1 + policy/modules/system/selinuxutil.fc | 6 +++--- policy/modules/system/selinuxutil.te | 1 + policy/modules/system/udev.te | 2 +- support/Makefile.devel | 5 +---- 29 files changed, 95 insertions(+), 24 deletions(-) Index: policy-20060207.patch =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20060207.patch,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- policy-20060207.patch 4 Mar 2006 05:10:54 -0000 1.32 +++ policy-20060207.patch 4 Mar 2006 14:49:35 -0000 1.33 @@ -35,6 +35,25 @@ kernel_read_system_state($1_su_t) kernel_read_kernel_sysctls($1_su_t) +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/vbetool.te serefpolicy-2.2.23/policy/modules/admin/vbetool.te +--- nsaserefpolicy/policy/modules/admin/vbetool.te 2006-02-01 08:23:27.000000000 -0500 ++++ serefpolicy-2.2.23/policy/modules/admin/vbetool.te 2006-03-04 09:41:54.000000000 -0500 +@@ -15,6 +15,7 @@ + # Local policy + # + ++allow vbetool_t self:capabilities sys_admin; + allow vbetool_t self:process execmem; + + dev_wx_raw_memory(vbetool_t) +@@ -24,3 +25,7 @@ + + libs_use_ld_so(vbetool_t) + libs_use_shared_libs(vbetool_t) ++ ++optional_policy(`hal',` ++ hal_read_var_run(vbetool_t) ++') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corenetwork.te.in serefpolicy-2.2.23/policy/modules/kernel/corenetwork.te.in --- nsaserefpolicy/policy/modules/kernel/corenetwork.te.in 2006-02-20 14:07:36.000000000 -0500 +++ serefpolicy-2.2.23/policy/modules/kernel/corenetwork.te.in 2006-03-04 00:08:36.000000000 -0500 @@ -246,6 +265,53 @@ files_type(cvs_data_t) type cvs_tmp_t; +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.if serefpolicy-2.2.23/policy/modules/services/hal.if +--- nsaserefpolicy/policy/modules/services/hal.if 2006-03-04 00:06:36.000000000 -0500 ++++ serefpolicy-2.2.23/policy/modules/services/hal.if 2006-03-04 09:41:13.000000000 -0500 +@@ -100,3 +100,24 @@ + allow $1 hald_t:dbus send_msg; + allow hald_t $1:dbus send_msg; + ') ++ ++ ++######################################## ++## ++## Read hald state files. ++## ++## ++## ++## Domain allowed access. ++## ++## ++# ++interface(`hal_read_var_run',` ++ gen_require(` ++ type hald_var_run_t; ++ ') ++ ++ files_search_pids($1) ++ allow $1 hald_var_run_t:file r_file_perms; ++') ++ +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.te serefpolicy-2.2.23/policy/modules/services/hal.te +--- nsaserefpolicy/policy/modules/services/hal.te 2006-03-04 00:06:36.000000000 -0500 ++++ serefpolicy-2.2.23/policy/modules/services/hal.te 2006-03-04 09:46:42.000000000 -0500 +@@ -48,6 +48,7 @@ + kernel_read_network_state(hald_t) + kernel_read_kernel_sysctls(hald_t) + kernel_read_fs_sysctls(hald_t) ++kernel_rw_vm_sysctls(hald_t) + kernel_write_proc_files(hald_t) + + files_search_boot(hald_t) +@@ -144,6 +145,7 @@ + userdom_dontaudit_search_sysadm_home_dirs(hald_t) + + ifdef(`targeted_policy', ` ++ term_setattr_unallocated_ttys(hald_t) + term_dontaudit_use_unallocated_ttys(hald_t) + term_dontaudit_use_generic_ptys(hald_t) + files_dontaudit_read_root_files(hald_t) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ktalk.te serefpolicy-2.2.23/policy/modules/services/ktalk.te --- nsaserefpolicy/policy/modules/services/ktalk.te 2006-03-04 00:06:36.000000000 -0500 +++ serefpolicy-2.2.23/policy/modules/services/ktalk.te 2006-03-04 00:08:36.000000000 -0500 Index: selinux-policy.spec =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v retrieving revision 1.134 retrieving revision 1.135 diff -u -r1.134 -r1.135 --- selinux-policy.spec 4 Mar 2006 05:10:54 -0000 1.134 +++ selinux-policy.spec 4 Mar 2006 14:49:35 -0000 1.135 @@ -296,7 +296,8 @@ %fileList strict %changelog -* Tue Feb 28 2006 Dan Walsh 2.2.23-1 +* Sat Mar 4 2006 Dan Walsh 2.2.23-1 +- Add hal changes suggested by Jeremy - add policyhelp to point at policy html pages * Mon Feb 27 2006 Dan Walsh 2.2.22-2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/sources,v retrieving revision 1.50 retrieving revision 1.51 diff -u -r1.50 -r1.51 --- sources 27 Feb 2006 23:00:40 -0000 1.50 +++ sources 4 Mar 2006 14:49:35 -0000 1.51 @@ -1 +1 @@ -298e1f669a1a0203eeffcc1a82b1a794 serefpolicy-2.2.22.tgz +bf76b7f77de4a36a1842db5cb0a98fa7 serefpolicy-2.2.23.tgz From fedora-cvs-commits at redhat.com Sat Mar 4 15:10:00 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sat, 4 Mar 2006 10:10:00 -0500 Subject: rpms/selinux-policy/devel policy-20060207.patch,1.33,1.34 Message-ID: <200603041510.k24FA0ZX021094@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/selinux-policy/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv21062 Modified Files: policy-20060207.patch Log Message: * Sat Mar 4 2006 Dan Walsh 2.2.23-1 - Add hal changes suggested by Jeremy - add policyhelp to point at policy html pages policy-20060207.patch: Rules.modular | 2 +- policy/modules/admin/readahead.te | 2 +- policy/modules/admin/su.fc | 1 + policy/modules/admin/su.if | 6 +++--- policy/modules/admin/vbetool.te | 5 +++++ policy/modules/kernel/corenetwork.te.in | 2 +- policy/modules/kernel/devices.if | 2 +- policy/modules/kernel/files.fc | 2 +- policy/modules/kernel/files.if | 20 ++++++++++++++++++-- policy/modules/services/apache.fc | 2 ++ policy/modules/services/apache.if | 5 +++++ policy/modules/services/bluetooth.te | 5 +++++ policy/modules/services/cron.te | 3 +++ policy/modules/services/cups.fc | 2 +- policy/modules/services/cups.te | 6 ++++-- policy/modules/services/cvs.te | 2 +- policy/modules/services/hal.if | 21 +++++++++++++++++++++ policy/modules/services/hal.te | 2 ++ policy/modules/services/ktalk.te | 2 ++ policy/modules/services/nscd.if | 2 +- policy/modules/services/samba.te | 2 +- policy/modules/system/init.te | 5 +++++ policy/modules/system/libraries.fc | 2 ++ policy/modules/system/locallogin.te | 1 + policy/modules/system/lvm.fc | 1 + policy/modules/system/selinuxutil.fc | 6 +++--- policy/modules/system/selinuxutil.te | 1 + policy/modules/system/udev.te | 2 +- support/Makefile.devel | 5 +---- 29 files changed, 95 insertions(+), 24 deletions(-) Index: policy-20060207.patch =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20060207.patch,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- policy-20060207.patch 4 Mar 2006 14:49:35 -0000 1.33 +++ policy-20060207.patch 4 Mar 2006 15:09:56 -0000 1.34 @@ -37,12 +37,12 @@ kernel_read_kernel_sysctls($1_su_t) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/vbetool.te serefpolicy-2.2.23/policy/modules/admin/vbetool.te --- nsaserefpolicy/policy/modules/admin/vbetool.te 2006-02-01 08:23:27.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/admin/vbetool.te 2006-03-04 09:41:54.000000000 -0500 ++++ serefpolicy-2.2.23/policy/modules/admin/vbetool.te 2006-03-04 10:00:17.000000000 -0500 @@ -15,6 +15,7 @@ # Local policy # -+allow vbetool_t self:capabilities sys_admin; ++allow vbetool_t self:capability sys_admin; allow vbetool_t self:process execmem; dev_wx_raw_memory(vbetool_t) From fedora-cvs-commits at redhat.com Sat Mar 4 21:10:18 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sat, 4 Mar 2006 16:10:18 -0500 Subject: rpms/kernel/devel kernel-2.6.spec,1.2012,1.2013 Message-ID: <200603042110.k24LAIio016042@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv15938 Modified Files: kernel-2.6.spec Log Message: disable the apic munging code for now Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.2012 retrieving revision 1.2013 diff -u -r1.2012 -r1.2013 --- kernel-2.6.spec 4 Mar 2006 03:31:05 -0000 1.2012 +++ kernel-2.6.spec 4 Mar 2006 21:10:14 -0000 1.2013 @@ -724,7 +724,7 @@ # Compile 686 kernels tuned for Pentium4. %patch200 -p1 # Keep UP APIC off by default. -%patch201 -p1 +#%patch201 -p1 # add vidfail capability; # without this patch specifying a framebuffer on the kernel prompt would # make the boot stop if there's no supported framebuffer device; this is bad From fedora-cvs-commits at redhat.com Sat Mar 4 22:31:46 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sat, 4 Mar 2006 17:31:46 -0500 Subject: rpms/kernel/devel linux-2.6-sata-silence-dumb-msg.patch, NONE, 1.1 kernel-2.6.spec, 1.2013, 1.2014 Message-ID: <200603042231.k24MVkDj011081@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv11052 Modified Files: kernel-2.6.spec Added Files: linux-2.6-sata-silence-dumb-msg.patch Log Message: silence noisy sata printk linux-2.6-sata-silence-dumb-msg.patch: libata-scsi.c | 3 --- 1 files changed, 3 deletions(-) --- NEW FILE linux-2.6-sata-silence-dumb-msg.patch --- https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=183348 --- linux-2.6.15.noarch/drivers/scsi/libata-scsi.c~ 2006-03-04 15:51:08.000000000 -0500 +++ linux-2.6.15.noarch/drivers/scsi/libata-scsi.c 2006-03-04 15:51:25.000000000 -0500 @@ -520,9 +520,6 @@ void ata_to_sense_error(unsigned id, u8 *ascq = 0x04; /* "auto-reallocation failed" */ translate_done: - printk(KERN_ERR "ata%u: translated ATA stat/err 0x%02x/%02x to " - "SCSI SK/ASC/ASCQ 0x%x/%02x/%02x\n", id, drv_stat, drv_err, - *sk, *asc, *ascq); return; } Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.2013 retrieving revision 1.2014 diff -u -r1.2013 -r1.2014 --- kernel-2.6.spec 4 Mar 2006 21:10:14 -0000 1.2013 +++ kernel-2.6.spec 4 Mar 2006 22:31:11 -0000 1.2014 @@ -395,6 +395,7 @@ # SATA Bits Patch2200: linux-2.6-sata-promise-pata-ports.patch +Patch2201: linux-2.6-sata-silence-dumb-msg.patch # ACPI bits Patch2300: linux-2.6-acpi_os_acquire_object-gfp_kernel-called-with-irqs.patch @@ -825,6 +826,8 @@ # SATA Patches # Enable PATA ports on Promise. %patch2200 -p1 +# Silence noisy printk +%patch2201 -p1 # ACPI patches %patch2300 -p1 @@ -1603,6 +1606,9 @@ %endif %changelog +* Sat Mar 4 2006 Dave Jones +- Silence noisy SATA printk. + * Fri Mar 3 2006 Dave Jones - 2.6.16rc5-git7 - Fix cpu_index >= NR_CPUS always false warnings. From fedora-cvs-commits at redhat.com Sat Mar 4 23:05:51 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sat, 4 Mar 2006 18:05:51 -0500 Subject: rpms/kernel/FC-4 linux-2.6-g5-dualcore.patch, NONE, 1.1 kernel-2.6.spec, 1.1609, 1.1610 Message-ID: <200603042305.k24N5pWD001749@cvs.devel.redhat.com> Author: dwmw2 Update of /cvs/dist/rpms/kernel/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv1700 Modified Files: kernel-2.6.spec Added Files: linux-2.6-g5-dualcore.patch Log Message: Add support for dual-core G5 machines linux-2.6-g5-dualcore.patch: arch/powerpc/Kconfig | 6 arch/powerpc/kernel/Makefile | 3 arch/powerpc/kernel/pci_64.c | 24 + arch/powerpc/kernel/prom.c | 12 arch/powerpc/kernel/prom_parse.c | 547 ++++++++++++++++++++++++++++++ arch/powerpc/platforms/powermac/feature.c | 192 +++++++--- arch/powerpc/platforms/powermac/pci.c | 299 ++++++++++++---- arch/powerpc/platforms/powermac/pic.c | 474 ++++++++++++++----------- arch/powerpc/platforms/powermac/pmac.h | 6 arch/powerpc/platforms/powermac/setup.c | 24 - arch/powerpc/platforms/powermac/smp.c | 341 +++++++++--------- arch/powerpc/sysdev/dart.h | 41 +- arch/powerpc/sysdev/mpic.c | 220 ++++++++---- arch/powerpc/sysdev/u3_iommu.c | 173 +++++---- arch/ppc/kernel/pci.c | 17 drivers/macintosh/smu.c | 57 ++- drivers/pci/probe.c | 2 drivers/video/nvidia/nv_hw.c | 81 +++- drivers/video/nvidia/nv_setup.c | 3 drivers/video/nvidia/nvidia.c | 9 include/asm-powerpc/iommu.h | 6 include/asm-powerpc/keylargo.h | 10 include/asm-powerpc/mmu.h | 2 include/asm-powerpc/mpic.h | 4 include/asm-powerpc/pci-bridge.h | 9 include/asm-powerpc/pmac_feature.h | 2 include/asm-powerpc/prom.h | 31 + include/asm-ppc/pci-bridge.h | 9 include/asm-ppc/prom.h | 32 + include/linux/pci_regs.h | 1 30 files changed, 1910 insertions(+), 727 deletions(-) --- NEW FILE linux-2.6-g5-dualcore.patch --- Index: linux-newg5-backport/arch/powerpc/kernel/pci_64.c =================================================================== --- linux-newg5-backport.orig/arch/powerpc/kernel/pci_64.c 2005-12-20 15:54:40.000000000 +1100 +++ linux-newg5-backport/arch/powerpc/kernel/pci_64.c 2005-12-20 15:55:12.000000000 +1100 @@ -375,7 +375,7 @@ struct pci_dev *of_create_pci_dev(struct dev->subsystem_vendor = get_int_prop(node, "subsystem-vendor-id", 0); dev->subsystem_device = get_int_prop(node, "subsystem-id", 0); - dev->cfg_size = 256; /*pci_cfg_space_size(dev);*/ + dev->cfg_size = pci_cfg_space_size(dev); sprintf(pci_name(dev), "%04x:%02x:%02x.%d", pci_domain_nr(bus), dev->bus->number, PCI_SLOT(devfn), PCI_FUNC(devfn)); @@ -449,13 +449,13 @@ void __devinit of_scan_pci_bridge(struct /* parse bus-range property */ busrange = (u32 *) get_property(node, "bus-range", &len); if (busrange == NULL || len != 8) { - printk(KERN_ERR "Can't get bus-range for PCI-PCI bridge %s\n", + printk(KERN_DEBUG "Can't get bus-range for PCI-PCI bridge %s\n", node->full_name); return; } ranges = (u32 *) get_property(node, "ranges", &len); if (ranges == NULL) { - printk(KERN_ERR "Can't get ranges for PCI-PCI bridge %s\n", + printk(KERN_DEBUG "Can't get ranges for PCI-PCI bridge %s\n", node->full_name); return; } @@ -552,7 +552,7 @@ void __devinit scan_phb(struct pci_contr mode = PCI_PROBE_NORMAL; #ifdef CONFIG_PPC_MULTIPLATFORM - if (ppc_md.pci_probe_mode) + if (node && ppc_md.pci_probe_mode) mode = ppc_md.pci_probe_mode(bus); if (mode == PCI_PROBE_DEVTREE) { bus->subordinate = hose->last_busno; @@ -1308,6 +1308,22 @@ void pci_resource_to_user(const struct p #endif /* CONFIG_PPC_MULTIPLATFORM */ +unsigned long pci_address_to_pio(phys_addr_t address) +{ + struct pci_controller *hose, *tmp; + + list_for_each_entry_safe(hose, tmp, &hose_list, list_node) { + if (address >= hose->io_base_phys && + address < (hose->io_base_phys + hose->pci_io_size)) { + unsigned long base = + (unsigned long)hose->io_base_virt - pci_io_base; + return base + (address - hose->io_base_phys); + } + } + return (unsigned int)-1; +} +EXPORT_SYMBOL_GPL(pci_address_to_pio); + #define IOBASE_BRIDGE_NUMBER 0 #define IOBASE_MEMORY 1 Index: linux-newg5-backport/arch/powerpc/kernel/prom_parse.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 +++ linux-newg5-backport/arch/powerpc/kernel/prom_parse.c 2005-12-20 15:55:12.000000000 +1100 @@ -0,0 +1,547 @@ +#undef DEBUG + +#include +#include +#include +#include +#include +#include +#include + +#ifdef DEBUG +#define DBG(fmt...) do { printk(fmt); } while(0) +#else +#define DBG(fmt...) do { } while(0) +#endif + +#ifdef CONFIG_PPC64 +#define PRu64 "%lx" +#else +#define PRu64 "%llx" +#endif + +/* Max address size we deal with */ +#define OF_MAX_ADDR_CELLS 4 +#define OF_CHECK_COUNTS(na, ns) ((na) > 0 && (na) <= OF_MAX_ADDR_CELLS && \ + (ns) > 0) + +/* Debug utility */ +#ifdef DEBUG +static void of_dump_addr(const char *s, u32 *addr, int na) +{ + printk("%s", s); + while(na--) + printk(" %08x", *(addr++)); + printk("\n"); +} +#else +static void of_dump_addr(const char *s, u32 *addr, int na) { } +#endif + +/* Read a big address */ +static inline u64 of_read_addr(u32 *cell, int size) +{ + u64 r = 0; + while (size--) + r = (r << 32) | *(cell++); + return r; +} + +/* Callbacks for bus specific translators */ +struct of_bus { + const char *name; + const char *addresses; + int (*match)(struct device_node *parent); + void (*count_cells)(struct device_node *child, + int *addrc, int *sizec); + u64 (*map)(u32 *addr, u32 *range, int na, int ns, int pna); + int (*translate)(u32 *addr, u64 offset, int na); + unsigned int (*get_flags)(u32 *addr); +}; + + +/* + * Default translator (generic bus) + */ + +static void of_bus_default_count_cells(struct device_node *dev, + int *addrc, int *sizec) +{ + if (addrc) + *addrc = prom_n_addr_cells(dev); + if (sizec) + *sizec = prom_n_size_cells(dev); +} + +static u64 of_bus_default_map(u32 *addr, u32 *range, int na, int ns, int pna) +{ + u64 cp, s, da; + + cp = of_read_addr(range, na); + s = of_read_addr(range + na + pna, ns); + da = of_read_addr(addr, na); + + DBG("OF: default map, cp="PRu64", s="PRu64", da="PRu64"\n", + cp, s, da); + + if (da < cp || da >= (cp + s)) + return OF_BAD_ADDR; + return da - cp; +} + +static int of_bus_default_translate(u32 *addr, u64 offset, int na) +{ + u64 a = of_read_addr(addr, na); + memset(addr, 0, na * 4); + a += offset; + if (na > 1) + addr[na - 2] = a >> 32; + addr[na - 1] = a & 0xffffffffu; + + return 0; +} + +static unsigned int of_bus_default_get_flags(u32 *addr) +{ + return IORESOURCE_MEM; +} + + +/* + * PCI bus specific translator + */ + +static int of_bus_pci_match(struct device_node *np) +{ + return !strcmp(np->type, "pci"); +} + +static void of_bus_pci_count_cells(struct device_node *np, + int *addrc, int *sizec) +{ + if (addrc) + *addrc = 3; + if (sizec) + *sizec = 2; +} + +static u64 of_bus_pci_map(u32 *addr, u32 *range, int na, int ns, int pna) +{ + u64 cp, s, da; + + /* Check address type match */ + if ((addr[0] ^ range[0]) & 0x03000000) [...3752 lines suppressed...] #endif /* CONFIG_PPC64 */ Index: linux-newg5-backport/drivers/macintosh/smu.c =================================================================== --- linux-newg5-backport.orig/drivers/macintosh/smu.c 2005-12-20 15:54:40.000000000 +1100 +++ linux-newg5-backport/drivers/macintosh/smu.c 2005-12-20 15:59:41.000000000 +1100 @@ -53,7 +53,7 @@ #undef DEBUG_SMU #ifdef DEBUG_SMU -#define DPRINTK(fmt, args...) do { udbg_printf(KERN_DEBUG fmt , ##args); } while (0) +#define DPRINTK(fmt, args...) do { printk(KERN_DEBUG fmt , ##args); } while (0) #else #define DPRINTK(fmt, args...) do { } while (0) #endif @@ -94,6 +94,8 @@ struct smu_device { static struct smu_device *smu; static DECLARE_MUTEX(smu_part_access); +static void smu_i2c_retry(unsigned long data); + /* * SMU driver low level stuff */ @@ -469,7 +471,6 @@ int __init smu_init (void) smu->of_node = np; smu->db_irq = NO_IRQ; smu->msg_irq = NO_IRQ; - init_timer(&smu->i2c_timer); /* smu_cmdbuf_abs is in the low 2G of RAM, can be converted to a * 32 bits value safely @@ -544,6 +545,10 @@ static int smu_late_init(void) if (!smu) return 0; + init_timer(&smu->i2c_timer); + smu->i2c_timer.function = smu_i2c_retry; + smu->i2c_timer.data = (unsigned long)smu; + /* * Try to request the interrupts */ @@ -575,21 +580,29 @@ arch_initcall(smu_late_init); /* * sysfs visibility */ +static void smu_create_i2c(struct device_node *np) +{ + char name[32]; + u32 *reg = (u32 *)get_property(np, "reg", NULL); + + if (reg != NULL) { + sprintf(name, "smu-i2c-%02x", *reg); + of_platform_device_create(np, name, &smu->of_dev->dev); + } +} static void smu_expose_childs(void *unused) { - struct device_node *np; + struct device_node *np, *gp; for (np = NULL; (np = of_get_next_child(smu->of_node, np)) != NULL;) { - if (device_is_compatible(np, "smu-i2c")) { - char name[32]; - u32 *reg = (u32 *)get_property(np, "reg", NULL); - - if (reg == NULL) - continue; - sprintf(name, "smu-i2c-%02x", *reg); - of_platform_device_create(np, name, &smu->of_dev->dev); - } + if (device_is_compatible(np, "smu-i2c-control")) { + gp = NULL; + while ((gp = of_get_next_child(np, gp)) != NULL) + if (device_is_compatible(gp, "i2c-bus")) + smu_create_i2c(gp); + } else if (device_is_compatible(np, "smu-i2c")) + smu_create_i2c(np); if (device_is_compatible(np, "smu-sensors")) of_platform_device_create(np, "smu-sensors", &smu->of_dev->dev); } @@ -712,13 +725,13 @@ static void smu_i2c_complete_command(str static void smu_i2c_retry(unsigned long data) { - struct smu_i2c_cmd *cmd = (struct smu_i2c_cmd *)data; + struct smu_i2c_cmd *cmd = smu->cmd_i2c_cur; DPRINTK("SMU: i2c failure, requeuing...\n"); /* requeue command simply by resetting reply_len */ cmd->pdata[0] = 0xff; - cmd->scmd.reply_len = 0x10; + cmd->scmd.reply_len = sizeof(cmd->pdata); smu_queue_cmd(&cmd->scmd); } @@ -747,10 +760,8 @@ static void smu_i2c_low_completion(struc */ if (fail && --cmd->retries > 0) { DPRINTK("SMU: i2c failure, starting timer...\n"); - smu->i2c_timer.function = smu_i2c_retry; - smu->i2c_timer.data = (unsigned long)cmd; - smu->i2c_timer.expires = jiffies + msecs_to_jiffies(5); - add_timer(&smu->i2c_timer); + BUG_ON(cmd != smu->cmd_i2c_cur); + mod_timer(&smu->i2c_timer, jiffies + msecs_to_jiffies(5)); return; } @@ -764,7 +775,7 @@ static void smu_i2c_low_completion(struc /* Ok, initial command complete, now poll status */ scmd->reply_buf = cmd->pdata; - scmd->reply_len = 0x10; + scmd->reply_len = sizeof(cmd->pdata); scmd->data_buf = cmd->pdata; scmd->data_len = 1; cmd->pdata[0] = 0; @@ -786,7 +797,7 @@ int smu_queue_i2c(struct smu_i2c_cmd *cm cmd->scmd.done = smu_i2c_low_completion; cmd->scmd.misc = cmd; cmd->scmd.reply_buf = cmd->pdata; - cmd->scmd.reply_len = 0x10; + cmd->scmd.reply_len = sizeof(cmd->pdata); cmd->scmd.data_buf = (u8 *)(char *)&cmd->info; cmd->scmd.status = 1; cmd->stage = 0; @@ -909,10 +920,13 @@ static struct smu_sdbp_header *smu_creat struct property *prop; /* First query the partition info */ + DPRINTK("SMU: Query partition infos ... (irq=%d)\n", smu->db_irq); smu_queue_simple(&cmd, SMU_CMD_PARTITION_COMMAND, 2, smu_done_complete, &comp, SMU_CMD_PARTITION_LATEST, id); wait_for_completion(&comp); + DPRINTK("SMU: done, status: %d, reply_len: %d\n", + cmd.cmd.status, cmd.cmd.reply_len); /* Partition doesn't exist (or other error) */ if (cmd.cmd.status != 0 || cmd.cmd.reply_len != 6) @@ -975,6 +989,8 @@ struct smu_sdbp_header *__smu_get_sdb_pa sprintf(pname, "sdb-partition-%02x", id); + DPRINTK("smu_get_sdb_partition(%02x)\n", id); + if (interruptible) { int rc; rc = down_interruptible(&smu_part_access); @@ -986,6 +1002,7 @@ struct smu_sdbp_header *__smu_get_sdb_pa part = (struct smu_sdbp_header *)get_property(smu->of_node, pname, size); if (part == NULL) { + DPRINTK("trying to extract from SMU ...\n"); part = smu_create_sdb_partition(id); if (part != NULL && size) *size = part->len << 2; Index: linux-newg5-backport/arch/powerpc/Kconfig =================================================================== --- linux-newg5-backport.orig/arch/powerpc/Kconfig 2005-12-20 15:54:40.000000000 +1100 +++ linux-newg5-backport/arch/powerpc/Kconfig 2005-12-20 15:55:12.000000000 +1100 @@ -300,6 +300,7 @@ config PPC_PMAC64 bool depends on PPC_PMAC && POWER4 select U3_DART + select MPIC_BROKEN_U3 select GENERIC_TBSYNC default y @@ -578,11 +579,12 @@ config ARCH_SELECT_MEMORY_MODEL depends on PPC64 config ARCH_FLATMEM_ENABLE - def_bool y - depends on PPC64 && !NUMA + def_bool y + depends on (PPC64 && !NUMA) || PPC32 config ARCH_SPARSEMEM_ENABLE def_bool y + depends on PPC64 config ARCH_SPARSEMEM_DEFAULT def_bool y Index: linux-newg5-backport/include/linux/pci_regs.h =================================================================== --- linux-newg5-backport.orig/include/linux/pci_regs.h 2005-10-26 12:44:03.000000000 +1000 +++ linux-newg5-backport/include/linux/pci_regs.h 2005-12-20 15:56:58.000000000 +1100 @@ -196,6 +196,7 @@ #define PCI_CAP_ID_MSI 0x05 /* Message Signalled Interrupts */ #define PCI_CAP_ID_CHSWP 0x06 /* CompactPCI HotSwap */ #define PCI_CAP_ID_PCIX 0x07 /* PCI-X */ +#define PCI_CAP_ID_HT_IRQCONF 0x08 /* HyperTransport IRQ Configuration */ #define PCI_CAP_ID_SHPC 0x0C /* PCI Standard Hot-Plug Controller */ #define PCI_CAP_ID_EXP 0x10 /* PCI Express */ #define PCI_CAP_ID_MSIX 0x11 /* MSI-X */ Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-4/kernel-2.6.spec,v retrieving revision 1.1609 retrieving revision 1.1610 diff -u -r1.1609 -r1.1610 --- kernel-2.6.spec 2 Mar 2006 04:06:36 -0000 1.1609 +++ kernel-2.6.spec 4 Mar 2006 23:05:33 -0000 1.1610 @@ -228,6 +228,7 @@ Patch304: linux-2.6-ppc-rtas-check.patch Patch305: linux-2.6-powerpc-parport.patch Patch306: linux-2.6-powerpc64-fpexc.patch +Patch307: linux-2.6-g5-dualcore.patch # 400 - 499 ia64 # 500 - 599 s390(x) @@ -596,6 +597,7 @@ %patch304 -p1 %patch305 -p1 %patch306 -p1 +%patch307 -p1 # # Xen @@ -1286,6 +1288,9 @@ %endif %changelog +* Sat Mar 4 2006 David Woodhouse +- Add support for dual-core Apple G5 machines + * Wed Mar 1 2006 Dave Jones [2.6.15-1.1833_FC4] - 2.6.15.5 From fedora-cvs-commits at redhat.com Sat Mar 4 23:08:17 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sat, 4 Mar 2006 18:08:17 -0500 Subject: rpms/kernel/FC-4 linux-2.6-g5-dualcore.patch,1.1,1.2 Message-ID: <200603042308.k24N8HXb002285@cvs.devel.redhat.com> Author: dwmw2 Update of /cvs/dist/rpms/kernel/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv2257 Modified Files: linux-2.6-g5-dualcore.patch Log Message: Make maple build too linux-2.6-g5-dualcore.patch: linux-2.6.15/arch/powerpc/platforms/maple/setup.c | 4 linux-newg5-backport/arch/powerpc/Kconfig | 6 linux-newg5-backport/arch/powerpc/kernel/Makefile | 3 linux-newg5-backport/arch/powerpc/kernel/pci_64.c | 24 linux-newg5-backport/arch/powerpc/kernel/prom.c | 12 linux-newg5-backport/arch/powerpc/kernel/prom_parse.c | 547 ++++++++++ linux-newg5-backport/arch/powerpc/platforms/powermac/feature.c | 192 ++- linux-newg5-backport/arch/powerpc/platforms/powermac/pci.c | 299 ++++- linux-newg5-backport/arch/powerpc/platforms/powermac/pic.c | 474 ++++---- linux-newg5-backport/arch/powerpc/platforms/powermac/pmac.h | 6 linux-newg5-backport/arch/powerpc/platforms/powermac/setup.c | 24 linux-newg5-backport/arch/powerpc/platforms/powermac/smp.c | 341 +++--- linux-newg5-backport/arch/powerpc/sysdev/dart.h | 41 linux-newg5-backport/arch/powerpc/sysdev/mpic.c | 220 ++-- linux-newg5-backport/arch/powerpc/sysdev/u3_iommu.c | 173 +-- linux-newg5-backport/arch/ppc/kernel/pci.c | 17 linux-newg5-backport/drivers/macintosh/smu.c | 57 - linux-newg5-backport/drivers/pci/probe.c | 2 linux-newg5-backport/drivers/video/nvidia/nv_hw.c | 81 + linux-newg5-backport/drivers/video/nvidia/nv_setup.c | 3 linux-newg5-backport/drivers/video/nvidia/nvidia.c | 9 linux-newg5-backport/include/asm-powerpc/iommu.h | 6 linux-newg5-backport/include/asm-powerpc/keylargo.h | 10 linux-newg5-backport/include/asm-powerpc/mmu.h | 2 linux-newg5-backport/include/asm-powerpc/mpic.h | 4 linux-newg5-backport/include/asm-powerpc/pci-bridge.h | 9 linux-newg5-backport/include/asm-powerpc/pmac_feature.h | 2 linux-newg5-backport/include/asm-powerpc/prom.h | 31 linux-newg5-backport/include/asm-ppc/pci-bridge.h | 9 linux-newg5-backport/include/asm-ppc/prom.h | 32 linux-newg5-backport/include/linux/pci_regs.h | 1 31 files changed, 1912 insertions(+), 729 deletions(-) Index: linux-2.6-g5-dualcore.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-4/linux-2.6-g5-dualcore.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- linux-2.6-g5-dualcore.patch 4 Mar 2006 23:05:38 -0000 1.1 +++ linux-2.6-g5-dualcore.patch 4 Mar 2006 23:08:14 -0000 1.2 @@ -4149,3 +4149,23 @@ #define PCI_CAP_ID_SHPC 0x0C /* PCI Standard Hot-Plug Controller */ #define PCI_CAP_ID_EXP 0x10 /* PCI Express */ #define PCI_CAP_ID_MSIX 0x11 /* MSI-X */ +--- linux-2.6.15/arch/powerpc/platforms/maple/setup.c~ 2006-01-03 03:21:10.000000000 +0000 ++++ linux-2.6.15/arch/powerpc/platforms/maple/setup.c 2006-03-04 23:07:26.000000000 +0000 +@@ -208,7 +208,7 @@ static void __init maple_init_early(void + /* Setup interrupt mapping options */ + ppc64_interrupt_controller = IC_OPEN_PIC; + +- iommu_init_early_u3(); ++ iommu_init_early_dart(); + + DBG(" <- maple_init_early\n"); + } +@@ -270,7 +270,7 @@ static int __init maple_probe(int platfo + * occupies having to be broken up so the DART itself is not + * part of the cacheable linar mapping + */ +- alloc_u3_dart_table(); ++ alloc_dart_table(); + + return 1; + } From fedora-cvs-commits at redhat.com Sat Mar 4 23:24:58 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sat, 4 Mar 2006 18:24:58 -0500 Subject: rpms/selinux-policy/devel policy-20060207.patch, 1.34, 1.35 selinux-policy.spec, 1.135, 1.136 Message-ID: <200603042324.k24NOwJb022171@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/selinux-policy/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv22124 Modified Files: policy-20060207.patch selinux-policy.spec Log Message: * Sat Mar 4 2006 Dan Walsh 2.2.23-2 - Fix cups html interface policy-20060207.patch: Rules.modular | 2 +- policy/modules/admin/readahead.te | 2 +- policy/modules/admin/su.fc | 1 + policy/modules/admin/su.if | 6 +++--- policy/modules/admin/vbetool.te | 5 +++++ policy/modules/kernel/corenetwork.te.in | 2 +- policy/modules/kernel/devices.if | 2 +- policy/modules/kernel/files.fc | 2 +- policy/modules/kernel/files.if | 20 ++++++++++++++++++-- policy/modules/kernel/kernel.if | 2 +- policy/modules/services/apache.fc | 2 ++ policy/modules/services/apache.if | 5 +++++ policy/modules/services/bluetooth.te | 5 +++++ policy/modules/services/cron.te | 3 +++ policy/modules/services/cups.fc | 2 +- policy/modules/services/cups.te | 6 ++++-- policy/modules/services/cvs.te | 2 +- policy/modules/services/hal.if | 21 +++++++++++++++++++++ policy/modules/services/hal.te | 2 ++ policy/modules/services/ktalk.te | 2 ++ policy/modules/services/nscd.if | 2 +- policy/modules/services/samba.te | 2 +- policy/modules/system/init.te | 5 +++++ policy/modules/system/libraries.fc | 2 ++ policy/modules/system/locallogin.te | 1 + policy/modules/system/lvm.fc | 1 + policy/modules/system/selinuxutil.fc | 6 +++--- policy/modules/system/selinuxutil.te | 1 + policy/modules/system/udev.te | 2 +- support/Makefile.devel | 5 +---- 30 files changed, 96 insertions(+), 25 deletions(-) Index: policy-20060207.patch =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20060207.patch,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- policy-20060207.patch 4 Mar 2006 15:09:56 -0000 1.34 +++ policy-20060207.patch 4 Mar 2006 23:24:54 -0000 1.35 @@ -131,6 +131,18 @@ ') ######################################## +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel.if serefpolicy-2.2.23/policy/modules/kernel/kernel.if +--- nsaserefpolicy/policy/modules/kernel/kernel.if 2006-03-04 00:06:34.000000000 -0500 ++++ serefpolicy-2.2.23/policy/modules/kernel/kernel.if 2006-03-04 18:24:16.000000000 -0500 +@@ -1328,7 +1328,7 @@ + + allow $1 proc_t:dir search; + allow $1 sysctl_t:dir r_dir_perms; +- allow $1 sysctl_kernel_t:dir r_dir_perms; ++ allow $1 sysctl_kernel_t:dir rw_dir_perms; + allow $1 sysctl_kernel_t:file rw_file_perms; + ') + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.fc serefpolicy-2.2.23/policy/modules/services/apache.fc --- nsaserefpolicy/policy/modules/services/apache.fc 2006-02-27 17:17:23.000000000 -0500 +++ serefpolicy-2.2.23/policy/modules/services/apache.fc 2006-03-04 00:08:36.000000000 -0500 @@ -218,13 +230,13 @@ /var/run/ptal-printd(/.*)? gen_context(system_u:object_r:ptal_var_run_t,s0) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.te serefpolicy-2.2.23/policy/modules/services/cups.te --- nsaserefpolicy/policy/modules/services/cups.te 2006-03-04 00:06:35.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/services/cups.te 2006-03-04 00:09:52.000000000 -0500 ++++ serefpolicy-2.2.23/policy/modules/services/cups.te 2006-03-04 10:49:58.000000000 -0500 @@ -77,7 +77,7 @@ dontaudit cupsd_t self:capability { sys_tty_config net_admin }; allow cupsd_t self:process { setsched signal_perms }; allow cupsd_t self:fifo_file rw_file_perms; -allow cupsd_t self:unix_stream_socket create_socket_perms; -+allow cupsd_t self:unix_stream_socket create_stream_socket_perms; ++allow cupsd_t self:unix_stream_socket { create_stream_socket_perms connectto }; allow cupsd_t self:unix_dgram_socket create_socket_perms; allow cupsd_t self:netlink_audit_socket { create_netlink_socket_perms nlmsg_relay }; allow cupsd_t self:netlink_route_socket { r_netlink_socket_perms }; Index: selinux-policy.spec =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v retrieving revision 1.135 retrieving revision 1.136 diff -u -r1.135 -r1.136 --- selinux-policy.spec 4 Mar 2006 14:49:35 -0000 1.135 +++ selinux-policy.spec 4 Mar 2006 23:24:54 -0000 1.136 @@ -10,7 +10,7 @@ Summary: SELinux policy configuration Name: selinux-policy Version: 2.2.23 -Release: 1 +Release: 2 License: GPL Group: System Environment/Base Source: serefpolicy-%{version}.tgz @@ -296,6 +296,9 @@ %fileList strict %changelog +* Sat Mar 4 2006 Dan Walsh 2.2.23-2 +- Fix cups html interface + * Sat Mar 4 2006 Dan Walsh 2.2.23-1 - Add hal changes suggested by Jeremy - add policyhelp to point at policy html pages From fedora-cvs-commits at redhat.com Sun Mar 5 00:26:26 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sat, 4 Mar 2006 19:26:26 -0500 Subject: rpms/xorg-x11-xkbdata/devel .cvsignore, 1.5, 1.6 sources, 1.5, 1.6 xorg-x11-xkbdata.spec, 1.12, 1.13 Message-ID: <200603050026.k250QQjo003873@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/xorg-x11-xkbdata/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv3786 Modified Files: .cvsignore sources xorg-x11-xkbdata.spec Log Message: - Update to 0.8 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/xorg-x11-xkbdata/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 1 Mar 2006 03:28:35 -0000 1.5 +++ .cvsignore 5 Mar 2006 00:26:22 -0000 1.6 @@ -1 +1 @@ -xkeyboard-config-0.7.tar.bz2 +xkeyboard-config-0.8.tar.bz2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/xorg-x11-xkbdata/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 1 Mar 2006 03:28:35 -0000 1.5 +++ sources 5 Mar 2006 00:26:22 -0000 1.6 @@ -1 +1 @@ -a99e9aa576b34a03606118b96e858731 xkeyboard-config-0.7.tar.bz2 +48e694ebe816065670dda2a36f0581a2 xkeyboard-config-0.8.tar.bz2 Index: xorg-x11-xkbdata.spec =================================================================== RCS file: /cvs/dist/rpms/xorg-x11-xkbdata/devel/xorg-x11-xkbdata.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- xorg-x11-xkbdata.spec 1 Mar 2006 18:52:42 -0000 1.12 +++ xorg-x11-xkbdata.spec 5 Mar 2006 00:26:22 -0000 1.13 @@ -1,5 +1,5 @@ %define tarname xkeyboard-config -%define tarver 0.7 +%define tarver 0.8 # INFO: Package contains data-only, no binaries, so no debuginfo is needed %define debug_package %{nil} @@ -86,6 +86,9 @@ %{_datadir}/X11/xkb/rules/xorg.xml %changelog +* Sat Mar 04 2006 Ray Strode 1.0.1-7 +- Update to 0.8. + * Wed Mar 01 2006 Ray Strode 1.0.1-6 - Turn on compat symlink (bug 183521) From fedora-cvs-commits at redhat.com Sun Mar 5 00:27:18 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sat, 4 Mar 2006 19:27:18 -0500 Subject: rpms/xorg-x11-xkbdata/devel xorg-x11-xkbdata.spec,1.13,1.14 Message-ID: <200603050027.k250RI9V027312@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/xorg-x11-xkbdata/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv17022 Modified Files: xorg-x11-xkbdata.spec Log Message: - rev release Index: xorg-x11-xkbdata.spec =================================================================== RCS file: /cvs/dist/rpms/xorg-x11-xkbdata/devel/xorg-x11-xkbdata.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- xorg-x11-xkbdata.spec 5 Mar 2006 00:26:22 -0000 1.13 +++ xorg-x11-xkbdata.spec 5 Mar 2006 00:27:15 -0000 1.14 @@ -10,7 +10,7 @@ Name: xorg-x11-xkbdata Version: 1.0.1 # When rebuilding, bump the final digit only -Release: 6 +Release: 7 License: MIT Group: User Interface/X URL: http://www.x.org From fedora-cvs-commits at redhat.com Sun Mar 5 02:20:47 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sat, 4 Mar 2006 21:20:47 -0500 Subject: rpms/gnome-terminal/devel .cvsignore, 1.22, 1.23 gnome-terminal.spec, 1.35, 1.36 sources, 1.22, 1.23 Message-ID: <200603050220.k252Kl18019885@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/gnome-terminal/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv19833 Modified Files: .cvsignore gnome-terminal.spec sources Log Message: 2.13.93 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/gnome-terminal/devel/.cvsignore,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- .cvsignore 4 Mar 2006 05:30:56 -0000 1.22 +++ .cvsignore 5 Mar 2006 02:20:43 -0000 1.23 @@ -7,3 +7,4 @@ gnome-terminal-2.13.90.tar.bz2 gnome-terminal-2.13.91.tar.bz2 gnome-terminal-2.13.92.tar.bz2 +gnome-terminal-2.13.93.tar.bz2 Index: gnome-terminal.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-terminal/devel/gnome-terminal.spec,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- gnome-terminal.spec 4 Mar 2006 05:30:56 -0000 1.35 +++ gnome-terminal.spec 5 Mar 2006 02:20:43 -0000 1.36 @@ -12,7 +12,7 @@ Summary: GNOME Terminal Name: gnome-terminal -Version: 2.13.92 +Version: 2.13.93 Release: 1 URL: http://www.gnome.org/ Source0: gnome-terminal-%{version}.tar.bz2 @@ -101,7 +101,10 @@ %{_libdir}/bonobo %changelog -* Sun Mar 4 2006 Matthias Clasen - 2.13.92-1 +* Sat Mar 4 2006 Matthias Clasen - 2.13.93-1 +- Update to 2.13.93 + +* Sat Mar 4 2006 Matthias Clasen - 2.13.92-1 - Update to 2.13.92 * Sun Feb 12 2006 Matthias Clasen - 2.13.91-1 Index: sources =================================================================== RCS file: /cvs/dist/rpms/gnome-terminal/devel/sources,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- sources 4 Mar 2006 05:30:56 -0000 1.22 +++ sources 5 Mar 2006 02:20:43 -0000 1.23 @@ -1 +1 @@ -0cf3d04aabae7534e39d9271a42c046d gnome-terminal-2.13.92.tar.bz2 +98d3e15be90bfb2dba246e336d706d46 gnome-terminal-2.13.93.tar.bz2 From fedora-cvs-commits at redhat.com Sun Mar 5 02:31:32 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sat, 4 Mar 2006 21:31:32 -0500 Subject: rpms/kernel/FC-4 kernel-2.6.spec,1.1610,1.1611 Message-ID: <200603050231.k252VWNf023167@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv19789 Modified Files: kernel-2.6.spec Log Message: fix off by one in x86-64 nr-cpus Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-4/kernel-2.6.spec,v retrieving revision 1.1610 retrieving revision 1.1611 diff -u -r1.1610 -r1.1611 --- kernel-2.6.spec 4 Mar 2006 23:05:33 -0000 1.1610 +++ kernel-2.6.spec 5 Mar 2006 02:31:06 -0000 1.1611 @@ -1288,6 +1288,9 @@ %endif %changelog +* Sat Mar 4 2006 Dave Jones +- Fix maximum number of CPUs on x86-64 (was off-by-one) + * Sat Mar 4 2006 David Woodhouse - Add support for dual-core Apple G5 machines From fedora-cvs-commits at redhat.com Sun Mar 5 02:31:32 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sat, 4 Mar 2006 21:31:32 -0500 Subject: rpms/kernel/FC-4/configs config-x86_64-generic,1.18,1.19 Message-ID: <200603050231.k252VWU7023175@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/FC-4/configs In directory cvs.devel.redhat.com:/tmp/cvs-serv19789/configs Modified Files: config-x86_64-generic Log Message: fix off by one in x86-64 nr-cpus Index: config-x86_64-generic =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-4/configs/config-x86_64-generic,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- config-x86_64-generic 21 Feb 2006 02:35:46 -0000 1.18 +++ config-x86_64-generic 5 Mar 2006 02:31:30 -0000 1.19 @@ -10,7 +10,7 @@ CONFIG_K8_NUMA=y CONFIG_X86_64_ACPI_NUMA=y # CONFIG_NUMA_EMU is not set -CONFIG_NR_CPUS=256 +CONFIG_NR_CPUS=255 CONFIG_GART_IOMMU=y CONFIG_X86_POWERNOW_K8=y CONFIG_IA32_EMULATION=y From fedora-cvs-commits at redhat.com Sun Mar 5 03:17:56 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sat, 4 Mar 2006 22:17:56 -0500 Subject: rpms/kernel/FC-4 kernel-2.6.spec, 1.1611, 1.1612 linux-2.6-x86-apic-off-by-default.patch, 1.4, NONE Message-ID: <200603050317.k253HuhQ025482@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv25403 Modified Files: kernel-2.6.spec Removed Files: linux-2.6-x86-apic-off-by-default.patch Log Message: drop apic patch Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-4/kernel-2.6.spec,v retrieving revision 1.1611 retrieving revision 1.1612 diff -u -r1.1611 -r1.1612 --- kernel-2.6.spec 5 Mar 2006 02:31:06 -0000 1.1611 +++ kernel-2.6.spec 5 Mar 2006 03:17:53 -0000 1.1612 @@ -214,11 +214,10 @@ # 200 - 299 x86(-64) Patch200: linux-2.6-x86-tune-p4.patch -Patch201: linux-2.6-x86-apic-off-by-default.patch -Patch202: linux-2.6-x86-vga-vidfail.patch -Patch203: linux-2.6.14-intel-cache-build.patch -Patch204: linux-2.6-x86_64-silence-up-apic-errors.patch -Patch205: linux-2.6-x86_64-disable-hotplug-guessing.patch +Patch201: linux-2.6-x86-vga-vidfail.patch +Patch202: linux-2.6.14-intel-cache-build.patch +Patch203: linux-2.6-x86_64-silence-up-apic-errors.patch +Patch204: linux-2.6-x86_64-disable-hotplug-guessing.patch # 300 - 399 ppc(64) Patch300: linux-2.6.15-default-powerpc.patch @@ -571,22 +570,20 @@ # # Compile 686 kernels tuned for Pentium4. %patch200 -p1 -# Keep UP APIC off by default. -%patch201 -p1 -# add vidfail capability; +# add vidfail capability; # without this patch specifying a framebuffer on the kernel prompt would # make the boot stop if there's no supported framebuffer device; this is bad # for the installer cd that wants to automatically fall back to textmode # in that case -%patch202 -p1 +%patch201 -p1 # exitfunc called from initfunc. -%patch203 -p1 +%patch202 -p1 # Suppress APIC errors on UP x86-64. -%patch204 -p1 +%patch203 -p1 # Disable guessing of how many hotplug cpus to add. -%patch205 -p1 +%patch204 -p1 -# +# # ppc64 # --- linux-2.6-x86-apic-off-by-default.patch DELETED --- From fedora-cvs-commits at redhat.com Sun Mar 5 05:42:10 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sun, 5 Mar 2006 00:42:10 -0500 Subject: rpms/udev/devel udev-rules.patch,1.8,1.9 udev.spec,1.158,1.159 Message-ID: <200603050542.k255gAO2015518@cvs.devel.redhat.com> Author: notting Update of /cvs/dist/rpms/udev/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv15170 Modified Files: udev-rules.patch udev.spec Log Message: $modalias is deprecated in favor of $env{MODALIAS}. And it appears to break with things that only have MODALIAS in the environment, as opposed to sysfs files. Such as, say, firewire. (#181494) udev-rules.patch: 05-udev-early.rules | 9 ++ 95-pam-console.rules | 1 hotplug.rules | 13 +++ udev.rules | 166 ++++++++++++++++++++++++++++----------------------- 4 files changed, 113 insertions(+), 76 deletions(-) Index: udev-rules.patch =================================================================== RCS file: /cvs/dist/rpms/udev/devel/udev-rules.patch,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- udev-rules.patch 2 Mar 2006 07:33:00 -0000 1.8 +++ udev-rules.patch 5 Mar 2006 05:42:06 -0000 1.9 @@ -242,7 +242,7 @@ + PROGRAM="/bin/sh -c 'K=%k; K=$${K#usbdev}; printf bus/usb/%%03i/%%03i $${K%%%%.*} $${K#*.}'", \ + NAME="%c", MODE="0644" -+ACTION=="add", SUBSYSTEM=="?*", MODALIAS=="?*", RUN+="/sbin/modprobe $modalias" ++ACTION=="add", SUBSYSTEM=="?*", MODALIAS=="?*", RUN+="/sbin/modprobe $env{MODALIAS}" -# Perhaps this should just be for all subsystems? - Index: udev.spec =================================================================== RCS file: /cvs/dist/rpms/udev/devel/udev.spec,v retrieving revision 1.158 retrieving revision 1.159 diff -u -r1.158 -r1.159 --- udev.spec 2 Mar 2006 07:33:00 -0000 1.158 +++ udev.spec 5 Mar 2006 05:42:06 -0000 1.159 @@ -5,7 +5,7 @@ Summary: A userspace implementation of devfs Name: udev Version: 084 -Release: 10 +Release: 11 License: GPL Group: System Environment/Base Provides: udev-persistent = 0:%{version}-%{release} @@ -283,6 +283,9 @@ %attr(0644,root,root) %{_mandir}/man8/vol_id*.8* %changelog +* Sum Mar 05 2006 Bill Nottingham - 084-11 +- use $ENV{MODALIAS}, not $modalias (#181494) + * Thu Mar 02 2006 Harald Hoyer - 084-10 - fixed cdrom rule From fedora-cvs-commits at redhat.com Sun Mar 5 05:43:10 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sun, 5 Mar 2006 00:43:10 -0500 Subject: rpms/udev/devel udev.spec,1.159,1.160 Message-ID: <200603050543.k255hAeK016042@cvs.devel.redhat.com> Author: notting Update of /cvs/dist/rpms/udev/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv15986 Modified Files: udev.spec Log Message: type much? Index: udev.spec =================================================================== RCS file: /cvs/dist/rpms/udev/devel/udev.spec,v retrieving revision 1.159 retrieving revision 1.160 diff -u -r1.159 -r1.160 --- udev.spec 5 Mar 2006 05:42:06 -0000 1.159 +++ udev.spec 5 Mar 2006 05:43:08 -0000 1.160 @@ -283,7 +283,7 @@ %attr(0644,root,root) %{_mandir}/man8/vol_id*.8* %changelog -* Sum Mar 05 2006 Bill Nottingham - 084-11 +* Sun Mar 05 2006 Bill Nottingham - 084-11 - use $ENV{MODALIAS}, not $modalias (#181494) * Thu Mar 02 2006 Harald Hoyer - 084-10 From fedora-cvs-commits at redhat.com Sun Mar 5 05:59:53 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sun, 5 Mar 2006 00:59:53 -0500 Subject: rpms/udev/devel udev-rules.patch,1.9,1.10 Message-ID: <200603050559.k255xrrq003270@cvs.devel.redhat.com> Author: notting Update of /cvs/dist/rpms/udev/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv3208 Modified Files: udev-rules.patch Log Message: need ENV{MODALIAS} as well udev-rules.patch: 05-udev-early.rules | 9 ++ 95-pam-console.rules | 1 hotplug.rules | 13 +++ udev.rules | 168 ++++++++++++++++++++++++++++----------------------- 4 files changed, 114 insertions(+), 77 deletions(-) Index: udev-rules.patch =================================================================== RCS file: /cvs/dist/rpms/udev/devel/udev-rules.patch,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- udev-rules.patch 5 Mar 2006 05:42:06 -0000 1.9 +++ udev-rules.patch 5 Mar 2006 05:59:32 -0000 1.10 @@ -242,7 +242,7 @@ + PROGRAM="/bin/sh -c 'K=%k; K=$${K#usbdev}; printf bus/usb/%%03i/%%03i $${K%%%%.*} $${K#*.}'", \ + NAME="%c", MODE="0644" -+ACTION=="add", SUBSYSTEM=="?*", MODALIAS=="?*", RUN+="/sbin/modprobe $env{MODALIAS}" ++ACTION=="add", SUBSYSTEM=="?*", ENV{MODALIAS}=="?*", RUN+="/sbin/modprobe $env{MODALIAS}" -# Perhaps this should just be for all subsystems? - @@ -252,7 +252,8 @@ - RUN+="/sbin/modprobe $modalias" -ACTION=="add", SUBSYSTEM=="pcmcia", MODALIAS=="*", \ - RUN+="/sbin/modprobe $modalias" - ACTION=="add", SUBSYSTEM=="pcmcia", MODALIAS=="*", \ +-ACTION=="add", SUBSYSTEM=="pcmcia", MODALIAS=="*", \ ++ACTION=="add", SUBSYSTEM=="pcmcia", ENV{MODALIAS}=="*", \ RUN+="/bin/sh -c 'echo 1 > /sys/$DEVPATH/allow_func_id_match'" -ACTION=="add", SUBSYSTEM=="ieee1394", MODALIAS=="*", \ From fedora-cvs-commits at redhat.com Sun Mar 5 07:37:37 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sun, 5 Mar 2006 02:37:37 -0500 Subject: rpms/kernel/devel linux-2.6-softlockup-disable.patch, NONE, 1.1 kernel-2.6.spec, 1.2014, 1.2015 Message-ID: <200603050737.k257bbPR028833@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv28698 Modified Files: kernel-2.6.spec Added Files: linux-2.6-softlockup-disable.patch Log Message: Add a safety net to softlockup so that it doesn't prevent installs. linux-2.6-softlockup-disable.patch: main.c | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletion(-) --- NEW FILE linux-2.6-softlockup-disable.patch --- --- linux-2.6.15.noarch/init/main.c~ 2006-03-05 00:45:51.000000000 -0500 +++ linux-2.6.15.noarch/init/main.c 2006-03-05 00:49:41.000000000 -0500 @@ -640,6 +640,14 @@ static void __init do_basic_setup(void) do_initcalls(); } +static int __initdata nosoftlockup; + +static int __init nosoftlockup_setup(char *str) +{ + nosoftlockup = 1; +} +__setup("nosoftlockup", nosoftlockup_setup); + static void do_pre_smp_initcalls(void) { extern int spawn_ksoftirqd(void); @@ -649,7 +657,8 @@ static void do_pre_smp_initcalls(void) migration_init(); #endif spawn_ksoftirqd(); - spawn_softlockup_task(); + if (!nosoftlockup) + spawn_softlockup_task(); } static void run_init_process(char *init_filename) Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.2014 retrieving revision 1.2015 diff -u -r1.2014 -r1.2015 --- kernel-2.6.spec 4 Mar 2006 22:31:11 -0000 1.2014 +++ kernel-2.6.spec 5 Mar 2006 07:37:32 -0000 1.2015 @@ -368,6 +368,7 @@ Patch1710: linux-2.6-sched-up-migration-cost.patch Patch1720: linux-2.6-md-raid1-leak.patch Patch1730: linux-2.6-signal-trampolines-unwind-info.patch +Patch1740: linux-2.6-softlockup-disable.patch # SELinux/audit patches. Patch1800: linux-2.6-selinux-hush.patch @@ -960,6 +961,8 @@ %patch1720 -p1 # Mark unwind info for signal trampolines in vDSOs %patch1730 -p1 +# Add a safety net to softlockup so that it doesn't prevent installs. +%patch1740 -p1 # Silence some selinux messages. %patch1800 -p1 @@ -1606,6 +1609,9 @@ %endif %changelog +* Sun Mar 5 2006 Dave Jones +- Add a safety net to softlockup so that it doesn't prevent installs. + * Sat Mar 4 2006 Dave Jones - Silence noisy SATA printk. From fedora-cvs-commits at redhat.com Sun Mar 5 08:52:53 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sun, 5 Mar 2006 03:52:53 -0500 Subject: rpms/kernel/devel patch-2.6.16-rc5-git8.bz2.sign, NONE, 1.1 .cvsignore, 1.370, 1.371 kernel-2.6.spec, 1.2015, 1.2016 sources, 1.311, 1.312 upstream, 1.286, 1.287 patch-2.6.16-rc5-git7.bz2.sign, 1.1, NONE Message-ID: <200603050852.k258qrma028767@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv28706 Modified Files: .cvsignore kernel-2.6.spec sources upstream Added Files: patch-2.6.16-rc5-git8.bz2.sign Removed Files: patch-2.6.16-rc5-git7.bz2.sign Log Message: git8 --- NEW FILE patch-2.6.16-rc5-git8.bz2.sign --- -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.2.1 (GNU/Linux) Comment: See http://www.kernel.org/signature.html for info iD8DBQBECozsyGugalF9Dw4RAjd2AKCBdn+cFSUUBZGePvmZYIupfggdqgCgiv2u wF7DuJNfTyXMKo5MA6LLjk8= =ZsHs -----END PGP SIGNATURE----- Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v retrieving revision 1.370 retrieving revision 1.371 diff -u -r1.370 -r1.371 --- .cvsignore 3 Mar 2006 18:58:25 -0000 1.370 +++ .cvsignore 5 Mar 2006 08:52:50 -0000 1.371 @@ -4,4 +4,4 @@ linux-2.6.15.tar.bz2 xen-20060208.tar.bz2 patch-2.6.16-rc5.bz2 -patch-2.6.16-rc5-git7.bz2 +patch-2.6.16-rc5-git8.bz2 Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.2015 retrieving revision 1.2016 diff -u -r1.2015 -r1.2016 --- kernel-2.6.spec 5 Mar 2006 07:37:32 -0000 1.2015 +++ kernel-2.6.spec 5 Mar 2006 08:52:50 -0000 1.2016 @@ -218,7 +218,7 @@ # Patches 0 through 100 are meant for core subsystem upgrades # Patch1: patch-2.6.16-rc5.bz2 -Patch2: patch-2.6.16-rc5-git7.bz2 +Patch2: patch-2.6.16-rc5-git8.bz2 # Patches 100 through 500 are meant for architecture patches Patch100: linux-2.6-bzimage.patch @@ -1610,6 +1610,7 @@ %changelog * Sun Mar 5 2006 Dave Jones +- 2.6.16rc5-git8 - Add a safety net to softlockup so that it doesn't prevent installs. * Sat Mar 4 2006 Dave Jones Index: sources =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/sources,v retrieving revision 1.311 retrieving revision 1.312 diff -u -r1.311 -r1.312 --- sources 3 Mar 2006 18:58:25 -0000 1.311 +++ sources 5 Mar 2006 08:52:50 -0000 1.312 @@ -1,4 +1,4 @@ cdf95e00f5111e31f78e1d97304d9522 linux-2.6.15.tar.bz2 30f4ef37dbc4d0bce9366e8716e8b51b xen-20060208.tar.bz2 1740ae34807f687a93adf2469ea5c4fc patch-2.6.16-rc5.bz2 -9998826270c7881c350ce4e36eca35c6 patch-2.6.16-rc5-git7.bz2 +ac2274a7e960b780325805e050ad5cee patch-2.6.16-rc5-git8.bz2 Index: upstream =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/upstream,v retrieving revision 1.286 retrieving revision 1.287 diff -u -r1.286 -r1.287 --- upstream 3 Mar 2006 18:58:25 -0000 1.286 +++ upstream 5 Mar 2006 08:52:50 -0000 1.287 @@ -1,3 +1,3 @@ linux-2.6.15.tar.bz2 patch-2.6.16-rc5.bz2 -patch-2.6.16-rc5-git7.bz2 +patch-2.6.16-rc5-git8.bz2 --- patch-2.6.16-rc5-git7.bz2.sign DELETED --- From fedora-cvs-commits at redhat.com Sun Mar 5 11:07:51 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sun, 5 Mar 2006 06:07:51 -0500 Subject: rpms/squirrelmail/FC-4 squirrelmail.spec,1.22,1.23 Message-ID: <200603051107.k25B7pPL012006@cvs.devel.redhat.com> Author: dwmw2 Update of /cvs/dist/rpms/squirrelmail/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv11972 Modified Files: squirrelmail.spec Log Message: Fix up i18n.php _before_ installing it to the buildroot, not afterwards. Index: squirrelmail.spec =================================================================== RCS file: /cvs/dist/rpms/squirrelmail/FC-4/squirrelmail.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- squirrelmail.spec 3 Mar 2006 17:10:41 -0000 1.22 +++ squirrelmail.spec 5 Mar 2006 11:07:48 -0000 1.23 @@ -6,7 +6,7 @@ Summary: SquirrelMail webmail client Name: squirrelmail Version: 1.4.6 -Release: 1.fc4 +Release: 3.fc4 License: GPL URL: http://www.squirrelmail.org/ Group: Applications/Internet @@ -35,6 +35,11 @@ %prep #%setup -q %setup -q -n squirrelmail-%{version} +mkdir locale_tempdir +cd locale_tempdir +tar xfj %SOURCE4 + +%build rm -f plugins/make_archive.pl # Rearrange the documentation @@ -51,7 +56,7 @@ mv plugins/squirrelspell/doc/* doc/plugins/squirrelspell rm -f doc/plugins/squirrelspell/index.php rmdir plugins/squirrelspell/doc -perl -pi -e "s/\.\.//g" doc/index.html +perl -pi -e "s{\.\./}{}g" doc/index.html # Fixup various files echo "left_refresh=300" >> data/default_pref @@ -63,7 +68,7 @@ # Fix the version %{__perl} -pi -e "s|^(\s*\\\$version\s*=\s*'[^']+)'|\1-%{release}'|g"\ functions/strings.php - + # replace splash screen %if %{fedora_splash} cp %{SOURCE2} images/sm_logo.png @@ -71,6 +76,59 @@ cp %{SOURCE3} images/sm_logo.png %endif +# Convert all locales to utf-8. Not only is this probably the right thing +# to do anyway, but SquirrelMail will corrupt charsets unless the charset +# of the user's locale is a superset of the charset of any mail they reply to +# https://sf.net/tracker/?func=detail&atid=423691&aid=1235345&group_id=311 +sed -i functions/i18n.php \ + -e "s/^\(\$languages\['\([^']*\)'\]\['CHARSET'].*= '\)\([^']*\)';/\1utf-8';/" \ + -e "s/^\(\$languages\['\([^']*\)'\]\['LOCALE'].*=\).*/\1 '\2.UTF-8';/" + +cd locale_tempdir +for LOCALE in `ls locale/` ; do + SKIPINVALID= + case $LOCALE in + ja_JP) + # ja_JP uses iso2022-jp for email but euc-jp in its interface. + CHARSET=euc-jp + ;; + ko_KR) + # ko_KR has broken help files in indeterminate charset. + # Assume it's _mostly_ EUC-KR as it's supposed to be, and let + # iconv drop invalid characters from the input. + SKIPINVALID=-c + CHARSET=`grep CHARSET locale/$LOCALE/setup.php | cut -f6 -d\'` + ;; + *) + CHARSET=`grep CHARSET locale/$LOCALE/setup.php | cut -f6 -d\'` + ;; + esac + + # Check for locales where CHARSET isn't in LOCALE. + grep LOCALE locale/$LOCALE/setup.php | grep -vi $CHARSET || : + + if [ "$CHARSET" != "utf-8" -a "$CHARSET" != "UTF-8" ]; then + for a in `ls help/$LOCALE/ 2>/dev/null` ; do + iconv $SKIPINVALID -f $CHARSET -t utf-8 help/$LOCALE/$a > $a.new && mv $a.new help/$LOCALE/$a + done + sed -e "s/CHARSET..[ ]*= [^;]*;/CHARSET'] = 'utf-8';/" \ + -e "s/LOCALE..[ ]*= [^;]*;/LOCALE'] = '$LOCALE.UTF-8';/" \ + locale/$LOCALE/setup.php > setup.php.new ; mv setup.php.new locale/$LOCALE/setup.php + fi +done + +# do the pofiles separately since they each specify their own charset +for POFILE in `find locale -name \*.po` ; do + CHARSET=`grep charset= $POFILE | cut -f2 -d= | cut -f1 -d\\\\` + if [ "$CHARSET" != "utf-8" -a "$CHARSET" != "UTF-8" ]; then + sed s/charset=$CHARSET/charset=utf-8/ $POFILE | iconv -f $CHARSET -t utf-8 > $POFILE.new && mv $POFILE.new $POFILE + fi +done +for POFILE in `find . -name \*.po` ; do + msgfmt $POFILE -c -o `echo $POFILE | sed s/\.po\$/.mo/` +done +cd .. + %install rm -rf $RPM_BUILD_ROOT mkdir -p -m0755 $RPM_BUILD_ROOT%{_sysconfdir}/squirrelmail @@ -120,62 +178,7 @@ install -m 644 $RPM_SOURCE_DIR/squirrelmail.conf \ $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/ -# Switch all locales to UTF-8. -sed -i functions/i18n.php \ - -e "s/^\(\$languages\['\([^']*\)'\]\['CHARSET'].*= '\)\([^']*\)';/\1utf-8';/" \ - -e "s/^\(\$languages\['\([^']*\)'\]\['LOCALE'].*=\).*/\1 '\2.UTF-8';/" - - -# install locales -mkdir locale_tempdir cd locale_tempdir -tar xfj %SOURCE4 -# Convert all locales to utf-8. Not only is this probably the right thing -# to do anyway, but SquirrelMail will corrupt charsets unless the charset -# of the user's locale is a superset of the charset of any mail they reply to -# https://sf.net/tracker/?func=detail&atid=423691&aid=1235345&group_id=311 -for LOCALE in `ls locale/` ; do - SKIPINVALID= - case $LOCALE in - ja_JP) - # ja_JP uses iso2022-jp for email but euc-jp in its interface. - CHARSET=euc-jp - ;; - ko_KR) - # ko_KR has broken help files in indeterminate charset. - # Assume it's _mostly_ EUC-KR as it's supposed to be, and let - # iconv drop invalid characters from the input. - SKIPINVALID=-c - CHARSET=`grep CHARSET locale/$LOCALE/setup.php | cut -f6 -d\'` - ;; - *) - CHARSET=`grep CHARSET locale/$LOCALE/setup.php | cut -f6 -d\'` - ;; - esac - - # Check for locales where CHARSET isn't in LOCALE. - grep LOCALE locale/$LOCALE/setup.php | grep -vi $CHARSET || : - - if [ "$CHARSET" != "utf-8" -a "$CHARSET" != "UTF-8" ]; then - for a in `ls help/$LOCALE/ 2>/dev/null` ; do - iconv $SKIPINVALID -f $CHARSET -t utf-8 help/$LOCALE/$a > $a.new && mv $a.new help/$LOCALE/$a - done - sed -e "s/CHARSET..[ ]*= [^;]*;/CHARSET'] = 'utf-8';/" \ - -e "s/LOCALE..[ ]*= [^;]*;/LOCALE'] = '$LOCALE.UTF-8';/" \ - locale/$LOCALE/setup.php > setup.php.new ; mv setup.php.new locale/$LOCALE/setup.php - fi -done - -# do the pofiles separately since they each specify their own charset -for POFILE in `find locale -name \*.po` ; do - CHARSET=`grep charset= $POFILE | cut -f2 -d= | cut -f1 -d\\\\` - if [ "$CHARSET" != "utf-8" -a "$CHARSET" != "UTF-8" ]; then - sed s/charset=$CHARSET/charset=utf-8/ $POFILE | iconv -f $CHARSET -t utf-8 > $POFILE.new && mv $POFILE.new $POFILE - fi -done -for POFILE in `find . -name \*.po` ; do - msgfmt $POFILE -c -o `echo $POFILE | sed s/\.po\$/.mo/` -done cp -r locale/* $RPM_BUILD_ROOT%{_datadir}/squirrelmail/locale/ cp -r images/* $RPM_BUILD_ROOT%{_datadir}/squirrelmail/images/ cp -r help/* $RPM_BUILD_ROOT%{_datadir}/squirrelmail/help/ @@ -212,6 +215,13 @@ %{_sysconfdir}/cron.daily/squirrelmail.cron %changelog +* Fri Mar 3 2006 Warren Togami 1.4.6-3 +- Fix regex in doc mangling (#183943 Michal Jaegermann) + +* Fri Mar 3 2006 David Woodhouse 1.4.6-2 +- Add a %%build section, move the file mangling to it. + (#162852 Nicolas Mailhot) + * Wed Mar 1 2006 David Woodhouse 1.4.6-1 - Upgrade to 1.4.6 proper for CVE-2006-0377 CVE-2006-0195 CVE-2006-0188 - Script the charset changes instead of using a patch From fedora-cvs-commits at redhat.com Mon Mar 6 02:01:18 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sun, 5 Mar 2006 21:01:18 -0500 Subject: rpms/selinux-policy/devel policy-20060207.patch, 1.35, 1.36 selinux-policy.spec, 1.136, 1.137 Message-ID: <200603060201.k2621IeH023458@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/selinux-policy/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv23402 Modified Files: policy-20060207.patch selinux-policy.spec Log Message: * Sun Mar 5 2006 Dan Walsh 2.2.23-3 - Load Policy needs translock policy-20060207.patch: Rules.modular | 2 +- policy/modules/admin/readahead.te | 2 +- policy/modules/admin/su.fc | 1 + policy/modules/admin/su.if | 6 +++--- policy/modules/admin/vbetool.te | 5 +++++ policy/modules/kernel/corenetwork.te.in | 2 +- policy/modules/kernel/devices.if | 2 +- policy/modules/kernel/files.fc | 2 +- policy/modules/kernel/files.if | 20 ++++++++++++++++++-- policy/modules/kernel/kernel.if | 2 +- policy/modules/services/apache.fc | 2 ++ policy/modules/services/apache.if | 5 +++++ policy/modules/services/bluetooth.te | 5 +++++ policy/modules/services/cron.te | 3 +++ policy/modules/services/cups.fc | 2 +- policy/modules/services/cups.te | 6 ++++-- policy/modules/services/cvs.te | 2 +- policy/modules/services/hal.if | 21 +++++++++++++++++++++ policy/modules/services/hal.te | 2 ++ policy/modules/services/ktalk.te | 2 ++ policy/modules/services/nscd.if | 2 +- policy/modules/services/samba.te | 2 +- policy/modules/system/init.te | 5 +++++ policy/modules/system/libraries.fc | 2 ++ policy/modules/system/locallogin.te | 1 + policy/modules/system/lvm.fc | 1 + policy/modules/system/selinuxutil.fc | 6 +++--- policy/modules/system/selinuxutil.te | 4 ++++ policy/modules/system/udev.te | 2 +- support/Makefile.devel | 5 +---- 30 files changed, 99 insertions(+), 25 deletions(-) Index: policy-20060207.patch =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20060207.patch,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- policy-20060207.patch 4 Mar 2006 23:24:54 -0000 1.35 +++ policy-20060207.patch 6 Mar 2006 02:00:43 -0000 1.36 @@ -1,6 +1,6 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/readahead.te serefpolicy-2.2.23/policy/modules/admin/readahead.te --- nsaserefpolicy/policy/modules/admin/readahead.te 2006-03-04 00:06:33.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/admin/readahead.te 2006-03-04 00:08:36.000000000 -0500 ++++ serefpolicy-2.2.23/policy/modules/admin/readahead.te 2006-03-04 23:47:48.000000000 -0500 @@ -18,7 +18,7 @@ # Local policy # @@ -12,7 +12,7 @@ allow readahead_t readahead_var_run_t:file create_file_perms; diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/su.fc serefpolicy-2.2.23/policy/modules/admin/su.fc --- nsaserefpolicy/policy/modules/admin/su.fc 2005-11-14 18:24:06.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/admin/su.fc 2006-03-04 00:08:36.000000000 -0500 ++++ serefpolicy-2.2.23/policy/modules/admin/su.fc 2006-03-04 23:47:48.000000000 -0500 @@ -2,3 +2,4 @@ /bin/su -- gen_context(system_u:object_r:su_exec_t,s0) @@ -20,7 +20,7 @@ +/usr/bin/kdesu -- gen_context(system_u:object_r:su_exec_t,s0) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/su.if serefpolicy-2.2.23/policy/modules/admin/su.if --- nsaserefpolicy/policy/modules/admin/su.if 2006-03-04 00:06:33.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/admin/su.if 2006-03-04 00:08:36.000000000 -0500 ++++ serefpolicy-2.2.23/policy/modules/admin/su.if 2006-03-04 23:47:48.000000000 -0500 @@ -141,10 +141,10 @@ # By default, revert to the calling domain when a shell is executed. @@ -37,7 +37,7 @@ kernel_read_kernel_sysctls($1_su_t) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/vbetool.te serefpolicy-2.2.23/policy/modules/admin/vbetool.te --- nsaserefpolicy/policy/modules/admin/vbetool.te 2006-02-01 08:23:27.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/admin/vbetool.te 2006-03-04 10:00:17.000000000 -0500 ++++ serefpolicy-2.2.23/policy/modules/admin/vbetool.te 2006-03-04 23:47:48.000000000 -0500 @@ -15,6 +15,7 @@ # Local policy # @@ -56,7 +56,7 @@ +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corenetwork.te.in serefpolicy-2.2.23/policy/modules/kernel/corenetwork.te.in --- nsaserefpolicy/policy/modules/kernel/corenetwork.te.in 2006-02-20 14:07:36.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/kernel/corenetwork.te.in 2006-03-04 00:08:36.000000000 -0500 ++++ serefpolicy-2.2.23/policy/modules/kernel/corenetwork.te.in 2006-03-04 23:47:48.000000000 -0500 @@ -66,7 +66,7 @@ network_port(giftd, tcp,1213,s0) network_port(gopher, tcp,70,s0, udp,70,s0) @@ -68,7 +68,7 @@ network_port(i18n_input, tcp,9010,s0) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.if serefpolicy-2.2.23/policy/modules/kernel/devices.if --- nsaserefpolicy/policy/modules/kernel/devices.if 2006-02-23 09:25:08.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/kernel/devices.if 2006-03-04 00:08:36.000000000 -0500 ++++ serefpolicy-2.2.23/policy/modules/kernel/devices.if 2006-03-04 23:47:48.000000000 -0500 @@ -2384,7 +2384,7 @@ ') @@ -80,7 +80,7 @@ ######################################## diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.fc serefpolicy-2.2.23/policy/modules/kernel/files.fc --- nsaserefpolicy/policy/modules/kernel/files.fc 2006-03-04 00:06:34.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/kernel/files.fc 2006-03-04 00:08:36.000000000 -0500 ++++ serefpolicy-2.2.23/policy/modules/kernel/files.fc 2006-03-04 23:47:48.000000000 -0500 @@ -93,7 +93,7 @@ # HOME_ROOT # expanded by genhomedircon @@ -92,7 +92,7 @@ HOME_ROOT/lost\+found/.* <> diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.if serefpolicy-2.2.23/policy/modules/kernel/files.if --- nsaserefpolicy/policy/modules/kernel/files.if 2006-03-04 00:06:34.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/kernel/files.if 2006-03-04 00:08:36.000000000 -0500 ++++ serefpolicy-2.2.23/policy/modules/kernel/files.if 2006-03-04 23:47:48.000000000 -0500 @@ -1648,6 +1648,21 @@ ') @@ -133,7 +133,7 @@ ######################################## diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel.if serefpolicy-2.2.23/policy/modules/kernel/kernel.if --- nsaserefpolicy/policy/modules/kernel/kernel.if 2006-03-04 00:06:34.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/kernel/kernel.if 2006-03-04 18:24:16.000000000 -0500 ++++ serefpolicy-2.2.23/policy/modules/kernel/kernel.if 2006-03-04 23:47:48.000000000 -0500 @@ -1328,7 +1328,7 @@ allow $1 proc_t:dir search; @@ -145,7 +145,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.fc serefpolicy-2.2.23/policy/modules/services/apache.fc --- nsaserefpolicy/policy/modules/services/apache.fc 2006-02-27 17:17:23.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/services/apache.fc 2006-03-04 00:08:36.000000000 -0500 ++++ serefpolicy-2.2.23/policy/modules/services/apache.fc 2006-03-04 23:47:48.000000000 -0500 @@ -15,6 +15,7 @@ /etc/vhosts -- gen_context(system_u:object_r:httpd_config_t,s0) @@ -161,7 +161,7 @@ +/usr/share/selinux-policy([^/]*)?/html(/.*)? gen_context(system_u:object_r:httpd_sys_content_t,s0) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.if serefpolicy-2.2.23/policy/modules/services/apache.if --- nsaserefpolicy/policy/modules/services/apache.if 2006-03-04 00:06:35.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/services/apache.if 2006-03-04 00:08:36.000000000 -0500 ++++ serefpolicy-2.2.23/policy/modules/services/apache.if 2006-03-04 23:47:48.000000000 -0500 @@ -12,6 +12,11 @@ ## # @@ -176,7 +176,7 @@ gen_tunable(allow_httpd_$1_script_anon_write,false) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bluetooth.te serefpolicy-2.2.23/policy/modules/services/bluetooth.te --- nsaserefpolicy/policy/modules/services/bluetooth.te 2006-03-04 00:06:35.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/services/bluetooth.te 2006-03-04 00:08:36.000000000 -0500 ++++ serefpolicy-2.2.23/policy/modules/services/bluetooth.te 2006-03-04 23:47:48.000000000 -0500 @@ -115,6 +115,7 @@ corecmd_exec_shell(bluetooth_t) @@ -205,7 +205,7 @@ ifdef(`strict_policy',` diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.te serefpolicy-2.2.23/policy/modules/services/cron.te --- nsaserefpolicy/policy/modules/services/cron.te 2006-03-04 00:06:35.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/services/cron.te 2006-03-04 00:08:36.000000000 -0500 ++++ serefpolicy-2.2.23/policy/modules/services/cron.te 2006-03-04 23:47:48.000000000 -0500 @@ -166,6 +166,9 @@ allow crond_t unconfined_t:dbus send_msg; @@ -218,7 +218,7 @@ allow crond_t crond_tmp_t:file create_file_perms; diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.fc serefpolicy-2.2.23/policy/modules/services/cups.fc --- nsaserefpolicy/policy/modules/services/cups.fc 2005-11-14 18:24:08.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/services/cups.fc 2006-03-04 00:08:36.000000000 -0500 ++++ serefpolicy-2.2.23/policy/modules/services/cups.fc 2006-03-04 23:47:48.000000000 -0500 @@ -43,7 +43,7 @@ /var/log/cups(/.*)? gen_context(system_u:object_r:cupsd_log_t,s0) /var/log/turboprint_cups\.log.* -- gen_context(system_u:object_r:cupsd_log_t,s0) @@ -230,7 +230,7 @@ /var/run/ptal-printd(/.*)? gen_context(system_u:object_r:ptal_var_run_t,s0) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.te serefpolicy-2.2.23/policy/modules/services/cups.te --- nsaserefpolicy/policy/modules/services/cups.te 2006-03-04 00:06:35.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/services/cups.te 2006-03-04 10:49:58.000000000 -0500 ++++ serefpolicy-2.2.23/policy/modules/services/cups.te 2006-03-04 23:47:48.000000000 -0500 @@ -77,7 +77,7 @@ dontaudit cupsd_t self:capability { sys_tty_config net_admin }; allow cupsd_t self:process { setsched signal_perms }; @@ -267,7 +267,7 @@ ######################################## diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cvs.te serefpolicy-2.2.23/policy/modules/services/cvs.te --- nsaserefpolicy/policy/modules/services/cvs.te 2006-03-04 00:06:35.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/services/cvs.te 2006-03-04 00:08:36.000000000 -0500 ++++ serefpolicy-2.2.23/policy/modules/services/cvs.te 2006-03-04 23:47:48.000000000 -0500 @@ -11,7 +11,7 @@ inetd_tcp_service_domain(cvs_t,cvs_exec_t) role system_r types cvs_t; @@ -279,7 +279,7 @@ type cvs_tmp_t; diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.if serefpolicy-2.2.23/policy/modules/services/hal.if --- nsaserefpolicy/policy/modules/services/hal.if 2006-03-04 00:06:36.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/services/hal.if 2006-03-04 09:41:13.000000000 -0500 ++++ serefpolicy-2.2.23/policy/modules/services/hal.if 2006-03-04 23:47:48.000000000 -0500 @@ -100,3 +100,24 @@ allow $1 hald_t:dbus send_msg; allow hald_t $1:dbus send_msg; @@ -307,7 +307,7 @@ + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.te serefpolicy-2.2.23/policy/modules/services/hal.te --- nsaserefpolicy/policy/modules/services/hal.te 2006-03-04 00:06:36.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/services/hal.te 2006-03-04 09:46:42.000000000 -0500 ++++ serefpolicy-2.2.23/policy/modules/services/hal.te 2006-03-04 23:47:48.000000000 -0500 @@ -48,6 +48,7 @@ kernel_read_network_state(hald_t) kernel_read_kernel_sysctls(hald_t) @@ -326,7 +326,7 @@ files_dontaudit_read_root_files(hald_t) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ktalk.te serefpolicy-2.2.23/policy/modules/services/ktalk.te --- nsaserefpolicy/policy/modules/services/ktalk.te 2006-03-04 00:06:36.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/services/ktalk.te 2006-03-04 00:08:36.000000000 -0500 ++++ serefpolicy-2.2.23/policy/modules/services/ktalk.te 2006-03-04 23:47:48.000000000 -0500 @@ -68,6 +68,8 @@ files_read_etc_files(ktalkd_t) @@ -338,7 +338,7 @@ logging_send_syslog_msg(ktalkd_t) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nscd.if serefpolicy-2.2.23/policy/modules/services/nscd.if --- nsaserefpolicy/policy/modules/services/nscd.if 2006-02-10 21:34:14.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/services/nscd.if 2006-03-04 00:08:36.000000000 -0500 ++++ serefpolicy-2.2.23/policy/modules/services/nscd.if 2006-03-04 23:47:48.000000000 -0500 @@ -49,8 +49,8 @@ dontaudit $1 nscd_t:nscd { shmempwd shmemgrp shmemhost }; @@ -351,7 +351,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/samba.te serefpolicy-2.2.23/policy/modules/services/samba.te --- nsaserefpolicy/policy/modules/services/samba.te 2006-03-04 00:06:36.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/services/samba.te 2006-03-04 00:08:36.000000000 -0500 ++++ serefpolicy-2.2.23/policy/modules/services/samba.te 2006-03-04 23:47:48.000000000 -0500 @@ -32,7 +32,7 @@ type samba_secrets_t; files_type(samba_secrets_t) @@ -363,7 +363,7 @@ type samba_var_t; diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.te serefpolicy-2.2.23/policy/modules/system/init.te --- nsaserefpolicy/policy/modules/system/init.te 2006-03-04 00:06:37.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/system/init.te 2006-03-04 00:08:36.000000000 -0500 ++++ serefpolicy-2.2.23/policy/modules/system/init.te 2006-03-04 23:47:48.000000000 -0500 @@ -349,6 +349,7 @@ files_mounton_isid_type_dirs(initrc_t) files_list_default(initrc_t) @@ -385,7 +385,7 @@ # this also would result in a type transition diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.fc serefpolicy-2.2.23/policy/modules/system/libraries.fc --- nsaserefpolicy/policy/modules/system/libraries.fc 2006-02-20 14:07:38.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/system/libraries.fc 2006-03-04 00:08:36.000000000 -0500 ++++ serefpolicy-2.2.23/policy/modules/system/libraries.fc 2006-03-04 23:47:48.000000000 -0500 @@ -65,6 +65,7 @@ /usr/lib(64)?/(nvidia/)?libGL(core)?\.so(\.[^/]*)* -- gen_context(system_u:object_r:textrel_shlib_t,s0) /usr/lib(64)?/libGLU\.so(\.[^/]*)* -- gen_context(system_u:object_r:textrel_shlib_t,s0) @@ -404,7 +404,7 @@ /usr/lib(64)?/.*/program/.*\.so.* gen_context(system_u:object_r:shlib_t,s0) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/locallogin.te serefpolicy-2.2.23/policy/modules/system/locallogin.te --- nsaserefpolicy/policy/modules/system/locallogin.te 2006-03-04 00:06:37.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/system/locallogin.te 2006-03-04 00:08:36.000000000 -0500 ++++ serefpolicy-2.2.23/policy/modules/system/locallogin.te 2006-03-04 23:47:48.000000000 -0500 @@ -20,6 +20,7 @@ type local_login_tmp_t; @@ -415,7 +415,7 @@ type sulogin_exec_t; diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/lvm.fc serefpolicy-2.2.23/policy/modules/system/lvm.fc --- nsaserefpolicy/policy/modules/system/lvm.fc 2005-11-14 18:24:06.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/system/lvm.fc 2006-03-04 00:08:36.000000000 -0500 ++++ serefpolicy-2.2.23/policy/modules/system/lvm.fc 2006-03-04 23:47:48.000000000 -0500 @@ -25,6 +25,7 @@ # /sbin # @@ -426,7 +426,7 @@ /sbin/e2fsadm -- gen_context(system_u:object_r:lvm_exec_t,s0) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.fc serefpolicy-2.2.23/policy/modules/system/selinuxutil.fc --- nsaserefpolicy/policy/modules/system/selinuxutil.fc 2006-02-23 09:25:09.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/system/selinuxutil.fc 2006-03-04 00:08:36.000000000 -0500 ++++ serefpolicy-2.2.23/policy/modules/system/selinuxutil.fc 2006-03-04 23:47:48.000000000 -0500 @@ -8,9 +8,9 @@ /etc/selinux/([^/]*/)?contexts/files(/.*)? gen_context(system_u:object_r:file_context_t,s0) /etc/selinux/([^/]*/)?policy(/.*)? gen_context(system_u:object_r:policy_config_t,s15:c0.c255) @@ -442,8 +442,18 @@ # diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.te serefpolicy-2.2.23/policy/modules/system/selinuxutil.te --- nsaserefpolicy/policy/modules/system/selinuxutil.te 2006-03-04 00:06:37.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/system/selinuxutil.te 2006-03-04 00:08:36.000000000 -0500 -@@ -263,6 +263,7 @@ ++++ serefpolicy-2.2.23/policy/modules/system/selinuxutil.te 2006-03-05 20:56:17.000000000 -0500 +@@ -192,6 +192,9 @@ + selinux_load_policy(load_policy_t) + selinux_set_boolean(load_policy_t) + ++seutil_get_semanage_trans_lock(load_policy_t) ++seutil_get_semanage_read_lock(load_policy_t) ++ + term_use_console(load_policy_t) + term_list_ptys(load_policy_t) + +@@ -263,6 +266,7 @@ selinux_compute_relabel_context(newrole_t) selinux_compute_user_contexts(newrole_t) @@ -453,7 +463,7 @@ term_relabel_all_user_ttys(newrole_t) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.te serefpolicy-2.2.23/policy/modules/system/udev.te --- nsaserefpolicy/policy/modules/system/udev.te 2006-03-04 00:06:37.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/system/udev.te 2006-03-04 00:08:36.000000000 -0500 ++++ serefpolicy-2.2.23/policy/modules/system/udev.te 2006-03-04 23:47:48.000000000 -0500 @@ -39,7 +39,7 @@ # Local policy # @@ -465,7 +475,7 @@ allow udev_t self:process { execmem setfscreate }; diff --exclude-from=exclude -N -u -r nsaserefpolicy/Rules.modular serefpolicy-2.2.23/Rules.modular --- nsaserefpolicy/Rules.modular 2006-02-17 14:46:10.000000000 -0500 -+++ serefpolicy-2.2.23/Rules.modular 2006-03-04 00:08:36.000000000 -0500 ++++ serefpolicy-2.2.23/Rules.modular 2006-03-04 23:47:48.000000000 -0500 @@ -204,7 +204,7 @@ # $(APPDIR)/customizable_types: $(BASE_CONF) @@ -477,7 +487,7 @@ ######################################## diff --exclude-from=exclude -N -u -r nsaserefpolicy/support/Makefile.devel serefpolicy-2.2.23/support/Makefile.devel --- nsaserefpolicy/support/Makefile.devel 2006-02-22 14:09:04.000000000 -0500 -+++ serefpolicy-2.2.23/support/Makefile.devel 2006-03-04 00:08:36.000000000 -0500 ++++ serefpolicy-2.2.23/support/Makefile.devel 2006-03-04 23:47:48.000000000 -0500 @@ -6,10 +6,7 @@ SED ?= sed EINFO ?= echo Index: selinux-policy.spec =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v retrieving revision 1.136 retrieving revision 1.137 diff -u -r1.136 -r1.137 --- selinux-policy.spec 4 Mar 2006 23:24:54 -0000 1.136 +++ selinux-policy.spec 6 Mar 2006 02:00:43 -0000 1.137 @@ -10,7 +10,7 @@ Summary: SELinux policy configuration Name: selinux-policy Version: 2.2.23 -Release: 2 +Release: 3 License: GPL Group: System Environment/Base Source: serefpolicy-%{version}.tgz @@ -296,6 +296,9 @@ %fileList strict %changelog +* Sun Mar 5 2006 Dan Walsh 2.2.23-3 +- Load Policy needs translock + * Sat Mar 4 2006 Dan Walsh 2.2.23-2 - Fix cups html interface From fedora-cvs-commits at redhat.com Mon Mar 6 03:07:27 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sun, 5 Mar 2006 22:07:27 -0500 Subject: rpms/gtk2/devel gtk2.spec,1.127,1.128 Message-ID: <200603060307.k2637R9Z003835@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/gtk2/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv3767 Modified Files: gtk2.spec Log Message: remove another .la file Index: gtk2.spec =================================================================== RCS file: /cvs/dist/rpms/gtk2/devel/gtk2.spec,v retrieving revision 1.127 retrieving revision 1.128 diff -u -r1.127 -r1.128 --- gtk2.spec 1 Mar 2006 14:09:35 -0000 1.127 +++ gtk2.spec 6 Mar 2006 03:07:21 -0000 1.128 @@ -16,7 +16,7 @@ Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X. Name: gtk2 Version: %{base_version} -Release: 3 +Release: 4 License: LGPL Group: System Environment/Libraries Source: gtk+-%{version}.tar.bz2 @@ -201,6 +201,7 @@ rm $RPM_BUILD_ROOT%{_libdir}/*.la rm $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/2.4.0/immodules/*.la rm $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/2.4.0/loaders/*.la +rm $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/2.4.0/engines/*.la mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/gtk-2.0/$host touch $RPM_BUILD_ROOT%{_sysconfdir}/gtk-2.0/$host/gtk.immodules @@ -264,6 +265,9 @@ %doc tmpdocs/examples %changelog +* Sun Mar 5 2006 Matthias Clasen - 2.8.13-4 +- Don't ship .la files for engines, either + * Wed Mar 01 2006 Karsten Hopp 2.8.13-3 - Buildrequires: libXi-devel From fedora-cvs-commits at redhat.com Mon Mar 6 04:13:13 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sun, 5 Mar 2006 23:13:13 -0500 Subject: rpms/initscripts/devel .cvsignore, 1.96, 1.97 initscripts.spec, 1.110, 1.111 sources, 1.104, 1.105 Message-ID: <200603060413.k264DDmC013405@cvs.devel.redhat.com> Author: notting Update of /cvs/dist/rpms/initscripts/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv13358 Modified Files: .cvsignore initscripts.spec sources Log Message: update Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/initscripts/devel/.cvsignore,v retrieving revision 1.96 retrieving revision 1.97 diff -u -r1.96 -r1.97 --- .cvsignore 1 Mar 2006 00:04:03 -0000 1.96 +++ .cvsignore 6 Mar 2006 04:13:10 -0000 1.97 @@ -1 +1 @@ -initscripts-8.30.tar.bz2 +initscripts-8.31.tar.bz2 Index: initscripts.spec =================================================================== RCS file: /cvs/dist/rpms/initscripts/devel/initscripts.spec,v retrieving revision 1.110 retrieving revision 1.111 diff -u -r1.110 -r1.111 --- initscripts.spec 1 Mar 2006 00:04:03 -0000 1.110 +++ initscripts.spec 6 Mar 2006 04:13:10 -0000 1.111 @@ -1,6 +1,6 @@ Summary: The inittab file and the /etc/init.d scripts. Name: initscripts -Version: 8.30 +Version: 8.31 License: GPL Group: System Environment/Base Release: 1 @@ -208,6 +208,10 @@ %ghost %attr(0664,root,utmp) /var/run/utmp %changelog +* Sun Mar 5 2006 Bill Nottingham 8.31-1 +- fix kexec support () +- translation updates + * Tue Feb 28 2006 Bill Nottingham 8.30-1 - hotplug: don't cause modules to be reloaded on ifdown/rmmod (#179809) - fix endless loops in ifup/ifdown (#177792, #182466) Index: sources =================================================================== RCS file: /cvs/dist/rpms/initscripts/devel/sources,v retrieving revision 1.104 retrieving revision 1.105 diff -u -r1.104 -r1.105 --- sources 1 Mar 2006 00:04:03 -0000 1.104 +++ sources 6 Mar 2006 04:13:10 -0000 1.105 @@ -1 +1 @@ -097ea19d927afa7340e1e17e530ef960 initscripts-8.30.tar.bz2 +47a206fc78e3e4be55f0a855f227f9dc initscripts-8.31.tar.bz2 From fedora-cvs-commits at redhat.com Mon Mar 6 04:32:36 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sun, 5 Mar 2006 23:32:36 -0500 Subject: rpms/initscripts/devel sources,1.105,1.106 Message-ID: <200603060432.k264Wa3I000721@cvs.devel.redhat.com> Author: notting Update of /cvs/dist/rpms/initscripts/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv681 Modified Files: sources Log Message: fix dist Index: sources =================================================================== RCS file: /cvs/dist/rpms/initscripts/devel/sources,v retrieving revision 1.105 retrieving revision 1.106 diff -u -r1.105 -r1.106 --- sources 6 Mar 2006 04:13:10 -0000 1.105 +++ sources 6 Mar 2006 04:32:20 -0000 1.106 @@ -1 +1 @@ -47a206fc78e3e4be55f0a855f227f9dc initscripts-8.31.tar.bz2 +284dd7a83319a3d4233a8a12022a3e29 initscripts-8.31.tar.bz2 From fedora-cvs-commits at redhat.com Mon Mar 6 07:49:31 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 6 Mar 2006 02:49:31 -0500 Subject: rpms/kernel/devel linux-2.6-softlockup-disable.patch,1.1,1.2 Message-ID: <200603060749.k267nViv009855@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv9783 Modified Files: linux-2.6-softlockup-disable.patch Log Message: fix warning linux-2.6-softlockup-disable.patch: main.c | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletion(-) Index: linux-2.6-softlockup-disable.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-softlockup-disable.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- linux-2.6-softlockup-disable.patch 5 Mar 2006 07:37:32 -0000 1.1 +++ linux-2.6-softlockup-disable.patch 6 Mar 2006 07:49:29 -0000 1.2 @@ -1,6 +1,6 @@ --- linux-2.6.15.noarch/init/main.c~ 2006-03-05 00:45:51.000000000 -0500 +++ linux-2.6.15.noarch/init/main.c 2006-03-05 00:49:41.000000000 -0500 -@@ -640,6 +640,14 @@ static void __init do_basic_setup(void) +@@ -640,6 +640,15 @@ static void __init do_basic_setup(void) do_initcalls(); } @@ -9,6 +9,7 @@ +static int __init nosoftlockup_setup(char *str) +{ + nosoftlockup = 1; ++ return 1; +} +__setup("nosoftlockup", nosoftlockup_setup); + From fedora-cvs-commits at redhat.com Mon Mar 6 07:56:08 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 6 Mar 2006 02:56:08 -0500 Subject: rpms/glibc/devel .cvsignore, 1.141, 1.142 glibc-fedora.patch, 1.140, 1.141 glibc.spec, 1.226, 1.227 sources, 1.163, 1.164 Message-ID: <200603060756.k267u8Vu012938@cvs.devel.redhat.com> Author: jakub Update of /cvs/dist/rpms/glibc/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv12839/devel Modified Files: .cvsignore glibc-fedora.patch glibc.spec sources Log Message: auto-import glibc-2.3.91-2 on branch devel from glibc-2.3.91-2.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/glibc/devel/.cvsignore,v retrieving revision 1.141 retrieving revision 1.142 diff -u -r1.141 -r1.142 --- .cvsignore 2 Mar 2006 11:47:25 -0000 1.141 +++ .cvsignore 6 Mar 2006 07:55:58 -0000 1.142 @@ -1,2 +1,2 @@ -glibc-20060302T0855.tar.bz2 -glibc-fedora-20060302T0855.tar.bz2 +glibc-20060306T0720.tar.bz2 +glibc-fedora-20060306T0720.tar.bz2 glibc-fedora.patch: ChangeLog | 96 +++ ChangeLog.11 | 21 ChangeLog.12 | 12 ChangeLog.15 | 45 + csu/elf-init.c | 17 debug/tst-chk1.c | 7 elf/check-textrel.c | 1 elf/ldconfig.c | 38 + elf/tst-stackguard1.c | 8 iconv/iconvconfig.c | 55 - include/bits/stdlib-ldbl.h | 1 include/bits/wchar-ldbl.h | 1 include/features.h | 8 intl/locale.alias | 2 libio/bits/stdio2.h | 19 libio/stdio.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/no_NO | 69 ++ localedata/locales/zh_TW | 6 malloc/mcheck.c | 30 - malloc/mtrace.c | 20 nptl/ChangeLog | 19 nptl/Makefile | 8 nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S | 61 +- nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevelrobustlock.S | 45 + nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h | 242 +++++--- nptl/sysdeps/unix/sysv/linux/kernel-features.h | 6 nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S | 59 +- nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h | 294 +++++++--- nptl/sysdeps/unix/sysv/linux/x86_64/lowlevelrobustlock.S | 41 + nptl/tst-stackguard1.c | 8 nscd/connections.c | 15 nscd/nscd.c | 4 nscd/nscd.conf | 4 nscd/nscd.init | 19 posix/Makefile | 19 posix/getconf.speclist.h | 15 sysdeps/generic/dl-cache.h | 8 sysdeps/ia64/Makefile | 4 sysdeps/ia64/ia64libgcc.S | 350 ------------ sysdeps/ia64/libgcc-compat.c | 84 ++ sysdeps/unix/nice.c | 7 sysdeps/unix/sysv/linux/dl-osinfo.h | 29 sysdeps/unix/sysv/linux/futimesat.c | 23 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/tcsetattr.c | 32 + 56 files changed, 1390 insertions(+), 631 deletions(-) View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.140 -r 1.141 glibc-fedora.patch Index: glibc-fedora.patch =================================================================== RCS file: /cvs/dist/rpms/glibc/devel/glibc-fedora.patch,v retrieving revision 1.140 retrieving revision 1.141 diff -u -r1.140 -r1.141 --- glibc-fedora.patch 2 Mar 2006 11:47:25 -0000 1.140 +++ glibc-fedora.patch 6 Mar 2006 07:55:58 -0000 1.141 @@ -1,27 +1,38 @@ ---- glibc-20060302T0855/ChangeLog 2 Mar 2006 04:49:45 -0000 1.10046 -+++ glibc-20060302T0855-fedora/ChangeLog 2 Mar 2006 09:59:46 -0000 1.8782.2.168 -@@ -1,3 +1,20 @@ -+2006-03-02 Jakub Jelinek -+ -+ * malloc/malloc.c (MALLOC_ALIGNMENT): Set to __alignof__ (long double) -+ if long double is more aligned than 2 * SIZE_SZ. -+ (misaligned_chunk): Define. -+ (public_rEALLOc, _int_free, _int_realloc): Use it. -+ -+2006-03-02 Jakub Jelinek -+ -+ * elf/check-textrel.c: Include config.h. -+ (AB(handle_file)): Don't fail if PF_X | PF_W on architectures known -+ to have executable writable PLT. -+ * sysdeps/powerpc/powerpc32/configure.in (HAVE_PPC_SECURE_PLT): New -+ test. -+ * sysdeps/powerpc/powerpc32/configure: Rebuilt. -+ * config.h.in (HAVE_PPC_SECURE_PLT): Add. +--- glibc-20060306T0720/ChangeLog 6 Mar 2006 06:18:43 -0000 1.10059 ++++ glibc-20060306T0720-fedora/ChangeLog 6 Mar 2006 07:34:43 -0000 1.8782.2.171 +@@ -1,3 +1,31 @@ ++2006-03-04 Jakub Jelinek ++ Roland McGrath ++ ++ * sysdeps/unix/sysv/linux/i386/lowlevellock.h ++ (LLL_STUB_UNWIND_INFO_START, LLL_STUB_UNWIND_INFO_END, ++ LLL_STUB_UNWIND_INFO_3, LLL_STUB_UNWIND_INFO_4): Define. ++ (lll_mutex_lock, lll_robust_mutex_lock, lll_mutex_cond_lock, ++ lll_robust_mutex_cond_lock, lll_mutex_timedlock, ++ lll_robust_mutex_timedlock, lll_mutex_unlock, ++ lll_robust_mutex_unlock, lll_lock, lll_unlock): Use them. ++ Add _L_*_ symbols around the subsection. ++ * sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S: Add unwind info. ++ * sysdeps/unix/sysv/linux/i386/i486/lowlevelrobustlock.S: Likewise. ++ ++2006-03-03 Jakub Jelinek ++ Roland McGrath ++ ++ * sysdeps/unix/sysv/linux/x86_64/lowlevellock.h ++ (LLL_STUB_UNWIND_INFO_START, LLL_STUB_UNWIND_INFO_END, ++ LLL_STUB_UNWIND_INFO_5, LLL_STUB_UNWIND_INFO_6): Define. ++ (lll_mutex_lock, lll_robust_mutex_lock, lll_mutex_cond_lock, ++ lll_robust_mutex_cond_lock, lll_mutex_timedlock, ++ lll_robust_mutex_timedlock, lll_mutex_unlock, ++ lll_robust_mutex_unlock, lll_lock, lll_unlock): Use them. ++ Add _L_*_ symbols around the subsection. ++ * sysdeps/unix/sysv/linux/x86_64/lowlevellock.S: Add unwind info. ++ * sysdeps/unix/sysv/linux/x86_64/lowlevelrobustlock.S: Likewise. + - 2006-01-05 H.J. Lu + 2006-03-05 Roland McGrath - [BZ #2013] -@@ -859,6 +876,11 @@ + * malloc/malloc.c (MALLOC_ALIGNMENT): Revert to (2 * SIZE_SZ) value. +@@ -982,6 +1010,11 @@ (__MATHDECL_2): Use __REDIRECT_NTH instead of __REDIRECT followed by __THROW. @@ -33,7 +44,7 @@ 2006-02-02 Ulrich Drepper * sysdeps/unix/sysv/linux/futimesat.c [__NR_futimesat] -@@ -918,6 +940,11 @@ +@@ -1041,6 +1074,11 @@ * sysdeps/ieee754/ldbl-128/s_llrintl.c (__llrintl): Fix a typo. * sysdeps/s390/fpu/libm-test-ulps: Remove llrint ulps. @@ -45,7 +56,7 @@ 2006-01-19 Thomas Schwinge * libio/genops.c: Include . -@@ -3344,6 +3371,10 @@ +@@ -3467,6 +3505,10 @@ * elf/order2mod2.c (init): Cast ignored value to void. @@ -56,7 +67,7 @@ 2005-12-27 Ulrich Drepper * elf/tst-tls13.c (do_test): Avoid using the library path when -@@ -3627,6 +3658,26 @@ +@@ -3750,6 +3792,26 @@ * sysdeps/unix/sysv/linux/time.c: If __NR_time is not defined, use sysdeps/unix/time.c implementation. @@ -83,7 +94,7 @@ 2005-12-19 Ulrich Drepper [BZ #1955] -@@ -6745,6 +6796,11 @@ +@@ -6868,6 +6930,11 @@ R_ARM_TLS_TPOFF32, R_ARM_TLS_GD32, R_ARM_TLS_LDM32, R_ARM_TLS_LDO32, R_ARM_TLS_IE32, R_ARM_TLS_LE32): New macros. @@ -95,7 +106,7 @@ 2005-10-03 Roland McGrath * sysdeps/powerpc/nofpu: Directory removed, saved in ports repository. -@@ -7739,6 +7795,12 @@ +@@ -7862,6 +7929,12 @@ * argp/argp-help.c (__argp_error): __asprintf -> vasprintf. (__argp_failure): Likewise. @@ -108,7 +119,7 @@ 2005-08-08 Ulrich Drepper * nscd/cache.c (cache_add): Commit hash table and header to disk. -@@ -7863,6 +7925,17 @@ +@@ -7986,6 +8059,17 @@ __syslog_chk. * misc/Versions: Export __syslog_chk and __vsyslog_chk. @@ -126,7 +137,7 @@ 2005-07-28 Thomas Schwinge [BZ #1137] -@@ -10923,6 +10996,18 @@ +@@ -11046,6 +11130,18 @@ * scripts/soversions.awk: Fix default version set handling. @@ -145,8 +156,8 @@ 2005-02-10 Roland McGrath [BZ #157] ---- glibc-20060302T0855/ChangeLog.11 10 Nov 2000 03:31:36 -0000 1.1 -+++ glibc-20060302T0855-fedora/ChangeLog.11 22 Sep 2004 21:20:47 -0000 1.1.4.1 +--- glibc-20060306T0720/ChangeLog.11 10 Nov 2000 03:31:36 -0000 1.1 ++++ glibc-20060306T0720-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. @@ -196,8 +207,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-20060302T0855/ChangeLog.12 16 Aug 2001 05:24:54 -0000 1.1 -+++ glibc-20060302T0855-fedora/ChangeLog.12 22 Sep 2004 21:20:47 -0000 1.1.4.1 +--- glibc-20060306T0720/ChangeLog.12 16 Aug 2001 05:24:54 -0000 1.1 ++++ glibc-20060306T0720-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. @@ -224,8 +235,8 @@ 2001-01-02 Franz Sirl * sysdeps/powerpc/dl-machine.c (__process_machine_rela): Fix typo. ---- glibc-20060302T0855/ChangeLog.15 16 Feb 2005 07:34:17 -0000 1.1 -+++ glibc-20060302T0855-fedora/ChangeLog.15 3 Mar 2005 17:29:57 -0000 1.1.6.2 +--- glibc-20060306T0720/ChangeLog.15 16 Feb 2005 07:34:17 -0000 1.1 ++++ glibc-20060306T0720-fedora/ChangeLog.15 3 Mar 2005 17:29:57 -0000 1.1.6.2 @@ -477,6 +477,14 @@ 2004-11-26 Jakub Jelinek @@ -306,20 +317,8 @@ 2004-08-30 Roland McGrath * scripts/extract-abilist.awk: If `lastversion' variable defined, omit ---- glibc-20060302T0855/config.h.in 22 Feb 2006 02:09:03 -0000 1.78 -+++ glibc-20060302T0855-fedora/config.h.in 2 Mar 2006 09:59:02 -0000 1.70.2.5 -@@ -200,6 +200,9 @@ - /* Define if your assembler and linker support R_PPC_REL16* relocs. */ - #undef HAVE_ASM_PPC_REL16 - -+/* Define if your compiler defaults to -msecure-plt mode on ppc. */ -+#undef HAVE_PPC_SECURE_PLT -+ - /* Define if __stack_chk_guard canary should be randomized at program startup. */ - #undef ENABLE_STACKGUARD_RANDOMIZE - ---- glibc-20060302T0855/csu/elf-init.c 5 Nov 2005 17:41:38 -0000 1.8 -+++ glibc-20060302T0855-fedora/csu/elf-init.c 15 Nov 2005 09:54:10 -0000 1.3.2.6 +--- glibc-20060306T0720/csu/elf-init.c 5 Nov 2005 17:41:38 -0000 1.8 ++++ glibc-20060306T0720-fedora/csu/elf-init.c 15 Nov 2005 09:54:10 -0000 1.3.2.6 @@ -49,6 +49,23 @@ extern void (*__init_array_end []) (int, extern void (*__fini_array_start []) (void) attribute_hidden; extern void (*__fini_array_end []) (void) attribute_hidden; @@ -344,8 +343,8 @@ /* These function symbols are provided for the .init/.fini section entry points automagically by the linker. */ ---- glibc-20060302T0855/debug/tst-chk1.c 22 Aug 2005 15:12:34 -0000 1.14 -+++ glibc-20060302T0855-fedora/debug/tst-chk1.c 24 Aug 2005 07:23:26 -0000 1.1.2.15 +--- glibc-20060306T0720/debug/tst-chk1.c 22 Aug 2005 15:12:34 -0000 1.14 ++++ glibc-20060306T0720-fedora/debug/tst-chk1.c 24 Aug 2005 07:23:26 -0000 1.1.2.15 @@ -17,6 +17,9 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ @@ -374,8 +373,8 @@ [...1638 lines suppressed...] ++++ glibc-20060306T0720-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 @@ -1474,8 +2609,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-20060302T0855/sysdeps/ia64/Makefile 16 Aug 2004 06:46:14 -0000 1.10 -+++ glibc-20060302T0855-fedora/sysdeps/ia64/Makefile 22 Sep 2004 21:21:07 -0000 1.10.2.1 +--- glibc-20060306T0720/sysdeps/ia64/Makefile 16 Aug 2004 06:46:14 -0000 1.10 ++++ glibc-20060306T0720-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)) @@ -1487,8 +2622,8 @@ endif endif ---- glibc-20060302T0855/sysdeps/ia64/ia64libgcc.S 11 May 2002 05:12:35 -0000 1.2 -+++ glibc-20060302T0855-fedora/sysdeps/ia64/ia64libgcc.S 22 Sep 2004 21:21:07 -0000 1.2.2.1 +--- glibc-20060306T0720/sysdeps/ia64/ia64libgcc.S 11 May 2002 05:12:35 -0000 1.2 ++++ glibc-20060306T0720-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. */ @@ -1840,8 +2975,8 @@ - .symver ___multi3, __multi3 at GLIBC_2.2 - -#endif ---- glibc-20060302T0855/sysdeps/ia64/libgcc-compat.c 1 Jan 1970 00:00:00 -0000 -+++ glibc-20060302T0855-fedora/sysdeps/ia64/libgcc-compat.c 22 Sep 2004 21:21:08 -0000 1.1.2.1 +--- glibc-20060306T0720/sysdeps/ia64/libgcc-compat.c 1 Jan 1970 00:00:00 -0000 ++++ glibc-20060306T0720-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. @@ -1927,63 +3062,8 @@ +symbol_version (INTUSE (__multi3), __multi3, GLIBC_2.2); + +#endif ---- glibc-20060302T0855/sysdeps/powerpc/powerpc32/configure 17 Jun 2005 22:58:48 -0000 1.1 -+++ glibc-20060302T0855-fedora/sysdeps/powerpc/powerpc32/configure 2 Mar 2006 09:59:03 -0000 1.1.2.2 -@@ -31,3 +31,32 @@ if test $libc_cv_ppc_rel16 = yes; then - _ACEOF - - fi -+ -+# See whether GCC uses -msecure-plt. -+echo "$as_me:$LINENO: checking for -msecure-plt by default" >&5 -+echo $ECHO_N "checking for -msecure-plt by default... $ECHO_C" >&6 -+if test "${libc_cv_ppc_secure_plt+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ echo 'int foo (void) { extern int bar; return bar; }' > conftest.c -+libc_cv_ppc_secure_plt=no -+if { ac_try='${CC-cc} -S $CFLAGS conftest.c -fpic -o conftest.s 1>&5' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; }; then -+ if grep '_GLOBAL_OFFSET_TABLE_-.*@ha' conftest.s > /dev/null 2>&1; then -+ libc_cv_ppc_secure_plt=yes -+ fi -+fi -+rm -rf conftest* -+fi -+echo "$as_me:$LINENO: result: $libc_cv_ppc_secure_plt" >&5 -+echo "${ECHO_T}$libc_cv_ppc_secure_plt" >&6 -+if test $libc_cv_ppc_secure_plt = yes; then -+ cat >>confdefs.h <<\_ACEOF -+#define HAVE_PPC_SECURE_PLT 1 -+_ACEOF -+ -+fi ---- glibc-20060302T0855/sysdeps/powerpc/powerpc32/configure.in 17 Jun 2005 22:58:48 -0000 1.1 -+++ glibc-20060302T0855-fedora/sysdeps/powerpc/powerpc32/configure.in 2 Mar 2006 09:59:03 -0000 1.1.2.2 -@@ -16,3 +16,17 @@ rm -f conftest*]) - if test $libc_cv_ppc_rel16 = yes; then - AC_DEFINE(HAVE_ASM_PPC_REL16) - fi -+ -+# See whether GCC uses -msecure-plt. -+AC_CACHE_CHECK(for -msecure-plt by default, libc_cv_ppc_secure_plt, [dnl -+echo 'int foo (void) { extern int bar; return bar; }' > conftest.c -+libc_cv_ppc_secure_plt=no -+if AC_TRY_COMMAND(${CC-cc} -S $CFLAGS conftest.c -fpic -o conftest.s 1>&AS_MESSAGE_LOG_FD); then -+ if grep '_GLOBAL_OFFSET_TABLE_-.*@ha' conftest.s > /dev/null 2>&1; then -+ libc_cv_ppc_secure_plt=yes -+ fi -+fi -+rm -rf conftest*]) -+if test $libc_cv_ppc_secure_plt = yes; then -+ AC_DEFINE(HAVE_PPC_SECURE_PLT) -+fi ---- glibc-20060302T0855/sysdeps/unix/nice.c 28 Sep 2002 19:13:13 -0000 1.6 -+++ glibc-20060302T0855-fedora/sysdeps/unix/nice.c 22 Sep 2004 21:21:08 -0000 1.6.2.1 +--- glibc-20060306T0720/sysdeps/unix/nice.c 28 Sep 2002 19:13:13 -0000 1.6 ++++ glibc-20060306T0720-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); } @@ -1998,8 +3078,8 @@ if (result != -1) return getpriority (PRIO_PROCESS, 0); else ---- glibc-20060302T0855/sysdeps/unix/sysv/linux/dl-osinfo.h 8 Jan 2006 08:21:15 -0000 1.22 -+++ glibc-20060302T0855-fedora/sysdeps/unix/sysv/linux/dl-osinfo.h 9 Jan 2006 21:55:08 -0000 1.14.2.8 +--- glibc-20060306T0720/sysdeps/unix/sysv/linux/dl-osinfo.h 8 Jan 2006 08:21:15 -0000 1.22 ++++ glibc-20060306T0720-fedora/sysdeps/unix/sysv/linux/dl-osinfo.h 9 Jan 2006 21:55:08 -0000 1.14.2.8 @@ -18,12 +18,15 @@ 02111-1307 USA. */ @@ -2048,8 +3128,8 @@ + ret ^= stk; return ret; } ---- glibc-20060302T0855/sysdeps/unix/sysv/linux/futimesat.c 3 Feb 2006 05:26:34 -0000 1.6 -+++ glibc-20060302T0855-fedora/sysdeps/unix/sysv/linux/futimesat.c 3 Feb 2006 09:43:55 -0000 1.1.2.7 +--- glibc-20060306T0720/sysdeps/unix/sysv/linux/futimesat.c 3 Feb 2006 05:26:34 -0000 1.6 ++++ glibc-20060306T0720-fedora/sysdeps/unix/sysv/linux/futimesat.c 3 Feb 2006 09:43:55 -0000 1.1.2.7 @@ -37,14 +37,14 @@ futimesat (fd, file, tvp) { int result; @@ -2092,8 +3172,8 @@ { size_t filelen = strlen (file); static const char procfd[] = "/proc/self/fd/%d/%s"; ---- glibc-20060302T0855/sysdeps/unix/sysv/linux/paths.h 15 Nov 2000 23:06:47 -0000 1.11 -+++ glibc-20060302T0855-fedora/sysdeps/unix/sysv/linux/paths.h 22 Sep 2004 21:21:08 -0000 1.11.4.1 +--- glibc-20060306T0720/sysdeps/unix/sysv/linux/paths.h 15 Nov 2000 23:06:47 -0000 1.11 ++++ glibc-20060306T0720-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" @@ -2103,8 +3183,8 @@ #define _PATH_WTMP "/var/log/wtmp" /* Provide trailing slash, since mostly used for building pathnames. */ ---- glibc-20060302T0855/sysdeps/unix/sysv/linux/tcsetattr.c 10 Sep 2003 19:16:07 -0000 1.16 -+++ glibc-20060302T0855-fedora/sysdeps/unix/sysv/linux/tcsetattr.c 22 Sep 2004 21:21:08 -0000 1.16.2.1 +--- glibc-20060306T0720/sysdeps/unix/sysv/linux/tcsetattr.c 10 Sep 2003 19:16:07 -0000 1.16 ++++ glibc-20060306T0720-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; @@ -2150,8 +3230,8 @@ + return retval; } libc_hidden_def (tcsetattr) ---- glibc-20060302T0855/sysdeps/unix/sysv/linux/i386/dl-cache.h 1 Jan 1970 00:00:00 -0000 -+++ glibc-20060302T0855-fedora/sysdeps/unix/sysv/linux/i386/dl-cache.h 22 Sep 2004 21:21:08 -0000 1.1.2.1 +--- glibc-20060306T0720/sysdeps/unix/sysv/linux/i386/dl-cache.h 1 Jan 1970 00:00:00 -0000 ++++ glibc-20060306T0720-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. @@ -2212,8 +3292,8 @@ + } while (0) + +#include_next ---- glibc-20060302T0855/sysdeps/unix/sysv/linux/ia64/dl-cache.h 6 Jul 2001 04:56:17 -0000 1.2 -+++ glibc-20060302T0855-fedora/sysdeps/unix/sysv/linux/ia64/dl-cache.h 22 Sep 2004 21:21:09 -0000 1.2.4.1 +--- glibc-20060306T0720/sysdeps/unix/sysv/linux/ia64/dl-cache.h 6 Jul 2001 04:56:17 -0000 1.2 ++++ glibc-20060306T0720-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) @@ -2246,24 +3326,24 @@ + } while (0) + #include_next ---- glibc-20060302T0855/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 1 Jan 1970 00:00:00 -0000 -+++ glibc-20060302T0855-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 22 Sep 2004 21:21:09 -0000 1.1.2.1 +--- glibc-20060306T0720/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 1 Jan 1970 00:00:00 -0000 ++++ glibc-20060306T0720-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-20060302T0855/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 1 Jan 1970 00:00:00 -0000 -+++ glibc-20060302T0855-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 22 Sep 2004 21:21:09 -0000 1.1.2.1 +--- glibc-20060306T0720/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 1 Jan 1970 00:00:00 -0000 ++++ glibc-20060306T0720-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-20060302T0855/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed 17 Jan 2002 06:49:28 -0000 1.2 -+++ glibc-20060302T0855-fedora/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed 22 Sep 2004 21:21:09 -0000 1.2.2.1 +--- glibc-20060306T0720/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed 17 Jan 2002 06:49:28 -0000 1.2 ++++ glibc-20060306T0720-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"_ Index: glibc.spec =================================================================== RCS file: /cvs/dist/rpms/glibc/devel/glibc.spec,v retrieving revision 1.226 retrieving revision 1.227 diff -u -r1.226 -r1.227 --- glibc.spec 2 Mar 2006 11:47:25 -0000 1.226 +++ glibc.spec 6 Mar 2006 07:55:58 -0000 1.227 @@ -1,9 +1,9 @@ -%define glibcdate 20060302T0855 +%define glibcdate 20060306T0720 %define glibcname glibc -%define glibcsrcdir glibc-20060302T0855 +%define glibcsrcdir glibc-20060306T0720 %define glibc_release_tarballs 0 %define glibcversion 2.3.91 -%define glibcrelease 1 +%define glibcrelease 2 %define auxarches i586 i686 athlon sparcv9 alphaev6 %define prelinkarches noarch %define xenarches i686 athlon @@ -699,6 +699,9 @@ %ifarch i686 BuildFlags="-march=i686 -mtune=pentium4" %endif +%ifarch x86_64 +BuildFlags="-DUSE_CFA_VAL_EXPRESSION" +%endif %ifarch alphaev6 BuildFlags="-mcpu=ev6" %endif @@ -1337,6 +1340,13 @@ %endif %changelog +* Mon Mar 6 2006 Jakub Jelinek 2.3.91-2 +- update from CVS + - fix sYSMALLOc for MALLOC_ALIGNMENT > 2 * SIZE_SZ (#183895) + - revert ppc32 malloc alignment patch, it breaks malloc_set_state + and needs some further thoughts and time (#183894) +- provide accurate unwind info for lowlevellock.h stubs on x86_64 + * Thu Mar 2 2006 Jakub Jelinek 2.3.91-1 - update from CVS - fixes for various arches Index: sources =================================================================== RCS file: /cvs/dist/rpms/glibc/devel/sources,v retrieving revision 1.163 retrieving revision 1.164 diff -u -r1.163 -r1.164 --- sources 2 Mar 2006 11:47:25 -0000 1.163 +++ sources 6 Mar 2006 07:55:58 -0000 1.164 @@ -1,2 +1,2 @@ -7787f2784c74be230cbb307b44a8a883 glibc-20060302T0855.tar.bz2 -3dd6039e4a284e1cde38324db43f8ebb glibc-fedora-20060302T0855.tar.bz2 +1e8fec58db2ad0735426a0e345c4d777 glibc-20060306T0720.tar.bz2 +e9f6d149054a4507911a303ec1de4064 glibc-fedora-20060306T0720.tar.bz2 From fedora-cvs-commits at redhat.com Mon Mar 6 08:24:22 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 6 Mar 2006 03:24:22 -0500 Subject: rpms/glibc/devel glibc-fedora.patch,1.141,1.142 Message-ID: <200603060824.k268OMKV028540@cvs.devel.redhat.com> Author: jakub Update of /cvs/dist/rpms/glibc/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv28465 Modified Files: glibc-fedora.patch Log Message: 2.3.91-2 glibc-fedora.patch: ChangeLog | 96 +++ ChangeLog.11 | 21 ChangeLog.12 | 12 ChangeLog.15 | 45 + csu/elf-init.c | 17 debug/tst-chk1.c | 7 elf/check-textrel.c | 1 elf/ldconfig.c | 38 + elf/tst-stackguard1.c | 8 iconv/iconvconfig.c | 55 - include/bits/stdlib-ldbl.h | 1 include/bits/wchar-ldbl.h | 1 include/features.h | 8 intl/locale.alias | 2 libc/sysdeps/unix/sysv/linux/i386/sysconf.c | 14 libio/bits/stdio2.h | 19 libio/stdio.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/no_NO | 69 ++ localedata/locales/zh_TW | 6 malloc/mcheck.c | 30 - malloc/mtrace.c | 20 nptl/ChangeLog | 19 nptl/Makefile | 8 nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S | 61 +- nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevelrobustlock.S | 45 + nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h | 242 +++++--- nptl/sysdeps/unix/sysv/linux/kernel-features.h | 6 nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S | 59 +- nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h | 294 +++++++--- nptl/sysdeps/unix/sysv/linux/x86_64/lowlevelrobustlock.S | 41 + nptl/tst-stackguard1.c | 8 nscd/connections.c | 15 nscd/nscd.c | 4 nscd/nscd.conf | 4 nscd/nscd.init | 19 posix/Makefile | 19 posix/getconf.speclist.h | 15 sysdeps/generic/dl-cache.h | 8 sysdeps/ia64/Makefile | 4 sysdeps/ia64/ia64libgcc.S | 350 ------------ sysdeps/ia64/libgcc-compat.c | 84 ++ sysdeps/unix/nice.c | 7 sysdeps/unix/sysv/linux/dl-osinfo.h | 29 sysdeps/unix/sysv/linux/futimesat.c | 23 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/tcsetattr.c | 32 + 57 files changed, 1393 insertions(+), 642 deletions(-) Index: glibc-fedora.patch =================================================================== RCS file: /cvs/dist/rpms/glibc/devel/glibc-fedora.patch,v retrieving revision 1.141 retrieving revision 1.142 diff -u -r1.141 -r1.142 --- glibc-fedora.patch 6 Mar 2006 07:55:58 -0000 1.141 +++ glibc-fedora.patch 6 Mar 2006 08:24:20 -0000 1.142 @@ -3347,3 +3347,47 @@ @@ -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"_ +--- libc/sysdeps/unix/sysv/linux/i386/sysconf.c 2006-02-02 06:10:40.000000000 +0100 ++++ libc/sysdeps/unix/sysv/linux/i386/sysconf.c 2006-03-06 09:22:20.000000000 +0100 +@@ -27,6 +27,7 @@ static long int linux_sysconf (int name) + + + static long int ++__attribute__((noinline)) + handle_i486 (int name) + { + /* The processor only has a unified level 1 cache of 8k. */ +@@ -203,6 +204,7 @@ intel_check_word (int name, unsigned int + + + static long int ++__attribute__((noinline)) + handle_intel (int name, unsigned int maxidx) + { + if (maxidx < 2) +@@ -265,6 +267,7 @@ handle_intel (int name, unsigned int max + + + static long int ++__attribute__((noinline)) + handle_amd (int name) + { + unsigned int eax; +@@ -359,17 +362,6 @@ i386_i486_test (void) + long int + __sysconf (int name) + { +- if (name == _SC_CPUTIME || name == _SC_THREAD_CPUTIME) +- { +-#if HP_TIMING_AVAIL +- // XXX We can add here test for machines which cannot support a +- // XXX usable TSC. +- return 200112L; +-#else +- return -1; +-#endif +- } +- + /* All the remainder, except the cache information, is handled in + the generic code. */ + if (name < _SC_LEVEL1_ICACHE_SIZE || name > _SC_LEVEL4_CACHE_LINESIZE) From fedora-cvs-commits at redhat.com Mon Mar 6 08:29:41 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 6 Mar 2006 03:29:41 -0500 Subject: rpms/glibc/devel glibc-fedora.patch,1.142,1.143 Message-ID: <200603060829.k268TfXB030748@cvs.devel.redhat.com> Author: jakub Update of /cvs/dist/rpms/glibc/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv30682 Modified Files: glibc-fedora.patch Log Message: 2.3.91-2 glibc-fedora.patch: ChangeLog | 96 +++ ChangeLog.11 | 21 ChangeLog.12 | 12 ChangeLog.15 | 45 + csu/elf-init.c | 17 debug/tst-chk1.c | 7 elf/check-textrel.c | 1 elf/ldconfig.c | 38 + elf/tst-stackguard1.c | 8 iconv/iconvconfig.c | 55 - include/bits/stdlib-ldbl.h | 1 include/bits/wchar-ldbl.h | 1 include/features.h | 8 intl/locale.alias | 2 libc/sysdeps/unix/sysv/linux/i386/sysconf.c | 17 libc/sysdeps/unix/sysv/linux/x86_64/sysconf.c | 10 libio/bits/stdio2.h | 19 libio/stdio.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/no_NO | 69 ++ localedata/locales/zh_TW | 6 malloc/mcheck.c | 30 - malloc/mtrace.c | 20 nptl/ChangeLog | 19 nptl/Makefile | 8 nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S | 61 +- nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevelrobustlock.S | 45 + nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h | 242 +++++--- nptl/sysdeps/unix/sysv/linux/kernel-features.h | 6 nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S | 59 +- nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h | 294 +++++++--- nptl/sysdeps/unix/sysv/linux/x86_64/lowlevelrobustlock.S | 41 + nptl/tst-stackguard1.c | 8 nscd/connections.c | 15 nscd/nscd.c | 4 nscd/nscd.conf | 4 nscd/nscd.init | 19 posix/Makefile | 19 posix/getconf.speclist.h | 15 sysdeps/generic/dl-cache.h | 8 sysdeps/ia64/Makefile | 4 sysdeps/ia64/ia64libgcc.S | 350 ------------ sysdeps/ia64/libgcc-compat.c | 84 ++ sysdeps/unix/nice.c | 7 sysdeps/unix/sysv/linux/dl-osinfo.h | 29 sysdeps/unix/sysv/linux/futimesat.c | 23 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/tcsetattr.c | 32 + 58 files changed, 1395 insertions(+), 653 deletions(-) Index: glibc-fedora.patch =================================================================== RCS file: /cvs/dist/rpms/glibc/devel/glibc-fedora.patch,v retrieving revision 1.142 retrieving revision 1.143 diff -u -r1.142 -r1.143 --- glibc-fedora.patch 6 Mar 2006 08:24:20 -0000 1.142 +++ glibc-fedora.patch 6 Mar 2006 08:29:36 -0000 1.143 @@ -3347,33 +3347,36 @@ @@ -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"_ ---- libc/sysdeps/unix/sysv/linux/i386/sysconf.c 2006-02-02 06:10:40.000000000 +0100 -+++ libc/sysdeps/unix/sysv/linux/i386/sysconf.c 2006-03-06 09:22:20.000000000 +0100 -@@ -27,6 +27,7 @@ static long int linux_sysconf (int name) +--- libc/sysdeps/unix/sysv/linux/i386/sysconf.c 1 Feb 2006 18:26:19 -0000 1.6 ++++ libc/sysdeps/unix/sysv/linux/i386/sysconf.c 6 Mar 2006 08:25:57 -0000 1.7 +@@ -26,7 +26,7 @@ + static long int linux_sysconf (int name); - static long int -+__attribute__((noinline)) +-static long int ++static long int __attribute__ ((noinline)) handle_i486 (int name) { /* The processor only has a unified level 1 cache of 8k. */ -@@ -203,6 +204,7 @@ intel_check_word (int name, unsigned int +@@ -202,7 +202,7 @@ intel_check_word (int name, unsigned int + } - static long int -+__attribute__((noinline)) +-static long int ++static long int __attribute__ ((noinline)) handle_intel (int name, unsigned int maxidx) { if (maxidx < 2) -@@ -265,6 +267,7 @@ handle_intel (int name, unsigned int max +@@ -264,7 +264,7 @@ handle_intel (int name, unsigned int max + } - static long int -+__attribute__((noinline)) +-static long int ++static long int __attribute__ ((noinline)) handle_amd (int name) { unsigned int eax; -@@ -359,17 +362,6 @@ i386_i486_test (void) +@@ -359,17 +359,6 @@ i386_i486_test (void) long int __sysconf (int name) { @@ -3391,3 +3394,36 @@ /* All the remainder, except the cache information, is handled in the generic code. */ if (name < _SC_LEVEL1_ICACHE_SIZE || name > _SC_LEVEL4_CACHE_LINESIZE) +--- libc/sysdeps/unix/sysv/linux/x86_64/sysconf.c 2 Feb 2006 05:33:33 -0000 1.4 ++++ libc/sysdeps/unix/sysv/linux/x86_64/sysconf.c 6 Mar 2006 08:25:57 -0000 1.5 +@@ -163,7 +163,7 @@ intel_check_word (int name, unsigned int + } + + +-static long int ++static long int __attribute__ ((noinline)) + handle_intel (int name, unsigned int maxidx) + { + assert (maxidx >= 2); +@@ -220,7 +220,7 @@ handle_intel (int name, unsigned int max + } + + +-static long int ++static long int __attribute__ ((noinline)) + handle_amd (int name) + { + unsigned int eax; +@@ -293,12 +293,6 @@ handle_amd (int name) + long int + __sysconf (int name) + { +- if (name == _SC_CPUTIME || name == _SC_THREAD_CPUTIME) +- { +- /* XXX Test whether TSC is usable. */ +- return 200112L; +- } +- + /* We only handle the cache information here (for now). */ + if (name < _SC_LEVEL1_ICACHE_SIZE || name > _SC_LEVEL4_CACHE_LINESIZE) + return linux_sysconf (name); From fedora-cvs-commits at redhat.com Mon Mar 6 08:33:21 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 6 Mar 2006 03:33:21 -0500 Subject: rpms/libusb/devel libusb.spec,1.23,1.24 sources,1.9,1.10 Message-ID: <200603060833.k268XLqM031259@cvs.devel.redhat.com> Author: jnovy Update of /cvs/dist/rpms/libusb/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv31055 Modified Files: libusb.spec sources Log Message: * Mon Mar 6 2006 Jindrich Novy 0.1.12-1 - update to 0.1.12 - drop .format, .searchorder patches, applied upstream Index: libusb.spec =================================================================== RCS file: /cvs/dist/rpms/libusb/devel/libusb.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- libusb.spec 11 Feb 2006 04:15:06 -0000 1.23 +++ libusb.spec 6 Mar 2006 08:33:19 -0000 1.24 @@ -1,10 +1,8 @@ Summary: A library which allows userspace access to USB devices. Name: libusb -Version: 0.1.11 -Release: 2.2 +Version: 0.1.12 +Release: 1 Source0: http://prdownloads.sourceforge.net/libusb/%{name}-%{version}.tar.gz -Patch0: libusb-0.1.11-format.patch -Patch1: libusb-0.1.11-searchorder.patch License: LGPL Group: System Environment/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-root @@ -27,8 +25,6 @@ %prep %setup -q -%patch0 -p1 -b .format -%patch1 -p1 -b .searchorder # Fix libdir in configure.in. mv -f configure.in configure.in.old @@ -73,6 +69,10 @@ %changelog +* Mon Mar 6 2006 Jindrich Novy 0.1.12-1 +- update to 0.1.12 +- drop .format, .searchorder patches, applied upstream + * Fri Feb 10 2006 Jesse Keating - 0.1.11-2.2 - bump again for double-long bug on ppc(64) Index: sources =================================================================== RCS file: /cvs/dist/rpms/libusb/devel/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 22 Jan 2006 08:04:53 -0000 1.9 +++ sources 6 Mar 2006 08:33:19 -0000 1.10 @@ -1 +1 @@ -df79951a36333104a663c30cb598df37 libusb-0.1.11.tar.gz +caf182cbc7565dac0fd72155919672e6 libusb-0.1.12.tar.gz From fedora-cvs-commits at redhat.com Mon Mar 6 08:35:27 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 6 Mar 2006 03:35:27 -0500 Subject: rpms/libusb/devel libusb-0.1.11-format.patch, 1.2, NONE libusb-0.1.11-searchorder.patch, 1.1, NONE Message-ID: <200603060835.k268ZRFn031480@cvs.devel.redhat.com> Author: jnovy Update of /cvs/dist/rpms/libusb/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv31435 Removed Files: libusb-0.1.11-format.patch libusb-0.1.11-searchorder.patch Log Message: - remove obsolete patches --- libusb-0.1.11-format.patch DELETED --- --- libusb-0.1.11-searchorder.patch DELETED --- From fedora-cvs-commits at redhat.com Mon Mar 6 10:42:38 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 6 Mar 2006 05:42:38 -0500 Subject: rpms/w3m/devel w3m-multilib.patch,NONE,1.1 w3m.spec,1.31,1.32 Message-ID: <200603061042.k26AgcDG008273@cvs.devel.redhat.com> Author: tagoh Update of /cvs/dist/rpms/w3m/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv8259 Modified Files: w3m.spec Added Files: w3m-multilib.patch Log Message: * Mon Mar 6 2006 Akira TAGOH - 0.5.1-13 - w3m-multilib.patch: fixed to link 64bit version of libnsl.so. (#182408) w3m-multilib.patch: acinclude.m4 | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE w3m-multilib.patch --- diff -ruN w3m-0.5.1.orig/acinclude.m4 w3m-0.5.1/acinclude.m4 --- w3m-0.5.1.orig/acinclude.m4 2006-03-06 18:24:38.000000000 +0900 +++ w3m-0.5.1/acinclude.m4 2006-03-06 18:27:55.000000000 +0900 @@ -394,7 +394,7 @@ [lib=$1 AC_MSG_CHECKING(for -l$lib) extlib="not found" - for dir in /lib /usr/lib /usr/local/lib /usr/ucblib /usr/ccslib /usr/ccs/lib + for dir in /lib64 /lib /usr/lib64 /usr/lib /usr/local/lib64 /usr/local/lib /usr/ucblib /usr/ccslib /usr/ccs/lib do if test -f $dir/lib$lib.a -o -f $dir/lib$lib.so ; then LIBS="$LIBS -l$lib" Index: w3m.spec =================================================================== RCS file: /cvs/dist/rpms/w3m/devel/w3m.spec,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- w3m.spec 11 Feb 2006 06:02:53 -0000 1.31 +++ w3m.spec 6 Mar 2006 10:42:35 -0000 1.32 @@ -4,7 +4,7 @@ Name: w3m Version: 0.5.1 -Release: 12.2.1 +Release: 13 License: BSD URL: http://w3m.sourceforge.net/ BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot @@ -32,6 +32,7 @@ Patch21: w3m-0.5.1-gcc4.patch Patch22: w3m-cvs-20050328.patch Patch23: w3m-fix-vi-prec-num.patch +Patch24: w3m-multilib.patch Summary: A pager with Web browsing abilities. @@ -70,6 +71,9 @@ %patch21 -p1 %patch22 -p0 %patch23 -p1 +%ifarch ppc64 s390x sparc64 x86_64 +%patch24 -p1 +%endif rm -rf gc tar xfz %{SOURCE20} @@ -81,6 +85,8 @@ mkdir lib ln -s ../gc.a lib/libgc.a popd +aclocal +autoconf %configure %{build_options} \ %{?_without_nntp:--disable-nntp} \ %{!?_without_nntp:--enable-nntp} \ @@ -128,6 +134,9 @@ %{_libexecdir}/w3m/w3mimgdisplay %changelog +* Mon Mar 6 2006 Akira TAGOH - 0.5.1-13 +- w3m-multilib.patch: fixed to link 64bit version of libnsl.so. (#182408) + * Fri Feb 10 2006 Jesse Keating - 0.5.1-12.2.1 - bump again for double-long bug on ppc(64) From fedora-cvs-commits at redhat.com Mon Mar 6 11:26:03 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 6 Mar 2006 06:26:03 -0500 Subject: rpms/doxygen/devel doxygen.spec,1.36,1.37 Message-ID: <200603061126.k26BQ3g8019919@cvs.devel.redhat.com> Author: than Update of /cvs/dist/rpms/doxygen/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv19871 Modified Files: doxygen.spec Log Message: fix build problem #184042 Index: doxygen.spec =================================================================== RCS file: /cvs/dist/rpms/doxygen/devel/doxygen.spec,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- doxygen.spec 11 Feb 2006 02:27:32 -0000 1.36 +++ doxygen.spec 6 Mar 2006 11:25:59 -0000 1.37 @@ -4,7 +4,7 @@ Summary: A documentation system for C/C++. Name: doxygen Version: 1.4.6 -Release: 1.2 +Release: 2 Epoch: 1 Source0: ftp://ftp.stack.nl/pub/users/dimitri/%{name}-%{version}.src.tar.gz @@ -90,7 +90,7 @@ %doc html %endif %{_bindir}/* -%exclude %{_bindir}/doxywizard +%{?_with_qt:%exclude %{_bindir}/doxywizard} %{_mandir}/man1/* %exclude %{_mandir}/man1/doxywizard* @@ -102,6 +102,9 @@ %endif %changelog +* Mon Mar 06 2006 Than Ngo 1:1.4.6-2 +- fix build problem #184042 + * Fri Feb 10 2006 Jesse Keating - 1:1.4.6-1.2 - bump again for double-long bug on ppc(64) From fedora-cvs-commits at redhat.com Mon Mar 6 13:34:07 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 6 Mar 2006 08:34:07 -0500 Subject: rpms/glibc/devel .cvsignore, 1.142, 1.143 glibc-fedora.patch, 1.143, 1.144 glibc.spec, 1.227, 1.228 sources, 1.164, 1.165 Message-ID: <200603061334.k26DY70G008163@cvs.devel.redhat.com> Author: jakub Update of /cvs/dist/rpms/glibc/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv8129/devel Modified Files: .cvsignore glibc-fedora.patch glibc.spec sources Log Message: auto-import glibc-2.4-1 on branch devel from glibc-2.4-1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/glibc/devel/.cvsignore,v retrieving revision 1.142 retrieving revision 1.143 diff -u -r1.142 -r1.143 --- .cvsignore 6 Mar 2006 07:55:58 -0000 1.142 +++ .cvsignore 6 Mar 2006 13:33:54 -0000 1.143 @@ -1,2 +1,2 @@ -glibc-20060306T0720.tar.bz2 -glibc-fedora-20060306T0720.tar.bz2 +glibc-20060306T1239.tar.bz2 +glibc-fedora-20060306T1239.tar.bz2 glibc-fedora.patch: ChangeLog | 96 +++ ChangeLog.11 | 21 ChangeLog.12 | 12 ChangeLog.15 | 45 + csu/elf-init.c | 17 debug/tst-chk1.c | 7 elf/ldconfig.c | 25 elf/tst-stackguard1.c | 8 iconv/iconvconfig.c | 55 - include/bits/stdlib-ldbl.h | 1 include/bits/wchar-ldbl.h | 1 include/features.h | 8 intl/locale.alias | 2 libio/bits/stdio2.h | 19 libio/stdio.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/no_NO | 69 ++ localedata/locales/zh_TW | 6 malloc/mcheck.c | 30 - malloc/mtrace.c | 20 nptl/ChangeLog | 19 nptl/Makefile | 8 nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S | 61 +- nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevelrobustlock.S | 45 + nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h | 242 +++++--- nptl/sysdeps/unix/sysv/linux/kernel-features.h | 6 nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S | 59 +- nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h | 294 +++++++--- nptl/sysdeps/unix/sysv/linux/x86_64/lowlevelrobustlock.S | 41 + nptl/tst-stackguard1.c | 8 nscd/connections.c | 15 nscd/nscd.c | 4 nscd/nscd.conf | 4 nscd/nscd.init | 19 posix/Makefile | 19 posix/getconf.speclist.h | 15 sysdeps/generic/dl-cache.h | 8 sysdeps/ia64/Makefile | 4 sysdeps/ia64/ia64libgcc.S | 350 ------------ sysdeps/ia64/libgcc-compat.c | 84 ++ sysdeps/unix/nice.c | 7 sysdeps/unix/sysv/linux/dl-osinfo.h | 29 sysdeps/unix/sysv/linux/futimesat.c | 23 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/tcsetattr.c | 32 + 55 files changed, 1377 insertions(+), 630 deletions(-) Index: glibc-fedora.patch =================================================================== RCS file: /cvs/dist/rpms/glibc/devel/glibc-fedora.patch,v retrieving revision 1.143 retrieving revision 1.144 diff -u -r1.143 -r1.144 --- glibc-fedora.patch 6 Mar 2006 08:29:36 -0000 1.143 +++ glibc-fedora.patch 6 Mar 2006 13:33:54 -0000 1.144 @@ -1,6 +1,9 @@ ---- glibc-20060306T0720/ChangeLog 6 Mar 2006 06:18:43 -0000 1.10059 -+++ glibc-20060306T0720-fedora/ChangeLog 6 Mar 2006 07:34:43 -0000 1.8782.2.171 -@@ -1,3 +1,31 @@ +--- glibc-20060306T1239/ChangeLog 6 Mar 2006 10:59:43 -0000 1.10062 ++++ glibc-20060306T1239-fedora/ChangeLog 6 Mar 2006 13:15:14 -0000 1.8782.2.172 +@@ -18,6 +18,34 @@ + _SC_CPUTIME and _SC_THREAD_CPUTIME here. + * sysdeps/unix/sysv/linux/x86_64/sysconf.c (__sysconf): Likewise. + +2006-03-04 Jakub Jelinek + Roland McGrath + @@ -32,7 +35,7 @@ 2006-03-05 Roland McGrath * malloc/malloc.c (MALLOC_ALIGNMENT): Revert to (2 * SIZE_SZ) value. -@@ -982,6 +1010,11 @@ +@@ -1030,6 +1058,11 @@ (__MATHDECL_2): Use __REDIRECT_NTH instead of __REDIRECT followed by __THROW. @@ -44,7 +47,7 @@ 2006-02-02 Ulrich Drepper * sysdeps/unix/sysv/linux/futimesat.c [__NR_futimesat] -@@ -1041,6 +1074,11 @@ +@@ -1089,6 +1122,11 @@ * sysdeps/ieee754/ldbl-128/s_llrintl.c (__llrintl): Fix a typo. * sysdeps/s390/fpu/libm-test-ulps: Remove llrint ulps. @@ -56,7 +59,7 @@ 2006-01-19 Thomas Schwinge * libio/genops.c: Include . -@@ -3467,6 +3505,10 @@ +@@ -3515,6 +3553,10 @@ * elf/order2mod2.c (init): Cast ignored value to void. @@ -67,7 +70,7 @@ 2005-12-27 Ulrich Drepper * elf/tst-tls13.c (do_test): Avoid using the library path when -@@ -3750,6 +3792,26 @@ +@@ -3798,6 +3840,26 @@ * sysdeps/unix/sysv/linux/time.c: If __NR_time is not defined, use sysdeps/unix/time.c implementation. @@ -94,7 +97,7 @@ 2005-12-19 Ulrich Drepper [BZ #1955] -@@ -6868,6 +6930,11 @@ +@@ -6916,6 +6978,11 @@ R_ARM_TLS_TPOFF32, R_ARM_TLS_GD32, R_ARM_TLS_LDM32, R_ARM_TLS_LDO32, R_ARM_TLS_IE32, R_ARM_TLS_LE32): New macros. @@ -106,7 +109,7 @@ 2005-10-03 Roland McGrath * sysdeps/powerpc/nofpu: Directory removed, saved in ports repository. -@@ -7862,6 +7929,12 @@ +@@ -7910,6 +7977,12 @@ * argp/argp-help.c (__argp_error): __asprintf -> vasprintf. (__argp_failure): Likewise. @@ -119,7 +122,7 @@ 2005-08-08 Ulrich Drepper * nscd/cache.c (cache_add): Commit hash table and header to disk. -@@ -7986,6 +8059,17 @@ +@@ -8034,6 +8107,17 @@ __syslog_chk. * misc/Versions: Export __syslog_chk and __vsyslog_chk. @@ -137,7 +140,7 @@ 2005-07-28 Thomas Schwinge [BZ #1137] -@@ -11046,6 +11130,18 @@ +@@ -11094,6 +11178,18 @@ * scripts/soversions.awk: Fix default version set handling. @@ -156,8 +159,8 @@ 2005-02-10 Roland McGrath [BZ #157] ---- glibc-20060306T0720/ChangeLog.11 10 Nov 2000 03:31:36 -0000 1.1 -+++ glibc-20060306T0720-fedora/ChangeLog.11 22 Sep 2004 21:20:47 -0000 1.1.4.1 +--- glibc-20060306T1239/ChangeLog.11 10 Nov 2000 03:31:36 -0000 1.1 ++++ glibc-20060306T1239-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. @@ -207,8 +210,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-20060306T0720/ChangeLog.12 16 Aug 2001 05:24:54 -0000 1.1 -+++ glibc-20060306T0720-fedora/ChangeLog.12 22 Sep 2004 21:20:47 -0000 1.1.4.1 +--- glibc-20060306T1239/ChangeLog.12 16 Aug 2001 05:24:54 -0000 1.1 ++++ glibc-20060306T1239-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. @@ -235,8 +238,8 @@ 2001-01-02 Franz Sirl * sysdeps/powerpc/dl-machine.c (__process_machine_rela): Fix typo. ---- glibc-20060306T0720/ChangeLog.15 16 Feb 2005 07:34:17 -0000 1.1 -+++ glibc-20060306T0720-fedora/ChangeLog.15 3 Mar 2005 17:29:57 -0000 1.1.6.2 +--- glibc-20060306T1239/ChangeLog.15 16 Feb 2005 07:34:17 -0000 1.1 ++++ glibc-20060306T1239-fedora/ChangeLog.15 3 Mar 2005 17:29:57 -0000 1.1.6.2 @@ -477,6 +477,14 @@ 2004-11-26 Jakub Jelinek @@ -317,8 +320,8 @@ 2004-08-30 Roland McGrath * scripts/extract-abilist.awk: If `lastversion' variable defined, omit ---- glibc-20060306T0720/csu/elf-init.c 5 Nov 2005 17:41:38 -0000 1.8 -+++ glibc-20060306T0720-fedora/csu/elf-init.c 15 Nov 2005 09:54:10 -0000 1.3.2.6 +--- glibc-20060306T1239/csu/elf-init.c 5 Nov 2005 17:41:38 -0000 1.8 ++++ glibc-20060306T1239-fedora/csu/elf-init.c 15 Nov 2005 09:54:10 -0000 1.3.2.6 @@ -49,6 +49,23 @@ extern void (*__init_array_end []) (int, extern void (*__fini_array_start []) (void) attribute_hidden; extern void (*__fini_array_end []) (void) attribute_hidden; @@ -343,8 +346,8 @@ /* These function symbols are provided for the .init/.fini section entry points automagically by the linker. */ ---- glibc-20060306T0720/debug/tst-chk1.c 22 Aug 2005 15:12:34 -0000 1.14 -+++ glibc-20060306T0720-fedora/debug/tst-chk1.c 24 Aug 2005 07:23:26 -0000 1.1.2.15 +--- glibc-20060306T1239/debug/tst-chk1.c 22 Aug 2005 15:12:34 -0000 1.14 ++++ glibc-20060306T1239-fedora/debug/tst-chk1.c 24 Aug 2005 07:23:26 -0000 1.1.2.15 @@ -17,6 +17,9 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ @@ -373,39 +376,9 @@ # define O 0 #else # define O 1 ---- glibc-20060306T0720/elf/check-textrel.c 2 Mar 2006 18:40:46 -0000 1.9 -+++ glibc-20060306T0720-fedora/elf/check-textrel.c 2 Mar 2006 09:59:03 -0000 1.5.2.2 -@@ -18,6 +18,7 @@ - Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA - 02111-1307 USA. */ - -+#include "config.h" - #include - #include - #include ---- glibc-20060306T0720/elf/ldconfig.c 1 Jan 2006 19:15:56 -0000 1.52 -+++ glibc-20060306T0720-fedora/elf/ldconfig.c 2 Jan 2006 10:52:50 -0000 1.47.2.7 -@@ -693,7 +693,18 @@ search_dir (const struct dir_entry *entr - #endif - !is_hwcap_platform (direntry->d_name))) - continue; -- len = strlen (entry->path) + strlen (direntry->d_name); -+ len = strlen (direntry->d_name); -+ if (len >= sizeof (".#prelink#") - 1) -+ { -+ if (strcmp (direntry->d_name + len - sizeof (".#prelink#") + 1, -+ ".#prelink#") == 0) -+ continue; -+ if (len >= sizeof (".#prelink#.XXXXXX") - 1 -+ && memcmp (direntry->d_name + len - sizeof (".#prelink#.XXXXXX") -+ + 1, ".#prelink#.", sizeof (".#prelink#.") - 1) == 0) -+ continue; -+ } -+ len += strlen (entry->path); - if (len > file_name_len) - { - file_name_len = len + 1; -@@ -951,17 +962,19 @@ search_dirs (void) +--- glibc-20060306T1239/elf/ldconfig.c 6 Mar 2006 08:40:11 -0000 1.53 ++++ glibc-20060306T1239-fedora/elf/ldconfig.c 6 Mar 2006 13:15:14 -0000 1.47.2.8 +@@ -964,17 +964,19 @@ search_dirs (void) static void parse_conf_include (const char *config_file, unsigned int lineno, @@ -427,7 +400,7 @@ if (do_chroot && opt_chroot) { -@@ -1022,7 +1035,14 @@ parse_conf (const char *filename, bool d +@@ -1035,7 +1037,14 @@ parse_conf (const char *filename, bool d cp += 8; while ((dir = strsep (&cp, " \t")) != NULL) if (dir[0] != '\0') @@ -443,7 +416,7 @@ } else if (!strncasecmp (cp, "hwcap", 5) && isblank (cp[5])) { -@@ -1085,7 +1105,7 @@ parse_conf (const char *filename, bool d +@@ -1098,7 +1107,7 @@ parse_conf (const char *filename, bool d config files to read. */ static void parse_conf_include (const char *config_file, unsigned int lineno, @@ -452,7 +425,7 @@ { if (opt_chroot && pattern[0] != '/') error (EXIT_FAILURE, 0, -@@ -1115,7 +1135,7 @@ parse_conf_include (const char *config_f +@@ -1128,7 +1137,7 @@ parse_conf_include (const char *config_f { case 0: for (size_t i = 0; i < gl.gl_pathc; ++i) @@ -461,7 +434,7 @@ globfree64 (&gl); break; -@@ -1155,6 +1175,8 @@ main (int argc, char **argv) +@@ -1168,6 +1177,8 @@ main (int argc, char **argv) { int remaining; @@ -470,7 +443,7 @@ /* Parse and process arguments. */ argp_parse (&argp, argc, argv, 0, &remaining, NULL); -@@ -1267,12 +1289,14 @@ main (int argc, char **argv) +@@ -1280,12 +1291,14 @@ main (int argc, char **argv) if (!opt_only_cline) { @@ -486,8 +459,8 @@ } search_dirs (); ---- glibc-20060306T0720/elf/tst-stackguard1.c 26 Jun 2005 18:08:36 -0000 1.1 -+++ glibc-20060306T0720-fedora/elf/tst-stackguard1.c 8 Aug 2005 21:24:27 -0000 1.1.2.3 +--- glibc-20060306T1239/elf/tst-stackguard1.c 26 Jun 2005 18:08:36 -0000 1.1 ++++ glibc-20060306T1239-fedora/elf/tst-stackguard1.c 8 Aug 2005 21:24:27 -0000 1.1.2.3 @@ -160,17 +160,21 @@ do_test (void) the 16 runs, something is very wrong. */ int ndifferences = 0; @@ -512,8 +485,8 @@ { puts ("stack guard canaries are not randomized enough"); puts ("nor equal to the default canary value"); ---- glibc-20060306T0720/iconv/iconvconfig.c 1 Jan 2006 19:15:56 -0000 1.25 -+++ glibc-20060306T0720-fedora/iconv/iconvconfig.c 2 Jan 2006 10:52:50 -0000 1.19.2.6 +--- glibc-20060306T1239/iconv/iconvconfig.c 1 Jan 2006 19:15:56 -0000 1.25 ++++ glibc-20060306T1239-fedora/iconv/iconvconfig.c 2 Jan 2006 10:52:50 -0000 1.19.2.6 @@ -1011,6 +1011,34 @@ next_prime (uint32_t seed) module name offset (following last entry with step count 0) @@ -590,8 +563,8 @@ /* Open the output file. */ if (output_file == NULL) { ---- glibc-20060306T0720/include/features.h 5 Jan 2006 12:25:35 -0000 1.42 -+++ glibc-20060306T0720-fedora/include/features.h 6 Jan 2006 09:23:23 -0000 1.35.2.11 +--- glibc-20060306T1239/include/features.h 5 Jan 2006 12:25:35 -0000 1.42 ++++ glibc-20060306T1239-fedora/include/features.h 6 Jan 2006 09:23:23 -0000 1.35.2.11 @@ -275,7 +275,13 @@ #endif @@ -607,16 +580,16 @@ # if _FORTIFY_SOURCE > 1 # define __USE_FORTIFY_LEVEL 2 # else ---- glibc-20060306T0720/include/bits/stdlib-ldbl.h 1 Jan 1970 00:00:00 -0000 -+++ glibc-20060306T0720-fedora/include/bits/stdlib-ldbl.h 1 Feb 2006 09:30:43 -0000 1.1.2.1 +--- glibc-20060306T1239/include/bits/stdlib-ldbl.h 1 Jan 1970 00:00:00 -0000 ++++ glibc-20060306T1239-fedora/include/bits/stdlib-ldbl.h 1 Feb 2006 09:30:43 -0000 1.1.2.1 @@ -0,0 +1 @@ +#include ---- glibc-20060306T0720/include/bits/wchar-ldbl.h 1 Jan 1970 00:00:00 -0000 -+++ glibc-20060306T0720-fedora/include/bits/wchar-ldbl.h 1 Feb 2006 09:30:43 -0000 1.1.2.1 +--- glibc-20060306T1239/include/bits/wchar-ldbl.h 1 Jan 1970 00:00:00 -0000 ++++ glibc-20060306T1239-fedora/include/bits/wchar-ldbl.h 1 Feb 2006 09:30:43 -0000 1.1.2.1 @@ -0,0 +1 @@ +#include ---- glibc-20060306T0720/intl/locale.alias 4 Dec 2003 07:57:47 -0000 1.23 -+++ glibc-20060306T0720-fedora/intl/locale.alias 22 Sep 2004 21:20:53 -0000 1.23.2.1 +--- glibc-20060306T1239/intl/locale.alias 4 Dec 2003 07:57:47 -0000 1.23 ++++ glibc-20060306T1239-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 @@ -626,8 +599,8 @@ norwegian nb_NO.ISO-8859-1 nynorsk nn_NO.ISO-8859-1 polish pl_PL.ISO-8859-2 ---- glibc-20060306T0720/libio/stdio.h 16 Jan 2006 20:12:21 -0000 1.86 -+++ glibc-20060306T0720-fedora/libio/stdio.h 30 Jan 2006 09:29:46 -0000 1.78.2.8 +--- glibc-20060306T1239/libio/stdio.h 16 Jan 2006 20:12:21 -0000 1.86 ++++ glibc-20060306T1239-fedora/libio/stdio.h 30 Jan 2006 09:29:46 -0000 1.78.2.8 @@ -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. */ @@ -641,8 +614,8 @@ __BEGIN_NAMESPACE_STD /* Remove file FILENAME. */ ---- glibc-20060306T0720/libio/bits/stdio2.h 19 Mar 2005 00:14:58 -0000 1.4 -+++ glibc-20060306T0720-fedora/libio/bits/stdio2.h 27 Jun 2005 13:04:16 -0000 1.1.2.6 +--- glibc-20060306T1239/libio/bits/stdio2.h 19 Mar 2005 00:14:58 -0000 1.4 ++++ glibc-20060306T1239-fedora/libio/bits/stdio2.h 27 Jun 2005 13:04:16 -0000 1.1.2.6 @@ -61,14 +61,25 @@ extern int __vfprintf_chk (FILE *__restr extern int __vprintf_chk (int __flag, __const char *__restrict __format, _G_va_list __ap); @@ -673,8 +646,8 @@ #endif ---- glibc-20060306T0720/locale/iso-4217.def 23 Sep 2005 19:07:54 -0000 1.18 -+++ glibc-20060306T0720-fedora/locale/iso-4217.def 3 Oct 2005 20:44:15 -0000 1.15.2.3 +--- glibc-20060306T1239/locale/iso-4217.def 23 Sep 2005 19:07:54 -0000 1.18 ++++ glibc-20060306T1239-fedora/locale/iso-4217.def 3 Oct 2005 20:44:15 -0000 1.15.2.3 @@ -8,6 +8,7 @@ * * !!! The list has to be sorted !!! @@ -766,8 +739,8 @@ DEFINE_INT_CURR("PYG") /* Paraguay Guarani */ DEFINE_INT_CURR("QAR") /* Qatar Rial */ DEFINE_INT_CURR("ROL") /* Romanian Leu */ ---- glibc-20060306T0720/locale/programs/3level.h 7 Dec 2005 05:47:27 -0000 1.6 -+++ glibc-20060306T0720-fedora/locale/programs/3level.h 19 Dec 2005 12:11:15 -0000 1.5.2.2 +--- glibc-20060306T1239/locale/programs/3level.h 7 Dec 2005 05:47:27 -0000 1.6 ++++ glibc-20060306T1239-fedora/locale/programs/3level.h 19 Dec 2005 12:11:15 -0000 1.5.2.2 @@ -202,6 +202,42 @@ CONCAT(TABLE,_iterate) (struct TABLE *t, } } @@ -811,8 +784,8 @@ #endif #ifndef NO_FINALIZE ---- glibc-20060306T0720/localedata/Makefile 25 Sep 2005 17:01:12 -0000 1.102 -+++ glibc-20060306T0720-fedora/localedata/Makefile 3 Oct 2005 20:44:15 -0000 1.101.2.2 +--- glibc-20060306T1239/localedata/Makefile 25 Sep 2005 17:01:12 -0000 1.102 ++++ glibc-20060306T1239-fedora/localedata/Makefile 3 Oct 2005 20:44:15 -0000 1.101.2.2 @@ -222,6 +222,7 @@ $(INSTALL-SUPPORTED-LOCALES): install-lo echo -n '...'; \ input=`echo $$locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; \ @@ -821,8 +794,8 @@ -i locales/$$input -c -f charmaps/$$charset \ $(addprefix --prefix=,$(install_root)) $$locale; \ echo ' done'; \ ---- glibc-20060306T0720/localedata/SUPPORTED 5 Nov 2005 16:25:49 -0000 1.87 -+++ glibc-20060306T0720-fedora/localedata/SUPPORTED 15 Nov 2005 08:21:56 -0000 1.71.2.8 +--- glibc-20060306T1239/localedata/SUPPORTED 5 Nov 2005 16:25:49 -0000 1.87 ++++ glibc-20060306T1239-fedora/localedata/SUPPORTED 15 Nov 2005 08:21:56 -0000 1.71.2.8 @@ -69,6 +69,7 @@ cy_GB.UTF-8/UTF-8 \ cy_GB/ISO-8859-14 \ da_DK.UTF-8/UTF-8 \ @@ -864,8 +837,8 @@ ta_IN/UTF-8 \ te_IN/UTF-8 \ tg_TJ.UTF-8/UTF-8 \ ---- glibc-20060306T0720/localedata/locales/cy_GB 28 Sep 2004 04:37:33 -0000 1.4 -+++ glibc-20060306T0720-fedora/localedata/locales/cy_GB 29 Sep 2004 08:48:23 -0000 1.3.2.2 +--- glibc-20060306T1239/localedata/locales/cy_GB 28 Sep 2004 04:37:33 -0000 1.4 ++++ glibc-20060306T1239-fedora/localedata/locales/cy_GB 29 Sep 2004 08:48:23 -0000 1.3.2.2 @@ -248,8 +248,11 @@ mon "" d_fmt "" @@ -880,8 +853,8 @@ END LC_TIME LC_MESSAGES ---- glibc-20060306T0720/localedata/locales/en_GB 31 Oct 2004 23:42:26 -0000 1.12 -+++ glibc-20060306T0720-fedora/localedata/locales/en_GB 2 Nov 2004 12:25:47 -0000 1.10.2.2 +--- glibc-20060306T1239/localedata/locales/en_GB 31 Oct 2004 23:42:26 -0000 1.12 ++++ glibc-20060306T1239-fedora/localedata/locales/en_GB 2 Nov 2004 12:25:47 -0000 1.10.2.2 @@ -112,8 +112,8 @@ mon "" d_fmt "" @@ -893,8 +866,8 @@ date_fmt "/ / " ---- glibc-20060306T0720/localedata/locales/no_NO 1 Jan 1970 00:00:00 -0000 -+++ glibc-20060306T0720-fedora/localedata/locales/no_NO 22 Sep 2004 21:21:01 -0000 1.11.2.1 +--- glibc-20060306T1239/localedata/locales/no_NO 1 Jan 1970 00:00:00 -0000 ++++ glibc-20060306T1239-fedora/localedata/locales/no_NO 22 Sep 2004 21:21:01 -0000 1.11.2.1 @@ -0,0 +1,69 @@ +escape_char / +comment_char % @@ -965,8 +938,8 @@ +LC_ADDRESS +copy "nb_NO" +END LC_ADDRESS ---- glibc-20060306T0720/localedata/locales/zh_TW 31 Oct 2004 23:42:28 -0000 1.7 -+++ glibc-20060306T0720-fedora/localedata/locales/zh_TW 2 Nov 2004 12:25:57 -0000 1.5.2.2 +--- glibc-20060306T1239/localedata/locales/zh_TW 31 Oct 2004 23:42:28 -0000 1.7 ++++ glibc-20060306T1239-fedora/localedata/locales/zh_TW 2 Nov 2004 12:25:57 -0000 1.5.2.2 @@ -1,7 +1,7 @@ comment_char % escape_char / @@ -994,8 +967,8 @@ revision "0.2" date "2000-08-02" % ---- glibc-20060306T0720/malloc/mcheck.c 8 Sep 2004 20:36:02 -0000 1.18 -+++ glibc-20060306T0720-fedora/malloc/mcheck.c 20 Dec 2005 10:59:21 -0000 1.18.2.1 +--- glibc-20060306T1239/malloc/mcheck.c 8 Sep 2004 20:36:02 -0000 1.18 ++++ glibc-20060306T1239-fedora/malloc/mcheck.c 20 Dec 2005 10:59:21 -0000 1.18.2.1 @@ -24,9 +24,25 @@ # include # include @@ -1071,8 +1044,8 @@ old_free_hook = __free_hook; __free_hook = freehook; ---- glibc-20060306T0720/malloc/mtrace.c 14 Sep 2004 04:24:46 -0000 1.41 -+++ glibc-20060306T0720-fedora/malloc/mtrace.c 20 Dec 2005 10:59:21 -0000 1.41.2.1 +--- glibc-20060306T1239/malloc/mtrace.c 14 Sep 2004 04:24:46 -0000 1.41 ++++ glibc-20060306T1239-fedora/malloc/mtrace.c 20 Dec 2005 10:59:21 -0000 1.41.2.1 @@ -40,6 +40,18 @@ # include # define setvbuf(s, b, f, l) INTUSE(_IO_setvbuf) (s, b, f, l) @@ -1128,8 +1101,8 @@ __memalign_hook = tr_memalignhook; __malloc_hook = tr_mallochook; ---- glibc-20060306T0720/nptl/ChangeLog 6 Mar 2006 01:41:08 -0000 1.879 -+++ glibc-20060306T0720-fedora/nptl/ChangeLog 6 Mar 2006 07:29:58 -0000 1.706.2.83 +--- glibc-20060306T1239/nptl/ChangeLog 6 Mar 2006 01:41:08 -0000 1.879 ++++ glibc-20060306T1239-fedora/nptl/ChangeLog 6 Mar 2006 07:29:58 -0000 1.706.2.83 @@ -731,6 +731,15 @@ Use __sigfillset. Document that sigfillset does the right thing wrt to SIGSETXID. @@ -1170,8 +1143,8 @@ 2003-07-25 Jakub Jelinek * tst-cancel17.c (do_test): Check if aio_cancel failed. ---- glibc-20060306T0720/nptl/Makefile 28 Feb 2006 09:36:05 -0000 1.179 -+++ glibc-20060306T0720-fedora/nptl/Makefile 1 Mar 2006 06:55:40 -0000 1.157.2.19 +--- glibc-20060306T1239/nptl/Makefile 28 Feb 2006 09:36:05 -0000 1.179 ++++ glibc-20060306T1239-fedora/nptl/Makefile 1 Mar 2006 06:55:40 -0000 1.157.2.19 @@ -519,15 +519,19 @@ $(addprefix $(objpfx), \ $(tests) $(xtests) $(test-srcs))): $(objpfx)libpthread.so \ $(objpfx)libpthread_nonshared.a @@ -1194,8 +1167,8 @@ else $(addprefix $(objpfx),$(tests) $(test-srcs)): $(objpfx)libpthread.a endif ---- glibc-20060306T0720/nptl/tst-stackguard1.c 26 Jun 2005 17:44:14 -0000 1.1 -+++ glibc-20060306T0720-fedora/nptl/tst-stackguard1.c 8 Aug 2005 21:24:28 -0000 1.1.2.3 +--- glibc-20060306T1239/nptl/tst-stackguard1.c 26 Jun 2005 17:44:14 -0000 1.1 ++++ glibc-20060306T1239-fedora/nptl/tst-stackguard1.c 8 Aug 2005 21:24:28 -0000 1.1.2.3 @@ -190,17 +190,21 @@ do_test (void) the 16 runs, something is very wrong. */ int ndifferences = 0; @@ -1220,8 +1193,8 @@ { puts ("stack guard canaries are not randomized enough"); puts ("nor equal to the default canary value"); ---- glibc-20060306T0720/nptl/sysdeps/unix/sysv/linux/kernel-features.h 1 Jan 1970 00:00:00 -0000 -+++ glibc-20060306T0720-fedora/nptl/sysdeps/unix/sysv/linux/kernel-features.h 22 Sep 2004 21:21:02 -0000 1.1.2.1 +--- glibc-20060306T1239/nptl/sysdeps/unix/sysv/linux/kernel-features.h 1 Jan 1970 00:00:00 -0000 ++++ glibc-20060306T1239-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 + @@ -1229,8 +1202,8 @@ +#ifndef __ASSUME_CLONE_THREAD_FLAGS +# define __ASSUME_CLONE_THREAD_FLAGS 1 +#endif ---- glibc-20060306T0720/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h 17 Feb 2006 08:05:32 -0000 1.29 -+++ glibc-20060306T0720-fedora/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h 6 Mar 2006 07:34:44 -0000 1.25.2.4 +--- glibc-20060306T1239/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h 17 Feb 2006 08:05:32 -0000 1.29 ++++ glibc-20060306T1239-fedora/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h 6 Mar 2006 07:34:44 -0000 1.25.2.4 @@ -65,6 +65,88 @@ #define BUSY_WAIT_NOP asm ("rep; nop") @@ -1566,8 +1539,8 @@ : "=m" (futex), "=&a" (ignore) \ : "m" (futex), \ "i" (offsetof (tcbhead_t, multiple_threads)) \ ---- glibc-20060306T0720/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S 1 Oct 2004 10:30:44 -0000 1.14 -+++ glibc-20060306T0720-fedora/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S 6 Mar 2006 07:34:44 -0000 1.13.2.2 +--- glibc-20060306T1239/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S 1 Oct 2004 10:30:44 -0000 1.14 ++++ glibc-20060306T1239-fedora/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S 6 Mar 2006 07:34:44 -0000 1.13.2.2 @@ -1,4 +1,4 @@ -/* Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc. +/* Copyright (C) 2002, 2003, 2004, 2006 Free Software Foundation, Inc. @@ -1713,8 +1686,8 @@ .size __lll_mutex_unlock_wake,.-__lll_mutex_unlock_wake ---- glibc-20060306T0720/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevelrobustlock.S 2 Mar 2006 00:25:56 -0000 1.2 -+++ glibc-20060306T0720-fedora/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevelrobustlock.S 6 Mar 2006 07:34:44 -0000 1.1.2.3 +--- glibc-20060306T1239/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevelrobustlock.S 2 Mar 2006 00:25:56 -0000 1.2 ++++ glibc-20060306T1239-fedora/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevelrobustlock.S 6 Mar 2006 07:34:44 -0000 1.1.2.3 @@ -44,9 +44,16 @@ .hidden __lll_robust_mutex_lock_wait .align 16 @@ -1815,8 +1788,8 @@ - ret + cfi_endproc .size __lll_robust_mutex_timedlock_wait,.-__lll_robust_mutex_timedlock_wait ---- glibc-20060306T0720/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S 31 Mar 2005 10:00:15 -0000 1.14 -+++ glibc-20060306T0720-fedora/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S 6 Mar 2006 07:33:30 -0000 1.11.2.4 +--- glibc-20060306T1239/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S 31 Mar 2005 10:00:15 -0000 1.14 ++++ glibc-20060306T1239-fedora/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S 6 Mar 2006 07:33:30 -0000 1.11.2.4 @@ -1,4 +1,4 @@ -/* Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +/* Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. @@ -1958,8 +1931,8 @@ .size __lll_mutex_unlock_wake,.-__lll_mutex_unlock_wake ---- glibc-20060306T0720/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h 17 Feb 2006 08:06:14 -0000 1.26 -+++ glibc-20060306T0720-fedora/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h 6 Mar 2006 07:33:30 -0000 1.23.2.3 +--- glibc-20060306T1239/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h 17 Feb 2006 08:06:14 -0000 1.26 ++++ glibc-20060306T1239-fedora/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h 6 Mar 2006 07:33:30 -0000 1.23.2.3 @@ -46,6 +46,110 @@ #define BUSY_WAIT_NOP asm ("rep; nop") @@ -2347,8 +2320,8 @@ : "=m" (futex), "=&D" (ignore) \ : "m" (futex) \ : "ax", "cx", "r11", "cc", "memory"); }) ---- glibc-20060306T0720/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevelrobustlock.S 2 Mar 2006 00:26:55 -0000 1.2 -+++ glibc-20060306T0720-fedora/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevelrobustlock.S 6 Mar 2006 07:33:30 -0000 1.1.2.3 +--- glibc-20060306T1239/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevelrobustlock.S 2 Mar 2006 00:26:55 -0000 1.2 ++++ glibc-20060306T1239-fedora/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevelrobustlock.S 6 Mar 2006 07:33:30 -0000 1.1.2.3 @@ -46,8 +46,13 @@ .hidden __lll_robust_mutex_lock_wait .align 16 @@ -2443,8 +2416,8 @@ - retq + cfi_endproc .size __lll_robust_mutex_timedlock_wait,.-__lll_robust_mutex_timedlock_wait ---- glibc-20060306T0720/nscd/connections.c 3 Jan 2006 21:26:28 -0000 1.82 -+++ glibc-20060306T0720-fedora/nscd/connections.c 4 Jan 2006 07:58:21 -0000 1.55.2.19 +--- glibc-20060306T1239/nscd/connections.c 3 Jan 2006 21:26:28 -0000 1.82 ++++ glibc-20060306T1239-fedora/nscd/connections.c 4 Jan 2006 07:58:21 -0000 1.55.2.19 @@ -1873,3 +1873,18 @@ finish_drop_privileges (void) exit (4); } @@ -2464,8 +2437,8 @@ + prune_cache (&dbs[hstdb], LONG_MAX); +} + ---- glibc-20060306T0720/nscd/nscd.c 1 Jan 2006 19:15:56 -0000 1.51 -+++ glibc-20060306T0720-fedora/nscd/nscd.c 2 Jan 2006 10:52:53 -0000 1.38.2.11 +--- glibc-20060306T1239/nscd/nscd.c 1 Jan 2006 19:15:56 -0000 1.51 ++++ glibc-20060306T1239-fedora/nscd/nscd.c 2 Jan 2006 10:52:53 -0000 1.38.2.11 @@ -119,6 +119,9 @@ static struct argp argp = options, parse_opt, NULL, doc, }; @@ -2484,8 +2457,8 @@ signal (SIGPIPE, SIG_IGN); /* Cleanup files created by a previous 'bind'. */ ---- glibc-20060306T0720/nscd/nscd.conf 23 Aug 2005 23:17:32 -0000 1.11 -+++ glibc-20060306T0720-fedora/nscd/nscd.conf 24 Aug 2005 07:23:30 -0000 1.8.2.3 +--- glibc-20060306T1239/nscd/nscd.conf 23 Aug 2005 23:17:32 -0000 1.11 ++++ glibc-20060306T1239-fedora/nscd/nscd.conf 24 Aug 2005 07:23:30 -0000 1.8.2.3 @@ -32,8 +32,8 @@ # logfile /var/log/nscd.log # threads 6 @@ -2497,8 +2470,8 @@ debug-level 0 # reload-count 5 paranoia no ---- glibc-20060306T0720/nscd/nscd.init 20 Jun 2005 15:47:52 -0000 1.9 -+++ glibc-20060306T0720-fedora/nscd/nscd.init 12 Sep 2005 12:53:20 -0000 1.6.2.4 +--- glibc-20060306T1239/nscd/nscd.init 20 Jun 2005 15:47:52 -0000 1.9 ++++ glibc-20060306T1239-fedora/nscd/nscd.init 12 Sep 2005 12:53:20 -0000 1.6.2.4 @@ -9,6 +9,7 @@ # slow naming services like NIS, NIS+, LDAP, or hesiod. # processname: /usr/sbin/nscd @@ -2539,8 +2512,8 @@ RETVAL=$? echo [ $RETVAL -eq 0 ] && touch /var/lock/subsys/nscd ---- glibc-20060306T0720/posix/Makefile 8 Jan 2006 09:39:15 -0000 1.188 -+++ glibc-20060306T0720-fedora/posix/Makefile 9 Jan 2006 21:55:00 -0000 1.171.2.16 +--- glibc-20060306T1239/posix/Makefile 8 Jan 2006 09:39:15 -0000 1.188 ++++ glibc-20060306T1239-fedora/posix/Makefile 9 Jan 2006 21:55:00 -0000 1.171.2.16 @@ -107,7 +107,8 @@ generated := $(addprefix wordexp-test-re bug-regex21-mem bug-regex21.mtrace \ tst-rxspencer-mem tst-rxspencer.mtrace tst-getconf.out \ @@ -2574,8 +2547,8 @@ + | sed -n -e '/START_OF_STRINGS/,$${/POSIX_V6_/{s/^[^"]*"//;s/".*$$//;p}}' \ + > $@.new + mv -f $@.new $@ ---- glibc-20060306T0720/posix/getconf.speclist.h 1 Jan 1970 00:00:00 -0000 -+++ glibc-20060306T0720-fedora/posix/getconf.speclist.h 13 Dec 2004 23:32:37 -0000 1.1.2.2 +--- glibc-20060306T1239/posix/getconf.speclist.h 1 Jan 1970 00:00:00 -0000 ++++ glibc-20060306T1239-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 = @@ -2592,8 +2565,8 @@ +"POSIX_V6_LPBIG_OFFBIG" +#endif +""; ---- glibc-20060306T0720/sysdeps/generic/dl-cache.h 25 Jun 2003 08:01:22 -0000 1.13 -+++ glibc-20060306T0720-fedora/sysdeps/generic/dl-cache.h 22 Sep 2004 21:21:07 -0000 1.13.2.1 +--- glibc-20060306T1239/sysdeps/generic/dl-cache.h 25 Jun 2003 08:01:22 -0000 1.13 ++++ glibc-20060306T1239-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 @@ -2609,8 +2582,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-20060306T0720/sysdeps/ia64/Makefile 16 Aug 2004 06:46:14 -0000 1.10 -+++ glibc-20060306T0720-fedora/sysdeps/ia64/Makefile 22 Sep 2004 21:21:07 -0000 1.10.2.1 +--- glibc-20060306T1239/sysdeps/ia64/Makefile 16 Aug 2004 06:46:14 -0000 1.10 ++++ glibc-20060306T1239-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)) @@ -2622,8 +2595,8 @@ endif endif ---- glibc-20060306T0720/sysdeps/ia64/ia64libgcc.S 11 May 2002 05:12:35 -0000 1.2 -+++ glibc-20060306T0720-fedora/sysdeps/ia64/ia64libgcc.S 22 Sep 2004 21:21:07 -0000 1.2.2.1 +--- glibc-20060306T1239/sysdeps/ia64/ia64libgcc.S 11 May 2002 05:12:35 -0000 1.2 ++++ glibc-20060306T1239-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. */ @@ -2975,8 +2948,8 @@ - .symver ___multi3, __multi3 at GLIBC_2.2 - -#endif ---- glibc-20060306T0720/sysdeps/ia64/libgcc-compat.c 1 Jan 1970 00:00:00 -0000 -+++ glibc-20060306T0720-fedora/sysdeps/ia64/libgcc-compat.c 22 Sep 2004 21:21:08 -0000 1.1.2.1 +--- glibc-20060306T1239/sysdeps/ia64/libgcc-compat.c 1 Jan 1970 00:00:00 -0000 ++++ glibc-20060306T1239-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. @@ -3062,8 +3035,8 @@ +symbol_version (INTUSE (__multi3), __multi3, GLIBC_2.2); + +#endif ---- glibc-20060306T0720/sysdeps/unix/nice.c 28 Sep 2002 19:13:13 -0000 1.6 -+++ glibc-20060306T0720-fedora/sysdeps/unix/nice.c 22 Sep 2004 21:21:08 -0000 1.6.2.1 +--- glibc-20060306T1239/sysdeps/unix/nice.c 28 Sep 2002 19:13:13 -0000 1.6 ++++ glibc-20060306T1239-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); } @@ -3078,8 +3051,8 @@ if (result != -1) return getpriority (PRIO_PROCESS, 0); else ---- glibc-20060306T0720/sysdeps/unix/sysv/linux/dl-osinfo.h 8 Jan 2006 08:21:15 -0000 1.22 -+++ glibc-20060306T0720-fedora/sysdeps/unix/sysv/linux/dl-osinfo.h 9 Jan 2006 21:55:08 -0000 1.14.2.8 +--- glibc-20060306T1239/sysdeps/unix/sysv/linux/dl-osinfo.h 8 Jan 2006 08:21:15 -0000 1.22 ++++ glibc-20060306T1239-fedora/sysdeps/unix/sysv/linux/dl-osinfo.h 9 Jan 2006 21:55:08 -0000 1.14.2.8 @@ -18,12 +18,15 @@ 02111-1307 USA. */ @@ -3128,8 +3101,8 @@ + ret ^= stk; return ret; } ---- glibc-20060306T0720/sysdeps/unix/sysv/linux/futimesat.c 3 Feb 2006 05:26:34 -0000 1.6 -+++ glibc-20060306T0720-fedora/sysdeps/unix/sysv/linux/futimesat.c 3 Feb 2006 09:43:55 -0000 1.1.2.7 +--- glibc-20060306T1239/sysdeps/unix/sysv/linux/futimesat.c 3 Feb 2006 05:26:34 -0000 1.6 ++++ glibc-20060306T1239-fedora/sysdeps/unix/sysv/linux/futimesat.c 3 Feb 2006 09:43:55 -0000 1.1.2.7 @@ -37,14 +37,14 @@ futimesat (fd, file, tvp) { int result; @@ -3172,8 +3145,8 @@ { size_t filelen = strlen (file); static const char procfd[] = "/proc/self/fd/%d/%s"; ---- glibc-20060306T0720/sysdeps/unix/sysv/linux/paths.h 15 Nov 2000 23:06:47 -0000 1.11 -+++ glibc-20060306T0720-fedora/sysdeps/unix/sysv/linux/paths.h 22 Sep 2004 21:21:08 -0000 1.11.4.1 +--- glibc-20060306T1239/sysdeps/unix/sysv/linux/paths.h 15 Nov 2000 23:06:47 -0000 1.11 ++++ glibc-20060306T1239-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" @@ -3183,8 +3156,8 @@ #define _PATH_WTMP "/var/log/wtmp" /* Provide trailing slash, since mostly used for building pathnames. */ ---- glibc-20060306T0720/sysdeps/unix/sysv/linux/tcsetattr.c 10 Sep 2003 19:16:07 -0000 1.16 -+++ glibc-20060306T0720-fedora/sysdeps/unix/sysv/linux/tcsetattr.c 22 Sep 2004 21:21:08 -0000 1.16.2.1 +--- glibc-20060306T1239/sysdeps/unix/sysv/linux/tcsetattr.c 10 Sep 2003 19:16:07 -0000 1.16 ++++ glibc-20060306T1239-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; @@ -3230,8 +3203,8 @@ + return retval; } libc_hidden_def (tcsetattr) ---- glibc-20060306T0720/sysdeps/unix/sysv/linux/i386/dl-cache.h 1 Jan 1970 00:00:00 -0000 -+++ glibc-20060306T0720-fedora/sysdeps/unix/sysv/linux/i386/dl-cache.h 22 Sep 2004 21:21:08 -0000 1.1.2.1 +--- glibc-20060306T1239/sysdeps/unix/sysv/linux/i386/dl-cache.h 1 Jan 1970 00:00:00 -0000 ++++ glibc-20060306T1239-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. @@ -3292,8 +3265,8 @@ + } while (0) + +#include_next ---- glibc-20060306T0720/sysdeps/unix/sysv/linux/ia64/dl-cache.h 6 Jul 2001 04:56:17 -0000 1.2 -+++ glibc-20060306T0720-fedora/sysdeps/unix/sysv/linux/ia64/dl-cache.h 22 Sep 2004 21:21:09 -0000 1.2.4.1 +--- glibc-20060306T1239/sysdeps/unix/sysv/linux/ia64/dl-cache.h 6 Jul 2001 04:56:17 -0000 1.2 ++++ glibc-20060306T1239-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) @@ -3326,104 +3299,24 @@ + } while (0) + #include_next ---- glibc-20060306T0720/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 1 Jan 1970 00:00:00 -0000 -+++ glibc-20060306T0720-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 22 Sep 2004 21:21:09 -0000 1.1.2.1 +--- glibc-20060306T1239/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 1 Jan 1970 00:00:00 -0000 ++++ glibc-20060306T1239-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-20060306T0720/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 1 Jan 1970 00:00:00 -0000 -+++ glibc-20060306T0720-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 22 Sep 2004 21:21:09 -0000 1.1.2.1 +--- glibc-20060306T1239/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 1 Jan 1970 00:00:00 -0000 ++++ glibc-20060306T1239-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-20060306T0720/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed 17 Jan 2002 06:49:28 -0000 1.2 -+++ glibc-20060306T0720-fedora/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed 22 Sep 2004 21:21:09 -0000 1.2.2.1 +--- glibc-20060306T1239/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed 17 Jan 2002 06:49:28 -0000 1.2 ++++ glibc-20060306T1239-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"_ ---- libc/sysdeps/unix/sysv/linux/i386/sysconf.c 1 Feb 2006 18:26:19 -0000 1.6 -+++ libc/sysdeps/unix/sysv/linux/i386/sysconf.c 6 Mar 2006 08:25:57 -0000 1.7 -@@ -26,7 +26,7 @@ - static long int linux_sysconf (int name); - - --static long int -+static long int __attribute__ ((noinline)) - handle_i486 (int name) - { - /* The processor only has a unified level 1 cache of 8k. */ -@@ -202,7 +202,7 @@ intel_check_word (int name, unsigned int - } - - --static long int -+static long int __attribute__ ((noinline)) - handle_intel (int name, unsigned int maxidx) - { - if (maxidx < 2) -@@ -264,7 +264,7 @@ handle_intel (int name, unsigned int max - } - - --static long int -+static long int __attribute__ ((noinline)) - handle_amd (int name) - { - unsigned int eax; -@@ -359,17 +359,6 @@ i386_i486_test (void) - long int - __sysconf (int name) - { -- if (name == _SC_CPUTIME || name == _SC_THREAD_CPUTIME) -- { --#if HP_TIMING_AVAIL -- // XXX We can add here test for machines which cannot support a -- // XXX usable TSC. -- return 200112L; --#else -- return -1; --#endif -- } -- - /* All the remainder, except the cache information, is handled in - the generic code. */ - if (name < _SC_LEVEL1_ICACHE_SIZE || name > _SC_LEVEL4_CACHE_LINESIZE) ---- libc/sysdeps/unix/sysv/linux/x86_64/sysconf.c 2 Feb 2006 05:33:33 -0000 1.4 -+++ libc/sysdeps/unix/sysv/linux/x86_64/sysconf.c 6 Mar 2006 08:25:57 -0000 1.5 -@@ -163,7 +163,7 @@ intel_check_word (int name, unsigned int - } - - --static long int -+static long int __attribute__ ((noinline)) - handle_intel (int name, unsigned int maxidx) - { - assert (maxidx >= 2); -@@ -220,7 +220,7 @@ handle_intel (int name, unsigned int max - } - - --static long int -+static long int __attribute__ ((noinline)) - handle_amd (int name) - { - unsigned int eax; -@@ -293,12 +293,6 @@ handle_amd (int name) - long int - __sysconf (int name) - { -- if (name == _SC_CPUTIME || name == _SC_THREAD_CPUTIME) -- { -- /* XXX Test whether TSC is usable. */ -- return 200112L; -- } -- - /* We only handle the cache information here (for now). */ - if (name < _SC_LEVEL1_ICACHE_SIZE || name > _SC_LEVEL4_CACHE_LINESIZE) - return linux_sysconf (name); Index: glibc.spec =================================================================== RCS file: /cvs/dist/rpms/glibc/devel/glibc.spec,v retrieving revision 1.227 retrieving revision 1.228 diff -u -r1.227 -r1.228 --- glibc.spec 6 Mar 2006 07:55:58 -0000 1.227 +++ glibc.spec 6 Mar 2006 13:33:54 -0000 1.228 @@ -1,9 +1,9 @@ -%define glibcdate 20060306T0720 +%define glibcdate 20060306T1239 %define glibcname glibc -%define glibcsrcdir glibc-20060306T0720 +%define glibcsrcdir glibc-20060306T1239 %define glibc_release_tarballs 0 -%define glibcversion 2.3.91 -%define glibcrelease 2 +%define glibcversion 2.4 +%define glibcrelease 1 %define auxarches i586 i686 athlon sparcv9 alphaev6 %define prelinkarches noarch %define xenarches i686 athlon @@ -1340,6 +1340,10 @@ %endif %changelog +* Mon Mar 6 2006 Jakub Jelinek 2.4-1 +- update from CVS + - glibc 2.4 release + * Mon Mar 6 2006 Jakub Jelinek 2.3.91-2 - update from CVS - fix sYSMALLOc for MALLOC_ALIGNMENT > 2 * SIZE_SZ (#183895) Index: sources =================================================================== RCS file: /cvs/dist/rpms/glibc/devel/sources,v retrieving revision 1.164 retrieving revision 1.165 diff -u -r1.164 -r1.165 --- sources 6 Mar 2006 07:55:58 -0000 1.164 +++ sources 6 Mar 2006 13:33:54 -0000 1.165 @@ -1,2 +1,2 @@ -1e8fec58db2ad0735426a0e345c4d777 glibc-20060306T0720.tar.bz2 -e9f6d149054a4507911a303ec1de4064 glibc-fedora-20060306T0720.tar.bz2 +c3bd549b42829d73aad876a10435ae73 glibc-20060306T1239.tar.bz2 +505133aab642c0cf807ddb498458c1c4 glibc-fedora-20060306T1239.tar.bz2 From fedora-cvs-commits at redhat.com Mon Mar 6 14:46:02 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 6 Mar 2006 09:46:02 -0500 Subject: rpms/policycoreutils/devel policycoreutils-rhat.patch, 1.166, 1.167 policycoreutils.spec, 1.239, 1.240 Message-ID: <200603061446.k26Ek21F020673@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/policycoreutils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv20025 Modified Files: policycoreutils-rhat.patch policycoreutils.spec Log Message: * Mon Mar 6 2006 Dan Walsh 1.29.26-5 - Fix audit2allow to generate all rules policycoreutils-rhat.patch: audit2allow/audit2allow | 182 ++++++++++++++- audit2allow/audit2allow.1 | 3 scripts/chcat | 2 scripts/fixfiles | 5 semanage/semanage | 11 semanage/semanage.8 | 4 semanage/seobject.py | 528 +++++++++++++++++++++++++++------------------- setsebool/Makefile | 2 8 files changed, 507 insertions(+), 230 deletions(-) Index: policycoreutils-rhat.patch =================================================================== RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v retrieving revision 1.166 retrieving revision 1.167 diff -u -r1.166 -r1.167 --- policycoreutils-rhat.patch 4 Mar 2006 05:05:58 -0000 1.166 +++ policycoreutils-rhat.patch 6 Mar 2006 14:45:58 -0000 1.167 @@ -1,6 +1,6 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/audit2allow/audit2allow policycoreutils-1.29.26/audit2allow/audit2allow --- nsapolicycoreutils/audit2allow/audit2allow 2005-12-08 12:52:44.000000000 -0500 -+++ policycoreutils-1.29.26/audit2allow/audit2allow 2006-02-23 16:32:45.000000000 -0500 ++++ policycoreutils-1.29.26/audit2allow/audit2allow 2006-03-06 09:44:31.000000000 -0500 @@ -25,6 +25,118 @@ # # @@ -187,6 +187,15 @@ found=1 else: avc.append(i) +@@ -166,7 +313,7 @@ + self.add_seclass(seclass, access) + self.add_type(tcon) + self.add_type(scon) +- if (type, scon, tcon, seclass) not in self.seRules.keys(): ++ if (rule_type, scon, tcon, seclass) not in self.seRules.keys(): + self.seRules[(rule_type, scon, tcon, seclass)]=serule(rule_type, scon, tcon, seclass) + + self.seRules[(rule_type, scon, tcon, seclass)].add((access, msg, comm, name )) @@ -182,9 +329,10 @@ if "security_compute_sid" in avc: return Index: policycoreutils.spec =================================================================== RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils.spec,v retrieving revision 1.239 retrieving revision 1.240 diff -u -r1.239 -r1.240 --- policycoreutils.spec 4 Mar 2006 05:05:58 -0000 1.239 +++ policycoreutils.spec 6 Mar 2006 14:45:58 -0000 1.240 @@ -5,7 +5,7 @@ Summary: SELinux policy core utilities. Name: policycoreutils Version: 1.29.26 -Release: 4 +Release: 5 License: GPL Group: System Environment/Base Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz @@ -99,6 +99,9 @@ %{_libdir}/python2.4/site-packages/seobject.py* %changelog +* Mon Mar 6 2006 Dan Walsh 1.29.26-5 +- Fix audit2allow to generate all rules + * Fri Mar 3 2006 Dan Walsh 1.29.26-4 - Minor fixes to chcat and semanage From fedora-cvs-commits at redhat.com Mon Mar 6 14:58:00 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 6 Mar 2006 09:58:00 -0500 Subject: rpms/shadow-utils/devel shadow-4.0.14-symlinks.patch, NONE, 1.1 shadow-utils.spec, 1.67, 1.68 Message-ID: <200603061458.k26Ew02m005022@cvs.devel.redhat.com> Author: pvrabec Update of /cvs/dist/rpms/shadow-utils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv4951 Modified Files: shadow-utils.spec Added Files: shadow-4.0.14-symlinks.patch Log Message: use lrename() function, which follow a destination symbolic link(#181977) shadow-4.0.14-symlinks.patch: commonio.c | 73 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 72 insertions(+), 1 deletion(-) --- NEW FILE shadow-4.0.14-symlinks.patch --- --- shadow-4.0.12/lib/commonio.c.symlinks 2006-03-06 11:13:18.000000000 -0500 +++ shadow-4.0.12/lib/commonio.c 2006-03-06 11:18:05.000000000 -0500 @@ -5,6 +5,8 @@ RCSID ("$Id: commonio.c,v 1.28 2005/03/31 05:14:49 kloczek Exp $") #include "defines.h" #include +#include +#include #include #include #include @@ -22,6 +24,7 @@ #include "commonio.h" /* local function prototypes */ +static int lrename(const char *, const char *); static int check_link_count (const char *); static int do_lock_file (const char *, const char *); static FILE *fopen_set_perms (const char *, const char *, const struct stat *); @@ -36,6 +39,74 @@ static int lock_count = 0; static int nscd_need_reload = 0; +/* + * Simple rename(P) alternative that attempts to rename to symlink + * target. If symlink target is on different device, or resolving target + * fails for any reason, then falls back to POSIX rename(). + * + * This function helps preserve symbolic link structures when + * attempting to do atomic file replacement. + */ +int +lrename(const char *old, const char *new) +{ + const char *new0 = new; + char *target = NULL; + size_t targetlen = 0; + int res; +#if defined(S_ISLNK) + struct stat sb = {0}; +#if defined(_POSIX_SYMLOOP_MAX) + int maxloops = _POSIX_SYMLOOP_MAX; +#elif defined(_SYMLOOP_MAX) + int maxloops = _SYMLOOP_MAX; +#else + int maxloops = sysconf(_SC_SYMLOOP_MAX); + if (maxloops <= 0) + maxloops = 8; +#endif + while (maxloops-- > 0 && lstat(new, &sb) == 0 && S_ISLNK(sb.st_mode)) + { + size_t len; + size_t bufflen = sb.st_size + 1; + char *buff = malloc(bufflen); + if (!buff) + { + new = new0; + break; + } + len = readlink(new, buff, bufflen - 1); + if (target) // aka new + { + free(target); + target = NULL; + } + target = buff; + targetlen = bufflen; + if (len == -1) + { + // could be a dangling link + new = new0; + break; + } + else + { + target[len] = '\0'; + new = target; + } + } +#endif + res = rename(old, new); + if (res != 0 && new == target) + res = rename(old, new0); + if (target) + { + free(target); + target = NULL; + } + return res; +} + static int check_link_count (const char *file) { struct stat sb; @@ -705,7 +776,7 @@ goto fail; } - if (rename (buf, db->filename)) + if (lrename (buf, db->filename)) goto fail; nscd_need_reload = 1; Index: shadow-utils.spec =================================================================== RCS file: /cvs/dist/rpms/shadow-utils/devel/shadow-utils.spec,v retrieving revision 1.67 retrieving revision 1.68 diff -u -r1.67 -r1.68 --- shadow-utils.spec 11 Feb 2006 05:41:44 -0000 1.67 +++ shadow-utils.spec 6 Mar 2006 14:57:57 -0000 1.68 @@ -5,7 +5,7 @@ Summary: Utilities for managing accounts and shadow password files. Name: shadow-utils Version: 4.0.14 -Release: 1.2 +Release: 2 Epoch: 2 URL: http://shadow.pld.org.pl/ Source0: ftp://ftp.pld.org.pl/software/shadow/shadow-%{version}.tar.bz2 @@ -17,6 +17,8 @@ Patch3: shadow-4.0.14-goodname.patch Patch4: shadow-4.0.13-newgrpPwd.patch Patch5: shadow-4.0.12-lOption.patch +Patch6: shadow-4.0.14-symlinks.patch + License: BSD Group: System Environment/Base BuildRequires: autoconf, automake, libtool, gettext-devel @@ -47,12 +49,13 @@ %patch3 -p1 -b .goodname %patch4 -p1 -b .newgrpPwd %patch5 -p1 -b .lOption +%patch6 -p1 -b .symlinks rm po/*.gmo rm po/stamp-po -libtoolize --force aclocal +libtoolize --force automake -a autoconf @@ -197,6 +200,9 @@ %{_mandir}/*/man8/faillog.8* %changelog +* Mon Mar 06 2006 Peter Vrabec 2:4.0.14-2 +- use lrename() function, which follow a destination symbolic link(#181977) + * Fri Feb 10 2006 Jesse Keating - 2:4.0.14-1.2 - bump again for double-long bug on ppc(64) From fedora-cvs-commits at redhat.com Mon Mar 6 15:15:22 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 6 Mar 2006 10:15:22 -0500 Subject: rpms/NetworkManager/devel .cvsignore, 1.33, 1.34 NetworkManager.spec, 1.98, 1.99 sources, 1.49, 1.50 Message-ID: <200603061515.k26FFMrv009485@cvs.devel.redhat.com> Author: dcbw Update of /cvs/dist/rpms/NetworkManager/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv9367 Modified Files: .cvsignore NetworkManager.spec sources Log Message: * Mon Mar 6 2006 Dan Williams 0.6.0-1 - Update to 0.6.0 release - Move autostart file to /usr/share/gnome/autostart Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/NetworkManager/devel/.cvsignore,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- .cvsignore 3 Mar 2006 05:08:15 -0000 1.33 +++ .cvsignore 6 Mar 2006 15:15:19 -0000 1.34 @@ -1,3 +1,4 @@ NetworkManager-0.5.1.cvs20060227.tar.gz NetworkManager-0.5.1.cvs20060301.tar.gz NetworkManager-0.5.1.cvs20060302.tar.gz +NetworkManager-0.6.0.tar.gz Index: NetworkManager.spec =================================================================== RCS file: /cvs/dist/rpms/NetworkManager/devel/NetworkManager.spec,v retrieving revision 1.98 retrieving revision 1.99 diff -u -r1.98 -r1.99 --- NetworkManager.spec 3 Mar 2006 05:16:50 -0000 1.98 +++ NetworkManager.spec 6 Mar 2006 15:15:19 -0000 1.99 @@ -1,6 +1,6 @@ ExcludeArch: s390 s390x -%define cvs_snapshot 1 +%define cvs_snapshot 0 %define hal_version 0.5.0 %define dbus_version 0.60 @@ -14,8 +14,8 @@ Name: NetworkManager Summary: Network connection manager and user applications -Version: 0.5.1 -Release: 18%{?nm_cvs_version} +Version: 0.6.0 +Release: 1%{?nm_cvs_version} Group: System Environment/Base License: GPL URL: http://www.gnome.org/projects/NetworkManager/ @@ -134,14 +134,6 @@ %{__rm} -f $RPM_BUILD_ROOT%{_libdir}/libnm-util.a %{__cp} test/nm-tool $RPM_BUILD_ROOT%{_bindir}/ -%{__mkdir_p} $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/ -%{__cp} nm-applet.desktop $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/ -%{__rm} -rf $RPM_BUILD_ROOT%{_datadir}/autostart - -# eventually, we probably want this location instead. but not this late :) -%{__rm} -f $RPM_BUILD_ROOT%{_datadir}/gnome/autostart/nm-applet.desktop - - %clean %{__rm} -rf $RPM_BUILD_ROOT @@ -181,12 +173,13 @@ %config %{_sysconfdir}/rc.d/init.d/%{name}Dispatcher %{_sbindir}/%{name} %{_sbindir}/NetworkManagerDispatcher +%dir %{_sysconfdir}/NetworkManager/ %{_bindir}/nm-tool %{_libdir}/libnm-util.so* %{_mandir}/man1/NetworkManager.1.gz %{_mandir}/man1/NetworkManagerDispatcher.1.gz %{_mandir}/man1/nm-tool.1.gz -%{_localstatedir}/run/%{name} +%dir %{_localstatedir}/run/%{name} %{_prefix}/libexec/nm-crash-logger %{_datadir}/NetworkManager/gdb-cmd @@ -199,7 +192,7 @@ %{_datadir}/nm-applet/ %{_datadir}/icons/hicolor/22x22/apps/*.png %{_datadir}/icons/hicolor/48x48/apps/*.png -%{_sysconfdir}/xdg/autostart/nm-applet.desktop +%{_datadir}/gnome/autostart/nm-applet.desktop %files devel %defattr(-,root,root,0755) @@ -218,6 +211,10 @@ %changelog +* Mon Mar 6 2006 Dan Williams 0.6.0-1 +- Update to 0.6.0 release +- Move autostart file to /usr/share/gnome/autostart + * Thu Mar 2 2006 Jeremy Katz - 0.5.1-18.cvs20060302 - updated cvs snapshot. seems to make airo much less spastic Index: sources =================================================================== RCS file: /cvs/dist/rpms/NetworkManager/devel/sources,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- sources 3 Mar 2006 05:08:15 -0000 1.49 +++ sources 6 Mar 2006 15:15:19 -0000 1.50 @@ -1 +1 @@ -5e69cd267af4e817591d7fe22070384f NetworkManager-0.5.1.cvs20060302.tar.gz +87e748bcd0fe866204d79f609802b4b8 NetworkManager-0.6.0.tar.gz From fedora-cvs-commits at redhat.com Mon Mar 6 15:19:47 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 6 Mar 2006 10:19:47 -0500 Subject: rpms/shadow-utils/FC-4 shadow-4.0.12-symlinks.patch, NONE, 1.1 shadow-utils.spec, 1.55, 1.56 Message-ID: <200603061519.k26FJlu9023895@cvs.devel.redhat.com> Author: pvrabec Update of /cvs/dist/rpms/shadow-utils/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv23840 Modified Files: shadow-utils.spec Added Files: shadow-4.0.12-symlinks.patch Log Message: use lrename() function, which follow a destination symbolic link(#181977) shadow-4.0.12-symlinks.patch: commonio.c | 73 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 72 insertions(+), 1 deletion(-) --- NEW FILE shadow-4.0.12-symlinks.patch --- --- shadow-4.0.12/lib/commonio.c.symlinks 2006-03-06 11:13:18.000000000 -0500 +++ shadow-4.0.12/lib/commonio.c 2006-03-06 11:18:05.000000000 -0500 @@ -5,6 +5,8 @@ RCSID ("$Id: commonio.c,v 1.28 2005/03/31 05:14:49 kloczek Exp $") #include "defines.h" #include +#include +#include #include #include #include @@ -22,6 +24,7 @@ #include "commonio.h" /* local function prototypes */ +static int lrename(const char *, const char *); static int check_link_count (const char *); static int do_lock_file (const char *, const char *); static FILE *fopen_set_perms (const char *, const char *, const struct stat *); @@ -36,6 +39,74 @@ static int lock_count = 0; static int nscd_need_reload = 0; +/* + * Simple rename(P) alternative that attempts to rename to symlink + * target. If symlink target is on different device, or resolving target + * fails for any reason, then falls back to POSIX rename(). + * + * This function helps preserve symbolic link structures when + * attempting to do atomic file replacement. + */ +int +lrename(const char *old, const char *new) +{ + const char *new0 = new; + char *target = NULL; + size_t targetlen = 0; + int res; +#if defined(S_ISLNK) + struct stat sb = {0}; +#if defined(_POSIX_SYMLOOP_MAX) + int maxloops = _POSIX_SYMLOOP_MAX; +#elif defined(_SYMLOOP_MAX) + int maxloops = _SYMLOOP_MAX; +#else + int maxloops = sysconf(_SC_SYMLOOP_MAX); + if (maxloops <= 0) + maxloops = 8; +#endif + while (maxloops-- > 0 && lstat(new, &sb) == 0 && S_ISLNK(sb.st_mode)) + { + size_t len; + size_t bufflen = sb.st_size + 1; + char *buff = malloc(bufflen); + if (!buff) + { + new = new0; + break; + } + len = readlink(new, buff, bufflen - 1); + if (target) // aka new + { + free(target); + target = NULL; + } + target = buff; + targetlen = bufflen; + if (len == -1) + { + // could be a dangling link + new = new0; + break; + } + else + { + target[len] = '\0'; + new = target; + } + } +#endif + res = rename(old, new); + if (res != 0 && new == target) + res = rename(old, new0); + if (target) + { + free(target); + target = NULL; + } + return res; +} + static int check_link_count (const char *file) { struct stat sb; @@ -705,7 +776,7 @@ goto fail; } - if (rename (buf, db->filename)) + if (lrename (buf, db->filename)) goto fail; nscd_need_reload = 1; Index: shadow-utils.spec =================================================================== RCS file: /cvs/dist/rpms/shadow-utils/FC-4/shadow-utils.spec,v retrieving revision 1.55 retrieving revision 1.56 diff -u -r1.55 -r1.56 --- shadow-utils.spec 16 Nov 2005 11:13:42 -0000 1.55 +++ shadow-utils.spec 6 Mar 2006 15:19:45 -0000 1.56 @@ -7,7 +7,7 @@ Summary: Utilities for managing accounts and shadow password files. Name: shadow-utils Version: 4.0.12 -Release: 6.FC4 +Release: 7.FC4 Epoch: 2 URL: http://shadow.pld.org.pl/ Source0: ftp://ftp.pld.org.pl/software/shadow/shadow-%{version}.tar.bz2 @@ -22,6 +22,7 @@ #Patch6: shadow-4.0.11.1-selinux.patch Patch7: shadow-4.0.12-audit.patch Patch8: shadow-4.0.12-lOption.patch +Patch9: shadow-4.0.12-symlinks.patch License: BSD Group: System Environment/Base BuildRequires: autoconf, automake, libtool, gettext-devel @@ -55,6 +56,7 @@ #%patch6 -p1 -b .selinux %patch7 -p1 -b .audit %patch8 -p1 -b .lOption +%patch9 -p1 -b .symlinks rm po/*.gmo rm po/stamp-po @@ -238,6 +240,9 @@ %{_mandir}/*/man8/faillog.8* %changelog +* Mon Mar 06 2006 Peter Vrabec 2:4.0.12-7.FC4 +- use lrename() function, which follow a destination symbolic link(#181977) + * Wed Nov 16 2005 Peter Vrabec 2:4.0.12-6.FC4 - fix useradd segfaults (#173241) From fedora-cvs-commits at redhat.com Mon Mar 6 15:26:12 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 6 Mar 2006 10:26:12 -0500 Subject: rpms/nautilus/devel nautilus-2.13-format.patch, 1.3, 1.4 nautilus.spec, 1.95, 1.96 Message-ID: <200603061526.k26FQCYC027041@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/nautilus/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv26960 Modified Files: nautilus-2.13-format.patch nautilus.spec Log Message: reinstate format patch nautilus-2.13-format.patch: fm-directory-view.c | 25 +++++++++++++++++++------ 1 files changed, 19 insertions(+), 6 deletions(-) Index: nautilus-2.13-format.patch =================================================================== RCS file: /cvs/dist/rpms/nautilus/devel/nautilus-2.13-format.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- nautilus-2.13-format.patch 27 Feb 2006 18:49:53 -0000 1.3 +++ nautilus-2.13-format.patch 6 Mar 2006 15:26:08 -0000 1.4 @@ -0,0 +1,55 @@ +--- nautilus-2.13.92/src/file-manager/fm-directory-view.c.format 2006-03-06 10:19:21.000000000 -0500 ++++ nautilus-2.13.92/src/file-manager/fm-directory-view.c 2006-03-06 10:24:40.000000000 -0500 +@@ -6269,6 +6269,8 @@ + GList *selection, *l; + GnomeVFSDrive *drive; + FMDirectoryView *view; ++ char *device_path; ++ char *cmdline; + + view = FM_DIRECTORY_VIEW (data); + +@@ -6278,9 +6280,18 @@ + + if (nautilus_file_has_drive (file)) { + drive = nautilus_file_get_drive (file); ++ device_path = gnome_vfs_drive_get_device_path (drive); ++ + if (gnome_vfs_drive_get_device_type (drive) == GNOME_VFS_DEVICE_TYPE_FLOPPY) { +- g_spawn_command_line_async ("gfloppy", NULL); ++ cmdline = g_strconcat ("gfloppy ", device_path, NULL); ++ + } ++ else { ++ cmdline = g_strconcat ("userformat ", device_path, NULL); ++ } ++ g_spawn_command_line_async (cmdline, NULL); ++ g_free (cmdline); ++ g_free (device_path); + } + } + nautilus_file_list_free (selection); +@@ -7021,16 +7032,18 @@ + } else if (nautilus_file_has_drive (file)) { + drive = nautilus_file_get_drive (file); + *show_eject = eject_for_type (gnome_vfs_drive_get_device_type (drive)); ++ if ((gnome_vfs_drive_get_device_type (drive) == GNOME_VFS_DEVICE_TYPE_FLOPPY && ++ g_find_program_in_path ("gfloppy")) || ++ g_find_program_in_path ("userformat")) { ++ *show_format = TRUE; ++ } ++ + if (gnome_vfs_drive_is_mounted (drive)) { + *show_unmount = TRUE; ++ *show_format = FALSE; + } else { + *show_mount = TRUE; + } +- +- if (gnome_vfs_drive_get_device_type (drive) == GNOME_VFS_DEVICE_TYPE_FLOPPY && +- g_find_program_in_path ("gfloppy")) { +- *show_format = TRUE; +- } + } else if (nautilus_file_is_nautilus_link (file)) { + uri = nautilus_file_get_activation_uri (file); + if (uri != NULL && Index: nautilus.spec =================================================================== RCS file: /cvs/dist/rpms/nautilus/devel/nautilus.spec,v retrieving revision 1.95 retrieving revision 1.96 diff -u -r1.95 -r1.96 --- nautilus.spec 27 Feb 2006 18:49:53 -0000 1.95 +++ nautilus.spec 6 Mar 2006 15:26:08 -0000 1.96 @@ -18,7 +18,7 @@ Name: nautilus Summary: Nautilus is a file manager for GNOME. Version: 2.13.92 -Release: 1 +Release: 2 License: GPL Group: User Interface/Desktops Source: ftp://ftp.gnome.org/pub/GNOME/sources/2.7/%{name}/%{name}-%{version}.tar.bz2 @@ -175,6 +175,9 @@ %{_includedir}/nautilus %changelog +* Mon Mar 6 2006 Matthias Clasen - 2.13.92-2 +- Reinstate the format patch which was accidentally dropped + * Mon Feb 27 2006 Matthias Clasen - 2.13.92-1 - Update to 2.13.92 From fedora-cvs-commits at redhat.com Mon Mar 6 15:32:44 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 6 Mar 2006 10:32:44 -0500 Subject: rpms/NetworkManager/devel no-wpa-no-scan1.patch, NONE, 1.1 NetworkManager.spec, 1.99, 1.100 Message-ID: <200603061532.k26FWiWX028772@cvs.devel.redhat.com> Author: dcbw Update of /cvs/dist/rpms/NetworkManager/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv28728 Modified Files: NetworkManager.spec Added Files: no-wpa-no-scan1.patch Log Message: * Mon Mar 6 2006 Dan Williams 0.6.0-2 - Don't let wpa_supplicant perform scanning with non-WPA drivers no-wpa-no-scan1.patch: nm-device-802-11-wireless.c | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletion(-) --- NEW FILE no-wpa-no-scan1.patch --- Index: src/nm-device-802-11-wireless.c =================================================================== RCS file: /cvs/gnome/NetworkManager/src/nm-device-802-11-wireless.c,v retrieving revision 1.61 diff -u -p -r1.61 nm-device-802-11-wireless.c --- src/nm-device-802-11-wireless.c 4 Mar 2006 05:01:57 -0000 1.61 +++ src/nm-device-802-11-wireless.c 4 Mar 2006 06:17:00 -0000 @@ -2462,6 +2462,8 @@ supplicant_send_network_config (NMDevice gboolean user_created; char * hex_essid; char * ap_scan = "AP_SCAN 1"; + guint32 caps; + gboolean supports_wpa; g_return_val_if_fail (self != NULL, FALSE); g_return_val_if_fail (req != NULL, FALSE); @@ -2472,9 +2474,17 @@ supplicant_send_network_config (NMDevice ctrl = self->priv->supplicant.ctrl; g_assert (ctrl); + /* Assume that drivers that don't support WPA pretty much suck, + * and can't handle NM scanning along with wpa_supplicant. Which + * is the case for most of them, airo in particular. + */ + caps = nm_device_get_type_capabilities (NM_DEVICE (self)); + supports_wpa = (caps & NM_802_11_CAP_PROTO_WPA) + || (caps & NM_802_11_CAP_PROTO_WPA2); + /* Ad-Hoc and non-broadcasting networks need AP_SCAN 2 */ user_created = nm_ap_get_user_created (ap); - if (!nm_ap_get_broadcast (ap) || user_created) + if (!nm_ap_get_broadcast (ap) || user_created || !supports_wpa) ap_scan = "AP_SCAN 2"; /* Tell wpa_supplicant that we'll do the scanning */ Index: NetworkManager.spec =================================================================== RCS file: /cvs/dist/rpms/NetworkManager/devel/NetworkManager.spec,v retrieving revision 1.99 retrieving revision 1.100 diff -u -r1.99 -r1.100 --- NetworkManager.spec 6 Mar 2006 15:15:19 -0000 1.99 +++ NetworkManager.spec 6 Mar 2006 15:32:31 -0000 1.100 @@ -15,7 +15,7 @@ Name: NetworkManager Summary: Network connection manager and user applications Version: 0.6.0 -Release: 1%{?nm_cvs_version} +Release: 2%{?nm_cvs_version} Group: System Environment/Base License: GPL URL: http://www.gnome.org/projects/NetworkManager/ @@ -23,6 +23,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-root Patch0: special-case-madwifi.patch +Patch1: no-wpa-no-scan1.patch PreReq: chkconfig Requires: wireless-tools >= %{wireless_tools_version} @@ -117,6 +118,7 @@ %prep %setup -q %patch0 -p0 -b .madwifi +%patch1 -p0 -b .no-wpa-no-scan1 %build %configure --with-named=/usr/sbin/named --with-named-dir=/var/named/data --with-named-user=named --enable-notify=yes @@ -211,6 +213,9 @@ %changelog +* Mon Mar 6 2006 Dan Williams 0.6.0-2 +- Don't let wpa_supplicant perform scanning with non-WPA drivers + * Mon Mar 6 2006 Dan Williams 0.6.0-1 - Update to 0.6.0 release - Move autostart file to /usr/share/gnome/autostart From fedora-cvs-commits at redhat.com Mon Mar 6 15:35:15 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 6 Mar 2006 10:35:15 -0500 Subject: rpms/udev/devel udev-rules.patch,1.10,1.11 udev.spec,1.160,1.161 Message-ID: <200603061535.k26FZFIa029123@cvs.devel.redhat.com> Author: harald Update of /cvs/dist/rpms/udev/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv29081 Modified Files: udev-rules.patch udev.spec Log Message: fixed DRI permissions udev-rules.patch: 05-udev-early.rules | 9 ++ 95-pam-console.rules | 1 hotplug.rules | 13 ++- udev.rules | 172 ++++++++++++++++++++++++++++----------------------- 4 files changed, 115 insertions(+), 80 deletions(-) Index: udev-rules.patch =================================================================== RCS file: /cvs/dist/rpms/udev/devel/udev-rules.patch,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- udev-rules.patch 5 Mar 2006 05:59:32 -0000 1.10 +++ udev-rules.patch 6 Mar 2006 15:35:13 -0000 1.11 @@ -1,5 +1,5 @@ --- udev-084/etc/udev/redhat/hotplug.rules.rhrules 2006-01-30 08:51:38.000000000 +0100 -+++ udev-084/etc/udev/redhat/hotplug.rules 2006-03-02 08:29:54.000000000 +0100 ++++ udev-084/etc/udev/redhat/hotplug.rules 2006-03-06 13:55:18.000000000 +0100 @@ -1,8 +1,15 @@ # do not call hotplug.d and dev.d for "drivers" and "module" events -SUBSYSTEM=="drivers", OPTIONS="last_rule" @@ -20,11 +20,11 @@ + +LABEL="hotplug_end" --- /dev/null 2006-02-15 18:27:05.942547250 +0100 -+++ udev-084/etc/udev/redhat/95-pam-console.rules 2006-03-02 08:29:54.000000000 +0100 ++++ udev-084/etc/udev/redhat/95-pam-console.rules 2006-03-06 13:55:18.000000000 +0100 @@ -0,0 +1 @@ +ACTION=="add", SYSFS{dev}="?*", KERNEL=="?*", RUN+="/sbin/pam_console_apply $env{DEVNAME} $env{DEVLINKS}" --- /dev/null 2006-02-15 18:27:05.942547250 +0100 -+++ udev-084/etc/udev/redhat/05-udev-early.rules 2006-03-02 08:29:54.000000000 +0100 ++++ udev-084/etc/udev/redhat/05-udev-early.rules 2006-03-06 13:55:18.000000000 +0100 @@ -0,0 +1,9 @@ +# sysfs is populated after the event is sent +ACTION=="add", DEVPATH=="/devices/*", ENV{PHYSDEVBUS}=="?*", WAIT_FOR_SYSFS="bus" @@ -36,7 +36,7 @@ + +ACTION=="add", SUBSYSTEM=="firmware", ENV{FIRMWARE}=="*", RUN="/sbin/firmware_helper", OPTIONS="last_rule" --- udev-084/etc/udev/redhat/udev.rules.rhrules 2006-01-30 08:51:38.000000000 +0100 -+++ udev-084/etc/udev/redhat/udev.rules 2006-03-02 08:30:33.000000000 +0100 ++++ udev-084/etc/udev/redhat/udev.rules 2006-03-06 14:56:28.000000000 +0100 @@ -3,47 +3,52 @@ # # default is OWNER="root" GROUP="root", MODE="0600" @@ -137,7 +137,16 @@ # audio devices KERNEL=="dsp*", MODE="0660" -@@ -142,9 +153,9 @@ +@@ -131,7 +142,7 @@ + # dri devices + KERNEL=="nvidia*", MODE="0660" + KERNEL=="3dfx*", MODE="0660" +-KERNEL=="dri/*", MODE="0666" ++KERNEL=="card[0-9]*", NAME="dri/%k", MODE="0666" + + # usb devices + KERNEL=="usb/dabusb*", MODE="0660" +@@ -142,16 +153,14 @@ KERNEL=="z90crypt", MODE="0666" # DVB @@ -149,7 +158,14 @@ # create a symlink named after the device map name # note devmap_name comes with extras/multipath -@@ -179,8 +190,8 @@ + #KERNEL=="dm-[0-9]*", PROGRAM="/sbin/devmap_name %M %m", NAME="%k", SYMLINK+="%c" + +-# DRI devices always go into a subdirectory (as per the LSB spec) +-KERNEL=="card*", NAME="dri/card%n" + + # alsa devices + KERNEL=="controlC[0-9]*", NAME="snd/%k" +@@ -179,8 +188,8 @@ BUS=="usb", KERNEL=="lp[0-9]*", NAME="usb/%k" KERNEL=="microcode", NAME="cpu/%k" @@ -160,7 +176,7 @@ KERNEL=="ram1", SYMLINK+="ram" KERNEL=="video0", SYMLINK+="video" -@@ -203,13 +214,12 @@ +@@ -203,13 +212,12 @@ KERNEL=="device-mapper", NAME="mapper/control" # old compat symlinks with enumeration @@ -180,7 +196,7 @@ KERNEL=="umad*", NAME="infiniband/%k" KERNEL=="issm*", NAME="infiniband/%k" -@@ -221,27 +231,30 @@ +@@ -221,27 +229,30 @@ KERNEL=="zappseudo", NAME="zap/pseudo" KERNEL=="zap[0-9]*", NAME="zap/%n" @@ -223,7 +239,7 @@ ####################################### # Persistent block device stuff - begin -@@ -256,7 +269,8 @@ +@@ -256,7 +267,8 @@ KERNEL=="ram*|loop*|fd*|nbd*", GOTO="persistent_end" # never access removable ide devices, the drivers are causing event loops on open() @@ -233,7 +249,7 @@ # by-id (hardware serial number) KERNEL=="hd*[!0-9]", IMPORT{program}="/sbin/ata_id --export $tempnode" -@@ -297,37 +311,43 @@ +@@ -297,37 +309,43 @@ # Persistent block device stuff - end ##################################### Index: udev.spec =================================================================== RCS file: /cvs/dist/rpms/udev/devel/udev.spec,v retrieving revision 1.160 retrieving revision 1.161 diff -u -r1.160 -r1.161 --- udev.spec 5 Mar 2006 05:43:08 -0000 1.160 +++ udev.spec 6 Mar 2006 15:35:13 -0000 1.161 @@ -5,7 +5,7 @@ Summary: A userspace implementation of devfs Name: udev Version: 084 -Release: 11 +Release: 12 License: GPL Group: System Environment/Base Provides: udev-persistent = 0:%{version}-%{release} @@ -283,6 +283,9 @@ %attr(0644,root,root) %{_mandir}/man8/vol_id*.8* %changelog +* Mon Mar 06 2006 Harald Hoyer - 084-12 +- fixed DRI permissions + * Sun Mar 05 2006 Bill Nottingham - 084-11 - use $ENV{MODALIAS}, not $modalias (#181494) From fedora-cvs-commits at redhat.com Mon Mar 6 15:47:40 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 6 Mar 2006 10:47:40 -0500 Subject: rpms/system-config-date/devel .cvsignore, 1.40, 1.41 sources, 1.43, 1.44 system-config-date.spec, 1.48, 1.49 Message-ID: <200603061547.k26FlePj014179@cvs.devel.redhat.com> Author: nphilipp Update of /cvs/dist/rpms/system-config-date/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv14097 Modified Files: .cvsignore sources system-config-date.spec Log Message: don't write into /tmp make synchronizing with time servers configurable (#157485) Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/system-config-date/devel/.cvsignore,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- .cvsignore 3 Mar 2006 15:04:04 -0000 1.40 +++ .cvsignore 6 Mar 2006 15:47:37 -0000 1.41 @@ -1 +1 @@ -system-config-date-1.8.1.tar.bz2 +system-config-date-1.8.2.tar.bz2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/system-config-date/devel/sources,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- sources 3 Mar 2006 15:04:04 -0000 1.43 +++ sources 6 Mar 2006 15:47:37 -0000 1.44 @@ -1 +1 @@ -e5f27e07c88de4e52640edc976e820bd system-config-date-1.8.1.tar.bz2 +04b0e69d7d0c4d9fbffde77dfe62522b system-config-date-1.8.2.tar.bz2 Index: system-config-date.spec =================================================================== RCS file: /cvs/dist/rpms/system-config-date/devel/system-config-date.spec,v retrieving revision 1.48 retrieving revision 1.49 diff -u -r1.48 -r1.49 --- system-config-date.spec 3 Mar 2006 15:04:04 -0000 1.48 +++ system-config-date.spec 6 Mar 2006 15:47:37 -0000 1.49 @@ -1,6 +1,6 @@ Summary: A graphical interface for modifying system date and time Name: system-config-date -Version: 1.8.1 +Version: 1.8.2 Release: 1 URL: http://fedora.redhat.com/projects/config-tools/ License: GPL @@ -97,6 +97,10 @@ %attr(0644,root,root) %config(noreplace) /usr/share/system-config-date/ntp.template %changelog +* Mon Mar 06 2006 Nils Philippsen 1.8.2 +- don't write into /tmp +- make synchronizing with time servers configurable (#157485) + * Fri Mar 03 2006 Nils Philippsen 1.8.1 - require hicolor-icon-theme (#182859, #182860) From fedora-cvs-commits at redhat.com Mon Mar 6 15:49:36 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 6 Mar 2006 10:49:36 -0500 Subject: rpms/kernel/devel/configs config-x86_64-generic,1.32,1.32.6.1 Message-ID: <200603061549.k26Fna2K015121@cvs.devel.redhat.com> Author: sct Update of /cvs/dist/rpms/kernel/devel/configs In directory cvs.devel.redhat.com:/tmp/cvs-serv15062/configs Modified Files: Tag: private-xen-rebased-2009-branch config-x86_64-generic Log Message: Merge with rawhide kernel 1.2016 Index: config-x86_64-generic =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/configs/config-x86_64-generic,v retrieving revision 1.32 retrieving revision 1.32.6.1 diff -u -r1.32 -r1.32.6.1 --- config-x86_64-generic 24 Feb 2006 19:13:38 -0000 1.32 +++ config-x86_64-generic 6 Mar 2006 15:49:34 -0000 1.32.6.1 @@ -10,14 +10,14 @@ CONFIG_K8_NUMA=y CONFIG_X86_64_ACPI_NUMA=y # CONFIG_NUMA_EMU is not set -CONFIG_NR_CPUS=256 +CONFIG_NR_CPUS=255 CONFIG_GART_IOMMU=y CONFIG_X86_POWERNOW_K8=y CONFIG_IA32_EMULATION=y # CONFIG_IA32_AOUT is not set # CONFIG_IOMMU_DEBUG is not set CONFIG_DEBUG_RODATA=y -CONFIG_MICROCODE=m +CONFIG_MICROCODE=m CONFIG_SWIOTLB=y CONFIG_X86_PM_TIMER=y CONFIG_EDD=m @@ -55,7 +55,7 @@ CONFIG_CPU_FREQ_DEBUG=y CONFIG_X86_SPEEDSTEP_CENTRINO=y CONFIG_X86_ACPI_CPUFREQ=m -CONFIG_X86_SPEEDSTEP_CENTRINO_ACPI=y +CONFIG_X86_SPEEDSTEP_CENTRINO_ACPI=y # CONFIG_X86_ACPI_CPUFREQ_PROC_INTF is not set CONFIG_CPU_FREQ_STAT=m CONFIG_CPU_FREQ_STAT_DETAILS=y @@ -84,7 +84,7 @@ CONFIG_HOTPLUG_PCI_COMPAQ=m # CONFIG_HOTPLUG_PCI_COMPAQ_NVRAM is not set CONFIG_HOTPLUG_PCI_IBM=m -CONFIG_HOTPLUG_PCI_ACPI=m +CONFIG_HOTPLUG_PCI_ACPI=m CONFIG_HOTPLUG_PCI_ACPI_IBM=m # CONFIG_HOTPLUG_PCI_CPCI is not set CONFIG_HOTPLUG_PCI_PCIE=m From fedora-cvs-commits at redhat.com Mon Mar 6 15:49:36 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 6 Mar 2006 10:49:36 -0500 Subject: rpms/kernel/devel linux-2.6-sata-silence-dumb-msg.patch, NONE, 1.1.2.1 linux-2.6-softlockup-disable.patch, NONE, 1.2.2.1 linux-2.6-x86-cpu_index-false.patch, NONE, 1.1.2.1 patch-2.6.16-rc5-git8.bz2.sign, NONE, 1.1.2.1 .cvsignore, 1.369.4.1, 1.369.4.2 kernel-2.6.spec, 1.2009.4.2, 1.2009.4.3 sources, 1.310.4.1, 1.310.4.2 upstream, 1.285, 1.285.4.1 patch-2.6.16-rc5-git6.bz2.sign, 1.1, NONE Message-ID: <200603061549.k26FnauV015112@cvs.devel.redhat.com> Author: sct Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv15062 Modified Files: Tag: private-xen-rebased-2009-branch .cvsignore kernel-2.6.spec sources upstream Added Files: Tag: private-xen-rebased-2009-branch linux-2.6-sata-silence-dumb-msg.patch linux-2.6-softlockup-disable.patch linux-2.6-x86-cpu_index-false.patch patch-2.6.16-rc5-git8.bz2.sign Removed Files: Tag: private-xen-rebased-2009-branch patch-2.6.16-rc5-git6.bz2.sign Log Message: Merge with rawhide kernel 1.2016 linux-2.6-sata-silence-dumb-msg.patch: libata-scsi.c | 3 --- 1 files changed, 3 deletions(-) --- NEW FILE linux-2.6-sata-silence-dumb-msg.patch --- https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=183348 --- linux-2.6.15.noarch/drivers/scsi/libata-scsi.c~ 2006-03-04 15:51:08.000000000 -0500 +++ linux-2.6.15.noarch/drivers/scsi/libata-scsi.c 2006-03-04 15:51:25.000000000 -0500 @@ -520,9 +520,6 @@ void ata_to_sense_error(unsigned id, u8 *ascq = 0x04; /* "auto-reallocation failed" */ translate_done: - printk(KERN_ERR "ata%u: translated ATA stat/err 0x%02x/%02x to " - "SCSI SK/ASC/ASCQ 0x%x/%02x/%02x\n", id, drv_stat, drv_err, - *sk, *asc, *ascq); return; } linux-2.6-softlockup-disable.patch: main.c | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletion(-) --- NEW FILE linux-2.6-softlockup-disable.patch --- --- linux-2.6.15.noarch/init/main.c~ 2006-03-05 00:45:51.000000000 -0500 +++ linux-2.6.15.noarch/init/main.c 2006-03-05 00:49:41.000000000 -0500 @@ -640,6 +640,15 @@ static void __init do_basic_setup(void) do_initcalls(); } +static int __initdata nosoftlockup; + +static int __init nosoftlockup_setup(char *str) +{ + nosoftlockup = 1; + return 1; +} +__setup("nosoftlockup", nosoftlockup_setup); + static void do_pre_smp_initcalls(void) { extern int spawn_ksoftirqd(void); @@ -649,7 +657,8 @@ static void do_pre_smp_initcalls(void) migration_init(); #endif spawn_ksoftirqd(); - spawn_softlockup_task(); + if (!nosoftlockup) + spawn_softlockup_task(); } static void run_init_process(char *init_filename) linux-2.6-x86-cpu_index-false.patch: processor_core.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) --- NEW FILE linux-2.6-x86-cpu_index-false.patch --- Local apic entries are only 8 bits, but it seemed to not be caught with u8 return value result in the check cpu_index >= NR_CPUS becomming always false. drivers/acpi/processor_core.c: In function `acpi_processor_get_info': drivers/acpi/processor_core.c:483: warning: comparison is always false due to limited range of data type Signed-off-by: Ashok Raj ----------------------------------------------------- drivers/acpi/processor_core.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) Index: linux-2.6.16-rc5-mm1/drivers/acpi/processor_core.c =================================================================== --- linux-2.6.16-rc5-mm1.orig/drivers/acpi/processor_core.c +++ linux-2.6.16-rc5-mm1/drivers/acpi/processor_core.c @@ -382,7 +382,7 @@ static int acpi_processor_remove_fs(stru /* Use the acpiid in MADT to map cpus in case of SMP */ #ifndef CONFIG_SMP -#define convert_acpiid_to_cpu(acpi_id) (0xff) +#define convert_acpiid_to_cpu(acpi_id) (-1) #else #ifdef CONFIG_IA64 @@ -395,7 +395,7 @@ static int acpi_processor_remove_fs(stru #define ARCH_BAD_APICID (0xff) #endif -static u8 convert_acpiid_to_cpu(u8 acpi_id) +static int convert_acpiid_to_cpu(u8 acpi_id) { u16 apic_id; int i; @@ -421,7 +421,7 @@ static int acpi_processor_get_info(struc acpi_status status = 0; union acpi_object object = { 0 }; struct acpi_buffer buffer = { sizeof(union acpi_object), &object }; - u8 cpu_index; + int cpu_index; static int cpu0_initialized; ACPI_FUNCTION_TRACE("acpi_processor_get_info"); @@ -466,7 +466,7 @@ static int acpi_processor_get_info(struc cpu_index = convert_acpiid_to_cpu(pr->acpi_id); /* Handle UP system running SMP kernel, with no LAPIC in MADT */ - if (!cpu0_initialized && (cpu_index == 0xff) && + if (!cpu0_initialized && (cpu_index == -1) && (num_online_cpus() == 1)) { cpu_index = 0; } @@ -480,7 +480,7 @@ static int acpi_processor_get_info(struc * less than the max # of CPUs. They should be ignored _iff * they are physically not present. */ - if (cpu_index >= NR_CPUS) { + if (cpu_index == -1) { if (ACPI_FAILURE (acpi_processor_hotadd_init(pr->handle, &pr->id))) { ACPI_ERROR((AE_INFO, --- NEW FILE patch-2.6.16-rc5-git8.bz2.sign --- -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.2.1 (GNU/Linux) Comment: See http://www.kernel.org/signature.html for info iD8DBQBECozsyGugalF9Dw4RAjd2AKCBdn+cFSUUBZGePvmZYIupfggdqgCgiv2u wF7DuJNfTyXMKo5MA6LLjk8= =ZsHs -----END PGP SIGNATURE----- Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v retrieving revision 1.369.4.1 retrieving revision 1.369.4.2 diff -u -r1.369.4.1 -r1.369.4.2 --- .cvsignore 2 Mar 2006 22:45:15 -0000 1.369.4.1 +++ .cvsignore 6 Mar 2006 15:49:33 -0000 1.369.4.2 @@ -4,4 +4,4 @@ linux-2.6.15.tar.bz2 patch-2.6.16-rc5.bz2 xen-20060301.tar.bz2 -patch-2.6.16-rc5-git6.bz2 +patch-2.6.16-rc5-git8.bz2 Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.2009.4.2 retrieving revision 1.2009.4.3 diff -u -r1.2009.4.2 -r1.2009.4.3 --- kernel-2.6.spec 2 Mar 2006 22:47:46 -0000 1.2009.4.2 +++ kernel-2.6.spec 6 Mar 2006 15:49:33 -0000 1.2009.4.3 @@ -219,7 +219,7 @@ # Patches 0 through 100 are meant for core subsystem upgrades # Patch1: patch-2.6.16-rc5.bz2 -Patch2: patch-2.6.16-rc5-git6.bz2 +Patch2: patch-2.6.16-rc5-git8.bz2 # Patches 100 through 500 are meant for architecture patches Patch100: linux-2.6-bzimage.patch @@ -234,6 +234,7 @@ Patch205: linux-2.6-edid-check.patch Patch206: linux-2.6-x86_64-smp-on-uphw-cpucount.patch Patch207: linux-2.6-x86-hp-reboot.patch +Patch208: linux-2.6-x86-cpu_index-false.patch # 300 - 399 ppc(64) Patch300: linux-2.6-powermac-pfunc-noise.patch @@ -370,6 +371,7 @@ Patch1710: linux-2.6-sched-up-migration-cost.patch Patch1720: linux-2.6-md-raid1-leak.patch Patch1730: linux-2.6-signal-trampolines-unwind-info.patch +Patch1740: linux-2.6-softlockup-disable.patch # SELinux/audit patches. Patch1800: linux-2.6-selinux-hush.patch @@ -397,6 +399,7 @@ # SATA Bits Patch2200: linux-2.6-sata-promise-pata-ports.patch +Patch2201: linux-2.6-sata-silence-dumb-msg.patch # ACPI bits Patch2300: linux-2.6-acpi_os_acquire_object-gfp_kernel-called-with-irqs.patch @@ -404,7 +407,6 @@ # Broadcom wireless driver Patch5000: linux-2.6-softmac-git.patch Patch5001: linux-2.6-bcm43xx-git.patch -Patch5002: linux-2.6-bcm-warnings.patch # # 10000 to 20000 is for stuff that has to come last due to the @@ -730,7 +732,7 @@ # Compile 686 kernels tuned for Pentium4. %patch200 -p1 # Keep UP APIC off by default. -%patch201 -p1 +#%patch201 -p1 # add vidfail capability; # without this patch specifying a framebuffer on the kernel prompt would # make the boot stop if there's no supported framebuffer device; this is bad @@ -747,6 +749,8 @@ %patch206 -p1 # Reboot through BIOS on HP systems,. %patch207 -p1 +# cpu_index >= NR_CPUS becomming always false. +%patch208 -p1 # # ppc64 @@ -843,6 +847,8 @@ # SATA Patches # Enable PATA ports on Promise. %patch2200 -p1 +# Silence noisy printk +%patch2201 -p1 # ACPI patches %patch2300 -p1 @@ -975,6 +981,8 @@ %patch1720 -p1 # Mark unwind info for signal trampolines in vDSOs %patch1730 -p1 +# Add a safety net to softlockup so that it doesn't prevent installs. +%patch1740 -p1 # Silence some selinux messages. %patch1800 -p1 @@ -1020,8 +1028,6 @@ %patch5000 -p1 # ... and bcm43xx driver too %patch5001 -p1 -# warning fix. -%patch5002 -p1 # # final stuff @@ -1623,6 +1629,23 @@ %endif %changelog +* Mon Mar 6 2006 Stephen Tweedie +- Merge xen rebase with 1.2016 kernel + +* Sun Mar 5 2006 Dave Jones +- 2.6.16rc5-git8 +- Add a safety net to softlockup so that it doesn't prevent installs. + +* Sat Mar 4 2006 Dave Jones +- Silence noisy SATA printk. + +* Fri Mar 3 2006 Dave Jones +- 2.6.16rc5-git7 +- Fix cpu_index >= NR_CPUS always false warnings. + +* Thu Mar 2 2006 John W. Linville +- Update to current bcm43xx code + * Thu Mar 2 2006 Stephen Tweedie - Rebase to rawhide 1.2009 - Disable xen PAE build again Index: sources =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/sources,v retrieving revision 1.310.4.1 retrieving revision 1.310.4.2 diff -u -r1.310.4.1 -r1.310.4.2 --- sources 2 Mar 2006 22:45:19 -0000 1.310.4.1 +++ sources 6 Mar 2006 15:49:34 -0000 1.310.4.2 @@ -1,4 +1,4 @@ cdf95e00f5111e31f78e1d97304d9522 linux-2.6.15.tar.bz2 1740ae34807f687a93adf2469ea5c4fc patch-2.6.16-rc5.bz2 cdfde609af8adcf58d7ff626599b2d90 xen-20060301.tar.bz2 -57537f7ff1c1cf1534df4a0986956feb patch-2.6.16-rc5-git6.bz2 +ac2274a7e960b780325805e050ad5cee patch-2.6.16-rc5-git8.bz2 Index: upstream =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/upstream,v retrieving revision 1.285 retrieving revision 1.285.4.1 diff -u -r1.285 -r1.285.4.1 --- upstream 2 Mar 2006 19:26:10 -0000 1.285 +++ upstream 6 Mar 2006 15:49:34 -0000 1.285.4.1 @@ -1,3 +1,3 @@ linux-2.6.15.tar.bz2 patch-2.6.16-rc5.bz2 -patch-2.6.16-rc5-git6.bz2 +patch-2.6.16-rc5-git8.bz2 --- patch-2.6.16-rc5-git6.bz2.sign DELETED --- From fedora-cvs-commits at redhat.com Mon Mar 6 16:03:57 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 6 Mar 2006 11:03:57 -0500 Subject: rpms/GConf2/devel GConf2-2.13.5-sync-less.patch, NONE, 1.1 GConf2.spec, 1.38, 1.39 Message-ID: <200603061603.k26G3vp9019642@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/GConf2/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv19617 Modified Files: GConf2.spec Added Files: GConf2-2.13.5-sync-less.patch Log Message: - Only sync the database once when installing multiple schema files. Patch by Josselin Mouette . (upstream bug 333353) GConf2-2.13.5-sync-less.patch: gconftool.c | 21 +++++++++++++++++---- 1 files changed, 17 insertions(+), 4 deletions(-) --- NEW FILE GConf2-2.13.5-sync-less.patch --- --- GConf2-2.13.5/gconf/gconftool.c 2006-03-03 14:30:01.000000000 +0100 +++ GConf2-2.13.5/gconf/gconftool.c 2006-03-03 14:38:46.000000000 +0100 @@ -476,6 +476,7 @@ static int do_recursive_unset (GConfEngine* conf, const gchar** args); static int do_all_subdirs(GConfEngine* conf, const gchar** args); static int do_load_file(GConfEngine* conf, LoadType load_type, gboolean unload, const gchar* file, const gchar** base_dirs); +static int do_sync(GConfEngine* conf); static int do_short_docs (GConfEngine *conf, const gchar **args); static int do_long_docs (GConfEngine *conf, const gchar **args); static int do_get_schema_name (GConfEngine *conf, const gchar **args); @@ -841,6 +842,8 @@ gint retval; retval = do_load_file(conf, LOAD_SCHEMA_FILE, FALSE, schema_file, NULL); + if (!retval) + retval = do_sync(conf); gconf_engine_unref(conf); @@ -853,6 +856,8 @@ gint retval; retval = do_load_file(conf, LOAD_ENTRY_FILE, FALSE, entry_file, args); + if (!retval) + retval = do_sync(conf); gconf_engine_unref(conf); @@ -865,6 +870,8 @@ gint retval; retval = do_load_file(conf, LOAD_ENTRY_FILE, TRUE, unload_entry_file, args); + if (!retval) + retval = do_sync(conf); gconf_engine_unref(conf); @@ -3629,7 +3636,6 @@ xmlDocPtr doc; xmlNodePtr iter; - GError * err = NULL; /* file comes from the command line, is thus in locale charset */ gchar *utf8_file = g_locale_to_utf8 (file, -1, NULL, NULL, NULL);; @@ -3691,7 +3697,17 @@ iter = iter->next; } + + return 0; +#undef LOAD_TYPE_TO_LIST +#undef LOAD_TYPE_TO_ROOT +} +static int +do_sync(GConfEngine* conf) +{ + GError * err = NULL; + gconf_engine_suggest_sync(conf, &err); if (err != NULL) @@ -3703,9 +3719,6 @@ } return 0; - -#undef LOAD_TYPE_TO_LIST -#undef LOAD_TYPE_TO_ROOT } static int Index: GConf2.spec =================================================================== RCS file: /cvs/dist/rpms/GConf2/devel/GConf2.spec,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- GConf2.spec 15 Feb 2006 15:39:45 -0000 1.38 +++ GConf2.spec 6 Mar 2006 16:03:42 -0000 1.39 @@ -5,7 +5,7 @@ Summary: A process-transparent configuration system Name: GConf2 Version: 2.13.5 -Release: 4 +Release: 5 License: LGPL Group: System Environment/Base Source: ftp://ftp.gnome.org/pub/GNOME/unstable/sources/GConf/GConf-%{version}.tar.bz2 @@ -23,6 +23,9 @@ BuildRequires: gettext BuildRequires: openldap-devel +Patch0: GConf2-2.8.1-reload.patch +Patch1: GConf2-2.13.5-sync-less.patch + %description GConf is a process-transparent configuration database API used to store user preferences. It has pluggable backends and features to @@ -36,8 +39,6 @@ Requires: ORBit2-devel >= %{orbit2_version} Requires: glib2-devel >= %{glib2_version} -Patch1: GConf2-2.8.1-reload.patch - %description devel GConf development package. Contains files needed for doing @@ -45,7 +46,8 @@ %prep %setup -q -n GConf-%{version} -%patch1 -p1 -b .reload +%patch0 -p1 -b .reload +%patch1 -p1 -b .sync-less %build %configure @@ -101,6 +103,11 @@ %{_libdir}/pkgconfig/* %changelog +* Mon Mar 6 2006 Ray Strode 2.13.5-5 +- Only sync the database once when installing multiple + schema files. Patch by Josselin Mouette . + (upstream bug 333353) + * Wed Feb 15 2006 Christopher Aillon 2.13.5-4 - Send SIGTERM instead of SIGHUP to gconfd From fedora-cvs-commits at redhat.com Mon Mar 6 16:10:24 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 6 Mar 2006 11:10:24 -0500 Subject: rpms/nut/FC-4 nut.spec, 1.21, 1.22 sources, 1.11, 1.12 ups.sysconfig, 1.2, 1.3 nut-2.0.2-buffer.patch, 1.1, NONE Message-ID: <200603061610.k26GAOtv020917@cvs.devel.redhat.com> Author: than Update of /cvs/dist/rpms/nut/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv19909 Modified Files: nut.spec sources ups.sysconfig Removed Files: nut-2.0.2-buffer.patch Log Message: - update to 2.0.3, #182089 - fix nut default setting #175615 - remove nut-2.0.2-buffer which is included in new upstream - add missing hotplug scripts for newhidup, #170106 Index: nut.spec =================================================================== RCS file: /cvs/dist/rpms/nut/FC-4/nut.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- nut.spec 6 Oct 2005 22:34:16 -0000 1.21 +++ nut.spec 6 Mar 2006 16:10:20 -0000 1.22 @@ -10,8 +10,8 @@ Summary: Network UPS Tools Name: nut -Version: 2.0.2 -Release: 0.fc4.2 +Version: 2.0.3 +Release: 0.fc4.1 Group: Applications/System License: GPL BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root @@ -24,7 +24,6 @@ Patch1: nut-0.45.0-conffiles.patch Patch2: nut-0.45.4-conf.patch Patch3: nut-2.0.1-bad.patch -Patch4: nut-2.0.2-buffer.patch Patch5: nut-2.0.2-warning.patch Requires: nut-client @@ -90,7 +89,6 @@ %patch1 -p1 -b .conf %patch2 -p1 -b .conf1 %patch3 -p1 -b .bad -%patch4 -p1 -b .buffer %patch5 -p1 -b .warnings iconv -f iso-8859-1 -t utf-8 < man/newhidups.8 > man/newhidups.8_ @@ -121,7 +119,8 @@ %{buildroot}%{_sysconfdir}/sysconfig \ %{buildroot}%{piddir} \ %{buildroot}%{_localstatedir}/lib/ups \ - %{buildroot}%{initdir} + %{buildroot}%{initdir} \ + %{buildroot}%{_sysconfdir}/hotplug/usb make install install-conf \ install-cgi-conf \ @@ -136,6 +135,10 @@ install -m 755 %{SOURCE2} %{buildroot}%{_sysconfdir}/sysconfig/ups install -m 755 %{SOURCE1} %{buildroot}%{initdir}/ups +# hotplug scripts +install -m 755 scripts/hotplug/libhidups %{buildroot}%{_sysconfdir}/hotplug/usb/ +install -m 644 scripts/hotplug/libhid.usermap %{buildroot}%{_sysconfdir}/hotplug/usb/ + # rename for file in %{buildroot}%{_sysconfdir}/ups/*.sample do @@ -187,6 +190,7 @@ %config(noreplace) %attr(640,root,nut) %{_sysconfdir}/ups/upsd.conf %config(noreplace) %attr(640,root,nut) %{_sysconfdir}/ups/upsd.users %config(noreplace) %attr(644,root,root) %{_sysconfdir}/sysconfig/ups +%{_sysconfdir}/hotplug/usb/* %{modeldir}/* %{_sbindir}/upsd %{_bindir}/upslog @@ -233,6 +237,7 @@ %{_mandir}/man8/bcmxcp.8* %{_mandir}/man8/solis.8* %{_mandir}/man8/upscode2.8* + %files client %defattr(-,root,root) %attr(755,root,root) %{initdir}/ups @@ -271,6 +276,12 @@ %{_mandir}/man8/upsset.cgi.8.gz %changelog +* Mon Mar 06 2006 Than Ngo 2.0.3-0.fc4.1 +- update to 2.0.3, #182089 +- fix nut default setting #175615 +- remove nut-2.0.2-buffer which is included in new upstream +- add missing hotplug scripts for newhidup, #170106 + * Fri Oct 07 2005 Than Ngo 2.0.2-0.fc4.2 - own /var/www/nut-cgi-bin #169904 Index: sources =================================================================== RCS file: /cvs/dist/rpms/nut/FC-4/sources,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- sources 4 Oct 2005 09:44:19 -0000 1.11 +++ sources 6 Mar 2006 16:10:20 -0000 1.12 @@ -1 +0,0 @@ -6560df8d0a42f0f585d34ed1ae8c6f67 nut-2.0.2.tar.gz Index: ups.sysconfig =================================================================== RCS file: /cvs/dist/rpms/nut/FC-4/ups.sysconfig,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ups.sysconfig 9 Sep 2004 09:22:07 -0000 1.2 +++ ups.sysconfig 6 Mar 2006 16:10:20 -0000 1.3 @@ -11,7 +11,7 @@ # upsdrvctl # You MUST change this, or set SERVER to "no" # To support multiple drivers, set MODEL=upsdrvctl -MODEL=NONE +MODEL=upsdrvctl # UPS device - needed if UPS is locally attached DEVICE=/dev/ttyS0 # Any options to pass to $MODEL --- nut-2.0.2-buffer.patch DELETED --- From fedora-cvs-commits at redhat.com Mon Mar 6 16:14:16 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 6 Mar 2006 11:14:16 -0500 Subject: rpms/nut/FC-4 nut.spec,1.22,1.23 Message-ID: <200603061614.k26GEGHF022682@cvs.devel.redhat.com> Author: than Update of /cvs/dist/rpms/nut/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv22616 Modified Files: nut.spec Log Message: fix rpm file list Index: nut.spec =================================================================== RCS file: /cvs/dist/rpms/nut/FC-4/nut.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- nut.spec 6 Mar 2006 16:10:20 -0000 1.22 +++ nut.spec 6 Mar 2006 16:14:14 -0000 1.23 @@ -237,6 +237,9 @@ %{_mandir}/man8/bcmxcp.8* %{_mandir}/man8/solis.8* %{_mandir}/man8/upscode2.8* +%{_mandir}/man8/bcmxcp_usb.8.gz +%{_mandir}/man8/gamatronic.8.gz +%{_mandir}/man8/tripplite_usb.8.gz %files client %defattr(-,root,root) From fedora-cvs-commits at redhat.com Mon Mar 6 16:19:16 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 6 Mar 2006 11:19:16 -0500 Subject: rpms/nut/FC-4 .cvsignore,1.11,1.12 sources,1.12,1.13 Message-ID: <200603061619.k26GJGUh004572@cvs.devel.redhat.com> Author: than Update of /cvs/dist/rpms/nut/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv4477 Modified Files: .cvsignore sources Log Message: upload source Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/nut/FC-4/.cvsignore,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- .cvsignore 4 Oct 2005 09:44:19 -0000 1.11 +++ .cvsignore 6 Mar 2006 16:19:13 -0000 1.12 @@ -1,3 +1,4 @@ nut-2.0.0.tar.gz nut-2.0.1.tar.gz nut-2.0.2.tar.gz +nut-2.0.3.tar.gz Index: sources =================================================================== RCS file: /cvs/dist/rpms/nut/FC-4/sources,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- sources 6 Mar 2006 16:10:20 -0000 1.12 +++ sources 6 Mar 2006 16:19:13 -0000 1.13 @@ -0,0 +1 @@ +ed2d3104d021a6ddb864f23d8cbd1cf6 nut-2.0.3.tar.gz From fedora-cvs-commits at redhat.com Mon Mar 6 16:22:06 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 6 Mar 2006 11:22:06 -0500 Subject: rpms/nc/devel nc-1.84-connect_with_timeout.patch, NONE, 1.1 nc.spec, 1.25, 1.26 Message-ID: <200603061622.k26GM64e005806@cvs.devel.redhat.com> Author: rvokal Update of /cvs/dist/rpms/nc/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv5747 Modified Files: nc.spec Added Files: nc-1.84-connect_with_timeout.patch Log Message: - timeout works also for connect (#182736) nc-1.84-connect_with_timeout.patch: netcat.c | 84 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 80 insertions(+), 4 deletions(-) --- NEW FILE nc-1.84-connect_with_timeout.patch --- --- nc/netcat.c.test 2006-03-06 17:02:03.000000000 +0100 +++ nc/netcat.c 2006-03-06 17:04:19.000000000 +0100 @@ -64,6 +64,10 @@ #define PORT_MAX 65535 #define PORT_MAX_LEN 6 +#define CONNECTION_SUCCESS 0 +#define CONNECTION_FAILED 1 +#define CONNECTION_TIMEOUT 2 + /* Command Line Options */ int dflag; /* detached, no stdin */ int iflag; /* Interval Flag */ @@ -102,6 +106,9 @@ int parse_iptos(char *); void usage(int); +static int connect_with_timeout(int fd, const struct sockaddr *sa, + socklen_t salen, int ctimeout); + int main(int argc, char *argv[]) { @@ -509,13 +516,15 @@ } set_common_sockopts(s); - - if (connect(s, res0->ai_addr, res0->ai_addrlen) == 0) + if ((error = connect_with_timeout(s, res0->ai_addr, res0->ai_addrlen, timeout)) == CONNECTION_SUCCESS) break; - else if (vflag) + else if (vflag && error == CONNECTION_FAILED) warn("connect to %s port %s (%s) failed", host, port, uflag ? "udp" : "tcp"); - + else if (vflag && error == CONNECTION_TIMEOUT) + warn("connect to %s port %s (%s) timed out", host, port, + uflag ? "udp" : "tcp"); + close(s); s = -1; } while ((res0 = res0->ai_next) != NULL); @@ -525,6 +534,73 @@ return (s); } +static int connect_with_timeout(int fd, const struct sockaddr *sa, + socklen_t salen, int ctimeout) +{ + int err; + struct timeval tv, *tvp = NULL; + fd_set connect_fdset; + socklen_t len; + int orig_flags; + + orig_flags = fcntl(fd, F_GETFL, 0); + if (fcntl(fd, F_SETFL, orig_flags | O_NONBLOCK) < 0 ) { + warn("can't set O_NONBLOCK - timeout not avaliable"); + if (connect(fd, sa, salen) == 0) + return CONNECTION_SUCCESS; + else + return CONNECTION_FAILED; + } + + /* set connect timeout */ + if (ctimeout > 0) { + tv.tv_sec = (time_t)ctimeout/1000; + tv.tv_usec = 0; + tvp = &tv; + } + + /* attempt the connection */ + err = connect(fd, sa, salen); + + if (err != 0 && errno == EINPROGRESS) { + /* connection is proceeding + * it is complete (or failed) when select returns */ + + /* initialize connect_fdset */ + FD_ZERO(&connect_fdset); + FD_SET(fd, &connect_fdset); + + /* call select */ + do { + err = select(fd + 1, NULL, &connect_fdset, + NULL, tvp); + } while (err < 0 && errno == EINTR); + + /* select error */ + if (err < 0) + errx(1,"select error: %s", strerror(errno)); + + /* we have reached a timeout */ + if (err == 0) + return CONNECTION_TIMEOUT; + + /* select returned successfully, but we must test socket + * error for result */ + len = sizeof(err); + if (getsockopt(fd, SOL_SOCKET, SO_ERROR, &err, &len) < 0) + errx(1, "getsockopt error: %s", strerror(errno)); + + /* setup errno according to the result returned by + * getsockopt */ + if (err != 0) + errno = err; + } + + /* return aborted if an error occured, and valid otherwise */ + return (err != 0)? CONNECTION_FAILED : CONNECTION_SUCCESS; +} + + /* * local_listen() * Returns a socket listening on a local port, binds to specified source Index: nc.spec =================================================================== RCS file: /cvs/dist/rpms/nc/devel/nc.spec,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- nc.spec 11 Feb 2006 04:42:35 -0000 1.25 +++ nc.spec 6 Mar 2006 16:22:02 -0000 1.26 @@ -1,13 +1,14 @@ Summary: Reads and writes data across network connections using TCP or UDP. Name: nc Version: 1.84 -Release: 3.2 +Release: 4 URL: http://www.openbsd.org/cgi-bin/cvsweb/src/usr.bin/nc/ Source0: nc-%{version}.tar.bz2 Patch0: nc-1.84-glib.patch Patch1: nc-1.78-pollhup.patch Patch2: nc-1.82-reuseaddr.patch Patch3: nc-gcc_signess.patch +Patch4: nc-1.84-connect_with_timeout.patch License: GPL Group: Applications/Internet BuildRoot: %{_tmppath}/%{name}-root @@ -33,6 +34,7 @@ %patch1 -p1 -b .pollhup %patch2 -p1 -b .reuseaddr %patch3 -p1 -b .gcc +%patch4 -p1 -b .timeout %build gcc $RPM_OPT_FLAGS -Werror `pkg-config --cflags --libs glib-2.0` netcat.c atomicio.c socks.c -o nc @@ -54,6 +56,9 @@ %doc README scripts %changelog +* Mon Mar 06 2006 Radek Vok??l 1.84-4 +- timeout works also for connect (#182736) + * Fri Feb 10 2006 Jesse Keating - 1.84-3.2 - bump again for double-long bug on ppc(64) From fedora-cvs-commits at redhat.com Mon Mar 6 16:31:47 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 6 Mar 2006 11:31:47 -0500 Subject: rpms/nc/devel nc-1.84-connect_with_timeout.patch,1.1,1.2 Message-ID: <200603061631.k26GVlSK009287@cvs.devel.redhat.com> Author: rvokal Update of /cvs/dist/rpms/nc/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv9259 Modified Files: nc-1.84-connect_with_timeout.patch Log Message: return to orig_flags nc-1.84-connect_with_timeout.patch: netcat.c | 85 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 81 insertions(+), 4 deletions(-) Index: nc-1.84-connect_with_timeout.patch =================================================================== RCS file: /cvs/dist/rpms/nc/devel/nc-1.84-connect_with_timeout.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- nc-1.84-connect_with_timeout.patch 6 Mar 2006 16:22:02 -0000 1.1 +++ nc-1.84-connect_with_timeout.patch 6 Mar 2006 16:31:45 -0000 1.2 @@ -1,5 +1,5 @@ ---- nc/netcat.c.test 2006-03-06 17:02:03.000000000 +0100 -+++ nc/netcat.c 2006-03-06 17:04:19.000000000 +0100 +--- nc/netcat.c.timeout 2006-03-06 17:16:52.000000000 +0100 ++++ nc/netcat.c 2006-03-06 17:27:42.000000000 +0100 @@ -64,6 +64,10 @@ #define PORT_MAX 65535 #define PORT_MAX_LEN 6 @@ -41,7 +41,7 @@ close(s); s = -1; } while ((res0 = res0->ai_next) != NULL); -@@ -525,6 +534,73 @@ +@@ -525,6 +534,74 @@ return (s); } @@ -108,6 +108,7 @@ + } + + /* return aborted if an error occured, and valid otherwise */ ++ fcntl(fd, F_SETFL, orig_flags); + return (err != 0)? CONNECTION_FAILED : CONNECTION_SUCCESS; +} + From fedora-cvs-commits at redhat.com Mon Mar 6 16:33:09 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 6 Mar 2006 11:33:09 -0500 Subject: rpms/kernel/devel/configs config-xen-generic,1.9,1.10 Message-ID: <200603061633.k26GX94r009392@cvs.devel.redhat.com> Author: sct Update of /cvs/dist/rpms/kernel/devel/configs In directory cvs.devel.redhat.com:/tmp/cvs-serv9215/configs Modified Files: config-xen-generic Log Message: Checkin xen rebase to main distCVS HEAD: HEAD now follows xen-unstable.hg upstream, not linux-2.6-merge.hg. (Merged from private-xen-rebased-2009-branch.) Index: config-xen-generic =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/configs/config-xen-generic,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- config-xen-generic 28 Feb 2006 20:16:29 -0000 1.9 +++ config-xen-generic 6 Mar 2006 16:32:53 -0000 1.10 @@ -18,6 +18,7 @@ # CONFIG_XEN_PCIDEV_BE_DEBUG is not set # CONFIG_XEN_PCIDEV_FRONTEND is not set # CONFIG_XEN_PCIDEV_FE_DEBUG is not set +CONFIG_XEN_NETDEV_LOOPBACK=y # # X86 Processor Configuration From fedora-cvs-commits at redhat.com Mon Mar 6 16:33:09 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 6 Mar 2006 11:33:09 -0500 Subject: rpms/kernel/devel/scripts rebase-xen.sh,1.1,1.2 Message-ID: <200603061633.k26GX9hj009401@cvs.devel.redhat.com> Author: sct Update of /cvs/dist/rpms/kernel/devel/scripts In directory cvs.devel.redhat.com:/tmp/cvs-serv9215/scripts Added Files: rebase-xen.sh Log Message: Checkin xen rebase to main distCVS HEAD: HEAD now follows xen-unstable.hg upstream, not linux-2.6-merge.hg. (Merged from private-xen-rebased-2009-branch.) Index: rebase-xen.sh =================================================================== RCS file: rebase-xen.sh diff -N rebase-xen.sh --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ rebase-xen.sh 6 Mar 2006 16:32:55 -0000 1.2 @@ -0,0 +1,36 @@ +#!/bin/bash + +set -x + +if [ ! -d linux-2.6.*-xen0 -o ! -d ref-linux-2.6.* ] ; then + make prep-kernels || exit 1 +fi + +pushd *xen0 || exit 1 +make distclean || exit 1 +popd + +pushd xen || exit 1 +make clean +popd + +# +# The xen patches include diffs to linux/Makefile which conflict with +# our own Makefile changes; exclude these the easy way by making the files +# the same in both arms of the diff! +# +\cp -f *xen0/Makefile ref-linux-2.6.*/Makefile + +diff -Nru -p --exclude='.*' ref-linux-2.6.* *xen0 > linux-2.6-xen.patch +if [ $? -gt 1 ] ; then + exit $? +fi + +DATE=`date +%Y%m%d` +tar cvf xen-$DATE.tar xen || exit 1 +rm -f xen-$DATE.tar.bz2 +bzip2 -v9 xen-$DATE.tar || exit 1 + +set +x + +ls -l linux-2.6-xen.patch xen-$DATE.tar.bz2 From fedora-cvs-commits at redhat.com Mon Mar 6 16:32:54 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 6 Mar 2006 11:32:54 -0500 Subject: rpms/kernel/devel linux-2.6-xen-i386-mach-io-check-nmi.patch, 1.1, 1.2 linux-2.6-xen-move-vdso-fixmap.patch, 1.1, 1.2 linux-2.6-xen-net-csum.patch, 1.1, 1.2 linux-2.6-xen-pmd-shared.patch, 1.1, 1.2 linux-2.6-xen-smp-alts.patch, 1.1, 1.2 linux-2.6-xen-vsyscall_base.patch, 1.1, 1.2 linux-2.6-xen.patch, 1.3, 1.4 .cvsignore, 1.371, 1.372 kernel-2.6.spec, 1.2016, 1.2017 linux-2.6-crashdump-common.patch, 1.9, 1.10 linux-2.6-execshield-fixes.patch, 1.5, 1.6 linux-2.6-execshield-vdso.patch, 1.2, 1.3 linux-2.6-execshield-xen.patch, 1.2, 1.3 linux-2.6-execshield.patch, 1.10, 1.11 linux-2.6-xen-compile-fixes.patch, 1.1, 1.2 sources, 1.312, 1.313 linux-2.6-xen-acpi.patch, 1.1, NONE linux-2.6-xen-cpusteal-kernel.patch, 1.2, NONE linux-2.6-xen-gcc-4.1-compile-fix.patch, 1.1, NONE linux-2.6-xen-guest-enable-char-devices.patch, 1.1, NONE linux-2.6-xen-merge.patch, 1.3, NONE linux-2.6-xen-x86_64-fixes.patch, 1.1, NONE linux-2.6-xen_net_read_mac_export.patch, 1.1, NONE Message-ID: <200603061632.k26GWsFZ009356@cvs.devel.redhat.com> Author: sct Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv9215 Modified Files: .cvsignore kernel-2.6.spec linux-2.6-crashdump-common.patch linux-2.6-execshield-fixes.patch linux-2.6-execshield-vdso.patch linux-2.6-execshield-xen.patch linux-2.6-execshield.patch linux-2.6-xen-compile-fixes.patch sources Added Files: linux-2.6-xen-i386-mach-io-check-nmi.patch linux-2.6-xen-move-vdso-fixmap.patch linux-2.6-xen-net-csum.patch linux-2.6-xen-pmd-shared.patch linux-2.6-xen-smp-alts.patch linux-2.6-xen-vsyscall_base.patch linux-2.6-xen.patch Removed Files: linux-2.6-xen-acpi.patch linux-2.6-xen-cpusteal-kernel.patch linux-2.6-xen-gcc-4.1-compile-fix.patch linux-2.6-xen-guest-enable-char-devices.patch linux-2.6-xen-merge.patch linux-2.6-xen-x86_64-fixes.patch linux-2.6-xen_net_read_mac_export.patch Log Message: Checkin xen rebase to main distCVS HEAD: HEAD now follows xen-unstable.hg upstream, not linux-2.6-merge.hg. (Merged from private-xen-rebased-2009-branch.) linux-2.6-xen-i386-mach-io-check-nmi.patch: arch/i386/kernel/traps.c | 9 +-------- include/asm-i386/mach-default/mach_traps.h | 12 ++++++++++++ 2 files changed, 13 insertions(+), 8 deletions(-) Index: linux-2.6-xen-i386-mach-io-check-nmi.patch =================================================================== RCS file: linux-2.6-xen-i386-mach-io-check-nmi.patch diff -N linux-2.6-xen-i386-mach-io-check-nmi.patch --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ linux-2.6-xen-i386-mach-io-check-nmi.patch 6 Mar 2006 16:31:47 -0000 1.2 @@ -0,0 +1,45 @@ +diff -pruN ../pristine-linux-2.6.16-rc3/arch/i386/kernel/traps.c ./arch/i386/kernel/traps.c +--- ../pristine-linux-2.6.16-rc3/arch/i386/kernel/traps.c 2006-02-15 20:38:51.000000000 +0000 ++++ ./arch/i386/kernel/traps.c 2006-02-15 20:40:43.000000000 +0000 +@@ -567,18 +567,11 @@ static void mem_parity_error(unsigned ch + + static void io_check_error(unsigned char reason, struct pt_regs * regs) + { +- unsigned long i; +- + printk(KERN_EMERG "NMI: IOCK error (debug interrupt?)\n"); + show_registers(regs); + + /* Re-enable the IOCK line, wait for a few seconds */ +- reason = (reason & 0xf) | 8; +- outb(reason, 0x61); +- i = 2000; +- while (--i) udelay(1000); +- reason &= ~8; +- outb(reason, 0x61); ++ clear_io_check_error(reason); + } + + static void unknown_nmi_error(unsigned char reason, struct pt_regs * regs) +diff -pruN ../pristine-linux-2.6.16-rc3/include/asm-i386/mach-default/mach_traps.h ./include/asm-i386/mach-default/mach_traps.h +--- ../pristine-linux-2.6.16-rc3/include/asm-i386/mach-default/mach_traps.h 2006-01-03 03:21:10.000000000 +0000 ++++ ./include/asm-i386/mach-default/mach_traps.h 2006-02-15 20:40:43.000000000 +0000 +@@ -15,6 +15,18 @@ static inline void clear_mem_error(unsig + outb(reason, 0x61); + } + ++static inline void clear_io_check_error(unsigned char reason) ++{ ++ unsigned long i; ++ ++ reason = (reason & 0xf) | 8; ++ outb(reason, 0x61); ++ i = 2000; ++ while (--i) udelay(1000); ++ reason &= ~8; ++ outb(reason, 0x61); ++} ++ + static inline unsigned char get_nmi_reason(void) + { + return inb(0x61); linux-2.6-xen-move-vdso-fixmap.patch: arch/i386/kernel/asm-offsets.c | 3 - arch/i386/kernel/sysenter.c | 76 ++++++++++++++++++++++++++++++--- arch/i386/mm/pgtable-xen.c | 1 include/asm-i386/a.out.h | 2 include/asm-i386/elf.h | 7 ++- include/asm-i386/fixmap.h | 9 --- include/asm-i386/mach-xen/asm/fixmap.h | 9 --- include/asm-i386/mach-xen/asm/page.h | 2 include/asm-i386/page.h | 2 9 files changed, 84 insertions(+), 27 deletions(-) Index: linux-2.6-xen-move-vdso-fixmap.patch =================================================================== RCS file: linux-2.6-xen-move-vdso-fixmap.patch diff -N linux-2.6-xen-move-vdso-fixmap.patch --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ linux-2.6-xen-move-vdso-fixmap.patch 6 Mar 2006 16:31:48 -0000 1.2 @@ -0,0 +1,264 @@ +# HG changeset patch +# User cl349 at firebug.cl.cam.ac.uk +# Node ID 822a27d28afeab1ffdf8ca8e8e8a11de5e7c7aec +# Parent 875e0e96e574cc8216394b7eb6eaa22474d0f216 +Move the gate page (vsyscall) out of the fixmap area into user address space, +just below PAGE_OFFSET. + +From: Gerd Hoffmann +Signed-off-by: Christian Limpach + +diff -r 875e0e96e574 -r 822a27d28afe linux-2.6-xen-sparse/arch/i386/kernel/asm-offsets.c +--- a/linux-2.6-xen-sparse/arch/i386/kernel/asm-offsets.c Thu Feb 23 15:22:17 2006 +0000 ++++ b/linux-2.6-xen-sparse/arch/i386/kernel/asm-offsets.c Thu Feb 23 15:22:19 2006 +0000 +@@ -13,6 +13,7 @@ + #include + #include + #include ++#include + + #define DEFINE(sym, val) \ + asm volatile("\n->" #sym " %0 " #val : : "i" (val)) +@@ -70,5 +71,5 @@ void foo(void) + #endif + + DEFINE(PAGE_SIZE_asm, PAGE_SIZE); +- DEFINE(VSYSCALL_BASE, __fix_to_virt(FIX_VSYSCALL)); ++ DEFINE(VSYSCALL_BASE, VSYSCALL_BASE); + } +diff -r 875e0e96e574 -r 822a27d28afe linux-2.6-xen-sparse/arch/i386/kernel/sysenter.c +--- a/linux-2.6-xen-sparse/arch/i386/kernel/sysenter.c Thu Feb 23 15:22:17 2006 +0000 ++++ b/linux-2.6-xen-sparse/arch/i386/kernel/sysenter.c Thu Feb 23 15:22:19 2006 +0000 +@@ -13,6 +13,7 @@ + #include + #include + #include ++#include + + #include + #include +@@ -47,25 +48,90 @@ void enable_sep_cpu(void) + */ + extern const char vsyscall_int80_start, vsyscall_int80_end; + extern const char vsyscall_sysenter_start, vsyscall_sysenter_end; ++static void *syscall_page; + + int __init sysenter_setup(void) + { +- void *page = (void *)get_zeroed_page(GFP_ATOMIC); +- +- __set_fixmap(FIX_VSYSCALL, __pa(page), PAGE_READONLY_EXEC); ++ syscall_page = (void *)get_zeroed_page(GFP_ATOMIC); + + #ifdef CONFIG_X86_SYSENTER + if (boot_cpu_has(X86_FEATURE_SEP)) { +- memcpy(page, ++ memcpy(syscall_page, + &vsyscall_sysenter_start, + &vsyscall_sysenter_end - &vsyscall_sysenter_start); + return 0; + } + #endif + +- memcpy(page, ++ memcpy(syscall_page, + &vsyscall_int80_start, + &vsyscall_int80_end - &vsyscall_int80_start); + + return 0; + } ++ ++static struct page* ++syscall_nopage(struct vm_area_struct *vma, unsigned long adr, int *type) ++{ ++ struct page *p = virt_to_page(adr - vma->vm_start + syscall_page); ++ get_page(p); ++ return p; ++} ++ ++/* Prevent VMA merging */ ++static void syscall_vma_close(struct vm_area_struct *vma) ++{ ++} ++ ++static struct vm_operations_struct syscall_vm_ops = { ++ .close = syscall_vma_close, ++ .nopage = syscall_nopage, ++}; ++ ++/* Setup a VMA at program startup for the vsyscall page */ ++int arch_setup_additional_pages(struct linux_binprm *bprm, int exstack) ++{ ++ struct vm_area_struct *vma; ++ struct mm_struct *mm = current->mm; ++ int ret; ++ ++ vma = kmem_cache_alloc(vm_area_cachep, SLAB_KERNEL); ++ if (!vma) ++ return -ENOMEM; ++ ++ memset(vma, 0, sizeof(struct vm_area_struct)); ++ /* Could randomize here */ ++ vma->vm_start = VSYSCALL_BASE; ++ vma->vm_end = VSYSCALL_BASE + PAGE_SIZE; ++ /* MAYWRITE to allow gdb to COW and set breakpoints */ ++ vma->vm_flags = VM_READ|VM_EXEC|VM_MAYREAD|VM_MAYEXEC|VM_MAYWRITE; ++ vma->vm_flags |= mm->def_flags; ++ vma->vm_page_prot = protection_map[vma->vm_flags & 7]; ++ vma->vm_ops = &syscall_vm_ops; ++ vma->vm_mm = mm; ++ ++ down_write(&mm->mmap_sem); ++ if ((ret = insert_vm_struct(mm, vma))) { ++ up_write(&mm->mmap_sem); ++ kmem_cache_free(vm_area_cachep, vma); ++ return ret; ++ } ++ mm->total_vm++; ++ up_write(&mm->mmap_sem); ++ return 0; ++} ++ ++struct vm_area_struct *get_gate_vma(struct task_struct *tsk) ++{ ++ return NULL; ++} ++ ++int in_gate_area(struct task_struct *task, unsigned long addr) ++{ ++ return 0; ++} ++ ++int in_gate_area_no_task(unsigned long addr) ++{ ++ return 0; ++} +diff -r 875e0e96e574 -r 822a27d28afe linux-2.6-xen-sparse/arch/i386/mm/pgtable-xen.c +--- a/linux-2.6-xen-sparse/arch/i386/mm/pgtable-xen.c Thu Feb 23 15:22:17 2006 +0000 ++++ b/linux-2.6-xen-sparse/arch/i386/mm/pgtable-xen.c Thu Feb 23 15:22:19 2006 +0000 +@@ -194,7 +194,6 @@ void __set_fixmap (enum fixed_addresses + } + switch (idx) { + case FIX_WP_TEST: +- case FIX_VSYSCALL: + #ifdef CONFIG_X86_F00F_BUG + case FIX_F00F_IDT: + #endif +diff -r 875e0e96e574 -r 822a27d28afe linux-2.6-xen-sparse/include/asm-i386/a.out.h +--- a/linux-2.6-xen-sparse/include/asm-i386/a.out.h Thu Feb 23 15:22:17 2006 +0000 ++++ b/linux-2.6-xen-sparse/include/asm-i386/a.out.h Thu Feb 23 15:22:19 2006 +0000 +@@ -19,7 +19,7 @@ struct exec + + #ifdef __KERNEL__ + +-#define STACK_TOP TASK_SIZE ++#define STACK_TOP (TASK_SIZE - 3*PAGE_SIZE) + + #endif + +diff -r 875e0e96e574 -r 822a27d28afe linux-2.6-xen-sparse/include/asm-i386/elf.h +--- a/linux-2.6-xen-sparse/include/asm-i386/elf.h Thu Feb 23 15:22:17 2006 +0000 ++++ b/linux-2.6-xen-sparse/include/asm-i386/elf.h Thu Feb 23 15:22:19 2006 +0000 +@@ -129,10 +129,15 @@ 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_BASE (PAGE_OFFSET - 2*PAGE_SIZE) + #define VSYSCALL_EHDR ((const struct elfhdr *) VSYSCALL_BASE) + #define VSYSCALL_ENTRY ((unsigned long) &__kernel_vsyscall) + extern void __kernel_vsyscall; ++ ++#define ARCH_HAS_SETUP_ADDITIONAL_PAGES ++struct linux_binprm; ++extern int arch_setup_additional_pages(struct linux_binprm *bprm, ++ int executable_stack); + + #define ARCH_DLINFO \ + do { \ +diff -r 875e0e96e574 -r 822a27d28afe linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/fixmap.h +--- a/linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/fixmap.h Thu Feb 23 15:22:17 2006 +0000 ++++ b/linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/fixmap.h Thu Feb 23 15:22:19 2006 +0000 +@@ -53,7 +53,6 @@ + */ + enum fixed_addresses { + FIX_HOLE, +- FIX_VSYSCALL, + #ifdef CONFIG_X86_LOCAL_APIC + FIX_APIC_BASE, /* local (CPU) APIC) -- required for SMP or not */ + #endif +@@ -123,14 +122,6 @@ extern void __set_fixmap( + #define __fix_to_virt(x) (FIXADDR_TOP - ((x) << PAGE_SHIFT)) + #define __virt_to_fix(x) ((FIXADDR_TOP - ((x)&PAGE_MASK)) >> PAGE_SHIFT) + +-/* +- * This is the range that is readable by user mode, and things +- * acting like user mode such as get_user_pages. +- */ +-#define FIXADDR_USER_START (__fix_to_virt(FIX_VSYSCALL)) +-#define FIXADDR_USER_END (FIXADDR_USER_START + PAGE_SIZE) +- +- + extern void __this_fixmap_does_not_exist(void); + + /* +diff -r 875e0e96e574 -r 822a27d28afe linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/page.h +--- a/linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/page.h Thu Feb 23 15:22:17 2006 +0000 ++++ b/linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/page.h Thu Feb 23 15:22:19 2006 +0000 +@@ -317,6 +317,8 @@ extern int page_is_ram(unsigned long pag + #define virt_to_mfn(v) (pfn_to_mfn(__pa(v) >> PAGE_SHIFT)) + #define mfn_to_virt(m) (__va(mfn_to_pfn(m) << PAGE_SHIFT)) + ++#define __HAVE_ARCH_GATE_AREA 1 ++ + #endif /* __KERNEL__ */ + + #include +# HG changeset patch +# User cl349 at firebug.cl.cam.ac.uk +# Node ID 55f597e929f341eade781048db9da77a0352820d +# Parent dbec76a720f8d79aa9dfcdb9e91684b7426a23f9 +Fix non-xen build for: Move the gate page (vsyscall) out of the fixmap area +into user address space, just below PAGE_OFFSET. + +From: Gerd Hoffmann +Signed-off-by: Christian Limpach + +diff -r dbec76a720f8 -r 55f597e929f3 linux-2.6-xen-sparse/include/asm-i386/fixmap.h +--- a/linux-2.6-xen-sparse/include/asm-i386/fixmap.h Mon Feb 27 10:26:01 2006 +0000 ++++ b/linux-2.6-xen-sparse/include/asm-i386/fixmap.h Mon Feb 27 10:27:57 2006 +0000 +@@ -52,7 +52,6 @@ + */ + enum fixed_addresses { + FIX_HOLE, +- FIX_VSYSCALL, + #ifdef CONFIG_X86_LOCAL_APIC + FIX_APIC_BASE, /* local (CPU) APIC) -- required for SMP or not */ + #endif +@@ -116,14 +115,6 @@ extern void __set_fixmap (enum fixed_add + #define __fix_to_virt(x) (FIXADDR_TOP - ((x) << PAGE_SHIFT)) + #define __virt_to_fix(x) ((FIXADDR_TOP - ((x)&PAGE_MASK)) >> PAGE_SHIFT) + +-/* +- * This is the range that is readable by user mode, and things +- * acting like user mode such as get_user_pages. +- */ +-#define FIXADDR_USER_START (__fix_to_virt(FIX_VSYSCALL)) +-#define FIXADDR_USER_END (FIXADDR_USER_START + PAGE_SIZE) +- +- + extern void __this_fixmap_does_not_exist(void); + + /* +diff -r dbec76a720f8 -r 55f597e929f3 linux-2.6-xen-sparse/include/asm-i386/page.h +--- a/linux-2.6-xen-sparse/include/asm-i386/page.h Mon Feb 27 10:26:01 2006 +0000 ++++ b/linux-2.6-xen-sparse/include/asm-i386/page.h Mon Feb 27 10:27:57 2006 +0000 +@@ -139,6 +139,8 @@ extern int page_is_ram(unsigned long pag + ((current->personality & READ_IMPLIES_EXEC) ? VM_EXEC : 0 ) | \ + VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC) + ++#define __HAVE_ARCH_GATE_AREA 1 ++ + #endif /* __KERNEL__ */ + + #include linux-2.6-xen-net-csum.patch: ip_nat_proto_tcp.c | 6 +++++- ip_nat_proto_udp.c | 9 +++++++-- 2 files changed, 12 insertions(+), 3 deletions(-) Index: linux-2.6-xen-net-csum.patch =================================================================== RCS file: linux-2.6-xen-net-csum.patch diff -N linux-2.6-xen-net-csum.patch --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ linux-2.6-xen-net-csum.patch 6 Mar 2006 16:31:48 -0000 1.2 @@ -0,0 +1,41 @@ +diff -pruN ../pristine-linux-2.6.16-rc1-git4/net/ipv4/netfilter/ip_nat_proto_tcp.c ./net/ipv4/netfilter/ip_nat_proto_tcp.c +--- ../pristine-linux-2.6.16-rc1-git4/net/ipv4/netfilter/ip_nat_proto_tcp.c 2006-02-02 17:39:51.000000000 +0000 ++++ ./net/ipv4/netfilter/ip_nat_proto_tcp.c 2006-02-02 17:44:18.000000000 +0000 +@@ -129,10 +129,14 @@ tcp_manip_pkt(struct sk_buff **pskb, + if (hdrsize < sizeof(*hdr)) + return 1; + +- hdr->check = ip_nat_cheat_check(~oldip, newip, ++ if ((*pskb)->proto_csum_blank) { ++ hdr->check = ip_nat_cheat_check(oldip, ~newip, hdr->check); ++ } else { ++ hdr->check = ip_nat_cheat_check(~oldip, newip, + ip_nat_cheat_check(oldport ^ 0xFFFF, + newport, + hdr->check)); ++ } + return 1; + } + +diff -pruN ../pristine-linux-2.6.16-rc1-git4/net/ipv4/netfilter/ip_nat_proto_udp.c ./net/ipv4/netfilter/ip_nat_proto_udp.c +--- ../pristine-linux-2.6.16-rc1-git4/net/ipv4/netfilter/ip_nat_proto_udp.c 2006-02-02 17:39:51.000000000 +0000 ++++ ./net/ipv4/netfilter/ip_nat_proto_udp.c 2006-02-02 17:44:18.000000000 +0000 +@@ -113,11 +113,16 @@ udp_manip_pkt(struct sk_buff **pskb, + newport = tuple->dst.u.udp.port; + portptr = &hdr->dest; + } +- if (hdr->check) /* 0 is a special case meaning no checksum */ +- hdr->check = ip_nat_cheat_check(~oldip, newip, ++ if (hdr->check) { /* 0 is a special case meaning no checksum */ ++ if ((*pskb)->proto_csum_blank) { ++ hdr->check = ip_nat_cheat_check(oldip, ~newip, hdr->check); ++ } else { ++ hdr->check = ip_nat_cheat_check(~oldip, newip, + ip_nat_cheat_check(*portptr ^ 0xFFFF, + newport, + hdr->check)); ++ } ++ } + *portptr = newport; + return 1; + } linux-2.6-xen-pmd-shared.patch: arch/i386/mm/pageattr.c | 2 - arch/i386/mm/pgtable.c | 51 +++++++++++++++++++++++++++++---- include/asm-i386/pgtable-2level-defs.h | 2 + include/asm-i386/pgtable-3level-defs.h | 2 + 4 files changed, 50 insertions(+), 7 deletions(-) Index: linux-2.6-xen-pmd-shared.patch =================================================================== RCS file: linux-2.6-xen-pmd-shared.patch diff -N linux-2.6-xen-pmd-shared.patch --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ linux-2.6-xen-pmd-shared.patch 6 Mar 2006 16:31:48 -0000 1.2 @@ -0,0 +1,111 @@ +diff -pruN ../pristine-linux-2.6.16-rc1-git4/arch/i386/mm/pageattr.c ./arch/i386/mm/pageattr.c +--- ../pristine-linux-2.6.16-rc1-git4/arch/i386/mm/pageattr.c 2006-02-02 17:39:29.000000000 +0000 ++++ ./arch/i386/mm/pageattr.c 2006-02-02 17:45:14.000000000 +0000 +@@ -78,7 +78,7 @@ static void set_pmd_pte(pte_t *kpte, uns + unsigned long flags; + + set_pte_atomic(kpte, pte); /* change init_mm */ +- if (PTRS_PER_PMD > 1) ++ if (HAVE_SHARED_KERNEL_PMD) + return; + + spin_lock_irqsave(&pgd_lock, flags); +diff -pruN ../pristine-linux-2.6.16-rc1-git4/arch/i386/mm/pgtable.c ./arch/i386/mm/pgtable.c +--- ../pristine-linux-2.6.16-rc1-git4/arch/i386/mm/pgtable.c 2006-01-03 03:21:10.000000000 +0000 ++++ ./arch/i386/mm/pgtable.c 2006-02-02 17:45:14.000000000 +0000 +@@ -215,9 +215,10 @@ void pgd_ctor(void *pgd, kmem_cache_t *c + spin_lock_irqsave(&pgd_lock, flags); + } + +- clone_pgd_range((pgd_t *)pgd + USER_PTRS_PER_PGD, +- swapper_pg_dir + USER_PTRS_PER_PGD, +- KERNEL_PGD_PTRS); ++ if (PTRS_PER_PMD == 1 || HAVE_SHARED_KERNEL_PMD) ++ clone_pgd_range((pgd_t *)pgd + USER_PTRS_PER_PGD, ++ swapper_pg_dir + USER_PTRS_PER_PGD, ++ KERNEL_PGD_PTRS); + if (PTRS_PER_PMD > 1) + return; + +@@ -249,6 +250,30 @@ pgd_t *pgd_alloc(struct mm_struct *mm) + goto out_oom; + set_pgd(&pgd[i], __pgd(1 + __pa(pmd))); + } ++ ++ if (!HAVE_SHARED_KERNEL_PMD) { ++ unsigned long flags; ++ ++ for (i = USER_PTRS_PER_PGD; i < PTRS_PER_PGD; i++) { ++ pmd_t *pmd = kmem_cache_alloc(pmd_cache, GFP_KERNEL); ++ if (!pmd) ++ goto out_oom; ++ set_pgd(&pgd[USER_PTRS_PER_PGD], __pgd(1 + __pa(pmd))); ++ } ++ ++ spin_lock_irqsave(&pgd_lock, flags); ++ for (i = USER_PTRS_PER_PGD; i < PTRS_PER_PGD; i++) { ++ unsigned long v = (unsigned long)i << PGDIR_SHIFT; ++ pgd_t *kpgd = pgd_offset_k(v); ++ pud_t *kpud = pud_offset(kpgd, v); ++ pmd_t *kpmd = pmd_offset(kpud, v); ++ pmd_t *pmd = (void *)__va(pgd_val(pgd[i])-1); ++ memcpy(pmd, kpmd, PAGE_SIZE); ++ } ++ pgd_list_add(pgd); ++ spin_unlock_irqrestore(&pgd_lock, flags); ++ } ++ + return pgd; + + out_oom: +@@ -263,9 +288,23 @@ void pgd_free(pgd_t *pgd) + int i; + + /* in the PAE case user pgd entries are overwritten before usage */ +- if (PTRS_PER_PMD > 1) +- for (i = 0; i < USER_PTRS_PER_PGD; ++i) +- kmem_cache_free(pmd_cache, (void *)__va(pgd_val(pgd[i])-1)); ++ if (PTRS_PER_PMD > 1) { ++ for (i = 0; i < USER_PTRS_PER_PGD; ++i) { ++ pmd_t *pmd = (void *)__va(pgd_val(pgd[i])-1); ++ kmem_cache_free(pmd_cache, pmd); ++ } ++ if (!HAVE_SHARED_KERNEL_PMD) { ++ unsigned long flags; ++ spin_lock_irqsave(&pgd_lock, flags); ++ pgd_list_del(pgd); ++ spin_unlock_irqrestore(&pgd_lock, flags); ++ for (i = USER_PTRS_PER_PGD; i < PTRS_PER_PGD; i++) { ++ pmd_t *pmd = (void *)__va(pgd_val(pgd[i])-1); ++ memset(pmd, 0, PTRS_PER_PMD*sizeof(pmd_t)); ++ kmem_cache_free(pmd_cache, pmd); ++ } ++ } ++ } + /* in the non-PAE case, free_pgtables() clears user pgd entries */ + kmem_cache_free(pgd_cache, pgd); + } +diff -pruN ../pristine-linux-2.6.16-rc1-git4/include/asm-i386/pgtable-2level-defs.h ./include/asm-i386/pgtable-2level-defs.h +--- ../pristine-linux-2.6.16-rc1-git4/include/asm-i386/pgtable-2level-defs.h 2006-01-03 03:21:10.000000000 +0000 ++++ ./include/asm-i386/pgtable-2level-defs.h 2006-02-02 17:45:14.000000000 +0000 +@@ -1,6 +1,8 @@ + #ifndef _I386_PGTABLE_2LEVEL_DEFS_H + #define _I386_PGTABLE_2LEVEL_DEFS_H + ++#define HAVE_SHARED_KERNEL_PMD 0 ++ + /* + * traditional i386 two-level paging structure: + */ +diff -pruN ../pristine-linux-2.6.16-rc1-git4/include/asm-i386/pgtable-3level-defs.h ./include/asm-i386/pgtable-3level-defs.h +--- ../pristine-linux-2.6.16-rc1-git4/include/asm-i386/pgtable-3level-defs.h 2006-01-03 03:21:10.000000000 +0000 ++++ ./include/asm-i386/pgtable-3level-defs.h 2006-02-02 17:45:14.000000000 +0000 +@@ -1,6 +1,8 @@ + #ifndef _I386_PGTABLE_3LEVEL_DEFS_H + #define _I386_PGTABLE_3LEVEL_DEFS_H + ++#define HAVE_SHARED_KERNEL_PMD 1 ++ + /* + * PGDIR_SHIFT determines what a top-level page table entry can map + */ linux-2.6-xen-smp-alts.patch: arch/i386/Kconfig | 13 ++++++ arch/i386/kernel/Makefile | 1 arch/i386/kernel/smpalts.c | 85 +++++++++++++++++++++++++++++++++++++++++ arch/i386/kernel/smpboot.c | 10 ++++ arch/i386/kernel/vmlinux.lds.S | 7 +++ include/asm-i386/atomic.h | 7 --- include/asm-i386/bitops.h | 19 +++------ include/asm-i386/futex.h | 4 - include/asm-i386/rwsem.h | 17 ++++---- include/asm-i386/smp_alt.h | 32 +++++++++++++++ include/asm-i386/spinlock.h | 37 +++++++++++++++-- include/asm-i386/system.h | 56 ++++++++++++++++++++++++--- 12 files changed, 249 insertions(+), 39 deletions(-) Index: linux-2.6-xen-smp-alts.patch =================================================================== RCS file: linux-2.6-xen-smp-alts.patch diff -N linux-2.6-xen-smp-alts.patch --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ linux-2.6-xen-smp-alts.patch 6 Mar 2006 16:31:48 -0000 1.2 @@ -0,0 +1,591 @@ +diff -pruN ../pristine-linux-2.6.16-rc3/arch/i386/Kconfig ./arch/i386/Kconfig +--- ../pristine-linux-2.6.16-rc3/arch/i386/Kconfig 2006-02-15 20:38:51.000000000 +0000 ++++ ./arch/i386/Kconfig 2006-02-15 20:45:57.000000000 +0000 +@@ -202,6 +202,19 @@ config SMP + + If you don't know what to do here, say N. + ++config SMP_ALTERNATIVES ++ bool "SMP alternatives support (EXPERIMENTAL)" ++ depends on SMP && EXPERIMENTAL ++ help ++ Try to reduce the overhead of running an SMP kernel on a uniprocessor ++ host slightly by replacing certain key instruction sequences ++ according to whether we currently have more than one CPU available. ++ This should provide a noticeable boost to performance when ++ running SMP kernels on UP machines, and have negligible impact ++ when running on an true SMP host. ++ ++ If unsure, say N. ++ + config NR_CPUS + int "Maximum number of CPUs (2-255)" + range 2 255 +diff -pruN ../pristine-linux-2.6.16-rc3/arch/i386/kernel/Makefile ./arch/i386/kernel/Makefile +--- ../pristine-linux-2.6.16-rc3/arch/i386/kernel/Makefile 2006-02-15 20:38:51.000000000 +0000 ++++ ./arch/i386/kernel/Makefile 2006-02-15 20:45:57.000000000 +0000 +@@ -37,6 +37,7 @@ obj-$(CONFIG_EFI) += efi.o efi_stub.o + obj-$(CONFIG_DOUBLEFAULT) += doublefault.o + obj-$(CONFIG_VM86) += vm86.o + obj-$(CONFIG_EARLY_PRINTK) += early_printk.o ++obj-$(CONFIG_SMP_ALTERNATIVES) += smpalts.o + + EXTRA_AFLAGS := -traditional + +diff -pruN ../pristine-linux-2.6.16-rc3/arch/i386/kernel/smpalts.c ./arch/i386/kernel/smpalts.c +--- ../pristine-linux-2.6.16-rc3/arch/i386/kernel/smpalts.c 1970-01-01 01:00:00.000000000 +0100 ++++ ./arch/i386/kernel/smpalts.c 2006-02-15 20:45:57.000000000 +0000 +@@ -0,0 +1,85 @@ ++#include ++#include ++#include ++#include ++#include ++ ++struct smp_replacement_record { ++ unsigned char targ_size; ++ unsigned char smp1_size; ++ unsigned char smp2_size; ++ unsigned char up_size; ++ unsigned char feature; ++ unsigned char data[0]; ++}; ++ ++struct smp_alternative_record { ++ void *targ_start; ++ struct smp_replacement_record *repl; ++}; ++ ++extern struct smp_alternative_record __start_smp_alternatives_table, ++ __stop_smp_alternatives_table; ++extern unsigned long __init_begin, __init_end; ++ ++void prepare_for_smp(void) ++{ ++ struct smp_alternative_record *r; ++ printk(KERN_INFO "Enabling SMP...\n"); ++ for (r = &__start_smp_alternatives_table; ++ r != &__stop_smp_alternatives_table; ++ r++) { ++ BUG_ON(r->repl->targ_size < r->repl->smp1_size); ++ BUG_ON(r->repl->targ_size < r->repl->smp2_size); ++ BUG_ON(r->repl->targ_size < r->repl->up_size); ++ if (system_state == SYSTEM_RUNNING && ++ r->targ_start >= (void *)&__init_begin && ++ r->targ_start < (void *)&__init_end) ++ continue; ++ if (r->repl->feature != (unsigned char)-1 && ++ boot_cpu_has(r->repl->feature)) { ++ memcpy(r->targ_start, ++ r->repl->data + r->repl->smp1_size, ++ r->repl->smp2_size); ++ memset(r->targ_start + r->repl->smp2_size, ++ 0x90, ++ r->repl->targ_size - r->repl->smp2_size); ++ } else { ++ memcpy(r->targ_start, ++ r->repl->data, ++ r->repl->smp1_size); ++ memset(r->targ_start + r->repl->smp1_size, ++ 0x90, ++ r->repl->targ_size - r->repl->smp1_size); ++ } ++ } ++ /* Paranoia */ ++ asm volatile ("jmp 1f\n1:"); ++ mb(); ++} ++ ++void unprepare_for_smp(void) ++{ ++ struct smp_alternative_record *r; ++ printk(KERN_INFO "Disabling SMP...\n"); ++ for (r = &__start_smp_alternatives_table; ++ r != &__stop_smp_alternatives_table; ++ r++) { ++ BUG_ON(r->repl->targ_size < r->repl->smp1_size); ++ BUG_ON(r->repl->targ_size < r->repl->smp2_size); ++ BUG_ON(r->repl->targ_size < r->repl->up_size); ++ if (system_state == SYSTEM_RUNNING && ++ r->targ_start >= (void *)&__init_begin && ++ r->targ_start < (void *)&__init_end) ++ continue; ++ memcpy(r->targ_start, ++ r->repl->data + r->repl->smp1_size + r->repl->smp2_size, ++ r->repl->up_size); ++ memset(r->targ_start + r->repl->up_size, ++ 0x90, ++ r->repl->targ_size - r->repl->up_size); ++ } ++ /* Paranoia */ ++ asm volatile ("jmp 1f\n1:"); ++ mb(); ++} +diff -pruN ../pristine-linux-2.6.16-rc3/arch/i386/kernel/smpboot.c ./arch/i386/kernel/smpboot.c +--- ../pristine-linux-2.6.16-rc3/arch/i386/kernel/smpboot.c 2006-02-15 20:38:51.000000000 +0000 ++++ ./arch/i386/kernel/smpboot.c 2006-02-15 20:45:57.000000000 +0000 +@@ -1214,6 +1214,11 @@ static void __init smp_boot_cpus(unsigne + if (max_cpus <= cpucount+1) + continue; + ++#ifdef CONFIG_SMP_ALTERNATIVES ++ if (kicked == 1) ++ prepare_for_smp(); ++#endif ++ + if (((cpu = alloc_cpu_id()) <= 0) || do_boot_cpu(apicid, cpu)) + printk("CPU #%d not responding - cannot use it.\n", + apicid); +@@ -1392,6 +1397,11 @@ int __devinit __cpu_up(unsigned int cpu) + return -EIO; + } + ++#ifdef CONFIG_SMP_ALTERNATIVES ++ if (num_online_cpus() == 1) ++ prepare_for_smp(); ++#endif ++ + local_irq_enable(); + per_cpu(cpu_state, cpu) = CPU_UP_PREPARE; + /* Unleash the CPU! */ +diff -pruN ../pristine-linux-2.6.16-rc3/arch/i386/kernel/vmlinux.lds.S ./arch/i386/kernel/vmlinux.lds.S +--- ../pristine-linux-2.6.16-rc3/arch/i386/kernel/vmlinux.lds.S 2006-01-03 03:21:10.000000000 +0000 ++++ ./arch/i386/kernel/vmlinux.lds.S 2006-02-15 20:45:57.000000000 +0000 +@@ -34,6 +34,13 @@ SECTIONS + __ex_table : AT(ADDR(__ex_table) - LOAD_OFFSET) { *(__ex_table) } + __stop___ex_table = .; + ++ . = ALIGN(16); ++ __start_smp_alternatives_table = .; ++ __smp_alternatives : { *(__smp_alternatives) } ++ __stop_smp_alternatives_table = .; ++ ++ __smp_replacements : { *(__smp_replacements) } ++ + RODATA + + /* writeable */ +diff -pruN ../pristine-linux-2.6.16-rc3/include/asm-i386/atomic.h ./include/asm-i386/atomic.h +--- ../pristine-linux-2.6.16-rc3/include/asm-i386/atomic.h 2006-02-15 20:38:57.000000000 +0000 ++++ ./include/asm-i386/atomic.h 2006-02-15 20:45:57.000000000 +0000 +@@ -4,18 +4,13 @@ + #include + #include + #include ++#include + + /* + * Atomic operations that C can't guarantee us. Useful for + * resource counting etc.. + */ + +-#ifdef CONFIG_SMP +-#define LOCK "lock ; " +-#else +-#define LOCK "" +-#endif +- + /* + * Make sure gcc doesn't try to be clever and move things around + * on us. We need to use _exactly_ the address the user gave us, +diff -pruN ../pristine-linux-2.6.16-rc3/include/asm-i386/bitops.h ./include/asm-i386/bitops.h +--- ../pristine-linux-2.6.16-rc3/include/asm-i386/bitops.h 2006-02-15 20:38:57.000000000 +0000 ++++ ./include/asm-i386/bitops.h 2006-02-15 20:45:57.000000000 +0000 +@@ -7,6 +7,7 @@ + + #include + #include ++#include + + /* + * These have to be done with inline assembly: that way the bit-setting +@@ -16,12 +17,6 @@ + * bit 0 is the LSB of addr; bit 32 is the LSB of (addr+1). + */ + +-#ifdef CONFIG_SMP +-#define LOCK_PREFIX "lock ; " +-#else +-#define LOCK_PREFIX "" +-#endif +- + #define ADDR (*(volatile long *) addr) + + /** +@@ -41,7 +36,7 @@ + */ + static inline void set_bit(int nr, volatile unsigned long * addr) + { +- __asm__ __volatile__( LOCK_PREFIX ++ __asm__ __volatile__( LOCK + "btsl %1,%0" + :"+m" (ADDR) + :"Ir" (nr)); +@@ -76,7 +71,7 @@ static inline void __set_bit(int nr, vol + */ + static inline void clear_bit(int nr, volatile unsigned long * addr) + { +- __asm__ __volatile__( LOCK_PREFIX ++ __asm__ __volatile__( LOCK + "btrl %1,%0" + :"+m" (ADDR) + :"Ir" (nr)); +@@ -121,7 +116,7 @@ static inline void __change_bit(int nr, + */ + static inline void change_bit(int nr, volatile unsigned long * addr) + { +- __asm__ __volatile__( LOCK_PREFIX ++ __asm__ __volatile__( LOCK + "btcl %1,%0" + :"+m" (ADDR) + :"Ir" (nr)); +@@ -140,7 +135,7 @@ static inline int test_and_set_bit(int n + { + int oldbit; + +- __asm__ __volatile__( LOCK_PREFIX ++ __asm__ __volatile__( LOCK + "btsl %2,%1\n\tsbbl %0,%0" + :"=r" (oldbit),"+m" (ADDR) + :"Ir" (nr) : "memory"); +@@ -180,7 +175,7 @@ static inline int test_and_clear_bit(int + { + int oldbit; + +- __asm__ __volatile__( LOCK_PREFIX ++ __asm__ __volatile__( LOCK + "btrl %2,%1\n\tsbbl %0,%0" + :"=r" (oldbit),"+m" (ADDR) + :"Ir" (nr) : "memory"); +@@ -231,7 +226,7 @@ static inline int test_and_change_bit(in + { + int oldbit; + +- __asm__ __volatile__( LOCK_PREFIX ++ __asm__ __volatile__( LOCK + "btcl %2,%1\n\tsbbl %0,%0" + :"=r" (oldbit),"+m" (ADDR) + :"Ir" (nr) : "memory"); +diff -pruN ../pristine-linux-2.6.16-rc3/include/asm-i386/futex.h ./include/asm-i386/futex.h +--- ../pristine-linux-2.6.16-rc3/include/asm-i386/futex.h 2006-02-15 20:38:57.000000000 +0000 ++++ ./include/asm-i386/futex.h 2006-02-15 20:45:57.000000000 +0000 +@@ -28,7 +28,7 @@ + "1: movl %2, %0\n\ + movl %0, %3\n" \ + insn "\n" \ +-"2: " LOCK_PREFIX "cmpxchgl %3, %2\n\ ++"2: " LOCK "cmpxchgl %3, %2\n\ + jnz 1b\n\ + 3: .section .fixup,\"ax\"\n\ + 4: mov %5, %1\n\ +@@ -68,7 +68,7 @@ futex_atomic_op_inuser (int encoded_op, + #endif + switch (op) { + case FUTEX_OP_ADD: +- __futex_atomic_op1(LOCK_PREFIX "xaddl %0, %2", ret, ++ __futex_atomic_op1(LOCK "xaddl %0, %2", ret, + oldval, uaddr, oparg); + break; + case FUTEX_OP_OR: +diff -pruN ../pristine-linux-2.6.16-rc3/include/asm-i386/rwsem.h ./include/asm-i386/rwsem.h +--- ../pristine-linux-2.6.16-rc3/include/asm-i386/rwsem.h 2006-01-03 03:21:10.000000000 +0000 ++++ ./include/asm-i386/rwsem.h 2006-02-15 20:45:57.000000000 +0000 +@@ -40,6 +40,7 @@ + + #include + #include ++#include + + struct rwsem_waiter; + +@@ -99,7 +100,7 @@ static inline void __down_read(struct rw + { + __asm__ __volatile__( + "# beginning down_read\n\t" +-LOCK_PREFIX " incl (%%eax)\n\t" /* adds 0x00000001, returns the old value */ ++LOCK " incl (%%eax)\n\t" /* adds 0x00000001, returns the old value */ + " js 2f\n\t" /* jump if we weren't granted the lock */ + "1:\n\t" + LOCK_SECTION_START("") +@@ -130,7 +131,7 @@ static inline int __down_read_trylock(st + " movl %1,%2\n\t" + " addl %3,%2\n\t" + " jle 2f\n\t" +-LOCK_PREFIX " cmpxchgl %2,%0\n\t" ++LOCK " cmpxchgl %2,%0\n\t" + " jnz 1b\n\t" + "2:\n\t" + "# ending __down_read_trylock\n\t" +@@ -150,7 +151,7 @@ static inline void __down_write(struct r + tmp = RWSEM_ACTIVE_WRITE_BIAS; + __asm__ __volatile__( + "# beginning down_write\n\t" +-LOCK_PREFIX " xadd %%edx,(%%eax)\n\t" /* subtract 0x0000ffff, returns the old value */ ++LOCK " xadd %%edx,(%%eax)\n\t" /* subtract 0x0000ffff, returns the old value */ + " testl %%edx,%%edx\n\t" /* was the count 0 before? */ + " jnz 2f\n\t" /* jump if we weren't granted the lock */ + "1:\n\t" +@@ -188,7 +189,7 @@ static inline void __up_read(struct rw_s + __s32 tmp = -RWSEM_ACTIVE_READ_BIAS; + __asm__ __volatile__( + "# beginning __up_read\n\t" +-LOCK_PREFIX " xadd %%edx,(%%eax)\n\t" /* subtracts 1, returns the old value */ ++LOCK " xadd %%edx,(%%eax)\n\t" /* subtracts 1, returns the old value */ + " js 2f\n\t" /* jump if the lock is being waited upon */ + "1:\n\t" + LOCK_SECTION_START("") +@@ -214,7 +215,7 @@ static inline void __up_write(struct rw_ + __asm__ __volatile__( + "# beginning __up_write\n\t" + " movl %2,%%edx\n\t" +-LOCK_PREFIX " xaddl %%edx,(%%eax)\n\t" /* tries to transition 0xffff0001 -> 0x00000000 */ ++LOCK " xaddl %%edx,(%%eax)\n\t" /* tries to transition 0xffff0001 -> 0x00000000 */ + " jnz 2f\n\t" /* jump if the lock is being waited upon */ + "1:\n\t" + LOCK_SECTION_START("") +@@ -239,7 +240,7 @@ static inline void __downgrade_write(str + { + __asm__ __volatile__( + "# beginning __downgrade_write\n\t" +-LOCK_PREFIX " addl %2,(%%eax)\n\t" /* transitions 0xZZZZ0001 -> 0xYYYY0001 */ ++LOCK " addl %2,(%%eax)\n\t" /* transitions 0xZZZZ0001 -> 0xYYYY0001 */ + " js 2f\n\t" /* jump if the lock is being waited upon */ + "1:\n\t" + LOCK_SECTION_START("") +@@ -263,7 +264,7 @@ LOCK_PREFIX " addl %2,(%%eax)\n\t" + static inline void rwsem_atomic_add(int delta, struct rw_semaphore *sem) + { + __asm__ __volatile__( +-LOCK_PREFIX "addl %1,%0" ++LOCK "addl %1,%0" + : "=m"(sem->count) + : "ir"(delta), "m"(sem->count)); + } +@@ -276,7 +277,7 @@ static inline int rwsem_atomic_update(in + int tmp = delta; + + __asm__ __volatile__( +-LOCK_PREFIX "xadd %0,(%2)" ++LOCK "xadd %0,(%2)" + : "+r"(tmp), "=m"(sem->count) + : "r"(sem), "m"(sem->count) + : "memory"); +diff -pruN ../pristine-linux-2.6.16-rc3/include/asm-i386/smp_alt.h ./include/asm-i386/smp_alt.h +--- ../pristine-linux-2.6.16-rc3/include/asm-i386/smp_alt.h 1970-01-01 01:00:00.000000000 +0100 ++++ ./include/asm-i386/smp_alt.h 2006-02-15 20:45:57.000000000 +0000 +@@ -0,0 +1,32 @@ ++#ifndef __ASM_SMP_ALT_H__ ++#define __ASM_SMP_ALT_H__ ++ ++#include ++ ++#ifdef CONFIG_SMP ++#if defined(CONFIG_SMP_ALTERNATIVES) && !defined(MODULE) ++#define LOCK \ ++ "6677: nop\n" \ ++ ".section __smp_alternatives,\"a\"\n" \ ++ ".long 6677b\n" \ ++ ".long 6678f\n" \ ++ ".previous\n" \ ++ ".section __smp_replacements,\"a\"\n" \ ++ "6678: .byte 1\n" \ ++ ".byte 1\n" \ ++ ".byte 0\n" \ ++ ".byte 1\n" \ ++ ".byte -1\n" \ ++ "lock\n" \ ++ "nop\n" \ ++ ".previous\n" ++void prepare_for_smp(void); ++void unprepare_for_smp(void); ++#else ++#define LOCK "lock ; " ++#endif ++#else ++#define LOCK "" ++#endif ++ ++#endif /* __ASM_SMP_ALT_H__ */ +diff -pruN ../pristine-linux-2.6.16-rc3/include/asm-i386/spinlock.h ./include/asm-i386/spinlock.h +--- ../pristine-linux-2.6.16-rc3/include/asm-i386/spinlock.h 2006-01-03 03:21:10.000000000 +0000 ++++ ./include/asm-i386/spinlock.h 2006-02-15 20:45:57.000000000 +0000 +@@ -6,6 +6,7 @@ + #include + #include + #include ++#include + + /* + * Your basic SMP spinlocks, allowing only a single CPU anywhere +@@ -23,7 +24,8 @@ + + #define __raw_spin_lock_string \ + "\n1:\t" \ +- "lock ; decb %0\n\t" \ ++ LOCK \ ++ "decb %0\n\t" \ + "jns 3f\n" \ + "2:\t" \ + "rep;nop\n\t" \ +@@ -34,7 +36,8 @@ + + #define __raw_spin_lock_string_flags \ + "\n1:\t" \ +- "lock ; decb %0\n\t" \ ++ LOCK \ ++ "decb %0\n\t" \ + "jns 4f\n\t" \ + "2:\t" \ + "testl $0x200, %1\n\t" \ +@@ -65,10 +68,34 @@ static inline void __raw_spin_lock_flags + static inline int __raw_spin_trylock(raw_spinlock_t *lock) + { + char oldval; ++#ifdef CONFIG_SMP_ALTERNATIVES + __asm__ __volatile__( +- "xchgb %b0,%1" ++ "1:movb %1,%b0\n" ++ "movb $0,%1\n" ++ "2:" ++ ".section __smp_alternatives,\"a\"\n" ++ ".long 1b\n" ++ ".long 3f\n" ++ ".previous\n" ++ ".section __smp_replacements,\"a\"\n" ++ "3: .byte 2b - 1b\n" ++ ".byte 5f-4f\n" ++ ".byte 0\n" ++ ".byte 6f-5f\n" ++ ".byte -1\n" ++ "4: xchgb %b0,%1\n" ++ "5: movb %1,%b0\n" ++ "movb $0,%1\n" ++ "6:\n" ++ ".previous\n" + :"=q" (oldval), "=m" (lock->slock) + :"0" (0) : "memory"); ++#else ++ __asm__ __volatile__( ++ "xchgb %b0,%1\n" ++ :"=q" (oldval), "=m" (lock->slock) ++ :"0" (0) : "memory"); ++#endif + return oldval > 0; + } + +@@ -178,12 +205,12 @@ static inline int __raw_write_trylock(ra + + static inline void __raw_read_unlock(raw_rwlock_t *rw) + { +- asm volatile("lock ; incl %0" :"=m" (rw->lock) : : "memory"); ++ asm volatile(LOCK "incl %0" :"=m" (rw->lock) : : "memory"); + } + + static inline void __raw_write_unlock(raw_rwlock_t *rw) + { +- asm volatile("lock ; addl $" RW_LOCK_BIAS_STR ", %0" ++ asm volatile(LOCK "addl $" RW_LOCK_BIAS_STR ", %0" + : "=m" (rw->lock) : : "memory"); + } + +diff -pruN ../pristine-linux-2.6.16-rc3/include/asm-i386/system.h ./include/asm-i386/system.h +--- ../pristine-linux-2.6.16-rc3/include/asm-i386/system.h 2006-02-15 20:38:57.000000000 +0000 ++++ ./include/asm-i386/system.h 2006-02-15 20:45:57.000000000 +0000 +@@ -5,7 +5,7 @@ + #include + #include + #include +-#include /* for LOCK_PREFIX */ ++#include + + #ifdef __KERNEL__ + +@@ -271,19 +271,19 @@ static inline unsigned long __cmpxchg(vo + unsigned long prev; + switch (size) { + case 1: +- __asm__ __volatile__(LOCK_PREFIX "cmpxchgb %b1,%2" ++ __asm__ __volatile__(LOCK "cmpxchgb %b1,%2" + : "=a"(prev) + : "q"(new), "m"(*__xg(ptr)), "0"(old) + : "memory"); + return prev; + case 2: +- __asm__ __volatile__(LOCK_PREFIX "cmpxchgw %w1,%2" ++ __asm__ __volatile__(LOCK "cmpxchgw %w1,%2" + : "=a"(prev) + : "r"(new), "m"(*__xg(ptr)), "0"(old) + : "memory"); + return prev; + case 4: +- __asm__ __volatile__(LOCK_PREFIX "cmpxchgl %1,%2" ++ __asm__ __volatile__(LOCK "cmpxchgl %1,%2" + : "=a"(prev) + : "r"(new), "m"(*__xg(ptr)), "0"(old) + : "memory"); +@@ -336,7 +336,7 @@ static inline unsigned long long __cmpxc + unsigned long long new) + { + unsigned long long prev; +- __asm__ __volatile__(LOCK_PREFIX "cmpxchg8b %3" ++ __asm__ __volatile__(LOCK "cmpxchg8b %3" + : "=A"(prev) + : "b"((unsigned long)new), + "c"((unsigned long)(new >> 32)), +@@ -503,11 +503,55 @@ struct alt_instr { + #endif + + #ifdef CONFIG_SMP ++#if defined(CONFIG_SMP_ALTERNATIVES) && !defined(MODULE) ++#define smp_alt_mb(instr) \ ++__asm__ __volatile__("6667:\nnop\nnop\nnop\nnop\nnop\nnop\n6668:\n" \ ++ ".section __smp_alternatives,\"a\"\n" \ ++ ".long 6667b\n" \ ++ ".long 6673f\n" \ ++ ".previous\n" \ ++ ".section __smp_replacements,\"a\"\n" \ ++ "6673:.byte 6668b-6667b\n" \ ++ ".byte 6670f-6669f\n" \ ++ ".byte 6671f-6670f\n" \ ++ ".byte 0\n" \ ++ ".byte %c0\n" \ ++ "6669:lock;addl $0,0(%%esp)\n" \ ++ "6670:" instr "\n" \ ++ "6671:\n" \ ++ ".previous\n" \ ++ : \ ++ : "i" (X86_FEATURE_XMM2) \ ++ : "memory") ++#define smp_rmb() smp_alt_mb("lfence") ++#define smp_mb() smp_alt_mb("mfence") ++#define set_mb(var, value) do { \ ++unsigned long __set_mb_temp; \ ++__asm__ __volatile__("6667:movl %1, %0\n6668:\n" \ ++ ".section __smp_alternatives,\"a\"\n" \ ++ ".long 6667b\n" \ ++ ".long 6673f\n" \ ++ ".previous\n" \ ++ ".section __smp_replacements,\"a\"\n" \ ++ "6673: .byte 6668b-6667b\n" \ ++ ".byte 6670f-6669f\n" \ ++ ".byte 0\n" \ ++ ".byte 6671f-6670f\n" \ ++ ".byte -1\n" \ ++ "6669: xchg %1, %0\n" \ ++ "6670:movl %1, %0\n" \ ++ "6671:\n" \ ++ ".previous\n" \ ++ : "=m" (var), "=r" (__set_mb_temp) \ ++ : "1" (value) \ ++ : "memory"); } while (0) ++#else + #define smp_mb() mb() + #define smp_rmb() rmb() ++#define set_mb(var, value) do { (void) xchg(&var, value); } while (0) ++#endif + #define smp_wmb() wmb() + #define smp_read_barrier_depends() read_barrier_depends() +-#define set_mb(var, value) do { (void) xchg(&var, value); } while (0) + #else + #define smp_mb() barrier() + #define smp_rmb() barrier() linux-2.6-xen-vsyscall_base.patch: asm-offsets.c | 1 - 1 files changed, 1 deletion(-) Index: linux-2.6-xen-vsyscall_base.patch =================================================================== RCS file: linux-2.6-xen-vsyscall_base.patch diff -N linux-2.6-xen-vsyscall_base.patch --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ linux-2.6-xen-vsyscall_base.patch 6 Mar 2006 16:31:49 -0000 1.2 @@ -0,0 +1,18 @@ +Xen's patches to make the fixmap area movable cause conflicts with non-xen +builds, as the FIX_VSYSCALL define is no longer constant so cannot +sensibly be handled by asm-offsets.c. + +But with execshield/vdso, we've got per-process maps to get to this memory, +so we don't actually need the fixmap area's base address from assembly any +more. Nuke it. + +--sct + +--- linux-2.6.15.i586/arch/i386/kernel/asm-offsets.c.vsys 2006-03-02 12:13:23.000000000 -0500 ++++ linux-2.6.15.i586/arch/i386/kernel/asm-offsets.c 2006-03-02 12:13:33.000000000 -0500 +@@ -71,5 +71,4 @@ + #endif + + DEFINE(PAGE_SIZE_asm, PAGE_SIZE); +- DEFINE(VSYSCALL_BASE, __fix_to_virt(FIX_VSYSCALL)); + } linux-2.6-xen.patch: arch/i386/Kconfig | 98 arch/i386/Kconfig.cpu | 2 arch/i386/Makefile | 18 arch/i386/boot-xen/Makefile | 21 arch/i386/kernel/Makefile | 33 arch/i386/kernel/acpi/Makefile | 4 arch/i386/kernel/acpi/boot-xen.c | 1161 ++++++++ arch/i386/kernel/apic-xen.c | 140 + arch/i386/kernel/asm-offsets.c | 5 arch/i386/kernel/cpu/Makefile | 5 arch/i386/kernel/cpu/common-xen.c | 719 +++++ arch/i386/kernel/cpu/mtrr/Makefile | 7 arch/i386/kernel/cpu/mtrr/main-xen.c | 187 + arch/i386/kernel/early_printk-xen.c | 2 arch/i386/kernel/entry-xen.S | 857 ++++++ arch/i386/kernel/fixup.c | 95 arch/i386/kernel/head-xen.S | 173 + arch/i386/kernel/init_task-xen.c | 51 arch/i386/kernel/io_apic-xen.c | 2730 ++++++++++++++++++++ arch/i386/kernel/ioport-xen.c | 122 arch/i386/kernel/irq-xen.c | 306 ++ arch/i386/kernel/ldt-xen.c | 269 + arch/i386/kernel/microcode-xen.c | 164 + arch/i386/kernel/mpparse-xen.c | 1188 ++++++++ arch/i386/kernel/pci-dma-xen.c | 344 ++ arch/i386/kernel/process-xen.c | 833 ++++++ arch/i386/kernel/quirks-xen.c | 48 arch/i386/kernel/setup-xen.c | 1888 +++++++++++++ arch/i386/kernel/smp-xen.c | 617 ++++ arch/i386/kernel/swiotlb.c | 674 ++++ arch/i386/kernel/sysenter.c | 90 arch/i386/kernel/time-xen.c | 1067 +++++++ arch/i386/kernel/traps-xen.c | 1094 ++++++++ arch/i386/kernel/vm86.c | 8 arch/i386/kernel/vmlinux.lds.S | 4 arch/i386/kernel/vsyscall-note-xen.S | 32 arch/i386/kernel/vsyscall.S | 2 arch/i386/mach-xen/Makefile | 5 arch/i386/mach-xen/setup.c | 37 arch/i386/mm/Makefile | 8 arch/i386/mm/fault-xen.c | 617 ++++ arch/i386/mm/highmem-xen.c | 123 arch/i386/mm/hypervisor.c | 471 +++ arch/i386/mm/init-xen.c | 846 ++++++ arch/i386/mm/ioremap-xen.c | 462 +++ arch/i386/mm/pgtable-xen.c | 646 ++++ arch/i386/mm/pgtable.c | 63 arch/i386/pci/Makefile | 9 arch/i386/pci/irq-xen.c | 1202 ++++++++ arch/i386/pci/pcifront.c | 55 arch/i386/power/Makefile | 4 arch/ia64/Kconfig | 43 arch/ia64/Makefile | 10 arch/ia64/hp/sim/Makefile | 2 arch/ia64/kernel/entry.S | 32 arch/ia64/kernel/head.S | 4 arch/ia64/kernel/pal.S | 5 arch/ia64/kernel/sal.c | 3 arch/ia64/kernel/setup.c | 4 arch/ia64/xen-mkbuildtree-post | 2 arch/ia64/xen-mkbuildtree-pre | 50 arch/ia64/xen/Makefile | 5 arch/ia64/xen/drivers/Makefile | 20 arch/ia64/xen/drivers/README | 2 arch/ia64/xen/drivers/coreMakefile | 24 arch/ia64/xen/drivers/evtchn_ia64.c | 266 + arch/ia64/xen/drivers/patches/blkback.c.patch | 33 arch/ia64/xen/drivers/patches/console.c.patch | 11 arch/ia64/xen/drivers/patches/devmem.c.patch | 2 arch/ia64/xen/drivers/patches/gnttab.c.patch | 33 arch/ia64/xen/drivers/patches/privcmd.c.patch | 30 arch/ia64/xen/drivers/xenia64_init.c | 55 arch/ia64/xen/hypercall.S | 323 ++ arch/ia64/xen/xen_ksyms.c | 12 arch/ia64/xen/xenconsole.c | 19 arch/ia64/xen/xenentry.S | 850 ++++++ arch/ia64/xen/xenhpski.c | 19 arch/ia64/xen/xenivt.S | 2044 ++++++++++++++ arch/ia64/xen/xenminstate.h | 367 ++ arch/ia64/xen/xenpal.S | 73 arch/ia64/xen/xensetup.S | 33 arch/um/kernel/physmem.c | 4 arch/x86_64/Kconfig | 60 arch/x86_64/Makefile | 16 arch/x86_64/ia32/Makefile | 20 arch/x86_64/ia32/ia32entry-xen.S | 721 +++++ arch/x86_64/ia32/syscall32-xen.c | 128 arch/x86_64/ia32/syscall32_syscall-xen.S | 28 arch/x86_64/ia32/vsyscall-int80.S | 58 arch/x86_64/ia32/vsyscall-sigreturn.S | 2 arch/x86_64/kernel/Makefile | 18 arch/x86_64/kernel/acpi/Makefile | 1 arch/x86_64/kernel/apic-xen.c | 200 + arch/x86_64/kernel/asm-offsets.c | 2 arch/x86_64/kernel/e820-xen.c | 744 +++++ arch/x86_64/kernel/early_printk-xen.c | 306 ++ arch/x86_64/kernel/entry-xen.S | 1140 ++++++++ arch/x86_64/kernel/genapic-xen.c | 144 + arch/x86_64/kernel/genapic_xen.c | 162 + arch/x86_64/kernel/head-xen.S | 156 + arch/x86_64/kernel/head64-xen.c | 140 + arch/x86_64/kernel/init_task.c | 3 arch/x86_64/kernel/io_apic-xen.c | 2231 ++++++++++++++++ arch/x86_64/kernel/ioport-xen.c | 58 arch/x86_64/kernel/irq-xen.c | 168 + arch/x86_64/kernel/ldt-xen.c | 282 ++ arch/x86_64/kernel/mpparse-xen.c | 1005 +++++++ arch/x86_64/kernel/pci-swiotlb-xen.c | 54 arch/x86_64/kernel/process-xen.c | 810 +++++ arch/x86_64/kernel/setup-xen.c | 1635 +++++++++++ arch/x86_64/kernel/setup64-xen.c | 360 ++ arch/x86_64/kernel/smp-xen.c | 596 ++++ arch/x86_64/kernel/traps-xen.c | 1023 +++++++ arch/x86_64/kernel/vsyscall-xen.c | 239 + arch/x86_64/kernel/x8664_ksyms-xen.c | 172 + arch/x86_64/kernel/xen_entry.S | 41 arch/x86_64/mm/Makefile | 10 arch/x86_64/mm/fault-xen.c | 595 ++++ arch/x86_64/mm/init-xen.c | 1107 ++++++++ arch/x86_64/mm/pageattr-xen.c | 392 ++ arch/x86_64/pci/Makefile | 12 drivers/Makefile | 1 drivers/acpi/Kconfig | 3 drivers/acpi/tables.c | 7 drivers/char/mem.c | 6 drivers/char/tpm/Kconfig | 14 drivers/char/tpm/Makefile | 1 drivers/char/tpm/tpm.c | 44 drivers/char/tpm/tpm.h | 7 drivers/char/tpm/tpm_xen.c | 536 +++ drivers/char/tty_io.c | 7 drivers/firmware/Kconfig | 2 drivers/pci/Kconfig | 1 drivers/serial/Kconfig | 1 drivers/video/Kconfig | 2 drivers/xen/Kconfig | 200 + drivers/xen/Makefile | 22 drivers/xen/balloon/Makefile | 2 drivers/xen/balloon/balloon.c | 585 ++++ drivers/xen/blkback/Makefile | 3 drivers/xen/blkback/blkback.c | 596 ++++ drivers/xen/blkback/common.h | 123 drivers/xen/blkback/interface.c | 164 + drivers/xen/blkback/vbd.c | 102 drivers/xen/blkback/xenbus.c | 421 +++ drivers/xen/blkfront/Makefile | 5 drivers/xen/blkfront/blkfront.c | 834 ++++++ drivers/xen/blkfront/block.h | 162 + drivers/xen/blkfront/vbd.c | 323 ++ drivers/xen/blktap/Makefile | 3 drivers/xen/blktap/blktap.c | 910 ++++++ drivers/xen/blktap/common.h | 110 drivers/xen/blktap/interface.c | 146 + drivers/xen/blktap/xenbus.c | 234 + drivers/xen/char/Makefile | 2 drivers/xen/char/mem.c | 156 + drivers/xen/console/Makefile | 2 drivers/xen/console/console.c | 647 ++++ drivers/xen/console/xencons_ring.c | 125 drivers/xen/core/Makefile | 9 drivers/xen/core/evtchn.c | 823 ++++++ drivers/xen/core/features.c | 29 drivers/xen/core/gnttab.c | 429 +++ drivers/xen/core/reboot.c | 442 +++ drivers/xen/core/skbuff.c | 144 + drivers/xen/core/smpboot.c | 464 +++ drivers/xen/core/xen_proc.c | 29 drivers/xen/evtchn/Makefile | 2 drivers/xen/evtchn/evtchn.c | 459 +++ drivers/xen/net_driver_util.c | 68 drivers/xen/netback/Makefile | 5 drivers/xen/netback/common.h | 110 drivers/xen/netback/interface.c | 320 ++ drivers/xen/netback/loopback.c | 231 + drivers/xen/netback/netback.c | 835 ++++++ drivers/xen/netback/xenbus.c | 327 ++ drivers/xen/netfront/Makefile | 4 drivers/xen/netfront/netfront.c | 1504 +++++++++++ drivers/xen/pciback/Makefile | 10 drivers/xen/pciback/conf_space.c | 324 ++ drivers/xen/pciback/conf_space.h | 97 drivers/xen/pciback/conf_space_header.c | 269 + drivers/xen/pciback/passthrough.c | 116 drivers/xen/pciback/pci_stub.c | 377 ++ drivers/xen/pciback/pciback.h | 73 drivers/xen/pciback/pciback_ops.c | 84 drivers/xen/pciback/vpci.c | 163 + drivers/xen/pciback/xenbus.c | 439 +++ drivers/xen/pcifront/Makefile | 7 drivers/xen/pcifront/pci.c | 44 drivers/xen/pcifront/pci_op.c | 245 + drivers/xen/pcifront/pcifront.h | 40 drivers/xen/pcifront/xenbus.c | 295 ++ drivers/xen/privcmd/Makefile | 2 drivers/xen/privcmd/privcmd.c | 302 ++ drivers/xen/tpmback/Makefile | 4 drivers/xen/tpmback/common.h | 91 drivers/xen/tpmback/interface.c | 203 + drivers/xen/tpmback/tpmback.c | 1118 ++++++++ drivers/xen/tpmback/xenbus.c | 333 ++ drivers/xen/tpmfront/Makefile | 2 drivers/xen/tpmfront/tpmfront.c | 729 +++++ drivers/xen/tpmfront/tpmfront.h | 40 drivers/xen/util.c | 80 drivers/xen/xenbus/Makefile | 8 drivers/xen/xenbus/xenbus_client.c | 403 ++ drivers/xen/xenbus/xenbus_comms.c | 203 + drivers/xen/xenbus/xenbus_comms.h | 50 drivers/xen/xenbus/xenbus_dev.c | 238 + drivers/xen/xenbus/xenbus_probe.c | 1015 +++++++ drivers/xen/xenbus/xenbus_xs.c | 821 ++++++ fs/Kconfig | 1 include/asm-i386/a.out.h | 2 include/asm-i386/apic.h | 2 include/asm-i386/elf.h | 7 include/asm-i386/fixmap.h | 13 include/asm-i386/mach-xen/asm/agp.h | 37 include/asm-i386/mach-xen/asm/desc.h | 164 + include/asm-i386/mach-xen/asm/dma-mapping.h | 156 + include/asm-i386/mach-xen/asm/fixmap.h | 158 + include/asm-i386/mach-xen/asm/floppy.h | 147 + include/asm-i386/mach-xen/asm/highmem.h | 81 include/asm-i386/mach-xen/asm/hw_irq.h | 73 include/asm-i386/mach-xen/asm/hypercall.h | 323 ++ include/asm-i386/mach-xen/asm/hypervisor.h | 163 + include/asm-i386/mach-xen/asm/io.h | 401 ++ include/asm-i386/mach-xen/asm/kmap_types.h | 32 include/asm-i386/mach-xen/asm/mmu.h | 21 include/asm-i386/mach-xen/asm/mmu_context.h | 105 include/asm-i386/mach-xen/asm/page.h | 326 ++ include/asm-i386/mach-xen/asm/param.h | 24 include/asm-i386/mach-xen/asm/pci.h | 154 + include/asm-i386/mach-xen/asm/pgalloc.h | 64 include/asm-i386/mach-xen/asm/pgtable-2level-defs.h | 21 include/asm-i386/mach-xen/asm/pgtable-2level.h | 83 include/asm-i386/mach-xen/asm/pgtable-3level-defs.h | 25 include/asm-i386/mach-xen/asm/pgtable-3level.h | 181 + include/asm-i386/mach-xen/asm/pgtable.h | 512 +++ include/asm-i386/mach-xen/asm/processor.h | 762 +++++ include/asm-i386/mach-xen/asm/ptrace.h | 90 include/asm-i386/mach-xen/asm/scatterlist.h | 22 include/asm-i386/mach-xen/asm/segment.h | 117 include/asm-i386/mach-xen/asm/setup.h | 66 include/asm-i386/mach-xen/asm/smp.h | 103 include/asm-i386/mach-xen/asm/spinlock.h | 217 + include/asm-i386/mach-xen/asm/swiotlb.h | 43 include/asm-i386/mach-xen/asm/synch_bitops.h | 141 + include/asm-i386/mach-xen/asm/system.h | 679 ++++ include/asm-i386/mach-xen/asm/tlbflush.h | 102 include/asm-i386/mach-xen/asm/vga.h | 20 include/asm-i386/mach-xen/irq_vectors.h | 125 include/asm-i386/mach-xen/mach_traps.h | 33 include/asm-i386/mach-xen/setup_arch_post.h | 50 include/asm-i386/mach-xen/setup_arch_pre.h | 5 include/asm-i386/page.h | 4 include/asm-i386/spinlock.h | 6 include/asm-i386/system.h | 2 include/asm-ia64/fixmap.h | 2 include/asm-ia64/gcc_intrin.h | 60 include/asm-ia64/hypercall.h | 500 +++ include/asm-ia64/hypervisor.h | 70 include/asm-ia64/intel_intrin.h | 68 include/asm-ia64/pal.h | 1 include/asm-ia64/privop.h | 59 include/asm-ia64/processor.h | 1 include/asm-ia64/synch_bitops.h | 61 include/asm-ia64/system.h | 4 include/asm-ia64/xen/privop.h | 272 + include/asm-um/page.h | 2 include/asm-x86_64/apic.h | 2 include/asm-x86_64/mach-xen/asm/arch_hooks.h | 27 include/asm-x86_64/mach-xen/asm/bootsetup.h | 42 include/asm-x86_64/mach-xen/asm/desc.h | 263 + include/asm-x86_64/mach-xen/asm/dma-mapping.h | 191 + include/asm-x86_64/mach-xen/asm/fixmap.h | 111 include/asm-x86_64/mach-xen/asm/floppy.h | 206 + include/asm-x86_64/mach-xen/asm/hw_irq.h | 141 + include/asm-x86_64/mach-xen/asm/hypercall.h | 323 ++ include/asm-x86_64/mach-xen/asm/hypervisor.h | 2 include/asm-x86_64/mach-xen/asm/io.h | 359 ++ include/asm-x86_64/mach-xen/asm/irq.h | 39 include/asm-x86_64/mach-xen/asm/mmu.h | 33 include/asm-x86_64/mach-xen/asm/mmu_context.h | 134 include/asm-x86_64/mach-xen/asm/nmi.h | 75 include/asm-x86_64/mach-xen/asm/page.h | 317 ++ include/asm-x86_64/mach-xen/asm/pci.h | 174 + include/asm-x86_64/mach-xen/asm/pgalloc.h | 199 + include/asm-x86_64/mach-xen/asm/pgtable.h | 560 ++++ include/asm-x86_64/mach-xen/asm/processor.h | 503 +++ include/asm-x86_64/mach-xen/asm/ptrace.h | 125 include/asm-x86_64/mach-xen/asm/smp.h | 152 + include/asm-x86_64/mach-xen/asm/synch_bitops.h | 2 include/asm-x86_64/mach-xen/asm/system.h | 434 +++ include/asm-x86_64/mach-xen/asm/timer.h | 67 include/asm-x86_64/mach-xen/asm/tlbflush.h | 104 include/asm-x86_64/mach-xen/asm/vga.h | 20 include/asm-x86_64/mach-xen/asm/xor.h | 328 ++ include/asm-x86_64/mach-xen/irq_vectors.h | 123 include/asm-x86_64/mach-xen/mach_time.h | 122 include/asm-x86_64/mach-xen/mach_timer.h | 48 include/asm-x86_64/mach-xen/setup_arch_post.h | 52 include/asm-x86_64/mach-xen/setup_arch_pre.h | 5 include/linux/gfp.h | 6 include/linux/highmem.h | 6 include/linux/irq.h | 3 include/linux/mm.h | 13 include/linux/skbuff.h | 13 include/xen/balloon.h | 70 include/xen/driver_util.h | 26 include/xen/evtchn.h | 123 include/xen/features.h | 20 include/xen/foreign_page.h | 40 include/xen/gnttab.h | 120 include/xen/interface/COPYING | 28 include/xen/interface/acm.h | 181 + include/xen/interface/acm_ops.h | 96 include/xen/interface/arch-ia64.h | 314 ++ include/xen/interface/arch-x86_32.h | 158 + include/xen/interface/arch-x86_64.h | 243 + include/xen/interface/dom0_ops.h | 488 +++ include/xen/interface/event_channel.h | 203 + include/xen/interface/features.h | 53 include/xen/interface/grant_table.h | 306 ++ include/xen/interface/hvm/hvm_info_table.h | 24 include/xen/interface/hvm/ioreq.h | 93 include/xen/interface/hvm/vmx_assist.h | 97 include/xen/interface/io/blkif.h | 85 include/xen/interface/io/console.h | 33 include/xen/interface/io/netif.h | 76 include/xen/interface/io/pciif.h | 55 include/xen/interface/io/ring.h | 270 + include/xen/interface/io/tpmif.h | 56 include/xen/interface/io/xenbus.h | 44 include/xen/interface/io/xs_wire.h | 97 include/xen/interface/memory.h | 153 + include/xen/interface/nmi.h | 54 include/xen/interface/physdev.h | 70 include/xen/interface/sched.h | 60 include/xen/interface/sched_ctl.h | 68 include/xen/interface/trace.h | 90 include/xen/interface/vcpu.h | 119 include/xen/interface/version.h | 64 include/xen/interface/xen.h | 463 +++ include/xen/net_driver_util.h | 56 include/xen/pcifront.h | 39 include/xen/public/evtchn.h | 98 include/xen/public/privcmd.h | 91 include/xen/public/xenstored.h | 89 include/xen/tpmfe.h | 40 include/xen/xen_proc.h | 23 include/xen/xenbus.h | 298 ++ include/xen/xencons.h | 14 kernel/Kconfig.preempt | 1 kernel/irq/manage.c | 84 lib/Kconfig.debug | 2 lib/Makefile | 3 mm/Kconfig | 3 mm/highmem.c | 11 mm/memory.c | 112 mm/mmap.c | 4 mm/page_alloc.c | 6 net/core/dev.c | 50 net/core/skbuff.c | 41 scripts/Makefile.xen | 14 364 files changed, 77454 insertions(+), 245 deletions(-) View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.3 -r 1.4 linux-2.6-xen.patch Index: linux-2.6-xen.patch =================================================================== RCS file: linux-2.6-xen.patch diff -N linux-2.6-xen.patch --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ linux-2.6-xen.patch 6 Mar 2006 16:31:49 -0000 1.4 @@ -0,0 +1,80787 @@ +diff -Nru -p --exclude='.*' ref-linux-2.6.16-rc5/arch/i386/boot-xen/Makefile linux-2.6.16-rc5-xen0/arch/i386/boot-xen/Makefile +--- ref-linux-2.6.16-rc5/arch/i386/boot-xen/Makefile 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.16-rc5-xen0/arch/i386/boot-xen/Makefile 2006-03-01 11:09:36.000000000 -0500 +@@ -0,0 +1,21 @@ ++ ++OBJCOPYFLAGS := -g --strip-unneeded ++ ++vmlinuz: vmlinux-stripped FORCE ++ $(call if_changed,gzip) ++ ++vmlinux-stripped: vmlinux FORCE ++ $(call if_changed,objcopy) ++ ++INSTALL_ROOT := $(patsubst %/boot,%,$(INSTALL_PATH)) ++ ++XINSTALL_NAME ?= $(KERNELRELEASE) ++install: ++ mkdir -p $(INSTALL_ROOT)/boot ++ ln -f -s vmlinuz-$(XINSTALL_NAME)$(INSTALL_SUFFIX) $(INSTALL_ROOT)/boot/vmlinuz-$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(XENGUEST)$(INSTALL_SUFFIX) ++ rm -f $(INSTALL_ROOT)/boot/vmlinuz-$(XINSTALL_NAME)$(INSTALL_SUFFIX) ++ install -m0644 vmlinuz $(INSTALL_ROOT)/boot/vmlinuz-$(XINSTALL_NAME)$(INSTALL_SUFFIX) ++ install -m0644 vmlinux $(INSTALL_ROOT)/boot/vmlinux-syms-$(XINSTALL_NAME)$(INSTALL_SUFFIX) ++ install -m0664 .config $(INSTALL_ROOT)/boot/config-$(XINSTALL_NAME)$(INSTALL_SUFFIX) ++ install -m0664 System.map $(INSTALL_ROOT)/boot/System.map-$(XINSTALL_NAME)$(INSTALL_SUFFIX) ++ ln -f -s vmlinuz-$(XINSTALL_NAME)$(INSTALL_SUFFIX) $(INSTALL_ROOT)/boot/vmlinuz-$(VERSION).$(PATCHLEVEL)$(XENGUEST)$(INSTALL_SUFFIX) +diff -Nru -p --exclude='.*' ref-linux-2.6.16-rc5/arch/i386/Kconfig linux-2.6.16-rc5-xen0/arch/i386/Kconfig +--- ref-linux-2.6.16-rc5/arch/i386/Kconfig 2006-03-01 11:12:36.000000000 -0500 ++++ linux-2.6.16-rc5-xen0/arch/i386/Kconfig 2006-03-01 11:09:36.000000000 -0500 +@@ -58,6 +58,15 @@ config X86_PC + help + Choose this option if your computer is a standard PC or compatible. + ++config X86_XEN ++ bool "Xen-compatible" ++ select X86_UP_APIC if !SMP && XEN_PRIVILEGED_GUEST ++ select X86_UP_IOAPIC if !SMP && XEN_PRIVILEGED_GUEST ++ select SWIOTLB ++ help ++ Choose this option if you plan to run this kernel on top of the ++ Xen Hypervisor. ++ + config X86_ELAN + bool "AMD Elan" + help +@@ -159,6 +168,7 @@ source "arch/i386/Kconfig.cpu" + + config HPET_TIMER + bool "HPET Timer Support" ++ depends on !X86_XEN + help + This enables the use of the HPET for the kernel's internal timer. + HPET is the next generation timer replacing legacy 8254s. +@@ -231,7 +241,7 @@ config NR_CPUS + + config SCHED_SMT + bool "SMT (Hyperthreading) scheduler support" +- depends on SMP ++ depends on SMP && !X86_XEN + default off + help + SMT scheduler support improves the CPU scheduler's decision making +@@ -243,7 +253,7 @@ source "kernel/Kconfig.preempt" + + config X86_UP_APIC + bool "Local APIC support on uniprocessors" +- depends on !SMP && !(X86_VISWS || X86_VOYAGER) ++ depends on !SMP && !(X86_VISWS || X86_VOYAGER || XEN_UNPRIVILEGED_GUEST) + help + A local APIC (Advanced Programmable Interrupt Controller) is an + integrated interrupt controller in the CPU. If you have a single-CPU +@@ -268,12 +278,12 @@ config X86_UP_IOAPIC + + config X86_LOCAL_APIC + bool +- depends on X86_UP_APIC || ((X86_VISWS || SMP) && !X86_VOYAGER) ++ depends on X86_UP_APIC || ((X86_VISWS || SMP) && !(X86_VOYAGER || XEN_UNPRIVILEGED_GUEST)) + default y + + config X86_IO_APIC + bool +- depends on X86_UP_IOAPIC || (SMP && !(X86_VISWS || X86_VOYAGER)) ++ depends on X86_UP_IOAPIC || (SMP && !(X86_VISWS || X86_VOYAGER || XEN_UNPRIVILEGED_GUEST)) + default y + + config X86_VISWS_APIC +@@ -281,9 +291,14 @@ config X86_VISWS_APIC + depends on X86_VISWS + default y + ++config X86_TSC ++ bool ++ depends on (MWINCHIP3D || MWINCHIP2 || MCRUSOE || MEFFICEON || MCYRIXIII || MK7 || MK6 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || M586TSC || MK8 || MVIAC3_2 || MGEODEGX1) && !X86_NUMAQ && !X86_XEN ++ default y ++ + config X86_MCE + bool "Machine Check Exception" +- depends on !X86_VOYAGER ++ depends on !(X86_VOYAGER || X86_XEN) + ---help--- + Machine Check Exception support allows the processor to notify the + kernel if it detects a problem (e.g. overheating, component failure). +@@ -373,6 +388,7 @@ config X86_REBOOTFIXUPS + + config MICROCODE + tristate "/dev/cpu/microcode - Intel IA32 CPU microcode support" ++ depends on !XEN_UNPRIVILEGED_GUEST + ---help--- + If you say Y here and also to "/dev file system support" in the + 'File systems' section, you will be able to update the microcode on +@@ -390,6 +406,7 @@ config MICROCODE + + config X86_MSR + tristate "/dev/cpu/*/msr - Model-specific register support" ++ depends on !X86_XEN + help + This device gives privileged processes access to the x86 + Model-Specific Registers (MSRs). It is a character device with +@@ -405,6 +422,10 @@ config X86_CPUID + with major 203 and minors 0 to 31 for /dev/cpu/0/cpuid to + /dev/cpu/31/cpuid. + ++config SWIOTLB ++ bool ++ default n ++ + source "drivers/firmware/Kconfig" + + choice +@@ -573,7 +594,7 @@ config HAVE_ARCH_EARLY_PFN_TO_NID + + config HIGHPTE + bool "Allocate 3rd-level pagetables from highmem" +- depends on HIGHMEM4G || HIGHMEM64G ++ depends on (HIGHMEM4G || HIGHMEM64G) && !X86_XEN + help + The VM uses one page table entry for each page of physical memory. + For systems with a lot of RAM, this can be wasteful of precious +@@ -582,6 +603,7 @@ config HIGHPTE + + config MATH_EMULATION + bool "Math emulation" ++ depends on !X86_XEN + ---help--- + Linux can emulate a math coprocessor (used for floating point + operations) if you don't have one. 486DX and Pentium processors have +@@ -607,6 +629,8 @@ config MATH_EMULATION + + config MTRR + bool "MTRR (Memory Type Range Register) support" ++ depends on !XEN_UNPRIVILEGED_GUEST ++ default y if X86_XEN + ---help--- + On Intel P6 family processors (Pentium Pro, Pentium II and later) + the Memory Type Range Registers (MTRRs) may be used to control +@@ -641,7 +665,7 @@ config MTRR + + config EFI + bool "Boot from EFI support (EXPERIMENTAL)" +- depends on ACPI ++ depends on ACPI && !X86_XEN + default n + ---help--- + This enables the the kernel to boot on EFI platforms using +@@ -659,7 +683,7 @@ config EFI + + config IRQBALANCE + bool "Enable kernel irq balancing" +- depends on SMP && X86_IO_APIC ++ depends on SMP && X86_IO_APIC && !X86_XEN + default y + help + The default yes will allow the kernel to do irq load balancing. +@@ -702,7 +726,7 @@ source kernel/Kconfig.hz + + config KEXEC + bool "kexec system call (EXPERIMENTAL)" +- depends on EXPERIMENTAL ++ depends on EXPERIMENTAL && !X86_XEN + help + kexec is a system call that implements the ability to shutdown your + current kernel, and to start another kernel. It is like a reboot +@@ -756,6 +780,7 @@ config HOTPLUG_CPU + config DOUBLEFAULT + default y + bool "Enable doublefault exception handler" if EMBEDDED ++ depends on !X86_NO_TSS + help + This option allows trapping of rare doublefault exceptions that + would otherwise cause a system to silently reboot. Disabling this +@@ -766,18 +791,20 @@ endmenu + + + menu "Power management options (ACPI, APM)" [...80394 lines suppressed...] +@@ -418,7 +418,8 @@ static void __free_pages_ok(struct page + int i; + int reserved = 0; + +- arch_free_page(page, order); ++ if (arch_free_page(page, order)) ++ return; + if (!PageHighMem(page)) + mutex_debug_check_no_locks_freed(page_address(page), + PAGE_SIZE<mapping = NULL; +diff -Nru -p --exclude='.*' ref-linux-2.6.16-rc5/net/core/dev.c linux-2.6.16-rc5-xen0/net/core/dev.c +--- ref-linux-2.6.16-rc5/net/core/dev.c 2006-03-01 11:12:32.000000000 -0500 ++++ linux-2.6.16-rc5-xen0/net/core/dev.c 2006-03-01 11:09:38.000000000 -0500 +@@ -116,6 +116,12 @@ + #endif /* CONFIG_NET_RADIO */ + #include + ++#ifdef CONFIG_XEN ++#include ++#include ++#include ++#endif ++ + /* + * The list of packet types we will receive (as opposed to discard) + * and the routines to invoke. +@@ -1260,6 +1266,37 @@ int dev_queue_xmit(struct sk_buff *skb) + __skb_linearize(skb, GFP_ATOMIC)) + goto out_kfree_skb; + ++#ifdef CONFIG_XEN ++ /* If a checksum-deferred packet is forwarded to a device that needs a ++ * checksum, correct the pointers and force checksumming. ++ */ ++ if (skb->proto_csum_blank) { ++ if (skb->protocol != htons(ETH_P_IP)) ++ goto out_kfree_skb; ++ skb->h.raw = (unsigned char *)skb->nh.iph + 4*skb->nh.iph->ihl; ++ if (skb->h.raw >= skb->tail) ++ goto out_kfree_skb; ++ switch (skb->nh.iph->protocol) { ++ case IPPROTO_TCP: ++ skb->csum = offsetof(struct tcphdr, check); ++ break; ++ case IPPROTO_UDP: ++ skb->csum = offsetof(struct udphdr, check); ++ break; ++ default: ++ if (net_ratelimit()) ++ printk(KERN_ERR "Attempting to checksum a non-" ++ "TCP/UDP packet, dropping a protocol" ++ " %d packet", skb->nh.iph->protocol); ++ rc = -EPROTO; ++ goto out_kfree_skb; ++ } ++ if ((skb->h.raw + skb->csum + 2) > skb->tail) ++ goto out_kfree_skb; ++ skb->ip_summed = CHECKSUM_HW; ++ } ++#endif ++ + /* If packet is not checksummed and device does not support + * checksumming for this protocol, complete checksumming here. + */ +@@ -1609,6 +1646,19 @@ int netif_receive_skb(struct sk_buff *sk + } + #endif + ++#ifdef CONFIG_XEN ++ switch (skb->ip_summed) { ++ case CHECKSUM_UNNECESSARY: ++ skb->proto_csum_valid = 1; ++ break; ++ case CHECKSUM_HW: ++ /* XXX Implement me. */ ++ default: ++ skb->proto_csum_valid = 0; ++ break; ++ } ++#endif ++ + list_for_each_entry_rcu(ptype, &ptype_all, list) { + if (!ptype->dev || ptype->dev == skb->dev) { + if (pt_prev) +diff -Nru -p --exclude='.*' ref-linux-2.6.16-rc5/net/core/skbuff.c linux-2.6.16-rc5-xen0/net/core/skbuff.c +--- ref-linux-2.6.16-rc5/net/core/skbuff.c 2006-03-01 11:12:32.000000000 -0500 ++++ linux-2.6.16-rc5-xen0/net/core/skbuff.c 2006-03-01 11:09:39.000000000 -0500 +@@ -132,6 +132,7 @@ void skb_under_panic(struct sk_buff *skb + * Buffers may only be allocated from interrupts using a @gfp_mask of + * %GFP_ATOMIC. + */ ++#ifndef CONFIG_HAVE_ARCH_ALLOC_SKB + struct sk_buff *__alloc_skb(unsigned int size, gfp_t gfp_mask, + int fclone) + { +@@ -186,6 +187,7 @@ nodata: + skb = NULL; + goto out; + } ++#endif /* !CONFIG_HAVE_ARCH_ALLOC_SKB */ + + /** + * alloc_skb_from_cache - allocate a network buffer +@@ -203,14 +205,18 @@ nodata: + */ + struct sk_buff *alloc_skb_from_cache(kmem_cache_t *cp, + unsigned int size, +- gfp_t gfp_mask) ++ gfp_t gfp_mask, ++ int fclone) + { ++ kmem_cache_t *cache; ++ struct skb_shared_info *shinfo; + struct sk_buff *skb; + u8 *data; + ++ cache = fclone ? skbuff_fclone_cache : skbuff_head_cache; ++ + /* Get the HEAD */ +- skb = kmem_cache_alloc(skbuff_head_cache, +- gfp_mask & ~__GFP_DMA); ++ skb = kmem_cache_alloc(cache, gfp_mask & ~__GFP_DMA); + if (!skb) + goto out; + +@@ -227,16 +233,29 @@ struct sk_buff *alloc_skb_from_cache(kme + skb->data = data; + skb->tail = data; + skb->end = data + size; ++ /* make sure we initialize shinfo sequentially */ ++ shinfo = skb_shinfo(skb); ++ atomic_set(&shinfo->dataref, 1); ++ shinfo->nr_frags = 0; ++ shinfo->tso_size = 0; ++ shinfo->tso_segs = 0; ++ shinfo->ufo_size = 0; ++ shinfo->ip6_frag_id = 0; ++ shinfo->frag_list = NULL; + +- atomic_set(&(skb_shinfo(skb)->dataref), 1); +- skb_shinfo(skb)->nr_frags = 0; +- skb_shinfo(skb)->tso_size = 0; +- skb_shinfo(skb)->tso_segs = 0; +- skb_shinfo(skb)->frag_list = NULL; ++ if (fclone) { ++ struct sk_buff *child = skb + 1; ++ atomic_t *fclone_ref = (atomic_t *) (child + 1); ++ ++ skb->fclone = SKB_FCLONE_ORIG; ++ atomic_set(fclone_ref, 1); ++ ++ child->fclone = SKB_FCLONE_UNAVAILABLE; ++ } + out: + return skb; + nodata: +- kmem_cache_free(skbuff_head_cache, skb); ++ kmem_cache_free(cache, skb); + skb = NULL; + goto out; + } +@@ -408,6 +427,10 @@ struct sk_buff *skb_clone(struct sk_buff + C(local_df); + n->cloned = 1; + n->nohdr = 0; ++#ifdef CONFIG_XEN ++ C(proto_csum_valid); ++ C(proto_csum_blank); ++#endif + C(pkt_type); + C(ip_summed); + C(priority); +diff -Nru -p --exclude='.*' ref-linux-2.6.16-rc5/scripts/Makefile.xen linux-2.6.16-rc5-xen0/scripts/Makefile.xen +--- ref-linux-2.6.16-rc5/scripts/Makefile.xen 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.16-rc5-xen0/scripts/Makefile.xen 2006-03-01 11:09:39.000000000 -0500 +@@ -0,0 +1,14 @@ ++ ++# cherrypickxen($1 = allobj) ++cherrypickxen = $(foreach var, $(1), \ ++ $(shell o=$(var); \ ++ c=$${o/%.o/-xen.c}; \ ++ s=$${o/%.o/-xen.S}; \ ++ oxen=$${o/%.o/-xen.o}; \ ++ [ -f $(srctree)/$(src)/$${c} ] || \ ++ [ -f $(srctree)/$(src)/$${s} ] \ ++ && echo $$oxen \ ++ || echo $(var) ) \ ++ ) ++# filterxen($1 = allobj, $2 = noobjs) ++filterxen = $(filter-out $(2), $(1)) Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v retrieving revision 1.371 retrieving revision 1.372 diff -u -r1.371 -r1.372 --- .cvsignore 5 Mar 2006 08:52:50 -0000 1.371 +++ .cvsignore 6 Mar 2006 16:31:46 -0000 1.372 @@ -2,6 +2,6 @@ temp-* kernel-2.6.15 linux-2.6.15.tar.bz2 -xen-20060208.tar.bz2 patch-2.6.16-rc5.bz2 +xen-20060301.tar.bz2 patch-2.6.16-rc5-git8.bz2 Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.2016 retrieving revision 1.2017 diff -u -r1.2016 -r1.2017 --- kernel-2.6.spec 5 Mar 2006 08:52:50 -0000 1.2016 +++ kernel-2.6.spec 6 Mar 2006 16:31:46 -0000 1.2017 @@ -8,7 +8,7 @@ # Whether to apply the Xen patches, leave this enabled. %define includexen 1 # Whether to build the Xen kernels, disable if you want. -%define buildxen 0 +%define buildxen 1 %define buildxenPAE 0 %define builddoc 0 %define buildkdump 1 @@ -162,7 +162,8 @@ License: GPLv2 Version: %{rpmversion} Release: %{release} -ExclusiveArch: noarch %{all_x86} x86_64 ppc ppc64 ia64 sparc sparc64 ppc64iseries s390 s390x +#ExclusiveArch: noarch %{all_x86} x86_64 ppc ppc64 ia64 sparc sparc64 ppc64iseries s390 s390x +ExclusiveArch: noarch %{all_x86} x86_64 ppc ppc64 sparc sparc64 ppc64iseries s390 s390x ExclusiveOS: Linux Provides: kernel = %{version} Provides: kernel-drm = 4.3.0 @@ -185,7 +186,7 @@ Source0: ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-%{kversion}.tar.bz2 -Source1: xen-20060208.tar.bz2 +Source1: xen-20060301.tar.bz2 Source2: Config.mk Source10: COPYING.modules @@ -249,18 +250,20 @@ # 500 - 599 s390(x) # 600 - 699 sparc(64) +# 690 - 699 xen patches already split in their system +Patch690: linux-2.6-xen-i386-mach-io-check-nmi.patch +Patch691: linux-2.6-xen-net-csum.patch +Patch692: linux-2.6-xen-pmd-shared.patch +Patch693: linux-2.6-xen-smp-alts.patch # 700 - 799 Xen -Patch700: linux-2.6-xen-merge.patch +Patch700: linux-2.6-xen.patch Patch701: linux-2.6-xen-compile-fixes.patch Patch702: linux-2.6-xen-no-tls-warn.patch -Patch704: linux-2.6-xen-guest-enable-char-devices.patch -Patch705: linux-2.6-xen_net_read_mac_export.patch +Patch703: linux-2.6-xen-move-vdso-fixmap.patch +Patch704: linux-2.6-xen-vsyscall_base.patch Patch706: linux-2.6-xen_remap_vma_flags.patch -Patch707: linux-2.6-xen-acpi.patch -Patch708: linux-2.6-xen-x86_64-fixes.patch Patch709: linux-2.6-percpu-NR_CPUS-hotplug-fix.patch Patch710: linux-2.6-xen-module-fault.patch -Patch711: linux-2.6-xen-cpusteal-kernel.patch # # Patches 800 through 899 are reserved for bugfixes to the core system @@ -417,9 +420,6 @@ # Do not add anything non-trivial here. Patch10001: linux-2.6-random-patches.patch -Patch20000: linux-2.6-xen-gcc-4.1-compile-fix.patch -Patch20010: linux-2.6-xen-cpusteal-hv.patch - # END OF PATCH DEFINITIONS BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root @@ -681,10 +681,12 @@ %prep if [ ! -d kernel-%{kversion}/vanilla ]; then # Ok, first time we do a make prep. -%setup -q -n %{name}-%{version} -c -a1 rm -f pax_global_header +%setup -q -n %{name}-%{version} -c -a1 cp %{SOURCE2} . mv linux-%{kversion} vanilla + mv xen xen-vanilla + cp %{SOURCE2} . else # We already have a vanilla dir. cd kernel-%{kversion} @@ -692,13 +694,17 @@ mv linux-%{kversion}.%{_target_cpu} deleteme rm -rf deleteme & fi + if [ -d xen ]; then + mv xen deleteme2 + rm -rf deleteme2 & + fi fi cp -rl vanilla linux-%{kversion}.%{_target_cpu} +cp -rl xen-vanilla xen %if %{buildxen} cd xen -%patch20000 -p1 -%patch20010 -p2 +# Any necessary hypervisor patches go here cd .. %endif cd linux-%{kversion}.%{_target_cpu} @@ -771,17 +777,31 @@ # %if %{includexen} # Base Xen patch from linux-2.6-merge.hg +%patch690 -p1 +# Conflict with non-xen kernels +#%patch691 -p1 +%patch692 -p1 +%patch693 -p1 %patch700 -p1 + +# +# Xen includes a patch which moves the vsyscall fixmap into a user-space VA, +# freeing user-space from reliance on an absolute fixmap area and so allowing +# the fixmap area to become dynamic. +# +# Execshield already does this, making the fixmap area invisible to the user +# and adding a new randomised vdso for it in user VA, so there's no point in +# having both: revert the Xen changeset so that execsheild applies cleanly. +# +%patch703 -p2 -R + %patch701 -p1 %patch702 -p1 %patch704 -p1 -%patch705 -p1 %patch706 -p1 -%patch707 -p1 -%patch708 -p2 %patch709 -p1 -%patch710 -p1 -%patch711 -p2 +#%patch710 -p1 + %endif # @@ -1609,6 +1629,9 @@ %endif %changelog +* Mon Mar 6 2006 Stephen Tweedie +- Merge xen rebase with 1.2016 kernel + * Sun Mar 5 2006 Dave Jones - 2.6.16rc5-git8 - Add a safety net to softlockup so that it doesn't prevent installs. @@ -1623,11 +1646,42 @@ * Thu Mar 2 2006 John W. Linville - Update to current bcm43xx code +* Thu Mar 2 2006 Stephen Tweedie +- Rebase to rawhide 1.2009 +- Disable xen PAE build again + * Thu Mar 2 2006 Dave Jones - 2.6.16rc5-git6 - Fix acpi_os_acquire_object() with IRQs disabled debug msgs. - Mark unwind info for signal trampolines in vDSOs +* Thu Mar 2 2006 Juan Quintela +- rebase with rawhide 2008. + +* Thu Mar 2 2006 Stephen Tweedie +- Fix xen/execshield VSYSCALL_BASE conflict + +* Thu Mar 2 2006 Dave Jones +- Fix acpi_os_acquire_object() with IRQs disabled debug msgs. +- Mark unwind info for signal trampolines in vDSOs + +* Wed Mar 1 2006 Juan Quintela +- disable ia64 build again. + +* Wed Mar 1 2006 Stephen Tweedie +- Rebase to xen kernel patches and HV from xen-unstable cset 9022 +- Delete xen cpu steal patches (now upstream) +- Delete xen_net_read_mac export patch (now upstream) +- Revert xen cset 8948 (vdso updates which execshield already performs) +- Delete unneeded linux-2.6-xen-gcc-4.1-compile-fix.patch + +* Wed Mar 1 2006 Juan Quintela +- remove xen ia64 bits, they break ia64 build. +- riel cpusteal hv fix. + +* Wed Mar 1 2006 Juan Quintela +- enable ia64 again + * Wed Mar 1 2006 Dave Jones - 2.6.16rc5-git4 - Fix leak in RAID1 @@ -1635,6 +1689,14 @@ - Enable PATA ports on Promise SATA. (#179369) - NFS: writes should not clobber utimes() calls. (#183208) +* Tue Feb 28 2006 Juan Quintela +- fix x86_64 xen build. + +* Tue Feb 28 2006 Juan Quintela +- rebase with rawhide 1.1993. +- enable ia64 again. +- rebase with rawhide 1.1991. + * Tue Feb 28 2006 Dave Jones - 2.6.16rc5-git3 @@ -1651,6 +1713,11 @@ * Sat Feb 25 2006 Dave Jones - 2.6.16rc4-git8 +* Fri Feb 24 2006 Stephen Tweedie +- Disable ia64 until we work out the Xen interactions +- Fix config confusion on ia64 +- Execshield/vdso fixes (quintela at redhat.com) + * Fri Feb 24 2006 Dave Jones - 2.6.16rc4-git7 @@ -1673,6 +1740,9 @@ - Make it possible to disable xen and kdump builds. - Add Xen cpu steal accounting code. +* Mon Feb 20 2006 Stephen Tweedie +- Rebase kernel xen patches to xen-unstable cset 8907 + * Sun Feb 20 2006 Dave Jones - Fix incorrect hardlink count in selinuxfs (#182001) linux-2.6-crashdump-common.patch: linux-2.6.12/Documentation/sysrq.txt | 8 linux-2.6.12/arch/i386/kernel/nmi.c | 1 linux-2.6.12/arch/i386/kernel/traps.c | 3 linux-2.6.12/arch/i386/mm/init.c | 47 +++++ linux-2.6.12/arch/i386/mm/pgtable.c | 2 linux-2.6.12/arch/ia64/kernel/process.c | 30 ++- linux-2.6.12/arch/ia64/kernel/traps.c | 6 linux-2.6.12/arch/ia64/mm/contig.c | 3 linux-2.6.12/arch/ia64/mm/discontig.c | 3 linux-2.6.12/arch/ia64/mm/init.c | 90 +++++++++ linux-2.6.12/arch/powerpc/kernel/process.c | 1 linux-2.6.12/arch/powerpc/kernel/traps.c | 3 linux-2.6.12/arch/powerpc/mm/mem.c | 29 +++ linux-2.6.12/arch/s390/kernel/traps.c | 6 linux-2.6.12/arch/x86_64/kernel/process.c | 2 linux-2.6.12/arch/x86_64/kernel/traps.c | 6 linux-2.6.12/arch/x86_64/mm/init.c | 32 +++ linux-2.6.12/drivers/char/sysrq.c | 2 linux-2.6.12/include/asm-generic/crashdump.h | 47 +++++ linux-2.6.12/include/asm-i386/crashdump.h | 123 +++++++++++++ linux-2.6.12/include/asm-i386/kmap_types.h | 4 linux-2.6.12/include/asm-ia64/crashdump.h | 72 +++++++ linux-2.6.12/include/asm-powerpc/crashdump.h | 61 ++++++ linux-2.6.12/include/asm-x86_64/crashdump.h | 86 +++++++++ linux-2.6.12/include/linux/kernel.h | 18 + linux-2.6.12/kernel/Makefile | 2 linux-2.6.12/kernel/dump.c | 246 +++++++++++++++++++++++++++ linux-2.6.12/kernel/panic.c | 4 linux-2.6.12/kernel/printk.c | 20 ++ linux-2.6.12/kernel/sched.c | 2 linux-2.6.13/arch/x86_64/mm/fault.c | 1 linux-2.6.13/drivers/char/sysrq.c | 5 32 files changed, 951 insertions(+), 14 deletions(-) Index: linux-2.6-crashdump-common.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-crashdump-common.patch,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- linux-2.6-crashdump-common.patch 13 Feb 2006 21:17:47 -0000 1.9 +++ linux-2.6-crashdump-common.patch 6 Mar 2006 16:31:46 -0000 1.10 @@ -239,15 +239,14 @@ +#endif /* _ASM_X86_64_CRASHDUMP_H */ --- linux-2.6.12/include/asm-i386/kmap_types.h.orig 2005-06-17 15:48:29.000000000 -0400 +++ linux-2.6.12/include/asm-i386/kmap_types.h 2005-08-18 14:23:59.000000000 -0400 -@@ -23,8 +23,10 @@ +@@ -23,7 +23,9 @@ D(10) KM_IRQ1, D(11) KM_SOFTIRQ0, D(12) KM_SOFTIRQ1, - D(13) KM_SWIOTLB, --D(14) KM_TYPE_NR -+D(14) KM_CRASHDUMP, -+D(15) KM_UNUSED, -+D(16) KM_TYPE_NR +-D(13) KM_TYPE_NR ++D(13) KM_CRASHDUMP, ++D(14) KM_UNUSED, ++D(15) KM_TYPE_NR }; #undef D @@ -890,14 +889,6 @@ * valid. The argument is a physical page number. --- linux-2.6.12/arch/i386/mm/pgtable.c.orig 2005-08-18 12:39:56.000000000 -0400 +++ linux-2.6.12/arch/i386/mm/pgtable.c 2005-08-18 14:23:58.000000000 -0400 -@@ -13,6 +13,7 @@ - #include - #include - #include -+#include - - #include - #include @@ -63,6 +64,8 @@ printk(KERN_INFO "%lu pages pagetables\n", ps.nr_page_table_pages); } linux-2.6-execshield-fixes.patch: linux-2.6.15.noarch/include/asm-i386/desc.h | 2 +- linux-exec-shield-curr.q/arch/i386/kernel/traps.c | 2 +- linux-exec-shield-curr.q/fs/proc/base.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) Index: linux-2.6-execshield-fixes.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-execshield-fixes.patch,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- linux-2.6-execshield-fixes.patch 15 Feb 2006 17:44:53 -0000 1.5 +++ linux-2.6-execshield-fixes.patch 6 Mar 2006 16:31:46 -0000 1.6 @@ -30,15 +30,15 @@ #endif #ifdef CONFIG_SECURITY E(PROC_TGID_ATTR, "attr", S_IFDIR|S_IRUGO|S_IXUGO), -diff -uNp linux-2.6.15.i686/include/asm-i386/desc.h.orig linux-2.6.15.i686/include/asm-i386/desc.h ---- linux-2.6.15.i686/include/asm-i386/desc.h.orig 2006-01-25 17:57:49.000000000 -0500 -+++ linux-2.6.15.i686/include/asm-i386/desc.h 2006-01-25 18:00:02.000000000 -0500 -@@ -208,7 +208,7 @@ static inline void set_user_cs(struct de +diff -uNp linux-2.6.15.noarch/include/asm-i386/desc.h.orig linux-2.6.15.noarch/include/asm-i386/desc.h +--- linux-2.6.15.noarch/include/asm-i386/desc.h.orig 2006-02-22 21:05:44.000000000 +0100 ++++ linux-2.6.15.noarch/include/asm-i386/desc.h 2006-02-22 21:09:15.000000000 +0100 +@@ -168,7 +168,7 @@ static inline void set_user_cs(struct de + } - #ifndef CONFIG_X86_XEN #define load_user_cs_desc(cpu, mm) \ - per_cpu(cpu_gdt_table, (cpu))[GDT_ENTRY_DEFAULT_USER_CS] = (mm)->context.user_cs -+ get_cpu_gdt_table(cpu)[GDT_ENTRY_DEFAULT_USER_CS] = (mm)->context.user_cs - #else - #define load_user_cs_desc(cpu, mm) \ - HYPERVISOR_update_descriptor(virt_to_machine(&get_cpu_gdt_table(cpu)[GDT_ENTRY_DEFAULT_USER_CS]), (u64)(mm)->context.user_cs.a | ((u64)(mm)->context.user_cs.b) << 32); ++ get_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); linux-2.6-execshield-vdso.patch: linux-2.6.15.noarch/arch/i386/kernel/sysenter.c | 71 +++++++++++-------- linux-2.6.15.xen/arch/i386/kernel/cpu/common-xen.c | 6 + linux/fs/binfmt_elf.c | 15 +--- linux/fs/proc/task_mmu.c | 9 +- linux/include/asm-i386/elf.h | 7 + linux/include/asm-i386/page.h | 5 + linux/include/linux/mm.h | 5 + linux/kernel/sysctl.c | 10 ++ linux/mm/mmap.c | 78 +++++++++++++++++++++ 9 files changed, 163 insertions(+), 43 deletions(-) Index: linux-2.6-execshield-vdso.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-execshield-vdso.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- linux-2.6-execshield-vdso.patch 9 Jan 2006 19:24:08 -0000 1.2 +++ linux-2.6-execshield-vdso.patch 6 Mar 2006 16:31:46 -0000 1.3 @@ -8,11 +8,10 @@ mm/mmap.c | 78 ++++++++++++++++++++++++++++++++++++++++++++ 8 files changed, 155 insertions(+), 43 deletions(-) -Index: linux/arch/i386/kernel/sysenter.c -=================================================================== ---- linux.orig/arch/i386/kernel/sysenter.c -+++ linux/arch/i386/kernel/sysenter.c -@@ -47,20 +47,13 @@ void enable_sep_cpu(void) +diff -uNp linux-2.6.15.noarch/arch/i386/kernel/sysenter.c.orig linux-2.6.15.noarch/arch/i386/kernel/sysenter.c +--- linux-2.6.15.noarch/arch/i386/kernel/sysenter.c.orig 2006-02-22 20:56:56.000000000 +0100 ++++ linux-2.6.15.noarch/arch/i386/kernel/sysenter.c 2006-02-22 21:04:49.000000000 +0100 +@@ -49,20 +49,13 @@ void enable_sep_cpu(void) extern const char vsyscall_int80_start, vsyscall_int80_end; extern const char vsyscall_sysenter_start, vsyscall_sysenter_end; @@ -33,9 +32,9 @@ - sysenter_page = virt_to_page(page); + sysenter_pages[0] = virt_to_page(page); - if (!boot_cpu_has(X86_FEATURE_SEP)) { - memcpy(page, -@@ -78,42 +71,58 @@ int __init sysenter_setup(void) + #ifdef CONFIG_X86_SYSENTER + if (boot_cpu_has(X86_FEATURE_SEP)) { +@@ -78,42 +71,60 @@ int __init sysenter_setup(void) extern void SYSENTER_RETURN_OFFSET; @@ -98,6 +97,7 @@ } -static int __init vdso_setup(char *str) ++#ifndef CONFIG_XEN +int in_gate_area_no_task(unsigned long addr) { - vdso_enabled = simple_strtoul(str, NULL, 0); @@ -115,6 +115,23 @@ +{ + return NULL; +} ++#endif +diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff linux-2.6.15.orig/arch/i386/kernel/cpu/common-xen.c linux-2.6.15.xen/arch/i386/kernel/cpu/common-xen.c +--- linux-2.6.15.orig/arch/i386/kernel/cpu/common-xen.c 2006-02-22 15:56:20.000000000 +0100 ++++ linux-2.6.15.xen/arch/i386/kernel/cpu/common-xen.c 2006-02-22 18:26:45.000000000 +0100 +@@ -409,6 +409,12 @@ void __devinit identify_cpu(struct cpuin + if (disable_pse) + clear_bit(X86_FEATURE_PSE, c->x86_capability); + ++ if (exec_shield != 0) { ++#ifdef CONFIG_HIGHMEM64G /* NX implies PAE */ ++ if (!test_bit(X86_FEATURE_NX, c->x86_capability)) ++#endif ++ clear_bit(X86_FEATURE_SEP, c->x86_capability); ++ } + /* If the model name is still unset, do table lookup. */ + if ( !c->x86_model_id[0] ) { + char *p; Index: linux/fs/binfmt_elf.c =================================================================== --- linux.orig/fs/binfmt_elf.c linux-2.6-execshield-xen.patch: arch/i386/kernel/entry-xen.S | 8 - arch/i386/kernel/process-xen.c | 58 +++++++ arch/i386/kernel/smp-xen.c | 2 arch/i386/kernel/traps-xen.c | 92 +++++++++++- arch/i386/mm/init-xen.c | 11 + linux-2.6.15.i686/include/asm-x86_64/mach-xen/asm/pgtable.h | 2 linux-2.6.15.noarch/arch/x86_64/kernel/setup64-xen.c | 23 --- 7 files changed, 166 insertions(+), 30 deletions(-) Index: linux-2.6-execshield-xen.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-execshield-xen.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- linux-2.6-execshield-xen.patch 13 Feb 2006 21:17:47 -0000 1.2 +++ linux-2.6-execshield-xen.patch 6 Mar 2006 16:31:47 -0000 1.3 @@ -120,10 +120,10 @@ index 0f7199b..878c084 100644 --- a/arch/i386/kernel/traps-xen.c +++ b/arch/i386/kernel/traps-xen.c -@@ -459,11 +459,89 @@ DO_ERROR_INFO(17, SIGBUS, "alignment che - #ifdef CONFIG_X86_MCE - DO_ERROR(18, SIGBUS, "machine check", machine_check) - #endif +@@ -459,13 +459,99 @@ DO_ERROR_INFO(17, SIGBUS, "alignment che + DO_ERROR(11, SIGBUS, "segment not present", segment_not_present) + DO_ERROR(12, SIGBUS, "stack segment", stack_segment) + DO_ERROR_INFO(17, SIGBUS, "alignment check", alignment_check, BUS_ADRALN, 0) -DO_ERROR_INFO(32, SIGSEGV, "iret exception", iret_error, ILL_BADSTK, 0) + + @@ -205,24 +205,11 @@ fastcall void __kprobes do_general_protection(struct pt_regs * regs, long error_code) { +- current->thread.error_code = error_code; +- current->thread.trap_no = 13; + int cpu = get_cpu(); + int ok; + - /* - * If we trapped on an LDT access then ensure that the default_ldt is - * loaded, if nothing else. We load default_ldt lazily because LDT -@@ -473,13 +551,22 @@ fastcall void __kprobes do_general_prote - unsigned long ldt; - __asm__ __volatile__ ("sldt %0" : "=r" (ldt)); - if (ldt == 0) { -+ put_cpu(); - xen_set_ldt((unsigned long)&default_ldt[0], 5); - return; - } - } - -- current->thread.error_code = error_code; -- current->thread.trap_no = 13; + ok = check_lazy_exec_limit(cpu, regs, error_code); + put_cpu(); + @@ -280,22 +267,6 @@ pagetable_init(); ---- linux-2.6.14/include/asm-i386/desc.h~ 2006-01-06 17:09:44.000000000 -0500 -+++ linux-2.6.14/include/asm-i386/desc.h 2006-01-06 17:22:41.000000000 -0500 -@@ -210,8 +210,13 @@ - desc->b = (limit & 0xf0000) | 0x00c0fb00; - } - -+#ifndef CONFIG_X86_XEN - #define load_user_cs_desc(cpu, mm) \ - per_cpu(cpu_gdt_table, (cpu))[GDT_ENTRY_DEFAULT_USER_CS] = (mm)->context.user_cs -+#else -+#define load_user_cs_desc(cpu, mm) \ -+ HYPERVISOR_update_descriptor(virt_to_machine(&get_cpu_gdt_table(cpu)[GDT_ENTRY_DEFAULT_USER_CS]), (u64)(mm)->context.user_cs.a | ((u64)(mm)->context.user_cs.b) << 32); -+#endif - - 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); diff -urNp --exclude-from=/home/mitica/quintela/config/misc/dontdiff linux-2.6.15.orig/arch/x86_64/kernel/setup64-xen.c linux-2.6.15.noarch/arch/x86_64/kernel/setup64-xen.c --- linux-2.6.15.orig/arch/x86_64/kernel/setup64-xen.c 2006-02-10 20:25:28.000000000 +0100 +++ linux-2.6.15.noarch/arch/x86_64/kernel/setup64-xen.c 2006-02-10 21:27:22.000000000 +0100 @@ -337,3 +308,15 @@ /* * Great future plan: +diff -uNp linux-2.6.15.i686/include/asm-x86_64/mach-xen/asm/pgtable.h.orig linux-2.6.15.i686/include/asm-x86_64/mach-xen/asm/pgtable.h +--- linux-2.6.15.i686/include/asm-x86_64/mach-xen/asm/pgtable.h.orig 2006-02-23 16:50:14.000000000 +0100 ++++ linux-2.6.15.i686/include/asm-x86_64/mach-xen/asm/pgtable.h 2006-02-23 16:59:04.000000000 +0100 +@@ -44,7 +44,7 @@ extern unsigned long __supported_pte_mas + + #define swapper_pg_dir init_level4_pgt + +-extern void nonx_setup(char *str); ++extern void nonx_setup(const char *str); + extern void paging_init(void); + extern void clear_kernel_mapping(unsigned long addr, unsigned long size); + linux-2.6-execshield.patch: arch/i386/kernel/asm-offsets.c | 1 arch/i386/kernel/cpu/common.c | 7 + 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 | 56 ++++++++++++++- arch/i386/kernel/traps.c | 93 ++++++++++++++++++++++++- 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 | 4 - arch/x86_64/kernel/process.c | 6 - arch/x86_64/kernel/setup64.c | 23 ------ arch/x86_64/mm/fault.c | 2 drivers/char/random.c | 7 + fs/binfmt_elf.c | 130 ++++++++++++++++++++++++++++------- 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 | 7 + include/asm-i386/thread_info.h | 1 include/asm-ia64/pgalloc.h | 4 + include/asm-powerpc/pgalloc.h | 5 + include/asm-ppc/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/pgtable.h | 2 include/asm-x86_64/processor.h | 2 include/linux/mm.h | 11 ++ 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 | 16 ++-- mm/mmap.c | 105 ++++++++++++++++++++++++++-- mm/mprotect.c | 5 + mm/mremap.c | 4 - 47 files changed, 684 insertions(+), 123 deletions(-) Index: linux-2.6-execshield.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-execshield.patch,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- linux-2.6-execshield.patch 18 Jan 2006 06:03:01 -0000 1.10 +++ linux-2.6-execshield.patch 6 Mar 2006 16:31:47 -0000 1.11 @@ -227,12 +227,13 @@ #include #include -@@ -36,7 +37,7 @@ void enable_sep_cpu(void) +@@ -36,8 +37,8 @@ void enable_sep_cpu(void) wrmsr(MSR_IA32_SYSENTER_CS, __KERNEL_CS, 0); wrmsr(MSR_IA32_SYSENTER_ESP, tss->esp1, 0); wrmsr(MSR_IA32_SYSENTER_EIP, (unsigned long) sysenter_entry, 0); - put_cpu(); + put_cpu(); + #endif } /* linux-2.6-xen-compile-fixes.patch: arch/i386/kernel/acpi/boot-xen.c | 3 +- linux-2.6.15.ia64/fs/Kconfig | 1 linux-2.6.15.xen/arch/i386/kernel/Makefile | 3 -- linux-2.6.15.xen/arch/i386/kernel/smp-xen.c | 1 linux-2.6.15.xen/arch/i386/mm/init-xen.c | 1 linux-2.6.15.xen/arch/x86_64/kernel/pmtimer.c | 2 + linux-2.6.15.xen/arch/x86_64/kernel/process-xen.c | 6 ---- linux-2.6.15.xen/arch/x86_64/mm/fault-xen.c | 2 - linux-2.6.15.xen/include/asm-i386/mach-xen/asm/desc.h | 14 +++++++++++ linux-2.6.15.xen/include/asm-i386/mach-xen/asm/mmu.h | 7 +++++ linux-2.6.15.xen/include/asm-i386/mach-xen/asm/pgalloc.h | 1 linux-2.6.15.xen/include/asm-i386/mach-xen/asm/processor.h | 7 ++++- linux-2.6.15.xen/include/asm-i386/mach-xen/asm/swiotlb.h | 1 linux-2.6.15.xen/include/asm-x86_64/mach-xen/asm/pgalloc.h | 7 +++++ linux-2.6.15.xen/include/asm-x86_64/mach-xen/asm/pgtable.h | 2 - linux-2.6.15.xen/include/asm-x86_64/mach-xen/asm/processor.h | 2 + 16 files changed, 47 insertions(+), 13 deletions(-) Index: linux-2.6-xen-compile-fixes.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-xen-compile-fixes.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- linux-2.6-xen-compile-fixes.patch 13 Feb 2006 21:17:47 -0000 1.1 +++ linux-2.6-xen-compile-fixes.patch 6 Mar 2006 16:31:47 -0000 1.2 @@ -1,51 +1,233 @@ -diff -urNp --exclude-from=/home/mitica/quintela/config/misc/dontdiff linux-2.6.15.orig/arch/x86_64/kernel/apic-xen.c linux-2.6.15.noarch/arch/x86_64/kernel/apic-xen.c ---- linux-2.6.15.orig/arch/x86_64/kernel/apic-xen.c 2006-02-10 20:25:27.000000000 +0100 -+++ linux-2.6.15.noarch/arch/x86_64/kernel/apic-xen.c 2006-02-11 03:11:49.000000000 +0100 -@@ -42,6 +42,15 @@ - int apic_verbosity; - int disable_apic; - -+/* -+ * 'what should we do if we get a hw irq event on an illegal vector'. -+ * each architecture has to answer this themselves. -+ */ -+void ack_bad_irq(unsigned int irq) +diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff linux-2.6.15.orig/arch/i386/mm/init-xen.c linux-2.6.15.xen/arch/i386/mm/init-xen.c +--- linux-2.6.15.orig/arch/i386/mm/init-xen.c 2006-02-22 15:56:24.000000000 +0100 ++++ linux-2.6.15.xen/arch/i386/mm/init-xen.c 2006-02-22 18:56:27.000000000 +0100 +@@ -34,6 +34,7 @@ + #include + #include + #include ++#include + #include + #include + #include +diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff linux-2.6.15.orig/arch/x86_64/kernel/process-xen.c linux-2.6.15.xen/arch/x86_64/kernel/process-xen.c +--- linux-2.6.15.orig/arch/x86_64/kernel/process-xen.c 2006-02-22 15:56:20.000000000 +0100 ++++ linux-2.6.15.xen/arch/x86_64/kernel/process-xen.c 2006-02-22 18:32:50.000000000 +0100 +@@ -618,12 +618,6 @@ void set_personality_64bit(void) + + /* Make sure to be in 64bit mode */ + clear_thread_flag(TIF_IA32); +- +- /* TBD: overwrites user setup. Should have two bits. +- But 64bit processes have always behaved this way, +- so it's not too bad. The main problem is just that +- 32bit childs are affected again. */ +- current->personality &= ~READ_IMPLIES_EXEC; + } + + asmlinkage long sys_fork(struct pt_regs *regs) +diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff linux-2.6.15.orig/arch/x86_64/mm/fault-xen.c linux-2.6.15.xen/arch/x86_64/mm/fault-xen.c +--- linux-2.6.15.orig/arch/x86_64/mm/fault-xen.c 2006-02-22 15:56:20.000000000 +0100 ++++ linux-2.6.15.xen/arch/x86_64/mm/fault-xen.c 2006-02-22 18:34:19.000000000 +0100 +@@ -80,7 +80,7 @@ static noinline int is_prefetch(struct p + instr = (unsigned char *)convert_rip_to_linear(current, regs); + max_instr = instr + 15; + +- if (user_mode(regs) && instr >= (unsigned char *)TASK_SIZE) ++ if (user_mode(regs) && instr >= (unsigned char *)TASK_SIZE64) + return 0; + + while (scan_more && instr < max_instr) { +diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff linux-2.6.15.orig/include/asm-i386/mach-xen/asm/desc.h linux-2.6.15.xen/include/asm-i386/mach-xen/asm/desc.h +--- linux-2.6.15.orig/include/asm-i386/mach-xen/asm/desc.h 2006-02-22 15:56:20.000000000 +0100 ++++ linux-2.6.15.xen/include/asm-i386/mach-xen/asm/desc.h 2006-02-22 18:46:35.000000000 +0100 +@@ -157,6 +157,20 @@ static inline unsigned long get_desc_bas + return base; + } + ++static inline void set_user_cs(struct desc_struct *desc, unsigned long limit) +{ -+ printk("unexpected IRQ trap at vector %02x\n", irq); ++ limit = (limit - 1) / PAGE_SIZE; ++ desc->a = limit & 0xffff; ++ desc->b = (limit & 0xf0000) | 0x00c0fb00; +} + - void smp_local_timer_interrupt(struct pt_regs *regs) - { - profile_tick(CPU_PROFILING, regs); -diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff linux-2.6.15.x86_64/arch/i386/mm/init-xen.c linux-2.6.15.new/arch/i386/mm/init-xen.c ---- linux-2.6.15.x86_64/arch/i386/mm/init-xen.c 2006-02-11 19:15:39.000000000 +0100 -+++ linux-2.6.15.new/arch/i386/mm/init-xen.c 2006-02-11 16:24:12.000000000 +0100 -@@ -459,6 +459,7 @@ void zap_low_mappings (void) - - static int disable_nx __initdata = 0; - u64 __supported_pte_mask __read_mostly = ~_PAGE_NX; -+EXPORT_SYMBOL(__supported_pte_mask); ++#define load_user_cs_desc(cpu, mm) \ ++ HYPERVISOR_update_descriptor(virt_to_machine(&get_cpu_gdt_table(cpu)[GDT_ENTRY_DEFAULT_USER_CS]), (u64)(mm)->context.user_cs.a | ((u64)(mm)->context.user_cs.b) << 32); ++ ++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__ */ - /* - * noexec = on|off -diff -uNp linux-2.6.15.noarch/arch/x86_64/kernel/genapic-xen.c.orig linux-2.6.15.noarch/arch/x86_64/kernel/genapic-xen.c ---- linux-2.6.15.noarch/arch/x86_64/kernel/genapic-xen.c.orig 2006-02-11 20:17:49.000000000 +0100 -+++ linux-2.6.15.noarch/arch/x86_64/kernel/genapic-xen.c 2006-02-11 20:18:09.000000000 +0100 -@@ -39,6 +39,17 @@ extern struct genapic apic_xen; - struct genapic *genapic = &apic_xen; #endif +diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff linux-2.6.15.orig/include/asm-i386/mach-xen/asm/mmu.h linux-2.6.15.xen/include/asm-i386/mach-xen/asm/mmu.h +--- linux-2.6.15.orig/include/asm-i386/mach-xen/asm/mmu.h 2006-02-22 15:56:20.000000000 +0100 ++++ linux-2.6.15.xen/include/asm-i386/mach-xen/asm/mmu.h 2006-02-22 18:17:34.000000000 +0100 +@@ -7,11 +7,18 @@ + * 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; -+#ifndef CONFIG_X86_LOCAL_APIC -+/* -+ * 'what should we do if we get a hw irq event on an illegal vector'. -+ * each architecture has to answer this themselves. -+ */ -+void ack_bad_irq(unsigned int irq) -+{ -+ printk("unexpected IRQ trap at vector %02x\n", irq); -+} -+#endif + /* mm/memory.c:exit_mmap hook */ +diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff linux-2.6.15.orig/include/asm-i386/mach-xen/asm/pgalloc.h linux-2.6.15.xen/include/asm-i386/mach-xen/asm/pgalloc.h +--- linux-2.6.15.orig/include/asm-i386/mach-xen/asm/pgalloc.h 2006-02-22 15:56:20.000000000 +0100 ++++ linux-2.6.15.xen/include/asm-i386/mach-xen/asm/pgalloc.h 2006-02-22 18:17:59.000000000 +0100 +@@ -3,6 +3,7 @@ + + #include + #include ++#include + #include + #include /* for struct page */ + #include /* for phys_to_virt and page_to_pseudophys */ +diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff linux-2.6.15.orig/include/asm-i386/mach-xen/asm/processor.h linux-2.6.15.xen/include/asm-i386/mach-xen/asm/processor.h +--- linux-2.6.15.orig/include/asm-i386/mach-xen/asm/processor.h 2006-02-22 15:56:20.000000000 +0100 ++++ linux-2.6.15.xen/include/asm-i386/mach-xen/asm/processor.h 2006-02-22 18:42:49.000000000 +0100 +@@ -335,7 +335,9 @@ 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 + + #define HAVE_ARCH_PICK_MMAP_LAYOUT + +@@ -530,6 +532,9 @@ static inline void __load_esp0(struct ts + 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) /* - * Check the APIC IDs in bios_cpu_apicid and choose the APIC mode. +diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff linux-2.6.15.orig/include/asm-i386/mach-xen/asm/swiotlb.h linux-2.6.15.xen/include/asm-i386/mach-xen/asm/swiotlb.h +--- linux-2.6.15.orig/include/asm-i386/mach-xen/asm/swiotlb.h 2006-02-22 15:56:20.000000000 +0100 ++++ linux-2.6.15.xen/include/asm-i386/mach-xen/asm/swiotlb.h 2006-02-22 19:53:16.000000000 +0100 +@@ -2,6 +2,7 @@ + #define _ASM_SWIOTLB_H 1 + + #include ++#include + + /* SWIOTLB interface */ + +diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff linux-2.6.15.orig/include/asm-x86_64/mach-xen/asm/pgalloc.h linux-2.6.15.xen/include/asm-x86_64/mach-xen/asm/pgalloc.h +--- linux-2.6.15.orig/include/asm-x86_64/mach-xen/asm/pgalloc.h 2006-02-22 15:56:20.000000000 +0100 ++++ linux-2.6.15.xen/include/asm-x86_64/mach-xen/asm/pgalloc.h 2006-02-22 18:24:18.000000000 +0100 +@@ -7,6 +7,13 @@ + #include + #include /* for phys_to_virt and page_to_pseudophys */ + ++#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) ++ + #include + void make_page_readonly(void *va, unsigned int feature); + void make_page_writable(void *va, unsigned int feature); +diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff linux-2.6.15.orig/include/asm-x86_64/mach-xen/asm/pgtable.h linux-2.6.15.xen/include/asm-x86_64/mach-xen/asm/pgtable.h +--- linux-2.6.15.orig/include/asm-x86_64/mach-xen/asm/pgtable.h 2006-02-22 15:56:20.000000000 +0100 ++++ linux-2.6.15.xen/include/asm-x86_64/mach-xen/asm/pgtable.h 2006-02-22 18:24:57.000000000 +0100 +@@ -44,7 +44,7 @@ extern unsigned long __supported_pte_mas + + #define swapper_pg_dir init_level4_pgt + +-extern int nonx_setup(char *str); ++extern void nonx_setup(char *str); + extern void paging_init(void); + extern void clear_kernel_mapping(unsigned long addr, unsigned long size); + +diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff linux-2.6.15.orig/include/asm-x86_64/mach-xen/asm/processor.h linux-2.6.15.xen/include/asm-x86_64/mach-xen/asm/processor.h +--- linux-2.6.15.orig/include/asm-x86_64/mach-xen/asm/processor.h 2006-02-22 15:56:20.000000000 +0100 ++++ linux-2.6.15.xen/include/asm-x86_64/mach-xen/asm/processor.h 2006-02-22 18:25:18.000000000 +0100 +@@ -180,6 +180,8 @@ static inline void clear_in_cr4 (unsigne + */ + #define TASK_SIZE64 (0x800000000000UL - 4096) + ++#define __HAVE_ARCH_ALIGN_STACK ++ + /* This decides where the kernel will search for a free chunk of vm + * space during mmap's. + */ +diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff linux-2.6.15.orig/arch/i386/kernel/Makefile linux-2.6.15.xen/arch/i386/kernel/Makefile +--- linux-2.6.15.orig/arch/i386/kernel/Makefile 2006-02-22 15:56:20.000000000 +0100 ++++ linux-2.6.15.xen/arch/i386/kernel/Makefile 2006-02-22 17:08:31.000000000 +0100 +@@ -83,8 +83,7 @@ $(obj)/built-in.o: ld_flags += -R $(obj) + + SYSCFLAGS_vsyscall-syms.o = -r + $(obj)/vsyscall-syms.o: $(src)/vsyscall.lds \ +- $(foreach F,$(VSYSCALL_TYPES-y),$(obj)/vsyscall-$F.o) \ +- $(obj)/$(vsyscall_note) FORCE ++ $(obj)/vsyscall-sysenter.o $(obj)/$(vsyscall_note) FORCE + $(call if_changed,syscall) + + ifdef CONFIG_XEN +diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff linux-2.6.15.orig/arch/i386/kernel/smp-xen.c linux-2.6.15.xen/arch/i386/kernel/smp-xen.c +--- linux-2.6.15.orig/arch/i386/kernel/smp-xen.c 2006-02-22 15:56:21.000000000 +0100 ++++ linux-2.6.15.xen/arch/i386/kernel/smp-xen.c 2006-02-22 18:29:12.000000000 +0100 +@@ -23,6 +23,7 @@ + + #include + #include ++#include + #if 0 + #include + #endif +--- linux-2.6.15.ia64/fs/Kconfig~ 2006-02-24 14:14:42.000000000 -0500 ++++ linux-2.6.15.ia64/fs/Kconfig 2006-02-24 14:38:17.000000000 -0500 +@@ -841,7 +841,6 @@ + config HUGETLBFS + bool "HugeTLB file system support" + depends X86 || IA64 || PPC64 || SPARC64 || SUPERH || BROKEN +- depends !XEN + + config HUGETLB_PAGE + def_bool HUGETLBFS +diff -urNp --exclude-from=/home/mitica/quintela/config/misc/dontdiff kernel-2.6.15/linux-2.6.15.noarch/arch/x86_64/kernel/pmtimer.c linux-2.6.15.xen/arch/x86_64/kernel/pmtimer.c +--- kernel-2.6.15/linux-2.6.15.noarch/arch/x86_64/kernel/pmtimer.c 2006-02-28 22:47:11.000000000 +0100 ++++ linux-2.6.15.xen/arch/x86_64/kernel/pmtimer.c 2006-02-28 22:37:45.000000000 +0100 +@@ -60,8 +60,10 @@ int pmtimer_mark_offset(void) + delta = cyc2us((tick - last_pmtmr_tick) & ACPI_PM_MASK); + + last_pmtmr_tick = tick; ++#ifndef CONFIG_XEN + monotonic_base += delta * NSEC_PER_USEC; ++#endif + + delta += offset_delay; + + +--- linux-2.6.15.i686/arch/i386/kernel/acpi/boot-xen.c 2006-03-02 19:47:26.000000000 +0100 ++++ linux-2.6.15.noarch/arch/i386/kernel/acpi/boot-xen.c 2006-03-02 22:00:11.000000000 +0100 +@@ -230,8 +230,9 @@ static int __init acpi_parse_madt(unsign + madt->lapic_address); + } + ++#ifndef CONFIG_X86_64 + acpi_madt_oem_check(madt->header.oem_id, madt->header.oem_table_id); +- ++#endif + return 0; + } + Index: sources =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/sources,v retrieving revision 1.312 retrieving revision 1.313 diff -u -r1.312 -r1.313 --- sources 5 Mar 2006 08:52:50 -0000 1.312 +++ sources 6 Mar 2006 16:32:22 -0000 1.313 @@ -1,4 +1,4 @@ cdf95e00f5111e31f78e1d97304d9522 linux-2.6.15.tar.bz2 -30f4ef37dbc4d0bce9366e8716e8b51b xen-20060208.tar.bz2 1740ae34807f687a93adf2469ea5c4fc patch-2.6.16-rc5.bz2 +cdfde609af8adcf58d7ff626599b2d90 xen-20060301.tar.bz2 ac2274a7e960b780325805e050ad5cee patch-2.6.16-rc5-git8.bz2 --- linux-2.6-xen-acpi.patch DELETED --- --- linux-2.6-xen-cpusteal-kernel.patch DELETED --- --- linux-2.6-xen-gcc-4.1-compile-fix.patch DELETED --- --- linux-2.6-xen-guest-enable-char-devices.patch DELETED --- --- linux-2.6-xen-merge.patch DELETED --- --- linux-2.6-xen-x86_64-fixes.patch DELETED --- --- linux-2.6-xen_net_read_mac_export.patch DELETED --- From fedora-cvs-commits at redhat.com Mon Mar 6 16:56:40 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 6 Mar 2006 11:56:40 -0500 Subject: rpms/kernel/devel Makefile.config, 1.34, 1.35 kernel-2.6.spec, 1.2017, 1.2018 Message-ID: <200603061656.k26Guea4025892@cvs.devel.redhat.com> Author: sct Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv25752 Modified Files: Makefile.config kernel-2.6.spec Log Message: Rename kernel-xen-(hypervisor|guest) to kernel-xen(0|U) for consistency with upstream and to make kernel subtype suffixes match the subpackage names. (From Jeremy Katz.) Index: Makefile.config =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/Makefile.config,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- Makefile.config 15 Feb 2006 00:52:14 -0000 1.34 +++ Makefile.config 6 Mar 2006 16:56:38 -0000 1.35 @@ -12,9 +12,9 @@ $(CFG)-s390.config $(CFG)-s390x.config \ $(CFG)-ppc.config $(CFG)-ppc-smp.config \ $(CFG)-ppc64.config $(CFG)-ia64.config \ - $(CFG)-i686-hypervisor.config $(CFG)-i686-guest.config \ - $(CFG)-i686-hypervisor-PAE.config $(CFG)-i686-guest-PAE.config \ - $(CFG)-x86_64-hypervisor.config $(CFG)-x86_64-guest.config + $(CFG)-i686-xen0.config $(CFG)-i686-xenU.config \ + $(CFG)-i686-xen0-PAE.config $(CFG)-i686-xenU-PAE.config \ + $(CFG)-x86_64-xen0.config $(CFG)-x86_64-xenU.config PLATFORMS = x86 x86_64 powerpc powerpc32 powerpc64 s390 ia64 # sparc sparc64 TEMPFILES = $(addprefix temp-, $(addsuffix -generic, $(PLATFORMS))) @@ -120,21 +120,21 @@ kernel-$(VERSION)-ia64.config: configs/config-ia64 temp-ia64-generic perl scripts/merge.pl $^ ia64 > $@ -kernel-$(VERSION)-i686-hypervisor.config: configs/config-xen-xen0 temp-x86-xen-generic +kernel-$(VERSION)-i686-xen0.config: configs/config-xen-xen0 temp-x86-xen-generic perl scripts/merge.pl $^ i386 > $@ -kernel-$(VERSION)-i686-hypervisor-PAE.config: configs/config-xen-xen0-PAE temp-x86-xen-generic +kernel-$(VERSION)-i686-xen0-PAE.config: configs/config-xen-xen0-PAE temp-x86-xen-generic perl scripts/merge.pl $^ i386 > $@ -kernel-$(VERSION)-i686-guest.config: configs/config-xen-xenU temp-x86-xen-generic +kernel-$(VERSION)-i686-xenU.config: configs/config-xen-xenU temp-x86-xen-generic perl scripts/merge.pl $^ i386 > $@ -kernel-$(VERSION)-i686-guest-PAE.config: configs/config-xen-xenU-PAE temp-x86-xen-generic +kernel-$(VERSION)-i686-xenU-PAE.config: configs/config-xen-xenU-PAE temp-x86-xen-generic perl scripts/merge.pl $^ i386 > $@ -kernel-$(VERSION)-x86_64-hypervisor.config: configs/config-xen-xen0 temp-x86_64-xen-generic +kernel-$(VERSION)-x86_64-xen0.config: configs/config-xen-xen0 temp-x86_64-xen-generic perl scripts/merge.pl $^ x86_64 > $@ -kernel-$(VERSION)-x86_64-guest.config: configs/config-xen-xenU temp-x86_64-xen-generic +kernel-$(VERSION)-x86_64-xenU.config: configs/config-xen-xenU temp-x86_64-xen-generic perl scripts/merge.pl $^ x86_64 > $@ Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.2017 retrieving revision 1.2018 diff -u -r1.2017 -r1.2018 --- kernel-2.6.spec 6 Mar 2006 16:31:46 -0000 1.2017 +++ kernel-2.6.spec 6 Mar 2006 16:56:38 -0000 1.2018 @@ -203,17 +203,17 @@ Source28: kernel-%{kversion}-ppc.config Source29: kernel-%{kversion}-ppc-smp.config Source30: kernel-%{kversion}-ia64.config -Source31: kernel-%{kversion}-i686-hypervisor.config -Source32: kernel-%{kversion}-i686-guest.config +Source31: kernel-%{kversion}-i686-xen0.config +Source32: kernel-%{kversion}-i686-xenU.config Source33: kernel-%{kversion}-i686-kdump.config Source33: kernel-%{kversion}-x86_64-kdump.config #Source34: kernel-%{kversion}-sparc.config #Source35: kernel-%{kversion}-sparc64.config #Source36: kernel-%{kversion}-sparc64-smp.config -Source37: kernel-%{kversion}-i686-hypervisor-PAE.config -Source38: kernel-%{kversion}-i686-guest-PAE.config -Source39: kernel-%{kversion}-x86_64-hypervisor.config -Source40: kernel-%{kversion}-x86_64-guest.config +Source37: kernel-%{kversion}-i686-xen0-PAE.config +Source38: kernel-%{kversion}-i686-xenU-PAE.config +Source39: kernel-%{kversion}-x86_64-xen0.config +Source40: kernel-%{kversion}-x86_64-xenU.config # # Patches 0 through 100 are meant for core subsystem upgrades @@ -497,12 +497,12 @@ This package provides kernel headers and makefiles sufficient to build modules against the SMP kernel package. -%package xen-hypervisor +%package xen0 Summary: The Linux kernel compiled for Xen guest0 VM operations Group: System Environment/Kernel Provides: kernel = %{version} -Provides: kernel-%{_target_cpu} = %{rpmversion}-%{release}hypervisor +Provides: kernel-%{_target_cpu} = %{rpmversion}-%{release}xen0 Prereq: %{kernel_prereq} Requires: xen Conflicts: %{kernel_dot_org_conflicts} @@ -515,47 +515,46 @@ # isn't required for the kernel proper to function AutoReqProv: no -%description xen-hypervisor +%description xen0 This package includes a version of the Linux kernel which runs in Xen's guest0 VM and provides device services to the unprivileged guests. Install this package in your Xen guest0 environment. - -%package xen-hypervisor-devel +%package xen0-devel Summary: Development package for building kernel modules to match the kernel. Group: System Environment/Kernel AutoReqProv: no -Provides: kernel-xen-hypervisor-devel-%{_target_cpu} = %{rpmversion}-%{release} -Provides: kernel-devel-%{_target_cpu} = %{rpmversion}-%{release}hypervisor -Provides: kernel-devel = %{rpmversion}-%{release}hypervisor +Provides: kernel-xen0-devel-%{_target_cpu} = %{rpmversion}-%{release} +Provides: kernel-devel-%{_target_cpu} = %{rpmversion}-%{release}xen0 +Provides: kernel-devel = %{rpmversion}-%{release}xen0 Prereq: /usr/sbin/hardlink, /usr/bin/find -%description xen-hypervisor-devel +%description xen0-devel This package provides kernel headers and makefiles sufficient to build modules against the kernel package. -%package xen-hypervisor-PAE +%package xen0-PAE Summary: The Linux kernel compiled for Xen guest0 VM operations with PAE support Group: System Environment/Kernel Provides: kernel = %{version} -Provides: kernel-%{_target_cpu} = %{rpmversion}-%{release}hypervisor-PAE +Provides: kernel-%{_target_cpu} = %{rpmversion}-%{release}xen0-PAE Prereq: %{kernel_prereq} Requires: xen Conflicts: %{kernel_dot_org_conflicts} Conflicts: %{package_conflicts} Conflicts: %{xen_conflicts} -# the hypervisor-PAE kernel needs a newer mkinitrd than everything else right now +# the xen0-PAE kernel needs a newer mkinitrd than everything else right now Conflicts: mkinitrd <= 4.2.0 # We can't let RPM do the dependencies automatic because it'll then pick up # a correct but undesirable perl dependency from the module headers which # isn't required for the kernel proper to function AutoReqProv: no -%description xen-hypervisor-PAE +%description xen0-PAE This package includes a version of the Linux kernel which runs in Xen's guest0 VM with PAE support and provides device services to the unprivileged guests. @@ -563,25 +562,25 @@ Install this package in your Xen guest0 environment. -%package xen-hypervisor-PAE-devel +%package xen0-PAE-devel Summary: Development package for building kernel modules to match the kernel. Group: System Environment/Kernel AutoReqProv: no -Provides: kernel-xen-hypervisor-PAE-devel-%{_target_cpu} = %{rpmversion}-%{release} -Provides: kernel-devel-%{_target_cpu} = %{rpmversion}-%{release}hypervisor-PAE -Provides: kernel-devel = %{rpmversion}-%{release}hypervisor-PAE +Provides: kernel-xen0-PAE-devel-%{_target_cpu} = %{rpmversion}-%{release} +Provides: kernel-devel-%{_target_cpu} = %{rpmversion}-%{release}xen0-PAE +Provides: kernel-devel = %{rpmversion}-%{release}xen0-PAE Prereq: /usr/sbin/hardlink, /usr/bin/find -%description xen-hypervisor-PAE-devel +%description xen0-PAE-devel This package provides kernel headers and makefiles sufficient to build modules against the kernel package. -%package xen-guest +%package xenU Summary: The Linux kernel compiled for unprivileged Xen guest VMs Group: System Environment/Kernel Provides: kernel = %{version} -Provides: kernel-%{_target_cpu} = %{rpmversion}-%{release}guest +Provides: kernel-%{_target_cpu} = %{rpmversion}-%{release}xenU Prereq: %{kernel_prereq} Conflicts: %{kernel_dot_org_conflicts} Conflicts: %{package_conflicts} @@ -591,31 +590,31 @@ # isn't required for the kernel proper to function AutoReqProv: no -%description xen-guest +%description xenU This package includes a version of the Linux kernel which runs in Xen unprivileged guest VMs. This should be installed both inside the unprivileged guest (for the modules) and in the guest0 domain. -%package xen-guest-devel +%package xenU-devel Summary: Development package for building kernel modules to match the kernel. Group: System Environment/Kernel AutoReqProv: no -Provides: kernel-xen-guest-devel-%{_target_cpu} = %{rpmversion}-%{release} -Provides: kernel-devel-%{_target_cpu} = %{rpmversion}-%{release}guest -Provides: kernel-devel = %{rpmversion}-%{release}guest +Provides: kernel-xenU-devel-%{_target_cpu} = %{rpmversion}-%{release} +Provides: kernel-devel-%{_target_cpu} = %{rpmversion}-%{release}xenU +Provides: kernel-devel = %{rpmversion}-%{release}xenU Prereq: /usr/sbin/hardlink, /usr/bin/find -%description xen-guest-devel +%description xenU-devel This package provides kernel headers and makefiles sufficient to build modules against the kernel package. -%package xen-guest-PAE +%package xenU-PAE Summary: The Linux kernel compiled for unprivileged Xen guest VMs with PAE support Group: System Environment/Kernel Provides: kernel = %{version} -Provides: kernel-%{_target_cpu} = %{rpmversion}-%{release}guest-PAE +Provides: kernel-%{_target_cpu} = %{rpmversion}-%{release}xenU-PAE Prereq: %{kernel_prereq} Conflicts: %{kernel_dot_org_conflicts} Conflicts: %{package_conflicts} @@ -625,22 +624,22 @@ # isn't required for the kernel proper to function AutoReqProv: no -%description xen-guest-PAE +%description xenU-PAE This package includes a version of the Linux kernel which runs in Xen unprivileged guest VMs with PAE support. This should be installed both inside the unprivileged guest (for the modules) and in the guest0 domain. -%package xen-guest-PAE-devel +%package xenU-PAE-devel Summary: Development package for building kernel modules to match the kernel. Group: System Environment/Kernel AutoReqProv: no -Provides: kernel-xen-guest-PAE-devel-%{_target_cpu} = %{rpmversion}-%{release} -Provides: kernel-devel-%{_target_cpu} = %{rpmversion}-%{release}guest-PAE -Provides: kernel-devel = %{rpmversion}-%{release}guest-PAE +Provides: kernel-xenU-PAE-devel-%{_target_cpu} = %{rpmversion}-%{release} +Provides: kernel-devel-%{_target_cpu} = %{rpmversion}-%{release}xenU-PAE +Provides: kernel-devel = %{rpmversion}-%{release}xenU-PAE Prereq: /usr/sbin/hardlink, /usr/bin/find -%description xen-guest-PAE-devel +%description xenU-PAE-devel This package provides kernel headers and makefiles sufficient to build modules against the kernel package. @@ -1294,13 +1293,13 @@ %endif %if %{buildxenPAE} -BuildKernel vmlinuz vmlinuz hypervisor-PAE -BuildKernel vmlinuz vmlinuz guest-PAE +BuildKernel vmlinuz vmlinuz xen0-PAE +BuildKernel vmlinuz vmlinuz xenU-PAE %endif %if %{buildxen} -BuildKernel vmlinuz vmlinuz hypervisor -BuildKernel vmlinuz vmlinuz guest +BuildKernel vmlinuz vmlinuz xen0 +BuildKernel vmlinuz vmlinuz xenU %endif %if %{buildkdump} @@ -1388,54 +1387,54 @@ popd > /dev/null fi -%post xen-hypervisor -[ ! -x /usr/sbin/module_upgrade ] || /usr/sbin/module_upgrade %{rpmversion}-%{release}-hypervisor -/sbin/new-kernel-pkg --package kernel-xen-hypervisor --mkinitrd --depmod --install --multiboot=/boot/xen.gz-%{KVERREL} %{KVERREL}hypervisor +%post xen0 +[ ! -x /usr/sbin/module_upgrade ] || /usr/sbin/module_upgrade %{rpmversion}-%{release}-xen0 +/sbin/new-kernel-pkg --package kernel-xen0 --mkinitrd --depmod --install --multiboot=/boot/xen.gz-%{KVERREL} %{KVERREL}xen0 [ ! -x /sbin/ldconfig ] || /sbin/ldconfig -X -%post xen-hypervisor-devel +%post xen0-devel [ -f /etc/sysconfig/kernel ] && . /etc/sysconfig/kernel if [ "$HARDLINK" != "no" -a -x /usr/sbin/hardlink ] ; then - pushd /usr/src/kernels/%{KVERREL}-hypervisor-%{_target_cpu} > /dev/null + pushd /usr/src/kernels/%{KVERREL}-xen0-%{_target_cpu} > /dev/null /usr/bin/find . -type f | while read f; do hardlink -c /usr/src/kernels/*FC*/$f $f ; done popd > /dev/null fi -%post xen-guest -[ ! -x /usr/sbin/module_upgrade ] || /usr/sbin/module_upgrade %{rpmversion}-%{release}-guest -/sbin/new-kernel-pkg --package kernel-xen-guest --mkinitrd --depmod --install %{KVERREL}guest +%post xenU +[ ! -x /usr/sbin/module_upgrade ] || /usr/sbin/module_upgrade %{rpmversion}-%{release}-xenU +/sbin/new-kernel-pkg --package kernel-xenU --mkinitrd --depmod --install %{KVERREL}U [ ! -x /sbin/ldconfig ] || /sbin/ldconfig -X -%post xen-guest-devel +%post xenU-devel [ -f /etc/sysconfig/kernel ] && . /etc/sysconfig/kernel if [ "$HARDLINK" != "no" -a -x /usr/sbin/hardlink ] ; then - pushd /usr/src/kernels/%{KVERREL}-guest-%{_target_cpu} > /dev/null + pushd /usr/src/kernels/%{KVERREL}-xenU-%{_target_cpu} > /dev/null /usr/bin/find . -type f | while read f; do hardlink -c /usr/src/kernels/*FC*/$f $f ; done popd > /dev/null fi -%post xen-hypervisor-PAE -[ ! -x /usr/sbin/module_upgrade ] || /usr/sbin/module_upgrade %{rpmversion}-%{release}-hypervisor-PAE -/sbin/new-kernel-pkg --package kernel-xen-hypervisor-PAE --mkinitrd --depmod --install --multiboot=/boot/xen.gz-%{KVERREL}-PAE %{KVERREL}hypervisor-PAE +%post xen0-PAE +[ ! -x /usr/sbin/module_upgrade ] || /usr/sbin/module_upgrade %{rpmversion}-%{release}-xen0-PAE +/sbin/new-kernel-pkg --package kernel-xen0-PAE --mkinitrd --depmod --install --multiboot=/boot/xen.gz-%{KVERREL}-PAE %{KVERREL}xen0-PAE [ ! -x /sbin/ldconfig ] || /sbin/ldconfig -X -%post xen-hypervisor-PAE-devel +%post xen0-PAE-devel [ -f /etc/sysconfig/kernel ] && . /etc/sysconfig/kernel if [ "$HARDLINK" != "no" -a -x /usr/sbin/hardlink ] ; then - pushd /usr/src/kernels/%{KVERREL}-hypervisor-PAE-%{_target_cpu} > /dev/null + pushd /usr/src/kernels/%{KVERREL}-xen0-PAE-%{_target_cpu} > /dev/null /usr/bin/find . -type f | while read f; do hardlink -c /usr/src/kernels/*FC*/$f $f ; done popd > /dev/null fi -%post xen-guest-PAE -[ ! -x /usr/sbin/module_upgrade ] || /usr/sbin/module_upgrade %{rpmversion}-%{release}-guest-PAE -/sbin/new-kernel-pkg --package kernel-xen-guest-PAE --mkinitrd --depmod --install %{KVERREL}guest-PAE +%post xenU-PAE +[ ! -x /usr/sbin/module_upgrade ] || /usr/sbin/module_upgrade %{rpmversion}-%{release}-xenU-PAE +/sbin/new-kernel-pkg --package kernel-xenU-PAE --mkinitrd --depmod --install %{KVERREL}xenU-PAE [ ! -x /sbin/ldconfig ] || /sbin/ldconfig -X -%post xen-guest-PAE-devel +%post xenU-PAE-devel [ -f /etc/sysconfig/kernel ] && . /etc/sysconfig/kernel if [ "$HARDLINK" != "no" -a -x /usr/sbin/hardlink ] ; then - pushd /usr/src/kernels/%{KVERREL}-guest-PAE-%{_target_cpu} > /dev/null + pushd /usr/src/kernels/%{KVERREL}-xenU-PAE-%{_target_cpu} > /dev/null /usr/bin/find . -type f | while read f; do hardlink -c /usr/src/kernels/*FC*/$f $f ; done popd > /dev/null fi @@ -1460,21 +1459,21 @@ /sbin/modprobe loop 2> /dev/null > /dev/null || : /sbin/new-kernel-pkg --rminitrd --rmmoddep --remove %{KVERREL}smp -%preun xen-hypervisor +%preun xen0 /sbin/modprobe loop 2> /dev/null > /dev/null || : -/sbin/new-kernel-pkg --rminitrd --rmmoddep --remove %{KVERREL}hypervisor +/sbin/new-kernel-pkg --rminitrd --rmmoddep --remove %{KVERREL}xen0 -%preun xen-guest +%preun xenU /sbin/modprobe loop 2> /dev/null > /dev/null || : -/sbin/new-kernel-pkg --rmmoddep --remove %{KVERREL}guest +/sbin/new-kernel-pkg --rmmoddep --remove %{KVERREL}xenU -%preun xen-hypervisor-PAE +%preun xen0-PAE /sbin/modprobe loop 2> /dev/null > /dev/null || : -/sbin/new-kernel-pkg --rminitrd --rmmoddep --remove %{KVERREL}hypervisor-PAE +/sbin/new-kernel-pkg --rminitrd --rmmoddep --remove %{KVERREL}xen0-PAE -%preun xen-guest-PAE +%preun xenU-PAE /sbin/modprobe loop 2> /dev/null > /dev/null || : -/sbin/new-kernel-pkg --rmmoddep --remove %{KVERREL}guest-PAE +/sbin/new-kernel-pkg --rmmoddep --remove %{KVERREL}xenU-PAE ### @@ -1519,83 +1518,83 @@ %endif %if %{buildxen} -%files xen-hypervisor +%files xen0 %defattr(-,root,root) -/%{image_install_path}/vmlinuz-%{KVERREL}hypervisor -/boot/System.map-%{KVERREL}hypervisor -/boot/config-%{KVERREL}hypervisor +/%{image_install_path}/vmlinuz-%{KVERREL}xen0 +/boot/System.map-%{KVERREL}xen0 +/boot/config-%{KVERREL}xen0 /boot/xen.gz-%{KVERREL} /boot/xen-syms-%{KVERREL} -%dir /lib/modules/%{KVERREL}hypervisor -/lib/modules/%{KVERREL}hypervisor/kernel -%verify(not mtime) /lib/modules/%{KVERREL}hypervisor/build -/lib/modules/%{KVERREL}hypervisor/source +%dir /lib/modules/%{KVERREL}xen0 +/lib/modules/%{KVERREL}xen0/kernel +%verify(not mtime) /lib/modules/%{KVERREL}xen0/build +/lib/modules/%{KVERREL}xen0/source /etc/ld.so.conf.d/kernelcap-%{KVERREL}.conf -/lib/modules/%{KVERREL}hypervisor/extra -/lib/modules/%{KVERREL}hypervisor/updates +/lib/modules/%{KVERREL}xen0/extra +/lib/modules/%{KVERREL}xen0/updates -%files xen-hypervisor-devel +%files xen0-devel %defattr(-,root,root) -%verify(not mtime) /usr/src/kernels/%{KVERREL}-hypervisor-%{_target_cpu} -/usr/src/kernels/%{KVERREL}hypervisor-%{_target_cpu} +%verify(not mtime) /usr/src/kernels/%{KVERREL}-xen0-%{_target_cpu} +/usr/src/kernels/%{KVERREL}xen0-%{_target_cpu} -%files xen-guest +%files xenU %defattr(-,root,root) -/%{image_install_path}/vmlinuz-%{KVERREL}guest -/boot/System.map-%{KVERREL}guest -/boot/config-%{KVERREL}guest -%dir /lib/modules/%{KVERREL}guest -/lib/modules/%{KVERREL}guest/kernel -%verify(not mtime) /lib/modules/%{KVERREL}guest/build -/lib/modules/%{KVERREL}guest/source +/%{image_install_path}/vmlinuz-%{KVERREL}xenU +/boot/System.map-%{KVERREL}xenU +/boot/config-%{KVERREL}xenU +%dir /lib/modules/%{KVERREL}xenU +/lib/modules/%{KVERREL}xenU/kernel +%verify(not mtime) /lib/modules/%{KVERREL}xenU/build +/lib/modules/%{KVERREL}xenU/source /etc/ld.so.conf.d/kernelcap-%{KVERREL}.conf -/lib/modules/%{KVERREL}guest/extra -/lib/modules/%{KVERREL}guest/updates +/lib/modules/%{KVERREL}xenU/extra +/lib/modules/%{KVERREL}xenU/updates -%files xen-guest-devel +%files xenU-devel %defattr(-,root,root) -%verify(not mtime) /usr/src/kernels/%{KVERREL}-guest-%{_target_cpu} -/usr/src/kernels/%{KVERREL}guest-%{_target_cpu} +%verify(not mtime) /usr/src/kernels/%{KVERREL}-xenU-%{_target_cpu} +/usr/src/kernels/%{KVERREL}xenU-%{_target_cpu} %endif %if %{buildxenPAE} -%files xen-hypervisor-PAE +%files xen0-PAE %defattr(-,root,root) -/%{image_install_path}/vmlinuz-%{KVERREL}hypervisor-PAE -/boot/System.map-%{KVERREL}hypervisor-PAE -/boot/config-%{KVERREL}hypervisor-PAE +/%{image_install_path}/vmlinuz-%{KVERREL}xen0-PAE +/boot/System.map-%{KVERREL}xen0-PAE +/boot/config-%{KVERREL}xen0-PAE /boot/xen.gz-%{KVERREL}-PAE /boot/xen-syms-%{KVERREL}-PAE -%dir /lib/modules/%{KVERREL}hypervisor-PAE -/lib/modules/%{KVERREL}hypervisor-PAE/kernel -%verify(not mtime) /lib/modules/%{KVERREL}hypervisor-PAE/build -/lib/modules/%{KVERREL}hypervisor-PAE/source +%dir /lib/modules/%{KVERREL}xen0-PAE +/lib/modules/%{KVERREL}xen0-PAE/kernel +%verify(not mtime) /lib/modules/%{KVERREL}xen0-PAE/build +/lib/modules/%{KVERREL}xen0-PAE/source /etc/ld.so.conf.d/kernelcap-%{KVERREL}.conf -/lib/modules/%{KVERREL}hypervisor-PAE/extra -/lib/modules/%{KVERREL}hypervisor-PAE/updates +/lib/modules/%{KVERREL}xen0-PAE/extra +/lib/modules/%{KVERREL}xen0-PAE/updates -%files xen-hypervisor-PAE-devel +%files xen0-PAE-devel %defattr(-,root,root) -%verify(not mtime) /usr/src/kernels/%{KVERREL}-hypervisor-PAE-%{_target_cpu} -/usr/src/kernels/%{KVERREL}hypervisor-PAE-%{_target_cpu} +%verify(not mtime) /usr/src/kernels/%{KVERREL}-xen0-PAE-%{_target_cpu} +/usr/src/kernels/%{KVERREL}xen0-PAE-%{_target_cpu} -%files xen-guest-PAE +%files xenU-PAE %defattr(-,root,root) -/%{image_install_path}/vmlinuz-%{KVERREL}guest-PAE -/boot/System.map-%{KVERREL}guest-PAE -/boot/config-%{KVERREL}guest-PAE -%dir /lib/modules/%{KVERREL}guest-PAE -/lib/modules/%{KVERREL}guest-PAE/kernel -%verify(not mtime) /lib/modules/%{KVERREL}guest-PAE/build -/lib/modules/%{KVERREL}guest-PAE/source +/%{image_install_path}/vmlinuz-%{KVERREL}xenU-PAE +/boot/System.map-%{KVERREL}xenU-PAE +/boot/config-%{KVERREL}xenU-PAE +%dir /lib/modules/%{KVERREL}xenU-PAE +/lib/modules/%{KVERREL}xenU-PAE/kernel +%verify(not mtime) /lib/modules/%{KVERREL}xenU-PAE/build +/lib/modules/%{KVERREL}xenU-PAE/source /etc/ld.so.conf.d/kernelcap-%{KVERREL}.conf -/lib/modules/%{KVERREL}guest-PAE/extra -/lib/modules/%{KVERREL}guest-PAE/updates +/lib/modules/%{KVERREL}xenU-PAE/extra +/lib/modules/%{KVERREL}xenU-PAE/updates -%files xen-guest-PAE-devel +%files xenU-PAE-devel %defattr(-,root,root) -%verify(not mtime) /usr/src/kernels/%{KVERREL}-guest-PAE-%{_target_cpu} -/usr/src/kernels/%{KVERREL}guest-PAE-%{_target_cpu} +%verify(not mtime) /usr/src/kernels/%{KVERREL}-xenU-PAE-%{_target_cpu} +/usr/src/kernels/%{KVERREL}xenU-PAE-%{_target_cpu} %endif %if %{buildkdump} @@ -1631,6 +1630,9 @@ %changelog * Mon Mar 6 2006 Stephen Tweedie - Merge xen rebase with 1.2016 kernel +- Rename kernel-xen-(hypervisor|guest) to kernel-xen(0|U) for consistency + with upstream and to make kernel subtype suffixes match the subpackage + names. (From Jeremy Katz.) * Sun Mar 5 2006 Dave Jones - 2.6.16rc5-git8 From fedora-cvs-commits at redhat.com Mon Mar 6 17:27:32 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 6 Mar 2006 12:27:32 -0500 Subject: rpms/firefox/devel firefox-redhat-default-bookmarks.html, 1.2, 1.3 firefox.spec, 1.106, 1.107 Message-ID: <200603061727.k26HRWCJ013807@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/firefox/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv13685 Modified Files: firefox-redhat-default-bookmarks.html firefox.spec Log Message: - Add new bookmarks file from Warren (bug 182386) Index: firefox-redhat-default-bookmarks.html =================================================================== RCS file: /cvs/dist/rpms/firefox/devel/firefox-redhat-default-bookmarks.html,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- firefox-redhat-default-bookmarks.html 3 Nov 2005 15:03:30 -0000 1.2 +++ firefox-redhat-default-bookmarks.html 6 Mar 2006 17:27:29 -0000 1.3 @@ -7,15 +7,21 @@

Bookmarks

-

Personal Toolbar Folder

+

Personal Toolbar Folder

-

Fedora Project Portal -
Latest Release Notes -

Fedora Community

+
Latest Release Notes +
Fedora Project +
Fedora Weekly News +

Community Support

-

Fedora Weekly News -
Fedora Forum.org +
Fedora Forum +
More Support & Discussion

-

Red Hat Magazine +

Fedora Core 5

+

+

Co! re Package List +
Extras Pack! age List +

+

Red Hat Magazine

Index: firefox.spec =================================================================== RCS file: /cvs/dist/rpms/firefox/devel/firefox.spec,v retrieving revision 1.106 retrieving revision 1.107 diff -u -r1.106 -r1.107 --- firefox.spec 28 Feb 2006 10:08:15 -0000 1.106 +++ firefox.spec 6 Mar 2006 17:27:29 -0000 1.107 @@ -9,7 +9,7 @@ Summary: Mozilla Firefox Web browser. Name: firefox Version: 1.5.0.1 -Release: 5 +Release: 6 URL: http://www.mozilla.org/projects/firefox/ License: MPL/LGPL Group: Applications/Internet @@ -265,6 +265,9 @@ #--------------------------------------------------------------------- %changelog +* Mon Mar 6 2006 Ray Strode - 1.5.0.1-6 +- Add new bookmarks file from Warren (bug 182386) + * Tue Feb 28 2006 Karsten Hopp - add buildrequires libXt-devel for X11/Intrinsic.h, X11/Shell.h From fedora-cvs-commits at redhat.com Mon Mar 6 17:47:55 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 6 Mar 2006 12:47:55 -0500 Subject: rpms/kexec-tools/devel kexec-tools.spec,1.13,1.14 Message-ID: <200603061747.k26Hltuk000417@cvs.devel.redhat.com> Author: tgraf Update of /cvs/dist/rpms/kexec-tools/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv344 Modified Files: kexec-tools.spec Log Message: - Move kexec and kdump binaries to /sbin Index: kexec-tools.spec =================================================================== RCS file: /cvs/dist/rpms/kexec-tools/devel/kexec-tools.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- kexec-tools.spec 2 Mar 2006 09:18:31 -0000 1.13 +++ kexec-tools.spec 6 Mar 2006 17:47:53 -0000 1.14 @@ -1,6 +1,6 @@ Name: kexec-tools Version: 1.101 -Release: 11 +Release: 12 License: GPL Group: Applications/System Summary: The kexec/kdump userspace component. @@ -48,7 +48,7 @@ cp $RPM_SOURCE_DIR/kdump.sysconfig . %build -%configure +%configure --sbindir=/sbin rm -f kexec-tools.spec.in make @@ -85,8 +85,7 @@ %files %defattr(-,root,root,-) -%{_sbindir}/kexec -%{_sbindir}/kdump +/sbin/* %config(noreplace,missingok) /etc/sysconfig/kdump %config /etc/rc.d/init.d/kdump @@ -96,6 +95,9 @@ %doc TODO %changelog +* Mon Mar 06 2006 Thomas Graf - 1.101-12 +- Move kexec and kdump binaries to /sbin + * Thu Mar 02 2006 Thomas Graf - 1.101-11 - Fix argument order when stopping kexec From fedora-cvs-commits at redhat.com Mon Mar 6 18:16:57 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 6 Mar 2006 13:16:57 -0500 Subject: rpms/firefox/devel firefox-redhat-default-bookmarks.html, 1.3, 1.4 firefox.spec, 1.107, 1.108 Message-ID: <200603061816.k26IGvMB022251@cvs.devel.redhat.com> Author: wtogami Update of /cvs/dist/rpms/firefox/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv20703 Modified Files: firefox-redhat-default-bookmarks.html firefox.spec Log Message: make links point at the correct release Index: firefox-redhat-default-bookmarks.html =================================================================== RCS file: /cvs/dist/rpms/firefox/devel/firefox-redhat-default-bookmarks.html,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- firefox-redhat-default-bookmarks.html 6 Mar 2006 17:27:29 -0000 1.3 +++ firefox-redhat-default-bookmarks.html 6 Mar 2006 18:16:55 -0000 1.4 @@ -19,8 +19,8 @@

Fedora Core 5

-

Co! re Package List -
Extras Pack! age List +
Core Packa! ge List +
Extras Pack! age List

Red Hat Magazine

Index: firefox.spec =================================================================== RCS file: /cvs/dist/rpms/firefox/devel/firefox.spec,v retrieving revision 1.107 retrieving revision 1.108 diff -u -r1.107 -r1.108 --- firefox.spec 6 Mar 2006 17:27:29 -0000 1.107 +++ firefox.spec 6 Mar 2006 18:16:55 -0000 1.108 @@ -9,7 +9,7 @@ Summary: Mozilla Firefox Web browser. Name: firefox Version: 1.5.0.1 -Release: 6 +Release: 7 URL: http://www.mozilla.org/projects/firefox/ License: MPL/LGPL Group: Applications/Internet @@ -265,6 +265,9 @@ #--------------------------------------------------------------------- %changelog +* Mon Mar 6 2006 Warren Togami - 1.5.0.1-7 +- make links point to the correct release + * Mon Mar 6 2006 Ray Strode - 1.5.0.1-6 - Add new bookmarks file from Warren (bug 182386) From fedora-cvs-commits at redhat.com Mon Mar 6 18:35:14 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 6 Mar 2006 13:35:14 -0500 Subject: rpms/kudzu/devel .cvsignore, 1.111, 1.112 kudzu.spec, 1.126, 1.127 sources, 1.125, 1.126 Message-ID: <200603061835.k26IZEc3028040@cvs.devel.redhat.com> Author: notting Update of /cvs/dist/rpms/kudzu/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv27990 Modified Files: .cvsignore kudzu.spec sources Log Message: update Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/kudzu/devel/.cvsignore,v retrieving revision 1.111 retrieving revision 1.112 diff -u -r1.111 -r1.112 --- .cvsignore 28 Feb 2006 19:57:38 -0000 1.111 +++ .cvsignore 6 Mar 2006 18:35:11 -0000 1.112 @@ -1 +1 @@ -kudzu-1.2.33.tar.gz +kudzu-1.2.34.tar.gz Index: kudzu.spec =================================================================== RCS file: /cvs/dist/rpms/kudzu/devel/kudzu.spec,v retrieving revision 1.126 retrieving revision 1.127 diff -u -r1.126 -r1.127 --- kudzu.spec 28 Feb 2006 19:57:38 -0000 1.126 +++ kudzu.spec 6 Mar 2006 18:35:11 -0000 1.127 @@ -1,5 +1,5 @@ Name: kudzu -Version: 1.2.33 +Version: 1.2.34 Release: 1 License: GPL Summary: The Red Hat Linux hardware probing tool. @@ -79,6 +79,9 @@ %{_includedir}/kudzu %changelog +* Mon Mar 6 2006 Bill Nottingham - 1.2.34-1 +- silence some error messages + * Tue Feb 28 2006 Jeremy Katz - 1.2.33-1 - fix i2o again (#182522) Index: sources =================================================================== RCS file: /cvs/dist/rpms/kudzu/devel/sources,v retrieving revision 1.125 retrieving revision 1.126 diff -u -r1.125 -r1.126 --- sources 28 Feb 2006 19:57:38 -0000 1.125 +++ sources 6 Mar 2006 18:35:11 -0000 1.126 @@ -1 +1 @@ -cd55171cf82925592f2293fbcf0128d3 kudzu-1.2.33.tar.gz +a8700feb257e963cef52aefdefeb8b7d kudzu-1.2.34.tar.gz From fedora-cvs-commits at redhat.com Mon Mar 6 18:49:51 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 6 Mar 2006 13:49:51 -0500 Subject: rpms/booty/devel .cvsignore, 1.39, 1.40 booty.spec, 1.43, 1.44 sources, 1.42, 1.43 Message-ID: <200603061849.k26InpvO004663@cvs.devel.redhat.com> Author: katzj Update of /cvs/dist/rpms/booty/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv4639/devel Modified Files: .cvsignore booty.spec sources Log Message: auto-import booty-0.69-1 on branch devel from booty-0.69-1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/booty/devel/.cvsignore,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- .cvsignore 27 Feb 2006 23:25:57 -0000 1.39 +++ .cvsignore 6 Mar 2006 18:49:48 -0000 1.40 @@ -1 +1 @@ -booty-0.68.tar.bz2 +booty-0.69.tar.bz2 Index: booty.spec =================================================================== RCS file: /cvs/dist/rpms/booty/devel/booty.spec,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- booty.spec 27 Feb 2006 23:25:57 -0000 1.43 +++ booty.spec 6 Mar 2006 18:49:48 -0000 1.44 @@ -1,6 +1,6 @@ Summary: simple python bootloader config lib Name: booty -Version: 0.68 +Version: 0.69 Release: 1 License: LGPL Source0: %{name}-%{version}.tar.bz2 @@ -34,6 +34,9 @@ %changelog +* Mon Mar 6 2006 Jeremy Katz - 0.69-1 +- adjust for changed xen kernel naming + * Mon Feb 27 2006 Peter Jones - 0.68-1 - sync between invocations of grub on smp - default to "mbr", not "partition" for grub installation on md Index: sources =================================================================== RCS file: /cvs/dist/rpms/booty/devel/sources,v retrieving revision 1.42 retrieving revision 1.43 diff -u -r1.42 -r1.43 --- sources 27 Feb 2006 23:25:57 -0000 1.42 +++ sources 6 Mar 2006 18:49:48 -0000 1.43 @@ -1 +1 @@ -0399f7351e71ced1e74a18c3c0d08dec booty-0.68.tar.bz2 +3dc3a3e365872c07143e7357d0ab1347 booty-0.69.tar.bz2 From fedora-cvs-commits at redhat.com Mon Mar 6 20:12:09 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 6 Mar 2006 15:12:09 -0500 Subject: rpms/rhpxl/devel .cvsignore, 1.20, 1.21 rhpxl.spec, 1.22, 1.23 sources, 1.22, 1.23 Message-ID: <200603062012.k26KC9WZ021169@cvs.devel.redhat.com> Author: katzj Update of /cvs/dist/rpms/rhpxl/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv21127/devel Modified Files: .cvsignore rhpxl.spec sources Log Message: auto-import rhpxl-0.18-1 on branch devel from rhpxl-0.18-1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/rhpxl/devel/.cvsignore,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- .cvsignore 22 Feb 2006 22:58:29 -0000 1.20 +++ .cvsignore 6 Mar 2006 20:12:06 -0000 1.21 @@ -1 +1 @@ -rhpxl-0.17.tar.gz +rhpxl-0.18.tar.gz Index: rhpxl.spec =================================================================== RCS file: /cvs/dist/rpms/rhpxl/devel/rhpxl.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- rhpxl.spec 22 Feb 2006 22:58:29 -0000 1.22 +++ rhpxl.spec 6 Mar 2006 20:12:06 -0000 1.23 @@ -2,7 +2,7 @@ Summary: Python library for configuring and running X. Name: rhpxl -Version: 0.17 +Version: 0.18 Release: 1 Source0: %{name}-%{version}.tar.gz License: GPL @@ -43,6 +43,9 @@ %{_sbindir}/ddcprobe %changelog +* Mon Mar 6 2006 Jeremy Katz - 0.18-1 +- allow forcing vesa (#184015) + * Wed Feb 22 2006 Jeremy Katz - 0.17-1 - fix braindead i810 (#182300) Index: sources =================================================================== RCS file: /cvs/dist/rpms/rhpxl/devel/sources,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- sources 22 Feb 2006 22:58:29 -0000 1.22 +++ sources 6 Mar 2006 20:12:06 -0000 1.23 @@ -1 +1 @@ -110edd1f567d4d68d32fabff07697bfc rhpxl-0.17.tar.gz +60088c7d19309600375f16ef1dbdb952 rhpxl-0.18.tar.gz From fedora-cvs-commits at redhat.com Mon Mar 6 20:17:36 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 6 Mar 2006 15:17:36 -0500 Subject: rpms/kernel/devel kernel-2.6.spec,1.2018,1.2019 Message-ID: <200603062017.k26KHaa0003558@cvs.devel.redhat.com> Author: sct Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv3524 Modified Files: kernel-2.6.spec Log Message: Fix typo in domU %post new-kernel-pkg line. Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.2018 retrieving revision 1.2019 diff -u -r1.2018 -r1.2019 --- kernel-2.6.spec 6 Mar 2006 16:56:38 -0000 1.2018 +++ kernel-2.6.spec 6 Mar 2006 20:17:33 -0000 1.2019 @@ -1402,7 +1402,7 @@ %post xenU [ ! -x /usr/sbin/module_upgrade ] || /usr/sbin/module_upgrade %{rpmversion}-%{release}-xenU -/sbin/new-kernel-pkg --package kernel-xenU --mkinitrd --depmod --install %{KVERREL}U +/sbin/new-kernel-pkg --package kernel-xenU --mkinitrd --depmod --install %{KVERREL}xenU [ ! -x /sbin/ldconfig ] || /sbin/ldconfig -X %post xenU-devel From fedora-cvs-commits at redhat.com Mon Mar 6 20:37:44 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 6 Mar 2006 15:37:44 -0500 Subject: rpms/xen/devel xen-kva-mmap.patch,NONE,1.1 xen.spec,1.101,1.102 Message-ID: <200603062037.k26KbiT2010239@cvs.devel.redhat.com> Author: sct Update of /cvs/dist/rpms/xen/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv10211 Modified Files: xen.spec Added Files: xen-kva-mmap.patch Log Message: Use kva mmap to find the xenstore page (upstream xen-unstable cset 9130) xen-kva-mmap.patch: xenstored_domain.c | 18 ++---------------- 1 files changed, 2 insertions(+), 16 deletions(-) --- NEW FILE xen-kva-mmap.patch --- # HG changeset patch # User kaf24 at firebug.cl.cam.ac.uk # Node ID aefc75f5db5edeb00ed94ba772804642b0bf0038 # Parent 1c46091df7ce2d55f003cef8bde6efa4a41dd8bd /proc/xen/xsd_kva exports mmap interface that xenstored now uses to map the domain0 xenbus page. Signed-off-by: Keir Fraser diff -r 1c46091df7ce -r aefc75f5db5e tools/xenstore/xenstored_domain.c --- a/tools/xenstore/xenstored_domain.c Fri Mar 3 19:06:50 2006 +0100 +++ b/tools/xenstore/xenstored_domain.c Fri Mar 3 19:07:55 2006 +0100 @@ -27,7 +27,6 @@ #include #include #include -#include //#define DEBUG #include "utils.h" @@ -466,21 +465,8 @@ static int dom0_init(void) { int rc, fd; evtchn_port_t port; - unsigned long kva; char str[20]; struct domain *dom0; - - fd = open(XENSTORED_PROC_KVA, O_RDONLY); - if (fd == -1) - return -1; - - rc = read(fd, str, sizeof(str)); - if (rc == -1) - goto outfd; - str[rc] = '\0'; - kva = strtoul(str, NULL, 0); - - close(fd); fd = open(XENSTORED_PROC_PORT, O_RDONLY); if (fd == -1) @@ -496,12 +482,12 @@ static int dom0_init(void) dom0 = new_domain(NULL, 0, port); - fd = open(_PATH_KMEM, O_RDWR); + fd = open(XENSTORED_PROC_KVA, O_RDWR); if (fd == -1) return -1; dom0->interface = mmap(NULL, getpagesize(), PROT_READ|PROT_WRITE, - MAP_SHARED, fd, kva); + MAP_SHARED, fd, 0); if (dom0->interface == MAP_FAILED) goto outfd; Index: xen.spec =================================================================== RCS file: /cvs/dist/rpms/xen/devel/xen.spec,v retrieving revision 1.101 retrieving revision 1.102 diff -u -r1.101 -r1.102 --- xen.spec 6 Mar 2006 19:23:33 -0000 1.101 +++ xen.spec 6 Mar 2006 20:37:41 -0000 1.102 @@ -5,7 +5,7 @@ Summary: Xen is a virtual machine monitor Name: xen Version: 3.0.1 -Release: 1 +Release: 2 Group: Development/Libraries License: GPL URL: http://www.cl.cam.ac.uk/Research/SRG/netos/xen/index.html @@ -15,6 +15,7 @@ Source2: xenguest-install.py Patch0: xen-misc-fixes.patch Patch1: xen-initscript.patch +Patch2: xen-kva-mmap.patch Patch3: xen-dom0-minmem.patch Patch4: xen-compile-fixes.patch Patch6: xen-network-iptables-bridge.patch @@ -54,6 +55,7 @@ %setup -q -n xen-3.0.1 -a 1 %patch0 -p1 -b .misc %patch1 -p1 -b .init +%patch2 -p1 -b .kva-mmap %patch3 -p1 -b .mem-min %patch4 -p1 -b .compile %patch6 -p1 @@ -157,6 +159,9 @@ %dir %{_localstatedir}/run/xenstored %changelog +* Mon Mar 6 2006 Stephen Tweedie - 3.0.1-2 +- Use kva mmap to find the xenstore page (upstream xen-unstable cset 9130) + * Mon Mar 6 2006 Jeremy Katz - 3.0.1-1 - fix xenguest-install so that it uses phy: for block devices instead of forcing them over loopback. From fedora-cvs-commits at redhat.com Mon Mar 6 20:38:30 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 6 Mar 2006 15:38:30 -0500 Subject: rpms/xorg-x11-server/devel xorg-x11-server-1.0.1-fpic-libxf86config.patch, NONE, 1.1 xorg-x11-server-1.0.1-Red-Hat-extramodes.patch, 1.1, 1.2 xorg-x11-server.spec, 1.44, 1.45 Message-ID: <200603062038.k26KcUoW010665@cvs.devel.redhat.com> Author: katzj Update of /cvs/dist/rpms/xorg-x11-server/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv10629 Modified Files: xorg-x11-server-1.0.1-Red-Hat-extramodes.patch xorg-x11-server.spec Added Files: xorg-x11-server-1.0.1-fpic-libxf86config.patch Log Message: * Mon Mar 6 2006 Jeremy Katz - 1.0.1-8 - build libxf86config with -fPIC (#181292) - fix sgi 1600sw extra mode (#182430) xorg-x11-server-1.0.1-fpic-libxf86config.patch: Makefile.am | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE xorg-x11-server-1.0.1-fpic-libxf86config.patch --- --- xorg-server-1.0.1/hw/xfree86/parser/Makefile.am.xf86configfpic 2006-03-06 13:57:45.000000000 -0500 +++ xorg-server-1.0.1/hw/xfree86/parser/Makefile.am 2006-03-06 13:59:11.000000000 -0500 @@ -23,7 +23,7 @@ DRI.c \ Extensions.c -AM_CFLAGS = $(XORG_CFLAGS) +AM_CFLAGS = $(XORG_CFLAGS) -fPIC EXTRA_DIST = \ Configint.h \ xorg-x11-server-1.0.1-Red-Hat-extramodes.patch: extramodes | 118 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 116 insertions(+), 2 deletions(-) Index: xorg-x11-server-1.0.1-Red-Hat-extramodes.patch =================================================================== RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server-1.0.1-Red-Hat-extramodes.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- xorg-x11-server-1.0.1-Red-Hat-extramodes.patch 8 Feb 2006 22:03:43 -0000 1.1 +++ xorg-x11-server-1.0.1-Red-Hat-extramodes.patch 6 Mar 2006 20:38:28 -0000 1.2 @@ -1,6 +1,6 @@ ---- hw/xfree86/common/extramodes.redhat-custom-modelines 2002-11-10 23:21:46.000000000 -0500 -+++ hw/xfree86/common/extramodes 2002-11-23 06:29:45.000000000 -0500 -@@ -10,15 +10,27 @@ +--- xorg-server-1.0.1/hw/xfree86/common/extramodes.Red-Hat-extramodes 2004-04-23 15:53:57.000000000 -0400 ++++ xorg-server-1.0.1/hw/xfree86/common/extramodes 2006-03-06 15:09:19.000000000 -0500 +@@ -10,14 +10,23 @@ # 1152x768 @ 54.8Hz (Titanium PowerBook) hsync: 44.2kHz ModeLine "1152x768" 64.995 1152 1178 1314 1472 768 771 777 806 +hsync +vsync @@ -16,19 +16,17 @@ # 1400x1050 @ 75Hz (VESA GTF) hsync: 82.2kHz ModeLine "1400x1050" 155.8 1400 1464 1784 1912 1050 1052 1064 1090 +hsync +vsync +-# 1600x1024 @ 60Hz (SGI 1600SW) hsync: 64.0kHz +-Modeline "1600x1024" 106.910 1600 1620 1640 1670 1024 1027 1030 1067 -hsync -vsync +# 1400x1050 @ 85Hz (Red Hat custom modeline) hsync: 93.2 kHz +ModeLine "1400x1050" 184.0 1400 1464 1656 1960 1050 1051 1054 1100 +hsync +vsync + - # 1600x1024 @ 60Hz (SGI 1600SW) hsync: 64.0kHz - Modeline "1600x1024" 106.910 1600 1620 1640 1670 1024 1027 1030 1067 -hsync -vsync - +# 1920x1200 @ 70Hz (Red Hat custom modeline - bugzilla #53364) hsync: 87.50 KHz +Modeline "1920x1200" 230.0 1920 1936 2096 2528 1200 1201 1204 1250 -HSync -VSync -+ + # 1920x1440 @ 85Hz (VESA GTF) hsync: 128.5kHz Modeline "1920x1440" 341.35 1920 2072 2288 2656 1440 1441 1444 1512 -hsync +vsync - -@@ -31,3 +43,104 @@ +@@ -31,3 +40,108 @@ # 2048x1536 @ 85Hz (VESA GTF) hsync: 137.0kHz Modeline "2048x1536" 388.04 2048 2216 2440 2832 1536 1537 1540 1612 -hsync +vsync @@ -133,3 +131,7 @@ + +# 2560x1600 @ 85.00 Hz (GTF) hsync: 142.80 kHz; pclk: 507.23 MHz +Modeline "2560x1600" 507.23 2560 2768 3056 3552 1600 1601 1604 1680 -HSync +Vsync ++ ++# 1600x1024 for SGI 1600 SW ++ModeLine "1600x1024" 103.125 1600 1600 1656 1664 1024 1024 1029 1030 +Hsync +Vsync ++ Index: xorg-x11-server.spec =================================================================== RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- xorg-x11-server.spec 1 Mar 2006 06:34:44 -0000 1.44 +++ xorg-x11-server.spec 6 Mar 2006 20:38:28 -0000 1.45 @@ -4,7 +4,7 @@ Summary: X.Org X11 X server Name: xorg-x11-server Version: 1.0.1 -Release: 7 +Release: 8 URL: http://www.x.org License: MIT/X11 Group: User Interface/X @@ -23,6 +23,8 @@ Patch5: xorg-server-1.0.1-backtrace.patch # https://bugs.freedesktop.org/show_bug.cgi?id=6010 Patch6: xserver-1.0.1-randr-sdk.patch +# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=181292. hacky patch +Patch7: xorg-x11-server-1.0.1-fpic-libxf86config.patch # Patches taken from xserver/xorg CVS HEAD, post-1.0.1 Patch100: xorg-x11-server-1.0.1-fbpict-fix-rounding.patch @@ -240,12 +242,13 @@ %patch4 -p0 -b .composite-fastpath-fdo4320 %patch5 -p0 -b .backtrace %patch6 -p1 -b .randrsdk +%patch7 -p1 -b .xf86configfpic %patch100 -p2 -b .fbpict-fix-rounding %patch101 -p2 -b .SEGV-on-null-interface %patch1000 -p0 -b .redhat-die-ugly-pattern-die-die-die -%patch1001 -p0 -b .Red-Hat-extramodes +%patch1001 -p1 -b .Red-Hat-extramodes %build #FONTDIR="${datadir}/X11/fonts" @@ -519,6 +522,10 @@ # ------------------------------------------------------------------- %changelog +* Mon Mar 6 2006 Jeremy Katz - 1.0.1-8 +- build libxf86config with -fPIC (#181292) +- fix sgi 1600sw extra mode (#182430) + * Wed Feb 22 2006 Jeremy Katz 1.0.1-7 - install randrstr.h as part of sdk as required for building some drivers From fedora-cvs-commits at redhat.com Mon Mar 6 20:40:41 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 6 Mar 2006 15:40:41 -0500 Subject: rpms/kernel/devel linux-2.6-xen-kva-mmap.patch, NONE, 1.1 kernel-2.6.spec, 1.2019, 1.2020 linux-2.6-xen-module-fault.patch, 1.1, NONE Message-ID: <200603062040.k26KefTY011662@cvs.devel.redhat.com> Author: sct Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv11455 Modified Files: kernel-2.6.spec Added Files: linux-2.6-xen-kva-mmap.patch Removed Files: linux-2.6-xen-module-fault.patch Log Message: Export mmap-able kva interface for xen to find the xenstore page (xen-unstable cset 9130) Remove stale linux-2.6-xen-module-fault.patch file linux-2.6-xen-kva-mmap.patch: xenbus_probe.c | 25 +++++++++++++++++++++++-- 1 files changed, 23 insertions(+), 2 deletions(-) --- NEW FILE linux-2.6-xen-kva-mmap.patch --- # HG changeset patch # User kaf24 at firebug.cl.cam.ac.uk # Node ID aefc75f5db5edeb00ed94ba772804642b0bf0038 # Parent 1c46091df7ce2d55f003cef8bde6efa4a41dd8bd /proc/xen/xsd_kva exports mmap interface that xenstored now uses to map the domain0 xenbus page. Signed-off-by: Keir Fraser diff -r 1c46091df7ce -r aefc75f5db5e linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_probe.c --- a/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_probe.c Fri Mar 3 19:06:50 2006 +0100 +++ b/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_probe.c Fri Mar 3 19:07:55 2006 +0100 @@ -951,9 +951,25 @@ void xenbus_probe(void *unused) } +static struct file_operations xsd_kva_fops; static struct proc_dir_entry *xsd_kva_intf; static struct proc_dir_entry *xsd_port_intf; +static int xsd_kva_mmap(struct file *file, struct vm_area_struct *vma) +{ + size_t size = vma->vm_end - vma->vm_start; + + if ((size > PAGE_SIZE) || (vma->vm_pgoff != 0)) + return -EINVAL; + + vma->vm_pgoff = mfn_to_pfn(xen_start_info->store_mfn); + + if (remap_pfn_range(vma, vma->vm_start, vma->vm_pgoff, + size, vma->vm_page_prot)) + return -EAGAIN; + + return 0; +} static int xsd_kva_read(char *page, char **start, off_t off, int count, int *eof, void *data) @@ -1027,9 +1043,14 @@ static int __init xenbus_probe_init(void xen_start_info->store_evtchn = op.u.alloc_unbound.port; /* And finally publish the above info in /proc/xen */ - if((xsd_kva_intf = create_xen_proc_entry("xsd_kva", 0400))) + if ((xsd_kva_intf = create_xen_proc_entry("xsd_kva", 0400))) { + memcpy(&xsd_kva_fops, xsd_kva_intf->proc_fops, + sizeof(xsd_kva_fops)); + xsd_kva_fops.mmap = xsd_kva_mmap; + xsd_kva_intf->proc_fops = &xsd_kva_fops; xsd_kva_intf->read_proc = xsd_kva_read; - if((xsd_port_intf = create_xen_proc_entry("xsd_port", 0400))) + } + if ((xsd_port_intf = create_xen_proc_entry("xsd_port", 0400))) xsd_port_intf->read_proc = xsd_port_read; } Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.2019 retrieving revision 1.2020 diff -u -r1.2019 -r1.2020 --- kernel-2.6.spec 6 Mar 2006 20:17:33 -0000 1.2019 +++ kernel-2.6.spec 6 Mar 2006 20:40:38 -0000 1.2020 @@ -263,7 +263,7 @@ Patch704: linux-2.6-xen-vsyscall_base.patch Patch706: linux-2.6-xen_remap_vma_flags.patch Patch709: linux-2.6-percpu-NR_CPUS-hotplug-fix.patch -Patch710: linux-2.6-xen-module-fault.patch +Patch710: linux-2.6-xen-kva-mmap.patch # # Patches 800 through 899 are reserved for bugfixes to the core system @@ -799,7 +799,7 @@ %patch704 -p1 %patch706 -p1 %patch709 -p1 -#%patch710 -p1 +%patch710 -p2 %endif @@ -1633,6 +1633,9 @@ - Rename kernel-xen-(hypervisor|guest) to kernel-xen(0|U) for consistency with upstream and to make kernel subtype suffixes match the subpackage names. (From Jeremy Katz.) +- Export mmap-able kva interface for xen to find the xenstore page + (xen-unstable cset 9130) +- Remove stale linux-2.6-xen-module-fault.patch file * Sun Mar 5 2006 Dave Jones - 2.6.16rc5-git8 --- linux-2.6-xen-module-fault.patch DELETED --- From fedora-cvs-commits at redhat.com Mon Mar 6 21:11:44 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 6 Mar 2006 16:11:44 -0500 Subject: rpms/gnome-session/devel gnome-session-2.13.92-desensitize-invalid-buttons.patch, NONE, 1.1 gnome-session-2.13.92-fix-session-editing.patch, NONE, 1.1 gnome-session.spec, 1.60, 1.61 Message-ID: <200603062111.k26LBi8X025860@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/gnome-session/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv25827 Modified Files: gnome-session.spec Added Files: gnome-session-2.13.92-desensitize-invalid-buttons.patch gnome-session-2.13.92-fix-session-editing.patch Log Message: - Patch from Vincent Untz to fix session editing (upstream bug 333641) - Desensitize buttons for operations that the user isn't allowed to do (bug 179479). gnome-session-2.13.92-desensitize-invalid-buttons.patch: session-properties-capplet.c | 39 +++++++++++++++++++++++++++++++++------ startup-programs.c | 43 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 76 insertions(+), 6 deletions(-) --- NEW FILE gnome-session-2.13.92-desensitize-invalid-buttons.patch --- --- gnome-session-2.13.92/gnome-session/startup-programs.c.desensitize-invalid-buttons 2006-03-06 14:38:08.000000000 -0500 +++ gnome-session-2.13.92/gnome-session/startup-programs.c 2006-03-06 15:48:12.000000000 -0500 @@ -22,6 +22,7 @@ #include #include #include +#include #include #include #include @@ -552,6 +553,48 @@ startup_list_delete (GSList **sl, GtkTre spc_write_state (); } +gboolean +startup_list_can_edit (GSList **sl, GtkTreeModel *model, GtkTreeSelection *sel) +{ + ManualClient *client; + GtkTreeIter iter; + char *path, *basename; + const char * const * system_dirs; + int i; + gboolean can_edit = TRUE; + + if (!gtk_tree_selection_get_selected (sel, NULL, &iter)) return FALSE; + + gtk_tree_model_get (model, &iter, 0, &client, -1); + + if (g_file_test (client->desktop_file, G_FILE_TEST_EXISTS) && + access (client->desktop_file, W_OK) != 0) + return FALSE; + + basename = g_path_get_basename (client->desktop_file); + + system_dirs = g_get_system_data_dirs (); + for (i = 0; system_dirs[i] != NULL && can_edit; i++) + { + path = g_build_filename (system_dirs[i], "gnome", "autostart", basename, NULL); + if (g_file_test (path, G_FILE_TEST_EXISTS) && access (path, W_OK) != 0) + can_edit = FALSE; + g_free (path); + } + + system_dirs = g_get_system_config_dirs (); + for (i = 0; system_dirs[i] != NULL && can_edit; i++) + { + path = g_build_filename (system_dirs[i], "autostart", basename, NULL); + if (g_file_test (path, G_FILE_TEST_EXISTS) && access (path, W_OK) != 0) + can_edit = FALSE; + g_free (path); + } + + g_free (basename); + return can_edit; +} + /* Check if the selected client can be enabled */ gboolean startup_list_can_enable (GSList **sl, GtkTreeModel *model, GtkTreeSelection *sel) --- gnome-session-2.13.92/gnome-session/session-properties-capplet.c.desensitize-invalid-buttons 2006-03-06 14:50:12.000000000 -0500 +++ gnome-session-2.13.92/gnome-session/session-properties-capplet.c 2006-03-06 15:51:46.000000000 -0500 @@ -91,7 +91,7 @@ static void saved_sessions (GtkWidget *w #define SESSION_STOCK_EDIT "session-stock-edit" static void -selection_changed_cb (GtkTreeSelection *selection, GtkTreeView *view) +session_selection_changed_cb (GtkTreeSelection *selection, GtkTreeView *view) { gboolean sel; GtkWidget *edit_button; @@ -100,15 +100,42 @@ selection_changed_cb (GtkTreeSelection * edit_button = g_object_get_data (G_OBJECT (view), "edit"); delete_button = g_object_get_data (G_OBJECT (view), "delete"); - enable_button = g_object_get_data (G_OBJECT (view), "enable"); - if (!edit_button || !delete_button || !enable_button) + if (!edit_button || !delete_button) return; sel = gtk_tree_selection_get_selected (selection, NULL, NULL); gtk_widget_set_sensitive (edit_button, sel); gtk_widget_set_sensitive (delete_button, sel); +} + +static void +startup_selection_changed_cb (GtkTreeSelection *selection, GtkTreeView *view) +{ + gboolean sel; + GtkWidget *edit_button; + GtkWidget *delete_button; + GtkWidget *enable_button; + + edit_button = g_object_get_data (G_OBJECT (view), "edit"); + delete_button = g_object_get_data (G_OBJECT (view), "delete"); + enable_button = g_object_get_data (G_OBJECT (view), "enable"); + + if (!edit_button || !delete_button || !enable_button) + return; + + sel = gtk_tree_selection_get_selected (selection, NULL, NULL); + + if (sel && startup_list_can_edit (&startup_list, startup_store, startup_sel)) + gtk_widget_set_sensitive (edit_button, TRUE); + else + gtk_widget_set_sensitive (edit_button, FALSE); + + if (sel && startup_list_can_edit (&startup_list, startup_store, startup_sel)) + gtk_widget_set_sensitive (delete_button, TRUE); + else + gtk_widget_set_sensitive (delete_button, FALSE); if (sel) { @@ -342,7 +369,7 @@ capplet_build (void) GTK_WIDGET (sessions_view)); sessions_sel = gtk_tree_view_get_selection (sessions_view); gtk_tree_selection_set_mode (sessions_sel, GTK_SELECTION_SINGLE); - g_signal_connect (G_OBJECT (sessions_sel), "changed", (GCallback) selection_changed_cb, sessions_view); + g_signal_connect (G_OBJECT (sessions_sel), "changed", (GCallback) session_selection_changed_cb, sessions_view); renderer = gtk_cell_renderer_text_new (); column = gtk_tree_view_column_new_with_attributes (_("Session Name"), renderer, "text", 0, NULL); gtk_tree_view_append_column (sessions_view, column); @@ -430,7 +457,7 @@ capplet_build (void) GTK_WIDGET (startup_view)); startup_sel = gtk_tree_view_get_selection (startup_view); gtk_tree_selection_set_mode (startup_sel, GTK_SELECTION_SINGLE); - g_signal_connect (G_OBJECT (startup_sel), "changed", (GCallback) selection_changed_cb, startup_view); + g_signal_connect (G_OBJECT (startup_sel), "changed", (GCallback) startup_selection_changed_cb, startup_view); renderer = gtk_cell_renderer_text_new (); column = gtk_tree_view_column_new_with_attributes (_("Command"), renderer, "text", 2, NULL); gtk_tree_view_append_column (startup_view, column); @@ -601,7 +628,7 @@ enable_startup_cb (void) else startup_list_disable (&startup_list, startup_store, startup_sel); - selection_changed_cb (startup_sel, startup_view); + startup_selection_changed_cb (startup_sel, startup_view); } static void gnome-session-2.13.92-fix-session-editing.patch: startup-programs.c | 66 ++++++++++++++++++++++++++++++++++++++++++----------- 1 files changed, 53 insertions(+), 13 deletions(-) --- NEW FILE gnome-session-2.13.92-fix-session-editing.patch --- --- gnome-session-2.13.92/gnome-session/startup-programs.c.fix-session-editing 2006-03-06 14:38:08.000000000 -0500 +++ gnome-session-2.13.92/gnome-session/startup-programs.c 2006-03-06 15:48:12.000000000 -0500 @@ -500,11 +501,11 @@ startup_list_add_dialog (GSList **sl, Gt int i = 2; basename = g_path_get_basename (client->argv[0]); - orig_filename = g_strdup_printf ("%s/.config/autostart/%s.desktop", g_get_home_dir (), basename); - filename = g_strdup (orig_filename); + orig_filename = g_build_filename (g_get_user_config_dir (), "autostart", basename, NULL); + filename = g_strdup_printf ("%s.desktop", orig_filename); while (g_file_exists (filename)) { - char *tmp = g_strdup_printf ("%s-%d", orig_filename, i); + char *tmp = g_strdup_printf ("%s-%d.desktop", orig_filename, i); g_free (filename); filename = tmp; @@ -577,22 +620,40 @@ startup_list_enable (GSList **sl, GtkTre if (!client->enabled) { char *path, *basename; + const char * const * system_dirs; + int i; basename = g_path_get_basename (client->desktop_file); /* if the desktop file is in the user's home and there is one file with the same name in the system-wide dir, just remove it */ - path = g_build_filename (PREFIX, "share", "autostart", basename, NULL); - if (g_str_has_prefix (client->desktop_file, g_get_home_dir ()) - && g_file_test (path, G_FILE_TEST_EXISTS)) - client->to_remove = TRUE; + if (g_str_has_prefix (client->desktop_file, g_get_user_config_dir ())) { + system_dirs = g_get_system_data_dirs (); + for (i = 0; system_dirs[i] != NULL && !client->to_remove; i++) + { + path = g_build_filename (system_dirs[i], "gnome", "autostart", + basename, NULL); + if (g_file_test (path, G_FILE_TEST_EXISTS)) + client->to_remove = TRUE; + g_free (path); + } + + /* support old place (/etc/xdg/autostart) */ + system_dirs = g_get_system_config_dirs (); + for (i = 0; system_dirs[i] != NULL && !client->to_remove; i++) + { + path = g_build_filename (system_dirs[i], "autostart", basename, NULL); + if (g_file_test (path, G_FILE_TEST_EXISTS)) + client->to_remove = TRUE; + g_free (path); + } + } client->enabled = TRUE; spc_write_state (); g_free (basename); - g_free (path); } } @@ -608,17 +669,39 @@ startup_list_disable (GSList **sl, GtkTr if (client->enabled) { char *path, *basename; + const char * const * system_dirs; + int i; basename = g_path_get_basename (client->desktop_file); /* if the desktop file is in the system-wide dir, create another one on the user's home */ - if (g_str_has_prefix (client->desktop_file, PREFIX)) + system_dirs = g_get_system_data_dirs (); + for (i = 0; system_dirs[i] != NULL && !client->to_remove; i++) { - path = g_build_filename (g_get_home_dir (), ".config", "autostart", basename, NULL); - g_free (client->desktop_file); - client->desktop_file = path; - } + if (g_str_has_prefix (client->desktop_file, system_dirs[i])) + { + path = g_build_filename (g_get_user_config_dir (), "autostart", basename, NULL); + g_free (client->desktop_file); + client->desktop_file = path; + + break; + } + } + + /* support old place (/etc/xdg/autostart) */ + system_dirs = g_get_system_config_dirs (); + for (i = 0; system_dirs[i] != NULL && !client->to_remove; i++) + { + if (g_str_has_prefix (client->desktop_file, system_dirs[i])) + { + path = g_build_filename (g_get_user_config_dir (), "autostart", basename, NULL); + g_free (client->desktop_file); + client->desktop_file = path; + + break; + } + } client->enabled = FALSE; spc_write_state (); Index: gnome-session.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-session/devel/gnome-session.spec,v retrieving revision 1.60 retrieving revision 1.61 diff -u -r1.60 -r1.61 --- gnome-session.spec 1 Mar 2006 12:54:32 -0000 1.60 +++ gnome-session.spec 6 Mar 2006 21:11:40 -0000 1.61 @@ -14,7 +14,7 @@ Summary: GNOME session manager Name: gnome-session Version: 2.13.92 -Release: 2 +Release: 3 URL: http://www.gnome.org Source0: %{name}-%{version}.tar.bz2 Source1: redhat-default-session @@ -52,6 +52,8 @@ # too much crashing Patch9: gnome-session-2.13.4-no-crashes.patch Patch10: gnome-session-2.13.92-preserve-backward-compat.patch +Patch11: gnome-session-2.13.92-fix-session-editing.patch +Patch12: gnome-session-2.13.92-desensitize-invalid-buttons.patch BuildRequires: glib2-devel >= %{glib2_version} BuildRequires: pango-devel >= %{pango_version} @@ -85,6 +87,9 @@ %patch8 -p1 -b .shaped %patch9 -p1 -b .no-crashes %patch10 -p1 -b .preserve-backward-compat +%patch11 -p1 -b .fix-session-editing +%patch12 -p1 -b .desensitize-invalid-buttons + %build #workaround broken perl-XML-Parser on 64bit arches @@ -161,6 +166,11 @@ %{_datadir}/gnome/autostart %changelog +* Mon Mar 06 2006 Ray Strode - 2.13.92-3 +- Patch from Vincent Untz to fix session editing (upstream bug 333641) +- Desensitize buttons for operations that the user isn't allowed + to do (bug 179479). + * Wed Mar 01 2006 Karsten Hopp 2.13.92-2 - BuildRequires: gnome-desktop-devel, libX11-devel, libXt-devel From fedora-cvs-commits at redhat.com Mon Mar 6 21:17:39 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 6 Mar 2006 16:17:39 -0500 Subject: rpms/eclipse/devel eclipse-tomcat55.patch, 1.1, 1.2 eclipse-webapp-tomcat55.patch, 1.1, 1.2 eclipse-webapp-tomcat5.patch, 1.1, NONE Message-ID: <200603062117.k26LHdpj006095@cvs.devel.redhat.com> Author: overholt Update of /cvs/dist/rpms/eclipse/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv6080 Modified Files: eclipse-tomcat55.patch eclipse-webapp-tomcat55.patch Removed Files: eclipse-webapp-tomcat5.patch Log Message: More tomcat 5.5 fixes merged from head patch. eclipse-tomcat55.patch: .classpath | 51 - META-INF/MANIFEST.MF | 35 about.html | 45 - src/org/eclipse/tomcat/internal/EclipseErrorReportValve.java | 62 - src/org/eclipse/tomcat/internal/TomcatAppServer.java | 449 ++++++----- src/org/eclipse/tomcat/internal/TomcatPlugin.java | 6 6 files changed, 374 insertions(+), 274 deletions(-) Index: eclipse-tomcat55.patch =================================================================== RCS file: /cvs/dist/rpms/eclipse/devel/eclipse-tomcat55.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- eclipse-tomcat55.patch 28 Feb 2006 23:05:11 -0000 1.1 +++ eclipse-tomcat55.patch 6 Mar 2006 21:17:35 -0000 1.2 @@ -4,7 +4,7 @@ retrieving revision 1.20 diff -u -r1.20 .classpath --- .classpath 21 Apr 2005 23:31:58 -0000 1.20 -+++ .classpath 28 Feb 2006 22:56:26 -0000 ++++ .classpath 6 Mar 2006 21:10:23 -0000 @@ -1,29 +1,36 @@ @@ -31,22 +31,21 @@ - - - -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + @@ -62,6 +61,7 @@ + + + ++ Index: about.html @@ -70,7 +70,7 @@ retrieving revision 1.24 diff -u -r1.24 about.html --- about.html 21 Jun 2005 00:52:06 -0000 1.24 -+++ about.html 28 Feb 2006 22:56:26 -0000 ++++ about.html 6 Mar 2006 21:10:23 -0000 @@ -8,7 +8,7 @@

About This Content

@@ -167,31 +167,27 @@ retrieving revision 1.14 diff -u -r1.14 MANIFEST.MF --- META-INF/MANIFEST.MF 19 May 2005 04:05:11 -0000 1.14 -+++ META-INF/MANIFEST.MF 28 Feb 2006 22:56:42 -0000 -@@ -2,29 +2,34 @@ ++++ META-INF/MANIFEST.MF 6 Mar 2006 21:10:40 -0000 +@@ -2,30 +2,34 @@ Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.tomcat; singleton:=true -Bundle-Version: 4.1.30.1 -Bundle-ClassPath: tomcatwrapper.jar, +Bundle-Version: 5.5.15 -+Bundle-ClassPath: bootstrap.jar, -+ catalina-optional.jar, ++Bundle-ClassPath: catalina-optional.jar, catalina.jar, - bootstrap.jar, commons-beanutils.jar, commons-collections.jar, -+ commons-dbcp.jar, + commons-digester-rss.jar, commons-digester.jar, -- commons-logging-api.jar, + commons-el.jar, -+ commons-fileupload.jar, -+ commons-launcher.jar, + commons-logging.jar, + commons-logging-api.jar, commons-modeler.jar, -+ commons-pool.jar, - jakarta-regexp-1.3.jar, +- jakarta-regexp-1.3.jar, ++ regexp-1.3.jar, jasper-compiler.jar, jasper-runtime.jar, + jspapi.jar, @@ -208,21 +204,38 @@ - servlets-manager.jar, tomcat-coyote.jar, - tomcat-http11.jar, +- tomcat-util.jar + tomcat-http.jar, - tomcat-util.jar ++ tomcat-util.jar, ++ regexp-1.3.jar, ++ servletapi5.jar, ++ log4j.jar Bundle-Activator: org.eclipse.tomcat.internal.TomcatPlugin Bundle-Vendor: %providerName -@@ -54,8 +59,6 @@ + Bundle-Localization: plugin +@@ -54,8 +58,7 @@ mx4j.util;x-internal:=true, org.apache.catalina;x-internal:=true, org.apache.catalina.connector;x-internal:=true, - org.apache.catalina.connector.http;x-internal:=true, - org.apache.catalina.connector.http10;x-internal:=true, ++ org.apache.catalina.core;x-internal:=true, org.apache.catalina.realm;x-internal:=true, org.apache.catalina.servlets;x-internal:=true, org.apache.commons.beanutils;x-internal:=true, -@@ -82,10 +85,9 @@ - org.apache.coyote.tomcat4;x-internal:=true, +@@ -69,7 +72,6 @@ + org.apache.commons.digester.rss;x-internal:=true, + org.apache.commons.digester.xmlrules;x-internal:=true, + org.apache.commons.logging;x-internal:=true, +- org.apache.commons.logging.impl;x-internal:=true, + org.apache.commons.modeler;x-internal:=true, + org.apache.commons.modeler.ant;x-internal:=true, + org.apache.commons.modeler.mbeans;x-internal:=true, +@@ -79,13 +81,11 @@ + org.apache.coyote.http11;x-internal:=true, + org.apache.coyote.http11.filters;x-internal:=true, + org.apache.coyote.memory;x-internal:=true, +- org.apache.coyote.tomcat4;x-internal:=true, org.apache.jasper;x-internal:=true, org.apache.jasper.compiler;x-internal:=true, - org.apache.jasper.logging;x-internal:=true, @@ -233,10 +246,11 @@ org.apache.jasper.xmlparser;x-internal:=true, org.apache.naming;x-internal:=true, org.apache.naming.factory;x-internal:=true, -@@ -96,11 +98,9 @@ +@@ -95,12 +95,9 @@ + org.apache.tomcat.util;x-internal:=true, org.apache.tomcat.util.buf;x-internal:=true, org.apache.tomcat.util.collections;x-internal:=true, - org.apache.tomcat.util.compat;x-internal:=true, +- org.apache.tomcat.util.compat;x-internal:=true, - org.apache.tomcat.util.handler;x-internal:=true, org.apache.tomcat.util.http;x-internal:=true, org.apache.tomcat.util.http.mapper;x-internal:=true, @@ -251,7 +265,7 @@ retrieving revision 1.8 diff -u -r1.8 EclipseErrorReportValve.java --- src/org/eclipse/tomcat/internal/EclipseErrorReportValve.java 23 May 2005 03:58:04 -0000 1.8 -+++ src/org/eclipse/tomcat/internal/EclipseErrorReportValve.java 28 Feb 2006 22:56:42 -0000 ++++ src/org/eclipse/tomcat/internal/EclipseErrorReportValve.java 6 Mar 2006 21:10:40 -0000 @@ -69,15 +69,27 @@ package org.eclipse.tomcat.internal; @@ -371,8 +385,16 @@ retrieving revision 1.43 diff -u -r1.43 TomcatAppServer.java --- src/org/eclipse/tomcat/internal/TomcatAppServer.java 22 Jun 2005 15:29:56 -0000 1.43 -+++ src/org/eclipse/tomcat/internal/TomcatAppServer.java 28 Feb 2006 22:56:42 -0000 -@@ -17,21 +17,21 @@ ++++ src/org/eclipse/tomcat/internal/TomcatAppServer.java 6 Mar 2006 21:10:40 -0000 +@@ -11,27 +11,29 @@ + package org.eclipse.tomcat.internal; + + import java.io.ByteArrayOutputStream; ++import java.io.FileNotFoundException; ++import java.io.FileOutputStream; + import java.io.PrintStream; + import java.net.InetAddress; + import java.net.URL; import java.net.UnknownHostException; import java.util.ArrayList; @@ -398,7 +420,7 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IConfigurationElement; import org.eclipse.core.runtime.IExtension; -@@ -91,27 +91,39 @@ +@@ -91,27 +93,40 @@ * java.lang.String) */ public synchronized void start(int port, String hostAddress) throws CoreException { @@ -443,6 +465,7 @@ - String base = home; - System.setProperty("catalina.base", base); //$NON-NLS-1$ + embedded = new Embedded(new MemoryRealm()); ++ embedded.setRedirectStreams(true); + URL installURL = TomcatPlugin.getDefault().getBundle() + .getEntry("/"); //$NON-NLS-1$ + URL resolvedURL = Platform.resolve(installURL); @@ -453,7 +476,7 @@ // Set up realm if one found if (TomcatPlugin.getDefault().getPluginPreferences().getInt( -@@ -119,14 +131,22 @@ +@@ -119,14 +134,32 @@ Realm realm = getRealm(); embedded.setRealm(realm); } @@ -466,10 +489,20 @@ + } + }); ++ ++ // Install the assembled container hierarchy ++ PrintStream sysErr = System.err; ++ // reassign standard error to prevent Tomcat from writing ++ // its version message there. ++ PrintStream newOutput = new PrintStream(new FileOutputStream( ++ TomcatPlugin.getDefault().getStateLocation().toOSString() ++ + IPath.SEPARATOR + "tomcat.log")); //$NON-NLS-1$ ++ System.setErr(newOutput); ++ ++ embedded.setRedirectStreams(true); // start now, and then add all the contexts.. embedded.start(); - -+ // Create a very basic container hierarchy engine = embedded.createEngine(); @@ -478,29 +511,36 @@ // all request go to our only host engine.setDefaultHost(host.getName()); -@@ -136,7 +156,7 @@ +@@ -136,123 +169,112 @@ .setErrorReportValveClass("org.eclipse.tomcat.internal.EclipseErrorReportValve"); //$NON-NLS-1$ } engine.addChild(host); - +- // Install the assembled container hierarchy +- PrintStream sysOut = System.out; +- // reassign standard output to prevent Tomcat from writing +- // its version message there. +- System.setOut(new PrintStream(new ByteArrayOutputStream())); + - // Install the assembled container hierarchy - PrintStream sysOut = System.out; - // reassign standard output to prevent Tomcat from writing -@@ -146,8 +166,8 @@ + try { embedded.addEngine(engine); } finally { - System.setOut(sysOut); +- System.setOut(sysOut); - } - ++ System.setErr(sysErr); + } + // Root context Context root = embedded.createContext("", home + "/webapps/ROOT"); //$NON-NLS-1$ //$NON-NLS-2$ // this line should be replaced once tomcat provides support -@@ -156,103 +176,97 @@ - ((StandardContext) root) - .setWorkDir(getWorkingDirectory("ROOT")); //$NON-NLS-1$ + // for setting the working directory + if (root instanceof StandardContext) { +- ((StandardContext) root) +- .setWorkDir(getWorkingDirectory("ROOT")); //$NON-NLS-1$ ++ StandardContext standardContext = (StandardContext) root; ++ standardContext.setWorkDir(getWorkingDirectory("ROOT")); //$NON-NLS-1$ ++ standardContext.setSaveConfig(false); } + root.setLoader(embedded.createLoader(this.getClass() @@ -579,7 +619,7 @@ - running = true; - } - }); -+ Connector connector = embedded.createConnector(iAddress.getHostAddress(), this.port,false);; ++ Connector connector = embedded.createConnector(iAddress.getHostAddress(), this.port, false); + + Preferences pref = TomcatPlugin.getDefault() + .getPluginPreferences(); @@ -593,8 +633,8 @@ + int acceptCount = pref.getInt(TomcatPlugin.PREF_ACCEPT_COUNT); + if (acceptCount > 0) { + connector.setProperty("backlog",""+acceptCount); - } - ++ } ++ + int maxProcessors = pref + .getInt(TomcatPlugin.PREF_MAX_PROCESSORS); + if (maxProcessors > 0) { @@ -617,7 +657,7 @@ + if ((disableUploadTimeout != null) && (!("".equals(disableUploadTimeout.trim())))) { //$NON-NLS-1$ + connector.setProperty("disableUploadTimeout", disableUploadTimeout); + } -+ } + } + + // connectorImpl.setDebug(0); + // If there is problem in embedded.addConnector() @@ -628,12 +668,13 @@ +// hasConnection = true; +// } +// }); -+ + // add Connector to Tomcat - PrintStream sysErr = System.err; +- PrintStream sysErr = System.err; // reassign standard error to prevent Coyote from writing // its version message there. - System.setErr(new PrintStream(new ByteArrayOutputStream())); +- System.setErr(new PrintStream(new ByteArrayOutputStream())); ++ System.setErr(newOutput); try { - embedded.addConnector(connector); - httpConnector = connector; @@ -660,7 +701,7 @@ } catch (Exception exc) { TomcatPlugin .logError( -@@ -306,91 +320,129 @@ +@@ -306,91 +328,145 @@ * @throws CoreException */ private void createSSLConnector(InetAddress iAddress, int sslport) @@ -851,7 +892,23 @@ + PrintStream sysErr = System.err; + // reassign standard error to prevent Coyote from writing + // its version message there. -+ System.setErr(new PrintStream(new ByteArrayOutputStream())); ++// System.setErr(new PrintStream(new ByteArrayOutputStream())); ++ PrintStream newOutput; ++ try { ++ newOutput = new PrintStream(new FileOutputStream( ++ TomcatPlugin.getDefault().getStateLocation().toOSString() ++ + IPath.SEPARATOR + "tomcat.log")); ++ System.setErr(newOutput); ++ } catch (SecurityException e1) { ++ e1.printStackTrace(); ++ System.setErr(new PrintStream(new ByteArrayOutputStream())); ++ } catch (FileNotFoundException e1) { ++ e1.printStackTrace(); ++ System.setErr(new PrintStream(new ByteArrayOutputStream())); ++ } catch (IllegalStateException e1) { ++ e1.printStackTrace(); ++ System.setErr(new PrintStream(new ByteArrayOutputStream())); ++ } //$NON-NLS-1$ + try { + sslConnector = connector; + embedded.addConnector(this.sslConnector); @@ -875,13 +932,28 @@ private Realm getRealm() { IExtensionRegistry registry = Platform.getExtensionRegistry(); IExtensionPoint extensionPoint = registry.getExtensionPoint( +@@ -477,10 +553,11 @@ + } + try { + Context context = embedded.createContext(contextPath, path +- .toOSString()); ++ .toOSString()); + if (context instanceof StandardContext) { +- ((StandardContext) context) +- .setWorkDir(getWorkingDirectory(webappName)); ++ StandardContext standardContext = (StandardContext) context; ++ standardContext.setWorkDir(getWorkingDirectory(webappName)); ++ standardContext.setSaveConfig(false); + } + + WebAppClassLoader webappLoader = new WebAppClassLoader(customLoader); Index: src/org/eclipse/tomcat/internal/TomcatPlugin.java =================================================================== RCS file: /cvsroot/eclipse/org.eclipse.tomcat/src/org/eclipse/tomcat/internal/TomcatPlugin.java,v retrieving revision 1.24 diff -u -r1.24 TomcatPlugin.java --- src/org/eclipse/tomcat/internal/TomcatPlugin.java 23 May 2005 03:58:20 -0000 1.24 -+++ src/org/eclipse/tomcat/internal/TomcatPlugin.java 28 Feb 2006 22:56:42 -0000 ++++ src/org/eclipse/tomcat/internal/TomcatPlugin.java 6 Mar 2006 21:10:40 -0000 @@ -24,13 +24,16 @@ public final static String PREF_ACCEPT_COUNT = "acceptCount"; //$NON-NLS-1$ public final static String PREF_MAX_PROCESSORS = "maxProcessors"; //$NON-NLS-1$ @@ -899,3 +971,13 @@ private static TomcatPlugin plugin; // private static BundleContext bundleContext; +@@ -63,6 +66,9 @@ + } + + public static TomcatPlugin getDefault() { ++ if (plugin == null) { ++ plugin = new TomcatPlugin(); ++ } + return plugin; + } + eclipse-webapp-tomcat55.patch: build.properties | 2 +- build.xml | 15 +++++++++------ 2 files changed, 10 insertions(+), 7 deletions(-) Index: eclipse-webapp-tomcat55.patch =================================================================== RCS file: /cvs/dist/rpms/eclipse/devel/eclipse-webapp-tomcat55.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- eclipse-webapp-tomcat55.patch 1 Mar 2006 14:49:15 -0000 1.1 +++ eclipse-webapp-tomcat55.patch 6 Mar 2006 21:17:35 -0000 1.2 @@ -4,7 +4,7 @@ retrieving revision 1.32 diff -u -r1.32 build.properties --- build.properties 18 Mar 2005 08:00:28 -0000 1.32 -+++ build.properties 28 Feb 2006 22:52:35 -0000 ++++ build.properties 6 Mar 2006 21:10:11 -0000 @@ -33,5 +33,5 @@ ../org.eclipse.help.appserver/bin,\ ../org.eclipse.help.appserver,\ @@ -18,7 +18,7 @@ retrieving revision 1.65 diff -u -r1.65 build.xml --- build.xml 18 Mar 2005 07:55:40 -0000 1.65 -+++ build.xml 28 Feb 2006 22:52:35 -0000 ++++ build.xml 6 Mar 2006 21:10:12 -0000 @@ -126,7 +126,7 @@ --- eclipse-webapp-tomcat5.patch DELETED --- From fedora-cvs-commits at redhat.com Mon Mar 6 21:29:25 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 6 Mar 2006 16:29:25 -0500 Subject: rpms/bluez-utils/devel bluez-utils.spec, 1.35, 1.36 dund.init, 1.2, 1.3 hidd.init, 1.3, 1.4 pand.init, 1.2, 1.3 Message-ID: <200603062129.k26LTP4B006308@cvs.devel.redhat.com> Author: katzj Update of /cvs/dist/rpms/bluez-utils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv6292 Modified Files: bluez-utils.spec dund.init hidd.init pand.init Log Message: * Mon Mar 6 2006 Jeremy Katz - 2.25-2 - fix initscripts to be more resilient of files missing to clean up scriptlet errors on install Index: bluez-utils.spec =================================================================== RCS file: /cvs/dist/rpms/bluez-utils/devel/bluez-utils.spec,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- bluez-utils.spec 23 Feb 2006 21:50:18 -0000 1.35 +++ bluez-utils.spec 6 Mar 2006 21:29:23 -0000 1.36 @@ -1,7 +1,7 @@ Summary: Bluetooth utilities Name: bluez-utils Version: 2.25 -Release: 1 +Release: 2 License: GPL Group: Applications/System Source: http://bluez.sourceforge.net/download/%{name}-%{version}.tar.gz @@ -110,6 +110,10 @@ %{_libdir}/cups/backend/bluetooth %changelog +* Mon Mar 6 2006 Jeremy Katz - 2.25-2 +- fix initscripts to be more resilient of files missing to clean up + scriptlet errors on install + * Thu Feb 23 2006 David Woodhouse - 2.25-1 - Update to bluez-utils 2.25 - Add hidd init script (#182274) Index: dund.init =================================================================== RCS file: /cvs/dist/rpms/bluez-utils/devel/dund.init,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- dund.init 2 May 2005 16:07:15 -0000 1.2 +++ dund.init 6 Mar 2006 21:29:23 -0000 1.3 @@ -10,9 +10,9 @@ # Source function library. . /etc/rc.d/init.d/functions -. /etc/sysconfig/network +[ -f /etc/sysconfig/network ] && . /etc/sysconfig/network -[ ${NETWORKING} = "no" ] && exit 0 +[ ${NETWORKING} = "yes" ] || exit 0 [ -r /etc/sysconfig/dund ] || exit 0 Index: hidd.init =================================================================== RCS file: /cvs/dist/rpms/bluez-utils/devel/hidd.init,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- hidd.init 2 May 2005 16:57:01 -0000 1.3 +++ hidd.init 6 Mar 2006 21:29:23 -0000 1.4 @@ -10,9 +10,9 @@ # Source function library. . /etc/rc.d/init.d/functions -. /etc/sysconfig/network +[ -f /etc/sysconfig/network ] && . /etc/sysconfig/network -[ ${NETWORKING} = "no" ] && exit 0 +[ ${NETWORKING} = "yes" ] || exit 0 [ -r /etc/sysconfig/hidd ] || exit 0 Index: pand.init =================================================================== RCS file: /cvs/dist/rpms/bluez-utils/devel/pand.init,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- pand.init 2 May 2005 16:07:15 -0000 1.2 +++ pand.init 6 Mar 2006 21:29:23 -0000 1.3 @@ -10,9 +10,9 @@ # Source function library. . /etc/rc.d/init.d/functions -. /etc/sysconfig/network +[ -f /etc/sysconfig/network ] && . /etc/sysconfig/network -[ ${NETWORKING} = "no" ] && exit 0 +[ ${NETWORKING} = "yes" ] || exit 0 [ -r /etc/sysconfig/pand ] || exit 0 From fedora-cvs-commits at redhat.com Mon Mar 6 21:33:54 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 6 Mar 2006 16:33:54 -0500 Subject: rpms/selinux-policy/devel modules-targeted.conf, 1.16, 1.17 policy-20060207.patch, 1.36, 1.37 selinux-policy.spec, 1.137, 1.138 Message-ID: <200603062133.k26LXsoK006418@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/selinux-policy/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv6398 Modified Files: modules-targeted.conf policy-20060207.patch selinux-policy.spec Log Message: * Mon Mar 6 2006 Dan Walsh 2.2.23-4 - Fixes for cups - Make cryptosetup work with hal Index: modules-targeted.conf =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/modules-targeted.conf,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- modules-targeted.conf 4 Mar 2006 14:49:35 -0000 1.16 +++ modules-targeted.conf 6 Mar 2006 21:33:51 -0000 1.17 @@ -858,7 +858,7 @@ # # Policy for logical volume management programs. # -lvm = off +lvm = base # Layer: system # Module: sysnetwork policy-20060207.patch: Rules.modular | 2 +- policy/modules/admin/readahead.te | 2 +- policy/modules/admin/su.fc | 1 + policy/modules/admin/su.if | 6 +++--- policy/modules/admin/vbetool.te | 5 +++++ policy/modules/kernel/corenetwork.te.in | 2 +- policy/modules/kernel/devices.if | 2 +- policy/modules/kernel/files.fc | 2 +- policy/modules/kernel/files.if | 20 ++++++++++++++++++-- policy/modules/kernel/kernel.if | 2 +- policy/modules/services/apache.fc | 2 ++ policy/modules/services/apache.if | 5 +++++ policy/modules/services/bluetooth.te | 11 ++++++----- policy/modules/services/cron.te | 3 +++ policy/modules/services/cups.fc | 2 +- policy/modules/services/cups.if | 22 ++++++++++++++++++++++ policy/modules/services/cups.te | 7 +++++-- policy/modules/services/cvs.te | 2 +- policy/modules/services/hal.if | 21 +++++++++++++++++++++ policy/modules/services/hal.te | 6 ++++++ policy/modules/services/ktalk.fc | 1 + policy/modules/services/ktalk.te | 6 ++++++ policy/modules/services/nscd.if | 2 +- policy/modules/services/samba.te | 2 +- policy/modules/system/init.te | 5 +++++ policy/modules/system/libraries.fc | 2 ++ policy/modules/system/locallogin.te | 1 + policy/modules/system/lvm.fc | 1 + policy/modules/system/selinuxutil.fc | 6 +++--- policy/modules/system/selinuxutil.te | 4 ++++ policy/modules/system/udev.te | 2 +- support/Makefile.devel | 5 +---- 32 files changed, 132 insertions(+), 30 deletions(-) Index: policy-20060207.patch =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20060207.patch,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- policy-20060207.patch 6 Mar 2006 02:00:43 -0000 1.36 +++ policy-20060207.patch 6 Mar 2006 21:33:51 -0000 1.37 @@ -176,7 +176,7 @@ gen_tunable(allow_httpd_$1_script_anon_write,false) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bluetooth.te serefpolicy-2.2.23/policy/modules/services/bluetooth.te --- nsaserefpolicy/policy/modules/services/bluetooth.te 2006-03-04 00:06:35.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/services/bluetooth.te 2006-03-04 23:47:48.000000000 -0500 ++++ serefpolicy-2.2.23/policy/modules/services/bluetooth.te 2006-03-06 09:54:40.000000000 -0500 @@ -115,6 +115,7 @@ corecmd_exec_shell(bluetooth_t) @@ -193,16 +193,25 @@ allow bluetooth_helper_t bluetooth_t:socket { read write }; -@@ -214,6 +216,9 @@ - ifdef(`xserver.te', ` - allow bluetooth_helper_t xserver_log_t:dir search; - allow bluetooth_helper_t xserver_log_t:file { getattr read }; -+ optional_policy(`xserver', ` -+ xserver_stream_connect_xdm(bluetooth_helper_t) -+ '); +@@ -208,14 +210,13 @@ + nscd_socket_use(bluetooth_helper_t) ') ++optional_policy(`xserver', ` ++ xserver_stream_connect_xdm(bluetooth_helper_t) ++'); ++ + ifdef(`TODO',` + allow bluetooth_helper_t tmp_t:dir search; + +-ifdef(`xserver.te', ` +- allow bluetooth_helper_t xserver_log_t:dir search; +- allow bluetooth_helper_t xserver_log_t:file { getattr read }; +-') +- ifdef(`strict_policy',` + ifdef(`xdm.te',` + allow bluetooth_helper_t xdm_xserver_tmp_t:sock_file { read write }; diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.te serefpolicy-2.2.23/policy/modules/services/cron.te --- nsaserefpolicy/policy/modules/services/cron.te 2006-03-04 00:06:35.000000000 -0500 +++ serefpolicy-2.2.23/policy/modules/services/cron.te 2006-03-04 23:47:48.000000000 -0500 @@ -228,9 +237,38 @@ /var/run/hp.*\.pid -- gen_context(system_u:object_r:hplip_var_run_t,s0) /var/run/hp.*\.port -- gen_context(system_u:object_r:hplip_var_run_t,s0) /var/run/ptal-printd(/.*)? gen_context(system_u:object_r:ptal_var_run_t,s0) +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.if serefpolicy-2.2.23/policy/modules/services/cups.if +--- nsaserefpolicy/policy/modules/services/cups.if 2006-02-23 09:25:09.000000000 -0500 ++++ serefpolicy-2.2.23/policy/modules/services/cups.if 2006-03-06 12:24:44.000000000 -0500 +@@ -226,3 +226,25 @@ + allow cupsd_t $1:tcp_socket { acceptfrom recvfrom }; + kernel_tcp_recvfrom($1) + ') ++ ++######################################## ++## ++## Connect to cupsd over an unix domain stream socket. ++## ++## ++## ++## Domain allowed access. ++## ++## ++# ++interface(`cups_stream_connect',` ++ gen_require(` ++ type cupsd_t, cupsd_var_run_t; ++ ') ++ ++ files_search_pids($1) ++ allow $1 cupsd_var_run_t:dir search; ++ allow $1 cupsd_var_run_t:sock_file write; ++ allow $1 cupsd_t:unix_stream_socket connectto; ++') ++ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.te serefpolicy-2.2.23/policy/modules/services/cups.te --- nsaserefpolicy/policy/modules/services/cups.te 2006-03-04 00:06:35.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/services/cups.te 2006-03-04 23:47:48.000000000 -0500 ++++ serefpolicy-2.2.23/policy/modules/services/cups.te 2006-03-06 12:24:35.000000000 -0500 @@ -77,7 +77,7 @@ dontaudit cupsd_t self:capability { sys_tty_config net_admin }; allow cupsd_t self:process { setsched signal_perms }; @@ -256,7 +294,15 @@ kernel_read_all_sysctls(cupsd_t) kernel_tcp_recvfrom(cupsd_t) -@@ -649,7 +651,7 @@ +@@ -382,6 +384,7 @@ + allow hplip_t self:rawip_socket create_socket_perms; + + allow hplip_t cupsd_etc_t:dir search; ++cups_stream_connect(hplip_t) + + allow hplip_t hplip_etc_t:file r_file_perms; + allow hplip_t hplip_etc_t:dir r_dir_perms; +@@ -649,7 +652,7 @@ ifdef(`targeted_policy',` term_use_generic_ptys(cupsd_config_t) @@ -307,7 +353,7 @@ + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.te serefpolicy-2.2.23/policy/modules/services/hal.te --- nsaserefpolicy/policy/modules/services/hal.te 2006-03-04 00:06:36.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/services/hal.te 2006-03-04 23:47:48.000000000 -0500 ++++ serefpolicy-2.2.23/policy/modules/services/hal.te 2006-03-06 14:50:05.000000000 -0500 @@ -48,6 +48,7 @@ kernel_read_network_state(hald_t) kernel_read_kernel_sysctls(hald_t) @@ -324,10 +370,39 @@ term_dontaudit_use_unallocated_ttys(hald_t) term_dontaudit_use_generic_ptys(hald_t) files_dontaudit_read_root_files(hald_t) +@@ -195,6 +197,10 @@ + hotplug_read_config(hald_t) + ') + ++optional_policy(`lvm', ` ++ lvm_domtrans(hald_t) ++') ++ + optional_policy(`mount',` + mount_domtrans(hald_t) + ') +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ktalk.fc serefpolicy-2.2.23/policy/modules/services/ktalk.fc +--- nsaserefpolicy/policy/modules/services/ktalk.fc 2006-02-20 14:07:37.000000000 -0500 ++++ serefpolicy-2.2.23/policy/modules/services/ktalk.fc 2006-03-06 11:04:32.000000000 -0500 +@@ -1,3 +1,4 @@ + + /usr/bin/in.talkd -- gen_context(system_u:object_r:ktalkd_exec_t,s0) + /usr/bin/ktalkd -- gen_context(system_u:object_r:ktalkd_exec_t,s0) ++/var/log/talkd.* -- gen_context(system_u:object_r:ktalkd_log_t,s0) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ktalk.te serefpolicy-2.2.23/policy/modules/services/ktalk.te --- nsaserefpolicy/policy/modules/services/ktalk.te 2006-03-04 00:06:36.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/services/ktalk.te 2006-03-04 23:47:48.000000000 -0500 -@@ -68,6 +68,8 @@ ++++ serefpolicy-2.2.23/policy/modules/services/ktalk.te 2006-03-06 11:06:04.000000000 -0500 +@@ -14,6 +14,9 @@ + type ktalkd_tmp_t; + files_tmp_file(ktalkd_tmp_t) + ++type ktalkd_log_t; ++logging_log_file(ktalkd_log_t) ++ + type ktalkd_var_run_t; + files_pid_file(ktalkd_var_run_t) + +@@ -68,9 +71,12 @@ files_read_etc_files(ktalkd_t) @@ -336,6 +411,10 @@ libs_use_ld_so(ktalkd_t) libs_use_shared_libs(ktalkd_t) logging_send_syslog_msg(ktalkd_t) ++logging_log_filetrans(ktalkd_t,ktalkd_log_t,file) + + miscfiles_read_localization(ktalkd_t) + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nscd.if serefpolicy-2.2.23/policy/modules/services/nscd.if --- nsaserefpolicy/policy/modules/services/nscd.if 2006-02-10 21:34:14.000000000 -0500 +++ serefpolicy-2.2.23/policy/modules/services/nscd.if 2006-03-04 23:47:48.000000000 -0500 Index: selinux-policy.spec =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v retrieving revision 1.137 retrieving revision 1.138 diff -u -r1.137 -r1.138 --- selinux-policy.spec 6 Mar 2006 02:00:43 -0000 1.137 +++ selinux-policy.spec 6 Mar 2006 21:33:51 -0000 1.138 @@ -10,7 +10,7 @@ Summary: SELinux policy configuration Name: selinux-policy Version: 2.2.23 -Release: 3 +Release: 4 License: GPL Group: System Environment/Base Source: serefpolicy-%{version}.tgz @@ -296,6 +296,10 @@ %fileList strict %changelog +* Mon Mar 6 2006 Dan Walsh 2.2.23-4 +- Fixes for cups +- Make cryptosetup work with hal + * Sun Mar 5 2006 Dan Walsh 2.2.23-3 - Load Policy needs translock From fedora-cvs-commits at redhat.com Mon Mar 6 21:38:54 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 6 Mar 2006 16:38:54 -0500 Subject: rpms/cman-kernel/devel cman-kernel.spec,1.144,1.145 Message-ID: <200603062138.k26LcsqU006622@cvs.devel.redhat.com> Author: cfeist Update of /cvs/dist/rpms/cman-kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv6609 Modified Files: cman-kernel.spec Log Message: Updated Kernel Version Index: cman-kernel.spec =================================================================== RCS file: /cvs/dist/rpms/cman-kernel/devel/cman-kernel.spec,v retrieving revision 1.144 retrieving revision 1.145 diff -u -r1.144 -r1.145 --- cman-kernel.spec 23 Feb 2006 20:41:02 -0000 1.144 +++ cman-kernel.spec 6 Mar 2006 21:38:51 -0000 1.145 @@ -12,7 +12,7 @@ %define buildup 1 %define buildsmp 1 %define buildxen 0 -%define kernel_version 2.6.15-1.1975_FC5 +%define kernel_version 2.6.15-1.2009.4.2_FC5 %define subversion 0 %define tempversion 2.6.15 @@ -26,7 +26,7 @@ Name: cman-kernel Version: 2.6.15.1 -Release: 0.FC5.2 +Release: 0.FC5.3 License: GPL Group: System Environment/Kernel Summary: cman-kernel - The Cluster Manager kernel modules From fedora-cvs-commits at redhat.com Mon Mar 6 21:39:08 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 6 Mar 2006 16:39:08 -0500 Subject: rpms/gnbd-kernel/devel gnbd-kernel.spec,1.137,1.138 Message-ID: <200603062139.k26Ld8P9006678@cvs.devel.redhat.com> Author: cfeist Update of /cvs/dist/rpms/gnbd-kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv6665 Modified Files: gnbd-kernel.spec Log Message: Updated Kernel Version Index: gnbd-kernel.spec =================================================================== RCS file: /cvs/dist/rpms/gnbd-kernel/devel/gnbd-kernel.spec,v retrieving revision 1.137 retrieving revision 1.138 diff -u -r1.137 -r1.138 --- gnbd-kernel.spec 28 Feb 2006 20:48:14 -0000 1.137 +++ gnbd-kernel.spec 6 Mar 2006 21:39:06 -0000 1.138 @@ -12,7 +12,7 @@ %define buildup 1 %define buildsmp 1 %define buildxen 1 -%define kernel_version 2.6.15-1.1975_FC5 +%define kernel_version 2.6.15-1.2009.4.2_FC5 %define subversion 2 %ifnarch i686 @@ -25,7 +25,7 @@ Name: gnbd-kernel Version: 2.6.15 -Release: 5.FC5.9 +Release: 5.FC5.10 License: GPL Group: System Environment/Kernel Summary: gnbd-kernel - The kernel module for GFS's Network Block Device From fedora-cvs-commits at redhat.com Mon Mar 6 21:39:18 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 6 Mar 2006 16:39:18 -0500 Subject: rpms/dlm-kernel/devel dlm-kernel.spec,1.117,1.118 Message-ID: <200603062139.k26LdI6o006736@cvs.devel.redhat.com> Author: cfeist Update of /cvs/dist/rpms/dlm-kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv6723 Modified Files: dlm-kernel.spec Log Message: Updated Kernel Version Index: dlm-kernel.spec =================================================================== RCS file: /cvs/dist/rpms/dlm-kernel/devel/dlm-kernel.spec,v retrieving revision 1.117 retrieving revision 1.118 diff -u -r1.117 -r1.118 --- dlm-kernel.spec 23 Feb 2006 20:41:45 -0000 1.117 +++ dlm-kernel.spec 6 Mar 2006 21:39:16 -0000 1.118 @@ -12,7 +12,7 @@ %define buildup 1 %define buildsmp 1 %define buildxen 0 -%define kernel_version 2.6.15-1.1975_FC5 +%define kernel_version 2.6.15-1.2009.4.2_FC5 %define subversion 0 %ifnarch i686 @@ -25,7 +25,7 @@ Name: dlm-kernel Version: 2.6.15 -Release: 0.FC5.1 +Release: 0.FC5.2 License: GPL Group: System Environment/Kernel Summary: dlm-kernel - The Distributed Lock Manager kernel modules. From fedora-cvs-commits at redhat.com Mon Mar 6 21:39:26 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 6 Mar 2006 16:39:26 -0500 Subject: rpms/GFS-kernel/devel GFS-kernel.spec,1.137,1.138 Message-ID: <200603062139.k26LdQOv006791@cvs.devel.redhat.com> Author: cfeist Update of /cvs/dist/rpms/GFS-kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv6778 Modified Files: GFS-kernel.spec Log Message: Updated Kernel Version Index: GFS-kernel.spec =================================================================== RCS file: /cvs/dist/rpms/GFS-kernel/devel/GFS-kernel.spec,v retrieving revision 1.137 retrieving revision 1.138 diff -u -r1.137 -r1.138 --- GFS-kernel.spec 23 Feb 2006 20:41:55 -0000 1.137 +++ GFS-kernel.spec 6 Mar 2006 21:39:24 -0000 1.138 @@ -12,7 +12,7 @@ %define buildup 1 %define buildsmp 1 %define buildxen 0 -%define kernel_version 2.6.15-1.1975_FC5 +%define kernel_version 2.6.15-1.2009.4.2_FC5 %define subversion 2 %ifnarch i686 @@ -25,7 +25,7 @@ Name: GFS-kernel Version: 2.6.15 -Release: 5.FC5.5 +Release: 5.FC5.6 License: GPL Group: System Environment/Kernel Summary: GFS-kernel - The Global File System kernel modules From fedora-cvs-commits at redhat.com Mon Mar 6 21:40:54 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 6 Mar 2006 16:40:54 -0500 Subject: rpms/kexec-tools/devel kexec-tools.spec,1.14,1.15 Message-ID: <200603062140.k26LesoL006935@cvs.devel.redhat.com> Author: katzj Update of /cvs/dist/rpms/kexec-tools/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv6920 Modified Files: kexec-tools.spec Log Message: * Mon Mar 6 2006 Jeremy Katz - 1.101-13 - proper requires for scriptlets Index: kexec-tools.spec =================================================================== RCS file: /cvs/dist/rpms/kexec-tools/devel/kexec-tools.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- kexec-tools.spec 6 Mar 2006 17:47:53 -0000 1.14 +++ kexec-tools.spec 6 Mar 2006 21:40:51 -0000 1.15 @@ -1,6 +1,6 @@ Name: kexec-tools Version: 1.101 -Release: 12 +Release: 13 License: GPL Group: Applications/System Summary: The kexec/kdump userspace component. @@ -9,6 +9,7 @@ Source1: kdump.init Source2: kdump.sysconfig BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot +Requires(pre): coreutils chkconfig sed # # Patches 0 through 100 are meant for x86 kexec-tools enablement @@ -95,6 +96,9 @@ %doc TODO %changelog +* Mon Mar 6 2006 Jeremy Katz - 1.101-13 +- proper requires for scriptlets + * Mon Mar 06 2006 Thomas Graf - 1.101-12 - Move kexec and kdump binaries to /sbin From fedora-cvs-commits at redhat.com Mon Mar 6 21:44:47 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 6 Mar 2006 16:44:47 -0500 Subject: rpms/kernel/devel linux-2.6-drm-cripple-r300.patch, NONE, 1.1 kernel-2.6.spec, 1.2020, 1.2021 Message-ID: <200603062144.k26Lil82007135@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv7120 Modified Files: kernel-2.6.spec Added Files: linux-2.6-drm-cripple-r300.patch Log Message: Disable DRI on Radeon R300 and above, due to instability. (#174646,#182196) linux-2.6-drm-cripple-r300.patch: drm_pciids.h | 33 --------------------------------- 1 files changed, 33 deletions(-) --- NEW FILE linux-2.6-drm-cripple-r300.patch --- Cripple the Radeon driver so that it doesn't work on R300 and above right now. Fedora Xorg isn't ready for it yet, and loading the module for it causes crashes. https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=174646 https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=182196 --- linux-2.6.15.noarch/drivers/char/drm/drm_pciids.h~ 2006-03-05 23:37:54.000000000 -0500 +++ linux-2.6.15.noarch/drivers/char/drm/drm_pciids.h 2006-03-05 23:39:38.000000000 -0500 @@ -3,19 +3,8 @@ Please contact dri-devel at lists.sf.net to add new cards to this list */ #define radeon_PCI_IDS \ - {0x1002, 0x3150, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV350},\ {0x1002, 0x4136, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS100|CHIP_IS_IGP}, \ {0x1002, 0x4137, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS200|CHIP_IS_IGP}, \ - {0x1002, 0x4144, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R300}, \ - {0x1002, 0x4145, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R300}, \ - {0x1002, 0x4146, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R300}, \ - {0x1002, 0x4147, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R300}, \ - {0x1002, 0x4150, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV350}, \ - {0x1002, 0x4151, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV350}, \ - {0x1002, 0x4152, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV350}, \ - {0x1002, 0x4153, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV350}, \ - {0x1002, 0x4154, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV350}, \ - {0x1002, 0x4156, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV350}, \ {0x1002, 0x4237, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS250|CHIP_IS_IGP}, \ {0x1002, 0x4242, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R200}, \ {0x1002, 0x4243, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R200}, \ @@ -26,8 +15,6 @@ {0x1002, 0x4965, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R250}, \ {0x1002, 0x4966, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R250}, \ {0x1002, 0x4967, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R250}, \ - {0x1002, 0x4A49, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R420}, \ - {0x1002, 0x4A4B, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R420}, \ {0x1002, 0x4C57, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV200|CHIP_IS_MOBILITY}, \ {0x1002, 0x4C58, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV200|CHIP_IS_MOBILITY}, \ {0x1002, 0x4C59, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV100|CHIP_IS_MOBILITY}, \ @@ -36,18 +23,6 @@ {0x1002, 0x4C65, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R250|CHIP_IS_MOBILITY}, \ {0x1002, 0x4C66, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R250|CHIP_IS_MOBILITY}, \ {0x1002, 0x4C67, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R250|CHIP_IS_MOBILITY}, \ - {0x1002, 0x4E44, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R300}, \ - {0x1002, 0x4E45, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R300}, \ - {0x1002, 0x4E46, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV350}, \ - {0x1002, 0x4E47, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R300}, \ - {0x1002, 0x4E48, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R350}, \ - {0x1002, 0x4E49, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R350}, \ - {0x1002, 0x4E4A, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV350}, \ - {0x1002, 0x4E4B, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R350}, \ - {0x1002, 0x4E50, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV350|CHIP_IS_MOBILITY}, \ - {0x1002, 0x4E51, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV350|CHIP_IS_MOBILITY}, \ - {0x1002, 0x4E54, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV350|CHIP_IS_MOBILITY}, \ - {0x1002, 0x4E56, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV350|CHIP_IS_MOBILITY}, \ {0x1002, 0x5144, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R100|CHIP_SINGLE_CRTC}, \ {0x1002, 0x5145, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R100|CHIP_SINGLE_CRTC}, \ {0x1002, 0x5146, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R100|CHIP_SINGLE_CRTC}, \ @@ -70,12 +45,6 @@ {0x1002, 0x516A, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R200}, \ {0x1002, 0x516B, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R200}, \ {0x1002, 0x516C, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R200}, \ - {0x1002, 0x5460, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV350}, \ - {0x1002, 0x554F, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R350}, \ - {0x1002, 0x5834, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS300|CHIP_IS_IGP}, \ - {0x1002, 0x5835, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS300|CHIP_IS_IGP|CHIP_IS_MOBILITY}, \ - {0x1002, 0x5836, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS300|CHIP_IS_IGP}, \ - {0x1002, 0x5837, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS300|CHIP_IS_IGP}, \ {0x1002, 0x5960, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV280}, \ {0x1002, 0x5961, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV280}, \ {0x1002, 0x5962, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV280}, \ @@ -89,8 +58,6 @@ {0x1002, 0x5c62, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV280}, \ {0x1002, 0x5c63, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV280|CHIP_IS_MOBILITY}, \ {0x1002, 0x5c64, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV280}, \ - {0x1002, 0x5d4d, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R350}, \ - {0x1002, 0x5e4b, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R420}, \ {0, 0, 0} #define r128_PCI_IDS \ Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.2020 retrieving revision 1.2021 diff -u -r1.2020 -r1.2021 --- kernel-2.6.spec 6 Mar 2006 20:40:38 -0000 1.2020 +++ kernel-2.6.spec 6 Mar 2006 21:44:45 -0000 1.2021 @@ -372,6 +372,7 @@ Patch1720: linux-2.6-md-raid1-leak.patch Patch1730: linux-2.6-signal-trampolines-unwind-info.patch Patch1740: linux-2.6-softlockup-disable.patch +Patch1750: linux-2.6-drm-cripple-r300.patch # SELinux/audit patches. Patch1800: linux-2.6-selinux-hush.patch @@ -982,6 +983,8 @@ %patch1730 -p1 # Add a safety net to softlockup so that it doesn't prevent installs. %patch1740 -p1 +# Disable R300 and above DRI as it's unstable. +%patch1750 -p1 # Silence some selinux messages. %patch1800 -p1 @@ -1628,6 +1631,9 @@ %endif %changelog +* Mon Mar 6 2006 Dave Jones +- Disable DRI on Radeon R300 and above, due to instability. (#174646,#182196) + * Mon Mar 6 2006 Stephen Tweedie - Merge xen rebase with 1.2016 kernel - Rename kernel-xen-(hypervisor|guest) to kernel-xen(0|U) for consistency From fedora-cvs-commits at redhat.com Mon Mar 6 21:47:44 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 6 Mar 2006 16:47:44 -0500 Subject: rpms/eclipse/devel eclipse-tomcat55-build.patch, 1.2, 1.3 eclipse.spec, 1.257, 1.258 Message-ID: <200603062147.k26LlimG019752@cvs.devel.redhat.com> Author: overholt Update of /cvs/dist/rpms/eclipse/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv19737 Modified Files: eclipse-tomcat55-build.patch eclipse.spec Log Message: s/tomcat-http11/tomcat-http/g eclipse-tomcat55-build.patch: build.xml | 76 +++++++++++++++++++++++++++++++++++++++----------------------- 1 files changed, 48 insertions(+), 28 deletions(-) Index: eclipse-tomcat55-build.patch =================================================================== RCS file: /cvs/dist/rpms/eclipse/devel/eclipse-tomcat55-build.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- eclipse-tomcat55-build.patch 1 Mar 2006 16:17:35 -0000 1.2 +++ eclipse-tomcat55-build.patch 6 Mar 2006 21:47:41 -0000 1.3 @@ -1,5 +1,5 @@ ---- build.xml.orig 2005-05-13 14:34:52.000000000 -0400 -+++ build.xml 2005-06-14 15:56:51.000000000 -0400 +--- build.xml.orig 2006-03-06 16:45:16.000000000 -0500 ++++ build.xml 2006-03-06 16:45:57.000000000 -0500 @@ -45,7 +45,7 @@ @@ -9,7 +9,7 @@ -@@ -115,44 +115,64 @@ +@@ -115,48 +115,68 @@ @@ -17,34 +17,20 @@ - -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- + + + + -+ -+ -+ -+ + + + + + + -+ -+ + + +- +- + + + @@ -55,8 +41,14 @@ + + + -+ -+ + + +- +- +- +- +- +- + + + @@ -95,7 +87,13 @@ - - +- +- ++ ++ + + + @@ -189,11 +209,11 @@ @@ -150,3 +148,4 @@ + + Index: eclipse.spec =================================================================== RCS file: /cvs/dist/rpms/eclipse/devel/eclipse.spec,v retrieving revision 1.257 retrieving revision 1.258 diff -u -r1.257 -r1.258 --- eclipse.spec 3 Mar 2006 22:24:20 -0000 1.257 +++ eclipse.spec 6 Mar 2006 21:47:41 -0000 1.258 @@ -914,7 +914,7 @@ ln -sf %{tomcatlibdir}/server/lib/servlets-default.jar plugins/org.eclipse.tomcat_*/servlets-default.jar ln -sf %{tomcatlibdir}/server/lib/servlets-invoker.jar plugins/org.eclipse.tomcat_*/servlets-invoker.jar ln -sf %{tomcatlibdir}/server/lib/tomcat-coyote.jar plugins/org.eclipse.tomcat_*/tomcat-coyote.jar -ln -sf %{tomcatlibdir}/server/lib/tomcat-http11.jar plugins/org.eclipse.tomcat_*/tomcat-http.jar +ln -sf %{tomcatlibdir}/server/lib/tomcat-http.jar plugins/org.eclipse.tomcat_*/tomcat-http.jar ln -sf %{tomcatlibdir}/server/lib/tomcat-util.jar plugins/org.eclipse.tomcat_*/tomcat-util.jar ## END TOMCAT ## ln -sf %{_javadir}/junit.jar plugins/org.junit_*/junit.jar From fedora-cvs-commits at redhat.com Mon Mar 6 22:10:51 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 6 Mar 2006 17:10:51 -0500 Subject: rpms/gdm/devel gdm-2.13.0.9-disable-sounds-completely.patch, NONE, 1.1 gdm.spec, 1.138, 1.139 Message-ID: <200603062210.k26MApPk032454@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/gdm/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv31303 Modified Files: gdm.spec Added Files: gdm-2.13.0.9-disable-sounds-completely.patch Log Message: - disable sounds completely when disabled in configuration file (upstream bug 333435) gdm-2.13.0.9-disable-sounds-completely.patch: slave.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) --- NEW FILE gdm-2.13.0.9-disable-sounds-completely.patch --- Index: gdm2/daemon/slave.c =================================================================== RCS file: /cvs/gnome/gdm2/daemon/slave.c,v retrieving revision 1.318 retrieving revision 1.319 diff -u -p -r1.318 -r1.319 --- gdm2/daemon/slave.c 15 Feb 2006 20:40:41 -0000 1.318 +++ gdm2/daemon/slave.c 6 Mar 2006 21:40:26 -0000 1.319 @@ -2047,8 +2047,8 @@ gdm_slave_wait_for_login (void) gdm_slave_greeter_ctl_no_ret (GDM_RESET, ""); /* Play sounds if specified for a failed login */ - if (d->attached && - failuresound && + if (d->attached && failuresound && + gdm_get_value_bool (GDM_KEY_SOUND_ON_LOGIN_FAILURE) && ! play_login_sound (failuresound)) { gdm_error (_("Login sound requested on non-local display or the play " "software cannot be run or the sound does not exist.")); @@ -2069,9 +2069,9 @@ gdm_slave_wait_for_login (void) successsound = gdm_get_value_string (GDM_KEY_SOUND_ON_LOGIN_SUCCESS_FILE); /* Play sounds if specified for a successful login */ - if (login != NULL && + if (login != NULL && successsound && + gdm_get_value_bool (GDM_KEY_SOUND_ON_LOGIN_SUCCESS) && d->attached && - successsound && ! play_login_sound (successsound)) { gdm_error (_("Login sound requested on non-local display or the play software " "cannot be run or the sound does not exist.")); Index: gdm.spec =================================================================== RCS file: /cvs/dist/rpms/gdm/devel/gdm.spec,v retrieving revision 1.138 retrieving revision 1.139 diff -u -r1.138 -r1.139 --- gdm.spec 28 Feb 2006 15:38:45 -0000 1.138 +++ gdm.spec 6 Mar 2006 22:10:47 -0000 1.139 @@ -15,7 +15,7 @@ Summary: The GNOME Display Manager. Name: gdm Version: 2.13.0.9 -Release: 1 +Release: 2 Epoch: 1 License: LGPL/GPL Group: User Interface/X @@ -43,6 +43,7 @@ Patch18: gdm-2.8.0.4-dont-call-xsm.patch Patch19: gdm-2.13.0.4-add-gnome-cflags.patch Patch22: gdm-2.13.0.7-pam_stack.patch +Patch23: gdm-2.13.0.9-disable-sounds-completely.patch BuildRoot: %{_tmppath}/gdm-%{PACKAGE_VERSION}-root @@ -114,6 +115,7 @@ %patch18 -p1 -b .dont-call-xsm %patch19 -p1 -b .add-gnome-cflags %patch22 -p1 -b .pam_stack +%patch23 -p1 -b .disable-sounds-completely # fix the time format for ja perl -pi -e "s|^msgstr \"%a %b %d, %H:%M\"|msgstr \"%m/%d \(%a\) %H:%M\"|; s|^msgstr \"%a %b %d, %I:%M %p\"|msgstr \"%m/%d \(%a\) %p %I:%M\"|" po/ja.po @@ -307,6 +309,10 @@ %attr(1770, root, gdm) %dir %{_localstatedir}/gdm %changelog +* Mon Mar 6 2006 Ray Strode - 1:2.13.0.9-2 +- disable sounds completely when disabled in configuration file + (upstream bug 333435) + * Tue Feb 28 2006 Ray Strode - 1:2.13.0.9-1 - Update to 2.13.0.9 - Use new %%post section, written by From fedora-cvs-commits at redhat.com Mon Mar 6 22:12:58 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 6 Mar 2006 17:12:58 -0500 Subject: rpms/eclipse/devel eclipse.spec,1.258,1.259 Message-ID: <200603062212.k26MCwxs000972@cvs.devel.redhat.com> Author: overholt Update of /cvs/dist/rpms/eclipse/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv942 Modified Files: eclipse.spec Log Message: s/jakarta-//g Index: eclipse.spec =================================================================== RCS file: /cvs/dist/rpms/eclipse/devel/eclipse.spec,v retrieving revision 1.258 retrieving revision 1.259 diff -u -r1.258 -r1.259 --- eclipse.spec 6 Mar 2006 21:47:41 -0000 1.258 +++ eclipse.spec 6 Mar 2006 22:12:54 -0000 1.259 @@ -510,7 +510,7 @@ ln -sf %{tomcatlibdir}/server/lib/catalina.jar plugins/org.eclipse.tomcat/catalina.jar ln -sf %{tomcatlibdir}/server/lib/catalina-optional.jar plugins/org.eclipse.tomcat/catalina-optional.jar ln -sf %{_javadir}/commons-beanutils.jar plugins/org.eclipse.tomcat/commons-beanutils.jar -ln -sf %{_javadir}/commons-collections.jar plugins/org.eclipse.tomcat/jakarta-commons-collections.jar +ln -sf %{_javadir}/commons-collections.jar plugins/org.eclipse.tomcat/commons-collections.jar ln -sf %{_javadir}/commons-dbcp.jar plugins/org.eclipse.tomcat/commons-dbcp.jar ln -sf %{_javadir}/commons-digester.jar plugins/org.eclipse.tomcat/commons-digester.jar ln -sf %{_javadir}/commons-digester-rss.jar plugins/org.eclipse.tomcat/commons-digester-rss.jar From fedora-cvs-commits at redhat.com Mon Mar 6 22:14:39 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 6 Mar 2006 17:14:39 -0500 Subject: rpms/kernel/devel linux-2.6-cond-resched-booting-fix.patch, NONE, 1.1 kernel-2.6.spec, 1.2021, 1.2022 Message-ID: <200603062214.k26MEdUk001803@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv1758 Modified Files: kernel-2.6.spec Added Files: linux-2.6-cond-resched-booting-fix.patch Log Message: Don't do voluntary preempt until after bootup linux-2.6-cond-resched-booting-fix.patch: sched.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletion(-) --- NEW FILE linux-2.6-cond-resched-booting-fix.patch --- Date: Sun, 5 Mar 2006 21:00:17 -0800 (PST) From: Linus Torvalds To: Andrew Morton Subject: Re: Fw: Re: oops in choose_configuration() cc: Greg KH , Ingo Molnar , Linux Kernel Mailing List , Dave Jones On Sun, 5 Mar 2006, Andrew Morton wrote: > For several days I've been getting repeatable oopses in the -mm kernel. > They occur once per ~30 boots, during initscripts. Actually, having thought about this some more, I wonder if the bug isn't a hell of a lot simpler than we've given it credit for. I think you're running with CONFIG_PREEMPT_VOLUNTARY, right? And looking more closely, that thing is BROKEN. DaveJ - do Fedora kernels also enable that thing? Ingo: as far as I can see, CONFIG_PREEMPT_VOLUNTARY is totally and utterly broken during bootup. It does: # define might_resched() cond_resched() and then we have # define might_sleep() do { might_resched(); } while (0) and but the fact is, we _know_ that "might_sleep()" is broken during early bootup. We know this, because when we ahev __might_sleep() enabled to warn about cases where we must not sleep, we've had those tests disabled during early boot for a long time, in order to avoid irritating and nasty known "sleeping function called from invalid context" messages: ... if ((in_atomic() || irqs_disabled()) && system_state == SYSTEM_RUNNING && !oops_in_progress) { if (time_before(jiffies, prev_jiffy + HZ) && prev_jiffy) ... Note in particular the "system_state == SYSTEM_RUNNING". It's there for a reason. Namely that we know that we do things that aren't valid during early bootup, and that we call functions that might sleep while we have interrupts disabled, for example. HOWEVER, the "cond_resched()" does not take that into account at all, and will happily conditionally reschedule things at early bootup before we have set system_state to SYSTEM_RUNNING. In other words, unless I've totally lost it, I think that CONFIG_PREEMPT_VOLUNTARY currently makes us re-schedule at points in the early boot that we _know_ are unsafe. We happen to not hit it very often, because (a) some of the time it doesn't matter and (b) when it matters, we seldom have "need_resched()" returning true, but I would not be at all surprised if Andrew's problems are because the scheduler heuristics make it happen when it shouldn't. And the end result? I don't know. But we've traditionally run _all_ of the early boot ignoring the "might_sleep()" warnings, up until the point where we unlock the kernel lock, long after things like kmem_cache_init(). So I would not be surprised, for example, if we had kmem_cache_init() doing bad things because it got interrupts enabled at a point where it shouldn't, because it went through the scheduler. I dunno. I can't actually see what would corrupt anything, but the point is that we definitely do scheduling in places that have gotten absolutely _zero_ coverage, because we turned off the checks on purpose during early boot because the checks gave false positives. And CONFIG_PREEMPT_VOLUNTARY turns those false positives into potential rescheduling events. Maybe I'm crazy. But it looks really really broken to me. Andrew, if I'm right, then this ugly patch should make a difference. Is there something else I've missed? Linus ---- diff --git a/kernel/sched.c b/kernel/sched.c index 12d291b..3454bb8 100644 --- a/kernel/sched.c +++ b/kernel/sched.c @@ -4028,6 +4028,8 @@ static inline void __cond_resched(void) */ if (unlikely(preempt_count())) return; + if (unlikely(system_state != SYSTEM_RUNNING)) + return; do { add_preempt_count(PREEMPT_ACTIVE); schedule(); - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo at vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.2021 retrieving revision 1.2022 diff -u -r1.2021 -r1.2022 --- kernel-2.6.spec 6 Mar 2006 21:44:45 -0000 1.2021 +++ kernel-2.6.spec 6 Mar 2006 22:14:36 -0000 1.2022 @@ -373,6 +373,7 @@ Patch1730: linux-2.6-signal-trampolines-unwind-info.patch Patch1740: linux-2.6-softlockup-disable.patch Patch1750: linux-2.6-drm-cripple-r300.patch +Patch1760: linux-2.6-cond-resched-booting-fix.patch # SELinux/audit patches. Patch1800: linux-2.6-selinux-hush.patch @@ -985,6 +986,8 @@ %patch1740 -p1 # Disable R300 and above DRI as it's unstable. %patch1750 -p1 +# Don't do voluntary preempt until after bootup +%patch1760 -p1 # Silence some selinux messages. %patch1800 -p1 @@ -1633,6 +1636,7 @@ %changelog * Mon Mar 6 2006 Dave Jones - Disable DRI on Radeon R300 and above, due to instability. (#174646,#182196) +- Don't do voluntary preempt until after bootup * Mon Mar 6 2006 Stephen Tweedie - Merge xen rebase with 1.2016 kernel From fedora-cvs-commits at redhat.com Mon Mar 6 22:15:07 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 6 Mar 2006 17:15:07 -0500 Subject: rpms/gnbd-kernel/devel gnbd-kernel.spec,1.138,1.139 Message-ID: <200603062215.k26MF7R9001997@cvs.devel.redhat.com> Author: cfeist Update of /cvs/dist/rpms/gnbd-kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv1965 Modified Files: gnbd-kernel.spec Log Message: Reverted back to xenU. Index: gnbd-kernel.spec =================================================================== RCS file: /cvs/dist/rpms/gnbd-kernel/devel/gnbd-kernel.spec,v retrieving revision 1.138 retrieving revision 1.139 diff -u -r1.138 -r1.139 --- gnbd-kernel.spec 6 Mar 2006 21:39:06 -0000 1.138 +++ gnbd-kernel.spec 6 Mar 2006 22:15:04 -0000 1.139 @@ -25,7 +25,7 @@ Name: gnbd-kernel Version: 2.6.15 -Release: 5.FC5.10 +Release: 5.FC5.11 License: GPL Group: System Environment/Kernel Summary: gnbd-kernel - The kernel module for GFS's Network Block Device @@ -33,8 +33,8 @@ BuildRequires: kernel-smp = %{kernel_version} BuildRequires: kernel-devel = %{kernel_version} BuildRequires: kernel-smp-devel = %{kernel_version} -BuildRequires: kernel-xen-guest = %{kernel_version} -BuildRequires: kernel-xen-hypervisor = %{kernel_version} +BuildRequires: kernel-xenU-devel = %{kernel_version} +BuildRequires: kernel-xen0-devel = %{kernel_version} Conflicts: GFS <= 6.0 Conflicts: GFS-modules Requires: kernel = %{kernel_version} @@ -70,27 +70,27 @@ %endif %if %{buildxen} -%package -n gnbd-kernel-xen-guest +%package -n gnbd-kernel-xenU Group: System Environment/Kernel -Summary: gnbd-kernel-xen-guest - The kernel module for GFS's Network Block Device -Requires: kernel-xen-guest = %{kernel_version} -Requires: /lib/modules/%{kernel_version}guest +Summary: gnbd-kernel-xenU - The kernel module for GFS's Network Block Device +Requires: kernel-xenU = %{kernel_version} +Requires: /lib/modules/%{kernel_version}xenU Provides: gnbd-kernel-modules = %{version}-%{release} Provides: kernel-modules -%description -n gnbd-kernel-xen-guest -gnbd-kernel-xen-guest - The xen-guest kernel module for GFS's Network Block Device +%description -n gnbd-kernel-xenU +gnbd-kernel-smp - The smp kernel module for GFS's Network Block Device -%package -n gnbd-kernel-xen-hypervisor +%package -n gnbd-kernel-xen0 Group: System Environment/Kernel -Summary: gnbd-kernel-xen-hypservisor - The kernel module for GFS's Network Block Device -Requires: kernel-xen-hypservisor = %{kernel_version} -Requires: /lib/modules/%{kernel_version}hypervisor +Summary: gnbd-kernel-xen0 - The kernel module for GFS's Network Block Device +Requires: kernel-xen0 = %{kernel_version} +Requires: /lib/modules/%{kernel_version}xen0 Provides: kernel-modules Provides: gnbd-kernel-modules = %{version}-%{release} -%description -n gnbd-kernel-xen-hypervisor -gnbd-kernel-xen-hypervisor - The xen-hypervisor kernel module for GFS's Network Block Device +%description -n gnbd-kernel-xen0 +gnbd-kernel-smp - The smp kernel module for GFS's Network Block Device %endif ################################################################################ @@ -106,8 +106,8 @@ BUILD_TOPDIR=`pwd` cp -r `pwd` ../smp -cp -r `pwd` ../guest -cp -r `pwd` ../hypervisor +cp -r `pwd` ../xenU +cp -r `pwd` ../xen0 Build_gnbd(){ cpu_type=$1 @@ -124,7 +124,7 @@ exit 1 fi ./configure --kernel_src=$kernel_src --incdir=%{_includedir} - if [ "$flavor" == "xen-guest" -o "$flavor" == "xen-hypervisor" ]; then + if [ "$flavor" == "xenU" -o "$flavor" == "xen0" ]; then make ARCH=xen %{?_smp_mflags} else make %{?_smp_mflags} @@ -141,11 +141,11 @@ %endif %if %{buildxen} -cd ../guest -Build_gnbd %{_target_cpu} guest +cd ../xenU +Build_gnbd %{_target_cpu} xenU -cd ../hypervisor -Build_gnbd %{_target_cpu} hypervisor +cd ../xen0 +Build_gnbd %{_target_cpu} xen0 %endif ################################################################################ @@ -164,9 +164,9 @@ %endif %if %{buildxen} -cd ../guest +cd ../xenU make install DESTDIR=$RPM_BUILD_ROOT ARCH=xen -cd ../hypervisor +cd ../xen0 make install DESTDIR=$RPM_BUILD_ROOT ARCH=xen %endif @@ -186,10 +186,10 @@ %endif %if %{buildxen} -%post xen-guest -/sbin/depmod -e %{kernel_version}guest -%post xen-hypervisor -/sbin/depmod -a %{kernel_version}hypervisor +%post xenU +/sbin/depmod -e %{kernel_version}xenU +%post xen0 +/sbin/depmod -a %{kernel_version}xen0 %endif %files @@ -203,13 +203,13 @@ %endif %if %{buildxen} -%files -n gnbd-kernel-xen-guest +%files -n gnbd-kernel-xenU %defattr(-,root,root,-) -/lib/modules/%{kernel_version}guest/kernel/drivers/block/gnbd/gnbd.ko +/lib/modules/%{kernel_version}xenU/kernel/drivers/block/gnbd/gnbd.ko -%files -n gnbd-kernel-xen-hypervisor +%files -n gnbd-kernel-xen0 %defattr(-,root,root,-) -/lib/modules/%{kernel_version}hypervisor/kernel/drivers/block/gnbd/gnbd.ko +/lib/modules/%{kernel_version}xen0/kernel/drivers/block/gnbd/gnbd.ko %endif %files -n gnbd-kernheaders From fedora-cvs-commits at redhat.com Mon Mar 6 22:18:23 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 6 Mar 2006 17:18:23 -0500 Subject: rpms/audit/devel .cvsignore, 1.57, 1.58 audit.spec, 1.83, 1.84 sources, 1.64, 1.65 audit-1.1.4-semanage.patch, 1.4, NONE Message-ID: <200603062218.k26MINkX015945@cvs.devel.redhat.com> Author: sgrubb Update of /cvs/dist/rpms/audit/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv15915 Modified Files: .cvsignore audit.spec sources Removed Files: audit-1.1.4-semanage.patch Log Message: * Wed Mar 6 2006 Steve Grubb 1.1.5-1 - Changed audit_log_semanage_message to take new params - In aureport, add class between syscall and permission in avc report - Fix bug where fsync is called in debug mode - Add optional support for tty in SYSCALL records for ausearch/aureport - Reinstate legacy rule operator support - Add man pages - Auditd ignore most signals Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/audit/devel/.cvsignore,v retrieving revision 1.57 retrieving revision 1.58 diff -u -r1.57 -r1.58 --- .cvsignore 8 Feb 2006 23:08:01 -0000 1.57 +++ .cvsignore 6 Mar 2006 22:18:21 -0000 1.58 @@ -54,3 +54,4 @@ audit-1.1.2.tar.gz audit-1.1.3.tar.gz audit-1.1.4.tar.gz +audit-1.1.5.tar.gz Index: audit.spec =================================================================== RCS file: /cvs/dist/rpms/audit/devel/audit.spec,v retrieving revision 1.83 retrieving revision 1.84 diff -u -r1.83 -r1.84 --- audit.spec 11 Feb 2006 01:59:34 -0000 1.83 +++ audit.spec 6 Mar 2006 22:18:21 -0000 1.84 @@ -1,13 +1,12 @@ Summary: User space tools for 2.6 kernel auditing. Name: audit -Version: 1.1.4 -Release: 5.1 +Version: 1.1.5 +Release: 1 License: GPL Group: System Environment/Daemons URL: http://people.redhat.com/sgrubb/audit/ Source0: %{name}-%{version}.tar.gz Patch1: audit-1.1.3-initscript-disabled.patch -Patch2: audit-1.1.4-semanage.patch BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildRequires: libtool swig BuildRequires: glibc-kernheaders >= 2.4-9.1.95 @@ -57,7 +56,6 @@ %setup -q # When in production, uncomment this so the patch is applied #%patch1 -p1 -%patch2 -p1 %build autoreconf -fv --install @@ -148,6 +146,15 @@ %changelog +* Wed Mar 6 2006 Steve Grubb 1.1.5-1 +- Changed audit_log_semanage_message to take new params +- In aureport, add class between syscall and permission in avc report +- Fix bug where fsync is called in debug mode +- Add optional support for tty in SYSCALL records for ausearch/aureport +- Reinstate legacy rule operator support +- Add man pages +- Auditd ignore most signals + * Fri Feb 10 2006 Jesse Keating - 1.1.4-5.1 - bump again for double-long bug on ppc(64) Index: sources =================================================================== RCS file: /cvs/dist/rpms/audit/devel/sources,v retrieving revision 1.64 retrieving revision 1.65 diff -u -r1.64 -r1.65 --- sources 8 Feb 2006 23:08:01 -0000 1.64 +++ sources 6 Mar 2006 22:18:21 -0000 1.65 @@ -1 +1,2 @@ 3a5f2a609b72de4101cc78f28c233a30 audit-1.1.4.tar.gz +78d71a75ac2677cb77be3dc788119d2c audit-1.1.5.tar.gz --- audit-1.1.4-semanage.patch DELETED --- From fedora-cvs-commits at redhat.com Mon Mar 6 22:18:56 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 6 Mar 2006 17:18:56 -0500 Subject: rpms/audit/devel sources,1.65,1.66 Message-ID: <200603062218.k26MIu8S016190@cvs.devel.redhat.com> Author: sgrubb Update of /cvs/dist/rpms/audit/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv16070 Modified Files: sources Log Message: remove 1.1.4 from source file Index: sources =================================================================== RCS file: /cvs/dist/rpms/audit/devel/sources,v retrieving revision 1.65 retrieving revision 1.66 diff -u -r1.65 -r1.66 --- sources 6 Mar 2006 22:18:21 -0000 1.65 +++ sources 6 Mar 2006 22:18:51 -0000 1.66 @@ -1,2 +1 @@ -3a5f2a609b72de4101cc78f28c233a30 audit-1.1.4.tar.gz 78d71a75ac2677cb77be3dc788119d2c audit-1.1.5.tar.gz From fedora-cvs-commits at redhat.com Mon Mar 6 22:38:20 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 6 Mar 2006 17:38:20 -0500 Subject: rpms/gnbd-kernel/devel gnbd-kernel.spec,1.139,1.140 Message-ID: <200603062238.k26McKl6022684@cvs.devel.redhat.com> Author: cfeist Update of /cvs/dist/rpms/gnbd-kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv22653 Modified Files: gnbd-kernel.spec Log Message: Added Prereq: /sbin/depmod. Index: gnbd-kernel.spec =================================================================== RCS file: /cvs/dist/rpms/gnbd-kernel/devel/gnbd-kernel.spec,v retrieving revision 1.139 retrieving revision 1.140 diff -u -r1.139 -r1.140 --- gnbd-kernel.spec 6 Mar 2006 22:15:04 -0000 1.139 +++ gnbd-kernel.spec 6 Mar 2006 22:38:18 -0000 1.140 @@ -39,6 +39,7 @@ Conflicts: GFS-modules Requires: kernel = %{kernel_version} Requires: /lib/modules/%{kernel_version} +Prereq: /sbin/depmod Provides: gnbd-kernel-modules = %{version}-%{release} Provides: kernel-modules #ExclusiveArch: i586 i686 x86_64 ppc From fedora-cvs-commits at redhat.com Mon Mar 6 22:38:36 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 6 Mar 2006 17:38:36 -0500 Subject: rpms/gnbd-kernel/devel gnbd-kernel.spec,1.140,1.141 Message-ID: <200603062238.k26McaNe022856@cvs.devel.redhat.com> Author: cfeist Update of /cvs/dist/rpms/gnbd-kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv22818 Modified Files: gnbd-kernel.spec Log Message: Bumped rev. Index: gnbd-kernel.spec =================================================================== RCS file: /cvs/dist/rpms/gnbd-kernel/devel/gnbd-kernel.spec,v retrieving revision 1.140 retrieving revision 1.141 diff -u -r1.140 -r1.141 --- gnbd-kernel.spec 6 Mar 2006 22:38:18 -0000 1.140 +++ gnbd-kernel.spec 6 Mar 2006 22:38:34 -0000 1.141 @@ -25,7 +25,7 @@ Name: gnbd-kernel Version: 2.6.15 -Release: 5.FC5.11 +Release: 5.FC5.12 License: GPL Group: System Environment/Kernel Summary: gnbd-kernel - The kernel module for GFS's Network Block Device From fedora-cvs-commits at redhat.com Mon Mar 6 22:47:42 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 6 Mar 2006 17:47:42 -0500 Subject: rpms/cman-kernel/devel cman-kernel.spec,1.145,1.146 Message-ID: <200603062247.k26Mlgdt007775@cvs.devel.redhat.com> Author: cfeist Update of /cvs/dist/rpms/cman-kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv7740 Modified Files: cman-kernel.spec Log Message: Added /sbin/depmod. Index: cman-kernel.spec =================================================================== RCS file: /cvs/dist/rpms/cman-kernel/devel/cman-kernel.spec,v retrieving revision 1.145 retrieving revision 1.146 diff -u -r1.145 -r1.146 --- cman-kernel.spec 6 Mar 2006 21:38:51 -0000 1.145 +++ cman-kernel.spec 6 Mar 2006 22:47:40 -0000 1.146 @@ -40,6 +40,7 @@ Conflicts: GFS-modules GFS-modules-smp GFS-modules-hugemem Requires: kernel = %{kernel_version} Requires: /lib/modules/%{kernel_version} +Prereq: /sbin/depmod Provides: kernel-modules Provides: cman-kernel-modules = %{version}-%{release} #ExclusiveArch: i586 i686 x86_64 ppc ppc64 From fedora-cvs-commits at redhat.com Mon Mar 6 22:47:56 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 6 Mar 2006 17:47:56 -0500 Subject: rpms/cman-kernel/devel cman-kernel.spec,1.146,1.147 Message-ID: <200603062247.k26Mlu8W007925@cvs.devel.redhat.com> Author: cfeist Update of /cvs/dist/rpms/cman-kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv7883 Modified Files: cman-kernel.spec Log Message: Bumped release. Index: cman-kernel.spec =================================================================== RCS file: /cvs/dist/rpms/cman-kernel/devel/cman-kernel.spec,v retrieving revision 1.146 retrieving revision 1.147 diff -u -r1.146 -r1.147 --- cman-kernel.spec 6 Mar 2006 22:47:40 -0000 1.146 +++ cman-kernel.spec 6 Mar 2006 22:47:53 -0000 1.147 @@ -26,7 +26,7 @@ Name: cman-kernel Version: 2.6.15.1 -Release: 0.FC5.3 +Release: 0.FC5.4 License: GPL Group: System Environment/Kernel Summary: cman-kernel - The Cluster Manager kernel modules From fedora-cvs-commits at redhat.com Mon Mar 6 22:48:23 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 6 Mar 2006 17:48:23 -0500 Subject: rpms/dlm-kernel/devel dlm-kernel.spec,1.118,1.119 Message-ID: <200603062248.k26MmNVt008222@cvs.devel.redhat.com> Author: cfeist Update of /cvs/dist/rpms/dlm-kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv8188 Modified Files: dlm-kernel.spec Log Message: Added /sbin/depmod. Index: dlm-kernel.spec =================================================================== RCS file: /cvs/dist/rpms/dlm-kernel/devel/dlm-kernel.spec,v retrieving revision 1.118 retrieving revision 1.119 diff -u -r1.118 -r1.119 --- dlm-kernel.spec 6 Mar 2006 21:39:16 -0000 1.118 +++ dlm-kernel.spec 6 Mar 2006 22:48:19 -0000 1.119 @@ -25,7 +25,7 @@ Name: dlm-kernel Version: 2.6.15 -Release: 0.FC5.2 +Release: 0.FC5.3 License: GPL Group: System Environment/Kernel Summary: dlm-kernel - The Distributed Lock Manager kernel modules. @@ -47,6 +47,7 @@ Requires: kernel = %{kernel_version} Requires: cman-kernel >= 2.6.14 Requires: /lib/modules/%{kernel_version} +Prereq: /sbin/depmod Provides: kernel-modules Provides: dlm-kernel-modules = %{version}-%{release} #ExclusiveArch: i586 i686 x86_64 ppc ppc64 From fedora-cvs-commits at redhat.com Mon Mar 6 22:48:49 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 6 Mar 2006 17:48:49 -0500 Subject: rpms/GFS-kernel/devel GFS-kernel.spec,1.138,1.139 Message-ID: <200603062248.k26MmnO8008514@cvs.devel.redhat.com> Author: cfeist Update of /cvs/dist/rpms/GFS-kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv8482 Modified Files: GFS-kernel.spec Log Message: Added /sbin/depmod. Index: GFS-kernel.spec =================================================================== RCS file: /cvs/dist/rpms/GFS-kernel/devel/GFS-kernel.spec,v retrieving revision 1.138 retrieving revision 1.139 diff -u -r1.138 -r1.139 --- GFS-kernel.spec 6 Mar 2006 21:39:24 -0000 1.138 +++ GFS-kernel.spec 6 Mar 2006 22:48:46 -0000 1.139 @@ -25,7 +25,7 @@ Name: GFS-kernel Version: 2.6.15 -Release: 5.FC5.6 +Release: 5.FC5.7 License: GPL Group: System Environment/Kernel Summary: GFS-kernel - The Global File System kernel modules @@ -48,6 +48,7 @@ Conflicts: GFS-modules Requires: kernel = %{kernel_version} Requires: /lib/modules/%{kernel_version} +Prereq: /sbin/depmod Provides: kernel-modules Provides: GFS-kernel-modules = %{version}-%{release} #ExclusiveArch: i586 i686 x86_64 ppc From fedora-cvs-commits at redhat.com Mon Mar 6 22:51:49 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 6 Mar 2006 17:51:49 -0500 Subject: rpms/kernel/devel kernel-2.6.spec,1.2022,1.2023 Message-ID: <200603062251.k26Mpnxi010239@cvs.devel.redhat.com> Author: sct Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv9975 Modified Files: kernel-2.6.spec Log Message: Add workaround for non-xen ia64 builds: temporarily back-out the ia64- specific portions of linux-2.6-xen.patch. ExclusiveArch: noarch ia64 only for a single build to test it. Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.2022 retrieving revision 1.2023 diff -u -r1.2022 -r1.2023 --- kernel-2.6.spec 6 Mar 2006 22:14:36 -0000 1.2022 +++ kernel-2.6.spec 6 Mar 2006 22:51:46 -0000 1.2023 @@ -163,7 +163,7 @@ Version: %{rpmversion} Release: %{release} #ExclusiveArch: noarch %{all_x86} x86_64 ppc ppc64 ia64 sparc sparc64 ppc64iseries s390 s390x -ExclusiveArch: noarch %{all_x86} x86_64 ppc ppc64 sparc sparc64 ppc64iseries s390 s390x +ExclusiveArch: noarch ia64 ExclusiveOS: Linux Provides: kernel = %{version} Provides: kernel-drm = 4.3.0 @@ -783,9 +783,21 @@ #%patch691 -p1 %patch692 -p1 %patch693 -p1 -%patch700 -p1 # +# Apply the main xen patch... +# +%patch700 -p1 -b .p.xen +# +# ... and back out all the ia64-specific sections, as they currently prevent +# non-xen builds from working. +for f in `find arch/ia64/ include/asm-ia64/ include/xen/interface/arch-ia64.h* -type f -name "*.p.xen"` ; do \ + g=`dirname $f`/`basename $f .p.xen`; \ + mv "$f" "$g"; \ + if [ ! -s "$g" ] ; then rm -f "$g" ; fi; \ +done + +# # Xen includes a patch which moves the vsyscall fixmap into a user-space VA, # freeing user-space from reliance on an absolute fixmap area and so allowing # the fixmap area to become dynamic. @@ -1646,6 +1658,8 @@ - Export mmap-able kva interface for xen to find the xenstore page (xen-unstable cset 9130) - Remove stale linux-2.6-xen-module-fault.patch file +- Add workaround for non-xen ia64 builds: temporarily back-out the ia64- + specific portions of linux-2.6-xen.patch. * Sun Mar 5 2006 Dave Jones - 2.6.16rc5-git8 From fedora-cvs-commits at redhat.com Mon Mar 6 23:02:59 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 6 Mar 2006 18:02:59 -0500 Subject: rpms/kernel/devel kernel-2.6.spec,1.2023,1.2024 Message-ID: <200603062302.k26N2xsd014712@cvs.devel.redhat.com> Author: sct Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv14681 Modified Files: kernel-2.6.spec Log Message: Revert the one-off ia64-only build ExclusiveArch. Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.2023 retrieving revision 1.2024 diff -u -r1.2023 -r1.2024 --- kernel-2.6.spec 6 Mar 2006 22:51:46 -0000 1.2023 +++ kernel-2.6.spec 6 Mar 2006 23:02:40 -0000 1.2024 @@ -163,7 +163,7 @@ Version: %{rpmversion} Release: %{release} #ExclusiveArch: noarch %{all_x86} x86_64 ppc ppc64 ia64 sparc sparc64 ppc64iseries s390 s390x -ExclusiveArch: noarch ia64 +ExclusiveArch: noarch %{all_x86} x86_64 ppc ppc64 sparc sparc64 ppc64iseries s390 s390x ExclusiveOS: Linux Provides: kernel = %{version} Provides: kernel-drm = 4.3.0 From fedora-cvs-commits at redhat.com Mon Mar 6 23:05:40 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 6 Mar 2006 18:05:40 -0500 Subject: rpms/selinux-policy/devel policy-20060207.patch, 1.37, 1.38 selinux-policy.spec, 1.138, 1.139 Message-ID: <200603062305.k26N5ejm014846@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/selinux-policy/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv14777 Modified Files: policy-20060207.patch selinux-policy.spec Log Message: * Mon Mar 6 2006 Dan Walsh 2.2.23-4 - Fixes for cups - Make cryptosetup work with hal policy-20060207.patch: Rules.modular | 2 - policy/modules/admin/readahead.te | 2 - policy/modules/admin/su.fc | 1 policy/modules/admin/su.if | 6 ++-- policy/modules/admin/vbetool.te | 5 +++ policy/modules/kernel/corenetwork.te.in | 2 - policy/modules/kernel/devices.if | 2 - policy/modules/kernel/files.fc | 2 - policy/modules/kernel/files.if | 20 ++++++++++++++- policy/modules/kernel/kernel.if | 4 +-- policy/modules/services/apache.fc | 2 + policy/modules/services/apache.if | 5 +++ policy/modules/services/bluetooth.te | 11 ++++---- policy/modules/services/cron.te | 3 ++ policy/modules/services/cups.fc | 2 - policy/modules/services/cups.if | 22 +++++++++++++++++ policy/modules/services/cups.te | 7 +++-- policy/modules/services/cvs.te | 2 - policy/modules/services/hal.if | 41 ++++++++++++++++++++++++++++++++ policy/modules/services/hal.te | 6 ++++ policy/modules/services/ktalk.fc | 1 policy/modules/services/ktalk.te | 6 ++++ policy/modules/services/nscd.if | 2 - policy/modules/services/samba.te | 2 - policy/modules/system/init.te | 5 +++ policy/modules/system/libraries.fc | 2 + policy/modules/system/locallogin.te | 1 policy/modules/system/lvm.fc | 1 policy/modules/system/selinuxutil.fc | 6 ++-- policy/modules/system/selinuxutil.te | 4 +++ policy/modules/system/udev.te | 2 - support/Makefile.devel | 5 --- 32 files changed, 153 insertions(+), 31 deletions(-) Index: policy-20060207.patch =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20060207.patch,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- policy-20060207.patch 6 Mar 2006 21:33:51 -0000 1.37 +++ policy-20060207.patch 6 Mar 2006 23:04:56 -0000 1.38 @@ -37,7 +37,7 @@ kernel_read_kernel_sysctls($1_su_t) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/vbetool.te serefpolicy-2.2.23/policy/modules/admin/vbetool.te --- nsaserefpolicy/policy/modules/admin/vbetool.te 2006-02-01 08:23:27.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/admin/vbetool.te 2006-03-04 23:47:48.000000000 -0500 ++++ serefpolicy-2.2.23/policy/modules/admin/vbetool.te 2006-03-06 17:41:24.000000000 -0500 @@ -15,6 +15,7 @@ # Local policy # @@ -52,7 +52,7 @@ libs_use_shared_libs(vbetool_t) + +optional_policy(`hal',` -+ hal_read_var_run(vbetool_t) ++ hal_rw_var_run(vbetool_t) +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corenetwork.te.in serefpolicy-2.2.23/policy/modules/kernel/corenetwork.te.in --- nsaserefpolicy/policy/modules/kernel/corenetwork.te.in 2006-02-20 14:07:36.000000000 -0500 @@ -133,7 +133,16 @@ ######################################## diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel.if serefpolicy-2.2.23/policy/modules/kernel/kernel.if --- nsaserefpolicy/policy/modules/kernel/kernel.if 2006-03-04 00:06:34.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/kernel/kernel.if 2006-03-04 23:47:48.000000000 -0500 ++++ serefpolicy-2.2.23/policy/modules/kernel/kernel.if 2006-03-06 16:54:38.000000000 -0500 +@@ -1023,7 +1023,7 @@ + ') + + allow $1 proc_t:dir search; +- allow $1 sysctl_t:dir r_dir_perms; ++ allow $1 sysctl_t:dir rw_dir_perms; + allow $1 sysctl_vm_t:file r_file_perms; + ') + @@ -1328,7 +1328,7 @@ allow $1 proc_t:dir search; @@ -325,8 +334,8 @@ type cvs_tmp_t; diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.if serefpolicy-2.2.23/policy/modules/services/hal.if --- nsaserefpolicy/policy/modules/services/hal.if 2006-03-04 00:06:36.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/services/hal.if 2006-03-04 23:47:48.000000000 -0500 -@@ -100,3 +100,24 @@ ++++ serefpolicy-2.2.23/policy/modules/services/hal.if 2006-03-06 17:40:22.000000000 -0500 +@@ -100,3 +100,44 @@ allow $1 hald_t:dbus send_msg; allow hald_t $1:dbus send_msg; ') @@ -351,6 +360,26 @@ + allow $1 hald_var_run_t:file r_file_perms; +') + ++ ++######################################## ++## ++## Read/Write hald state files. ++## ++## ++## ++## Domain allowed access. ++## ++## ++# ++interface(`hal_rw_var_run',` ++ gen_require(` ++ type hald_var_run_t; ++ ') ++ ++ files_search_pids($1) ++ allow $1 hald_var_run_t:file rw_file_perms; ++') ++ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.te serefpolicy-2.2.23/policy/modules/services/hal.te --- nsaserefpolicy/policy/modules/services/hal.te 2006-03-04 00:06:36.000000000 -0500 +++ serefpolicy-2.2.23/policy/modules/services/hal.te 2006-03-06 14:50:05.000000000 -0500 Index: selinux-policy.spec =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v retrieving revision 1.138 retrieving revision 1.139 diff -u -r1.138 -r1.139 --- selinux-policy.spec 6 Mar 2006 21:33:51 -0000 1.138 +++ selinux-policy.spec 6 Mar 2006 23:05:10 -0000 1.139 @@ -10,7 +10,7 @@ Summary: SELinux policy configuration Name: selinux-policy Version: 2.2.23 -Release: 4 +Release: 5 License: GPL Group: System Environment/Base Source: serefpolicy-%{version}.tgz From fedora-cvs-commits at redhat.com Mon Mar 6 23:10:31 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 6 Mar 2006 18:10:31 -0500 Subject: rpms/kernel/FC-4/configs config-generic, 1.54, 1.54.4.1 config-x86-generic, 1.20, 1.20.4.1 config-x86_64-generic, 1.18, 1.18.4.1 Message-ID: <200603062310.k26NAVt8016397@cvs.devel.redhat.com> Author: linville Update of /cvs/dist/rpms/kernel/FC-4/configs In directory cvs.devel.redhat.com:/tmp/cvs-serv16172/configs Modified Files: Tag: private-linville-netdev-fc4-12-branch config-generic config-x86-generic config-x86_64-generic Log Message: Index: config-generic =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-4/configs/config-generic,v retrieving revision 1.54 retrieving revision 1.54.4.1 diff -u -r1.54 -r1.54.4.1 --- config-generic 21 Feb 2006 05:47:00 -0000 1.54 +++ config-generic 6 Mar 2006 23:10:28 -0000 1.54.4.1 @@ -588,6 +588,7 @@ CONFIG_PACKET_MMAP=y CONFIG_UNIX=y CONFIG_NET_KEY=m +CONFIG_NETDEBUG=y CONFIG_INET=y CONFIG_INET_TUNNEL=m CONFIG_INET_DIAG=m @@ -645,6 +646,8 @@ CONFIG_IPV6=m CONFIG_IPV6_PRIVACY=y +CONFIG_IPV6_ROUTER_PREF=y +CONFIG_IPV6_ROUTE_INFO=y CONFIG_INET6_AH=m CONFIG_INET6_ESP=m CONFIG_INET6_IPCOMP=m @@ -655,6 +658,7 @@ CONFIG_NETFILTER_NETLINK=m CONFIG_NETFILTER_NETLINK_QUEUE=m CONFIG_NETFILTER_NETLINK_LOG=m +CONFIG_NETFILTER_XTABLES=m # CONFIG_NETFILTER_DEBUG is not set CONFIG_BRIDGE_NETFILTER=y @@ -693,6 +697,7 @@ CONFIG_IP_NF_MATCH_DCCP=m CONFIG_IP_NF_MATCH_CONNBYTES=m CONFIG_IP_NF_MATCH_STRING=m +CONFIG_IP_NF_MATCH_POLICY=m CONFIG_IP_NF_TARGET_CONNMARK=m CONFIG_IP_NF_TARGET_CLUSTERIP=m CONFIG_IP_NF_TARGET_MASQUERADE=m @@ -754,6 +759,7 @@ CONFIG_IP6_NF_MATCH_LENGTH=m CONFIG_IP6_NF_MATCH_EUI64=m CONFIG_IP6_NF_MATCH_PHYSDEV=m +CONFIG_IP6_NF_MATCH_POLICY=m CONFIG_IP6_NF_FILTER=m CONFIG_IP6_NF_MANGLE=m CONFIG_IP6_NF_RAW=m @@ -789,6 +795,37 @@ CONFIG_XFRM=y CONFIG_XFRM_USER=y +CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m +CONFIG_NETFILTER_XT_TARGET_CONNMARK=m +CONFIG_NETFILTER_XT_TARGET_MARK=m +CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m +CONFIG_NETFILTER_XT_TARGET_NOTRACK=m +CONFIG_NETFILTER_XT_MATCH_COMMENT=m +CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m +CONFIG_NETFILTER_XT_MATCH_CONNMARK=m +CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m +CONFIG_NETFILTER_XT_MATCH_DCCP=m +CONFIG_NETFILTER_XT_MATCH_HELPER=m +CONFIG_NETFILTER_XT_MATCH_LENGTH=m +CONFIG_NETFILTER_XT_MATCH_LIMIT=m +CONFIG_NETFILTER_XT_MATCH_MAC=m +CONFIG_NETFILTER_XT_MATCH_MARK=m +CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m +CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m +CONFIG_NETFILTER_XT_MATCH_POLICY=m +CONFIG_NETFILTER_XT_MATCH_REALM=m +CONFIG_NETFILTER_XT_MATCH_SCTP=m +CONFIG_NETFILTER_XT_MATCH_STATE=m +CONFIG_NETFILTER_XT_MATCH_STRING=m +CONFIG_NETFILTER_XT_MATCH_TCPMSS=m + +# +# TIPC Configuration (EXPERIMENTAL) +# +CONFIG_TIPC=m +CONFIG_TIPC_ADVANCED=n +CONFIG_TIPC_DEBUG=y + # # SCTP Configuration (EXPERIMENTAL) # @@ -820,6 +857,7 @@ CONFIG_WAN_ROUTER=m CONFIG_IP_DCCP=m CONFIG_IP_DCCP_CCID3=m +CONFIG_IP_DCCP_CCID2=m # CONFIG_IP_DCCP_DEBUG is not set CONFIG_IP_DCCP_UNLOAD_HACK=y @@ -1040,6 +1078,7 @@ CONFIG_R8169_VLAN=y CONFIG_SK98LIN=m CONFIG_SKGE=m +CONFIG_SKY2=m CONFIG_TIGON3=m # @@ -1098,11 +1137,16 @@ CONFIG_IEEE80211_CRYPT_WEP=m CONFIG_IEEE80211_CRYPT_CCMP=m CONFIG_IEEE80211_CRYPT_TKIP=m +CONFIG_IEEE80211_SOFTMAC=m +CONFIG_IEEE80211_SOFTMAC_DEBUG=y # CONFIG_IPW2100 is not set -# CONFIG_IPW_DEBUG is not set +# CONFIG_IPW2100_DEBUG is not set # CONFIG_IPW2100_PROMISC is not set # CONFIG_IPW2100_LEGACY_FW_LOAD is not set # CONFIG_IPW2200 is not set +# CONFIG_IPW2200_MONITOR is not set +# CONFIG_IPW_QOS is not set +# CONFIG_IPW2200_DEBUG is not set CONFIG_AIRO=m CONFIG_HERMES=m CONFIG_PLX_HERMES=m @@ -1112,6 +1156,11 @@ CONFIG_ATMEL=m CONFIG_PCI_ATMEL=m CONFIG_PRISM54=m +CONFIG_PRISM54_USB=m +CONFIG_BCM43XX=m +CONFIG_BCM43XX_DEBUG=y +CONFIG_ACX_PCI=m +CONFIG_ACX_USB=m # # Wireless 802.11b Pcmcia/Cardbus cards support @@ -1127,6 +1176,7 @@ CONFIG_HOSTAP_PCI=m CONFIG_HOSTAP_PLX=m CONFIG_HOSTAP_FIRMWARE=y +CONFIG_HOSTAP_FIRMWARE_NVRAM=y CONFIG_HOSTAP_CS=m # @@ -1190,6 +1240,7 @@ CONFIG_TEKRAM_DONGLE=m CONFIG_IRPORT_SIR=m # CONFIG_DONGLE_OLD is not set +CONFIG_TOIM3232_DONGLE=m CONFIG_LITELINK_DONGLE=m CONFIG_MA600_DONGLE=m CONFIG_GIRBIL_DONGLE=m @@ -2526,6 +2577,7 @@ # CONFIG_SECURITY=y CONFIG_SECURITY_NETWORK=y +CONFIG_SECURITY_NETWORK_XFRM=y CONFIG_SECURITY_CAPABILITIES=y # CONFIG_SECURITY_ROOTPLUG is not set CONFIG_SECURITY_SELINUX=y Index: config-x86-generic =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-4/configs/config-x86-generic,v retrieving revision 1.20 retrieving revision 1.20.4.1 diff -u -r1.20 -r1.20.4.1 --- config-x86-generic 21 Feb 2006 02:35:46 -0000 1.20 +++ config-x86-generic 6 Mar 2006 23:10:28 -0000 1.20.4.1 @@ -241,13 +241,16 @@ CONFIG_IEEE80211_WPA=m CONFIG_IEEE80211_CRYPT_CCMP=m CONFIG_IEEE80211_CRYPT_TKIP=m +CONFIG_IEEE80211_SOFTMAC=m CONFIG_IPW2100=m -# CONFIG_IPW_DEBUG is not set +CONFIG_IPW2100_DEBUG=y CONFIG_IPW2100_PROMISC=y # CONFIG_IPW2100_LEGACY_FW_LOAD is not set CONFIG_IPW2100_MONITOR=y CONFIG_IPW2200=m CONFIG_IPW2200_MONITOR=y +CONFIG_IPW_QOS=y +CONFIG_IPW2200_DEBUG=y CONFIG_BLK_DEV_AMD74XX=y Index: config-x86_64-generic =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-4/configs/config-x86_64-generic,v retrieving revision 1.18 retrieving revision 1.18.4.1 diff -u -r1.18 -r1.18.4.1 --- config-x86_64-generic 21 Feb 2006 02:35:46 -0000 1.18 +++ config-x86_64-generic 6 Mar 2006 23:10:28 -0000 1.18.4.1 @@ -1,5 +1,4 @@ CONFIG_UID16=y -# CONFIG_SMP is not set # CONFIG_MK8 is not set # CONFIG_MPSC is not set CONFIG_GENERIC_CPU=y @@ -104,11 +103,14 @@ # CONFIG_IEEE80211_DEBUG is not set CONFIG_IEEE80211_CRYPT_CCMP=m CONFIG_IEEE80211_CRYPT_TKIP=m +CONFIG_IEEE80211_SOFTMAC=m CONFIG_IPW2100=m CONFIG_IPW2100_MONITOR=y -# CONFIG_IPW_DEBUG is not set +CONFIG_IPW2100_DEBUG=y CONFIG_IPW2200=m CONFIG_IPW2200_MONITOR=y +CONFIG_IPW_QOS=y +CONFIG_IPW2200_DEBUG=y CONFIG_PNP=y CONFIG_PNPACPI=y From fedora-cvs-commits at redhat.com Mon Mar 6 23:20:01 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 6 Mar 2006 18:20:01 -0500 Subject: rpms/jakarta-commons-daemon/devel jakarta-commons-daemon.spec, 1.5, 1.6 Message-ID: <200603062320.k26NK1KU000620@cvs.devel.redhat.com> Author: katzj Update of /cvs/dist/rpms/jakarta-commons-daemon/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv588 Modified Files: jakarta-commons-daemon.spec Log Message: * Mon Mar 6 2006 Jeremy Katz - 1:1.0-2jpp_3fc - stop scriptlet spew Index: jakarta-commons-daemon.spec =================================================================== RCS file: /cvs/dist/rpms/jakarta-commons-daemon/devel/jakarta-commons-daemon.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- jakarta-commons-daemon.spec 17 Feb 2006 22:28:04 -0000 1.5 +++ jakarta-commons-daemon.spec 6 Mar 2006 23:19:59 -0000 1.6 @@ -7,7 +7,7 @@ Name: %{name} Version: 1.0 -Release: 2jpp_2fc +Release: 2jpp_3fc Epoch: 1 Summary: Jakarta Commons Daemon Package License: Apache Software License @@ -49,6 +49,7 @@ %package javadoc Summary: Javadoc for %{name} Group: Development/Documentation +Prereq: coreutils %description javadoc Javadoc for %{name}. @@ -126,6 +127,9 @@ %changelog +* Mon Mar 6 2006 Jeremy Katz - 1:1.0-2jpp_3fc +- stop scriptlet spew + * Tue Feb 7 2006 Rafael Schloming - 1:1.0-2jpp_2fc - nativized From fedora-cvs-commits at redhat.com Mon Mar 6 23:21:11 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 6 Mar 2006 18:21:11 -0500 Subject: rpms/kernel/devel jwltest-bcm43xx-wx-overflow.patch, NONE, 1.1.2.1 jwltest-e1000-7_0_33-k2.patch, NONE, 1.1.12.1 jwltest-ipw2200-hwcrypto-off.patch, NONE, 1.1.10.1 jwltest-sk98lin-neuter.patch, NONE, 1.1.18.1 jwltest-sky2-1_0.patch, NONE, 1.1.4.1 jwltest-tg3-3_50.patch, NONE, 1.1.6.1 kernel-2.6.spec, 1.2021, 1.2021.2.1 Message-ID: <200603062321.k26NLBI1001198@cvs.devel.redhat.com> Author: linville Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv1134 Modified Files: Tag: private-linville-jwltest-fc5-13-branch kernel-2.6.spec Added Files: Tag: private-linville-jwltest-fc5-13-branch jwltest-bcm43xx-wx-overflow.patch jwltest-e1000-7_0_33-k2.patch jwltest-ipw2200-hwcrypto-off.patch jwltest-sk98lin-neuter.patch jwltest-sky2-1_0.patch jwltest-tg3-3_50.patch Log Message: jwltest-bcm43xx-wx-overflow.patch: bcm43xx_wx.c | 19 +++++++++++++------ 1 files changed, 13 insertions(+), 6 deletions(-) --- NEW FILE jwltest-bcm43xx-wx-overflow.patch --- --- linux-2.6.15.noarch/drivers/net/wireless/bcm43xx/bcm43xx_wx.c.orig 2006-03-06 16:59:32.000000000 -0500 +++ linux-2.6.15.noarch/drivers/net/wireless/bcm43xx/bcm43xx_wx.c 2006-03-06 16:59:38.000000000 -0500 @@ -858,12 +858,6 @@ static int bcm43xx_wx_sprom_write(struct if (!capable(CAP_SYS_RAWIO)) goto out; - err = -ENOMEM; - sprom = kmalloc(BCM43xx_SPROM_SIZE * sizeof(*sprom), - GFP_KERNEL); - if (!sprom) - goto out; - len = data->data.length; extra[len - 1] = '\0'; input = strchr(extra, ':'); @@ -872,6 +866,19 @@ static int bcm43xx_wx_sprom_write(struct len -= input - extra; } else input = extra; + + if (len > BCM43xx_SPROM_SIZE * sizeof(*sprom)) { + err = -EINVAL; + goto out; + } + + sprom = kmalloc(BCM43xx_SPROM_SIZE * sizeof(*sprom), + GFP_KERNEL); + if (!sprom) { + err = -ENOMEM; + goto out; + } + err = hex2sprom(sprom, input, len); if (err) goto out_kfree; jwltest-e1000-7_0_33-k2.patch: e1000.h | 52 +-- e1000_ethtool.c | 113 +++---- e1000_hw.c | 861 ++++++++++++++++++++++++++++++++++++++++++++++++-------- e1000_hw.h | 366 ++++++++++++++++++++++- e1000_main.c | 674 +++++++++++++++++++------------------------ e1000_osdep.h | 4 e1000_param.c | 78 +---- 7 files changed, 1508 insertions(+), 640 deletions(-) --- NEW FILE jwltest-e1000-7_0_33-k2.patch --- --- linux-2.6.15.noarch/drivers/net/e1000/e1000_param.c.orig 2006-02-13 11:48:40.000000000 -0500 +++ linux-2.6.15.noarch/drivers/net/e1000/e1000_param.c 2006-02-13 11:54:16.000000000 -0500 @@ -44,10 +44,19 @@ */ #define E1000_PARAM_INIT { [0 ... E1000_MAX_NIC] = OPTION_UNSET } +/* Module Parameters are always initialized to -1, so that the driver + * can tell the difference between no user specified value or the + * user asking for the default value. + * The true default values are loaded in when e1000_check_options is called. + * + * This is a GCC extension to ANSI C. + * See the item "Labeled Elements in Initializers" in the section + * "Extensions to the C Language Family" of the GCC documentation. + */ + #define E1000_PARAM(X, desc) \ - static int __devinitdata X[E1000_MAX_NIC+1] = E1000_PARAM_INIT; \ - static int num_##X = 0; \ - module_param_array_named(X, X, int, &num_##X, 0); \ + static const int __devinitdata X[E1000_MAX_NIC+1] = E1000_PARAM_INIT; \ + MODULE_PARM(X, "1-" __MODULE_STRING(E1000_MAX_NIC) "i"); \ MODULE_PARM_DESC(X, desc); /* Transmit Descriptor Count @@ -268,7 +277,7 @@ e1000_validate_option(int *value, struct BUG(); } - DPRINTK(PROBE, INFO, "Invalid %s specified (%i) %s\n", + DPRINTK(PROBE, INFO, "Invalid %s value specified (%i) %s\n", opt->name, *value, opt->err); *value = opt->def; return -1; @@ -295,6 +304,7 @@ e1000_check_options(struct e1000_adapter DPRINTK(PROBE, NOTICE, "Warning: no configuration for board #%i\n", bd); DPRINTK(PROBE, NOTICE, "Using defaults for all values\n"); + bd = E1000_MAX_NIC; } { /* Transmit Descriptor Count */ @@ -312,14 +322,10 @@ e1000_check_options(struct e1000_adapter opt.arg.r.max = mac_type < e1000_82544 ? E1000_MAX_TXD : E1000_MAX_82544_TXD; - if (num_TxDescriptors > bd) { tx_ring->count = TxDescriptors[bd]; e1000_validate_option(&tx_ring->count, &opt, adapter); E1000_ROUNDUP(tx_ring->count, REQ_TX_DESCRIPTOR_MULTIPLE); - } else { - tx_ring->count = opt.def; - } for (i = 0; i < adapter->num_tx_queues; i++) tx_ring[i].count = tx_ring->count; } @@ -338,14 +344,10 @@ e1000_check_options(struct e1000_adapter opt.arg.r.max = mac_type < e1000_82544 ? E1000_MAX_RXD : E1000_MAX_82544_RXD; - if (num_RxDescriptors > bd) { rx_ring->count = RxDescriptors[bd]; e1000_validate_option(&rx_ring->count, &opt, adapter); E1000_ROUNDUP(rx_ring->count, REQ_RX_DESCRIPTOR_MULTIPLE); - } else { - rx_ring->count = opt.def; - } for (i = 0; i < adapter->num_rx_queues; i++) rx_ring[i].count = rx_ring->count; } @@ -357,13 +359,9 @@ e1000_check_options(struct e1000_adapter .def = OPTION_ENABLED }; - if (num_XsumRX > bd) { int rx_csum = XsumRX[bd]; e1000_validate_option(&rx_csum, &opt, adapter); adapter->rx_csum = rx_csum; - } else { - adapter->rx_csum = opt.def; - } } { /* Flow Control */ @@ -383,13 +381,9 @@ e1000_check_options(struct e1000_adapter .p = fc_list }} }; - if (num_FlowControl > bd) { int fc = FlowControl[bd]; e1000_validate_option(&fc, &opt, adapter); adapter->hw.fc = adapter->hw.original_fc = fc; - } else { - adapter->hw.fc = adapter->hw.original_fc = opt.def; - } } { /* Transmit Interrupt Delay */ struct e1000_option opt = { @@ -401,13 +395,9 @@ e1000_check_options(struct e1000_adapter .max = MAX_TXDELAY }} }; - if (num_TxIntDelay > bd) { adapter->tx_int_delay = TxIntDelay[bd]; e1000_validate_option(&adapter->tx_int_delay, &opt, adapter); - } else { - adapter->tx_int_delay = opt.def; - } } { /* Transmit Absolute Interrupt Delay */ struct e1000_option opt = { @@ -419,13 +409,9 @@ e1000_check_options(struct e1000_adapter .max = MAX_TXABSDELAY }} }; - if (num_TxAbsIntDelay > bd) { adapter->tx_abs_int_delay = TxAbsIntDelay[bd]; e1000_validate_option(&adapter->tx_abs_int_delay, &opt, adapter); - } else { - adapter->tx_abs_int_delay = opt.def; - } } { /* Receive Interrupt Delay */ struct e1000_option opt = { @@ -437,13 +423,9 @@ e1000_check_options(struct e1000_adapter .max = MAX_RXDELAY }} }; - if (num_RxIntDelay > bd) { adapter->rx_int_delay = RxIntDelay[bd]; e1000_validate_option(&adapter->rx_int_delay, &opt, adapter); - } else { - adapter->rx_int_delay = opt.def; - } } { /* Receive Absolute Interrupt Delay */ struct e1000_option opt = { @@ -455,13 +437,9 @@ e1000_check_options(struct e1000_adapter .max = MAX_RXABSDELAY }} }; - if (num_RxAbsIntDelay > bd) { adapter->rx_abs_int_delay = RxAbsIntDelay[bd]; e1000_validate_option(&adapter->rx_abs_int_delay, &opt, adapter); - } else { - adapter->rx_abs_int_delay = opt.def; - } } { /* Interrupt Throttling Rate */ struct e1000_option opt = { @@ -473,7 +451,6 @@ e1000_check_options(struct e1000_adapter .max = MAX_ITR }} }; - if (num_InterruptThrottleRate > bd) { adapter->itr = InterruptThrottleRate[bd]; switch (adapter->itr) { case 0: @@ -489,9 +466,6 @@ e1000_check_options(struct e1000_adapter adapter); break; } - } else { - adapter->itr = opt.def; - } } switch (adapter->hw.media_type) { @@ -518,17 +492,18 @@ static void __devinit e1000_check_fiber_options(struct e1000_adapter *adapter) { int bd = adapter->bd_number; - if (num_Speed > bd) { + bd = bd > E1000_MAX_NIC ? E1000_MAX_NIC : bd; + if ((Speed[bd] != OPTION_UNSET)) { DPRINTK(PROBE, INFO, "Speed not valid for fiber adapters, " "parameter ignored\n"); } - if (num_Duplex > bd) { + if ((Duplex[bd] != OPTION_UNSET)) { DPRINTK(PROBE, INFO, "Duplex not valid for fiber adapters, " "parameter ignored\n"); } - if ((num_AutoNeg > bd) && (AutoNeg[bd] != 0x20)) { + if ((AutoNeg[bd] != OPTION_UNSET) && (AutoNeg[bd] != 0x20)) { DPRINTK(PROBE, INFO, "AutoNeg other than 1000/Full is " "not valid for fiber adapters, " "parameter ignored\n"); @@ -547,6 +522,7 @@ e1000_check_copper_options(struct e1000_ { int speed, dplx, an; [...3966 lines suppressed...] - rxdr->count = max(ring->rx_pending,(uint32_t)E1000_MIN_RXD); rxdr->count = min(rxdr->count,(uint32_t)(mac_type < e1000_82544 ? E1000_MAX_RXD : E1000_MAX_82544_RXD)); @@ -767,6 +767,7 @@ e1000_reg_test(struct e1000_adapter *ada /* there are several bits on newer hardware that are r/w */ case e1000_82571: case e1000_82572: + case e1000_80003es2lan: toggle = 0x7FFFF3FF; break; case e1000_82573: @@ -1256,6 +1257,10 @@ e1000_integrated_phy_loopback(struct e10 e1000_write_phy_reg(&adapter->hw, PHY_CTRL, 0x9140); /* autoneg off */ e1000_write_phy_reg(&adapter->hw, PHY_CTRL, 0x8140); + } else if (adapter->hw.phy_type == e1000_phy_gg82563) { + e1000_write_phy_reg(&adapter->hw, + GG82563_PHY_KMRN_MODE_CTRL, + 0x1CE); } /* force 1000, set loopback */ e1000_write_phy_reg(&adapter->hw, PHY_CTRL, 0x4140); @@ -1325,6 +1330,7 @@ e1000_set_phy_loopback(struct e1000_adap case e1000_82571: case e1000_82572: case e1000_82573: + case e1000_80003es2lan: return e1000_integrated_phy_loopback(adapter); break; @@ -1405,6 +1411,11 @@ e1000_loopback_cleanup(struct e1000_adap case e1000_82546_rev_3: default: hw->autoneg = TRUE; + if (hw->phy_type == e1000_phy_gg82563) { + e1000_write_phy_reg(hw, + GG82563_PHY_KMRN_MODE_CTRL, + 0x180); + } e1000_read_phy_reg(hw, PHY_CTRL, &phy_reg); if (phy_reg & MII_CR_LOOPBACK) { phy_reg &= ~MII_CR_LOOPBACK; @@ -1640,10 +1651,26 @@ e1000_get_wol(struct net_device *netdev, case E1000_DEV_ID_82546EB_QUAD_COPPER: case E1000_DEV_ID_82545EM_FIBER: case E1000_DEV_ID_82545EM_COPPER: + case E1000_DEV_ID_82546GB_QUAD_COPPER: wol->supported = 0; wol->wolopts = 0; return; + case E1000_DEV_ID_82546GB_QUAD_COPPER_KSP3: + /* device id 10B5 port-A supports wol */ + if (!adapter->ksp3_port_a) { + wol->supported = 0; + return; + } + /* KSP3 does not suppport UCAST wake-ups for any interface */ + wol->supported = WAKE_MCAST | WAKE_BCAST | WAKE_MAGIC; + + if (adapter->wol & E1000_WUFC_EX) + DPRINTK(DRV, ERR, "Interface does not support " + "directed (unicast) frame wake-up packets\n"); + wol->wolopts = 0; + goto do_defaults; + case E1000_DEV_ID_82546EB_FIBER: case E1000_DEV_ID_82546GB_FIBER: case E1000_DEV_ID_82571EB_FIBER: @@ -1658,8 +1685,9 @@ e1000_get_wol(struct net_device *netdev, default: wol->supported = WAKE_UCAST | WAKE_MCAST | WAKE_BCAST | WAKE_MAGIC; - wol->wolopts = 0; + +do_defaults: if (adapter->wol & E1000_WUFC_EX) wol->wolopts |= WAKE_UCAST; if (adapter->wol & E1000_WUFC_MC) @@ -1684,10 +1712,22 @@ e1000_set_wol(struct net_device *netdev, case E1000_DEV_ID_82543GC_COPPER: case E1000_DEV_ID_82544EI_FIBER: case E1000_DEV_ID_82546EB_QUAD_COPPER: + case E1000_DEV_ID_82546GB_QUAD_COPPER: case E1000_DEV_ID_82545EM_FIBER: case E1000_DEV_ID_82545EM_COPPER: return wol->wolopts ? -EOPNOTSUPP : 0; + case E1000_DEV_ID_82546GB_QUAD_COPPER_KSP3: + /* device id 10B5 port-A supports wol */ + if (!adapter->ksp3_port_a) + return wol->wolopts ? -EOPNOTSUPP : 0; + + if (wol->wolopts & WAKE_UCAST) { + DPRINTK(DRV, ERR, "Interface does not support " + "directed (unicast) frame wake-up packets\n"); + return -EOPNOTSUPP; + } + case E1000_DEV_ID_82546EB_FIBER: case E1000_DEV_ID_82546GB_FIBER: case E1000_DEV_ID_82571EB_FIBER: @@ -1710,6 +1750,7 @@ e1000_set_wol(struct net_device *netdev, adapter->wol |= E1000_WUFC_BC; if (wol->wolopts & WAKE_MAGIC) adapter->wol |= E1000_WUFC_MAG; + } return 0; @@ -1799,11 +1840,6 @@ e1000_get_ethtool_stats(struct net_devic struct ethtool_stats *stats, uint64_t *data) { struct e1000_adapter *adapter = netdev_priv(netdev); -#ifdef CONFIG_E1000_MQ - uint64_t *queue_stat; - int stat_count = sizeof(struct e1000_queue_stats) / sizeof(uint64_t); - int j, k; -#endif int i; e1000_update_stats(adapter); @@ -1812,29 +1848,12 @@ e1000_get_ethtool_stats(struct net_devic data[i] = (e1000_gstrings_stats[i].sizeof_stat == sizeof(uint64_t)) ? *(uint64_t *)p : *(uint32_t *)p; } -#ifdef CONFIG_E1000_MQ - for (j = 0; j < adapter->num_tx_queues; j++) { - queue_stat = (uint64_t *)&adapter->tx_ring[j].tx_stats; - for (k = 0; k < stat_count; k++) - data[i + k] = queue_stat[k]; - i += k; - } - for (j = 0; j < adapter->num_rx_queues; j++) { - queue_stat = (uint64_t *)&adapter->rx_ring[j].rx_stats; - for (k = 0; k < stat_count; k++) - data[i + k] = queue_stat[k]; - i += k; - } -#endif /* BUG_ON(i != E1000_STATS_LEN); */ } static void e1000_get_strings(struct net_device *netdev, uint32_t stringset, uint8_t *data) { -#ifdef CONFIG_E1000_MQ - struct e1000_adapter *adapter = netdev_priv(netdev); -#endif uint8_t *p = data; int i; @@ -1849,20 +1868,6 @@ e1000_get_strings(struct net_device *net ETH_GSTRING_LEN); p += ETH_GSTRING_LEN; } -#ifdef CONFIG_E1000_MQ - for (i = 0; i < adapter->num_tx_queues; i++) { - sprintf(p, "tx_queue_%u_packets", i); - p += ETH_GSTRING_LEN; - sprintf(p, "tx_queue_%u_bytes", i); - p += ETH_GSTRING_LEN; - } - for (i = 0; i < adapter->num_rx_queues; i++) { - sprintf(p, "rx_queue_%u_packets", i); - p += ETH_GSTRING_LEN; - sprintf(p, "rx_queue_%u_bytes", i); - p += ETH_GSTRING_LEN; - } -#endif /* BUG_ON(p - data != E1000_STATS_LEN * ETH_GSTRING_LEN); */ break; } @@ -1889,7 +1894,7 @@ static struct ethtool_ops e1000_ethtool_ .set_pauseparam = e1000_set_pauseparam, .get_rx_csum = e1000_get_rx_csum, .set_rx_csum = e1000_set_rx_csum, - .get_tx_csum = e1000_get_tx_csum, + .get_tx_csum = e1000_get_tx_csum, .set_tx_csum = e1000_set_tx_csum, .get_sg = ethtool_op_get_sg, .set_sg = ethtool_op_set_sg, @@ -1903,10 +1908,12 @@ static struct ethtool_ops e1000_ethtool_ .phys_id = e1000_phys_id, .get_stats_count = e1000_get_stats_count, .get_ethtool_stats = e1000_get_ethtool_stats, - .get_perm_addr = ethtool_op_get_perm_addr, +#ifdef ETHTOOL_GPERMADDR + .get_perm_addr = ethtool_op_get_perm_addr, +#endif }; - -void e1000_set_ethtool_ops(struct net_device *netdev) + +void set_ethtool_ops(struct net_device *netdev) { SET_ETHTOOL_OPS(netdev, &e1000_ethtool_ops); } jwltest-ipw2200-hwcrypto-off.patch: ipw2200.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) --- NEW FILE jwltest-ipw2200-hwcrypto-off.patch --- --- linux-2.6.15.noarch/drivers/net/wireless/ipw2200.c.orig 2006-02-14 14:43:12.000000000 -0500 +++ linux-2.6.15.noarch/drivers/net/wireless/ipw2200.c 2006-02-14 14:55:29.000000000 -0500 @@ -55,7 +55,7 @@ static int associate = 1; static int auto_create = 1; static int led = 0; static int disable = 0; -static int hwcrypto = 1; +static int hwcrypto = 0; static const char ipw_modes[] = { 'a', 'b', 'g', '?' }; @@ -7058,8 +7058,7 @@ static int ipw_associate_network(struct priv->assoc_request.auth_key = priv->ieee->sec.active_key; if ((priv->capability & CAP_PRIVACY_ON) && - (priv->ieee->sec.level == SEC_LEVEL_1) && - !(priv->ieee->host_encrypt || priv->ieee->host_decrypt)) + (priv->ieee->sec.level == SEC_LEVEL_1)) ipw_send_wep_keys(priv, DCW_WEP_KEY_SEC_TYPE_WEP); } else { priv->assoc_request.auth_type = AUTH_OPEN; @@ -11285,7 +11284,7 @@ MODULE_PARM_DESC(mode, "network mode (0= #endif module_param(hwcrypto, int, 0444); -MODULE_PARM_DESC(hwcrypto, "enable hardware crypto (default on)"); +MODULE_PARM_DESC(hwcrypto, "enable hardware crypto (default off)"); module_param(cmdlog, int, 0444); MODULE_PARM_DESC(cmdlog, jwltest-sk98lin-neuter.patch: skge.c | 2 -- 1 files changed, 2 deletions(-) --- NEW FILE jwltest-sk98lin-neuter.patch --- --- linux-2.6.13/drivers/net/sk98lin/skge.c.orig 2005-10-20 15:19:17.000000000 -0400 +++ linux-2.6.13/drivers/net/sk98lin/skge.c 2005-10-20 15:19:25.000000000 -0400 @@ -5227,8 +5227,6 @@ { 0 } }; -MODULE_DEVICE_TABLE(pci, skge_pci_tbl); - static struct pci_driver skge_driver = { .name = "sk98lin", .id_table = skge_pci_tbl, jwltest-sky2-1_0.patch: sky2.c | 480 +++++++++++++++++++++++++++++++---------------------------------- sky2.h | 20 -- 2 files changed, 243 insertions(+), 257 deletions(-) --- NEW FILE jwltest-sky2-1_0.patch --- --- linux-2.6.15.noarch/drivers/net/sky2.h.orig 2006-03-02 17:12:16.000000000 -0500 +++ linux-2.6.15.noarch/drivers/net/sky2.h 2006-03-02 17:12:01.000000000 -0500 @@ -278,13 +278,9 @@ enum { Y2_IS_CHK_TXS1 = 1<<1, /* Descriptor error TXS 1 */ Y2_IS_CHK_TXA1 = 1<<0, /* Descriptor error TXA 1 */ - Y2_IS_BASE = Y2_IS_HW_ERR | Y2_IS_STAT_BMU | - Y2_IS_POLL_CHK | Y2_IS_TWSI_RDY | - Y2_IS_IRQ_SW | Y2_IS_TIMINT, - Y2_IS_PORT_1 = Y2_IS_IRQ_PHY1 | Y2_IS_IRQ_MAC1 | - Y2_IS_CHK_RX1 | Y2_IS_CHK_TXA1 | Y2_IS_CHK_TXS1, - Y2_IS_PORT_2 = Y2_IS_IRQ_PHY2 | Y2_IS_IRQ_MAC2 | - Y2_IS_CHK_RX2 | Y2_IS_CHK_TXA2 | Y2_IS_CHK_TXS2, + Y2_IS_BASE = Y2_IS_HW_ERR | Y2_IS_STAT_BMU, + Y2_IS_PORT_1 = Y2_IS_IRQ_PHY1 | Y2_IS_IRQ_MAC1, + Y2_IS_PORT_2 = Y2_IS_IRQ_PHY2 | Y2_IS_IRQ_MAC2, }; /* B2_IRQM_HWE_MSK 32 bit IRQ Moderation HW Error Mask */ @@ -1832,6 +1828,7 @@ struct sky2_port { struct net_device *netdev; unsigned port; u32 msg_enable; + spinlock_t phy_lock; spinlock_t tx_lock ____cacheline_aligned_in_smp; struct tx_ring_info *tx_ring; @@ -1840,7 +1837,6 @@ struct sky2_port { u16 tx_prod; /* next le to use */ u32 tx_addr64; u16 tx_pending; - u16 tx_last_put; u16 tx_last_mss; struct ring_info *rx_ring ____cacheline_aligned_in_smp; @@ -1849,7 +1845,6 @@ struct sky2_port { u16 rx_next; /* next re to check */ u16 rx_put; /* next le index to use */ u16 rx_pending; - u16 rx_last_put; u16 rx_bufsize; #ifdef SKY2_VLAN_TAG_USED u16 rx_tag; @@ -1869,18 +1864,16 @@ struct sky2_port { struct net_device_stats net_stats; - struct work_struct phy_task; - struct semaphore phy_sema; }; struct sky2_hw { void __iomem *regs; struct pci_dev *pdev; struct net_device *dev[2]; - spinlock_t hw_lock; - u32 intr_mask; + u32 istatus; int pm_cap; + int msi_detected; u8 chip_id; u8 chip_rev; u8 copper; @@ -1889,6 +1882,7 @@ struct sky2_hw { struct sky2_status_le *st_le; u32 st_idx; dma_addr_t st_dma; + wait_queue_head_t msi_wait; }; /* Register accessor for memory mapped device */ --- linux-2.6.15.noarch/drivers/net/sky2.c.orig 2006-03-02 17:12:13.000000000 -0500 +++ linux-2.6.15.noarch/drivers/net/sky2.c 2006-03-02 17:12:01.000000000 -0500 @@ -51,7 +51,7 @@ #include "sky2.h" #define DRV_NAME "sky2" -#define DRV_VERSION "0.15" +#define DRV_VERSION "1.0-pre1" #define PFX DRV_NAME " " /* @@ -61,10 +61,6 @@ * a receive requires one (or two if using 64 bit dma). */ -#define is_ec_a1(hw) \ - unlikely((hw)->chip_id == CHIP_ID_YUKON_EC && \ - (hw)->chip_rev == CHIP_REV_YU_EC_A1) - #define RX_LE_SIZE 512 #define RX_LE_BYTES (RX_LE_SIZE*sizeof(struct sky2_rx_le)) #define RX_MAX_PENDING (RX_LE_SIZE/2 - 2) @@ -74,14 +70,14 @@ #define TX_RING_SIZE 512 #define TX_DEF_PENDING (TX_RING_SIZE - 1) #define TX_MIN_PENDING 64 -#define MAX_SKB_TX_LE (4 + 2*MAX_SKB_FRAGS) +#define MAX_SKB_TX_LE (4 + (sizeof(dma_addr_t)/sizeof(u32))*MAX_SKB_FRAGS) #define STATUS_RING_SIZE 2048 /* 2 ports * (TX + 2*RX) */ #define STATUS_LE_BYTES (STATUS_RING_SIZE*sizeof(struct sky2_status_le)) #define ETH_JUMBO_MTU 9000 #define TX_WATCHDOG (5 * HZ) #define NAPI_WEIGHT 64 -#define PHY_RETRIES 1000 +#define PHY_RETRIES 100 static const u32 default_msg = NETIF_MSG_DRV | NETIF_MSG_PROBE | NETIF_MSG_LINK @@ -96,6 +92,10 @@ static int copybreak __read_mostly = 256 module_param(copybreak, int, 0); MODULE_PARM_DESC(copybreak, "Receive copy threshold"); +static int disable_msi = 0; +module_param(disable_msi, int, 0); +MODULE_PARM_DESC(disable_msi, "Disable Message Signaled Interrupt (MSI)"); + static const struct pci_device_id sky2_id_table[] = { { PCI_DEVICE(PCI_VENDOR_ID_SYSKONNECT, 0x9000) }, { PCI_DEVICE(PCI_VENDOR_ID_SYSKONNECT, 0x9E00) }, @@ -146,7 +146,7 @@ static int gm_phy_write(struct sky2_hw * for (i = 0; i < PHY_RETRIES; i++) { if (!(gma_read16(hw, port, GM_SMI_CTRL) & GM_SMI_CT_BUSY)) return 0; - udelay(1); + udelay(10); } printk(KERN_WARNING PFX "%s: phy write timeout\n", hw->dev[port]->name); @@ -166,7 +166,7 @@ static int __gm_phy_read(struct sky2_hw return 0; } - udelay(1); + udelay(10); } return -ETIMEDOUT; @@ -504,9 +504,9 @@ static void sky2_phy_init(struct sky2_hw /* Force a renegotiation */ static void sky2_phy_reinit(struct sky2_port *sky2) { - down(&sky2->phy_sema); + spin_lock_bh(&sky2->phy_lock); sky2_phy_init(sky2->hw, sky2->port); - up(&sky2->phy_sema); + spin_unlock_bh(&sky2->phy_lock); } static void sky2_mac_init(struct sky2_hw *hw, unsigned port) @@ -571,9 +571,9 @@ static void sky2_mac_init(struct sky2_hw sky2_read16(hw, SK_REG(port, GMAC_IRQ_SRC)); - down(&sky2->phy_sema); + spin_lock_bh(&sky2->phy_lock); sky2_phy_init(hw, port); - up(&sky2->phy_sema); + spin_unlock_bh(&sky2->phy_lock); /* MIB clear */ reg = gma_read16(hw, port, GM_PHY_ADDR); @@ -622,8 +622,8 @@ static void sky2_mac_init(struct sky2_hw /* Configure Rx MAC FIFO */ sky2_write8(hw, SK_REG(port, RX_GMF_CTRL_T), GMF_RST_CLR); - sky2_write16(hw, SK_REG(port, RX_GMF_CTRL_T), - GMF_RX_CTRL_DEF); + sky2_write32(hw, SK_REG(port, RX_GMF_CTRL_T), + GMF_OPER_ON | GMF_RX_F_FL_ON); /* Flush Rx MAC FIFO on any flow control or error */ sky2_write16(hw, SK_REG(port, RX_GMF_FL_MSK), GMR_FS_ANY_ERR); @@ -729,33 +729,10 @@ static inline struct sky2_tx_le *get_tx_ * This is a workaround code taken from SysKonnect sk98lin driver * to deal with chip bug on Yukon EC rev 0 in the wraparound case. */ -static void sky2_put_idx(struct sky2_hw *hw, unsigned q, - u16 idx, u16 *last, u16 size) +static inline void sky2_put_idx(struct sky2_hw *hw, unsigned q, u16 idx) { wmb(); - if (is_ec_a1(hw) && idx < *last) { - u16 hwget = sky2_read16(hw, Y2_QADDR(q, PREF_UNIT_GET_IDX)); - - if (hwget == 0) { - /* Start prefetching again */ - sky2_write8(hw, Y2_QADDR(q, PREF_UNIT_FIFO_WM), 0xe0); - goto setnew; - } - - if (hwget == size - 1) { - /* set watermark to one list element */ - sky2_write8(hw, Y2_QADDR(q, PREF_UNIT_FIFO_WM), 8); - - /* set put index to first list element */ - sky2_write16(hw, Y2_QADDR(q, PREF_UNIT_PUT_IDX), 0); - } else /* have hardware go to end of list */ - sky2_write16(hw, Y2_QADDR(q, PREF_UNIT_PUT_IDX), - size - 1); - } else { -setnew: - sky2_write16(hw, Y2_QADDR(q, PREF_UNIT_PUT_IDX), idx); - } - *last = idx; + sky2_write16(hw, Y2_QADDR(q, PREF_UNIT_PUT_IDX), idx); mmiowb(); } @@ -886,9 +863,9 @@ static int sky2_ioctl(struct net_device case SIOCGMIIREG: { u16 val = 0; - down(&sky2->phy_sema); + spin_lock_bh(&sky2->phy_lock); err = __gm_phy_read(hw, sky2->port, data->reg_num & 0x1f, &val); - up(&sky2->phy_sema); + spin_unlock_bh(&sky2->phy_lock); data->val_out = val; break; @@ -898,10 +875,10 @@ static int sky2_ioctl(struct net_device if (!capable(CAP_NET_ADMIN)) return -EPERM; - down(&sky2->phy_sema); + spin_lock_bh(&sky2->phy_lock); err = gm_phy_write(hw, sky2->port, data->reg_num & 0x1f, data->val_in); - up(&sky2->phy_sema); + spin_unlock_bh(&sky2->phy_lock); break; } return err; @@ -995,9 +972,12 @@ static int sky2_rx_start(struct sky2_por sky2_rx_add(sky2, re->mapaddr); } + /* Truncate oversize frames */ + sky2_write16(hw, SK_REG(sky2->port, RX_GMF_TR_THR), sky2->rx_bufsize - 8); + sky2_write32(hw, SK_REG(sky2->port, RX_GMF_CTRL_T), RX_TRUNC_ON); + /* Tell chip about available buffers */ - sky2_write16(hw, Y2_QADDR(rxq, PREF_UNIT_PUT_IDX), sky2->rx_put); - sky2->rx_last_put = sky2_read16(hw, Y2_QADDR(rxq, PREF_UNIT_PUT_IDX)); + sky2_put_idx(hw, rxq, sky2->rx_put); return 0; nomem: sky2_rx_clean(sky2); @@ -1010,7 +990,7 @@ static int sky2_up(struct net_device *de struct sky2_port *sky2 = netdev_priv(dev); struct sky2_hw *hw = sky2->hw; unsigned port = sky2->port; - u32 ramsize, rxspace; + u32 ramsize, rxspace, imask; int err = -ENOMEM; if (netif_msg_ifup(sky2)) @@ -1075,10 +1055,10 @@ static int sky2_up(struct net_device *de goto err_out; /* Enable interrupts from phy/mac for port */ - spin_lock_irq(&hw->hw_lock); - hw->intr_mask |= (port == 0) ? Y2_IS_PORT_1 : Y2_IS_PORT_2; - sky2_write32(hw, B0_IMSK, hw->intr_mask); - spin_unlock_irq(&hw->hw_lock); + imask = sky2_read32(hw, B0_IMSK); + imask |= (port == 0) ? Y2_IS_PORT_1 : Y2_IS_PORT_2; + sky2_write32(hw, B0_IMSK, imask); + return 0; err_out: @@ -1145,6 +1125,7 @@ static int sky2_xmit_frame(struct sk_buf struct sky2_tx_le *le = NULL; struct tx_ring_info *re; unsigned i, len; + int avail; dma_addr_t mapping; u32 addr64; u16 mss; @@ -1287,11 +1268,14 @@ static int sky2_xmit_frame(struct sk_buf re->idx = sky2->tx_prod; le->ctrl |= EOP; - sky2_put_idx(hw, txqaddr[sky2->port], sky2->tx_prod, - &sky2->tx_last_put, TX_RING_SIZE); + avail = tx_avail(sky2); + if (avail < TX_MIN_PENDING) { + le->ctrl |= FRC_STAT; + if (avail <= MAX_SKB_TX_LE) + netif_stop_queue(dev); + } - if (tx_avail(sky2) <= MAX_SKB_TX_LE) - netif_stop_queue(dev); + sky2_put_idx(hw, txqaddr[sky2->port], sky2->tx_prod); out_unlock: spin_unlock(&sky2->tx_lock); @@ -1366,6 +1350,7 @@ static int sky2_down(struct net_device * struct sky2_hw *hw = sky2->hw; unsigned port = sky2->port; u16 ctrl; + u32 imask; /* Never really got started! */ if (!sky2->tx_le) @@ -1377,14 +1362,6 @@ static int sky2_down(struct net_device * /* Stop more packets from being queued */ netif_stop_queue(dev); - /* Disable port IRQ */ - spin_lock_irq(&hw->hw_lock); - hw->intr_mask &= ~((sky2->port == 0) ? Y2_IS_IRQ_PHY1 : Y2_IS_IRQ_PHY2); - sky2_write32(hw, B0_IMSK, hw->intr_mask); - spin_unlock_irq(&hw->hw_lock); - - flush_scheduled_work(); - sky2_phy_reset(hw, port); /* Stop transmitter */ @@ -1428,6 +1405,11 @@ static int sky2_down(struct net_device * sky2_write8(hw, SK_REG(port, RX_GMF_CTRL_T), GMF_RST_SET); sky2_write8(hw, SK_REG(port, TX_GMF_CTRL_T), GMF_RST_SET); + /* Disable port IRQ */ + imask = sky2_read32(hw, B0_IMSK); + imask &= ~(sky2->port == 0) ? Y2_IS_PORT_1 : Y2_IS_PORT_2; + sky2_write32(hw, B0_IMSK, imask); + /* turn off LED's */ sky2_write16(hw, B0_Y2LED, LED_STAT_OFF); @@ -1622,20 +1604,19 @@ static int sky2_autoneg_done(struct sky2 return 0; } -/* - * Interrupt from PHY are handled outside of interrupt context - * because accessing phy registers requires spin wait which might - * cause excess interrupt latency. - */ -static void sky2_phy_task(void *arg) +/* Interrupt from PHY */ +static void sky2_phy_intr(struct sky2_hw *hw, unsigned port) { - struct sky2_port *sky2 = arg; - struct sky2_hw *hw = sky2->hw; + struct net_device *dev = hw->dev[port]; + struct sky2_port *sky2 = netdev_priv(dev); u16 istatus, phystat; - down(&sky2->phy_sema); - istatus = gm_phy_read(hw, sky2->port, PHY_MARV_INT_STAT); - phystat = gm_phy_read(hw, sky2->port, PHY_MARV_PHY_STAT); + spin_lock(&sky2->phy_lock); + istatus = gm_phy_read(hw, port, PHY_MARV_INT_STAT); + phystat = gm_phy_read(hw, port, PHY_MARV_PHY_STAT); + + if (!netif_running(dev)) + goto out; if (netif_msg_intr(sky2)) printk(KERN_INFO PFX "%s: phy interrupt status 0x%x 0x%x\n", @@ -1661,12 +1642,7 @@ static void sky2_phy_task(void *arg) sky2_link_down(sky2); } out: - up(&sky2->phy_sema); - - spin_lock_irq(&hw->hw_lock); - hw->intr_mask |= (sky2->port == 0) ? Y2_IS_IRQ_PHY1 : Y2_IS_IRQ_PHY2; - sky2_write32(hw, B0_IMSK, hw->intr_mask); - spin_unlock_irq(&hw->hw_lock); + spin_unlock(&sky2->phy_lock); } @@ -1678,20 +1654,6 @@ static void sky2_tx_timeout(struct net_d struct sky2_port *sky2 = netdev_priv(dev); struct sky2_hw *hw = sky2->hw; unsigned txq = txqaddr[sky2->port]; - u16 ridx; - - /* Maybe we just missed an status interrupt */ - spin_lock(&sky2->tx_lock); - ridx = sky2_read16(hw, - sky2->port == 0 ? STAT_TXA1_RIDX : STAT_TXA2_RIDX); - sky2_tx_complete(sky2, ridx); - spin_unlock(&sky2->tx_lock); - - if (!netif_queue_stopped(dev)) { - if (net_ratelimit()) - pr_info(PFX "transmit interrupt missed? recovered\n"); - return; - } if (netif_msg_timer(sky2)) printk(KERN_ERR PFX "%s: tx timeout\n", dev->name); @@ -1707,10 +1669,12 @@ static void sky2_tx_timeout(struct net_d #define roundup(x, y) ((((x)+((y)-1))/(y))*(y)) -/* Want receive buffer size to be multiple of 64 bits, and incl room for vlan */ +/* Want receive buffer size to be multiple of 64 bits + * and incl room for vlan and truncation + */ static inline unsigned sky2_buf_size(int mtu) { - return roundup(mtu + ETH_HLEN + 4, 8); + return roundup(mtu + ETH_HLEN + VLAN_HLEN, 8) + 8; } static int sky2_change_mtu(struct net_device *dev, int new_mtu) @@ -1719,6 +1683,7 @@ static int sky2_change_mtu(struct net_de struct sky2_hw *hw = sky2->hw; int err; u16 ctl, mode; + u32 imask; if (new_mtu < ETH_ZLEN || new_mtu > ETH_JUMBO_MTU) return -EINVAL; @@ -1731,12 +1696,15 @@ static int sky2_change_mtu(struct net_de return 0; } + imask = sky2_read32(hw, B0_IMSK); sky2_write32(hw, B0_IMSK, 0); dev->trans_start = jiffies; /* prevent tx timeout */ netif_stop_queue(dev); netif_poll_disable(hw->dev[0]); + synchronize_irq(hw->pdev->irq); + ctl = gma_read16(hw, sky2->port, GM_GP_CTRL); gma_write16(hw, sky2->port, GM_GP_CTRL, ctl & ~GM_GPCR_RX_ENA); sky2_rx_stop(sky2); @@ -1755,7 +1723,7 @@ static int sky2_change_mtu(struct net_de sky2_write8(hw, RB_ADDR(rxqaddr[sky2->port], RB_CTRL), RB_ENA_OP_MD); err = sky2_rx_start(sky2); - sky2_write32(hw, B0_IMSK, hw->intr_mask); + sky2_write32(hw, B0_IMSK, imask); if (err) dev_close(dev); @@ -1793,7 +1761,7 @@ static struct sk_buff *sky2_receive(stru if (!(status & GMR_FS_RX_OK)) goto resubmit; - if ((status >> 16) != length || length > sky2->rx_bufsize) + if (length > sky2->netdev->mtu + ETH_HLEN) goto oversize; if (length < copybreak) { @@ -1832,8 +1800,7 @@ resubmit: sky2_rx_add(sky2, re->mapaddr); /* Tell receiver about new buffers. */ - sky2_put_idx(sky2->hw, rxqaddr[sky2->port], sky2->rx_put, - &sky2->rx_last_put, RX_LE_SIZE); + sky2_put_idx(sky2->hw, rxqaddr[sky2->port], sky2->rx_put); return skb; @@ -1860,76 +1827,49 @@ error: goto resubmit; } -/* - * Check for transmit complete - */ -#define TX_NO_STATUS 0xffff - -static void sky2_tx_check(struct sky2_hw *hw, int port, u16 last) +/* Transmit complete */ +static inline void sky2_tx_done(struct sky2_hw *hw, int port, u16 last) { - if (last != TX_NO_STATUS) { - struct net_device *dev = hw->dev[port]; - if (dev && netif_running(dev)) { - struct sky2_port *sky2 = netdev_priv(dev); + struct net_device *dev = hw->dev[port]; + if (dev && netif_running(dev)) { + struct sky2_port *sky2 = netdev_priv(dev); - spin_lock(&sky2->tx_lock); - sky2_tx_complete(sky2, last); - spin_unlock(&sky2->tx_lock); - } + spin_lock(&sky2->tx_lock); + sky2_tx_complete(sky2, last); + spin_unlock(&sky2->tx_lock); } } -/* - * Both ports share the same status interrupt, therefore there is only - * one poll routine. - */ -static int sky2_poll(struct net_device *dev0, int *budget) +/* Process status response ring */ +static int sky2_status_intr(struct sky2_hw *hw, int to_do) { - struct sky2_hw *hw = ((struct sky2_port *) netdev_priv(dev0))->hw; - unsigned int to_do = min(dev0->quota, *budget); - unsigned int work_done = 0; + int work_done = 0; u16 hwidx; - u16 tx_done[2] = { TX_NO_STATUS, TX_NO_STATUS }; - - sky2_write32(hw, STAT_CTRL, SC_STAT_CLR_IRQ); - - /* - * Kick the STAT_LEV_TIMER_CTRL timer. - * This fixes my hangs on Yukon-EC (0xb6) rev 1. - * The if clause is there to start the timer only if it has been - * configured correctly and not been disabled via ethtool. - */ - if (sky2_read8(hw, STAT_LEV_TIMER_CTRL) == TIM_START) { - sky2_write8(hw, STAT_LEV_TIMER_CTRL, TIM_STOP); - sky2_write8(hw, STAT_LEV_TIMER_CTRL, TIM_START); - } hwidx = sky2_read16(hw, STAT_PUT_IDX); - BUG_ON(hwidx >= STATUS_RING_SIZE); rmb(); while (hwidx != hw->st_idx) { - struct sky2_status_le *le = hw->st_le + hw->st_idx; + const struct sky2_status_le *le = hw->st_le + hw->st_idx; struct net_device *dev; struct sky2_port *sky2; struct sk_buff *skb; u32 status; u16 length; + u8 link, opcode; - le = hw->st_le + hw->st_idx; hw->st_idx = (hw->st_idx + 1) % STATUS_RING_SIZE; - prefetch(hw->st_le + hw->st_idx); - BUG_ON(le->link >= 2); - dev = hw->dev[le->link]; - if (dev == NULL || !netif_running(dev)) - continue; + link = le->link; + BUG_ON(link >= 2); + dev = hw->dev[link]; sky2 = netdev_priv(dev); - status = le32_to_cpu(le->status); - length = le16_to_cpu(le->length); + length = le->length; + status = le->status; + opcode = le->opcode & ~HW_OWNER; - switch (le->opcode & ~HW_OWNER) { + switch (opcode) { case OP_RXSTAT: skb = sky2_receive(sky2, length, status); if (!skb) @@ -1967,44 +1907,25 @@ static int sky2_poll(struct net_device * skb->csum = le16_to_cpu(status); break; + case OP_TXINDEXLE: /* TX index reports status for both ports */ - tx_done[0] = status & 0xffff; - tx_done[1] = ((status >> 24) & 0xff) - | (u16)(length & 0xf) << 8; - break; + sky2_tx_done(hw, 0, status & 0xffff); + sky2_tx_done(hw, 1, + ((status >> 24) & 0xff) + | (u16)(length & 0xf) << 8); + goto exit_loop; default: if (net_ratelimit()) printk(KERN_WARNING PFX - "unknown status opcode 0x%x\n", le->opcode); + "unknown status opcode 0x%x\n", opcode); break; } } exit_loop: - sky2_tx_check(hw, 0, tx_done[0]); - sky2_tx_check(hw, 1, tx_done[1]); - - if (sky2_read8(hw, STAT_TX_TIMER_CTRL) == TIM_START) { - sky2_write8(hw, STAT_TX_TIMER_CTRL, TIM_STOP); - sky2_write8(hw, STAT_TX_TIMER_CTRL, TIM_START); - } - - if (likely(work_done < to_do)) { - spin_lock_irq(&hw->hw_lock); - __netif_rx_complete(dev0); - - hw->intr_mask |= Y2_IS_STAT_BMU; - sky2_write32(hw, B0_IMSK, hw->intr_mask); - spin_unlock_irq(&hw->hw_lock); - - return 0; - } else { - *budget -= work_done; - dev0->quota -= work_done; - return 1; - } + return work_done; } static void sky2_hw_error(struct sky2_hw *hw, unsigned port, u32 status) @@ -2123,58 +2044,66 @@ static void sky2_mac_intr(struct sky2_hw } } -static void sky2_phy_intr(struct sky2_hw *hw, unsigned port) -{ - struct net_device *dev = hw->dev[port]; - struct sky2_port *sky2 = netdev_priv(dev); - - hw->intr_mask &= ~(port == 0 ? Y2_IS_IRQ_PHY1 : Y2_IS_IRQ_PHY2); - sky2_write32(hw, B0_IMSK, hw->intr_mask); - schedule_work(&sky2->phy_task); -} - -static irqreturn_t sky2_intr(int irq, void *dev_id, struct pt_regs *regs) +static int sky2_poll(struct net_device *dev0, int *budget) { - struct sky2_hw *hw = dev_id; - struct net_device *dev0 = hw->dev[0]; - u32 status; - - status = sky2_read32(hw, B0_Y2_SP_ISRC2); - if (status == 0 || status == ~0) - return IRQ_NONE; + struct sky2_hw *hw = ((struct sky2_port *) netdev_priv(dev0))->hw; + int work_limit = min(dev0->quota, *budget); + int work_done = 0; - spin_lock(&hw->hw_lock); - if (status & Y2_IS_HW_ERR) + if (hw->istatus & Y2_IS_HW_ERR) sky2_hw_intr(hw); - /* Do NAPI for Rx and Tx status */ - if (status & Y2_IS_STAT_BMU) { - hw->intr_mask &= ~Y2_IS_STAT_BMU; - sky2_write32(hw, B0_IMSK, hw->intr_mask); - - if (likely(__netif_rx_schedule_prep(dev0))) { - prefetch(&hw->st_le[hw->st_idx]); - __netif_rx_schedule(dev0); - } - } - - if (status & Y2_IS_IRQ_PHY1) + if (hw->istatus & Y2_IS_IRQ_PHY1) sky2_phy_intr(hw, 0); - if (status & Y2_IS_IRQ_PHY2) + if (hw->istatus & Y2_IS_IRQ_PHY2) sky2_phy_intr(hw, 1); - if (status & Y2_IS_IRQ_MAC1) + if (hw->istatus & Y2_IS_IRQ_MAC1) sky2_mac_intr(hw, 0); - if (status & Y2_IS_IRQ_MAC2) + if (hw->istatus & Y2_IS_IRQ_MAC2) sky2_mac_intr(hw, 1); + if (hw->istatus & Y2_IS_STAT_BMU) { + work_done = sky2_status_intr(hw, work_limit); + *budget -= work_done; + dev0->quota -= work_done; + + if (work_done >= work_limit) { + hw->istatus = Y2_IS_STAT_BMU; + return 1; + } + + sky2_write32(hw, STAT_CTRL, SC_STAT_CLR_IRQ); + } + + netif_rx_complete(dev0); + + /* Ack interrupt and re-enable */ + hw->istatus = 0; sky2_write32(hw, B0_Y2_SP_ICR, 2); + return 0; +} - spin_unlock(&hw->hw_lock); +static irqreturn_t sky2_intr(int irq, void *dev_id, struct pt_regs *regs) +{ + struct sky2_hw *hw = dev_id; + struct net_device *dev0 = hw->dev[0]; + u32 status; + /* Reading this mask interrupts as side effect */ + status = sky2_read32(hw, B0_Y2_SP_ISRC2); + if (status == 0 || status == ~0) + return IRQ_NONE; + + if (likely(__netif_rx_schedule_prep(dev0))) { + hw->istatus = status; + prefetch(&hw->st_le[hw->st_idx]); + __netif_rx_schedule(dev0); + } else + printk(PFX "irq but schedule failed??\n"); return IRQ_HANDLED; } @@ -2227,6 +2156,16 @@ static int sky2_reset(struct sky2_hw *hw return -EOPNOTSUPP; } + hw->chip_rev = (sky2_read8(hw, B2_MAC_CFG) & CFG_CHIP_R_MSK) >> 4; + + /* This rev is really old, and requires untested workarounds */ + if (hw->chip_id == CHIP_ID_YUKON_EC && hw->chip_rev == CHIP_REV_YU_EC_A1) { + printk(KERN_ERR PFX "%s: unsupported revision Yukon-%s (0x%x) rev %d\n", + pci_name(hw->pdev), yukon2_name[hw->chip_id - CHIP_ID_YUKON_XL], + hw->chip_id, hw->chip_rev); + return -EOPNOTSUPP; + } + /* disable ASF */ if (hw->chip_id <= CHIP_ID_YUKON_EC) { sky2_write8(hw, B28_Y2_ASF_STAT_CMD, Y2_ASF_RESET); @@ -2260,7 +2199,6 @@ static int sky2_reset(struct sky2_hw *hw if (!(sky2_read8(hw, B2_Y2_CLK_GATE) & Y2_STATUS_LNK2_INAC)) ++hw->ports; } - hw->chip_rev = (sky2_read8(hw, B2_MAC_CFG) & CFG_CHIP_R_MSK) >> 4; sky2_set_power_state(hw, PCI_D0); @@ -2327,29 +2265,17 @@ static int sky2_reset(struct sky2_hw *hw sky2_write16(hw, STAT_LAST_IDX, STATUS_RING_SIZE - 1); /* These status setup values are copied from SysKonnect's driver */ - if (is_ec_a1(hw)) { - /* WA for dev. #4.3 */ - sky2_write16(hw, STAT_TX_IDX_TH, 0xfff); /* Tx Threshold */ - - /* set Status-FIFO watermark */ - sky2_write8(hw, STAT_FIFO_WM, 0x21); /* WA for dev. #4.18 */ - - /* set Status-FIFO ISR watermark */ - sky2_write8(hw, STAT_FIFO_ISR_WM, 0x07); /* WA for dev. #4.18 */ - sky2_write32(hw, STAT_TX_TIMER_INI, sky2_us2clk(hw, 10000)); - } else { - sky2_write16(hw, STAT_TX_IDX_TH, 10); - sky2_write8(hw, STAT_FIFO_WM, 16); + sky2_write16(hw, STAT_TX_IDX_TH, 10); + sky2_write8(hw, STAT_FIFO_WM, 16); - /* set Status-FIFO ISR watermark */ - if (hw->chip_id == CHIP_ID_YUKON_XL && hw->chip_rev == 0) - sky2_write8(hw, STAT_FIFO_ISR_WM, 4); - else - sky2_write8(hw, STAT_FIFO_ISR_WM, 16); + /* set Status-FIFO ISR watermark */ + if (hw->chip_id == CHIP_ID_YUKON_XL && hw->chip_rev == 0) + sky2_write8(hw, STAT_FIFO_ISR_WM, 4); + else + sky2_write8(hw, STAT_FIFO_ISR_WM, 16); - sky2_write32(hw, STAT_TX_TIMER_INI, sky2_us2clk(hw, 1000)); - sky2_write32(hw, STAT_ISR_TIMER_INI, sky2_us2clk(hw, 7)); - } + sky2_write32(hw, STAT_TX_TIMER_INI, sky2_us2clk(hw, 1000)); + sky2_write32(hw, STAT_ISR_TIMER_INI, sky2_us2clk(hw, 7)); /* enable status unit */ sky2_write32(hw, STAT_CTRL, SC_STAT_OP_ON); @@ -2732,7 +2658,7 @@ static int sky2_phys_id(struct net_devic ms = data * 1000; /* save initial values */ - down(&sky2->phy_sema); + spin_lock_bh(&sky2->phy_lock); if (hw->chip_id == CHIP_ID_YUKON_XL) { u16 pg = gm_phy_read(hw, port, PHY_MARV_EXT_ADR); gm_phy_write(hw, port, PHY_MARV_EXT_ADR, 3); @@ -2748,9 +2674,9 @@ static int sky2_phys_id(struct net_devic sky2_led(hw, port, onoff); onoff = !onoff; - up(&sky2->phy_sema); + spin_unlock_bh(&sky2->phy_lock); interrupted = msleep_interruptible(250); - down(&sky2->phy_sema); + spin_lock_bh(&sky2->phy_lock); ms -= 250; } @@ -2765,7 +2691,7 @@ static int sky2_phys_id(struct net_devic gm_phy_write(hw, port, PHY_MARV_LED_CTRL, ledctrl); gm_phy_write(hw, port, PHY_MARV_LED_OVER, ledover); } - up(&sky2->phy_sema); + spin_unlock_bh(&sky2->phy_lock); return 0; } @@ -3077,10 +3003,9 @@ static __devinit struct net_device *sky2 */ sky2->rx_csum = (hw->chip_id != CHIP_ID_YUKON_XL); - INIT_WORK(&sky2->phy_task, sky2_phy_task, sky2); - init_MUTEX(&sky2->phy_sema); + spin_lock_init(&sky2->phy_lock); sky2->tx_pending = TX_DEF_PENDING; - sky2->rx_pending = is_ec_a1(hw) ? 8 : RX_DEF_PENDING; + sky2->rx_pending = RX_DEF_PENDING; sky2->rx_bufsize = sky2_buf_size(ETH_DATA_LEN); hw->dev[port] = dev; @@ -3122,6 +3047,66 @@ static void __devinit sky2_show_addr(str dev->dev_addr[3], dev->dev_addr[4], dev->dev_addr[5]); } +/* Handle software interrupt used during MSI test */ +static irqreturn_t __devinit sky2_test_intr(int irq, void *dev_id, + struct pt_regs *regs) +{ + struct sky2_hw *hw = dev_id; + u32 status = sky2_read32(hw, B0_Y2_SP_ISRC2); + + if (status == 0) + return IRQ_NONE; + + if (status & Y2_IS_IRQ_SW) { + hw->msi_detected = 1; + wake_up(&hw->msi_wait); + sky2_write8(hw, B0_CTST, CS_CL_SW_IRQ); + } + sky2_write32(hw, B0_Y2_SP_ICR, 2); + + return IRQ_HANDLED; +} + +/* Test interrupt path by forcing a a software IRQ */ +static int __devinit sky2_test_msi(struct sky2_hw *hw) +{ + struct pci_dev *pdev = hw->pdev; + int err; + + sky2_write32(hw, B0_IMSK, Y2_IS_IRQ_SW); + + err = request_irq(pdev->irq, sky2_test_intr, SA_SHIRQ, DRV_NAME, hw); + if (err) { + printk(KERN_ERR PFX "%s: cannot assign irq %d\n", + pci_name(pdev), pdev->irq); + return err; + } + + init_waitqueue_head (&hw->msi_wait); + + sky2_write8(hw, B0_CTST, CS_ST_SW_IRQ); + wmb(); + + wait_event_timeout(hw->msi_wait, hw->msi_detected, HZ/10); + + if (!hw->msi_detected) { + /* MSI test failed, go back to INTx mode */ + printk(KERN_WARNING PFX "%s: No interrupt was generated using MSI, " + "switching to INTx mode. Please report this failure to " + "the PCI maintainer and include system chipset information.\n", + pci_name(pdev)); + + err = -EOPNOTSUPP; + sky2_write8(hw, B0_CTST, CS_CL_SW_IRQ); + } + + sky2_write32(hw, B0_IMSK, 0); + + free_irq(pdev->irq, hw); + + return err; +} + static int __devinit sky2_probe(struct pci_dev *pdev, const struct pci_device_id *ent) { @@ -3190,7 +3175,6 @@ static int __devinit sky2_probe(struct p goto err_out_free_hw; } hw->pm_cap = pm_cap; - spin_lock_init(&hw->hw_lock); #ifdef __BIG_ENDIAN /* byte swap descriptors in hardware */ @@ -3243,22 +3227,29 @@ static int __devinit sky2_probe(struct p } } - err = request_irq(pdev->irq, sky2_intr, SA_SHIRQ | SA_SAMPLE_RANDOM, - DRV_NAME, hw); + if (!disable_msi && pci_enable_msi(pdev) == 0) { + err = sky2_test_msi(hw); + if (err == -EOPNOTSUPP) + pci_disable_msi(pdev); + else if (err) + goto err_out_unregister; + } + + err = request_irq(pdev->irq, sky2_intr, SA_SHIRQ, DRV_NAME, hw); if (err) { printk(KERN_ERR PFX "%s: cannot assign irq %d\n", pci_name(pdev), pdev->irq); goto err_out_unregister; } - hw->intr_mask = Y2_IS_BASE; - sky2_write32(hw, B0_IMSK, hw->intr_mask); + sky2_write32(hw, B0_IMSK, Y2_IS_BASE); pci_set_drvdata(pdev, hw); return 0; err_out_unregister: + pci_disable_msi(pdev); if (dev1) { unregister_netdev(dev1); free_netdev(dev1); @@ -3301,6 +3292,7 @@ static void __devexit sky2_remove(struct sky2_read8(hw, B0_CTST); free_irq(pdev->irq, hw); + pci_disable_msi(pdev); pci_free_consistent(pdev, STATUS_LE_BYTES, hw->st_le, hw->st_dma); pci_release_regions(pdev); pci_disable_device(pdev); jwltest-tg3-3_50.patch: drivers/net/tg3.c | 100 +++++++++++++++++++++++++++++++++++++++--------- include/linux/pci_ids.h | 2 2 files changed, 84 insertions(+), 18 deletions(-) --- NEW FILE jwltest-tg3-3_50.patch --- --- linux-2.6.15.noarch/include/linux/pci_ids.h.orig 2006-02-16 15:56:23.000000000 -0500 +++ linux-2.6.15.noarch/include/linux/pci_ids.h 2006-02-16 15:56:17.000000000 -0500 @@ -1861,12 +1861,14 @@ #define PCI_DEVICE_ID_TIGON3_5705M 0x165d #define PCI_DEVICE_ID_TIGON3_5705M_2 0x165e #define PCI_DEVICE_ID_TIGON3_5714 0x1668 +#define PCI_DEVICE_ID_TIGON3_5714S 0x1669 #define PCI_DEVICE_ID_TIGON3_5780 0x166a #define PCI_DEVICE_ID_TIGON3_5780S 0x166b #define PCI_DEVICE_ID_TIGON3_5705F 0x166e #define PCI_DEVICE_ID_TIGON3_5750 0x1676 #define PCI_DEVICE_ID_TIGON3_5751 0x1677 #define PCI_DEVICE_ID_TIGON3_5715 0x1678 +#define PCI_DEVICE_ID_TIGON3_5715S 0x1679 #define PCI_DEVICE_ID_TIGON3_5750M 0x167c #define PCI_DEVICE_ID_TIGON3_5751M 0x167d #define PCI_DEVICE_ID_TIGON3_5751F 0x167e --- linux-2.6.15.noarch/drivers/net/tg3.c.orig 2006-02-16 15:55:22.000000000 -0500 +++ linux-2.6.15.noarch/drivers/net/tg3.c 2006-02-16 15:55:22.000000000 -0500 @@ -69,8 +69,8 @@ #define DRV_MODULE_NAME "tg3" #define PFX DRV_MODULE_NAME ": " -#define DRV_MODULE_VERSION "3.49" -#define DRV_MODULE_RELDATE "Feb 2, 2006" +#define DRV_MODULE_VERSION "3.50" +#define DRV_MODULE_RELDATE "Feb 4, 2006" #define TG3_DEF_MAC_MODE 0 #define TG3_DEF_RX_MODE 0 @@ -223,8 +223,12 @@ static struct pci_device_id tg3_pci_tbl[ PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL }, { PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5714, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL }, + { PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5714S, + PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL }, { PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5715, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL }, + { PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5715S, + PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL }, { PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5780, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL }, { PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5780S, @@ -1038,9 +1042,11 @@ static void tg3_frob_aux_power(struct tg struct net_device *dev_peer; dev_peer = pci_get_drvdata(tp->pdev_peer); + /* remove_one() may have been run on the peer. */ if (!dev_peer) - BUG(); - tp_peer = netdev_priv(dev_peer); + tp_peer = tp; + else + tp_peer = netdev_priv(dev_peer); } if ((tp->tg3_flags & TG3_FLAG_WOL_ENABLE) != 0 || @@ -1131,7 +1137,7 @@ static int tg3_halt_cpu(struct tg3 *, u3 static int tg3_nvram_lock(struct tg3 *); static void tg3_nvram_unlock(struct tg3 *); -static int tg3_set_power_state(struct tg3 *tp, int state) +static int tg3_set_power_state(struct tg3 *tp, pci_power_t state) { u32 misc_host_ctrl; u16 power_control, power_caps; @@ -1150,7 +1156,7 @@ static int tg3_set_power_state(struct tg power_control |= PCI_PM_CTRL_PME_STATUS; power_control &= ~(PCI_PM_CTRL_STATE_MASK); switch (state) { - case 0: + case PCI_D0: power_control |= 0; pci_write_config_word(tp->pdev, pm + PCI_PM_CTRL, @@ -1163,15 +1169,15 @@ static int tg3_set_power_state(struct tg return 0; - case 1: + case PCI_D1: power_control |= 1; break; - case 2: + case PCI_D2: power_control |= 2; break; - case 3: + case PCI_D3hot: power_control |= 3; break; @@ -2680,6 +2686,12 @@ static int tg3_setup_fiber_mii_phy(struc err |= tg3_readphy(tp, MII_BMSR, &bmsr); err |= tg3_readphy(tp, MII_BMSR, &bmsr); + if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5714) { + if (tr32(MAC_TX_STATUS) & TX_STATUS_LINK_UP) + bmsr |= BMSR_LSTATUS; + else + bmsr &= ~BMSR_LSTATUS; + } err |= tg3_readphy(tp, MII_BMCR, &bmcr); @@ -2748,6 +2760,13 @@ static int tg3_setup_fiber_mii_phy(struc bmcr = new_bmcr; err |= tg3_readphy(tp, MII_BMSR, &bmsr); err |= tg3_readphy(tp, MII_BMSR, &bmsr); + if (GET_ASIC_REV(tp->pci_chip_rev_id) == + ASIC_REV_5714) { + if (tr32(MAC_TX_STATUS) & TX_STATUS_LINK_UP) + bmsr |= BMSR_LSTATUS; + else + bmsr &= ~BMSR_LSTATUS; + } tp->tg3_flags2 &= ~TG3_FLG2_PARALLEL_DETECT; } } @@ -5568,6 +5587,9 @@ static int tg3_reset_hw(struct tg3 *tp) tg3_abort_hw(tp, 1); } + if (tp->tg3_flags2 & TG3_FLG2_MII_SERDES) + tg3_phy_reset(tp); + err = tg3_chip_reset(tp); if (err) return err; @@ -6080,6 +6102,17 @@ static int tg3_reset_hw(struct tg3 *tp) tp->tg3_flags2 |= TG3_FLG2_HW_AUTONEG; } + if ((tp->tg3_flags2 & TG3_FLG2_MII_SERDES) && + (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5714)) { + u32 tmp; + + tmp = tr32(SERDES_RX_CTRL); + tw32(SERDES_RX_CTRL, tmp | SERDES_RX_SIG_DETECT); + tp->grc_local_ctrl &= ~GRC_LCLCTRL_USE_EXT_SIG_DETECT; + tp->grc_local_ctrl |= GRC_LCLCTRL_USE_SIG_DETECT; + tw32(GRC_LOCAL_CTRL, tp->grc_local_ctrl); + } + err = tg3_setup_phy(tp, 1); if (err) return err; @@ -6158,7 +6191,7 @@ static int tg3_init_hw(struct tg3 *tp) int err; /* Force the chip into D0. */ - err = tg3_set_power_state(tp, 0); + err = tg3_set_power_state(tp, PCI_D0); if (err) goto out; @@ -6445,6 +6478,10 @@ static int tg3_open(struct net_device *d tg3_full_lock(tp, 0); + err = tg3_set_power_state(tp, PCI_D0); + if (err) + return err; + tg3_disable_ints(tp); tp->tg3_flags &= ~TG3_FLAG_INIT_COMPLETE; @@ -6459,7 +6496,9 @@ static int tg3_open(struct net_device *d if ((tp->tg3_flags2 & TG3_FLG2_5750_PLUS) && (GET_CHIP_REV(tp->pci_chip_rev_id) != CHIPREV_5750_AX) && - (GET_CHIP_REV(tp->pci_chip_rev_id) != CHIPREV_5750_BX)) { + (GET_CHIP_REV(tp->pci_chip_rev_id) != CHIPREV_5750_BX) && + !((GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5714) && + (tp->pdev_peer == tp->pdev))) { /* All MSI supporting chips should support tagged * status. Assert that this is the case. */ @@ -6822,7 +6861,6 @@ static int tg3_close(struct net_device * tp->tg3_flags &= ~(TG3_FLAG_INIT_COMPLETE | TG3_FLAG_GOT_SERDES_FLOWCTL); - netif_carrier_off(tp->dev); tg3_full_unlock(tp); @@ -6839,6 +6877,10 @@ static int tg3_close(struct net_device * tg3_free_consistent(tp); + tg3_set_power_state(tp, PCI_D3hot); + + netif_carrier_off(tp->dev); + return 0; } @@ -7157,6 +7199,9 @@ static void tg3_get_regs(struct net_devi memset(p, 0, TG3_REGDUMP_LEN); + if (tp->link_config.phy_is_low_power) + return; + tg3_full_lock(tp, 0); #define __GET_REG32(reg) (*(p)++ = tr32(reg)) @@ -7231,6 +7276,9 @@ static int tg3_get_eeprom(struct net_dev u8 *pd; u32 i, offset, len, val, b_offset, b_count; + if (tp->link_config.phy_is_low_power) + return -EAGAIN; + offset = eeprom->offset; len = eeprom->len; eeprom->len = 0; @@ -7292,6 +7340,9 @@ static int tg3_set_eeprom(struct net_dev u32 offset, len, b_offset, odd_len, start, end; u8 *buf; + if (tp->link_config.phy_is_low_power) + return -EAGAIN; + if (eeprom->magic != TG3_EEPROM_MAGIC) return -EINVAL; @@ -8212,6 +8263,9 @@ static void tg3_self_test(struct net_dev { struct tg3 *tp = netdev_priv(dev); + if (tp->link_config.phy_is_low_power) + tg3_set_power_state(tp, PCI_D0); + memset(data, 0, sizeof(u64) * TG3_NUM_TEST); if (tg3_test_nvram(tp) != 0) { @@ -8269,6 +8323,9 @@ static void tg3_self_test(struct net_dev tg3_full_unlock(tp); } + if (tp->link_config.phy_is_low_power) + tg3_set_power_state(tp, PCI_D3hot); + } static int tg3_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) @@ -8288,6 +8345,9 @@ static int tg3_ioctl(struct net_device * if (tp->tg3_flags2 & TG3_FLG2_PHY_SERDES) break; /* We have no PHY */ + if (tp->link_config.phy_is_low_power) + return -EAGAIN; + spin_lock_bh(&tp->lock); err = tg3_readphy(tp, data->reg_num & 0x1f, &mii_regval); spin_unlock_bh(&tp->lock); @@ -8304,6 +8364,9 @@ static int tg3_ioctl(struct net_device * if (!capable(CAP_NET_ADMIN)) return -EPERM; + if (tp->link_config.phy_is_low_power) + return -EAGAIN; + spin_lock_bh(&tp->lock); err = tg3_writephy(tp, data->reg_num & 0x1f, data->val_in); spin_unlock_bh(&tp->lock); @@ -9718,7 +9781,7 @@ static int __devinit tg3_get_invariants( tp->grc_local_ctrl |= GRC_LCLCTRL_GPIO_OE3; /* Force the chip into D0. */ - err = tg3_set_power_state(tp, 0); + err = tg3_set_power_state(tp, PCI_D0); if (err) { printk(KERN_ERR PFX "(%s) transition to D0 failed\n", pci_name(tp->pdev)); @@ -10771,11 +10834,12 @@ static int __devinit tg3_init_one(struct tp->tg3_flags2 |= TG3_FLG2_TSO_CAPABLE; } - /* TSO is off by default, user can enable using ethtool. */ -#if 0 - if (tp->tg3_flags2 & TG3_FLG2_TSO_CAPABLE) + /* TSO is on by default on chips that support hardware TSO. + * Firmware TSO on older chips gives lower performance, so it + * is off by default, but can be enabled using ethtool. + */ + if (tp->tg3_flags2 & TG3_FLG2_HW_TSO) dev->features |= NETIF_F_TSO; -#endif #endif @@ -10968,7 +11032,7 @@ static int tg3_resume(struct pci_dev *pd pci_restore_state(tp->pdev); - err = tg3_set_power_state(tp, 0); + err = tg3_set_power_state(tp, PCI_D0); if (err) return err; Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.2021 retrieving revision 1.2021.2.1 diff -u -r1.2021 -r1.2021.2.1 --- kernel-2.6.spec 6 Mar 2006 21:44:45 -0000 1.2021 +++ kernel-2.6.spec 6 Mar 2006 23:21:09 -0000 1.2021.2.1 @@ -24,7 +24,8 @@ %define sublevel 15 %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.13 %define release %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})_FC5%{rhbsys} %define signmodules 0 %define make_target bzImage @@ -163,7 +164,7 @@ Version: %{rpmversion} Release: %{release} #ExclusiveArch: noarch %{all_x86} x86_64 ppc ppc64 ia64 sparc sparc64 ppc64iseries s390 s390x -ExclusiveArch: noarch %{all_x86} x86_64 ppc ppc64 sparc sparc64 ppc64iseries s390 s390x +ExclusiveArch: noarch %{all_x86} x86_64 ppc ppc64 ExclusiveOS: Linux Provides: kernel = %{version} Provides: kernel-drm = 4.3.0 @@ -247,6 +248,7 @@ Patch317: linux-2.6-ppc-iseries-input-layer.patch # 400 - 499 ia64 + # 500 - 599 s390(x) # 600 - 699 sparc(64) @@ -343,6 +345,10 @@ Patch1302: linux-2.6-net-wireless-features.patch Patch1303: linux-2.6-net-ipw2200-hwcrypto.patch Patch1304: linux-2.6-net-ipw2200-monitor.patch +Patch1305: jwltest-sk98lin-neuter.patch +Patch1306: jwltest-e1000-7_0_33-k2.patch +Patch1307: jwltest-tg3-3_50.patch +Patch1308: jwltest-sky2-1_0.patch # Squashfs Patch1400: linux-2.6-squashfs.patch @@ -408,6 +414,7 @@ # Broadcom wireless driver Patch5000: linux-2.6-softmac-git.patch Patch5001: linux-2.6-bcm43xx-git.patch +Patch5002: jwltest-bcm43xx-wx-overflow.patch # # 10000 to 20000 is for stuff that has to come last due to the @@ -934,6 +941,14 @@ %patch1303 -p1 # add IPW2200_MONITOR config option %patch1304 -p1 +# neuter sk98lin (as far as userland is concerned) +%patch1305 -p1 +# update e1000 to 7.0.33-k2(-pre) +#%patch1306 -p1 +# update tg3 to 3.50 +%patch1307 -p1 +# update sky2 to 1.0-pre1 +%patch1308 -p1 # Squashfs %patch1400 -p1 @@ -1030,6 +1045,8 @@ %patch5000 -p1 # ... and bcm43xx driver too %patch5001 -p1 +# fix possible buffer overflow in wx handler +%patch5002 -p1 # # final stuff From fedora-cvs-commits at redhat.com Tue Mar 7 00:38:27 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 6 Mar 2006 19:38:27 -0500 Subject: rpms/eclipse/devel eclipse.spec,1.259,1.260 Message-ID: <200603070038.k270cRql015871@cvs.devel.redhat.com> Author: overholt Update of /cvs/dist/rpms/eclipse/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv15838 Modified Files: eclipse.spec Log Message: more symlink garbage. Index: eclipse.spec =================================================================== RCS file: /cvs/dist/rpms/eclipse/devel/eclipse.spec,v retrieving revision 1.259 retrieving revision 1.260 diff -u -r1.259 -r1.260 --- eclipse.spec 6 Mar 2006 22:12:54 -0000 1.259 +++ eclipse.spec 7 Mar 2006 00:38:25 -0000 1.260 @@ -501,8 +501,6 @@ ## BEGIN TOMCAT ## rm -f plugins/org.eclipse.tomcat/servlet.jar rm -f plugins/org.eclipse.tomcat/servlets-manager.jar -rm -f plugins/org.eclipse.tomcat/commons-collections.jar -rm -f plugins/org.eclipse.tomcat/commons-logging-api.jar rm -f plugins/org.eclipse.tomcat/naming-common.jar rm -f plugins/org.eclipse.tomcat/servlets-common.jar rm -f plugins/org.eclipse.tomcat/tomcat-http11.jar @@ -518,6 +516,7 @@ ln -sf %{_javadir}/commons-fileupload.jar plugins/org.eclipse.tomcat/commons-fileupload.jar ln -sf %{_javadir}/commons-launcher.jar plugins/org.eclipse.tomcat/commons-launcher.jar ln -sf %{_javadir}/commons-logging.jar plugins/org.eclipse.tomcat/commons-logging.jar +ln -sf %{_javadir}/commons-logging-api.jar plugins/org.eclipse.tomcat/commons-logging-api.jar ln -sf %{_javadir}/commons-modeler.jar plugins/org.eclipse.tomcat/commons-modeler.jar ln -sf %{_javadir}/commons-pool.jar plugins/org.eclipse.tomcat/commons-pool.jar ln -sf %{_javadir}/jasper-compiler.jar plugins/org.eclipse.tomcat/jasper-compiler.jar @@ -882,8 +881,6 @@ ## BEGIN TOMCAT ## rm -f plugins/org.eclipse.tomcat_*/servlet.jar rm -f plugins/org.eclipse.tomcat_*/servlets-manager.jar -rm -f plugins/org.eclipse.tomcat_*/commons-collections.jar -rm -f plugins/org.eclipse.tomcat_*/commons-logging-api.jar rm -f plugins/org.eclipse.tomcat_*/naming-common.jar rm -f plugins/org.eclipse.tomcat_*/servlets-common.jar rm -f plugins/org.eclipse.tomcat_*/tomcat-http11.jar @@ -899,6 +896,7 @@ ln -sf %{_javadir}/commons-fileupload.jar plugins/org.eclipse.tomcat_*/commons-fileupload.jar ln -sf %{_javadir}/commons-launcher.jar plugins/org.eclipse.tomcat_*/commons-launcher.jar ln -sf %{_javadir}/commons-logging.jar plugins/org.eclipse.tomcat_*/commons-logging.jar +ln -sf %{_javadir}/commons-logging-api.jar plugins/org.eclipse.tomcat_*/commons-logging-api.jar ln -sf %{_javadir}/commons-modeler.jar plugins/org.eclipse.tomcat_*/commons-modeler.jar ln -sf %{_javadir}/commons-pool.jar plugins/org.eclipse.tomcat_*/commons-pool.jar ln -sf %{_javadir}/jasper-compiler.jar plugins/org.eclipse.tomcat_*/jasper-compiler.jar From fedora-cvs-commits at redhat.com Tue Mar 7 00:41:53 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 6 Mar 2006 19:41:53 -0500 Subject: rpms/imake/devel imake.spec, 1.19, 1.20 xorg-cf-files-1.0.1-redhat.patch, 1.1, 1.2 Message-ID: <200603070041.k270frno017448@cvs.devel.redhat.com> Author: mharris Update of /cvs/dist/rpms/imake/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv17417 Modified Files: imake.spec xorg-cf-files-1.0.1-redhat.patch Log Message: * Mon Mar 06 2006 Mike A. Harris 1.0.1-3 - Updated xorg-cf-files-1.0.1-redhat.patch with fix for (#178177) Index: imake.spec =================================================================== RCS file: /cvs/dist/rpms/imake/devel/imake.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- imake.spec 1 Mar 2006 15:34:21 -0000 1.19 +++ imake.spec 7 Mar 2006 00:41:51 -0000 1.20 @@ -1,7 +1,7 @@ Summary: imake source code configuration and build system Name: imake Version: 1.0.1 -Release: 2 +Release: 3 License: MIT/X11 Group: User Interface/X URL: http://www.x.org @@ -18,31 +18,9 @@ Patch2: xorg-cf-files-1.0.1-redhat.patch BuildRequires: pkgconfig -BuildRequires: xorg-x11-util-macros xorg-x11-proto-devel +BuildRequires: xorg-x11-util-macros +BuildRequires: xorg-x11-proto-devel -# libxkbfile-devel needed for setxkbmap, xkbcomp, xkbevd, xkbprint -#BuildRequires: libxkbfile-devel -# libX11-devel needed for setxkbmap, xkbcomp, xkbevd, xkbprint -#BuildRequires: libX11-devel -# libXaw-devel needed for xkbutils -#BuildRequires: libXaw-devel -# libXt-devel needed for xkbutils -#BuildRequires: libXt-devel -# FIXME: xkbvleds requires libXext, but autotools doesn't check/require it: -# gcc -O2 -g -march=i386 -mcpu=i686 -o xkbvleds xkbvleds-xkbvleds.o -# xkbvleds-LED.o xkbvleds-utils.o -lXaw7 -lXmu -lXt -lSM -lICE -lXext -lXpm -lX11 -ldl -# /usr/bin/ld: cannot find -lXext -# libXext-devel needed for xkbutils (from above error) -#BuildRequires: libXext-devel -# FIXME: xkbvleds requires libXext, but autotools doesn't check/require it: -# gcc -O2 -g -march=i386 -mcpu=i686 -o xkbvleds xkbvleds-xkbvleds.o -# xkbvleds-LED.o xkbvleds-utils.o -lXaw7 -lXmu -lXt -lSM -lICE -lXext -lXpm -lX11 -ldl -# /usr/bin/ld: cannot find -lXpm -# libXpm-devel needed for xkbutils (from above error) -#BuildRequires: libXpm-devel - -# FIXME: -# Obsoletes: Provides: ccmakedep cleanlinks gccmakedep imake lndir makedepend makeg Provides: mergelib mkdirhier mkhtmlindex revpath xmkmf @@ -137,6 +115,9 @@ %{_mandir}/man1/xmkmf.1x* %changelog +* Mon Mar 06 2006 Mike A. Harris 1.0.1-3 +- Updated xorg-cf-files-1.0.1-redhat.patch with fix for (#178177) + * Wed Mar 01 2006 Karsten Hopp 1.0.1-2 - Buildrequires: xorg-x11-proto-devel xorg-cf-files-1.0.1-redhat.patch: linux.cf | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletion(-) Index: xorg-cf-files-1.0.1-redhat.patch =================================================================== RCS file: /cvs/dist/rpms/imake/devel/xorg-cf-files-1.0.1-redhat.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- xorg-cf-files-1.0.1-redhat.patch 31 Jan 2006 17:06:05 -0000 1.1 +++ xorg-cf-files-1.0.1-redhat.patch 7 Mar 2006 00:41:51 -0000 1.2 @@ -1,6 +1,6 @@ --- xorg-cf-files-1.0.0/linux.cf.redhat 2005-10-21 21:10:27.000000000 +0200 +++ xorg-cf-files-1.0.1/linux.cf 2005-12-21 11:27:16.000000000 +0100 -@@ -190,7 +190,12 @@ +@@ -190,7 +190,13 @@ #endif /* LinuxDebian */ #if LinuxDistribution == LinuxRedHat @@ -10,7 +10,8 @@ +# define BuildHtmlManPages NO +# define ProjectRoot /usr +# define ManPath /usr/share/man -+# define XAppLoadDir /usr/share/X11/app-defaults ++# define XAppLoadDir /usr/share/X11/app-defaults ++# define ConfigDir /usr/share/X11/config #endif #ifndef HasDevRandom From fedora-cvs-commits at redhat.com Tue Mar 7 02:28:55 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 6 Mar 2006 21:28:55 -0500 Subject: rpms/gdm/devel gdm.spec,1.139,1.140 Message-ID: <200603070228.k272StKj032644@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/gdm/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv32525 Modified Files: gdm.spec Log Message: - migrate users with baseXsession=/etc/X11/gdm/Xsession to /etc/X11/xinit/Xsession Index: gdm.spec =================================================================== RCS file: /cvs/dist/rpms/gdm/devel/gdm.spec,v retrieving revision 1.139 retrieving revision 1.140 diff -u -r1.139 -r1.140 --- gdm.spec 6 Mar 2006 22:10:47 -0000 1.139 +++ gdm.spec 7 Mar 2006 02:28:51 -0000 1.140 @@ -15,7 +15,7 @@ Summary: The GNOME Display Manager. Name: gdm Version: 2.13.0.9 -Release: 2 +Release: 3 Epoch: 1 License: LGPL/GPL Group: User Interface/X @@ -232,6 +232,7 @@ -e 's@^command=/usr/X11R6/bin/X@#command=/usr/bin/Xorg@' \ -e 's@^Xnest=/usr/X11R6/bin/Xnest@#Xnest=/usr/X11R6/bin/Xnest@' \ -e 's@^BaseXsession=/etc/X11/xdm/Xsession@#BaseXsession=/etc/X11/xinit/Xsession@' \ + -e 's@^BaseXsession=/etc/X11/gdm/Xsession@#&@' \ -e 's@^BaseXsession=/etc/gdm/Xsession@#&@' \ -e 's@^Greeter=/usr/bin/gdmgreeter@#Greeter=/usr/libexec/gdmgreeter@' \ -e 's@^RemoteGreeter=/usr/bin/gdmlogin@#RemoteGreeter=/usr/libexec/gdmlogin@' \ @@ -309,6 +310,10 @@ %attr(1770, root, gdm) %dir %{_localstatedir}/gdm %changelog +* Mon Mar 6 2006 Ray Strode - 1:2.13.0.9-3 +- migrate users with baseXsession=/etc/X11/gdm/Xsession to + /etc/X11/xinit/Xsession + * Mon Mar 6 2006 Ray Strode - 1:2.13.0.9-2 - disable sounds completely when disabled in configuration file (upstream bug 333435) From fedora-cvs-commits at redhat.com Tue Mar 7 02:51:30 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 6 Mar 2006 21:51:30 -0500 Subject: rpms/kernel/devel kernel-2.6.spec,1.2024,1.2025 Message-ID: <200603070251.k272pUwF020169@cvs.devel.redhat.com> Author: sct Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv19593 Modified Files: kernel-2.6.spec Log Message: Fix up the ia64 xen revert magic: the kernel build worked, but the %install fell over due to the leftover backup files. Delete these before moving on. Reenable ia64 in the .spec, as apart from the new %install regression, ia64 build now seems to work. Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.2024 retrieving revision 1.2025 diff -u -r1.2024 -r1.2025 --- kernel-2.6.spec 6 Mar 2006 23:02:40 -0000 1.2024 +++ kernel-2.6.spec 7 Mar 2006 02:51:27 -0000 1.2025 @@ -162,8 +162,7 @@ License: GPLv2 Version: %{rpmversion} Release: %{release} -#ExclusiveArch: noarch %{all_x86} x86_64 ppc ppc64 ia64 sparc sparc64 ppc64iseries s390 s390x -ExclusiveArch: noarch %{all_x86} x86_64 ppc ppc64 sparc sparc64 ppc64iseries s390 s390x +ExclusiveArch: noarch %{all_x86} x86_64 ppc ppc64 ia64 sparc sparc64 ppc64iseries s390 s390x ExclusiveOS: Linux Provides: kernel = %{version} Provides: kernel-drm = 4.3.0 @@ -791,11 +790,14 @@ # # ... and back out all the ia64-specific sections, as they currently prevent # non-xen builds from working. +# for f in `find arch/ia64/ include/asm-ia64/ include/xen/interface/arch-ia64.h* -type f -name "*.p.xen"` ; do \ g=`dirname $f`/`basename $f .p.xen`; \ mv "$f" "$g"; \ if [ ! -s "$g" ] ; then rm -f "$g" ; fi; \ done +# Delete the rest of the backup files, they just confuse the build later +find -name "*.p.xen" | xargs rm -f # # Xen includes a patch which moves the vsyscall fixmap into a user-space VA, From fedora-cvs-commits at redhat.com Tue Mar 7 03:22:01 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 6 Mar 2006 22:22:01 -0500 Subject: rpms/kernel/FC-4 kernel-2.6.spec, 1.1609.4.1, 1.1609.4.2 5418-mv643xx_eth-Remove-BIT0-BIT31-defines.txt, 1.1.2.1, NONE Message-ID: <200603070322.k273M1bT010028@cvs.devel.redhat.com> Author: linville Update of /cvs/dist/rpms/kernel/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv9996 Modified Files: Tag: private-linville-netdev-fc4-12-branch kernel-2.6.spec Removed Files: Tag: private-linville-netdev-fc4-12-branch 5418-mv643xx_eth-Remove-BIT0-BIT31-defines.txt Log Message: Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-4/kernel-2.6.spec,v retrieving revision 1.1609.4.1 retrieving revision 1.1609.4.2 diff -u -r1.1609.4.1 -r1.1609.4.2 --- kernel-2.6.spec 6 Mar 2006 23:10:19 -0000 1.1609.4.1 +++ kernel-2.6.spec 7 Mar 2006 03:21:57 -0000 1.1609.4.2 @@ -1252,22 +1252,21 @@ Patch20864: 5409-mv643xx_eth-Remove-duplicate-includes-of-linux-in.h-and-linux-ip.h.txt Patch20865: 5410-mv643xx_eth-Fix-misplaced-parenthesis-in-mv643xx_eth_port_disable_rx.txt Patch20866: 5412-mv643xx_eth-Select-CONFIG_MII-on-CONFIG_MV643XX_ETH.txt -Patch20867: 5418-mv643xx_eth-Remove-BIT0-BIT31-defines.txt -Patch20868: 5420-TCP-H-TCP-Use-msecs_to_jiffies.txt -Patch20869: 5421-TCP-H-TCP-Account-for-delayed-ACKs.txt -Patch20870: 5422-TCP-H-TCP-Better-time-accounting.txt -Patch20871: 5423-IPSEC-xfrm_user-Kill-PAGE_SIZE-check-in-verify_sec_ctx_len.txt -Patch20872: 5427-PKTGEN-Updates-version.txt -Patch20873: 5428-bonding-suppress-duplicate-packets.txt -Patch20874: 5432-pcnet_cs-add-new-id-Logitec-LPM-LN100TE.txt -Patch20875: 5433-sb1250-mac-Add-support-for-the-BCM1480.txt -Patch20876: 5435-remove-obsolete-sis900-documentation.txt -Patch20877: 5436-s2io-set_multicast_list-bug.txt -Patch20878: 5437-natsemi-NAPI-and-a-bugfix.txt -Patch20879: 5438-natsemi-NAPI-and-a-bugfix.txt -Patch20880: 5439-Fix-io-ordering-problems-in-e100.txt -Patch20881: 5447-ATM-keep-atmsvc-failure-messages-quiet.txt -Patch20882: 5450-chelsio-fix-kmalloc-failure-in-t1_espi_create.txt +Patch20867: 5420-TCP-H-TCP-Use-msecs_to_jiffies.txt +Patch20868: 5421-TCP-H-TCP-Account-for-delayed-ACKs.txt +Patch20869: 5422-TCP-H-TCP-Better-time-accounting.txt +Patch20870: 5423-IPSEC-xfrm_user-Kill-PAGE_SIZE-check-in-verify_sec_ctx_len.txt +Patch20871: 5427-PKTGEN-Updates-version.txt +Patch20872: 5428-bonding-suppress-duplicate-packets.txt +Patch20873: 5432-pcnet_cs-add-new-id-Logitec-LPM-LN100TE.txt +Patch20874: 5433-sb1250-mac-Add-support-for-the-BCM1480.txt +Patch20875: 5435-remove-obsolete-sis900-documentation.txt +Patch20876: 5436-s2io-set_multicast_list-bug.txt +Patch20877: 5437-natsemi-NAPI-and-a-bugfix.txt +Patch20878: 5438-natsemi-NAPI-and-a-bugfix.txt +Patch20879: 5439-Fix-io-ordering-problems-in-e100.txt +Patch20880: 5447-ATM-keep-atmsvc-failure-messages-quiet.txt +Patch20881: 5450-chelsio-fix-kmalloc-failure-in-t1_espi_create.txt # END OF PATCH DEFINITIONS @@ -3467,38 +3466,36 @@ %patch20865 -p1 # mv643xx_eth: Select CONFIG_MII on CONFIG_MV643XX_ETH %patch20866 -p1 -# mv643xx_eth: Remove BIT0-BIT31 #defines -%patch20867 -p1 # [TCP] H-TCP: Use msecs_to_jiffies -%patch20868 -p1 +%patch20867 -p1 # [TCP] H-TCP: Account for delayed-ACKs -%patch20869 -p1 +%patch20868 -p1 # [TCP] H-TCP: Better time accounting -%patch20870 -p1 +%patch20869 -p1 # [IPSEC] xfrm_user: Kill PAGE_SIZE check in verify_sec_ctx_len() -%patch20871 -p1 +%patch20870 -p1 # [PKTGEN]: Updates version. -%patch20872 -p1 +%patch20871 -p1 # bonding: suppress duplicate packets -%patch20873 -p1 +%patch20872 -p1 # pcnet_cs: add new id (Logitec LPM-LN100TE) -%patch20874 -p1 +%patch20873 -p1 # sb1250-mac: Add support for the BCM1480 -%patch20875 -p1 +%patch20874 -p1 # remove obsolete sis900 documentation -%patch20876 -p1 +%patch20875 -p1 # s2io: set_multicast_list bug +%patch20876 -p1 +# natsemi: NAPI and a bugfix %patch20877 -p1 # natsemi: NAPI and a bugfix %patch20878 -p1 -# natsemi: NAPI and a bugfix -%patch20879 -p1 # Fix io ordering problems in e100 -%patch20880 -p1 +%patch20879 -p1 # [ATM]: keep atmsvc failure messages quiet -%patch20881 -p1 +%patch20880 -p1 # chelsio: fix kmalloc failure in t1_espi_create -%patch20882 -p1 +%patch20881 -p1 # END OF PATCH APPLICATIONS @@ -4805,7 +4802,6 @@ - mv643xx_eth: Remove duplicate includes of linux/in.h and linux/ip.h - mv643xx_eth: Fix misplaced parenthesis in mv643xx_eth_port_disable_rx - mv643xx_eth: Select CONFIG_MII on CONFIG_MV643XX_ETH -- mv643xx_eth: Remove BIT0-BIT31 #defines - [TCP] H-TCP: Use msecs_to_jiffies - [TCP] H-TCP: Account for delayed-ACKs - [TCP] H-TCP: Better time accounting --- 5418-mv643xx_eth-Remove-BIT0-BIT31-defines.txt DELETED --- From fedora-cvs-commits at redhat.com Tue Mar 7 03:46:19 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 6 Mar 2006 22:46:19 -0500 Subject: rpms/gnome-power-manager/devel gnome-power-manager.spec,1.29,1.30 Message-ID: <200603070346.k273kJYl018425@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/gnome-power-manager/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv16419 Modified Files: gnome-power-manager.spec Log Message: - fix icon in bubbles (bug 184192). Index: gnome-power-manager.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-power-manager/devel/gnome-power-manager.spec,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- gnome-power-manager.spec 3 Mar 2006 22:58:49 -0000 1.29 +++ gnome-power-manager.spec 7 Mar 2006 03:46:16 -0000 1.30 @@ -5,7 +5,7 @@ Summary: GNOME Power Manager Name: gnome-power-manager Version: 2.13.93 -Release: 1 +Release: 2 License: GPL Group: Applications/System Source: gnome-power-manager-%{version}.tar.bz2 @@ -53,6 +53,9 @@ %find_lang %name +(cd $RPM_BUILD_ROOT%{_datadir}/gnome-power-manager; \ + ln -sf battery-discharging-100.png ../icons/hicolor/24x24/apps) + %clean rm -rf $RPM_BUILD_ROOT @@ -64,6 +67,10 @@ done scrollkeeper-update +touch --no-create %{_datadir}/icons/hicolor +[ -x gtk-update-icon-cache ] && \ + gtk-update-icon-cache -qf %{_datadir}/icons/hicolor + %postun scrollkeeper-update @@ -82,6 +89,9 @@ %{_datadir}/applications/gnome-power-preferences.desktop %changelog +* Mon Mar 6 2006 Ray Strode - 2.13.93-2 +- fix icon in bubbles (bug 184192). + * Fri Mar 3 2006 Ray Strode - 2.13.93-1 - Update to 2.13.93 - ignore d-bus timeout errors From fedora-cvs-commits at redhat.com Tue Mar 7 04:16:30 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 6 Mar 2006 23:16:30 -0500 Subject: rpms/gnome-power-manager/devel gnome-power-manager.spec,1.30,1.31 Message-ID: <200603070416.k274GUsS010149@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/gnome-power-manager/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv8335 Modified Files: gnome-power-manager.spec Log Message: - fix the fix in -2 Index: gnome-power-manager.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-power-manager/devel/gnome-power-manager.spec,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- gnome-power-manager.spec 7 Mar 2006 03:46:16 -0000 1.30 +++ gnome-power-manager.spec 7 Mar 2006 04:16:27 -0000 1.31 @@ -5,7 +5,7 @@ Summary: GNOME Power Manager Name: gnome-power-manager Version: 2.13.93 -Release: 2 +Release: 3 License: GPL Group: Applications/System Source: gnome-power-manager-%{version}.tar.bz2 @@ -68,8 +68,9 @@ scrollkeeper-update touch --no-create %{_datadir}/icons/hicolor -[ -x gtk-update-icon-cache ] && \ - gtk-update-icon-cache -qf %{_datadir}/icons/hicolor +if [ -x /usr/bin/gtk-update-icon-cache ]; then + gtk-update-icon-cache -q %{_datadir}/icons/hicolor +fi %postun scrollkeeper-update @@ -89,6 +90,9 @@ %{_datadir}/applications/gnome-power-preferences.desktop %changelog +* Mon Mar 6 2006 Ray Strode - 2.13.93-3 +- fix the fix in -2 + * Mon Mar 6 2006 Ray Strode - 2.13.93-2 - fix icon in bubbles (bug 184192). From fedora-cvs-commits at redhat.com Tue Mar 7 04:25:41 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 6 Mar 2006 23:25:41 -0500 Subject: rpms/bind/devel Copyright.caching-nameserver, NONE, 1.1 bind-chroot-admin.in, NONE, 1.1 localdomain.zone, NONE, 1.1 localhost.zone, NONE, 1.1 named.broadcast, NONE, 1.1 named.caching-nameserver.conf, NONE, 1.1 named.ip6.local, NONE, 1.1 named.local, NONE, 1.1 named.rfc1912.zones, NONE, 1.1 named.root, NONE, 1.1 named.zero, NONE, 1.1 bind.spec, 1.91, 1.92 named.init, 1.40, 1.41 Message-ID: <200603070425.k274PfsX019693@cvs.devel.redhat.com> Author: jvdias Update of /cvs/dist/rpms/bind/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv19487 Modified Files: bind.spec named.init Added Files: Copyright.caching-nameserver bind-chroot-admin.in localdomain.zone localhost.zone named.broadcast named.caching-nameserver.conf named.ip6.local named.local named.rfc1912.zones named.root named.zero Log Message: - replace caching-nameserver with bind-config sub-package - fix bug 181730: fix creation of named user & gid - fix bug 177595: handle case where $ROOTDIR is a link in initscript - fix bug 177001: bind-config creates symlinks OK now - fix bug 176388: named.conf is now never replaced by any RPM - fix bug 176246: remove unecessary creation of rpmsave links - fix bug 174925: no replacement of named.conf - fix bug 173963: existing named.conf never modified - major .spec file cleanup --- NEW FILE Copyright.caching-nameserver --- The files included in this package are obtained from ftp://ftp.internic.net/domain/, where they are made available for free to anybody. In other words, this package is created under a Public Domain license. --- NEW FILE bind-chroot-admin.in --- #!/bin/bash # # Script to control the bind-chroot ISC BIND named(8) server runtime environment. # # Usage: # [ -e | --enable ] [ -d | --disable ] | [ -s --sync ] # # -e | --enable: enable the bind-chroot environment # -d | --disable: disable the bind-chroot environment # -s | --sync: sync files between the bind chroot and / environments, # so they are correct for the current state of the bind-chroot # (enabled / disabled) # $BIND_CHROOT_PREFIX, default /var/named/chroot, is the location of the chroot. # $BIND_DIR, default /var/named, is the default un-chrooted bind directory. # # Copyright(C) 2006 Jason Vas Dias , Red Hat, Inc. # # This software is provided under the terms of the GNU # General Public License (GPL), as published at: # http://www.gnu.org/licenses/gpl.html . # # BIND_CHROOT_PREFIX=${BIND_CHROOT_PREFIX:- at BIND_CHROOT_PREFIX@} BIND_DIR=${BIND_DIR:- at BIND_DIR@} function usage() { echo 'Usage: -e | --enable: enable the bind-chroot environment -d | --disable: disable the bind-chroot environment -s | --sync: sync files between the bind chroot and / environments, so they are correct for the current state of the bind-chroot (enabled / disabled) $BIND_CHROOT_PREFIX, default /var/named/chroot, is the location of the chroot. $BIND_DIR, default /var/named, is the default un-chrooted bind directory. '; } function rootdir() { . /etc/sysconfig/named if [ -n "$ROOTDIR" ]; then BIND_CHROOT_PREFIX="$ROOTDIR"; BIND_CHROOT_PREFIX=`echo $BIND_CHROOT_PREFIX | sed 's#//*#/#g;s#/$##'`; if [ -L "$BIND_CHROOT_PREFIX" ]; then BIND_CHROOT_PREFIX=`/usr/bin/readlink "$BIND_CHROOT_PREFIX"`; fi return 0; fi; return 1; } function check_dirs() { if [ -z "$BIND_CHROOT_PREFIX" ]; then rootdir; if [ -z "$BIND_CHROOT_PREFIX" ]; then usage; exit 1; fi; fi BIND_DIR=`echo $BIND_DIR | sed 's#//*#/#g;s#/$##'`; if [ -L "$BIND_DIR" ]; then BIND_DIR=`/usr/bin/readlink "$BIND_DIR"`; fi BIND_CHROOT_PREFIX=`echo $BIND_CHROOT_PREFIX | sed 's#//*#/#g;s#/$##'`; if [ -L "$BIND_CHROOT_PREFIX" ]; then BIND_CHROOT_PREFIX=`/usr/bin/readlink "$BIND_CHROOT_PREFIX"`; fi /bin/mkdir -p ${BIND_DIR}/{slaves,data}; /bin/chown root:named ${BIND_DIR}; /bin/chown named:named ${BIND_DIR}/{slaves,data}; /bin/chmod 750 ${BIND_DIR} /bin/chmod 770 ${BIND_DIR}/{slaves,data}; mkdir -p ${BIND_CHROOT_PREFIX}/{etc,proc,dev,var/{run/dbus,run/named,named/{slaves,data}}}; /bin/chown root:named ${BIND_CHROOT_PREFIX}/{etc,proc,dev,var/{run,run/dbus,named/}}; /bin/chmod 750 ${BIND_CHROOT_PREFIX}/{,etc,proc,dev,var,var/{run,run/dbus,named/}}; /bin/chown named:named ${BIND_CHROOT_PREFIX}/var/{run/named,named/{data,slaves}}; /bin/chmod 770 ${BIND_CHROOT_PREFIX}/var/{run/named,named/{slaves,data}}; [ ! -e "${BIND_CHROOT_PREFIX}/dev/random" ] && /bin/mknod "${BIND_CHROOT_PREFIX}/dev/random" c 1 8 [ ! -e "${BIND_CHROOT_PREFIX}/dev/zero" ] && /bin/mknod "${BIND_CHROOT_PREFIX}/dev/zero" c 1 5 [ ! -e "${BIND_CHROOT_PREFIX}/dev/null" ] && /bin/mknod "${BIND_CHROOT_PREFIX}/dev/null" c 1 3 [ ! -e "${BIND_CHROOT_PREFIX}/etc/localtime" ] && [ -e /etc/localtime ] && /bin/cp -fp /etc/localtime "${BIND_CHROOT_PREFIX}/etc/localtime"; } check_dirs; function replace_with_link() { # replaces $dst second arg file with link to $src first arg file if [ $# -lt 2 ]; then return 1; fi; src=$1 dst=$2 if [ -z "$src" ] || [ -z "$dst" ] || [ "$src" = "$dst" ]; then return 1; fi if [ ! -e "$src" ]; then if [ ! -e "$dst" ]; then return 1; else if [ -L "$dst" ]; then dstlnk=`/usr/bin/readlink "$dst"`; if [ ! -e "$dstlnk" ] ; then return 1; fi rm -f "$dst"; /bin/cp -fp "$dstlnk" "$dst"; fi; /bin/mv "$dst" "$src"; fi fi if [ -e "$dst" ]; then if [ ! -L "$dst" ]; then if [ ! -s "$dst" ]; then /bin/rm -f "$dst"; else if [ "$src" -nt "$dst" ] || [ ! "$dst" -nt "$src" ] ; then /bin/mv "$dst" "$dst".`/bin/date +'%Y-%m-%d_%H-%M-%S.%N'`; else # [ "$dst" -nt "$src" ] /bin/mv "$src" "$src".`/bin/date +'%Y-%m-%d_%H-%M-%S.%N'`; /bin/mv "$dst" "$src"; fi; fi; else dstlnk=`/usr/bin/readlink "$dst"` if [ "$dstlnk" != $src ]; then /bin/rm -f $dst; if [ "$dstlnk" != "$dst" ] && [ -s $dstlnk ]; then if [ "$dstlnk" -nt "$src" ] || [ ! "$dstlnk" -nt "$src" ] ; then /bin/cp -fp "$dstlnk" "$dst".`/bin/date +'%Y-%m-%d_%H-%M-%S.%N'`; else /bin/mv "$src" "$src".`/bin/date +'%Y-%m-%d_%H-%M-%S.%N'`; /bin/cp -fp "$dstlnk" "$src"; fi; fi; else return 0; fi; fi; fi; /bin/ln -sf "$src" "$dst"; return $?; } function replace_with_file() { if [ $# -lt 2 ]; then return 1; fi; src=$1; dst=$2; if [ -z "$src" ] || [ -z "$dst" ] || [ "$src" = "$dst" ]; then return 1; fi if [ ! -e "$src" ]; then if [ -e "$dst" ]; then /bin/rm -f $dst; fi; return 1; fi; if [ -e "$dst" ]; then if [ ! -L "$dst" ]; then /bin/mv "$dst" "$dst".`/bin/date +'%Y-%m-%d_%H-%M-%S.%N'`; else /bin/rm -f "$dst"; fi; fi; /bin/mv -f "$src" "$dst"; } function enable_bind_chroot() { if /bin/egrep '^ROOTDIR=' /etc/sysconfig/named; then /bin/sed -i -e 's#^ROOTDIR=.*$#ROOTDIR='${BIND_CHROOT_PREFIX}'#' /etc/sysconfig/named ; else echo 'ROOTDIR='${BIND_CHROOT_PREFIX} >> /etc/sysconfig/named; fi } function disable_bind_chroot() { /bin/sed -i -e '/^ROOTDIR=/d' /etc/sysconfig/named; } function sync_files() { shopt -q nullglob; ng=$? shopt -s nullglob; pfx='' if rootdir ; then # chroot is enabled /usr/bin/find /{etc/{named.*,rndc.*},${BIND_DIR#/}{/*,/data/*,/slaves/*}} -maxdepth 0 -type f | while read f; do replace_with_link ${BIND_CHROOT_PREFIX}/$f $f; done; pfx=${BIND_CHROOT_PREFIX} else # chroot is disabled /usr/bin/find /var/named/chroot/{etc/{named.*,rndc.*},var/named{/*,/data/*,/slaves/*}} -maxdepth 0 | while read f; do if [ ! -d "$f" ]; then replace_with_file $f ${f#$BIND_CHROOT_PREFIX}; fi; done fi; if [ $ng -eq 1 ]; then shopt -u nullglob; fi; chown root:named ${pfx}/var/named/* >/dev/null 2>&1; chmod 750 ${pfx}/var/named >/dev/null 2>&1; chmod 640 ${pfx}/var/named/* >/dev/null 2>&1; chown named:named ${pfx}/var/named/{data{,/*},slaves{,*/}} >/dev/null 2>&1; chmod 770 ${pfx}/var/named/{data,slaves} >/dev/null 2>&1; chmod 640 ${pfx}/var/named/{data/*,slaves/*} >/dev/null 2>&1; # [ -x /sbin/restorecon ] && /sbin/restorecon -R $pfx{/var/named,/etc/{named,rndc}.*} -e ${BIND_CHROOT_PREFIX}/proc -e ${BIND_CHROOT_PREFIX}/var/run/dbus -e ${BIND_CHROOT_PREFIX}/dev >/dev/null 2>&1; } case $1 in -e|--enable) enable_bind_chroot; sync_files; /sbin/service named condrestart exit $?; ;; -d|--disable) disable_bind_chroot; sync_files; /sbin/service named condrestart exit $?; ;; -s|--sync) sync_files; exit $?; ;; -q) ;; *) usage; exit 1; esac --- NEW FILE localdomain.zone --- $TTL 86400 @ IN SOA localhost root ( 42 ; serial (d. adams) 3H ; refresh 15M ; retry 1W ; expiry 1D ) ; minimum IN NS localhost localhost IN A 127.0.0.1 --- NEW FILE localhost.zone --- $TTL 86400 @ IN SOA @ root ( 42 ; serial (d. adams) 3H ; refresh 15M ; retry 1W ; expiry 1D ) ; minimum IN NS @ IN A 127.0.0.1 IN AAAA ::1 --- NEW FILE named.broadcast --- $TTL 86400 @ IN SOA localhost. root.localhost. ( 42 ; serial (d. adams) 3H ; refresh 15M ; retry 1W ; expiry 1D ) ; minimum IN NS localhost. --- NEW FILE named.caching-nameserver.conf --- // // named.caching-nameserver.conf // // Provided by Red Hat bind-config package to configure the // ISC BIND named(8) DNS server as a caching only nameserver // (as a localhost DNS resolver only). // // DO NOT EDIT THIS FILE - use system-config-bind or an editor // to create named.conf - edits to this file will be lost on // bind-config package upgrade. // options { listen-on port 53 { 127.0.0.1; }; directory "/var/named"; dump-file "/var/named/data/cache_dump.db"; statistics-file "/var/named/data/named_stats.txt"; memstatistics-file "/var/named/data/named_mem_stats.txt"; query-source port 53; query-source-v6 port 53; allow-query { localhost; }; }; logging { channel default_debug { file "data/named.run"; severity dynamic; }; }; view localhost_resolver { match-clients { localhost; }; match-destinations { localhost; }; recursion yes; include "/etc/named.rfc1912.zones"; }; --- NEW FILE named.ip6.local --- $TTL 86400 @ IN SOA localhost. root.localhost. ( 1997022700 ; Serial 28800 ; Refresh 14400 ; Retry 3600000 ; Expire 86400 ) ; Minimum IN NS localhost. 1 IN PTR localhost. --- NEW FILE named.local --- $TTL 86400 @ IN SOA localhost. root.localhost. ( 1997022700 ; Serial 28800 ; Refresh 14400 ; Retry 3600000 ; Expire 86400 ) ; Minimum IN NS localhost. 1 IN PTR localhost. --- NEW FILE named.rfc1912.zones --- // named.rfc1912.zones: // // Provided by Red Hat bind-config package // // ISC BIND named zone configuration for zones recommended by // RFC 1912 section 4.1 : localhost TLDs and address zones // zone "." IN { type hint; file "named.ca"; }; zone "localdomain" IN { type master; file "localdomain.zone"; allow-update { none; }; }; zone "localhost" IN { type master; file "localhost.zone"; allow-update { none; }; }; zone "0.0.127.in-addr.arpa" IN { type master; file "named.local"; allow-update { none; }; }; zone "0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.ip6.arpa" IN { type master; file "named.ip6.local"; allow-update { none; }; }; zone "255.in-addr.arpa" IN { type master; file "named.broadcast"; allow-update { none; }; }; zone "0.in-addr.arpa" IN { type master; file "named.zero"; allow-update { none; }; }; --- NEW FILE named.root --- ; This file holds the information on root name servers needed to ; initialize cache of Internet domain name servers ; (e.g. reference this file in the "cache . " ; configuration file of BIND domain name servers). ; ; This file is made available by InterNIC ; under anonymous FTP as ; file /domain/named.cache ; on server FTP.INTERNIC.NET ; -OR- RS.INTERNIC.NET ; ; last update: Jan 29, 2004 ; related version of root zone: 2004012900 ; ; ; formerly NS.INTERNIC.NET ; . 3600000 IN NS A.ROOT-SERVERS.NET. A.ROOT-SERVERS.NET. 3600000 A 198.41.0.4 ; ; formerly NS1.ISI.EDU ; . 3600000 NS B.ROOT-SERVERS.NET. B.ROOT-SERVERS.NET. 3600000 A 192.228.79.201 ; ; formerly C.PSI.NET ; . 3600000 NS C.ROOT-SERVERS.NET. C.ROOT-SERVERS.NET. 3600000 A 192.33.4.12 ; ; formerly TERP.UMD.EDU ; . 3600000 NS D.ROOT-SERVERS.NET. D.ROOT-SERVERS.NET. 3600000 A 128.8.10.90 ; ; formerly NS.NASA.GOV ; . 3600000 NS E.ROOT-SERVERS.NET. E.ROOT-SERVERS.NET. 3600000 A 192.203.230.10 ; ; formerly NS.ISC.ORG ; . 3600000 NS F.ROOT-SERVERS.NET. F.ROOT-SERVERS.NET. 3600000 A 192.5.5.241 ; ; formerly NS.NIC.DDN.MIL ; . 3600000 NS G.ROOT-SERVERS.NET. G.ROOT-SERVERS.NET. 3600000 A 192.112.36.4 ; ; formerly AOS.ARL.ARMY.MIL ; . 3600000 NS H.ROOT-SERVERS.NET. H.ROOT-SERVERS.NET. 3600000 A 128.63.2.53 ; ; formerly NIC.NORDU.NET ; . 3600000 NS I.ROOT-SERVERS.NET. I.ROOT-SERVERS.NET. 3600000 A 192.36.148.17 ; ; operated by VeriSign, Inc. ; . 3600000 NS J.ROOT-SERVERS.NET. J.ROOT-SERVERS.NET. 3600000 A 192.58.128.30 ; ; operated by RIPE NCC ; . 3600000 NS K.ROOT-SERVERS.NET. K.ROOT-SERVERS.NET. 3600000 A 193.0.14.129 ; ; operated by ICANN ; . 3600000 NS L.ROOT-SERVERS.NET. L.ROOT-SERVERS.NET. 3600000 A 198.32.64.12 ; ; operated by WIDE ; . 3600000 NS M.ROOT-SERVERS.NET. M.ROOT-SERVERS.NET. 3600000 A 202.12.27.33 ; End of File --- NEW FILE named.zero --- $TTL 86400 @ IN SOA localhost. root.localhost. ( 42 ; serial (d. adams) 3H ; refresh 15M ; retry 1W ; expiry 1D ) ; minimum IN NS localhost. Index: bind.spec =================================================================== RCS file: /cvs/dist/rpms/bind/devel/bind.spec,v retrieving revision 1.91 retrieving revision 1.92 diff -u -r1.91 -r1.92 --- bind.spec 11 Feb 2006 02:07:03 -0000 1.91 +++ bind.spec 7 Mar 2006 04:25:38 -0000 1.92 @@ -1,91 +1,107 @@ -%define posix_threads 0 -%{?!SDB: %define SDB 1} -%{?!LIBBIND:%define LIBBIND 1} -%{?!efence: %define efence 0} -%{?!test: %define test 0} -%{?!WITH_DBUS: %define WITH_DBUS 1} # + dynamic forwarder table management with D-BUS -# Usage: export RPM='/usr/bin/rpmbuild --define "test 1"'; make $arch; -Summary: The Berkeley Internet Name Domain (BIND) DNS (Domain Name System) server. -Name: bind -License: BSD-like -Version: 9.3.2 -Release: 4.1 -Epoch: 30 -Url: http://www.isc.org/products/BIND/ -Buildroot: %{_tmppath}/%{name}-root -Group: System Environment/Daemons -Source: ftp://ftp.isc.org/isc/bind9/%{version}/bind-%{version}.tar.gz -#Source1: bind-manpages-2.tar.bz2 -# Finally, ISC are distributing man named.conf(5) and nslookup(8) ! -Source1: named.sysconfig -Source2: named.init -Source3: named.logrotate -Source4: keygen.c -Source5: rfc1912.txt -Source6: bind-chroot.tar.gz -Source7: bind-9.3.1rc1-sdb_tools-Makefile.in -Source8: dnszone.schema -Source9: libbind-man.tar.gz -Source10: named-dbus.conf -Source11: named.service -Source12: README.sdb_pgsql -Source13: namedSetForwarders -Source14: namedGetForwarders -Source15: filter_requires.sh -# http://www.venaas.no/ldap/bind-sdb/dnszone-schema.txt -Patch: bind-9.2.0rc3-varrun.patch -Patch1: bind-9.3.2b2-rndckey.patch -Patch2: bind-9.3.1beta2-openssl-suffix.patch -Patch3: bind-posixthreads.patch -Patch4: bind-bsdcompat.patch -Patch5: bind-nonexec.patch -Patch6: bind-9.2.2-nsl.patch -Patch7: bind-9.2.4rc7-pie.patch -Patch8: bind-9.3.0-handle-send-errors.patch -Patch9: bind-9.3.0-missing-dnssec-tools.patch -Patch10: bind-9.3.2b1-PIE.patch -Patch11: bind-9.3.2b2-sdbsrc.patch -Patch12: bind-9.3.1rc1-sdb.patch -Patch13: bind-9.3.1rc1-fix_libbind_includedir.patch -Patch14: libbind-9.3.1rc1-fix_h_errno.patch -Patch15: bind-9.3.2b2-dbus.patch -Patch16: bind-9.3.2-redhat_doc.patch -Patch17: bind-9.3.2b1-fix_sdb_ldap.patch -Patch18: bind-9.3.1-reject_resolv_conf_errors.patch -Patch19: bind-9.3.1-next_server_on_referral.patch -Patch20: bind-9.3.2b2-no_servfail_stops.patch -Patch21: bind-9.3.2b1-fix_sdb_pgsql.patch -Patch22: bind-9.3.1-sdb_dbus.patch -Patch23: bind-9.3.1-dbus_archdep_libdir.patch -Patch24: bind-9.3.1-t_no_default_lookups.patch -Patch25: bind-9.3.1-fix_no_dbus_daemon.patch -Patch26: bind-9.3.1-flush-cache.patch -Patch27: bind-9.3.1-dbus_restart.patch -Patch28: bind-9.3.2rc1-dbus-0.6.patch -Patch29: bind-9.3.2-bz177854.patch -Requires(pre,preun): shadow-utils -Requires(post,preun): chkconfig -Requires(post): textutils, fileutils, sed, grep -Requires: bind-libs = %{epoch}:%{version}-%{release}, bind-utils = %{epoch}:%{version}-%{release}, glibc >= 2.2, /bin/usleep -#Requires: kernel >= 2.4 -#Requires: glibc >= 2.3.2-5 +# +# Red Hat BIND package .spec file +# +%{?!SDB: %define SDB 1} +%{?!LIBBIND: %define LIBBIND 1} +%{?!efence: %define efence 0} +%{?!test: %define test 0} +%{?!WITH_DBUS: %define WITH_DBUS 1} # + dynamic forwarder table management with D-BUS +%{?!DEBUGINFO: %define DEBUGINFO 1} +%define bind_dir /var/named +%define chroot_prefix %{bind_dir}/chroot +# +Summary: The Berkeley Internet Name Domain (BIND) DNS (Domain Name System) server. +Name: bind +License: BSD-like +Version: 9.3.2 +Release: 6 +Epoch: 30 +Url: http://www.isc.org/products/BIND/ +Buildroot: %{_tmppath}/%{name}-root +Group: System Environment/Daemons +# +Source: ftp://ftp.isc.org/isc/bind9/%{version}/bind-%{version}.tar.gz +Source1: named.sysconfig +Source2: named.init +Source3: named.logrotate +Source4: keygen.c +Source5: rfc1912.txt +Source6: bind-chroot.tar.gz +Source7: bind-9.3.1rc1-sdb_tools-Makefile.in +Source8: http://www.venaas.no/ldap/bind-sdb/dnszone.schema +Source9: libbind-man.tar.gz +Source10: named-dbus.conf +Source11: named.service +Source12: README.sdb_pgsql +Source13: namedSetForwarders +Source14: namedGetForwarders +Source15: filter_requires.sh +Source16: named.caching-nameserver.conf +Source17: named.root +Source18: named.local +Source19: localhost.zone +Source20: localdomain.zone +Source21: named.ip6.local +Source22: named.broadcast +Source23: named.zero +Source24: Copyright.caching-nameserver +Source25: rfc1912.txt +Source26: bind-chroot-admin.in +Source27: named.rfc1912.zones +# +Patch: bind-9.2.0rc3-varrun.patch +Patch1: bind-9.3.2b2-rndckey.patch +Patch2: bind-9.3.1beta2-openssl-suffix.patch +Patch3: bind-posixthreads.patch +Patch4: bind-bsdcompat.patch +Patch5: bind-nonexec.patch +Patch6: bind-9.2.2-nsl.patch +Patch7: bind-9.2.4rc7-pie.patch +Patch8: bind-9.3.0-handle-send-errors.patch +Patch9: bind-9.3.0-missing-dnssec-tools.patch +Patch10: bind-9.3.2b1-PIE.patch +Patch11: bind-9.3.2b2-sdbsrc.patch +Patch12: bind-9.3.1rc1-sdb.patch +Patch13: bind-9.3.1rc1-fix_libbind_includedir.patch +Patch14: libbind-9.3.1rc1-fix_h_errno.patch +Patch15: bind-9.3.2b2-dbus.patch +Patch16: bind-9.3.2-redhat_doc.patch +Patch17: bind-9.3.2b1-fix_sdb_ldap.patch +Patch18: bind-9.3.1-reject_resolv_conf_errors.patch +Patch19: bind-9.3.1-next_server_on_referral.patch +Patch20: bind-9.3.2b2-no_servfail_stops.patch +Patch21: bind-9.3.2b1-fix_sdb_pgsql.patch +Patch22: bind-9.3.1-sdb_dbus.patch +Patch23: bind-9.3.1-dbus_archdep_libdir.patch +Patch24: bind-9.3.1-t_no_default_lookups.patch +Patch25: bind-9.3.1-fix_no_dbus_daemon.patch +Patch26: bind-9.3.1-flush-cache.patch +Patch27: bind-9.3.1-dbus_restart.patch +Patch28: bind-9.3.2rc1-dbus-0.6.patch +Patch29: bind-9.3.2-bz177854.patch +# +Requires(pre,preun): shadow-utils +Requires(post,preun): chkconfig +Requires(post): textutils, fileutils, sed, grep +Requires: bind-libs = %{epoch}:%{version}-%{release}, glibc >= 2.2, /bin/usleep %if %{SDB} %if %{WITH_DBUS} -BuildRequires: openssl-devel gcc dbus-devel glibc-devel >= 2.2.5-26 glibc-kernheaders >= 2.4-7.10 libtool pkgconfig tar openldap-devel postgresql-devel +BuildRequires: openssl-devel gcc dbus-devel glibc-devel >= 2.2.5-26 glibc-kernheaders >= 2.4-7.10 libtool pkgconfig tar openldap-devel postgresql-devel %else -BuildRequires: openssl-devel gcc glibc-devel >= 2.2.5-26 glibc-kernheaders >= 2.4-7.10 libtool pkgconfig tar openldap-devel postgresql-devel +BuildRequires: openssl-devel gcc glibc-devel >= 2.2.5-26 glibc-kernheaders >= 2.4-7.10 libtool pkgconfig tar openldap-devel postgresql-devel %endif %else %if %{WITH_DBUS} -BuildRequires: openssl-devel gcc dbus-devel glibc-devel >= 2.2.5-26 glibc-kernheaders >= 2.4-7.10 libtool pkgconfig tar +BuildRequires: openssl-devel gcc dbus-devel glibc-devel >= 2.2.5-26 glibc-kernheaders >= 2.4-7.10 libtool pkgconfig tar %else -BuildRequires: openssl-devel gcc glibc-devel >= 2.2.5-26 glibc-kernheaders >= 2.4-7.10 libtool pkgconfig tar +BuildRequires: openssl-devel gcc glibc-devel >= 2.2.5-26 glibc-kernheaders >= 2.4-7.10 libtool pkgconfig tar %endif %endif # fix bug 176100: do not Require: perl just for namedGetForwarders ! %define __perl_requires %SOURCE15 %define __find_requires %SOURCE15 %define _use_internal_dependency_generator 0 +# %description BIND (Berkeley Internet Name Domain) is an implementation of the DNS @@ -94,16 +110,18 @@ (routines for applications to use when interfacing with DNS); and tools for verifying that the DNS server is operating properly. -%package libs -Summary: Libraries used by various DNS packages -Group: Applications/System + +%package libs +Summary: Libraries used by various DNS packages +Group: Applications/System %description libs Contains libraries used by both the bind server package as well as the utils packages. -%package utils -Summary: Utilities for querying DNS name servers. -Group: Applications/System + +%package utils +Summary: Utilities for querying DNS name servers. +Group: Applications/System Requires: bind-libs = %{epoch}:%{version}-%{release} %description utils @@ -116,16 +134,48 @@ You should install bind-utils if you need to get information from DNS name servers. -%package devel -Summary: Include files and libraries needed for bind DNS development. -Group: Development/Libraries -Requires: bind-libs = %{epoch}:%{version}-%{release} + +%package devel +Summary: Include files and libraries needed for bind DNS development. +Group: Development/Libraries +Requires: bind-libs = %{epoch}:%{version}-%{release} %description devel The bind-devel package contains all the include files and the library required for DNS (Domain Name System) development for BIND versions 9.x.x. + +%package config +Summary: Default BIND configuration files for a caching nameserver +Group: System Environment/Daemons +Obsoletes: caching-nameserver +Provides: caching-nameserver +Requires: bind = %{epoch}:%{version}-%{release} + +%description config +The bind-config package includes the configuration files which will make +the ISC BIND named DNS name server act as a simple caching nameserver. +A caching nameserver is a DNS Resolver, as defined in RFC 1035, section 7. +ISC BIND named(8) provides a very efficient, flexible and robust resolver as +well as a server of authoritative DNS data - many users use this package +along with BIND to implement their primary system DNS resolver service. +If you would like to set up a caching name server, you'll need to install +bind, bind-libs, and bind-utils along with this package. +This package replaces the caching-nameserver package. + +%package chroot +Summary: A chroot runtime environment for the ISC BIND DNS server, named(8) +Group: System Environment/Daemons +Prefix: %{chroot_prefix} +Requires: bind = %{epoch}:%{version}-%{release} + +%description chroot +This package contains a tree of files which can be used as a +chroot(2) jail for the named(8) program from the BIND package. +Based off code from Jan "Yenya" Kasprzak + + %if %{LIBBIND} %package libbind-devel @@ -140,16 +190,6 @@ %endif -%package chroot -Summary: A chrooted tree for the BIND nameserver -Group: System Environment/Daemons -Prefix: /var/named/chroot -Requires: bind = %{epoch}:%{version}-%{release} - -%description chroot -This package contains a tree of files which can be used as a -chroot(2) jail for the named(8) program from the BIND package. -Based off code from Jan "Yenya" Kasprzak %if %{SDB} @@ -173,15 +213,17 @@ %endif + %prep %setup -q -n %{name}-%{version} %patch -p1 -b .varrun %patch1 -p1 -b .key %patch2 -p1 -b .openssl_suffix +#%define posix_threads 0 #%if %{posix_threads} #%patch3 -p1 -b .posixthreads +#^- This patch is no longer required and would not work anyway (see BZ 87525). #%endif -# This patch is no longer required and would not work anyway (see BZ 87525). %patch4 -p1 -b .bsdcompat %patch5 -p1 -b .nonexec %patch6 -p1 -b .nsl @@ -254,6 +296,7 @@ %endif %endif + %build libtoolize --copy --force; aclocal; autoconf cp -f /usr/share/libtool/config.{guess,sub} . @@ -292,11 +335,16 @@ if [ $? -ne 0 ]; then exit $?; fi; -cp %{SOURCE5} doc/rfc -gzip -9 doc/rfc/* + + +%if !%{DEBUGINFO} +%define debug_package %{nil} +%endif %install rm -rf $RPM_BUILD_ROOT +cp %{SOURCE5} doc/rfc +gzip -9 doc/rfc/* mkdir -p ${RPM_BUILD_ROOT}/etc/{rc.d/init.d,logrotate.d} mkdir -p ${RPM_BUILD_ROOT}/usr/{bin,lib,sbin,include} mkdir -p ${RPM_BUILD_ROOT}/var/named @@ -305,14 +353,15 @@ mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/{man1,man5,man8} mkdir -p ${RPM_BUILD_ROOT}/var/run/named #chroot -mkdir -p ${RPM_BUILD_ROOT}/%{prefix} -tar --no-same-owner -zxvf %{SOURCE6} --directory ${RPM_BUILD_ROOT}/%{prefix} +mkdir -p ${RPM_BUILD_ROOT}/%{chroot_prefix} +tar --no-same-owner -zxvf %{SOURCE6} --directory ${RPM_BUILD_ROOT}/%{chroot_prefix} # these are required to prevent them being erased during upgrade of previous # versions that included them (bug #130121): -touch ${RPM_BUILD_ROOT}/%{prefix}/etc/named.conf -touch ${RPM_BUILD_ROOT}/%{prefix}/etc/rndc.key -touch ${RPM_BUILD_ROOT}/%{prefix}/dev/null -touch ${RPM_BUILD_ROOT}/%{prefix}/dev/random +touch ${RPM_BUILD_ROOT}/%{chroot_prefix}/etc/named.conf +touch ${RPM_BUILD_ROOT}/%{chroot_prefix}/etc/named.rfc1912.zones +touch ${RPM_BUILD_ROOT}/%{chroot_prefix}/etc/rndc.key +touch ${RPM_BUILD_ROOT}/%{chroot_prefix}/dev/null +touch ${RPM_BUILD_ROOT}/%{chroot_prefix}/dev/random #end chroot make DESTDIR=$RPM_BUILD_ROOT install install -c -m 640 bin/rndc/rndc.conf $RPM_BUILD_ROOT%{_sysconfdir} @@ -378,32 +427,218 @@ find $RPM_BUILD_ROOT/%{_libdir} -name '*.la' -exec '/bin/rm' '-f' '{}' ';'; # /usr/lib/rpm/brp-compress # +# Ghost config files: +touch $RPM_BUILD_ROOT/etc/named.conf +# bind-config files: +mkdir -p $RPM_BUILD_ROOT/{etc,var/named} +install -m 644 %{SOURCE16} $RPM_BUILD_ROOT/etc/named.caching-nameserver.conf +install -m 644 %{SOURCE27} $RPM_BUILD_ROOT/etc/named.rfc1912.zones +install -m 644 %{SOURCE17} $RPM_BUILD_ROOT/var/named/named.ca +install -m 644 %{SOURCE18} $RPM_BUILD_ROOT/var/named/named.local +install -m 644 %{SOURCE19} $RPM_BUILD_ROOT/var/named/localhost.zone +install -m 644 %{SOURCE20} $RPM_BUILD_ROOT/var/named/localdomain.zone +install -m 644 %{SOURCE21} $RPM_BUILD_ROOT/var/named/named.ip6.local +install -m 644 %{SOURCE22} $RPM_BUILD_ROOT/var/named/named.broadcast +install -m 644 %{SOURCE23} $RPM_BUILD_ROOT/var/named/named.zero +for f in /etc/named.caching-nameserver.conf /var/named/{named.ca,named.local,localhost.zone,localdomain.zone,named.ip6.local,named.broadcast,named.zero}; do + touch $RPM_BUILD_ROOT/%{chroot_prefix}/$f; +done +install -m 644 %{SOURCE24} ./rfc1912.txt +install -m 644 %{SOURCE25} ./Copyright +# bind-chroot-admin script: +sed -e 's^@BIND_CHROOT_PREFIX@^'%{chroot_prefix}'^;s^@BIND_DIR@^'%{bind_dir}'^' < %SOURCE26 > bind-chroot-admin; +install -m 754 bind-chroot-admin $RPM_BUILD_ROOT/%{_sbindir} +%if !%{DEBUGINFO} +echo 'WARNING - NOT generating debuginfo!' +/usr/lib/rpm/brp-compress +exit 0 +%endif :; + +%files +%defattr(-,root,root) +%attr(750,root,named) %dir /var/named +%attr(770,named,named) %dir /var/named/slaves +%attr(770,named,named) %dir /var/named/data +%attr(770,named,named) %dir /var/run/named +%attr(754,root,root) %config /etc/rc.d/init.d/named +%config(noreplace) /etc/sysconfig/named +%verify(not size,not md5) %config(noreplace) %attr(0640,root,named) /etc/rndc.key +# %verify(not size,not md5) %config(noreplace) %attr(0640,root,named) /etc/rndc.conf +# ^- Let the named internal default rndc.conf be used - +# rndc.conf not required unless it differs from default. +%ghost %config(noreplace) /etc/named.conf +# ^- Ensure something owns named.conf, even though it may not be installed at all +%ghost %config(noreplace) /etc/rndc.conf +%config(noreplace) /etc/logrotate.d/named +%{_sbindir}/dnssec* +%{_sbindir}/lwresd +%{_sbindir}/named +%{_sbindir}/named-bootconf +%{_sbindir}/named-check* +%{_sbindir}/rndc* +%{_sbindir}/dns-keygen +%{_sbindir}/bind-chroot-admin +%{_mandir}/man5/named.conf.5* +%{_mandir}/man5/rndc.conf.5* +%{_mandir}/man8/rndc.8* +%{_mandir}/man8/named.8* +%{_mandir}/man8/lwresd.8* +%{_mandir}/man8/dnssec*.8* +%{_mandir}/man8/named-checkconf.8* +%{_mandir}/man8/named-checkzone.8* +%{_mandir}/man8/rndc-confgen.8* +%doc CHANGES COPYRIGHT README +%doc doc/arm doc/misc +%if %{WITH_DBUS} +%doc doc/README.DBUS +%attr(644,root,root) %config /etc/dbus-1/system.d/named.conf +%attr(644,root,root) %config /usr/share/dbus-1/services/named.service +%attr(754,root,root) /usr/sbin/namedGetForwarders +%attr(754,root,root) /usr/sbin/namedSetForwarders +%endif + +%files libs +%defattr(-,root,root) +%{_libdir}/*so* + +%files utils +%defattr(-,root,root) +%{_bindir}/dig +%{_bindir}/host +%{_bindir}/nslookup +%{_bindir}/nsupdate +%{_mandir}/man1/host.1* +%{_mandir}/man8/nsupdate.8* +%{_mandir}/man1/dig.1* +%{_mandir}/man1/nslookup.1* + +%files devel +%defattr(-,root,root) +%{_libdir}/libbind9.a +%{_libdir}/libdns.a +%{_libdir}/libisc.a +%{_libdir}/libisccc.a +%{_libdir}/libisccfg.a +%{_libdir}/liblwres.a +%{_includedir}/bind9 +%{_includedir}/dns +%{_includedir}/dst +%{_includedir}/isc +%{_includedir}/isccc +%{_includedir}/isccfg +%{_includedir}/lwres +%{_mandir}/man3/lwres* +%{_bindir}/isc-config.sh +%doc doc/draft doc/rfc + +%files config +%defattr(-,root,root) +%config /etc/named.caching-nameserver.conf +%ghost %config %{chroot_prefix}/etc/named.caching-nameserver.conf +%config /etc/named.rfc1912.zones +%ghost %config %{chroot_prefix}/etc/named.rfc1912.zones +%ghost %config(noreplace) /etc/named.conf +%ghost %config(noreplace) %{chroot_prefix}/etc/named.conf +%defattr(-,named,named) +%config /var/named/named.ca +%ghost %config %{chroot_prefix}/var/named/named.ca +%config /var/named/named.local +%ghost %config %{chroot_prefix}/var/named/named.local +%config /var/named/localhost.zone +%ghost %config %{chroot_prefix}/var/named/localhost.zone +%config /var/named/localdomain.zone +%ghost %config %{chroot_prefix}/var/named/localdomain.zone +%config /var/named/named.ip6.local +%ghost %config %{chroot_prefix}/var/named/named.ip6.local +%config /var/named/named.broadcast +%ghost %config %{chroot_prefix}/var/named/named.broadcast +%config /var/named/named.zero +%ghost %config %{chroot_prefix}/var/named/named.zero +%defattr(-,root,root) +%doc Copyright +%doc rfc1912.txt + +%files chroot +%defattr(-,root,root) +%attr(750,root,named) %dir %prefix +%attr(750,root,named) %dir %prefix/dev +%attr(750,root,named) %dir %prefix/etc +%attr(750,root,named) %dir %prefix/var +%attr(770,root,named) %dir %prefix/var/run +%attr(770,named,named) %dir %prefix/var/tmp +%attr(770,named,named) %dir %prefix/var/run/named +%attr(750,root,named) %dir %prefix/var/named +%attr(770,named,named) %dir %prefix/var/named/slaves +%attr(770,named,named) %dir %prefix/var/named/data +%ghost %config(noreplace) %prefix/etc/named.conf +%ghost %config(noreplace) %prefix/etc/named.caching-nameserver.conf +%ghost %config(noreplace) %prefix/etc/rndc.key +%ghost %prefix/dev/null +%ghost %prefix/dev/random + +%if %{LIBBIND} + +%files libbind-devel +%defattr(-,root,root) +%{_libdir}/libbind.* +%{_includedir}/bind +%{_mandir}/man3/libbind-* +%{_mandir}/man7/libbind-* +%{_mandir}/man5/libbind-* + +%endif + +%if %{SDB} + +%files sdb +%defattr(-,root,named) +%{_sbindir}/named_sdb +%config /etc/openldap/schema/dnszone.schema +%{_sbindir}/zone2ldap +%{_sbindir}/ldap2zone +%{_sbindir}/zonetodb +%{_mandir}/man1/zone2ldap.1* +%doc contrib/sdb/ldap/README.ldap contrib/sdb/ldap/INSTALL.ldap contrib/sdb/pgsql/README.sdb_pgsql + +%endif + + %pre -/usr/sbin/groupadd -g 25 named >/dev/null 2>&1 || :; -/usr/sbin/useradd -c "Named" -u 25 -g named \ - -s /sbin/nologin -r -d /var/named named >/dev/null 2>&1 || :; +if [ "$1" -eq 1 ]; then + # create named group IFF it does not already exist + # - use any free ID between 1 and 499 if group 25 exists: + /usr/sbin/groupadd -g 25 -f -r named >/dev/null 2>&1 || :; + # if named user does not already exist, create it as system user: + if ! /usr/bin/id -u named > /dev/null 2>&1; then + if ! /bin/egrep -q '^[^:]+:[^:]+:25:' /etc/passwd >/dev/null 2>&1 ; then + /usr/sbin/useradd -u 25 -r -n -M -g named -s /sbin/nologin -d /var/named -c Named named >/dev/null 2>&1 || :; + else + # use any free ID between 1 and 499: + /usr/sbin/useradd -r -n -M -g named -s /sbin/nologin -d /var/named -c Named named >/dev/null 2>&1 || :; + fi; + fi; +fi; +:; %post if [ "$1" -eq 1 ]; then /sbin/chkconfig --add named - if [ -f /etc/named.boot -a ! -f /etc/named.conf ]; then - if [ -x /usr/sbin/named-bootconf ]; then - cat /etc/named.boot | /usr/sbin/named-bootconf > /etc/named.conf - chmod 644 /etc/named.conf - fi + if [ -f /etc/named.boot -a -x /usr/sbin/named-bootconf -a ! -f /etc/named.conf ]; then + # Convert BIND 4 named.bootconf syntax to BIND 9 syntax (should never be used!) + cat /etc/named.boot | /usr/sbin/named-bootconf > /etc/named.bootconf-converted.conf + if [ "$?" -eq 0 ]; then + chmod 644 /etc/named.bootconf-converted.conf + cp -fp /etc/named.bootconf-converted.conf /etc/named.conf; + fi; fi - if grep -q '@KEY@' /etc/rndc.key; then - sed -e "s/@KEY@/`/usr/sbin/dns-keygen`/" /etc/rndc.key >/etc/rndc.key.tmp - mv -f /etc/rndc.key.tmp /etc/rndc.key + if /bin/egrep -q '@KEY@' /etc/rndc.key; then + /bin/sed -i -e "s^@KEY@^`/usr/sbin/dns-keygen`^" /etc/rndc.key ; + chmod 0640 /etc/rndc.key + chown root:named /etc/rndc.key fi - if [ ! -s /etc/named.conf ]; then - echo -e '// Default named.conf generated by install of bind-'%{version}'-'%{release}'\noptions {\n\tdirectory "/var/named";\n\tdump-file "/var/named/data/cache_dump.db";\n\tstatistics-file "/var/named/data/named_stats.txt";\n};\ninclude "/etc/rndc.key";\n' > /etc/named.conf; - fi; - [ -d /selinux ] && [ -x /sbin/restorecon ] && /sbin/restorecon /etc/rndc.key /etc/rndc.conf /etc/named.conf >/dev/null 2>&1 - chmod 0640 /etc/rndc.conf /etc/rndc.key - chown root:named /etc/rndc.conf /etc/rndc.key /etc/named.conf + [ -d /selinux ] && [ -x /sbin/restorecon ] && /sbin/restorecon /etc/rndc.conf /etc/named.conf >/dev/null 2>&1 ; /sbin/ldconfig fi :; @@ -422,15 +657,6 @@ /etc/rc.d/init.d/named condrestart >/dev/null 2>&1 || : fi; /sbin/ldconfig - -%postun utils -# because bind-utils depends on bind, it gets uninstalled first, -# so bind's preun's 'service named stop' will fail (no rndc). -if [ $1 = 0 ]; then - if [ -f /var/lock/subsys/named ]; then - /etc/rc.d/init.d/named stop >/dev/null 2>&1 || :; - fi; -fi; :; %triggerpostun -- bind < 8.2.2_P5-15 @@ -472,134 +698,60 @@ fi :; -%clean -rm -rf ${RPM_BUILD_ROOT} -# ${RPM_BUILD_DIR}/%{name}-%{version} +%postun utils +if [ $1 = 0 ]; then + if [ -f /var/lock/subsys/named ]; then + /etc/rc.d/init.d/named stop >/dev/null 2>&1 || :; + fi; +fi; :; + %post libs -p /sbin/ldconfig %postun libs -p /sbin/ldconfig -%files -%defattr(-,root,root) -%doc CHANGES COPYRIGHT README -%doc doc/arm doc/misc -%if %{WITH_DBUS} -%doc doc/README.DBUS -%attr(644,root,root) %config /etc/dbus-1/system.d/named.conf -%attr(644,root,root) %config /usr/share/dbus-1/services/named.service -%attr(754,root,root) /usr/sbin/namedGetForwarders -%attr(754,root,root) /usr/sbin/namedSetForwarders -%endif -%config(noreplace) /etc/logrotate.d/named -%attr(754,root,root) %config /etc/rc.d/init.d/named -%config(noreplace) /etc/sysconfig/named -%verify(not size,not md5) %config(noreplace) %attr(0640,root,named) /etc/rndc.conf -%verify(not size,not md5) %config(noreplace) %attr(0640,root,named) /etc/rndc.key -%{_sbindir}/dnssec* -%{_sbindir}/lwresd -%{_sbindir}/named -%{_sbindir}/named-bootconf -%{_sbindir}/named-check* -%{_sbindir}/rndc* -%{_sbindir}/dns-keygen +%post config +if [ "$1" -gt 0 ]; then + /usr/bin/chcon system_u:object_r:named_conf_t /etc/named.caching-nameserver.conf >/dev/null 2>&1 || :; +elif [ "$1" -eq 1 ]; then + /usr/sbin/bind-chroot-admin --sync; +fi; +:; -%{_mandir}/man5/named.conf.5* -%{_mandir}/man5/rndc.conf.5* -%{_mandir}/man8/rndc.8* -%{_mandir}/man8/named.8* -%{_mandir}/man8/lwresd.8* -%{_mandir}/man8/dnssec*.8* -%{_mandir}/man8/named-checkconf.8* -%{_mandir}/man8/named-checkzone.8* -%{_mandir}/man8/rndc-confgen.8* +%postun config +if [ "$1" -eq 0 ]; then + /usr/sbin/bind-chroot-admin --sync +fi; +:; -%attr(750,root,named) %dir /var/named -%attr(770,named,named) %dir /var/named/slaves -%attr(770,named,named) %dir /var/named/data -%attr(770,named,named) %dir /var/run/named -%files libs -%defattr(-,root,root) -%{_libdir}/*so* +%post chroot +if [ "$1" -gt 0 ]; then + chown named:named "%{prefix}/var/named/data" + /usr/sbin/bind-chroot-admin --enable; +fi; +:; -%files utils -%defattr(-,root,root) -%{_bindir}/dig -%{_bindir}/host -%{_bindir}/nslookup -%{_bindir}/nsupdate -%{_mandir}/man1/host.1* -%{_mandir}/man8/nsupdate.8* -%{_mandir}/man1/dig.1* -%{_mandir}/man1/nslookup.1* +%preun chroot +if [ "$1" = "0" ]; then + /usr/sbin/bind-chroot-admin --disable; +fi +:; -%files devel -%defattr(-,root,root) -%{_libdir}/libbind9.a -%{_libdir}/libdns.a -%{_libdir}/libisc.a -%{_libdir}/libisccc.a -%{_libdir}/libisccfg.a -%{_libdir}/liblwres.a -%{_includedir}/bind9 -%{_includedir}/dns -%{_includedir}/dst -%{_includedir}/isc -%{_includedir}/isccc -%{_includedir}/isccfg -%{_includedir}/lwres -%{_mandir}/man3/lwres* -%{_bindir}/isc-config.sh -%doc doc/draft doc/rfc %if %{LIBBIND} -%files libbind-devel -%defattr(-,root,root) -%{_libdir}/libbind.* -%{_includedir}/bind -%{_mandir}/man3/libbind-* -%{_mandir}/man7/libbind-* -%{_mandir}/man5/libbind-* - %post libbind-devel -p /sbin/ldconfig %postun libbind-devel -p /sbin/ldconfig %endif -%files chroot -%defattr(-,root,root) -%attr(750,root,named) %dir %prefix -%attr(750,root,named) %dir %prefix/dev -%attr(750,root,named) %dir %prefix/etc -%attr(750,root,named) %dir %prefix/var -%attr(770,root,named) %dir %prefix/var/run -%attr(770,named,named) %dir %prefix/var/tmp -%attr(770,named,named) %dir %prefix/var/run/named -%attr(750,root,named) %dir %prefix/var/named -%attr(770,named,named) %dir %prefix/var/named/slaves -%attr(770,named,named) %dir %prefix/var/named/data -%ghost %prefix/etc/named.conf -%ghost %prefix/etc/rndc.key -%ghost %prefix/dev/null -%ghost %prefix/dev/random %if %{SDB} -%files sdb -%defattr(-,root,named) -%{_sbindir}/named_sdb -%config /etc/openldap/schema/dnszone.schema -%{_sbindir}/zone2ldap -%{_sbindir}/ldap2zone -%{_sbindir}/zonetodb -%{_mandir}/man1/zone2ldap.1* -%doc contrib/sdb/ldap/README.ldap contrib/sdb/ldap/INSTALL.ldap contrib/sdb/pgsql/README.sdb_pgsql - %post sdb if [ "$1" -ge 1 ]; then # check that dnszone.schema is installed in OpenLDAP's slapd.conf @@ -640,119 +792,24 @@ %endif # SDB -%post chroot -safe_replace() -{ - f1=$1; - f2=$2; - o=$3; - g=$4; - m=$5; - dc=$6; - if /usr/bin/test "x" = "x$f1" -o "x" = "x$f2" -o "$f1" = "$f2"; then - return 1; - fi; - if /usr/bin/test -r $f1 -a -s $f1 -a '!' -L $f1; then - if /usr/bin/test -r $f2 -a -s $f2 -a '!' -L $f2; then - /bin/mv $f1 $f1'.rpmsave' >/dev/null 2>&1 || :; - /bin/mv $f2 $f1 > /dev/null 2>&1 || :; - else - /bin/rm -f $f2 > /dev/null 2>&1 || :; - fi; - /bin/mv $f1 $f2 > /dev/null 2>&1 || :; - /bin/ln -s $f2 $f1 > /dev/null 2>&1 || :; - else - /bin/rm -f $f1 > /dev/null 2>&1 || :; - if /usr/bin/test -r $f2 -a -s $f2; then - /bin/ln -s $f2 $f1 > /dev/null 2>&1 || :; - else - if /usr/bin/test "x$dc" != "x"; then - echo $dc > $f2; - /bin/ln -s $f2 $f1 > /dev/null 2>&1 || :; - else - return 2; - fi; - fi; - fi; - chown $o':'$g $f2; - chmod $m $f2; - return 0; -} -if /usr/bin/test -r /etc/sysconfig/named && /bin/egrep -q '^ROOTDIR=' /etc/sysconfig/named; then - :; -else - echo ROOTDIR="%{prefix}" >>/etc/sysconfig/named; -fi -if /usr/bin/test -r /etc/localtime; then - /bin/cp -fp /etc/localtime "%{prefix}/etc/localtime" -fi -safe_replace /etc/rndc.key "%{prefix}/etc/rndc.key" root named 644 ''; -r=$?; -if /usr/bin/test "$r" -eq 2; then - /bin/rm -f /etc/rndc.key - echo -e 'key "rndckey" {\nalgorithm hmac-md5;\nsecret "'`/usr/sbin/dns-keygen`'"\n};' > /etc/rndc.key; - safe_replace /etc/rndc.key "%{prefix}/etc/rndc.key" root named 644 ''; -fi; -default_ndc='include "/etc/rndc.key";' -if [ -f /etc/named.custom ]; then - default_ndc='include "/etc/rndc.key";\ninclude "/etc/named.custom";' - safe_replace /etc/named.custom "%{prefix}/etc/named.custom" root named 644 '' || :; -fi -safe_replace /etc/named.conf "%{prefix}/etc/named.conf" root named 644 "$default_ndc" -/usr/bin/find /var/named -xdev -type f | /bin/egrep -v '/var/named/chroot' | while read f; -do - d=`/usr/bin/dirname $f`; - if test '!' -d "%{prefix}$d"; then - mkdir -p "%{prefix}$d"; - chown named:named "%{prefix}$d"; - chmod 655 "%{prefix}$d"; - fi; - safe_replace $f "%{prefix}$f" named named 644 '' || :; -done -[ ! -e "%{prefix}/dev/random" ] && mknod "%{prefix}/dev/random" c 1 8 -[ ! -e "%{prefix}/dev/zero" ] && mknod "%{prefix}/dev/zero" c 1 5 -[ ! -e "%{prefix}/dev/null" ] && mknod "%{prefix}/dev/null" c 1 3 -chmod a+r "%{prefix}/dev/random" "%{prefix}/dev/null" "%{prefix}/dev/" -chown root:named "%{prefix}/var/named" -chown named:named "%{prefix}/var/named/slaves" -chown named:named "%{prefix}/var/named/data" -/etc/init.d/named condrestart >/dev/null 2>&1 || :; -[ -d /selinux ] && [ -x /sbin/restorecon ] && /sbin/restorecon -e %{prefix}/proc -e %{prefix}/var/run/dbus -R %{prefix} >/dev/null 2>&1 -:; - -%preun chroot -if [ "$1" = "0" ]; then - /usr/bin/find /var/named/chroot -xdev -type f | while read f; - do - F=`echo $f | sed 's#/var/named/chroot##'`; - if /usr/bin/test -L $F && test `/usr/bin/readlink $F` = $f; then - /bin/rm -f $F; - /bin/mv $f $F; - fi; - done - if test -r /etc/sysconfig/named && grep -q '^ROOTDIR=' /etc/sysconfig/named; then - named_tmp=`/bin/mktemp /tmp/XXXXXX` - grep -v '^ROOTDIR='%{prefix} /etc/sysconfig/named > $named_tmp - mv -f $named_tmp /etc/sysconfig/named - [ -d /selinux ] && [ -x /sbin/restorecon ] && /sbin/restorecon /etc/sysconfig/named - fi - /etc/init.d/named condrestart >/dev/null 2>&1 || :; -fi -:; - -%triggerpostun -n bind-chroot -- bind-chroot -# Fix mess left by bind-chroot-9.2.2's %preun (bug 131803) -if [ "$1" -gt 0 ]; then - if test -r /etc/sysconfig/named && grep -q '^ROOTDIR=' /etc/sysconfig/named; then - :; - else - echo 'ROOTDIR='%{prefix} >> /etc/sysconfig/named - /etc/init.d/named condrestart >/dev/null 2>&1 || :; - fi; -fi; +%clean +# rm -rf ${RPM_BUILD_ROOT} +echo 'WARNING ! REMOVED CLEAN & DEBUGINFO!' +# ${RPM_BUILD_DIR}/%{name}-%{version} :; %changelog +* Mon Mar 06 2006 Jason Vas Dias - 30:9.3.2-6 +- replace caching-nameserver with bind-config sub-package +- fix bug 181730: fix creation of named user & gid +- fix bug 177595: handle case where $ROOTDIR is a link in initscript +- fix bug 177001: bind-config creates symlinks OK now +- fix bug 176388: named.conf is now never replaced by any RPM +- fix bug 176246: remove unecessary creation of rpmsave links +- fix bug 174925: no replacement of named.conf +- fix bug 173963: existing named.conf never modified +- major .spec file cleanup + * Fri Feb 10 2006 Jesse Keating - 30:9.3.2-4.1 - bump again for double-long bug on ppc(64) Index: named.init =================================================================== RCS file: /cvs/dist/rpms/bind/devel/named.init,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- named.init 2 Dec 2005 00:08:28 -0000 1.40 +++ named.init 7 Mar 2006 04:25:38 -0000 1.41 @@ -19,7 +19,13 @@ [ -r /etc/sysconfig/named ] && . /etc/sysconfig/named -[ -n "$ROOTDIR" ] && ROOTDIR=`echo $ROOTDIR | sed 's#//*#/#g;s#/$##'` +if [ -n "$ROOTDIR" ]; then + ROOTDIR=`echo $ROOTDIR | sed 's#//*#/#g;s#/$##'`; + rdl=`/usr/bin/readlink $ROOTDIR`; + if [ -n "$rdl" ]; then + ROOTDIR="$rdl"; + fi; +fi RETVAL=0 named='named' @@ -42,8 +48,20 @@ fi; done; } -named_conf=`nmdcOption $OPTIONS`; -[ -r ${ROOTDIR}/${named_conf:-etc/named.conf} ] || exit 1 + +named_c_option=`nmdcOption $OPTIONS`; +named_conf=${named_c_option:-etc/named.conf}; + +if [ ! -r ${named_conf} ] ; then + if [ -z "$named_c_option" ] && [ -r ${ROOTDIR}/etc/named.caching-nameserver.conf ]; then + named_conf='/etc/named.caching-nameserver.conf'; + OPTIONS="$OPTIONS -c ${named_conf}"; + else + echo Locating $ROOTDIR/${named_conf} failed: + failure + echo; + fi; +fi; start() { # Start daemons. From fedora-cvs-commits at redhat.com Tue Mar 7 04:33:23 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 6 Mar 2006 23:33:23 -0500 Subject: rpms/eclipse/devel eclipse.spec,1.260,1.261 Message-ID: <200603070433.k274XNtJ021527@cvs.devel.redhat.com> Author: overholt Update of /cvs/dist/rpms/eclipse/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv21500 Modified Files: eclipse.spec Log Message: Don't do native ecj ... now I remember why I stopped doing it. Index: eclipse.spec =================================================================== RCS file: /cvs/dist/rpms/eclipse/devel/eclipse.spec,v retrieving revision 1.260 retrieving revision 1.261 diff -u -r1.260 -r1.261 --- eclipse.spec 7 Mar 2006 00:38:25 -0000 1.260 +++ eclipse.spec 7 Mar 2006 04:33:20 -0000 1.261 @@ -663,10 +663,6 @@ result/linux-gtk-%{eclipse_arch}-sdk.tar.gz pushd $RPM_BUILD_ROOT%{_datadir}/%{name} -%if %{native_ecj} -# extract jdtCompilerAdapter.jar from org.eclipse.jdt.core_3.1.2.jar -unzip -d plugins plugins/org.eclipse.jdt.core_3.1.2.jar jdtCompilerAdapter.jar -%endif # Extract .so files # https://bugs.eclipse.org/bugs/show_bug.cgi?id=90535 @@ -926,21 +922,23 @@ %if %{gcj_support} aot-compile-rpm -%if %{native_ecj} - # Build and install ecj binary - pushd $RPM_BUILD_ROOT%{_libdir}/gcj/%{name} - gcj -g -O2 --main=org.eclipse.jdt.internal.compiler.batch.Main \ - -Wl,-R,%{_libdir}/gcj/%{name} \ - org.eclipse.jdt.core_3.1.2.jar.so jdtCompilerAdapter.jar.so -o \ - $RPM_BUILD_ROOT%{_bindir}/ecj - popd - chmod a+x $RPM_BUILD_ROOT%{_bindir}/ecj -%else - # Install /usr/bin/ecj script - sed 's:@JAVADIR@:%{_javadir}:g' < %{SOURCE20} > ecj - install -m755 ecj $RPM_BUILD_ROOT%{_bindir} - rm ecj -%endif +# FIXME: due to aot-compile-rpm smarts, the required resource bundles aren't +# being compiled so this truly native ecj binary isn't possible +#%if %{native_ecj} +# # Build and install ecj binary +# pushd $RPM_BUILD_ROOT%{_libdir}/gcj/%{name} +# gcj -g -O2 --main=org.eclipse.jdt.internal.compiler.batch.Main \ +# -Wl,-R,%{_libdir}/gcj/%{name} \ +# org.eclipse.jdt.core_3.1.2.jar.so -o \ +# $RPM_BUILD_ROOT%{_bindir}/ecj +# popd +# chmod a+x $RPM_BUILD_ROOT%{_bindir}/ecj +#%else +# Install /usr/bin/ecj script +sed 's:@JAVADIR@:%{_javadir}:g' < %{SOURCE20} > ecj +install -m755 ecj $RPM_BUILD_ROOT%{_bindir} +rm ecj +#%endif %endif @@ -1068,19 +1066,12 @@ %dir %{_datadir}/%{name}/features %dir %{_datadir}/%{name}/configuration %{_datadir}/%{name}/plugins/org.eclipse.jdt.core_3.* -%if %{native_ecj} -%{_datadir}/%{name}/plugins/jdtCompilerAdapter.jar -%endif %{_datadir}/java/eclipse-ecj.jar %if %{gcj_support} # Native bits %dir %{_libdir}/gcj/%{name} %{_libdir}/gcj/%{name}/org.eclipse.jdt.core_3.1.2.jar.so %{_libdir}/gcj/%{name}/org.eclipse.jdt.core_3.1.2.jar.db -%if %{native_ecj} -%{_libdir}/gcj/%{name}/jdtCompilerAdapter.jar.so -%{_libdir}/gcj/%{name}/jdtCompilerAdapter.jar.db -%endif %{_bindir}/ecj %endif @@ -1314,9 +1305,6 @@ %changelog * Fri Mar 03 2006 Andrew Overholt 3.1.2-1jpp_12fc - Only build with a native ecj on x86{,_64} -- Make /usr/bin/ecj native again as it's slow as a script with gij and - the chances of a someone using a proprietary JDK and not setting their - javac alternative are slim. * Tue Feb 28 2006 Andrew Overholt 3.1.2-1jpp_12fc - Update to tomcat 5.5 (e.o#98371). From fedora-cvs-commits at redhat.com Tue Mar 7 04:37:22 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 6 Mar 2006 23:37:22 -0500 Subject: rpms/gnome-power-manager/devel gnome-power-manager.spec,1.31,1.32 Message-ID: <200603070437.k274bMju022311@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/gnome-power-manager/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv22202 Modified Files: gnome-power-manager.spec Log Message: - fix the fix in -2 and -3 Index: gnome-power-manager.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-power-manager/devel/gnome-power-manager.spec,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- gnome-power-manager.spec 7 Mar 2006 04:16:27 -0000 1.31 +++ gnome-power-manager.spec 7 Mar 2006 04:37:18 -0000 1.32 @@ -5,7 +5,7 @@ Summary: GNOME Power Manager Name: gnome-power-manager Version: 2.13.93 -Release: 3 +Release: 4 License: GPL Group: Applications/System Source: gnome-power-manager-%{version}.tar.bz2 @@ -53,8 +53,8 @@ %find_lang %name -(cd $RPM_BUILD_ROOT%{_datadir}/gnome-power-manager; \ - ln -sf battery-discharging-100.png ../icons/hicolor/24x24/apps) +(cd $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/24x24/apps; \ + ln -sf ../../../../gnome-power-manager/battery-discharging-100.png .) %clean rm -rf $RPM_BUILD_ROOT @@ -88,8 +88,12 @@ %{_datadir}/omf/gnome-power-manager/gnome-power-manager-C.omf %{_datadir}/gnome/autostart/* %{_datadir}/applications/gnome-power-preferences.desktop +%{_datadir}/icons/hicolor/24x24/apps* %changelog +* Mon Mar 6 2006 Ray Strode - 2.13.93-4 +- fix the fix in -2 and -3 + * Mon Mar 6 2006 Ray Strode - 2.13.93-3 - fix the fix in -2 From fedora-cvs-commits at redhat.com Tue Mar 7 04:45:58 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 6 Mar 2006 23:45:58 -0500 Subject: rpms/anaconda/devel .cvsignore, 1.232, 1.233 anaconda.spec, 1.353, 1.354 sources, 1.352, 1.353 Message-ID: <200603070445.k274jwtc031069@cvs.devel.redhat.com> Author: katzj Update of /cvs/dist/rpms/anaconda/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv30526/devel Modified Files: .cvsignore anaconda.spec sources Log Message: auto-import anaconda-10.92.17-1 on branch devel from anaconda-10.92.17-1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/anaconda/devel/.cvsignore,v retrieving revision 1.232 retrieving revision 1.233 diff -u -r1.232 -r1.233 --- .cvsignore 3 Mar 2006 23:55:32 -0000 1.232 +++ .cvsignore 7 Mar 2006 04:45:56 -0000 1.233 @@ -1 +1 @@ -anaconda-10.92.16.tar.bz2 +anaconda-10.92.17.tar.bz2 Index: anaconda.spec =================================================================== RCS file: /cvs/dist/rpms/anaconda/devel/anaconda.spec,v retrieving revision 1.353 retrieving revision 1.354 diff -u -r1.353 -r1.354 --- anaconda.spec 3 Mar 2006 23:55:32 -0000 1.353 +++ anaconda.spec 7 Mar 2006 04:45:56 -0000 1.354 @@ -1,5 +1,5 @@ Name: anaconda -Version: 10.92.16 +Version: 10.92.17 Release: 1 License: GPL Summary: Graphical system installer @@ -79,6 +79,16 @@ /sbin/chkconfig --del reconfig >/dev/null 2>&1 || : %changelog +* Mon Mar 6 2006 Jeremy Katz - 10.92.17-1 +- fix traceback in size check +- disable size check on upgrade (clumens, #184112) +- try to catch more failures to read repo metadata (clumens) +- only do runlevel 5 if graphical install (dcantrel, #184013) +- adjust to new xen kernel package naming +- add 'vesa' flag to force the use of the vesa driver +- more meaningful error messages on conflicts (pnasrat) +- ensure some dirs are labelled correct (#182252) + * Fri Mar 3 2006 Paul Nasrat - 10.92.16-1 - Support Everything/globs in ks (pnasrat, clumens, #177621) - Allow changes if not enough disk space (clumens, #183878) Index: sources =================================================================== RCS file: /cvs/dist/rpms/anaconda/devel/sources,v retrieving revision 1.352 retrieving revision 1.353 diff -u -r1.352 -r1.353 --- sources 3 Mar 2006 23:55:32 -0000 1.352 +++ sources 7 Mar 2006 04:45:56 -0000 1.353 @@ -1 +1 @@ -cac9a4faf01bf6a982bf4c04d8131d7f anaconda-10.92.16.tar.bz2 +2d038454d200cf74f86686ae8273210b anaconda-10.92.17.tar.bz2 From fedora-cvs-commits at redhat.com Tue Mar 7 04:53:16 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 6 Mar 2006 23:53:16 -0500 Subject: rpms/gnome-power-manager/devel gnome-power-manager.spec,1.32,1.33 Message-ID: <200603070453.k274rGPg009526@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/gnome-power-manager/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv9402 Modified Files: gnome-power-manager.spec Log Message: add directory separator in file list where it belongs Index: gnome-power-manager.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-power-manager/devel/gnome-power-manager.spec,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- gnome-power-manager.spec 7 Mar 2006 04:37:18 -0000 1.32 +++ gnome-power-manager.spec 7 Mar 2006 04:53:14 -0000 1.33 @@ -88,7 +88,7 @@ %{_datadir}/omf/gnome-power-manager/gnome-power-manager-C.omf %{_datadir}/gnome/autostart/* %{_datadir}/applications/gnome-power-preferences.desktop -%{_datadir}/icons/hicolor/24x24/apps* +%{_datadir}/icons/hicolor/24x24/apps/* %changelog * Mon Mar 6 2006 Ray Strode - 2.13.93-4 From fedora-cvs-commits at redhat.com Tue Mar 7 05:09:28 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 7 Mar 2006 00:09:28 -0500 Subject: rpms/gnome-power-manager/devel gnome-power-manager.spec,1.33,1.34 Message-ID: <200603070509.k2759SSp013641@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/gnome-power-manager/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv13491 Modified Files: gnome-power-manager.spec Log Message: make icon dir Index: gnome-power-manager.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-power-manager/devel/gnome-power-manager.spec,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- gnome-power-manager.spec 7 Mar 2006 04:53:14 -0000 1.33 +++ gnome-power-manager.spec 7 Mar 2006 05:09:23 -0000 1.34 @@ -53,6 +53,7 @@ %find_lang %name +mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/24x24/apps (cd $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/24x24/apps; \ ln -sf ../../../../gnome-power-manager/battery-discharging-100.png .) From fedora-cvs-commits at redhat.com Tue Mar 7 05:09:45 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 7 Mar 2006 00:09:45 -0500 Subject: rpms/metacity/devel metacity-2.13.144-bling.patch, NONE, 1.1 .cvsignore, 1.33, 1.34 metacity.spec, 1.61, 1.62 sources, 1.33, 1.34 libcm-0.0.16.0.2006.02.16-include-glxext.patch, 1.1, NONE Message-ID: <200603070509.k2759jlC013694@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/metacity/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv13639 Modified Files: .cvsignore metacity.spec sources Added Files: metacity-2.13.144-bling.patch Removed Files: libcm-0.0.16.0.2006.02.16-include-glxext.patch Log Message: - update to 2.13.144 - add bling patch from HEAD metacity-2.13.144-bling.patch: Makefile.am | 4 c-screen.c | 520 +++++++++++++++++++ c-screen.h | 40 + compositor.c | 1360 ++++++++++++---------------------------------------- display.c | 103 +++ errors.c | 40 + errors.h | 8 metacity.schemas.in | 14 prefs.c | 46 + prefs.h | 4 screen.c | 117 +++- spring-model.c | 410 +++++++++++++++ spring-model.h | 31 + window.c | 68 +- 14 files changed, 1656 insertions(+), 1109 deletions(-) --- NEW FILE metacity-2.13.144-bling.patch --- --- metacity-2.13.144/src/prefs.h.bling 2006-03-06 23:11:10.000000000 -0500 +++ metacity-2.13.144/src/prefs.h 2006-03-06 23:18:42.000000000 -0500 @@ -52,7 +52,8 @@ typedef enum META_PREF_REDUCED_RESOURCES, META_PREF_GNOME_ACCESSIBILITY, META_PREF_CURSOR_THEME, - META_PREF_CURSOR_SIZE + META_PREF_CURSOR_SIZE, + META_PREF_COMPOSITING_MANAGER } MetaPreference; typedef void (* MetaPrefsChangedFunc) (MetaPreference pref, @@ -98,6 +99,7 @@ void meta_prefs_change_workspace_ const char* meta_prefs_get_cursor_theme (void); int meta_prefs_get_cursor_size (void); +gboolean meta_prefs_get_compositing_manager (void); /* Screen bindings */ #define META_KEYBINDING_WORKSPACE_1 "switch_to_workspace_1" --- metacity-2.13.144/src/errors.h.bling 2006-03-06 23:09:44.000000000 -0500 +++ metacity-2.13.144/src/errors.h 2006-03-06 23:18:41.000000000 -0500 @@ -25,7 +25,15 @@ #include "util.h" #include "display.h" +typedef void (* ErrorHandler) (Display *dpy, + XErrorEvent *error, + gpointer data); + void meta_errors_init (void); +void meta_errors_register_foreign_display (Display *foreign_dpy, + ErrorHandler handler, + gpointer data); + void meta_error_trap_push (MetaDisplay *display); void meta_error_trap_pop (MetaDisplay *display, gboolean last_request_was_roundtrip); --- metacity-2.13.144/src/window.c.bling 2006-03-06 23:10:00.000000000 -0500 +++ metacity-2.13.144/src/window.c 2006-03-06 23:18:42.000000000 -0500 @@ -979,7 +979,8 @@ meta_window_free (MetaWindow *window) if (window->display->focus_window == window) window->display->focus_window = NULL; - unmaximize_window_before_freeing (window); + if (window->maximized_horizontally || window->maximized_vertically) + unmaximize_window_before_freeing (window); meta_window_unqueue_calc_showing (window); meta_window_unqueue_move_resize (window); @@ -1319,6 +1320,7 @@ finish_minimize (gpointer data) meta_window_hide (window); if (window->has_focus) { + g_print ("focusing something other than %lx\n", window->frame->xwindow); meta_workspace_focus_default_window (window->screen->active_workspace, window, @@ -6670,22 +6672,23 @@ update_move (MetaWindow *window, int new_x, new_y; MetaRectangle old; int shake_threshold; + MetaDisplay *display = window->display; - window->display->grab_latest_motion_x = x; - window->display->grab_latest_motion_y = y; + display->grab_latest_motion_x = x; + display->grab_latest_motion_y = y; - dx = x - window->display->grab_anchor_root_x; - dy = y - window->display->grab_anchor_root_y; + dx = x - display->grab_anchor_root_x; + dy = y - display->grab_anchor_root_y; - new_x = window->display->grab_anchor_window_pos.x + dx; - new_y = window->display->grab_anchor_window_pos.y + dy; + new_x = display->grab_anchor_window_pos.x + dx; + new_y = display->grab_anchor_window_pos.y + dy; meta_verbose ("x,y = %d,%d anchor ptr %d,%d anchor pos %d,%d dx,dy %d,%d\n", x, y, - window->display->grab_anchor_root_x, - window->display->grab_anchor_root_y, - window->display->grab_anchor_window_pos.x, - window->display->grab_anchor_window_pos.y, + display->grab_anchor_root_x, + display->grab_anchor_root_y, + display->grab_anchor_window_pos.x, + display->grab_anchor_window_pos.y, dx, dy); /* Don't bother doing anything if no move has been specified. (This @@ -6712,22 +6715,22 @@ update_move (MetaWindow *window, /* move the unmaximized window to the cursor */ prop = - ((double)(x - window->display->grab_initial_window_pos.x)) / - ((double)window->display->grab_initial_window_pos.width); + ((double)(x - display->grab_initial_window_pos.x)) / + ((double)display->grab_initial_window_pos.width); - window->display->grab_initial_window_pos.x = + display->grab_initial_window_pos.x = x - window->saved_rect.width * prop; - window->display->grab_initial_window_pos.y = y; + display->grab_initial_window_pos.y = y; if (window->frame) { - window->display->grab_initial_window_pos.y += window->frame->child_y / 2; + display->grab_initial_window_pos.y += window->frame->child_y / 2; } - window->saved_rect.x = window->display->grab_initial_window_pos.x; - window->saved_rect.y = window->display->grab_initial_window_pos.y; - window->display->grab_anchor_root_x = x; - window->display->grab_anchor_root_y = y; + window->saved_rect.x = display->grab_initial_window_pos.x; + window->saved_rect.y = display->grab_initial_window_pos.y; + display->grab_anchor_root_x = x; + display->grab_anchor_root_y = y; meta_window_unmaximize (window, META_MAXIMIZE_HORIZONTAL | @@ -6775,9 +6778,9 @@ update_move (MetaWindow *window, META_MAXIMIZE_VERTICAL); } - window->display->grab_initial_window_pos = work_area; - window->display->grab_anchor_root_x = x; - window->display->grab_anchor_root_y = y; + display->grab_initial_window_pos = work_area; + display->grab_anchor_root_x = x; + display->grab_anchor_root_y = y; window->shaken_loose = FALSE; meta_window_maximize (window, @@ -6789,8 +6792,8 @@ update_move (MetaWindow *window, } } - if (window->display->grab_wireframe_active) - old = window->display->grab_wireframe_rect; + if (display->grab_wireframe_active) + old = display->grab_wireframe_rect; else { old = window->rect; @@ -6813,10 +6816,19 @@ update_move (MetaWindow *window, snap, FALSE); - if (window->display->grab_wireframe_active) + if (display->compositor) + { + int root_x = new_x - display->grab_anchor_window_pos.x + display->grab_anchor_root_x; + int root_y = new_y - display->grab_anchor_window_pos.y + display->grab_anchor_root_y; + + meta_compositor_update_move (display->compositor, + window, root_x, root_y); + } + + if (display->grab_wireframe_active) meta_window_update_wireframe (window, new_x, new_y, - window->display->grab_wireframe_rect.width, - window->display->grab_wireframe_rect.height); + display->grab_wireframe_rect.width, + display->grab_wireframe_rect.height); else meta_window_move (window, TRUE, new_x, new_y); } --- metacity-2.13.144/src/metacity.schemas.in.bling 2006-03-06 23:11:23.000000000 -0500 +++ metacity-2.13.144/src/metacity.schemas.in 2006-03-06 23:18:41.000000000 -0500 @@ -269,6 +269,20 @@ + /schemas/apps/metacity/general/compositing_manager + /apps/metacity/general/compositing_manager + metacity + boolean + FALSE + + Compositing Manager + + Determines whether Metacity is a compositing manager. + + + + + /schemas/apps/metacity/workspace_names/name /apps/metacity/workspace_names/name_1 /apps/metacity/workspace_names/name_2 --- metacity-2.13.144/src/compositor.c.bling 2006-03-06 23:09:29.000000000 -0500 +++ metacity-2.13.144/src/compositor.c 2006-03-06 23:18:41.000000000 -0500 @@ -32,32 +32,33 @@ #ifdef HAVE_COMPOSITE_EXTENSIONS #include [...3154 lines suppressed...] +model_init (Model *model, MetaRectangle *rect, gboolean expand) +{ + model->anchor_object = NULL; + + model->k = DEFAULT_SPRING_K; + model->friction = DEFAULT_FRICTION; + + model_init_grid (model, rect, expand); + model->steps = 0; + model->last_time = 0; +} + +Model * +model_new (MetaRectangle *rect, gboolean expand) +{ + Model *model = g_new0 (Model, 1); + + model_init (model, rect, expand); + + return model; +} + +static double +object_distance (Object *object, double x, double y) +{ + double dx, dy; + + dx = object->position.x - x; + dy = object->position.y - y; + + return sqrt (dx*dx + dy*dy); +} + +static Object * +model_find_nearest (Model *model, double x, double y) +{ + Object *object = &model->objects[0]; + double distance, min_distance = 0.0; + int i; + + for (i = 0; i < model->num_objects; i++) { + distance = object_distance (&model->objects[i], x, y); + if (i == 0 || distance < min_distance) { + min_distance = distance; + object = &model->objects[i]; + } + } + + return object; +} + +void +model_begin_move (Model *model, int x, int y) +{ + if (model->anchor_object) + model->anchor_object->immobile = 0; + + model->anchor_object = model_find_nearest (model, x, y); + + model->anchor_offset.x = x - model->anchor_object->position.x; + model->anchor_offset.y = y - model->anchor_object->position.y; + + g_print ("ypos: %f %f\n", model->anchor_object->position.y, + model->anchor_object->position.x); + + g_print ("anchor offset: %f %f\n", + model->anchor_offset.x, + model->anchor_offset.y); + + model->anchor_object->immobile = 1; +} + +void +model_set_anchor (Model *model, + int x, + int y) +{ + if (model->anchor_object) + model->anchor_object->immobile = 0; + + model->anchor_object = model_find_nearest (model, x, y); + model->anchor_offset.x = model->anchor_object->position.x - x; + model->anchor_offset.y = model->anchor_object->position.y - y; + + model->anchor_object->immobile = 1; +} + +void +model_update_move (Model *model, int x, int y) +{ + model->anchor_object->position.x = x - model->anchor_offset.x; + model->anchor_object->position.y = y - model->anchor_offset.y; +} + +static void +on_end_move (Model *model) +{ + if (model->anchor_object) + { + model->anchor_object->immobile = 0; + model->anchor_object = NULL; + } +} + +#define EPSILON 0.01 + +gboolean +model_is_calm (Model *model) +{ + int i, j; + gboolean calm = TRUE; + + for (i = 0; i < model->num_objects; i++) + { + if (model->objects[i].velocity.x > EPSILON || + model->objects[i].velocity.y > EPSILON || + model->objects[i].velocity.x < - EPSILON || + model->objects[i].velocity.y < - EPSILON) + { + return FALSE; + } + } + + return TRUE; +} + +void +model_step (Model *model) +{ + int i; + + for (i = 0; i < model->num_springs; i++) + spring_exert_forces (&model->springs[i], model->k); + + for (i = 0; i < model->num_objects; i++) + model_step_object (model, &model->objects[i]); +} + +void +model_destroy (Model *model) +{ + g_free (model); +} + +void +model_get_position (Model *model, + int i, + int j, + double *x, + double *y) +{ + if (x) + *x = model->objects[j * 4 + i].position.x; + + if (y) + *y = model->objects[j * 4 + i].position.y; +} --- metacity-2.13.144/src/c-screen.h.bling 2006-03-06 23:09:18.000000000 -0500 +++ metacity-2.13.144/src/c-screen.h 2006-03-06 23:18:41.000000000 -0500 @@ -0,0 +1,40 @@ +#include "screen.h" + +typedef struct MetaScreenInfo MetaScreenInfo; + +MetaScreenInfo *meta_screen_info_new (WsDisplay *display, + MetaScreen *screen); +MetaScreenInfo *meta_screen_info_get_by_xwindow (Window xwindow); +void meta_screen_info_destroy (MetaScreenInfo *scr_info); +void meta_screen_info_redirect (MetaScreenInfo *info); +void meta_screen_info_unredirect (MetaScreenInfo *info); +void meta_screen_info_add_window (MetaScreenInfo *scr_info, + Window xwindow); +void meta_screen_info_remove_window (MetaScreenInfo *scr_info, + Window xwindow); +void meta_screen_info_restack (MetaScreenInfo *scr_info, + Window window, + Window above_this); +void meta_screen_info_set_size (MetaScreenInfo *info, + Window window, + gint x, + gint y, + gint width, + gint height); +void meta_screen_info_raise_window (MetaScreenInfo *scr_info, + Window window); +void meta_screen_info_queue_paint (MetaScreenInfo *info); +void meta_screen_info_set_updates (MetaScreenInfo *info, + Window xwindow, + gboolean updates); +void meta_screen_info_set_patch (MetaScreenInfo *info, + Window xwindow, + CmPoint points[4][4]); +void meta_screen_info_unset_patch (MetaScreenInfo *info, + Window xwindow); +void meta_screen_info_set_alpha (MetaScreenInfo *info, + Window xwindow, + gdouble alpha); +void meta_screen_info_get_real_size (MetaScreenInfo *info, + Window xwindow, + WsRectangle *size); Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/metacity/devel/.cvsignore,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- .cvsignore 17 Feb 2006 22:09:29 -0000 1.33 +++ .cvsignore 7 Mar 2006 05:09:39 -0000 1.34 @@ -1,2 +1,2 @@ -metacity-2.13.89.0.2006.02.17.tar.bz2 -libcm-0.0.16.0.2006.02.16.tar.bz2 +libcm-0.0.16.0.2006.03.06.tar.bz2 +metacity-2.13.144.tar.bz2 Index: metacity.spec =================================================================== RCS file: /cvs/dist/rpms/metacity/devel/metacity.spec,v retrieving revision 1.61 retrieving revision 1.62 diff -u -r1.61 -r1.62 --- metacity.spec 19 Feb 2006 19:53:43 -0000 1.61 +++ metacity.spec 7 Mar 2006 05:09:41 -0000 1.62 @@ -1,16 +1,15 @@ %define gettext_package metacity %define libcm_version 0.0.16 -%define libcm_snapshot_date 2006.02.16 -%define metacity_version 2.13.89 -%define metacity_snapshot_date 2006.02.17 +%define libcm_snapshot_date 2006.03.06 +%define metacity_version 2.13.144 Summary: Metacity window manager Name: metacity -Version: %{metacity_version}.0.%{metacity_snapshot_date} -Release: 2 +Version: %{metacity_version} +Release: 1 URL: http://ftp.gnome.org/pub/gnome/sources/metacity/ -Source0: metacity-%{metacity_version}.0.%{metacity_snapshot_date}.tar.bz2 +Source0: metacity-%{metacity_version}.tar.bz2 Source1: libcm-%{libcm_version}.0.%{libcm_snapshot_date}.tar.bz2 License: GPL Group: User Interface/Desktops @@ -35,9 +34,9 @@ Requires: redhat-artwork >= 0.62 Patch0: metacity-2.4.13.90-ctrlaltdel.patch -Patch1: metacity-2.13.89.0.2006.02.16-static-cm.patch -Patch2: metacity-2.13.89.0.2006.02.16-fix-type.patch -Patch3: libcm-0.0.16.0.2006.02.16-include-glxext.patch +Patch1: metacity-2.13.144-bling.patch +Patch2: metacity-2.13.89.0.2006.02.16-static-cm.patch +Patch3: metacity-2.13.89.0.2006.02.16-fix-type.patch %description @@ -45,16 +44,13 @@ GNOME 2. %prep -%setup -q -n metacity-%{metacity_version}.0.%{metacity_snapshot_date} -%setup -D -T -a1 -n metacity-%{metacity_version}.0.%{metacity_snapshot_date} +%setup -q -n metacity-%{metacity_version} +%setup -D -T -a1 -n metacity-%{metacity_version} %patch0 -p1 -b .ctrlaltdel -%patch1 -p1 -b .static-cm -%patch2 -p1 -b .fix-type - -pushd libcm-%{libcm_version}.0.%{libcm_snapshot_date} -%patch3 -p1 -b .include-glxext -popd +%patch1 -p1 -b .bling +%patch2 -p1 -b .static-cm +%patch3 -p1 -b .fix-type %build rm -rf $RPM_BUILD_ROOT @@ -146,6 +142,10 @@ %{_mandir}/man1/* %changelog +* Mon Mar 6 2006 Ray Strode - 2.13.144-1 +- update to 2.13.144 +- add bling patch from HEAD + * Sun Feb 19 2006 Ray Strode - 2.13.89.0.2006.02.17-2 - disable compositor on s390 s390x and ppc64 Index: sources =================================================================== RCS file: /cvs/dist/rpms/metacity/devel/sources,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- sources 17 Feb 2006 22:09:29 -0000 1.33 +++ sources 7 Mar 2006 05:09:41 -0000 1.34 @@ -1,2 +1,2 @@ -4c8a668019049dd6a4321ad0d0fc93ae metacity-2.13.89.0.2006.02.17.tar.bz2 -72896fe1209ee3c85944ef52c373eb14 libcm-0.0.16.0.2006.02.16.tar.bz2 +eba1b4b6d6a18eb4fc28e35045b63b0e libcm-0.0.16.0.2006.03.06.tar.bz2 +81126bb03bfa77c63e1c49452a8e198c metacity-2.13.144.tar.bz2 --- libcm-0.0.16.0.2006.02.16-include-glxext.patch DELETED --- From fedora-cvs-commits at redhat.com Tue Mar 7 05:13:21 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 7 Mar 2006 00:13:21 -0500 Subject: rpms/gdb/devel gdb-6.3-augmS-20060303.patch, 1.1, 1.2 gdb-6.3-cfaval-20060303.patch, 1.1, 1.2 gdb-6.3-prelink-core-20060223.patch, 1.2, 1.3 gdb.spec, 1.175, 1.176 Message-ID: <200603070513.k275DLVx014460@cvs.devel.redhat.com> Author: aoliva Update of /cvs/dist/rpms/gdb/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv14260/gdb-devel Modified Files: gdb-6.3-augmS-20060303.patch gdb-6.3-cfaval-20060303.patch gdb-6.3-prelink-core-20060223.patch gdb.spec Log Message: * Tue Mar 7 2006 Alexandre Oliva - 6.3.0.0-1.115 - Change dwarf2 frame identifiers to use the actual PC instead of the function's entry point. - Fix FSF and GDB contact addresses in new testcases. - Change prelink test to issue untested instead of warning message if system libraries are not prelinked. gdb-6.3-augmS-20060303.patch: dwarf2-frame.c | 34 +++++ dwarf2-frame.h | 8 + testsuite/gdb.dwarf2/signal-augm.S | 207 +++++++++++++++++++++++++++++++++++ testsuite/gdb.dwarf2/signal-augm.c | 198 +++++++++++++++++++++++++++++++++ testsuite/gdb.dwarf2/signal-augm.exp | 77 +++++++++++++ 5 files changed, 521 insertions(+), 3 deletions(-) Index: gdb-6.3-augmS-20060303.patch =================================================================== RCS file: /cvs/dist/rpms/gdb/devel/gdb-6.3-augmS-20060303.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gdb-6.3-augmS-20060303.patch 3 Mar 2006 19:10:47 -0000 1.1 +++ gdb-6.3-augmS-20060303.patch 7 Mar 2006 05:13:18 -0000 1.2 @@ -107,7 +107,7 @@ + + 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. ++ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + + Written by Jakub Jelinek, as testcase for GCC PR 26208. */ + @@ -319,7 +319,7 @@ + + 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. ++ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + + Written by Jakub Jelinek, as testcase for GCC PR 26208. GDB does + not need all of it, since all we do is to try to recognize signal @@ -520,10 +520,10 @@ +# +# 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. ++# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +# Please email any bugs, comments, and/or additions to this file to: -+# bug-gdb at prep.ai.mit.edu ++# bug-gdb at gnu.org + +# This file was written by Alexandre Oliva + gdb-6.3-cfaval-20060303.patch: gdb/dwarf2-frame.c | 90 ++++++++++ gdb/dwarf2-frame.h | 4 gdb/testsuite/gdb.dwarf2/cfa-val-expr-1.c | 261 ++++++++++++++++++++++++++++++ gdb/testsuite/gdb.dwarf2/cfa-val-expr-2.c | 226 +++++++++++++++++++++++++ gdb/testsuite/gdb.dwarf2/cfa-val-expr.exp | 91 ++++++++++ gdb/valarith.c | 9 - include/elf/dwarf2.h | 68 +++++++ 7 files changed, 743 insertions(+), 6 deletions(-) Index: gdb-6.3-cfaval-20060303.patch =================================================================== RCS file: /cvs/dist/rpms/gdb/devel/gdb-6.3-cfaval-20060303.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gdb-6.3-cfaval-20060303.patch 3 Mar 2006 19:10:47 -0000 1.1 +++ gdb-6.3-cfaval-20060303.patch 7 Mar 2006 05:13:18 -0000 1.2 @@ -29,7 +29,7 @@ DWARF 3). for gdb/ChangeLog -2006-03-03 Alexandre Oliva +2006-03-07 Alexandre Oliva * dwarf2-frame.h (enum dwarf2_frame_reg_rule): Add DWARF2_FRAME_REG_SAVED_VAL_OFFSET and @@ -37,6 +37,7 @@ * dwarf2-frame.c (execute_cfa_program): Handle val_offset, val_offset_sf and val_expression. (dwarf2_frame_prev_register): Handle the new reg rules. + (dwarf2_frame_this_id): Use pc instead of function entry point. 2005-08-11 Andreas Schwab @@ -45,7 +46,7 @@ operators. for gdb/testsuite/ChangeLog -2006-03-03 Alexandre Oliva +2006-03-07 Alexandre Oliva * gdb.dwarf2/cfa-val-expr.exp: New test. * gdb.dwarf2/cfa-val-expr-1.c, gdb.dwarf2/cfa-val-expr-2.c: @@ -53,8 +54,8 @@ Index: gdb-6.3/gdb/dwarf2-frame.c =================================================================== ---- gdb-6.3.orig/gdb/dwarf2-frame.c 2006-03-03 13:51:53.000000000 -0300 -+++ gdb-6.3/gdb/dwarf2-frame.c 2006-03-03 14:28:03.000000000 -0300 +--- gdb-6.3.orig/gdb/dwarf2-frame.c 2006-03-04 09:17:24.000000000 -0300 ++++ gdb-6.3/gdb/dwarf2-frame.c 2006-03-07 01:44:55.000000000 -0300 @@ -435,6 +435,34 @@ bad CFI data; mismatched DW_CFA_restore_ fs->regs.reg[reg].loc.offset = offset; break; @@ -135,6 +136,15 @@ struct dwarf2_frame_cache +@@ -734,7 +793,7 @@ dwarf2_frame_this_id (struct frame_info + struct dwarf2_frame_cache *cache = + dwarf2_frame_cache (next_frame, this_cache); + +- (*this_id) = frame_id_build (cache->cfa, frame_func_unwind (next_frame)); ++ (*this_id) = frame_id_build (cache->cfa, frame_pc_unwind (next_frame)); + } + + static void @@ -797,6 +856,28 @@ dwarf2_frame_prev_register (struct frame } break; @@ -180,8 +190,8 @@ { Index: gdb-6.3/gdb/dwarf2-frame.h =================================================================== ---- gdb-6.3.orig/gdb/dwarf2-frame.h 2006-03-03 13:51:53.000000000 -0300 -+++ gdb-6.3/gdb/dwarf2-frame.h 2006-03-03 13:51:55.000000000 -0300 +--- gdb-6.3.orig/gdb/dwarf2-frame.h 2006-03-04 09:17:24.000000000 -0300 ++++ gdb-6.3/gdb/dwarf2-frame.h 2006-03-04 09:17:24.000000000 -0300 @@ -55,6 +55,10 @@ enum dwarf2_frame_reg_rule register. */ DWARF2_FRAME_REG_INDIRECT, @@ -196,7 +206,7 @@ Index: gdb-6.3/gdb/testsuite/gdb.dwarf2/cfa-val-expr-1.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ gdb-6.3/gdb/testsuite/gdb.dwarf2/cfa-val-expr-1.c 2006-03-03 13:51:55.000000000 -0300 ++++ gdb-6.3/gdb/testsuite/gdb.dwarf2/cfa-val-expr-1.c 2006-03-04 09:17:24.000000000 -0300 @@ -0,0 +1,261 @@ +/* This testcase is part of GDB, the GNU debugger. + @@ -214,7 +224,7 @@ + + 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. ++ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + + Written by Jakub Jelinek, as testcase for Dwarf3 value expression + support in GCC unwinders. GDB does not need all of it, since all @@ -462,7 +472,7 @@ Index: gdb-6.3/gdb/testsuite/gdb.dwarf2/cfa-val-expr-2.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ gdb-6.3/gdb/testsuite/gdb.dwarf2/cfa-val-expr-2.c 2006-03-03 13:51:55.000000000 -0300 ++++ gdb-6.3/gdb/testsuite/gdb.dwarf2/cfa-val-expr-2.c 2006-03-04 09:17:24.000000000 -0300 @@ -0,0 +1,226 @@ +/* This testcase is part of GDB, the GNU debugger. + @@ -480,7 +490,7 @@ + + 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. ++ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + + Written by Jakub Jelinek, as testcase for Dwarf3 value expression + support in GCC unwinders. GDB does not need all of it, since all @@ -693,8 +703,8 @@ Index: gdb-6.3/gdb/testsuite/gdb.dwarf2/cfa-val-expr.exp =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ gdb-6.3/gdb/testsuite/gdb.dwarf2/cfa-val-expr.exp 2006-03-03 13:51:55.000000000 -0300 -@@ -0,0 +1,87 @@ ++++ gdb-6.3/gdb/testsuite/gdb.dwarf2/cfa-val-expr.exp 2006-03-07 01:35:17.000000000 -0300 +@@ -0,0 +1,91 @@ +# Copyright 2006 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify @@ -709,10 +719,10 @@ +# +# 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. ++# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +# Please email any bugs, comments, and/or additions to this file to: -+# bug-gdb at prep.ai.mit.edu ++# bug-gdb at gnu.org + +# This file was written by Alexandre Oliva + @@ -759,6 +769,10 @@ +gdb_test "run" ".*Breakpoint 1.*" "stopped at fn5 ($tnum)" +gdb_test "backtrace" ".*\#0 .* fn5 .*\#1 .* bar .*\#2 .* _L_mutex.* .*\#3 .* foo .*\#4 .* fn2 .*\#5 .* fn1 .*\#6 .* main.*" "backtrace ($tnum)" + ++if {![istarget x86_64-*-linux*]} { ++ return 0; ++} ++ +set tnum 2 +set testfile "cfa-val-expr-$tnum" + @@ -784,8 +798,8 @@ +return 0 Index: gdb-6.3/include/elf/dwarf2.h =================================================================== ---- gdb-6.3.orig/include/elf/dwarf2.h 2006-03-03 13:55:48.000000000 -0300 -+++ gdb-6.3/include/elf/dwarf2.h 2006-03-03 14:27:03.000000000 -0300 +--- gdb-6.3.orig/include/elf/dwarf2.h 2006-03-04 09:15:43.000000000 -0300 ++++ gdb-6.3/include/elf/dwarf2.h 2006-03-04 09:17:24.000000000 -0300 @@ -1,7 +1,7 @@ -/* Declarations and definitions of codes relating to the DWARF2 symbolic - debugging information format. @@ -921,8 +935,8 @@ /* UPC. */ Index: gdb-6.3/gdb/valarith.c =================================================================== ---- gdb-6.3.orig/gdb/valarith.c 2004-09-20 17:18:39.000000000 -0300 -+++ gdb-6.3/gdb/valarith.c 2006-03-03 15:45:05.000000000 -0300 +--- gdb-6.3.orig/gdb/valarith.c 2006-03-04 09:15:43.000000000 -0300 ++++ gdb-6.3/gdb/valarith.c 2006-03-04 09:17:24.000000000 -0300 @@ -881,7 +881,14 @@ value_binop (struct value *arg1, struct Use the signedness of the operand with the greater length. If both operands are of equal length, use unsigned operation gdb-6.3-prelink-core-20060223.patch: Makefile.in | 2 mipsnbsd-tdep.c | 6 + solib-legacy.c | 11 +++ solib-svr4.c | 124 +++++++++++++++++++++++++++++++++++---- solib-svr4.h | 6 + testsuite/gdb.base/prelink-lib.c | 34 ++++++++++ testsuite/gdb.base/prelink.c | 30 +++++++++ testsuite/gdb.base/prelink.exp | 115 ++++++++++++++++++++++++++++++++++++ 8 files changed, 317 insertions(+), 11 deletions(-) Index: gdb-6.3-prelink-core-20060223.patch =================================================================== RCS file: /cvs/dist/rpms/gdb/devel/gdb-6.3-prelink-core-20060223.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- gdb-6.3-prelink-core-20060223.patch 3 Mar 2006 19:10:47 -0000 1.2 +++ gdb-6.3-prelink-core-20060223.patch 7 Mar 2006 05:13:18 -0000 1.3 @@ -18,11 +18,12 @@ * Makefile.in (solib-svr4.o): Depend on $(elf_bfd_h). for gdb/testsuite/ChangeLog -2006-03-03 Alexandre Oliva +2006-03-07 Alexandre Oliva - * gdb.base/prelink.exp: Add -q to prelink runs. Rename - executable to prelinkt. Don't re-prelink if we didn't get a - core file. Test prelink -u exit status to tell whether + * gdb.base/prelink.c, gdb.base/prelink-lib.c: Update FSF address. + * gdb.base/prelink.exp: Likewise. Add -q to prelink runs. + Rename executable to prelinkt. Don't re-prelink if we didn't + get a core file. Test prelink -u exit status to tell whether prelinking failed. Use gdb_test_multiple. 2006-02-28 Alexandre Oliva @@ -32,8 +33,8 @@ Index: gdb-6.3/gdb/mipsnbsd-tdep.c =================================================================== ---- gdb-6.3.orig/gdb/mipsnbsd-tdep.c 2006-02-23 17:39:41.000000000 -0300 -+++ gdb-6.3/gdb/mipsnbsd-tdep.c 2006-02-23 17:39:57.000000000 -0300 +--- gdb-6.3.orig/gdb/mipsnbsd-tdep.c 2006-03-07 01:45:10.000000000 -0300 ++++ gdb-6.3/gdb/mipsnbsd-tdep.c 2006-03-07 01:45:13.000000000 -0300 @@ -295,6 +295,9 @@ mipsnbsd_ilp32_solib_svr4_fetch_link_map lmo.l_name_offset = 8; lmo.l_name_size = 4; @@ -56,8 +57,8 @@ Index: gdb-6.3/gdb/solib-legacy.c =================================================================== ---- gdb-6.3.orig/gdb/solib-legacy.c 2006-02-23 17:39:41.000000000 -0300 -+++ gdb-6.3/gdb/solib-legacy.c 2006-02-23 17:39:57.000000000 -0300 +--- gdb-6.3.orig/gdb/solib-legacy.c 2006-03-07 01:45:10.000000000 -0300 ++++ gdb-6.3/gdb/solib-legacy.c 2006-03-07 01:45:13.000000000 -0300 @@ -68,6 +68,9 @@ legacy_svr4_fetch_link_map_offsets (void lmo.l_next_offset = offsetof (struct link_map, l_next); lmo.l_next_size = fieldsize (struct link_map, l_next); @@ -92,8 +93,8 @@ #endif /* HAVE_STRUCT_LINK_MAP_WITH_L_MEMBERS */ Index: gdb-6.3/gdb/solib-svr4.c =================================================================== ---- gdb-6.3.orig/gdb/solib-svr4.c 2006-02-23 17:39:41.000000000 -0300 -+++ gdb-6.3/gdb/solib-svr4.c 2006-02-23 17:39:57.000000000 -0300 +--- gdb-6.3.orig/gdb/solib-svr4.c 2006-03-07 01:45:10.000000000 -0300 ++++ gdb-6.3/gdb/solib-svr4.c 2006-03-07 01:45:13.000000000 -0300 @@ -36,10 +36,13 @@ #include "inferior.h" #include "command.h" @@ -300,8 +301,8 @@ SO_NAME_MAX_PATH_SIZE - 1, &errcode); Index: gdb-6.3/gdb/solib-svr4.h =================================================================== ---- gdb-6.3.orig/gdb/solib-svr4.h 2006-02-23 17:39:41.000000000 -0300 -+++ gdb-6.3/gdb/solib-svr4.h 2006-02-23 17:39:57.000000000 -0300 +--- gdb-6.3.orig/gdb/solib-svr4.h 2006-03-07 01:45:10.000000000 -0300 ++++ gdb-6.3/gdb/solib-svr4.h 2006-03-07 01:45:13.000000000 -0300 @@ -51,6 +51,12 @@ struct link_map_offsets /* Size of l_addr field in struct link_map. */ int l_addr_size; @@ -317,8 +318,8 @@ Index: gdb-6.3/gdb/Makefile.in =================================================================== ---- gdb-6.3.orig/gdb/Makefile.in 2006-02-23 17:39:41.000000000 -0300 -+++ gdb-6.3/gdb/Makefile.in 2006-02-23 17:39:57.000000000 -0300 +--- gdb-6.3.orig/gdb/Makefile.in 2006-03-07 01:45:10.000000000 -0300 ++++ gdb-6.3/gdb/Makefile.in 2006-03-07 01:45:13.000000000 -0300 @@ -2535,7 +2535,7 @@ solib-sunos.o: solib-sunos.c $(defs_h) $ solib-svr4.o: solib-svr4.c $(defs_h) $(elf_external_h) $(elf_common_h) \ $(elf_mips_h) $(symtab_h) $(bfd_h) $(symfile_h) $(objfiles_h) \ @@ -331,8 +332,27 @@ Index: gdb-6.3/gdb/testsuite/gdb.base/prelink-lib.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ gdb-6.3/gdb/testsuite/gdb.base/prelink-lib.c 2006-02-23 17:39:57.000000000 -0300 -@@ -0,0 +1,15 @@ ++++ gdb-6.3/gdb/testsuite/gdb.base/prelink-lib.c 2006-03-07 01:45:13.000000000 -0300 +@@ -0,0 +1,34 @@ ++/* This testcase is part of GDB, the GNU debugger. ++ ++ Copyright 2006 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 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ++*/ ++ +int +g (void (*p)(void)) +{ @@ -351,8 +371,27 @@ Index: gdb-6.3/gdb/testsuite/gdb.base/prelink.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ gdb-6.3/gdb/testsuite/gdb.base/prelink.c 2006-02-23 17:39:57.000000000 -0300 -@@ -0,0 +1,11 @@ ++++ gdb-6.3/gdb/testsuite/gdb.base/prelink.c 2006-03-07 01:45:13.000000000 -0300 +@@ -0,0 +1,30 @@ ++/* This testcase is part of GDB, the GNU debugger. ++ ++ Copyright 2006 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 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ++*/ ++ +#include + +extern void (*h (void)) (void (*)(void)); @@ -367,7 +406,7 @@ Index: gdb-6.3/gdb/testsuite/gdb.base/prelink.exp =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ gdb-6.3/gdb/testsuite/gdb.base/prelink.exp 2006-03-03 14:35:19.000000000 -0300 ++++ gdb-6.3/gdb/testsuite/gdb.base/prelink.exp 2006-03-07 01:50:42.000000000 -0300 @@ -0,0 +1,115 @@ +# Copyright 2006 Free Software Foundation, Inc. + @@ -383,10 +422,10 @@ +# +# 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. ++# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +# Please email any bugs, comments, and/or additions to this file to: -+# bug-gdb at prep.ai.mit.edu ++# bug-gdb at gnu.org + +# This file was written by Alexandre Oliva + @@ -461,7 +500,7 @@ +} + +if {[catch "system \"prelink -uN ${libfile}\""] != 0} { -+ warning "${libfile} was not prelinked, maybe system libraries are not prelinked?" ++ untested "${libfile} was not prelinked, maybe system libraries are not prelinked?" + return 0 +} +catch "system \"prelink -qNR ${libfile}\"" Index: gdb.spec =================================================================== RCS file: /cvs/dist/rpms/gdb/devel/gdb.spec,v retrieving revision 1.175 retrieving revision 1.176 diff -u -r1.175 -r1.176 --- gdb.spec 3 Mar 2006 19:10:47 -0000 1.175 +++ gdb.spec 7 Mar 2006 05:13:18 -0000 1.176 @@ -11,7 +11,7 @@ Version: 6.3.0.0 # The release always contains a leading reserved number, start it at 0. -Release: 1.114 +Release: 1.118 License: GPL Group: Development/Debuggers @@ -549,6 +549,16 @@ # don't include the files in include, they are part of binutils %changelog +* Tue Mar 7 2006 Alexandre Oliva - 6.3.0.0-1.118 +- Bump up release number. + +* Tue Mar 7 2006 Alexandre Oliva - 6.3.0.0-1.115 +- Change dwarf2 frame identifiers to use the actual PC instead of the +function's entry point. +- Fix FSF and GDB contact addresses in new testcases. +- Change prelink test to issue untested instead of warning message if +system libraries are not prelinked. + * Fri Mar 3 2006 Alexandre Oliva - 6.3.0.0-1.114 - Bump up release number. From fedora-cvs-commits at redhat.com Tue Mar 7 05:13:20 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 7 Mar 2006 00:13:20 -0500 Subject: rpms/gdb/FC-4 gdb-6.3-augmS-20060303.patch, 1.1, 1.2 gdb-6.3-cfaval-20060303.patch, 1.1, 1.2 gdb-6.3-prelink-core-20060223.patch, 1.2, 1.3 gdb.spec, 1.172, 1.173 Message-ID: <200603070513.k275DK5d014426@cvs.devel.redhat.com> Author: aoliva Update of /cvs/dist/rpms/gdb/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv14260/gdb-FC-4 Modified Files: gdb-6.3-augmS-20060303.patch gdb-6.3-cfaval-20060303.patch gdb-6.3-prelink-core-20060223.patch gdb.spec Log Message: * Tue Mar 7 2006 Alexandre Oliva - 6.3.0.0-1.115 - Change dwarf2 frame identifiers to use the actual PC instead of the function's entry point. - Fix FSF and GDB contact addresses in new testcases. - Change prelink test to issue untested instead of warning message if system libraries are not prelinked. gdb-6.3-augmS-20060303.patch: dwarf2-frame.c | 34 +++++ dwarf2-frame.h | 8 + testsuite/gdb.dwarf2/signal-augm.S | 207 +++++++++++++++++++++++++++++++++++ testsuite/gdb.dwarf2/signal-augm.c | 198 +++++++++++++++++++++++++++++++++ testsuite/gdb.dwarf2/signal-augm.exp | 77 +++++++++++++ 5 files changed, 521 insertions(+), 3 deletions(-) Index: gdb-6.3-augmS-20060303.patch =================================================================== RCS file: /cvs/dist/rpms/gdb/FC-4/gdb-6.3-augmS-20060303.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gdb-6.3-augmS-20060303.patch 3 Mar 2006 19:10:48 -0000 1.1 +++ gdb-6.3-augmS-20060303.patch 7 Mar 2006 05:13:17 -0000 1.2 @@ -107,7 +107,7 @@ + + 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. ++ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + + Written by Jakub Jelinek, as testcase for GCC PR 26208. */ + @@ -319,7 +319,7 @@ + + 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. ++ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + + Written by Jakub Jelinek, as testcase for GCC PR 26208. GDB does + not need all of it, since all we do is to try to recognize signal @@ -520,10 +520,10 @@ +# +# 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. ++# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +# Please email any bugs, comments, and/or additions to this file to: -+# bug-gdb at prep.ai.mit.edu ++# bug-gdb at gnu.org + +# This file was written by Alexandre Oliva + gdb-6.3-cfaval-20060303.patch: gdb/dwarf2-frame.c | 90 ++++++++++ gdb/dwarf2-frame.h | 4 gdb/testsuite/gdb.dwarf2/cfa-val-expr-1.c | 261 ++++++++++++++++++++++++++++++ gdb/testsuite/gdb.dwarf2/cfa-val-expr-2.c | 226 +++++++++++++++++++++++++ gdb/testsuite/gdb.dwarf2/cfa-val-expr.exp | 91 ++++++++++ gdb/valarith.c | 9 - include/elf/dwarf2.h | 68 +++++++ 7 files changed, 743 insertions(+), 6 deletions(-) Index: gdb-6.3-cfaval-20060303.patch =================================================================== RCS file: /cvs/dist/rpms/gdb/FC-4/gdb-6.3-cfaval-20060303.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gdb-6.3-cfaval-20060303.patch 3 Mar 2006 19:10:48 -0000 1.1 +++ gdb-6.3-cfaval-20060303.patch 7 Mar 2006 05:13:17 -0000 1.2 @@ -29,7 +29,7 @@ DWARF 3). for gdb/ChangeLog -2006-03-03 Alexandre Oliva +2006-03-07 Alexandre Oliva * dwarf2-frame.h (enum dwarf2_frame_reg_rule): Add DWARF2_FRAME_REG_SAVED_VAL_OFFSET and @@ -37,6 +37,7 @@ * dwarf2-frame.c (execute_cfa_program): Handle val_offset, val_offset_sf and val_expression. (dwarf2_frame_prev_register): Handle the new reg rules. + (dwarf2_frame_this_id): Use pc instead of function entry point. 2005-08-11 Andreas Schwab @@ -45,7 +46,7 @@ operators. for gdb/testsuite/ChangeLog -2006-03-03 Alexandre Oliva +2006-03-07 Alexandre Oliva * gdb.dwarf2/cfa-val-expr.exp: New test. * gdb.dwarf2/cfa-val-expr-1.c, gdb.dwarf2/cfa-val-expr-2.c: @@ -53,8 +54,8 @@ Index: gdb-6.3/gdb/dwarf2-frame.c =================================================================== ---- gdb-6.3.orig/gdb/dwarf2-frame.c 2006-03-03 13:51:53.000000000 -0300 -+++ gdb-6.3/gdb/dwarf2-frame.c 2006-03-03 14:28:03.000000000 -0300 +--- gdb-6.3.orig/gdb/dwarf2-frame.c 2006-03-04 09:17:24.000000000 -0300 ++++ gdb-6.3/gdb/dwarf2-frame.c 2006-03-07 01:44:55.000000000 -0300 @@ -435,6 +435,34 @@ bad CFI data; mismatched DW_CFA_restore_ fs->regs.reg[reg].loc.offset = offset; break; @@ -135,6 +136,15 @@ struct dwarf2_frame_cache +@@ -734,7 +793,7 @@ dwarf2_frame_this_id (struct frame_info + struct dwarf2_frame_cache *cache = + dwarf2_frame_cache (next_frame, this_cache); + +- (*this_id) = frame_id_build (cache->cfa, frame_func_unwind (next_frame)); ++ (*this_id) = frame_id_build (cache->cfa, frame_pc_unwind (next_frame)); + } + + static void @@ -797,6 +856,28 @@ dwarf2_frame_prev_register (struct frame } break; @@ -180,8 +190,8 @@ { Index: gdb-6.3/gdb/dwarf2-frame.h =================================================================== ---- gdb-6.3.orig/gdb/dwarf2-frame.h 2006-03-03 13:51:53.000000000 -0300 -+++ gdb-6.3/gdb/dwarf2-frame.h 2006-03-03 13:51:55.000000000 -0300 +--- gdb-6.3.orig/gdb/dwarf2-frame.h 2006-03-04 09:17:24.000000000 -0300 ++++ gdb-6.3/gdb/dwarf2-frame.h 2006-03-04 09:17:24.000000000 -0300 @@ -55,6 +55,10 @@ enum dwarf2_frame_reg_rule register. */ DWARF2_FRAME_REG_INDIRECT, @@ -196,7 +206,7 @@ Index: gdb-6.3/gdb/testsuite/gdb.dwarf2/cfa-val-expr-1.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ gdb-6.3/gdb/testsuite/gdb.dwarf2/cfa-val-expr-1.c 2006-03-03 13:51:55.000000000 -0300 ++++ gdb-6.3/gdb/testsuite/gdb.dwarf2/cfa-val-expr-1.c 2006-03-04 09:17:24.000000000 -0300 @@ -0,0 +1,261 @@ +/* This testcase is part of GDB, the GNU debugger. + @@ -214,7 +224,7 @@ + + 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. ++ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + + Written by Jakub Jelinek, as testcase for Dwarf3 value expression + support in GCC unwinders. GDB does not need all of it, since all @@ -462,7 +472,7 @@ Index: gdb-6.3/gdb/testsuite/gdb.dwarf2/cfa-val-expr-2.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ gdb-6.3/gdb/testsuite/gdb.dwarf2/cfa-val-expr-2.c 2006-03-03 13:51:55.000000000 -0300 ++++ gdb-6.3/gdb/testsuite/gdb.dwarf2/cfa-val-expr-2.c 2006-03-04 09:17:24.000000000 -0300 @@ -0,0 +1,226 @@ +/* This testcase is part of GDB, the GNU debugger. + @@ -480,7 +490,7 @@ + + 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. ++ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + + Written by Jakub Jelinek, as testcase for Dwarf3 value expression + support in GCC unwinders. GDB does not need all of it, since all @@ -693,8 +703,8 @@ Index: gdb-6.3/gdb/testsuite/gdb.dwarf2/cfa-val-expr.exp =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ gdb-6.3/gdb/testsuite/gdb.dwarf2/cfa-val-expr.exp 2006-03-03 13:51:55.000000000 -0300 -@@ -0,0 +1,87 @@ ++++ gdb-6.3/gdb/testsuite/gdb.dwarf2/cfa-val-expr.exp 2006-03-07 01:35:17.000000000 -0300 +@@ -0,0 +1,91 @@ +# Copyright 2006 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify @@ -709,10 +719,10 @@ +# +# 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. ++# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +# Please email any bugs, comments, and/or additions to this file to: -+# bug-gdb at prep.ai.mit.edu ++# bug-gdb at gnu.org + +# This file was written by Alexandre Oliva + @@ -759,6 +769,10 @@ +gdb_test "run" ".*Breakpoint 1.*" "stopped at fn5 ($tnum)" +gdb_test "backtrace" ".*\#0 .* fn5 .*\#1 .* bar .*\#2 .* _L_mutex.* .*\#3 .* foo .*\#4 .* fn2 .*\#5 .* fn1 .*\#6 .* main.*" "backtrace ($tnum)" + ++if {![istarget x86_64-*-linux*]} { ++ return 0; ++} ++ +set tnum 2 +set testfile "cfa-val-expr-$tnum" + @@ -784,8 +798,8 @@ +return 0 Index: gdb-6.3/include/elf/dwarf2.h =================================================================== ---- gdb-6.3.orig/include/elf/dwarf2.h 2006-03-03 13:55:48.000000000 -0300 -+++ gdb-6.3/include/elf/dwarf2.h 2006-03-03 14:27:03.000000000 -0300 +--- gdb-6.3.orig/include/elf/dwarf2.h 2006-03-04 09:15:43.000000000 -0300 ++++ gdb-6.3/include/elf/dwarf2.h 2006-03-04 09:17:24.000000000 -0300 @@ -1,7 +1,7 @@ -/* Declarations and definitions of codes relating to the DWARF2 symbolic - debugging information format. @@ -921,8 +935,8 @@ /* UPC. */ Index: gdb-6.3/gdb/valarith.c =================================================================== ---- gdb-6.3.orig/gdb/valarith.c 2004-09-20 17:18:39.000000000 -0300 -+++ gdb-6.3/gdb/valarith.c 2006-03-03 15:45:05.000000000 -0300 +--- gdb-6.3.orig/gdb/valarith.c 2006-03-04 09:15:43.000000000 -0300 ++++ gdb-6.3/gdb/valarith.c 2006-03-04 09:17:24.000000000 -0300 @@ -881,7 +881,14 @@ value_binop (struct value *arg1, struct Use the signedness of the operand with the greater length. If both operands are of equal length, use unsigned operation gdb-6.3-prelink-core-20060223.patch: Makefile.in | 2 mipsnbsd-tdep.c | 6 + solib-legacy.c | 11 +++ solib-svr4.c | 124 +++++++++++++++++++++++++++++++++++---- solib-svr4.h | 6 + testsuite/gdb.base/prelink-lib.c | 34 ++++++++++ testsuite/gdb.base/prelink.c | 30 +++++++++ testsuite/gdb.base/prelink.exp | 115 ++++++++++++++++++++++++++++++++++++ 8 files changed, 317 insertions(+), 11 deletions(-) Index: gdb-6.3-prelink-core-20060223.patch =================================================================== RCS file: /cvs/dist/rpms/gdb/FC-4/gdb-6.3-prelink-core-20060223.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- gdb-6.3-prelink-core-20060223.patch 3 Mar 2006 19:10:48 -0000 1.2 +++ gdb-6.3-prelink-core-20060223.patch 7 Mar 2006 05:13:17 -0000 1.3 @@ -18,11 +18,12 @@ * Makefile.in (solib-svr4.o): Depend on $(elf_bfd_h). for gdb/testsuite/ChangeLog -2006-03-03 Alexandre Oliva +2006-03-07 Alexandre Oliva - * gdb.base/prelink.exp: Add -q to prelink runs. Rename - executable to prelinkt. Don't re-prelink if we didn't get a - core file. Test prelink -u exit status to tell whether + * gdb.base/prelink.c, gdb.base/prelink-lib.c: Update FSF address. + * gdb.base/prelink.exp: Likewise. Add -q to prelink runs. + Rename executable to prelinkt. Don't re-prelink if we didn't + get a core file. Test prelink -u exit status to tell whether prelinking failed. Use gdb_test_multiple. 2006-02-28 Alexandre Oliva @@ -32,8 +33,8 @@ Index: gdb-6.3/gdb/mipsnbsd-tdep.c =================================================================== ---- gdb-6.3.orig/gdb/mipsnbsd-tdep.c 2006-02-23 17:39:41.000000000 -0300 -+++ gdb-6.3/gdb/mipsnbsd-tdep.c 2006-02-23 17:39:57.000000000 -0300 +--- gdb-6.3.orig/gdb/mipsnbsd-tdep.c 2006-03-07 01:45:10.000000000 -0300 ++++ gdb-6.3/gdb/mipsnbsd-tdep.c 2006-03-07 01:45:13.000000000 -0300 @@ -295,6 +295,9 @@ mipsnbsd_ilp32_solib_svr4_fetch_link_map lmo.l_name_offset = 8; lmo.l_name_size = 4; @@ -56,8 +57,8 @@ Index: gdb-6.3/gdb/solib-legacy.c =================================================================== ---- gdb-6.3.orig/gdb/solib-legacy.c 2006-02-23 17:39:41.000000000 -0300 -+++ gdb-6.3/gdb/solib-legacy.c 2006-02-23 17:39:57.000000000 -0300 +--- gdb-6.3.orig/gdb/solib-legacy.c 2006-03-07 01:45:10.000000000 -0300 ++++ gdb-6.3/gdb/solib-legacy.c 2006-03-07 01:45:13.000000000 -0300 @@ -68,6 +68,9 @@ legacy_svr4_fetch_link_map_offsets (void lmo.l_next_offset = offsetof (struct link_map, l_next); lmo.l_next_size = fieldsize (struct link_map, l_next); @@ -92,8 +93,8 @@ #endif /* HAVE_STRUCT_LINK_MAP_WITH_L_MEMBERS */ Index: gdb-6.3/gdb/solib-svr4.c =================================================================== ---- gdb-6.3.orig/gdb/solib-svr4.c 2006-02-23 17:39:41.000000000 -0300 -+++ gdb-6.3/gdb/solib-svr4.c 2006-02-23 17:39:57.000000000 -0300 +--- gdb-6.3.orig/gdb/solib-svr4.c 2006-03-07 01:45:10.000000000 -0300 ++++ gdb-6.3/gdb/solib-svr4.c 2006-03-07 01:45:13.000000000 -0300 @@ -36,10 +36,13 @@ #include "inferior.h" #include "command.h" @@ -300,8 +301,8 @@ SO_NAME_MAX_PATH_SIZE - 1, &errcode); Index: gdb-6.3/gdb/solib-svr4.h =================================================================== ---- gdb-6.3.orig/gdb/solib-svr4.h 2006-02-23 17:39:41.000000000 -0300 -+++ gdb-6.3/gdb/solib-svr4.h 2006-02-23 17:39:57.000000000 -0300 +--- gdb-6.3.orig/gdb/solib-svr4.h 2006-03-07 01:45:10.000000000 -0300 ++++ gdb-6.3/gdb/solib-svr4.h 2006-03-07 01:45:13.000000000 -0300 @@ -51,6 +51,12 @@ struct link_map_offsets /* Size of l_addr field in struct link_map. */ int l_addr_size; @@ -317,8 +318,8 @@ Index: gdb-6.3/gdb/Makefile.in =================================================================== ---- gdb-6.3.orig/gdb/Makefile.in 2006-02-23 17:39:41.000000000 -0300 -+++ gdb-6.3/gdb/Makefile.in 2006-02-23 17:39:57.000000000 -0300 +--- gdb-6.3.orig/gdb/Makefile.in 2006-03-07 01:45:10.000000000 -0300 ++++ gdb-6.3/gdb/Makefile.in 2006-03-07 01:45:13.000000000 -0300 @@ -2535,7 +2535,7 @@ solib-sunos.o: solib-sunos.c $(defs_h) $ solib-svr4.o: solib-svr4.c $(defs_h) $(elf_external_h) $(elf_common_h) \ $(elf_mips_h) $(symtab_h) $(bfd_h) $(symfile_h) $(objfiles_h) \ @@ -331,8 +332,27 @@ Index: gdb-6.3/gdb/testsuite/gdb.base/prelink-lib.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ gdb-6.3/gdb/testsuite/gdb.base/prelink-lib.c 2006-02-23 17:39:57.000000000 -0300 -@@ -0,0 +1,15 @@ ++++ gdb-6.3/gdb/testsuite/gdb.base/prelink-lib.c 2006-03-07 01:45:13.000000000 -0300 +@@ -0,0 +1,34 @@ ++/* This testcase is part of GDB, the GNU debugger. ++ ++ Copyright 2006 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 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ++*/ ++ +int +g (void (*p)(void)) +{ @@ -351,8 +371,27 @@ Index: gdb-6.3/gdb/testsuite/gdb.base/prelink.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ gdb-6.3/gdb/testsuite/gdb.base/prelink.c 2006-02-23 17:39:57.000000000 -0300 -@@ -0,0 +1,11 @@ ++++ gdb-6.3/gdb/testsuite/gdb.base/prelink.c 2006-03-07 01:45:13.000000000 -0300 +@@ -0,0 +1,30 @@ ++/* This testcase is part of GDB, the GNU debugger. ++ ++ Copyright 2006 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 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ++*/ ++ +#include + +extern void (*h (void)) (void (*)(void)); @@ -367,7 +406,7 @@ Index: gdb-6.3/gdb/testsuite/gdb.base/prelink.exp =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ gdb-6.3/gdb/testsuite/gdb.base/prelink.exp 2006-03-03 14:35:19.000000000 -0300 ++++ gdb-6.3/gdb/testsuite/gdb.base/prelink.exp 2006-03-07 01:50:42.000000000 -0300 @@ -0,0 +1,115 @@ +# Copyright 2006 Free Software Foundation, Inc. + @@ -383,10 +422,10 @@ +# +# 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. ++# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +# Please email any bugs, comments, and/or additions to this file to: -+# bug-gdb at prep.ai.mit.edu ++# bug-gdb at gnu.org + +# This file was written by Alexandre Oliva + @@ -461,7 +500,7 @@ +} + +if {[catch "system \"prelink -uN ${libfile}\""] != 0} { -+ warning "${libfile} was not prelinked, maybe system libraries are not prelinked?" ++ untested "${libfile} was not prelinked, maybe system libraries are not prelinked?" + return 0 +} +catch "system \"prelink -qNR ${libfile}\"" Index: gdb.spec =================================================================== RCS file: /cvs/dist/rpms/gdb/FC-4/gdb.spec,v retrieving revision 1.172 retrieving revision 1.173 diff -u -r1.172 -r1.173 --- gdb.spec 3 Mar 2006 19:10:48 -0000 1.172 +++ gdb.spec 7 Mar 2006 05:13:17 -0000 1.173 @@ -11,7 +11,7 @@ Version: 6.3.0.0 # The release always contains a leading reserved number, start it at 0. -Release: 1.113 +Release: 1.117 License: GPL Group: Development/Debuggers @@ -549,7 +549,17 @@ # don't include the files in include, they are part of binutils %changelog -* Fri Mar 3 2006 Alexandre Oliva - 6.3.0.0-1.113 +* Tue Mar 7 2006 Alexandre Oliva - 6.3.0.0-1.117 +- Bump up release number. + +* Tue Mar 7 2006 Alexandre Oliva - 6.3.0.0-1.115 +- Change dwarf2 frame identifiers to use the actual PC instead of the +function's entry point. +- Fix FSF and GDB contact addresses in new testcases. +- Change prelink test to issue untested instead of warning message if +system libraries are not prelinked. + +* Fri Mar 3 2006 Alexandre Oliva - 6.3.0.0-1.114 - Bump up release number. * Fri Mar 3 2006 Alexandre Oliva - 6.3.0.0-1.111 From fedora-cvs-commits at redhat.com Tue Mar 7 05:13:19 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 7 Mar 2006 00:13:19 -0500 Subject: rpms/gcc/FC-4 gcc4.spec,1.49,1.50 Message-ID: <200603070513.k275DJtp014415@cvs.devel.redhat.com> Author: aoliva Update of /cvs/dist/rpms/gcc/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv14260/gcc-FC-4 Modified Files: gcc4.spec Log Message: * Tue Mar 7 2006 Alexandre Oliva - 6.3.0.0-1.115 - Change dwarf2 frame identifiers to use the actual PC instead of the function's entry point. - Fix FSF and GDB contact addresses in new testcases. - Change prelink test to issue untested instead of warning message if system libraries are not prelinked. Index: gcc4.spec =================================================================== RCS file: /cvs/dist/rpms/gcc/FC-4/gcc4.spec,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- gcc4.spec 25 Nov 2005 23:44:19 -0000 1.49 +++ gcc4.spec 7 Mar 2006 05:13:15 -0000 1.50 @@ -81,6 +81,10 @@ Patch9: gcc4-ppc32-msecure-plt.patch Patch10: gcc4-weakref.patch +Patch1001: gcc4-dwarf2-frame_base-ia64.patch + +Patch10000: lxo-updates-for-devel.patch + %define _gnu %{nil} %ifarch sparc %define gcc_target_platform sparc64-%{_vendor}-%{_target_os} @@ -416,6 +420,9 @@ perl -pi -e 's/^install: install-recursive/ifeq (\$(MULTISUBDIR),)\ninstall: install-recursive\nelse\ninstall:\n\techo Multilib libjava install disabled\nendif/' libjava/Makefile.in perl -pi -e 's/^check: check-recursive/ifeq (\$(MULTISUBDIR),)\ncheck: check-recursive\nelse\ncheck:\n\techo Multilib libjava check disabled\nendif/' libjava/Makefile.in +%patch1001 -p0 -b .dwarf2-frame_base-ia64~ +%patch10000 -p0 -b .lxo-devel~ + ./contrib/gcc_update --touch %ifarch ppc From fedora-cvs-commits at redhat.com Tue Mar 7 05:15:50 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 7 Mar 2006 00:15:50 -0500 Subject: rpms/gcc/FC-4 gcc4.spec,1.50,1.51 Message-ID: <200603070515.k275FonW014935@cvs.devel.redhat.com> Author: aoliva Update of /cvs/dist/rpms/gcc/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv14908 Modified Files: gcc4.spec Log Message: Revert accidental commit Index: gcc4.spec =================================================================== RCS file: /cvs/dist/rpms/gcc/FC-4/gcc4.spec,v retrieving revision 1.50 retrieving revision 1.51 diff -u -r1.50 -r1.51 --- gcc4.spec 7 Mar 2006 05:13:15 -0000 1.50 +++ gcc4.spec 7 Mar 2006 05:15:43 -0000 1.51 @@ -81,10 +81,6 @@ Patch9: gcc4-ppc32-msecure-plt.patch Patch10: gcc4-weakref.patch -Patch1001: gcc4-dwarf2-frame_base-ia64.patch - -Patch10000: lxo-updates-for-devel.patch - %define _gnu %{nil} %ifarch sparc %define gcc_target_platform sparc64-%{_vendor}-%{_target_os} @@ -420,9 +416,6 @@ perl -pi -e 's/^install: install-recursive/ifeq (\$(MULTISUBDIR),)\ninstall: install-recursive\nelse\ninstall:\n\techo Multilib libjava install disabled\nendif/' libjava/Makefile.in perl -pi -e 's/^check: check-recursive/ifeq (\$(MULTISUBDIR),)\ncheck: check-recursive\nelse\ncheck:\n\techo Multilib libjava check disabled\nendif/' libjava/Makefile.in -%patch1001 -p0 -b .dwarf2-frame_base-ia64~ -%patch10000 -p0 -b .lxo-devel~ - ./contrib/gcc_update --touch %ifarch ppc From fedora-cvs-commits at redhat.com Tue Mar 7 05:18:06 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 7 Mar 2006 00:18:06 -0500 Subject: rpms/gdb/devel gdb.spec,1.176,1.177 Message-ID: <200603070518.k275Hx5r016416@cvs.devel.redhat.com> Author: aoliva Update of /cvs/dist/rpms/gdb/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv16026/gdb-devel Modified Files: gdb.spec Log Message: * Tue Mar 7 2006 Alexandre Oliva - 6.3.0.0-1.115 [...] - Do not try to compile x86_64-only CFA testcase on 32-bit x86. Index: gdb.spec =================================================================== RCS file: /cvs/dist/rpms/gdb/devel/gdb.spec,v retrieving revision 1.176 retrieving revision 1.177 diff -u -r1.176 -r1.177 --- gdb.spec 7 Mar 2006 05:13:18 -0000 1.176 +++ gdb.spec 7 Mar 2006 05:17:56 -0000 1.177 @@ -556,6 +556,7 @@ - Change dwarf2 frame identifiers to use the actual PC instead of the function's entry point. - Fix FSF and GDB contact addresses in new testcases. +- Do not try to compile x86_64-only CFA testcase on 32-bit x86. - Change prelink test to issue untested instead of warning message if system libraries are not prelinked. From fedora-cvs-commits at redhat.com Tue Mar 7 05:18:06 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 7 Mar 2006 00:18:06 -0500 Subject: rpms/gdb/FC-4 gdb.spec,1.173,1.174 Message-ID: <200603070518.k275I3ai016449@cvs.devel.redhat.com> Author: aoliva Update of /cvs/dist/rpms/gdb/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv16026/gdb-FC-4 Modified Files: gdb.spec Log Message: * Tue Mar 7 2006 Alexandre Oliva - 6.3.0.0-1.115 [...] - Do not try to compile x86_64-only CFA testcase on 32-bit x86. Index: gdb.spec =================================================================== RCS file: /cvs/dist/rpms/gdb/FC-4/gdb.spec,v retrieving revision 1.173 retrieving revision 1.174 diff -u -r1.173 -r1.174 --- gdb.spec 7 Mar 2006 05:13:17 -0000 1.173 +++ gdb.spec 7 Mar 2006 05:17:58 -0000 1.174 @@ -556,6 +556,7 @@ - Change dwarf2 frame identifiers to use the actual PC instead of the function's entry point. - Fix FSF and GDB contact addresses in new testcases. +- Do not try to compile x86_64-only CFA testcase on 32-bit x86. - Change prelink test to issue untested instead of warning message if system libraries are not prelinked. From fedora-cvs-commits at redhat.com Tue Mar 7 05:29:51 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 7 Mar 2006 00:29:51 -0500 Subject: rpms/kernel/devel linux-2.6-x86-fix-nmi-watchdog.patch, NONE, 1.1 kernel-2.6.spec, 1.2025, 1.2026 Message-ID: <200603070529.k275Tpq5030159@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv30118 Modified Files: kernel-2.6.spec Added Files: linux-2.6-x86-fix-nmi-watchdog.patch Log Message: * Tue Mar 7 2006 Dave Jones - Fix NMI watchdog on i386. linux-2.6-x86-fix-nmi-watchdog.patch: nmi.c | 3 +-- 1 files changed, 1 insertion(+), 2 deletions(-) --- NEW FILE linux-2.6-x86-fix-nmi-watchdog.patch --- It fixes i386 nmi_watchdog that does not meet watchdog timeout condition. It does not hit die_nmi when it should be triggered, because the current nmi_watchdog_tick in arch/i386/kernel/nmi.c never count up alert_counter like this: void nmi_watchdog_tick (struct pt_regs * regs) { if (last_irq_sums[cpu] == sum) { alert_counter[cpu]++; <- count up alert_counter, but if (alert_counter[cpu] == 5*nmi_hz) die_nmi(regs, "NMI Watchdog detected LOCKUP"); alert_counter[cpu] = 0; <- reset alert_counter This patch changes it back to the previous and working version. Tested with 2.6.15. It's also OK for 2.6.16-rc5. This was found and originally written by Kohta NAKASHIMA. -- gotom Signed-Off-By: GOTO Masanori --- --- linux-2.6.15/arch/i386/kernel/nmi.c.gotom 2006-03-02 17:52:49.021365056 +0900 +++ linux-2.6.15/arch/i386/kernel/nmi.c 2006-03-02 17:53:19.939664760 +0900 @@ -544,7 +544,7 @@ void nmi_watchdog_tick (struct pt_regs * * die_nmi will return ONLY if NOTIFY_STOP happens.. */ die_nmi(regs, "NMI Watchdog detected LOCKUP"); - + } else { last_irq_sums[cpu] = sum; alert_counter[cpu] = 0; } - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo at vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.2025 retrieving revision 1.2026 diff -u -r1.2025 -r1.2026 --- kernel-2.6.spec 7 Mar 2006 02:51:27 -0000 1.2025 +++ kernel-2.6.spec 7 Mar 2006 05:29:45 -0000 1.2026 @@ -234,6 +234,7 @@ Patch206: linux-2.6-x86_64-smp-on-uphw-cpucount.patch Patch207: linux-2.6-x86-hp-reboot.patch Patch208: linux-2.6-x86-cpu_index-false.patch +Patch209: linux-2.6-x86-fix-nmi-watchdog.patch # 300 - 399 ppc(64) Patch300: linux-2.6-powermac-pfunc-noise.patch @@ -751,6 +752,8 @@ %patch207 -p1 # cpu_index >= NR_CPUS becomming always false. %patch208 -p1 +# fix nmi watchdog. +%patch209 -p1 # # ppc64 @@ -1648,6 +1651,9 @@ %endif %changelog +* Tue Mar 7 2006 Dave Jones +- Fix NMI watchdog on i386. + * Mon Mar 6 2006 Dave Jones - Disable DRI on Radeon R300 and above, due to instability. (#174646,#182196) - Don't do voluntary preempt until after bootup @@ -1657,7 +1663,7 @@ - Rename kernel-xen-(hypervisor|guest) to kernel-xen(0|U) for consistency with upstream and to make kernel subtype suffixes match the subpackage names. (From Jeremy Katz.) -- Export mmap-able kva interface for xen to find the xenstore page +- Export mmap-able kva interface for xen to find the xenstore page (xen-unstable cset 9130) - Remove stale linux-2.6-xen-module-fault.patch file - Add workaround for non-xen ia64 builds: temporarily back-out the ia64- From fedora-cvs-commits at redhat.com Tue Mar 7 08:44:59 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 7 Mar 2006 03:44:59 -0500 Subject: rpms/glibc/devel glibc-fedora.patch, 1.144, 1.145 glibc.spec, 1.228, 1.229 sources, 1.165, 1.166 Message-ID: <200603070844.k278ixMY010692@cvs.devel.redhat.com> Author: jakub Update of /cvs/dist/rpms/glibc/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv10668/devel Modified Files: glibc-fedora.patch glibc.spec sources Log Message: auto-import glibc-2.4-2 on branch devel from glibc-2.4-2.src.rpm glibc-fedora.patch: ChangeLog | 130 ++++ ChangeLog.11 | 21 ChangeLog.12 | 12 ChangeLog.15 | 45 + csu/elf-init.c | 17 debug/tst-chk1.c | 7 elf/ldconfig.c | 25 elf/tst-stackguard1.c | 8 iconv/iconvconfig.c | 55 - include/bits/stdlib-ldbl.h | 1 include/bits/wchar-ldbl.h | 1 include/features.h | 8 intl/locale.alias | 2 libio/bits/stdio2.h | 19 libio/stdio.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/no_NO | 69 ++ localedata/locales/zh_TW | 6 malloc/mcheck.c | 30 - malloc/mtrace.c | 20 math/libm-test.inc | 288 +++++++++ nptl/ChangeLog | 19 nptl/Makefile | 8 nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S | 61 +- nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevelrobustlock.S | 45 + nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h | 242 +++++--- nptl/sysdeps/unix/sysv/linux/kernel-features.h | 6 nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S | 59 +- nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h | 294 +++++++--- nptl/sysdeps/unix/sysv/linux/x86_64/lowlevelrobustlock.S | 41 + nptl/tst-stackguard1.c | 8 nscd/connections.c | 15 nscd/nscd.c | 4 nscd/nscd.conf | 4 nscd/nscd.init | 19 posix/Makefile | 19 posix/getconf.speclist.h | 15 sysdeps/generic/dl-cache.h | 8 sysdeps/ia64/Makefile | 4 sysdeps/ia64/ia64libgcc.S | 350 ------------ sysdeps/ia64/libgcc-compat.c | 84 ++ sysdeps/ieee754/ldbl-128ibm/e_fmodl.c | 8 sysdeps/ieee754/ldbl-128ibm/e_rem_pio2l.c | 5 sysdeps/ieee754/ldbl-128ibm/math_ldbl.h | 293 ++++++---- sysdeps/ieee754/ldbl-128ibm/s_ceill.c | 125 +--- sysdeps/ieee754/ldbl-128ibm/s_floorl.c | 118 +--- sysdeps/ieee754/ldbl-128ibm/s_rintl.c | 144 ++-- sysdeps/ieee754/ldbl-128ibm/s_roundl.c | 124 +--- sysdeps/ieee754/ldbl-128ibm/s_truncl.c | 125 +--- sysdeps/powerpc/fpu/fegetround.c | 4 sysdeps/powerpc/fpu/fenv_libc.h | 37 + sysdeps/powerpc/fpu/fesetround.c | 18 sysdeps/powerpc/fpu/math_ldbl.h | 189 ++++++ sysdeps/unix/nice.c | 7 sysdeps/unix/sysv/linux/dl-osinfo.h | 29 sysdeps/unix/sysv/linux/futimesat.c | 23 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/tcsetattr.c | 32 + 68 files changed, 2376 insertions(+), 1143 deletions(-) Index: glibc-fedora.patch =================================================================== RCS file: /cvs/dist/rpms/glibc/devel/glibc-fedora.patch,v retrieving revision 1.144 retrieving revision 1.145 diff -u -r1.144 -r1.145 --- glibc-fedora.patch 6 Mar 2006 13:33:54 -0000 1.144 +++ glibc-fedora.patch 7 Mar 2006 08:44:54 -0000 1.145 @@ -1,6 +1,44 @@ --- glibc-20060306T1239/ChangeLog 6 Mar 2006 10:59:43 -0000 1.10062 -+++ glibc-20060306T1239-fedora/ChangeLog 6 Mar 2006 13:15:14 -0000 1.8782.2.172 -@@ -18,6 +18,34 @@ ++++ glibc-20060306T1239-fedora/ChangeLog 7 Mar 2006 08:24:11 -0000 1.8782.2.173 +@@ -1,3 +1,37 @@ ++2006-03-03 Steven Munroe ++ Alan Modra ++ ++ [BZ #2423] ++ * math/libm-test.inc [TEST_LDOUBLE] (ceil_test, floor_test, rint_test, ++ round_test, trunc_test): Add new tests. ++ ++ * sysdeps/powerpc/fpu/fenv_libc.h (__fegetround, __fesetround): ++ Define inline implementations. ++ * sysdeps/powerpc/fpu/fegetround.c: Use __fegetround. ++ * sysdeps/powerpc/fpu/fesetround.c: Use __fesetround. ++ ++ * sysdeps/ieee754/ldbl-128ibm/math_ldbl.h ++ (EXTRACT_IBM_EXTENDED_MANTISSA, INSERT_IBM_EXTENDED_MANTISSA): ++ Removed, replaced with. ++ (ldbl_extract_mantissa, ldbl_insert_mantissa, ldbl_pack, ldbl_unpack, ++ ldbl_canonicalise, ldbl_nearbyint): Define inline utility ++ functions for IBM long double format. ++ * sysdeps/ieee754/ldbl-128ibm/e_fmodl.c (__ieee754_fmodl): Replace ++ EXTRACT_IBM_EXTENDED_MANTISSA and INSERT_IBM_EXTENDED_MANTISSA ++ with ldbl_extract_mantissa and ldbl_insert_mantissa. ++ * sysdeps/ieee754/ldbl-128ibm/e_rem_pio2l.c (__ieee754_rem_pio2l): ++ Replace EXTRACT_IBM_EXTENDED_MANTISSA with ldbl_extract_mantissa. ++ (ldbl_extract_mantissa, ldbl_insert_mantissa): Defined. ++ ++ * sysdeps/ieee754/ldbl-128ibm/s_ceill.c (__ceill): Handle rounding ++ that spans doubles in IBM long double format. ++ * sysdeps/ieee754/ldbl-128ibm/s_floorl.c: Likewise. ++ * sysdeps/ieee754/ldbl-128ibm/s_rintl.c: Likewise. ++ * sysdeps/ieee754/ldbl-128ibm/s_roundl.c: Likewise. ++ * sysdeps/ieee754/ldbl-128ibm/s_truncl.c: Likewise. ++ * sysdeps/powerpc/fpu/math_ldbl.h: New file. ++ * sysdeps/powerpc/powerpc64/fpu/s_rintl.S: Removed. ++ + 2006-03-06 Roland McGrath + + * version.h (VERSION): 2.4 +@@ -18,6 +52,34 @@ _SC_CPUTIME and _SC_THREAD_CPUTIME here. * sysdeps/unix/sysv/linux/x86_64/sysconf.c (__sysconf): Likewise. @@ -35,7 +73,7 @@ 2006-03-05 Roland McGrath * malloc/malloc.c (MALLOC_ALIGNMENT): Revert to (2 * SIZE_SZ) value. -@@ -1030,6 +1058,11 @@ +@@ -1030,6 +1092,11 @@ (__MATHDECL_2): Use __REDIRECT_NTH instead of __REDIRECT followed by __THROW. @@ -47,7 +85,7 @@ 2006-02-02 Ulrich Drepper * sysdeps/unix/sysv/linux/futimesat.c [__NR_futimesat] -@@ -1089,6 +1122,11 @@ +@@ -1089,6 +1156,11 @@ * sysdeps/ieee754/ldbl-128/s_llrintl.c (__llrintl): Fix a typo. * sysdeps/s390/fpu/libm-test-ulps: Remove llrint ulps. @@ -59,7 +97,7 @@ 2006-01-19 Thomas Schwinge * libio/genops.c: Include . -@@ -3515,6 +3553,10 @@ +@@ -3515,6 +3587,10 @@ * elf/order2mod2.c (init): Cast ignored value to void. @@ -70,7 +108,7 @@ 2005-12-27 Ulrich Drepper * elf/tst-tls13.c (do_test): Avoid using the library path when -@@ -3798,6 +3840,26 @@ +@@ -3798,6 +3874,26 @@ * sysdeps/unix/sysv/linux/time.c: If __NR_time is not defined, use sysdeps/unix/time.c implementation. @@ -97,7 +135,7 @@ 2005-12-19 Ulrich Drepper [BZ #1955] -@@ -6916,6 +6978,11 @@ +@@ -6916,6 +7012,11 @@ R_ARM_TLS_TPOFF32, R_ARM_TLS_GD32, R_ARM_TLS_LDM32, R_ARM_TLS_LDO32, R_ARM_TLS_IE32, R_ARM_TLS_LE32): New macros. @@ -109,7 +147,7 @@ 2005-10-03 Roland McGrath * sysdeps/powerpc/nofpu: Directory removed, saved in ports repository. -@@ -7910,6 +7977,12 @@ +@@ -7910,6 +8011,12 @@ * argp/argp-help.c (__argp_error): __asprintf -> vasprintf. (__argp_failure): Likewise. @@ -122,7 +160,7 @@ 2005-08-08 Ulrich Drepper * nscd/cache.c (cache_add): Commit hash table and header to disk. -@@ -8034,6 +8107,17 @@ +@@ -8034,6 +8141,17 @@ __syslog_chk. * misc/Versions: Export __syslog_chk and __vsyslog_chk. @@ -140,7 +178,7 @@ 2005-07-28 Thomas Schwinge [BZ #1137] -@@ -11094,6 +11178,18 @@ +@@ -11094,6 +11212,18 @@ * scripts/soversions.awk: Fix default version set handling. @@ -1101,6 +1139,462 @@ __memalign_hook = tr_memalignhook; __malloc_hook = tr_mallochook; +--- glibc-20060306T1239/math/libm-test.inc 28 Jan 2006 00:35:55 -0000 1.69 ++++ glibc-20060306T1239-fedora/math/libm-test.inc 7 Mar 2006 08:24:12 -0000 1.61.2.7 +@@ -1628,8 +1628,12 @@ ceil_test (void) + + TEST_f_f (ceil, M_PIl, 4.0); + TEST_f_f (ceil, -M_PIl, -3.0); ++ TEST_f_f (ceil, 0.1, 1.0); + TEST_f_f (ceil, 0.25, 1.0); ++ TEST_f_f (ceil, 0.625, 1.0); ++ TEST_f_f (ceil, -0.1, minus_zero); + TEST_f_f (ceil, -0.25, minus_zero); ++ TEST_f_f (ceil, -0.625, minus_zero); + + #ifdef TEST_LDOUBLE + /* The result can only be represented in long double. */ +@@ -1644,6 +1648,13 @@ ceil_test (void) + TEST_f_f (ceil, -4503599627370496.5L, -4503599627370496.0L); + TEST_f_f (ceil, -4503599627370496.75L, -4503599627370496.0L); + TEST_f_f (ceil, -4503599627370497.5L, -4503599627370497.0L); ++ ++ TEST_f_f (ceil, 4503599627370494.5000000000001L, 4503599627370495.0L); ++ TEST_f_f (ceil, 4503599627370495.5000000000001L, 4503599627370496.0L); ++ TEST_f_f (ceil, 4503599627370496.5000000000001L, 4503599627370497.0L); ++ TEST_f_f (ceil, -4503599627370494.5000000000001L, -4503599627370494.0L); ++ TEST_f_f (ceil, -4503599627370495.5000000000001L, -4503599627370495.0L); ++ TEST_f_f (ceil, -4503599627370496.5000000000001L, -4503599627370496.0L); + + TEST_f_f (ceil, 9007199254740991.5L, 9007199254740992.0L); + TEST_f_f (ceil, 9007199254740992.25L, 9007199254740993.0L); +@@ -1657,6 +1668,20 @@ ceil_test (void) + TEST_f_f (ceil, -9007199254740992.75L, -9007199254740992.0L); + TEST_f_f (ceil, -9007199254740993.5L, -9007199254740993.0L); + ++ TEST_f_f (ceil, 9007199254740991.0000000000001L, 9007199254740992.0L); ++ TEST_f_f (ceil, 9007199254740992.0000000000001L, 9007199254740993.0L); ++ TEST_f_f (ceil, 9007199254740993.0000000000001L, 9007199254740994.0L); ++ TEST_f_f (ceil, 9007199254740991.5000000000001L, 9007199254740992.0L); ++ TEST_f_f (ceil, 9007199254740992.5000000000001L, 9007199254740993.0L); ++ TEST_f_f (ceil, 9007199254740993.5000000000001L, 9007199254740994.0L); ++ ++ TEST_f_f (ceil, -9007199254740991.0000000000001L, -9007199254740991.0L); ++ TEST_f_f (ceil, -9007199254740992.0000000000001L, -9007199254740992.0L); ++ TEST_f_f (ceil, -9007199254740993.0000000000001L, -9007199254740993.0L); ++ TEST_f_f (ceil, -9007199254740991.5000000000001L, -9007199254740991.0L); ++ TEST_f_f (ceil, -9007199254740992.5000000000001L, -9007199254740992.0L); ++ TEST_f_f (ceil, -9007199254740993.5000000000001L, -9007199254740993.0L); ++ + TEST_f_f (ceil, 72057594037927935.5L, 72057594037927936.0L); + TEST_f_f (ceil, 72057594037927936.25L, 72057594037927937.0L); + TEST_f_f (ceil, 72057594037927936.5L, 72057594037927937.0L); +@@ -2628,9 +2653,12 @@ floor_test (void) + TEST_f_f (floor, M_PIl, 3.0); + TEST_f_f (floor, -M_PIl, -4.0); + ++ TEST_f_f (floor, 0.1, 0.0); + TEST_f_f (floor, 0.25, 0.0); ++ TEST_f_f (floor, 0.625, 0.0); ++ TEST_f_f (floor, -0.1, -1.0); + TEST_f_f (floor, -0.25, -1.0); +- ++ TEST_f_f (floor, -0.625, -1.0); + + #ifdef TEST_LDOUBLE + /* The result can only be represented in long double. */ +@@ -2639,12 +2667,18 @@ floor_test (void) + TEST_f_f (floor, 4503599627370496.5L, 4503599627370496.0L); + TEST_f_f (floor, 4503599627370496.75L, 4503599627370496.0L); + TEST_f_f (floor, 4503599627370497.5L, 4503599627370497.0L); ++ TEST_f_f (floor, 4503599627370494.5000000000001L, 4503599627370494.0L); ++ TEST_f_f (floor, 4503599627370495.5000000000001L, 4503599627370495.0L); ++ TEST_f_f (floor, 4503599627370496.5000000000001L, 4503599627370496.0L); + + TEST_f_f (floor, -4503599627370495.5L, -4503599627370496.0L); + TEST_f_f (floor, -4503599627370496.25L, -4503599627370497.0L); + TEST_f_f (floor, -4503599627370496.5L, -4503599627370497.0L); + TEST_f_f (floor, -4503599627370496.75L, -4503599627370497.0L); + TEST_f_f (floor, -4503599627370497.5L, -4503599627370498.0L); ++ TEST_f_f (floor, -4503599627370494.5000000000001L, -4503599627370495.0L); ++ TEST_f_f (floor, -4503599627370495.5000000000001L, -4503599627370496.0L); ++ TEST_f_f (floor, -4503599627370496.5000000000001L, -4503599627370497.0L); + + TEST_f_f (floor, 9007199254740991.5L, 9007199254740991.0L); + TEST_f_f (floor, 9007199254740992.25L, 9007199254740992.0L); +@@ -2652,12 +2686,26 @@ floor_test (void) + TEST_f_f (floor, 9007199254740992.75L, 9007199254740992.0L); + TEST_f_f (floor, 9007199254740993.5L, 9007199254740993.0L); + ++ TEST_f_f (floor, 9007199254740991.0000000000001L, 9007199254740991.0L); ++ TEST_f_f (floor, 9007199254740992.0000000000001L, 9007199254740992.0L); ++ TEST_f_f (floor, 9007199254740993.0000000000001L, 9007199254740993.0L); ++ TEST_f_f (floor, 9007199254740991.5000000000001L, 9007199254740991.0L); ++ TEST_f_f (floor, 9007199254740992.5000000000001L, 9007199254740992.0L); ++ TEST_f_f (floor, 9007199254740993.5000000000001L, 9007199254740993.0L); ++ + TEST_f_f (floor, -9007199254740991.5L, -9007199254740992.0L); + TEST_f_f (floor, -9007199254740992.25L, -9007199254740993.0L); + TEST_f_f (floor, -9007199254740992.5L, -9007199254740993.0L); + TEST_f_f (floor, -9007199254740992.75L, -9007199254740993.0L); + TEST_f_f (floor, -9007199254740993.5L, -9007199254740994.0L); + ++ TEST_f_f (floor, -9007199254740991.0000000000001L, -9007199254740992.0L); ++ TEST_f_f (floor, -9007199254740992.0000000000001L, -9007199254740993.0L); ++ TEST_f_f (floor, -9007199254740993.0000000000001L, -9007199254740994.0L); ++ TEST_f_f (floor, -9007199254740991.5000000000001L, -9007199254740992.0L); ++ TEST_f_f (floor, -9007199254740992.5000000000001L, -9007199254740993.0L); ++ TEST_f_f (floor, -9007199254740993.5000000000001L, -9007199254740994.0L); ++ + TEST_f_f (floor, 72057594037927935.5L, 72057594037927935.0L); + TEST_f_f (floor, 72057594037927936.25L, 72057594037927936.0L); + TEST_f_f (floor, 72057594037927936.5L, 72057594037927936.0L); +@@ -3971,6 +4019,12 @@ rint_test (void) + TEST_f_f (rint, -2.5, -2.0); + TEST_f_f (rint, -3.5, -4.0); + TEST_f_f (rint, -4.5, -4.0); ++ TEST_f_f (rint, 0.1, 0.0); ++ TEST_f_f (rint, 0.25, 0.0); ++ TEST_f_f (rint, 0.625, 1.0); ++ TEST_f_f (rint, -0.1, -0.0); ++ TEST_f_f (rint, -0.25, -0.0); ++ TEST_f_f (rint, -0.625, -1.0); + #ifdef TEST_LDOUBLE + /* The result can only be represented in long double. */ + TEST_f_f (rint, 4503599627370495.5L, 4503599627370496.0L); +@@ -3978,12 +4032,34 @@ rint_test (void) + TEST_f_f (rint, 4503599627370496.5L, 4503599627370496.0L); + TEST_f_f (rint, 4503599627370496.75L, 4503599627370497.0L); + TEST_f_f (rint, 4503599627370497.5L, 4503599627370498.0L); ++ ++ TEST_f_f (rint, 4503599627370494.5000000000001L, 4503599627370495.0L); ++ TEST_f_f (rint, 4503599627370495.5000000000001L, 4503599627370496.0L); ++ TEST_f_f (rint, 4503599627370496.5000000000001L, 4503599627370497.0L); + + TEST_f_f (rint, -4503599627370495.5L, -4503599627370496.0L); + TEST_f_f (rint, -4503599627370496.25L, -4503599627370496.0L); + TEST_f_f (rint, -4503599627370496.5L, -4503599627370496.0L); + TEST_f_f (rint, -4503599627370496.75L, -4503599627370497.0L); + TEST_f_f (rint, -4503599627370497.5L, -4503599627370498.0L); ++ ++ TEST_f_f (rint, -4503599627370494.5000000000001L, -4503599627370495.0L); ++ TEST_f_f (rint, -4503599627370495.5000000000001L, -4503599627370496.0L); ++ TEST_f_f (rint, -4503599627370496.5000000000001L, -4503599627370497.0L); ++ ++ TEST_f_f (rint, 9007199254740991.0000000000001L, 9007199254740991.0L); ++ TEST_f_f (rint, 9007199254740992.0000000000001L, 9007199254740992.0L); ++ TEST_f_f (rint, 9007199254740993.0000000000001L, 9007199254740993.0L); ++ TEST_f_f (rint, 9007199254740991.5000000000001L, 9007199254740992.0L); ++ TEST_f_f (rint, 9007199254740992.5000000000001L, 9007199254740993.0L); ++ TEST_f_f (rint, 9007199254740993.5000000000001L, 9007199254740994.0L); ++ ++ TEST_f_f (rint, -9007199254740991.0000000000001L, -9007199254740991.0L); ++ TEST_f_f (rint, -9007199254740992.0000000000001L, -9007199254740992.0L); ++ TEST_f_f (rint, -9007199254740993.0000000000001L, -9007199254740993.0L); ++ TEST_f_f (rint, -9007199254740991.5000000000001L, -9007199254740992.0L); ++ TEST_f_f (rint, -9007199254740992.5000000000001L, -9007199254740993.0L); ++ TEST_f_f (rint, -9007199254740993.5000000000001L, -9007199254740994.0L); + + TEST_f_f (rint, 9007199254740991.5L, 9007199254740992.0L); + TEST_f_f (rint, 9007199254740992.25L, 9007199254740992.0L); +@@ -4039,6 +4115,45 @@ rint_test_tonearest (void) + TEST_f_f (rint, -1.0, -1.0); + TEST_f_f (rint, -1.5, -2.0); + TEST_f_f (rint, -2.0, -2.0); ++ TEST_f_f (rint, 0.1, 0.0); ++ TEST_f_f (rint, 0.25, 0.0); ++ TEST_f_f (rint, 0.625, 1.0); ++ TEST_f_f (rint, -0.1, -0.0); ++ TEST_f_f (rint, -0.25, -0.0); ++ TEST_f_f (rint, -0.625, -1.0); ++#ifdef TEST_LDOUBLE ++ /* The result can only be represented in long double. */ ++ TEST_f_f (rint, 4503599627370495.5L, 4503599627370496.0L); ++ TEST_f_f (rint, 4503599627370496.25L, 4503599627370496.0L); ++ TEST_f_f (rint, 4503599627370496.5L, 4503599627370496.0L); ++ TEST_f_f (rint, 4503599627370496.75L, 4503599627370497.0L); ++ TEST_f_f (rint, 4503599627370497.5L, 4503599627370498.0L); ++ TEST_f_f (rint, 4503599627370494.5000000000001L, 4503599627370495.0L); ++ TEST_f_f (rint, 4503599627370495.5000000000001L, 4503599627370496.0L); ++ TEST_f_f (rint, 4503599627370496.5000000000001L, 4503599627370497.0L); ++ TEST_f_f (rint, -4503599627370495.5L, -4503599627370496.0L); ++ TEST_f_f (rint, -4503599627370496.25L, -4503599627370496.0L); ++ TEST_f_f (rint, -4503599627370496.5L, -4503599627370496.0L); ++ TEST_f_f (rint, -4503599627370496.75L, -4503599627370497.0L); ++ TEST_f_f (rint, -4503599627370497.5L, -4503599627370498.0L); ++ TEST_f_f (rint, -4503599627370494.5000000000001L, -4503599627370495.0L); ++ TEST_f_f (rint, -4503599627370495.5000000000001L, -4503599627370496.0L); ++ TEST_f_f (rint, -4503599627370496.5000000000001L, -4503599627370497.0L); ++ ++ TEST_f_f (rint, 9007199254740991.0000000000001L, 9007199254740991.0L); ++ TEST_f_f (rint, 9007199254740992.0000000000001L, 9007199254740992.0L); ++ TEST_f_f (rint, 9007199254740993.0000000000001L, 9007199254740993.0L); ++ TEST_f_f (rint, 9007199254740991.5000000000001L, 9007199254740992.0L); ++ TEST_f_f (rint, 9007199254740992.5000000000001L, 9007199254740993.0L); ++ TEST_f_f (rint, 9007199254740993.5000000000001L, 9007199254740994.0L); ++ ++ TEST_f_f (rint, -9007199254740991.0000000000001L, -9007199254740991.0L); ++ TEST_f_f (rint, -9007199254740992.0000000000001L, -9007199254740992.0L); ++ TEST_f_f (rint, -9007199254740993.0000000000001L, -9007199254740993.0L); ++ TEST_f_f (rint, -9007199254740991.5000000000001L, -9007199254740992.0L); ++ TEST_f_f (rint, -9007199254740992.5000000000001L, -9007199254740993.0L); ++ TEST_f_f (rint, -9007199254740993.5000000000001L, -9007199254740994.0L); ++#endif + } + + fesetround(save_round_mode); +@@ -4066,6 +4181,45 @@ rint_test_towardzero (void) + TEST_f_f (rint, -1.0, -1.0); + TEST_f_f (rint, -1.5, -1.0); + TEST_f_f (rint, -2.0, -2.0); ++ TEST_f_f (rint, 0.1, 0.0); ++ TEST_f_f (rint, 0.25, 0.0); ++ TEST_f_f (rint, 0.625, 0.0); ++ TEST_f_f (rint, -0.1, -0.0); ++ TEST_f_f (rint, -0.25, -0.0); ++ TEST_f_f (rint, -0.625, -0.0); ++#ifdef TEST_LDOUBLE ++ /* The result can only be represented in long double. */ ++ TEST_f_f (rint, 4503599627370495.5L, 4503599627370495.0L); ++ TEST_f_f (rint, 4503599627370496.25L, 4503599627370496.0L); ++ TEST_f_f (rint, 4503599627370496.5L, 4503599627370496.0L); ++ TEST_f_f (rint, 4503599627370496.75L, 4503599627370496.0L); ++ TEST_f_f (rint, 4503599627370497.5L, 4503599627370497.0L); ++ TEST_f_f (rint, 4503599627370494.5000000000001L, 4503599627370494.0L); ++ TEST_f_f (rint, 4503599627370495.5000000000001L, 4503599627370495.0L); ++ TEST_f_f (rint, 4503599627370496.5000000000001L, 4503599627370496.0L); ++ TEST_f_f (rint, -4503599627370495.5L, -4503599627370495.0L); ++ TEST_f_f (rint, -4503599627370496.25L, -4503599627370496.0L); ++ TEST_f_f (rint, -4503599627370496.5L, -4503599627370496.0L); ++ TEST_f_f (rint, -4503599627370496.75L, -4503599627370496.0L); ++ TEST_f_f (rint, -4503599627370497.5L, -4503599627370497.0L); ++ TEST_f_f (rint, -4503599627370494.5000000000001L, -4503599627370494.0L); ++ TEST_f_f (rint, -4503599627370495.5000000000001L, -4503599627370495.0L); ++ TEST_f_f (rint, -4503599627370496.5000000000001L, -4503599627370496.0L); ++ ++ TEST_f_f (rint, 9007199254740991.0000000000001L, 9007199254740991.0L); ++ TEST_f_f (rint, 9007199254740992.0000000000001L, 9007199254740992.0L); ++ TEST_f_f (rint, 9007199254740993.0000000000001L, 9007199254740993.0L); ++ TEST_f_f (rint, 9007199254740991.5000000000001L, 9007199254740991.0L); ++ TEST_f_f (rint, 9007199254740992.5000000000001L, 9007199254740992.0L); ++ TEST_f_f (rint, 9007199254740993.5000000000001L, 9007199254740993.0L); ++ ++ TEST_f_f (rint, -9007199254740991.0000000000001L, -9007199254740991.0L); ++ TEST_f_f (rint, -9007199254740992.0000000000001L, -9007199254740992.0L); ++ TEST_f_f (rint, -9007199254740993.0000000000001L, -9007199254740993.0L); ++ TEST_f_f (rint, -9007199254740991.5000000000001L, -9007199254740991.0L); ++ TEST_f_f (rint, -9007199254740992.5000000000001L, -9007199254740992.0L); ++ TEST_f_f (rint, -9007199254740993.5000000000001L, -9007199254740993.0L); ++#endif + } + + fesetround(save_round_mode); +@@ -4093,6 +4247,45 @@ rint_test_downward (void) + TEST_f_f (rint, -1.0, -1.0); + TEST_f_f (rint, -1.5, -2.0); + TEST_f_f (rint, -2.0, -2.0); ++ TEST_f_f (rint, 0.1, 0.0); ++ TEST_f_f (rint, 0.25, 0.0); ++ TEST_f_f (rint, 0.625, 0.0); ++ TEST_f_f (rint, -0.1, -1.0); ++ TEST_f_f (rint, -0.25, -1.0); ++ TEST_f_f (rint, -0.625, -1.0); ++#ifdef TEST_LDOUBLE ++ /* The result can only be represented in long double. */ ++ TEST_f_f (rint, 4503599627370495.5L, 4503599627370495.0L); ++ TEST_f_f (rint, 4503599627370496.25L, 4503599627370496.0L); ++ TEST_f_f (rint, 4503599627370496.5L, 4503599627370496.0L); ++ TEST_f_f (rint, 4503599627370496.75L, 4503599627370496.0L); ++ TEST_f_f (rint, 4503599627370497.5L, 4503599627370497.0L); ++ TEST_f_f (rint, 4503599627370494.5000000000001L, 4503599627370494.0L); ++ TEST_f_f (rint, 4503599627370495.5000000000001L, 4503599627370495.0L); ++ TEST_f_f (rint, 4503599627370496.5000000000001L, 4503599627370496.0L); ++ TEST_f_f (rint, -4503599627370495.5L, -4503599627370496.0L); ++ TEST_f_f (rint, -4503599627370496.25L, -4503599627370497.0L); ++ TEST_f_f (rint, -4503599627370496.5L, -4503599627370497.0L); ++ TEST_f_f (rint, -4503599627370496.75L, -4503599627370497.0L); ++ TEST_f_f (rint, -4503599627370497.5L, -4503599627370498.0L); ++ TEST_f_f (rint, -4503599627370494.5000000000001L, -4503599627370495.0L); ++ TEST_f_f (rint, -4503599627370495.5000000000001L, -4503599627370496.0L); ++ TEST_f_f (rint, -4503599627370496.5000000000001L, -4503599627370497.0L); ++ ++ TEST_f_f (rint, 9007199254740991.0000000000001L, 9007199254740991.0L); ++ TEST_f_f (rint, 9007199254740992.0000000000001L, 9007199254740992.0L); ++ TEST_f_f (rint, 9007199254740993.0000000000001L, 9007199254740993.0L); ++ TEST_f_f (rint, 9007199254740991.5000000000001L, 9007199254740991.0L); ++ TEST_f_f (rint, 9007199254740992.5000000000001L, 9007199254740992.0L); ++ TEST_f_f (rint, 9007199254740993.5000000000001L, 9007199254740993.0L); ++ ++ TEST_f_f (rint, -9007199254740991.0000000000001L, -9007199254740992.0L); ++ TEST_f_f (rint, -9007199254740992.0000000000001L, -9007199254740993.0L); ++ TEST_f_f (rint, -9007199254740993.0000000000001L, -9007199254740994.0L); ++ TEST_f_f (rint, -9007199254740991.5000000000001L, -9007199254740992.0L); ++ TEST_f_f (rint, -9007199254740992.5000000000001L, -9007199254740993.0L); ++ TEST_f_f (rint, -9007199254740993.5000000000001L, -9007199254740994.0L); ++#endif + } + + fesetround(save_round_mode); +@@ -4120,6 +4313,45 @@ rint_test_upward (void) + TEST_f_f (rint, -1.0, -1.0); + TEST_f_f (rint, -1.5, -1.0); + TEST_f_f (rint, -2.0, -2.0); ++ TEST_f_f (rint, 0.1, 1.0); ++ TEST_f_f (rint, 0.25, 1.0); ++ TEST_f_f (rint, 0.625, 1.0); ++ TEST_f_f (rint, -0.1, -0.0); ++ TEST_f_f (rint, -0.25, -0.0); ++ TEST_f_f (rint, -0.625, -0.0); ++#ifdef TEST_LDOUBLE ++ /* The result can only be represented in long double. */ ++ TEST_f_f (rint, 4503599627370495.5L, 4503599627370496.0L); ++ TEST_f_f (rint, 4503599627370496.25L, 4503599627370497.0L); ++ TEST_f_f (rint, 4503599627370496.5L, 4503599627370497.0L); ++ TEST_f_f (rint, 4503599627370496.75L, 4503599627370497.0L); ++ TEST_f_f (rint, 4503599627370497.5L, 4503599627370498.0L); ++ TEST_f_f (rint, 4503599627370494.5000000000001L, 4503599627370495.0L); ++ TEST_f_f (rint, 4503599627370495.5000000000001L, 4503599627370496.0L); ++ TEST_f_f (rint, 4503599627370496.5000000000001L, 4503599627370497.0L); ++ TEST_f_f (rint, -4503599627370495.5L, -4503599627370495.0L); ++ TEST_f_f (rint, -4503599627370496.25L, -4503599627370496.0L); ++ TEST_f_f (rint, -4503599627370496.5L, -4503599627370496.0L); ++ TEST_f_f (rint, -4503599627370496.75L, -4503599627370496.0L); ++ TEST_f_f (rint, -4503599627370497.5L, -4503599627370497.0L); ++ TEST_f_f (rint, -4503599627370494.5000000000001L, -4503599627370494.0L); ++ TEST_f_f (rint, -4503599627370495.5000000000001L, -4503599627370495.0L); ++ TEST_f_f (rint, -4503599627370496.5000000000001L, -4503599627370496.0L); ++ ++ TEST_f_f (rint, 9007199254740991.0000000000001L, 9007199254740992.0L); ++ TEST_f_f (rint, 9007199254740992.0000000000001L, 9007199254740993.0L); ++ TEST_f_f (rint, 9007199254740993.0000000000001L, 9007199254740994.0L); ++ TEST_f_f (rint, 9007199254740991.5000000000001L, 9007199254740992.0L); ++ TEST_f_f (rint, 9007199254740992.5000000000001L, 9007199254740993.0L); ++ TEST_f_f (rint, 9007199254740993.5000000000001L, 9007199254740994.0L); ++ ++ TEST_f_f (rint, -9007199254740991.0000000000001L, -9007199254740991.0L); ++ TEST_f_f (rint, -9007199254740992.0000000000001L, -9007199254740992.0L); ++ TEST_f_f (rint, -9007199254740993.0000000000001L, -9007199254740993.0L); ++ TEST_f_f (rint, -9007199254740991.5000000000001L, -9007199254740991.0L); ++ TEST_f_f (rint, -9007199254740992.5000000000001L, -9007199254740992.0L); ++ TEST_f_f (rint, -9007199254740993.5000000000001L, -9007199254740993.0L); ++#endif + } + + fesetround(save_round_mode); +@@ -4142,6 +4374,12 @@ round_test (void) + TEST_f_f (round, -0.8L, -1.0); + TEST_f_f (round, 1.5, 2.0); + TEST_f_f (round, -1.5, -2.0); ++ TEST_f_f (round, 0.1, 0.0); ++ TEST_f_f (round, 0.25, 0.0); ++ TEST_f_f (round, 0.625, 1.0); ++ TEST_f_f (round, -0.1, -0.0); ++ TEST_f_f (round, -0.25, -0.0); ++ TEST_f_f (round, -0.625, -1.0); + TEST_f_f (round, 2097152.5, 2097153); + TEST_f_f (round, -2097152.5, -2097153); + +@@ -4151,13 +4389,19 @@ round_test (void) + TEST_f_f (round, 4503599627370496.25L, 4503599627370496.0L); + TEST_f_f (round, 4503599627370496.5L, 4503599627370497.0L); + TEST_f_f (round, 4503599627370496.75L, 4503599627370497.0L); +- TEST_f_f (round, 4503599627370497.5L, 4503599627370498.0L); ++ TEST_f_f (round, 4503599627370497.5L, 4503599627370498.0L); ++ TEST_f_f (round, 4503599627370494.5000000000001L, 4503599627370495.0L); ++ TEST_f_f (round, 4503599627370495.5000000000001L, 4503599627370496.0L); ++ TEST_f_f (round, 4503599627370496.5000000000001L, 4503599627370497.0L); + + TEST_f_f (round, -4503599627370495.5L, -4503599627370496.0L); + TEST_f_f (round, -4503599627370496.25L, -4503599627370496.0L); + TEST_f_f (round, -4503599627370496.5L, -4503599627370497.0L); + TEST_f_f (round, -4503599627370496.75L, -4503599627370497.0L); + TEST_f_f (round, -4503599627370497.5L, -4503599627370498.0L); ++ TEST_f_f (round, -4503599627370494.5000000000001L, -4503599627370495.0L); ++ TEST_f_f (round, -4503599627370495.5000000000001L, -4503599627370496.0L); ++ TEST_f_f (round, -4503599627370496.5000000000001L, -4503599627370497.0L); + + TEST_f_f (round, 9007199254740991.5L, 9007199254740992.0L); + TEST_f_f (round, 9007199254740992.25L, 9007199254740992.0L); +@@ -4171,6 +4415,20 @@ round_test (void) + TEST_f_f (round, -9007199254740992.75L, -9007199254740993.0L); + TEST_f_f (round, -9007199254740993.5L, -9007199254740994.0L); + ++ TEST_f_f (round, 9007199254740991.0000000000001L, 9007199254740991.0L); ++ TEST_f_f (round, 9007199254740992.0000000000001L, 9007199254740992.0L); ++ TEST_f_f (round, 9007199254740993.0000000000001L, 9007199254740993.0L); ++ TEST_f_f (round, 9007199254740991.5000000000001L, 9007199254740992.0L); ++ TEST_f_f (round, 9007199254740992.5000000000001L, 9007199254740993.0L); ++ TEST_f_f (round, 9007199254740993.5000000000001L, 9007199254740994.0L); ++ ++ TEST_f_f (round, -9007199254740991.0000000000001L, -9007199254740991.0L); ++ TEST_f_f (round, -9007199254740992.0000000000001L, -9007199254740992.0L); ++ TEST_f_f (round, -9007199254740993.0000000000001L, -9007199254740993.0L); ++ TEST_f_f (round, -9007199254740991.5000000000001L, -9007199254740992.0L); ++ TEST_f_f (round, -9007199254740992.5000000000001L, -9007199254740993.0L); ++ TEST_f_f (round, -9007199254740993.5000000000001L, -9007199254740994.0L); ++ + TEST_f_f (round, 72057594037927935.5L, 72057594037927936.0L); + TEST_f_f (round, 72057594037927936.25L, 72057594037927936.0L); + TEST_f_f (round, 72057594037927936.5L, 72057594037927937.0L); +@@ -4541,7 +4799,11 @@ trunc_test (void) + + TEST_f_f (trunc, 0, 0); + TEST_f_f (trunc, minus_zero, minus_zero); ++ TEST_f_f (trunc, 0.1, 0); ++ TEST_f_f (trunc, 0.25, 0); + TEST_f_f (trunc, 0.625, 0); ++ TEST_f_f (trunc, -0.1, minus_zero); ++ TEST_f_f (trunc, -0.25, minus_zero); + TEST_f_f (trunc, -0.625, minus_zero); + TEST_f_f (trunc, 1, 1); + TEST_f_f (trunc, -1, -1); +@@ -4565,11 +4827,19 @@ trunc_test (void) + TEST_f_f (trunc, 4503599627370496.75L, 4503599627370496.0L); + TEST_f_f (trunc, 4503599627370497.5L, 4503599627370497.0L); + ++ TEST_f_f (trunc, 4503599627370494.5000000000001L, 4503599627370494.0L); ++ TEST_f_f (trunc, 4503599627370495.5000000000001L, 4503599627370495.0L); ++ TEST_f_f (trunc, 4503599627370496.5000000000001L, 4503599627370496.0L); ++ + TEST_f_f (trunc, -4503599627370495.5L, -4503599627370495.0L); + TEST_f_f (trunc, -4503599627370496.25L, -4503599627370496.0L); + TEST_f_f (trunc, -4503599627370496.5L, -4503599627370496.0L); + TEST_f_f (trunc, -4503599627370496.75L, -4503599627370496.0L); + TEST_f_f (trunc, -4503599627370497.5L, -4503599627370497.0L); ++ ++ TEST_f_f (trunc, -4503599627370494.5000000000001L, -4503599627370494.0L); ++ TEST_f_f (trunc, -4503599627370495.5000000000001L, -4503599627370495.0L); ++ TEST_f_f (trunc, -4503599627370496.5000000000001L, -4503599627370496.0L); + + TEST_f_f (trunc, 9007199254740991.5L, 9007199254740991.0L); + TEST_f_f (trunc, 9007199254740992.25L, 9007199254740992.0L); +@@ -4577,12 +4847,26 @@ trunc_test (void) + TEST_f_f (trunc, 9007199254740992.75L, 9007199254740992.0L); + TEST_f_f (trunc, 9007199254740993.5L, 9007199254740993.0L); + ++ TEST_f_f (trunc, 9007199254740991.0000000000001L, 9007199254740991.0L); ++ TEST_f_f (trunc, 9007199254740992.0000000000001L, 9007199254740992.0L); ++ TEST_f_f (trunc, 9007199254740993.0000000000001L, 9007199254740993.0L); ++ TEST_f_f (trunc, 9007199254740991.5000000000001L, 9007199254740991.0L); ++ TEST_f_f (trunc, 9007199254740992.5000000000001L, 9007199254740992.0L); ++ TEST_f_f (trunc, 9007199254740993.5000000000001L, 9007199254740993.0L); ++ + TEST_f_f (trunc, -9007199254740991.5L, -9007199254740991.0L); + TEST_f_f (trunc, -9007199254740992.25L, -9007199254740992.0L); + TEST_f_f (trunc, -9007199254740992.5L, -9007199254740992.0L); + TEST_f_f (trunc, -9007199254740992.75L, -9007199254740992.0L); + TEST_f_f (trunc, -9007199254740993.5L, -9007199254740993.0L); + ++ TEST_f_f (trunc, -9007199254740991.0000000000001L, -9007199254740991.0L); ++ TEST_f_f (trunc, -9007199254740992.0000000000001L, -9007199254740992.0L); ++ TEST_f_f (trunc, -9007199254740993.0000000000001L, -9007199254740993.0L); ++ TEST_f_f (trunc, -9007199254740991.5000000000001L, -9007199254740991.0L); ++ TEST_f_f (trunc, -9007199254740992.5000000000001L, -9007199254740992.0L); ++ TEST_f_f (trunc, -9007199254740993.5000000000001L, -9007199254740993.0L); ++ + TEST_f_f (trunc, 72057594037927935.5L, 72057594037927935.0L); + TEST_f_f (trunc, 72057594037927936.25L, 72057594037927936.0L); + TEST_f_f (trunc, 72057594037927936.5L, 72057594037927936.0L); --- glibc-20060306T1239/nptl/ChangeLog 6 Mar 2006 01:41:08 -0000 1.879 +++ glibc-20060306T1239-fedora/nptl/ChangeLog 6 Mar 2006 07:29:58 -0000 1.706.2.83 @@ -731,6 +731,15 @@ @@ -3035,6 +3529,1393 @@ +symbol_version (INTUSE (__multi3), __multi3, GLIBC_2.2); + +#endif +--- glibc-20060306T1239/sysdeps/ieee754/ldbl-128ibm/e_fmodl.c 28 Jan 2006 00:07:25 -0000 1.1 ++++ glibc-20060306T1239-fedora/sysdeps/ieee754/ldbl-128ibm/e_fmodl.c 7 Mar 2006 08:24:12 -0000 1.1.2.2 +@@ -76,8 +76,8 @@ static long double one = 1.0, Zero[] = { + /* Make the IBM extended format 105 bit mantissa look like the ieee854 112 + bit mantissa so the following operatations will give the correct + result. */ +- EXTRACT_IBM_EXTENDED_MANTISSA(hx, lx, temp, x); +- EXTRACT_IBM_EXTENDED_MANTISSA(hy, ly, temp, y); ++ ldbl_extract_mantissa(&hx, &lx, &temp, x); ++ ldbl_extract_mantissa(&hy, &ly, &temp, y); + + /* set up {hx,lx}, {hy,ly} and align y to x */ + if(ix >= -1022) +@@ -127,7 +127,7 @@ static long double one = 1.0, Zero[] = { + iy -= 1; + } + if(iy>= -1022) { /* normalize output */ +- INSERT_IBM_EXTENDED_MANTISSA(x, (sx>>63), iy, hx, lx); ++ x = ldbl_insert_mantissa((sx>>63), iy, hx, lx); + } else { /* subnormal output */ + n = -1022 - iy; + if(n<=48) { +@@ -138,7 +138,7 @@ static long double one = 1.0, Zero[] = { + } else { + lx = hx>>(n-64); hx = sx; + } +- INSERT_IBM_EXTENDED_MANTISSA(x, (sx>>63), iy, hx, lx); ++ x = ldbl_insert_mantissa((sx>>63), iy, hx, lx); + x *= one; /* create necessary signal */ + } + return x; /* exact output */ +--- glibc-20060306T1239/sysdeps/ieee754/ldbl-128ibm/e_rem_pio2l.c 28 Jan 2006 00:07:25 -0000 1.1 ++++ glibc-20060306T1239-fedora/sysdeps/ieee754/ldbl-128ibm/e_rem_pio2l.c 7 Mar 2006 08:24:12 -0000 1.1.2.2 +@@ -199,7 +199,8 @@ int32_t __ieee754_rem_pio2l(long double + { + long double z, w, t; + double tx[8]; +- int64_t exp, n, ix, hx, ixd; ++ int exp; ++ int64_t n, ix, hx, ixd; + u_int64_t lx, lxd; + + GET_LDOUBLE_WORDS64 (hx, lx, x); +@@ -243,7 +244,7 @@ int32_t __ieee754_rem_pio2l(long double + stored in a double array. */ + /* Make the IBM extended format 105 bit mantissa look like the ieee854 112 + bit mantissa so the next operatation will give the correct result. */ +- EXTRACT_IBM_EXTENDED_MANTISSA (ixd, lxd, exp, x); ++ ldbl_extract_mantissa (&ixd, &lxd, &exp, x); + exp = exp - 23; + /* This is faster than doing this in floating point, because we + have to convert it to integers anyway and like this we can keep +--- glibc-20060306T1239/sysdeps/ieee754/ldbl-128ibm/math_ldbl.h 28 Jan 2006 00:07:25 -0000 1.1 ++++ glibc-20060306T1239-fedora/sysdeps/ieee754/ldbl-128ibm/math_ldbl.h 7 Mar 2006 08:24:12 -0000 1.1.2.2 +@@ -3,122 +3,179 @@ + #endif + + #include ++#include ++ ++static inline void ++ldbl_extract_mantissa (int64_t *hi64, u_int64_t *lo64, int *exp, long double x) ++{ ++ /* We have 105 bits of mantissa plus one implicit digit. Since ++ 106 bits are representable we use the first implicit digit for ++ the number before the decimal point and the second implicit bit ++ as bit 53 of the mantissa. */ ++ unsigned long long hi, lo; ++ int ediff; ++ union ibm_extended_long_double eldbl; ++ eldbl.d = x; ++ *exp = eldbl.ieee.exponent - IBM_EXTENDED_LONG_DOUBLE_BIAS; + +-#define EXTRACT_IBM_EXTENDED_MANTISSA(hi64, lo64, expnt, ibm_ext_ldbl) \ +- do \ +- { \ +- /* We have 105 bits of mantissa plus one implicit digit. Since \ +- 106 bits are representable without the rest using hexadecimal \ +- digits we use only the implicit digits for the number before \ +- the decimal point. */ \ +- unsigned long long hi, lo; \ +- int ediff; \ +- union ibm_extended_long_double eldbl; \ +- eldbl.d = ibm_ext_ldbl; \ +- expnt = eldbl.ieee.exponent - IBM_EXTENDED_LONG_DOUBLE_BIAS; \ +- \ +- lo = ((long long)eldbl.ieee.mantissa2 << 32) | eldbl.ieee.mantissa3; \ +- hi = ((long long)eldbl.ieee.mantissa0 << 32) | eldbl.ieee.mantissa1; \ +- /* If the lower double is not a denomal or zero then set the hidden \ +- 53rd bit. */ \ +- if (eldbl.ieee.exponent2 > 0x001) \ +- { \ +- lo |= (1ULL << 52); \ +- lo = lo << 7; /* pre-shift lo to match ieee854. */ \ +- /* The lower double is normalized separately from the upper. We \ +- may need to adjust the lower manitissa to reflect this. */ \ +- ediff = eldbl.ieee.exponent - eldbl.ieee.exponent2; \ +- if (ediff > 53) \ +- lo = lo >> (ediff-53); \ +- } \ +- hi |= (1ULL << 52); \ +- \ +- if ((eldbl.ieee.negative != eldbl.ieee.negative2) \ +- && ((eldbl.ieee.exponent2 != 0) && (lo != 0LL))) \ +- { \ +- hi--; \ +- lo = (1ULL << 60) - lo; \ +- if (hi < (1ULL << 52)) \ +- { \ +- /* we have a borrow from the hidden bit, so shift left 1. */ \ +- hi = (hi << 1) | (lo >> 59); \ +- lo = 0xfffffffffffffffLL & (lo << 1); \ +- expnt--; \ +- } \ +- } \ +- lo64 = (hi << 60) | lo; \ +- hi64 = hi >> 4; \ +- } \ +- while (0) +- +-#define INSERT_IBM_EXTENDED_MANTISSA(ibm_ext_ldbl, sign, expnt, hi64, lo64) \ +- do \ +- { \ +- union ibm_extended_long_double u; \ +- unsigned long hidden2, lzcount; \ +- unsigned long long hi, lo; \ +- \ +- u.ieee.negative = sign; \ +- u.ieee.negative2 = sign; \ +- u.ieee.exponent = expnt + IBM_EXTENDED_LONG_DOUBLE_BIAS; \ +- u.ieee.exponent2 = expnt-53 + IBM_EXTENDED_LONG_DOUBLE_BIAS; \ +- /* Expect 113 bits (112 bits + hidden) right justified in two longs. \ +- The low order 53 bits (52 + hidden) go into the lower double */ \ +- lo = (lo64 >> 7)& ((1ULL << 53) - 1); \ +- hidden2 = (lo64 >> 59) & 1ULL; \ +- /* The high order 53 bits (52 + hidden) go into the upper double */ \ +- hi = (lo64 >> 60) & ((1ULL << 11) - 1); \ +- hi |= (hi64 << 4); \ +- \ +- if (lo != 0LL) \ +- { \ +- /* hidden2 bit of low double controls rounding of the high double. \ +- If hidden2 is '1' then round up hi and adjust lo (2nd mantissa) \ +- plus change the sign of the low double to compensate. */ \ +- if (hidden2) \ +- { \ +- hi++; \ +- u.ieee.negative2 = !sign; \ +- lo = (1ULL << 53) - lo; \ +- } \ +- /* The hidden bit of the lo mantissa is zero so we need to \ +- normalize the it for the low double. Shift it left until the \ +- hidden bit is '1' then adjust the 2nd exponent accordingly. */ \ +- \ +- if (sizeof (lo) == sizeof (long)) \ +- lzcount = __builtin_clzl (lo); \ +- else if ((lo >> 32) != 0) \ +- lzcount = __builtin_clzl ((long) (lo >> 32)); \ +- else \ +- lzcount = __builtin_clzl ((long) lo) + 32; \ +- lzcount = lzcount - 11; \ +- if (lzcount > 0) \ +- { \ +- int expnt2 = u.ieee.exponent2 - lzcount; \ +- if (expnt2 >= 1) \ +- { \ +- /* Not denormal. Normalize and set low exponent. */ \ +- lo = lo << lzcount; \ +- u.ieee.exponent2 = expnt2; \ +- } \ +- else \ +- { \ +- /* Is denormal. */ \ +- lo = lo << (lzcount + expnt2); \ +- u.ieee.exponent2 = 0; \ +- } \ +- } \ +- } \ +- else \ +- { \ +- u.ieee.negative2 = 0; \ +- u.ieee.exponent2 = 0; \ +- } \ +- \ +- u.ieee.mantissa3 = lo & ((1ULL << 32) - 1); \ +- u.ieee.mantissa2 = (lo >> 32) & ((1ULL << 20) - 1); \ +- u.ieee.mantissa1 = hi & ((1ULL << 32) - 1); \ +- u.ieee.mantissa0 = (hi >> 32) & ((1ULL << 20) - 1); \ +- ibm_ext_ldbl = u.d; \ +- } \ +- while (0) ++ lo = ((long long)eldbl.ieee.mantissa2 << 32) | eldbl.ieee.mantissa3; ++ hi = ((long long)eldbl.ieee.mantissa0 << 32) | eldbl.ieee.mantissa1; ++ /* If the lower double is not a denomal or zero then set the hidden ++ 53rd bit. */ ++ if (eldbl.ieee.exponent2 > 0x001) ++ { ++ lo |= (1ULL << 52); ++ lo = lo << 7; /* pre-shift lo to match ieee854. */ ++ /* The lower double is normalized separately from the upper. We ++ may need to adjust the lower manitissa to reflect this. */ ++ ediff = eldbl.ieee.exponent - eldbl.ieee.exponent2; ++ if (ediff > 53) ++ lo = lo >> (ediff-53); ++ } ++ hi |= (1ULL << 52); ++ ++ if ((eldbl.ieee.negative != eldbl.ieee.negative2) ++ && ((eldbl.ieee.exponent2 != 0) && (lo != 0LL))) ++ { ++ hi--; ++ lo = (1ULL << 60) - lo; ++ if (hi < (1ULL << 52)) ++ { ++ /* we have a borrow from the hidden bit, so shift left 1. */ ++ hi = (hi << 1) | (lo >> 59); ++ lo = 0xfffffffffffffffLL & (lo << 1); ++ *exp = *exp - 1; ++ } ++ } ++ *lo64 = (hi << 60) | lo; ++ *hi64 = hi >> 4; ++} ++ ++static inline long double ++ldbl_insert_mantissa (int sign, int exp, int64_t hi64, u_int64_t lo64) ++{ ++ union ibm_extended_long_double u; ++ unsigned long hidden2, lzcount; ++ unsigned long long hi, lo; ++ ++ u.ieee.negative = sign; ++ u.ieee.negative2 = sign; ++ u.ieee.exponent = exp + IBM_EXTENDED_LONG_DOUBLE_BIAS; ++ u.ieee.exponent2 = exp-53 + IBM_EXTENDED_LONG_DOUBLE_BIAS; ++ /* Expect 113 bits (112 bits + hidden) right justified in two longs. ++ The low order 53 bits (52 + hidden) go into the lower double */ ++ lo = (lo64 >> 7)& ((1ULL << 53) - 1); ++ hidden2 = (lo64 >> 59) & 1ULL; ++ /* The high order 53 bits (52 + hidden) go into the upper double */ ++ hi = (lo64 >> 60) & ((1ULL << 11) - 1); ++ hi |= (hi64 << 4); ++ ++ if (lo != 0LL) ++ { ++ /* hidden2 bit of low double controls rounding of the high double. ++ If hidden2 is '1' then round up hi and adjust lo (2nd mantissa) ++ plus change the sign of the low double to compensate. */ ++ if (hidden2) ++ { ++ hi++; ++ u.ieee.negative2 = !sign; ++ lo = (1ULL << 53) - lo; ++ } ++ /* The hidden bit of the lo mantissa is zero so we need to ++ normalize the it for the low double. Shift it left until the ++ hidden bit is '1' then adjust the 2nd exponent accordingly. */ ++ ++ if (sizeof (lo) == sizeof (long)) ++ lzcount = __builtin_clzl (lo); ++ else if ((lo >> 32) != 0) ++ lzcount = __builtin_clzl ((long) (lo >> 32)); ++ else ++ lzcount = __builtin_clzl ((long) lo) + 32; ++ lzcount = lzcount - 11; ++ if (lzcount > 0) ++ { ++ int expnt2 = u.ieee.exponent2 - lzcount; ++ if (expnt2 >= 1) ++ { ++ /* Not denormal. Normalize and set low exponent. */ ++ lo = lo << lzcount; ++ u.ieee.exponent2 = expnt2; ++ } ++ else ++ { ++ /* Is denormal. */ ++ lo = lo << (lzcount + expnt2); ++ u.ieee.exponent2 = 0; ++ } ++ } ++ } ++ else ++ { ++ u.ieee.negative2 = 0; ++ u.ieee.exponent2 = 0; ++ } ++ ++ u.ieee.mantissa3 = lo & ((1ULL << 32) - 1); ++ u.ieee.mantissa2 = (lo >> 32) & ((1ULL << 20) - 1); ++ u.ieee.mantissa1 = hi & ((1ULL << 32) - 1); ++ u.ieee.mantissa0 = (hi >> 32) & ((1ULL << 20) - 1); ++ return u.d; ++} ++ ++/* Handy utility functions to pack/unpack/cononicalize and find the nearbyint ++ of long double implemented as double double. */ ++static inline long double ++ldbl_pack (double a, double aa) ++{ ++ union ibm_extended_long_double u; ++ u.dd[0] = a; ++ u.dd[1] = aa; ++ return u.d; ++} ++ ++static inline void ++ldbl_unpack (long double l, double *a, double *aa) ++{ ++ union ibm_extended_long_double u; ++ u.d = l; ++ *a = u.dd[0]; ++ *aa = u.dd[1]; ++} ++ ++ ++/* Convert a finite long double to canonical form. ++ Does not handle +/-Inf properly. */ ++static inline void ++ldbl_canonicalize (double *a, double *aa) ++{ ++ double xh, xl; ++ ++ xh = *a + *aa; ++ xl = (*a - xh) + *aa; ++ *a = xh; ++ *aa = xl; ++} ++ ++/* Simple inline nearbyint (double) function . ++ Only works in the default rounding mode ++ but is useful in long double rounding functions. */ ++static inline double ++ldbl_nearbyint (double a) ++{ ++ double two52 = 0x10000000000000LL; ++ ++ if (__builtin_expect ((__builtin_fabs (a) < two52), 1)) ++ { ++ if (__builtin_expect ((a > 0.0), 1)) ++ { ++ a += two52; ++ a -= two52; ++ } ++ else if (__builtin_expect ((a < 0.0), 1)) ++ { ++ a = two52 - a; ++ a = -(a - two52); ++ } ++ } ++ return a; ++} +--- glibc-20060306T1239/sysdeps/ieee754/ldbl-128ibm/s_ceill.c 31 Jan 2006 18:56:23 -0000 1.2 ++++ glibc-20060306T1239-fedora/sysdeps/ieee754/ldbl-128ibm/s_ceill.c 7 Mar 2006 08:24:12 -0000 1.1.2.3 +@@ -19,7 +19,7 @@ + 02111-1307 USA. */ + + #include +-#include ++#include + #include + #include + #include +@@ -34,87 +34,58 @@ __ceill (x) + long double x; + #endif + { +- static const double TWO52 = 4503599627370496.0L; +- int mode = fegetround(); +- union ibm_extended_long_double u; ++ double xh, xl, hi, lo; + +- u.d = x; ++ ldbl_unpack (x, &xh, &xl); + +- if (fabs (u.dd[0]) < TWO52) ++ /* Return Inf, Nan, +/-0 unchanged. */ ++ if (__builtin_expect (xh != 0.0 ++ && __builtin_isless (__builtin_fabs (xh), ++ __builtin_inf ()), 1)) + { +- double high = u.dd[0]; +- fesetround(FE_UPWARD); +- if (high > 0.0) +- { +- high += TWO52; +- high -= TWO52; +- if (high == -0.0) high = 0.0; +- } +- else if (high < 0.0) +- { +- high -= TWO52; +- high += TWO52; +- if (high == 0.0) high = -0.0; +- } +- u.dd[0] = high; +- u.dd[1] = 0.0; +- fesetround(mode); +- } +- else if (fabs (u.dd[1]) < TWO52 && u.dd[1] != 0.0) +- { +- double high, low; +- /* In this case we have to round the low double and handle any +- adjustment to the high double that may be caused by rounding +- (up). This is complicated by the fact that the high double +- may already be rounded and the low double may have the +- opposite sign to compensate. */ +- if (u.dd[0] > 0.0) +- { +- if (u.dd[1] > 0.0) +- { +- /* If the high/low doubles are the same sign then simply +- round the low double. */ +- high = u.dd[0]; +- low = u.dd[1]; +- } +- else if (u.dd[1] < 0.0) +- { +- /* Else the high double is pre rounded and we need to +- adjust for that. */ +- high = nextafter (u.dd[0], 0.0); +- low = u.dd[1] + (u.dd[0] - high); +- } +- fesetround(FE_UPWARD); +- low += TWO52; +- low -= TWO52; +- fesetround(mode); +- } +- else if (u.dd[0] < 0.0) +- { +- if (u.dd[1] < 0.0) +- { +- /* If the high/low doubles are the same sign then simply +- round the low double. */ +- high = u.dd[0]; +- low = u.dd[1]; +- } +- else if (u.dd[1] > 0.0) +- { +- /* Else the high double is pre rounded and we need to +- adjust for that. */ +- high = nextafter (u.dd[0], 0.0); +- low = u.dd[1] + (u.dd[0] - high); +- } +- fesetround(FE_UPWARD); +- low -= TWO52; +- low += TWO52; +- fesetround(mode); +- } +- u.dd[0] = high + low; +- u.dd[1] = high - u.dd[0] + low; ++ double orig_xh; ++ int save_round = fegetround (); ++ ++ /* Long double arithmetic, including the canonicalisation below, ++ only works in round-to-nearest mode. */ ++ fesetround (FE_TONEAREST); ++ ++ /* Convert the high double to integer. */ ++ orig_xh = xh; ++ hi = ldbl_nearbyint (xh); ++ ++ /* Subtract integral high part from the value. */ ++ xh -= hi; ++ ldbl_canonicalize (&xh, &xl); ++ ++ /* Now convert the low double, adjusted for any remainder from the ++ high double. */ ++ lo = ldbl_nearbyint (xh); ++ ++ /* Adjust the result when the remainder is non-zero. nearbyint ++ rounds values to the nearest integer, and values halfway ++ between integers to the nearest even integer. ceill must ++ round towards +Inf. */ ++ xh -= lo; ++ ldbl_canonicalize (&xh, &xl); ++ ++ if (xh > 0.0 || (xh == 0.0 && xl > 0.0)) ++ lo += 1.0; ++ ++ /* Ensure the final value is canonical. In certain cases, ++ rounding causes hi,lo calculated so far to be non-canonical. */ ++ xh = hi; ++ xl = lo; ++ ldbl_canonicalize (&xh, &xl); ++ ++ /* Ensure we return -0 rather than +0 when appropriate. */ ++ if (orig_xh < 0.0) ++ xh = -__builtin_fabs (xh); ++ ++ fesetround (save_round); + } + +- return u.d; ++ return ldbl_pack (xh, xl); + } + + long_double_symbol (libm, __ceill, ceill); +--- glibc-20060306T1239/sysdeps/ieee754/ldbl-128ibm/s_floorl.c 31 Jan 2006 18:56:23 -0000 1.2 ++++ glibc-20060306T1239-fedora/sysdeps/ieee754/ldbl-128ibm/s_floorl.c 7 Mar 2006 08:24:12 -0000 1.1.2.3 +@@ -19,7 +19,7 @@ + 02111-1307 USA. */ + + #include +-#include ++#include + #include + #include + #include +@@ -34,86 +34,52 @@ __floorl (x) + long double x; + #endif + { +- static const double TWO52 = 4503599627370496.0L; +- int mode = fegetround(); +- union ibm_extended_long_double u; ++ double xh, xl, hi, lo; + +- u.d = x; ++ ldbl_unpack (x, &xh, &xl); + +- if (fabs (u.dd[0]) < TWO52) ++ /* Return Inf, Nan, +/-0 unchanged. */ ++ if (__builtin_expect (xh != 0.0 ++ && __builtin_isless (__builtin_fabs (xh), ++ __builtin_inf ()), 1)) + { +- double high = u.dd[0]; +- fesetround(FE_DOWNWARD); +- if (high > 0.0) +- { +- high += TWO52; +- high -= TWO52; +- if (high == -0.0) high = 0.0; +- } +- else if (high < 0.0) +- { +- high -= TWO52; +- high += TWO52; +- if (high == 0.0) high = -0.0; +- } +- u.dd[0] = high; +- u.dd[1] = 0.0; +- fesetround(mode); +- } +- else if (fabs (u.dd[1]) < TWO52 && u.dd[1] != 0.0) +- { +- double high, low; +- /* In this case we have to round the low double and handle any +- adjustment to the high double that may be caused by rounding +- (up). This is complicated by the fact that the high double +- may already be rounded and the low double may have the +- opposite sign to compensate. */ +- if (u.dd[0] > 0.0) +- { +- if (u.dd[1] > 0.0) +- { +- /* If the high/low doubles are the same sign then simply +- round the low double. */ +- high = u.dd[0]; +- low = u.dd[1]; +- } +- else if (u.dd[1] < 0.0) +- { +- /* Else the high double is pre rounded and we need to +- adjust for that. */ +- high = nextafter (u.dd[0], 0.0); +- low = u.dd[1] + (u.dd[0] - high); +- } +- fesetround(FE_DOWNWARD); +- low += TWO52; +- low -= TWO52; +- } +- else if (u.dd[0] < 0.0) +- { +- if (u.dd[1] < 0.0) +- { +- /* If the high/low doubles are the same sign then simply +- round the low double. */ +- high = u.dd[0]; +- low = u.dd[1]; +- } +- else if (u.dd[1] > 0.0) +- { +- /* Else the high double is pre rounded and we need to +- adjust for that. */ +- high = nextafter (u.dd[0], 0.0); +- low = u.dd[1] + (u.dd[0] - high); +- } +- fesetround(FE_DOWNWARD); +- low -= TWO52; +- low += TWO52; +- } +- fesetround(mode); +- u.dd[0] = high + low; +- u.dd[1] = high - u.dd[0] + low; ++ int save_round = fegetround (); ++ ++ /* Long double arithmetic, including the canonicalisation below, ++ only works in round-to-nearest mode. */ ++ fesetround (FE_TONEAREST); ++ ++ /* Convert the high double to integer. */ ++ hi = ldbl_nearbyint (xh); ++ ++ /* Subtract integral high part from the value. */ ++ xh -= hi; ++ ldbl_canonicalize (&xh, &xl); ++ ++ /* Now convert the low double, adjusted for any remainder from the ++ high double. */ ++ lo = ldbl_nearbyint (xh); ++ ++ /* Adjust the result when the remainder is non-zero. nearbyint ++ rounds values to the nearest integer, and values halfway ++ between integers to the nearest even integer. floorl must ++ round towards -Inf. */ ++ xh -= lo; ++ ldbl_canonicalize (&xh, &xl); ++ ++ if (xh < 0.0 || (xh == 0.0 && xl < 0.0)) ++ lo += -1.0; ++ ++ /* Ensure the final value is canonical. In certain cases, ++ rounding causes hi,lo calculated so far to be non-canonical. */ ++ xh = hi; ++ xl = lo; ++ ldbl_canonicalize (&xh, &xl); ++ ++ fesetround (save_round); + } + +- return u.d; ++ return ldbl_pack (xh, xl); + } + + long_double_symbol (libm, __floorl, floorl); +--- glibc-20060306T1239/sysdeps/ieee754/ldbl-128ibm/s_rintl.c 28 Jan 2006 00:07:25 -0000 1.1 ++++ glibc-20060306T1239-fedora/sysdeps/ieee754/ldbl-128ibm/s_rintl.c 7 Mar 2006 08:24:12 -0000 1.1.2.2 +@@ -22,6 +22,7 @@ + when it's coded in C. */ + + #include ++#include + #include + #include + #include +@@ -36,84 +37,83 @@ __rintl (x) + long double x; + #endif + { +- static const long double TWO52 = 4503599627370496.0L; +- union ibm_extended_long_double u; +- u.d = x; ++ double xh, xl, hi, lo; + +- if (fabs (u.dd[0]) < TWO52) +- { +- double high = u.dd[0]; +- if (high > 0.0) +- { +- high += TWO52; +- high -= TWO52; +- if (high == -0.0) high = 0.0; +- } +- else if (high < 0.0) +- { +- high -= TWO52; +- high += TWO52; +- if (high == 0.0) high = -0.0; +- } +- u.dd[0] = high; +- u.dd[1] = 0.0; +- } +- else if (fabs (u.dd[1]) < TWO52 && u.dd[1] != 0.0) ++ ldbl_unpack (x, &xh, &xl); ++ ++ /* Return Inf, Nan, +/-0 unchanged. */ ++ if (__builtin_expect (xh != 0.0 ++ && __builtin_isless (__builtin_fabs (xh), ++ __builtin_inf ()), 1)) + { +- double high, low, tau; +- /* In this case we have to round the low double and handle any +- adjustment to the high double that may be caused by rounding +- (up). This is complicated by the fact that the high double +- may already be rounded and the low double may have the +- opposite sign to compensate. */ +- if (u.dd[0] > 0.0) +- { +- if (u.dd[1] > 0.0) +- { +- /* If the high/low doubles are the same sign then simply +- round the low double. */ +- high = u.dd[0]; +- low = u.dd[1]; +- } +- else if (u.dd[1] < 0.0) +- { +- /* Else the high double is pre rounded and we need to +- adjust for that. */ +- +- tau = nextafter (u.dd[0], 0.0); +- tau = (u.dd[0] - tau) * 2.0; +- high = u.dd[0] - tau; +- low = u.dd[1] + tau; +- } +- low += TWO52; +- low -= TWO52; +- } +- else if (u.dd[0] < 0.0) ++ double orig_xh; ++ int save_round = fegetround (); ++ ++ /* Long double arithmetic, including the canonicalisation below, ++ only works in round-to-nearest mode. */ ++ fesetround (FE_TONEAREST); ++ ++ /* Convert the high double to integer. */ ++ orig_xh = xh; ++ hi = ldbl_nearbyint (xh); ++ ++ /* Subtract integral high part from the value. If the low double ++ happens to be exactly 0.5 or -0.5, you might think that this ++ subtraction could result in an incorrect conversion. For ++ instance, subtracting an odd number would cause this function ++ to round in the wrong direction. However, if we have a ++ canonical long double with the low double 0.5 or -0.5, then the ++ high double must be even. */ ++ xh -= hi; ++ ldbl_canonicalize (&xh, &xl); ++ ++ /* Now convert the low double, adjusted for any remainder from the ++ high double. */ ++ lo = ldbl_nearbyint (xh); ++ ++ xh -= lo; ++ ldbl_canonicalize (&xh, &xl); ++ ++ switch (save_round) + { +- if (u.dd[1] < 0.0) +- { +- /* If the high/low doubles are the same sign then simply +- round the low double. */ +- high = u.dd[0]; +- low = u.dd[1]; +- } +- else if (u.dd[1] > 0.0) +- { +- /* Else the high double is pre rounded and we need to +- adjust for that. */ +- tau = nextafter (u.dd[0], 0.0); +- tau = (u.dd[0] - tau) * 2.0; +- high = u.dd[0] - tau; +- low = u.dd[1] + tau; +- } +- low = TWO52 - low; +- low = -(low - TWO52); ++ case FE_TONEAREST: ++ if (xl > 0.0 && xh == 0.5) ++ lo += 1.0; ++ else if (xl < 0.0 && -xh == 0.5) ++ lo -= 1.0; ++ break; ++ ++ case FE_TOWARDZERO: ++ if (orig_xh < 0.0) ++ goto do_up; ++ /* Fall thru */ ++ ++ case FE_DOWNWARD: ++ if (xh < 0.0 || (xh == 0.0 && xl < 0.0)) ++ lo -= 1.0; ++ break; ++ ++ case FE_UPWARD: ++ do_up: ++ if (xh > 0.0 || (xh == 0.0 && xl > 0.0)) ++ lo += 1.0; ++ break; + } +- u.dd[0] = high + low; +- u.dd[1] = high - u.dd[0] + low; ++ ++ /* Ensure the final value is canonical. In certain cases, ++ rounding causes hi,lo calculated so far to be non-canonical. */ ++ xh = hi; ++ xl = lo; ++ ldbl_canonicalize (&xh, &xl); ++ ++ /* Ensure we return -0 rather than +0 when appropriate. */ ++ if (orig_xh < 0.0) ++ xh = -__builtin_fabs (xh); ++ ++ fesetround (save_round); + } + +- return u.d; ++ return ldbl_pack (xh, xl); + } + + long_double_symbol (libm, __rintl, rintl); +--- glibc-20060306T1239/sysdeps/ieee754/ldbl-128ibm/s_roundl.c 28 Jan 2006 00:07:25 -0000 1.1 ++++ glibc-20060306T1239-fedora/sysdeps/ieee754/ldbl-128ibm/s_roundl.c 7 Mar 2006 08:24:12 -0000 1.1.2.2 +@@ -22,7 +22,7 @@ + when it's coded in C. */ + + #include +-#include ++#include + #include + #include + #include +@@ -37,84 +37,62 @@ __roundl (x) + long double x; + #endif + { +- static const double TWO52 = 4503599627370496.0; +- static const double HALF = 0.5; +- int mode = fegetround(); +- union ibm_extended_long_double u; +- u.d = x; +- +- if (fabs (u.dd[0]) < TWO52) +- { +- fesetround(FE_TOWARDZERO); +- if (u.dd[0] > 0.0) +- { +- u.dd[0] += HALF; +- u.dd[0] += TWO52; +- u.dd[0] -= TWO52; +- } +- else if (u.dd[0] < 0.0) +- { +- u.dd[0] = TWO52 - (u.dd[0] - HALF); +- u.dd[0] = -(u.dd[0] - TWO52); +- } +- u.dd[1] = 0.0; +- fesetround(mode); +- } +- else if (fabs (u.dd[1]) < TWO52 && u.dd[1] != 0.0) ++ double xh, xl, hi, lo; ++ ++ ldbl_unpack (x, &xh, &xl); ++ ++ /* Return Inf, Nan, +/-0 unchanged. */ ++ if (__builtin_expect (xh != 0.0 ++ && __builtin_isless (__builtin_fabs (xh), ++ __builtin_inf ()), 1)) + { +- double high, low; +- /* In this case we have to round the low double and handle any +- adjustment to the high double that may be caused by rounding +- (up). This is complicated by the fact that the high double +- may already be rounded and the low double may have the +- opposite sign to compensate. */ +- if (u.dd[0] > 0.0) ++ double orig_xh; ++ int save_round = fegetround (); ++ ++ /* Long double arithmetic, including the canonicalisation below, ++ only works in round-to-nearest mode. */ ++ fesetround (FE_TONEAREST); ++ ++ /* Convert the high double to integer. */ ++ orig_xh = xh; ++ hi = ldbl_nearbyint (xh); ++ ++ /* Subtract integral high part from the value. */ ++ xh -= hi; ++ ldbl_canonicalize (&xh, &xl); ++ ++ /* Now convert the low double, adjusted for any remainder from the ++ high double. */ ++ lo = ldbl_nearbyint (xh); ++ ++ /* Adjust the result when the remainder is exactly 0.5. nearbyint ++ rounds values halfway between integers to the nearest even ++ integer. roundl must round away from zero. ++ Also correct cases where nearbyint returns an incorrect value ++ for LO. */ ++ xh -= lo; ++ ldbl_canonicalize (&xh, &xl); ++ if (xh == 0.5) + { +- if (u.dd[1] > 0.0) +- { +- /* If the high/low doubles are the same sign then simply +- round the low double. */ +- high = u.dd[0]; +- low = u.dd[1]; +- } +- else if (u.dd[1] < 0.0) +- { +- /* Else the high double is pre rounded and we need to +- adjust for that. */ +- high = nextafter (u.dd[0], 0.0); +- low = u.dd[1] + (u.dd[0] - high); +- } +- fesetround(FE_TOWARDZERO); +- low += HALF; +- low += TWO52; +- low -= TWO52; ++ if (xl > 0.0 || (xl == 0.0 && orig_xh > 0.0)) ++ lo += 1.0; + } +- else if (u.dd[0] < 0.0) ++ else if (-xh == 0.5) + { +- if (u.dd[1] < 0.0) +- { +- /* If the high/low doubles are the same sign then simply +- round the low double. */ +- high = u.dd[0]; +- low = u.dd[1]; +- } +- else if (u.dd[1] > 0.0) +- { +- /* Else the high double is pre rounded and we need to +- adjust for that. */ +- high = nextafter (u.dd[0], 0.0); +- low = u.dd[1] + (u.dd[0] - high); +- } +- fesetround(FE_TOWARDZERO); +- low -= HALF; +- low = TWO52 - low; +- low = -(low - TWO52); ++ if (xl < 0.0 || (xl == 0.0 && orig_xh < 0.0)) ++ lo -= 1.0; + } +- fesetround(mode); +- u.dd[0] = high + low; +- u.dd[1] = high - u.dd[0] + low; ++ ++ /* Ensure the final value is canonical. In certain cases, ++ rounding causes hi,lo calculated so far to be non-canonical. */ ++ xh = hi; ++ xl = lo; ++ ldbl_canonicalize (&xh, &xl); ++ ++ fesetround (save_round); + } +- return u.d; ++ ++ return ldbl_pack (xh, xl); + } + + long_double_symbol (libm, __roundl, roundl); +--- glibc-20060306T1239/sysdeps/ieee754/ldbl-128ibm/s_truncl.c 28 Jan 2006 00:07:25 -0000 1.1 ++++ glibc-20060306T1239-fedora/sysdeps/ieee754/ldbl-128ibm/s_truncl.c 7 Mar 2006 08:24:12 -0000 1.1.2.2 +@@ -22,7 +22,7 @@ + when it's coded in C. */ + + #include +-#include ++#include + #include + #include + #include +@@ -37,83 +37,66 @@ __truncl (x) + long double x; + #endif + { +- static const double TWO52 = 4503599627370496.0L; +- int mode = fegetround(); +- union ibm_extended_long_double u; +- +- u.d = x; +- +- if (fabs (u.dd[0]) < TWO52) +- { +- fesetround(FE_TOWARDZERO); +- if (u.dd[0] > 0.0) +- { +- u.dd[0] += TWO52; +- u.dd[0] -= TWO52; +- } +- else if (u.dd[0] < 0.0) +- { +- u.dd[0] = TWO52 - u.dd[0]; +- u.dd[0] = -(u.dd[0] - TWO52); +- } +- u.dd[1] = 0.0; +- fesetround(mode); +- } +- else if (fabs (u.dd[1]) < TWO52 && u.dd[1] != 0.0) ++ double xh, xl, hi, lo; ++ ++ ldbl_unpack (x, &xh, &xl); ++ ++ /* Return Inf, Nan, +/-0 unchanged. */ ++ if (__builtin_expect (xh != 0.0 ++ && __builtin_isless (__builtin_fabs (xh), ++ __builtin_inf ()), 1)) + { +- double high, low; +- /* In this case we have to round the low double and handle any +- adjustment to the high double that may be caused by rounding +- (up). This is complicated by the fact that the high double +- may already be rounded and the low double may have the +- opposite sign to compensate. */ +- if (u.dd[0] > 0.0) ++ double orig_xh; ++ int save_round = fegetround (); ++ ++ /* Long double arithmetic, including the canonicalisation below, ++ only works in round-to-nearest mode. */ ++ fesetround (FE_TONEAREST); ++ ++ /* Convert the high double to integer. */ ++ orig_xh = xh; ++ hi = ldbl_nearbyint (xh); ++ ++ /* Subtract integral high part from the value. */ ++ xh -= hi; ++ ldbl_canonicalize (&xh, &xl); ++ ++ /* Now convert the low double, adjusted for any remainder from the ++ high double. */ ++ lo = ldbl_nearbyint (xh); ++ ++ /* Adjust the result when the remainder is non-zero. nearbyint ++ rounds values to the nearest integer, and values halfway ++ between integers to the nearest even integer. floorl must ++ round towards -Inf. */ ++ xh -= lo; ++ ldbl_canonicalize (&xh, &xl); ++ ++ if (orig_xh < 0.0) + { +- if (u.dd[1] > 0.0) +- { +- /* If the high/low doubles are the same sign then simply +- round the low double. */ +- high = u.dd[0]; +- low = u.dd[1]; +- } +- else if (u.dd[1] < 0.0) +- { +- /* Else the high double is pre rounded and we need to +- adjust for that. */ +- high = nextafter (u.dd[0], 0.0); +- low = u.dd[1] + (u.dd[0] - high); +- } +- fesetround(FE_TOWARDZERO); +- low += TWO52; +- low -= TWO52; +- fesetround(mode); ++ if (xh > 0.0 || (xh == 0.0 && xl > 0.0)) ++ lo += 1.0; + } +- else if (u.dd[0] < 0.0) ++ else + { +- if (u.dd[1] < 0.0) +- { +- /* If the high/low doubles are the same sign then simply +- round the low double. */ +- high = u.dd[0]; +- low = u.dd[1]; +- } +- else if (u.dd[1] > 0.0) +- { +- /* Else the high double is pre rounded and we need to +- adjust for that. */ +- high = nextafter (u.dd[0], 0.0); +- low = u.dd[1] + (u.dd[0] - high); +- } +- fesetround(FE_TOWARDZERO); +- low = TWO52 - low; +- low = -(low - TWO52); +- fesetround(mode); ++ if (xh < 0.0 || (xh == 0.0 && xl < 0.0)) ++ lo -= 1.0; + } +- u.dd[0] = high + low; +- u.dd[1] = high - u.dd[0] + low; ++ ++ /* Ensure the final value is canonical. In certain cases, ++ rounding causes hi,lo calculated so far to be non-canonical. */ ++ xh = hi; ++ xl = lo; ++ ldbl_canonicalize (&xh, &xl); ++ ++ /* Ensure we return -0 rather than +0 when appropriate. */ ++ if (orig_xh < 0.0) ++ xh = -__builtin_fabs (xh); ++ ++ fesetround (save_round); + } + +- return u.d; ++ return ldbl_pack (xh, xl); + } + + long_double_symbol (libm, __truncl, truncl); +--- glibc-20060306T1239/sysdeps/powerpc/fpu/fegetround.c 6 Jul 2001 04:56:02 -0000 1.2 ++++ glibc-20060306T1239-fedora/sysdeps/powerpc/fpu/fegetround.c 7 Mar 2006 08:24:12 -0000 1.2.4.1 +@@ -23,7 +23,5 @@ + int + fegetround (void) + { +- int result; +- asm ("mcrfs 7,7 ; mfcr %0" : "=r"(result) : : "cr7"); \ +- return result & 3; ++ return __fegetround(); + } +--- glibc-20060306T1239/sysdeps/powerpc/fpu/fenv_libc.h 6 Jul 2001 04:56:02 -0000 1.2 ++++ glibc-20060306T1239-fedora/sysdeps/powerpc/fpu/fenv_libc.h 7 Mar 2006 08:24:12 -0000 1.2.4.1 +@@ -1,5 +1,5 @@ + /* Internal libc stuff for floating point environment routines. +- Copyright (C) 1997 Free Software Foundation, Inc. ++ Copyright (C) 1997, 2006 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or +@@ -54,6 +54,41 @@ typedef union + unsigned int l[2]; + } fenv_union_t; + ++ ++static inline int ++__fegetround (void) ++{ ++ int result; ++ asm volatile ("mcrfs 7,7\n\t" ++ "mfcr %0" : "=r"(result) : : "cr7"); ++ return result & 3; ++} ++#define fegetround() __fegetround() ++ ++static inline int ++__fesetround (int round) ++{ ++ if ((unsigned int) round < 2) ++ { ++ asm volatile ("mtfsb0 30"); ++ if ((unsigned int) round == 0) ++ asm volatile ("mtfsb0 31"); ++ else ++ asm volatile ("mtfsb1 31"); ++ } ++ else ++ { ++ asm volatile ("mtfsb1 30"); ++ if ((unsigned int) round == 2) ++ asm volatile ("mtfsb0 31"); ++ else ++ asm volatile ("mtfsb1 31"); ++ } ++ ++ return 0; ++} ++#define fesetround(mode) __fesetround(mode) ++ + /* Definitions of all the FPSCR bit numbers */ + enum { + FPSCR_FX = 0, /* exception summary */ +--- glibc-20060306T1239/sysdeps/powerpc/fpu/fesetround.c 8 Jul 2005 18:52:46 -0000 1.4 ++++ glibc-20060306T1239-fedora/sysdeps/powerpc/fpu/fesetround.c 7 Mar 2006 08:24:12 -0000 1.3.4.2 +@@ -1,5 +1,5 @@ + /* Set current rounding direction. +- Copyright (C) 1997, 2005 Free Software Foundation, Inc. ++ Copyright (C) 1997, 2005, 2006 Free Software Foundation, Inc. + This file is part of the GNU C Library. + Contributed by Ulrich Drepper , 1997. + +@@ -20,23 +20,13 @@ + + #include + ++#undef fesetround + int + fesetround (int round) + { +- fenv_union_t u; +- + if ((unsigned int) round > 3) + return 1; +- +- /* Get the current state. */ +- u.fenv = fegetenv_register (); +- +- /* Set the relevant bits. */ +- u.l[1] = (u.l[1] & ~3) | (round & 3); +- +- /* Put the new state in effect. */ +- fesetenv_register (u.fenv); +- +- return 0; ++ else ++ return __fesetround(round); + } + libm_hidden_def (fesetround) +--- glibc-20060306T1239/sysdeps/powerpc/fpu/math_ldbl.h 1 Jan 1970 00:00:00 -0000 ++++ glibc-20060306T1239-fedora/sysdeps/powerpc/fpu/math_ldbl.h 7 Mar 2006 08:24:12 -0000 1.1.2.1 +@@ -0,0 +1,189 @@ ++#ifndef _MATH_PRIVATE_H_ ++#error "Never use directly; include instead." ++#endif ++ ++#include ++#include ++ ++static inline void ++ldbl_extract_mantissa (int64_t *hi64, u_int64_t *lo64, int *exp, long double x) ++{ ++ /* We have 105 bits of mantissa plus one implicit digit. Since ++ 106 bits are representable we use the first implicit digit for ++ the number before the decimal point and the second implicit bit ++ as bit 53 of the mantissa. */ ++ unsigned long long hi, lo; ++ int ediff; ++ union ibm_extended_long_double eldbl; ++ eldbl.d = x; ++ *exp = eldbl.ieee.exponent - IBM_EXTENDED_LONG_DOUBLE_BIAS; ++ ++ lo = ((long long)eldbl.ieee.mantissa2 << 32) | eldbl.ieee.mantissa3; ++ hi = ((long long)eldbl.ieee.mantissa0 << 32) | eldbl.ieee.mantissa1; ++ /* If the lower double is not a denomal or zero then set the hidden ++ 53rd bit. */ ++ if (eldbl.ieee.exponent2 > 0x001) ++ { ++ lo |= (1ULL << 52); ++ lo = lo << 7; /* pre-shift lo to match ieee854. */ ++ /* The lower double is normalized separately from the upper. We ++ may need to adjust the lower manitissa to reflect this. */ ++ ediff = eldbl.ieee.exponent - eldbl.ieee.exponent2; ++ if (ediff > 53) ++ lo = lo >> (ediff-53); ++ } ++ hi |= (1ULL << 52); ++ ++ if ((eldbl.ieee.negative != eldbl.ieee.negative2) ++ && ((eldbl.ieee.exponent2 != 0) && (lo != 0LL))) ++ { ++ hi--; ++ lo = (1ULL << 60) - lo; ++ if (hi < (1ULL << 52)) ++ { ++ /* we have a borrow from the hidden bit, so shift left 1. */ ++ hi = (hi << 1) | (lo >> 59); ++ lo = 0xfffffffffffffffLL & (lo << 1); ++ *exp = *exp - 1; ++ } ++ } ++ *lo64 = (hi << 60) | lo; ++ *hi64 = hi >> 4; ++} ++ ++static inline long double ++ldbl_insert_mantissa (int sign, int exp, int64_t hi64, u_int64_t lo64) ++{ ++ union ibm_extended_long_double u; ++ unsigned long hidden2, lzcount; ++ unsigned long long hi, lo; ++ ++ u.ieee.negative = sign; ++ u.ieee.negative2 = sign; ++ u.ieee.exponent = exp + IBM_EXTENDED_LONG_DOUBLE_BIAS; ++ u.ieee.exponent2 = exp-53 + IBM_EXTENDED_LONG_DOUBLE_BIAS; ++ /* Expect 113 bits (112 bits + hidden) right justified in two longs. ++ The low order 53 bits (52 + hidden) go into the lower double */ ++ lo = (lo64 >> 7)& ((1ULL << 53) - 1); ++ hidden2 = (lo64 >> 59) & 1ULL; ++ /* The high order 53 bits (52 + hidden) go into the upper double */ ++ hi = (lo64 >> 60) & ((1ULL << 11) - 1); ++ hi |= (hi64 << 4); ++ ++ if (lo != 0LL) ++ { ++ /* hidden2 bit of low double controls rounding of the high double. ++ If hidden2 is '1' then round up hi and adjust lo (2nd mantissa) ++ plus change the sign of the low double to compensate. */ ++ if (hidden2) ++ { ++ hi++; ++ u.ieee.negative2 = !sign; ++ lo = (1ULL << 53) - lo; ++ } ++ /* The hidden bit of the lo mantissa is zero so we need to ++ normalize the it for the low double. Shift it left until the ++ hidden bit is '1' then adjust the 2nd exponent accordingly. */ ++ ++ if (sizeof (lo) == sizeof (long)) ++ lzcount = __builtin_clzl (lo); ++ else if ((lo >> 32) != 0) ++ lzcount = __builtin_clzl ((long) (lo >> 32)); ++ else ++ lzcount = __builtin_clzl ((long) lo) + 32; ++ lzcount = lzcount - 11; ++ if (lzcount > 0) ++ { ++ int expnt2 = u.ieee.exponent2 - lzcount; ++ if (expnt2 >= 1) ++ { ++ /* Not denormal. Normalize and set low exponent. */ ++ lo = lo << lzcount; ++ u.ieee.exponent2 = expnt2; ++ } ++ else ++ { ++ /* Is denormal. */ ++ lo = lo << (lzcount + expnt2); ++ u.ieee.exponent2 = 0; ++ } ++ } ++ } ++ else ++ { ++ u.ieee.negative2 = 0; ++ u.ieee.exponent2 = 0; ++ } ++ ++ u.ieee.mantissa3 = lo & ((1ULL << 32) - 1); ++ u.ieee.mantissa2 = (lo >> 32) & ((1ULL << 20) - 1); ++ u.ieee.mantissa1 = hi & ((1ULL << 32) - 1); ++ u.ieee.mantissa0 = (hi >> 32) & ((1ULL << 20) - 1); ++ return u.d; ++} ++ ++/* gcc generates disgusting code to pack and unpack long doubles. ++ This tells gcc that pack/unpack is really a nop. We use fr1/fr2 ++ because those are the regs used to pass/return a single ++ long double arg. */ ++static inline long double ++ldbl_pack (double a, double aa) ++{ ++ register long double x __asm__ ("fr1"); ++ register double xh __asm__ ("fr1"); ++ register double xl __asm__ ("fr2"); ++ xh = a; ++ xl = aa; ++ __asm__ ("" : "=f" (x) : "f" (xh), "f" (xl)); ++ return x; ++} ++ ++static inline void ++ldbl_unpack (long double l, double *a, double *aa) ++{ ++ register long double x __asm__ ("fr1"); ++ register double xh __asm__ ("fr1"); ++ register double xl __asm__ ("fr2"); ++ x = l; ++ __asm__ ("" : "=f" (xh), "=f" (xl) : "f" (x)); ++ *a = xh; ++ *aa = xl; ++} ++ ++ ++/* Convert a finite long double to canonical form. ++ Does not handle +/-Inf properly. */ ++static inline void ++ldbl_canonicalize (double *a, double *aa) ++{ ++ double xh, xl; ++ ++ xh = *a + *aa; ++ xl = (*a - xh) + *aa; ++ *a = xh; ++ *aa = xl; ++} ++ ++/* Simple inline nearbyint (double) function . ++ Only works in the default rounding mode ++ but is useful in long double rounding functions. */ ++static inline double ++ldbl_nearbyint (double a) ++{ ++ double two52 = 0x10000000000000LL; ++ ++ if (__builtin_expect ((__builtin_fabs (a) < two52), 1)) ++ { ++ if (__builtin_expect ((a > 0.0), 1)) ++ { ++ a += two52; ++ a -= two52; ++ } ++ else if (__builtin_expect ((a < 0.0), 1)) ++ { ++ a = two52 - a; ++ a = -(a - two52); ++ } ++ } ++ return a; ++} --- glibc-20060306T1239/sysdeps/unix/nice.c 28 Sep 2002 19:13:13 -0000 1.6 +++ glibc-20060306T1239-fedora/sysdeps/unix/nice.c 22 Sep 2004 21:21:08 -0000 1.6.2.1 @@ -41,7 +41,12 @@ nice (int incr) Index: glibc.spec =================================================================== RCS file: /cvs/dist/rpms/glibc/devel/glibc.spec,v retrieving revision 1.228 retrieving revision 1.229 diff -u -r1.228 -r1.229 --- glibc.spec 6 Mar 2006 13:33:54 -0000 1.228 +++ glibc.spec 7 Mar 2006 08:44:55 -0000 1.229 @@ -3,7 +3,7 @@ %define glibcsrcdir glibc-20060306T1239 %define glibc_release_tarballs 0 %define glibcversion 2.4 -%define glibcrelease 1 +%define glibcrelease 2 %define auxarches i586 i686 athlon sparcv9 alphaev6 %define prelinkarches noarch %define xenarches i686 athlon @@ -56,6 +56,15 @@ Conflicts: rpm <= 4.0-0.65 Conflicts: glibc-devel < 2.2.3 Conflicts: gcc4 <= 4.0.0-0.6 +%ifarch x86_64 +# Need gdb that understands DW_CFA_val_expression +Conflicts: gdb < 6.3.0.0-1.111 +%endif +%ifarch %{ix86} +# Need gdb that understands DW_CFA_val_expression and handles two frames +# with the same entry point and CFA, but different PC +Conflicts: gdb < 6.3.0.0-1.115 +%endif # Earlier shadow-utils packages had too restrictive permissions on # /etc/default Conflicts: shadow-utils < 2:4.0.3-20 @@ -694,10 +703,10 @@ GCC=gcc GXX=g++ %ifarch %{ix86} -BuildFlags="-march=%{_target_cpu}" +BuildFlags="-march=%{_target_cpu} -DUSE_CFA_VAL_EXPRESSION" %endif %ifarch i686 -BuildFlags="-march=i686 -mtune=pentium4" +BuildFlags="-march=i686 -mtune=pentium4 -DUSE_CFA_VAL_EXPRESSION" %endif %ifarch x86_64 BuildFlags="-DUSE_CFA_VAL_EXPRESSION" @@ -1340,6 +1349,10 @@ %endif %changelog +* Tue Mar 7 2006 Jakub Jelinek 2.4-2 +- accurate unwind info for lowlevellock.h stubs on %%{ix86} +- fix ppc/ppc64 ceill, floorl, rintl, roundl and truncl (BZ#2423) + * Mon Mar 6 2006 Jakub Jelinek 2.4-1 - update from CVS - glibc 2.4 release Index: sources =================================================================== RCS file: /cvs/dist/rpms/glibc/devel/sources,v retrieving revision 1.165 retrieving revision 1.166 diff -u -r1.165 -r1.166 --- sources 6 Mar 2006 13:33:54 -0000 1.165 +++ sources 7 Mar 2006 08:44:55 -0000 1.166 @@ -1,2 +1,2 @@ c3bd549b42829d73aad876a10435ae73 glibc-20060306T1239.tar.bz2 -505133aab642c0cf807ddb498458c1c4 glibc-fedora-20060306T1239.tar.bz2 +ad9e233a573f227fb9efd93e2f387fdf glibc-fedora-20060306T1239.tar.bz2 From fedora-cvs-commits at redhat.com Tue Mar 7 09:58:50 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 7 Mar 2006 04:58:50 -0500 Subject: rpms/system-config-soundcard/devel system-config-soundcard-1.2.16-log.patch, 1.1, 1.2 system-config-soundcard.spec, 1.30, 1.31 Message-ID: <200603070958.k279wop4009415@cvs.devel.redhat.com> Author: stransky Update of /cvs/dist/rpms/system-config-soundcard/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv9377 Modified Files: system-config-soundcard-1.2.16-log.patch system-config-soundcard.spec Log Message: modified log patch system-config-soundcard-1.2.16-log.patch: Makefile | 2 ++ src/soundcard.py | 1 + src/soundcardBackend.py | 21 +++++++++++++-------- src/system-config-soundcard | 15 --------------- src/system-config-soundcard.logger | 16 ++++++++++++++++ src/system-config-soundcard.play | 6 ++++++ 6 files changed, 38 insertions(+), 23 deletions(-) Index: system-config-soundcard-1.2.16-log.patch =================================================================== RCS file: /cvs/dist/rpms/system-config-soundcard/devel/system-config-soundcard-1.2.16-log.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- system-config-soundcard-1.2.16-log.patch 3 Mar 2006 22:20:44 -0000 1.1 +++ system-config-soundcard-1.2.16-log.patch 7 Mar 2006 09:58:46 -0000 1.2 @@ -1,66 +1,18 @@ ---- system-config-soundcard-1.2.16/Makefile.old 2006-01-30 09:46:57.000000000 +0100 -+++ system-config-soundcard-1.2.16/Makefile 2006-03-03 22:11:14.000000000 +0100 -@@ -29,6 +29,7 @@ - mkdir -p $(INSTROOT)/usr/share/icons/hicolor/48x48/apps - mkdir -p $(INSTROOT)/usr/share/applications - install src/*.py $(INSTROOT)$(PKGDATADIR) -+ install src/*.logger $(INSTROOT)$(PKGDATADIR) - install src/${PKGNAME} $(INSTROOT)$(PKGDATADIR)/${PKGNAME} - install src/sound-sample.wav $(INSTROOT)$(PKGDATADIR)/sound-sample.wav - install ${PKGNAME}.pam $(INSTROOT)$(PAMD_DIR)/${PKGNAME} ---- /dev/null 2006-03-03 20:50:29.888481500 +0100 -+++ system-config-soundcard-1.2.16/src/system-config-soundcard.logger 2006-03-03 22:11:14.000000000 +0100 -@@ -0,0 +1,16 @@ +--- /dev/null 2006-03-01 12:49:27.336509500 +0100 ++++ system-config-soundcard-1.2.16/src/system-config-soundcard.play 2006-03-07 10:39:55.000000000 +0100 +@@ -0,0 +1,6 @@ +#!/bin/sh + +LOG_FILE="/root/scsound.log" -+ -+echo -e "------- System Config Soundcard --------\n`date`\n" > $LOG_FILE 2>&1 -+echo -e "------- lspci --------\n`lspci`\n" >> $LOG_FILE 2>&1 -+echo -e "------- lsmod --------\n`lsmod`\n" >> $LOG_FILE 2>&1 -+echo -e "------- /etc/modprobe.conf --------\n`cat /etc/modprobe.conf`\n" >> $LOG_FILE 2>&1 -+echo -e "------- /etc/asound.conf --------\n`cat /etc/asound.conf`\n" >> $LOG_FILE 2>&1 -+echo -e "------- aplay -l --------\n`aplay -l 2>&1`\n" >> $LOG_FILE 2>&1 -+echo -e "------- amixer --------\n`amixer`\n" >> $LOG_FILE 2>&1 -+echo -e "------- /proc/asound/version --------\n`cat /proc/asound/version`\n" >> $LOG_FILE 2>&1 -+echo -e "------- rpm -q alsa-lib --------\n`rpm -q alsa-lib`\n" >> $LOG_FILE 2>&1 -+echo -e "------- rpm -q alsa-utils --------\n`rpm -q alsa-utils`\n" >> $LOG_FILE 2>&1 -+echo -e "------- /proc/asound/modules --------\n`cat /proc/asound/modules`\n" >> $LOG_FILE 2>&1 -+echo -e "------- /proc/asound/pcm --------\n`cat /proc/asound/pcm`\n" >> $LOG_FILE 2>&1 ---- system-config-soundcard-1.2.16/src/soundcardBackend.py.old 2006-02-07 13:09:59.000000000 +0100 -+++ system-config-soundcard-1.2.16/src/soundcardBackend.py 2006-03-03 22:17:20.000000000 +0100 -@@ -483,3 +483,14 @@ - return self.defaultModule ++echo -e "------- Playng wav --------\n" >> $LOG_FILE 2>&1 ++echo $1 $2 $3 $4 $5 $6 >> $LOG_FILE 2>&1 ++exec $1 $2 $3 $4 $5 $6 >> $LOG_FILE 2>&1 +--- system-config-soundcard-1.2.16/src/system-config-soundcard.log 2006-02-07 13:09:59.000000000 +0100 ++++ system-config-soundcard-1.2.16/src/system-config-soundcard 2006-03-07 10:39:55.000000000 +0100 +@@ -2,20 +2,5 @@ - return 0 -+ -+ def writeLog(self): -+ amixer_pid = os.fork() -+ if (not amixer_pid): -+ try: -+ os.execv(amixer_path, amixer_args) -+ except: -+ sys.exit(0) -+ else: -+ os.waitpid(amixer_pid,0) -+ return 0 ---- system-config-soundcard-1.2.16/src/soundcard.py.old 2006-02-07 13:26:51.000000000 +0100 -+++ system-config-soundcard-1.2.16/src/soundcard.py 2006-03-03 22:11:14.000000000 +0100 -@@ -469,6 +469,7 @@ - dlg.destroy() - - if rc == gtk.RESPONSE_NO: -+ self.soundcardBackend.writeLog() - #Oh well, they couldn't hear the sound. Notify the user and then quit. We did our best - self.showErrorDialog(_("Automatic detection of the sound card did not work. " \ - "Audio will not be available on the system.\n" \ ---- system-config-soundcard-1.2.16/src/system-config-soundcard.old 2006-02-07 13:09:59.000000000 +0100 -+++ system-config-soundcard-1.2.16/src/system-config-soundcard 2006-03-03 22:11:14.000000000 +0100 -@@ -1,21 +1,4 @@ - #!/bin/sh + LOG_FILE="/root/scsound.log" --LOG_FILE="/root/scsound.log" -- -echo -e "------- System Config Soundcard --------\n`date`\n" > $LOG_FILE 2>&1 -echo -e "------- lspci --------\n`lspci`\n" >> $LOG_FILE 2>&1 -echo -e "------- lsmod --------\n`lsmod`\n" >> $LOG_FILE 2>&1 @@ -77,5 +29,88 @@ -echo -e "------- system-config-soundcard --------\n" >> $LOG_FILE 2>&1 - export PYTHONPATH=/usr/share/system-config-soundcard --/usr/bin/python2 /usr/share/system-config-soundcard/system-config-soundcard.py >> $LOG_FILE 2>&1 -+/usr/bin/python2 /usr/share/system-config-soundcard/system-config-soundcard.py + /usr/bin/python2 /usr/share/system-config-soundcard/system-config-soundcard.py >> $LOG_FILE 2>&1 +--- system-config-soundcard-1.2.16/src/soundcard.py.log 2006-02-07 13:26:51.000000000 +0100 ++++ system-config-soundcard-1.2.16/src/soundcard.py 2006-03-07 10:39:55.000000000 +0100 +@@ -469,6 +469,7 @@ + dlg.destroy() + + if rc == gtk.RESPONSE_NO: ++ self.soundcardBackend.writeLog() + #Oh well, they couldn't hear the sound. Notify the user and then quit. We did our best + self.showErrorDialog(_("Automatic detection of the sound card did not work. " \ + "Audio will not be available on the system.\n" \ +--- system-config-soundcard-1.2.16/src/soundcardBackend.py.log 2006-02-07 13:09:59.000000000 +0100 ++++ system-config-soundcard-1.2.16/src/soundcardBackend.py 2006-03-07 10:40:19.000000000 +0100 +@@ -195,24 +195,25 @@ + if self.aplay_pid != 0: + return + ++ path = "/usr/share/system-config-soundcard/system-config-soundcard.play" ++ + if kernel_type == '2.6': + device = "plughw:%d,0"% index +- +- path = "/usr/bin/aplay" +- args = [path, "-D", device, "-N", "/usr/share/system-config-soundcard/sound-sample.wav"] ++ args = [path, "/usr/bin/aplay", "-D", device, "-N", "/usr/share/system-config-soundcard/sound-sample.wav"] + + if kernel_type == "2.4": + if self.dspList == []: + device = "/dev/dsp" + else: +- device = "/dev/dsp%d" % self.dspList.index(module) +- +- path = "/usr/bin/play" +- args = [path, "-d", device, "/usr/share/system-config-soundcard/sound-sample.wav", "-v", "2"] ++ device = "/dev/dsp%d" % self.dspList.index(module) ++ args = [path, "/usr/bin/play", "-d", device, "/usr/share/system-config-soundcard/sound-sample.wav", "-v", "2"] + + self.aplay_pid = os.fork() + if (not self.aplay_pid): +- os.execv(path, args) ++ try: ++ os.execv(path, args) ++ except: ++ sys.exit(0) + + def stopTestSound(self): + # Kill the child process +@@ -483,3 +484,7 @@ + return self.defaultModule + + return 0 ++ ++ def writeLog(self): ++ os.system("/usr/share/system-config-soundcard/system-config-soundcard.logger") ++ return 0 +--- /dev/null 2006-03-01 12:49:27.336509500 +0100 ++++ system-config-soundcard-1.2.16/src/system-config-soundcard.logger 2006-03-07 10:39:55.000000000 +0100 +@@ -0,0 +1,16 @@ ++#!/bin/sh ++ ++LOG_FILE="/root/scsound.log" ++ ++echo -e "------- System Config Soundcard Log --------\n`date`\n" >> $LOG_FILE 2>&1 ++echo -e "------- lspci --------\n`lspci`\n" >> $LOG_FILE 2>&1 ++echo -e "------- lsmod --------\n`lsmod`\n" >> $LOG_FILE 2>&1 ++echo -e "------- /etc/modprobe.conf --------\n`cat /etc/modprobe.conf`\n" >> $LOG_FILE 2>&1 ++echo -e "------- /etc/asound.conf --------\n`cat /etc/asound.conf`\n" >> $LOG_FILE 2>&1 ++echo -e "------- aplay -l --------\n`aplay -l 2>&1`\n" >> $LOG_FILE 2>&1 ++echo -e "------- amixer --------\n`amixer`\n" >> $LOG_FILE 2>&1 ++echo -e "------- /proc/asound/version --------\n`cat /proc/asound/version`\n" >> $LOG_FILE 2>&1 ++echo -e "------- rpm -q alsa-lib --------\n`rpm -q alsa-lib`\n" >> $LOG_FILE 2>&1 ++echo -e "------- rpm -q alsa-utils --------\n`rpm -q alsa-utils`\n" >> $LOG_FILE 2>&1 ++echo -e "------- /proc/asound/modules --------\n`cat /proc/asound/modules`\n" >> $LOG_FILE 2>&1 ++echo -e "------- /proc/asound/pcm --------\n`cat /proc/asound/pcm`\n" >> $LOG_FILE 2>&1 +--- system-config-soundcard-1.2.16/Makefile.log 2006-01-30 09:46:57.000000000 +0100 ++++ system-config-soundcard-1.2.16/Makefile 2006-03-07 10:39:55.000000000 +0100 +@@ -29,6 +29,8 @@ + mkdir -p $(INSTROOT)/usr/share/icons/hicolor/48x48/apps + mkdir -p $(INSTROOT)/usr/share/applications + install src/*.py $(INSTROOT)$(PKGDATADIR) ++ install src/*.logger $(INSTROOT)$(PKGDATADIR) ++ install src/*.play $(INSTROOT)$(PKGDATADIR) + install src/${PKGNAME} $(INSTROOT)$(PKGDATADIR)/${PKGNAME} + install src/sound-sample.wav $(INSTROOT)$(PKGDATADIR)/sound-sample.wav + install ${PKGNAME}.pam $(INSTROOT)$(PAMD_DIR)/${PKGNAME} Index: system-config-soundcard.spec =================================================================== RCS file: /cvs/dist/rpms/system-config-soundcard/devel/system-config-soundcard.spec,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- system-config-soundcard.spec 3 Mar 2006 22:20:44 -0000 1.30 +++ system-config-soundcard.spec 7 Mar 2006 09:58:46 -0000 1.31 @@ -82,6 +82,7 @@ %attr(0644,root,root) %config /etc/security/console.apps/system-config-soundcard %attr(0644,root,root) %config /etc/pam.d/system-config-soundcard %attr(0755,root,root) /usr/share/system-config-soundcard/system-config-soundcard.logger +%attr(0755,root,root) /usr/share/system-config-soundcard/system-config-soundcard.play %ghost /root/scsound.log %changelog From fedora-cvs-commits at redhat.com Tue Mar 7 10:23:25 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 7 Mar 2006 05:23:25 -0500 Subject: rpms/mkbootdisk/devel mkbootdisk-x86_64.patch, NONE, 1.1 mkbootdisk.spec, 1.18, 1.19 Message-ID: <200603071023.k27ANPKW027764@cvs.devel.redhat.com> Author: pvrabec Update of /cvs/dist/rpms/mkbootdisk/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv27711 Modified Files: mkbootdisk.spec Added Files: mkbootdisk-x86_64.patch Log Message: build as noarch mkbootdisk-x86_64.patch: mkbootdisk | 6 ++++++ 1 files changed, 6 insertions(+) --- NEW FILE mkbootdisk-x86_64.patch --- --- mkbootdisk.orig 2003-12-11 11:38:32.000000000 +0100 +++ mkbootdisk 2003-12-11 15:52:12.000000000 +0100 @@ -77,6 +77,12 @@ [ -z "$kernel" ] && usage 1 +[ "$(uname -i)" == "x86_64" ] && [ -z $isoimage ] && { + echo "Image for x86_64 architecture does not fit on 1.44MB floppy." >&2 + echo "Use \"--iso --device image.iso\" options to make a CD image." >&2 + exit 1 +} + [ -d /lib/modules/$kernel ] || { echo "/lib/modules/$kernel is not a directory." >&2 exit 1 Index: mkbootdisk.spec =================================================================== RCS file: /cvs/dist/rpms/mkbootdisk/devel/mkbootdisk.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- mkbootdisk.spec 7 Feb 2006 12:57:38 -0000 1.18 +++ mkbootdisk.spec 7 Mar 2006 10:23:21 -0000 1.19 @@ -1,15 +1,16 @@ Summary: Creates a boot floppy disk for booting a system. Name: mkbootdisk Version: 1.5.2 -Release: 5.2 +Release: 6 License: GPL Group: System Environment/Base Source: mkbootdisk-%{version}.tar.gz Patch0: mkbootdisk-1.5.2-tmp.patch Patch1: mkbootdisk-1.5.2-hangup.patch Patch2: mkbootdisk-1.5.2-mantypo.patch -ExclusiveArch: i386 sparc +Patch3: mkbootdisk-x86_64.patch ExclusiveOs: Linux +BuildArch: noarch Requires: mkinitrd dosfstools %ifnarch sparc Requires: syslinux @@ -34,6 +35,7 @@ %patch0 -p1 -b .tmp %patch1 -p1 -b .hangup %patch2 -p1 -b .mantypo +%patch3 -p0 -b .x86_64 %install rm -rf $RPM_BUILD_ROOT @@ -48,6 +50,9 @@ %attr(644,root,root) %{_mandir}/man8/mkbootdisk.8.gz %changelog +* Tue Mar 07 2006 Peter Vrabec 1.5.2-6 +- build as noarch + * Tue Feb 07 2006 Jesse Keating - 1.5.2-5.2 - rebuilt for new gcc4.1 snapshot and glibc changes From fedora-cvs-commits at redhat.com Tue Mar 7 12:04:15 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 7 Mar 2006 07:04:15 -0500 Subject: rpms/emacs/devel emacs.spec, 1.68, 1.69 emacs-21-personality-linux32-101818.patch, 1.2, NONE Message-ID: <200603071204.k27C4Fsa024943@cvs.devel.redhat.com> Author: petersen Update of /cvs/dist/rpms/emacs/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv24879 Modified Files: emacs.spec Removed Files: emacs-21-personality-linux32-101818.patch Log Message: - bring back setarch for i386 with -R option in spec file and drop emacs-21-personality-linux32-101818.patch since it no longer seems sufficient with recent kernels (Sam Peterson, #174736) - buildrequire giflib-devel instead of libungif-devel Index: emacs.spec =================================================================== RCS file: /cvs/dist/rpms/emacs/devel/emacs.spec,v retrieving revision 1.68 retrieving revision 1.69 diff -u -r1.68 -r1.69 --- emacs.spec 2 Mar 2006 09:47:31 -0000 1.68 +++ emacs.spec 7 Mar 2006 12:04:00 -0000 1.69 @@ -11,7 +11,7 @@ Summary: GNU Emacs text editor Name: emacs Version: 21.4 -Release: 13 +Release: 14 License: GPL URL: http://www.gnu.org/software/emacs/ Group: Applications/Editors @@ -59,7 +59,7 @@ %else Buildrequires: autoconf, gtk2-devel %endif -Buildrequires: libX11-devel, libpng-devel, libjpeg-devel, libungif-devel, libtiff-devel +Buildrequires: libX11-devel, libpng-devel, libjpeg-devel, giflib-devel, libtiff-devel Requires: xorg-x11-fonts-ISO8859-1-75dpi %ifarch %{ix86} BuildRequires: setarch @@ -102,7 +102,6 @@ Patch26: xfree86-4.3-modifiers.dpatch # generated from ftp://fly.isti.cnr.it/pub/etags.c.gz Patch27: etags-update-to-cvs.patch -Patch28: emacs-21-personality-linux32-101818.patch %endif # Lisp and doc patches @@ -193,6 +192,12 @@ %define emacs_libexecdir %{_libexecdir}/emacs/%{version}/%{_host} +%ifarch %{ix86} +%define setarch setarch i386 -R +%else +%define setarch %{nil} +%endif + %prep %if %{emacs21} %setup -q -b 1 -a 24 -a 28 -a 33 @@ -226,10 +231,6 @@ %patch25 -p1 -b .25-scroll-margin %patch26 -p1 -b .26-xmodifier %patch27 -p1 -b .27-14.21 -%ifarch %{ix86} -# workaround #101818 (vm/break dumper problem) -%patch28 -p1 -b .28-execshield -%endif %endif # patches 2 and 3 touch configure.in @@ -302,7 +303,7 @@ %if ! %{emacs21} %__make bootstrap %endif -%__make %{?_smp_mflags} +%{setarch} %__make %{?_smp_mflags} # remove versioned file so that we end up with .1 suffix and only one DOC file rm src/emacs-%{version}.* @@ -336,10 +337,20 @@ rm -rf $RPM_BUILD_ROOT # workaround #101818 (vm/break dumper problem) -%makeinstall \ -%ifarch %{ix86} - SETARCH="setarch i386 -R" -%endif +%{setarch} make install \ + prefix=%{?buildroot:%{buildroot}}%{_prefix} \ + exec_prefix=%{?buildroot:%{buildroot}}%{_exec_prefix} \ + bindir=%{?buildroot:%{buildroot}}%{_bindir} \ + sbindir=%{?buildroot:%{buildroot}}%{_sbindir} \ + sysconfdir=%{?buildroot:%{buildroot}}%{_sysconfdir} \ + datadir=%{?buildroot:%{buildroot}}%{_datadir} \ + includedir=%{?buildroot:%{buildroot}}%{_includedir} \ + libdir=%{?buildroot:%{buildroot}}%{_libdir} \ + libexecdir=%{?buildroot:%{buildroot}}%{_libexecdir} \ + localstatedir=%{?buildroot:%{buildroot}}%{_localstatedir} \ + sharedstatedir=%{?buildroot:%{buildroot}}%{_sharedstatedir} \ + mandir=%{?buildroot:%{buildroot}}%{_mandir} \ + infodir=%{?buildroot:%{buildroot}}%{_infodir} # suffix binaries with -x mv $RPM_BUILD_ROOT%{_bindir}/emacs{,-x} @@ -352,10 +363,7 @@ # remove the versioned binary with X support so that we end up with .1 suffix for emacs-nox too rm src/emacs-%{version}.* %configure --without-x -%__make %{?_smp_mflags} \ -%ifarch %{ix86} - SETARCH="setarch i386 -R" -%endif +%{setarch} %__make %{?_smp_mflags} # install the emacs without X install -m 0755 src/emacs-%{version}.1 $RPM_BUILD_ROOT%{_bindir}/emacs-%{version}-nox @@ -541,6 +549,12 @@ %endif %changelog +* Tue Mar 7 2006 Jens Petersen - 21.4-14 +- bring back setarch for i386 with -R option in spec file and drop + emacs-21-personality-linux32-101818.patch since it no longer seems + sufficient with recent kernels (Sam Peterson, #174736) +- buildrequire giflib-devel instead of libungif-devel + * Thu Mar 2 2006 Jens Petersen - avoid backup for fix-x-vs-no-x-diffs.dpatch (Ian Collier, #183503) - remove the old ccmode info manual (#182084) --- emacs-21-personality-linux32-101818.patch DELETED --- From fedora-cvs-commits at redhat.com Tue Mar 7 13:39:04 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 7 Mar 2006 08:39:04 -0500 Subject: rpms/glibc/devel glibc-fedora.patch, 1.145, 1.146 glibc.spec, 1.229, 1.230 sources, 1.166, 1.167 Message-ID: <200603071339.k27Dd4jd023118@cvs.devel.redhat.com> Author: jakub Update of /cvs/dist/rpms/glibc/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv23080/devel Modified Files: glibc-fedora.patch glibc.spec sources Log Message: auto-import glibc-2.4-3 on branch devel from glibc-2.4-3.src.rpm glibc-fedora.patch: ChangeLog | 136 ++++ ChangeLog.11 | 21 ChangeLog.12 | 12 ChangeLog.15 | 45 + csu/elf-init.c | 17 debug/tst-chk1.c | 7 elf/ldconfig.c | 25 elf/tst-stackguard1.c | 8 iconv/iconvconfig.c | 55 - include/bits/stdlib-ldbl.h | 1 include/bits/wchar-ldbl.h | 1 include/features.h | 8 intl/locale.alias | 2 libio/bits/stdio2.h | 19 libio/stdio.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/no_NO | 69 ++ localedata/locales/zh_TW | 6 malloc/mcheck.c | 30 - malloc/mtrace.c | 20 math/libm-test.inc | 334 +++++++++++ nptl/ChangeLog | 19 nptl/Makefile | 8 nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S | 61 +- nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevelrobustlock.S | 45 + nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h | 242 +++++--- nptl/sysdeps/unix/sysv/linux/kernel-features.h | 6 nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S | 59 +- nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h | 294 +++++++--- nptl/sysdeps/unix/sysv/linux/x86_64/lowlevelrobustlock.S | 41 + nptl/tst-stackguard1.c | 8 nscd/connections.c | 15 nscd/nscd.c | 4 nscd/nscd.conf | 4 nscd/nscd.init | 19 posix/Makefile | 19 posix/getconf.speclist.h | 15 sysdeps/generic/dl-cache.h | 8 sysdeps/ia64/Makefile | 4 sysdeps/ia64/ia64libgcc.S | 350 ------------ sysdeps/ia64/libgcc-compat.c | 84 ++ sysdeps/ieee754/ldbl-128ibm/e_fmodl.c | 8 sysdeps/ieee754/ldbl-128ibm/e_rem_pio2l.c | 5 sysdeps/ieee754/ldbl-128ibm/math_ldbl.h | 293 ++++++---- sysdeps/ieee754/ldbl-128ibm/s_ceill.c | 125 +--- sysdeps/ieee754/ldbl-128ibm/s_floorl.c | 118 +--- sysdeps/ieee754/ldbl-128ibm/s_rintl.c | 144 ++-- sysdeps/ieee754/ldbl-128ibm/s_roundl.c | 124 +--- sysdeps/ieee754/ldbl-128ibm/s_truncl.c | 125 +--- sysdeps/powerpc/fpu/fegetround.c | 4 sysdeps/powerpc/fpu/fenv_libc.h | 37 + sysdeps/powerpc/fpu/fesetround.c | 18 sysdeps/powerpc/fpu/math_ldbl.h | 189 ++++++ sysdeps/powerpc/powerpc64/fpu/s_rintl.S | 113 --- sysdeps/unix/nice.c | 7 sysdeps/unix/sysv/linux/dl-osinfo.h | 29 sysdeps/unix/sysv/linux/futimesat.c | 23 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/tcsetattr.c | 32 + 69 files changed, 2428 insertions(+), 1256 deletions(-) Index: glibc-fedora.patch =================================================================== RCS file: /cvs/dist/rpms/glibc/devel/glibc-fedora.patch,v retrieving revision 1.145 retrieving revision 1.146 diff -u -r1.145 -r1.146 --- glibc-fedora.patch 7 Mar 2006 08:44:54 -0000 1.145 +++ glibc-fedora.patch 7 Mar 2006 13:39:01 -0000 1.146 @@ -1,6 +1,12 @@ --- glibc-20060306T1239/ChangeLog 6 Mar 2006 10:59:43 -0000 1.10062 -+++ glibc-20060306T1239-fedora/ChangeLog 7 Mar 2006 08:24:11 -0000 1.8782.2.173 -@@ -1,3 +1,37 @@ ++++ glibc-20060306T1239-fedora/ChangeLog 7 Mar 2006 13:28:11 -0000 1.8782.2.174 +@@ -1,3 +1,43 @@ ++2006-03-07 Jakub Jelinek ++ ++ * math/libm-test.inc [TEST_LDOUBLE] (ceil_test, floor_test, rint_test, ++ round_test, trunc_test): Only run some of the new tests if ++ LDBL_MANT_DIG > 100. ++ +2006-03-03 Steven Munroe + Alan Modra + @@ -38,7 +44,7 @@ 2006-03-06 Roland McGrath * version.h (VERSION): 2.4 -@@ -18,6 +52,34 @@ +@@ -18,6 +58,34 @@ _SC_CPUTIME and _SC_THREAD_CPUTIME here. * sysdeps/unix/sysv/linux/x86_64/sysconf.c (__sysconf): Likewise. @@ -73,7 +79,7 @@ 2006-03-05 Roland McGrath * malloc/malloc.c (MALLOC_ALIGNMENT): Revert to (2 * SIZE_SZ) value. -@@ -1030,6 +1092,11 @@ +@@ -1030,6 +1098,11 @@ (__MATHDECL_2): Use __REDIRECT_NTH instead of __REDIRECT followed by __THROW. @@ -85,7 +91,7 @@ 2006-02-02 Ulrich Drepper * sysdeps/unix/sysv/linux/futimesat.c [__NR_futimesat] -@@ -1089,6 +1156,11 @@ +@@ -1089,6 +1162,11 @@ * sysdeps/ieee754/ldbl-128/s_llrintl.c (__llrintl): Fix a typo. * sysdeps/s390/fpu/libm-test-ulps: Remove llrint ulps. @@ -97,7 +103,7 @@ 2006-01-19 Thomas Schwinge * libio/genops.c: Include . -@@ -3515,6 +3587,10 @@ +@@ -3515,6 +3593,10 @@ * elf/order2mod2.c (init): Cast ignored value to void. @@ -108,7 +114,7 @@ 2005-12-27 Ulrich Drepper * elf/tst-tls13.c (do_test): Avoid using the library path when -@@ -3798,6 +3874,26 @@ +@@ -3798,6 +3880,26 @@ * sysdeps/unix/sysv/linux/time.c: If __NR_time is not defined, use sysdeps/unix/time.c implementation. @@ -135,7 +141,7 @@ 2005-12-19 Ulrich Drepper [BZ #1955] -@@ -6916,6 +7012,11 @@ +@@ -6916,6 +7018,11 @@ R_ARM_TLS_TPOFF32, R_ARM_TLS_GD32, R_ARM_TLS_LDM32, R_ARM_TLS_LDO32, R_ARM_TLS_IE32, R_ARM_TLS_LE32): New macros. @@ -147,7 +153,7 @@ 2005-10-03 Roland McGrath * sysdeps/powerpc/nofpu: Directory removed, saved in ports repository. -@@ -7910,6 +8011,12 @@ +@@ -7910,6 +8017,12 @@ * argp/argp-help.c (__argp_error): __asprintf -> vasprintf. (__argp_failure): Likewise. @@ -160,7 +166,7 @@ 2005-08-08 Ulrich Drepper * nscd/cache.c (cache_add): Commit hash table and header to disk. -@@ -8034,6 +8141,17 @@ +@@ -8034,6 +8147,17 @@ __syslog_chk. * misc/Versions: Export __syslog_chk and __vsyslog_chk. @@ -178,7 +184,7 @@ 2005-07-28 Thomas Schwinge [BZ #1137] -@@ -11094,6 +11212,18 @@ +@@ -11094,6 +11218,18 @@ * scripts/soversions.awk: Fix default version set handling. @@ -1140,7 +1146,7 @@ __malloc_hook = tr_mallochook; --- glibc-20060306T1239/math/libm-test.inc 28 Jan 2006 00:35:55 -0000 1.69 -+++ glibc-20060306T1239-fedora/math/libm-test.inc 7 Mar 2006 08:24:12 -0000 1.61.2.7 ++++ glibc-20060306T1239-fedora/math/libm-test.inc 7 Mar 2006 13:28:12 -0000 1.61.2.8 @@ -1628,8 +1628,12 @@ ceil_test (void) TEST_f_f (ceil, M_PIl, 4.0); @@ -1154,24 +1160,27 @@ #ifdef TEST_LDOUBLE /* The result can only be represented in long double. */ -@@ -1644,6 +1648,13 @@ ceil_test (void) - TEST_f_f (ceil, -4503599627370496.5L, -4503599627370496.0L); +@@ -1645,6 +1649,15 @@ ceil_test (void) TEST_f_f (ceil, -4503599627370496.75L, -4503599627370496.0L); TEST_f_f (ceil, -4503599627370497.5L, -4503599627370497.0L); -+ + ++# if LDBL_MANT_DIG > 100 + TEST_f_f (ceil, 4503599627370494.5000000000001L, 4503599627370495.0L); + TEST_f_f (ceil, 4503599627370495.5000000000001L, 4503599627370496.0L); + TEST_f_f (ceil, 4503599627370496.5000000000001L, 4503599627370497.0L); + TEST_f_f (ceil, -4503599627370494.5000000000001L, -4503599627370494.0L); + TEST_f_f (ceil, -4503599627370495.5000000000001L, -4503599627370495.0L); + TEST_f_f (ceil, -4503599627370496.5000000000001L, -4503599627370496.0L); - ++# endif ++ TEST_f_f (ceil, 9007199254740991.5L, 9007199254740992.0L); TEST_f_f (ceil, 9007199254740992.25L, 9007199254740993.0L); -@@ -1657,6 +1668,20 @@ ceil_test (void) + TEST_f_f (ceil, 9007199254740992.5L, 9007199254740993.0L); +@@ -1657,6 +1670,22 @@ ceil_test (void) TEST_f_f (ceil, -9007199254740992.75L, -9007199254740992.0L); TEST_f_f (ceil, -9007199254740993.5L, -9007199254740993.0L); ++# if LDBL_MANT_DIG > 100 + TEST_f_f (ceil, 9007199254740991.0000000000001L, 9007199254740992.0L); + TEST_f_f (ceil, 9007199254740992.0000000000001L, 9007199254740993.0L); + TEST_f_f (ceil, 9007199254740993.0000000000001L, 9007199254740994.0L); @@ -1185,11 +1194,12 @@ + TEST_f_f (ceil, -9007199254740991.5000000000001L, -9007199254740991.0L); + TEST_f_f (ceil, -9007199254740992.5000000000001L, -9007199254740992.0L); + TEST_f_f (ceil, -9007199254740993.5000000000001L, -9007199254740993.0L); ++# endif + TEST_f_f (ceil, 72057594037927935.5L, 72057594037927936.0L); TEST_f_f (ceil, 72057594037927936.25L, 72057594037927937.0L); TEST_f_f (ceil, 72057594037927936.5L, 72057594037927937.0L); -@@ -2628,9 +2653,12 @@ floor_test (void) +@@ -2628,9 +2657,12 @@ floor_test (void) TEST_f_f (floor, M_PIl, 3.0); TEST_f_f (floor, -M_PIl, -4.0); @@ -1203,35 +1213,41 @@ #ifdef TEST_LDOUBLE /* The result can only be represented in long double. */ -@@ -2639,12 +2667,18 @@ floor_test (void) +@@ -2639,12 +2671,22 @@ floor_test (void) TEST_f_f (floor, 4503599627370496.5L, 4503599627370496.0L); TEST_f_f (floor, 4503599627370496.75L, 4503599627370496.0L); TEST_f_f (floor, 4503599627370497.5L, 4503599627370497.0L); ++# if LDBL_MANT_DIG > 100 + TEST_f_f (floor, 4503599627370494.5000000000001L, 4503599627370494.0L); + TEST_f_f (floor, 4503599627370495.5000000000001L, 4503599627370495.0L); + TEST_f_f (floor, 4503599627370496.5000000000001L, 4503599627370496.0L); ++# endif TEST_f_f (floor, -4503599627370495.5L, -4503599627370496.0L); TEST_f_f (floor, -4503599627370496.25L, -4503599627370497.0L); TEST_f_f (floor, -4503599627370496.5L, -4503599627370497.0L); TEST_f_f (floor, -4503599627370496.75L, -4503599627370497.0L); TEST_f_f (floor, -4503599627370497.5L, -4503599627370498.0L); ++# if LDBL_MANT_DIG > 100 + TEST_f_f (floor, -4503599627370494.5000000000001L, -4503599627370495.0L); + TEST_f_f (floor, -4503599627370495.5000000000001L, -4503599627370496.0L); + TEST_f_f (floor, -4503599627370496.5000000000001L, -4503599627370497.0L); ++# endif TEST_f_f (floor, 9007199254740991.5L, 9007199254740991.0L); TEST_f_f (floor, 9007199254740992.25L, 9007199254740992.0L); -@@ -2652,12 +2686,26 @@ floor_test (void) +@@ -2652,12 +2694,30 @@ floor_test (void) TEST_f_f (floor, 9007199254740992.75L, 9007199254740992.0L); TEST_f_f (floor, 9007199254740993.5L, 9007199254740993.0L); ++# if LDBL_MANT_DIG > 100 + TEST_f_f (floor, 9007199254740991.0000000000001L, 9007199254740991.0L); + TEST_f_f (floor, 9007199254740992.0000000000001L, 9007199254740992.0L); + TEST_f_f (floor, 9007199254740993.0000000000001L, 9007199254740993.0L); + TEST_f_f (floor, 9007199254740991.5000000000001L, 9007199254740991.0L); + TEST_f_f (floor, 9007199254740992.5000000000001L, 9007199254740992.0L); + TEST_f_f (floor, 9007199254740993.5000000000001L, 9007199254740993.0L); ++# endif + TEST_f_f (floor, -9007199254740991.5L, -9007199254740992.0L); TEST_f_f (floor, -9007199254740992.25L, -9007199254740993.0L); @@ -1239,17 +1255,19 @@ TEST_f_f (floor, -9007199254740992.75L, -9007199254740993.0L); TEST_f_f (floor, -9007199254740993.5L, -9007199254740994.0L); ++# if LDBL_MANT_DIG > 100 + TEST_f_f (floor, -9007199254740991.0000000000001L, -9007199254740992.0L); + TEST_f_f (floor, -9007199254740992.0000000000001L, -9007199254740993.0L); + TEST_f_f (floor, -9007199254740993.0000000000001L, -9007199254740994.0L); + TEST_f_f (floor, -9007199254740991.5000000000001L, -9007199254740992.0L); + TEST_f_f (floor, -9007199254740992.5000000000001L, -9007199254740993.0L); + TEST_f_f (floor, -9007199254740993.5000000000001L, -9007199254740994.0L); ++# endif + TEST_f_f (floor, 72057594037927935.5L, 72057594037927935.0L); TEST_f_f (floor, 72057594037927936.25L, 72057594037927936.0L); TEST_f_f (floor, 72057594037927936.5L, 72057594037927936.0L); -@@ -3971,6 +4019,12 @@ rint_test (void) +@@ -3971,6 +4031,12 @@ rint_test (void) TEST_f_f (rint, -2.5, -2.0); TEST_f_f (rint, -3.5, -4.0); TEST_f_f (rint, -4.5, -4.0); @@ -1262,14 +1280,16 @@ #ifdef TEST_LDOUBLE /* The result can only be represented in long double. */ TEST_f_f (rint, 4503599627370495.5L, 4503599627370496.0L); -@@ -3978,12 +4032,34 @@ rint_test (void) +@@ -3978,12 +4044,38 @@ rint_test (void) TEST_f_f (rint, 4503599627370496.5L, 4503599627370496.0L); TEST_f_f (rint, 4503599627370496.75L, 4503599627370497.0L); TEST_f_f (rint, 4503599627370497.5L, 4503599627370498.0L); + ++# if LDBL_MANT_DIG > 100 + TEST_f_f (rint, 4503599627370494.5000000000001L, 4503599627370495.0L); + TEST_f_f (rint, 4503599627370495.5000000000001L, 4503599627370496.0L); + TEST_f_f (rint, 4503599627370496.5000000000001L, 4503599627370497.0L); ++# endif TEST_f_f (rint, -4503599627370495.5L, -4503599627370496.0L); TEST_f_f (rint, -4503599627370496.25L, -4503599627370496.0L); @@ -1277,6 +1297,7 @@ TEST_f_f (rint, -4503599627370496.75L, -4503599627370497.0L); TEST_f_f (rint, -4503599627370497.5L, -4503599627370498.0L); + ++# if LDBL_MANT_DIG > 100 + TEST_f_f (rint, -4503599627370494.5000000000001L, -4503599627370495.0L); + TEST_f_f (rint, -4503599627370495.5000000000001L, -4503599627370496.0L); + TEST_f_f (rint, -4503599627370496.5000000000001L, -4503599627370497.0L); @@ -1294,10 +1315,11 @@ + TEST_f_f (rint, -9007199254740991.5000000000001L, -9007199254740992.0L); + TEST_f_f (rint, -9007199254740992.5000000000001L, -9007199254740993.0L); + TEST_f_f (rint, -9007199254740993.5000000000001L, -9007199254740994.0L); ++# endif TEST_f_f (rint, 9007199254740991.5L, 9007199254740992.0L); TEST_f_f (rint, 9007199254740992.25L, 9007199254740992.0L); -@@ -4039,6 +4115,45 @@ rint_test_tonearest (void) +@@ -4039,6 +4131,49 @@ rint_test_tonearest (void) TEST_f_f (rint, -1.0, -1.0); TEST_f_f (rint, -1.5, -2.0); TEST_f_f (rint, -2.0, -2.0); @@ -1314,14 +1336,17 @@ + TEST_f_f (rint, 4503599627370496.5L, 4503599627370496.0L); + TEST_f_f (rint, 4503599627370496.75L, 4503599627370497.0L); + TEST_f_f (rint, 4503599627370497.5L, 4503599627370498.0L); ++# if LDBL_MANT_DIG > 100 + TEST_f_f (rint, 4503599627370494.5000000000001L, 4503599627370495.0L); + TEST_f_f (rint, 4503599627370495.5000000000001L, 4503599627370496.0L); + TEST_f_f (rint, 4503599627370496.5000000000001L, 4503599627370497.0L); ++# endif + TEST_f_f (rint, -4503599627370495.5L, -4503599627370496.0L); + TEST_f_f (rint, -4503599627370496.25L, -4503599627370496.0L); + TEST_f_f (rint, -4503599627370496.5L, -4503599627370496.0L); + TEST_f_f (rint, -4503599627370496.75L, -4503599627370497.0L); + TEST_f_f (rint, -4503599627370497.5L, -4503599627370498.0L); ++# if LDBL_MANT_DIG > 100 + TEST_f_f (rint, -4503599627370494.5000000000001L, -4503599627370495.0L); + TEST_f_f (rint, -4503599627370495.5000000000001L, -4503599627370496.0L); + TEST_f_f (rint, -4503599627370496.5000000000001L, -4503599627370497.0L); @@ -1339,11 +1364,12 @@ + TEST_f_f (rint, -9007199254740991.5000000000001L, -9007199254740992.0L); + TEST_f_f (rint, -9007199254740992.5000000000001L, -9007199254740993.0L); + TEST_f_f (rint, -9007199254740993.5000000000001L, -9007199254740994.0L); ++# endif +#endif } fesetround(save_round_mode); -@@ -4066,6 +4181,45 @@ rint_test_towardzero (void) +@@ -4066,6 +4201,49 @@ rint_test_towardzero (void) TEST_f_f (rint, -1.0, -1.0); TEST_f_f (rint, -1.5, -1.0); TEST_f_f (rint, -2.0, -2.0); @@ -1360,14 +1386,17 @@ + TEST_f_f (rint, 4503599627370496.5L, 4503599627370496.0L); + TEST_f_f (rint, 4503599627370496.75L, 4503599627370496.0L); + TEST_f_f (rint, 4503599627370497.5L, 4503599627370497.0L); ++# if LDBL_MANT_DIG > 100 + TEST_f_f (rint, 4503599627370494.5000000000001L, 4503599627370494.0L); + TEST_f_f (rint, 4503599627370495.5000000000001L, 4503599627370495.0L); + TEST_f_f (rint, 4503599627370496.5000000000001L, 4503599627370496.0L); ++# endif + TEST_f_f (rint, -4503599627370495.5L, -4503599627370495.0L); + TEST_f_f (rint, -4503599627370496.25L, -4503599627370496.0L); + TEST_f_f (rint, -4503599627370496.5L, -4503599627370496.0L); + TEST_f_f (rint, -4503599627370496.75L, -4503599627370496.0L); + TEST_f_f (rint, -4503599627370497.5L, -4503599627370497.0L); ++# if LDBL_MANT_DIG > 100 + TEST_f_f (rint, -4503599627370494.5000000000001L, -4503599627370494.0L); + TEST_f_f (rint, -4503599627370495.5000000000001L, -4503599627370495.0L); + TEST_f_f (rint, -4503599627370496.5000000000001L, -4503599627370496.0L); @@ -1385,11 +1414,12 @@ + TEST_f_f (rint, -9007199254740991.5000000000001L, -9007199254740991.0L); + TEST_f_f (rint, -9007199254740992.5000000000001L, -9007199254740992.0L); + TEST_f_f (rint, -9007199254740993.5000000000001L, -9007199254740993.0L); ++# endif +#endif } fesetround(save_round_mode); -@@ -4093,6 +4247,45 @@ rint_test_downward (void) +@@ -4093,6 +4271,49 @@ rint_test_downward (void) TEST_f_f (rint, -1.0, -1.0); TEST_f_f (rint, -1.5, -2.0); TEST_f_f (rint, -2.0, -2.0); @@ -1406,14 +1436,17 @@ + TEST_f_f (rint, 4503599627370496.5L, 4503599627370496.0L); + TEST_f_f (rint, 4503599627370496.75L, 4503599627370496.0L); + TEST_f_f (rint, 4503599627370497.5L, 4503599627370497.0L); ++# if LDBL_MANT_DIG > 100 + TEST_f_f (rint, 4503599627370494.5000000000001L, 4503599627370494.0L); + TEST_f_f (rint, 4503599627370495.5000000000001L, 4503599627370495.0L); + TEST_f_f (rint, 4503599627370496.5000000000001L, 4503599627370496.0L); ++# endif + TEST_f_f (rint, -4503599627370495.5L, -4503599627370496.0L); + TEST_f_f (rint, -4503599627370496.25L, -4503599627370497.0L); + TEST_f_f (rint, -4503599627370496.5L, -4503599627370497.0L); + TEST_f_f (rint, -4503599627370496.75L, -4503599627370497.0L); + TEST_f_f (rint, -4503599627370497.5L, -4503599627370498.0L); ++# if LDBL_MANT_DIG > 100 + TEST_f_f (rint, -4503599627370494.5000000000001L, -4503599627370495.0L); + TEST_f_f (rint, -4503599627370495.5000000000001L, -4503599627370496.0L); + TEST_f_f (rint, -4503599627370496.5000000000001L, -4503599627370497.0L); @@ -1431,11 +1464,12 @@ + TEST_f_f (rint, -9007199254740991.5000000000001L, -9007199254740992.0L); + TEST_f_f (rint, -9007199254740992.5000000000001L, -9007199254740993.0L); + TEST_f_f (rint, -9007199254740993.5000000000001L, -9007199254740994.0L); ++# endif +#endif } fesetround(save_round_mode); -@@ -4120,6 +4313,45 @@ rint_test_upward (void) +@@ -4120,6 +4341,49 @@ rint_test_upward (void) TEST_f_f (rint, -1.0, -1.0); TEST_f_f (rint, -1.5, -1.0); TEST_f_f (rint, -2.0, -2.0); @@ -1452,14 +1486,17 @@ + TEST_f_f (rint, 4503599627370496.5L, 4503599627370497.0L); + TEST_f_f (rint, 4503599627370496.75L, 4503599627370497.0L); + TEST_f_f (rint, 4503599627370497.5L, 4503599627370498.0L); ++# if LDBL_MANT_DIG > 100 + TEST_f_f (rint, 4503599627370494.5000000000001L, 4503599627370495.0L); + TEST_f_f (rint, 4503599627370495.5000000000001L, 4503599627370496.0L); + TEST_f_f (rint, 4503599627370496.5000000000001L, 4503599627370497.0L); ++# endif + TEST_f_f (rint, -4503599627370495.5L, -4503599627370495.0L); + TEST_f_f (rint, -4503599627370496.25L, -4503599627370496.0L); + TEST_f_f (rint, -4503599627370496.5L, -4503599627370496.0L); + TEST_f_f (rint, -4503599627370496.75L, -4503599627370496.0L); + TEST_f_f (rint, -4503599627370497.5L, -4503599627370497.0L); ++# if LDBL_MANT_DIG > 100 + TEST_f_f (rint, -4503599627370494.5000000000001L, -4503599627370494.0L); + TEST_f_f (rint, -4503599627370495.5000000000001L, -4503599627370495.0L); + TEST_f_f (rint, -4503599627370496.5000000000001L, -4503599627370496.0L); @@ -1477,11 +1514,12 @@ + TEST_f_f (rint, -9007199254740991.5000000000001L, -9007199254740991.0L); + TEST_f_f (rint, -9007199254740992.5000000000001L, -9007199254740992.0L); + TEST_f_f (rint, -9007199254740993.5000000000001L, -9007199254740993.0L); ++# endif +#endif } fesetround(save_round_mode); -@@ -4142,6 +4374,12 @@ round_test (void) +@@ -4142,6 +4406,12 @@ round_test (void) TEST_f_f (round, -0.8L, -1.0); TEST_f_f (round, 1.5, 2.0); TEST_f_f (round, -1.5, -2.0); @@ -1494,31 +1532,36 @@ TEST_f_f (round, 2097152.5, 2097153); TEST_f_f (round, -2097152.5, -2097153); -@@ -4151,13 +4389,19 @@ round_test (void) +@@ -4151,13 +4421,23 @@ round_test (void) TEST_f_f (round, 4503599627370496.25L, 4503599627370496.0L); TEST_f_f (round, 4503599627370496.5L, 4503599627370497.0L); TEST_f_f (round, 4503599627370496.75L, 4503599627370497.0L); - TEST_f_f (round, 4503599627370497.5L, 4503599627370498.0L); + TEST_f_f (round, 4503599627370497.5L, 4503599627370498.0L); ++# if LDBL_MANT_DIG > 100 + TEST_f_f (round, 4503599627370494.5000000000001L, 4503599627370495.0L); + TEST_f_f (round, 4503599627370495.5000000000001L, 4503599627370496.0L); + TEST_f_f (round, 4503599627370496.5000000000001L, 4503599627370497.0L); ++# endif TEST_f_f (round, -4503599627370495.5L, -4503599627370496.0L); TEST_f_f (round, -4503599627370496.25L, -4503599627370496.0L); TEST_f_f (round, -4503599627370496.5L, -4503599627370497.0L); TEST_f_f (round, -4503599627370496.75L, -4503599627370497.0L); TEST_f_f (round, -4503599627370497.5L, -4503599627370498.0L); ++# if LDBL_MANT_DIG > 100 + TEST_f_f (round, -4503599627370494.5000000000001L, -4503599627370495.0L); + TEST_f_f (round, -4503599627370495.5000000000001L, -4503599627370496.0L); + TEST_f_f (round, -4503599627370496.5000000000001L, -4503599627370497.0L); ++# endif TEST_f_f (round, 9007199254740991.5L, 9007199254740992.0L); TEST_f_f (round, 9007199254740992.25L, 9007199254740992.0L); -@@ -4171,6 +4415,20 @@ round_test (void) +@@ -4171,6 +4451,22 @@ round_test (void) TEST_f_f (round, -9007199254740992.75L, -9007199254740993.0L); TEST_f_f (round, -9007199254740993.5L, -9007199254740994.0L); ++# if LDBL_MANT_DIG > 100 + TEST_f_f (round, 9007199254740991.0000000000001L, 9007199254740991.0L); + TEST_f_f (round, 9007199254740992.0000000000001L, 9007199254740992.0L); + TEST_f_f (round, 9007199254740993.0000000000001L, 9007199254740993.0L); @@ -1532,11 +1575,12 @@ + TEST_f_f (round, -9007199254740991.5000000000001L, -9007199254740992.0L); + TEST_f_f (round, -9007199254740992.5000000000001L, -9007199254740993.0L); + TEST_f_f (round, -9007199254740993.5000000000001L, -9007199254740994.0L); ++# endif + TEST_f_f (round, 72057594037927935.5L, 72057594037927936.0L); TEST_f_f (round, 72057594037927936.25L, 72057594037927936.0L); TEST_f_f (round, 72057594037927936.5L, 72057594037927937.0L); -@@ -4541,7 +4799,11 @@ trunc_test (void) +@@ -4541,7 +4837,11 @@ trunc_test (void) TEST_f_f (trunc, 0, 0); TEST_f_f (trunc, minus_zero, minus_zero); @@ -1548,13 +1592,15 @@ TEST_f_f (trunc, -0.625, minus_zero); TEST_f_f (trunc, 1, 1); TEST_f_f (trunc, -1, -1); -@@ -4565,11 +4827,19 @@ trunc_test (void) +@@ -4565,11 +4865,23 @@ trunc_test (void) TEST_f_f (trunc, 4503599627370496.75L, 4503599627370496.0L); TEST_f_f (trunc, 4503599627370497.5L, 4503599627370497.0L); ++# if LDBL_MANT_DIG > 100 + TEST_f_f (trunc, 4503599627370494.5000000000001L, 4503599627370494.0L); + TEST_f_f (trunc, 4503599627370495.5000000000001L, 4503599627370495.0L); + TEST_f_f (trunc, 4503599627370496.5000000000001L, 4503599627370496.0L); ++# endif + TEST_f_f (trunc, -4503599627370495.5L, -4503599627370495.0L); TEST_f_f (trunc, -4503599627370496.25L, -4503599627370496.0L); @@ -1562,22 +1608,26 @@ TEST_f_f (trunc, -4503599627370496.75L, -4503599627370496.0L); TEST_f_f (trunc, -4503599627370497.5L, -4503599627370497.0L); + ++# if LDBL_MANT_DIG > 100 + TEST_f_f (trunc, -4503599627370494.5000000000001L, -4503599627370494.0L); + TEST_f_f (trunc, -4503599627370495.5000000000001L, -4503599627370495.0L); + TEST_f_f (trunc, -4503599627370496.5000000000001L, -4503599627370496.0L); ++# endif TEST_f_f (trunc, 9007199254740991.5L, 9007199254740991.0L); TEST_f_f (trunc, 9007199254740992.25L, 9007199254740992.0L); -@@ -4577,12 +4847,26 @@ trunc_test (void) +@@ -4577,12 +4889,30 @@ trunc_test (void) TEST_f_f (trunc, 9007199254740992.75L, 9007199254740992.0L); TEST_f_f (trunc, 9007199254740993.5L, 9007199254740993.0L); ++# if LDBL_MANT_DIG > 100 + TEST_f_f (trunc, 9007199254740991.0000000000001L, 9007199254740991.0L); + TEST_f_f (trunc, 9007199254740992.0000000000001L, 9007199254740992.0L); + TEST_f_f (trunc, 9007199254740993.0000000000001L, 9007199254740993.0L); + TEST_f_f (trunc, 9007199254740991.5000000000001L, 9007199254740991.0L); + TEST_f_f (trunc, 9007199254740992.5000000000001L, 9007199254740992.0L); + TEST_f_f (trunc, 9007199254740993.5000000000001L, 9007199254740993.0L); ++# endif + TEST_f_f (trunc, -9007199254740991.5L, -9007199254740991.0L); TEST_f_f (trunc, -9007199254740992.25L, -9007199254740992.0L); @@ -1585,12 +1635,14 @@ TEST_f_f (trunc, -9007199254740992.75L, -9007199254740992.0L); TEST_f_f (trunc, -9007199254740993.5L, -9007199254740993.0L); ++# if LDBL_MANT_DIG > 100 + TEST_f_f (trunc, -9007199254740991.0000000000001L, -9007199254740991.0L); + TEST_f_f (trunc, -9007199254740992.0000000000001L, -9007199254740992.0L); + TEST_f_f (trunc, -9007199254740993.0000000000001L, -9007199254740993.0L); + TEST_f_f (trunc, -9007199254740991.5000000000001L, -9007199254740991.0L); + TEST_f_f (trunc, -9007199254740992.5000000000001L, -9007199254740992.0L); + TEST_f_f (trunc, -9007199254740993.5000000000001L, -9007199254740993.0L); ++# endif + TEST_f_f (trunc, 72057594037927935.5L, 72057594037927935.0L); TEST_f_f (trunc, 72057594037927936.25L, 72057594037927936.0L); @@ -4916,6 +4968,122 @@ + } + return a; +} +--- glibc-20060306T1239/sysdeps/powerpc/powerpc64/fpu/s_rintl.S 28 Jan 2006 00:07:31 -0000 1.1 ++++ glibc-20060306T1239-fedora/sysdeps/powerpc/powerpc64/fpu/s_rintl.S 1 Jan 1970 00:00:00 -0000 +@@ -1,113 +0,0 @@ +-/* Round to int long double floating-point values. +- IBM extended format long double version. +- Copyright (C) 2004, 2006 Free Software Foundation, Inc. +- This file is part of the GNU C Library. +- +- The GNU C Library is free software; you can redistribute it and/or +- modify it under the terms of the GNU Lesser General Public +- License as published by the Free Software Foundation; either +- version 2.1 of the License, or (at your option) any later version. +- +- The GNU C Library is distributed in the hope that it will be useful, +- but WITHOUT ANY WARRANTY; without even the implied warranty of +- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +- Lesser General Public License for more details. +- +- You should have received a copy of the GNU Lesser General Public +- License along with the GNU C Library; if not, write to the Free +- Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA +- 02111-1307 USA. */ +- +-/* This has been coded in assembler because GCC makes such a mess of it +- when it's coded in C. */ +- +-#include +-#include +- +- .section ".toc","aw" +-.LC0: /* 2**52 */ +- .tc FD_43300000_0[TC],0x4330000000000000 +- .section ".text" +- +-ENTRY (__rintl) +- lfd fp13,.LC0 at toc(2) +- fabs fp0,fp1 +- fsub fp12,fp13,fp13 /* generate 0.0 */ +- fabs fp9,fp2 +- fcmpu cr7,fp0,fp13 /* if (fabs(x) > TWO52) */ +- fcmpu cr6,fp1,fp12 /* if (x > 0.0) */ +- bnl- cr7,.L2 +- fmr fp2,fp12 +- bng- cr6,.L1 +- fadd fp1,fp1,fp13 /* x+= TWO52; */ +- fsub fp1,fp1,fp13 /* x-= TWO52; */ +- fabs fp1,fp1 /* if (x == 0.0) */ +- blr /* x = 0.0; */ +-.L1: +- bnllr- cr6 /* if (x < 0.0) */ +- fsub fp1,fp1,fp13 /* x-= TWO52; */ +- fadd fp1,fp1,fp13 /* x+= TWO52; */ +- fnabs fp1,fp1 /* if (x == 0.0) */ +- blr /* x = -0.0; */ +- +-/* The high double is > TWO52 so we need to round the low double and +- perhaps the high double. In this case we have to round the low +- double and handle any adjustment to the high double that may be +- caused by rounding (up). This is complicated by the fact that the +- high double may already be rounded and the low double may have the +- opposite sign to compensate.This gets a bit tricky so we use the +- following algorithm: +- +- tau = floor(x_high/TWO52); +- x0 = x_high - tau; +- x1 = x_low + tau; +- r1 = rint(x1); +- y_high = x0 + r1; +- y_low = x0 - y_high + r1; +- return y; */ +-.L2: +- fcmpu cr7,fp9,fp13 /* if (|x_low| > TWO52) */ +- fcmpu cr0,fp9,fp12 /* || (|x_low| == 0.0) */ +- fcmpu cr5,fp2,fp12 /* if (x_low > 0.0) */ +- bgelr- cr7 /* return x; */ +- beqlr- cr0 +- fdiv fp8,fp1,fp13 /* x_high/TWO52 */ +- +- bng- cr6,.L6 /* if (x > 0.0) */ +- fctidz fp0,fp8 +- fcfid fp8,fp0 /* tau = floor(x_high/TWO52); */ +- fadd fp8,fp8,fp8 /* tau++; Make tau even */ +- bng cr5,.L4 /* if (x_low > 0.0) */ +- fmr fp3,fp1 +- fmr fp4,fp2 +- b .L5 +-.L4: /* if (x_low < 0.0) */ +- fsub fp3,fp1,fp8 /* x0 = x_high - tau; */ +- fadd fp4,fp2,fp8 /* x1 = x_low + tau; */ +-.L5: +- fadd fp5,fp4,fp13 /* r1 = x1 + TWO52; */ +- fsub fp5,fp5,fp13 /* r1 = r1 - TWO52; */ +- b .L9 +-.L6: /* if (x < 0.0) */ +- fctidz fp0,fp8 +- fcfid fp8,fp0 /* tau = floor(x_high/TWO52); */ +- fadd fp8,fp8,fp8 /* tau++; Make tau even */ +- bnl cr5,.L7 /* if (x_low < 0.0) */ +- fmr fp3,fp1 +- fmr fp4,fp2 +- b .L8 +-.L7: /* if (x_low > 0.0) */ +- fsub fp3,fp1,fp8 /* x0 = x_high - tau; */ +- fadd fp4,fp2,fp8 /* x1 = x_low + tau; */ +-.L8: +- fsub fp5,fp13,fp4 /* r1 = TWO52 - x1; */ +- fsub fp0,fp5,fp13 /* r1 = - (r1 - TWO52); */ +- fneg fp5,fp0 +-.L9: +- fadd fp1,fp3,fp5 /* y_high = x0 + r1; */ +- fsub fp2,fp3,fp1 /* y_low = x0 - y_high + r1; */ +- fadd fp2,fp2,fp5 +- blr +-END (__rintl) +- +-long_double_symbol (libm, __rintl, rintl) --- glibc-20060306T1239/sysdeps/unix/nice.c 28 Sep 2002 19:13:13 -0000 1.6 +++ glibc-20060306T1239-fedora/sysdeps/unix/nice.c 22 Sep 2004 21:21:08 -0000 1.6.2.1 @@ -41,7 +41,12 @@ nice (int incr) Index: glibc.spec =================================================================== RCS file: /cvs/dist/rpms/glibc/devel/glibc.spec,v retrieving revision 1.229 retrieving revision 1.230 diff -u -r1.229 -r1.230 --- glibc.spec 7 Mar 2006 08:44:55 -0000 1.229 +++ glibc.spec 7 Mar 2006 13:39:01 -0000 1.230 @@ -3,7 +3,7 @@ %define glibcsrcdir glibc-20060306T1239 %define glibc_release_tarballs 0 %define glibcversion 2.4 -%define glibcrelease 2 +%define glibcrelease 3 %define auxarches i586 i686 athlon sparcv9 alphaev6 %define prelinkarches noarch %define xenarches i686 athlon @@ -1349,6 +1349,9 @@ %endif %changelog +* Tue Mar 7 2006 Jakub Jelinek 2.4-3 +- really fix rintl on ppc64 + * Tue Mar 7 2006 Jakub Jelinek 2.4-2 - accurate unwind info for lowlevellock.h stubs on %%{ix86} - fix ppc/ppc64 ceill, floorl, rintl, roundl and truncl (BZ#2423) Index: sources =================================================================== RCS file: /cvs/dist/rpms/glibc/devel/sources,v retrieving revision 1.166 retrieving revision 1.167 diff -u -r1.166 -r1.167 --- sources 7 Mar 2006 08:44:55 -0000 1.166 +++ sources 7 Mar 2006 13:39:01 -0000 1.167 @@ -1,2 +1,2 @@ c3bd549b42829d73aad876a10435ae73 glibc-20060306T1239.tar.bz2 -ad9e233a573f227fb9efd93e2f387fdf glibc-fedora-20060306T1239.tar.bz2 +f4732d93d3749c864b1909e9f9d39524 glibc-fedora-20060306T1239.tar.bz2 From fedora-cvs-commits at redhat.com Tue Mar 7 13:43:48 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 7 Mar 2006 08:43:48 -0500 Subject: rpms/eclipse/devel eclipse-tomcat55-build.patch, 1.3, 1.4 eclipse.spec, 1.261, 1.262 Message-ID: <200603071343.k27DhmXk025293@cvs.devel.redhat.com> Author: overholt Update of /cvs/dist/rpms/eclipse/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv25260 Modified Files: eclipse-tomcat55-build.patch eclipse.spec Log Message: s/jakarta-regexp/regexp-1.3/g eclipse-tomcat55-build.patch: build.xml | 76 +++++++++++++++++++++++++++++++++++++++----------------------- 1 files changed, 48 insertions(+), 28 deletions(-) Index: eclipse-tomcat55-build.patch =================================================================== RCS file: /cvs/dist/rpms/eclipse/devel/eclipse-tomcat55-build.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- eclipse-tomcat55-build.patch 6 Mar 2006 21:47:41 -0000 1.3 +++ eclipse-tomcat55-build.patch 7 Mar 2006 13:43:44 -0000 1.4 @@ -73,8 +73,8 @@ - - -+ -+ ++ ++ + + Index: eclipse.spec =================================================================== RCS file: /cvs/dist/rpms/eclipse/devel/eclipse.spec,v retrieving revision 1.261 retrieving revision 1.262 diff -u -r1.261 -r1.262 --- eclipse.spec 7 Mar 2006 04:33:20 -0000 1.261 +++ eclipse.spec 7 Mar 2006 13:43:44 -0000 1.262 @@ -499,6 +499,7 @@ # END LUCENE ## ln -sf %{_javadir}/jsch.jar plugins/org.eclipse.team.cvs.ssh2/jsch-0.1.18.jar ## BEGIN TOMCAT ## +rm -f plugins/org.eclipse.tomcat/jakarta-regexp-1.3.jar rm -f plugins/org.eclipse.tomcat/servlet.jar rm -f plugins/org.eclipse.tomcat/servlets-manager.jar rm -f plugins/org.eclipse.tomcat/naming-common.jar @@ -875,6 +876,7 @@ # END LUCENE ## ln -sf %{_javadir}/jsch.jar plugins/org.eclipse.team.cvs.ssh2_*/jsch-0.1.18.jar ## BEGIN TOMCAT ## +rm -f plugins/org.eclipse.tomcat_*/jakarta-regexp-1.3.jar rm -f plugins/org.eclipse.tomcat_*/servlet.jar rm -f plugins/org.eclipse.tomcat_*/servlets-manager.jar rm -f plugins/org.eclipse.tomcat_*/naming-common.jar From fedora-cvs-commits at redhat.com Tue Mar 7 15:01:52 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 7 Mar 2006 10:01:52 -0500 Subject: rpms/mc/FC-4 mc-etcmc.patch, NONE, 1.1 mc-showfree.patch, NONE, 1.1 mc-extensions.patch, 1.5, 1.6 mc-utf8.patch, 1.11, 1.12 mc.spec, 1.63, 1.64 sources, 1.26, 1.27 Message-ID: <200603071501.k27F1qo7023771@cvs.devel.redhat.com> Author: jnovy Update of /cvs/dist/rpms/mc/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv23616 Modified Files: mc-extensions.patch mc-utf8.patch mc.spec sources Added Files: mc-etcmc.patch mc-showfree.patch Log Message: * Tue Mar 7 2006 Jindrich Novy 4.6.1a-5.fc4 - fix hotkey conflict in Layout options (#183282) - move syntax configuration file from /usr/share/mc to /etc/mc - save layout settings pernamently for showing free space, not only for current session (#182127) - fix audio bindings, make firefox default html binding - mc no more segfaults when edited file contains \x80 (#181611) - make mc FHS compliant: store config files in /etc/mc and extfs/*.ini files in /etc/mc/extfs instead of /usr/share/mc (#2188) mc-etcmc.patch: edit/editcmd.c | 17 ++++++++++------- edit/syntax.c | 8 +++++++- src/Makefile.am | 6 ++++-- src/Makefile.in | 5 +++-- src/charsets.c | 7 ++++++- src/cmd.c | 18 ++++++++++++++++-- src/ext.c | 4 ++++ src/main.c | 11 ++++++++--- src/main.h | 2 +- src/setup.c | 14 +++++++++++++- src/user.c | 5 +++++ src/util.c | 25 +++++++++++++++++-------- vfs/extfs.c | 6 +++--- 13 files changed, 97 insertions(+), 31 deletions(-) --- NEW FILE mc-etcmc.patch --- --- mc-4.6.1a/src/charsets.c.etcmc 2005-05-27 05:35:15.000000000 +0200 +++ mc-4.6.1a/src/charsets.c 2006-02-24 15:17:05.000000000 +0100 @@ -45,12 +45,17 @@ load_codepages_list (void) char *fname; char buf[256]; extern char *mc_home; + extern char *mc_home_alt; extern int display_codepage; char *default_codepage = NULL; fname = concat_dir_and_file (mc_home, CHARSETS_INDEX); if (!(f = fopen (fname, "r"))) { - fprintf (stderr, _("Warning: file %s not found\n"), fname); + g_free (fname); + fname = concat_dir_and_file (mc_home_alt, CHARSETS_INDEX); + if (!(f = fopen (fname, "r"))) { + fprintf (stderr, _("Warning: file %s not found\n"), fname); + } g_free (fname); return -1; } --- mc-4.6.1a/src/main.h.etcmc 2006-02-24 15:17:05.000000000 +0100 +++ mc-4.6.1a/src/main.h 2006-02-24 15:17:05.000000000 +0100 @@ -112,7 +112,7 @@ void print_vfs_message(const char *msg, extern const char *prompt; extern const char *edit_one_file; -extern char *mc_home; +extern char *mc_home, *mc_home_alt; char *get_mc_lib_dir (void); int maybe_cd (int move_up_dir); --- mc-4.6.1a/src/ext.c.etcmc 2005-07-31 22:29:35.000000000 +0200 +++ mc-4.6.1a/src/ext.c 2006-02-24 15:17:05.000000000 +0100 @@ -444,6 +444,10 @@ regex_command (const char *filename, con g_free (extension_file); check_stock_mc_ext: extension_file = concat_dir_and_file (mc_home, MC_LIB_EXT); + if (!exist_file (extension_file)) { + g_free (extension_file); + extension_file = concat_dir_and_file (mc_home_alt, MC_LIB_EXT); + } mc_user_ext = 0; } data = load_file (extension_file); --- mc-4.6.1a/src/setup.c.etcmc 2006-01-29 21:26:05.000000000 +0100 +++ mc-4.6.1a/src/setup.c 2006-02-24 15:17:05.000000000 +0100 @@ -481,8 +481,15 @@ setup_init (void) if (exist_file (inifile)){ g_free (profile); profile = inifile; - } else + } else { g_free (inifile); + inifile = concat_dir_and_file (mc_home_alt, "mc.ini"); + if (exist_file (inifile)) { + g_free (profile); + profile = inifile; + } else + g_free (inifile); + } } profile_name = profile; @@ -501,6 +508,11 @@ load_setup (void) /* mc.lib is common for all users, but has priority lower than ~/.mc/ini. FIXME: it's only used for keys and treestore now */ global_profile_name = concat_dir_and_file (mc_home, "mc.lib"); + + if (!exist_file(global_profile_name)) { + g_free (global_profile_name); + global_profile_name = concat_dir_and_file (mc_home_alt, "mc.lib"); + } /* Load integer boolean options */ for (i = 0; int_options[i].opt_name; i++) --- mc-4.6.1a/src/Makefile.am.etcmc 2006-02-04 12:13:30.000000000 +0100 +++ mc-4.6.1a/src/Makefile.am 2006-02-24 15:17:05.000000000 +0100 @@ -8,9 +8,11 @@ bin_PROGRAMS = mc mcmfmt if CONS_SAVER pkglibexec_PROGRAMS = cons.saver AM_CPPFLAGS = -DDATADIR=\""$(pkgdatadir)/"\" -DLOCALEDIR=\""$(localedir)"\" \ - -DSAVERDIR=\""$(pkglibexecdir)"\" + -DSAVERDIR=\""$(pkglibexecdir)"\" \ + -DSYSCONFDIR=\""$(sysconfdir)/@PACKAGE@/"\" else -AM_CPPFLAGS = -DDATADIR=\""$(pkgdatadir)/"\" -DLOCALEDIR=\""$(localedir)"\" +AM_CPPFLAGS = -DDATADIR=\""$(pkgdatadir)/"\" -DLOCALEDIR=\""$(localedir)"\" \ + -DSYSCONFDIR=\""$(sysconfdir)/@PACKAGE@/"\" endif noinst_PROGRAMS = man2hlp --- mc-4.6.1a/src/util.c.etcmc 2006-02-24 15:17:05.000000000 +0100 +++ mc-4.6.1a/src/util.c 2006-02-24 15:17:05.000000000 +0100 @@ -40,7 +40,7 @@ #include "tty.h" #include "global.h" #include "profile.h" -#include "main.h" /* mc_home */ +#include "main.h" /* mc_home, mc_home_alt */ #include "cmd.h" /* guess_message_value */ #include "mountlist.h" #include "win.h" /* xterm_flag */ @@ -950,16 +950,25 @@ load_mc_home_file (const char *filename, if (!data) { g_free (hintfile); - /* Fall back to the two-letter language code */ - if (lang[0] && lang[1]) - lang[2] = 0; + g_free (hintfile_base); + + hintfile_base = concat_dir_and_file (mc_home_alt, filename); + hintfile = g_strconcat (hintfile_base, ".", lang, (char *) NULL); data = load_file (hintfile); - + if (!data) { - g_free (hintfile); - hintfile = hintfile_base; - data = load_file (hintfile_base); + /* Fall back to the two-letter language code */ + if (lang[0] && lang[1]) + lang[2] = 0; + hintfile = g_strconcat (hintfile_base, ".", lang, (char *) NULL); + data = load_file (hintfile); + + if (!data) { + g_free (hintfile); + hintfile = hintfile_base; + data = load_file (hintfile_base); + } } } --- mc-4.6.1a/src/cmd.c.etcmc 2006-02-04 12:12:28.000000000 +0100 +++ mc-4.6.1a/src/cmd.c 2006-02-24 15:17:05.000000000 +0100 @@ -570,8 +570,13 @@ void ext_cmd (void) check_for_default (extdir, buffer); do_edit (buffer); g_free (buffer); - } else if (dir == 1) + } else if (dir == 1) { + if (!exist_file(extdir)) { + g_free (extdir); + extdir = concat_dir_and_file (mc_home_alt, MC_LIB_EXT); + } do_edit (extdir); + } g_free (extdir); flush_extension_file (); @@ -594,6 +599,11 @@ menu_edit_cmd (int where) ); menufile = concat_dir_and_file (mc_home, where ? CEDIT_GLOBAL_MENU : MC_GLOBAL_MENU); + + if (!exist_file(menufile)) { + g_free (menufile); + menufile = concat_dir_and_file (mc_home_alt, where ? CEDIT_GLOBAL_MENU : MC_GLOBAL_MENU); + } switch (dir) { case 0: @@ -608,6 +618,10 @@ menu_edit_cmd (int where) case 2: buffer = concat_dir_and_file (mc_home, where ? CEDIT_GLOBAL_MENU : MC_GLOBAL_MENU); + if (!exist_file(buffer)) { + g_free (buffer); + buffer = concat_dir_and_file (mc_home_alt, where ? CEDIT_GLOBAL_MENU : MC_GLOBAL_MENU); + } break; default: @@ -666,7 +680,7 @@ edit_syntax_cmd (void) _(" Which syntax file you want to edit? "), 0, 2, _("&User"), _("&System Wide")); } - extdir = concat_dir_and_file (mc_home, "syntax" PATH_SEP_STR "Syntax"); + extdir = concat_dir_and_file (mc_home_alt, "syntax" PATH_SEP_STR "Syntax"); if (dir == 0) { buffer = concat_dir_and_file (home_dir, SYNTAX_FILE); --- mc-4.6.1a/src/main.c.etcmc 2006-02-24 15:17:05.000000000 +0100 +++ mc-4.6.1a/src/main.c 2006-02-24 15:17:05.000000000 +0100 @@ -282,9 +282,12 @@ gboolean is_utf8 = FALSE; /* The xterm title */ char *xterm_title_str = NULL; -/* mc_home: The home of MC */ +/* mc_home: The home of MC - /etc/mc or defined by MC_DATADIR */ char *mc_home = NULL; +/* mc_home_alt: Alternative home of MC - deprecated /usr/share/mc */ +char *mc_home_alt = NULL; + char cmd_buf[512]; static void @@ -1817,8 +1820,9 @@ OS_Setup (void) if ((mc_libdir = getenv ("MC_DATADIR")) != NULL) { mc_home = g_strdup (mc_libdir); } else { - mc_home = g_strdup (DATADIR); + mc_home = g_strdup (SYSCONFDIR); } + mc_home_alt = mc_libdir != NULL ? g_strdup (SYSCONFDIR) : g_strdup (DATADIR); } static void @@ -1948,7 +1952,7 @@ process_args (poptContext ctx, int c, co break; case 'f': - printf ("%s\n", mc_home); + printf ("%s (%s)\n", mc_home, mc_home_alt); exit (0); break; @@ -2326,6 +2330,7 @@ main (int argc, char *argv[]) } g_free (last_wd_string); + g_free (mc_home_alt); g_free (mc_home); done_key (); #ifdef HAVE_CHARSET --- mc-4.6.1a/src/Makefile.in.etcmc 2006-02-15 21:12:44.000000000 +0100 +++ mc-4.6.1a/src/Makefile.in 2006-02-24 15:17:05.000000000 +0100 @@ -314,9 +314,10 @@ target_alias = @target_alias@ AM_CFLAGS = $(GLIB_CFLAGS) localedir = $(datadir)/locale pkglibexecdir = $(libexecdir)/@PACKAGE@ - at CONS_SAVER_FALSE@AM_CPPFLAGS = -DDATADIR=\""$(pkgdatadir)/"\" -DLOCALEDIR=\""$(localedir)"\" + at CONS_SAVER_FALSE@AM_CPPFLAGS = -DDATADIR=\""$(pkgdatadir)/"\" -DLOCALEDIR=\""$(localedir)"\" \ + at CONS_SAVER_FALSE@ -DSYSCONFDIR=\""$(sysconfdir)/@PACKAGE@/"\" @CONS_SAVER_TRUE at AM_CPPFLAGS = -DDATADIR=\""$(pkgdatadir)/"\" -DLOCALEDIR=\""$(localedir)"\" \ - at CONS_SAVER_TRUE@ -DSAVERDIR=\""$(pkglibexecdir)"\" + at CONS_SAVER_TRUE@ -DSAVERDIR=\""$(pkglibexecdir)"\" -DSYSCONFDIR=\""$(sysconfdir)/@PACKAGE@/"\" man2hlp_LDADD = $(GLIB_LIBS) mcmfmt_SOURCES = mfmt.c --- mc-4.6.1a/src/user.c.etcmc 2006-02-04 15:41:42.000000000 +0100 +++ mc-4.6.1a/src/user.c 2006-02-24 15:17:05.000000000 +0100 @@ -726,6 +726,11 @@ user_menu_cmd (struct WEdit *edit_widget g_free (menu); menu = concat_dir_and_file \ (mc_home, edit_widget ? CEDIT_GLOBAL_MENU : MC_GLOBAL_MENU); + if (!exist_file (menu)) { + g_free (menu); + menu = concat_dir_and_file \ + (mc_home_alt, edit_widget ? CEDIT_GLOBAL_MENU : MC_GLOBAL_MENU); + } } } --- mc-4.6.1a/edit/editcmd.c.etcmc 2006-02-24 15:17:05.000000000 +0100 +++ mc-4.6.1a/edit/editcmd.c 2006-02-24 15:17:05.000000000 +0100 @@ -49,7 +49,7 @@ #include "../src/tty.h" /* LINES */ #include "../src/widget.h" /* listbox_new() */ #include "../src/layout.h" /* clr_scr() */ -#include "../src/main.h" /* mc_home */ +#include "../src/main.h" /* mc_home, mc_home_alt */ #include "../src/help.h" /* interactive_display() */ #include "../src/key.h" /* XCTRL */ #include "../src/dialog.h" /* do_refresh() */ @@ -2790,12 +2790,15 @@ edit_block_process_cmd (WEdit *edit, con return; } if (!(script_src = fopen (o, "r"))) { - fclose (script_home); - unlink (h); - edit_error_dialog ("", get_sys_error (catstrs - (_("Error reading script:"), - o, (char *) NULL))); - return; + o = catstrs (mc_home_alt, shell_cmd, (char *) NULL); + if (!(script_src = fopen (o, "r"))) { + fclose (script_home); + unlink (h); + edit_error_dialog ("", get_sys_error (catstrs + (_("Error reading script:"), + o, (char *) NULL))); + return; + } } while (fgets (buf, sizeof (buf), script_src)) fputs (buf, script_home); --- mc-4.6.1a/edit/syntax.c.etcmc 2006-02-04 15:41:42.000000000 +0100 +++ mc-4.6.1a/edit/syntax.c 2006-02-24 15:17:05.000000000 +0100 @@ -37,7 +37,7 @@ #include "edit.h" #include "edit-widget.h" #include "../src/color.h" /* use_colors */ -#include "../src/main.h" /* mc_home */ +#include "../src/main.h" /* mc_home, mc_home_alt */ #include "../src/wtools.h" /* message() */ /* bytes */ @@ -680,6 +680,12 @@ static FILE *open_include_file (const ch g_free (error_file_name); error_file_name = g_strconcat (mc_home, PATH_SEP_STR "syntax" PATH_SEP_STR, filename, (char *) NULL); + if (!(f = fopen (error_file_name, "r"))) { + g_free (error_file_name); + error_file_name = g_strconcat (mc_home_alt, PATH_SEP_STR "syntax" PATH_SEP_STR, + filename, (char *) NULL); + } else return f; + return fopen (error_file_name, "r"); } --- mc-4.6.1a/vfs/extfs.c.etcmc 2005-09-05 02:52:57.000000000 +0200 +++ mc-4.6.1a/vfs/extfs.c 2006-02-24 15:22:16.000000000 +0100 @@ -242,7 +242,7 @@ extfs_open_archive (int fstype, const ch tmp = name_quote (name, 0); } - mc_extfsdir = concat_dir_and_file (mc_home, "extfs" PATH_SEP_STR); + mc_extfsdir = concat_dir_and_file (mc_home_alt, "extfs" PATH_SEP_STR); cmd = g_strconcat (mc_extfsdir, extfs_prefixes[fstype], " list ", local_name ? local_name : tmp, (char *) NULL); @@ -617,7 +617,7 @@ extfs_cmd (const char *extfs_cmd, struct archive_name = name_quote (extfs_get_archive_name (archive), 0); quoted_localname = name_quote (localname, 0); - mc_extfsdir = concat_dir_and_file (mc_home, "extfs" PATH_SEP_STR); + mc_extfsdir = concat_dir_and_file (mc_home_alt, "extfs" PATH_SEP_STR); cmd = g_strconcat (mc_extfsdir, extfs_prefixes[archive->fstype], extfs_cmd, archive_name, " ", quoted_file, " ", quoted_localname, (char *) NULL); @@ -646,7 +646,7 @@ extfs_run (struct vfs_class *me, const c g_free (p); archive_name = name_quote (extfs_get_archive_name (archive), 0); - mc_extfsdir = concat_dir_and_file (mc_home, "extfs" PATH_SEP_STR); + mc_extfsdir = concat_dir_and_file (mc_home_alt, "extfs" PATH_SEP_STR); cmd = g_strconcat (mc_extfsdir, extfs_prefixes[archive->fstype], " run ", archive_name, " ", q, (char *) NULL); g_free (mc_extfsdir); mc-showfree.patch: layout.c | 49 ++++++++++++++++++++++++++++--------------------- layout.h | 1 + screen.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ setup.c | 1 + 4 files changed, 75 insertions(+), 21 deletions(-) --- NEW FILE mc-showfree.patch --- --- mc-4.6.1a/src/setup.c.showfree 2006-01-29 21:26:05.000000000 +0100 +++ mc-4.6.1a/src/setup.c 2006-02-28 11:43:49.000000000 +0100 @@ -133,6 +133,7 @@ static const struct { { "show_mini_info", &show_mini_info }, { "permission_mode", &permission_mode }, { "filetype_mode", &filetype_mode }, + { "free_space", &free_space }, { 0, 0 } }; --- mc-4.6.1a/src/screen.c.showfree 2006-02-28 11:42:47.000000000 +0100 +++ mc-4.6.1a/src/screen.c 2006-02-28 11:42:48.000000000 +0100 @@ -49,6 +49,7 @@ #define WANT_WIDGETS #include "main.h" /* the_menubar */ #include "unixcompat.h" +#include "mountlist.h" /* my_statfs */ #define ELEMENTS(arr) ( sizeof(arr) / sizeof((arr)[0]) ) @@ -106,6 +107,12 @@ int filetype_mode = 1; /* The hook list for the select file function */ Hook *select_file_hook = 0; +/* Old current working directory for displaying free space */ +char *old_cwd = NULL; + +/* Used to figure out how many free space we have */ +struct my_statfs myfs_stats; + static cb_ret_t panel_callback (Widget *, widget_msg_t msg, int parm); static int panel_event (Gpm_Event *event, void *); static void paint_frame (WPanel *panel); @@ -851,6 +858,41 @@ paint_dir (WPanel *panel) standend (); } + +static void +show_free_space(WPanel *panel) +{ + struct stat st; + + /* Don't try to stat non-local fs */ + if (!vfs_file_is_local(panel->cwd)) + return; + + if (old_cwd == NULL || strcmp(old_cwd, panel->cwd) == 0) { + init_my_statfs(); + g_free(old_cwd); + old_cwd = g_strdup(panel->cwd); + } + + my_statfs (&myfs_stats, panel->cwd); + st = panel->dir.list [panel->selected].st; + + if (myfs_stats.avail > 0 || myfs_stats.total > 0) { + char buffer1 [6], buffer2[6], *tmp; + size_trunc_len (buffer1, 5, myfs_stats.avail, 1); + size_trunc_len (buffer2, 5, myfs_stats.total, 1); + tmp = g_strdup_printf (_("%s (%d%%) of %s"), buffer1, myfs_stats.total > 0 ? + (int)(100 * (double)myfs_stats.avail / myfs_stats.total) : 0, + buffer2); + widget_move (&panel->widget, panel->widget.lines-3, panel->widget.cols-2-strlen(tmp)); + if (panel->active) + attrset (REVERSE_COLOR); + addstr (tmp); + attrset (NORMAL_COLOR); + g_free (tmp); + } +} + static void mini_info_separator (WPanel *panel) { @@ -866,6 +908,7 @@ mini_info_separator (WPanel *panel) hline ((slow_terminal ? '-' : ACS_HLINE) | NORMAL_COLOR, panel->widget.cols - 2); #endif /* !HAVE_SLANG */ + if (free_space) show_free_space (panel); } static void @@ -929,6 +972,8 @@ show_dir (WPanel *panel) widget_move (&panel->widget, 0, panel->widget.cols - 3); addstr ("v"); + mini_info_separator (panel); + if (panel->active) standend (); } --- mc-4.6.1a/src/layout.c.showfree 2006-02-28 11:42:47.000000000 +0100 +++ mc-4.6.1a/src/layout.c 2006-02-28 11:42:48.000000000 +0100 @@ -99,6 +99,9 @@ int message_visible = 1; /* Set to show current working dir in xterm window title */ int xterm_title = 1; +/* Set to show free space on device assigned to current directory */ +int free_space = 1; + /* The starting line for the output of the subprogram */ int output_start_y = 0; @@ -128,6 +131,7 @@ static int _command_prompt; static int _keybar_visible; static int _message_visible; static int _xterm_title; +static int _free_space; static int _permission_mode; static int _filetype_mode; @@ -158,6 +162,7 @@ static struct { int *variable; WCheck *widget; } check_options [] = { + { N_("show free sp&Ace"), &free_space, 0 }, { N_("&Xterm window title"), &xterm_title, 0 }, { N_("h&Intbar visible"), &message_visible, 0 }, { N_("&Keybar visible"), &keybar_visible, 0 }, @@ -229,8 +234,8 @@ static int b2left_cback (int action) if (_equal_split){ /* Turn equal split off */ _equal_split = 0; - check_options [6].widget->state = check_options [6].widget->state & ~C_BOOL; - dlg_select_widget (check_options [6].widget); + check_options [7].widget->state = check_options [7].widget->state & ~C_BOOL; + dlg_select_widget (check_options [7].widget); dlg_select_widget (bleft_widget); } _first_panel_size++; @@ -244,8 +249,8 @@ static int b2right_cback (int action) if (_equal_split){ /* Turn equal split off */ _equal_split = 0; - check_options [6].widget->state = check_options [6].widget->state & ~C_BOOL; - dlg_select_widget (check_options [6].widget); + check_options [7].widget->state = check_options [7].widget->state & ~C_BOOL; + dlg_select_widget (check_options [7].widget); dlg_select_widget (bright_widget); } _first_panel_size--; @@ -300,14 +305,15 @@ layout_callback (struct Dlg_head *h, dlg return MSG_HANDLED; case DLG_POST_KEY: - _filetype_mode = check_options [8].widget->state & C_BOOL; - _permission_mode = check_options [7].widget->state & C_BOOL; - _equal_split = check_options [6].widget->state & C_BOOL; - _menubar_visible = check_options [5].widget->state & C_BOOL; - _command_prompt = check_options [4].widget->state & C_BOOL; - _keybar_visible = check_options [2].widget->state & C_BOOL; - _message_visible = check_options [1].widget->state & C_BOOL; - _xterm_title = check_options [0].widget->state & C_BOOL; + _filetype_mode = check_options [9].widget->state & C_BOOL; + _permission_mode = check_options [8].widget->state & C_BOOL; + _equal_split = check_options [7].widget->state & C_BOOL; + _menubar_visible = check_options [6].widget->state & C_BOOL; + _command_prompt = check_options [5].widget->state & C_BOOL; + _keybar_visible = check_options [3].widget->state & C_BOOL; + _message_visible = check_options [2].widget->state & C_BOOL; + _xterm_title = check_options [1].widget->state & C_BOOL; + _free_space = check_options [0].widget->state & C_BOOL; if (console_flag){ int minimum; if (_output_lines < 0) @@ -374,7 +380,7 @@ init_layout (void) first_width = l1; } - for (i = 0; i <= 8; i++) { + for (i = 0; i <= 9; i++) { check_options[i].text = _(check_options[i].text); l1 = mbstrlen (check_options[i].text) + 7; if (l1 > first_width) @@ -391,7 +397,7 @@ init_layout (void) second_width = mbstrlen (title3) + 1; - for (i = 0; i < 6; i++) { + for (i = 0; i < 7; i++) { check_options[i].text = _(check_options[i].text); l1 = mbstrlen (check_options[i].text) + 7; if (l1 > second_width) @@ -454,15 +460,15 @@ init_layout (void) } #define XTRACT(i) *check_options[i].variable, check_options[i].text - for (i = 0; i < 6; i++) { + for (i = 0; i < 7; i++) { check_options[i].widget = - check_new (8 - i, 7 + first_width, XTRACT (i)); + check_new (9 - i, 7 + first_width, XTRACT (i)); add_widget (layout_dlg, check_options[i].widget); } - check_options[8].widget = check_new (10, 6, XTRACT (8)); + check_options[9].widget = check_new (10, 6, XTRACT (9)); + add_widget (layout_dlg, check_options[9].widget); + check_options[8].widget = check_new (9, 6, XTRACT (8)); add_widget (layout_dlg, check_options[8].widget); - check_options[7].widget = check_new (9, 6, XTRACT (7)); - add_widget (layout_dlg, check_options[7].widget); _filetype_mode = filetype_mode; _permission_mode = permission_mode; @@ -472,20 +478,21 @@ init_layout (void) _keybar_visible = keybar_visible; _message_visible = message_visible; _xterm_title = xterm_title; + _free_space = free_space; bright_widget = button_new (6, 15, B_2RIGHT, NARROW_BUTTON, "&>", b2right_cback); add_widget (layout_dlg, bright_widget); bleft_widget = button_new (6, 9, B_2LEFT, NARROW_BUTTON, "&<", b2left_cback); add_widget (layout_dlg, bleft_widget); - check_options[6].widget = check_new (5, 6, XTRACT (6)); + check_options[7].widget = check_new (5, 6, XTRACT (7)); old_first_panel_size = -1; old_horizontal_split = -1; old_output_lines = -1; _first_panel_size = first_panel_size; _output_lines = output_lines; - add_widget (layout_dlg, check_options[6].widget); + add_widget (layout_dlg, check_options[7].widget); radio_widget = radio_new (3, 6, 2, s_split_direction, 1); add_widget (layout_dlg, radio_widget); radio_widget->sel = horizontal_split; --- mc-4.6.1a/src/layout.h.showfree 2004-12-03 20:17:47.000000000 +0100 +++ mc-4.6.1a/src/layout.h 2006-02-28 11:42:48.000000000 +0100 @@ -39,6 +39,7 @@ extern int keybar_visible; extern int output_start_y; extern int message_visible; extern int xterm_title; +extern int free_space; extern int horizontal_split; extern int nice_rotating_dash; mc-extensions.patch: configure | 2 +- configure.ac | 2 +- lib/mc.ext.in | 52 +++++++++++++++++++++++++++++++++++++++++++--------- 3 files changed, 45 insertions(+), 11 deletions(-) Index: mc-extensions.patch =================================================================== RCS file: /cvs/dist/rpms/mc/FC-4/mc-extensions.patch,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- mc-extensions.patch 9 Dec 2005 10:48:43 -0000 1.5 +++ mc-extensions.patch 7 Mar 2006 15:01:03 -0000 1.6 @@ -1,3 +1,25 @@ +--- mc-4.6.1a/configure.ac.extensions 2005-11-11 03:03:55.000000000 +0100 ++++ mc-4.6.1a/configure.ac 2006-02-28 11:54:30.000000000 +0100 +@@ -83,7 +83,7 @@ AC_PROG_LN_S + AC_CHECK_TOOL(AR, ar, ar) + + dnl Only list browsers here that can be run in background (i.e. with `&') +-AC_CHECK_PROGS(X11_WWW, [gnome-moz-remote mozilla konqueror opera netscape]) ++AC_CHECK_PROGS(X11_WWW, [firefox gnome-moz-remote mozilla konqueror opera netscape]) + + dnl + dnl Ovverriding mmap support. This has to be before AC_FUNC_MMAP is used. +--- mc-4.6.1a/configure.extensions 2006-02-15 21:12:35.000000000 +0100 ++++ mc-4.6.1a/configure 2006-02-28 12:03:54.000000000 +0100 +@@ -5791,7 +5791,7 @@ else + fi + + +-for ac_prog in gnome-moz-remote mozilla konqueror opera netscape ++for ac_prog in firefox gnome-moz-remote mozilla konqueror opera netscape + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 --- mc-4.6.1a/lib/mc.ext.in.extensions 2005-09-06 11:20:01.000000000 +0200 +++ mc-4.6.1a/lib/mc.ext.in 2005-12-06 09:22:37.000000000 +0100 @@ -216,14 +221,25 @@ shell/.7z @@ -81,7 +103,7 @@ Open=mplayer -vo null %f View=%view{ascii} mplayer -quiet -slave -frames 0 -vo null -ao null -identify %f 2>/dev/null | tail +13 || file %f -+Include/audio ++include/audio + Open=mplayer %f + View=%view{ascii} mplayer -identify -vo null -ao null -frames 0 %f 2>&1 | sed -n '/^ID_/p' @@ -121,14 +143,14 @@ # Postscript type/^PostScript - Open=(gv %f &) -+ Open=(evince %f &) ++ Open=(evince %f >/dev/null 2>&1 &) View=%view{ascii} ps2ascii %f # PDF type/^PDF - Open=(xpdf %f &) -+ Open=(evince %f &) -+ #Open=(xpdf %f &) ++ Open=(evince %f >/dev/null 2>&1 &) ++ #Open=(xpdf %f >/dev/null 2>&1 &) #Open=(acroread %f &) #Open=(ghostview %f &) View=%view{ascii} pdftotext %f - mc-utf8.patch: acinclude.m4 | 16 - edit/edit-widget.h | 16 + edit/edit.c | 267 +++++++++++++++++++-------- edit/edit.h | 39 +++ edit/editcmd.c | 523 +++++++++++++++++++++++++++++++++++++++++++++-------- edit/editdraw.c | 113 +++++++---- edit/editkeys.c | 29 ++ edit/editwidget.c | 3 edit/wordproc.c | 79 ++++++-- src/achown.c | 6 src/boxes.c | 50 ++--- src/dialog.c | 2 src/file.c | 9 src/filegui.c | 47 ++-- src/find.c | 12 - src/help.c | 24 ++ src/hotlist.c | 14 - src/layout.c | 26 +- src/learn.c | 2 src/main.c | 6 src/menu.c | 122 +++++++++++- src/menu.h | 2 src/myslang.h | 10 + src/option.c | 20 +- src/panelize.c | 8 src/screen.c | 269 ++++++++++++++++++++------- src/slint.c | 4 src/tty.c | 10 - src/tty.h | 2 src/util.c | 331 ++++++++++++++++++++++++++++++--- src/util.h | 7 src/view.c | 50 ++++- src/widget.c | 371 ++++++++++++++++++++++++++++++------- src/widget.h | 16 + src/wtools.c | 14 - 35 files changed, 2024 insertions(+), 495 deletions(-) Index: mc-utf8.patch =================================================================== RCS file: /cvs/dist/rpms/mc/FC-4/mc-utf8.patch,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- mc-utf8.patch 16 Nov 2005 13:51:01 -0000 1.11 +++ mc-utf8.patch 7 Mar 2006 15:01:03 -0000 1.12 @@ -1,5 +1,5 @@ --- mc-4.6.1a/acinclude.m4.utf8 2005-11-16 00:27:27.000000000 +0100 -+++ mc-4.6.1a/acinclude.m4 2005-11-16 14:03:46.000000000 +0100 ++++ mc-4.6.1a/acinclude.m4 2006-02-01 14:25:01.000000000 +0100 @@ -768,14 +768,14 @@ AC_DEFUN([MC_WITH_SLANG], [ fi @@ -24,7 +24,7 @@ if test x$with_screen = xslang; then AC_DEFINE(HAVE_SYSTEM_SLANG, 1, --- mc-4.6.1a/src/layout.c.utf8 2005-09-05 03:40:45.000000000 +0200 -+++ mc-4.6.1a/src/layout.c 2005-11-16 14:03:46.000000000 +0100 ++++ mc-4.6.1a/src/layout.c 2006-02-01 14:25:01.000000000 +0100 @@ -369,36 +369,36 @@ init_layout (void) while (i--) { @@ -98,8 +98,8 @@ widget_set_size (&the_menubar->widget, 0, 0, 1, COLS); ---- mc-4.6.1a/src/tty.c.utf8 2005-09-05 05:05:39.000000000 +0200 -+++ mc-4.6.1a/src/tty.c 2005-11-16 14:03:46.000000000 +0100 +--- mc-4.6.1a/src/tty.c.utf8 2006-01-07 13:17:07.000000000 +0100 ++++ mc-4.6.1a/src/tty.c 2006-02-01 14:25:01.000000000 +0100 @@ -123,10 +123,12 @@ tty_print_char(int c) * defined or not. Congratulations! At least, they left the API call * for SLsmg_write_nchars as it has always been. @@ -118,7 +118,7 @@ addch(c); #endif --- mc-4.6.1a/src/option.c.utf8 2005-05-27 05:35:15.000000000 +0200 -+++ mc-4.6.1a/src/option.c 2005-11-16 14:03:46.000000000 +0100 ++++ mc-4.6.1a/src/option.c 2006-02-01 14:25:01.000000000 +0100 @@ -123,12 +123,12 @@ init_configure (void) title2 = _(" Pause after run... "); title3 = _(" Other options "); @@ -167,7 +167,7 @@ i18n_config_flag = 1; } --- mc-4.6.1a/src/menu.h.utf8 2004-12-03 20:17:47.000000000 +0100 -+++ mc-4.6.1a/src/menu.h 2005-11-16 14:03:46.000000000 +0100 ++++ mc-4.6.1a/src/menu.h 2006-02-01 14:25:01.000000000 +0100 @@ -21,6 +21,8 @@ typedef struct Menu { menu_entry *entries; int start_x; /* position relative to menubar start */ @@ -178,7 +178,7 @@ extern int menubar_visible; --- mc-4.6.1a/src/menu.c.utf8 2005-09-05 04:12:09.000000000 +0200 -+++ mc-4.6.1a/src/menu.c 2005-11-16 14:03:46.000000000 +0100 ++++ mc-4.6.1a/src/menu.c 2006-02-01 14:25:01.000000000 +0100 @@ -22,6 +22,7 @@ #include @@ -380,8 +380,8 @@ g_free (menu->name); g_free (menu->help_node); g_free (menu); ---- mc-4.6.1a/src/filegui.c.utf8 2005-05-27 05:35:15.000000000 +0200 -+++ mc-4.6.1a/src/filegui.c 2005-11-16 14:03:46.000000000 +0100 +--- mc-4.6.1a/src/filegui.c.utf8 2006-01-30 10:22:33.000000000 +0100 ++++ mc-4.6.1a/src/filegui.c 2006-02-01 14:25:01.000000000 +0100 @@ -65,6 +65,7 @@ #include "filegui.h" #include "key.h" /* get_event */ @@ -528,7 +528,7 @@ return dest_dir; } --- mc-4.6.1a/src/panelize.c.utf8 2005-05-27 05:35:15.000000000 +0200 -+++ mc-4.6.1a/src/panelize.c 2005-11-16 14:03:46.000000000 +0100 ++++ mc-4.6.1a/src/panelize.c 2006-02-01 14:25:01.000000000 +0100 @@ -127,7 +127,7 @@ init_panelize (void) i = sizeof (panelize_but) / sizeof (panelize_but[0]); while (i--) { @@ -554,7 +554,7 @@ #endif /* ENABLE_NLS */ --- mc-4.6.1a/src/slint.c.utf8 2005-09-05 04:14:29.000000000 +0200 -+++ mc-4.6.1a/src/slint.c 2005-11-16 14:03:46.000000000 +0100 ++++ mc-4.6.1a/src/slint.c 2006-02-01 14:25:01.000000000 +0100 @@ -141,7 +141,9 @@ void slang_init (void) { @@ -566,9 +566,9 @@ /* * If the terminal in not in terminfo but begins with a well-known * string such as "linux" or "xterm" S-Lang will go on, but the ---- mc-4.6.1a/src/main.c.utf8 2005-11-02 12:50:52.000000000 +0100 -+++ mc-4.6.1a/src/main.c 2005-11-16 14:03:46.000000000 +0100 -@@ -698,7 +698,7 @@ load_prompt (int fd, void *unused) +--- mc-4.6.1a/src/main.c.utf8 2006-01-29 21:26:05.000000000 +0100 ++++ mc-4.6.1a/src/main.c 2006-02-01 14:25:01.000000000 +0100 +@@ -704,7 +704,7 @@ load_prompt (int fd, void *unused) int prompt_len; tmp_prompt = strip_ctrl_codes (subshell_prompt); @@ -577,7 +577,7 @@ /* Check for prompts too big */ if (COLS > 8 && prompt_len > COLS - 8) { -@@ -1611,7 +1611,11 @@ update_xterm_title_path (void) +@@ -1617,7 +1617,11 @@ update_xterm_title_path (void) if (xterm_flag && xterm_title) { p = s = g_strdup (strip_home_and_password (current_panel->cwd)); do { @@ -589,8 +589,8 @@ *s = '?'; } while (*++s); fprintf (stdout, "\33]0;mc - %s\7", p); ---- mc-4.6.1a/src/view.c.utf8 2005-10-04 23:07:20.000000000 +0200 -+++ mc-4.6.1a/src/view.c 2005-11-16 14:04:27.000000000 +0100 +--- mc-4.6.1a/src/view.c.utf8 2006-01-31 15:39:30.000000000 +0100 ++++ mc-4.6.1a/src/view.c 2006-02-01 14:25:01.000000000 +0100 @@ -43,6 +43,10 @@ #include #include @@ -602,7 +602,7 @@ #include "global.h" #include "tty.h" #include "cmd.h" /* For view_other_cmd */ -@@ -1631,7 +1635,7 @@ view_display_status (WView *view) +@@ -1627,7 +1631,7 @@ view_display_status (WView *view) hline (' ', width); file_label = _("File: %s"); @@ -611,7 +611,7 @@ file_name = view->filename ? view->filename : view->command ? view->command : ""; -@@ -1884,6 +1888,12 @@ view_display_text (WView * view) +@@ -1895,6 +1899,12 @@ view_display_text (WView * view) offset_type from; int c; struct hexedit_change_node *curr = view->change_list; @@ -624,7 +624,7 @@ view_display_clean (view); view_display_ruler (view); -@@ -1896,8 +1906,37 @@ view_display_text (WView * view) +@@ -1907,8 +1917,37 @@ view_display_text (WView * view) attrset (NORMAL_COLOR); for (row = 0, col = 0; row < height && (c = get_byte (view, from)) != -1; from++) { @@ -663,7 +663,7 @@ int c_prev; int c_next; -@@ -1956,10 +1995,17 @@ view_display_text (WView * view) +@@ -1967,10 +2006,17 @@ view_display_text (WView * view) if (col >= view->dpy_text_column && col - view->dpy_text_column < width) { widget_move (view, top + row, left + (col - view->dpy_text_column)); @@ -674,7 +674,7 @@ tty_print_char (c); +#else + wc = convert_to_display_c (wc); -+ if (!is_printable (wc)) ++ if (!iswprint (wc)) + wc = '.'; + tty_print_char (wc); +#endif @@ -682,7 +682,7 @@ col++; attrset (NORMAL_COLOR); --- mc-4.6.1a/src/screen.c.utf8 2005-11-11 04:32:40.000000000 +0100 -+++ mc-4.6.1a/src/screen.c 2005-11-16 14:03:46.000000000 +0100 ++++ mc-4.6.1a/src/screen.c 2006-02-01 14:25:01.000000000 +0100 @@ -171,21 +171,56 @@ add_permission_string (char *dest, int w static const char * string_file_name (file_entry *fe, int len) @@ -810,7 +810,7 @@ +#else + char buffer[BUF_MEDIUM]; +#endif -+ int txtwidth; ++ int txtwidth = 0; length = 0; empty_line = (file_index >= panel->count); @@ -1048,7 +1048,7 @@ attrset (NORMAL_COLOR); one_vline (); --- mc-4.6.1a/src/widget.h.utf8 2005-06-14 15:02:31.000000000 +0200 -+++ mc-4.6.1a/src/widget.h 2005-11-16 14:03:46.000000000 +0100 ++++ mc-4.6.1a/src/widget.h 2006-02-01 14:25:01.000000000 +0100 @@ -22,6 +22,7 @@ typedef struct WButton { char *text; /* text of button */ int hotkey; /* hot KEY */ @@ -1092,7 +1092,7 @@ int need_push; /* need to push the current Input on hist? */ char **completions; /* Possible completions array */ --- mc-4.6.1a/src/tty.h.utf8 2005-09-05 04:14:29.000000000 +0200 -+++ mc-4.6.1a/src/tty.h 2005-11-16 14:03:46.000000000 +0100 ++++ mc-4.6.1a/src/tty.h 2006-02-01 14:25:01.000000000 +0100 @@ -8,6 +8,8 @@ of ifdefs in the other files small. */ @@ -1102,8 +1102,8 @@ #ifdef HAVE_SLANG # include "myslang.h" #endif ---- mc-4.6.1a/src/hotlist.c.utf8 2005-05-27 05:35:15.000000000 +0200 -+++ mc-4.6.1a/src/hotlist.c 2005-11-16 14:03:46.000000000 +0100 +--- mc-4.6.1a/src/hotlist.c.utf8 2006-01-30 10:22:33.000000000 +0100 ++++ mc-4.6.1a/src/hotlist.c 2006-02-01 14:25:01.000000000 +0100 @@ -555,7 +555,7 @@ init_i18n_stuff(int list_type, int cols) row = hotlist_but [i].y; @@ -1165,7 +1165,7 @@ strip_password (label_string, 1); --- mc-4.6.1a/src/help.c.utf8 2005-07-22 11:29:50.000000000 +0200 -+++ mc-4.6.1a/src/help.c 2005-11-16 14:03:46.000000000 +0100 ++++ mc-4.6.1a/src/help.c 2006-02-01 14:25:01.000000000 +0100 @@ -449,10 +449,28 @@ static void help_show (Dlg_head *h, cons #ifndef HAVE_SLANG addch (acs_map [c]); @@ -1209,7 +1209,7 @@ if (!filename) g_free (hlpfile); --- mc-4.6.1a/src/wtools.c.utf8 2005-09-05 05:21:32.000000000 +0200 -+++ mc-4.6.1a/src/wtools.c 2005-11-16 14:03:46.000000000 +0100 ++++ mc-4.6.1a/src/wtools.c 2006-02-01 14:25:01.000000000 +0100 @@ -49,11 +49,11 @@ create_listbox_window (int cols, int lin /* Adjust sizes */ lines = (lines > LINES - 6) ? LINES - 6 : lines; @@ -1270,7 +1270,7 @@ #endif /* ENABLE_NLS */ --- mc-4.6.1a/src/util.h.utf8 2005-11-03 03:18:38.000000000 +0100 -+++ mc-4.6.1a/src/util.h 2005-11-16 14:03:46.000000000 +0100 ++++ mc-4.6.1a/src/util.h 2006-02-01 14:25:01.000000000 +0100 @@ -111,6 +111,13 @@ void init_uid_gid_cache (void); char *get_group (int); char *get_owner (int); @@ -1286,7 +1286,7 @@ #define MIN_I18NTIMELENGTH 10 #define STD_I18NTIMELENGTH 12 --- mc-4.6.1a/src/widget.c.utf8 2005-10-08 06:52:42.000000000 +0200 -+++ mc-4.6.1a/src/widget.c 2005-11-16 14:03:46.000000000 +0100 ++++ mc-4.6.1a/src/widget.c 2006-02-01 14:25:01.000000000 +0100 @@ -35,6 +35,9 @@ #include "global.h" @@ -2003,7 +2003,7 @@ } --- mc-4.6.1a/src/util.c.utf8 2005-11-03 03:18:38.000000000 +0100 -+++ mc-4.6.1a/src/util.c 2005-11-16 14:03:46.000000000 +0100 ++++ mc-4.6.1a/src/util.c 2006-02-01 14:25:01.000000000 +0100 @@ -33,7 +33,11 @@ #include #include @@ -2455,14 +2455,14 @@ } *w = 0; return s; ---- mc-4.6.1a/src/file.c.utf8 2005-09-17 13:45:13.000000000 +0200 -+++ mc-4.6.1a/src/file.c 2005-11-16 14:03:46.000000000 +0100 -@@ -164,15 +164,20 @@ static const char * +--- mc-4.6.1a/src/file.c.utf8 2006-01-29 21:26:05.000000000 +0100 ++++ mc-4.6.1a/src/file.c 2006-02-01 14:25:01.000000000 +0100 +@@ -161,15 +161,20 @@ static const char * do_transform_source (FileOpContext *ctx, const char *source) { size_t j, k, l, len; - const char *fnsource = x_basename (source); -+ const char *fnsource = g_strdup (x_basename (source)); ++ char *fnsource = g_strdup (x_basename (source)); int next_reg; enum CaseConvs case_conv = NO_CONV; static char fntarget[MC_MAXPATHLEN]; @@ -2479,7 +2479,7 @@ return NULL; } for (next_reg = 1, j = 0, k = 0; j < strlen (ctx->dest_mask); j++) { -@@ -216,6 +221,7 @@ do_transform_source (FileOpContext *ctx, +@@ -213,6 +218,7 @@ do_transform_source (FileOpContext *ctx, || ctx->regs.start[next_reg] < 0) { message (1, MSG_ERROR, _(" Invalid target mask ")); transform_error = FILE_ABORT; @@ -2487,7 +2487,7 @@ return NULL; } for (l = (size_t) ctx->regs.start[next_reg]; -@@ -230,6 +236,7 @@ do_transform_source (FileOpContext *ctx, +@@ -227,6 +233,7 @@ do_transform_source (FileOpContext *ctx, } } fntarget[k] = 0; @@ -2496,7 +2496,7 @@ } --- mc-4.6.1a/src/find.c.utf8 2005-07-07 21:34:56.000000000 +0200 -+++ mc-4.6.1a/src/find.c 2005-11-16 14:03:46.000000000 +0100 ++++ mc-4.6.1a/src/find.c 2006-02-01 14:25:01.000000000 +0100 @@ -217,7 +217,7 @@ find_parameters (char **start_dir, char int l1, maxlen = 0; @@ -2545,7 +2545,7 @@ list->list[next_free].f.marked = 0; list->list[next_free].f.link_to_dir = link_to_dir; --- mc-4.6.1a/src/myslang.h.utf8 2005-09-05 05:22:04.000000000 +0200 -+++ mc-4.6.1a/src/myslang.h 2005-11-16 14:03:46.000000000 +0100 ++++ mc-4.6.1a/src/myslang.h 2006-02-01 14:25:01.000000000 +0100 @@ -11,6 +11,16 @@ #endif /* HAVE_SLANG_SLANG_H */ #endif @@ -2564,7 +2564,7 @@ KEY_BACKSPACE = 400, KEY_END, KEY_UP, KEY_DOWN, KEY_LEFT, KEY_RIGHT, --- mc-4.6.1a/src/achown.c.utf8 2005-09-05 03:36:58.000000000 +0200 -+++ mc-4.6.1a/src/achown.c 2005-11-16 14:03:46.000000000 +0100 ++++ mc-4.6.1a/src/achown.c 2006-02-01 14:25:01.000000000 +0100 @@ -584,6 +584,12 @@ init_chown_advanced (void) b_att[2] = button_new (XTRACT (6)); b_user = button_new (XTRACT (5)); @@ -2579,7 +2579,7 @@ add_widget (ch_dlg, b_group); add_widget (ch_dlg, b_user); --- mc-4.6.1a/src/dialog.c.utf8 2005-09-05 05:20:27.000000000 +0200 -+++ mc-4.6.1a/src/dialog.c 2005-11-16 14:03:46.000000000 +0100 ++++ mc-4.6.1a/src/dialog.c 2006-02-01 14:25:01.000000000 +0100 @@ -166,7 +166,7 @@ common_dialog_repaint (struct Dlg_head * if (h->title) { @@ -2589,8 +2589,8 @@ addstr (h->title); } } ---- mc-4.6.1a/src/boxes.c.utf8 2005-06-14 15:02:31.000000000 +0200 -+++ mc-4.6.1a/src/boxes.c 2005-11-16 14:03:46.000000000 +0100 +--- mc-4.6.1a/src/boxes.c.utf8 2006-01-30 10:22:33.000000000 +0100 ++++ mc-4.6.1a/src/boxes.c 2006-02-01 14:25:01.000000000 +0100 @@ -153,23 +153,23 @@ display_init (int radio_sel, char *init_ display_title = _(display_title); for (i = 0; i < LIST_TYPES; i++) { @@ -2655,7 +2655,7 @@ if (i > SORT_X) SORT_X = i; -@@ -405,7 +405,7 @@ confirm_box (void) +@@ -408,7 +408,7 @@ confirm_box (void) while (i--) { conf_widgets [i].text = _(conf_widgets [i].text); @@ -2664,7 +2664,7 @@ if (l1 > maxlen) maxlen = l1; } -@@ -420,8 +420,8 @@ confirm_box (void) +@@ -423,8 +423,8 @@ confirm_box (void) * And this for the case when buttons with some space to the right * do not fit within 2/6 */ @@ -2675,7 +2675,7 @@ if (i > l1) l1 = i; -@@ -492,11 +492,11 @@ display_bits_box (void) +@@ -497,11 +497,11 @@ display_bits_box (void) { display_widgets [i].text = _(display_widgets[i].text); display_bits_str [i] = _(display_bits_str [i]); @@ -2689,7 +2689,7 @@ if (l1 > maxlen) maxlen = l1; -@@ -504,8 +504,8 @@ display_bits_box (void) +@@ -509,8 +509,8 @@ display_bits_box (void) display_bits.xlen = (maxlen + 5) * 6 / 4; /* See above confirm_box */ @@ -2700,7 +2700,7 @@ if (i > l1) l1 = i; -@@ -600,7 +600,7 @@ init_disp_bits_box (void) +@@ -605,7 +605,7 @@ init_disp_bits_box (void) cpname = _("&Select"); add_widget (dbits_dlg, @@ -2709,7 +2709,7 @@ NORMAL_BUTTON, cpname, sel_charset_button)); return dbits_dlg; -@@ -811,7 +811,7 @@ cd_dialog (void) +@@ -816,7 +816,7 @@ cd_dialog (void) quick_widgets [1].y_divisions = quick_widgets [0].y_divisions = Quick_input.ylen = 5; @@ -2718,7 +2718,7 @@ quick_widgets [0].relative_x = quick_widgets [1].relative_x + len + 1; -@@ -970,7 +970,7 @@ jobs_cmd (void) +@@ -975,7 +975,7 @@ jobs_cmd (void) { job_buttons [i].name = _(job_buttons [i].name); @@ -2727,7 +2727,7 @@ JOBS_X = max (JOBS_X, startx + len + 3); job_buttons [i].xpos = startx; -@@ -979,7 +979,7 @@ jobs_cmd (void) +@@ -984,7 +984,7 @@ jobs_cmd (void) /* Last button - Ok a.k.a. Cancel :) */ job_buttons [n_buttons - 1].xpos = @@ -2736,7 +2736,7 @@ i18n_flag = 1; } -@@ -1037,7 +1037,7 @@ vfs_smb_get_authinfo (const char *host, +@@ -1042,7 +1042,7 @@ vfs_smb_get_authinfo (const char *host, while (i--) { @@ -2745,7 +2745,7 @@ if (l1 > maxlen) maxlen = l1; } -@@ -1047,7 +1047,7 @@ vfs_smb_get_authinfo (const char *host, +@@ -1052,7 +1052,7 @@ vfs_smb_get_authinfo (const char *host, for (i = sizeof(buts)/sizeof(buts[0]), l1 = 0; i--; ) { @@ -2754,7 +2754,7 @@ } l1 += 15; if (l1 > dialog_x) -@@ -1056,7 +1056,7 @@ vfs_smb_get_authinfo (const char *host, +@@ -1061,7 +1061,7 @@ vfs_smb_get_authinfo (const char *host, ilen = dialog_x - 7 - maxlen; /* for the case of very long buttons :) */ istart = dialog_x - 3 - ilen; @@ -2764,7 +2764,7 @@ i18n_flag = 1; } --- mc-4.6.1a/src/learn.c.utf8 2005-05-27 05:35:15.000000000 +0200 -+++ mc-4.6.1a/src/learn.c 2005-11-16 14:03:46.000000000 +0100 ++++ mc-4.6.1a/src/learn.c 2006-02-01 14:25:01.000000000 +0100 @@ -237,7 +237,7 @@ init_learn (void) learn_but[0].x = 78 / 2 + 4; @@ -2775,7 +2775,7 @@ learn_title = _(learn_title); i18n_flag = 1; --- mc-4.6.1a/edit/edit-widget.h.utf8 2005-08-15 22:34:26.000000000 +0200 -+++ mc-4.6.1a/edit/edit-widget.h 2005-11-16 14:03:46.000000000 +0100 ++++ mc-4.6.1a/edit/edit-widget.h 2006-02-01 14:25:01.000000000 +0100 @@ -30,6 +30,11 @@ typedef struct edit_key_map_type { long command; } edit_key_map_type; @@ -2816,7 +2816,7 @@ unsigned long stack_size_mask; unsigned long stack_bottom; --- mc-4.6.1a/edit/editkeys.c.utf8 2005-08-10 18:47:44.000000000 +0200 -+++ mc-4.6.1a/edit/editkeys.c 2005-11-16 14:03:46.000000000 +0100 ++++ mc-4.6.1a/edit/editkeys.c 2006-02-01 14:25:01.000000000 +0100 @@ -181,10 +181,10 @@ static const edit_key_map_type common_ke * 'command' is one of the editor commands from editcmddef.h. */ @@ -2872,7 +2872,7 @@ return 0; } --- mc-4.6.1a/edit/editwidget.c.utf8 2005-09-07 10:54:12.000000000 +0200 -+++ mc-4.6.1a/edit/editwidget.c 2005-11-16 14:03:46.000000000 +0100 ++++ mc-4.6.1a/edit/editwidget.c 2006-02-01 14:25:01.000000000 +0100 @@ -344,7 +344,8 @@ edit_callback (Widget *w, widget_msg_t m case WIDGET_KEY: @@ -2883,8 +2883,8 @@ /* The user may override the access-keys for the menu bar. */ if (edit_translate_key (e, parm, &cmd, &ch)) { ---- mc-4.6.1a/edit/editcmd.c.utf8 2005-10-04 23:15:06.000000000 +0200 -+++ mc-4.6.1a/edit/editcmd.c 2005-11-16 14:03:46.000000000 +0100 +--- mc-4.6.1a/edit/editcmd.c.utf8 2006-01-30 10:22:33.000000000 +0100 ++++ mc-4.6.1a/edit/editcmd.c 2006-02-01 14:29:55.000000000 +0100 @@ -61,7 +61,7 @@ #define edit_get_save_file(f,h) input_expand_dialog (h, _(" Enter file name: "), f) @@ -3094,13 +3094,13 @@ @@ -945,7 +1027,7 @@ edit_block_copy_cmd (WEdit *edit) { long start_mark, end_mark, current = edit->curs1; - int size, x; + int size; - unsigned char *copy_buf; + mc_wchar_t *copy_buf; edit_update_curs_col (edit); - x = edit->curs_col; -@@ -990,7 +1072,7 @@ edit_block_move_cmd (WEdit *edit) + if (eval_marks (edit, &start_mark, &end_mark)) +@@ -985,7 +1067,7 @@ edit_block_move_cmd (WEdit *edit) { long count; long current; @@ -3109,7 +3109,7 @@ long start_mark, end_mark; int deleted = 0; int x = 0; -@@ -1051,7 +1133,7 @@ edit_block_move_cmd (WEdit *edit) +@@ -1046,7 +1128,7 @@ edit_block_move_cmd (WEdit *edit) edit_push_action (edit, COLUMN_ON); column_highlighting = 0; } else { @@ -3118,7 +3118,7 @@ edit_cursor_move (edit, start_mark - edit->curs1); edit_scroll_screen_over_cursor (edit); count = start_mark; -@@ -1389,7 +1471,11 @@ static long sargs[NUM_REPL_ARGS][256 / s +@@ -1385,7 +1467,11 @@ static long sargs[NUM_REPL_ARGS][256 / s /* This function is a modification of mc-3.2.10/src/view.c:regexp_view_search() */ /* returns -3 on error in pattern, -1 on not found, found_len = 0 if either */ static int @@ -3130,7 +3130,7 @@ int match_bol, int icase, int *found_len, void *d) { static regex_t r; -@@ -1398,6 +1484,11 @@ string_regexp_search (char *pattern, cha +@@ -1394,6 +1480,11 @@ string_regexp_search (char *pattern, cha regmatch_t *pmatch; static regmatch_t s[1]; @@ -3142,7 +3142,7 @@ pmatch = (regmatch_t *) d; if (!pmatch) pmatch = s; -@@ -1417,13 +1508,51 @@ string_regexp_search (char *pattern, cha +@@ -1413,13 +1504,51 @@ string_regexp_search (char *pattern, cha old_type = match_type; old_icase = icase; } @@ -3194,7 +3194,7 @@ *found_len = pmatch[0].rm_eo - pmatch[0].rm_so; return (pmatch[0].rm_so); } -@@ -1431,13 +1560,29 @@ string_regexp_search (char *pattern, cha +@@ -1427,13 +1556,29 @@ string_regexp_search (char *pattern, cha /* thanks to Liviu Daia for getting this (and the above) routines to work properly - paul */ @@ -3225,7 +3225,7 @@ int n = 0; for (p = 0; p < l; p++) /* count conversions... */ -@@ -1446,19 +1591,22 @@ edit_find_string (long start, unsigned c +@@ -1442,19 +1587,22 @@ edit_find_string (long start, unsigned c n++; if (replace_scanf || replace_regexp) { @@ -3255,7 +3255,7 @@ if (replace_case) { for (p = start; p < last_byte && p < start + MAX_REPL_LEN; p++) buf[p - start] = (*get_byte) (data, p); -@@ -1472,20 +1620,36 @@ edit_find_string (long start, unsigned c +@@ -1468,20 +1616,36 @@ edit_find_string (long start, unsigned c } buf[(q = p - start)] = 0; @@ -3293,7 +3293,7 @@ if (q + start < last_byte) { if (replace_case) { buf[q] = (*get_byte) (data, q + start); -@@ -1499,7 +1663,11 @@ edit_find_string (long start, unsigned c +@@ -1495,7 +1659,11 @@ edit_find_string (long start, unsigned c start++; buf++; /* move the window along */ if (buf == mbuf + MAX_REPL_LEN) { /* the window is about to go past the end of array, so... */ @@ -3305,7 +3305,7 @@ buf = mbuf; } q--; -@@ -1525,10 +1693,16 @@ edit_find_string (long start, unsigned c +@@ -1521,10 +1689,16 @@ edit_find_string (long start, unsigned c buf = mbuf; while (q) { @@ -3323,7 +3323,7 @@ return -3; } else if (found_start == -1) /* not found: try next line */ -@@ -1539,15 +1713,27 @@ edit_find_string (long start, unsigned c +@@ -1535,15 +1709,27 @@ edit_find_string (long start, unsigned c match_bol = 0; continue; } @@ -3353,7 +3353,7 @@ memmove (mbuf, buf, q); p = start + q; move_win = 1; -@@ -1557,36 +1743,59 @@ edit_find_string (long start, unsigned c +@@ -1553,36 +1739,59 @@ edit_find_string (long start, unsigned c } } } else { @@ -3421,7 +3421,7 @@ return -2; } -@@ -1600,9 +1809,14 @@ edit_find_forwards (long search_start, u +@@ -1596,9 +1805,14 @@ edit_find_forwards (long search_start, u while ((p = edit_find_string (p, exp, len, last_byte, get_byte, data, once_only, d)) >= 0) { if (replace_whole) { @@ -3436,7 +3436,7 @@ return p; if (once_only) return -2; -@@ -1634,6 +1848,7 @@ edit_find (long search_start, unsigned c +@@ -1630,6 +1844,7 @@ edit_find (long search_start, unsigned c #define is_digit(x) ((x) >= '0' && (x) <= '9') @@ -3444,7 +3444,7 @@ #define snprint(v) { \ *p1++ = *p++; \ *p1 = '\0'; \ -@@ -1641,33 +1856,48 @@ edit_find (long search_start, unsigned c +@@ -1637,33 +1852,48 @@ edit_find (long search_start, unsigned c if (n >= (size_t) (e - s)) goto nospc; \ s += n; \ } @@ -3501,7 +3501,7 @@ s += n; q = p; p1 = q1; -@@ -1695,45 +1925,78 @@ static int snprintf_p (char *str, size_t +@@ -1691,45 +1921,78 @@ static int snprintf_p (char *str, size_t *p1++ = *p++; if (*p == '*') { p++; @@ -3590,7 +3590,7 @@ snprint (*va_arg (ap, long *)); } else if (*p == 'p') { snprint (*va_arg (ap, void **)); -@@ -1742,10 +2005,17 @@ static int snprintf_p (char *str, size_t +@@ -1738,10 +2001,17 @@ static int snprintf_p (char *str, size_t q = p; } va_end (ap); @@ -3608,7 +3608,7 @@ return s + n - str; nospc: va_end (ap); -@@ -1924,8 +2194,11 @@ edit_replace_cmd (WEdit *edit, int again +@@ -1920,8 +2190,11 @@ edit_replace_cmd (WEdit *edit, int again } } if (replace_yes) { /* delete then insert new */ @@ -3621,7 +3621,7 @@ int ret = 0; /* we need to fill in sargs just like with scanf */ -@@ -1934,17 +2207,25 @@ edit_replace_cmd (WEdit *edit, int again +@@ -1930,17 +2203,25 @@ edit_replace_cmd (WEdit *edit, int again for (k = 1; k < NUM_REPL_ARGS && pmatch[k].rm_eo >= 0; k++) { @@ -3648,7 +3648,7 @@ edit-> search_start - -@@ -1962,14 +2243,23 @@ edit_replace_cmd (WEdit *edit, int again +@@ -1958,14 +2239,23 @@ edit_replace_cmd (WEdit *edit, int again } if (!ret) ret = @@ -3672,7 +3672,7 @@ } else { edit_error_dialog (_(" Replace "), ret == -@@ -1983,10 +2273,18 @@ edit_replace_cmd (WEdit *edit, int again +@@ -1979,10 +2269,18 @@ edit_replace_cmd (WEdit *edit, int again times_replaced++; while (i--) edit_delete (edit); @@ -3691,7 +3691,7 @@ } /* so that we don't find the same string again */ if (replace_backwards) { -@@ -2161,16 +2459,17 @@ edit_ok_to_exit (WEdit *edit) +@@ -2157,16 +2455,17 @@ edit_ok_to_exit (WEdit *edit) #define TEMP_BUF_LEN 1024 /* Return a null terminated length of text. Result must be g_free'd */ @@ -3713,7 +3713,7 @@ x = edit_move_forward3 (edit, edit_bol (edit, start), 0, start); c = edit_get_byte (edit, start); -@@ -2203,11 +2502,15 @@ edit_save_block (WEdit * edit, const cha +@@ -2199,11 +2498,15 @@ edit_save_block (WEdit * edit, const cha return 0; if (column_highlighting) { @@ -3730,7 +3730,7 @@ if (r < 0) break; p += r; -@@ -2215,15 +2518,19 @@ edit_save_block (WEdit * edit, const cha +@@ -2211,15 +2514,19 @@ edit_save_block (WEdit * edit, const cha } g_free (block); } else { @@ -3752,7 +3752,7 @@ start = end; } g_free (buf); -@@ -2561,17 +2868,20 @@ edit_block_process_cmd (WEdit *edit, con +@@ -2557,17 +2864,20 @@ edit_block_process_cmd (WEdit *edit, con /* prints at the cursor */ /* returns the number of chars printed */ @@ -3775,7 +3775,7 @@ static void pipe_mail (WEdit *edit, char *to, char *subject, char *cc) { FILE *p = 0; -@@ -2665,15 +2975,20 @@ void edit_mail_dialog (WEdit * edit) +@@ -2661,15 +2971,20 @@ void edit_mail_dialog (WEdit * edit) /* find first character of current word */ static int edit_find_word_start (WEdit *edit, long *word_start, int *word_len) { @@ -3798,7 +3798,7 @@ return 0; /* search start of word to be completed */ -@@ -2683,11 +2998,19 @@ static int edit_find_word_start (WEdit * +@@ -2679,11 +2994,19 @@ static int edit_find_word_start (WEdit * return 0; last = c; @@ -3819,7 +3819,7 @@ return 0; *word_start = edit->curs1 - (i - 1); /* start found */ -@@ -2720,7 +3043,7 @@ edit_collect_completions (WEdit *edit, l +@@ -2716,7 +3039,7 @@ edit_collect_completions (WEdit *edit, l int *num) { int len, max_len = 0, i, skip; @@ -3828,7 +3828,7 @@ /* collect max MAX_WORD_COMPLETIONS completions */ while (*num < MAX_WORD_COMPLETIONS) { -@@ -2739,11 +3062,16 @@ edit_collect_completions (WEdit *edit, l +@@ -2735,11 +3058,16 @@ edit_collect_completions (WEdit *edit, l buffers1[start >> S_EDIT_BUF_SIZE][start & M_EDIT_BUF_SIZE]; skip = 0; for (i = 0; i < *num; i++) { @@ -3848,7 +3848,7 @@ skip = 1; break; /* skip it, already added */ } -@@ -2751,7 +3079,7 @@ edit_collect_completions (WEdit *edit, l +@@ -2747,7 +3075,7 @@ edit_collect_completions (WEdit *edit, l if (skip) continue; @@ -3857,7 +3857,7 @@ compl[*num].len = len; for (i = 0; i < len; i++) compl[*num].text[i] = *(bufpos + i); -@@ -2765,6 +3093,18 @@ edit_collect_completions (WEdit *edit, l +@@ -2761,6 +3089,18 @@ edit_collect_completions (WEdit *edit, l return max_len; } @@ -3876,7 +3876,7 @@ /* let the user select its preferred completion */ static void -@@ -2777,6 +3117,9 @@ edit_completion_dialog (WEdit * edit, in +@@ -2773,6 +3113,9 @@ edit_completion_dialog (WEdit * edit, in WListbox *compl_list; int compl_dlg_h; /* completion dialog height */ int compl_dlg_w; /* completion dialog width */ @@ -3886,7 +3886,7 @@ /* calculate the dialog metrics */ compl_dlg_h = num_compl + 2; -@@ -2812,9 +3155,18 @@ edit_completion_dialog (WEdit * edit, in +@@ -2808,9 +3151,18 @@ edit_completion_dialog (WEdit * edit, in add_widget (compl_dlg, compl_list); /* fill the listbox with the completions */ @@ -3905,7 +3905,7 @@ /* pop up the dialog */ run_dlg (compl_dlg); -@@ -2822,9 +3174,17 @@ edit_completion_dialog (WEdit * edit, in +@@ -2818,9 +3170,17 @@ edit_completion_dialog (WEdit * edit, in /* apply the choosen completion */ if (compl_dlg->ret_value == B_ENTER) { listbox_get_current (compl_list, &curr, NULL); @@ -3924,7 +3924,7 @@ } /* destroy dialog before return */ -@@ -2841,8 +3201,9 @@ edit_complete_word_cmd (WEdit *edit) +@@ -2837,8 +3197,9 @@ edit_complete_word_cmd (WEdit *edit) { int word_len = 0, i, num_compl = 0, max_len; long word_start = 0; @@ -3936,7 +3936,7 @@ struct selection compl[MAX_WORD_COMPLETIONS]; /* completions */ /* don't want to disturb another search */ -@@ -2859,16 +3220,32 @@ edit_complete_word_cmd (WEdit *edit) +@@ -2855,16 +3216,32 @@ edit_complete_word_cmd (WEdit *edit) /* prepare match expression */ bufpos = &edit->buffers1[word_start >> S_EDIT_BUF_SIZE] [word_start & M_EDIT_BUF_SIZE]; @@ -3970,7 +3970,7 @@ if (num_compl > 0) { /* insert completed word if there is only one match */ --- mc-4.6.1a/edit/wordproc.c.utf8 2005-05-27 05:35:12.000000000 +0200 -+++ mc-4.6.1a/edit/wordproc.c 2005-11-16 14:03:46.000000000 +0100 ++++ mc-4.6.1a/edit/wordproc.c 2006-02-01 14:25:01.000000000 +0100 @@ -40,7 +40,12 @@ #define tab_width option_tab_spacing @@ -4191,7 +4191,7 @@ return; } --- mc-4.6.1a/edit/edit.h.utf8 2005-09-07 10:54:12.000000000 +0200 -+++ mc-4.6.1a/edit/edit.h 2005-11-16 14:03:46.000000000 +0100 ++++ mc-4.6.1a/edit/edit.h 2006-02-01 14:25:01.000000000 +0100 @@ -25,6 +25,27 @@ #include @@ -4285,7 +4285,7 @@ #define get_sys_error(s) (s) --- mc-4.6.1a/edit/editdraw.c.utf8 2005-09-05 04:14:29.000000000 +0200 -+++ mc-4.6.1a/edit/editdraw.c 2005-11-16 14:03:46.000000000 +0100 ++++ mc-4.6.1a/edit/editdraw.c 2006-02-01 14:25:01.000000000 +0100 @@ -69,11 +69,16 @@ static void status_string (WEdit * edit, * as decimal and as hex. */ @@ -4504,8 +4504,8 @@ print_to_widget (edit, row, start_col, start_col_real, end_col, line); } ---- mc-4.6.1a/edit/edit.c.utf8 2005-09-07 10:54:11.000000000 +0200 -+++ mc-4.6.1a/edit/edit.c 2005-11-16 14:03:46.000000000 +0100 +--- mc-4.6.1a/edit/edit.c.utf8 2006-01-26 16:42:56.000000000 +0100 ++++ mc-4.6.1a/edit/edit.c 2006-02-01 14:25:01.000000000 +0100 @@ -103,7 +103,11 @@ char *option_backup_ext = NULL; static void edit_move_to_prev_col (WEdit *edit, long p); static void user_menu (WEdit *edit); @@ -5082,7 +5082,7 @@ edit_update_curs_row (edit); done_undo:; -@@ -2098,7 +2223,7 @@ static void edit_goto_matching_bracket ( +@@ -2101,7 +2226,7 @@ static void edit_goto_matching_bracket ( * passed as -1. Commands are executed, and char_for_insertion is * inserted at the cursor. */ @@ -5091,7 +5091,7 @@ { if (command == CK_Begin_Record_Macro) { edit->macro_i = 0; -@@ -2133,7 +2258,7 @@ static const char * const shell_cmd[] = +@@ -2136,7 +2261,7 @@ static const char * const shell_cmd[] = all of them. It also does not check for the Undo command. */ void @@ -5100,7 +5100,7 @@ { edit->force |= REDRAW_LINE; -@@ -2166,7 +2291,7 @@ edit_execute_cmd (WEdit *edit, int comma +@@ -2169,7 +2294,7 @@ edit_execute_cmd (WEdit *edit, int comma } /* An ordinary key press */ Index: mc.spec =================================================================== RCS file: /cvs/dist/rpms/mc/FC-4/mc.spec,v retrieving revision 1.63 retrieving revision 1.64 diff -u -r1.63 -r1.64 --- mc.spec 9 Dec 2005 10:48:43 -0000 1.63 +++ mc.spec 7 Mar 2006 15:01:18 -0000 1.64 @@ -1,7 +1,7 @@ Summary: User-friendly text console file manager and visual shell. Name: mc Version: 4.6.1a -Release: 4.FC4 +Release: 5.fc4 Epoch: 1 License: GPL Group: System Environment/Shells @@ -19,9 +19,10 @@ Patch5: mc-userhost.patch Patch6: mc-64bit.patch Patch7: mc-utf8-look-and-feel.patch -Patch8: mc-phpfix.patch -Patch9: mc-concat.patch -Patch10: mc-ministatus.patch +Patch8: mc-concat.patch +Patch9: mc-ministatus.patch +Patch10: mc-showfree.patch +Patch11: mc-etcmc.patch %description Midnight Commander is a visual shell much like a file manager, only @@ -41,9 +42,10 @@ %patch5 -p1 -b .userhost %patch6 -p1 -b .64bit %patch7 -p1 -b .laf -%patch8 -p1 -b .phpfix -%patch9 -p1 -b .concat -%patch10 -p1 -b .ministatus +%patch8 -p1 -b .concat +%patch9 -p1 -b .ministatus +%patch10 -p1 -b .showfree +%patch11 -p1 -b .etcmc # convert files in /lib to UTF-8 pushd lib @@ -131,14 +133,20 @@ %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT%{_sysconfdir}/profile.d +install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/profile.d +install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/mc +install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/mc/extfs +install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/mc/syntax %{makeinstall} sysconfdir=$RPM_BUILD_ROOT%{_sysconfdir} install lib/{mc.sh,mc.csh} $RPM_BUILD_ROOT%{_sysconfdir}/profile.d -# install charsets, bug #76486 -install -m 644 lib/mc.charsets $RPM_BUILD_ROOT%{_datadir}/mc +# move configuration files to /etc/mc to make it FHS compliant (#2188) +mv -f $RPM_BUILD_ROOT%{_datadir}/mc/{cedit.menu,edit.indent.rc,edit.spell.rc,\ +mc.ext,mc.lib,mc.menu,mc.charsets} $RPM_BUILD_ROOT%{_sysconfdir}/mc +mv -f $RPM_BUILD_ROOT%{_datadir}/mc/extfs/*.ini $RPM_BUILD_ROOT%{_sysconfdir}/mc/extfs +mv -f $RPM_BUILD_ROOT%{_datadir}/mc/syntax/Syntax $RPM_BUILD_ROOT%{_sysconfdir}/mc/syntax # install man pages in various languages for l in es hu it pl ru sr; do @@ -168,7 +176,7 @@ %{_bindir}/mcmfmt %{_bindir}/mcview %{_datadir}/mc/* -%attr(4711, vcsa, root) %{_libdir}/mc/cons.saver +%attr(4711, vcsa, root) %{_libexecdir}/mc/cons.saver %{_mandir}/man1/* %lang(es) %{_mandir}/es/man1/mc.1.gz %lang(hu) %{_mandir}/hu/man1/mc.1.gz @@ -177,10 +185,21 @@ %lang(ru) %{_mandir}/ru/man1/mc.1.gz %lang(sr) %{_mandir}/sr/man1/mc.1.gz %config %{_sysconfdir}/profile.d/* -%dir %{_libdir}/mc +%config %{_sysconfdir}/mc/* %dir %{_datadir}/mc +%dir %{_sysconfdir}/mc %changelog +* Tue Mar 7 2006 Jindrich Novy 4.6.1a-5.fc4 +- fix hotkey conflict in Layout options (#183282) +- move syntax configuration file from /usr/share/mc to /etc/mc +- save layout settings pernamently for showing free space, not + only for current session (#182127) +- fix audio bindings, make firefox default html binding +- mc no more segfaults when edited file contains \x80 (#181611) +- make mc FHS compliant: store config files in /etc/mc and + extfs/*.ini files in /etc/mc/extfs instead of /usr/share/mc (#2188) + * Tue Dec 9 2005 Jindrich Novy 4.6.1a-4.FC4 - correctly concatenate directory and file in concat_dir_and_file() - highlight PHP files correctly (#175184) Index: sources =================================================================== RCS file: /cvs/dist/rpms/mc/FC-4/sources,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- sources 29 Nov 2005 22:22:10 -0000 1.26 +++ sources 7 Mar 2006 15:01:19 -0000 1.27 @@ -1 +1 @@ -1ed536a7b1c8ed5ce9081a2124f7dcdb mc-4.6.1a.tar.bz2 +137ebb38714a6810bae5f33209e31a67 mc-4.6.1a.tar.bz2 From fedora-cvs-commits at redhat.com Tue Mar 7 15:24:23 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 7 Mar 2006 10:24:23 -0500 Subject: rpms/shadow-utils/devel shadow-970616.login.defs, 1.1, 1.2 shadow-utils.spec, 1.68, 1.69 Message-ID: <200603071524.k27FONFM031265@cvs.devel.redhat.com> Author: pvrabec Update of /cvs/dist/rpms/shadow-utils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv31248 Modified Files: shadow-970616.login.defs shadow-utils.spec Log Message: set default umask to 077 in login.defs Index: shadow-970616.login.defs =================================================================== RCS file: /cvs/dist/rpms/shadow-utils/devel/shadow-970616.login.defs,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- shadow-970616.login.defs 9 Sep 2004 12:21:14 -0000 1.1 +++ shadow-970616.login.defs 7 Mar 2006 15:24:21 -0000 1.2 @@ -45,3 +45,6 @@ # CREATE_HOME yes + +UMASK 077 + Index: shadow-utils.spec =================================================================== RCS file: /cvs/dist/rpms/shadow-utils/devel/shadow-utils.spec,v retrieving revision 1.68 retrieving revision 1.69 diff -u -r1.68 -r1.69 --- shadow-utils.spec 6 Mar 2006 14:57:57 -0000 1.68 +++ shadow-utils.spec 7 Mar 2006 15:24:21 -0000 1.69 @@ -5,7 +5,7 @@ Summary: Utilities for managing accounts and shadow password files. Name: shadow-utils Version: 4.0.14 -Release: 2 +Release: 3 Epoch: 2 URL: http://shadow.pld.org.pl/ Source0: ftp://ftp.pld.org.pl/software/shadow/shadow-%{version}.tar.bz2 @@ -200,6 +200,9 @@ %{_mandir}/*/man8/faillog.8* %changelog +* Tue Mar 07 2006 Peter Vrabec 2:4.0.14-3 +- set default umask to 077 in login.defs + * Mon Mar 06 2006 Peter Vrabec 2:4.0.14-2 - use lrename() function, which follow a destination symbolic link(#181977) From fedora-cvs-commits at redhat.com Tue Mar 7 15:37:08 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 7 Mar 2006 10:37:08 -0500 Subject: rpms/kernel/devel kernel-2.6.spec,1.2026,1.2027 Message-ID: <200603071537.k27Fb89L031440@cvs.devel.redhat.com> Author: sct Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv31429 Modified Files: kernel-2.6.spec Log Message: Include xen header files in -devel packages if we're building xen. Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.2026 retrieving revision 1.2027 diff -u -r1.2026 -r1.2027 --- kernel-2.6.spec 7 Mar 2006 05:29:45 -0000 1.2026 +++ kernel-2.6.spec 7 Mar 2006 15:37:04 -0000 1.2027 @@ -1222,6 +1222,9 @@ ln -sf ../../../include/asm-ppc* asm popd fi +%if %{buildxen} + cp -a xen $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/include +%endif # Make sure the Makefile and version.h have a matching timestamp so that # external modules can be built @@ -1651,6 +1654,9 @@ %endif %changelog +* Tue Mar 7 2006 Stephen Tweedie +- Include xen header files in -devel packages if we're building xen. + * Tue Mar 7 2006 Dave Jones - Fix NMI watchdog on i386. From fedora-cvs-commits at redhat.com Tue Mar 7 15:38:08 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 7 Mar 2006 10:38:08 -0500 Subject: rpms/e2fsprogs/devel e2fsprogs-1.38-blkid-epoch.patch, NONE, 1.1 e2fsprogs.spec, 1.49, 1.50 Message-ID: <200603071538.k27Fc8MM031540@cvs.devel.redhat.com> Author: dcantrel Update of /cvs/dist/rpms/e2fsprogs/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv31467 Modified Files: e2fsprogs.spec Added Files: e2fsprogs-1.38-blkid-epoch.patch Log Message: Disable /etc/blkid.tab caching if time is set before epoch (#182188) e2fsprogs-1.38-blkid-epoch.patch: devname.c | 7 ++++--- probe.c | 14 ++++++++------ 2 files changed, 12 insertions(+), 9 deletions(-) --- NEW FILE e2fsprogs-1.38-blkid-epoch.patch --- --- e2fsprogs-1.38/lib/blkid/devname.c.epoch 2006-02-17 12:11:58.000000000 -0500 +++ e2fsprogs-1.38/lib/blkid/devname.c 2006-02-20 16:57:55.000000000 -0500 @@ -448,9 +448,10 @@ if (!cache) return -BLKID_ERR_PARAM; - if (cache->bic_flags & BLKID_BIC_FL_PROBED && - time(0) - cache->bic_time < BLKID_PROBE_INTERVAL) - return 0; + if (time(0) > 0) + if (cache->bic_flags & BLKID_BIC_FL_PROBED && + time(0) - cache->bic_time < BLKID_PROBE_INTERVAL) + return 0; blkid_read_cache(cache); #ifdef HAVE_DEVMAPPER --- e2fsprogs-1.38/lib/blkid/probe.c.epoch 2006-02-17 12:11:57.000000000 -0500 +++ e2fsprogs-1.38/lib/blkid/probe.c 2006-02-20 16:56:48.000000000 -0500 @@ -656,13 +656,15 @@ return NULL; now = time(0); - diff = now - dev->bid_time; + if (now > 0) { + diff = now - dev->bid_time; - if ((now < dev->bid_time) || - (diff < BLKID_PROBE_MIN) || - (dev->bid_flags & BLKID_BID_FL_VERIFIED && - diff < BLKID_PROBE_INTERVAL)) - return dev; + if ((now < dev->bid_time) || + (diff < BLKID_PROBE_MIN) || + (dev->bid_flags & BLKID_BID_FL_VERIFIED && + diff < BLKID_PROBE_INTERVAL)) + return dev; + } DBG(DEBUG_PROBE, printf("need to revalidate %s (time since last check %lu)\n", Index: e2fsprogs.spec =================================================================== RCS file: /cvs/dist/rpms/e2fsprogs/devel/e2fsprogs.spec,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- e2fsprogs.spec 24 Feb 2006 16:00:15 -0000 1.49 +++ e2fsprogs.spec 7 Mar 2006 15:38:06 -0000 1.50 @@ -4,7 +4,7 @@ Summary: Utilities for managing the second extended (ext2) filesystem. Name: e2fsprogs Version: 1.38 -Release: 9 +Release: 10 License: GPL Group: System Environment/Base Source: ftp://download.sourceforge.net/pub/sourceforge/e2fsprogs/e2fsprogs-%{version}.tar.gz @@ -27,6 +27,7 @@ Patch32: e2fsprogs-1.38-no_pottcdate.patch Patch33: e2fsprogs-1.38-lost+found.patch Patch34: e2fsprogs-1.38-blkid-devmapper.patch +Patch35: e2fsprogs-1.38-blkid-epoch.patch Url: http://e2fsprogs.sourceforge.net/ BuildRoot: %{_tmppath}/%{name}-root Requires: e2fsprogs-libs = %{version}-%{release}, device-mapper @@ -120,6 +121,9 @@ # look at device mapper devices %patch34 -p1 -b .dm +# disable blkid.tab caching if time is set before epoch +%patch35 -p1 -b .epoch + %build aclocal autoconf @@ -297,6 +301,9 @@ %{_mandir}/man3/uuid_unparse.3* %changelog +* Tue Mar 07 2006 David Cantrell - 1.38-10 +- Disable /etc/blkid.tab caching if time is set before epoch (#182188) + * Fri Feb 24 2006 Peter Jones - 1.38-9 - _don't_ handle selinux context on blkid.tab, dwalsh says this is a no-no. From fedora-cvs-commits at redhat.com Tue Mar 7 15:46:45 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 7 Mar 2006 10:46:45 -0500 Subject: rpms/e2fsprogs/devel e2fsprogs.spec,1.50,1.51 Message-ID: <200603071546.k27FkjHl011883@cvs.devel.redhat.com> Author: dcantrel Update of /cvs/dist/rpms/e2fsprogs/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv11870 Modified Files: e2fsprogs.spec Log Message: BuildRequires pkgconfig. Index: e2fsprogs.spec =================================================================== RCS file: /cvs/dist/rpms/e2fsprogs/devel/e2fsprogs.spec,v retrieving revision 1.50 retrieving revision 1.51 diff -u -r1.50 -r1.51 --- e2fsprogs.spec 7 Mar 2006 15:38:06 -0000 1.50 +++ e2fsprogs.spec 7 Mar 2006 15:46:43 -0000 1.51 @@ -4,7 +4,7 @@ Summary: Utilities for managing the second extended (ext2) filesystem. Name: e2fsprogs Version: 1.38 -Release: 10 +Release: 11 License: GPL Group: System Environment/Base Source: ftp://download.sourceforge.net/pub/sourceforge/e2fsprogs/e2fsprogs-%{version}.tar.gz @@ -32,7 +32,7 @@ BuildRoot: %{_tmppath}/%{name}-root Requires: e2fsprogs-libs = %{version}-%{release}, device-mapper BuildRequires: gettext, texinfo, autoconf, automake, libselinux-devel -BuildRequires: libsepol-devel, gettext-devel +BuildRequires: libsepol-devel, gettext-devel, pkgconfig BuildRequires: device-mapper >= 1.02.02-3 %define ext2resize_basever 1.1.17 @@ -301,6 +301,9 @@ %{_mandir}/man3/uuid_unparse.3* %changelog +* Tue Mar 07 2006 David Cantrell - 1.38-11 +- BuildRequires pkgconfig + * Tue Mar 07 2006 David Cantrell - 1.38-10 - Disable /etc/blkid.tab caching if time is set before epoch (#182188) From fedora-cvs-commits at redhat.com Tue Mar 7 15:48:14 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 7 Mar 2006 10:48:14 -0500 Subject: rpms/beagle/devel beagle-0.2.2-crawl-system-cron.patch, NONE, 1.1 beagle-0.2.2-security-fix.patch, NONE, 1.1 .cvsignore, 1.7, 1.8 beagle.spec, 1.42, 1.43 sources, 1.7, 1.8 Message-ID: <200603071548.k27FmE2A011969@cvs.devel.redhat.com> Author: alexl Update of /cvs/dist/rpms/beagle/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv11949 Modified Files: .cvsignore beagle.spec sources Added Files: beagle-0.2.2-crawl-system-cron.patch beagle-0.2.2-security-fix.patch Log Message: * Tue Mar 7 2006 Alexander Larsson - 0.2.2-1 - update to 0.2.2 beagle-0.2.2-crawl-system-cron.patch: beagle-crawl-system.in | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE beagle-0.2.2-crawl-system-cron.patch --- --- beagle-0.2.2/tools/beagle-crawl-system.in.crawl-system-cron 2006-03-07 16:44:28.000000000 +0100 +++ beagle-0.2.2/tools/beagle-crawl-system.in 2006-03-07 16:45:30.000000000 +0100 @@ -60,7 +60,7 @@ fi export TMPDIR=/tmp - eval nice -n 19 $IONICE su $CRAWL_USER -c \"@sbindir@/beagle-build-index --target @localstatedir@/cache/beagle/indexes/$CRAWL_INDEX_NAME $OPTIONS $CRAWL_PATHS\" > /dev/null 2>&1 + eval nice -n 19 $IONICE su $CRAWL_USER -s /bin/bash -c \"@sbindir@/beagle-build-index --target @localstatedir@/cache/beagle/indexes/$CRAWL_INDEX_NAME $OPTIONS $CRAWL_PATHS\" > /dev/null 2>&1 fi fi done beagle-0.2.2-security-fix.patch: beagled-index-helper.in | 33 ++------------------------------- beagled.in | 32 -------------------------------- 2 files changed, 2 insertions(+), 63 deletions(-) --- NEW FILE beagle-0.2.2-security-fix.patch --- --- beagle-0.2.2/beagled/beagled.in.security-fix 2006-03-07 16:37:41.000000000 +0100 +++ beagle-0.2.2/beagled/beagled.in 2006-03-07 16:38:40.000000000 +0100 @@ -1,36 +1,5 @@ #!@bash@ -if [ -e ./@target@ ] && [ -e ./Makefile.am ] ; then - echo "*** Running uninstalled @target@ ***" - - # When we run uninstalled, run in the foreground by default. - fg_default=1 - - TARGET_EXE="./@target@" - - export _BEAGLED_INDEX_HELPER_PATH="." - - # The stuff in webserver, Tiles and images is only needed when - # web services are enabled. - export MONO_PATH="../Util:../BeagleClient:./webserver:../Tiles:../images:$MONO_PATH" - - export LD_LIBRARY_PATH="../glue/.libs:$LD_LIBRARY_PATH" - - # In BEAGLE_FILTER_PATH, a trailing ':' means "append the default path". - if [ -n "$BEAGLE_FILTER_PATH" ]; then - export BEAGLE_FILTER_PATH="../Filters:$BEAGLE_FILTER_PATH" - else - export BEAGLE_FILTER_PATH="../Filters" - fi - - # Ditto BEAGLE_BACKEND_PATH. - if [ -n "$BEAGLE_BACKEND_PATH" ]; then - export BEAGLE_BACKEND_PATH=".:$BEAGLE_BACKEND_PATH" - else - export BEAGLE_BACKEND_PATH="." - fi -else - # Otherwise default to running in the background fg_default=0 @@ -39,7 +8,6 @@ export _BEAGLED_INDEX_HELPER_PATH="@pkglibdir@" export MONO_PATH="@pkglibdir@:$MONO_PATH" export LD_LIBRARY_PATH="@pkglibdir@:$LD_LIBRARY_PATH" -fi export MONO_GAC_PREFIX="@gacprefix@:$MONO_GAC_PREFIX" --- beagle-0.2.2/beagled/beagled-index-helper.in.security-fix 2006-03-07 16:38:00.000000000 +0100 +++ beagle-0.2.2/beagled/beagled-index-helper.in 2006-03-07 16:38:14.000000000 +0100 @@ -1,36 +1,7 @@ #!@bash@ -if [ -e ./@target@ ] && [ -e ./Makefile.am ] ; then - echo "*** Running uninstalled @target@ ***" - THIS_PATH="../Util:../BeagleClient:." - THIS_EXE="./@target@" - - export MONO_PATH="../Util:../BeagleClient:$MONO_PATH" - export LD_LIBRARY_PATH="../glue/.libs:$LD_LIBRARY_PATH" - - # In BEAGLE_FILTER_PATH, a trailing ':' means "append the default path". - if [ -n "$BEAGLE_FILTER_PATH" ]; then - export BEAGLE_FILTER_PATH="../Filters:$BEAGLE_FILTER_PATH" - else - export BEAGLE_FILTER_PATH="../Filters" - fi - -else - THIS_PATH="@pkglibdir@" - THIS_EXE="@pkglibdir@/@target@" -fi - -if [ -n "$_GET_ON_THE_HEAP_BUDDY_BANDWAGON" ]; then - n=1 - while [ -e $BEAGLE_HEAP_BUDDY_DIR/outfile.helper.$n ]; do - n=$(($n+1)) - done - MONO_EXTRA_ARGS="--profile=heap-buddy:$BEAGLE_HEAP_BUDDY_DIR/outfile.helper.$n $MONO_EXTRA_ARGS" -fi - -if [ -n "$BEAGLE_DEBUG_FLAG_IS_SET" ]; then - MONO_EXTRA_ARGS="--debug $MONO_EXTRA_ARGS" -fi +THIS_PATH="@pkglibdir@" +THIS_EXE="@pkglibdir@/@target@" export MONO_GAC_PREFIX="@gacprefix@:$MONO_GAC_PREFIX" export MONO_PATH="$THIS_PATH:$MONO_PATH" Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/beagle/devel/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 21 Feb 2006 20:06:06 -0000 1.7 +++ .cvsignore 7 Mar 2006 15:48:12 -0000 1.8 @@ -1,4 +1 @@ -beagle-0.2.0.tar.bz2 -beagle-0.2.1.tar.bz2 -beagle.desktop -beagle-crawl-system.cron +beagle-0.2.2.tar.bz2 Index: beagle.spec =================================================================== RCS file: /cvs/dist/rpms/beagle/devel/beagle.spec,v retrieving revision 1.42 retrieving revision 1.43 diff -u -r1.42 -r1.43 --- beagle.spec 3 Mar 2006 11:08:07 -0000 1.42 +++ beagle.spec 7 Mar 2006 15:48:12 -0000 1.43 @@ -1,6 +1,6 @@ Name: beagle -Version: 0.2.1 -Release: 17 +Version: 0.2.2 +Release: 1 Summary: The Beagle Search Infrastructure Group: User Interface/Desktops @@ -24,11 +24,10 @@ BuildRequires: librsvg2-devel >= 2.0 Requires: sqlite >= 3.3.1 Requires: zip unzip sed grep mono-core poppler-utils -Patch0: beagle-0.2.0-security-fix.patch -Patch1: beagle-0.2.1-sqlite3.patch +Patch0: beagle-0.2.2-security-fix.patch Patch2: beagle-0.2.1-crawl.patch Patch3: beagle-0.2.1-spew.patch -Patch4: beagle-0.2.1-crawl-system-cron.patch +Patch4: beagle-0.2.2-crawl-system-cron.patch # Mono only available on these: ExclusiveArch: %ix86 x86_64 ppc ia64 armv4l sparc s390 s390x @@ -63,7 +62,6 @@ %prep %setup -q %patch0 -p1 -b .security-fix -%patch1 -p1 -b .sqlite3 %patch2 -p1 -b .crawl %patch3 -p1 -b .spew %patch4 -p1 -b .crawl-system-cron @@ -213,6 +211,9 @@ %{_prefix}/lib/python*/site-packages/beagle.so %changelog +* Tue Mar 7 2006 Alexander Larsson - 0.2.2-1 +- update to 0.2.2 + * Fri Mar 3 2006 Alexander Larsson 0.2.1-17 - Change beagle user to uid/gid 58 (registered), because nut was already using 57 (unregistred!) Index: sources =================================================================== RCS file: /cvs/dist/rpms/beagle/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 21 Feb 2006 20:06:07 -0000 1.7 +++ sources 7 Mar 2006 15:48:12 -0000 1.8 @@ -1,3 +1 @@ -325ed91dc66fb6be060d0a5f4c8f56dd beagle-0.2.1.tar.bz2 -6f0f121a9269662071eb5c260b54f86f beagle.desktop -777250265dc910964f5acd9da29cc64c beagle-crawl-system.cron +d8c4765a30b9bf989a769f4337f35b3f beagle-0.2.2.tar.bz2 From fedora-cvs-commits at redhat.com Tue Mar 7 15:54:58 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 7 Mar 2006 10:54:58 -0500 Subject: rpms/beagle/devel sources,1.8,1.9 Message-ID: <200603071554.k27FswLL020534@cvs.devel.redhat.com> Author: alexl Update of /cvs/dist/rpms/beagle/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv20414 Modified Files: sources Log Message: put back other sources Index: sources =================================================================== RCS file: /cvs/dist/rpms/beagle/devel/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 7 Mar 2006 15:48:12 -0000 1.8 +++ sources 7 Mar 2006 15:54:55 -0000 1.9 @@ -1 +1,3 @@ +6f0f121a9269662071eb5c260b54f86f beagle.desktop +777250265dc910964f5acd9da29cc64c beagle-crawl-system.cron d8c4765a30b9bf989a769f4337f35b3f beagle-0.2.2.tar.bz2 From fedora-cvs-commits at redhat.com Tue Mar 7 16:14:06 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 7 Mar 2006 11:14:06 -0500 Subject: rpms/eclipse-cdt/devel eclipse-cdt.spec,1.37,1.38 Message-ID: <200603071614.k27GE61V025763@cvs.devel.redhat.com> Author: overholt Update of /cvs/dist/rpms/eclipse-cdt/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv25524 Modified Files: eclipse-cdt.spec Log Message: * Tue Mar 07 2006 Andrew Overholt 3.0.2-1jpp_2fc - Bump release. Index: eclipse-cdt.spec =================================================================== RCS file: /cvs/dist/rpms/eclipse-cdt/devel/eclipse-cdt.spec,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- eclipse-cdt.spec 2 Mar 2006 14:54:00 -0000 1.37 +++ eclipse-cdt.spec 7 Mar 2006 16:14:04 -0000 1.38 @@ -21,7 +21,7 @@ Summary: %{pkg_summary} Name: %{eclipse_name}-cdt Version: %{majmin}.%{micro} -Release: 1jpp_1fc +Release: 1jpp_2fc License: Eclipse Public License - v 1.0 (EPL) Group: Text Editors/Integrated Development Environments (IDE) URL: http://www.eclipse.org/cdt @@ -232,6 +232,9 @@ %changelog +* Tue Mar 07 2006 Andrew Overholt 3.0.2-1jpp_2fc +- Bump release. + * Mon Feb 13 2006 Andrew Overholt 3.0.2-1jpp_1fc - 3.0.2. From fedora-cvs-commits at redhat.com Tue Mar 7 16:14:59 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 7 Mar 2006 11:14:59 -0500 Subject: rpms/bluez-utils/devel bluez-utils.spec, 1.36, 1.37 dund.init, 1.3, 1.4 hidd.init, 1.4, 1.5 pand.init, 1.3, 1.4 Message-ID: <200603071614.k27GExnW026217@cvs.devel.redhat.com> Author: katzj Update of /cvs/dist/rpms/bluez-utils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv26173 Modified Files: bluez-utils.spec dund.init hidd.init pand.init Log Message: * Tue Mar 7 2006 Jeremy Katz - 2.25-3 - more initscript tweaking Index: bluez-utils.spec =================================================================== RCS file: /cvs/dist/rpms/bluez-utils/devel/bluez-utils.spec,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- bluez-utils.spec 6 Mar 2006 21:29:23 -0000 1.36 +++ bluez-utils.spec 7 Mar 2006 16:14:55 -0000 1.37 @@ -1,7 +1,7 @@ Summary: Bluetooth utilities Name: bluez-utils Version: 2.25 -Release: 2 +Release: 3 License: GPL Group: Applications/System Source: http://bluez.sourceforge.net/download/%{name}-%{version}.tar.gz @@ -110,6 +110,9 @@ %{_libdir}/cups/backend/bluetooth %changelog +* Tue Mar 7 2006 Jeremy Katz - 2.25-3 +- more initscript tweaking + * Mon Mar 6 2006 Jeremy Katz - 2.25-2 - fix initscripts to be more resilient of files missing to clean up scriptlet errors on install Index: dund.init =================================================================== RCS file: /cvs/dist/rpms/bluez-utils/devel/dund.init,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- dund.init 6 Mar 2006 21:29:23 -0000 1.3 +++ dund.init 7 Mar 2006 16:14:55 -0000 1.4 @@ -12,7 +12,7 @@ [ -f /etc/sysconfig/network ] && . /etc/sysconfig/network -[ ${NETWORKING} = "yes" ] || exit 0 +[ "${NETWORKING}" = "yes" ] || exit 0 [ -r /etc/sysconfig/dund ] || exit 0 Index: hidd.init =================================================================== RCS file: /cvs/dist/rpms/bluez-utils/devel/hidd.init,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- hidd.init 6 Mar 2006 21:29:23 -0000 1.4 +++ hidd.init 7 Mar 2006 16:14:55 -0000 1.5 @@ -12,7 +12,7 @@ [ -f /etc/sysconfig/network ] && . /etc/sysconfig/network -[ ${NETWORKING} = "yes" ] || exit 0 +[ "${NETWORKING}" = "yes" ] || exit 0 [ -r /etc/sysconfig/hidd ] || exit 0 Index: pand.init =================================================================== RCS file: /cvs/dist/rpms/bluez-utils/devel/pand.init,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- pand.init 6 Mar 2006 21:29:23 -0000 1.3 +++ pand.init 7 Mar 2006 16:14:55 -0000 1.4 @@ -12,7 +12,7 @@ [ -f /etc/sysconfig/network ] && . /etc/sysconfig/network -[ ${NETWORKING} = "yes" ] || exit 0 +[ "${NETWORKING}" = "yes" ] || exit 0 [ -r /etc/sysconfig/pand ] || exit 0 From fedora-cvs-commits at redhat.com Tue Mar 7 16:54:36 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 7 Mar 2006 11:54:36 -0500 Subject: rpms/anaconda/devel .cvsignore, 1.233, 1.234 anaconda.spec, 1.354, 1.355 sources, 1.353, 1.354 Message-ID: <200603071654.k27Gsa5f001052@cvs.devel.redhat.com> Author: katzj Update of /cvs/dist/rpms/anaconda/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv1012/devel Modified Files: .cvsignore anaconda.spec sources Log Message: auto-import anaconda-11.0.0-1 on branch devel from anaconda-11.0.0-1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/anaconda/devel/.cvsignore,v retrieving revision 1.233 retrieving revision 1.234 diff -u -r1.233 -r1.234 --- .cvsignore 7 Mar 2006 04:45:56 -0000 1.233 +++ .cvsignore 7 Mar 2006 16:54:33 -0000 1.234 @@ -1 +1 @@ -anaconda-10.92.17.tar.bz2 +anaconda-11.0.0.tar.bz2 Index: anaconda.spec =================================================================== RCS file: /cvs/dist/rpms/anaconda/devel/anaconda.spec,v retrieving revision 1.354 retrieving revision 1.355 diff -u -r1.354 -r1.355 --- anaconda.spec 7 Mar 2006 04:45:56 -0000 1.354 +++ anaconda.spec 7 Mar 2006 16:54:33 -0000 1.355 @@ -1,5 +1,5 @@ Name: anaconda -Version: 10.92.17 +Version: 11.0.0 Release: 1 License: GPL Summary: Graphical system installer @@ -79,6 +79,11 @@ /sbin/chkconfig --del reconfig >/dev/null 2>&1 || : %changelog +* Tue Mar 7 2006 Jeremy Katz - 11.0.0-1 +- Really fix the file contexts on the directories (#182252) +- More fixing for Xen kernel naming +- Branched, turn off betanag + * Mon Mar 6 2006 Jeremy Katz - 10.92.17-1 - fix traceback in size check - disable size check on upgrade (clumens, #184112) Index: sources =================================================================== RCS file: /cvs/dist/rpms/anaconda/devel/sources,v retrieving revision 1.353 retrieving revision 1.354 diff -u -r1.353 -r1.354 --- sources 7 Mar 2006 04:45:56 -0000 1.353 +++ sources 7 Mar 2006 16:54:33 -0000 1.354 @@ -1 +1 @@ -2d038454d200cf74f86686ae8273210b anaconda-10.92.17.tar.bz2 +1083fa7da01ae481343eeaa2dec6e518 anaconda-11.0.0.tar.bz2 From fedora-cvs-commits at redhat.com Tue Mar 7 17:04:02 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 7 Mar 2006 12:04:02 -0500 Subject: rpms/gdm/devel gdm-2.13.0.9-change-defaults.patch, NONE, 1.1 gdm.spec, 1.140, 1.141 gdm-2.13.0.8-change-defaults.patch, 1.1, NONE Message-ID: <200603071704.k27H42qN003557@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/gdm/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv3534 Modified Files: gdm.spec Added Files: gdm-2.13.0.9-change-defaults.patch Removed Files: gdm-2.13.0.8-change-defaults.patch Log Message: - Follow Solaris's lead and default to AlwaysRestartServer=True (may work around bug 182957) gdm-2.13.0.9-change-defaults.patch: gdm.conf.in | 47 ++++++++++++++++++++++++++--------------------- 1 files changed, 26 insertions(+), 21 deletions(-) --- NEW FILE gdm-2.13.0.9-change-defaults.patch --- --- gdm-2.13.0.9/config/gdm.conf.in.change-defaults 2006-02-09 15:04:13.000000000 -0500 +++ gdm-2.13.0.9/config/gdm.conf.in 2006-03-07 11:59:14.000000000 -0500 @@ -59,9 +59,9 @@ TimedLoginDelay=30 # should leave this alone. #Chooser=@EXPANDED_LIBEXECDIR@/gdmchooser -# The greeter for local (non-xdmcp) logins. Change gdmlogin to gdmgreeter to -# get the new graphical greeter. -#Greeter=@EXPANDED_LIBEXECDIR@/gdmlogin +# The greeter for local (non-xdmcp) logins. Change gdmgreeter to gdmlogin to +# get the boring greeter. +Greeter=@EXPANDED_LIBEXECDIR@/gdmgreeter # The greeter for xdmcp logins, usually you want a less graphically intensive # greeter here so it's better to leave this with gdmlogin @@ -78,16 +78,14 @@ TimedLoginDelay=30 # Default path to set. The profile scripts will likely override this value. # This value will be overridden with the value from /etc/default/login if it # contains "ROOT=". -#DefaultPath=@GDM_USER_PATH@ +DefaultPath=/usr/local/bin:/usr/bin:/bin:/usr/X11R6/bin # Default path for root. The profile scripts will likely override this value. # This value will be overridden with the value from /etc/default/login if it # contains "SUROOT=". -#RootPath=/sbin:/usr/sbin:@GDM_USER_PATH@ +RootPath=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin:/usr/X11R6/bin -# If you are having trouble with using a single server for a long time and want -# GDM to kill/restart the server, turn this on. On Solaris, this value is -# always true and this configuration setting is ignored. -#AlwaysRestartServer=false +# Whether to restart X server after the user logs out or not. +AlwaysRestartServer=true # User and group used for running GDM GUI applicaitons. By default this is set # to user "gdm" and group "gdm". This user/group should have very limited @@ -118,22 +116,22 @@ DisplayInitDir=@EXPANDED_SYSCONFDIR@/gdm XKeepsCrashing=@EXPANDED_SYSCONFDIR@/gdm/XKeepsCrashing # Reboot, Halt and suspend commands, you can add different commands separated # by a semicolon. GDM will use the first one it can find. -#RebootCommand=@REBOOT_COMMAND@ -#HaltCommand=@HALT_COMMAND@ +RebootCommand=/sbin/reboot;/sbin/shutdown -r now;/usr/sbin/shutdown -r now;/usr/bin/reboot +HaltCommand=/sbin/poweroff;/sbin/shutdown -h now;/usr/sbin/shutdown -h now;/usr/bin/poweroff #SuspendCommand=@SUSPEND_COMMAND@ # Probably should not touch the below this is the standard setup. ServAuthDir=@EXPANDED_AUTHDIR@ # This is our standard startup script. A bit different from a normal X # session, but it shares a lot of stuff with that. See the provided default # for more information. -BaseXsession=@EXPANDED_SYSCONFDIR@/gdm/Xsession +BaseXsession=/etc/X11/xinit/Xsession # This is a directory where .desktop files describing the sessions live. It is # really a PATH style variable since 2.4.4.2 to allow actual interoperability # with KDM. Note that /dm/Sessions is there for backwards # compatibility reasons with 2.4.4.x. #SessionDesktopDir=/etc/X11/sessions/:@EXPANDED_SYSCONFDIR@/dm/Sessions/:@EXPANDED_DATADIR@/gdm/BuiltInSessions/:@EXPANDED_DATADIR@/xsessions/ # This is the default .desktop session. One of the ones in SessionDesktopDir -#DefaultSession=gnome.desktop +DefaultSession=default.desktop # Better leave this blank and HOME will be used. You can use syntax ~/ below # to indicate home directory of the user. You can also set this to something # like /tmp if you don't want the authorizations to be in home directories. @@ -282,7 +280,7 @@ Enable=false #GtkRC=@EXPANDED_DATADIR@/themes/Default/gtk-2.0/gtkrc # The GTK+ theme to use for the GUI. -#GtkTheme=Default +GtkTheme=Clearlooks # If to allow changing the GTK+ (widget) theme from the greeter. Currently # this only affects the standard greeter as the graphical greeter does not yet # have this ability. @@ -303,7 +301,7 @@ Enable=false # themed login (gdmgreeter). # # The standard login has a title bar that the user can move. -#TitleBar=true +TitleBar=false # Don't allow user to move the standard login window. Only makes sense if # TitleBar is on. #LockPosition=false @@ -327,7 +325,7 @@ Browser=false # User ID's less than the MinimalUID value will not be included in the face # browser or in the gdmselection list for Automatic/Timed login. They will not # be displayed regardless of the settings for Include and Exclude. -#MinimalUID=100 +MinimalUID=500 # Users listed in Include will be included in the face browser and in the # gdmsetup selection list for Automatic/Timed login. Users should be separated # by commas. @@ -353,7 +351,7 @@ Browser=false # file, although GDM will be able to read a standard locale.alias file as well. #LocaleFile=@EXPANDED_LOCALEDIR@/locale.alias # Logo shown in the standard greeter. -#Logo=@EXPANDED_PIXMAPDIR@/gdm-foot-logo.png +Logo= # Logo shown on file chooser button in gdmsetup (do not modify this value). #ChooserButtonLogo=@EXPANDED_PIXMAPDIR@/gdm-foot-logo.png # The standard greeter should shake if a user entered the wrong username or @@ -400,8 +398,8 @@ DefaultRemoteWelcome=true # The Standard greeter (gdmlogin) uses BackgroundColor as the background # color, while the themed greeter (gdmgreeter) uses GraphicalThemedColor # as the background color. -BackgroundColor=#76848F -GraphicalThemedColor=#76848F +BackgroundColor=#20305a +GraphicalThemedColor=#000000 # XDMCP session should only get a color, this is the sanest setting since you # don't want to take up too much bandwidth #BackgroundRemoteOnlyColor=true @@ -416,7 +414,7 @@ GraphicalThemedColor=#76848F # Show the Failsafe sessions. These are much MUCH nicer (focus for xterm for # example) and more failsafe then those supplied by scripts so distros should # use this rather then just running an xterm from a script. -#ShowGnomeFailsafeSession=true +ShowGnomeFailsafeSession=false #ShowXtermFailsafeSession=true # Normally there is a session type called 'Last' that is shown which refers to # the last session the user used. If off, we will be in 'switchdesk' mode @@ -436,7 +434,7 @@ GraphicalThemedColor=#76848F # list then provide a list that is delimited by /: to the GraphicalThemes # key and set GraphicalThemeRand to true. Otherwise use GraphicalTheme # and specify just one theme. -#GraphicalTheme=circles +GraphicalTheme=FedoraBubbles #GraphicalThemes=circles/:happygnome GraphicalThemeDir=@EXPANDED_DATADIR@/gdm/themes/ GraphicalThemeRand=false @@ -577,3 +575,10 @@ flexible=false # Run the chooser instead of the greeter. When the user chooses a machine they # will get this same server but run with "-terminate -query hostname". chooser=true + +# Experimental build of Xorg with accelerated indirect rendering +# support +[server-aiglx] +name=Accelerated Indirect Rendering server +command=/usr/bin/Xair @X_CONFIG_OPTIONS@ +flexible=false Index: gdm.spec =================================================================== RCS file: /cvs/dist/rpms/gdm/devel/gdm.spec,v retrieving revision 1.140 retrieving revision 1.141 diff -u -r1.140 -r1.141 --- gdm.spec 7 Mar 2006 02:28:51 -0000 1.140 +++ gdm.spec 7 Mar 2006 17:03:45 -0000 1.141 @@ -15,7 +15,7 @@ Summary: The GNOME Display Manager. Name: gdm Version: 2.13.0.9 -Release: 3 +Release: 4 Epoch: 1 License: LGPL/GPL Group: User Interface/X @@ -25,7 +25,7 @@ Source2: gdm-early-login.init Source3: zzz-bootup-complete.init -Patch1: gdm-2.13.0.8-change-defaults.patch +Patch1: gdm-2.13.0.9-change-defaults.patch Patch2: gdm-2.8.0.2-add-pam-timestamp-module.patch Patch4: gdm-2.8.0.2-session-errors-in-tmp.patch Patch5: gdm-2.13.0.4-update-switchdesk-location.patch @@ -310,6 +310,10 @@ %attr(1770, root, gdm) %dir %{_localstatedir}/gdm %changelog +* Tue Mar 7 2006 Ray Strode - 1:2.13.0.9-4 +- Follow Solaris's lead and default to AlwaysRestartServer=True + (may work around bug 182957) + * Mon Mar 6 2006 Ray Strode - 1:2.13.0.9-3 - migrate users with baseXsession=/etc/X11/gdm/Xsession to /etc/X11/xinit/Xsession --- gdm-2.13.0.8-change-defaults.patch DELETED --- From fedora-cvs-commits at redhat.com Tue Mar 7 17:25:04 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 7 Mar 2006 12:25:04 -0500 Subject: rpms/beagle/devel beagle-0.2.2-textcache-crash.patch, NONE, 1.1 beagle.spec, 1.43, 1.44 Message-ID: <200603071725.k27HP4ab023927@cvs.devel.redhat.com> Author: alexl Update of /cvs/dist/rpms/beagle/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv23787 Modified Files: beagle.spec Added Files: beagle-0.2.2-textcache-crash.patch Log Message: * Tue Mar 7 2006 Alexander Larsson - 0.2.2-2 - Fix beagle-craw-system NullPtrException beagle-0.2.2-textcache-crash.patch: BuildIndex.cs | 3 ++- 1 files changed, 2 insertions(+), 1 deletion(-) --- NEW FILE beagle-0.2.2-textcache-crash.patch --- --- beagle-0.2.2/beagled/BuildIndex.cs.textcache-crash 2006-03-07 18:22:06.000000000 +0100 +++ beagle-0.2.2/beagled/BuildIndex.cs 2006-03-07 18:22:26.000000000 +0100 @@ -265,7 +265,8 @@ driver = new LuceneIndexingDriver (arg_output, false); driver.TextCache = (arg_cache_text) ? new TextCache (arg_output) : null; - driver.TextCache.WorldReadable = true; + if (driver.TextCache != null) + driver.TextCache.WorldReadable = true; backing_fa_store = new FileAttributesStore_Sqlite (driver.TopDirectory, driver.Fingerprint); fa_store = new FileAttributesStore (backing_fa_store); Index: beagle.spec =================================================================== RCS file: /cvs/dist/rpms/beagle/devel/beagle.spec,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- beagle.spec 7 Mar 2006 15:48:12 -0000 1.43 +++ beagle.spec 7 Mar 2006 17:25:01 -0000 1.44 @@ -1,6 +1,6 @@ Name: beagle Version: 0.2.2 -Release: 1 +Release: 2 Summary: The Beagle Search Infrastructure Group: User Interface/Desktops @@ -25,6 +25,7 @@ Requires: sqlite >= 3.3.1 Requires: zip unzip sed grep mono-core poppler-utils Patch0: beagle-0.2.2-security-fix.patch +Patch1: beagle-0.2.2-textcache-crash.patch Patch2: beagle-0.2.1-crawl.patch Patch3: beagle-0.2.1-spew.patch Patch4: beagle-0.2.2-crawl-system-cron.patch @@ -62,6 +63,7 @@ %prep %setup -q %patch0 -p1 -b .security-fix +%patch1 -p1 -b .textcache-crash %patch2 -p1 -b .crawl %patch3 -p1 -b .spew %patch4 -p1 -b .crawl-system-cron @@ -211,6 +213,9 @@ %{_prefix}/lib/python*/site-packages/beagle.so %changelog +* Tue Mar 7 2006 Alexander Larsson - 0.2.2-2 +- Fix beagle-craw-system NullPtrException + * Tue Mar 7 2006 Alexander Larsson - 0.2.2-1 - update to 0.2.2 From fedora-cvs-commits at redhat.com Tue Mar 7 17:32:58 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 7 Mar 2006 12:32:58 -0500 Subject: rpms/kernel/devel patch-2.6.16-rc5-git9.bz2.sign, NONE, 1.1 .cvsignore, 1.372, 1.373 kernel-2.6.spec, 1.2027, 1.2028 sources, 1.313, 1.314 upstream, 1.287, 1.288 linux-2.6-cond-resched-booting-fix.patch, 1.1, NONE patch-2.6.16-rc5-git8.bz2.sign, 1.1, NONE Message-ID: <200603071732.k27HWwRZ006679@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv774 Modified Files: .cvsignore kernel-2.6.spec sources upstream Added Files: patch-2.6.16-rc5-git9.bz2.sign Removed Files: linux-2.6-cond-resched-booting-fix.patch patch-2.6.16-rc5-git8.bz2.sign Log Message: git9 - slab fixes, timer fixes yada yada --- NEW FILE patch-2.6.16-rc5-git9.bz2.sign --- -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.2.1 (GNU/Linux) Comment: See http://www.kernel.org/signature.html for info iD8DBQBEDS/ryGugalF9Dw4RApkdAJ0Xl9aBHPG/vIFhvPPOf/NBMXdVFwCgirK0 1xiWiRi8i/91ugzCPm5sC9Q= =wtS2 -----END PGP SIGNATURE----- Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v retrieving revision 1.372 retrieving revision 1.373 diff -u -r1.372 -r1.373 --- .cvsignore 6 Mar 2006 16:31:46 -0000 1.372 +++ .cvsignore 7 Mar 2006 17:32:28 -0000 1.373 @@ -4,4 +4,4 @@ linux-2.6.15.tar.bz2 patch-2.6.16-rc5.bz2 xen-20060301.tar.bz2 -patch-2.6.16-rc5-git8.bz2 +patch-2.6.16-rc5-git9.bz2 Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.2027 retrieving revision 1.2028 diff -u -r1.2027 -r1.2028 --- kernel-2.6.spec 7 Mar 2006 15:37:04 -0000 1.2027 +++ kernel-2.6.spec 7 Mar 2006 17:32:29 -0000 1.2028 @@ -218,7 +218,7 @@ # Patches 0 through 100 are meant for core subsystem upgrades # Patch1: patch-2.6.16-rc5.bz2 -Patch2: patch-2.6.16-rc5-git8.bz2 +Patch2: patch-2.6.16-rc5-git9.bz2 # Patches 100 through 500 are meant for architecture patches Patch100: linux-2.6-bzimage.patch @@ -373,7 +373,6 @@ Patch1730: linux-2.6-signal-trampolines-unwind-info.patch Patch1740: linux-2.6-softlockup-disable.patch Patch1750: linux-2.6-drm-cripple-r300.patch -Patch1760: linux-2.6-cond-resched-booting-fix.patch # SELinux/audit patches. Patch1800: linux-2.6-selinux-hush.patch @@ -1003,8 +1002,6 @@ %patch1740 -p1 # Disable R300 and above DRI as it's unstable. %patch1750 -p1 -# Don't do voluntary preempt until after bootup -%patch1760 -p1 # Silence some selinux messages. %patch1800 -p1 @@ -1658,6 +1655,7 @@ - Include xen header files in -devel packages if we're building xen. * Tue Mar 7 2006 Dave Jones +- 2.6.16rc5-git9 - Fix NMI watchdog on i386. * Mon Mar 6 2006 Dave Jones Index: sources =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/sources,v retrieving revision 1.313 retrieving revision 1.314 diff -u -r1.313 -r1.314 --- sources 6 Mar 2006 16:32:22 -0000 1.313 +++ sources 7 Mar 2006 17:32:44 -0000 1.314 @@ -1,4 +1,4 @@ cdf95e00f5111e31f78e1d97304d9522 linux-2.6.15.tar.bz2 1740ae34807f687a93adf2469ea5c4fc patch-2.6.16-rc5.bz2 cdfde609af8adcf58d7ff626599b2d90 xen-20060301.tar.bz2 -ac2274a7e960b780325805e050ad5cee patch-2.6.16-rc5-git8.bz2 +808b0ab8d324a2bdd96ecb32617104fd patch-2.6.16-rc5-git9.bz2 Index: upstream =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/upstream,v retrieving revision 1.287 retrieving revision 1.288 diff -u -r1.287 -r1.288 --- upstream 5 Mar 2006 08:52:50 -0000 1.287 +++ upstream 7 Mar 2006 17:32:44 -0000 1.288 @@ -1,3 +1,3 @@ linux-2.6.15.tar.bz2 patch-2.6.16-rc5.bz2 -patch-2.6.16-rc5-git8.bz2 +patch-2.6.16-rc5-git9.bz2 --- linux-2.6-cond-resched-booting-fix.patch DELETED --- --- patch-2.6.16-rc5-git8.bz2.sign DELETED --- From fedora-cvs-commits at redhat.com Tue Mar 7 17:40:27 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 7 Mar 2006 12:40:27 -0500 Subject: rpms/tog-pegasus/devel tog-pegasus.spec,1.19,1.20 Message-ID: <200603071740.k27HeRWx020194@cvs.devel.redhat.com> Author: notting Update of /cvs/dist/rpms/tog-pegasus/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv20174 Modified Files: tog-pegasus.spec Log Message: wrong wrong wrong. use an assigned uid (66) and gid (65). (gid 66 is wine) (#175434) Index: tog-pegasus.spec =================================================================== RCS file: /cvs/dist/rpms/tog-pegasus/devel/tog-pegasus.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- tog-pegasus.spec 11 Feb 2006 05:52:41 -0000 1.19 +++ tog-pegasus.spec 7 Mar 2006 17:40:13 -0000 1.20 @@ -15,7 +15,7 @@ Summary: OpenPegasus WBEM Services for Linux Name: tog-pegasus Version: 2.5 -Release: 6.1 +Release: 7 Epoch: 2 Group: Systems Management/Base License: Open Group Pegasus Open Source @@ -204,24 +204,9 @@ elif [ $1 -eq 1 ]; then # first install: create the 'pegasus' user and group: # By default, ONLY the "pegasus" user will be allowed to connect to cimserver over network - if ! /usr/bin/id pegasus >/dev/null 2>&1; then - for((uid=466; uid<500; uid++)) - do - if /usr/sbin/groupadd pegasus -g $uid >/dev/null 2>&1 && - /usr/sbin/useradd -u $uid -c "tog-pegasus OpenPegasus WBEM/CIM services" -g pegasus -s /sbin/nologin -r -d /var/lib/Pegasus pegasus >/dev/null 2>&1; then - break; - else - if egrep -q '^pegasus:.*:'$uid':' /etc/group; then - groupdel pegasus >/dev/null 2>&1; - fi; - if [ $uid -eq 499 ]; then - uid=100; - elif [ $uid -eq 465 ]; then - break; - fi; - fi; - done; - fi; + /usr/sbin/groupadd pegasus -g 65 >/dev/null 2>&1 || :; + /usr/sbin/useradd -u 66 -c "tog-pegasus OpenPegasus WBEM/CIM services" -g pegasus \ + -s /sbin/nologin -r -d /var/lib/Pegasus pegasus >/dev/null 2>&1 || :; fi %post @@ -254,6 +239,9 @@ #rm -rf ${RPM_BUILD_DIR}/%{srcname}-%{version}; %changelog +* Tue Mar 7 2006 Bill Nottingham - 2:2.5-7 +- use an assigned uid/gid, do not loop over user ids looking for a free one + * Fri Feb 10 2006 Jesse Keating - 2:2.5-6.1 - bump again for double-long bug on ppc(64) From fedora-cvs-commits at redhat.com Tue Mar 7 18:01:56 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 7 Mar 2006 13:01:56 -0500 Subject: rpms/tog-pegasus/devel tog-pegasus.spec,1.20,1.21 Message-ID: <200603071801.k27I1tc1011010@cvs.devel.redhat.com> Author: jvdias Update of /cvs/dist/rpms/tog-pegasus/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv10976 Modified Files: tog-pegasus.spec Log Message: further fix for bug 175434 Index: tog-pegasus.spec =================================================================== RCS file: /cvs/dist/rpms/tog-pegasus/devel/tog-pegasus.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- tog-pegasus.spec 7 Mar 2006 17:40:13 -0000 1.20 +++ tog-pegasus.spec 7 Mar 2006 18:01:50 -0000 1.21 @@ -15,7 +15,7 @@ Summary: OpenPegasus WBEM Services for Linux Name: tog-pegasus Version: 2.5 -Release: 7 +Release: 8 Epoch: 2 Group: Systems Management/Base License: Open Group Pegasus Open Source @@ -204,9 +204,19 @@ elif [ $1 -eq 1 ]; then # first install: create the 'pegasus' user and group: # By default, ONLY the "pegasus" user will be allowed to connect to cimserver over network - /usr/sbin/groupadd pegasus -g 65 >/dev/null 2>&1 || :; - /usr/sbin/useradd -u 66 -c "tog-pegasus OpenPegasus WBEM/CIM services" -g pegasus \ - -s /sbin/nologin -r -d /var/lib/Pegasus pegasus >/dev/null 2>&1 || :; + # create pegasus group IFF it does not already exist + # - use any free ID between 1 and 499 if group 65 exists: + /usr/sbin/groupadd -g 65 -f -r pegasus >/dev/null 2>&1 || :; + if ! /usr/bin/id -u pegasus > /dev/null 2>&1; then + if ! /bin/egrep -q '^[^:]+:[^:]+:66:' /etc/passwd >/dev/null 2>&1 ; then + /usr/sbin/useradd -u 66 -r -n -M -g pegasus -s /sbin/nologin -r -d /var/lib/Pegasus \ + -c "tog-pegasus OpenPegasus WBEM/CIM services" pegasus >/dev/null 2>&1 || :; + else + # use any free ID between 1 and 499: + /usr/sbin/useradd -r -n -M -g pegasus -s /sbin/nologin -r -d /var/lib/Pegasus \ + -c "tog-pegasus OpenPegasus WBEM/CIM services" pegasus >/dev/null 2>&1 || :; + fi; + fi; fi %post @@ -239,6 +249,10 @@ #rm -rf ${RPM_BUILD_DIR}/%{srcname}-%{version}; %changelog +* Tue Mar 07 2006 Jason Vas Dias - 2.2.5-8 +- fix creation of userid / gid - the previous fix can fail if + gid 65 or uid 66 exists already. + * Tue Mar 7 2006 Bill Nottingham - 2:2.5-7 - use an assigned uid/gid, do not loop over user ids looking for a free one From fedora-cvs-commits at redhat.com Tue Mar 7 18:03:13 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 7 Mar 2006 13:03:13 -0500 Subject: rpms/tog-pegasus/devel tog-pegasus.spec,1.21,1.22 Message-ID: <200603071803.k27I3DIU011096@cvs.devel.redhat.com> Author: jvdias Update of /cvs/dist/rpms/tog-pegasus/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv11081 Modified Files: tog-pegasus.spec Log Message: further fix for bug 175434 Index: tog-pegasus.spec =================================================================== RCS file: /cvs/dist/rpms/tog-pegasus/devel/tog-pegasus.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- tog-pegasus.spec 7 Mar 2006 18:01:50 -0000 1.21 +++ tog-pegasus.spec 7 Mar 2006 18:03:10 -0000 1.22 @@ -209,11 +209,11 @@ /usr/sbin/groupadd -g 65 -f -r pegasus >/dev/null 2>&1 || :; if ! /usr/bin/id -u pegasus > /dev/null 2>&1; then if ! /bin/egrep -q '^[^:]+:[^:]+:66:' /etc/passwd >/dev/null 2>&1 ; then - /usr/sbin/useradd -u 66 -r -n -M -g pegasus -s /sbin/nologin -r -d /var/lib/Pegasus \ + /usr/sbin/useradd -u 66 -r -n -M -g pegasus -s /sbin/nologin -d /var/lib/Pegasus \ -c "tog-pegasus OpenPegasus WBEM/CIM services" pegasus >/dev/null 2>&1 || :; else # use any free ID between 1 and 499: - /usr/sbin/useradd -r -n -M -g pegasus -s /sbin/nologin -r -d /var/lib/Pegasus \ + /usr/sbin/useradd -r -n -M -g pegasus -s /sbin/nologin -d /var/lib/Pegasus \ -c "tog-pegasus OpenPegasus WBEM/CIM services" pegasus >/dev/null 2>&1 || :; fi; fi; From fedora-cvs-commits at redhat.com Tue Mar 7 18:04:59 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 7 Mar 2006 13:04:59 -0500 Subject: rpms/eclipse/devel eclipse-tomcat55.patch, 1.2, 1.3 eclipse.spec, 1.262, 1.263 Message-ID: <200603071804.k27I4xIH011260@cvs.devel.redhat.com> Author: overholt Update of /cvs/dist/rpms/eclipse/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv11170 Modified Files: eclipse-tomcat55.patch eclipse.spec Log Message: * Tue Mar 07 2006 Andrew Overholt 3.1.2-1jpp_13fc - One more small help fix (include tomcatwrapper.jar o.e.tomcat manifest). eclipse-tomcat55.patch: .classpath | 51 - META-INF/MANIFEST.MF | 34 about.html | 45 - src/org/eclipse/tomcat/internal/EclipseErrorReportValve.java | 62 - src/org/eclipse/tomcat/internal/TomcatAppServer.java | 449 ++++++----- src/org/eclipse/tomcat/internal/TomcatPlugin.java | 6 6 files changed, 374 insertions(+), 273 deletions(-) Index: eclipse-tomcat55.patch =================================================================== RCS file: /cvs/dist/rpms/eclipse/devel/eclipse-tomcat55.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- eclipse-tomcat55.patch 6 Mar 2006 21:17:35 -0000 1.2 +++ eclipse-tomcat55.patch 7 Mar 2006 18:04:46 -0000 1.3 @@ -4,7 +4,7 @@ retrieving revision 1.20 diff -u -r1.20 .classpath --- .classpath 21 Apr 2005 23:31:58 -0000 1.20 -+++ .classpath 6 Mar 2006 21:10:23 -0000 ++++ .classpath 7 Mar 2006 17:31:59 -0000 @@ -1,29 +1,36 @@ @@ -70,7 +70,7 @@ retrieving revision 1.24 diff -u -r1.24 about.html --- about.html 21 Jun 2005 00:52:06 -0000 1.24 -+++ about.html 6 Mar 2006 21:10:23 -0000 ++++ about.html 7 Mar 2006 17:31:59 -0000 @@ -8,7 +8,7 @@

About This Content

@@ -167,15 +167,15 @@ retrieving revision 1.14 diff -u -r1.14 MANIFEST.MF --- META-INF/MANIFEST.MF 19 May 2005 04:05:11 -0000 1.14 -+++ META-INF/MANIFEST.MF 6 Mar 2006 21:10:40 -0000 -@@ -2,30 +2,34 @@ ++++ META-INF/MANIFEST.MF 7 Mar 2006 17:32:16 -0000 +@@ -2,30 +2,35 @@ Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.tomcat; singleton:=true -Bundle-Version: 4.1.30.1 --Bundle-ClassPath: tomcatwrapper.jar, +Bundle-Version: 5.5.15 -+Bundle-ClassPath: catalina-optional.jar, + Bundle-ClassPath: tomcatwrapper.jar, ++ catalina-optional.jar, catalina.jar, - bootstrap.jar, commons-beanutils.jar, @@ -213,7 +213,7 @@ Bundle-Activator: org.eclipse.tomcat.internal.TomcatPlugin Bundle-Vendor: %providerName Bundle-Localization: plugin -@@ -54,8 +58,7 @@ +@@ -54,8 +59,7 @@ mx4j.util;x-internal:=true, org.apache.catalina;x-internal:=true, org.apache.catalina.connector;x-internal:=true, @@ -223,7 +223,7 @@ org.apache.catalina.realm;x-internal:=true, org.apache.catalina.servlets;x-internal:=true, org.apache.commons.beanutils;x-internal:=true, -@@ -69,7 +72,6 @@ +@@ -69,7 +73,6 @@ org.apache.commons.digester.rss;x-internal:=true, org.apache.commons.digester.xmlrules;x-internal:=true, org.apache.commons.logging;x-internal:=true, @@ -231,7 +231,7 @@ org.apache.commons.modeler;x-internal:=true, org.apache.commons.modeler.ant;x-internal:=true, org.apache.commons.modeler.mbeans;x-internal:=true, -@@ -79,13 +81,11 @@ +@@ -79,13 +82,11 @@ org.apache.coyote.http11;x-internal:=true, org.apache.coyote.http11.filters;x-internal:=true, org.apache.coyote.memory;x-internal:=true, @@ -246,7 +246,7 @@ org.apache.jasper.xmlparser;x-internal:=true, org.apache.naming;x-internal:=true, org.apache.naming.factory;x-internal:=true, -@@ -95,12 +95,9 @@ +@@ -95,12 +96,9 @@ org.apache.tomcat.util;x-internal:=true, org.apache.tomcat.util.buf;x-internal:=true, org.apache.tomcat.util.collections;x-internal:=true, @@ -265,7 +265,7 @@ retrieving revision 1.8 diff -u -r1.8 EclipseErrorReportValve.java --- src/org/eclipse/tomcat/internal/EclipseErrorReportValve.java 23 May 2005 03:58:04 -0000 1.8 -+++ src/org/eclipse/tomcat/internal/EclipseErrorReportValve.java 6 Mar 2006 21:10:40 -0000 ++++ src/org/eclipse/tomcat/internal/EclipseErrorReportValve.java 7 Mar 2006 17:32:16 -0000 @@ -69,15 +69,27 @@ package org.eclipse.tomcat.internal; @@ -385,7 +385,7 @@ retrieving revision 1.43 diff -u -r1.43 TomcatAppServer.java --- src/org/eclipse/tomcat/internal/TomcatAppServer.java 22 Jun 2005 15:29:56 -0000 1.43 -+++ src/org/eclipse/tomcat/internal/TomcatAppServer.java 6 Mar 2006 21:10:40 -0000 ++++ src/org/eclipse/tomcat/internal/TomcatAppServer.java 7 Mar 2006 17:32:17 -0000 @@ -11,27 +11,29 @@ package org.eclipse.tomcat.internal; @@ -953,7 +953,7 @@ retrieving revision 1.24 diff -u -r1.24 TomcatPlugin.java --- src/org/eclipse/tomcat/internal/TomcatPlugin.java 23 May 2005 03:58:20 -0000 1.24 -+++ src/org/eclipse/tomcat/internal/TomcatPlugin.java 6 Mar 2006 21:10:40 -0000 ++++ src/org/eclipse/tomcat/internal/TomcatPlugin.java 7 Mar 2006 17:32:17 -0000 @@ -24,13 +24,16 @@ public final static String PREF_ACCEPT_COUNT = "acceptCount"; //$NON-NLS-1$ public final static String PREF_MAX_PROCESSORS = "maxProcessors"; //$NON-NLS-1$ Index: eclipse.spec =================================================================== RCS file: /cvs/dist/rpms/eclipse/devel/eclipse.spec,v retrieving revision 1.262 retrieving revision 1.263 diff -u -r1.262 -r1.263 --- eclipse.spec 7 Mar 2006 13:43:44 -0000 1.262 +++ eclipse.spec 7 Mar 2006 18:04:46 -0000 1.263 @@ -27,7 +27,7 @@ Summary: %{pkg_summary} Name: eclipse Version: %{eclipse_majmin}.%{eclipse_micro} -Release: 1jpp_12fc +Release: 1jpp_13fc License: EPL Group: Text Editors/Integrated Development Environments (IDE) URL: http://www.eclipse.org/ @@ -1305,6 +1305,9 @@ %{_datadir}/%{name}/plugins/org.eclipse.platform.source.linux.gtk.*_%{version} %changelog +* Tue Mar 07 2006 Andrew Overholt 3.1.2-1jpp_13fc +- One more small help fix (include tomcatwrapper.jar o.e.tomcat manifest). + * Fri Mar 03 2006 Andrew Overholt 3.1.2-1jpp_12fc - Only build with a native ecj on x86{,_64} From fedora-cvs-commits at redhat.com Tue Mar 7 18:21:20 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 7 Mar 2006 13:21:20 -0500 Subject: rpms/kernel/devel linux-2.6-xen-disable_vm86.patch, NONE, 1.1 kernel-2.6.spec, 1.2028, 1.2029 Message-ID: <200603071821.k27ILK3i029958@cvs.devel.redhat.com> Author: sct Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv29495 Modified Files: kernel-2.6.spec Added Files: linux-2.6-xen-disable_vm86.patch Log Message: Disable CONFIG_VM86 for Xen builds (from quintela). It doesn't work as it relies on TSS, which Xen does not support; and we're better off returning ENOSYS than SEGVing in sys_vm86*(). linux-2.6-xen-disable_vm86.patch: Kconfig | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE linux-2.6-xen-disable_vm86.patch --- diff -uNp linux-2.6.15.noarch/init/Kconfig.orig linux-2.6.15.noarch/init/Kconfig --- linux-2.6.15.noarch/init/Kconfig.orig 2006-03-07 17:13:19.000000000 +0100 +++ linux-2.6.15.noarch/init/Kconfig 2006-03-07 17:13:34.000000000 +0100 @@ -224,7 +224,7 @@ config UID16 This enables the legacy 16-bit UID syscall wrappers. config VM86 - depends X86 + depends X86 && !XEN default y bool "Enable VM86 support" if EMBEDDED help Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.2028 retrieving revision 1.2029 diff -u -r1.2028 -r1.2029 --- kernel-2.6.spec 7 Mar 2006 17:32:29 -0000 1.2028 +++ kernel-2.6.spec 7 Mar 2006 18:21:17 -0000 1.2029 @@ -264,6 +264,7 @@ Patch706: linux-2.6-xen_remap_vma_flags.patch Patch709: linux-2.6-percpu-NR_CPUS-hotplug-fix.patch Patch710: linux-2.6-xen-kva-mmap.patch +Patch711: linux-2.6-xen-disable_vm86.patch # # Patches 800 through 899 are reserved for bugfixes to the core system @@ -818,6 +819,7 @@ %patch706 -p1 %patch709 -p1 %patch710 -p2 +%patch711 -p1 %endif @@ -1653,6 +1655,8 @@ %changelog * Tue Mar 7 2006 Stephen Tweedie - Include xen header files in -devel packages if we're building xen. + (bug 180198) +- Disable CONFIG_VM86 for Xen builds (from quintela) * Tue Mar 7 2006 Dave Jones - 2.6.16rc5-git9 From fedora-cvs-commits at redhat.com Tue Mar 7 18:50:14 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 7 Mar 2006 13:50:14 -0500 Subject: rpms/kexec-tools/devel kdump.init, 1.6, 1.7 kexec-tools.spec, 1.15, 1.16 Message-ID: <200603071850.k27IoEOW020412@cvs.devel.redhat.com> Author: tgraf Update of /cvs/dist/rpms/kexec-tools/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv19951 Modified Files: kdump.init kexec-tools.spec Log Message: - Fix kdump.init to call kexec from its new location Index: kdump.init =================================================================== RCS file: /cvs/dist/rpms/kexec-tools/devel/kdump.init,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- kdump.init 2 Mar 2006 09:18:31 -0000 1.6 +++ kdump.init 7 Mar 2006 18:50:02 -0000 1.7 @@ -17,7 +17,7 @@ # Source function library. . /etc/init.d/functions -KEXEC=/usr/sbin/kexec +KEXEC=/sbin/kexec # Will be different for ia64, for example. For now, that architecture isn't # supported. Code needs to be added here when we do. Index: kexec-tools.spec =================================================================== RCS file: /cvs/dist/rpms/kexec-tools/devel/kexec-tools.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- kexec-tools.spec 6 Mar 2006 21:40:51 -0000 1.15 +++ kexec-tools.spec 7 Mar 2006 18:50:02 -0000 1.16 @@ -1,6 +1,6 @@ Name: kexec-tools Version: 1.101 -Release: 13 +Release: 14 License: GPL Group: Applications/System Summary: The kexec/kdump userspace component. @@ -96,6 +96,9 @@ %doc TODO %changelog +* Tue Mar 07 2006 Thomas Graf - 1.101-14 +- Fix kdump.init to call kexec from its new location + * Mon Mar 6 2006 Jeremy Katz - 1.101-13 - proper requires for scriptlets From fedora-cvs-commits at redhat.com Tue Mar 7 18:56:51 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 7 Mar 2006 13:56:51 -0500 Subject: rpms/tog-pegasus/devel tog-pegasus.spec,1.22,1.23 Message-ID: <200603071856.k27IupD3023069@cvs.devel.redhat.com> Author: notting Update of /cvs/dist/rpms/tog-pegasus/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv22998 Modified Files: tog-pegasus.spec Log Message: fix. again. Index: tog-pegasus.spec =================================================================== RCS file: /cvs/dist/rpms/tog-pegasus/devel/tog-pegasus.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- tog-pegasus.spec 7 Mar 2006 18:03:10 -0000 1.22 +++ tog-pegasus.spec 7 Mar 2006 18:56:49 -0000 1.23 @@ -15,7 +15,7 @@ Summary: OpenPegasus WBEM Services for Linux Name: tog-pegasus Version: 2.5 -Release: 8 +Release: 9 Epoch: 2 Group: Systems Management/Base License: Open Group Pegasus Open Source @@ -204,19 +204,9 @@ elif [ $1 -eq 1 ]; then # first install: create the 'pegasus' user and group: # By default, ONLY the "pegasus" user will be allowed to connect to cimserver over network - # create pegasus group IFF it does not already exist - # - use any free ID between 1 and 499 if group 65 exists: /usr/sbin/groupadd -g 65 -f -r pegasus >/dev/null 2>&1 || :; - if ! /usr/bin/id -u pegasus > /dev/null 2>&1; then - if ! /bin/egrep -q '^[^:]+:[^:]+:66:' /etc/passwd >/dev/null 2>&1 ; then - /usr/sbin/useradd -u 66 -r -n -M -g pegasus -s /sbin/nologin -d /var/lib/Pegasus \ + /usr/sbin/useradd -u 66 -r -n -M -g pegasus -s /sbin/nologin -d /var/lib/Pegasus \ -c "tog-pegasus OpenPegasus WBEM/CIM services" pegasus >/dev/null 2>&1 || :; - else - # use any free ID between 1 and 499: - /usr/sbin/useradd -r -n -M -g pegasus -s /sbin/nologin -d /var/lib/Pegasus \ - -c "tog-pegasus OpenPegasus WBEM/CIM services" pegasus >/dev/null 2>&1 || :; - fi; - fi; fi %post From fedora-cvs-commits at redhat.com Tue Mar 7 19:02:23 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 7 Mar 2006 14:02:23 -0500 Subject: rpms/tog-pegasus/devel tog-pegasus.spec,1.23,1.24 Message-ID: <200603071902.k27J2Nvx024552@cvs.devel.redhat.com> Author: notting Update of /cvs/dist/rpms/tog-pegasus/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv24494 Modified Files: tog-pegasus.spec Log Message: fix changelog too Index: tog-pegasus.spec =================================================================== RCS file: /cvs/dist/rpms/tog-pegasus/devel/tog-pegasus.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- tog-pegasus.spec 7 Mar 2006 18:56:49 -0000 1.23 +++ tog-pegasus.spec 7 Mar 2006 19:02:19 -0000 1.24 @@ -239,11 +239,7 @@ #rm -rf ${RPM_BUILD_DIR}/%{srcname}-%{version}; %changelog -* Tue Mar 07 2006 Jason Vas Dias - 2.2.5-8 -- fix creation of userid / gid - the previous fix can fail if - gid 65 or uid 66 exists already. - -* Tue Mar 7 2006 Bill Nottingham - 2:2.5-7 +* Tue Mar 7 2006 Bill Nottingham - 2:2.5-9 - use an assigned uid/gid, do not loop over user ids looking for a free one * Fri Feb 10 2006 Jesse Keating - 2:2.5-6.1 From fedora-cvs-commits at redhat.com Tue Mar 7 19:24:45 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 7 Mar 2006 14:24:45 -0500 Subject: rpms/kudzu/devel .cvsignore, 1.112, 1.113 kudzu.spec, 1.127, 1.128 sources, 1.126, 1.127 Message-ID: <200603071924.k27JOjWM012631@cvs.devel.redhat.com> Author: notting Update of /cvs/dist/rpms/kudzu/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv12591 Modified Files: .cvsignore kudzu.spec sources Log Message: update Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/kudzu/devel/.cvsignore,v retrieving revision 1.112 retrieving revision 1.113 diff -u -r1.112 -r1.113 --- .cvsignore 6 Mar 2006 18:35:11 -0000 1.112 +++ .cvsignore 7 Mar 2006 19:24:42 -0000 1.113 @@ -1 +1 @@ -kudzu-1.2.34.tar.gz +kudzu-1.2.34.1.tar.gz Index: kudzu.spec =================================================================== RCS file: /cvs/dist/rpms/kudzu/devel/kudzu.spec,v retrieving revision 1.127 retrieving revision 1.128 diff -u -r1.127 -r1.128 --- kudzu.spec 6 Mar 2006 18:35:11 -0000 1.127 +++ kudzu.spec 7 Mar 2006 19:24:42 -0000 1.128 @@ -1,5 +1,5 @@ Name: kudzu -Version: 1.2.34 +Version: 1.2.34.1 Release: 1 License: GPL Summary: The Red Hat Linux hardware probing tool. @@ -79,6 +79,10 @@ %{_includedir}/kudzu %changelog +* Tue Mar 7 2006 Bill Nottingham - 1.2.35-1 +- switch at runtime between vm86 and x86emu on i386. Fixes vbe/ddc on + Xen and i386-on-x86_64 + * Mon Mar 6 2006 Bill Nottingham - 1.2.34-1 - silence some error messages Index: sources =================================================================== RCS file: /cvs/dist/rpms/kudzu/devel/sources,v retrieving revision 1.126 retrieving revision 1.127 diff -u -r1.126 -r1.127 --- sources 6 Mar 2006 18:35:11 -0000 1.126 +++ sources 7 Mar 2006 19:24:42 -0000 1.127 @@ -1 +1 @@ -a8700feb257e963cef52aefdefeb8b7d kudzu-1.2.34.tar.gz +55b28d6e9232def0059a615964abf33e kudzu-1.2.34.1.tar.gz From fedora-cvs-commits at redhat.com Tue Mar 7 19:37:19 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 7 Mar 2006 14:37:19 -0500 Subject: rpms/kernel/devel/configs config-xen-xen0,1.4,1.5 Message-ID: <200603071937.k27JbJQC008916@cvs.devel.redhat.com> Author: sct Update of /cvs/dist/rpms/kernel/devel/configs In directory cvs.devel.redhat.com:/tmp/cvs-serv8897/configs Modified Files: config-xen-xen0 Log Message: Disable CONFIG_B44 for Xen builds for now: it results in "b44.ko needs unknown symbol dma_get_cache_alignment" errors. Index: config-xen-xen0 =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/configs/config-xen-xen0,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- config-xen-xen0 13 Feb 2006 21:17:48 -0000 1.4 +++ config-xen-xen0 7 Mar 2006 19:37:17 -0000 1.5 @@ -34,6 +34,8 @@ # CONFIG_3C515 is not set # CONFIG_NI65 is not set # CONFIG_ELPLUS is not set +# B44 results in "b44.ko needs unknown symbol dma_get_cache_alignment" +# CONFIG_B44 is not set # # SCSI low-level drivers From fedora-cvs-commits at redhat.com Tue Mar 7 19:37:19 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 7 Mar 2006 14:37:19 -0500 Subject: rpms/kernel/devel kernel-2.6.spec,1.2029,1.2030 Message-ID: <200603071937.k27JbJFo008924@cvs.devel.redhat.com> Author: sct Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv8897 Modified Files: kernel-2.6.spec Log Message: Disable CONFIG_B44 for Xen builds for now: it results in "b44.ko needs unknown symbol dma_get_cache_alignment" errors. Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.2029 retrieving revision 1.2030 diff -u -r1.2029 -r1.2030 --- kernel-2.6.spec 7 Mar 2006 18:21:17 -0000 1.2029 +++ kernel-2.6.spec 7 Mar 2006 19:37:17 -0000 1.2030 @@ -1657,6 +1657,8 @@ - Include xen header files in -devel packages if we're building xen. (bug 180198) - Disable CONFIG_VM86 for Xen builds (from quintela) +- Disable CONFIG_B44 for Xen builds for now: it results in + "b44.ko needs unknown symbol dma_get_cache_alignment" errors. * Tue Mar 7 2006 Dave Jones - 2.6.16rc5-git9 From fedora-cvs-commits at redhat.com Tue Mar 7 19:38:28 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 7 Mar 2006 14:38:28 -0500 Subject: rpms/kernel/devel Makefile.config,1.35,1.36 Message-ID: <200603071938.k27JcSlo008977@cvs.devel.redhat.com> Author: sct Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv8943 Modified Files: Makefile.config Log Message: Make the PAE xen0/xenU configs inherit from the non-PAE ones so that we can keep configs in sync sanely. Tested to result in the same end result config files. Index: Makefile.config =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/Makefile.config,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- Makefile.config 6 Mar 2006 16:56:38 -0000 1.35 +++ Makefile.config 7 Mar 2006 19:38:26 -0000 1.36 @@ -123,13 +123,13 @@ kernel-$(VERSION)-i686-xen0.config: configs/config-xen-xen0 temp-x86-xen-generic perl scripts/merge.pl $^ i386 > $@ -kernel-$(VERSION)-i686-xen0-PAE.config: configs/config-xen-xen0-PAE temp-x86-xen-generic +kernel-$(VERSION)-i686-xen0-PAE.config: configs/config-xen-xen0-PAE kernel-$(VERSION)-i686-xen0.config perl scripts/merge.pl $^ i386 > $@ kernel-$(VERSION)-i686-xenU.config: configs/config-xen-xenU temp-x86-xen-generic perl scripts/merge.pl $^ i386 > $@ -kernel-$(VERSION)-i686-xenU-PAE.config: configs/config-xen-xenU-PAE temp-x86-xen-generic +kernel-$(VERSION)-i686-xenU-PAE.config: configs/config-xen-xenU-PAE kernel-$(VERSION)-i686-xenU.config perl scripts/merge.pl $^ i386 > $@ kernel-$(VERSION)-x86_64-xen0.config: configs/config-xen-xen0 temp-x86_64-xen-generic From fedora-cvs-commits at redhat.com Tue Mar 7 19:38:29 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 7 Mar 2006 14:38:29 -0500 Subject: rpms/kernel/devel/configs config-xen-xen0-PAE, 1.1, 1.2 config-xen-xenU-PAE, 1.2, 1.3 Message-ID: <200603071938.k27JcTCu008988@cvs.devel.redhat.com> Author: sct Update of /cvs/dist/rpms/kernel/devel/configs In directory cvs.devel.redhat.com:/tmp/cvs-serv8943/configs Modified Files: config-xen-xen0-PAE config-xen-xenU-PAE Log Message: Make the PAE xen0/xenU configs inherit from the non-PAE ones so that we can keep configs in sync sanely. Tested to result in the same end result config files. Index: config-xen-xen0-PAE =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/configs/config-xen-xen0-PAE,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- config-xen-xen0-PAE 10 Feb 2006 04:58:57 -0000 1.1 +++ config-xen-xen0-PAE 7 Mar 2006 19:38:26 -0000 1.2 @@ -1,78 +1,8 @@ # # XEN # -CONFIG_XEN_PRIVILEGED_GUEST=y -CONFIG_XEN_PHYSDEV_ACCESS=y -CONFIG_XEN_BLKDEV_BACKEND=y -CONFIG_XEN_NETDEV_BACKEND=y -CONFIG_XEN_BLKDEV_FRONTEND=m -CONFIG_XEN_NETDEV_FRONTEND=m -# CONFIG_XEN_NETDEV_FRONTEND_PIPELINED_TRANSMITTER is not set -# CONFIG_XEN_NETDEV_PIPELINED_TRANSMITTER is not set # CONFIG_NOHIGHMEM is not set # CONFIG_HIGHMEM4G is not set CONFIG_HIGHMEM64G=y CONFIG_HIGHMEM=y - -# -# Bus options (PCI, PCMCIA, EISA, MCA, ISA) -# -# CONFIG_PCI_GOBIOS is not set -# CONFIG_PCI_GOMMCONFIG is not set -# CONFIG_PCI_GODIRECT is not set -CONFIG_PCI_GOANY=y - -# Microcode driver in Xen won't work as a module - should be upgraded -CONFIG_MICROCODE=y - -# -# PCI Hotplug Support -# -# CONFIG_HOTPLUG_PCI is not set - -# -# Ethernet (10 or 100Mbit) -# -# CONFIG_LANCE is not set -# CONFIG_SUNLANCE is not set -# CONFIG_3C515 is not set -# CONFIG_NI65 is not set -# CONFIG_ELPLUS is not set - -# -# SCSI low-level drivers -# -# CONFIG_SCSI_AHA1542 is not set - -# -# ISA devices -# -# CONFIG_SND_SB16_CSP is not set - -# -# Serial drivers -# -CONFIG_SERIAL_8250=m -# CONFIG_SERIAL_8250_CONSOLE is not set -# CONFIG_XEN_DISABLE_SERIAL is not set - -# CONFIG_SYNCLINK is not set -# CONFIG_SYNCLINKMP is not set - -# -# FIR device drivers -# -# CONFIG_TOSHIBA_FIR is not set - -# -# TPM -# -# CONFIG_XEN_TPMDEV_BACKEND is not set -# CONFIG_XEN_TPMDEV_FRONTEND is not set - -# -# Power management bits that don't work in Xen: -# -# CONFIG_X86_POWERNOW_K7 is not set -# CONFIG_X86_P4_CLOCKMOD is not set Index: config-xen-xenU-PAE =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/configs/config-xen-xenU-PAE,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- config-xen-xenU-PAE 28 Feb 2006 20:16:29 -0000 1.2 +++ config-xen-xenU-PAE 7 Mar 2006 19:38:26 -0000 1.3 @@ -1,96 +1,8 @@ # # XEN # -# CONFIG_XEN_PRIVILEGED_GUEST is not set -# CONFIG_XEN_PHYSDEV_ACCESS is not set -# CONFIG_XEN_BLKDEV_BACKEND is not set -# CONFIG_XEN_NETDEV_BACKEND is not set -CONFIG_XEN_BLKDEV_FRONTEND=y -CONFIG_XEN_NETDEV_FRONTEND=m -# CONFIG_XEN_NETDEV_FRONTEND_PIPELINED_TRANSMITTER is not set -CONFIG_XEN_DISABLE_SERIAL=y # CONFIG_NOHIGHMEM is not set # CONFIG_HIGHMEM4G is not set CONFIG_HIGHMEM64G=y CONFIG_HIGHMEM=y - -# -# Disable the non-xen drivers, since unprivileged guests -# do not get hardware access - -# -# Bus options (PCI, PCMCIA, EISA, MCA, ISA) -# -# CONFIG_PCI is not set -# CONFIG_ISA is not set -# CONFIG_HOTPLUG is not set - -# -# PCMCIA/CardBus support -# -# CONFIG_PCMCIA is not set -# CONFIG_YENTA is not set -# CONFIG_CARDBUS is not set - -# -# Generic Driver Options -# -# CONFIG_FW_LOADER is not set - -# -# Memory Technology Devices (MTD) -# -# CONFIG_MTD is not set - -# -# Parallel port support -# -# CONFIG_PARPORT is not set - -# -# Plug and Play support -# -# CONFIG_PNP is not set -# CONFIG_ISAPNP is not set - -# -# Dongle support -# -# CONFIG_DONGLE is not set - -# -# File systems -# -CONFIG_EXT3_FS=y -CONFIG_JBD=y - -# -# FIR device drivers -# -# CONFIG_BT is not set - -# -# Obsolete Wireless cards support (pre-802.11) -# -# CONFIG_ATMEL is not set -# CONFIG_IEEE80211 is not set - -# -# TPM -# -# CONFIG_XEN_TPMDEV_BACKEND is not set -# CONFIG_XEN_TPMDEV_FRONTEND is not set - -# CONFIG_TOSHIBA is not set -# CONFIG_MICROCODE is not set - -# -# FB devices -# -# CONFIG_FB_MODE_HELPERS is not set - -# -# DVB devices -# -# CONFIG_DVB is not set From fedora-cvs-commits at redhat.com Tue Mar 7 19:48:05 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 7 Mar 2006 14:48:05 -0500 Subject: rpms/cman-kernel/devel cman-kernel.spec,1.147,1.148 Message-ID: <200603071948.k27Jm5lT021600@cvs.devel.redhat.com> Author: cfeist Update of /cvs/dist/rpms/cman-kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv21587 Modified Files: cman-kernel.spec Log Message: Updated Kernel Version Index: cman-kernel.spec =================================================================== RCS file: /cvs/dist/rpms/cman-kernel/devel/cman-kernel.spec,v retrieving revision 1.147 retrieving revision 1.148 diff -u -r1.147 -r1.148 --- cman-kernel.spec 6 Mar 2006 22:47:53 -0000 1.147 +++ cman-kernel.spec 7 Mar 2006 19:48:03 -0000 1.148 @@ -12,7 +12,7 @@ %define buildup 1 %define buildsmp 1 %define buildxen 0 -%define kernel_version 2.6.15-1.2009.4.2_FC5 +%define kernel_version 2.6.15-1.2027_FC5 %define subversion 0 %define tempversion 2.6.15 @@ -26,7 +26,7 @@ Name: cman-kernel Version: 2.6.15.1 -Release: 0.FC5.4 +Release: 0.FC5.5 License: GPL Group: System Environment/Kernel Summary: cman-kernel - The Cluster Manager kernel modules From fedora-cvs-commits at redhat.com Tue Mar 7 19:48:17 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 7 Mar 2006 14:48:17 -0500 Subject: rpms/gnbd-kernel/devel gnbd-kernel.spec,1.141,1.142 Message-ID: <200603071948.k27JmHsL021655@cvs.devel.redhat.com> Author: cfeist Update of /cvs/dist/rpms/gnbd-kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv21642 Modified Files: gnbd-kernel.spec Log Message: Updated Kernel Version Index: gnbd-kernel.spec =================================================================== RCS file: /cvs/dist/rpms/gnbd-kernel/devel/gnbd-kernel.spec,v retrieving revision 1.141 retrieving revision 1.142 diff -u -r1.141 -r1.142 --- gnbd-kernel.spec 6 Mar 2006 22:38:34 -0000 1.141 +++ gnbd-kernel.spec 7 Mar 2006 19:48:15 -0000 1.142 @@ -12,7 +12,7 @@ %define buildup 1 %define buildsmp 1 %define buildxen 1 -%define kernel_version 2.6.15-1.2009.4.2_FC5 +%define kernel_version 2.6.15-1.2027_FC5 %define subversion 2 %ifnarch i686 @@ -25,7 +25,7 @@ Name: gnbd-kernel Version: 2.6.15 -Release: 5.FC5.12 +Release: 5.FC5.13 License: GPL Group: System Environment/Kernel Summary: gnbd-kernel - The kernel module for GFS's Network Block Device From fedora-cvs-commits at redhat.com Tue Mar 7 19:48:25 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 7 Mar 2006 14:48:25 -0500 Subject: rpms/dlm-kernel/devel dlm-kernel.spec,1.119,1.120 Message-ID: <200603071948.k27JmPJ3021710@cvs.devel.redhat.com> Author: cfeist Update of /cvs/dist/rpms/dlm-kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv21697 Modified Files: dlm-kernel.spec Log Message: Updated Kernel Version Index: dlm-kernel.spec =================================================================== RCS file: /cvs/dist/rpms/dlm-kernel/devel/dlm-kernel.spec,v retrieving revision 1.119 retrieving revision 1.120 diff -u -r1.119 -r1.120 --- dlm-kernel.spec 6 Mar 2006 22:48:19 -0000 1.119 +++ dlm-kernel.spec 7 Mar 2006 19:48:23 -0000 1.120 @@ -12,7 +12,7 @@ %define buildup 1 %define buildsmp 1 %define buildxen 0 -%define kernel_version 2.6.15-1.2009.4.2_FC5 +%define kernel_version 2.6.15-1.2027_FC5 %define subversion 0 %ifnarch i686 @@ -25,7 +25,7 @@ Name: dlm-kernel Version: 2.6.15 -Release: 0.FC5.3 +Release: 0.FC5.4 License: GPL Group: System Environment/Kernel Summary: dlm-kernel - The Distributed Lock Manager kernel modules. From fedora-cvs-commits at redhat.com Tue Mar 7 19:48:33 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 7 Mar 2006 14:48:33 -0500 Subject: rpms/GFS-kernel/devel GFS-kernel.spec,1.139,1.140 Message-ID: <200603071948.k27JmXdu021765@cvs.devel.redhat.com> Author: cfeist Update of /cvs/dist/rpms/GFS-kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv21752 Modified Files: GFS-kernel.spec Log Message: Updated Kernel Version Index: GFS-kernel.spec =================================================================== RCS file: /cvs/dist/rpms/GFS-kernel/devel/GFS-kernel.spec,v retrieving revision 1.139 retrieving revision 1.140 diff -u -r1.139 -r1.140 --- GFS-kernel.spec 6 Mar 2006 22:48:46 -0000 1.139 +++ GFS-kernel.spec 7 Mar 2006 19:48:31 -0000 1.140 @@ -12,7 +12,7 @@ %define buildup 1 %define buildsmp 1 %define buildxen 0 -%define kernel_version 2.6.15-1.2009.4.2_FC5 +%define kernel_version 2.6.15-1.2027_FC5 %define subversion 2 %ifnarch i686 @@ -25,7 +25,7 @@ Name: GFS-kernel Version: 2.6.15 -Release: 5.FC5.7 +Release: 5.FC5.8 License: GPL Group: System Environment/Kernel Summary: GFS-kernel - The Global File System kernel modules From fedora-cvs-commits at redhat.com Tue Mar 7 20:05:30 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 7 Mar 2006 15:05:30 -0500 Subject: rpms/glib2/devel .cvsignore, 1.47, 1.48 glib2.spec, 1.81, 1.82 sources, 1.47, 1.48 Message-ID: <200603072005.k27K5UkR000424@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/glib2/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv391 Modified Files: .cvsignore glib2.spec sources Log Message: 2.10.1 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/glib2/devel/.cvsignore,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- .cvsignore 24 Feb 2006 20:08:09 -0000 1.47 +++ .cvsignore 7 Mar 2006 20:05:26 -0000 1.48 @@ -32,3 +32,4 @@ glib-2.9.5.tar.bz2 glib-2.9.6.tar.bz2 glib-2.10.0.tar.bz2 +glib-2.10.1.tar.bz2 Index: glib2.spec =================================================================== RCS file: /cvs/dist/rpms/glib2/devel/glib2.spec,v retrieving revision 1.81 retrieving revision 1.82 diff -u -r1.81 -r1.82 --- glib2.spec 25 Feb 2006 01:47:06 -0000 1.81 +++ glib2.spec 7 Mar 2006 20:05:26 -0000 1.82 @@ -1,6 +1,6 @@ Summary: A library of handy utility functions Name: glib2 -Version: 2.10.0 +Version: 2.10.1 Release: 1 License: LGPL Group: System Environment/Libraries @@ -99,6 +99,9 @@ %{_mandir}/man1/* %changelog +* Tue Mar 7 2006 Matthias Clasen - 2.10.1-1 +- Update to 2.10.1 + * Fri Feb 24 2006 Matthias Clasen - 2.10.0-1 - Update to 2.10.0 Index: sources =================================================================== RCS file: /cvs/dist/rpms/glib2/devel/sources,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- sources 24 Feb 2006 20:08:09 -0000 1.47 +++ sources 7 Mar 2006 20:05:28 -0000 1.48 @@ -1 +1 @@ -60c9f62979415bcb82f0b87d6785dc3b glib-2.10.0.tar.bz2 +51df7932da118f7f27bbda82b65f0f91 glib-2.10.1.tar.bz2 From fedora-cvs-commits at redhat.com Tue Mar 7 20:12:50 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 7 Mar 2006 15:12:50 -0500 Subject: rpms/libbonobo/devel .cvsignore, 1.14, 1.15 libbonobo.spec, 1.35, 1.36 sources, 1.14, 1.15 Message-ID: <200603072012.k27KCoZc003237@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/libbonobo/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv3111 Modified Files: .cvsignore libbonobo.spec sources Log Message: 2.13.93 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/libbonobo/devel/.cvsignore,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- .cvsignore 17 Jan 2006 02:52:56 -0000 1.14 +++ .cvsignore 7 Mar 2006 20:12:46 -0000 1.15 @@ -5,3 +5,4 @@ libbonobo-2.10.1.tar.bz2 libbonobo-2.13.0.tar.bz2 libbonobo-2.13.1.tar.bz2 +libbonobo-2.13.93.tar.bz2 Index: libbonobo.spec =================================================================== RCS file: /cvs/dist/rpms/libbonobo/devel/libbonobo.spec,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- libbonobo.spec 15 Feb 2006 22:15:25 -0000 1.35 +++ libbonobo.spec 7 Mar 2006 20:12:46 -0000 1.36 @@ -5,8 +5,8 @@ Summary: Bonobo component system Name: libbonobo -Version: 2.13.1 -Release: 9 +Version: 2.13.93 +Release: 1 URL: http://ftp.gnome.org Source0: %{name}-%{version}.tar.bz2 License: LGPL @@ -116,6 +116,9 @@ %{_datadir}/gtk-doc/html/bonobo-activation %changelog +* Tue Mar 7 2006 Matthias Clasen +- Update to 2.13.93 + * Wed Feb 15 2006 Ray Strode 2.13.1-9 - yet another iteration of the shlib patch Index: sources =================================================================== RCS file: /cvs/dist/rpms/libbonobo/devel/sources,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- sources 17 Jan 2006 02:52:56 -0000 1.14 +++ sources 7 Mar 2006 20:12:46 -0000 1.15 @@ -1 +1 @@ -e418c385ff2010323233a90fda318ffb libbonobo-2.13.1.tar.bz2 +2891b4da52322ef71f1d0b37a2cd3e4a libbonobo-2.13.93.tar.bz2 From fedora-cvs-commits at redhat.com Tue Mar 7 20:22:09 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 7 Mar 2006 15:22:09 -0500 Subject: rpms/libbonobo/devel libbonobo.spec,1.36,1.37 Message-ID: <200603072022.k27KM9Mm019760@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/libbonobo/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv19711 Modified Files: libbonobo.spec Log Message: build docs Index: libbonobo.spec =================================================================== RCS file: /cvs/dist/rpms/libbonobo/devel/libbonobo.spec,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- libbonobo.spec 7 Mar 2006 20:12:46 -0000 1.36 +++ libbonobo.spec 7 Mar 2006 20:22:06 -0000 1.37 @@ -57,7 +57,7 @@ aclocal automake autoconf -%configure --disable-gtk-doc +%configure --enable-gtk-doc make From fedora-cvs-commits at redhat.com Tue Mar 7 20:28:22 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 7 Mar 2006 15:28:22 -0500 Subject: rpms/cman-kernel/FC-4 cman-kernel.spec,1.117,1.118 Message-ID: <200603072028.k27KSMnE022692@cvs.devel.redhat.com> Author: cfeist Update of /cvs/dist/rpms/cman-kernel/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv22660 Modified Files: cman-kernel.spec Log Message: Updated Kernel Version Index: cman-kernel.spec =================================================================== RCS file: /cvs/dist/rpms/cman-kernel/FC-4/cman-kernel.spec,v retrieving revision 1.117 retrieving revision 1.118 diff -u -r1.117 -r1.118 --- cman-kernel.spec 20 Feb 2006 15:42:43 -0000 1.117 +++ cman-kernel.spec 7 Mar 2006 20:28:20 -0000 1.118 @@ -12,7 +12,7 @@ %define buildup 1 %define buildsmp 1 %define buildxen 0 -%define kernel_version 2.6.15-1.1831_FC4 +%define kernel_version 2.6.15-1.1833_FC4 %define subversion 20050601.152643.FC4 %ifnarch i686 x86_64 @@ -25,7 +25,7 @@ Name: cman-kernel Version: 2.6.11.5 -Release: %{subversion}.22 +Release: %{subversion}.23 License: GPL Group: System Environment/Kernel Summary: cman-kernel - The Cluster Manager kernel modules From fedora-cvs-commits at redhat.com Tue Mar 7 20:28:31 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 7 Mar 2006 15:28:31 -0500 Subject: rpms/gnbd-kernel/FC-4 gnbd-kernel.spec,1.99,1.100 Message-ID: <200603072028.k27KSV82022824@cvs.devel.redhat.com> Author: cfeist Update of /cvs/dist/rpms/gnbd-kernel/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv22788 Modified Files: gnbd-kernel.spec Log Message: Updated Kernel Version Index: gnbd-kernel.spec =================================================================== RCS file: /cvs/dist/rpms/gnbd-kernel/FC-4/gnbd-kernel.spec,v retrieving revision 1.99 retrieving revision 1.100 diff -u -r1.99 -r1.100 --- gnbd-kernel.spec 20 Feb 2006 15:42:51 -0000 1.99 +++ gnbd-kernel.spec 7 Mar 2006 20:28:29 -0000 1.100 @@ -12,7 +12,7 @@ %define buildup 1 %define buildsmp 1 %define buildxen 0 -%define kernel_version 2.6.15-1.1831_FC4 +%define kernel_version 2.6.15-1.1833_FC4 %define subversion 20050420.133124.FC4 %ifnarch i686 x86_64 @@ -25,7 +25,7 @@ Name: gnbd-kernel Version: 2.6.11.2 -Release: %{subversion}.57 +Release: %{subversion}.58 License: GPL Group: System Environment/Kernel Summary: gnbd-kernel - The kernel module for GFS's Network Block Device From fedora-cvs-commits at redhat.com Tue Mar 7 20:28:41 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 7 Mar 2006 15:28:41 -0500 Subject: rpms/dlm-kernel/FC-4 dlm-kernel.spec,1.93,1.94 Message-ID: <200603072028.k27KSfXG022944@cvs.devel.redhat.com> Author: cfeist Update of /cvs/dist/rpms/dlm-kernel/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv22914 Modified Files: dlm-kernel.spec Log Message: Updated Kernel Version Index: dlm-kernel.spec =================================================================== RCS file: /cvs/dist/rpms/dlm-kernel/FC-4/dlm-kernel.spec,v retrieving revision 1.93 retrieving revision 1.94 diff -u -r1.93 -r1.94 --- dlm-kernel.spec 20 Feb 2006 15:42:59 -0000 1.93 +++ dlm-kernel.spec 7 Mar 2006 20:28:39 -0000 1.94 @@ -12,7 +12,7 @@ %define buildup 1 %define buildsmp 1 %define buildxen 0 -%define kernel_version 2.6.15-1.1831_FC4 +%define kernel_version 2.6.15-1.1833_FC4 %define subversion 20050601.152643.FC4 %ifnarch i686 x86_64 @@ -25,7 +25,7 @@ Name: dlm-kernel Version: 2.6.11.5 -Release: %{subversion}.21 +Release: %{subversion}.22 License: GPL Group: System Environment/Kernel Summary: dlm-kernel - The Distributed Lock Manager kernel modules. From fedora-cvs-commits at redhat.com Tue Mar 7 20:28:51 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 7 Mar 2006 15:28:51 -0500 Subject: rpms/GFS-kernel/FC-4 GFS-kernel.spec,1.114,1.115 Message-ID: <200603072028.k27KSphH023070@cvs.devel.redhat.com> Author: cfeist Update of /cvs/dist/rpms/GFS-kernel/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv23038 Modified Files: GFS-kernel.spec Log Message: Updated Kernel Version Index: GFS-kernel.spec =================================================================== RCS file: /cvs/dist/rpms/GFS-kernel/FC-4/GFS-kernel.spec,v retrieving revision 1.114 retrieving revision 1.115 diff -u -r1.114 -r1.115 --- GFS-kernel.spec 20 Feb 2006 15:43:07 -0000 1.114 +++ GFS-kernel.spec 7 Mar 2006 20:28:49 -0000 1.115 @@ -12,7 +12,7 @@ %define buildup 1 %define buildsmp 1 %define buildxen 0 -%define kernel_version 2.6.15-1.1831_FC4 +%define kernel_version 2.6.15-1.1833_FC4 %define subversion 20050601.152643.FC4 %ifnarch i686 x86_64 @@ -25,7 +25,7 @@ Name: GFS-kernel Version: 2.6.11.8 -Release: %{subversion}.24 +Release: %{subversion}.25 License: GPL Group: System Environment/Kernel Summary: GFS-kernel - The Global File System kernel modules From fedora-cvs-commits at redhat.com Tue Mar 7 20:36:22 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 7 Mar 2006 15:36:22 -0500 Subject: rpms/kernel/FC-4/configs config-generic, 1.54, 1.54.6.1 config-ia64-generic, 1.6, 1.6.28.1 config-x86-generic, 1.20, 1.20.6.1 config-x86_64-generic, 1.19, 1.19.2.1 Message-ID: <200603072036.k27KaMdk023866@cvs.devel.redhat.com> Author: linville Update of /cvs/dist/rpms/kernel/FC-4/configs In directory cvs.devel.redhat.com:/tmp/cvs-serv23827/configs Modified Files: Tag: private-linville-jwltest-fc4-33-branch config-generic config-ia64-generic config-x86-generic config-x86_64-generic Log Message: Index: config-generic =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-4/configs/config-generic,v retrieving revision 1.54 retrieving revision 1.54.6.1 diff -u -r1.54 -r1.54.6.1 --- config-generic 21 Feb 2006 05:47:00 -0000 1.54 +++ config-generic 7 Mar 2006 20:36:18 -0000 1.54.6.1 @@ -1035,6 +1035,8 @@ CONFIG_NS83820=m CONFIG_HAMACHI=m CONFIG_YELLOWFIN=m +CONFIG_SKY2=m +CONFIG_SKY2_EC_A1=y CONFIG_R8169=m CONFIG_R8169_NAPI=y CONFIG_R8169_VLAN=y Index: config-ia64-generic =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-4/configs/config-ia64-generic,v retrieving revision 1.6 retrieving revision 1.6.28.1 diff -u -r1.6 -r1.6.28.1 --- config-ia64-generic 6 Dec 2005 23:12:21 -0000 1.6 +++ config-ia64-generic 7 Mar 2006 20:36:18 -0000 1.6.28.1 @@ -124,6 +124,7 @@ CONFIG_ACPI_SYSTEM=y CONFIG_ACPI_NUMA=y CONFIG_ACPI_BLACKLIST_YEAR=0 +CONFIG_ACPI_INITRD=y CONFIG_SERIAL_SGI_L1_CONSOLE=y CONFIG_PM=y # CONFIG_PM_DEBUG is not set Index: config-x86-generic =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-4/configs/config-x86-generic,v retrieving revision 1.20 retrieving revision 1.20.6.1 diff -u -r1.20 -r1.20.6.1 --- config-x86-generic 21 Feb 2006 02:35:46 -0000 1.20 +++ config-x86-generic 7 Mar 2006 20:36:18 -0000 1.20.6.1 @@ -150,6 +150,7 @@ CONFIG_ACPI_BLACKLIST_YEAR=2001 CONFIG_ACPI_VIDEO=m CONFIG_ACPI_IBM=m +CONFIG_ACPI_INITRD=y CONFIG_PNPACPI=y # Index: config-x86_64-generic =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-4/configs/config-x86_64-generic,v retrieving revision 1.19 retrieving revision 1.19.2.1 diff -u -r1.19 -r1.19.2.1 --- config-x86_64-generic 5 Mar 2006 02:31:30 -0000 1.19 +++ config-x86_64-generic 7 Mar 2006 20:36:18 -0000 1.19.2.1 @@ -79,6 +79,7 @@ CONFIG_ACPI_BLACKLIST_YEAR=0 CONFIG_ACPI_VIDEO=m CONFIG_ACPI_IBM=m +CONFIG_ACPI_INITRD=y CONFIG_HOTPLUG_PCI=y # CONFIG_HOTPLUG_PCI_FAKE is not set From fedora-cvs-commits at redhat.com Tue Mar 7 20:36:21 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 7 Mar 2006 15:36:21 -0500 Subject: rpms/kernel/FC-4 jwltest-acpi-dsdt-initrd.patch, NONE, 1.1.54.1 jwltest-hostap_cs-intersil.patch, NONE, 1.1.4.1 jwltest-mii-force_media.patch, NONE, 1.1.10.1 jwltest-neigh-update.patch, NONE, 1.1.2.1 jwltest-rhine-mdelay-undo.patch, NONE, 1.1.8.1 jwltest-sky2.patch, NONE, 1.1.22.1 jwltest-tulip-last_irq.patch, NONE, 1.1.12.1 jwltest-via-velocity-tx_csum.patch, NONE, 1.1.20.1 kernel-2.6.spec, 1.1612, 1.1612.2.1 Message-ID: <200603072036.k27KaLbG023859@cvs.devel.redhat.com> Author: linville Update of /cvs/dist/rpms/kernel/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv23827 Modified Files: Tag: private-linville-jwltest-fc4-33-branch kernel-2.6.spec Added Files: Tag: private-linville-jwltest-fc4-33-branch jwltest-acpi-dsdt-initrd.patch jwltest-hostap_cs-intersil.patch jwltest-mii-force_media.patch jwltest-neigh-update.patch jwltest-rhine-mdelay-undo.patch jwltest-sky2.patch jwltest-tulip-last_irq.patch jwltest-via-velocity-tx_csum.patch Log Message: jwltest-acpi-dsdt-initrd.patch: drivers/acpi/Kconfig | 13 +++++ drivers/acpi/osl.c | 104 +++++++++++++++++++++++++++++++++++++++----- drivers/acpi/tables/tbget.c | 5 ++ init/main.c | 16 +++--- 4 files changed, 120 insertions(+), 18 deletions(-) --- NEW FILE jwltest-acpi-dsdt-initrd.patch --- --- linux-2.6.14/drivers/acpi/Kconfig.orig 2005-11-07 15:45:19.000000000 -0500 +++ linux-2.6.14/drivers/acpi/Kconfig 2005-11-07 15:45:27.000000000 -0500 @@ -341,4 +341,17 @@ config ACPI_HOTPLUG_MEMORY $>modprobe acpi_memhotplug endif # ACPI +config ACPI_INITRD + bool "Read DSDT from initrd or initramfs" + depends on ACPI && BLK_DEV_INITRD && !ACPI_CUSTOM_DSDT + default n + help + The DSDT (Differentiated System Description Table) often needs to be + overridden because of broken BIOS implementations. If you want to use + a customized DSDT, please use the mkinitrd tool (mkinitrd package) to + attach the DSDT to the initrd or initramfs + (see http://gaugusch.at/kernel.shtml for details) + If there is no DSDT found in the initrd, the DSDT from the BIOS is + used. It is save to say yes here. + endmenu --- linux-2.6.14/drivers/acpi/osl.c.orig 2005-11-07 15:45:19.000000000 -0500 +++ linux-2.6.14/drivers/acpi/osl.c 2005-11-07 15:45:27.000000000 -0500 @@ -44,6 +44,10 @@ #include #include +#ifdef CONFIG_ACPI_INITRD +#include +#include +#endif #define _COMPONENT ACPI_OS_SERVICES ACPI_MODULE_NAME("osl") @@ -244,24 +248,104 @@ acpi_os_predefined_override(const struct return AE_OK; } +#ifdef CONFIG_ACPI_INITRD +static char * +acpi_find_dsdt_initrd(void) +{ + static const char signature[] = "INITRDDSDT123DSDT123"; + char *dsdt_start = NULL; + char *dsdt_buffer = NULL; + unsigned long len = 0, len2 = 0; + int fd; + char ramfs_dsdt_name[10] = "/DSDT.aml"; + struct kstat stat; + + /* try to get dsdt from tail of initrd */ + if ((fd = sys_open(ramfs_dsdt_name, O_RDONLY, 0)) < 0) { + if (initrd_start) { + char *data = (char *)initrd_start; + + printk(KERN_INFO PREFIX "Looking for DSDT in initrd..."); + + /* Search for the start signature */ + while (data < (char *)initrd_end - sizeof(signature) - 4) { + if (!memcmp(data, signature, sizeof(signature))) { + data += sizeof(signature); + if (!memcmp(data, "DSDT", 4)) + dsdt_start = data; + break; + } + data++; + } + + if (dsdt_start){ + printk(PREFIX " found at offset %zu", + dsdt_start - (char *)initrd_start); + len = (char*) initrd_end - dsdt_start; + printk(", size: %zu bytes\n", len); + dsdt_buffer = ACPI_MEM_ALLOCATE(len + 1); + memcpy(dsdt_buffer, dsdt_start, len); + *(dsdt_buffer + len + 1)= '\0'; + } + else + printk(" not found!\n"); + } + } + /* get dsdt from initramfs */ + else{ + printk(KERN_INFO PREFIX "Looking for DSDT in initramfs..."); + if (vfs_stat(ramfs_dsdt_name, &stat) < 0){ + printk ("error getting stats for file %s\n", ramfs_dsdt_name); + return NULL; + } + + len = stat.size; + dsdt_buffer = ACPI_MEM_ALLOCATE(len + 1); + if (!dsdt_buffer) { + printk("Could not allocate %lu bytes of memory\n", len); + return NULL; + } + printk (" found %s ...", ramfs_dsdt_name); + + len2 = sys_read (fd, (char __user *) dsdt_buffer, len); + if (len2 < len ){ + printk(PREFIX "\nError trying to read %lu bytes from %s\n", + len, ramfs_dsdt_name); + ACPI_MEM_FREE (dsdt_buffer); + dsdt_buffer = NULL; + } + else{ + printk(" successfully read %lu bytes from %s\n", + len, ramfs_dsdt_name); + *(dsdt_buffer + len + 1) = '\0'; + } + } + if (!dsdt_buffer) + printk(" not found!\n"); + return dsdt_buffer; +} +#endif + acpi_status -acpi_os_table_override(struct acpi_table_header * existing_table, - struct acpi_table_header ** new_table) +acpi_os_table_override (struct acpi_table_header *existing_table, + struct acpi_table_header **new_table) { if (!existing_table || !new_table) return AE_BAD_PARAMETER; - -#ifdef CONFIG_ACPI_CUSTOM_DSDT - if (strncmp(existing_table->signature, "DSDT", 4) == 0) - *new_table = (struct acpi_table_header *)AmlCode; - else - *new_table = NULL; -#else + *new_table = NULL; + if (strncmp(existing_table->signature, "DSDT", 4) == 0) { +#ifdef CONFIG_ACPI_CUSTOM_DSDT + *new_table = (struct acpi_table_header*)AmlCode; +#elif defined(CONFIG_ACPI_INITRD) + *new_table = (struct acpi_table_header*)acpi_find_dsdt_initrd(); #endif + if (*new_table) + printk(KERN_INFO PREFIX "Using customized DSDT\n"); + } return AE_OK; } - + static irqreturn_t acpi_irq(int irq, void *dev_id, struct pt_regs *regs) { return (*acpi_irq_handler) (acpi_irq_context) ? IRQ_HANDLED : IRQ_NONE; --- linux-2.6.14/drivers/acpi/tables/tbget.c.orig 2005-11-07 15:46:15.000000000 -0500 +++ linux-2.6.14/drivers/acpi/tables/tbget.c 2005-11-07 15:46:08.000000000 -0500 @@ -283,6 +283,11 @@ acpi_tb_table_override(struct acpi_table ACPI_REPORT_INFO(("Table [%4.4s] replaced by host OS\n", table_info->pointer->signature)); +#ifdef CONFIG_ACPI_INITRD + if (new_table) + ACPI_MEM_FREE(new_table); +#endif + return_ACPI_STATUS(AE_OK); } --- linux-2.6.14/init/main.c.orig 2005-11-07 15:45:19.000000000 -0500 +++ linux-2.6.14/init/main.c 2005-11-07 15:45:27.000000000 -0500 @@ -540,8 +540,6 @@ asmlinkage void __init start_kernel(void check_bugs(); - acpi_early_init(); /* before LAPIC and SMP init */ - /* Do the rest non-__init'ed, we're now alive */ rest_init(); } @@ -671,6 +669,14 @@ static int init(void * unused) */ child_reaper = current; + /* + * Do this before initcalls, because some drivers want to access + * firmware files. + */ + populate_rootfs(); + + acpi_early_init(); /* before LAPIC and SMP init */ + /* Sets up cpus_possible() */ smp_prepare_cpus(max_cpus); @@ -682,12 +688,6 @@ static int init(void * unused) cpuset_init_smp(); - /* - * Do this before initcalls, because some drivers want to access - * firmware files. - */ - populate_rootfs(); - do_basic_setup(); /* jwltest-hostap_cs-intersil.patch: drivers/net/wireless/hostap/hostap_cs.c | 5 ++++- include/pcmcia/device_id.h | 9 +++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) --- NEW FILE jwltest-hostap_cs-intersil.patch --- --- linux-2.6.15/include/pcmcia/device_id.h.orig 2006-01-02 22:21:10.000000000 -0500 +++ linux-2.6.15/include/pcmcia/device_id.h 2006-03-03 14:55:15.000000000 -0500 @@ -72,6 +72,15 @@ .prod_id = { (v1), (v2), (v3), (v4) }, \ .prod_id_hash = { (vh1), (vh2), (vh3), (vh4) }, } +#define PCMCIA_DEVICE_MANF_CARD_PROD_ID1(manf, card, v1, vh1) { \ + .match_flags = PCMCIA_DEV_ID_MATCH_MANF_ID| \ + PCMCIA_DEV_ID_MATCH_CARD_ID| \ + PCMCIA_DEV_ID_MATCH_PROD_ID1, \ + .manf_id = (manf), \ + .card_id = (card), \ + .prod_id = { (v1), NULL, NULL, NULL }, \ + .prod_id_hash = { (vh1), 0, 0, 0 }, } + /* multi-function devices */ --- linux-2.6.15/drivers/net/wireless/hostap/hostap_cs.c.orig 2006-01-02 22:21:10.000000000 -0500 +++ linux-2.6.15/drivers/net/wireless/hostap/hostap_cs.c 2006-03-03 14:55:15.000000000 -0500 @@ -930,7 +930,6 @@ static struct pcmcia_device_id hostap_cs PCMCIA_DEVICE_MANF_CARD(0x0101, 0x0777), PCMCIA_DEVICE_MANF_CARD(0x0126, 0x8000), PCMCIA_DEVICE_MANF_CARD(0x0138, 0x0002), - PCMCIA_DEVICE_MANF_CARD(0x0156, 0x0002), PCMCIA_DEVICE_MANF_CARD(0x0250, 0x0002), PCMCIA_DEVICE_MANF_CARD(0x026f, 0x030b), PCMCIA_DEVICE_MANF_CARD(0x0274, 0x1612), @@ -944,6 +943,10 @@ static struct pcmcia_device_id hostap_cs PCMCIA_DEVICE_MANF_CARD(0xd601, 0x0002), PCMCIA_DEVICE_MANF_CARD(0xd601, 0x0005), PCMCIA_DEVICE_MANF_CARD(0xd601, 0x0010), + PCMCIA_DEVICE_MANF_CARD_PROD_ID1(0x0156, 0x0002, "INTERSIL", + 0x74c5e40d), + PCMCIA_DEVICE_MANF_CARD_PROD_ID1(0x0156, 0x0002, "Intersil", + 0x4b801a17), PCMCIA_MFC_DEVICE_PROD_ID12(0, "SanDisk", "ConnectPlus", 0x7a954bd9, 0x74be00c6), PCMCIA_DEVICE_PROD_ID1234( jwltest-mii-force_media.patch: mii.c | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) --- NEW FILE jwltest-mii-force_media.patch --- --- linux-2.6.15/drivers/net/mii.c.orig 2006-01-02 22:21:10.000000000 -0500 +++ linux-2.6.15/drivers/net/mii.c 2006-01-09 13:49:32.000000000 -0500 @@ -266,10 +266,6 @@ unsigned int mii_check_media (struct mii int advertise, lpa, media, duplex; int lpa2 = 0; - /* if forced media, go no further */ - if (mii->force_media) - return 0; /* duplex did not change */ - /* check current and old link status */ old_carrier = netif_carrier_ok(mii->dev) ? 1 : 0; new_carrier = (unsigned int) mii_link_ok(mii); @@ -293,6 +289,13 @@ unsigned int mii_check_media (struct mii */ netif_carrier_on(mii->dev); + /* if forced media, go no further */ + if (mii->force_media) { + if (ok_to_print) + printk(KERN_INFO "%s: link up\n", mii->dev->name); + return 0; /* duplex did not change */ + } + /* get MII advertise and LPA values */ if ((!init_media) && (mii->advertising)) advertise = mii->advertising; jwltest-neigh-update.patch: neighbour.c | 8 ++++++++ 1 files changed, 8 insertions(+) --- NEW FILE jwltest-neigh-update.patch --- --- linux-2.6.15/net/core/neighbour.c.orig 2006-01-02 22:21:10.000000000 -0500 +++ linux-2.6.15/net/core/neighbour.c 2006-03-07 15:19:53.000000000 -0500 @@ -750,11 +750,13 @@ static void neigh_timer_handler(unsigned neigh->used + neigh->parms->delay_probe_time)) { NEIGH_PRINTK2("neigh %p is delayed.\n", neigh); neigh->nud_state = NUD_DELAY; + neigh->updated = jiffies; neigh_suspect(neigh); next = now + neigh->parms->delay_probe_time; } else { NEIGH_PRINTK2("neigh %p is suspected.\n", neigh); neigh->nud_state = NUD_STALE; + neigh->updated = jiffies; neigh_suspect(neigh); } } else if (state & NUD_DELAY) { @@ -762,11 +764,13 @@ static void neigh_timer_handler(unsigned neigh->confirmed + neigh->parms->delay_probe_time)) { NEIGH_PRINTK2("neigh %p is now reachable.\n", neigh); neigh->nud_state = NUD_REACHABLE; + neigh->updated = jiffies; neigh_connect(neigh); next = neigh->confirmed + neigh->parms->reachable_time; } else { NEIGH_PRINTK2("neigh %p is probed.\n", neigh); neigh->nud_state = NUD_PROBE; + neigh->updated = jiffies; atomic_set(&neigh->probes, 0); next = now + neigh->parms->retrans_time; } @@ -780,6 +784,7 @@ static void neigh_timer_handler(unsigned struct sk_buff *skb; neigh->nud_state = NUD_FAILED; + neigh->updated = jiffies; notify = 1; NEIGH_CACHE_STAT_INC(neigh->tbl, res_failed); NEIGH_PRINTK2("neigh %p is failed.\n", neigh); @@ -843,10 +848,12 @@ int __neigh_event_send(struct neighbour if (neigh->parms->mcast_probes + neigh->parms->app_probes) { atomic_set(&neigh->probes, neigh->parms->ucast_probes); neigh->nud_state = NUD_INCOMPLETE; + neigh->updated = jiffies; neigh_hold(neigh); neigh_add_timer(neigh, now + 1); } else { neigh->nud_state = NUD_FAILED; + neigh->updated = jiffies; write_unlock_bh(&neigh->lock); if (skb) @@ -857,6 +864,7 @@ int __neigh_event_send(struct neighbour NEIGH_PRINTK2("neigh %p is delayed.\n", neigh); neigh_hold(neigh); neigh->nud_state = NUD_DELAY; + neigh->updated = jiffies; neigh_add_timer(neigh, jiffies + neigh->parms->delay_probe_time); } jwltest-rhine-mdelay-undo.patch: via-rhine.c | 34 +++------------------------------- 1 files changed, 3 insertions(+), 31 deletions(-) --- NEW FILE jwltest-rhine-mdelay-undo.patch --- --- linux-2.6.15/drivers/net/via-rhine.c.orig 2006-01-02 22:21:10.000000000 -0500 +++ linux-2.6.15/drivers/net/via-rhine.c 2006-02-09 10:52:37.000000000 -0500 @@ -490,8 +490,6 @@ struct rhine_private { u8 tx_thresh, rx_thresh; struct mii_if_info mii_if; - struct work_struct tx_timeout_task; - struct work_struct check_media_task; void __iomem *base; }; @@ -499,8 +497,6 @@ static int mdio_read(struct net_device static void mdio_write(struct net_device *dev, int phy_id, int location, int value); static int rhine_open(struct net_device *dev); static void rhine_tx_timeout(struct net_device *dev); -static void rhine_tx_timeout_task(struct net_device *dev); -static void rhine_check_media_task(struct net_device *dev); static int rhine_start_tx(struct sk_buff *skb, struct net_device *dev); static irqreturn_t rhine_interrupt(int irq, void *dev_instance, struct pt_regs *regs); static void rhine_tx(struct net_device *dev); @@ -855,12 +851,6 @@ static int __devinit rhine_init_one(stru if (rp->quirks & rqRhineI) dev->features |= NETIF_F_SG|NETIF_F_HW_CSUM; - INIT_WORK(&rp->tx_timeout_task, - (void (*)(void *))rhine_tx_timeout_task, dev); - - INIT_WORK(&rp->check_media_task, - (void (*)(void *))rhine_check_media_task, dev); - /* dev->name not defined before register_netdev()! */ rc = register_netdev(dev); if (rc) @@ -1087,11 +1077,6 @@ static void rhine_check_media(struct net ioaddr + ChipCmd1); } -static void rhine_check_media_task(struct net_device *dev) -{ - rhine_check_media(dev, 0); -} - static void init_registers(struct net_device *dev) { struct rhine_private *rp = netdev_priv(dev); @@ -1145,8 +1130,8 @@ static void rhine_disable_linkmon(void _ if (quirks & rqRhineI) { iowrite8(0x01, ioaddr + MIIRegAddr); // MII_BMSR - /* Do not call from ISR! */ - msleep(1); + /* Can be called from ISR. Evil. */ + mdelay(1); /* 0x80 must be set immediately before turning it off */ iowrite8(0x80, ioaddr + MIICmd); @@ -1236,16 +1221,6 @@ static int rhine_open(struct net_device static void rhine_tx_timeout(struct net_device *dev) { struct rhine_private *rp = netdev_priv(dev); - - /* - * Move bulk of work outside of interrupt context - */ - schedule_work(&rp->tx_timeout_task); -} - -static void rhine_tx_timeout_task(struct net_device *dev) -{ - struct rhine_private *rp = netdev_priv(dev); void __iomem *ioaddr = rp->base; printk(KERN_WARNING "%s: Transmit timed out, status %4.4x, PHY status " @@ -1651,7 +1626,7 @@ static void rhine_error(struct net_devic spin_lock(&rp->lock); if (intr_status & IntrLinkChange) - schedule_work(&rp->check_media_task); + rhine_check_media(dev, 0); if (intr_status & IntrStatsMax) { rp->stats.rx_crc_errors += ioread16(ioaddr + RxCRCErrs); rp->stats.rx_missed_errors += ioread16(ioaddr + RxMissed); @@ -1899,9 +1874,6 @@ static int rhine_close(struct net_device spin_unlock_irq(&rp->lock); free_irq(rp->pdev->irq, dev); - - flush_scheduled_work(); - free_rbufs(dev); free_tbufs(dev); free_ring(dev); jwltest-sky2.patch: Kconfig | 18 Makefile | 1 sky2.c | 3040 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ sky2.h | 1910 ++++++++++++++++++++++++++++++++++++ sky2_compat.h | 6 5 files changed, 4975 insertions(+) --- NEW FILE jwltest-sky2.patch --- --- linux-2.6.14/drivers/net/sky2.h.orig 2005-11-14 09:45:48.000000000 -0500 +++ linux-2.6.14/drivers/net/sky2.h 2005-11-14 09:45:56.000000000 -0500 @@ -0,0 +1,1910 @@ +/* + * Definitions for the new Marvell Yukon 2 driver. + */ +#ifndef _SKY2_H +#define _SKY2_H + +/* PCI config registers */ +#define PCI_DEV_REG1 0x40 +#define PCI_DEV_REG2 0x44 +#define PCI_DEV_STATUS 0x7c +#define PCI_OS_PCI_X (1<<26) + +#define PEX_LNK_STAT 0xf2 +#define PEX_UNC_ERR_STAT 0x104 +#define PEX_DEV_CTRL 0xe8 + +/* Yukon-2 */ +enum pci_dev_reg_1 { + PCI_Y2_PIG_ENA = 1<<31, /* Enable Plug-in-Go (YUKON-2) */ + PCI_Y2_DLL_DIS = 1<<30, /* Disable PCI DLL (YUKON-2) */ + PCI_Y2_PHY2_COMA = 1<<29, /* Set PHY 2 to Coma Mode (YUKON-2) */ + PCI_Y2_PHY1_COMA = 1<<28, /* Set PHY 1 to Coma Mode (YUKON-2) */ + PCI_Y2_PHY2_POWD = 1<<27, /* Set PHY 2 to Power Down (YUKON-2) */ + PCI_Y2_PHY1_POWD = 1<<26, /* Set PHY 1 to Power Down (YUKON-2) */ +}; + +enum pci_dev_reg_2 { + PCI_VPD_WR_THR = 0xffL<<24, /* Bit 31..24: VPD Write Threshold */ + PCI_DEV_SEL = 0x7fL<<17, /* Bit 23..17: EEPROM Device Select */ + PCI_VPD_ROM_SZ = 7L<<14, /* Bit 16..14: VPD ROM Size */ + + PCI_PATCH_DIR = 0xfL<<8, /* Bit 11.. 8: Ext Patches dir 3..0 */ + PCI_EXT_PATCHS = 0xfL<<4, /* Bit 7.. 4: Extended Patches 3..0 */ + PCI_EN_DUMMY_RD = 1<<3, /* Enable Dummy Read */ + PCI_REV_DESC = 1<<2, /* Reverse Desc. Bytes */ + + PCI_USEDATA64 = 1<<0, /* Use 64Bit Data bus ext */ +}; + + +#define PCI_STATUS_ERROR_BITS (PCI_STATUS_DETECTED_PARITY | \ + PCI_STATUS_SIG_SYSTEM_ERROR | \ + PCI_STATUS_REC_MASTER_ABORT | \ + PCI_STATUS_REC_TARGET_ABORT | \ + PCI_STATUS_PARITY) + +enum pex_dev_ctrl { + PEX_DC_MAX_RRS_MSK = 7<<12, /* Bit 14..12: Max. Read Request Size */ + PEX_DC_EN_NO_SNOOP = 1<<11,/* Enable No Snoop */ + PEX_DC_EN_AUX_POW = 1<<10,/* Enable AUX Power */ + PEX_DC_EN_PHANTOM = 1<<9, /* Enable Phantom Functions */ + PEX_DC_EN_EXT_TAG = 1<<8, /* Enable Extended Tag Field */ + PEX_DC_MAX_PLS_MSK = 7<<5, /* Bit 7.. 5: Max. Payload Size Mask */ + PEX_DC_EN_REL_ORD = 1<<4, /* Enable Relaxed Ordering */ + PEX_DC_EN_UNS_RQ_RP = 1<<3, /* Enable Unsupported Request Reporting */ + PEX_DC_EN_FAT_ER_RP = 1<<2, /* Enable Fatal Error Reporting */ + PEX_DC_EN_NFA_ER_RP = 1<<1, /* Enable Non-Fatal Error Reporting */ + PEX_DC_EN_COR_ER_RP = 1<<0, /* Enable Correctable Error Reporting */ +}; +#define PEX_DC_MAX_RD_RQ_SIZE(x) (((x)<<12) & PEX_DC_MAX_RRS_MSK) + +/* PEX_UNC_ERR_STAT PEX Uncorrectable Errors Status Register (Yukon-2) */ +enum pex_err { + PEX_UNSUP_REQ = 1<<20, /* Unsupported Request Error */ + + PEX_MALFOR_TLP = 1<<18, /* Malformed TLP */ + + PEX_UNEXP_COMP = 1<<16, /* Unexpected Completion */ + + PEX_COMP_TO = 1<<14, /* Completion Timeout */ + PEX_FLOW_CTRL_P = 1<<13, /* Flow Control Protocol Error */ + PEX_POIS_TLP = 1<<12, /* Poisoned TLP */ + + PEX_DATA_LINK_P = 1<<4, /* Data Link Protocol Error */ + PEX_FATAL_ERRORS= (PEX_MALFOR_TLP | PEX_FLOW_CTRL_P | PEX_DATA_LINK_P), +}; + + +enum csr_regs { + B0_RAP = 0x0000, + B0_CTST = 0x0004, + B0_Y2LED = 0x0005, + B0_POWER_CTRL = 0x0007, + B0_ISRC = 0x0008, + B0_IMSK = 0x000c, + B0_HWE_ISRC = 0x0010, + B0_HWE_IMSK = 0x0014, + + /* Special ISR registers (Yukon-2 only) */ + B0_Y2_SP_ISRC2 = 0x001c, + B0_Y2_SP_ISRC3 = 0x0020, + B0_Y2_SP_EISR = 0x0024, + B0_Y2_SP_LISR = 0x0028, + B0_Y2_SP_ICR = 0x002c, + + B2_MAC_1 = 0x0100, + B2_MAC_2 = 0x0108, + B2_MAC_3 = 0x0110, + B2_CONN_TYP = 0x0118, + B2_PMD_TYP = 0x0119, + B2_MAC_CFG = 0x011a, + B2_CHIP_ID = 0x011b, + B2_E_0 = 0x011c, + + B2_Y2_CLK_GATE = 0x011d, + B2_Y2_HW_RES = 0x011e, + B2_E_3 = 0x011f, + B2_Y2_CLK_CTRL = 0x0120, + + B2_TI_INI = 0x0130, + B2_TI_VAL = 0x0134, + B2_TI_CTRL = 0x0138, + B2_TI_TEST = 0x0139, + + B2_TST_CTRL1 = 0x0158, + B2_TST_CTRL2 = 0x0159, + B2_GP_IO = 0x015c, + + B2_I2C_CTRL = 0x0160, + B2_I2C_DATA = 0x0164, + B2_I2C_IRQ = 0x0168, + B2_I2C_SW = 0x016c, + + B3_RAM_ADDR = 0x0180, + B3_RAM_DATA_LO = 0x0184, + B3_RAM_DATA_HI = 0x0188, + +/* RAM Interface Registers */ +/* Yukon-2: use RAM_BUFFER() to access the RAM buffer */ +/* + * The HW-Spec. calls this registers Timeout Value 0..11. But this names are + * not usable in SW. Please notice these are NOT real timeouts, these are + * the number of qWords transferred continuously. + */ +#define RAM_BUFFER(port, reg) (reg | (port <<6)) + + B3_RI_WTO_R1 = 0x0190, + B3_RI_WTO_XA1 = 0x0191, + B3_RI_WTO_XS1 = 0x0192, + B3_RI_RTO_R1 = 0x0193, + B3_RI_RTO_XA1 = 0x0194, + B3_RI_RTO_XS1 = 0x0195, + B3_RI_WTO_R2 = 0x0196, + B3_RI_WTO_XA2 = 0x0197, + B3_RI_WTO_XS2 = 0x0198, + B3_RI_RTO_R2 = 0x0199, + B3_RI_RTO_XA2 = 0x019a, + B3_RI_RTO_XS2 = 0x019b, + B3_RI_TO_VAL = 0x019c, + B3_RI_CTRL = 0x01a0, + B3_RI_TEST = 0x01a2, + B3_MA_TOINI_RX1 = 0x01b0, + B3_MA_TOINI_RX2 = 0x01b1, + B3_MA_TOINI_TX1 = 0x01b2, + B3_MA_TOINI_TX2 = 0x01b3, + B3_MA_TOVAL_RX1 = 0x01b4, + B3_MA_TOVAL_RX2 = 0x01b5, + B3_MA_TOVAL_TX1 = 0x01b6, + B3_MA_TOVAL_TX2 = 0x01b7, + B3_MA_TO_CTRL = 0x01b8, + B3_MA_TO_TEST = 0x01ba, + B3_MA_RCINI_RX1 = 0x01c0, + B3_MA_RCINI_RX2 = 0x01c1, + B3_MA_RCINI_TX1 = 0x01c2, + B3_MA_RCINI_TX2 = 0x01c3, + B3_MA_RCVAL_RX1 = 0x01c4, + B3_MA_RCVAL_RX2 = 0x01c5, + B3_MA_RCVAL_TX1 = 0x01c6, + B3_MA_RCVAL_TX2 = 0x01c7, + B3_MA_RC_CTRL = 0x01c8, + B3_MA_RC_TEST = 0x01ca, + B3_PA_TOINI_RX1 = 0x01d0, + B3_PA_TOINI_RX2 = 0x01d4, + B3_PA_TOINI_TX1 = 0x01d8, + B3_PA_TOINI_TX2 = 0x01dc, + B3_PA_TOVAL_RX1 = 0x01e0, + B3_PA_TOVAL_RX2 = 0x01e4, + B3_PA_TOVAL_TX1 = 0x01e8, + B3_PA_TOVAL_TX2 = 0x01ec, + B3_PA_CTRL = 0x01f0, + B3_PA_TEST = 0x01f2, + + Y2_CFG_SPC = 0x1c00, +}; + +/* B0_CTST 16 bit Control/Status register */ +enum { + Y2_VMAIN_AVAIL = 1<<17,/* VMAIN available (YUKON-2 only) */ + Y2_VAUX_AVAIL = 1<<16,/* VAUX available (YUKON-2 only) */ + Y2_ASF_ENABLE = 1<<13,/* ASF Unit Enable (YUKON-2 only) */ + Y2_ASF_DISABLE = 1<<12,/* ASF Unit Disable (YUKON-2 only) */ + Y2_CLK_RUN_ENA = 1<<11,/* CLK_RUN Enable (YUKON-2 only) */ + Y2_CLK_RUN_DIS = 1<<10,/* CLK_RUN Disable (YUKON-2 only) */ + Y2_LED_STAT_ON = 1<<9, /* Status LED On (YUKON-2 only) */ + Y2_LED_STAT_OFF = 1<<8, /* Status LED Off (YUKON-2 only) */ + [...4603 lines suppressed...] + goto err_out_free_regions; + } + + memset(hw, 0, sizeof(*hw)); + hw->pdev = pdev; + spin_lock_init(&hw->phy_lock); + + hw->regs = ioremap_nocache(pci_resource_start(pdev, 0), 0x4000); + if (!hw->regs) { + printk(KERN_ERR PFX "%s: cannot map device registers\n", + pci_name(pdev)); + goto err_out_free_hw; + } + hw->pm_cap = pm_cap; + + err = sky2_reset(hw); + if (err) + goto err_out_iounmap; + + printk(KERN_INFO PFX "addr 0x%lx irq %d Yukon-%s (0x%x) rev %d\n", + pci_resource_start(pdev, 0), pdev->irq, + yukon_name[hw->chip_id - CHIP_ID_YUKON], + hw->chip_id, hw->chip_rev); + + dev = sky2_init_netdev(hw, 0, using_dac); + if (!dev) + goto err_out_free_pci; + + err = register_netdev(dev); + if (err) { + printk(KERN_ERR PFX "%s: cannot register net device\n", + pci_name(pdev)); + goto err_out_free_netdev; + } + + sky2_show_addr(dev); + + if (hw->ports > 1 && (dev1 = sky2_init_netdev(hw, 1, using_dac))) { + if (register_netdev(dev1) == 0) + sky2_show_addr(dev1); + else { + /* Failure to register second port need not be fatal */ + printk(KERN_WARNING PFX + "register of second port failed\n"); + hw->dev[1] = NULL; + free_netdev(dev1); + } + } + + err = request_irq(pdev->irq, sky2_intr, SA_SHIRQ, DRV_NAME, hw); + if (err) { + printk(KERN_ERR PFX "%s: cannot assign irq %d\n", + pci_name(pdev), pdev->irq); + goto err_out_unregister; + } + + hw->intr_mask = Y2_IS_BASE; + sky2_write32(hw, B0_IMSK, hw->intr_mask); + + pci_set_drvdata(pdev, hw); + + return 0; + +err_out_unregister: + if (dev1) { + unregister_netdev(dev1); + free_netdev(dev1); + } + unregister_netdev(dev); +err_out_free_netdev: + free_netdev(dev); +err_out_free_pci: + sky2_write8(hw, B0_CTST, CS_RST_SET); + pci_free_consistent(hw->pdev, STATUS_LE_BYTES, hw->st_le, hw->st_dma); +err_out_iounmap: + iounmap(hw->regs); +err_out_free_hw: + kfree(hw); +err_out_free_regions: + pci_release_regions(pdev); + pci_disable_device(pdev); +err_out: + return err; +} + +static void __devexit sky2_remove(struct pci_dev *pdev) +{ + struct sky2_hw *hw = pci_get_drvdata(pdev); + struct net_device *dev0, *dev1; + + if (!hw) + return; + + dev0 = hw->dev[0]; + dev1 = hw->dev[1]; + if (dev1) + unregister_netdev(dev1); + unregister_netdev(dev0); + + sky2_write32(hw, B0_IMSK, 0); + sky2_set_power_state(hw, PCI_D3hot); + sky2_write16(hw, B0_Y2LED, LED_STAT_OFF); + sky2_write8(hw, B0_CTST, CS_RST_SET); + sky2_read8(hw, B0_CTST); + + free_irq(pdev->irq, hw); + pci_free_consistent(pdev, STATUS_LE_BYTES, hw->st_le, hw->st_dma); + pci_release_regions(pdev); + pci_disable_device(pdev); + + if (dev1) + free_netdev(dev1); + free_netdev(dev0); + iounmap(hw->regs); + kfree(hw); + + pci_set_drvdata(pdev, NULL); +} + +#ifdef CONFIG_PM +static int sky2_suspend(struct pci_dev *pdev, pm_message_t state) +{ + struct sky2_hw *hw = pci_get_drvdata(pdev); + int i; + + for (i = 0; i < 2; i++) { + struct net_device *dev = hw->dev[i]; + + if (dev) { + if (!netif_running(dev)) + continue; + + sky2_down(dev); + netif_device_detach(dev); + } + } + + return sky2_set_power_state(hw, pci_choose_state(pdev, state)); +} + +static int sky2_resume(struct pci_dev *pdev) +{ + struct sky2_hw *hw = pci_get_drvdata(pdev); + int i; + + pci_restore_state(pdev); + pci_enable_wake(pdev, PCI_D0, 0); + sky2_set_power_state(hw, PCI_D0); + + sky2_reset(hw); + + for (i = 0; i < 2; i++) { + struct net_device *dev = hw->dev[i]; + if (dev) { + if (netif_running(dev)) { + netif_device_attach(dev); + sky2_up(dev); + } + } + } + return 0; +} +#endif + +static struct pci_driver sky2_driver = { + .name = DRV_NAME, + .id_table = sky2_id_table, + .probe = sky2_probe, + .remove = __devexit_p(sky2_remove), +#ifdef CONFIG_PM + .suspend = sky2_suspend, + .resume = sky2_resume, +#endif +}; + +static int __init sky2_init_module(void) +{ + return pci_module_init(&sky2_driver); +} + +static void __exit sky2_cleanup_module(void) +{ + pci_unregister_driver(&sky2_driver); +} + +module_init(sky2_init_module); +module_exit(sky2_cleanup_module); + +MODULE_DESCRIPTION("Marvell Yukon 2 Gigabit Ethernet driver"); +MODULE_AUTHOR("Stephen Hemminger "); +MODULE_LICENSE("GPL"); --- linux-2.6.14/drivers/net/sky2_compat.h.orig 2005-11-14 09:56:09.000000000 -0500 +++ linux-2.6.14/drivers/net/sky2_compat.h 2005-11-14 09:56:02.000000000 -0500 @@ -0,0 +1,6 @@ +#ifndef __SKY2_COMPAT_H__ +#define __SKY2_COMPAT_H__ + +#define netif_rx_schedule_test(dev) netif_rx_schedule_prep(dev) + +#endif /* __SKY2_COMPAT_H__ */ jwltest-tulip-last_irq.patch: tulip_core.c | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE jwltest-tulip-last_irq.patch --- --- linux-2.6.14/drivers/net/tulip/tulip_core.c.orig 2005-12-13 15:31:26.000000000 -0500 +++ linux-2.6.14/drivers/net/tulip/tulip_core.c 2005-12-13 15:31:20.000000000 -0500 @@ -1564,7 +1564,7 @@ static int __devinit tulip_init_one (str dev->dev_addr, 6); } #endif -#if defined(__i386__) /* Patch up x86 BIOS bug. */ +#if defined(__i386__) || defined(__x86_64__) /* Patch up x86 BIOS bug. */ if (last_irq) irq = last_irq; #endif jwltest-via-velocity-tx_csum.patch: via-velocity.c | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE jwltest-via-velocity-tx_csum.patch --- --- linux-2.6.14/drivers/net/via-velocity.c.orig 2005-11-29 15:41:12.000000000 -0500 +++ linux-2.6.14/drivers/net/via-velocity.c 2005-11-29 15:41:47.000000000 -0500 @@ -792,7 +792,7 @@ static int __devinit velocity_found1(str #endif if (vptr->flags & VELOCITY_FLAGS_TX_CSUM) { - dev->features |= NETIF_F_HW_CSUM; + dev->features |= NETIF_F_IP_CSUM; } ret = register_netdev(dev); Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-4/kernel-2.6.spec,v retrieving revision 1.1612 retrieving revision 1.1612.2.1 diff -u -r1.1612 -r1.1612.2.1 --- kernel-2.6.spec 5 Mar 2006 03:17:53 -0000 1.1612 +++ kernel-2.6.spec 7 Mar 2006 20:36:18 -0000 1.1612.2.1 @@ -19,7 +19,8 @@ %define sublevel 15 %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.33 %define release %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})_FC4%{rhbsys} %define signmodules 0 %define make_target bzImage @@ -157,7 +158,8 @@ License: GPLv2 Version: %{rpmversion} Release: %{release} -ExclusiveArch: noarch %{all_x86} x86_64 ppc ppc64 sparc sparc64 +#ExclusiveArch: noarch %{all_x86} x86_64 ppc ppc64 sparc sparc64 +ExclusiveArch: noarch %{all_x86} x86_64 ppc ppc64 ExclusiveOS: Linux Provides: kernel = %{version} Provides: kernel-drm = 4.3.0 @@ -230,6 +232,7 @@ Patch307: linux-2.6-g5-dualcore.patch # 400 - 499 ia64 + # 500 - 599 s390(x) # 600 - 699 sparc(64) @@ -315,6 +318,12 @@ Patch1301: linux-2.6-net-sundance-ip100A.patch Patch1302: linux-2.6-ipw2200-hwcrypto.patch Patch1303: linux-2.6-net-ipw2200-monitor.patch +Patch1304: jwltest-sky2.patch +Patch1305: jwltest-via-velocity-tx_csum.patch +Patch1306: jwltest-tulip-last_irq.patch +Patch1307: jwltest-mii-force_media.patch +Patch1308: jwltest-rhine-mdelay-undo.patch +Patch1309: jwltest-hostap_cs-intersil.patch # Squashfs Patch1400: linux-2.6-squashfs.patch @@ -359,6 +368,7 @@ Patch1860: linux-2.6-posix-timers-sched_time-accumulation.patch Patch1870: linux-2.6-usb-find-interface.patch Patch1871: linux-2.6-usb-unusual-devices.patch +Patch1880: jwltest-neigh-update.patch # Warn about usage of various obsolete functionality that may go away. Patch1900: linux-2.6-obsolete-idescsi-warning.patch @@ -376,6 +386,8 @@ # ACPI patches. Patch2100: linux-2.6-acpi-thinkpad-c2c3.patch +Patch2200: jwltest-acpi-dsdt-initrd.patch + # # 10000 to 20000 is for stuff that has to come last due to the # amount of drivers they touch. But only these should go here. @@ -596,6 +608,10 @@ %patch306 -p1 %patch307 -p1 +# +# ia64 +# + # # Xen # @@ -730,6 +746,18 @@ %patch1302 -p1 # Make monitor mode work for ipw2200 %patch1303 -p1 +# add sky2 driver from upstream +%patch1304 -p1 +# via-velocity tx_csum only works for IPv4 +%patch1305 -p1 +# apply bios work-around for tulip to x86_64 as well as i386 +%patch1306 -p1 +# fix link state change bug w/ generic mii +%patch1307 -p1 +# undo via-rhine mdelay elimination patch +%patch1308 -p1 +# keep hostap_cs from binding to non-intersil cards w/ PCI ID 0x0156:0x0002 +%patch1309 -p1 # Squashfs %patch1400 -p1 @@ -809,6 +837,8 @@ %patch1870 -p1 # Add another mp3 player to the usb unusual device list. %patch1871 -p1 +# hit neigh->update when state changes +%patch1880 -p1 # Warn about obsolete functionality usage. %patch1900 -p1 @@ -832,6 +862,9 @@ # Blacklist another 'No C2/C3 states' Thinkpad R40e BIOS. %patch2100 -p1 +# Add DSDT override from initrd +%patch2200 -p1 + # # Patches 5000 to 6000 are reserved for new drivers that are about to # be merged upstream From fedora-cvs-commits at redhat.com Tue Mar 7 21:18:26 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 7 Mar 2006 16:18:26 -0500 Subject: rpms/glibc/devel glibc.spec,1.230,1.231 Message-ID: <200603072118.k27LIQEN031867@cvs.devel.redhat.com> Author: roland Update of /cvs/dist/rpms/glibc/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv31819 Modified Files: glibc.spec Log Message: back up %%{ix86} gdb conflicts to < 6.3.0.0-1.111 Index: glibc.spec =================================================================== RCS file: /cvs/dist/rpms/glibc/devel/glibc.spec,v retrieving revision 1.230 retrieving revision 1.231 diff -u -r1.230 -r1.231 --- glibc.spec 7 Mar 2006 13:39:01 -0000 1.230 +++ glibc.spec 7 Mar 2006 21:18:23 -0000 1.231 @@ -3,7 +3,7 @@ %define glibcsrcdir glibc-20060306T1239 %define glibc_release_tarballs 0 %define glibcversion 2.4 -%define glibcrelease 3 +%define glibcrelease 4 %define auxarches i586 i686 athlon sparcv9 alphaev6 %define prelinkarches noarch %define xenarches i686 athlon @@ -56,14 +56,13 @@ Conflicts: rpm <= 4.0-0.65 Conflicts: glibc-devel < 2.2.3 Conflicts: gcc4 <= 4.0.0-0.6 -%ifarch x86_64 +%ifarch x86_64 %{ix86} # Need gdb that understands DW_CFA_val_expression Conflicts: gdb < 6.3.0.0-1.111 -%endif -%ifarch %{ix86} +# XXX new gdb is broken, >= -1.111 is adequate if not great (no crashes) # Need gdb that understands DW_CFA_val_expression and handles two frames # with the same entry point and CFA, but different PC -Conflicts: gdb < 6.3.0.0-1.115 +#Conflicts: gdb < 6.3.0.0-1.115 %endif # Earlier shadow-utils packages had too restrictive permissions on # /etc/default @@ -1349,6 +1348,9 @@ %endif %changelog +* Tue Mar 7 2006 Roland McGrath 2.4-4 +- back up %%{ix86} gdb conflicts to < 6.3.0.0-1.111 + * Tue Mar 7 2006 Jakub Jelinek 2.4-3 - really fix rintl on ppc64 From fedora-cvs-commits at redhat.com Tue Mar 7 21:37:07 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 7 Mar 2006 16:37:07 -0500 Subject: rpms/glibc/devel glibc.spec,1.231,1.232 Message-ID: <200603072137.k27Lb7P7030911@cvs.devel.redhat.com> Author: roland Update of /cvs/dist/rpms/glibc/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv30896 Modified Files: glibc.spec Log Message: die, beehive, die Index: glibc.spec =================================================================== RCS file: /cvs/dist/rpms/glibc/devel/glibc.spec,v retrieving revision 1.231 retrieving revision 1.232 diff -u -r1.231 -r1.232 --- glibc.spec 7 Mar 2006 21:18:23 -0000 1.231 +++ glibc.spec 7 Mar 2006 21:37:04 -0000 1.232 @@ -3,7 +3,7 @@ %define glibcsrcdir glibc-20060306T1239 %define glibc_release_tarballs 0 %define glibcversion 2.4 -%define glibcrelease 4 +%define glibcrelease 5 %define auxarches i586 i686 athlon sparcv9 alphaev6 %define prelinkarches noarch %define xenarches i686 athlon @@ -1348,7 +1348,7 @@ %endif %changelog -* Tue Mar 7 2006 Roland McGrath 2.4-4 +* Tue Mar 7 2006 Roland McGrath 2.4-5 - back up %%{ix86} gdb conflicts to < 6.3.0.0-1.111 * Tue Mar 7 2006 Jakub Jelinek 2.4-3 From fedora-cvs-commits at redhat.com Tue Mar 7 21:38:23 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 7 Mar 2006 16:38:23 -0500 Subject: rpms/libdv/devel libdv-0.104-amd64reloc.patch, NONE, 1.1 libdv-0.104-gtk2.patch, NONE, 1.1 libdv-0.104-no-exec-stack.patch, NONE, 1.1 libdv-0.104-pic-fix.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 libdv.spec, 1.15, 1.16 sources, 1.7, 1.8 libdv-0.103-noexec-stack.patch, 1.1, NONE Message-ID: <200603072138.k27LcNdR030992@cvs.devel.redhat.com> Author: wtogami Update of /cvs/dist/rpms/libdv/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv30954 Modified Files: .cvsignore libdv.spec sources Added Files: libdv-0.104-amd64reloc.patch libdv-0.104-gtk2.patch libdv-0.104-no-exec-stack.patch libdv-0.104-pic-fix.patch Removed Files: libdv-0.103-noexec-stack.patch Log Message: * Tue Mar 07 2006 Warren Togami 0.104-2 - remove instead of exclude static libs * Wed Feb 15 2006 Matthias Saou 0.104-1 - Update to 0.104 at last (#147311) - Include no-exec-stack, pic-fix, amd64reloc and gtk2 patches from Gentoo and PLD (merge gcc4 fix to the pic-fix patch). - Now build against gtk2 (thanks to the patch above). - Exclude static library. https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=147311 Long standing issue now resolved that prevented us from upgrading to the 2004 version of libdv. It should be API/ABI compatible, but I am testing to be sure. libdv-0.104-amd64reloc.patch: encode_x86_64.S | 6 +++- idct_block_mmx_x86_64.S | 2 - quant_x86_64.S | 8 +++--- vlc_x86_64.S | 61 +++++++++++++++++++++++++----------------------- 4 files changed, 42 insertions(+), 35 deletions(-) --- NEW FILE libdv-0.104-amd64reloc.patch --- diff -aur /tmp/libdv-0.104/libdv/encode_x86_64.S /tmp/libdv-0.104-patched/libdv/encode_x86_64.S --- /tmp/libdv-0.104/libdv/encode_x86_64.S 2004-11-17 03:36:30.000000000 +0000 +++ /tmp/libdv-0.104-patched/libdv/encode_x86_64.S 2004-12-10 07:53:12.000000000 +0000 @@ -47,7 +47,8 @@ mov $63, %rcx # loop counter - mov vlc_encode_lookup(%rip), %r11 + mov vlc_encode_lookup at GOTPCREL(%rip), %r11 + mov (%r11),%r11 pxor %mm0, %mm0 pxor %mm2, %mm2 @@ -129,7 +130,8 @@ add $2, %rdi /* skip the DC coefficient */ mov $63, %rcx - mov vlc_num_bits_lookup(%rip), %r11 + mov vlc_num_bits_lookup at GOTPCREL(%rip), %r11 + mov (%r11),%r11 vlc_num_bits_block_x86_loop: movw (%rdi), %ax /* get the next coeffiecient */ diff -aur /tmp/libdv-0.104/libdv/idct_block_mmx_x86_64.S /tmp/libdv-0.104-patched/libdv/idct_block_mmx_x86_64.S --- /tmp/libdv-0.104/libdv/idct_block_mmx_x86_64.S 2004-10-20 04:49:24.000000000 +0100 +++ /tmp/libdv-0.104-patched/libdv/idct_block_mmx_x86_64.S 2004-12-10 07:38:23.000000000 +0000 @@ -22,7 +22,7 @@ /* void _dv_idct_88(dv_coeff_t *block) */ /* argument block=rdi */ - lea preSC(%rip), %r11 + mov preSC at GOTPCREL(%rip), %r11 /* * column 0: even part diff -aur /tmp/libdv-0.104/libdv/quant_x86_64.S /tmp/libdv-0.104-patched/libdv/quant_x86_64.S --- /tmp/libdv-0.104/libdv/quant_x86_64.S 2004-11-17 03:36:30.000000000 +0000 +++ /tmp/libdv-0.104-patched/libdv/quant_x86_64.S 2004-12-10 07:36:42.000000000 +0000 @@ -73,10 +73,10 @@ /* pq = dv_quant_shifts[qno + dv_quant_offset[class]]; */ mov %rsi,%rax /* qno */ mov %rdx,%r12 /* class */ - lea dv_quant_offset(%rip),%rcx + mov dv_quant_offset at GOTPCREL(%rip),%rcx movzbq (%rcx,%r12,1),%rcx /* dv_quant_offset[class] */ add %rcx,%rax /* qno + */ - lea dv_quant_shifts(%rip),%r11 + mov dv_quant_shifts at GOTPCREL(%rip),%r11 lea (%r11,%rax,4),%r11 /* r11 is pq = dv_quant_shifts[...] */ /* extra = (class == 3); */ @@ -217,10 +217,10 @@ mov %rsi,%rax /* qno */ mov %rdx,%r12 /* class */ - lea dv_quant_offset(%rip),%rcx + mov dv_quant_offset at GOTPCREL(%rip),%rcx movzbq (%rcx,%r12,1),%rcx add %rcx,%rax - lea dv_quant_shifts(%rip),%r11 + mov dv_quant_shifts at GOTPCREL(%rip),%r11 lea (%r11,%rax,4),%r11 /* r11 is pq */ /* extra = (class == 3); */ diff -aur /tmp/libdv-0.104/libdv/vlc_x86_64.S /tmp/libdv-0.104-patched/libdv/vlc_x86_64.S --- /tmp/libdv-0.104/libdv/vlc_x86_64.S 2004-10-20 04:49:24.000000000 +0100 +++ /tmp/libdv-0.104-patched/libdv/vlc_x86_64.S 2004-12-12 05:43:49.000000000 +0000 @@ -16,28 +16,28 @@ /* klass = dv_vlc_classes[maxbits][(bits & (dv_vlc_class_index_mask[maxbits])) >> */ /* (dv_vlc_class_index_rshift[maxbits])]; */ /* xor %rbp,%rbp */ - lea dv_vlc_class_index_mask(%rip),%r11 /* use %rip for PIC code */ + mov dv_vlc_class_index_mask at GOTPCREL(%rip),%r11 /* use %rip for PIC code */ mov (%r11,%rbx,4),%ebp /* int32 */ /* dv_vlc_class_index_mask[maxbits] */ and %eax,%ebp /* bits & */ - lea dv_vlc_class_index_rshift(%rip),%rcx + mov dv_vlc_class_index_rshift at GOTPCREL(%rip),%rcx mov (%rcx,%rbx,4),%ecx /* int32 */ /* dv_vlc_class_index_rshift[maxbits] */ sar %cl,%ebp /* >> */ - lea dv_vlc_classes(%rip),%rcx + mov dv_vlc_classes at GOTPCREL(%rip),%rcx mov (%rcx,%rbx,8),%rcx /* ptr */ /* dv_vlc_classes[maxbits], a pointer */ movsbq (%rcx,%rbp,1),%rbp /* int8 */ /* klass = */ /* *result = dv_vlc_lookups[klass][(bits & (dv_vlc_index_mask[klass])) >> */ /* (dv_vlc_index_rshift[klass])]; */ /* xor %rbx,%rbx */ - lea dv_vlc_index_mask(%rip),%r11 + mov dv_vlc_index_mask at GOTPCREL(%rip),%r11 mov (%r11,%rbp,4),%ebx /* int32 */ /* (dv_vlc_index_mask[klass]) */ /* xor %rcx,%rcx */ - lea dv_vlc_index_rshift(%rip),%r11 + mov dv_vlc_index_rshift at GOTPCREL(%rip),%r11 mov (%r11,%rbp,4),%ecx /* int32 */ /* dv_vlc_index_rshift[klass] */ and %eax,%ebx /* bits & */ sar %cl,%ebx /* >> */ - lea dv_vlc_lookups(%rip),%r11 + mov dv_vlc_lookups at GOTPCREL(%rip),%r11 mov (%r11,%rbp,8),%rbp /* ptr */ /* dv_vlc_lookups[klass] */ mov (%rbp,%rbx,4),%ebp /* int32 */ /* *result = */ @@ -57,7 +57,7 @@ mov %ebp,%ecx sar $8,%ecx and $0xff,%ecx /* result->len */ - lea sign_mask(%rip),%rbx + mov sign_mask at GOTPCREL(%rip),%rbx mov (%rbx,%rcx,4),%ebx /* int32 */ and %ebx,%eax neg %eax @@ -109,17 +109,17 @@ mov %rax,%rbp and $0xfe00,%ebp sar $9,%ebp - lea dv_vlc_class_lookup5(%rip),%r11 + mov dv_vlc_class_lookup5 at GOTPCREL(%rip),%r11 movsbq (%r11,%rbp),%rbp /* int8 klass */ - lea dv_vlc_index_mask(%rip),%rbx + mov dv_vlc_index_mask at GOTPCREL(%rip),%rbx mov (%rbx,%rbp,4),%ebx /* int32 */ - lea dv_vlc_index_rshift(%rip),%rcx + mov dv_vlc_index_rshift at GOTPCREL(%rip),%rcx mov (%rcx,%rbp,4),%ecx /* int32 */ and %eax,%ebx sar %cl,%ebx /* %rbx is klass */ - lea dv_vlc_lookups(%rip),%r11 + mov dv_vlc_lookups at GOTPCREL(%rip),%r11 mov (%r11,%rbp,8),%rbp /* ptr */ mov (%rbp,%rbx,4),%ebp /* int32 */ @@ -138,7 +138,7 @@ mov %ebp,%ecx sar $8,%ecx and $0xff,%ecx - lea sign_mask(%rip),%r11 + mov sign_mask at GOTPCREL(%rip),%r11 mov (%r11,%rcx,4),%ecx /* int32 */ and %ecx,%eax neg %eax @@ -253,7 +253,7 @@ /* Attempt to use the shortcut first. If it hits, then this vlc term has been decoded. */ - lea dv_vlc_class1_shortcut(%rip),%r10 + mov dv_vlc_class1_shortcut at GOTPCREL(%rip),%r10 mov (%r10,%rcx,4),%r11d /* record32 dv_vlc_tab_t */ test $0x80,%r11d @@ -267,17 +267,17 @@ /* %rax is bits */ - lea dv_vlc_class_lookup5(%rip),%r10 + mov dv_vlc_class_lookup5 at GOTPCREL(%rip),%r10 movsbq (%r10,%rcx,1),%rcx /* int8 */ /* xor %r12,%r12 */ - lea dv_vlc_index_mask(%rip),%r10 + mov dv_vlc_index_mask at GOTPCREL(%rip),%r10 mov (%r10,%rcx,4),%r12d /* int32 */ - lea dv_vlc_lookups(%rip),%r10 + mov dv_vlc_lookups at GOTPCREL(%rip),%r10 mov (%r10,%rcx,8),%r11 /* ptr->record32 */ - lea dv_vlc_index_rshift(%rip),%r10 + mov dv_vlc_index_rshift at GOTPCREL(%rip),%r10 mov (%r10,%rcx,4),%ecx /* int32 */ and %eax,%r12d @@ -303,7 +303,7 @@ mov %r11d,%ecx sar $8,%ecx and $0xff,%ecx - lea sign_mask(%rip),%r10 + mov sign_mask at GOTPCREL(%rip),%r10 mov (%r10,%rcx,4),%ecx /* int32 */ and %ecx,%eax neg %eax @@ -388,7 +388,8 @@ mov %r11,%rsi /* bits */ mov %rax,%rdi /* bits_left */ lea vlc(%rip),%rdx /* *vlc */ - call dv_decode_vlc + mov dv_decode_vlc at GOTPCREL(%rip),%r11 + call *%r11 pop %rdx pop %rsi pop %rdi @@ -473,7 +474,7 @@ movl %r11d,dv_macroblock_t_eob_count(%r13) /* int32 */ /* mb->i = (seg->i + dv_super_map_vertical[m]) % (seg->isPAL?12:10); */ - lea dv_super_map_vertical(%rip),%r11 + mov dv_super_map_vertical at GOTPCREL(%rip),%r11 movl (%r11,%rax,4),%r11d /* int32 */ /* xor %rcx,%rcx */ movl dv_videosegment_t_i(%r12),%ecx /* int32 */ @@ -493,7 +494,7 @@ movl %r11d,dv_macroblock_t_i(%r13) /* int32 */ /* mb->j = dv_super_map_horizontal[m]; */ - lea dv_super_map_horizontal(%rip),%r11 + mov dv_super_map_horizontal at GOTPCREL(%rip),%r11 movl (%r11,%rax,4),%r11d /* int32 */ movl %r11d,dv_macroblock_t_j(%r13) /* int32 */ @@ -546,7 +547,8 @@ /* bl->reorder = &dv_reorder[bl->dct_mode][1]; */ shl $6,%rax /* *64 */ - lea (dv_reorder+1)(%rip),%rcx + mov dv_reorder at GOTPCREL(%rip),%rcx + add $1,%rcx add %rcx,%rax mov %rax,dv_block_t_reorder(%r15) /* ptr */ @@ -557,13 +559,13 @@ /* bl->offset= mb_start + dv_parse_bit_start[b]; */ /* xor %rcx,%rcx */ movl mb_start(%rip),%ecx /* int32 */ - lea dv_parse_bit_start(%rip),%rax + mov dv_parse_bit_start at GOTPCREL(%rip),%rax mov (%rax,%r12,4),%eax /* int32 */ add %rcx,%rax movl %eax,dv_block_t_offset(%r15) /* int32 */ /* bl->end= mb_start + dv_parse_bit_end[b]; */ - lea dv_parse_bit_end(%rip),%rax + mov dv_parse_bit_end at GOTPCREL(%rip),%rax mov (%rax,%r12,4),%eax /* int32 */ add %ecx,%eax mov %eax,dv_block_t_end(%r15) /* int32 */ @@ -603,7 +605,8 @@ mov dv_videosegment_t_bs(%rdi),%rdi /* passed in rdi was seg, now passing seg->bs */ mov %r13,%rsi /* mb */ mov %r15,%rdx /* bl */ - call dv_parse_ac_coeffs_pass0 + mov dv_parse_ac_coeffs_pass0 at GOTPCREL(%rip),%r11 + call *%r11 pop %rdi pop %rsi pop %rdx @@ -635,10 +638,12 @@ mov %rsi,%rax /* quality */ and $DV_QUALITY_AC_MASK,%rax cmp $DV_QUALITY_AC_2,%rax + + jne done + mov dv_parse_ac_coeffs at GOTPCREL(%rip),%r11 + jmp *%r11 - jz dv_parse_ac_coeffs - - mov $0,%rax +done: mov $0,%rax ret libdv-0.104-gtk2.patch: configure.ac | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) --- NEW FILE libdv-0.104-gtk2.patch --- --- libdv-0.101/configure.ac~ 2004-02-23 18:01:21.000000000 +0100 +++ libdv-0.101/configure.ac 2004-02-23 18:01:21.000000000 +0100 @@ -152,7 +152,7 @@ dnl Checks for libraries. if $use_gtk; then - REQUIRES='glib >= 1.2.4 gtk+ >= 1.2.4' + REQUIRES='glib-2.0 >= 2.1.0 gtk+-x11-2.0 >= 2.1.0' PKG_CHECK_MODULES(GTK,$REQUIRES) else dnl Libs above are required for the apps, but not for the lib itself. @@ -175,7 +175,7 @@ fi if $use_gtk; then - AM_PATH_GTK(1.2.4, + AM_PATH_GTK_2_0(2.1.0, [ AC_DEFINE(HAVE_GTK) ]) libdv-0.104-no-exec-stack.patch: dct_block_mmx.S | 4 ++++ dct_block_mmx_x86_64.S | 4 ++++ encode_x86.S | 3 +++ encode_x86_64.S | 3 +++ idct_block_mmx.S | 3 +++ idct_block_mmx_x86_64.S | 3 +++ quant_x86.S | 3 +++ quant_x86_64.S | 3 +++ rgbtoyuv.S | 3 +++ rgbtoyuv_x86_64.S | 3 +++ transpose_x86.S | 4 ++++ transpose_x86_64.S | 4 ++++ vlc_x86.S | 4 ++++ vlc_x86_64.S | 4 ++++ 14 files changed, 48 insertions(+) --- NEW FILE libdv-0.104-no-exec-stack.patch --- Make sure that the asm files don't incorrectly trigger an executable stack marking in the final shared library. That's bad, mmmkay. Upstream has already fixed this in their cvs. --- libdv/dct_block_mmx.S +++ libdv/dct_block_mmx.S @@ -1207,3 +1207,7 @@ _dv_dct_block_mmx_postscale_248: popl %esi popl %ebp ret + +#ifdef __ELF__ +.section .note.GNU-stack,"", at progbits +#endif --- libdv/dct_block_mmx_x86_64.S +++ libdv/dct_block_mmx_x86_64.S @@ -1197,3 +1197,7 @@ _dv_dct_block_mmx_x86_64_postscale_248: pop %r12 ret + +#ifdef __ELF__ +.section .note.GNU-stack,"", at progbits +#endif --- libdv/encode_x86.S +++ libdv/encode_x86.S @@ -599,3 +599,6 @@ _dv_need_dct_248_mmx_rows: +#ifdef __ELF__ +.section .note.GNU-stack,"", at progbits +#endif --- libdv/encode_x86_64.S +++ libdv/encode_x86_64.S @@ -600,3 +600,6 @@ _dv_need_dct_248_mmx_x86_64_rows: +#ifdef __ELF__ +.section .note.GNU-stack,"", at progbits +#endif --- libdv/idct_block_mmx.S +++ libdv/idct_block_mmx.S @@ -648,3 +648,6 @@ x0: .long 0,0 .align 8 +#ifdef __ELF__ +.section .note.GNU-stack,"", at progbits +#endif --- libdv/idct_block_mmx_x86_64.S +++ libdv/idct_block_mmx_x86_64.S @@ -653,3 +653,6 @@ x0: .long 0,0 .align 8 +#ifdef __ELF__ +.section .note.GNU-stack,"", at progbits +#endif --- libdv/quant_x86.S +++ libdv/quant_x86.S @@ -454,3 +454,6 @@ _dv_quant_x86: +#ifdef __ELF__ +.section .note.GNU-stack,"", at progbits +#endif --- libdv/quant_x86_64.S +++ libdv/quant_x86_64.S @@ -459,3 +459,6 @@ _dv_quant_x86_64: +#ifdef __ELF__ +.section .note.GNU-stack,"", at progbits +#endif --- libdv/rgbtoyuv.S +++ libdv/rgbtoyuv.S @@ -1430,3 +1430,6 @@ video_copy_ntsc_c_block_mmx_loop: +#ifdef __ELF__ +.section .note.GNU-stack,"", at progbits +#endif --- libdv/rgbtoyuv_x86_64.S +++ libdv/rgbtoyuv_x86_64.S @@ -1370,3 +1370,6 @@ video_copy_ntsc_c_block_mmx_loop: +#ifdef __ELF__ +.section .note.GNU-stack,"", at progbits +#endif --- libdv/transpose_x86.S +++ libdv/transpose_x86.S @@ -188,3 +188,7 @@ popl %esi popl %ebp ret $0 + +#ifdef __ELF__ +.section .note.GNU-stack,"", at progbits +#endif --- libdv/transpose_x86_64.S +++ libdv/transpose_x86_64.S @@ -188,3 +188,7 @@ all_done_ready_to_exit: pop %r12 ret $0 + +#ifdef __ELF__ +.section .note.GNU-stack,"", at progbits +#endif --- libdv/vlc_x86.S +++ libdv/vlc_x86.S @@ -585,3 +585,7 @@ mod_12: .align 16 const_f_0_0_0: .short 0xffff,0,0,0 + +#ifdef __ELF__ +.section .note.GNU-stack,"", at progbits +#endif --- libdv/vlc_x86_64.S +++ libdv/vlc_x86_64.S @@ -671,3 +671,7 @@ mod_12: .align 16 const_f_0_0_0: .short 0xffff,0,0,0 + +#ifdef __ELF__ +.section .note.GNU-stack,"", at progbits +#endif libdv-0.104-pic-fix.patch: dct_block_mmx.S | 133 +++++++++++++++++++- dv.c | 7 - encode.c | 9 - encode_x86.S | 20 +-- idct_block_mmx.S | 141 +++++++++++++++++++++ quant.c | 4 quant.h | 2 quant_x86.S | 15 +- rgbtoyuv.S | 357 +++++++++++++++++++++++++++++++++++++++++++++++-------- vlc_x86.S | 230 +++++++++++++++++++++++++++++++++-- 10 files changed, 830 insertions(+), 88 deletions(-) --- NEW FILE libdv-0.104-pic-fix.patch --- diff -Naupr libdv-0.104.orig/libdv/dct_block_mmx.S libdv-0.104/libdv/dct_block_mmx.S --- libdv-0.104.orig/libdv/dct_block_mmx.S 2003-10-20 21:46:49.000000000 +0200 +++ libdv-0.104/libdv/dct_block_mmx.S 2006-02-16 12:44:37.000000000 +0100 @@ -53,6 +53,17 @@ scratch2: .quad 0 scratch3: .quad 0 scratch4: .quad 0 +#ifdef __PIC__ +# undef __i686 /* gcc define gets in our way */ + .section .gnu.linkonce.t.__i686.get_pc_thunk.bp,"ax", at progbits +.globl __i686.get_pc_thunk.bp + .hidden __i686.get_pc_thunk.bp + .type __i686.get_pc_thunk.bp, at function +__i686.get_pc_thunk.bp: + movl (%esp), %ebp + ret +#endif + .text .align 8 @@ -60,10 +71,14 @@ scratch4: .quad 0 _dv_dct_88_block_mmx: pushl %ebp - movl %esp, %ebp pushl %esi - movl 8(%ebp), %esi # source +#ifdef __PIC__ + call __i686.get_pc_thunk.bp + addl $_GLOBAL_OFFSET_TABLE_, %ebp +#endif + + movl 12(%ebp), %esi # source # column 0 movq 16*0(%esi), %mm0 # v0 @@ -86,22 +101,45 @@ _dv_dct_88_block_mmx: movq 16*3(%esi), %mm5 # v3 movq 16*4(%esi), %mm7 # v4 +#ifdef __PIC__ + movq %mm7, scratch1 at GOTOFF(%ebp) # scratch1: v4 ; +#else movq %mm7, scratch1 # scratch1: v4 ; +#endif movq %mm5, %mm7 # duplicate v3 +#ifdef __PIC__ + paddw scratch1 at GOTOFF(%ebp), %mm5 # v03: v3+v4 + psubw scratch1 at GOTOFF(%ebp), %mm7 # v04: v3-v4 + movq %mm5, scratch2 at GOTOFF(%ebp) # scratch2: v03 +#else paddw scratch1, %mm5 # v03: v3+v4 psubw scratch1, %mm7 # v04: v3-v4 movq %mm5, scratch2 # scratch2: v03 +#endif movq %mm0, %mm5 # mm5: v00 +#ifdef __PIC__ + paddw scratch2 at GOTOFF(%ebp), %mm0 # v10: v00+v03 + psubw scratch2 at GOTOFF(%ebp), %mm5 # v13: v00-v03 + movq %mm3, scratch3 at GOTOFF(%ebp) # scratch3: v02 +#else paddw scratch2, %mm0 # v10: v00+v03 psubw scratch2, %mm5 # v13: v00-v03 movq %mm3, scratch3 # scratch3: v02 +#endif movq %mm1, %mm3 # duplicate v01 +#ifdef __PIC__ + paddw scratch3 at GOTOFF(%ebp), %mm1 # v11: v01+v02 + psubw scratch3 at GOTOFF(%ebp), %mm3 # v12: v01-v02 + + movq %mm6, scratch4 at GOTOFF(%ebp) # scratch4: v05 +#else paddw scratch3, %mm1 # v11: v01+v02 psubw scratch3, %mm3 # v12: v01-v02 movq %mm6, scratch4 # scratch4: v05 +#endif movq %mm0, %mm6 # duplicate v10 paddw %mm1, %mm0 # v10+v11 @@ -111,10 +149,18 @@ _dv_dct_88_block_mmx: movq %mm6, 16*4(%esi) # out4: v10-v11 movq %mm4, %mm0 # mm0: v06 +#ifdef __PIC__ + paddw scratch4 at GOTOFF(%ebp), %mm4 # v15: v05+v06 +#else paddw scratch4, %mm4 # v15: v05+v06 +#endif paddw %mm2, %mm0 # v16: v07+v06 +#ifdef __PIC__ + pmulhw WA3 at GOTOFF(%ebp), %mm4 # v35~: WA3*v15 +#else pmulhw WA3, %mm4 # v35~: WA3*v15 +#endif psllw $1, %mm4 # v35: compensate the coeefient scale movq %mm4, %mm6 # duplicate v35 @@ -123,7 +169,11 @@ _dv_dct_88_block_mmx: paddw %mm5, %mm3 # v22: v12+v13 +#ifdef __PIC__ + pmulhw WA1 at GOTOFF(%ebp), %mm3 # v32~: WA1*v22 +#else pmulhw WA1, %mm3 # v32~: WA1*v22 +#endif psllw $16-NSHIFT, %mm3 # v32: compensate the coeefient scale movq %mm5, %mm6 # duplicate v13 @@ -134,13 +184,23 @@ _dv_dct_88_block_mmx: movq %mm6, 16*6(%esi) # out6: v13-v32 +#ifdef __PIC__ + paddw scratch4 at GOTOFF(%ebp), %mm7 # v14n: v04+v05 +#else paddw scratch4, %mm7 # v14n: v04+v05 +#endif movq %mm0, %mm5 # duplicate v16 psubw %mm7, %mm0 # va1: v16-v14n +#ifdef __PIC__ + pmulhw WA5 at GOTOFF(%ebp), %mm0 # va0~: va1*WA5 + pmulhw WA4 at GOTOFF(%ebp), %mm5 # v36~~: v16*WA4 + pmulhw WA2 at GOTOFF(%ebp), %mm7 # v34~~: v14n*WA2 +#else pmulhw WA5, %mm0 # va0~: va1*WA5 pmulhw WA4, %mm5 # v36~~: v16*WA4 pmulhw WA2, %mm7 # v34~~: v14n*WA2 +#endif psllw $16-WA4_SHIFT, %mm5 # v36: compensate the coeefient scale psllw $16-NSHIFT, %mm7 # v34: compensate the coeefient scale @@ -188,22 +248,45 @@ _dv_dct_88_block_mmx: movq 16*3(%esi), %mm5 # v3 movq 16*4(%esi), %mm7 # v4 +#ifdef __PIC__ + movq %mm7, scratch1 at GOTOFF(%ebp) # scratch1: v4 ; +#else movq %mm7, scratch1 # scratch1: v4 ; +#endif movq %mm5, %mm7 # duplicate v3 +#ifdef __PIC__ + paddw scratch1 at GOTOFF(%ebp), %mm5 # v03: v3+v4 + psubw scratch1 at GOTOFF(%ebp), %mm7 # v04: v3-v4 + movq %mm5, scratch2 at GOTOFF(%ebp) # scratch2: v03 +#else paddw scratch1, %mm5 # v03: v3+v4 psubw scratch1, %mm7 # v04: v3-v4 movq %mm5, scratch2 # scratch2: v03 +#endif movq %mm0, %mm5 # mm5: v00 +#ifdef __PIC__ + paddw scratch2 at GOTOFF(%ebp), %mm0 # v10: v00+v03 + psubw scratch2 at GOTOFF(%ebp), %mm5 # v13: v00-v03 + movq %mm3, scratch3 at GOTOFF(%ebp) # scratc3: v02 +#else paddw scratch2, %mm0 # v10: v00+v03 psubw scratch2, %mm5 # v13: v00-v03 movq %mm3, scratch3 # scratc3: v02 +#endif movq %mm1, %mm3 # duplicate v01 +#ifdef __PIC__ + paddw scratch3 at GOTOFF(%ebp), %mm1 # v11: v01+v02 + psubw scratch3 at GOTOFF(%ebp), %mm3 # v12: v01-v02 + + movq %mm6, scratch4 at GOTOFF(%ebp) # scratc4: v05 +#else paddw scratch3, %mm1 # v11: v01+v02 psubw scratch3, %mm3 # v12: v01-v02 movq %mm6, scratch4 # scratc4: v05 +#endif movq %mm0, %mm6 # duplicate v10 paddw %mm1, %mm0 # v10+v11 @@ -213,10 +296,18 @@ _dv_dct_88_block_mmx: movq %mm6, 16*4(%esi) # out4: v10-v11 movq %mm4, %mm0 # mm0: v06 +#ifdef __PIC__ + paddw scratch4 at GOTOFF(%ebp), %mm4 # v15: v05+v06 +#else paddw scratch4, %mm4 # v15: v05+v06 +#endif paddw %mm2, %mm0 # v16: v07+v06 +#ifdef __PIC__ + pmulhw WA3 at GOTOFF(%ebp), %mm4 # v35~: WA3*v15 +#else pmulhw WA3, %mm4 # v35~: WA3*v15 +#endif psllw $16-NSHIFT, %mm4 # v35: compensate the coeefient scale movq %mm4, %mm6 # duplicate v35 @@ -225,7 +316,11 @@ _dv_dct_88_block_mmx: paddw %mm5, %mm3 # v22: v12+v13 +#ifdef __PIC__ + pmulhw WA1 at GOTOFF(%ebp), %mm3 # v32~: WA3*v15 +#else pmulhw WA1, %mm3 # v32~: WA3*v15 +#endif psllw $16-NSHIFT, %mm3 # v32: compensate the coeefient scale movq %mm5, %mm6 # duplicate v13 @@ -235,13 +330,23 @@ _dv_dct_88_block_mmx: movq %mm5, 16*2(%esi) # out2: v13+v32 movq %mm6, 16*6(%esi) # out6: v13-v32 +#ifdef __PIC__ + paddw scratch4 at GOTOFF(%ebp), %mm7 # v14n: v04+v05 +#else paddw scratch4, %mm7 # v14n: v04+v05 +#endif movq %mm0, %mm5 # duplicate v16 psubw %mm7, %mm0 # va1: v16-v14n +#ifdef __PIC__ + pmulhw WA2 at GOTOFF(%ebp), %mm7 # v34~~: v14n*WA2 + pmulhw WA5 at GOTOFF(%ebp), %mm0 # va0~: va1*WA5 + pmulhw WA4 at GOTOFF(%ebp), %mm5 # v36~~: v16*WA4 +#else pmulhw WA2, %mm7 # v34~~: v14n*WA2 pmulhw WA5, %mm0 # va0~: va1*WA5 pmulhw WA4, %mm5 # v36~~: v16*WA4 +#endif psllw $16-NSHIFT, %mm7 psllw $16-WA4_SHIFT, %mm5 # v36: compensate the coeffient # scale note that WA4 is shifted 1 bit less than the others @@ -751,11 +856,15 @@ _dv_dct_block_mmx_postscale_88: _dv_dct_248_block_mmx: pushl %ebp - movl %esp, %ebp pushl %esi pushl %edi - movl 8(%ebp), %esi # source +#ifdef __PIC__ + call __i686.get_pc_thunk.bp + addl $_GLOBAL_OFFSET_TABLE_, %ebp +#endif + + movl 16(%ebp), %esi # source # column 0 @@ -779,7 +888,11 @@ _dv_dct_248_block_mmx: paddw %mm1, %mm0 # v20: v10+v11 psubw %mm1, %mm3 # v21: v10-v11 +#ifdef __PIC__ + pmulhw WA1 at GOTOFF(%ebp), %mm5 # v32~: WA1*v22 +#else pmulhw WA1, %mm5 # v32~: WA1*v22 +#endif movq %mm4, %mm2 psllw $16-NSHIFT, %mm5 # v32: compensate the coeffient scale @@ -818,7 +931,11 @@ _dv_dct_248_block_mmx: paddw %mm1, %mm0 # v20: v10+v11 psubw %mm1, %mm3 # v21: v10-v11 +#ifdef __PIC__ + pmulhw WA1 at GOTOFF(%ebp), %mm5 # v32~: WA1*v22 +#else pmulhw WA1, %mm5 # v32~: WA1*v22 +#endif movq %mm4, %mm2 psllw $16-NSHIFT, %mm5 # v32: compensate the coeffient scale @@ -855,7 +972,11 @@ _dv_dct_248_block_mmx: paddw %mm1, %mm0 # v20: v10+v11 psubw %mm1, %mm3 # v21: v10-v11 +#ifdef __PIC__ + pmulhw WA1 at GOTOFF(%ebp), %mm5 # v32~: WA1*v22 +#else pmulhw WA1, %mm5 # v32~: WA1*v22 +#endif movq %mm4, %mm2 psllw $16-NSHIFT, %mm5 # v32: compensate the coeffient scale @@ -892,7 +1013,11 @@ _dv_dct_248_block_mmx: paddw %mm1, %mm0 # v20: v10+v11 psubw %mm1, %mm3 # v21: v10-v11 +#ifdef __PIC__ + pmulhw WA1 at GOTOFF(%ebp), %mm5 # v32~: WA1*v22 +#else pmulhw WA1, %mm5 # v32~: WA1*v22 +#endif movq %mm4, %mm2 psllw $16-NSHIFT, %mm5 # v32: compensate the coeffient scale diff -Naupr libdv-0.104.orig/libdv/dv.c libdv-0.104/libdv/dv.c --- libdv-0.104.orig/libdv/dv.c 2004-10-20 05:49:24.000000000 +0200 +++ libdv-0.104/libdv/dv.c 2006-02-16 12:44:37.000000000 +0100 @@ -205,6 +205,9 @@ dv_reconfigure(int clamp_luma, int clamp } /* dv_reconfigure */ +extern uint8_t dv_quant_offset[4]; +extern uint8_t dv_quant_shifts[22][4]; + static inline void dv_decode_macroblock(dv_decoder_t *dv, dv_macroblock_t *mb, unsigned int quality) { int i; @@ -218,7 +221,7 @@ dv_decode_macroblock(dv_decoder_t *dv, d dv_idct_248 (co248, mb->b[i].coeffs); } else { #if ARCH_X86 - _dv_quant_88_inverse_x86(mb->b[i].coeffs,mb->qno,mb->b[i].class_no); + _dv_quant_88_inverse_x86(mb->b[i].coeffs,mb->qno,mb->b[i].class_no,dv_quant_offset,dv_quant_shifts); _dv_idct_88(mb->b[i].coeffs); #elif ARCH_X86_64 _dv_quant_88_inverse_x86_64(mb->b[i].coeffs,mb->qno,mb->b[i].class_no); @@ -250,7 +253,7 @@ dv_decode_video_segment(dv_decoder_t *dv dv_idct_248 (co248, mb->b[b].coeffs); } else { #if ARCH_X86 - _dv_quant_88_inverse_x86(bl->coeffs,mb->qno,bl->class_no); + _dv_quant_88_inverse_x86(bl->coeffs,mb->qno,bl->class_no,dv_quant_offset,dv_quant_shifts); _dv_weight_88_inverse(bl->coeffs); _dv_idct_88(bl->coeffs); #elif ARCH_X86_64 diff -Naupr libdv-0.104.orig/libdv/encode.c libdv-0.104/libdv/encode.c --- libdv-0.104.orig/libdv/encode.c 2004-11-17 04:36:30.000000000 +0100 +++ libdv-0.104/libdv/encode.c 2006-02-16 12:44:37.000000000 +0100 @@ -521,7 +521,8 @@ static void reorder_block(dv_block_t *bl } extern unsigned long _dv_vlc_encode_block_mmx(dv_coeff_t* coeffs, - dv_vlc_entry_t ** out); + dv_vlc_entry_t ** out, + dv_vlc_entry_t * lookup); extern unsigned long _dv_vlc_encode_block_mmx_x86_64(dv_coeff_t* coeffs, dv_vlc_entry_t ** out); @@ -558,7 +559,7 @@ static unsigned long vlc_encode_block(dv #elif ARCH_X86 int num_bits; - num_bits = _dv_vlc_encode_block_mmx(coeffs, &o); + num_bits = _dv_vlc_encode_block_mmx(coeffs, &o, vlc_encode_lookup); emms(); #else int num_bits; @@ -574,7 +575,7 @@ static unsigned long vlc_encode_block(dv return num_bits; } -extern unsigned long _dv_vlc_num_bits_block_x86(dv_coeff_t* coeffs); +extern unsigned long _dv_vlc_num_bits_block_x86(dv_coeff_t* coeffs, unsigned char* lookup); extern unsigned long _dv_vlc_num_bits_block_x86_64(dv_coeff_t* coeffs); extern unsigned long _dv_vlc_num_bits_block(dv_coeff_t* coeffs) @@ -600,7 +601,7 @@ extern unsigned long _dv_vlc_num_bits_bl #elif ARCH_X86_64 return _dv_vlc_num_bits_block_x86_64(coeffs); #else - return _dv_vlc_num_bits_block_x86(coeffs); + return _dv_vlc_num_bits_block_x86(coeffs, vlc_num_bits_lookup); #endif } diff -Naupr libdv-0.104.orig/libdv/encode_x86.S libdv-0.104/libdv/encode_x86.S --- libdv-0.104.orig/libdv/encode_x86.S 2003-10-20 21:46:50.000000000 +0200 +++ libdv-0.104/libdv/encode_x86.S 2006-02-16 12:44:37.000000000 +0100 @@ -23,10 +23,6 @@ * The libdv homepage is http://libdv.sourceforge.net/. */ -.data -ALLONE: .word 1,1,1,1 -VLCADDMASK: .byte 255,0,0,0,255,0,0,0 - .text .global _dv_vlc_encode_block_mmx @@ -45,11 +41,14 @@ _dv_vlc_encode_block_mmx: movl $63, %ecx - movl vlc_encode_lookup, %esi + movl 4+4*4+8(%esp), %esi # vlc_encode_lookup pxor %mm0, %mm0 pxor %mm2, %mm2 - movq VLCADDMASK, %mm1 + pushl $0x000000FF + pushl $0x000000FF + movq (%esp), %mm1 + addl $8, %esp xorl %ebp, %ebp subl $8, %edx vlc_encode_block_mmx_loop: @@ -121,7 +120,7 @@ _dv_vlc_num_bits_block_x86: addl $2, %edi movl $63, %ecx - movl vlc_num_bits_lookup, %esi + movl 4+4*4+4(%esp), %esi # vlc_num_bits_lookup vlc_num_bits_block_x86_loop: movw (%edi), %ax @@ -579,8 +578,11 @@ _dv_need_dct_248_mmx_rows: paddw %mm5, %mm1 paddw %mm1, %mm0 - - pmaddwd ALLONE, %mm0 + + pushl $0x00010001 + pushl $0x00010001 + pmaddwd (%esp), %mm0 + addl $8, %esp movq %mm0, %mm1 psrlq $32, %mm1 paddd %mm1, %mm0 diff -Naupr libdv-0.104.orig/libdv/idct_block_mmx.S libdv-0.104/libdv/idct_block_mmx.S --- libdv-0.104.orig/libdv/idct_block_mmx.S 2003-01-01 00:04:02.000000000 +0100 +++ libdv-0.104/libdv/idct_block_mmx.S 2006-02-16 12:44:37.000000000 +0100 @@ -8,16 +8,37 @@ +#ifdef __PIC__ +# undef __i686 /* gcc define gets in our way */ + .section .gnu.linkonce.t.__i686.get_pc_thunk.bp,"ax", at progbits +.globl __i686.get_pc_thunk.bp + .hidden __i686.get_pc_thunk.bp + .type __i686.get_pc_thunk.bp, at function +__i686.get_pc_thunk.bp: + movl (%esp), %ebp + ret +#endif + .text + .align 4 .globl _dv_idct_block_mmx .type _dv_idct_block_mmx, at function _dv_idct_block_mmx: pushl %ebp - movl %esp,%ebp pushl %esi + +#ifdef __PIC__ + call __i686.get_pc_thunk.bp + addl $_GLOBAL_OFFSET_TABLE_, %ebp +#endif + +#ifdef __PIC__ + leal preSC at GOTOFF(%ebp), %ecx +#else leal preSC, %ecx - movl 8(%ebp),%esi /* source matrix */ +#endif + movl 12(%esp),%esi /* source matrix */ /* * column 0: even part @@ -35,7 +56,11 @@ _dv_idct_block_mmx: movq %mm1, %mm2 /* added 11/1/96 */ pmulhw 8*8(%esi),%mm5 /* V8 */ psubsw %mm0, %mm1 /* V16 */ +#ifdef __PIC__ + pmulhw x5a825a825a825a82 at GOTOFF(%ebp), %mm1 /* 23170 ->V18 */ +#else pmulhw x5a825a825a825a82, %mm1 /* 23170 ->V18 */ +#endif paddsw %mm0, %mm2 /* V17 */ movq %mm2, %mm0 /* duplicate V17 */ psraw $1, %mm2 /* t75=t82 */ @@ -76,7 +101,11 @@ _dv_idct_block_mmx: paddsw %mm0, %mm3 /* V29 ; free mm0 */ movq %mm7, %mm1 /* duplicate V26 */ psraw $1, %mm3 /* t91=t94 */ +#ifdef __PIC__ + pmulhw x539f539f539f539f at GOTOFF(%ebp),%mm7 /* V33 */ +#else pmulhw x539f539f539f539f,%mm7 /* V33 */ +#endif psraw $1, %mm1 /* t96 */ movq %mm5, %mm0 /* duplicate V2 */ psraw $2, %mm4 /* t85=t87 */ @@ -84,15 +113,27 @@ _dv_idct_block_mmx: psubsw %mm4, %mm0 /* V28 ; free mm4 */ movq %mm0, %mm2 /* duplicate V28 */ psraw $1, %mm5 /* t90=t93 */ +#ifdef __PIC__ + pmulhw x4546454645464546 at GOTOFF(%ebp),%mm0 /* V35 */ +#else pmulhw x4546454645464546,%mm0 /* V35 */ +#endif psraw $1, %mm2 /* t97 */ movq %mm5, %mm4 /* duplicate t90=t93 */ psubsw %mm2, %mm1 /* V32 ; free mm2 */ +#ifdef __PIC__ + pmulhw x61f861f861f861f8 at GOTOFF(%ebp),%mm1 /* V36 */ +#else pmulhw x61f861f861f861f8,%mm1 /* V36 */ +#endif psllw $1, %mm7 /* t107 */ paddsw %mm3, %mm5 /* V31 */ psubsw %mm3, %mm4 /* V30 ; free mm3 */ +#ifdef __PIC__ + pmulhw x5a825a825a825a82 at GOTOFF(%ebp),%mm4 /* V34 */ +#else pmulhw x5a825a825a825a82,%mm4 /* V34 */ +#endif nop psubsw %mm1, %mm0 /* V38 */ psubsw %mm7, %mm1 /* V37 ; free mm7 */ @@ -159,7 +200,11 @@ _dv_idct_block_mmx: psubsw %mm7, %mm1 /* V50 */ pmulhw 8*9(%esi), %mm5 /* V9 */ paddsw %mm7, %mm2 /* V51 */ +#ifdef __PIC__ + pmulhw x5a825a825a825a82 at GOTOFF(%ebp), %mm1 /* 23170 ->V52 */ +#else pmulhw x5a825a825a825a82, %mm1 /* 23170 ->V52 */ +#endif movq %mm2, %mm6 /* duplicate V51 */ psraw $1, %mm2 /* t138=t144 */ movq %mm3, %mm4 /* duplicate V1 */ @@ -200,11 +245,19 @@ _dv_idct_block_mmx: * even more by doing the correction step in a later stage when the number * is actually multiplied by 16 */ +#ifdef __PIC__ + paddw x0005000200010001 at GOTOFF(%ebp), %mm4 +#else paddw x0005000200010001, %mm4 +#endif psubsw %mm6, %mm3 /* V60 ; free mm6 */ psraw $1, %mm0 /* t154=t156 */ movq %mm3, %mm1 /* duplicate V60 */ +#ifdef __PIC__ + pmulhw x539f539f539f539f at GOTOFF(%ebp), %mm1 /* V67 */ +#else pmulhw x539f539f539f539f, %mm1 /* V67 */ +#endif movq %mm5, %mm6 /* duplicate V3 */ psraw $2, %mm4 /* t148=t150 */ paddsw %mm4, %mm5 /* V61 */ @@ -213,13 +266,25 @@ _dv_idct_block_mmx: psllw $1, %mm1 /* t169 */ paddsw %mm0, %mm5 /* V65 -> result */ psubsw %mm0, %mm4 /* V64 ; free mm0 */ +#ifdef __PIC__ + pmulhw x5a825a825a825a82 at GOTOFF(%ebp), %mm4 /* V68 */ +#else pmulhw x5a825a825a825a82, %mm4 /* V68 */ +#endif psraw $1, %mm3 /* t158 */ psubsw %mm6, %mm3 /* V66 */ movq %mm5, %mm2 /* duplicate V65 */ +#ifdef __PIC__ + pmulhw x61f861f861f861f8 at GOTOFF(%ebp), %mm3 /* V70 */ +#else pmulhw x61f861f861f861f8, %mm3 /* V70 */ +#endif psllw $1, %mm6 /* t165 */ +#ifdef __PIC__ + pmulhw x4546454645464546 at GOTOFF(%ebp), %mm6 /* V69 */ +#else pmulhw x4546454645464546, %mm6 /* V69 */ +#endif psraw $1, %mm2 /* t172 */ /* moved from next block */ movq 8*5(%esi), %mm0 /* V56 */ @@ -344,7 +409,11 @@ _dv_idct_block_mmx: * movq 8*13(%esi), %mm4 tmt13 */ psubsw %mm4, %mm3 /* V134 */ +#ifdef __PIC__ + pmulhw x5a825a825a825a82 at GOTOFF(%ebp), %mm3 /* 23170 ->V136 */ +#else pmulhw x5a825a825a825a82, %mm3 /* 23170 ->V136 */ +#endif movq 8*9(%esi), %mm6 /* tmt9 */ paddsw %mm4, %mm5 /* V135 ; mm4 free */ movq %mm0, %mm4 /* duplicate tmt1 */ @@ -373,17 +442,33 @@ _dv_idct_block_mmx: psubsw %mm7, %mm0 /* V144 */ movq %mm0, %mm3 /* duplicate V144 */ paddsw %mm7, %mm2 /* V147 ; free mm7 */ +#ifdef __PIC__ + pmulhw x539f539f539f539f at GOTOFF(%ebp), %mm0 /* 21407-> V151 */ +#else pmulhw x539f539f539f539f, %mm0 /* 21407-> V151 */ +#endif movq %mm1, %mm7 /* duplicate tmt3 */ paddsw %mm5, %mm7 /* V145 */ psubsw %mm5, %mm1 /* V146 ; free mm5 */ psubsw %mm1, %mm3 /* V150 */ movq %mm7, %mm5 /* duplicate V145 */ +#ifdef __PIC__ + pmulhw x4546454645464546 at GOTOFF(%ebp), %mm1 /* 17734-> V153 */ +#else pmulhw x4546454645464546, %mm1 /* 17734-> V153 */ +#endif psubsw %mm2, %mm5 /* V148 */ +#ifdef __PIC__ + pmulhw x61f861f861f861f8 at GOTOFF(%ebp), %mm3 /* 25080-> V154 */ +#else pmulhw x61f861f861f861f8, %mm3 /* 25080-> V154 */ +#endif psllw $2, %mm0 /* t311 */ +#ifdef __PIC__ + pmulhw x5a825a825a825a82 at GOTOFF(%ebp), %mm5 /* 23170-> V152 */ +#else pmulhw x5a825a825a825a82, %mm5 /* 23170-> V152 */ +#endif paddsw %mm2, %mm7 /* V149 ; free mm2 */ psllw $1, %mm1 /* t313 */ nop /* without the nop - freeze here for one clock */ @@ -409,7 +494,11 @@ _dv_idct_block_mmx: paddsw %mm3, %mm6 /* V164 ; free mm3 */ movq %mm4, %mm3 /* duplicate V142 */ psubsw %mm5, %mm4 /* V165 ; free mm5 */ +#ifdef __PIC__ + movq %mm2, scratch7 at GOTOFF(%ebp) /* out7 */ +#else movq %mm2, scratch7 /* out7 */ +#endif psraw $4, %mm6 psraw $4, %mm4 paddsw %mm5, %mm3 /* V162 */ @@ -420,11 +509,19 @@ _dv_idct_block_mmx: */ movq %mm6, 8*9(%esi) /* out9 */ paddsw %mm1, %mm0 /* V161 */ +#ifdef __PIC__ + movq %mm3, scratch5 at GOTOFF(%ebp) /* out5 */ +#else movq %mm3, scratch5 /* out5 */ +#endif psubsw %mm1, %mm5 /* V166 ; free mm1 */ movq %mm4, 8*11(%esi) /* out11 */ psraw $4, %mm5 +#ifdef __PIC__ + movq %mm0, scratch3 at GOTOFF(%ebp) /* out3 */ +#else movq %mm0, scratch3 /* out3 */ +#endif movq %mm2, %mm4 /* duplicate V140 */ movq %mm5, 8*13(%esi) /* out13 */ paddsw %mm7, %mm2 /* V160 */ @@ -434,7 +531,11 @@ _dv_idct_block_mmx: /* moved from the next block */ movq 8*3(%esi), %mm7 psraw $4, %mm4 +#ifdef __PIC__ + movq %mm2, scratch1 at GOTOFF(%ebp) /* out1 */ +#else movq %mm2, scratch1 /* out1 */ +#endif /* moved from the next block */ movq %mm0, %mm1 movq %mm4, 8*15(%esi) /* out15 */ @@ -491,15 +592,31 @@ _dv_idct_block_mmx: paddsw %mm4, %mm3 /* V113 ; free mm4 */ movq %mm0, %mm4 /* duplicate V110 */ paddsw %mm1, %mm2 /* V111 */ +#ifdef __PIC__ + pmulhw x539f539f539f539f at GOTOFF(%ebp), %mm0 /* 21407-> V117 */ +#else pmulhw x539f539f539f539f, %mm0 /* 21407-> V117 */ +#endif psubsw %mm1, %mm5 /* V112 ; free mm1 */ psubsw %mm5, %mm4 /* V116 */ movq %mm2, %mm1 /* duplicate V111 */ +#ifdef __PIC__ + pmulhw x4546454645464546 at GOTOFF(%ebp), %mm5 /* 17734-> V119 */ +#else pmulhw x4546454645464546, %mm5 /* 17734-> V119 */ +#endif psubsw %mm3, %mm2 /* V114 */ +#ifdef __PIC__ + pmulhw x61f861f861f861f8 at GOTOFF(%ebp), %mm4 /* 25080-> V120 */ +#else pmulhw x61f861f861f861f8, %mm4 /* 25080-> V120 */ +#endif paddsw %mm3, %mm1 /* V115 ; free mm3 */ +#ifdef __PIC__ + pmulhw x5a825a825a825a82 at GOTOFF(%ebp), %mm2 /* 23170-> V118 */ +#else pmulhw x5a825a825a825a82, %mm2 /* 23170-> V118 */ +#endif psllw $2, %mm0 /* t266 */ movq %mm1, (%esi) /* save V115 */ psllw $1, %mm5 /* t268 */ @@ -517,7 +634,11 @@ _dv_idct_block_mmx: movq %mm6, %mm3 /* duplicate tmt4 */ psubsw %mm0, %mm6 /* V100 */ paddsw %mm0, %mm3 /* V101 ; free mm0 */ +#ifdef __PIC__ + pmulhw x5a825a825a825a82 at GOTOFF(%ebp), %mm6 /* 23170 ->V102 */ +#else pmulhw x5a825a825a825a82, %mm6 /* 23170 ->V102 */ +#endif movq %mm7, %mm5 /* duplicate tmt0 */ movq 8*8(%esi), %mm1 /* tmt8 */ paddsw %mm1, %mm7 /* V103 */ @@ -551,10 +672,18 @@ _dv_idct_block_mmx: movq 8*2(%esi), %mm3 /* V123 */ paddsw %mm4, %mm7 /* out0 */ /* moved up from next block */ +#ifdef __PIC__ + movq scratch3 at GOTOFF(%ebp), %mm0 +#else movq scratch3, %mm0 +#endif psraw $4, %mm7 /* moved up from next block */ +#ifdef __PIC__ + movq scratch5 at GOTOFF(%ebp), %mm6 +#else movq scratch5, %mm6 +#endif psubsw %mm4, %mm1 /* out14 ; free mm4 */ paddsw %mm3, %mm5 /* out2 */ psraw $4, %mm1 @@ -565,7 +694,11 @@ _dv_idct_block_mmx: movq %mm5, 8*2(%esi) /* out2 ; free mm5 */ psraw $4, %mm2 /* moved up to the prev block */ +#ifdef __PIC__ + movq scratch7 at GOTOFF(%ebp), %mm4 +#else movq scratch7, %mm4 +#endif /* moved up to the prev block */ psraw $4, %mm0 movq %mm2, 8*12(%esi) /* out12 ; free mm2 */ @@ -579,7 +712,11 @@ _dv_idct_block_mmx: * psraw $4, %mm0 * psraw $4, %mm6 */ +#ifdef __PIC__ + movq scratch1 at GOTOFF(%ebp), %mm1 +#else movq scratch1, %mm1 +#endif psraw $4, %mm4 movq %mm0, 8*3(%esi) /* out3 */ psraw $4, %mm1 diff -Naupr libdv-0.104.orig/libdv/quant.c libdv-0.104/libdv/quant.c --- libdv-0.104.orig/libdv/quant.c 2004-10-20 05:49:24.000000000 +0200 +++ libdv-0.104/libdv/quant.c 2006-02-16 12:44:48.000000000 +0100 @@ -144,7 +144,7 @@ uint8_t dv_quant_offset[4] = { 6,3,0,1 uint32_t dv_quant_248_mul_tab [2] [22] [64]; uint32_t dv_quant_88_mul_tab [2] [22] [64]; -extern void _dv_quant_x86(dv_coeff_t *block,int qno,int klass); +extern void _dv_quant_x86(dv_coeff_t *block,int qno,int klass,uint8_t *dv_quant_offset,uint8_t **dv_quant_shifts); extern void _dv_quant_x86_64(dv_coeff_t *block,int qno,int klass); static void quant_248_inverse_std(dv_coeff_t *block,int qno,int klass,dv_248_coeff_t *co); static void quant_248_inverse_mmx(dv_coeff_t *block,int qno,int klass,dv_248_coeff_t *co); @@ -210,7 +210,7 @@ void _dv_quant(dv_coeff_t *block,int qno _dv_quant_x86_64(block, qno, klass); emms(); #else - _dv_quant_x86(block, qno, klass); + _dv_quant_x86(block, qno, klass, dv_quant_offset, dv_quant_shifts); emms(); #endif } diff -Naupr libdv-0.104.orig/libdv/quant.h libdv-0.104/libdv/quant.h --- libdv-0.104.orig/libdv/quant.h 2004-10-20 05:49:24.000000000 +0200 +++ libdv-0.104/libdv/quant.h 2006-02-16 12:44:48.000000000 +0100 @@ -27,7 +27,7 @@ extern void _dv_quant(dv_coeff_t *block, extern void _dv_quant_88_inverse(dv_coeff_t *block,int qno,int klass); extern void (*_dv_quant_248_inverse) (dv_coeff_t *block,int qno,int klass, dv_248_coeff_t *co); -extern void _dv_quant_88_inverse_x86(dv_coeff_t *block,int qno,int klass); +extern void _dv_quant_88_inverse_x86(dv_coeff_t *block,int qno,int klass, uint8_t *offset, uint8_t **shifts); extern void _dv_quant_88_inverse_x86_64(dv_coeff_t *block,int qno,int klass); extern void dv_quant_init (void); #ifdef __cplusplus diff -Naupr libdv-0.104.orig/libdv/quant_x86.S libdv-0.104/libdv/quant_x86.S --- libdv-0.104.orig/libdv/quant_x86.S 2003-10-20 21:46:50.000000000 +0200 +++ libdv-0.104/libdv/quant_x86.S 2006-02-16 12:44:37.000000000 +0100 @@ -71,10 +71,13 @@ _dv_quant_88_inverse_x86: /* pq = dv_quant_shifts[qno + dv_quant_offset[class]]; */ movl ARGn(1),%eax /* qno */ + movl ARGn(3),%ebx /* dv_quant_offset */ + addl ARGn(2),%ebx /* class */ + movzbl (%ebx),%ecx movl ARGn(2),%ebx /* class */ - movzbl dv_quant_offset(%ebx),%ecx addl %ecx,%eax - leal dv_quant_shifts(,%eax,4),%edx /* edx is pq */ + movl ARGn(4),%edx /* dv_quant_shifts */ + leal (%edx,%eax,4),%edx /* edx is pq */ /* extra = (class == 3); */ /* 0 1 2 3 */ @@ -212,11 +215,13 @@ _dv_quant_x86: /* pq = dv_quant_shifts[qno + dv_quant_offset[class]]; */ movl ARGn(1),%eax /* qno */ + movl ARGn(3),%ebx /* offset */ + addl ARGn(2),%ebx /* class */ + movzbl (%ebx),%ecx movl ARGn(2),%ebx /* class */ - - movzbl dv_quant_offset(%ebx),%ecx + movl ARGn(4),%edx /* shifts */ addl %ecx,%eax - leal dv_quant_shifts(,%eax,4),%edx /* edx is pq */ + leal (%edx,%eax,4),%edx /* edx is pq */ /* extra = (class == 3); */ /* 0 1 2 3 */ diff -Naupr libdv-0.104.orig/libdv/rgbtoyuv.S libdv-0.104/libdv/rgbtoyuv.S --- libdv-0.104.orig/libdv/rgbtoyuv.S 2003-10-20 21:46:50.000000000 +0200 +++ libdv-0.104/libdv/rgbtoyuv.S 2006-02-16 12:44:37.000000000 +0100 @@ -110,20 +110,30 @@ VR0GR: .long 0,0 VBG0B: .long 0,0 #endif - + +#ifdef __PIC__ +# undef __i686 /* gcc define gets in our way */ + .section .gnu.linkonce.t.__i686.get_pc_thunk.bp,"ax", at progbits +.globl __i686.get_pc_thunk.bp + .hidden __i686.get_pc_thunk.bp + .type __i686.get_pc_thunk.bp, at function +__i686.get_pc_thunk.bp: + movl (%esp), %ebp + ret +#endif + .text -#define _inPtr 8 -#define _rows 12 -#define _columns 16 -#define _outyPtr 20 -#define _outuPtr 24 -#define _outvPtr 28 +#define _inPtr 24+8 +#define _rows 24+12 +#define _columns 24+16 +#define _outyPtr 24+20 +#define _outuPtr 24+24 +#define _outvPtr 24+28 _dv_rgbtoycb_mmx: pushl %ebp - movl %esp, %ebp pushl %eax pushl %ebx pushl %ecx @@ -131,46 +141,103 @@ _dv_rgbtoycb_mmx: pushl %esi pushl %edi +#ifdef __PIC__ + call __i686.get_pc_thunk.bp + addl $_GLOBAL_OFFSET_TABLE_, %ebp +#endif + +#ifdef __PIC__ + leal ZEROSX at GOTOFF(%ebp), %eax #This section gets around a bug +#else leal ZEROSX, %eax #This section gets around a bug +#endif movq (%eax), %mm0 #unlikely to persist +#ifdef __PIC__ + movq %mm0, ZEROS at GOTOFF(%ebp) + leal OFFSETDX at GOTOFF(%ebp), %eax +#else movq %mm0, ZEROS leal OFFSETDX, %eax +#endif movq (%eax), %mm0 +#ifdef __PIC__ + movq %mm0, OFFSETD at GOTOFF(%ebp) + leal OFFSETWX at GOTOFF(%ebp), %eax +#else movq %mm0, OFFSETD leal OFFSETWX, %eax +#endif movq (%eax), %mm0 +#ifdef __PIC__ + movq %mm0, OFFSETW at GOTOFF(%ebp) + leal OFFSETBX at GOTOFF(%ebp), %eax +#else movq %mm0, OFFSETW leal OFFSETBX, %eax +#endif movq (%eax), %mm0 +#ifdef __PIC__ + movq %mm0, OFFSETB at GOTOFF(%ebp) + leal YR0GRX at GOTOFF(%ebp), %eax +#else movq %mm0, OFFSETB leal YR0GRX, %eax +#endif movq (%eax), %mm0 +#ifdef __PIC__ + movq %mm0, YR0GR at GOTOFF(%ebp) + leal YBG0BX at GOTOFF(%ebp), %eax +#else movq %mm0, YR0GR leal YBG0BX, %eax +#endif movq (%eax), %mm0 +#ifdef __PIC__ + movq %mm0, YBG0B at GOTOFF(%ebp) + leal UR0GRX at GOTOFF(%ebp), %eax +#else movq %mm0, YBG0B leal UR0GRX, %eax +#endif movq (%eax), %mm0 +#ifdef __PIC__ + movq %mm0, UR0GR at GOTOFF(%ebp) + leal UBG0BX at GOTOFF(%ebp), %eax +#else movq %mm0, UR0GR leal UBG0BX, %eax +#endif movq (%eax), %mm0 +#ifdef __PIC__ + movq %mm0, UBG0B at GOTOFF(%ebp) + leal VR0GRX at GOTOFF(%ebp), %eax +#else movq %mm0, UBG0B leal VR0GRX, %eax +#endif movq (%eax), %mm0 +#ifdef __PIC__ + movq %mm0, VR0GR at GOTOFF(%ebp) + leal VBG0BX at GOTOFF(%ebp), %eax +#else movq %mm0, VR0GR leal VBG0BX, %eax +#endif movq (%eax), %mm0 +#ifdef __PIC__ + movq %mm0, VBG0B at GOTOFF(%ebp) +#else movq %mm0, VBG0B - - movl _rows(%ebp), %eax - movl _columns(%ebp), %ebx +#endif + movl _rows(%esp), %eax + movl _columns(%esp), %ebx mull %ebx #number pixels shrl $3, %eax #number of loops movl %eax, %edi #loop counter in edi - movl _inPtr(%ebp), %eax - movl _outyPtr(%ebp), %ebx - movl _outuPtr(%ebp), %ecx - movl _outvPtr(%ebp), %edx + movl _inPtr(%esp), %eax + movl _outyPtr(%esp), %ebx + movl _outuPtr(%esp), %ecx + movl _outvPtr(%esp), %edx rgbtoycb_mmx_loop: movq (%eax), %mm1 #load G2R2B1G1R1B0G0R0 pxor %mm6, %mm6 #0 -> mm6 @@ -184,29 +251,57 @@ rgbtoycb_mmx_loop: punpcklbw %mm6, %mm1 #B1G1R1B0 -> mm1 movq %mm0, %mm2 #R1B0G0R0 -> mm2 +#ifdef __PIC__ + pmaddwd YR0GR at GOTOFF(%ebp), %mm0 #yrR1,ygG0+yrR0 -> mm0 +#else pmaddwd YR0GR, %mm0 #yrR1,ygG0+yrR0 -> mm0 +#endif movq %mm1, %mm3 #B1G1R1B0 -> mm3 +#ifdef __PIC__ + pmaddwd YBG0B at GOTOFF(%ebp), %mm1 #ybB1+ygG1,ybB0 -> mm1 +#else pmaddwd YBG0B, %mm1 #ybB1+ygG1,ybB0 -> mm1 +#endif movq %mm2, %mm4 #R1B0G0R0 -> mm4 +#ifdef __PIC__ + pmaddwd UR0GR at GOTOFF(%ebp), %mm2 #urR1,ugG0+urR0 -> mm2 +#else pmaddwd UR0GR, %mm2 #urR1,ugG0+urR0 -> mm2 +#endif movq %mm3, %mm5 #B1G1R1B0 -> mm5 +#ifdef __PIC__ + pmaddwd UBG0B at GOTOFF(%ebp), %mm3 #ubB1+ugG1,ubB0 -> mm3 +#else pmaddwd UBG0B, %mm3 #ubB1+ugG1,ubB0 -> mm3 +#endif punpckhbw %mm6, %mm7 # 00G2R2 -> mm7 +#ifdef __PIC__ + pmaddwd VR0GR at GOTOFF(%ebp), %mm4 #vrR1,vgG0+vrR0 -> mm4 +#else pmaddwd VR0GR, %mm4 #vrR1,vgG0+vrR0 -> mm4 +#endif paddd %mm1, %mm0 #Y1Y0 -> mm0 +#ifdef __PIC__ + pmaddwd VBG0B at GOTOFF(%ebp), %mm5 #vbB1+vgG1,vbB0 -> mm5 +#else pmaddwd VBG0B, %mm5 #vbB1+vgG1,vbB0 -> mm5 +#endif movq 8(%eax), %mm1 #R5B4G4R4B3G3R3B2 -> mm1 paddd %mm3, %mm2 #U1U0 -> mm2 movq %mm1, %mm6 #R5B4G4R4B3G3R3B2 -> mm6 +#ifdef __PIC__ + punpcklbw ZEROS at GOTOFF(%ebp), %mm1 #B3G3R3B2 -> mm1 +#else punpcklbw ZEROS, %mm1 #B3G3R3B2 -> mm1 +#endif paddd %mm5, %mm4 #V1V0 -> mm4 movq %mm1, %mm5 #B3G3R3B2 -> mm5 @@ -214,29 +309,61 @@ rgbtoycb_mmx_loop: paddd %mm7, %mm1 #R3B200+00G2R2=R3B2G2R2->mm1 +#ifdef __PIC__ + punpckhbw ZEROS at GOTOFF(%ebp), %mm6 #R5B4G4R3 -> mm6 +#else punpckhbw ZEROS, %mm6 #R5B4G4R3 -> mm6 +#endif movq %mm1, %mm3 #R3B2G2R2 -> mm3 +#ifdef __PIC__ + pmaddwd YR0GR at GOTOFF(%ebp), %mm1 #yrR3,ygG2+yrR2 -> mm1 +#else pmaddwd YR0GR, %mm1 #yrR3,ygG2+yrR2 -> mm1 +#endif movq %mm5, %mm7 #B3G3R3B2 -> mm7 +#ifdef __PIC__ + pmaddwd YBG0B at GOTOFF(%ebp), %mm5 #ybB3+ygG3,ybB2 -> mm5 +#else pmaddwd YBG0B, %mm5 #ybB3+ygG3,ybB2 -> mm5 +#endif psrad $FIXPSHIFT, %mm0 #32-bit scaled Y1Y0 -> mm0 +#ifdef __PIC__ + movq %mm6, TEMP0 at GOTOFF(%ebp) #R5B4G4R4 -> TEMP0 +#else movq %mm6, TEMP0 #R5B4G4R4 -> TEMP0 +#endif movq %mm3, %mm6 #R3B2G2R2 -> mm6 +#ifdef __PIC__ + pmaddwd UR0GR at GOTOFF(%ebp), %mm6 #urR3,ugG2+urR2 -> mm6 +#else pmaddwd UR0GR, %mm6 #urR3,ugG2+urR2 -> mm6 +#endif psrad $FIXPSHIFT, %mm2 #32-bit scaled U1U0 -> mm2 paddd %mm5, %mm1 #Y3Y2 -> mm1 movq %mm7, %mm5 #B3G3R3B2 -> mm5 +#ifdef __PIC__ + pmaddwd UBG0B at GOTOFF(%ebp), %mm7 #ubB3+ugG3,ubB2 +#else pmaddwd UBG0B, %mm7 #ubB3+ugG3,ubB2 +#endif psrad $FIXPSHIFT, %mm1 #32-bit scaled Y3Y2 -> mm1 +#ifdef __PIC__ + pmaddwd VR0GR at GOTOFF(%ebp), %mm3 #vrR3,vgG2+vgR2 +#else pmaddwd VR0GR, %mm3 #vrR3,vgG2+vgR2 +#endif packssdw %mm1, %mm0 #Y3Y2Y1Y0 -> mm0 +#ifdef __PIC__ + pmaddwd VBG0B at GOTOFF(%ebp), %mm5 #vbB3+vgG3,vbB2 -> mm5 +#else pmaddwd VBG0B, %mm5 #vbB3+vgG3,vbB2 -> mm5 +#endif psrad $FIXPSHIFT, %mm4 #32-bit scaled V1V0 -> mm4 movq 16(%eax), %mm1 #B7G7R7B6G6R6B5G5 -> mm7 @@ -251,58 +378,114 @@ rgbtoycb_mmx_loop: movq %mm7, %mm5 #R7B6G6R6B5G500 -> mm5 psrad $FIXPSHIFT, %mm3 #32-bit scaled V3V2 -> mm3 +#ifdef __PIC__ + paddw OFFSETY at GOTOFF(%ebp), %mm0 +#else paddw OFFSETY, %mm0 +#endif movq %mm0, (%ebx) #store Y3Y2Y1Y0 packssdw %mm6, %mm2 #32-bit scaled U3U2U1U0 -> mm2 +#ifdef __PIC__ + movq TEMP0 at GOTOFF(%ebp), %mm0 #R5B4G4R4 -> mm0 +#else movq TEMP0, %mm0 #R5B4G4R4 -> mm0 +#endif addl $8, %ebx - + +#ifdef __PIC__ + punpcklbw ZEROS at GOTOFF(%ebp), %mm7 #B5G500 -> mm7 +#else punpcklbw ZEROS, %mm7 #B5G500 -> mm7 +#endif movq %mm0, %mm6 #R5B4G4R4 -> mm6 +#ifdef __PIC__ + movq %mm2, TEMPU at GOTOFF(%ebp) #32-bit scaled U3U2U1U0 -> TEMPU +#else movq %mm2, TEMPU #32-bit scaled U3U2U1U0 -> TEMPU +#endif psrlq $32, %mm0 #00R5B4 -> mm0 paddw %mm0, %mm7 #B5G5R5B4 -> mm7 movq %mm6, %mm2 #B5B4G4R4 -> mm2 +#ifdef __PIC__ + pmaddwd YR0GR at GOTOFF(%ebp), %mm2 #yrR5,ygG4+yrR4 -> mm2 +#else pmaddwd YR0GR, %mm2 #yrR5,ygG4+yrR4 -> mm2 +#endif movq %mm7, %mm0 #B5G5R5B4 -> mm0 +#ifdef __PIC__ + pmaddwd YBG0B at GOTOFF(%ebp), %mm7 #ybB5+ygG5,ybB4 -> mm7 +#else pmaddwd YBG0B, %mm7 #ybB5+ygG5,ybB4 -> mm7 +#endif packssdw %mm3, %mm4 #32-bit scaled V3V2V1V0 -> mm4 addl $24, %eax #increment RGB count +#ifdef __PIC__ + movq %mm4, TEMPV at GOTOFF(%ebp) #(V3V2V1V0)/256 -> mm4 +#else movq %mm4, TEMPV #(V3V2V1V0)/256 -> mm4 +#endif movq %mm6, %mm4 #B5B4G4R4 -> mm4 +#ifdef __PIC__ + pmaddwd UR0GR at GOTOFF(%ebp), %mm6 #urR5,ugG4+urR4 +#else pmaddwd UR0GR, %mm6 #urR5,ugG4+urR4 +#endif movq %mm0, %mm3 #B5G5R5B4 -> mm0 +#ifdef __PIC__ + pmaddwd UBG0B at GOTOFF(%ebp), %mm0 #ubB5+ugG5,ubB4 +#else pmaddwd UBG0B, %mm0 #ubB5+ugG5,ubB4 +#endif paddd %mm7, %mm2 #Y5Y4 -> mm2 +#ifdef __PIC__ + pmaddwd VR0GR at GOTOFF(%ebp), %mm4 #vrR5,vgG4+vrR4 -> mm4 +#else pmaddwd VR0GR, %mm4 #vrR5,vgG4+vrR4 -> mm4 +#endif pxor %mm7, %mm7 #0 -> mm7 +#ifdef __PIC__ + pmaddwd VBG0B at GOTOFF(%ebp), %mm3 #vbB5+vgG5,vbB4 -> mm3 +#else pmaddwd VBG0B, %mm3 #vbB5+vgG5,vbB4 -> mm3 +#endif punpckhbw %mm7, %mm1 #B7G7R7B6 -> mm1 paddd %mm6, %mm0 #U5U4 -> mm0 movq %mm1, %mm6 #B7G7R7B6 -> mm6 +#ifdef __PIC__ + pmaddwd YBG0B at GOTOFF(%ebp), %mm6 #ybB7+ygG7,ybB6 -> mm6 +#else pmaddwd YBG0B, %mm6 #ybB7+ygG7,ybB6 -> mm6 +#endif punpckhbw %mm7, %mm5 #R7B6G6R6 -> mm5 movq %mm5, %mm7 #R7B6G6R6 -> mm7 paddd %mm4, %mm3 #V5V4 -> mm3 +#ifdef __PIC__ + pmaddwd YR0GR at GOTOFF(%ebp), %mm5 #yrR7,ygG6+yrR6 -> mm5 +#else pmaddwd YR0GR, %mm5 #yrR7,ygG6+yrR6 -> mm5 +#endif movq %mm1, %mm4 #B7G7R7B6 -> mm4 +#ifdef __PIC__ + pmaddwd UBG0B at GOTOFF(%ebp), %mm4 #ubB7+ugG7,ubB6 -> mm4 +#else pmaddwd UBG0B, %mm4 #ubB7+ugG7,ubB6 -> mm4 +#endif psrad $FIXPSHIFT, %mm0 #32-bit scaled U5U4 -> mm0 psrad $FIXPSHIFT, %mm2 #32-bit scaled Y5Y4 -> mm2 @@ -310,25 +493,49 @@ rgbtoycb_mmx_loop: paddd %mm5, %mm6 #Y7Y6 -> mm6 movq %mm7, %mm5 #R7B6G6R6 -> mm5 +#ifdef __PIC__ + pmaddwd UR0GR at GOTOFF(%ebp), %mm7 #urR7,ugG6+ugR6 -> mm7 +#else pmaddwd UR0GR, %mm7 #urR7,ugG6+ugR6 -> mm7 +#endif psrad $FIXPSHIFT, %mm3 #32-bit scaled V5V4 -> mm3 +#ifdef __PIC__ + pmaddwd VBG0B at GOTOFF(%ebp), %mm1 #vbB7+vgG7,vbB6 -> mm1 +#else pmaddwd VBG0B, %mm1 #vbB7+vgG7,vbB6 -> mm1 +#endif psrad $FIXPSHIFT, %mm6 #32-bit scaled Y7Y6 -> mm6 packssdw %mm6, %mm2 #Y7Y6Y5Y4 -> mm2 +#ifdef __PIC__ + pmaddwd VR0GR at GOTOFF(%ebp), %mm5 #vrR7,vgG6+vrR6 -> mm5 +#else pmaddwd VR0GR, %mm5 #vrR7,vgG6+vrR6 -> mm5 +#endif paddd %mm4, %mm7 #U7U6 -> mm7 psrad $FIXPSHIFT, %mm7 #32-bit scaled U7U6 -> mm7 +#ifdef __PIC__ + paddw OFFSETY at GOTOFF(%ebp), %mm2 +#else paddw OFFSETY, %mm2 +#endif movq %mm2, (%ebx) #store Y7Y6Y5Y4 +#ifdef __PIC__ + movq ALLONE at GOTOFF(%ebp), %mm6 +#else movq ALLONE, %mm6 +#endif packssdw %mm7, %mm0 #32-bit scaled U7U6U5U4 -> mm0 +#ifdef __PIC__ + movq TEMPU at GOTOFF(%ebp), %mm4 #32-bit scaled U3U2U1U0 -> mm4 +#else movq TEMPU, %mm4 #32-bit scaled U3U2U1U0 -> mm4 +#endif pmaddwd %mm6, %mm0 #U7U6U5U4 averaged -> (U7U6)(U5U4)=UU3 UU2->mm0 pmaddwd %mm6, %mm4 #U3U2U1U0 averaged -> (U3U2)(U1U0)=UU1 UU0->mm4 @@ -338,8 +545,12 @@ rgbtoycb_mmx_loop: psrad $FIXPSHIFT, %mm1 #32-bit scaled V7V6 -> mm1 psraw $1, %mm4 #divide UU3 UU2 UU1 UU0 by 2 -> mm4 - + +#ifdef __PIC__ + movq TEMPV at GOTOFF(%ebp), %mm5 #32-bit scaled V3V2V1V0 -> mm5 +#else movq TEMPV, %mm5 #32-bit scaled V3V2V1V0 -> mm5 +#endif movq %mm4, (%ecx) # store U @@ -425,14 +636,22 @@ _dv_ppm_copy_y_block_mmx: _dv_pgm_copy_y_block_mmx: pushl %ebp - movl %esp, %ebp pushl %esi pushl %edi - - movl 8(%ebp), %edi # dest - movl 12(%ebp), %esi # src +#ifdef __PIC__ + call __i686.get_pc_thunk.bp + addl $_GLOBAL_OFFSET_TABLE_, %ebp +#endif + + movl 16(%esp), %edi # dest + movl 20(%esp), %esi # src + +#ifdef __PIC__ + movq OFFSETY at GOTOFF(%ebp), %mm7 +#else movq OFFSETY, %mm7 +#endif pxor %mm6, %mm6 movq (%esi), %mm0 @@ -567,14 +786,22 @@ _dv_pgm_copy_y_block_mmx: _dv_video_copy_y_block_mmx: pushl %ebp - movl %esp, %ebp pushl %esi pushl %edi - - movl 8(%ebp), %edi # dest - movl 12(%ebp), %esi # src +#ifdef __PIC__ + call __i686.get_pc_thunk.bp + addl $_GLOBAL_OFFSET_TABLE_, %ebp +#endif + + movl 16(%esp), %edi # dest + movl 20(%esp), %esi # src + +#ifdef __PIC__ + movq OFFSETBX at GOTOFF(%ebp), %mm7 +#else movq OFFSETBX, %mm7 +#endif pxor %mm6, %mm6 movq (%esi), %mm0 @@ -855,16 +1082,23 @@ _dv_ppm_copy_pal_c_block_mmx: _dv_pgm_copy_pal_c_block_mmx: pushl %ebp - movl %esp, %ebp pushl %esi pushl %edi pushl %ebx - - movl 8(%ebp), %edi # dest - movl 12(%ebp), %esi # src +#ifdef __PIC__ + call __i686.get_pc_thunk.bp + addl $_GLOBAL_OFFSET_TABLE_, %ebp +#endif + + movl 20(%esp), %edi # dest + movl 24(%esp), %esi # src +#ifdef __PIC__ + movq OFFSETBX at GOTOFF(%ebp), %mm7 +#else movq OFFSETBX, %mm7 +#endif pxor %mm6, %mm6 @@ -1003,15 +1237,23 @@ _dv_pgm_copy_pal_c_block_mmx: _dv_video_copy_pal_c_block_mmx: pushl %ebp - movl %esp, %ebp pushl %esi pushl %edi pushl %ebx - - movl 8(%ebp), %edi # dest - movl 12(%ebp), %esi # src +#ifdef __PIC__ + call __i686.get_pc_thunk.bp + addl $_GLOBAL_OFFSET_TABLE_, %ebp +#endif + + movl 20(%esp), %edi # dest + movl 24(%esp), %esi # src + +#ifdef __PIC__ + movq OFFSETBX at GOTOFF(%ebp), %mm7 +#else movq OFFSETBX, %mm7 +#endif paddw %mm7, %mm7 pxor %mm6, %mm6 @@ -1098,18 +1340,25 @@ video_copy_pal_c_block_mmx_loop: _dv_ppm_copy_ntsc_c_block_mmx: pushl %ebp - movl %esp, %ebp pushl %esi pushl %edi pushl %ebx - - movl 8(%ebp), %edi # dest - movl 12(%ebp), %esi # src + +#ifdef __PIC__ + call __i686.get_pc_thunk.bp + addl $_GLOBAL_OFFSET_TABLE_, %ebp +#endif + + movl 20(%esp), %edi # dest + movl 24(%esp), %esi # src movl $4, %ebx +#ifdef __PIC__ + movq ALLONE at GOTOFF(%ebp), %mm6 +#else movq ALLONE, %mm6 - +#endif ppm_copy_ntsc_c_block_mmx_loop: movq (%esi), %mm0 @@ -1171,14 +1420,22 @@ ppm_copy_ntsc_c_block_mmx_loop: _dv_pgm_copy_ntsc_c_block_mmx: pushl %ebp - movl %esp, %ebp pushl %esi pushl %edi - - movl 8(%ebp), %edi # dest - movl 12(%ebp), %esi # src +#ifdef __PIC__ + call __i686.get_pc_thunk.bp + addl $_GLOBAL_OFFSET_TABLE_, %ebp +#endif + + movl 16(%esp), %edi # dest + movl 20(%esp), %esi # src + +#ifdef __PIC__ + movq OFFSETBX at GOTOFF(%ebp), %mm7 +#else movq OFFSETBX, %mm7 +#endif paddw %mm7, %mm7 pxor %mm6, %mm6 @@ -1328,15 +1585,23 @@ _dv_pgm_copy_ntsc_c_block_mmx: _dv_video_copy_ntsc_c_block_mmx: pushl %ebp - movl %esp, %ebp pushl %esi pushl %edi pushl %ebx - - movl 8(%ebp), %edi # dest - movl 12(%ebp), %esi # src +#ifdef __PIC__ + call __i686.get_pc_thunk.bp + addl $_GLOBAL_OFFSET_TABLE_, %ebp +#endif + + movl 20(%esp), %edi # dest + movl 24(%esp), %esi # src + +#ifdef __PIC__ + movq OFFSETBX at GOTOFF(%ebp), %mm7 +#else movq OFFSETBX, %mm7 +#endif paddw %mm7, %mm7 pxor %mm6, %mm6 diff -Naupr libdv-0.104.orig/libdv/vlc_x86.S libdv-0.104/libdv/vlc_x86.S --- libdv-0.104.orig/libdv/vlc_x86.S 2002-05-20 14:31:25.000000000 +0200 +++ libdv-0.104/libdv/vlc_x86.S 2006-02-16 12:44:37.000000000 +0100 @@ -1,29 +1,76 @@ #include "asmoff.h" .text + +#ifdef __PIC__ +# undef __i686 /* gcc define gets in our way */ + .section .gnu.linkonce.t.__i686.get_pc_thunk.bp,"ax", at progbits +.globl __i686.get_pc_thunk.bp + .hidden __i686.get_pc_thunk.bp + .type __i686.get_pc_thunk.bp, at function +__i686.get_pc_thunk.bp: + movl (%esp), %ebp + ret + + .section .gnu.linkonce.t.__i686.get_pc_thunk.si,"ax", at progbits +.globl __i686.get_pc_thunk.si + .hidden __i686.get_pc_thunk.si + .type __i686.get_pc_thunk.si, at function +__i686.get_pc_thunk.si: + movl (%esp), %esi + ret +#endif + .align 4 .globl dv_decode_vlc .type dv_decode_vlc, at function dv_decode_vlc: pushl %ebx + pushl %ebp - /* Args are at 8(%esp). */ - movl 8(%esp),%eax /* %eax is bits */ - movl 12(%esp),%ebx /* %ebx is maxbits */ +#ifdef __PIC__ + call __i686.get_pc_thunk.bp + addl $_GLOBAL_OFFSET_TABLE_, %ebp +#endif + + /* Args are at 12(%esp). */ + movl 12(%esp),%eax /* %eax is bits */ + movl 16(%esp),%ebx /* %ebx is maxbits */ andl $0x3f,%ebx /* limit index range STL*/ +#ifdef __ELF__ + movl dv_vlc_class_index_mask at GOTOFF(%ebp,%ebx,4),%edx +#else movl dv_vlc_class_index_mask(,%ebx,4),%edx +#endif andl %eax,%edx +#ifdef __ELF__ + movl dv_vlc_class_index_rshift at GOTOFF(%ebp,%ebx,4),%ecx +#else movl dv_vlc_class_index_rshift(,%ebx,4),%ecx +#endif sarl %cl,%edx +#ifdef __ELF__ + movl dv_vlc_classes at GOTOFF(%ebp,%ebx,4),%ecx +#else movl dv_vlc_classes(,%ebx,4),%ecx +#endif movsbl (%ecx,%edx,1),%edx /* %edx is class */ - + +#ifdef __ELF__ + movl dv_vlc_index_mask at GOTOFF(%ebp,%edx,4),%ebx + movl dv_vlc_index_rshift at GOTOFF(%ebp,%edx,4),%ecx +#else movl dv_vlc_index_mask(,%edx,4),%ebx movl dv_vlc_index_rshift(,%edx,4),%ecx +#endif andl %eax,%ebx sarl %cl,%ebx +#ifdef __ELF__ + movl dv_vlc_lookups at GOTOFF(%ebp,%edx,4),%edx +#else movl dv_vlc_lookups(,%edx,4),%edx +#endif movl (%edx,%ebx,4),%edx /* Now %edx holds result, like this: @@ -42,7 +89,11 @@ dv_decode_vlc: movl %edx,%ecx sarl $8,%ecx andl $0xff,%ecx +#ifdef __ELF__ + movl sign_mask at GOTOFF(%ebp,%ecx,4),%ebx +#else movl sign_mask(,%ecx,4),%ebx +#endif andl %ebx,%eax negl %eax sarl $31,%eax @@ -63,14 +114,14 @@ dv_decode_vlc: *result = broken; Note that the 'broken' pattern is all ones (i.e. 0xffffffff) */ - movl 12(%esp),%ebx /* %ebx is maxbits */ + movl 16(%esp),%ebx /* %ebx is maxbits */ subl %ecx,%ebx sbbl %ebx,%ebx orl %ebx,%edx - movl 16(%esp),%eax + movl 20(%esp),%eax movl %edx,(%eax) - + popl %ebp popl %ebx ret @@ -80,21 +131,38 @@ dv_decode_vlc: .type __dv_decode_vlc, at function __dv_decode_vlc: pushl %ebx + pushl %ebp - /* Args are at 8(%esp). */ - movl 8(%esp),%eax /* %eax is bits */ +#ifdef __PIC__ + call __i686.get_pc_thunk.bp + addl $_GLOBAL_OFFSET_TABLE_, %ebp +#endif + + /* Args are at 12(%esp). */ + movl 12(%esp),%eax /* %eax is bits */ movl %eax,%edx /* %edx is class */ andl $0xfe00,%edx sarl $9,%edx +#ifdef __PIC__ + movsbl dv_vlc_class_lookup5 at GOTOFF(%ebp,%edx),%edx + + movl dv_vlc_index_mask at GOTOFF(%ebp,%edx,4),%ebx + movl dv_vlc_index_rshift at GOTOFF(%ebp,%edx,4),%ecx +#else movsbl dv_vlc_class_lookup5(%edx),%edx - + movl dv_vlc_index_mask(,%edx,4),%ebx movl dv_vlc_index_rshift(,%edx,4),%ecx +#endif andl %eax,%ebx sarl %cl,%ebx +#ifdef __PIC__ + movl dv_vlc_lookups at GOTOFF(%ebp,%edx,4),%edx +#else movl dv_vlc_lookups(,%edx,4),%edx +#endif movl (%edx,%ebx,4),%edx /* Now %edx holds result, like this: @@ -112,7 +180,11 @@ __dv_decode_vlc: movl %edx,%ecx sarl $8,%ecx andl $0xff,%ecx +#ifdef __PIC__ + movl sign_mask at GOTOFF(%ebp,%ecx,4),%ecx +#else movl sign_mask(,%ecx,4),%ecx +#endif andl %ecx,%eax negl %eax sarl $31,%eax @@ -127,9 +199,9 @@ __dv_decode_vlc: xorl %eax,%edx subl %eax,%edx - movl 12(%esp),%eax + movl 16(%esp),%eax movl %edx,(%eax) - + popl %ebp popl %ebx ret @@ -147,6 +219,11 @@ dv_parse_ac_coeffs_pass0: pushl %esi pushl %ebp +#ifdef __PIC__ + call __i686.get_pc_thunk.si + addl $_GLOBAL_OFFSET_TABLE_, %esi +#endif + #define ARGn(N) (20+(4*(N)))(%esp) /* @@ -159,8 +236,10 @@ dv_parse_ac_coeffs_pass0: ebp bl */ movl ARGn(2),%ebp +#ifndef __PIC__ movl ARGn(0),%esi movl bitstream_t_buf(%esi),%esi +#endif movl dv_block_t_offset(%ebp),%edi movl dv_block_t_reorder(%ebp),%ebx @@ -170,7 +249,11 @@ dv_parse_ac_coeffs_pass0: movq dv_block_t_coeffs(%ebp),%mm1 pxor %mm0,%mm0 +#ifdef __PIC__ + pand const_f_0_0_0 at GOTOFF(%esi),%mm1 +#else pand const_f_0_0_0,%mm1 +#endif movq %mm1,dv_block_t_coeffs(%ebp) movq %mm0,(dv_block_t_coeffs + 8)(%ebp) movq %mm0,(dv_block_t_coeffs + 16)(%ebp) @@ -191,9 +274,17 @@ dv_parse_ac_coeffs_pass0: readloop: movl %edi,%ecx shrl $3,%ecx +#ifdef __PIC__ + pushl %esi + movl ARGn(1),%esi + movl bitstream_t_buf(%esi),%esi +#endif movzbl (%esi,%ecx,1),%eax movzbl 1(%esi,%ecx,1),%edx movzbl 2(%esi,%ecx,1),%ecx +#ifdef __PIC__ + popl %esi +#endif shll $16,%eax shll $8,%edx orl %ecx,%eax @@ -217,7 +308,11 @@ readloop: /* Attempt to use the shortcut first. If it hits, then this vlc term has been decoded. */ +#ifdef __PIC__ + movl dv_vlc_class1_shortcut at GOTOFF(%esi,%ecx,4),%edx +#else movl dv_vlc_class1_shortcut(,%ecx,4),%edx +#endif test $0x80,%edx je done_decode @@ -228,12 +323,19 @@ readloop: movl %ebx,dv_block_t_reorder(%ebp) /* %eax is bits */ - +#ifdef __PIC__ + movsbl dv_vlc_class_lookup5 at GOTOFF(%esi,%ecx),%ecx + + movl dv_vlc_index_mask at GOTOFF(%esi,%ecx,4),%ebx + movl dv_vlc_lookups at GOTOFF(%esi,%ecx,4),%edx + movl dv_vlc_index_rshift at GOTOFF(%esi,%ecx,4),%ecx +#else movsbl dv_vlc_class_lookup5(%ecx),%ecx movl dv_vlc_index_mask(,%ecx,4),%ebx movl dv_vlc_lookups(,%ecx,4),%edx movl dv_vlc_index_rshift(,%ecx,4),%ecx +#endif andl %eax,%ebx sarl %cl,%ebx @@ -256,7 +358,11 @@ readloop: movl %edx,%ecx sarl $8,%ecx andl $0xff,%ecx +#ifdef __PIC__ + movl sign_mask at GOTOFF(%esi,%ecx,4),%ecx +#else movl sign_mask(,%ecx,4),%ecx +#endif andl %ecx,%eax negl %eax sarl $31,%eax @@ -326,10 +432,20 @@ alldone: slowpath: /* slow path: use dv_decode_vlc */; +#ifdef __PIC__ + pushl %esi + leal vlc at GOTOFF(%esi),%esi + xchgl %esi,(%esp) /* last parameter is &vlc */ +#else pushl $vlc /* last parameter is &vlc */ +#endif pushl %edx /* bits_left */ pushl %eax /* bits */ +#ifdef __PIC__ + call dv_decode_vlc at PLT +#else call dv_decode_vlc +#endif addl $12,%esp test $0x80,%edx /* If (vlc.run < 0) break */ jne escape @@ -365,6 +481,11 @@ dv_parse_video_segment: pushl %esi pushl %ebp +#ifdef __PIC__ + call __i686.get_pc_thunk.si + addl $_GLOBAL_OFFSET_TABLE_, %esi +#endif + #define ARGn(N) (20+(4*(N)))(%esp) movl ARGn(1),%eax /* quality */ @@ -373,7 +494,11 @@ dv_parse_video_segment: jz its_mono movl $6,%ebx its_mono: +#ifdef __PIC__ + movl %ebx,n_blocks at GOTOFF(%esi) +#else movl %ebx,n_blocks +#endif /* * ebx seg/b @@ -384,15 +509,22 @@ its_mono: * ebp bl */ movl ARGn(0),%ebx +#ifndef __PIC__ movl dv_videosegment_t_bs(%ebx),%esi movl bitstream_t_buf(%esi),%esi +#endif leal dv_videosegment_t_mb(%ebx),%edi movl $0,%eax movl $0,%ecx macloop: +#ifdef __PIC__ + movl %eax,m at GOTOFF(%esi) + movl %ecx,mb_start at GOTOFF(%esi) +#else movl %eax,m movl %ecx,mb_start +#endif movl ARGn(0),%ebx @@ -400,7 +532,15 @@ macloop: /* mb->qno = bitstream_get(bs,4); */ movl %ecx,%edx shr $3,%edx +#ifdef __PIC__ + pushl %esi + movl dv_videosegment_t_bs(%ebx),%esi + movl bitstream_t_buf(%esi),%esi +#endif movzbl 3(%esi,%edx,1),%edx +#ifdef __PIC__ + popl %esi +#endif andl $0xf,%edx movl %edx,dv_macroblock_t_qno(%edi) @@ -411,7 +551,11 @@ macloop: movl %edx,dv_macroblock_t_eob_count(%edi) /* mb->i = (seg->i + dv_super_map_vertical[m]) % (seg->isPAL?12:10); */ +#ifdef __PIC__ + movl dv_super_map_vertical at GOTOFF(%esi,%eax,4),%edx +#else movl dv_super_map_vertical(,%eax,4),%edx +#endif movl dv_videosegment_t_i(%ebx),%ecx addl %ecx,%edx @@ -422,11 +566,20 @@ skarly: andl $1,%ecx shll $5,%ecx /* ecx = (isPAL ? 32 : 0) */ +#ifdef __PIC__ + leal mod_10 at GOTOFF(%esi,%edx),%edx + movzbl (%edx,%ecx,1),%edx /* uses mod_12 for PAL */ +#else movzbl mod_10(%edx,%ecx,1),%edx /* uses mod_12 for PAL */ +#endif movl %edx,dv_macroblock_t_i(%edi) /* mb->j = dv_super_map_horizontal[m]; */ +#ifdef __PIC__ + movl dv_super_map_horizontal at GOTOFF(%esi,%eax,4),%edx +#else movl dv_super_map_horizontal(,%eax,4),%edx +#endif movl %edx,dv_macroblock_t_j(%edi) /* mb->k = seg->k; */ @@ -445,12 +598,29 @@ blkloop: +---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+ */ /* dc = bitstream_get(bs,9); */ +#ifdef __PIC__ + movl mb_start at GOTOFF(%esi),%ecx +#else movl mb_start,%ecx +#endif shr $3,%ecx +#ifdef __PIC__ + movzbl blk_start at GOTOFF(%esi,%ebx),%edx +#else movzbl blk_start(%ebx),%edx +#endif addl %ecx,%edx +#ifdef __PIC__ + pushl %esi + movl ARGn(1),%esi + movl dv_videosegment_t_bs(%esi),%esi + movl bitstream_t_buf(%esi),%esi +#endif movzbl (%esi,%edx,1),%eax /* hi byte */ movzbl 1(%esi,%edx,1),%ecx /* lo byte */ +#ifdef __PIC__ + popl %esi +#endif shll $8,%eax orl %ecx,%eax @@ -477,7 +647,11 @@ blkloop: /* bl->reorder = &dv_reorder[bl->dct_mode][1]; */ shll $6,%eax +#ifdef __PIC__ + addl dv_reorder at GOTOFF+1(%esi),%eax +#else addl $(dv_reorder+1),%eax +#endif movl %eax,dv_block_t_reorder(%ebp) /* bl->reorder_sentinel = bl->reorder + 63; */ @@ -485,13 +659,22 @@ blkloop: movl %eax,dv_block_t_reorder_sentinel(%ebp) /* bl->offset= mb_start + dv_parse_bit_start[b]; */ +#ifdef __PIC__ + movl mb_start at GOTOFF(%esi),%ecx + movl dv_parse_bit_start at GOTOFF(%esi,%ebx,4),%eax +#else movl mb_start,%ecx movl dv_parse_bit_start(,%ebx,4),%eax +#endif addl %ecx,%eax movl %eax,dv_block_t_offset(%ebp) /* bl->end= mb_start + dv_parse_bit_end[b]; */ +#ifdef __PIC__ + movl dv_parse_bit_end at GOTOFF(%esi,%ebx,4),%eax +#else movl dv_parse_bit_end(,%ebx,4),%eax +#endif addl %ecx,%eax movl %eax,dv_block_t_end(%ebp) @@ -503,7 +686,11 @@ blkloop: /* no AC pass. Just zero out the remaining coeffs */ movq dv_block_t_coeffs(%ebp),%mm1 pxor %mm0,%mm0 +#ifdef __PIC__ + pand const_f_0_0_0 at GOTOFF(%esi),%mm1 +#else pand const_f_0_0_0,%mm1 +#endif movq %mm1,dv_block_t_coeffs(%ebp) movq %mm0,(dv_block_t_coeffs + 8)(%ebp) movq %mm0,(dv_block_t_coeffs + 16)(%ebp) @@ -528,18 +715,31 @@ do_ac_pass: pushl %ebp pushl %edi pushl %eax +#ifdef __PIC__ + call dv_parse_ac_coeffs_pass0 at PLT +#else call dv_parse_ac_coeffs_pass0 +#endif addl $12,%esp done_ac: +#ifdef __PIC__ + movl n_blocks at GOTOFF(%esi),%eax +#else movl n_blocks,%eax +#endif addl $dv_block_t_size,%ebp incl %ebx cmpl %eax,%ebx jnz blkloop +#ifdef __PIC__ + movl m at GOTOFF(%esi),%eax + movl mb_start at GOTOFF(%esi),%ecx +#else movl m,%eax movl mb_start,%ecx +#endif addl $(8 * 80),%ecx addl $dv_macroblock_t_size,%edi incl %eax @@ -557,7 +757,11 @@ done_ac: andl $DV_QUALITY_AC_MASK,%eax cmpl $DV_QUALITY_AC_2,%eax +#ifdef __PIC__ + jz dv_parse_ac_coeffs at PLT +#else jz dv_parse_ac_coeffs +#endif movl $0,%eax ret Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/libdv/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 7 Feb 2005 02:26:33 -0000 1.5 +++ .cvsignore 7 Mar 2006 21:38:20 -0000 1.6 @@ -1,3 +1 @@ -libdv-0.102.tar.gz -libdv-0.103.tar.gz libdv-0.104.tar.gz Index: libdv.spec =================================================================== RCS file: /cvs/dist/rpms/libdv/devel/libdv.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- libdv.spec 13 Feb 2006 21:48:00 -0000 1.15 +++ libdv.spec 7 Mar 2006 21:38:20 -0000 1.16 @@ -1,18 +1,23 @@ -Summary: Software decoder for DV format video. -Name: libdv -Version: 0.103 -Release: 4.3 +Summary: Software decoder for DV format video +Name: libdv +Version: 0.104 +Release: 2.fc5 Epoch: 0 -License: LGPL -Group: System Environment/Libraries -URL: http://libdv.sourceforge.net/ -Source0: http://dl.sourceforge.net/sourceforge/libdv/libdv-0.103.tar.gz -Patch0: libdv-0.103-noexec-stack.patch -Patch1: libdv-0.103-mmx.patch +License: LGPL +Group: System Environment/Libraries +URL: http://libdv.sourceforge.net/ +Source: http://dl.sf.net/libdv/libdv-%{version}.tar.gz +Patch0: libdv-0.103-mmx.patch +Patch1: libdv-0.104-no-exec-stack.patch +Patch2: libdv-0.104-pic-fix.patch +Patch3: libdv-0.104-amd64reloc.patch +Patch4: libdv-0.104-gtk2.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot -BuildRequires: gtk+-devel >= 0:1.2.4 -BuildRequires: libXv-devel -ExcludeArch: s390 s390x +BuildRequires: gtk2-devel +BuildRequires: libXt-devel, libXv-devel +# Required for the gtk2 patch +BuildRequires: autoconf, automake, libtool, SDL-devel +ExcludeArch: s390 s390x %package devel Summary: Development package for libdv @@ -43,8 +48,13 @@ %prep %setup -q -%patch0 -p1 -%patch1 -p1 +%patch0 -p1 -b .mmx +%patch1 -p0 -b .no-exec-stack +%patch2 -p1 -b .pic-fix +%patch3 -p3 -b .amd64reloc +%patch4 -p1 -b .gtk2 +# Required for the gtk2 patch +autoreconf %build %configure @@ -53,6 +63,8 @@ %install rm -rf $RPM_BUILD_ROOT %makeinstall +rm $RPM_BUILD_ROOT%{_libdir}/libdv.a +rm $RPM_BUILD_ROOT%{_libdir}/libdv.la %clean rm -rf $RPM_BUILD_ROOT @@ -69,10 +81,10 @@ %files tools %defattr(-,root,root,-) %doc README.* +%{_bindir}/dubdv %{_bindir}/dvconnect %{_bindir}/encodedv %{_bindir}/playdv -%{_bindir}/dubdv %{_mandir}/man1/dubdv.1.gz %{_mandir}/man1/dvconnect.1.gz %{_mandir}/man1/encodedv.1* @@ -80,13 +92,21 @@ %files devel %defattr(-,root,root,-) -%exclude %{_libdir}/libdv.la +%{_includedir}/libdv/ %{_libdir}/libdv.so -%{_libdir}/libdv.a %{_libdir}/pkgconfig/libdv.pc -%{_includedir}/%{name} %changelog +* Tue Mar 07 2006 Warren Togami 0.104-2 +- remove instead of exclude static libs + +* Wed Feb 15 2006 Matthias Saou 0.104-1 +- Update to 0.104 at last (#147311) +- Include no-exec-stack, pic-fix, amd64reloc and gtk2 patches from Gentoo + and PLD (merge gcc4 fix to the pic-fix patch). +- Now build against gtk2 (thanks to the patch above). +- Exclude static library. + * Mon Feb 13 2006 Paul Nasrat - 0:0.103-4.3 - Patch to build with gcc 4.1 Index: sources =================================================================== RCS file: /cvs/dist/rpms/libdv/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 7 Feb 2005 03:10:53 -0000 1.7 +++ sources 7 Mar 2006 21:38:20 -0000 1.8 @@ -1,2 +1 @@ -b5c7d0db672a76528e100828dd866a79 libdv-0.103.tar.gz f6b08efce7472daa20685e6e8431f542 libdv-0.104.tar.gz --- libdv-0.103-noexec-stack.patch DELETED --- From fedora-cvs-commits at redhat.com Tue Mar 7 21:48:21 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 7 Mar 2006 16:48:21 -0500 Subject: rpms/bind/FC-4 bind-9.3.1-dbus_archdep_libdir_sdb.patch, NONE, 1.1 filter_requires.sh, NONE, 1.1 namedGetForwarders, NONE, 1.1 namedSetForwarders, NONE, 1.1 bind-9.3.1-dbus_archdep_libdir.patch, 1.1, 1.2 bind.spec, 1.67, 1.68 named.init, 1.34, 1.35 Message-ID: <200603072148.k27LmL5o011173@cvs.devel.redhat.com> Author: jvdias Update of /cvs/dist/rpms/bind/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv11150 Modified Files: bind-9.3.1-dbus_archdep_libdir.patch bind.spec named.init Added Files: bind-9.3.1-dbus_archdep_libdir_sdb.patch filter_requires.sh namedGetForwarders namedSetForwarders Log Message: - fix bug 181730: fix creation of named user & gid - fix bug 179816: fix builds for all combinations of WITH_DBUS=0/1 SDB=0/1 LIBBIND=0/1 - fix bug 177595: handle case where $ROOTDIR is a link in initscript - improve method used to mount /proc and /var/run/dbus under chroot in initscript - add namedGetForwarders and namedSetForwarders scripts for use with -D option bind-9.3.1-dbus_archdep_libdir_sdb.patch: Makefile.in | 3 ++- 1 files changed, 2 insertions(+), 1 deletion(-) --- NEW FILE bind-9.3.1-dbus_archdep_libdir_sdb.patch --- --- bind-9.3.1/bin/named_sdb/Makefile.in.dbus_archdep_libdir 2005-08-16 21:23:28.000000000 -0400 +++ bind-9.3.1/bin/named_sdb/Makefile.in 2005-08-16 23:00:49.000000000 -0400 @@ -35,8 +35,9 @@ ${LWRES_INCLUDES} ${DNS_INCLUDES} ${BIND9_INCLUDES} \ ${ISCCFG_INCLUDES} ${ISCCC_INCLUDES} ${ISC_INCLUDES} \ ${DBDRIVER_INCLUDES} +DBUS_ARCHDEP_LIBDIR ?= lib DBUS_INCLUDES = \ - -I/usr/lib/dbus-1.0/include -I/usr/include/dbus-1.0 + -I/usr/${DBUS_ARCHDEP_LIBDIR}/dbus-1.0/include -I/usr/include/dbus-1.0 CDEFINES = CWARNINGS = --- NEW FILE filter_requires.sh --- #!/bin/bash /usr/lib/rpm/find-requires $* | /bin/egrep -v perl --- NEW FILE namedGetForwarders --- #!/usr/bin/perl # # This script uses the named D-BUS support, which must be enabled in # the running named with the named '-D' option, to get and print the # list of forwarding zones in the running server. # # It accepts an optional first argument which is the DNS name # of the zone whose forwarders (if any) will be retrieved. # # If no zone argument is specified, all forwarding zones will be listed. # # Usage: GetForwarders [-n -r] [ ] # -n : output forward zone statements for named.conf # -r : output in resolv.conf format # : no -r or -n: just list the forwarders # # Copyright(C) Jason Vas Dias Red Hat Inc. 2005 # # 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 at # http://www.fsf.org/licensing/licenses/gpl.txt # and included in this software distribution as the "LICENSE" file. # # 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. # use Getopt::Std; %opts=(); getopts("rn",\%opts); $zone = ''; if ( $#ARGV >= 0 ) { $zone = "string:'". join("' string:'", at ARGV)."'"; }; @dn=(); open(DNS, '/usr/bin/dbus-send --system --type=method_call --print-reply --reply-timeout=20000 ' .'--dest=com.redhat.named /com/redhat/named com.redhat.named.text.GetForwarders ' .$zone .'|' ) || die("dbus-send failed: $?: $!"); while() { $_=~s/[\s\r\n]+$//; if ( /(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})/ ) { # nameserver address push @{${$dn[-1]}{'s'}}, { 'a' => "$1.$2.$3.$4" }; }elsif ( /\"(\d+)\"$/ ) { # port if ( $1 != 53 ) { ${@{${$dn[-1]}{'s'}}[-1]}{'p'} = $1; }; }elsif ( /string\s+\"([^\"]+)\"$/ ) { if ( ($1 eq 'first') || ($1 eq 'only') ) { # policy if( $1 eq 'only' ) { # not default ${$dn[-1]}{'o'} = 1; } }else { # new DN - "zone" push @dn, {'n'=>$1,'s'=>[]}; }; }; }; close(DNS); if( exists($opts{'r'}) ) { # resolv.conf style: my %svrs=(); print 'search ', join( ' ', grep { !( $_ =~ /\.in-addr\.arpa$/) } map { ${$_}{'n'} } @dn ),"\n", 'nameserver ', join( "\nnameserver ", grep { exists ( $svrs{ $_ } ) ? undef : { $svrs{$_}=$_ } } map { ${$_}{'a'} } map { @{${$_}{'s'}} } @dn ),"\n"; }elsif( exists($opts{'n'}) ) { # named.conf style: foreach $d (@dn) { print 'zone "',${$d}{'n'},'." IN { type forward; forwarders { ', join("; ", map { exists( ${$_}{'p'} ) ? ${$_}{'a'} . ' port ' . ${$_}{'p'} : ${$_}{'a'} } @{${$d}{'s'}} ), '; }; ', exists(${$d}{'o'}) ? ' forward only; ' : '', "};\n"; }; }else { # just list: foreach $d (@dn) { print ${$d}{'n'}, "\n\t", (exists(${$d}{'o'}) ? "forward only\n\t" : ''), join( "\n\t", map { exists( ${$_}{'p'} ) ? ${$_}{'a'} . ':' . ${$_}{'p'} : ${$_}{'a'} } @{${$d}{'s'}} ),"\n"; }; }; --- NEW FILE namedSetForwarders --- #!/bin/bash # # This script uses the named D-BUS support, which must be enabled in # the running named with the named '-D' option, to set the forwarding zones # in the running server. # # One zone argument is required, followed by any number of server IP (v4 or v6) # addresses. If the server IP address list is empty, any forwarders for the zone # will be removed. # # Usage: # SetForwarders [ -t <'first' | 'only'> ] [ [...] ] # # Copyright(C) Jason Vas Dias Red Hat Inc. 2005 # # 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 at # http://www.fsf.org/licensing/licenses/gpl.txt # and included in this software distribution as the "LICENSE" file. # # 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. # usage() { echo "Usage: SetForwarders [ -t <'first' | 'only'> ] [ [...] ]"; } type='' if [ $# -eq 0 ]; then usage; exit 1; elif [ "$1" = "-t" ]; then if [ $# -lt 2 ]; then echo '-t option requires an argument.' exit 1; fi; type=$2; shift 2; fi; if [ $# -lt 1 ]; then echo ' first argument required.' exit 1; fi; zone='string:'"$1"; shift; servers=''; if [ $# -gt 0 ]; then for svr in $*; do servers="$servers string:$svr"; done fi; dbus-send --system --type=method_call --print-reply --reply-timeout=20000 --dest=com.redhat.named /com/redhat/named com.redhat.named.text.SetForwarders $zone $type $servers; bind-9.3.1-dbus_archdep_libdir.patch: Makefile.in | 3 ++- 1 files changed, 2 insertions(+), 1 deletion(-) Index: bind-9.3.1-dbus_archdep_libdir.patch =================================================================== RCS file: /cvs/dist/rpms/bind/FC-4/bind-9.3.1-dbus_archdep_libdir.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- bind-9.3.1-dbus_archdep_libdir.patch 22 Aug 2005 20:25:52 -0000 1.1 +++ bind-9.3.1-dbus_archdep_libdir.patch 7 Mar 2006 21:48:18 -0000 1.2 @@ -1,16 +1,3 @@ ---- bind-9.3.1/bin/named_sdb/Makefile.in.dbus_archdep_libdir 2005-08-16 21:23:28.000000000 -0400 -+++ bind-9.3.1/bin/named_sdb/Makefile.in 2005-08-16 23:00:49.000000000 -0400 -@@ -35,8 +35,9 @@ - ${LWRES_INCLUDES} ${DNS_INCLUDES} ${BIND9_INCLUDES} \ - ${ISCCFG_INCLUDES} ${ISCCC_INCLUDES} ${ISC_INCLUDES} \ - ${DBDRIVER_INCLUDES} -+DBUS_ARCHDEP_LIBDIR ?= lib - DBUS_INCLUDES = \ -- -I/usr/lib/dbus-1.0/include -I/usr/include/dbus-1.0 -+ -I/usr/${DBUS_ARCHDEP_LIBDIR}/dbus-1.0/include -I/usr/include/dbus-1.0 - CDEFINES = - CWARNINGS = - --- bind-9.3.1/bin/named/Makefile.in.dbus_archdep_libdir 2005-08-16 21:23:28.000000000 -0400 +++ bind-9.3.1/bin/named/Makefile.in 2005-08-16 23:00:58.000000000 -0400 @@ -35,8 +35,9 @@ Index: bind.spec =================================================================== RCS file: /cvs/dist/rpms/bind/FC-4/bind.spec,v retrieving revision 1.67 retrieving revision 1.68 diff -u -r1.67 -r1.68 --- bind.spec 19 Oct 2005 21:55:24 -0000 1.67 +++ bind.spec 7 Mar 2006 21:48:18 -0000 1.68 @@ -9,7 +9,7 @@ Name: bind License: BSD-like Version: 9.3.1 -Release: 14_FC4 +Release: 16_FC4 Epoch: 24 Url: http://www.isc.org/products/BIND/ Buildroot: %{_tmppath}/%{name}-root @@ -29,6 +29,9 @@ Source10: named-dbus.conf Source11: named.service Source12: README.sdb_pgsql +Source13: namedSetForwarders +Source14: namedGetForwarders +Source15: filter_requires.sh # http://www.venaas.no/ldap/bind-sdb/dnszone-schema.txt Patch: bind-9.2.0rc3-varrun.patch Patch1: bind-9.2.1-key.patch @@ -56,6 +59,7 @@ Patch23: bind-9.3.1-dbus_archdep_libdir.patch Patch24: bind-9.3.1-t_no_default_lookups.patch Patch25: bind-9.3.1-fix_dbus.patch +Patch26: bind-9.3.1-dbus_archdep_libdir_sdb.patch Requires(pre,preun): shadow-utils Requires(post,preun): chkconfig Requires(post): textutils, fileutils, sed, grep @@ -75,6 +79,11 @@ BuildRequires: openssl-devel gcc glibc-devel >= 2.2.5-26 glibc-kernheaders >= 2.4-7.10 libtool pkgconfig tar %endif %endif +# do not Require: perl just for namedGetForwarders ! +%define __perl_requires %SOURCE15 +%define __find_requires %SOURCE15 +%define _use_internal_dependency_generator 0 +# %description BIND (Berkeley Internet Name Domain) is an implementation of the DNS @@ -210,21 +219,22 @@ %endif %if %{SDB} %patch17 -p1 -b .fix_sdb_ldap +%patch21 -p1 -b .fix_sdb_pgsql %endif %patch18 -p1 -b .reject_resolv_conf_errors %patch19 -p1 -b .next_server_on_referral %patch20 -p1 -b .no_servfail_stops -%patch21 -p1 -b .fix_sdb_pgsql %if %{WITH_DBUS} +%patch25 -p1 -b .fix_dbus %if %{SDB} cp -fp bin/named/{dbus_mgr.c,dbus_service.c,log.c,server.c} bin/named_sdb cp -fp bin/named/include/named/{dbus_mgr.h,dbus_service.h,globals.h,server.h,log.h,types.h} bin/named_sdb/include/named %patch22 -p1 -b .sdb_dbus +%patch26 -p1 -b .dbus_archdep_libdir_sdb %endif %patch23 -p1 -b .dbus_archdep_libdir %endif %patch24 -p1 -b .-t_no_default_lookups -%patch25 -p1 -b .fix_dbus %build libtoolize --copy --force; aclocal; autoconf @@ -316,6 +326,9 @@ cp -fp %{SOURCE10} $RPM_BUILD_ROOT/etc/dbus-1/system.d/named.conf cp -fp %{SOURCE11} $RPM_BUILD_ROOT/usr/share/dbus-1/services/named.service %endif +cp -fp %{SOURCE13} $RPM_BUILD_ROOT/%{_sbindir}/namedSetForwarders +cp -fp %{SOURCE14} $RPM_BUILD_ROOT/%{_sbindir}/namedGetForwarders +chmod 754 $RPM_BUILD_ROOT/%{_sbindir}/named{Set,Get}Forwarders %if %{test} if [ "`whoami`" = 'root' ]; then set -e @@ -347,9 +360,21 @@ :; %pre -/usr/sbin/groupadd -g 25 named >/dev/null 2>&1 || :; -/usr/sbin/useradd -c "Named" -u 25 -g named \ - -s /sbin/nologin -r -d /var/named named >/dev/null 2>&1 || :; +if [ "$1" -eq 1 ]; then + # create named group IFF it does not already exist + # - use any free ID between 1 and 499 if group 25 exists: + /usr/sbin/groupadd -g 25 -f -r named >/dev/null 2>&1 || :; + # if named user does not already exist, create it as system user: + if ! /usr/bin/id -u named > /dev/null 2>&1; then + if ! /bin/egrep -q '^[^:]+:[^:]+:25:' /etc/passwd >/dev/null 2>&1 ; then + /usr/sbin/useradd -u 25 -r -n -M -g named -s /sbin/nologin -d /var/named -c Named named >/dev/null 2>&1 || :; + else + # use any free ID between 1 and 499: + /usr/sbin/useradd -r -n -M -g named -s /sbin/nologin -d /var/named -c Named named >/dev/null 2>&1 || :; + fi; + fi; +fi; +:; %post if [ "$1" -eq 1 ]; then @@ -469,6 +494,8 @@ %{_sbindir}/named-check* %{_sbindir}/rndc* %{_sbindir}/dns-keygen +%{_sbindir}/namedSetForwarders +%{_sbindir}/namedGetForwarders %{_mandir}/man5/named.conf.5* %{_mandir}/man5/rndc.conf.5* @@ -677,12 +704,17 @@ [ ! -e "%{prefix}/dev/random" ] && mknod "%{prefix}/dev/random" c 1 8 [ ! -e "%{prefix}/dev/zero" ] && mknod "%{prefix}/dev/zero" c 1 5 [ ! -e "%{prefix}/dev/null" ] && mknod "%{prefix}/dev/null" c 1 3 -chmod a+r "%{prefix}/dev/random" "%{prefix}/dev/null" "%{prefix}/dev/" +chmod 666 %{prefix}/dev/{null,random,zero} +if [ -d /selinux ] && [ -x /usr/bin/chcon ]; then + for dev in null random zero; do + /usr/bin/chcon --reference=/dev/$dev %{prefix}/dev/$dev >/dev/null 2>&1 || :; + done; +fi; chown root:named "%{prefix}/var/named" chown named:named "%{prefix}/var/named/slaves" chown named:named "%{prefix}/var/named/data" /etc/init.d/named condrestart >/dev/null 2>&1 || :; -[ -d /selinux ] && [ -x /sbin/restorecon ] && /sbin/restorecon -R %{prefix} >/dev/null 2>&1 +[ -d /selinux ] && [ -x /sbin/restorecon ] && /sbin/restorecon -R %{prefix} -e %{prefix}/proc -e %{prefix}/dev -e %{prefix}/var/run >/dev/null 2>&1 :; %preun chroot @@ -718,7 +750,14 @@ :; %changelog -* Wed Oct 19 2005 Jason Vas Dias - 24.9.3.1-14 +* Tue Mar 07 2006 Jason Vas Dias - 24:9.3.1-16 +- fix bug 181730: fix creation of named user & gid +- fix bug 179816: fix builds for all combinations of WITH_DBUS=0/1 SDB=0/1 LIBBIND=0/1 +- fix bug 177595: handle case where $ROOTDIR is a link in initscript +- improve method used to mount /proc and /var/run/dbus under chroot in initscript +- add namedGetForwarders and namedSetForwarders scripts for use with -D option + +* Wed Oct 19 2005 Jason Vas Dias - 24:9.3.1-14 - Allow the -D enable D-BUS option to be used within bind-chroot . - fix bug 171178: supply some documentation for pgsql SDB . Index: named.init =================================================================== RCS file: /cvs/dist/rpms/bind/FC-4/named.init,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- named.init 19 Oct 2005 21:50:33 -0000 1.34 +++ named.init 7 Mar 2006 21:48:18 -0000 1.35 @@ -19,7 +19,13 @@ [ -r /etc/sysconfig/named ] && . /etc/sysconfig/named -[ -n "$ROOTDIR" ] && ROOTDIR=`echo $ROOTDIR | sed 's#//*#/#g;s#/$##'` +if [ -n "$ROOTDIR" ]; then + ROOTDIR=`echo $ROOTDIR | sed 's#//*#/#g;s#/$##'`; + rdl=`/usr/bin/readlink $ROOTDIR`; + if [ -n "$rdl" ]; then + ROOTDIR="$rdl"; + fi; +fi RETVAL=0 named='named' @@ -64,17 +70,24 @@ if [ ! -d ${ROOTDIR}/proc ]; then mkdir -p ${ROOTDIR}/proc fi - if ! egrep -q "/proc ${ROOTDIR}/proc" /proc/mounts; then + if ! egrep -q '^/proc[[:space:]]+'${ROOTDIR}'/proc' /proc/mounts; then mount --bind /proc ${ROOTDIR}/proc >/dev/null 2>&1 fi - if echo "$OPTIONS" | egrep -q '(\<|['"'"'"\ ])-D(\>|['"'"'"\ ])'; then - if ! /bin/mount | egrep -q "^/var/run/dbus/system_bus_socket on ${ROOTDIR}/var/run/dbus/system_bus_socket"; then + dbus=0; + for a in $OPTIONS; do + if [ $a = "-D" ]; then + dbus=1; + fi; + done + if [ $dbus -eq 1 ]; then + if ! egrep -q '^/[^[:space:]]+[[:space:]]+'${ROOTDIR}'/var/run/dbus' /proc/mounts; then mkdir -p ${ROOTDIR}/var/run/dbus - touch ${ROOTDIR}/var/run/dbus/system_bus_socket; - mount --bind /var/run/dbus/system_bus_socket ${ROOTDIR}/var/run/dbus/system_bus_socket > /dev/null 2>&1; + if [ ! -d /var/run/dbus ] ; then + mkdir -p /var/run/dbus ; + fi; + mount --bind /var/run/dbus ${ROOTDIR}/var/run/dbus > /dev/null 2>&1; fi; - fi; - + fi; fi no_write_master_zones=0 if [ -e /etc/selinux/config ]; then From fedora-cvs-commits at redhat.com Tue Mar 7 21:54:01 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 7 Mar 2006 16:54:01 -0500 Subject: rpms/psmisc/devel psmisc-22.1-fuser-silent.patch, NONE, 1.1 .cvsignore, 1.11, 1.12 psmisc.spec, 1.25, 1.26 sources, 1.11, 1.12 psmisc-21.7-fuser-pid.patch, 1.1, NONE psmisc-21.7-killall-scanf.patch, 1.1, NONE Message-ID: <200603072154.k27Ls1Bw011303@cvs.devel.redhat.com> Author: kzak Update of /cvs/dist/rpms/psmisc/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv11277 Modified Files: .cvsignore psmisc.spec sources Added Files: psmisc-22.1-fuser-silent.patch Removed Files: psmisc-21.7-fuser-pid.patch psmisc-21.7-killall-scanf.patch Log Message: update to upstream cvs version psmisc-22.1-fuser-silent.patch: fuser.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) --- NEW FILE psmisc-22.1-fuser-silent.patch --- --- psmisc-22.1.03072006cvs/src/fuser.c.kzak 2006-03-07 22:25:22.000000000 +0100 +++ psmisc-22.1.03072006cvs/src/fuser.c 2006-03-07 22:29:21.000000000 +0100 @@ -695,7 +695,7 @@ break; case 'l': list_signals(); - break; + return 0; case 'm': opts |= OPT_MOUNTS; break; @@ -849,7 +849,9 @@ int have_match = 0; for (nptr = names_head; nptr != NULL ; nptr = nptr->next) { - if (! (opts & OPT_SILENT)) { /* We're not silent */ + if (opts & OPT_SILENT) { + have_match = nptr->matched_procs ? 1 : have_match; + } else { /* We're not silent */ if (nptr->matched_procs != NULL || opts & OPT_ALLFILES) { if (head == 0 && opts & OPT_VERBOSE) { fprintf(stderr, _("\n%*s USER PID ACCESS COMMAND\n"), @@ -919,7 +921,7 @@ putc('\n', stderr); } /* be silent */ if (opts & OPT_KILL) - kill_matched_proc(nptr->matched_procs, opts, sig_number); + kill_matched_proc(nptr->matched_procs, opts, sig_number); } /* next name */ return (have_match==1?0:1); Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/psmisc/devel/.cvsignore,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- .cvsignore 30 Nov 2005 22:49:34 -0000 1.11 +++ .cvsignore 7 Mar 2006 21:53:59 -0000 1.12 @@ -1 +1 @@ -psmisc-21.8.tar.gz +psmisc-22.1.03072006cvs.tar.gz Index: psmisc.spec =================================================================== RCS file: /cvs/dist/rpms/psmisc/devel/psmisc.spec,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- psmisc.spec 11 Feb 2006 05:18:45 -0000 1.25 +++ psmisc.spec 7 Mar 2006 21:53:59 -0000 1.26 @@ -1,7 +1,7 @@ Summary: Utilities for managing processes on your system. Name: psmisc -Version: 21.8 -Release: 1.2.1 +Version: 22.1.03072006cvs +Release: 1 License: BSD/GPL Group: Applications/System Source: ftp://ftp.sf.net/pub/sourceforge/psmisc/psmisc-%{version}.tar.gz @@ -10,8 +10,7 @@ BuildRequires: libtermcap-devel BuildRequires: libselinux-devel -Patch0: psmisc-21.7-fuser-pid.patch -Patch1: psmisc-21.7-killall-scanf.patch +Patch0: psmisc-22.1-fuser-silent.patch %description The psmisc package contains utilities for managing processes on your @@ -23,11 +22,11 @@ %prep %setup -q -%patch0 -p1 -b .pid -%patch1 -p1 -b .scanf +%patch0 -p1 %build export CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE" +./autogen.sh %configure --prefix=/usr --enable-selinux make @@ -36,12 +35,10 @@ # The rpm makeinstall macro breaks the build, so we do it the old way make install DESTDIR="$RPM_BUILD_ROOT" -# install more stable old version of fuser -mv $RPM_BUILD_ROOT%{_bindir}/oldfuser $RPM_BUILD_ROOT%{_bindir}/fuser - mkdir -p $RPM_BUILD_ROOT/sbin mv $RPM_BUILD_ROOT%{_bindir}/fuser $RPM_BUILD_ROOT/sbin rm -f $RPM_BUILD_ROOT/%{_mandir}/man1/pidof.1* +rm -f $RPM_BUILD_ROOT/%{_bindir}/oldfuser %find_lang %name @@ -59,6 +56,12 @@ %{_mandir}/man1/pstree.1* %changelog +* Tue Mar 7 2006 Karel Zak 22.1.03072006cvs-1 +- update to new upstream CVS version +- enable new fuser version +- fix fuser return code +- fix #183897 - "pstree -a" call results in segmentation fault + * Fri Feb 10 2006 Jesse Keating - 21.8-1.2.1 - bump again for double-long bug on ppc(64) Index: sources =================================================================== RCS file: /cvs/dist/rpms/psmisc/devel/sources,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- sources 30 Nov 2005 22:49:34 -0000 1.11 +++ sources 7 Mar 2006 21:53:59 -0000 1.12 @@ -1 +1 @@ -d6276e071c10ddf4b0d98856e5573e1a psmisc-21.8.tar.gz +25f607bb96467f2b094201d81b50c8cb psmisc-22.1.03072006cvs.tar.gz --- psmisc-21.7-fuser-pid.patch DELETED --- --- psmisc-21.7-killall-scanf.patch DELETED --- From fedora-cvs-commits at redhat.com Tue Mar 7 22:10:19 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 7 Mar 2006 17:10:19 -0500 Subject: rpms/pykickstart/devel .cvsignore, 1.23, 1.24 pykickstart.spec, 1.23, 1.24 sources, 1.24, 1.25 Message-ID: <200603072210.k27MAJce023058@cvs.devel.redhat.com> Author: clumens Update of /cvs/dist/rpms/pykickstart/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv22994 Modified Files: .cvsignore pykickstart.spec sources Log Message: Bump version. Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/pykickstart/devel/.cvsignore,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- .cvsignore 24 Feb 2006 19:54:38 -0000 1.23 +++ .cvsignore 7 Mar 2006 22:10:15 -0000 1.24 @@ -12,3 +12,4 @@ pykickstart-0.20.tar.gz pykickstart-0.21.tar.gz pykickstart-0.22.tar.gz +pykickstart-0.23.tar.gz Index: pykickstart.spec =================================================================== RCS file: /cvs/dist/rpms/pykickstart/devel/pykickstart.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- pykickstart.spec 24 Feb 2006 19:54:38 -0000 1.23 +++ pykickstart.spec 7 Mar 2006 22:10:15 -0000 1.24 @@ -2,7 +2,7 @@ Summary: A python library for manipulating kickstart files Name: pykickstart -Version: 0.22 +Version: 0.23 Release: 1 Source0: %{name}-%{version}.tar.gz License: GPL @@ -36,6 +36,9 @@ /usr/bin/ksvalidator %changelog +* Tue Mar 07 2006 Chris Lumens 0.23-1 +- Backwards compatibility support for options to zerombr. + * Fri Feb 24 2006 Chris Lumens 0.22-1 - Get ignoredisk working again (#182934). Index: sources =================================================================== RCS file: /cvs/dist/rpms/pykickstart/devel/sources,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- sources 24 Feb 2006 19:54:38 -0000 1.24 +++ sources 7 Mar 2006 22:10:15 -0000 1.25 @@ -1 +1 @@ -24e273d7a3543dd952af4a3a736be02a pykickstart-0.22.tar.gz +aa52b2e3ad0bb422095f14029d527503 pykickstart-0.23.tar.gz From fedora-cvs-commits at redhat.com Tue Mar 7 22:12:43 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 7 Mar 2006 17:12:43 -0500 Subject: rpms/xterm/FC-4 xterm-208-reverse-video-set-cursor-gcs.patch, NONE, 1.1 xterm.spec, 1.19, 1.20 Message-ID: <200603072212.k27MChE2024121@cvs.devel.redhat.com> Author: jvdias Update of /cvs/dist/rpms/xterm/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv24092 Modified Files: xterm.spec Added Files: xterm-208-reverse-video-set-cursor-gcs.patch Log Message: fix bug 183993: call set_cursor_gcs in ReverseVideo xterm-208-reverse-video-set-cursor-gcs.patch: util.c | 2 ++ 1 files changed, 2 insertions(+) --- NEW FILE xterm-208-reverse-video-set-cursor-gcs.patch --- --- xterm-208/util.c.reverse-video-set-cursor-gcs 2006-01-03 21:10:27.000000000 -0500 +++ xterm-208/util.c 2006-03-07 16:57:40.000000000 -0500 @@ -1597,6 +1597,8 @@ T_COLOR(screen, MOUSE_FG), T_COLOR(screen, MOUSE_BG)); + set_cursor_gcs(screen); + termw->misc.re_verse = !termw->misc.re_verse; if (XtIsRealized((Widget) termw)) { Index: xterm.spec =================================================================== RCS file: /cvs/dist/rpms/xterm/FC-4/xterm.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- xterm.spec 22 Feb 2006 19:16:49 -0000 1.19 +++ xterm.spec 7 Mar 2006 22:12:40 -0000 1.20 @@ -4,7 +4,7 @@ Summary: xterm terminal emulator for the X Window System Name: xterm Version: 208 -Release: 2.FC4 +Release: 4.FC4 URL: http://dickey.his.com/xterm License: MIT Group: User Interface/X @@ -18,6 +18,7 @@ Patch5: xterm-208-root-grab-console.patch Patch6: xterm-208-bz180450.patch Patch7: xterm-208-bz182382.patch +Patch8: xterm-208-reverse-video-set-cursor-gcs.patch BuildRequires: xorg-x11-devel >= 6.7.0 BuildRequires: utempter libtermcap-devel @@ -41,6 +42,7 @@ %patch5 -p1 -b .root-grab-console %patch6 -p1 -b .bz180450 %patch7 -p1 -b .bz182382 +%patch8 -p1 -b .bz183993 %{?!_with_256_color: %define _with_256_color 1} %{?!_with_tek4014: %define _with_tek4014 1} @@ -94,6 +96,9 @@ %{_x11bindir}/xterm %changelog +* Tue Mar 07 2006 Jason Vas Dias - 208-4.FC4 +- fix bug 183993: call set_cursor_gcs in ReverseVideo + * Wed Feb 22 2006 Jason Vas Dias - 208-2.FC4 - fix bug 182382: check for (VWindow(screen)!=0) in set_cursor_gcs - further fix for bug 178302: allow vt100*cursorColor to be same From fedora-cvs-commits at redhat.com Tue Mar 7 22:20:59 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 7 Mar 2006 17:20:59 -0500 Subject: rpms/kernel/devel linux-2.6-bcm43xx-neuter.patch, NONE, 1.1 kernel-2.6.spec, 1.2030, 1.2031 Message-ID: <200603072220.k27MKx66007853@cvs.devel.redhat.com> Author: linville Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv7784 Modified Files: kernel-2.6.spec Added Files: linux-2.6-bcm43xx-neuter.patch Log Message: linux-2.6-bcm43xx-neuter.patch: bcm43xx_main.c | 2 ++ 1 files changed, 2 insertions(+) --- NEW FILE linux-2.6-bcm43xx-neuter.patch --- --- linux-2.6.15.noarch/drivers/net/wireless/bcm43xx/bcm43xx_main.c.orig 2006-03-07 17:11:21.000000000 -0500 +++ linux-2.6.15.noarch/drivers/net/wireless/bcm43xx/bcm43xx_main.c 2006-03-07 17:11:46.000000000 -0500 @@ -143,7 +143,9 @@ MODULE_PARM_DESC(fwpostfix, "Postfix for #endif { 0 }, }; +#if 0 /* Disable automatic loading in FC5 */ MODULE_DEVICE_TABLE(pci, bcm43xx_pci_tbl); +#endif static void bcm43xx_ram_write(struct bcm43xx_private *bcm, u16 offset, u32 val) { Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.2030 retrieving revision 1.2031 diff -u -r1.2030 -r1.2031 --- kernel-2.6.spec 7 Mar 2006 19:37:17 -0000 1.2030 +++ kernel-2.6.spec 7 Mar 2006 22:20:56 -0000 1.2031 @@ -409,6 +409,7 @@ # Broadcom wireless driver Patch5000: linux-2.6-softmac-git.patch Patch5001: linux-2.6-bcm43xx-git.patch +Patch5002: linux-2.6-bcm43xx-neuter.patch # # 10000 to 20000 is for stuff that has to come last due to the @@ -1049,6 +1050,8 @@ %patch5000 -p1 # ... and bcm43xx driver too %patch5001 -p1 +# temporarily remove bcm43xx's MODULE_DEVICE_TABLE entry +%patch5002 -p1 # # final stuff @@ -1653,6 +1656,9 @@ %endif %changelog +* Tue Mar 7 2006 John W. Linville +- Temporarily disable automatic load of bcm43xx driver (causes hangs on some systems) + * Tue Mar 7 2006 Stephen Tweedie - Include xen header files in -devel packages if we're building xen. (bug 180198) From fedora-cvs-commits at redhat.com Tue Mar 7 22:22:16 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 7 Mar 2006 17:22:16 -0500 Subject: rpms/selinux-policy/devel modules-targeted.conf, 1.17, 1.18 policy-20060207.patch, 1.38, 1.39 selinux-policy.spec, 1.139, 1.140 Message-ID: <200603072222.k27MMGa0008472@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/selinux-policy/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv8435 Modified Files: modules-targeted.conf policy-20060207.patch selinux-policy.spec Log Message: * Tue Mar 7 2006 Dan Walsh 2.2.23-5 - Add Xen support Index: modules-targeted.conf =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/modules-targeted.conf,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- modules-targeted.conf 6 Mar 2006 21:33:51 -0000 1.17 +++ modules-targeted.conf 7 Mar 2006 22:22:14 -0000 1.18 @@ -988,6 +988,14 @@ ipsec = off +# Layer: system +# Module: xend +# +# TCP/IP encryption +# +xend = base + + # Layer: apps # Module: java # policy-20060207.patch: Rules.modular | 2 policy/modules/admin/readahead.te | 2 policy/modules/admin/rpm.fc | 2 policy/modules/admin/su.fc | 1 policy/modules/admin/su.if | 6 policy/modules/admin/vbetool.te | 5 policy/modules/kernel/corenetwork.te.in | 3 policy/modules/kernel/devices.if | 20 +++ policy/modules/kernel/files.fc | 2 policy/modules/kernel/files.if | 20 ++- policy/modules/kernel/kernel.if | 102 ++++++++++++++++ policy/modules/kernel/kernel.te | 3 policy/modules/services/apache.fc | 2 policy/modules/services/apache.if | 5 policy/modules/services/apm.fc | 2 policy/modules/services/bluetooth.te | 11 - policy/modules/services/cron.te | 3 policy/modules/services/cups.fc | 2 policy/modules/services/cups.if | 22 +++ policy/modules/services/cups.te | 7 - policy/modules/services/cvs.te | 2 policy/modules/services/hal.if | 41 ++++++ policy/modules/services/hal.te | 6 policy/modules/services/ktalk.fc | 1 policy/modules/services/ktalk.te | 6 policy/modules/services/nscd.if | 2 policy/modules/services/samba.te | 2 policy/modules/system/fstools.te | 1 policy/modules/system/init.te | 5 policy/modules/system/libraries.fc | 2 policy/modules/system/locallogin.te | 1 policy/modules/system/lvm.fc | 1 policy/modules/system/lvm.te | 2 policy/modules/system/selinuxutil.fc | 6 policy/modules/system/selinuxutil.te | 4 policy/modules/system/sysnetwork.te | 3 policy/modules/system/udev.te | 2 policy/modules/system/xend.fc | 19 +++ policy/modules/system/xend.if | 71 +++++++++++ policy/modules/system/xend.te | 196 ++++++++++++++++++++++++++++++++ support/Makefile.devel | 5 41 files changed, 568 insertions(+), 32 deletions(-) Index: policy-20060207.patch =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20060207.patch,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- policy-20060207.patch 6 Mar 2006 23:04:56 -0000 1.38 +++ policy-20060207.patch 7 Mar 2006 22:22:14 -0000 1.39 @@ -1,6 +1,6 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/readahead.te serefpolicy-2.2.23/policy/modules/admin/readahead.te --- nsaserefpolicy/policy/modules/admin/readahead.te 2006-03-04 00:06:33.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/admin/readahead.te 2006-03-04 23:47:48.000000000 -0500 ++++ serefpolicy-2.2.23/policy/modules/admin/readahead.te 2006-03-07 13:42:37.000000000 -0500 @@ -18,7 +18,7 @@ # Local policy # @@ -10,9 +10,21 @@ allow readahead_t self:process signal_perms; allow readahead_t readahead_var_run_t:file create_file_perms; +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.fc serefpolicy-2.2.23/policy/modules/admin/rpm.fc +--- nsaserefpolicy/policy/modules/admin/rpm.fc 2006-01-27 21:35:04.000000000 -0500 ++++ serefpolicy-2.2.23/policy/modules/admin/rpm.fc 2006-03-07 15:39:28.000000000 -0500 +@@ -25,7 +25,7 @@ + /var/lib/rpm(/.*)? gen_context(system_u:object_r:rpm_var_lib_t,s0) + + /var/log/rpmpkgs.* -- gen_context(system_u:object_r:rpm_log_t,s0) +-/var/log/yum\.log -- gen_context(system_u:object_r:rpm_log_t,s0) ++/var/log/yum\.log.* -- gen_context(system_u:object_r:rpm_log_t,s0) + + # SuSE + ifdef(`distro_suse', ` diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/su.fc serefpolicy-2.2.23/policy/modules/admin/su.fc --- nsaserefpolicy/policy/modules/admin/su.fc 2005-11-14 18:24:06.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/admin/su.fc 2006-03-04 23:47:48.000000000 -0500 ++++ serefpolicy-2.2.23/policy/modules/admin/su.fc 2006-03-07 13:42:37.000000000 -0500 @@ -2,3 +2,4 @@ /bin/su -- gen_context(system_u:object_r:su_exec_t,s0) @@ -20,7 +32,7 @@ +/usr/bin/kdesu -- gen_context(system_u:object_r:su_exec_t,s0) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/su.if serefpolicy-2.2.23/policy/modules/admin/su.if --- nsaserefpolicy/policy/modules/admin/su.if 2006-03-04 00:06:33.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/admin/su.if 2006-03-04 23:47:48.000000000 -0500 ++++ serefpolicy-2.2.23/policy/modules/admin/su.if 2006-03-07 13:42:37.000000000 -0500 @@ -141,10 +141,10 @@ # By default, revert to the calling domain when a shell is executed. @@ -37,7 +49,7 @@ kernel_read_kernel_sysctls($1_su_t) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/vbetool.te serefpolicy-2.2.23/policy/modules/admin/vbetool.te --- nsaserefpolicy/policy/modules/admin/vbetool.te 2006-02-01 08:23:27.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/admin/vbetool.te 2006-03-06 17:41:24.000000000 -0500 ++++ serefpolicy-2.2.23/policy/modules/admin/vbetool.te 2006-03-07 13:42:37.000000000 -0500 @@ -15,6 +15,7 @@ # Local policy # @@ -56,7 +68,7 @@ +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corenetwork.te.in serefpolicy-2.2.23/policy/modules/kernel/corenetwork.te.in --- nsaserefpolicy/policy/modules/kernel/corenetwork.te.in 2006-02-20 14:07:36.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/kernel/corenetwork.te.in 2006-03-04 23:47:48.000000000 -0500 ++++ serefpolicy-2.2.23/policy/modules/kernel/corenetwork.te.in 2006-03-07 13:42:37.000000000 -0500 @@ -66,7 +66,7 @@ network_port(giftd, tcp,1213,s0) network_port(gopher, tcp,70,s0, udp,70,s0) @@ -66,9 +78,17 @@ network_port(howl, tcp,5335,s0, udp,5353,s0) network_port(hplip, tcp,50000,s0, tcp,50002,s0) network_port(i18n_input, tcp,9010,s0) +@@ -126,6 +126,7 @@ + network_port(uucpd, tcp,540,s0) + network_port(vnc, tcp,5900,s0) + network_port(xserver, tcp,6001,s0, tcp,6002,s0, tcp,6003,s0, tcp,6004,s0, tcp,6005,s0, tcp,6006,s0, tcp,6007,s0, tcp,6008,s0, tcp,6009,s0, tcp,6010,s0, tcp,6011,s0, tcp,6012,s0, tcp,6013,s0, tcp,6014,s0, tcp,6015,s0, tcp,6016,s0, tcp,6017,s0, tcp,6018,s0, tcp,6019,s0) ++network_port(xen, tcp,8002,s0) + network_port(zebra, tcp,2601,s0) + network_port(zope, tcp,8021,s0) + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.if serefpolicy-2.2.23/policy/modules/kernel/devices.if --- nsaserefpolicy/policy/modules/kernel/devices.if 2006-02-23 09:25:08.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/kernel/devices.if 2006-03-04 23:47:48.000000000 -0500 ++++ serefpolicy-2.2.23/policy/modules/kernel/devices.if 2006-03-07 16:50:04.000000000 -0500 @@ -2384,7 +2384,7 @@ ') @@ -78,9 +98,31 @@ ') ######################################## +@@ -2732,3 +2732,21 @@ + typeattribute $1 memory_raw_write, memory_raw_read; + ') + ++######################################## ++## ++## Dontaudit getattr on all device nodes. ++## ++## ++## ++## Domain to not audit. ++## ++## ++# ++interface(`dev_dontaudit_getattr_all_device_nodes',` ++ gen_require(` ++ attribute device_node; ++ ') ++ ++ dontaudit $1 device_node:dir_file_class_set getattr; ++') ++ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.fc serefpolicy-2.2.23/policy/modules/kernel/files.fc --- nsaserefpolicy/policy/modules/kernel/files.fc 2006-03-04 00:06:34.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/kernel/files.fc 2006-03-04 23:47:48.000000000 -0500 ++++ serefpolicy-2.2.23/policy/modules/kernel/files.fc 2006-03-07 13:42:37.000000000 -0500 @@ -93,7 +93,7 @@ # HOME_ROOT # expanded by genhomedircon @@ -92,7 +134,7 @@ HOME_ROOT/lost\+found/.* <> diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.if serefpolicy-2.2.23/policy/modules/kernel/files.if --- nsaserefpolicy/policy/modules/kernel/files.if 2006-03-04 00:06:34.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/kernel/files.if 2006-03-04 23:47:48.000000000 -0500 ++++ serefpolicy-2.2.23/policy/modules/kernel/files.if 2006-03-07 13:42:37.000000000 -0500 @@ -1648,6 +1648,21 @@ ') @@ -133,17 +175,16 @@ ######################################## diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel.if serefpolicy-2.2.23/policy/modules/kernel/kernel.if --- nsaserefpolicy/policy/modules/kernel/kernel.if 2006-03-04 00:06:34.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/kernel/kernel.if 2006-03-06 16:54:38.000000000 -0500 -@@ -1023,7 +1023,7 @@ - ') ++++ serefpolicy-2.2.23/policy/modules/kernel/kernel.if 2006-03-07 14:00:35.000000000 -0500 +@@ -1044,6 +1044,7 @@ allow $1 proc_t:dir search; -- allow $1 sysctl_t:dir r_dir_perms; -+ allow $1 sysctl_t:dir rw_dir_perms; - allow $1 sysctl_vm_t:file r_file_perms; + allow $1 sysctl_t:dir r_dir_perms; ++ allow $1 sysctl_vm_t:dir rw_dir_perms; + allow $1 sysctl_vm_t:file rw_file_perms; ') -@@ -1328,7 +1328,7 @@ +@@ -1328,7 +1329,7 @@ allow $1 proc_t:dir search; allow $1 sysctl_t:dir r_dir_perms; @@ -152,9 +193,125 @@ allow $1 sysctl_kernel_t:file rw_file_perms; ') +@@ -1946,3 +1947,102 @@ + + kernel_rw_all_sysctls($1) + ') ++ ++ ++ ++######################################## ++## ++## Do not audit attempts to search the xen ++## state directory. ++## ++## ++## ++## The process type reading the state. ++## ++## ++## ++# ++interface(`kernel_dontaudit_search_xen_state',` ++ gen_require(` ++ type proc_xen_t; ++ ') ++ ++ dontaudit $1 proc_xen_t:dir search; ++') ++ ++######################################## ++## ++## Allow searching of xen state directory. ++## ++## ++## ++## The process type reading the state. ++## ++## ++## ++# ++interface(`kernel_search_xen_state',` ++ gen_require(` ++ type proc_xen_t; ++ ') ++ ++ allow $1 proc_xen_t:dir search; ++') ++ ++######################################## ++## ++## Allow caller to read the xen state information. ++## ++## ++## ++## The process type reading the state. ++## ++## ++## ++# ++interface(`kernel_read_xen_state',` ++ gen_require(` ++ type proc_t, proc_xen_t; ++ ') ++ ++ allow $1 proc_t:dir search; ++ allow $1 proc_xen_t:dir r_dir_perms; ++ allow $1 proc_xen_t:file r_file_perms; ++ allow $1 proc_xen_t:lnk_file { getattr read }; ++') ++ ++######################################## ++## ++## Allow caller to read the xen state symbolic links. ++## ++## ++## ++## The process type reading the state. ++## ++## ++## ++# ++interface(`kernel_read_xen_state_symlinks',` ++ gen_require(` ++ type proc_t, proc_xen_t; ++ ') ++ ++ allow $1 proc_t:dir search; ++ allow $1 proc_xen_t:dir r_dir_perms; ++ allow $1 proc_xen_t:lnk_file r_file_perms; ++') ++ ++ ++######################################## ++# ++# kernel_rw_xen(domain) ++# ++interface(`kernel_write_xen_state',` ++ gen_require(` ++ type proc_t, proc_xen_t; ++ ') ++ ++ allow $1 proc_t:dir search; ++ allow $1 proc_xen_t:dir r_dir_perms; ++ allow $1 proc_xen_t:file write; ++') +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel.te serefpolicy-2.2.23/policy/modules/kernel/kernel.te +--- nsaserefpolicy/policy/modules/kernel/kernel.te 2006-02-07 10:43:26.000000000 -0500 ++++ serefpolicy-2.2.23/policy/modules/kernel/kernel.te 2006-03-07 13:42:37.000000000 -0500 +@@ -75,6 +75,9 @@ + type proc_net_t, proc_type; + genfscon proc /net gen_context(system_u:object_r:proc_net_t,s0) + ++type proc_xen_t, proc_type; ++genfscon proc /xen gen_context(system_u:object_r:proc_xen_t,s0) ++ + # + # Sysctl types + # diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.fc serefpolicy-2.2.23/policy/modules/services/apache.fc --- nsaserefpolicy/policy/modules/services/apache.fc 2006-02-27 17:17:23.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/services/apache.fc 2006-03-04 23:47:48.000000000 -0500 ++++ serefpolicy-2.2.23/policy/modules/services/apache.fc 2006-03-07 13:42:37.000000000 -0500 @@ -15,6 +15,7 @@ /etc/vhosts -- gen_context(system_u:object_r:httpd_config_t,s0) @@ -170,7 +327,7 @@ +/usr/share/selinux-policy([^/]*)?/html(/.*)? gen_context(system_u:object_r:httpd_sys_content_t,s0) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.if serefpolicy-2.2.23/policy/modules/services/apache.if --- nsaserefpolicy/policy/modules/services/apache.if 2006-03-04 00:06:35.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/services/apache.if 2006-03-04 23:47:48.000000000 -0500 ++++ serefpolicy-2.2.23/policy/modules/services/apache.if 2006-03-07 13:42:37.000000000 -0500 @@ -12,6 +12,11 @@ ## # @@ -183,9 +340,21 @@ # allow write access to public file transfer # services files. gen_tunable(allow_httpd_$1_script_anon_write,false) +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apm.fc serefpolicy-2.2.23/policy/modules/services/apm.fc +--- nsaserefpolicy/policy/modules/services/apm.fc 2005-11-14 18:24:08.000000000 -0500 ++++ serefpolicy-2.2.23/policy/modules/services/apm.fc 2006-03-07 15:38:20.000000000 -0500 +@@ -11,7 +11,7 @@ + # + # /var + # +-/var/log/acpid -- gen_context(system_u:object_r:apmd_log_t,s0) ++/var/log/acpid.* -- gen_context(system_u:object_r:apmd_log_t,s0) + + /var/run/\.?acpid\.socket -s gen_context(system_u:object_r:apmd_var_run_t,s0) + /var/run/apmd\.pid -- gen_context(system_u:object_r:apmd_var_run_t,s0) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bluetooth.te serefpolicy-2.2.23/policy/modules/services/bluetooth.te --- nsaserefpolicy/policy/modules/services/bluetooth.te 2006-03-04 00:06:35.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/services/bluetooth.te 2006-03-06 09:54:40.000000000 -0500 ++++ serefpolicy-2.2.23/policy/modules/services/bluetooth.te 2006-03-07 13:42:37.000000000 -0500 @@ -115,6 +115,7 @@ corecmd_exec_shell(bluetooth_t) @@ -223,7 +392,7 @@ allow bluetooth_helper_t xdm_xserver_tmp_t:sock_file { read write }; diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.te serefpolicy-2.2.23/policy/modules/services/cron.te --- nsaserefpolicy/policy/modules/services/cron.te 2006-03-04 00:06:35.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/services/cron.te 2006-03-04 23:47:48.000000000 -0500 ++++ serefpolicy-2.2.23/policy/modules/services/cron.te 2006-03-07 13:42:37.000000000 -0500 @@ -166,6 +166,9 @@ allow crond_t unconfined_t:dbus send_msg; @@ -236,7 +405,7 @@ allow crond_t crond_tmp_t:file create_file_perms; diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.fc serefpolicy-2.2.23/policy/modules/services/cups.fc --- nsaserefpolicy/policy/modules/services/cups.fc 2005-11-14 18:24:08.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/services/cups.fc 2006-03-04 23:47:48.000000000 -0500 ++++ serefpolicy-2.2.23/policy/modules/services/cups.fc 2006-03-07 13:42:37.000000000 -0500 @@ -43,7 +43,7 @@ /var/log/cups(/.*)? gen_context(system_u:object_r:cupsd_log_t,s0) /var/log/turboprint_cups\.log.* -- gen_context(system_u:object_r:cupsd_log_t,s0) @@ -248,7 +417,7 @@ /var/run/ptal-printd(/.*)? gen_context(system_u:object_r:ptal_var_run_t,s0) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.if serefpolicy-2.2.23/policy/modules/services/cups.if --- nsaserefpolicy/policy/modules/services/cups.if 2006-02-23 09:25:09.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/services/cups.if 2006-03-06 12:24:44.000000000 -0500 ++++ serefpolicy-2.2.23/policy/modules/services/cups.if 2006-03-07 13:42:37.000000000 -0500 @@ -226,3 +226,25 @@ allow cupsd_t $1:tcp_socket { acceptfrom recvfrom }; kernel_tcp_recvfrom($1) @@ -277,7 +446,7 @@ + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.te serefpolicy-2.2.23/policy/modules/services/cups.te --- nsaserefpolicy/policy/modules/services/cups.te 2006-03-04 00:06:35.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/services/cups.te 2006-03-06 12:24:35.000000000 -0500 ++++ serefpolicy-2.2.23/policy/modules/services/cups.te 2006-03-07 13:42:37.000000000 -0500 @@ -77,7 +77,7 @@ dontaudit cupsd_t self:capability { sys_tty_config net_admin }; allow cupsd_t self:process { setsched signal_perms }; @@ -322,7 +491,7 @@ ######################################## diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cvs.te serefpolicy-2.2.23/policy/modules/services/cvs.te --- nsaserefpolicy/policy/modules/services/cvs.te 2006-03-04 00:06:35.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/services/cvs.te 2006-03-04 23:47:48.000000000 -0500 ++++ serefpolicy-2.2.23/policy/modules/services/cvs.te 2006-03-07 13:42:37.000000000 -0500 @@ -11,7 +11,7 @@ inetd_tcp_service_domain(cvs_t,cvs_exec_t) role system_r types cvs_t; @@ -334,7 +503,7 @@ type cvs_tmp_t; diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.if serefpolicy-2.2.23/policy/modules/services/hal.if --- nsaserefpolicy/policy/modules/services/hal.if 2006-03-04 00:06:36.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/services/hal.if 2006-03-06 17:40:22.000000000 -0500 ++++ serefpolicy-2.2.23/policy/modules/services/hal.if 2006-03-07 13:42:37.000000000 -0500 @@ -100,3 +100,44 @@ allow $1 hald_t:dbus send_msg; allow hald_t $1:dbus send_msg; @@ -382,7 +551,7 @@ + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.te serefpolicy-2.2.23/policy/modules/services/hal.te --- nsaserefpolicy/policy/modules/services/hal.te 2006-03-04 00:06:36.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/services/hal.te 2006-03-06 14:50:05.000000000 -0500 ++++ serefpolicy-2.2.23/policy/modules/services/hal.te 2006-03-07 13:42:37.000000000 -0500 @@ -48,6 +48,7 @@ kernel_read_network_state(hald_t) kernel_read_kernel_sysctls(hald_t) @@ -412,7 +581,7 @@ ') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ktalk.fc serefpolicy-2.2.23/policy/modules/services/ktalk.fc --- nsaserefpolicy/policy/modules/services/ktalk.fc 2006-02-20 14:07:37.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/services/ktalk.fc 2006-03-06 11:04:32.000000000 -0500 ++++ serefpolicy-2.2.23/policy/modules/services/ktalk.fc 2006-03-07 13:42:37.000000000 -0500 @@ -1,3 +1,4 @@ /usr/bin/in.talkd -- gen_context(system_u:object_r:ktalkd_exec_t,s0) @@ -420,7 +589,7 @@ +/var/log/talkd.* -- gen_context(system_u:object_r:ktalkd_log_t,s0) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ktalk.te serefpolicy-2.2.23/policy/modules/services/ktalk.te --- nsaserefpolicy/policy/modules/services/ktalk.te 2006-03-04 00:06:36.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/services/ktalk.te 2006-03-06 11:06:04.000000000 -0500 ++++ serefpolicy-2.2.23/policy/modules/services/ktalk.te 2006-03-07 13:42:37.000000000 -0500 @@ -14,6 +14,9 @@ type ktalkd_tmp_t; files_tmp_file(ktalkd_tmp_t) @@ -446,7 +615,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nscd.if serefpolicy-2.2.23/policy/modules/services/nscd.if --- nsaserefpolicy/policy/modules/services/nscd.if 2006-02-10 21:34:14.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/services/nscd.if 2006-03-04 23:47:48.000000000 -0500 ++++ serefpolicy-2.2.23/policy/modules/services/nscd.if 2006-03-07 13:42:37.000000000 -0500 @@ -49,8 +49,8 @@ dontaudit $1 nscd_t:nscd { shmempwd shmemgrp shmemhost }; @@ -459,7 +628,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/samba.te serefpolicy-2.2.23/policy/modules/services/samba.te --- nsaserefpolicy/policy/modules/services/samba.te 2006-03-04 00:06:36.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/services/samba.te 2006-03-04 23:47:48.000000000 -0500 ++++ serefpolicy-2.2.23/policy/modules/services/samba.te 2006-03-07 13:42:37.000000000 -0500 @@ -32,7 +32,7 @@ type samba_secrets_t; files_type(samba_secrets_t) @@ -469,9 +638,20 @@ files_config_file(samba_share_t) type samba_var_t; +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/fstools.te serefpolicy-2.2.23/policy/modules/system/fstools.te +--- nsaserefpolicy/policy/modules/system/fstools.te 2006-03-04 00:06:37.000000000 -0500 ++++ serefpolicy-2.2.23/policy/modules/system/fstools.te 2006-03-07 16:50:14.000000000 -0500 +@@ -73,6 +73,7 @@ + dev_getattr_usbfs_dirs(fsadm_t) + # Access to /dev/mapper/control + dev_rw_lvm_control(fsadm_t) ++dev_dontaudit_getattr_all_device_nodes(fsadm_t) + + fs_search_auto_mountpoints(fsadm_t) + fs_getattr_xattr_fs(fsadm_t) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.te serefpolicy-2.2.23/policy/modules/system/init.te --- nsaserefpolicy/policy/modules/system/init.te 2006-03-04 00:06:37.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/system/init.te 2006-03-04 23:47:48.000000000 -0500 ++++ serefpolicy-2.2.23/policy/modules/system/init.te 2006-03-07 13:42:37.000000000 -0500 @@ -349,6 +349,7 @@ files_mounton_isid_type_dirs(initrc_t) files_list_default(initrc_t) @@ -493,7 +673,7 @@ # this also would result in a type transition diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.fc serefpolicy-2.2.23/policy/modules/system/libraries.fc --- nsaserefpolicy/policy/modules/system/libraries.fc 2006-02-20 14:07:38.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/system/libraries.fc 2006-03-04 23:47:48.000000000 -0500 ++++ serefpolicy-2.2.23/policy/modules/system/libraries.fc 2006-03-07 13:42:37.000000000 -0500 @@ -65,6 +65,7 @@ /usr/lib(64)?/(nvidia/)?libGL(core)?\.so(\.[^/]*)* -- gen_context(system_u:object_r:textrel_shlib_t,s0) /usr/lib(64)?/libGLU\.so(\.[^/]*)* -- gen_context(system_u:object_r:textrel_shlib_t,s0) @@ -512,7 +692,7 @@ /usr/lib(64)?/.*/program/.*\.so.* gen_context(system_u:object_r:shlib_t,s0) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/locallogin.te serefpolicy-2.2.23/policy/modules/system/locallogin.te --- nsaserefpolicy/policy/modules/system/locallogin.te 2006-03-04 00:06:37.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/system/locallogin.te 2006-03-04 23:47:48.000000000 -0500 ++++ serefpolicy-2.2.23/policy/modules/system/locallogin.te 2006-03-07 13:42:37.000000000 -0500 @@ -20,6 +20,7 @@ type local_login_tmp_t; @@ -523,7 +703,7 @@ type sulogin_exec_t; diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/lvm.fc serefpolicy-2.2.23/policy/modules/system/lvm.fc --- nsaserefpolicy/policy/modules/system/lvm.fc 2005-11-14 18:24:06.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/system/lvm.fc 2006-03-04 23:47:48.000000000 -0500 ++++ serefpolicy-2.2.23/policy/modules/system/lvm.fc 2006-03-07 13:42:37.000000000 -0500 @@ -25,6 +25,7 @@ # /sbin # @@ -532,9 +712,21 @@ /sbin/dmsetup -- gen_context(system_u:object_r:lvm_exec_t,s0) /sbin/dmsetup\.static -- gen_context(system_u:object_r:lvm_exec_t,s0) /sbin/e2fsadm -- gen_context(system_u:object_r:lvm_exec_t,s0) +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/lvm.te serefpolicy-2.2.23/policy/modules/system/lvm.te +--- nsaserefpolicy/policy/modules/system/lvm.te 2006-03-04 00:06:37.000000000 -0500 ++++ serefpolicy-2.2.23/policy/modules/system/lvm.te 2006-03-07 17:10:36.000000000 -0500 +@@ -129,6 +129,8 @@ + + # DAC overrides and mknod for modifying /dev entries (vgmknodes) + allow lvm_t self:capability { dac_override ipc_lock sys_admin sys_nice mknod chown sys_resource }; ++# Needed for dmraid ++allow lvm_t self:capability sys_rawio; + dontaudit lvm_t self:capability sys_tty_config; + allow lvm_t self:process { sigchld sigkill sigstop signull signal }; + # LVM will complain a lot if it cannot set its priority. diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.fc serefpolicy-2.2.23/policy/modules/system/selinuxutil.fc --- nsaserefpolicy/policy/modules/system/selinuxutil.fc 2006-02-23 09:25:09.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/system/selinuxutil.fc 2006-03-04 23:47:48.000000000 -0500 ++++ serefpolicy-2.2.23/policy/modules/system/selinuxutil.fc 2006-03-07 13:42:37.000000000 -0500 @@ -8,9 +8,9 @@ /etc/selinux/([^/]*/)?contexts/files(/.*)? gen_context(system_u:object_r:file_context_t,s0) /etc/selinux/([^/]*/)?policy(/.*)? gen_context(system_u:object_r:policy_config_t,s15:c0.c255) @@ -550,7 +742,7 @@ # diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.te serefpolicy-2.2.23/policy/modules/system/selinuxutil.te --- nsaserefpolicy/policy/modules/system/selinuxutil.te 2006-03-04 00:06:37.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/system/selinuxutil.te 2006-03-05 20:56:17.000000000 -0500 ++++ serefpolicy-2.2.23/policy/modules/system/selinuxutil.te 2006-03-07 13:42:37.000000000 -0500 @@ -192,6 +192,9 @@ selinux_load_policy(load_policy_t) selinux_set_boolean(load_policy_t) @@ -569,9 +761,22 @@ term_use_all_user_ttys(newrole_t) term_use_all_user_ptys(newrole_t) term_relabel_all_user_ttys(newrole_t) +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/sysnetwork.te serefpolicy-2.2.23/policy/modules/system/sysnetwork.te +--- nsaserefpolicy/policy/modules/system/sysnetwork.te 2006-03-04 00:06:37.000000000 -0500 ++++ serefpolicy-2.2.23/policy/modules/system/sysnetwork.te 2006-03-07 15:47:26.000000000 -0500 +@@ -322,6 +322,9 @@ + udev_dontaudit_rw_dgram_sockets(ifconfig_t) + ') + ') ++optional_policy(`xend',` ++ xend_append_log(ifconfig_t) ++') + + ifdef(`targeted_policy',` + term_use_generic_ptys(ifconfig_t) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.te serefpolicy-2.2.23/policy/modules/system/udev.te --- nsaserefpolicy/policy/modules/system/udev.te 2006-03-04 00:06:37.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/system/udev.te 2006-03-04 23:47:48.000000000 -0500 ++++ serefpolicy-2.2.23/policy/modules/system/udev.te 2006-03-07 13:42:37.000000000 -0500 @@ -39,7 +39,7 @@ # Local policy # @@ -581,9 +786,307 @@ dontaudit udev_t self:capability sys_tty_config; allow udev_t self:process ~{ ptrace setcurrent setexec setfscreate setrlimit execmem execstack execheap }; allow udev_t self:process { execmem setfscreate }; +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xend.fc serefpolicy-2.2.23/policy/modules/system/xend.fc +--- nsaserefpolicy/policy/modules/system/xend.fc 1969-12-31 19:00:00.000000000 -0500 ++++ serefpolicy-2.2.23/policy/modules/system/xend.fc 2006-03-07 14:59:39.000000000 -0500 +@@ -0,0 +1,19 @@ ++# xend executable will have: ++# label: system_u:object_r:xend_exec_t ++# MLS sensitivity: s0 ++# MCS categories: ++/usr/sbin/xend -- system_u:object_r:xend_exec_t:s0 ++/usr/sbin/xenconsoled -- system_u:object_r:xenconsoled_exec_t:s0 ++/usr/sbin/xenstored -- system_u:object_r:xenstored_exec_t:s0 ++ ++/var/log/xend\.log -- system_u:object_r:xend_var_log_t:s0 ++/var/log/xend-debug\.log -- system_u:object_r:xend_var_log_t:s0 ++/var/lib/xen(/.*)? system_u:object_r:xend_var_lib_t:s0 ++/var/lib/xend(/.*)? system_u:object_r:xend_var_lib_t:s0 ++/var/lib/xenstored(/.*)? system_u:object_r:xenstored_var_lib_t:s0 ++/var/run/xenstored(/.*)? system_u:object_r:xenstored_var_run_t:s0 ++/var/run/xend\.pid -- system_u:object_r:xend_var_run_t:s0 ++/var/run/xenstore\.pid -- system_u:object_r:xenstored_var_run_t:s0 ++/var/run/xenconsoled\.pid -- system_u:object_r:xenconsoled_var_run_t:s0 ++/etc/xen/scripts(/.*)? system_u:object_r:bin_t:s0 ++/dev/evtchn -c system_u:object_r:xend_device_t:s0 +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xend.if serefpolicy-2.2.23/policy/modules/system/xend.if +--- nsaserefpolicy/policy/modules/system/xend.if 1969-12-31 19:00:00.000000000 -0500 ++++ serefpolicy-2.2.23/policy/modules/system/xend.if 2006-03-07 15:47:54.000000000 -0500 +@@ -0,0 +1,71 @@ ++## policy for xen ++ ++######################################## ++## ++## Execute a domain transition to run xend. ++## ++## ++## ++## Domain allowed to transition. ++## ++## ++# ++interface(`xend_domtrans',` ++ gen_requires(` ++ type xend_t, xend_exec_t; ++ ') ++ ++ domain_auto_trans($1,xend_exec_t,xend_t) ++ ++ allow $1 xend_t:fd use; ++ allow xend_t $1:fd use; ++ allow xend_t $1:fifo_file rw_file_perms; ++ allow xend_t $1:process sigchld; ++') ++ ++ ++######################################## ++## ++## Allow the specified domain to append ++## xend log files. ++## ++## ++## ++## Domain allowed to transition. ++## ++## ++# ++interface(`xend_append_log',` ++ gen_require(` ++ type var_log_t, xend_var_log_t; ++ ') ++ ++ files_search_var($1) ++ allow $1 var_log_t:dir r_dir_perms; ++ allow $1 xend_var_log_t:file { getattr append }; ++ dontaudit $1 xend_var_log_t:file write; ++') ++ ++ ++ ++######################################## ++## ++## Connect to xenstored over an unix stream socket. ++## ++## ++## ++## Domain allowed access. ++## ++## ++# ++interface(`xend_store_stream_connect',` ++ gen_require(` ++ type xenstored_t, xenstored_var_run_t; ++ ') ++ ++ files_search_pids($1) ++ allow $1 xenstored_var_run_t:dir search; ++ allow $1 xenstored_var_run_t:sock_file { getattr write }; ++ allow $1 xenstored_t:unix_stream_socket connectto; ++') ++ +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xend.te serefpolicy-2.2.23/policy/modules/system/xend.te +--- nsaserefpolicy/policy/modules/system/xend.te 1969-12-31 19:00:00.000000000 -0500 ++++ serefpolicy-2.2.23/policy/modules/system/xend.te 2006-03-07 15:55:35.000000000 -0500 +@@ -0,0 +1,196 @@ ++policy_module(xend,1.0.0) ++ ++######################################## ++# ++# Declarations ++# ++ ++type xend_t; ++type xend_exec_t; ++domain_type(xend_t) ++init_daemon_domain(xend_t, xend_exec_t) ++ ++# pid files ++type xend_var_run_t; ++files_pid_file(xend_var_run_t) ++ ++# log files ++type xend_var_log_t; ++logging_log_file(xend_var_log_t) ++ ++# var/lib files ++type xend_var_lib_t; ++files_type(xend_var_lib_t) ++ ++# var/lib files ++type xend_device_t; ++dev_node(xend_device_t) ++ ++type xenstored_t; ++type xenstored_exec_t; ++domain_type(xenstored_t) ++domain_entry_file(xenstored_t,xenstored_exec_t) ++ ++# pid files ++type xenstored_var_run_t; ++files_pid_file(xenstored_var_run_t) ++ ++# var/lib files ++type xenstored_var_lib_t; ++files_type(xenstored_var_lib_t) ++ ++type xenconsoled_t; ++type xenconsoled_exec_t; ++domain_type(xenconsoled_t) ++domain_entry_file(xenconsoled_t,xenconsoled_exec_t) ++ ++# pid files ++type xenconsoled_var_run_t; ++files_pid_file(xenconsoled_var_run_t) ++ ++######################################## ++# ++# xend local policy ++# ++# Check in /etc/selinux/refpolicy/include for macros to use instead of allow rules. ++ ++# Some common macros (you might be able to remove some) ++files_read_etc_files(xend_t) ++libs_use_ld_so(xend_t) ++libs_use_shared_libs(xend_t) ++miscfiles_read_localization(xend_t) ++## internal communication is often done using fifo and unix sockets. ++allow xend_t self:fifo_file rw_file_perms; ++allow xend_t self:unix_stream_socket create_stream_socket_perms; ++allow xend_t self:process signal; ++allow xend_t self:capability { dac_override ipc_lock net_admin setuid sys_nice }; ++allow xend_t self:netlink_route_socket r_netlink_socket_perms; ++ ++# pid file ++allow xend_t xend_var_run_t:file manage_file_perms; ++allow xend_t xend_var_run_t:sock_file manage_file_perms; ++allow xend_t xend_var_run_t:dir rw_dir_perms; ++files_pid_filetrans(xend_t,xend_var_run_t, { file sock_file }) ++ ++# log files ++allow xend_t xend_var_log_t:file create_file_perms; ++allow xend_t xend_var_log_t:sock_file create_file_perms; ++allow xend_t xend_var_log_t:dir { rw_dir_perms setattr }; ++logging_log_filetrans(xend_t,xend_var_log_t,{ sock_file file dir }) ++ ++# var/lib files for xend ++allow xend_t xend_var_lib_t:file create_file_perms; ++allow xend_t xend_var_lib_t:sock_file create_file_perms; ++allow xend_t xend_var_lib_t:dir create_dir_perms; ++files_var_lib_filetrans(xend_t,xend_var_lib_t,{ file dir sock_file }) ++ ++## Networking basics (adjust to your needs!) ++sysnet_dns_name_resolve(xend_t) ++corenet_tcp_sendrecv_all_if(xend_t) ++corenet_tcp_sendrecv_all_nodes(xend_t) ++corenet_tcp_sendrecv_all_ports(xend_t) ++corenet_non_ipsec_sendrecv(xend_t) ++corenet_tcp_bind_xen_port(xend_t) ++corenet_tcp_bind_soundd_port(xend_t) ++allow xend_t self:tcp_socket create_stream_socket_perms; ++allow xend_t self:packet_socket create_socket_perms; ++allow xend_t self:unix_dgram_socket create_socket_perms; ++ ++corecmd_exec_sbin(xend_t) ++corecmd_exec_bin(xend_t) ++corecmd_exec_shell(xend_t) ++ ++consoletype_exec(xend_t) ++ ++dev_read_urand(xend_t) ++dev_filetrans(xend_t, xend_device_t, chr_file) ++dev_rw_sysfs(xend_t) ++ ++domain_read_all_domains_state(xend_t) ++domain_dontaudit_read_all_domains_state(xend_t) ++ ++domain_auto_trans(xend_t, xenconsoled_exec_t, xenconsoled_t) ++role system_r types xenconsoled_t; ++ ++domain_auto_trans(xend_t, xenstored_exec_t, xenstored_t) ++role system_r types xenstored_t; ++ ++kernel_read_kernel_sysctls(xend_t) ++kernel_read_system_state(xend_t) ++kernel_write_xen_state(xend_t) ++kernel_read_xen_state(xend_t) ++kernel_read_net_sysctls(xend_t) ++kernel_read_network_state(xend_t) ++ ++logging_send_syslog_msg(xend_t) ++ ++sysnet_domtrans_dhcpc(xend_t) ++sysnet_signal_dhcpc(xend_t) ++ ++sysnet_domtrans_ifconfig(xend_t) ++ ++term_dontaudit_getattr_all_user_ptys(xend_t) ++term_dontaudit_use_generic_ptys(xend_t) ++ ++xend_store_stream_connect(xend_t) ++ ++################################ xenconsoled_t ########################################## ++# Some common macros (you might be able to remove some) ++libs_use_ld_so(xenconsoled_t) ++libs_use_shared_libs(xenconsoled_t) ++miscfiles_read_localization(xenconsoled_t) ++files_search_etc(xenconsoled_t) ++allow xenconsoled_t self:unix_stream_socket create_stream_socket_perms; ++allow xenconsoled_t xend_t:fd use; ++allow xenconsoled_t self:capability { dac_override fsetid ipc_lock }; ++allow xenconsoled_t self:fifo_file { read write }; ++ ++kernel_read_kernel_sysctls(xenconsoled_t) ++kernel_write_xen_state(xenconsoled_t) ++kernel_read_xen_state(xenconsoled_t) ++ ++xend_append_log(xenconsoled_t) ++xend_store_stream_connect(xenconsoled_t) ++ ++# pid file ++allow xenconsoled_t xenconsoled_var_run_t:file manage_file_perms; ++allow xenconsoled_t xenconsoled_var_run_t:sock_file manage_file_perms; ++allow xenconsoled_t xenconsoled_var_run_t:dir rw_dir_perms; ++files_pid_filetrans(xenconsoled_t,xenconsoled_var_run_t, { file sock_file }) ++ ++term_dontaudit_use_generic_ptys(xenconsoled_t) ++ ++################################ xenstored_t ########################################## ++# Some common macros (you might be able to remove some) ++libs_use_ld_so(xenstored_t) ++libs_use_shared_libs(xenstored_t) ++miscfiles_read_localization(xenstored_t) ++files_search_etc(xenstored_t) ++allow xenstored_t self:capability { dac_override mknod }; ++allow xenstored_t self:unix_stream_socket create_stream_socket_perms; ++allow xenstored_t xend_t:process sigchld; ++ ++# pid file ++allow xenstored_t xenstored_var_run_t:file manage_file_perms; ++allow xenstored_t xenstored_var_run_t:sock_file manage_file_perms; ++allow xenstored_t xenstored_var_run_t:dir rw_dir_perms; ++files_pid_filetrans(xenstored_t,xenstored_var_run_t, { file sock_file }) ++ ++# var/lib files for xenstored ++allow xenstored_t xenstored_var_lib_t:file create_file_perms; ++allow xenstored_t xenstored_var_lib_t:sock_file create_file_perms; ++allow xenstored_t xenstored_var_lib_t:dir create_dir_perms; ++files_var_lib_filetrans(xenstored_t,xenstored_var_lib_t,{ file dir sock_file }) ++ ++allow xenstored_t xend_t:fd use; ++kernel_write_xen_state(xenstored_t) ++kernel_read_xen_state(xenstored_t) ++ ++term_dontaudit_use_generic_ptys(xenstored_t) ++ ++xend_append_log(xenstored_t) ++ ++allow xenstored_t xend_t:fifo_file write; ++allow xenstored_t xend_device_t:chr_file rw_file_perms; ++ ++dev_filetrans(xenstored_t, xend_device_t, { dir chr_file }) diff --exclude-from=exclude -N -u -r nsaserefpolicy/Rules.modular serefpolicy-2.2.23/Rules.modular --- nsaserefpolicy/Rules.modular 2006-02-17 14:46:10.000000000 -0500 -+++ serefpolicy-2.2.23/Rules.modular 2006-03-04 23:47:48.000000000 -0500 ++++ serefpolicy-2.2.23/Rules.modular 2006-03-07 13:42:37.000000000 -0500 @@ -204,7 +204,7 @@ # $(APPDIR)/customizable_types: $(BASE_CONF) @@ -595,7 +1098,7 @@ ######################################## diff --exclude-from=exclude -N -u -r nsaserefpolicy/support/Makefile.devel serefpolicy-2.2.23/support/Makefile.devel --- nsaserefpolicy/support/Makefile.devel 2006-02-22 14:09:04.000000000 -0500 -+++ serefpolicy-2.2.23/support/Makefile.devel 2006-03-04 23:47:48.000000000 -0500 ++++ serefpolicy-2.2.23/support/Makefile.devel 2006-03-07 13:42:37.000000000 -0500 @@ -6,10 +6,7 @@ SED ?= sed EINFO ?= echo Index: selinux-policy.spec =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v retrieving revision 1.139 retrieving revision 1.140 diff -u -r1.139 -r1.140 --- selinux-policy.spec 6 Mar 2006 23:05:10 -0000 1.139 +++ selinux-policy.spec 7 Mar 2006 22:22:14 -0000 1.140 @@ -10,7 +10,7 @@ Summary: SELinux policy configuration Name: selinux-policy Version: 2.2.23 -Release: 5 +Release: 6 License: GPL Group: System Environment/Base Source: serefpolicy-%{version}.tgz @@ -296,6 +296,9 @@ %fileList strict %changelog +* Tue Mar 7 2006 Dan Walsh 2.2.23-5 +- Add Xen support + * Mon Mar 6 2006 Dan Walsh 2.2.23-4 - Fixes for cups - Make cryptosetup work with hal From fedora-cvs-commits at redhat.com Tue Mar 7 22:25:20 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 7 Mar 2006 17:25:20 -0500 Subject: rpms/xterm/devel xterm-209-bz183993.patch, NONE, 1.1 xterm.spec, 1.38, 1.39 Message-ID: <200603072225.k27MPK7u009912@cvs.devel.redhat.com> Author: jvdias Update of /cvs/dist/rpms/xterm/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv9883 Modified Files: xterm.spec Added Files: xterm-209-bz183993.patch Log Message: fix bug 183993: set_cursor_gcs in ReverseVideo xterm-209-bz183993.patch: util.c | 2 ++ 1 files changed, 2 insertions(+) --- NEW FILE xterm-209-bz183993.patch --- --- xterm-209/util.c.bz183993 2006-02-12 20:14:59.000000000 -0500 +++ xterm-209/util.c 2006-03-07 17:16:57.000000000 -0500 @@ -1610,6 +1610,8 @@ T_COLOR(screen, MOUSE_FG), T_COLOR(screen, MOUSE_BG)); + set_cursor_gcs(screen); + termw->misc.re_verse = !termw->misc.re_verse; if (XtIsRealized((Widget) termw)) { Index: xterm.spec =================================================================== RCS file: /cvs/dist/rpms/xterm/devel/xterm.spec,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- xterm.spec 22 Feb 2006 19:20:30 -0000 1.38 +++ xterm.spec 7 Mar 2006 22:25:17 -0000 1.39 @@ -1,7 +1,7 @@ Summary: xterm terminal emulator for the X Window System Name: xterm Version: 209 -Release: 2 +Release: 4 URL: http://dickey.his.com/xterm License: MIT Group: User Interface/X @@ -20,6 +20,7 @@ Patch7: xterm-209-redhat-resources.patch Patch8: xterm-208-root-grab-console.patch Patch9: xterm-209-bz182382.patch +Patch10: xterm-209-bz183993.patch BuildRequires: libXft-devel BuildRequires: freetype-devel BuildRequires: libXrender-devel @@ -62,6 +63,7 @@ %patch7 -p1 -b .redhat-resources %patch8 -p1 -b .root-grab-console %patch9 -p1 -b .bz182382 +%patch10 -p1 -b .bz183993 %build RPM_OPT_FLAGS="$RPM_OPT_FLAGS -DPROJECTROOT='\"/usr\"'" @@ -107,6 +109,9 @@ %doc xterm.log.html ctlseqs.ms ctlseqs.txt UnicodeData.txt 16colors.txt README.i18n %changelog +* Tue Mar 07 2006 Jason Vas Dias - 209-4 +- fix bug 183993: call set_cursor_gcs in ReverseVideo + * Wed Feb 22 2006 Jason Vas Dias - 209-2 - fix bug 182382: check for (VWindow(screen)!=0) in set_cursor_gcs - further fix for bug 178302: allow *vt100*cursorColor to be same as fg From fedora-cvs-commits at redhat.com Tue Mar 7 23:12:34 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 7 Mar 2006 18:12:34 -0500 Subject: rpms/system-config-display/devel .cvsignore, 1.25, 1.26 sources, 1.30, 1.31 system-config-display.spec, 1.34, 1.35 Message-ID: <200603072312.k27NCYop005339@cvs.devel.redhat.com> Author: clumens Update of /cvs/dist/rpms/system-config-display/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv5283 Modified Files: .cvsignore sources system-config-display.spec Log Message: Bump version. Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/system-config-display/devel/.cvsignore,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- .cvsignore 27 Jan 2006 22:56:10 -0000 1.25 +++ .cvsignore 7 Mar 2006 23:12:31 -0000 1.26 @@ -2,3 +2,4 @@ system-config-display-1.0.34.tar.bz2 system-config-display-1.0.35.tar.bz2 system-config-display-1.0.36.tar.bz2 +system-config-display-1.0.37.tar.bz2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/system-config-display/devel/sources,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- sources 22 Feb 2006 18:17:11 -0000 1.30 +++ sources 7 Mar 2006 23:12:31 -0000 1.31 @@ -1 +1 @@ -54467cbc7faa05685f228fb6cd09c1ea system-config-display-1.0.36.tar.bz2 +dbfa074c9bcaa3c77981d1676236f073 system-config-display-1.0.37.tar.bz2 Index: system-config-display.spec =================================================================== RCS file: /cvs/dist/rpms/system-config-display/devel/system-config-display.spec,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- system-config-display.spec 3 Mar 2006 10:05:49 -0000 1.34 +++ system-config-display.spec 7 Mar 2006 23:12:31 -0000 1.35 @@ -1,7 +1,7 @@ Summary: A graphical interface for configuring the X Window System display Name: system-config-display -Version: 1.0.36 -Release: 3 +Version: 1.0.37 +Release: 1 URL: http://fedora.redhat.com/projects/config-tools/ License: GPL ExclusiveOS: Linux @@ -9,7 +9,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildArch: noarch Source0: %{name}-%{version}.tar.bz2 -Patch0: system-config-display-1.0.36-pam.patch ExcludeArch: s390 s390x ppc64 Obsoletes: redhat-config-xfree86 BuildRequires: desktop-file-utils @@ -29,7 +28,6 @@ Requires: metacity Prereq: gtk2 >= 2.6 Obsoletes: Xconfigurator -PreReq: hicolor-icon-theme %description system-config-display is a graphical application for configuring an @@ -37,7 +35,6 @@ %prep %setup -q -%patch0 -p1 -b .pm %build make @@ -83,9 +80,9 @@ %attr(0644,root,root) %{_datadir}/icons/hicolor/48x48/apps/system-config-display.png %changelog -* Fri Mar 03 2006 Martin Stransky 1.0.36-3 -- added pam fix (#170625) -- fix prereq (#182861, #182862) +* Tue Mar 07 2006 Chris Lumens 1.0.37-1 +- Initialize monitor name label to something other than unknown if we + really know what it is. * Wed Feb 22 2006 Chris Lumens 1.0.36-2 - Add rhpxl to requires From fedora-cvs-commits at redhat.com Wed Mar 8 00:17:11 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 7 Mar 2006 19:17:11 -0500 Subject: rpms/anaconda/devel .cvsignore, 1.234, 1.235 anaconda.spec, 1.355, 1.356 sources, 1.354, 1.355 Message-ID: <200603080017.k280HBpo022513@cvs.devel.redhat.com> Author: katzj Update of /cvs/dist/rpms/anaconda/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv22079/devel Modified Files: .cvsignore anaconda.spec sources Log Message: auto-import anaconda-11.0.1-1 on branch devel from anaconda-11.0.1-1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/anaconda/devel/.cvsignore,v retrieving revision 1.234 retrieving revision 1.235 diff -u -r1.234 -r1.235 --- .cvsignore 7 Mar 2006 16:54:33 -0000 1.234 +++ .cvsignore 8 Mar 2006 00:17:09 -0000 1.235 @@ -1 +1 @@ -anaconda-11.0.0.tar.bz2 +anaconda-11.0.1.tar.bz2 Index: anaconda.spec =================================================================== RCS file: /cvs/dist/rpms/anaconda/devel/anaconda.spec,v retrieving revision 1.355 retrieving revision 1.356 diff -u -r1.355 -r1.356 --- anaconda.spec 7 Mar 2006 16:54:33 -0000 1.355 +++ anaconda.spec 8 Mar 2006 00:17:09 -0000 1.356 @@ -1,5 +1,5 @@ Name: anaconda -Version: 11.0.0 +Version: 11.0.1 Release: 1 License: GPL Summary: Graphical system installer @@ -79,6 +79,10 @@ /sbin/chkconfig --del reconfig >/dev/null 2>&1 || : %changelog +* Tue Mar 7 2006 Jeremy Katz - 11.0.1-1 +- Fix text display for rescue CD isolinux +- Fix usb-storage not showing up by default (#181739) + * Tue Mar 7 2006 Jeremy Katz - 11.0.0-1 - Really fix the file contexts on the directories (#182252) - More fixing for Xen kernel naming Index: sources =================================================================== RCS file: /cvs/dist/rpms/anaconda/devel/sources,v retrieving revision 1.354 retrieving revision 1.355 diff -u -r1.354 -r1.355 --- sources 7 Mar 2006 16:54:33 -0000 1.354 +++ sources 8 Mar 2006 00:17:09 -0000 1.355 @@ -1 +1 @@ -1083fa7da01ae481343eeaa2dec6e518 anaconda-11.0.0.tar.bz2 +1b342be24bdd0fc393d5fbf14c9f7a2d anaconda-11.0.1.tar.bz2 From fedora-cvs-commits at redhat.com Wed Mar 8 00:42:06 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 7 Mar 2006 19:42:06 -0500 Subject: rpms/bind/devel bind-chroot-admin.in,1.1,1.2 bind.spec,1.92,1.93 Message-ID: <200603080042.k280g6ZR003488@cvs.devel.redhat.com> Author: jvdias Update of /cvs/dist/rpms/bind/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv3449 Modified Files: bind-chroot-admin.in bind.spec Log Message: fix issues with bind-chroot-admin Index: bind-chroot-admin.in =================================================================== RCS file: /cvs/dist/rpms/bind/devel/bind-chroot-admin.in,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- bind-chroot-admin.in 7 Mar 2006 04:25:38 -0000 1.1 +++ bind-chroot-admin.in 8 Mar 2006 00:42:02 -0000 1.2 @@ -74,15 +74,22 @@ /bin/chmod 750 ${BIND_DIR} /bin/chmod 770 ${BIND_DIR}/{slaves,data}; - mkdir -p ${BIND_CHROOT_PREFIX}/{etc,proc,dev,var/{run/dbus,run/named,named/{slaves,data}}}; - /bin/chown root:named ${BIND_CHROOT_PREFIX}/{etc,proc,dev,var/{run,run/dbus,named/}}; - /bin/chmod 750 ${BIND_CHROOT_PREFIX}/{,etc,proc,dev,var,var/{run,run/dbus,named/}}; + mkdir -p ${BIND_CHROOT_PREFIX}/{etc,dev,var/{run/named,named/{slaves,data}}}; + /bin/chown root:named ${BIND_CHROOT_PREFIX}/{etc,dev,var/{run,named/}}; + /bin/chmod 750 ${BIND_CHROOT_PREFIX}/{,etc,dev,var,var/{run,named/}}; /bin/chown named:named ${BIND_CHROOT_PREFIX}/var/{run/named,named/{data,slaves}}; - /bin/chmod 770 ${BIND_CHROOT_PREFIX}/var/{run/named,named/{slaves,data}}; - [ ! -e "${BIND_CHROOT_PREFIX}/dev/random" ] && /bin/mknod "${BIND_CHROOT_PREFIX}/dev/random" c 1 8 + /bin/chmod 770 ${BIND_CHROOT_PREFIX}/var/{run/named,named/{slaves,data}}; + + [ ! -e "${BIND_CHROOT_PREFIX}/dev/random" ] && /bin/mknod "${BIND_CHROOT_PREFIX}/dev/random" c 1 8 [ ! -e "${BIND_CHROOT_PREFIX}/dev/zero" ] && /bin/mknod "${BIND_CHROOT_PREFIX}/dev/zero" c 1 5 [ ! -e "${BIND_CHROOT_PREFIX}/dev/null" ] && /bin/mknod "${BIND_CHROOT_PREFIX}/dev/null" c 1 3 [ ! -e "${BIND_CHROOT_PREFIX}/etc/localtime" ] && [ -e /etc/localtime ] && /bin/cp -fp /etc/localtime "${BIND_CHROOT_PREFIX}/etc/localtime"; + chmod 666 "${BIND_CHROOT_PREFIX}"/dev/{random,null,zero}; + if [ -d /selinux ] && [ -x /usr/bin/chcon ]; then + for dev in random zero null; do + /usr/bin/chcon --reference=/dev/$dev ${BIND_CHROOT_PREFIX}/dev/$dev; + done + fi; } check_dirs; @@ -173,7 +180,7 @@ function enable_bind_chroot() { - if /bin/egrep '^ROOTDIR=' /etc/sysconfig/named; then + if /bin/egrep -q '^ROOTDIR=' /etc/sysconfig/named; then /bin/sed -i -e 's#^ROOTDIR=.*$#ROOTDIR='${BIND_CHROOT_PREFIX}'#' /etc/sysconfig/named ; else echo 'ROOTDIR='${BIND_CHROOT_PREFIX} >> /etc/sysconfig/named; @@ -216,7 +223,7 @@ chown named:named ${pfx}/var/named/{data{,/*},slaves{,*/}} >/dev/null 2>&1; chmod 770 ${pfx}/var/named/{data,slaves} >/dev/null 2>&1; chmod 640 ${pfx}/var/named/{data/*,slaves/*} >/dev/null 2>&1; -# [ -x /sbin/restorecon ] && /sbin/restorecon -R $pfx{/var/named,/etc/{named,rndc}.*} -e ${BIND_CHROOT_PREFIX}/proc -e ${BIND_CHROOT_PREFIX}/var/run/dbus -e ${BIND_CHROOT_PREFIX}/dev >/dev/null 2>&1; + [ -x /sbin/restorecon ] && /sbin/restorecon -R $pfx{/var/named,/etc/{named,rndc}.*} -e ${BIND_CHROOT_PREFIX}/proc -e ${BIND_CHROOT_PREFIX}/var/run/dbus -e ${BIND_CHROOT_PREFIX}/dev >/dev/null 2>&1; } case $1 in @@ -230,6 +237,8 @@ disable_bind_chroot; sync_files; /sbin/service named condrestart + /bin/umount ${BIND_CHROOT_PREFIX}/proc >/dev/null 2>&1 || :; + /bin/umount ${BIND_CHROOT_PREFIX}/var/run/dbus >/dev/null 2>&1 || :; exit $?; ;; -s|--sync) Index: bind.spec =================================================================== RCS file: /cvs/dist/rpms/bind/devel/bind.spec,v retrieving revision 1.92 retrieving revision 1.93 diff -u -r1.92 -r1.93 --- bind.spec 7 Mar 2006 04:25:38 -0000 1.92 +++ bind.spec 8 Mar 2006 00:42:02 -0000 1.93 @@ -14,7 +14,7 @@ Name: bind License: BSD-like Version: 9.3.2 -Release: 6 +Release: 7 Epoch: 30 Url: http://www.isc.org/products/BIND/ Buildroot: %{_tmppath}/%{name}-root @@ -365,7 +365,7 @@ #end chroot make DESTDIR=$RPM_BUILD_ROOT install install -c -m 640 bin/rndc/rndc.conf $RPM_BUILD_ROOT%{_sysconfdir} -install -c -m 755 contrib/named-bootconf/named-bootconf.sh $RPM_BUILD_ROOT/usr/sbin/named-bootconf +install -c -m 755 contrib/named-bootconf/named-bootconf.sh $RPM_BUILD_ROOT%{_sbindir}/named-bootconf install -c -m 755 %SOURCE2 $RPM_BUILD_ROOT/etc/rc.d/init.d/named install -c -m 644 %SOURCE3 $RPM_BUILD_ROOT/etc/logrotate.d/named touch $RPM_BUILD_ROOT%{_sysconfdir}/rndc.key @@ -375,7 +375,7 @@ secret "@KEY@"; }; __EOF -%{__cc} $RPM_OPT_FLAGS -o $RPM_BUILD_ROOT/usr/sbin/dns-keygen %{SOURCE4} +%{__cc} $RPM_OPT_FLAGS -o $RPM_BUILD_ROOT%{_sbindir}/dns-keygen %{SOURCE4} mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig cp %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/named #mv $RPM_BUILD_ROOT/usr/share/man/man8/named.conf.* $RPM_BUILD_ROOT/usr/share/man/man5 @@ -392,8 +392,8 @@ mkdir -p $RPM_BUILD_ROOT/usr/share/dbus-1/services cp -fp %{SOURCE10} $RPM_BUILD_ROOT/etc/dbus-1/system.d/named.conf cp -fp %{SOURCE11} $RPM_BUILD_ROOT/usr/share/dbus-1/services/named.service -cp -fp %{SOURCE13} $RPM_BUILD_ROOT/usr/sbin/namedSetForwarders -cp -fp %{SOURCE14} $RPM_BUILD_ROOT/usr/sbin/namedGetForwarders +cp -fp %{SOURCE13} $RPM_BUILD_ROOT%{_sbindir}/namedSetForwarders +cp -fp %{SOURCE14} $RPM_BUILD_ROOT%{_sbindir}/namedGetForwarders %endif %if %{test} if [ "`whoami`" = 'root' ]; then @@ -495,8 +495,8 @@ %doc doc/README.DBUS %attr(644,root,root) %config /etc/dbus-1/system.d/named.conf %attr(644,root,root) %config /usr/share/dbus-1/services/named.service -%attr(754,root,root) /usr/sbin/namedGetForwarders -%attr(754,root,root) /usr/sbin/namedSetForwarders +%attr(754,root,root) %{_sbindir}/namedGetForwarders +%attr(754,root,root) %{_sbindir}/namedSetForwarders %endif %files libs @@ -729,7 +729,6 @@ %post chroot if [ "$1" -gt 0 ]; then - chown named:named "%{prefix}/var/named/data" /usr/sbin/bind-chroot-admin --enable; fi; :; @@ -793,19 +792,20 @@ %endif # SDB %clean -# rm -rf ${RPM_BUILD_ROOT} -echo 'WARNING ! REMOVED CLEAN & DEBUGINFO!' -# ${RPM_BUILD_DIR}/%{name}-%{version} +rm -rf ${RPM_BUILD_ROOT} :; %changelog +* Tue Mar 07 2006 Jason Vas Dias - 30:9.3.2-7 +- fix issues with bind-chroot-admin + * Mon Mar 06 2006 Jason Vas Dias - 30:9.3.2-6 - replace caching-nameserver with bind-config sub-package - fix bug 181730: fix creation of named user & gid - fix bug 177595: handle case where $ROOTDIR is a link in initscript - fix bug 177001: bind-config creates symlinks OK now - fix bug 176388: named.conf is now never replaced by any RPM -- fix bug 176246: remove unecessary creation of rpmsave links +- fix bug 176248: remove unecessary creation of rpmsave links - fix bug 174925: no replacement of named.conf - fix bug 173963: existing named.conf never modified - major .spec file cleanup From fedora-cvs-commits at redhat.com Wed Mar 8 01:09:55 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 7 Mar 2006 20:09:55 -0500 Subject: rpms/avahi/devel .cvsignore, 1.10, 1.11 avahi.spec, 1.42, 1.43 sources, 1.10, 1.11 Message-ID: <200603080109.k2819s8Q024796@cvs.devel.redhat.com> Author: jvdias Update of /cvs/dist/rpms/avahi/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv24765 Modified Files: .cvsignore avahi.spec sources Log Message: upgrade to upstream version 0.6.9 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/avahi/devel/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 23 Feb 2006 17:21:13 -0000 1.10 +++ .cvsignore 8 Mar 2006 01:09:51 -0000 1.11 @@ -7,3 +7,4 @@ avahi-0.6.6.tar.gz avahi-0.6.7.tar.gz avahi-0.6.8.tar.gz +avahi-0.6.9.tar.gz Index: avahi.spec =================================================================== RCS file: /cvs/dist/rpms/avahi/devel/avahi.spec,v retrieving revision 1.42 retrieving revision 1.43 diff -u -r1.42 -r1.43 --- avahi.spec 23 Feb 2006 17:20:33 -0000 1.42 +++ avahi.spec 8 Mar 2006 01:09:51 -0000 1.43 @@ -3,7 +3,7 @@ %define WITH_MONO 0 %endif Name: avahi -Version: 0.6.8 +Version: 0.6.9 Release: 1 Summary: Local network service discovery Group: System Environment/Base @@ -322,6 +322,9 @@ %endif %changelog +* Tue Mar 07 2006 Jason Vas Dias - 0.6.9-1 +- Upgrade to upstream version 0.6.9 + * Thu Feb 23 2006 Jason Vas Dias - 0.6.8-1 - Upgrade to upstream version 0.6.8 - fix bug 182462: +Requires(post): initscripts, chkconfig, ldconfig Index: sources =================================================================== RCS file: /cvs/dist/rpms/avahi/devel/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 23 Feb 2006 17:21:13 -0000 1.10 +++ sources 8 Mar 2006 01:09:51 -0000 1.11 @@ -1 +1 @@ -28ef3c1f15d03f0dc73c9289a434d37c avahi-0.6.8.tar.gz +2652910f0e52c373d7a15b6851750517 avahi-0.6.9.tar.gz From fedora-cvs-commits at redhat.com Wed Mar 8 03:10:33 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 7 Mar 2006 22:10:33 -0500 Subject: rpms/kernel/devel kernel-2.6.spec, 1.2031, 1.2032 linux-2.6-xen-disable_vm86.patch, 1.1, NONE Message-ID: <200603080310.k283AXiR009746@cvs.devel.redhat.com> Author: sct Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv9709 Modified Files: kernel-2.6.spec Removed Files: linux-2.6-xen-disable_vm86.patch Log Message: Restore CONFIG_X86_VM86: X needs it. Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.2031 retrieving revision 1.2032 diff -u -r1.2031 -r1.2032 --- kernel-2.6.spec 7 Mar 2006 22:20:56 -0000 1.2031 +++ kernel-2.6.spec 8 Mar 2006 03:10:30 -0000 1.2032 @@ -264,7 +264,6 @@ Patch706: linux-2.6-xen_remap_vma_flags.patch Patch709: linux-2.6-percpu-NR_CPUS-hotplug-fix.patch Patch710: linux-2.6-xen-kva-mmap.patch -Patch711: linux-2.6-xen-disable_vm86.patch # # Patches 800 through 899 are reserved for bugfixes to the core system @@ -820,7 +819,6 @@ %patch706 -p1 %patch709 -p1 %patch710 -p2 -%patch711 -p1 %endif @@ -1662,7 +1660,6 @@ * Tue Mar 7 2006 Stephen Tweedie - Include xen header files in -devel packages if we're building xen. (bug 180198) -- Disable CONFIG_VM86 for Xen builds (from quintela) - Disable CONFIG_B44 for Xen builds for now: it results in "b44.ko needs unknown symbol dma_get_cache_alignment" errors. --- linux-2.6-xen-disable_vm86.patch DELETED --- From fedora-cvs-commits at redhat.com Wed Mar 8 03:49:24 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 7 Mar 2006 22:49:24 -0500 Subject: rpms/gnome-applets/devel gnome-applets-2.13.90-ref-mixer-elements.patch, NONE, 1.1 gnome-applets.spec, 1.119, 1.120 Message-ID: <200603080349.k283nOZx007234@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/gnome-applets/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv7219 Modified Files: gnome-applets.spec Added Files: gnome-applets-2.13.90-ref-mixer-elements.patch Log Message: - ref some objects given to us by gstreamer gnome-applets-2.13.90-ref-mixer-elements.patch: load.c | 1 + 1 files changed, 1 insertion(+) --- NEW FILE gnome-applets-2.13.90-ref-mixer-elements.patch --- --- gnome-applets-2.13.90/mixer/load.c.ref-mixer-elements 2006-03-07 18:04:14.000000000 -0500 +++ gnome-applets-2.13.90/mixer/load.c 2006-03-07 18:04:48.000000000 -0500 @@ -125,6 +125,7 @@ create_mixer_collection (void) mixer_list = gst_audio_default_registry_mixer_filter(_filter_func, FALSE, &helper); g_list_free (helper.names_list); + g_list_foreach (mixer_list, (GFunc) gst_object_ref, NULL); return mixer_list; } Index: gnome-applets.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-applets/devel/gnome-applets.spec,v retrieving revision 1.119 retrieving revision 1.120 diff -u -r1.119 -r1.120 --- gnome-applets.spec 1 Mar 2006 22:25:45 -0000 1.119 +++ gnome-applets.spec 8 Mar 2006 03:49:22 -0000 1.120 @@ -18,7 +18,7 @@ Summary: Small applications for the GNOME panel. Name: gnome-applets Version: 2.13.90 -Release: 3 +Release: 4 Epoch: 1 License: GPL Group: User Interface/Desktops @@ -30,6 +30,7 @@ Patch4: gnome-applets-2.11.1-cpufreq.patch Patch5: gnome-applets-2.13.4-warning.patch Patch6: gnome-applets-2.13.90-stock-ticker.patch +Patch7: gnome-applets-2.13.90-ref-mixer-elements.patch URL: http://www.gnome.org/ @@ -86,6 +87,7 @@ %patch4 -p1 -b .cpufreq %patch5 -p1 -b .warning %patch6 -p1 -b .stock-ticker +%patch7 -p1 -b .ref-mixer-elements cp gswitchit/gswitchit-applet.png gswitchit/gswitchit-properties-capplet.png @@ -181,6 +183,9 @@ %{_libdir}/pkgconfig/gweather.pc %changelog +* Tue Mar 7 2006 Ray Strode - 2.13.90-4 +- ref some objects given to us by gstreamer + * Wed Mar 1 2006 Ray Strode - 2.13.90-3 - More stock ticker fun (bug 179528) From fedora-cvs-commits at redhat.com Wed Mar 8 06:12:57 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 8 Mar 2006 01:12:57 -0500 Subject: rpms/rhythmbox/devel rhythmbox-0.9.3.1-trayicon.patch, NONE, 1.1 rhythmbox.spec, 1.52, 1.53 Message-ID: <200603080612.k286CvNA031648@cvs.devel.redhat.com> Author: notting Update of /cvs/dist/rpms/rhythmbox/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv31541 Modified Files: rhythmbox.spec Added Files: rhythmbox-0.9.3.1-trayicon.patch Log Message: fix markup in the tray icon. also, buildreq libnotify-devel rhythmbox-0.9.3.1-trayicon.patch: eggtrayicon.c | 19 +++++++++++++++---- 1 files changed, 15 insertions(+), 4 deletions(-) --- NEW FILE rhythmbox-0.9.3.1-trayicon.patch --- =================================================================== RCS file: /cvs/gnome/rhythmbox/widgets/eggtrayicon.c,v retrieving revision 1.8 retrieving revision 1.10 diff -u -r1.8 -r1.10 --- rhythmbox/widgets/eggtrayicon.c 2006/01/23 12:31:45 1.8 +++ rhythmbox/widgets/eggtrayicon.c 2006/02/16 11:25:19 1.10 @@ -551,6 +551,8 @@ GdkPixbuf *pixbuf; int x; int y; + char *esc_primary; + char *esc_secondary; if (!notify_is_initted ()) if (!notify_init ("rhythmbox")) @@ -561,10 +563,14 @@ notify_notification_close (icon->notify->handle, NULL); } - icon->notify->handle = notify_notification_new (primary, - secondary, + esc_primary = g_markup_escape_text (primary, strlen (primary)); + esc_secondary = g_markup_escape_text (secondary, strlen (secondary)); + icon->notify->handle = notify_notification_new (esc_primary, + esc_secondary, NULL, - NULL); + GTK_WIDGET (icon)); + g_free (esc_primary); + g_free (esc_secondary); notify_notification_set_timeout (icon->notify->handle, timeout); @@ -615,7 +621,8 @@ NotifyIcon *icon_notify = NULL; NotifyHints *hints; char *fn; - + char *esc_primary; + char *esc_secondary; if (!notify_is_initted ()) if (!notify_init ("rhythmbox")) @@ -663,6 +670,8 @@ notify_close (icon->notify->handle); } + esc_primary = g_markup_escape_text (primary, strlen (primary)); + esc_secondary = g_markup_escape_text (secondary, strlen (secondary)); icon->notify->hints = hints; icon->notify->icon = icon_notify; icon->notify->handle = notify_send_notification (NULL, "transfer", @@ -674,6 +683,8 @@ hints, NULL, 0); + g_free (esc_primary); + g_free (esc_secondary); return; #endif #else Index: rhythmbox.spec =================================================================== RCS file: /cvs/dist/rpms/rhythmbox/devel/rhythmbox.spec,v retrieving revision 1.52 retrieving revision 1.53 diff -u -r1.52 -r1.53 --- rhythmbox.spec 3 Mar 2006 23:26:44 -0000 1.52 +++ rhythmbox.spec 8 Mar 2006 06:12:54 -0000 1.53 @@ -3,7 +3,7 @@ Name: rhythmbox Summary: Music Management Application Version: 0.9.3.1 -Release: 2 +Release: 3 License: GPL Group: Applications/Multimedia Source: ftp://ftp.gnome.org/pub/GNOME/sources/rhythmbox/0.8/%{name}-%{version}.tar.bz2 @@ -23,10 +23,12 @@ BuildRequires: avahi-glib-devel >= 0.6 BuildRequires: libmusicbrainz-devel >= 2.1.0 BuildRequires: dbus-devel >= 0.60 +BuildRequires: libnotify-devel PreReq: desktop-file-utils >= %{desktop_file_utils_version} # no nautilus-cd-burner on s390 ExcludeArch: s390 s390x Patch0: rhythmbox-0.9.3.1-playlist.patch +Patch1: rhythmbox-0.9.3.1-trayicon.patch %description Rhythmbox is an integrated music management application based on the powerful @@ -37,6 +39,7 @@ %prep %setup -q %patch0 -p1 -b .playlist +%patch1 -p1 -b .trayicon %build From fedora-cvs-commits at redhat.com Wed Mar 8 06:20:10 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 8 Mar 2006 01:20:10 -0500 Subject: rpms/rhythmbox/devel rhythmbox-0.9.3.1-use-icon-name.patch, NONE, 1.1 rhythmbox.spec, 1.53, 1.54 Message-ID: <200603080620.k286KAmj007147@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/rhythmbox/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv7129 Modified Files: rhythmbox.spec Added Files: rhythmbox-0.9.3.1-use-icon-name.patch Log Message: - fix icon on notification bubbles (bug 183720) - patch from CVS to escape bubble markup, found by Bill Nottingham rhythmbox-0.9.3.1-use-icon-name.patch: eggtrayicon.c | 32 ++++++++++++++------------------ 1 files changed, 14 insertions(+), 18 deletions(-) --- NEW FILE rhythmbox-0.9.3.1-use-icon-name.patch --- --- rhythmbox-0.9.3.1/widgets/eggtrayicon.c.use-icon-name 2006-03-08 01:17:43.000000000 -0500 +++ rhythmbox-0.9.3.1/widgets/eggtrayicon.c 2006-03-08 01:18:59.000000000 -0500 @@ -563,35 +563,31 @@ egg_tray_icon_notify (EggTrayIcon *icon, notify_notification_close (icon->notify->handle, NULL); } + pixbuf = NULL; + esc_primary = g_markup_escape_text (primary, strlen (primary)); esc_secondary = g_markup_escape_text (secondary, strlen (secondary)); - icon->notify->handle = notify_notification_new (esc_primary, - esc_secondary, - NULL, - GTK_WIDGET (icon)); - g_free (esc_primary); - g_free (esc_secondary); - - notify_notification_set_timeout (icon->notify->handle, timeout); if (msgicon) { + icon->notify->handle = notify_notification_new (esc_primary, + esc_secondary, + NULL, + GTK_WIDGET (icon)); pixbuf = gtk_image_get_pixbuf (GTK_IMAGE (msgicon)); } else { - GtkIconTheme *theme; - gint icon_size; - - theme = gtk_icon_theme_get_default (); - gtk_icon_size_lookup (GTK_ICON_SIZE_DIALOG, &icon_size, NULL); - pixbuf = gtk_icon_theme_load_icon (theme, - "gnome-media-player", - icon_size, - 0, - NULL); + icon->notify->handle = notify_notification_new (esc_primary, + esc_secondary, + "gnome-media-player", + GTK_WIDGET (icon)); } + notify_notification_set_timeout (icon->notify->handle, timeout); + g_free (esc_primary); + g_free (esc_secondary); + if (pixbuf) { #if (LIBNOTIFY_VERSION_MICRO < 2) Index: rhythmbox.spec =================================================================== RCS file: /cvs/dist/rpms/rhythmbox/devel/rhythmbox.spec,v retrieving revision 1.53 retrieving revision 1.54 diff -u -r1.53 -r1.54 --- rhythmbox.spec 8 Mar 2006 06:12:54 -0000 1.53 +++ rhythmbox.spec 8 Mar 2006 06:20:08 -0000 1.54 @@ -29,6 +29,7 @@ ExcludeArch: s390 s390x Patch0: rhythmbox-0.9.3.1-playlist.patch Patch1: rhythmbox-0.9.3.1-trayicon.patch +Patch2: rhythmbox-0.9.3.1-use-icon-name.patch %description Rhythmbox is an integrated music management application based on the powerful @@ -40,6 +41,7 @@ %setup -q %patch0 -p1 -b .playlist %patch1 -p1 -b .trayicon +%patch2 -p1 -b .use-icon-name %build @@ -101,6 +103,11 @@ %{_libdir}/pkgconfig/rhythmbox.pc %changelog +* Wed Mar 08 2006 Ray Strode - 0.9.3.1-3 +- fix icon on notification bubbles (bug 183720) +- patch from CVS to escape bubble markup, found by + Bill Nottingham + * Fri Mar 03 2006 Ray Strode - 0.9.3.1-2 - add patch from James "Doc" Livingston to stop a hang for new users (bug 183883) From fedora-cvs-commits at redhat.com Wed Mar 8 10:14:46 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 8 Mar 2006 05:14:46 -0500 Subject: rpms/udev/devel udev.spec,1.161,1.162 Message-ID: <200603081014.k28AEkAq002514@cvs.devel.redhat.com> Author: harald Update of /cvs/dist/rpms/udev/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv2470 Modified Files: udev.spec Log Message: fixed pam_console rule Index: udev.spec =================================================================== RCS file: /cvs/dist/rpms/udev/devel/udev.spec,v retrieving revision 1.161 retrieving revision 1.162 diff -u -r1.161 -r1.162 --- udev.spec 6 Mar 2006 15:35:13 -0000 1.161 +++ udev.spec 8 Mar 2006 10:14:43 -0000 1.162 @@ -5,7 +5,7 @@ Summary: A userspace implementation of devfs Name: udev Version: 084 -Release: 12 +Release: 13 License: GPL Group: System Environment/Base Provides: udev-persistent = 0:%{version}-%{release} @@ -141,6 +141,7 @@ install -m 0644 etc/udev/redhat/05-udev-early.rules $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/05-udev-early.rules install -m 0644 etc/udev/redhat/udev.rules $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/50-udev.rules +install -m 0644 etc/udev/redhat/95-pam-console.rules $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/95-pam-console.rules # Backwards compat install -m 0644 etc/udev/redhat/hotplug.rules $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/51-hotplug.rules @@ -267,6 +268,7 @@ %config %attr(0644,root,root) %{_sysconfdir}/udev/rules.d/05-udev-early.rules %config %attr(0644,root,root) %{_sysconfdir}/udev/rules.d/50-udev.rules %config %attr(0644,root,root) %{_sysconfdir}/udev/rules.d/51-hotplug.rules +%config %attr(0644,root,root) %{_sysconfdir}/udev/rules.d/95-pam-console.rules %config %attr(0644,root,root) %dir %{_sysconfdir}/udev/makedev.d/50-udev.nodes #%config(missingok) %{_sysconfdir}/hotplug.d/default/10-udev.hotplug @@ -283,6 +285,9 @@ %attr(0644,root,root) %{_mandir}/man8/vol_id*.8* %changelog +* Wed Mar 08 2006 Harald Hoyer - 084-13 +- fixed pam_console rules (#182600) + * Mon Mar 06 2006 Harald Hoyer - 084-12 - fixed DRI permissions From fedora-cvs-commits at redhat.com Wed Mar 8 10:33:01 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 8 Mar 2006 05:33:01 -0500 Subject: rpms/system-config-soundcard/devel system-config-soundcard-1.2.16-gtk.patch, NONE, 1.1 system-config-soundcard.spec, 1.31, 1.32 Message-ID: <200603081033.k28AX1GC015602@cvs.devel.redhat.com> Author: stransky Update of /cvs/dist/rpms/system-config-soundcard/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv15587 Modified Files: system-config-soundcard.spec Added Files: system-config-soundcard-1.2.16-gtk.patch Log Message: removed obsolete variables system-config-soundcard-1.2.16-gtk.patch: soundcard.py | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) --- NEW FILE system-config-soundcard-1.2.16-gtk.patch --- --- system-config-soundcard-1.2.16/src/soundcard.py.old 2006-03-08 11:14:50.000000000 +0100 +++ system-config-soundcard-1.2.16/src/soundcard.py 2006-03-08 11:16:47.000000000 +0100 @@ -334,7 +334,7 @@ print "Play sound" if(status[0]): - return gtk.TRUE + return True self.playLabelSet(True) @@ -346,7 +346,7 @@ if selectedItem != None: self.soundcardBackend.playTestSound(module, index) - return gtk.TRUE + return True if not self.play_sound: if self.doDebug: @@ -361,7 +361,7 @@ self.soundQuestion() self.question = False - return gtk.TRUE + return True def getRepeat(self): return self.repeat Index: system-config-soundcard.spec =================================================================== RCS file: /cvs/dist/rpms/system-config-soundcard/devel/system-config-soundcard.spec,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- system-config-soundcard.spec 7 Mar 2006 09:58:46 -0000 1.31 +++ system-config-soundcard.spec 8 Mar 2006 10:32:59 -0000 1.32 @@ -10,6 +10,7 @@ BuildArch: noarch Source0: %{name}-%{version}.tar.bz2 Patch0: system-config-soundcard-1.2.16-log.patch +Patch1: system-config-soundcard-1.2.16-gtk.patch BuildRequires: desktop-file-utils BuildRequires: gettext ExcludeArch: s390 s390x @@ -31,6 +32,7 @@ %prep %setup -q %patch0 -p1 +%patch1 -p1 %build make @@ -86,6 +88,10 @@ %ghost /root/scsound.log %changelog +* Wed Mar 08 2006 Martin Stransky 1.2.16-4 +- removed obsolete variables + * work in progress version * + * Fri Mar 03 2006 Martin Stransky 1.2.16-3 - fix for #183524 - scsound.log file not created after failing to configure sound card From fedora-cvs-commits at redhat.com Wed Mar 8 11:13:16 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 8 Mar 2006 06:13:16 -0500 Subject: rpms/mc/FC-4 mc-extensions.patch,1.6,1.7 Message-ID: <200603081113.k28BDGJe009167@cvs.devel.redhat.com> Author: jnovy Update of /cvs/dist/rpms/mc/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv8943 Modified Files: mc-extensions.patch Log Message: - fix typo in extensions patch (#184288) mc-extensions.patch: configure | 2 +- configure.ac | 2 +- lib/mc.ext.in | 52 +++++++++++++++++++++++++++++++++++++++++++--------- 3 files changed, 45 insertions(+), 11 deletions(-) Index: mc-extensions.patch =================================================================== RCS file: /cvs/dist/rpms/mc/FC-4/mc-extensions.patch,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- mc-extensions.patch 7 Mar 2006 15:01:03 -0000 1.6 +++ mc-extensions.patch 8 Mar 2006 11:13:13 -0000 1.7 @@ -44,7 +44,7 @@ + +# C++ +regex/\.(C|cc|[Cc]pp|CPP)$ -+ Inlude=editor ++ Include=editor + +include/editor Open=%var{EDITOR:vi} %f From fedora-cvs-commits at redhat.com Wed Mar 8 11:13:55 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 8 Mar 2006 06:13:55 -0500 Subject: rpms/mc/devel mc-extensions.patch,1.7,1.8 mc.spec,1.83,1.84 Message-ID: <200603081113.k28BDtHd009466@cvs.devel.redhat.com> Author: jnovy Update of /cvs/dist/rpms/mc/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv9390 Modified Files: mc-extensions.patch mc.spec Log Message: * Wed Mar 8 2006 Jindrich Novy 4.6.1a-10 - fix typo in extensions patch so that C sources are highlighted correctly (#184228) mc-extensions.patch: configure | 2 +- configure.ac | 2 +- lib/mc.ext.in | 52 +++++++++++++++++++++++++++++++++++++++++++--------- 3 files changed, 45 insertions(+), 11 deletions(-) Index: mc-extensions.patch =================================================================== RCS file: /cvs/dist/rpms/mc/devel/mc-extensions.patch,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- mc-extensions.patch 28 Feb 2006 11:14:11 -0000 1.7 +++ mc-extensions.patch 8 Mar 2006 11:13:51 -0000 1.8 @@ -44,7 +44,7 @@ + +# C++ +regex/\.(C|cc|[Cc]pp|CPP)$ -+ Inlude=editor ++ Include=editor + +include/editor Open=%var{EDITOR:vi} %f Index: mc.spec =================================================================== RCS file: /cvs/dist/rpms/mc/devel/mc.spec,v retrieving revision 1.83 retrieving revision 1.84 diff -u -r1.83 -r1.84 --- mc.spec 28 Feb 2006 11:14:54 -0000 1.83 +++ mc.spec 8 Mar 2006 11:13:51 -0000 1.84 @@ -1,7 +1,7 @@ Summary: User-friendly text console file manager and visual shell. Name: mc Version: 4.6.1a -Release: 9 +Release: 10 Epoch: 1 License: GPL Group: System Environment/Shells @@ -192,6 +192,10 @@ %dir %{_sysconfdir}/mc %changelog +* Wed Mar 8 2006 Jindrich Novy 4.6.1a-10 +- fix typo in extensions patch so that C sources are + highlighted correctly (#184228) + * Tue Feb 28 2006 Jindrich Novy 4.6.1a-9 - fix hotkey conflict in Layout options (#183282) - move syntax configuration file from /usr/share/mc to /etc/mc From fedora-cvs-commits at redhat.com Wed Mar 8 11:23:14 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 8 Mar 2006 06:23:14 -0500 Subject: rpms/tetex/devel tetex.spec,1.85,1.86 vfontmap,1.2,1.3 Message-ID: <200603081123.k28BNEJ0026093@cvs.devel.redhat.com> Author: jnovy Update of /cvs/dist/rpms/tetex/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv26013 Modified Files: tetex.spec vfontmap Log Message: * Wed Mar 8 2006 Jindrich Novy 3.0-18 - update vfontmap to attempt to fix #178411 Index: tetex.spec =================================================================== RCS file: /cvs/dist/rpms/tetex/devel/tetex.spec,v retrieving revision 1.85 retrieving revision 1.86 diff -u -r1.85 -r1.86 --- tetex.spec 25 Feb 2006 09:49:04 -0000 1.85 +++ tetex.spec 8 Mar 2006 11:23:12 -0000 1.86 @@ -11,7 +11,7 @@ Summary: The TeX text formatting system. Name: tetex Version: 3.0 -Release: 17 +Release: 18 License: distributable Group: Applications/Publishing Requires: tmpwatch, dialog, ed @@ -791,6 +791,9 @@ %defattr(-,root,root) %changelog +* Wed Mar 8 2006 Jindrich Novy 3.0-18 +- update vfontmap to attempt to fix #178411 + * Sat Feb 25 2006 Jindrich Novy 3.0-17 - PreReq: info (#182886, #182887) Index: vfontmap =================================================================== RCS file: /cvs/dist/rpms/tetex/devel/vfontmap,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- vfontmap 25 Apr 2005 14:06:04 -0000 1.2 +++ vfontmap 8 Mar 2006 11:23:12 -0000 1.3 @@ -1,30 +1,16 @@ -min /usr/share/fonts/japanese/TrueType/kochi-mincho-subst.ttf -nmin /usr/share/fonts/japanese/TrueType/kochi-mincho-subst.ttf -goth /usr/share/fonts/japanese/TrueType/kochi-gothic-subst.ttf -ngoth /usr/share/fonts/japanese/TrueType/kochi-gothic-subst.ttf -jis /usr/share/fonts/japanese/TrueType/kochi-mincho-subst.ttf -jisg /usr/share/fonts/japanese/TrueType/kochi-gothic-subst.ttf -dm /usr/share/fonts/japanese/TrueType/kochi-mincho-subst.ttf -dg /usr/share/fonts/japanese/TrueType/kochi-gothic-subst.ttf - -mgoth /usr/share/fonts/japanese/TrueType/kochi-gothic-subst.ttf -fmin /usr/share/fonts/japanese/TrueType/kochi-mincho-subst.ttf -fgoth /usr/share/fonts/japanese/TrueType/kochi-gothic-subst.ttf - - # For sazanami fonts -#min /usr/share/fonts/japanese/TrueType/sazanami-mincho.ttf -#nmin /usr/share/fonts/japanese/TrueType/sazanami-mincho.ttf -#goth /usr/share/fonts/japanese/TrueType/sazanami-gothic.ttf -#ngoth /usr/share/fonts/japanese/TrueType/sazanami-gothic.ttf -#jis /usr/share/fonts/japanese/TrueType/sazanami-mincho.ttf -#jisg /usr/share/fonts/japanese/TrueType/sazanami-gothic.ttf -#dm /usr/share/fonts/japanese/TrueType/sazanami-mincho.ttf -#dg /usr/share/fonts/japanese/TrueType/sazanami-gothic.ttf - -#mgoth /usr/share/fonts/japanese/TrueType/sazanami-gothic.ttf -#fmin /usr/share/fonts/japanese/TrueType/sazanami-mincho.ttf -#fgoth /usr/share/fonts/japanese/TrueType/sazanami-gothic.ttf +min /usr/share/fonts/japanese/TrueType/sazanami-mincho.ttf +nmin /usr/share/fonts/japanese/TrueType/sazanami-mincho.ttf +goth /usr/share/fonts/japanese/TrueType/sazanami-gothic.ttf +ngoth /usr/share/fonts/japanese/TrueType/sazanami-gothic.ttf +jis /usr/share/fonts/japanese/TrueType/sazanami-mincho.ttf +jisg /usr/share/fonts/japanese/TrueType/sazanami-gothic.ttf +dm /usr/share/fonts/japanese/TrueType/sazanami-mincho.ttf +dg /usr/share/fonts/japanese/TrueType/sazanami-gothic.ttf + +mgoth /usr/share/fonts/japanese/TrueType/sazanami-gothic.ttf +fmin /usr/share/fonts/japanese/TrueType/sazanami-mincho.ttf +fgoth /usr/share/fonts/japanese/TrueType/sazanami-gothic.ttf # For IPAfonts From fedora-cvs-commits at redhat.com Wed Mar 8 11:38:03 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 8 Mar 2006 06:38:03 -0500 Subject: rpms/system-config-soundcard/devel .cvsignore, 1.10, 1.11 sources, 1.12, 1.13 system-config-soundcard.spec, 1.32, 1.33 system-config-soundcard-1.2.16-gtk.patch, 1.1, NONE system-config-soundcard-1.2.16-log.patch, 1.2, NONE Message-ID: <200603081138.k28Bc3JP030181@cvs.devel.redhat.com> Author: stransky Update of /cvs/dist/rpms/system-config-soundcard/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv30143 Modified Files: .cvsignore sources system-config-soundcard.spec Removed Files: system-config-soundcard-1.2.16-gtk.patch system-config-soundcard-1.2.16-log.patch Log Message: tmraz's look Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/system-config-soundcard/devel/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 7 Feb 2006 12:47:06 -0000 1.10 +++ .cvsignore 8 Mar 2006 11:38:00 -0000 1.11 @@ -4,3 +4,4 @@ system-config-soundcard-1.2.12.tar.bz2 system-config-soundcard-1.2.14.tar.bz2 system-config-soundcard-1.2.16.tar.bz2 +system-config-soundcard-1.2.17.tar.bz2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/system-config-soundcard/devel/sources,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- sources 7 Feb 2006 12:47:06 -0000 1.12 +++ sources 8 Mar 2006 11:38:00 -0000 1.13 @@ -1 +1 @@ -63b8e8c07dc93c12826f6f12c0bc871b system-config-soundcard-1.2.16.tar.bz2 +e0da09e27f7feac4128affee8dd5703b system-config-soundcard-1.2.17.tar.bz2 Index: system-config-soundcard.spec =================================================================== RCS file: /cvs/dist/rpms/system-config-soundcard/devel/system-config-soundcard.spec,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- system-config-soundcard.spec 8 Mar 2006 10:32:59 -0000 1.32 +++ system-config-soundcard.spec 8 Mar 2006 11:38:00 -0000 1.33 @@ -1,7 +1,7 @@ Summary: A graphical interface for detecting and configuring soundcards Name: system-config-soundcard -Version: 1.2.16 -Release: 3 +Version: 1.2.17 +Release: 1 URL: http://fedora.redhat.com/projects/config-tools/redhat-config-soundcard.html License: GPL ExclusiveOS: Linux @@ -9,8 +9,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildArch: noarch Source0: %{name}-%{version}.tar.bz2 -Patch0: system-config-soundcard-1.2.16-log.patch -Patch1: system-config-soundcard-1.2.16-gtk.patch BuildRequires: desktop-file-utils BuildRequires: gettext ExcludeArch: s390 s390x @@ -31,8 +29,6 @@ %prep %setup -q -%patch0 -p1 -%patch1 -p1 %build make @@ -88,9 +84,9 @@ %ghost /root/scsound.log %changelog -* Wed Mar 08 2006 Martin Stransky 1.2.16-4 +* Wed Mar 08 2006 Martin Stransky 1.2.17-1 +- modified look inspired by tmraz - removed obsolete variables - * work in progress version * * Fri Mar 03 2006 Martin Stransky 1.2.16-3 - fix for #183524 - scsound.log file not created after --- system-config-soundcard-1.2.16-gtk.patch DELETED --- --- system-config-soundcard-1.2.16-log.patch DELETED --- From fedora-cvs-commits at redhat.com Wed Mar 8 11:50:34 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 8 Mar 2006 06:50:34 -0500 Subject: rpms/system-config-soundcard/devel sources,1.13,1.14 Message-ID: <200603081150.k28BoYqx015673@cvs.devel.redhat.com> Author: stransky Update of /cvs/dist/rpms/system-config-soundcard/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv15626 Modified Files: sources Log Message: fix in makefile Index: sources =================================================================== RCS file: /cvs/dist/rpms/system-config-soundcard/devel/sources,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- sources 8 Mar 2006 11:38:00 -0000 1.13 +++ sources 8 Mar 2006 11:50:31 -0000 1.14 @@ -1 +1 @@ -e0da09e27f7feac4128affee8dd5703b system-config-soundcard-1.2.17.tar.bz2 +3c7aaa5f50254c6393a0aa8267871a23 system-config-soundcard-1.2.17.tar.bz2 From fedora-cvs-commits at redhat.com Wed Mar 8 12:22:15 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 8 Mar 2006 07:22:15 -0500 Subject: rpms/flex/devel flex.spec,1.23,1.24 Message-ID: <200603081222.k28CMF4W006659@cvs.devel.redhat.com> Author: pmachata Update of /cvs/dist/rpms/flex/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv6478 Modified Files: flex.spec Log Message: - adding test for #183098 into build process Index: flex.spec =================================================================== RCS file: /cvs/dist/rpms/flex/devel/flex.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- flex.spec 2 Mar 2006 15:37:50 -0000 1.23 +++ flex.spec 8 Mar 2006 12:22:12 -0000 1.24 @@ -1,12 +1,13 @@ Summary: A tool for creating scanners (text pattern recognizers). Name: flex Version: 2.5.4a -Release: 37.3 +Release: 37.4 License: BSD Group: Development/Tools URL: http://www.gnu.org/software/flex/ BuildRoot: %{_tmppath}/%{name}-root Source: ftp://ftp.gnu.org/non-gnu/flex/flex-2.5.4a.tar.gz +Source2: test-183098.sh Patch0: flex-2.5.4a-skel.patch Patch1: flex-2.5.4-glibc22.patch Patch2: flex-2.5.4a-gcc3.patch @@ -51,6 +52,7 @@ %configure make make bigcheck +sh %{SOURCE2} %install rm -rf $RPM_BUILD_ROOT @@ -64,8 +66,8 @@ ln -s libfl.a .%{_libdir}/libl.a ) -%check -make bigcheck +#%check +#make bigcheck %clean rm -rf ${RPM_BUILD_ROOT} @@ -79,7 +81,10 @@ %{_includedir}/FlexLexer.h %changelog -* Fri Feb 10 2006 Petr Machata - 2.5.4a-37.3 +* Fri Mar 8 2006 Petr Machata - 2.5.4a-37.4 +- adding test for #183098 into build process + +* Fri Mar 2 2006 Petr Machata - 2.5.4a-37.3 - rebuilt, no changes inside. In hunt for #183098 * Fri Feb 10 2006 Jesse Keating - 2.5.4a-37.2 From fedora-cvs-commits at redhat.com Wed Mar 8 12:26:01 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 8 Mar 2006 07:26:01 -0500 Subject: rpms/flex/devel test-183098.sh,NONE,1.1 Message-ID: <200603081226.k28CQ1rS008443@cvs.devel.redhat.com> Author: pmachata Update of /cvs/dist/rpms/flex/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv8287 Added Files: test-183098.sh Log Message: - forgot to add the test to cvs... --- NEW FILE test-183098.sh --- #!/bin/sh LEXFILE=`mktemp` CFILE=`mktemp` AOUT=`mktemp` ( echo -e ' C [\xc3] D [\x61] %{ int yywrap(void) { return 1; } static int f1 = 0; static int f2 = 0; %} %% {C} { if(!f1) printf("",(int)(unsigned char)*yytext); f1 += 1; } {D} { if(!f2) printf("",(int)(unsigned char)*yytext); f2 += 1; } <> { return !!(f1==1 && f2==1); } %% int main() { return !yylex(); } ' ) > ${LEXFILE} ./flex -o${CFILE} ${LEXFILE}\ && gcc -x c ${CFILE} -o ${AOUT}\ && echo -e '\xc3\x61' | ${AOUT} result=$? rm -f ${LEXFILE} ${CFILE} ${AOUT} if [ "x$result" = "x0" ]; then echo "passed" true else echo "failed!" false fi From fedora-cvs-commits at redhat.com Wed Mar 8 12:29:30 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 8 Mar 2006 07:29:30 -0500 Subject: rpms/cdrdao/devel .cvsignore, 1.7, 1.8 cdrdao.spec, 1.32, 1.33 sources, 1.7, 1.8 cdrdao-1.2.0-compile.patch, 1.1, NONE Message-ID: <200603081229.k28CTU36003167@cvs.devel.redhat.com> Author: harald Update of /cvs/dist/rpms/cdrdao/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv3149 Modified Files: .cvsignore cdrdao.spec sources Removed Files: cdrdao-1.2.0-compile.patch Log Message: - version 1.2.1 (1.2.0 was not functional) Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/cdrdao/devel/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 18 Jul 2005 11:57:48 -0000 1.7 +++ .cvsignore 8 Mar 2006 12:29:27 -0000 1.8 @@ -1 +1 @@ -cdrdao-1.2.0.tar.gz +cdrdao-1.2.1.tar.bz2 Index: cdrdao.spec =================================================================== RCS file: /cvs/dist/rpms/cdrdao/devel/cdrdao.spec,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- cdrdao.spec 11 Feb 2006 02:14:28 -0000 1.32 +++ cdrdao.spec 8 Mar 2006 12:29:27 -0000 1.33 @@ -1,15 +1,13 @@ Summary: Writes audio CD-Rs in disk-at-once (DAO) mode. Name: cdrdao -Version: 1.2.0 -Release: 1.2.2 +Version: 1.2.1 +Release: 1 License: GPL Group: Applications/Multimedia URL: http://cdrdao.sourceforge.net/ -Source: http://easynews.dl.sourceforge.net/sourceforge/cdrdao/%{name}-%{version}.tar.gz +Source: http://easynews.dl.sourceforge.net/sourceforge/cdrdao/%{name}-%{version}.tar.bz2 Source1: xcdrdao.desktop -Patch1: cdrdao-1.2.0-compile.patch - BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildRequires: cdrecord-devel >= 8:2.01.01.0.a03-2 BuildRequires: libvorbis-devel >= 1.0 @@ -26,7 +24,6 @@ %prep %setup -q -%patch1 -p1 -b .compile %build %configure --prefix=%{_prefix}\ @@ -54,6 +51,9 @@ %{_mandir}/*/* %changelog +* Wed Mar 08 2006 Harald Hoyer - 1.2.1-1 +- version 1.2.1 (1.2.0 was not functional) + * Fri Feb 10 2006 Jesse Keating - 1.2.0-1.2.2 - bump again for double-long bug on ppc(64) Index: sources =================================================================== RCS file: /cvs/dist/rpms/cdrdao/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 18 Jul 2005 11:57:48 -0000 1.7 +++ sources 8 Mar 2006 12:29:27 -0000 1.8 @@ -1 +1 @@ -dc2bdef7a7c8973e678ba4a4a2d9cc7e cdrdao-1.2.0.tar.gz +f93f3e68ec5b53ec1a776df73a1def60 cdrdao-1.2.1.tar.bz2 --- cdrdao-1.2.0-compile.patch DELETED --- From fedora-cvs-commits at redhat.com Wed Mar 8 13:22:52 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 8 Mar 2006 08:22:52 -0500 Subject: rpms/flex/devel flex.spec,1.24,1.25 Message-ID: <200603081322.k28DMqNc013206@cvs.devel.redhat.com> Author: pmachata Update of /cvs/dist/rpms/flex/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv12410 Modified Files: flex.spec Log Message: Fix in changelog. Index: flex.spec =================================================================== RCS file: /cvs/dist/rpms/flex/devel/flex.spec,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- flex.spec 8 Mar 2006 12:22:12 -0000 1.24 +++ flex.spec 8 Mar 2006 13:22:49 -0000 1.25 @@ -81,7 +81,7 @@ %{_includedir}/FlexLexer.h %changelog -* Fri Mar 8 2006 Petr Machata - 2.5.4a-37.4 +* Wed Mar 8 2006 Petr Machata - 2.5.4a-37.4 - adding test for #183098 into build process * Fri Mar 2 2006 Petr Machata - 2.5.4a-37.3 From fedora-cvs-commits at redhat.com Wed Mar 8 13:50:43 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 8 Mar 2006 08:50:43 -0500 Subject: rpms/kernel/devel kernel-2.6.spec,1.2021.2.1,1.2021.2.2 Message-ID: <200603081350.k28Doh5v003009@cvs.devel.redhat.com> Author: linville Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv2977 Modified Files: Tag: private-linville-jwltest-fc5-13-branch kernel-2.6.spec Log Message: Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.2021.2.1 retrieving revision 1.2021.2.2 diff -u -r1.2021.2.1 -r1.2021.2.2 --- kernel-2.6.spec 6 Mar 2006 23:21:09 -0000 1.2021.2.1 +++ kernel-2.6.spec 8 Mar 2006 13:50:40 -0000 1.2021.2.2 @@ -164,7 +164,9 @@ Version: %{rpmversion} Release: %{release} #ExclusiveArch: noarch %{all_x86} x86_64 ppc ppc64 ia64 sparc sparc64 ppc64iseries s390 s390x -ExclusiveArch: noarch %{all_x86} x86_64 ppc ppc64 +#ExclusiveArch: noarch %{all_x86} x86_64 ppc ppc64 +# Temporarily(?) disable 32-bit ppc build +ExclusiveArch: noarch %{all_x86} x86_64 ppc64 ExclusiveOS: Linux Provides: kernel = %{version} Provides: kernel-drm = 4.3.0 From fedora-cvs-commits at redhat.com Wed Mar 8 14:22:46 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 8 Mar 2006 09:22:46 -0500 Subject: rpms/kernel/FC-4 kernel-2.6.spec,1.1612.2.1,1.1612.2.2 Message-ID: <200603081422.k28EMk0I025160@cvs.devel.redhat.com> Author: linville Update of /cvs/dist/rpms/kernel/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv25124 Modified Files: Tag: private-linville-jwltest-fc4-33-branch kernel-2.6.spec Log Message: Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-4/kernel-2.6.spec,v retrieving revision 1.1612.2.1 retrieving revision 1.1612.2.2 diff -u -r1.1612.2.1 -r1.1612.2.2 --- kernel-2.6.spec 7 Mar 2006 20:36:18 -0000 1.1612.2.1 +++ kernel-2.6.spec 8 Mar 2006 14:22:41 -0000 1.1612.2.2 @@ -159,7 +159,9 @@ Version: %{rpmversion} Release: %{release} #ExclusiveArch: noarch %{all_x86} x86_64 ppc ppc64 sparc sparc64 -ExclusiveArch: noarch %{all_x86} x86_64 ppc ppc64 +#ExclusiveArch: noarch %{all_x86} x86_64 ppc ppc64 +# Temporarily disable 32-bit ppc builds (build problem) +ExclusiveArch: noarch %{all_x86} x86_64 ppc64 ExclusiveOS: Linux Provides: kernel = %{version} Provides: kernel-drm = 4.3.0 From fedora-cvs-commits at redhat.com Wed Mar 8 14:25:17 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 8 Mar 2006 09:25:17 -0500 Subject: rpms/kernel/devel kernel-2.6.spec,1.2021.2.2,1.2021.2.3 Message-ID: <200603081425.k28EPHfq026359@cvs.devel.redhat.com> Author: linville Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv26328 Modified Files: Tag: private-linville-jwltest-fc5-13-branch kernel-2.6.spec Log Message: Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.2021.2.2 retrieving revision 1.2021.2.3 diff -u -r1.2021.2.2 -r1.2021.2.3 --- kernel-2.6.spec 8 Mar 2006 13:50:40 -0000 1.2021.2.2 +++ kernel-2.6.spec 8 Mar 2006 14:25:15 -0000 1.2021.2.3 @@ -164,9 +164,7 @@ Version: %{rpmversion} Release: %{release} #ExclusiveArch: noarch %{all_x86} x86_64 ppc ppc64 ia64 sparc sparc64 ppc64iseries s390 s390x -#ExclusiveArch: noarch %{all_x86} x86_64 ppc ppc64 -# Temporarily(?) disable 32-bit ppc build -ExclusiveArch: noarch %{all_x86} x86_64 ppc64 +ExclusiveArch: noarch %{all_x86} x86_64 ppc ppc64 ExclusiveOS: Linux Provides: kernel = %{version} Provides: kernel-drm = 4.3.0 From fedora-cvs-commits at redhat.com Wed Mar 8 14:36:37 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 8 Mar 2006 09:36:37 -0500 Subject: rpms/ltrace/devel ltrace.spec,1.24,1.25 Message-ID: <200603081436.k28EabkS020592@cvs.devel.redhat.com> Author: pmachata Update of /cvs/dist/rpms/ltrace/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv15592 Modified Files: ltrace.spec Log Message: Changelog fix. Index: ltrace.spec =================================================================== RCS file: /cvs/dist/rpms/ltrace/devel/ltrace.spec,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- ltrace.spec 1 Mar 2006 18:35:19 -0000 1.24 +++ ltrace.spec 8 Mar 2006 14:36:35 -0000 1.25 @@ -59,7 +59,7 @@ %config /etc/ltrace.conf %changelog -* Fri Feb 10 2006 Jesse Keating - 0.3.36-4.3 +* Wed Mar 1 2006 Petr Machata - 0.3.36-4.3 - include %{ix86} to ExclusiveArch, instead of mere i386 * Fri Feb 10 2006 Jesse Keating - 0.3.36-4.2 From fedora-cvs-commits at redhat.com Wed Mar 8 15:12:30 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 8 Mar 2006 10:12:30 -0500 Subject: rpms/system-config-soundcard/devel system-config-soundcard-1.2.17-switch.patch, NONE, 1.1 system-config-soundcard.spec, 1.33, 1.34 Message-ID: <200603081512.k28FCUpq016084@cvs.devel.redhat.com> Author: stransky Update of /cvs/dist/rpms/system-config-soundcard/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv16041 Modified Files: system-config-soundcard.spec Added Files: system-config-soundcard-1.2.17-switch.patch Log Message: gui fix system-config-soundcard-1.2.17-switch.patch: soundcard.py | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE system-config-soundcard-1.2.17-switch.patch --- --- system-config-soundcard-1.2.17/src/soundcard.py.old 2006-03-08 12:30:02.000000000 +0100 +++ system-config-soundcard-1.2.17/src/soundcard.py 2006-03-08 16:10:01.000000000 +0100 @@ -172,8 +172,8 @@ # Pack into dialog playBox = gtk.VBox(False, 5) - playBox.pack_start(volumeBox) playBox.pack_start(controlBox) + playBox.pack_start(volumeBox) #Create an internal box that will contain a list if there's multiple cards #Or just a box if there's only one. Index: system-config-soundcard.spec =================================================================== RCS file: /cvs/dist/rpms/system-config-soundcard/devel/system-config-soundcard.spec,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- system-config-soundcard.spec 8 Mar 2006 11:38:00 -0000 1.33 +++ system-config-soundcard.spec 8 Mar 2006 15:12:26 -0000 1.34 @@ -1,7 +1,7 @@ Summary: A graphical interface for detecting and configuring soundcards Name: system-config-soundcard Version: 1.2.17 -Release: 1 +Release: 2 URL: http://fedora.redhat.com/projects/config-tools/redhat-config-soundcard.html License: GPL ExclusiveOS: Linux @@ -9,6 +9,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildArch: noarch Source0: %{name}-%{version}.tar.bz2 +Patch0: system-config-soundcard-1.2.17-switch.patch BuildRequires: desktop-file-utils BuildRequires: gettext ExcludeArch: s390 s390x @@ -29,6 +30,7 @@ %prep %setup -q +%patch -p1 %build make @@ -84,6 +86,9 @@ %ghost /root/scsound.log %changelog +* Wed Mar 08 2006 Martin Stransky 1.2.17-2 +- gui fix + * Wed Mar 08 2006 Martin Stransky 1.2.17-1 - modified look inspired by tmraz - removed obsolete variables From fedora-cvs-commits at redhat.com Wed Mar 8 15:19:19 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 8 Mar 2006 10:19:19 -0500 Subject: rpms/kde-i18n/devel .cvsignore, 1.31, 1.32 kde-i18n.spec, 1.53, 1.54 sources, 1.33, 1.34 subdirs-kde-i18n, 1.7, 1.8 Message-ID: <200603081519.k28FJJKF031583@cvs.devel.redhat.com> Author: than Update of /cvs/dist/rpms/kde-i18n/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv31529 Modified Files: .cvsignore kde-i18n.spec sources subdirs-kde-i18n Log Message: add missing zh_TW Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/kde-i18n/devel/.cvsignore,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- .cvsignore 1 Feb 2006 17:30:31 -0000 1.31 +++ .cvsignore 8 Mar 2006 15:19:17 -0000 1.32 @@ -219,3 +219,4 @@ kde-i18n-tr-3.5.1.tar.bz2 kde-i18n-uk-3.5.1.tar.bz2 kde-i18n-zh_CN-3.5.1.tar.bz2 +kde-i18n-zh_TW-3.5.1.tar.bz2 Index: kde-i18n.spec =================================================================== RCS file: /cvs/dist/rpms/kde-i18n/devel/kde-i18n.spec,v retrieving revision 1.53 retrieving revision 1.54 diff -u -r1.53 -r1.54 --- kde-i18n.spec 2 Feb 2006 09:55:46 -0000 1.53 +++ kde-i18n.spec 8 Mar 2006 15:19:17 -0000 1.54 @@ -4,7 +4,7 @@ Name: kde-i18n Version: 3.5.1 -Release: 1 +Release: 2 Url: http://www.kde.org Summary: Internationalization support for KDE Epoch: 1 @@ -48,6 +48,7 @@ Source33: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-tr-%{version}.tar.bz2 Source34: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-uk-%{version}.tar.bz2 Source35: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-zh_CN-%{version}.tar.bz2 +Source36: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-zh_TW-%{version}.tar.bz2 Source1000: subdirs-kde-i18n Requires: kdelibs >= 6:%{version} @@ -1147,14 +1148,15 @@ %lang(zh_CN) %{_datadir}/locale/zh_CN/* %lang(zh_CN) %doc %{_docdir}/HTML/zh_CN -%if %{buildall} %files Chinese-Big5 %defattr(-,root,root) %lang(zh_TW) %{_datadir}/locale/zh_TW/* %lang(zh_TW) %doc %{_docdir}/HTML/zh_TW -%endif %changelog +* Wed Mar 08 2006 Than Ngo 1:3.5.1-2 +- add missing zh_TW + * Wed Feb 01 2006 Than Ngo 1:3.5.1-1 - 3.5.1 Index: sources =================================================================== RCS file: /cvs/dist/rpms/kde-i18n/devel/sources,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- sources 1 Feb 2006 17:30:35 -0000 1.33 +++ sources 8 Mar 2006 15:19:17 -0000 1.34 @@ -34,3 +34,4 @@ d60ba5802f565cd7568bd4359fe01f06 kde-i18n-tr-3.5.1.tar.bz2 8c4a0a6a1779f09d84b6ddfe55df7ba9 kde-i18n-uk-3.5.1.tar.bz2 809fc565769b2dffed4098d4a3230296 kde-i18n-zh_CN-3.5.1.tar.bz2 +9bf0f18a06e4a915a6868a4eba15d0f2 kde-i18n-zh_TW-3.5.1.tar.bz2 Index: subdirs-kde-i18n =================================================================== RCS file: /cvs/dist/rpms/kde-i18n/devel/subdirs-kde-i18n,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- subdirs-kde-i18n 21 Jul 2005 10:05:38 -0000 1.7 +++ subdirs-kde-i18n 8 Mar 2006 15:19:17 -0000 1.8 @@ -34,3 +34,4 @@ tr uk zh_CN +zh_TW From fedora-cvs-commits at redhat.com Wed Mar 8 15:23:24 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 8 Mar 2006 10:23:24 -0500 Subject: rpms/beagle/devel beagle.spec,1.44,1.45 Message-ID: <200603081523.k28FNO5a000962@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/beagle/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv880 Modified Files: beagle.spec Log Message: - turn off beagle by default to limit the severity of bug 183898 - fix trigger/post scriptlet (bug 184238) Index: beagle.spec =================================================================== RCS file: /cvs/dist/rpms/beagle/devel/beagle.spec,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- beagle.spec 7 Mar 2006 17:25:01 -0000 1.44 +++ beagle.spec 8 Mar 2006 15:23:21 -0000 1.45 @@ -1,6 +1,6 @@ Name: beagle Version: 0.2.2 -Release: 2 +Release: 3 Summary: The Beagle Search Infrastructure Group: User Interface/Desktops @@ -88,8 +88,9 @@ mkdir -p $RPM_BUILD_ROOT/var/cache/beagle/indexes # Add an autostart file so beagled gets run by default -mkdir -p $RPM_BUILD_ROOT/etc/xdg/autostart -cp %{SOURCE1} $RPM_BUILD_ROOT/etc/xdg/autostart +# (temporarily disabled) +#mkdir -p $RPM_BUILD_ROOT/etc/xdg/autostart +#cp %{SOURCE1} $RPM_BUILD_ROOT/etc/xdg/autostart # use anacron instead of cron, so beagle-crawl-system has # a reasonable chance to run @@ -150,7 +151,7 @@ cd %{_libdir}/firefox-$latest/extensions mkdir beagle-extension unzip -q -d beagle-extension %{_libdir}/beagle/beagle.xpi - id=`grep em:id beagle-extension/install.rdf | head -1 | sed -e "s/<[^<]*>//g" | tr -d "\n\r"` + id=`grep em:id beagle-extension/install.rdf | head -1 | sed -e 's/^ *//' -e "s/<[^<]*>//g" | tr -d "\n\r"` if [ -e "$id" ]; then rm -rf beagle-extension else @@ -173,7 +174,7 @@ cd $libdir/firefox-$latest/extensions mkdir beagle-extension unzip -q -d beagle-extension $libdir/beagle/beagle.xpi - id=`grep em:id beagle-extension/install.rdf | head -1 | sed -e "s/<[^<]*>//g" | tr -d "\n\r"` + id=`grep em:id beagle-extension/install.rdf | head -1 | sed -e 's/^ *//' -e "s/<[^<]*>//g" | tr -d "\n\r"` if [ -e "$id" ]; then rm -rf beagle-extension else @@ -197,7 +198,7 @@ %{_mandir}/*/* %dir %attr(-,beagleindex,beagleindex) /var/cache/beagle %dir %attr(-,beagleindex,beagleindex) /var/cache/beagle/indexes -%{_sysconfdir}/xdg/autostart/beagle.desktop +#%{_sysconfdir}/xdg/autostart/beagle.desktop %files -n libbeagle %defattr(-, root, root) @@ -213,6 +214,11 @@ %{_prefix}/lib/python*/site-packages/beagle.so %changelog +* Wed Mar 8 2006 Ray Strode - 0.2.2-3 +- turn off beagle by default to limit the severity of + bug 183898 +- fix trigger/post scriptlet (bug 184238) + * Tue Mar 7 2006 Alexander Larsson - 0.2.2-2 - Fix beagle-craw-system NullPtrException From fedora-cvs-commits at redhat.com Wed Mar 8 15:33:57 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 8 Mar 2006 10:33:57 -0500 Subject: rpms/kexec-tools/devel kexec-tools.spec,1.16,1.17 Message-ID: <200603081533.k28FXvB8003887@cvs.devel.redhat.com> Author: tgraf Update of /cvs/dist/rpms/kexec-tools/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv3856 Modified Files: kexec-tools.spec Log Message: - Don't add kdump service by default, let the user manually add it to avoid everyone seeing a warning. Index: kexec-tools.spec =================================================================== RCS file: /cvs/dist/rpms/kexec-tools/devel/kexec-tools.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- kexec-tools.spec 7 Mar 2006 18:50:02 -0000 1.16 +++ kexec-tools.spec 8 Mar 2006 15:33:52 -0000 1.17 @@ -1,6 +1,6 @@ Name: kexec-tools Version: 1.101 -Release: 14 +Release: 15 License: GPL Group: Applications/System Summary: The kexec/kdump userspace component. @@ -69,7 +69,10 @@ KDUMP_COMMANDLINE=`echo $KDUMP_COMMANDLINE | sed -e 's/crashkernel=[0-9]\+M@[0-9]\+M//g'` export KDUMP_COMMANDLINE sed -i -e "s|REPLACEME|$KDUMP_COMMANDLINE irqpoll|g" /etc/sysconfig/kdump -chkconfig --add kdump + +# No longer add kdump service by default, let the user add it manually +# to avoid everyone to see a warning. +# chkconfig --add kdump %postun @@ -96,6 +99,10 @@ %doc TODO %changelog +* Wed Mar 08 2006 Thomas Graf - 1.101-15 +- Don't add kdump service by default, let the user manually add it to + avoid everyone seeing a warning. + * Tue Mar 07 2006 Thomas Graf - 1.101-14 - Fix kdump.init to call kexec from its new location From fedora-cvs-commits at redhat.com Wed Mar 8 15:43:28 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 8 Mar 2006 10:43:28 -0500 Subject: rpms/gnome-applets/devel gnome-applets-2.13.90-mixer-crash.patch, NONE, 1.1 gnome-applets.spec, 1.120, 1.121 Message-ID: <200603081543.k28FhShU007176@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/gnome-applets/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv7103 Modified Files: gnome-applets.spec Added Files: gnome-applets-2.13.90-mixer-crash.patch Log Message: fix a double-free in the mixer applet gnome-applets-2.13.90-mixer-crash.patch: applet.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) --- NEW FILE gnome-applets-2.13.90-mixer-crash.patch --- --- gnome-applets-2.13.90/mixer/applet.c.mixer-crash 2006-03-08 10:20:20.000000000 -0500 +++ gnome-applets-2.13.90/mixer/applet.c 2006-03-08 10:21:24.000000000 -0500 @@ -471,8 +471,8 @@ GstElement *element = GST_ELEMENT (item->data); gst_element_set_state (element, GST_STATE_NULL); - g_free (g_object_get_data (G_OBJECT (element), - "gnome-volume-applet-name")); + g_object_set_data (G_OBJECT (element), + "gnome-volume-applet-name", NULL); gst_object_unref (GST_OBJECT (element)); } g_list_free (applet->elements); Index: gnome-applets.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-applets/devel/gnome-applets.spec,v retrieving revision 1.120 retrieving revision 1.121 diff -u -r1.120 -r1.121 --- gnome-applets.spec 8 Mar 2006 03:49:22 -0000 1.120 +++ gnome-applets.spec 8 Mar 2006 15:43:25 -0000 1.121 @@ -18,7 +18,7 @@ Summary: Small applications for the GNOME panel. Name: gnome-applets Version: 2.13.90 -Release: 4 +Release: 5 Epoch: 1 License: GPL Group: User Interface/Desktops @@ -31,6 +31,7 @@ Patch5: gnome-applets-2.13.4-warning.patch Patch6: gnome-applets-2.13.90-stock-ticker.patch Patch7: gnome-applets-2.13.90-ref-mixer-elements.patch +Patch8: gnome-applets-2.13.90-mixer-crash.patch URL: http://www.gnome.org/ @@ -88,6 +89,7 @@ %patch5 -p1 -b .warning %patch6 -p1 -b .stock-ticker %patch7 -p1 -b .ref-mixer-elements +%patch8 -p1 -b .mixer-crash cp gswitchit/gswitchit-applet.png gswitchit/gswitchit-properties-capplet.png @@ -183,6 +185,9 @@ %{_libdir}/pkgconfig/gweather.pc %changelog +* Wed Mar 8 2006 Matthias Clasen - 2.13.90-5 +- Fix a crash in the mixer applet (#184285, #182957) + * Tue Mar 7 2006 Ray Strode - 2.13.90-4 - ref some objects given to us by gstreamer From fedora-cvs-commits at redhat.com Wed Mar 8 16:15:40 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 8 Mar 2006 11:15:40 -0500 Subject: rpms/system-config-soundcard/devel system-config-soundcard-1.2.17-ok-button.patch, NONE, 1.1 system-config-soundcard.spec, 1.34, 1.35 Message-ID: <200603081615.k28GFegX030678@cvs.devel.redhat.com> Author: stransky Update of /cvs/dist/rpms/system-config-soundcard/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv30640 Modified Files: system-config-soundcard.spec Added Files: system-config-soundcard-1.2.17-ok-button.patch Log Message: added button for saving configuration system-config-soundcard-1.2.17-ok-button.patch: soundcard.py | 49 ++++++++++++++++++---------------- soundcardBackend.py | 74 +++++++++++++++++++++++++++++++++++----------------- 2 files changed, 76 insertions(+), 47 deletions(-) --- NEW FILE system-config-soundcard-1.2.17-ok-button.patch --- --- system-config-soundcard-1.2.17/src/soundcard.py.old 2006-03-08 12:30:02.000000000 +0100 +++ system-config-soundcard-1.2.17/src/soundcard.py 2006-03-08 15:44:21.000000000 +0100 @@ -376,7 +376,7 @@ def refreshDeviceList(self): - selected_card = self.soundcardBackend.getDefaultCardNum() + selected_card = self.soundcardBackend.getDefaultCardNum() self.primarySubDeviceMenu = gtk.Menu() @@ -406,40 +406,40 @@ self.primarySubDeviceOptionMenu.set_menu(self.primarySubDeviceMenu) self.primarySubDeviceOptionMenu.show() - def closeClicked(self, *args): - self.apply() + def cancelClicked(self, *args): + self.apply(False) + gtk.main_quit() + + def okayClicked(self, *args): + self.apply(True) gtk.main_quit() def changeDefaultCard(self, *args): self.soundcardBackend.setDefaultCard(self.primaryDeviceOptionMenu.get_history()) self.soundcardBackend.setDefaultDevice(0) - self.soundcardBackend.writeConfig() self.refreshDeviceList() def changeDefaultDevice(self, *args): - self.soundcardBackend.setDefaultDevice(self.subdevices[self.primarySubDeviceOptionMenu.get_history()][0]) - self.soundcardBackend.writeConfig() + self.soundcardBackend.setDefaultDevice(self.subdevices[self.primarySubDeviceOptionMenu.get_history()][0]) def changeHW(self, widget, data=None): self.soundcardBackend.setHardwareDevice(widget.get_active()) - self.soundcardBackend.writeConfig() - + def changeDynKeys(self, widget, data=None): self.soundcardBackend.setDynamicKeys(widget.get_active()) - self.soundcardBackend.writeConfig() - self.soundcardBackend.reconfigureDynamicKeys() - - def apply(self, *args): + + def apply(self, save_config): if self.doDebug: - return - - pageNum = self.notebook.get_current_page() - page = self.notebook.get_nth_page(pageNum) - - if page: - module = page.get_children()[1].get_text() - - selectedItem = self.getSelectedCard() + return + if save_config: + self.soundcardBackend.writeConfig() + self.soundcardBackend.reconfigureDynamicKeys() + +# pageNum = self.notebook.get_current_page() +# page = self.notebook.get_nth_page(pageNum) +# if page: +# module = page.get_children()[1].get_text() +# selectedItem = self.getSelectedCard() ## if selectedItem != None: ## self.writeUnloadReload(selectedItem, module) @@ -536,8 +536,11 @@ self.mainWindow.set_border_width(10) self.mainWindow.set_position(gtk.WIN_POS_CENTER) self.mainWindow.set_icon(iconPixbuf) - self.okButton = self.mainWindow.add_button('gtk-close', 0) - self.okButton.connect("clicked", self.closeClicked) + + self.okButton = self.mainWindow.add_button('gtk-ok', 0) + self.okButton.connect("clicked", self.okayClicked) + self.cancelButton = self.mainWindow.add_button('gtk-cancel', 0) + self.cancelButton.connect("clicked", self.cancelClicked) self.toplevel.set_spacing(5) self.icon_box.pack_start(self.icon, False) --- system-config-soundcard-1.2.17/src/soundcardBackend.py.old 2006-03-08 12:30:02.000000000 +0100 +++ system-config-soundcard-1.2.17/src/soundcardBackend.py 2006-03-08 16:55:27.000000000 +0100 @@ -36,12 +36,28 @@ translate.textdomain ("system-config-soundcard") ## +## Error message +## +def errorDialog(text): + dlg = gtk.MessageDialog(None, 0, gtk.MESSAGE_ERROR, gtk.BUTTONS_OK, text) + + dlg.set_title(_("Error")) + dlg.set_default_size(100, 100) + dlg.set_position (gtk.WIN_POS_CENTER_ON_PARENT) + dlg.set_border_width(2) + dlg.set_modal(True) + rc = dlg.run() + dlg.destroy() + return + +## ## Get position ## def position(list, name): for line in list: if line[1] == name: return line[0] + errorDialog(_("Unable to find module %s in %s!") % (name, "/proc/asound/modules")) return 0 ## @@ -51,6 +67,7 @@ try: fd = open('/proc/asound/modules', 'r') except: + errorDialog(_("Unable to read %s!") % ("/proc/asound/modules")) return [] list = fd.readlines() @@ -134,7 +151,7 @@ def destroy(self, args): self.stopTestSound() - def probeCards(self): + def probeCards(self): driverList = read_driver_list() list = kudzu.probe(kudzu.CLASS_AUDIO, kudzu.BUS_PCI | kudzu.BUS_MACIO, kudzu.PROBE_ALL) @@ -174,8 +191,8 @@ self.cardList.sort(card_sort) - if self.cardList != []: - self.defaultModule = self.cardList[0].driver + if self.cardList != []: + self.defaultModule = self.cardList[0].driver return self.cardList @@ -358,12 +375,15 @@ return self.dynamic_keys def reconfigureDynamicKeys(self): - if self.dynamic_keys : - if os.path.exists("/var/run/console/console.lock"): + try: + if self.dynamic_keys : + if os.path.exists("/usr/bin/ainit") and os.path.exists("/var/run/console/console.lock"): os.system("/usr/bin/ainit `cat /var/run/console/console.lock` start") - else: - if os.path.exists("/var/run/console/console.lock"): + else: + if os.path.exists("/usr/bin/ainit") and os.path.exists("/var/run/console/console.lock"): os.system("/usr/bin/ainit `cat /var/run/console/console.lock` stop") + except: + None def writeConfig(self): @@ -392,25 +412,31 @@ fd.write(line) fd.close() - # re-writing ainit.conf - fd = open('/etc/alsa/ainit.conf', 'r') - lines = fd.readlines() - fd.close() + try: + if os.path.exists("/etc/alsa/ainit.conf"): - lines_out = [] - for line in lines: - line_tmp = string.split(string.strip(line)) - if line_tmp != [] and cmp(string.lower(line_tmp[0]),"enable") == 0: - if self.dynamic_keys: - lines_out.append("enable = yes\n") + # re-writing ainit.conf + fd = open('/etc/alsa/ainit.conf', 'r') + lines = fd.readlines() + fd.close() + + lines_out = [] + for line in lines: + line_tmp = string.split(string.strip(line)) + if line_tmp != [] and cmp(string.lower(line_tmp[0]),"enable") == 0: + if self.dynamic_keys: + lines_out.append("enable = yes\n") + else: + lines_out.append("enable = no\n") else: - lines_out.append("enable = no\n") - else: - lines_out.append(line) + lines_out.append(line) - fd = open('/etc/alsa/ainit.conf', 'w') - fd.writelines(lines_out) - fd.close() + fd = open('/etc/alsa/ainit.conf', 'w') + fd.writelines(lines_out) + fd.close() + + except: + None def readConfig(self): # Check alsa configuration @@ -431,7 +457,7 @@ # Check ainit configuration try: - fd = open('/etc/alsa/ainit.conf', 'r') + fd = open('/etc/alsa/ainit.conf', 'r') lines = fd.readlines() fd.close() Index: system-config-soundcard.spec =================================================================== RCS file: /cvs/dist/rpms/system-config-soundcard/devel/system-config-soundcard.spec,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- system-config-soundcard.spec 8 Mar 2006 15:12:26 -0000 1.34 +++ system-config-soundcard.spec 8 Mar 2006 16:15:37 -0000 1.35 @@ -10,6 +10,7 @@ BuildArch: noarch Source0: %{name}-%{version}.tar.bz2 Patch0: system-config-soundcard-1.2.17-switch.patch +Patch1: system-config-soundcard-1.2.17-ok-button.patch BuildRequires: desktop-file-utils BuildRequires: gettext ExcludeArch: s390 s390x @@ -31,6 +32,7 @@ %prep %setup -q %patch -p1 +%patch1 -p1 %build make @@ -87,6 +89,7 @@ %changelog * Wed Mar 08 2006 Martin Stransky 1.2.17-2 +- added "ok" button for save configuration - gui fix * Wed Mar 08 2006 Martin Stransky 1.2.17-1 From fedora-cvs-commits at redhat.com Wed Mar 8 16:27:23 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 8 Mar 2006 11:27:23 -0500 Subject: rpms/gnome-applets/devel gnome-applets-2.13.90-mixer-crash.patch, 1.1, 1.2 gnome-applets.spec, 1.121, 1.122 Message-ID: <200603081627.k28GRN9S015988@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/gnome-applets/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv15736 Modified Files: gnome-applets-2.13.90-mixer-crash.patch gnome-applets.spec Log Message: - update mclasen's patch to add set_data_full in a few places gnome-applets-2.13.90-mixer-crash.patch: load.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) Index: gnome-applets-2.13.90-mixer-crash.patch =================================================================== RCS file: /cvs/dist/rpms/gnome-applets/devel/gnome-applets-2.13.90-mixer-crash.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gnome-applets-2.13.90-mixer-crash.patch 8 Mar 2006 15:43:25 -0000 1.1 +++ gnome-applets-2.13.90-mixer-crash.patch 8 Mar 2006 16:27:21 -0000 1.2 @@ -1,13 +1,25 @@ ---- gnome-applets-2.13.90/mixer/applet.c.mixer-crash 2006-03-08 10:20:20.000000000 -0500 -+++ gnome-applets-2.13.90/mixer/applet.c 2006-03-08 10:21:24.000000000 -0500 -@@ -471,8 +471,8 @@ - GstElement *element = GST_ELEMENT (item->data); +--- gnome-applets-2.13.90/mixer/load.c.mixer-crash 2006-03-08 11:00:49.000000000 -0500 ++++ gnome-applets-2.13.90/mixer/load.c 2006-03-08 11:05:45.000000000 -0500 +@@ -247,16 +246,16 @@ create_mixer_collection (void) + /* name already exists, so append a number to make it unique */ + tname = g_strdup_printf ("%s #%d", name, samenamenr + 1); +- g_object_set_data (G_OBJECT (element), "gnome-volume-applet-origname", +- name); ++ g_object_set_data_full (G_OBJECT (element), "gnome-volume-applet-origname", ++ name, (GDestroyNotify) g_free); + name = tname; + } else { +- g_object_set_data (G_OBJECT (element), "gnome-volume-applet-origname", +- name); ++ g_object_set_data_full (G_OBJECT (element), "gnome-volume-applet-origname", ++ name, (GDestroyNotify) g_free); + } + +- g_object_set_data (G_OBJECT (element), "gnome-volume-applet-name", +- name); ++ g_object_set_data_full (G_OBJECT (element), "gnome-volume-applet-name", ++ name, (GDestroyNotify) g_free); + + /* add to list */ gst_element_set_state (element, GST_STATE_NULL); -- g_free (g_object_get_data (G_OBJECT (element), -- "gnome-volume-applet-name")); -+ g_object_set_data (G_OBJECT (element), -+ "gnome-volume-applet-name", NULL); - gst_object_unref (GST_OBJECT (element)); - } - g_list_free (applet->elements); Index: gnome-applets.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-applets/devel/gnome-applets.spec,v retrieving revision 1.121 retrieving revision 1.122 diff -u -r1.121 -r1.122 --- gnome-applets.spec 8 Mar 2006 15:43:25 -0000 1.121 +++ gnome-applets.spec 8 Mar 2006 16:27:21 -0000 1.122 @@ -30,7 +30,6 @@ Patch4: gnome-applets-2.11.1-cpufreq.patch Patch5: gnome-applets-2.13.4-warning.patch Patch6: gnome-applets-2.13.90-stock-ticker.patch -Patch7: gnome-applets-2.13.90-ref-mixer-elements.patch Patch8: gnome-applets-2.13.90-mixer-crash.patch URL: http://www.gnome.org/ @@ -88,7 +87,6 @@ %patch4 -p1 -b .cpufreq %patch5 -p1 -b .warning %patch6 -p1 -b .stock-ticker -%patch7 -p1 -b .ref-mixer-elements %patch8 -p1 -b .mixer-crash cp gswitchit/gswitchit-applet.png gswitchit/gswitchit-properties-capplet.png From fedora-cvs-commits at redhat.com Wed Mar 8 17:02:20 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 8 Mar 2006 12:02:20 -0500 Subject: rpms/selinux-policy/devel policy-20060207.patch, 1.39, 1.40 selinux-policy.spec, 1.140, 1.141 Message-ID: <200603081702.k28H2KOr024397@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/selinux-policy/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv24374 Modified Files: policy-20060207.patch selinux-policy.spec Log Message: * Wed Mar 8 2006 Dan Walsh 2.2.23-7 - Allow lvm tools to create drevice dir policy-20060207.patch: Rules.modular | 2 policy/modules/admin/readahead.te | 2 policy/modules/admin/rpm.fc | 2 policy/modules/admin/su.fc | 1 policy/modules/admin/su.if | 6 policy/modules/admin/vbetool.te | 5 policy/modules/kernel/corenetwork.te.in | 3 policy/modules/kernel/devices.if | 20 +++ policy/modules/kernel/files.fc | 2 policy/modules/kernel/files.if | 20 ++- policy/modules/kernel/filesystem.te | 1 policy/modules/kernel/kernel.if | 102 ++++++++++++++++ policy/modules/kernel/kernel.te | 3 policy/modules/services/apache.fc | 2 policy/modules/services/apache.if | 5 policy/modules/services/apm.fc | 2 policy/modules/services/bluetooth.te | 19 +-- policy/modules/services/cron.te | 3 policy/modules/services/cups.fc | 2 policy/modules/services/cups.if | 22 +++ policy/modules/services/cups.te | 7 - policy/modules/services/cvs.te | 2 policy/modules/services/hal.if | 41 ++++++ policy/modules/services/hal.te | 6 policy/modules/services/ktalk.fc | 1 policy/modules/services/ktalk.te | 6 policy/modules/services/nscd.if | 2 policy/modules/services/samba.te | 2 policy/modules/system/fstools.te | 1 policy/modules/system/init.te | 5 policy/modules/system/libraries.fc | 2 policy/modules/system/locallogin.te | 1 policy/modules/system/lvm.fc | 1 policy/modules/system/lvm.te | 3 policy/modules/system/selinuxutil.fc | 6 policy/modules/system/selinuxutil.te | 4 policy/modules/system/sysnetwork.te | 3 policy/modules/system/udev.te | 2 policy/modules/system/xend.fc | 19 +++ policy/modules/system/xend.if | 71 +++++++++++ policy/modules/system/xend.te | 196 ++++++++++++++++++++++++++++++++ support/Makefile.devel | 5 42 files changed, 576 insertions(+), 34 deletions(-) Index: policy-20060207.patch =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20060207.patch,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- policy-20060207.patch 7 Mar 2006 22:22:14 -0000 1.39 +++ policy-20060207.patch 8 Mar 2006 17:01:59 -0000 1.40 @@ -88,7 +88,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.if serefpolicy-2.2.23/policy/modules/kernel/devices.if --- nsaserefpolicy/policy/modules/kernel/devices.if 2006-02-23 09:25:08.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/kernel/devices.if 2006-03-07 16:50:04.000000000 -0500 ++++ serefpolicy-2.2.23/policy/modules/kernel/devices.if 2006-03-08 10:58:05.000000000 -0500 @@ -2384,7 +2384,7 @@ ') @@ -173,6 +173,14 @@ ') ######################################## +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/filesystem.te serefpolicy-2.2.23/policy/modules/kernel/filesystem.te +--- nsaserefpolicy/policy/modules/kernel/filesystem.te 2006-02-14 07:20:25.000000000 -0500 ++++ serefpolicy-2.2.23/policy/modules/kernel/filesystem.te 2006-03-08 11:55:28.000000000 -0500 +@@ -167,3 +167,4 @@ + genfscon nfs / gen_context(system_u:object_r:nfs_t,s0) + genfscon nfs4 / gen_context(system_u:object_r:nfs_t,s0) + genfscon afs / gen_context(system_u:object_r:nfs_t,s0) ++genfscon hfsplus / gen_context(system_u:object_r:nfs_t,s0) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel.if serefpolicy-2.2.23/policy/modules/kernel/kernel.if --- nsaserefpolicy/policy/modules/kernel/kernel.if 2006-03-04 00:06:34.000000000 -0500 +++ serefpolicy-2.2.23/policy/modules/kernel/kernel.if 2006-03-07 14:00:35.000000000 -0500 @@ -354,7 +362,7 @@ /var/run/apmd\.pid -- gen_context(system_u:object_r:apmd_var_run_t,s0) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bluetooth.te serefpolicy-2.2.23/policy/modules/services/bluetooth.te --- nsaserefpolicy/policy/modules/services/bluetooth.te 2006-03-04 00:06:35.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/services/bluetooth.te 2006-03-07 13:42:37.000000000 -0500 ++++ serefpolicy-2.2.23/policy/modules/services/bluetooth.te 2006-03-08 11:35:36.000000000 -0500 @@ -115,6 +115,7 @@ corecmd_exec_shell(bluetooth_t) @@ -363,7 +371,17 @@ files_read_etc_files(bluetooth_t) files_read_etc_runtime_files(bluetooth_t) -@@ -170,6 +171,7 @@ +@@ -146,6 +147,9 @@ + optional_policy(`dbus',` + dbus_system_bus_client_template(bluetooth,bluetooth_t) + dbus_send_system_bus(bluetooth_t) ++ dbus_system_bus_client_template(bluetooth_helper,bluetooth_helper_t) ++ dbus_connect_system_bus(bluetooth_helper_t) ++ dbus_send_system_bus(bluetooth_helper_t) + ') + + optional_policy(`nis',` +@@ -170,6 +174,7 @@ allow bluetooth_helper_t self:fifo_file rw_file_perms; allow bluetooth_helper_t self:shm create_shm_perms; allow bluetooth_helper_t self:unix_stream_socket { create_stream_socket_perms connectto }; @@ -371,7 +389,13 @@ allow bluetooth_helper_t bluetooth_t:socket { read write }; -@@ -208,14 +210,13 @@ +@@ -202,20 +207,17 @@ + miscfiles_read_localization(bluetooth_helper_t) + miscfiles_read_fonts(bluetooth_helper_t) + +-userdom_search_all_users_home_content(bluetooth_helper_t) +- + optional_policy(`nscd',` nscd_socket_use(bluetooth_helper_t) ') @@ -390,6 +414,14 @@ ifdef(`strict_policy',` ifdef(`xdm.te',` allow bluetooth_helper_t xdm_xserver_tmp_t:sock_file { read write }; +@@ -227,4 +229,7 @@ + files_rw_generic_tmp_sockets(bluetooth_helper_t) + allow bluetooth_helper_t tmpfs_t:file { read write }; + allow bluetooth_helper_t unconfined_t:unix_stream_socket connectto; ++ userdom_read_all_users_home_content_files(bluetooth_helper_t) ++ ++ xserver_stream_connect_xdm(bluetooth_helper_t) + ') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.te serefpolicy-2.2.23/policy/modules/services/cron.te --- nsaserefpolicy/policy/modules/services/cron.te 2006-03-04 00:06:35.000000000 -0500 +++ serefpolicy-2.2.23/policy/modules/services/cron.te 2006-03-07 13:42:37.000000000 -0500 @@ -714,7 +746,7 @@ /sbin/e2fsadm -- gen_context(system_u:object_r:lvm_exec_t,s0) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/lvm.te serefpolicy-2.2.23/policy/modules/system/lvm.te --- nsaserefpolicy/policy/modules/system/lvm.te 2006-03-04 00:06:37.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/system/lvm.te 2006-03-07 17:10:36.000000000 -0500 ++++ serefpolicy-2.2.23/policy/modules/system/lvm.te 2006-03-08 10:58:24.000000000 -0500 @@ -129,6 +129,8 @@ # DAC overrides and mknod for modifying /dev entries (vgmknodes) @@ -724,6 +756,14 @@ dontaudit lvm_t self:capability sys_tty_config; allow lvm_t self:process { sigchld sigkill sigstop signull signal }; # LVM will complain a lot if it cannot set its priority. +@@ -199,6 +201,7 @@ + dev_dontaudit_getattr_generic_chr_files(lvm_t) + dev_dontaudit_getattr_generic_blk_files(lvm_t) + dev_dontaudit_getattr_generic_pipes(lvm_t) ++dev_create_generic_dirs(lvm_t) + + fs_getattr_xattr_fs(lvm_t) + fs_search_auto_mountpoints(lvm_t) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.fc serefpolicy-2.2.23/policy/modules/system/selinuxutil.fc --- nsaserefpolicy/policy/modules/system/selinuxutil.fc 2006-02-23 09:25:09.000000000 -0500 +++ serefpolicy-2.2.23/policy/modules/system/selinuxutil.fc 2006-03-07 13:42:37.000000000 -0500 Index: selinux-policy.spec =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v retrieving revision 1.140 retrieving revision 1.141 diff -u -r1.140 -r1.141 --- selinux-policy.spec 7 Mar 2006 22:22:14 -0000 1.140 +++ selinux-policy.spec 8 Mar 2006 17:02:01 -0000 1.141 @@ -10,7 +10,7 @@ Summary: SELinux policy configuration Name: selinux-policy Version: 2.2.23 -Release: 6 +Release: 7 License: GPL Group: System Environment/Base Source: serefpolicy-%{version}.tgz @@ -296,6 +296,9 @@ %fileList strict %changelog +* Wed Mar 8 2006 Dan Walsh 2.2.23-7 +- Allow lvm tools to create drevice dir + * Tue Mar 7 2006 Dan Walsh 2.2.23-5 - Add Xen support From fedora-cvs-commits at redhat.com Wed Mar 8 17:04:50 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 8 Mar 2006 12:04:50 -0500 Subject: rpms/util-linux/devel util-linux-2.13-mkswap-selinux.patch, 1.1, 1.2 util-linux.spec, 1.108, 1.109 Message-ID: <200603081704.k28H4oLu024500@cvs.devel.redhat.com> Author: kzak Update of /cvs/dist/rpms/util-linux/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv24451 Modified Files: util-linux-2.13-mkswap-selinux.patch util-linux.spec Log Message: fix mkswap selinux patch util-linux-2.13-mkswap-selinux.patch: Makefile.am | 9 ++++++++- mkswap.c | 42 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 50 insertions(+), 1 deletion(-) Index: util-linux-2.13-mkswap-selinux.patch =================================================================== RCS file: /cvs/dist/rpms/util-linux/devel/util-linux-2.13-mkswap-selinux.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- util-linux-2.13-mkswap-selinux.patch 23 Feb 2006 14:19:40 -0000 1.1 +++ util-linux-2.13-mkswap-selinux.patch 8 Mar 2006 17:04:34 -0000 1.2 @@ -1,60 +1,81 @@ ---- util-linux-2.13-pre6/disk-utils/mkswap.c.selinux 2006-02-22 14:07:47.000000000 +0100 -+++ util-linux-2.13-pre6/disk-utils/mkswap.c 2006-02-22 15:16:05.000000000 +0100 -@@ -39,6 +39,8 @@ +--- util-linux-2.13-pre6/disk-utils/mkswap.c.selinux 2005-08-14 17:34:49.000000000 +0200 ++++ util-linux-2.13-pre6/disk-utils/mkswap.c 2006-03-08 16:35:08.000000000 +0100 +@@ -39,6 +39,12 @@ #include /* for _IO */ #include #include +#include ++#ifdef HAVE_LIBSELINUX +#include ++#include ++#endif ++ #include "swapheader.h" #include "xstrncpy.h" #include "nls.h" -@@ -76,6 +78,8 @@ +@@ -76,6 +82,8 @@ #define MAKE_VERSION(p,q,r) (65536*(p) + 256*(q) + (r)) -+#define SELINUX_SWAPFILE_LABEL "swapfile_t" ++#define SELINUX_SWAPFILE_TYPE "swapfile_t" + static int linux_version_code(void) { struct utsname my_utsname; -@@ -718,5 +722,30 @@ +@@ -718,5 +726,39 @@ if (fsync(DEV)) die(_("fsync failed")); #endif + -+ if (S_ISREG(statbuf.st_mode)) { -+ char *context = NULL; ++#ifdef HAVE_LIBSELINUX ++ if (S_ISREG(statbuf.st_mode) && is_selinux_enabled()) { ++ security_context_t context_string; ++ security_context_t oldcontext; ++ context_t newcontext; + -+ if (fgetfilecon(DEV, &context) < 0) { -+ if (errno == ENODATA) { -+ context = NULL; -+ } else { -+ perror(device_name); -+ die(_("unable to obtain selinux file label")); -+ return 0; -+ } ++ if ((fgetfilecon(DEV, &oldcontext) < 0) && ++ (errno != ENODATA)) { ++ fprintf(stderr, "%s: %s: unable to obtain selinux file label: %s\n", ++ program_name, device_name, ++ strerror(errno)); ++ exit(1); + } -+ if (context==NULL || strcmp(context, SELINUX_SWAPFILE_LABEL)) { -+ if (fsetfilecon(DEV, SELINUX_SWAPFILE_LABEL)) { ++ if (!(newcontext = context_new(oldcontext))) ++ die(_("unable to create new selinux context")); ++ if (context_type_set(newcontext, SELINUX_SWAPFILE_TYPE)) ++ die(_("couldn't compute selinux context")); ++ ++ context_string = context_str(newcontext); ++ ++ if (strcmp(context_string, oldcontext)!=0) { ++ if (fsetfilecon(DEV, context_string)) { + fprintf(stderr, "%s: unable to relabel %s to %s: %s\n", + program_name, device_name, -+ SELINUX_SWAPFILE_LABEL, ++ context_string, + strerror(errno)); + exit(1); + } + } -+ if (context) -+ freecon(context); ++ context_free(newcontext); ++ freecon(oldcontext); + } ++#endif return 0; } ---- util-linux-2.13-pre6/disk-utils/Makefile.am.selinux 2006-02-22 15:23:00.000000000 +0100 -+++ util-linux-2.13-pre6/disk-utils/Makefile.am 2006-02-22 15:23:09.000000000 +0100 -@@ -31,5 +31,5 @@ +--- util-linux-2.13-pre6/disk-utils/Makefile.am.selinux 2005-09-10 19:46:10.000000000 +0200 ++++ util-linux-2.13-pre6/disk-utils/Makefile.am 2006-03-08 16:27:03.000000000 +0100 +@@ -30,6 +30,13 @@ + mkfs_cramfs_LDADD = -lz $(top_srcdir)/lib/libmd5.a endif ++mkswap_LDADD = ++ if HAVE_UUID -mkswap_LDADD = -luuid -+mkswap_LDADD = -luuid -lselinux ++mkswap_LDADD += -luuid ++endif ++ ++if HAVE_SELINUX ++mkswap_LDADD += -lselinux endif ++ Index: util-linux.spec =================================================================== RCS file: /cvs/dist/rpms/util-linux/devel/util-linux.spec,v retrieving revision 1.108 retrieving revision 1.109 diff -u -r1.108 -r1.109 --- util-linux.spec 23 Feb 2006 14:19:40 -0000 1.108 +++ util-linux.spec 8 Mar 2006 17:04:47 -0000 1.109 @@ -25,7 +25,7 @@ Summary: A collection of basic system utilities. Name: util-linux Version: 2.13 -Release: 0.16 +Release: 0.17 License: distributable Group: System Environment/Base @@ -254,7 +254,7 @@ %patch221 -p1 %patch222 -p1 %patch223 -p1 -%patch224 -p1 +%patch224 -p1 -b .selinux %patch225 -p1 %patch226 -p1 %patch227 -p1 @@ -642,6 +642,9 @@ /sbin/losetup %changelog +* Wed Mar 8 2006 Karel Zak 2.13-0.17 +- fix #181782 - mkswap selinux relabeling (fix util-linux-2.13-mkswap-selinux.patch) + * Wed Feb 22 2006 Karel Zak 2.13-0.16 - fix #181782 - mkswap should automatically add selinux label to swapfile - fix #180730 - col is exiting with 1 (fix util-linux-2.12p-col-EILSEQ.patch) From fedora-cvs-commits at redhat.com Wed Mar 8 17:33:53 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 8 Mar 2006 12:33:53 -0500 Subject: rpms/doxygen/devel doxygen.spec,1.37,1.38 Message-ID: <200603081733.k28HXrbY015721@cvs.devel.redhat.com> Author: than Update of /cvs/dist/rpms/doxygen/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv15678 Modified Files: doxygen.spec Log Message: fix typo bug #184400 Index: doxygen.spec =================================================================== RCS file: /cvs/dist/rpms/doxygen/devel/doxygen.spec,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- doxygen.spec 6 Mar 2006 11:25:59 -0000 1.37 +++ doxygen.spec 8 Mar 2006 17:33:27 -0000 1.38 @@ -1,10 +1,10 @@ -%define qt_version 1:3.3.4 +%define qt_version 1:3.3.5 %{!?with_qt:%define with_qt 1} Summary: A documentation system for C/C++. Name: doxygen Version: 1.4.6 -Release: 2 +Release: 3 Epoch: 1 Source0: ftp://ftp.stack.nl/pub/users/dimitri/%{name}-%{version}.src.tar.gz @@ -86,22 +86,25 @@ %files %defattr(-,root,root) %doc LANGUAGE.HOWTO README examples -%if %{with_qt} -%doc html -%endif %{_bindir}/* -%{?_with_qt:%exclude %{_bindir}/doxywizard} %{_mandir}/man1/* +%if %{with_qt} +%exclude %{_bindir}/doxywizard %exclude %{_mandir}/man1/doxywizard* +%endif %if %{with_qt} %files doxywizard %defattr(-,root,root) +%doc html %{_bindir}/doxywizard %{_mandir}/man1/doxywizard* %endif %changelog +* Wed Mar 08 2006 Than Ngo 1:1.4.6-3 +- fix typo bug #184400 + * Mon Mar 06 2006 Than Ngo 1:1.4.6-2 - fix build problem #184042 From fedora-cvs-commits at redhat.com Wed Mar 8 17:55:53 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 8 Mar 2006 12:55:53 -0500 Subject: rpms/gnome-applets/devel gnome-applets-2.13.90-mixer-crash.patch, 1.2, 1.3 Message-ID: <200603081755.k28HtrRs004201@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/gnome-applets/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv4031 Modified Files: gnome-applets-2.13.90-mixer-crash.patch Log Message: - add hunk of patch back that got dropped somehow gnome-applets-2.13.90-mixer-crash.patch: applet.c | 2 -- load.c | 12 ++++++------ 2 files changed, 6 insertions(+), 8 deletions(-) Index: gnome-applets-2.13.90-mixer-crash.patch =================================================================== RCS file: /cvs/dist/rpms/gnome-applets/devel/gnome-applets-2.13.90-mixer-crash.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- gnome-applets-2.13.90-mixer-crash.patch 8 Mar 2006 16:27:21 -0000 1.2 +++ gnome-applets-2.13.90-mixer-crash.patch 8 Mar 2006 17:55:49 -0000 1.3 @@ -1,6 +1,6 @@ ---- gnome-applets-2.13.90/mixer/load.c.mixer-crash 2006-03-08 11:00:49.000000000 -0500 -+++ gnome-applets-2.13.90/mixer/load.c 2006-03-08 11:05:45.000000000 -0500 -@@ -247,16 +246,16 @@ create_mixer_collection (void) +--- gnome-applets-2.13.90/mixer/load.c.mixer-crash 2006-02-12 03:11:39.000000000 -0500 ++++ gnome-applets-2.13.90/mixer/load.c 2006-03-08 11:49:03.000000000 -0500 +@@ -246,16 +246,16 @@ create_mixer_collection (void) /* name already exists, so append a number to make it unique */ tname = g_strdup_printf ("%s #%d", name, samenamenr + 1); @@ -23,3 +23,14 @@ /* add to list */ gst_element_set_state (element, GST_STATE_NULL); +--- gnome-applets-2.13.90/mixer/applet.c.mixer-crash 2006-03-08 11:49:58.000000000 -0500 ++++ gnome-applets-2.13.90/mixer/applet.c 2006-03-08 11:50:05.000000000 -0500 +@@ -471,8 +471,6 @@ gnome_volume_applet_dispose (GObject *ob + GstElement *element = GST_ELEMENT (item->data); + + gst_element_set_state (element, GST_STATE_NULL); +- g_free (g_object_get_data (G_OBJECT (element), +- "gnome-volume-applet-name")); + gst_object_unref (GST_OBJECT (element)); + } + g_list_free (applet->elements); From fedora-cvs-commits at redhat.com Wed Mar 8 18:14:48 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 8 Mar 2006 13:14:48 -0500 Subject: rpms/gnome-applets/devel gnome-applets.spec, 1.122, 1.123 gnome-applets-2.13.90-ref-mixer-elements.patch, 1.1, NONE Message-ID: <200603081814.k28IEmlQ008107@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/gnome-applets/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv8013 Modified Files: gnome-applets.spec Removed Files: gnome-applets-2.13.90-ref-mixer-elements.patch Log Message: - improve package installation time by running gconftool-2 only once in %%post Index: gnome-applets.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-applets/devel/gnome-applets.spec,v retrieving revision 1.122 retrieving revision 1.123 diff -u -r1.122 -r1.123 --- gnome-applets.spec 8 Mar 2006 16:27:21 -0000 1.122 +++ gnome-applets.spec 8 Mar 2006 18:14:45 -0000 1.123 @@ -18,7 +18,7 @@ Summary: Small applications for the GNOME panel. Name: gnome-applets Version: 2.13.90 -Release: 5 +Release: 6 Epoch: 1 License: GPL Group: User Interface/Desktops @@ -141,10 +141,22 @@ fi export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` -SCHEMAS="battstat.schemas charpick.schemas cpufreq-applet.schemas drivemount.schemas geyes.schemas gswitchit.schemas gtik.schemas gweather.schemas mini-commander-global.schemas mini-commander.schemas mixer.schemas modemlights.schemas multiload.schemas stickynotes.schemas" -for S in $SCHEMAS; do - gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/$S > /dev/null -done + +gconftool-2 --makefile-install-rule \ + %{_sysconfdir}/gconf/schemas/battstat.schemas \ + %{_sysconfdir}/gconf/schemas/charpick.schemas \ + %{_sysconfdir}/gconf/schemas/cpufreq-applet.schemas \ + %{_sysconfdir}/gconf/schemas/divemount.schemas \ + %{_sysconfdir}/gconf/schemas/geyes.schemas \ + %{_sysconfdir}/gconf/schemas/gswitchit.schemas \ + %{_sysconfdir}/gconf/schemas/gtik.schemas \ + %{_sysconfdir}/gconf/schemas/gweather.schemas \ + %{_sysconfdir}/gconf/schemas/mini-commander-global.schemas \ + %{_sysconfdir}/gconf/schemas/mini-commander.schemas \ + %{_sysconfdir}/gconf/schemas/mixer.schemas \ + %{_sysconfdir}/gconf/schemas/modemlights.schemas \ + %{_sysconfdir}/gconf/schemas/multiload.schemas \ + %{_sysconfdir}/gconf/schemas/stickynotes.schemas > /dev/null %{_libexecdir}/gnome-applets/mc-install-default-macros > /dev/null %postun @@ -183,6 +195,10 @@ %{_libdir}/pkgconfig/gweather.pc %changelog +* Wed Mar 8 2006 Ray Strode - 2.13.90-6 +- improve package installation time by running gconftool-2 only + once in %%post + * Wed Mar 8 2006 Matthias Clasen - 2.13.90-5 - Fix a crash in the mixer applet (#184285, #182957) --- gnome-applets-2.13.90-ref-mixer-elements.patch DELETED --- From fedora-cvs-commits at redhat.com Wed Mar 8 18:17:58 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 8 Mar 2006 13:17:58 -0500 Subject: rpms/bind/devel bind-chroot-admin.in, 1.2, 1.3 bind.spec, 1.93, 1.94 named.caching-nameserver.conf, 1.1, 1.2 Message-ID: <200603081817.k28IHwMx021952@cvs.devel.redhat.com> Author: jvdias Update of /cvs/dist/rpms/bind/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv12835 Modified Files: bind-chroot-admin.in bind.spec named.caching-nameserver.conf Log Message: - Do not allow package to be installed if named:25 userid creation fails - Give libbind a pkg-config file - remove restorecon from bind-chroot-admin (not required). - fix named.caching-nameserver.conf (listen-on-v6 port 53 { ::1 };) Index: bind-chroot-admin.in =================================================================== RCS file: /cvs/dist/rpms/bind/devel/bind-chroot-admin.in,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- bind-chroot-admin.in 8 Mar 2006 00:42:02 -0000 1.2 +++ bind-chroot-admin.in 8 Mar 2006 18:17:55 -0000 1.3 @@ -85,7 +85,7 @@ [ ! -e "${BIND_CHROOT_PREFIX}/dev/null" ] && /bin/mknod "${BIND_CHROOT_PREFIX}/dev/null" c 1 3 [ ! -e "${BIND_CHROOT_PREFIX}/etc/localtime" ] && [ -e /etc/localtime ] && /bin/cp -fp /etc/localtime "${BIND_CHROOT_PREFIX}/etc/localtime"; chmod 666 "${BIND_CHROOT_PREFIX}"/dev/{random,null,zero}; - if [ -d /selinux ] && [ -x /usr/bin/chcon ]; then + if [ -d /selinux ] && [ -e /selinux/enforce ] && [ -x /usr/bin/chcon ]; then for dev in random zero null; do /usr/bin/chcon --reference=/dev/$dev ${BIND_CHROOT_PREFIX}/dev/$dev; done @@ -222,8 +222,7 @@ chmod 640 ${pfx}/var/named/* >/dev/null 2>&1; chown named:named ${pfx}/var/named/{data{,/*},slaves{,*/}} >/dev/null 2>&1; chmod 770 ${pfx}/var/named/{data,slaves} >/dev/null 2>&1; - chmod 640 ${pfx}/var/named/{data/*,slaves/*} >/dev/null 2>&1; - [ -x /sbin/restorecon ] && /sbin/restorecon -R $pfx{/var/named,/etc/{named,rndc}.*} -e ${BIND_CHROOT_PREFIX}/proc -e ${BIND_CHROOT_PREFIX}/var/run/dbus -e ${BIND_CHROOT_PREFIX}/dev >/dev/null 2>&1; + chmod 640 ${pfx}/var/named/{data/*,slaves/*} >/dev/null 2>&1; } case $1 in Index: bind.spec =================================================================== RCS file: /cvs/dist/rpms/bind/devel/bind.spec,v retrieving revision 1.93 retrieving revision 1.94 diff -u -r1.93 -r1.94 --- bind.spec 8 Mar 2006 00:42:02 -0000 1.93 +++ bind.spec 8 Mar 2006 18:17:55 -0000 1.94 @@ -7,6 +7,8 @@ %{?!test: %define test 0} %{?!WITH_DBUS: %define WITH_DBUS 1} # + dynamic forwarder table management with D-BUS %{?!DEBUGINFO: %define DEBUGINFO 1} +%{?!bind_uid: %define bind_uid 25} +%{?!bind_gid: %define bind_gid 25} %define bind_dir /var/named %define chroot_prefix %{bind_dir}/chroot # @@ -14,7 +16,7 @@ Name: bind License: BSD-like Version: 9.3.2 -Release: 7 +Release: 8 Epoch: 30 Url: http://www.isc.org/products/BIND/ Buildroot: %{_tmppath}/%{name}-root @@ -48,6 +50,7 @@ Source25: rfc1912.txt Source26: bind-chroot-admin.in Source27: named.rfc1912.zones +Source28: libbind.pc # Patch: bind-9.2.0rc3-varrun.patch Patch1: bind-9.3.2b2-rndckey.patch @@ -164,6 +167,7 @@ bind, bind-libs, and bind-utils along with this package. This package replaces the caching-nameserver package. + %package chroot Summary: A chroot runtime environment for the ISC BIND DNS server, named(8) Group: System Environment/Daemons @@ -385,7 +389,10 @@ cp -fp %{SOURCE12} contrib/sdb/pgsql/ %endif %if %{LIBBIND} -gunzip < %{SOURCE9} | (cd $RPM_BUILD_ROOT/usr/share; tar -xpf -) +gunzip < %{SOURCE9} | (cd $RPM_BUILD_ROOT/usr/share; tar -xpf -) +mkdir -p $RPM_BUILD_ROOT/%{_libdir}/pkgconfig +cp -fp %{SOURCE28} $RPM_BUILD_ROOT/%{_libdir}/pkgconfig/libbind.pc +chmod 644 $RPM_BUILD_ROOT/%{_libdir}/pkgconfig/libbind.pc %endif %if %{WITH_DBUS} mkdir -p $RPM_BUILD_ROOT/etc/dbus-1/system.d @@ -583,6 +590,7 @@ %files libbind-devel %defattr(-,root,root) %{_libdir}/libbind.* +%{_libdir}/pkgconfig/libbind.pc %{_includedir}/bind %{_mandir}/man3/libbind-* %{_mandir}/man7/libbind-* @@ -607,16 +615,15 @@ %pre if [ "$1" -eq 1 ]; then - # create named group IFF it does not already exist - # - use any free ID between 1 and 499 if group 25 exists: - /usr/sbin/groupadd -g 25 -f -r named >/dev/null 2>&1 || :; - # if named user does not already exist, create it as system user: - if ! /usr/bin/id -u named > /dev/null 2>&1; then - if ! /bin/egrep -q '^[^:]+:[^:]+:25:' /etc/passwd >/dev/null 2>&1 ; then - /usr/sbin/useradd -u 25 -r -n -M -g named -s /sbin/nologin -d /var/named -c Named named >/dev/null 2>&1 || :; - else - # use any free ID between 1 and 499: - /usr/sbin/useradd -r -n -M -g named -s /sbin/nologin -d /var/named -c Named named >/dev/null 2>&1 || :; + /usr/sbin/groupadd -g %{bind_gid} -f -r named >/dev/null 2>&1 || :; + if ! /usr/sbin/useradd -u %{bind_uid} -r -n -M -g named -s /sbin/nologin -d /var/named -c Named named >/dev/null 2>&1; then + if ! /usr/bin/id -u named >/dev/null 2>&1; then + echo 'Creation of named userid '%{bind_uid}' failed.' + echo 'The bind package cannot be installed without a named:named userid and group.' + if [ -x /usr/bin/logger ]; then + /usr/bin/logger -p 'user.crit' 'Creation of named userid '%{bind_uid}' failed - the bind package cannot be installed without a named:named userid and group.'; + fi; + exit 1; fi; fi; fi; @@ -715,7 +722,8 @@ %post config if [ "$1" -gt 0 ]; then /usr/bin/chcon system_u:object_r:named_conf_t /etc/named.caching-nameserver.conf >/dev/null 2>&1 || :; -elif [ "$1" -eq 1 ]; then +fi +if [ "$1" -eq 1 ]; then /usr/sbin/bind-chroot-admin --sync; fi; :; @@ -796,6 +804,12 @@ :; %changelog +* Wed Mar 08 2006 Jason Vas Dias - 30.9.3.2-8 +- Do not allow package to be installed if named:25 userid creation fails +- Give libbind a pkg-config file +- remove restorecon from bind-chroot-admin (not required). +- fix named.caching-nameserver.conf (listen-on-v6 port 53 { ::1 };) + * Tue Mar 07 2006 Jason Vas Dias - 30:9.3.2-7 - fix issues with bind-chroot-admin Index: named.caching-nameserver.conf =================================================================== RCS file: /cvs/dist/rpms/bind/devel/named.caching-nameserver.conf,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- named.caching-nameserver.conf 7 Mar 2006 04:25:38 -0000 1.1 +++ named.caching-nameserver.conf 8 Mar 2006 18:17:55 -0000 1.2 @@ -11,6 +11,7 @@ // options { listen-on port 53 { 127.0.0.1; }; + listen-on-v6 port 53 { ::1; }; directory "/var/named"; dump-file "/var/named/data/cache_dump.db"; statistics-file "/var/named/data/named_stats.txt"; From fedora-cvs-commits at redhat.com Wed Mar 8 18:21:21 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 8 Mar 2006 13:21:21 -0500 Subject: rpms/gtk2/devel .cvsignore, 1.46, 1.47 gtk2.spec, 1.128, 1.129 sources, 1.49, 1.50 Message-ID: <200603081821.k28ILLcM023552@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/gtk2/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv23476 Modified Files: .cvsignore gtk2.spec sources Log Message: 2.8.14 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/gtk2/devel/.cvsignore,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- .cvsignore 25 Feb 2006 05:42:33 -0000 1.46 +++ .cvsignore 8 Mar 2006 18:21:18 -0000 1.47 @@ -29,3 +29,4 @@ gtk+-2.8.11.tar.bz2 gtk+-2.8.12.tar.bz2 gtk+-2.8.13.tar.bz2 +gtk+-2.8.14.tar.bz2 Index: gtk2.spec =================================================================== RCS file: /cvs/dist/rpms/gtk2/devel/gtk2.spec,v retrieving revision 1.128 retrieving revision 1.129 diff -u -r1.128 -r1.129 --- gtk2.spec 6 Mar 2006 03:07:21 -0000 1.128 +++ gtk2.spec 8 Mar 2006 18:21:19 -0000 1.129 @@ -1,6 +1,6 @@ # Note that this is NOT a relocatable package -%define glib2_base_version 2.7.1 +%define glib2_base_version 2.10.1 %define glib2_version %{glib2_base_version}-1 %define pango_base_version 1.9.1 %define pango_version %{pango_base_version}-1 @@ -10,7 +10,7 @@ %define cairo_version %{cairo_base_version}-1 %define libpng_version 2:1.2.2-16 -%define base_version 2.8.13 +%define base_version 2.8.14 %define bin_version 2.4.0 Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X. @@ -265,6 +265,10 @@ %doc tmpdocs/examples %changelog +* Wed Mar 8 2006 Matthias Clasen - 2.8.14-1 +- Update to 2.8.14 to fix a possible memory overrun + in gtk_object_sink + * Sun Mar 5 2006 Matthias Clasen - 2.8.13-4 - Don't ship .la files for engines, either Index: sources =================================================================== RCS file: /cvs/dist/rpms/gtk2/devel/sources,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- sources 25 Feb 2006 05:42:33 -0000 1.49 +++ sources 8 Mar 2006 18:21:19 -0000 1.50 @@ -1,2 +1,2 @@ d8c012f67a8f23fa9aa495fca5331784 update-scripts.tar.gz -3b395d0b091d916d52cc1c2430407d35 gtk+-2.8.13.tar.bz2 +45125f53046fff3b649ddedf53bee9b0 gtk+-2.8.14.tar.bz2 From fedora-cvs-commits at redhat.com Wed Mar 8 18:21:36 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 8 Mar 2006 13:21:36 -0500 Subject: rpms/bind/devel libbind.pc,NONE,1.1 Message-ID: <200603081821.k28ILaaN023684@cvs.devel.redhat.com> Author: jvdias Update of /cvs/dist/rpms/bind/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv23653 Added Files: libbind.pc Log Message: pkg-config file for libbind --- NEW FILE libbind.pc --- # pkg-config file for libbind Name: libbind Description: BIND 8 compatible DNS Resolver Library Version: 9.3.2 Libs: -L/usr/lib -lbind Cflags: -I/usr/include/bind From fedora-cvs-commits at redhat.com Wed Mar 8 18:23:09 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 8 Mar 2006 13:23:09 -0500 Subject: rpms/gtk2/devel gtk2.spec,1.129,1.130 Message-ID: <200603081823.k28IN9lC024458@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/gtk2/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv24399 Modified Files: gtk2.spec Log Message: Fix release Index: gtk2.spec =================================================================== RCS file: /cvs/dist/rpms/gtk2/devel/gtk2.spec,v retrieving revision 1.129 retrieving revision 1.130 diff -u -r1.129 -r1.130 --- gtk2.spec 8 Mar 2006 18:21:19 -0000 1.129 +++ gtk2.spec 8 Mar 2006 18:23:06 -0000 1.130 @@ -16,7 +16,7 @@ Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X. Name: gtk2 Version: %{base_version} -Release: 4 +Release: 1 License: LGPL Group: System Environment/Libraries Source: gtk+-%{version}.tar.bz2 From fedora-cvs-commits at redhat.com Wed Mar 8 18:24:37 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 8 Mar 2006 13:24:37 -0500 Subject: rpms/notify-daemon/devel notify-daemon-0.3.1-dbus-0.61.patch, NONE, 1.1 notify-daemon.spec, 1.11, 1.12 Message-ID: <200603081824.k28IObR1025226@cvs.devel.redhat.com> Author: johnp Update of /cvs/dist/rpms/notify-daemon/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv25136 Modified Files: notify-daemon.spec Added Files: notify-daemon-0.3.1-dbus-0.61.patch Log Message: - Add patch to fix struct handling in the dbus glib binding for dbus 0.61 so image data works again notify-daemon-0.3.1-dbus-0.61.patch: notifydaemon.c | 18 +++++++++++++++--- 1 files changed, 15 insertions(+), 3 deletions(-) --- NEW FILE notify-daemon-0.3.1-dbus-0.61.patch --- --- notify-daemon-0.3.1/src/notifydaemon.c.dbus-0.61 2006-03-08 12:39:54.000000000 -0500 +++ notify-daemon-0.3.1/src/notifydaemon.c 2006-03-08 13:13:11.000000000 -0500 @@ -374,10 +374,22 @@ GValueArray *image_struct; GValue *value; GArray *tmp_array; - + + GType struct_type; + data = NULL; - - if (!G_VALUE_HOLDS (icon_data, G_TYPE_VALUE_ARRAY)) + + struct_type = dbus_g_type_get_struct ("GValueArray", + G_TYPE_INT, + G_TYPE_INT, + G_TYPE_INT, + G_TYPE_BOOLEAN, + G_TYPE_INT, + G_TYPE_INT, + dbus_g_type_get_collection ("GArray", G_TYPE_UCHAR), + G_TYPE_INVALID); + + if (!G_VALUE_HOLDS (icon_data, struct_type)) { g_warning ("_notify_daemon_process_icon_data expected a GValue of type GValueArray"); return FALSE; Index: notify-daemon.spec =================================================================== RCS file: /cvs/dist/rpms/notify-daemon/devel/notify-daemon.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- notify-daemon.spec 14 Feb 2006 16:11:42 -0000 1.11 +++ notify-daemon.spec 8 Mar 2006 18:24:35 -0000 1.12 @@ -4,7 +4,7 @@ Summary: Notification Daemon Name: notify-daemon Version: 0.3.1 -Release: 8 +Release: 9 URL: http://www.galago-project.org/specs/notification/ License: GPL Group: System Environment/Libraries @@ -21,6 +21,7 @@ Patch0: notify-daemon-0.3.1-position.patch Patch1: notify-daemon-0.3.1-message-markup.patch Patch2: notify-daemon-0.3.1-xselection.patch +Patch3: notify-daemon-0.3.1-dbus-0.61.patch %description notify-daemon is the server implementation of the freedesktop.org desktop @@ -31,6 +32,7 @@ %patch0 -p0 -b .position %patch1 -p1 -b .message-markup %patch2 -p1 -b .xselection +%patch3 -p1 -b .dbus-0.61 %build %configure @@ -52,6 +54,10 @@ %{_datadir}/dbus-1/services/notify-daemon.service %changelog +* Wed Mar 08 2006 John (J5) Palmieri - 0.3.1-9 +- Add patch to fix struct handling in the dbus glib binding for dbus 0.61 + so image data works again + * Tue Feb 14 2006 Christopher Aillon - 0.3.1-8 - BuildRequires love, for all you lovers out there. From fedora-cvs-commits at redhat.com Wed Mar 8 19:37:09 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 8 Mar 2006 14:37:09 -0500 Subject: rpms/dovecot/devel dovecot.spec,1.46,1.47 Message-ID: <200603081937.k28Jb9um025530@cvs.devel.redhat.com> Author: notting Update of /cvs/dist/rpms/dovecot/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv25517 Modified Files: dovecot.spec Log Message: redirect output Index: dovecot.spec =================================================================== RCS file: /cvs/dist/rpms/dovecot/devel/dovecot.spec,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- dovecot.spec 7 Mar 2006 00:59:12 -0000 1.46 +++ dovecot.spec 8 Mar 2006 19:37:07 -0000 1.47 @@ -165,7 +165,7 @@ fi if ! test -f /var/run/dovecot/login/ssl-parameters.dat; then - dovecot --build-ssl-parameters + dovecot --build-ssl-parameters &>/dev/null fi # Restart if it had been running before installation @@ -209,6 +209,9 @@ %changelog +* Wed Mar 8 2006 Bill Nottingham - 1.0-0.beta2.7 +- fix scriplet noise some more + * Mon Mar 6 2006 Jeremy Katz - 1.0-0.beta2.6 - fix scriptlet error (mitr, #184151) From fedora-cvs-commits at redhat.com Wed Mar 8 19:37:35 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 8 Mar 2006 14:37:35 -0500 Subject: rpms/dovecot/devel dovecot.spec,1.47,1.48 Message-ID: <200603081937.k28JbZ9J025554@cvs.devel.redhat.com> Author: notting Update of /cvs/dist/rpms/dovecot/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv25539 Modified Files: dovecot.spec Log Message: bump Index: dovecot.spec =================================================================== RCS file: /cvs/dist/rpms/dovecot/devel/dovecot.spec,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- dovecot.spec 8 Mar 2006 19:37:07 -0000 1.47 +++ dovecot.spec 8 Mar 2006 19:37:32 -0000 1.48 @@ -1,7 +1,7 @@ Summary: Dovecot Secure imap server Name: dovecot Version: 1.0 -Release: 0.beta2.6 +Release: 0.beta2.7 License: LGPL Group: System Environment/Daemons From fedora-cvs-commits at redhat.com Wed Mar 8 19:45:00 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 8 Mar 2006 14:45:00 -0500 Subject: rpms/gnome-user-docs/devel gnome-user-docs.spec,1.17,1.18 Message-ID: <200603081945.k28Jj0U1025631@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/gnome-user-docs/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv25612 Modified Files: gnome-user-docs.spec Log Message: - PreReq instead of Requires scrollkeeper. Reported by Bill Nottingham - s/makeinstall/make install DESTDIR=RPM_BUILD_ROOT/ Index: gnome-user-docs.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-user-docs/devel/gnome-user-docs.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- gnome-user-docs.spec 21 Feb 2006 13:24:14 -0000 1.17 +++ gnome-user-docs.spec 8 Mar 2006 19:44:58 -0000 1.18 @@ -1,7 +1,7 @@ Summary: GNOME User Documentation Name: gnome-user-docs Version: 2.13.1.1 -Release: 1 +Release: 2 License: FDL Source: gnome-user-docs-%{version}.tar.bz2 Group: Documentation @@ -10,7 +10,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-root Obsoletes: gnome-users-guide -Requires: scrollkeeper >= 0.3.11 +PreReq: scrollkeeper >= 0.3.11 BuildRequires: scrollkeeper BuildRequires: gnome-doc-utils >= 0.5.6 @@ -28,7 +28,7 @@ %install rm -rf $RPM_BUILD_ROOT -%makeinstall +make install DESTDIR=$RPM_BUILD_ROOT %clean rm -rf $RPM_BUILD_ROOT @@ -47,6 +47,10 @@ %{_datadir}/omf %changelog +* Wed Mar 8 2006 Ray Strode 2.13.1.1-2 +- PreReq instead of Requires scrollkeeper. Reported by + Bill Nottingham + * Tue Feb 21 2006 Matthias Clasen 2.13.1.1-1 - Update to 2.13.1.1 From fedora-cvs-commits at redhat.com Wed Mar 8 19:53:16 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 8 Mar 2006 14:53:16 -0500 Subject: rpms/mkinitrd/devel .cvsignore, 1.98, 1.99 mkinitrd.spec, 1.111, 1.112 sources, 1.107, 1.108 Message-ID: <200603081953.k28JrGEk005781@cvs.devel.redhat.com> Author: pjones Update of /cvs/dist/rpms/mkinitrd/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv5766 Modified Files: .cvsignore mkinitrd.spec sources Log Message: - update to 5.0.30-1 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/mkinitrd/devel/.cvsignore,v retrieving revision 1.98 retrieving revision 1.99 diff -u -r1.98 -r1.99 --- .cvsignore 27 Feb 2006 17:06:59 -0000 1.98 +++ .cvsignore 8 Mar 2006 19:53:14 -0000 1.99 @@ -1 +1 @@ -mkinitrd-5.0.29.tar.bz2 +mkinitrd-5.0.30.tar.bz2 Index: mkinitrd.spec =================================================================== RCS file: /cvs/dist/rpms/mkinitrd/devel/mkinitrd.spec,v retrieving revision 1.111 retrieving revision 1.112 diff -u -r1.111 -r1.112 --- mkinitrd.spec 27 Feb 2006 17:07:03 -0000 1.111 +++ mkinitrd.spec 8 Mar 2006 19:53:14 -0000 1.112 @@ -1,6 +1,6 @@ Summary: Creates an initial ramdisk image for preloading modules. Name: mkinitrd -Version: 5.0.29 +Version: 5.0.30 Release: 1 License: GPL Group: System Environment/Base @@ -63,6 +63,11 @@ %attr(644,root,root) %{_mandir}/man8/grubby.8* %changelog +* Wed Mar 8 2006 Peter Jones - 5.0.30-1 +- move blkid.tab* references to /etc/blkid/blkid.tab* +- don't do the selinux context stuff on blkid.tab*, as it now inherits from + the directory. + * Mon Feb 27 2006 Peter Jones - 5.0.29-1 - Fix pump-devel buildrequires - Fix grubby's getpathbyspec() usage (#183010) Index: sources =================================================================== RCS file: /cvs/dist/rpms/mkinitrd/devel/sources,v retrieving revision 1.107 retrieving revision 1.108 diff -u -r1.107 -r1.108 --- sources 27 Feb 2006 17:07:03 -0000 1.107 +++ sources 8 Mar 2006 19:53:14 -0000 1.108 @@ -1 +1 @@ -414b702dba718341cc79d52d6267e742 mkinitrd-5.0.29.tar.bz2 +04a5ab3702073dcfe4282f8e8eb3fb7f mkinitrd-5.0.30.tar.bz2 From fedora-cvs-commits at redhat.com Wed Mar 8 20:14:08 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 8 Mar 2006 15:14:08 -0500 Subject: rpms/mkinitrd/devel sources,1.108,1.109 Message-ID: <200603082014.k28KE8qF019465@cvs.devel.redhat.com> Author: pjones Update of /cvs/dist/rpms/mkinitrd/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv19400 Modified Files: sources Log Message: - update spec file Index: sources =================================================================== RCS file: /cvs/dist/rpms/mkinitrd/devel/sources,v retrieving revision 1.108 retrieving revision 1.109 diff -u -r1.108 -r1.109 --- sources 8 Mar 2006 19:53:14 -0000 1.108 +++ sources 8 Mar 2006 20:14:06 -0000 1.109 @@ -1 +1 @@ -04a5ab3702073dcfe4282f8e8eb3fb7f mkinitrd-5.0.30.tar.bz2 +b1dd3f1ed76f13a7cbfb872d765229cc mkinitrd-5.0.30.tar.bz2 From fedora-cvs-commits at redhat.com Wed Mar 8 20:17:06 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 8 Mar 2006 15:17:06 -0500 Subject: rpms/e2fsprogs/devel e2fsprogs-1.38-etcblkid.patch, NONE, 1.1 e2fsprogs.spec, 1.51, 1.52 Message-ID: <200603082017.k28KH6l9000454@cvs.devel.redhat.com> Author: pjones Update of /cvs/dist/rpms/e2fsprogs/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv26892 Modified Files: e2fsprogs.spec Added Files: e2fsprogs-1.38-etcblkid.patch Log Message: - move /etc/blkid.tab* to /etc/blkid/blkid.tab* so they inherit selinux contexts from the directory e2fsprogs-1.38-etcblkid.patch: RELEASE-NOTES | 2 +- doc/libblkid.txt | 4 ++-- lib/blkid/Makefile.in | 6 ++++-- lib/blkid/blkidP.h | 2 +- lib/blkid/libblkid.3.in | 4 ++-- misc/blkid.8.in | 4 ++-- misc/blkid.c | 2 +- 7 files changed, 13 insertions(+), 11 deletions(-) --- NEW FILE e2fsprogs-1.38-etcblkid.patch --- --- e2fsprogs-1.38/doc/libblkid.txt.etcblkid 2006-03-08 15:02:33.000000000 -0500 +++ e2fsprogs-1.38/doc/libblkid.txt 2006-03-08 15:04:08.000000000 -0500 @@ -58,7 +58,7 @@ } If a program needs to call multiple blkid functions, then passing in a -cache value of NULL is not recommended, since the /etc/blkid.tab file +cache value of NULL is not recommended, since the /etc/blkid/blkid.tab file will be repeatedly parsed over and over again, with memory allocated and deallocated. To initialize the blkid cache, blkid_get_cache() function is used: @@ -68,7 +68,7 @@ The second parameter of blkid_get_cache (if non-zero) is the alternate filename of the blkid cache file (where the default is -/etc/blkid.tab). Normally, programs should just pass in NULL. +/etc/blkid/blkid.tab). Normally, programs should just pass in NULL. If you have called blkid_get_cache(), you should call blkid_put_cache() when you are done using the blkid library functions. This will save the --- e2fsprogs-1.38/misc/blkid.8.in.etcblkid 2006-03-08 15:02:46.000000000 -0500 +++ e2fsprogs-1.38/misc/blkid.8.in 2006-03-08 15:04:17.000000000 -0500 @@ -55,7 +55,7 @@ Read from .I cachefile instead of reading from the default cache file -.IR /etc/blkid.tab . +.IR /etc/blkid/blkid.tab . If you want to start with a clean cache (i.e. don't report devices previously scanned but not necessarily available at this time), specify .IR /dev/null. @@ -139,7 +139,7 @@ Write the device cache to .I writecachefile instead of writing it to the default cache file -.IR /etc/blkid.tab . +.IR /etc/blkid/blkid.tab . If you don't want to save the cache to the default file, specify .IR /dev/null. If not specified it will be the same file as that given by the --- e2fsprogs-1.38/misc/blkid.c.etcblkid 2006-03-08 15:02:39.000000000 -0500 +++ e2fsprogs-1.38/misc/blkid.c 2006-03-08 15:04:19.000000000 -0500 @@ -39,7 +39,7 @@ fprintf(out, "usage:\t%s [-c ] [-hl] [-o format] " "[-s ] [-t ]\n [-v] [-w ] [dev ...]\n" - "\t-c\tcache file (default: /etc/blkid.tab, /dev/null = none)\n" + "\t-c\tcache file (default: /etc/blkid/blkid.tab, /dev/null = none)\n" "\t-h\tprint this usage message and exit\n" "\t-s\tshow specified tag(s) (default show all tags)\n" "\t-t\tfind device with a specific token (NAME=value pair)\n" --- e2fsprogs-1.38/lib/blkid/Makefile.in.etcblkid 2006-03-08 15:04:56.000000000 -0500 +++ e2fsprogs-1.38/lib/blkid/Makefile.in 2006-03-08 15:05:59.000000000 -0500 @@ -129,9 +129,10 @@ @cd $(top_builddir); CONFIG_FILES=lib/blkid/blkid.pc ./config.status installdirs:: - @echo " MKINSTALLDIRS $(libdir) $(includedir)/blkid" + @echo " MKINSTALLDIRS $(libdir) $(includedir)/blkid /etc/blkid" @$(MKINSTALLDIRS) $(DESTDIR)$(libdir) \ - $(DESTDIR)$(includedir)/blkid $(DESTDIR)$(libdir)/pkgconfig + $(DESTDIR)$(includedir)/blkid $(DESTDIR)$(libdir)/pkgconfig \ + $(DESTDIR)/etc/blkid install:: all installdirs @echo " INSTALL_DATA $(libdir)/libblkid.a" @@ -157,6 +158,7 @@ $(RM) -f $(DESTDIR)$(libdir)/libblkid.a \ $(DESTDIR)$(libdir)/pkgconfig/blkid.pc $(RM) -rf $(DESTDIR)$(includedir)/blkid + $(RM) -rf $(DESTDIR)/etc/blkid for i in $(SMANPAGES); do \ $(RM) -f $(DESTDIR)$(man3dir)/$$i; \ done --- e2fsprogs-1.38/lib/blkid/libblkid.3.in.etcblkid 2006-03-08 15:02:58.000000000 -0500 +++ e2fsprogs-1.38/lib/blkid/libblkid.3.in 2006-03-08 15:04:22.000000000 -0500 @@ -24,7 +24,7 @@ specific block device names into configuration files. .P Block device information is normally kept in a cache file -.I /etc/blkid.tab +.I /etc/blkid/blkid.tab and is verified to still be valid before being returned to the user (if the user has read permission on the raw block device, otherwise not). The cache file also allows unprivileged users (normally anyone other @@ -49,7 +49,7 @@ from Ted Ts'o. The library was subsequently heavily modified by Ted Ts'o. .SH FILES .TP -.I /etc/blkid.tab +.I /etc/blkid/blkid.tab Caches data extracted from each recognized block device. .SH AVAILABILITY .B libblkid --- e2fsprogs-1.38/lib/blkid/blkidP.h.etcblkid 2006-03-08 15:03:04.000000000 -0500 +++ e2fsprogs-1.38/lib/blkid/blkidP.h 2006-03-08 15:04:25.000000000 -0500 @@ -104,7 +104,7 @@ extern char *blkid_strdup(const char *s); extern char *blkid_strndup(const char *s, const int length); -#define BLKID_CACHE_FILE "/etc/blkid.tab" +#define BLKID_CACHE_FILE "/etc/blkid/blkid.tab" extern const char *blkid_devdirs[]; #define BLKID_ERR_IO 5 --- e2fsprogs-1.38/RELEASE-NOTES.etcblkid 2006-03-08 15:02:53.000000000 -0500 +++ e2fsprogs-1.38/RELEASE-NOTES 2006-03-08 15:04:30.000000000 -0500 @@ -718,7 +718,7 @@ Fixed a bug in the blkid library wihch could avoid an infinite loop in blkid_find_dev_with_tag() if /proc is not mounted and there the -/etc/blkid.tab file has not yet been created. +/etc/blkid/blkid.tab file has not yet been created. Fixed the badblocks program so that the destructive read/write test honors the -c option, and to use O_DIRECT when possible to avoid Index: e2fsprogs.spec =================================================================== RCS file: /cvs/dist/rpms/e2fsprogs/devel/e2fsprogs.spec,v retrieving revision 1.51 retrieving revision 1.52 diff -u -r1.51 -r1.52 --- e2fsprogs.spec 7 Mar 2006 15:46:43 -0000 1.51 +++ e2fsprogs.spec 8 Mar 2006 20:17:01 -0000 1.52 @@ -4,7 +4,7 @@ Summary: Utilities for managing the second extended (ext2) filesystem. Name: e2fsprogs Version: 1.38 -Release: 11 +Release: 12 License: GPL Group: System Environment/Base Source: ftp://download.sourceforge.net/pub/sourceforge/e2fsprogs/e2fsprogs-%{version}.tar.gz @@ -28,6 +28,7 @@ Patch33: e2fsprogs-1.38-lost+found.patch Patch34: e2fsprogs-1.38-blkid-devmapper.patch Patch35: e2fsprogs-1.38-blkid-epoch.patch +Patch36: e2fsprogs-1.38-etcblkid.patch Url: http://e2fsprogs.sourceforge.net/ BuildRoot: %{_tmppath}/%{name}-root Requires: e2fsprogs-libs = %{version}-%{release}, device-mapper @@ -124,6 +125,9 @@ # disable blkid.tab caching if time is set before epoch %patch35 -p1 -b .epoch +# put blkid.tab in /etc/blkid/ +%patch36 -p1 -b .etcblkid + %build aclocal autoconf @@ -171,6 +175,10 @@ %clean rm -rf $RPM_BUILD_ROOT +%post +[ -e /etc/blkid.tab ] && mv /etc/blkid.tab /etc/blkid/blkid.tab || : +[ -e /etc/blkid.tab.old ] && mv /etc/blkid.tab.old /etc/blkid/blkid.tab.old || : + %post libs -p /sbin/ldconfig %postun libs -p /sbin/ldconfig @@ -196,6 +204,7 @@ %doc %{ext2resize_name}/README.ext2resize %doc %{ext2resize_name}/doc/HOWTO.ext2resize +%dir /etc/blkid %{_root_sbindir}/badblocks %{_root_sbindir}/blkid %{_root_sbindir}/debugfs @@ -301,10 +310,13 @@ %{_mandir}/man3/uuid_unparse.3* %changelog -* Tue Mar 07 2006 David Cantrell - 1.38-11 +* Wed Mar 8 2006 Peter Jones - 1.38-12 +- Move /etc/blkid.tab to /etc/blkid/blkid.tab + +* Tue Mar 7 2006 David Cantrell - 1.38-11 - BuildRequires pkgconfig -* Tue Mar 07 2006 David Cantrell - 1.38-10 +* Tue Mar 7 2006 David Cantrell - 1.38-10 - Disable /etc/blkid.tab caching if time is set before epoch (#182188) * Fri Feb 24 2006 Peter Jones - 1.38-9 @@ -319,7 +331,7 @@ * Fri Feb 10 2006 Jesse Keating - 1.38-6.2 - bump again for double-long bug on ppc(64) -* Tue Feb 07 2006 Jesse Keating - 1.38-6.1 +* Tue Feb 7 2006 Jesse Keating - 1.38-6.1 - rebuilt for new gcc4.1 snapshot and glibc changes * Wed Jan 11 2006 Karel Zak 1.38-6 From fedora-cvs-commits at redhat.com Wed Mar 8 20:19:16 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 8 Mar 2006 15:19:16 -0500 Subject: rpms/jakarta-commons-daemon/devel jakarta-commons-daemon.spec, 1.6, 1.7 Message-ID: <200603082019.k28KJGeH001834@cvs.devel.redhat.com> Author: rafaels Update of /cvs/dist/rpms/jakarta-commons-daemon/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv1802 Modified Files: jakarta-commons-daemon.spec Log Message: added missing %post for rebuild-gcj-db Index: jakarta-commons-daemon.spec =================================================================== RCS file: /cvs/dist/rpms/jakarta-commons-daemon/devel/jakarta-commons-daemon.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- jakarta-commons-daemon.spec 6 Mar 2006 23:19:59 -0000 1.6 +++ jakarta-commons-daemon.spec 8 Mar 2006 20:19:13 -0000 1.7 @@ -7,7 +7,7 @@ Name: %{name} Version: 1.0 -Release: 2jpp_3fc +Release: 2jpp_4fc Epoch: 1 Summary: Jakarta Commons Daemon Package License: Apache Software License @@ -106,6 +106,7 @@ %{_sbindir}/jsvc %else +%post %{_bindir}/rebuild-gcj-db %postun @@ -127,6 +128,9 @@ %changelog +* Wed Mar 8 2006 Rafael Schloming - 1:1.0-2jpp_4fc +- added missing %post section for rebuild-gcj-db + * Mon Mar 6 2006 Jeremy Katz - 1:1.0-2jpp_3fc - stop scriptlet spew From fedora-cvs-commits at redhat.com Wed Mar 8 20:39:26 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 8 Mar 2006 15:39:26 -0500 Subject: rpms/kexec-tools/devel kdump.init, 1.7, 1.8 kexec-tools.spec, 1.17, 1.18 Message-ID: <200603082039.k28KdQw6008268@cvs.devel.redhat.com> Author: notting Update of /cvs/dist/rpms/kexec-tools/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv7973 Modified Files: kdump.init kexec-tools.spec Log Message: don't run by default, but do run chkconfig --add (#183633) Index: kdump.init =================================================================== RCS file: /cvs/dist/rpms/kexec-tools/devel/kdump.init,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- kdump.init 7 Mar 2006 18:50:02 -0000 1.7 +++ kdump.init 8 Mar 2006 20:39:23 -0000 1.8 @@ -9,7 +9,7 @@ # # Copyright 2005 Red Hat, Inc. # -# chkconfig: 2345 20 80 +# chkconfig: - 20 80 # # Author: Jeff Moyer Index: kexec-tools.spec =================================================================== RCS file: /cvs/dist/rpms/kexec-tools/devel/kexec-tools.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- kexec-tools.spec 8 Mar 2006 15:33:52 -0000 1.17 +++ kexec-tools.spec 8 Mar 2006 20:39:23 -0000 1.18 @@ -1,6 +1,6 @@ Name: kexec-tools Version: 1.101 -Release: 15 +Release: 16 License: GPL Group: Applications/System Summary: The kexec/kdump userspace component. @@ -69,10 +69,7 @@ KDUMP_COMMANDLINE=`echo $KDUMP_COMMANDLINE | sed -e 's/crashkernel=[0-9]\+M@[0-9]\+M//g'` export KDUMP_COMMANDLINE sed -i -e "s|REPLACEME|$KDUMP_COMMANDLINE irqpoll|g" /etc/sysconfig/kdump - -# No longer add kdump service by default, let the user add it manually -# to avoid everyone to see a warning. -# chkconfig --add kdump +/sbin/chkconfig --add kdump %postun @@ -99,6 +96,10 @@ %doc TODO %changelog +* Wed Mar 08 2006 Bill Nottingham - 1.101-16 +- fix scriptlet - call chkconfig --add, change the default in the + script itself (#183633) + * Wed Mar 08 2006 Thomas Graf - 1.101-15 - Don't add kdump service by default, let the user manually add it to avoid everyone seeing a warning. From fedora-cvs-commits at redhat.com Wed Mar 8 20:40:58 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 8 Mar 2006 15:40:58 -0500 Subject: rpms/selinux-policy/devel policy-20060207.patch, 1.40, 1.41 selinux-policy.spec, 1.141, 1.142 Message-ID: <200603082040.k28KewKh009032@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/selinux-policy/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv8800 Modified Files: policy-20060207.patch selinux-policy.spec Log Message: * Wed Mar 8 2006 Dan Walsh 2.2.23-8 - Blkid changes - Allow udev access to usb_device_t - Fix post script to create targeted policy config file policy-20060207.patch: Rules.modular | 2 policy/modules/admin/readahead.te | 2 policy/modules/admin/rpm.fc | 2 policy/modules/admin/su.fc | 1 policy/modules/admin/su.if | 6 policy/modules/admin/vbetool.te | 5 policy/modules/kernel/corenetwork.te.in | 3 policy/modules/kernel/devices.if | 20 +++ policy/modules/kernel/files.fc | 8 - policy/modules/kernel/files.if | 20 ++- policy/modules/kernel/filesystem.te | 1 policy/modules/kernel/kernel.if | 102 ++++++++++++++++ policy/modules/kernel/kernel.te | 3 policy/modules/services/apache.fc | 2 policy/modules/services/apache.if | 5 policy/modules/services/apm.fc | 2 policy/modules/services/apm.te | 4 policy/modules/services/bluetooth.te | 19 +-- policy/modules/services/cron.te | 3 policy/modules/services/cups.fc | 2 policy/modules/services/cups.if | 22 +++ policy/modules/services/cups.te | 7 - policy/modules/services/cvs.te | 2 policy/modules/services/hal.if | 41 ++++++ policy/modules/services/hal.te | 8 + policy/modules/services/ktalk.fc | 1 policy/modules/services/ktalk.te | 6 policy/modules/services/nscd.if | 2 policy/modules/services/samba.te | 2 policy/modules/system/fstools.te | 1 policy/modules/system/init.te | 5 policy/modules/system/libraries.fc | 2 policy/modules/system/locallogin.te | 1 policy/modules/system/lvm.fc | 1 policy/modules/system/lvm.te | 3 policy/modules/system/selinuxutil.fc | 6 policy/modules/system/selinuxutil.te | 4 policy/modules/system/sysnetwork.te | 3 policy/modules/system/udev.te | 2 policy/modules/system/unconfined.te | 8 - policy/modules/system/xend.fc | 19 +++ policy/modules/system/xend.if | 71 +++++++++++ policy/modules/system/xend.te | 198 ++++++++++++++++++++++++++++++++ support/Makefile.devel | 5 44 files changed, 587 insertions(+), 45 deletions(-) Index: policy-20060207.patch =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20060207.patch,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- policy-20060207.patch 8 Mar 2006 17:01:59 -0000 1.40 +++ policy-20060207.patch 8 Mar 2006 20:40:43 -0000 1.41 @@ -122,7 +122,34 @@ + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.fc serefpolicy-2.2.23/policy/modules/kernel/files.fc --- nsaserefpolicy/policy/modules/kernel/files.fc 2006-03-04 00:06:34.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/kernel/files.fc 2006-03-07 13:42:37.000000000 -0500 ++++ serefpolicy-2.2.23/policy/modules/kernel/files.fc 2006-03-08 13:59:25.000000000 -0500 +@@ -45,7 +45,7 @@ + /etc(/.*)? gen_context(system_u:object_r:etc_t,s0) + /etc/\.fstab\.hal\..+ -- gen_context(system_u:object_r:etc_runtime_t,s0) + /etc/asound\.state -- gen_context(system_u:object_r:etc_runtime_t,s0) +-/etc/blkid\.tab.* -- gen_context(system_u:object_r:etc_runtime_t,s0) ++/etc/blkid(/.*)? -- gen_context(system_u:object_r:etc_runtime_t,s0) + /etc/fstab\.REVOKE -- gen_context(system_u:object_r:etc_runtime_t,s0) + /etc/HOSTNAME -- gen_context(system_u:object_r:etc_runtime_t,s0) + /etc/ioctl\.save -- gen_context(system_u:object_r:etc_runtime_t,s0) +@@ -60,7 +60,7 @@ + + /etc/cups/client\.conf -- gen_context(system_u:object_r:etc_t,s0) + +-/etc/init\.d/functions -- gen_context(system_u:object_r:etc_t,s0) ++/etc/init\.d/functions -- gen_context(system_u:object_r:bin_t,s0) + + /etc/ipsec\.d/examples(/.*)? gen_context(system_u:object_r:etc_t,s0) + +@@ -68,7 +68,7 @@ + + /etc/ptal/ptal-printd-like -- gen_context(system_u:object_r:etc_runtime_t,s0) + +-/etc/rc\.d/init\.d/functions -- gen_context(system_u:object_r:etc_t,s0) ++/etc/rc\.d/init\.d/functions -- gen_context(system_u:object_r:bin_t,s0) + + /etc/sysconfig/hwconf -- gen_context(system_u:object_r:etc_runtime_t,s0) + /etc/sysconfig/iptables\.save -- gen_context(system_u:object_r:etc_runtime_t,s0) @@ -93,7 +93,7 @@ # HOME_ROOT # expanded by genhomedircon @@ -360,6 +387,20 @@ /var/run/\.?acpid\.socket -s gen_context(system_u:object_r:apmd_var_run_t,s0) /var/run/apmd\.pid -- gen_context(system_u:object_r:apmd_var_run_t,s0) +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apm.te serefpolicy-2.2.23/policy/modules/services/apm.te +--- nsaserefpolicy/policy/modules/services/apm.te 2006-03-04 00:06:35.000000000 -0500 ++++ serefpolicy-2.2.23/policy/modules/services/apm.te 2006-03-08 13:36:37.000000000 -0500 +@@ -225,6 +225,10 @@ + pcmcia_domtrans_cardctl(apmd_t) + ') + ++optional_policy(`xserver',` ++ xserver_domtrans_xdm_xserver(apmd_t) ++') ++ + optional_policy(`selinuxutil',` + seutil_sigchld_newrole(apmd_t) + ') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bluetooth.te serefpolicy-2.2.23/policy/modules/services/bluetooth.te --- nsaserefpolicy/policy/modules/services/bluetooth.te 2006-03-04 00:06:35.000000000 -0500 +++ serefpolicy-2.2.23/policy/modules/services/bluetooth.te 2006-03-08 11:35:36.000000000 -0500 @@ -583,7 +624,7 @@ + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.te serefpolicy-2.2.23/policy/modules/services/hal.te --- nsaserefpolicy/policy/modules/services/hal.te 2006-03-04 00:06:36.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/services/hal.te 2006-03-07 13:42:37.000000000 -0500 ++++ serefpolicy-2.2.23/policy/modules/services/hal.te 2006-03-08 15:25:53.000000000 -0500 @@ -48,6 +48,7 @@ kernel_read_network_state(hald_t) kernel_read_kernel_sysctls(hald_t) @@ -592,7 +633,16 @@ kernel_write_proc_files(hald_t) files_search_boot(hald_t) -@@ -144,6 +145,7 @@ +@@ -75,6 +76,8 @@ + dev_read_lvm_control(hald_t) + dev_getattr_all_chr_files(hald_t) + dev_manage_generic_chr_files(hald_t) ++dev_rw_generic_usb_dev(hald_t) ++ + # hal is now execing pm-suspend + dev_rw_sysfs(hald_t) + +@@ -144,6 +147,7 @@ userdom_dontaudit_search_sysadm_home_dirs(hald_t) ifdef(`targeted_policy', ` @@ -600,7 +650,7 @@ term_dontaudit_use_unallocated_ttys(hald_t) term_dontaudit_use_generic_ptys(hald_t) files_dontaudit_read_root_files(hald_t) -@@ -195,6 +197,10 @@ +@@ -195,6 +199,10 @@ hotplug_read_config(hald_t) ') @@ -826,6 +876,31 @@ dontaudit udev_t self:capability sys_tty_config; allow udev_t self:process ~{ ptrace setcurrent setexec setfscreate setrlimit execmem execstack execheap }; allow udev_t self:process { execmem setfscreate }; +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.te serefpolicy-2.2.23/policy/modules/system/unconfined.te +--- nsaserefpolicy/policy/modules/system/unconfined.te 2006-02-20 14:07:38.000000000 -0500 ++++ serefpolicy-2.2.23/policy/modules/system/unconfined.te 2006-03-08 12:35:43.000000000 -0500 +@@ -89,10 +89,6 @@ + firstboot_domtrans(unconfined_t) + ') + +- optional_policy(`fstools',` +- fstools_domtrans(unconfined_t) +- ') +- + optional_policy(`java',` + java_domtrans(unconfined_t) + ') +@@ -109,10 +105,6 @@ + mono_domtrans(unconfined_t) + ') + +- optional_policy(`mount',` +- mount_domtrans(unconfined_t) +- ') +- + optional_policy(`netutils',` + netutils_domtrans_ping(unconfined_t) + ') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xend.fc serefpolicy-2.2.23/policy/modules/system/xend.fc --- nsaserefpolicy/policy/modules/system/xend.fc 1969-12-31 19:00:00.000000000 -0500 +++ serefpolicy-2.2.23/policy/modules/system/xend.fc 2006-03-07 14:59:39.000000000 -0500 @@ -926,8 +1001,8 @@ + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xend.te serefpolicy-2.2.23/policy/modules/system/xend.te --- nsaserefpolicy/policy/modules/system/xend.te 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/system/xend.te 2006-03-07 15:55:35.000000000 -0500 -@@ -0,0 +1,196 @@ ++++ serefpolicy-2.2.23/policy/modules/system/xend.te 2006-03-08 14:24:46.000000000 -0500 +@@ -0,0 +1,198 @@ +policy_module(xend,1.0.0) + +######################################## @@ -993,7 +1068,7 @@ +allow xend_t self:fifo_file rw_file_perms; +allow xend_t self:unix_stream_socket create_stream_socket_perms; +allow xend_t self:process signal; -+allow xend_t self:capability { dac_override ipc_lock net_admin setuid sys_nice }; ++allow xend_t self:capability { dac_override ipc_lock net_admin setuid sys_nice sys_tty_config }; +allow xend_t self:netlink_route_socket r_netlink_socket_perms; + +# pid file @@ -1039,17 +1114,13 @@ +domain_read_all_domains_state(xend_t) +domain_dontaudit_read_all_domains_state(xend_t) + -+domain_auto_trans(xend_t, xenconsoled_exec_t, xenconsoled_t) -+role system_r types xenconsoled_t; -+ -+domain_auto_trans(xend_t, xenstored_exec_t, xenstored_t) -+role system_r types xenstored_t; ++init_dontaudit_use_fds(xend_t) + +kernel_read_kernel_sysctls(xend_t) +kernel_read_system_state(xend_t) +kernel_write_xen_state(xend_t) +kernel_read_xen_state(xend_t) -+kernel_read_net_sysctls(xend_t) ++kernel_rw_net_sysctls(xend_t) +kernel_read_network_state(xend_t) + +logging_send_syslog_msg(xend_t) @@ -1065,13 +1136,16 @@ +xend_store_stream_connect(xend_t) + +################################ xenconsoled_t ########################################## ++domain_auto_trans(xend_t, xenconsoled_exec_t, xenconsoled_t) ++role system_r types xenconsoled_t; ++allow xenconsoled_t xend_t:fd use; ++ +# Some common macros (you might be able to remove some) +libs_use_ld_so(xenconsoled_t) +libs_use_shared_libs(xenconsoled_t) +miscfiles_read_localization(xenconsoled_t) +files_search_etc(xenconsoled_t) +allow xenconsoled_t self:unix_stream_socket create_stream_socket_perms; -+allow xenconsoled_t xend_t:fd use; +allow xenconsoled_t self:capability { dac_override fsetid ipc_lock }; +allow xenconsoled_t self:fifo_file { read write }; + @@ -1091,6 +1165,10 @@ +term_dontaudit_use_generic_ptys(xenconsoled_t) + +################################ xenstored_t ########################################## ++domain_auto_trans(xend_t, xenstored_exec_t, xenstored_t) ++role system_r types xenstored_t; ++allow xenstored_t xend_t:fd use; ++ +# Some common macros (you might be able to remove some) +libs_use_ld_so(xenstored_t) +libs_use_shared_libs(xenstored_t) @@ -1112,7 +1190,6 @@ +allow xenstored_t xenstored_var_lib_t:dir create_dir_perms; +files_var_lib_filetrans(xenstored_t,xenstored_var_lib_t,{ file dir sock_file }) + -+allow xenstored_t xend_t:fd use; +kernel_write_xen_state(xenstored_t) +kernel_read_xen_state(xenstored_t) + @@ -1121,9 +1198,9 @@ +xend_append_log(xenstored_t) + +allow xenstored_t xend_t:fifo_file write; -+allow xenstored_t xend_device_t:chr_file rw_file_perms; -+ -+dev_filetrans(xenstored_t, xend_device_t, { dir chr_file }) ++dev_create_generic_dirs(xenstored_t) ++dev_filetrans(xenstored_t, xend_device_t, chr_file) ++allow xenstored_t xend_device_t:chr_file create_file_perms; diff --exclude-from=exclude -N -u -r nsaserefpolicy/Rules.modular serefpolicy-2.2.23/Rules.modular --- nsaserefpolicy/Rules.modular 2006-02-17 14:46:10.000000000 -0500 +++ serefpolicy-2.2.23/Rules.modular 2006-03-07 13:42:37.000000000 -0500 Index: selinux-policy.spec =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v retrieving revision 1.141 retrieving revision 1.142 diff -u -r1.141 -r1.142 --- selinux-policy.spec 8 Mar 2006 17:02:01 -0000 1.141 +++ selinux-policy.spec 8 Mar 2006 20:40:43 -0000 1.142 @@ -10,7 +10,7 @@ Summary: SELinux policy configuration Name: selinux-policy Version: 2.2.23 -Release: 7 +Release: 8 License: GPL Group: System Environment/Base Source: serefpolicy-%{version}.tgz @@ -204,7 +204,7 @@ %pre targeted %saveFileContext targeted -%post targeted +%post if [ ! -s /etc/selinux/config ]; then # # New install so we will default to targeted policy @@ -229,14 +229,17 @@ ln -sf ../selinux/config /etc/sysconfig/selinux restorecon /etc/selinux/config 2> /dev/null else + . /etc/selinux/config # if first time update booleans.local needs to be copied to sandbox - [ -f /etc/selinux/targeted/booleans.local ] && mv /etc/selinux/targeted/booleans.local /etc/selinux/targeted/modules/active/ - [ -f /etc/selinux/targeted/seusers ] && cp -f /etc/selinux/targeted/seusers /etc/selinux/targeted/modules/active/seusers + [ -f /etc/selinux/${SELINUXTYPE}/booleans.local ] && mv /etc/selinux/${SELINUXTYPE}/booleans.local /etc/selinux/targeted/modules/active/ + [ -f /etc/selinux/${SELINUXTYPE}/seusers ] && cp -f /etc/selinux/${SELINUXTYPE}/seusers /etc/selinux/${SELINUXTYPE}/modules/active/seusers grep -q "^SETLOCALDEFS" /etc/selinux/config || echo -n " # SETLOCALDEFS= Check local definition changes SETLOCALDEFS=0 ">> /etc/selinux/config fi + +%post targeted %rebuildpolicy targeted %relabel targeted @@ -296,6 +299,11 @@ %fileList strict %changelog +* Wed Mar 8 2006 Dan Walsh 2.2.23-8 +- Blkid changes +- Allow udev access to usb_device_t +- Fix post script to create targeted policy config file + * Wed Mar 8 2006 Dan Walsh 2.2.23-7 - Allow lvm tools to create drevice dir From fedora-cvs-commits at redhat.com Wed Mar 8 20:55:25 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 8 Mar 2006 15:55:25 -0500 Subject: rpms/xmlrpc/devel xmlrpc.spec,1.11,1.12 Message-ID: <200603082055.k28KtPfs028068@cvs.devel.redhat.com> Author: rafaels Update of /cvs/dist/rpms/xmlrpc/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv28005 Modified Files: xmlrpc.spec Log Message: excluded s390 due to eclipse Index: xmlrpc.spec =================================================================== RCS file: /cvs/dist/rpms/xmlrpc/devel/xmlrpc.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- xmlrpc.spec 6 Mar 2006 22:47:54 -0000 1.11 +++ xmlrpc.spec 8 Mar 2006 20:55:18 -0000 1.12 @@ -1,6 +1,6 @@ %define name xmlrpc %define version 2.0.1 -%define release 1jpp_6fc +%define release 1jpp_7fc %define section free %define gcj_support 1 @@ -34,7 +34,8 @@ #Distribution: JPackage #Vendor: JPackage Project -ExcludeArch: s390x ppc64 +# s390 excluded due to eclipse +ExcludeArch: s390x ppc64 s390 %description Apache XML-RPC is a Java implementation of XML-RPC, a popular protocol @@ -113,6 +114,9 @@ %{_javadocdir}/%{name}-%{version} %changelog +* Wed Mar 8 2006 Rafael Schloming - 0:2.0.1-1jpp_7fc +- excluded s390 due to eclipse + * Mon Mar 6 2006 Jeremy Katz - 0:2.0.1-1jpp_6fc - stop scriptlet spew From fedora-cvs-commits at redhat.com Wed Mar 8 20:56:46 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 8 Mar 2006 15:56:46 -0500 Subject: rpms/avahi/devel avahi.spec,1.43,1.44 Message-ID: <200603082056.k28KukQg028730@cvs.devel.redhat.com> Author: notting Update of /cvs/dist/rpms/avahi/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv27643 Modified Files: avahi.spec Log Message: Fix use of scriplets. 1. chkconfig --add is always unconditional. 2. condrestart goes in %postun, not %post (fixes script errors in the installer) http://fedoraproject.org/wiki/ScriptletSnippets for more information. Index: avahi.spec =================================================================== RCS file: /cvs/dist/rpms/avahi/devel/avahi.spec,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- avahi.spec 8 Mar 2006 01:09:51 -0000 1.43 +++ avahi.spec 8 Mar 2006 20:56:44 -0000 1.44 @@ -4,7 +4,7 @@ %endif Name: avahi Version: 0.6.9 -Release: 1 +Release: 2 Summary: Local network service discovery Group: System Environment/Base License: LGPL @@ -198,35 +198,22 @@ %post /sbin/ldconfig +/sbin/chkconfig --add avahi-daemon >/dev/null 2>&1 +/sbin/chkconfig --add avahi-dnsconfd >/dev/null 2>&1 if [ "$1" -eq 1 ]; then - if ! /sbin/chkconfig --list avahi-daemon >/dev/null 2>&1 ; then - # if user has not configured avahi service at all - /sbin/chkconfig --add avahi-daemon >/dev/null 2>&1 - fi; - if ! /sbin/chkconfig --list avahi-dnsconfd >/dev/null 2>&1 ; then - # avahi-dnsconfd NOT run by default in any runlevel; add it - # so system-config-services can see it - /sbin/chkconfig --add avahi-dnsconfd >/dev/null 2>&1 - fi; # We should realy make dbus reload the system.d config here. Dunno how though. # kill -HUP `cat /var/run/messagebus.pid` ? if [ -s /etc/localtime ]; then cp -fp /etc/localtime /etc/avahi/etc/localtime || :; fi; -elif [ "$1" -gt 1 ]; then - if ! /sbin/chkconfig --list avahi-daemon >/dev/null 2>&1 ; then - # if user has not configured avahi service at all - # reset initscript run order: - LC_ALL=C /sbin/chkconfig --levels=0123456 avahi-daemon reset >/dev/null 2>&1 - fi; -# pre 0.5.2-3, avahi-daemon initscript had 'chkconfig: 345 34 66', -# so it got started AFTER messagebus ( 97 ) and was unable to start. -# It now has 'chkconfig: 345 98 02'. +fi + +%postun +/sbin/ldconfig +if [ "$1" -ge "1" ]; then /sbin/service avahi-daemon condrestart >/dev/null 2>&1 /sbin/service avahi-dnsconfd condrestart >/dev/null 2>&1 -fi; - -%postun -p /sbin/ldconfig +fi %preun if [ "$1" -eq 0 ]; then From fedora-cvs-commits at redhat.com Wed Mar 8 21:07:13 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 8 Mar 2006 16:07:13 -0500 Subject: rpms/avalon-logkit/devel avalon-logkit.spec,1.17,1.18 Message-ID: <200603082107.k28L7Dr4030286@cvs.devel.redhat.com> Author: rafaels Update of /cvs/dist/rpms/avalon-logkit/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv30267 Modified Files: avalon-logkit.spec Log Message: excluded s390[x] and ppc64 due to eclipse Index: avalon-logkit.spec =================================================================== RCS file: /cvs/dist/rpms/avalon-logkit/devel/avalon-logkit.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- avalon-logkit.spec 6 Mar 2006 21:53:15 -0000 1.17 +++ avalon-logkit.spec 8 Mar 2006 21:07:10 -0000 1.18 @@ -2,7 +2,7 @@ %define short_Name LogKit %define name avalon-%{short_name} %define version 1.2 -%define release 3jpp_3fc +%define release 3jpp_4fc %define section free Name: %{name} @@ -33,6 +33,9 @@ BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot +# excluded due to eclipse +ExcludeArch: s390 s390x ppc64 + %description LogKit is a logging toolkit designed for secure performance orientated logging in applications. To get started using LogKit, it is recomended @@ -90,6 +93,9 @@ %{_javadocdir}/%{name}-%{version} %changelog +* Wed Mar 8 2006 Rafael Schloming - 0:1.2-3jpp_4fc +- ecluded s390[x] and ppc64 due to eclipse + * Mon Mar 6 2006 Jeremy Katz - 0:1.2-3jpp_3fc - stop scriptlet spew From fedora-cvs-commits at redhat.com Wed Mar 8 21:13:06 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 8 Mar 2006 16:13:06 -0500 Subject: rpms/kernel/devel linux-2.6-audit-slab-leak-tracking.patch, NONE, 1.1.2.1 kernel-2.6.spec, 1.2032, 1.2032.2.1 Message-ID: <200603082113.k28LD6pE032428@cvs.devel.redhat.com> Author: sgrubb Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv32244 Modified Files: Tag: private-lspp-11-branch kernel-2.6.spec Added Files: Tag: private-lspp-11-branch linux-2.6-audit-slab-leak-tracking.patch Log Message: lspp.11 kernel updates linux-2.6-audit-slab-leak-tracking.patch: fs/proc/proc_misc.c | 37 ++++++++++++++ lib/Kconfig.debug | 4 + mm/slab.c | 134 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 175 insertions(+) --- NEW FILE linux-2.6-audit-slab-leak-tracking.patch --- >From aviro at redhat.com Wed Mar 8 01:24:44 2006 Return-Path: Received: from mail.boston.redhat.com ([unix socket]) by mail.boston.redhat.com (Cyrus v2.1.12) with LMTP; Wed, 08 Mar 2006 01:24:45 -0500 X-Sieve: CMU Sieve 2.2 Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com [172.16.52.254]) by mail.boston.redhat.com (8.12.8/8.12.8) with ESMTP id k286OiTN010305 for ; Wed, 8 Mar 2006 01:24:45 -0500 Received: from devserv.devel.redhat.com (devserv.devel.redhat.com [172.16.58.1]) by int-mx1.corp.redhat.com (8.11.6/8.11.6) with ESMTP id k286Oi125677 for ; Wed, 8 Mar 2006 01:24:44 -0500 Received: from devserv.devel.redhat.com (localhost.localdomain [127.0.0.1]) by devserv.devel.redhat.com (8.12.11/8.12.11) with ESMTP id k286Oici030503 for ; Wed, 8 Mar 2006 01:24:44 -0500 Received: (from aviro at localhost) by devserv.devel.redhat.com (8.12.11/8.12.11/Submit) id k286OicR030501 for sgrubb at devserv.devel.redhat.com; Wed, 8 Mar 2006 01:24:44 -0500 Date: Wed, 8 Mar 2006 01:24:44 -0500 From: Alexander Viro To: Steven Grubb Subject: leak-tracking Message-ID: <20060308062444.GZ20691 at devserv.devel.redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.4.1i X-Length: 6868 X-UID: 53468 Enjoy. Set CONFIG_DEBUG_SLAB_LEAK and see the data in /proc/slab_allocators; format is :
. diff --git a/fs/proc/proc_misc.c b/fs/proc/proc_misc.c index 1d24fea..8d1b548 100644 --- a/fs/proc/proc_misc.c +++ b/fs/proc/proc_misc.c @@ -485,6 +485,40 @@ static struct file_operations proc_slabi .llseek = seq_lseek, .release = seq_release, }; + +#ifdef CONFIG_DEBUG_SLAB_LEAK +extern struct seq_operations slabstats_op; +static int slabstats_open(struct inode *inode, struct file *file) +{ + unsigned long *n = kzalloc(PAGE_SIZE, GFP_KERNEL); + int ret = -ENOMEM; + if (n) { + ret = seq_open(file, &slabstats_op); + if (!ret) { + struct seq_file *m = file->private_data; + *n = PAGE_SIZE / (2 * sizeof(unsigned long)); + m->private = n; + n = NULL; + } + kfree(n); + } + return ret; +} + +static int slabstats_release(struct inode *inode, struct file *file) +{ + struct seq_file *m = file->private_data; + kfree(m->private); + return seq_release(inode, file); +} + +static struct file_operations proc_slabstats_operations = { + .open = slabstats_open, + .read = seq_read, + .llseek = seq_lseek, + .release = slabstats_release, +}; +#endif #endif static int show_stat(struct seq_file *p, void *v) @@ -744,6 +778,9 @@ void __init proc_misc_init(void) create_seq_entry("interrupts", 0, &proc_interrupts_operations); #ifdef CONFIG_SLAB create_seq_entry("slabinfo",S_IWUSR|S_IRUGO,&proc_slabinfo_operations); +#ifdef CONFIG_DEBUG_SLAB_LEAK + create_seq_entry("slab_allocators", 0 ,&proc_slabstats_operations); +#endif #endif create_seq_entry("buddyinfo",S_IRUGO, &fragmentation_file_operations); create_seq_entry("vmstat",S_IRUGO, &proc_vmstat_file_operations); diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug index a314e66..69f2362 100644 --- a/lib/Kconfig.debug +++ b/lib/Kconfig.debug @@ -85,6 +85,10 @@ config DEBUG_SLAB allocation as well as poisoning memory on free to catch use of freed memory. This can make kmalloc/kfree-intensive workloads much slower. +config DEBUG_SLAB_LEAK + bool "Memory leak debugging" + depends on DEBUG_SLAB + config DEBUG_PREEMPT bool "Debug preemptible kernel" depends on DEBUG_KERNEL && PREEMPT diff --git a/mm/slab.c b/mm/slab.c index add05d8..1294fdb 100644 --- a/mm/slab.c +++ b/mm/slab.c @@ -3778,6 +3778,140 @@ ssize_t slabinfo_write(struct file *file res = count; return res; } + +#ifdef CONFIG_DEBUG_SLAB_LEAK + +static void *leaks_start(struct seq_file *m, loff_t *pos) +{ + loff_t n = *pos; + struct list_head *p; + + mutex_lock(&cache_chain_mutex); + p = cache_chain.next; + while (n--) { + p = p->next; + if (p == &cache_chain) + return NULL; + } + return list_entry(p, struct kmem_cache, next); +} + +static inline int add_caller(unsigned long *n, unsigned long v) +{ + unsigned long *p; + int l; + if (!v) + return 1; + l = n[1]; + p = n + 2; + while (l) { + int i = l/2; + unsigned long *q = p + 2 * i; + if (*q == v) { + q[1]++; + return 1; + } + if (*q > v) { + l = i; + } else { + p = q + 2; + l -= i + 1; + } + } + if (++n[1] == n[0]) + return 0; + memmove(p + 2, p, n[1] * 2 * sizeof(unsigned long) - ((void *)p - (void *)n)); + p[0] = v; + p[1] = 1; + return 1; +} + +static void handle_slab(unsigned long *n, struct kmem_cache *c, struct slab *s) +{ + void *p; + int i; + if (n[0] == n[1]) + return; + for (i = 0, p = s->s_mem; i < c->num; i++, p += c->buffer_size) { + if (slab_bufctl(s)[i] != BUFCTL_ALLOC) + continue; + if (*dbg_redzone1(c, p) != RED_ACTIVE) + continue; + if (!add_caller(n, (unsigned long)*dbg_userword(c, p))) + return; + } +} + +static int leaks_show(struct seq_file *m, void *p) +{ + struct kmem_cache *cachep = p; + struct list_head *q; + struct slab *slabp; + struct kmem_list3 *l3; + const char *name; + unsigned long *n = m->private; + int node; + int i; + + if (!(cachep->flags & SLAB_STORE_USER)) + return 0; + if (!(cachep->flags & SLAB_RED_ZONE)) + return 0; + + /* OK, we can do it */ + + n[1] = 0; + + spin_lock(&cachep->spinlock); + for_each_online_node(node) { + l3 = cachep->nodelists[node]; + if (!l3) + continue; + + check_irq_on(); + spin_lock_irq(&l3->list_lock); + + list_for_each(q, &l3->slabs_full) { + slabp = list_entry(q, struct slab, list); + handle_slab(n, cachep, slabp); + } + list_for_each(q, &l3->slabs_partial) { + slabp = list_entry(q, struct slab, list); + handle_slab(n, cachep, slabp); + } + spin_unlock_irq(&l3->list_lock); + } + name = cachep->name; + spin_unlock(&cachep->spinlock); + if (n[0] == n[1]) { + /* Increase the buffer size */ + mutex_unlock(&cache_chain_mutex); + m->private = kzalloc(n[0] * 4 * sizeof(unsigned long), GFP_KERNEL); + if (!m->private) { + /* Too bad, we are really out */ + m->private = n; + mutex_lock(&cache_chain_mutex); + return -ENOMEM; + } + *(unsigned long *)m->private = n[0] * 2; + kfree(n); + mutex_lock(&cache_chain_mutex); + /* Now make sure this entry will be retried */ + m->count = m->size; + return 0; + } + for (i = 0; i < n[1]; i++) + seq_printf(m, "%s: %p %lu\n", name, (void *)n[2*i+2], n[2*i+3]); + return 0; +} + +struct seq_operations slabstats_op = { + .start = leaks_start, + .next = s_next, + .stop = s_stop, + .show = leaks_show, +}; +#endif #endif /** Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.2032 retrieving revision 1.2032.2.1 diff -u -r1.2032 -r1.2032.2.1 --- kernel-2.6.spec 8 Mar 2006 03:10:30 -0000 1.2032 +++ kernel-2.6.spec 8 Mar 2006 21:13:02 -0000 1.2032.2.1 @@ -8,10 +8,10 @@ # Whether to apply the Xen patches, leave this enabled. %define includexen 1 # Whether to build the Xen kernels, disable if you want. -%define buildxen 1 +%define buildxen 0 %define buildxenPAE 0 %define builddoc 0 -%define buildkdump 1 +%define buildkdump 0 # Versions of various parts @@ -24,7 +24,7 @@ %define sublevel 15 %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 lspp.11 %define release %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})_FC5%{rhbsys} %define signmodules 0 %define make_target bzImage @@ -422,6 +422,10 @@ # Do not add anything non-trivial here. Patch10001: linux-2.6-random-patches.patch +# Audit & lspp patches +Patch20100: linux-2.6-audit-git.patch +Patch20101: linux-2.6-audit-slab-leak-tracking.patch + # END OF PATCH DEFINITIONS BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root @@ -1013,7 +1017,7 @@ # Fix incorrect hardlink count in selinuxfs %patch1803 -p1 # Add some more audit message types. -%patch1804 -p1 +#%patch1804 -p1 # Warn about obsolete functionality usage. %patch1900 -p1 @@ -1063,6 +1067,9 @@ # Small 1-2 liners fixing silly bugs that get pushed upstream quickly. %patch10001 -p1 +# Audit patches +%patch20100 -p1 +%patch20101 -p1 # END OF PATCH APPLICATIONS @@ -1076,7 +1083,8 @@ # now run oldconfig over all the config files for i in *.config do - mv $i .config + mv $i .config + echo "CONFIG_DEBUG_SLAB_LEAK=y" >> .config Arch=`head -1 .config | cut -b 3-` %if %{includexen} make ARCH=$Arch nonint_oldconfig > /dev/null @@ -1654,6 +1662,9 @@ %endif %changelog +* Wed Mar 8 2006 Steve Grubb +- lspp.11 + * Tue Mar 7 2006 John W. Linville - Temporarily disable automatic load of bcm43xx driver (causes hangs on some systems) From fedora-cvs-commits at redhat.com Wed Mar 8 21:15:18 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 8 Mar 2006 16:15:18 -0500 Subject: rpms/kernel/devel linux-2.6-audit-git.patch,NONE,1.1.14.1 Message-ID: <200603082115.k28LFIx2000954@cvs.devel.redhat.com> Author: sgrubb Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv810 Added Files: Tag: private-lspp-11-branch linux-2.6-audit-git.patch Log Message: lspp.11 audit git patch linux-2.6-audit-git.patch: arch/i386/kernel/ptrace.c | 14 arch/i386/kernel/vm86.c | 12 arch/ia64/kernel/ptrace.c | 12 arch/mips/kernel/ptrace.c | 4 arch/powerpc/kernel/ptrace.c | 18 arch/s390/kernel/ptrace.c | 4 arch/sparc64/kernel/ptrace.c | 4 arch/um/kernel/ptrace.c | 24 - arch/x86_64/kernel/ptrace.c | 16 fs/namei.c | 11 fs/open.c | 8 fs/xattr.c | 11 include/linux/audit.h | 148 +++++- include/linux/fsnotify.h | 14 include/linux/security.h | 33 + ipc/msg.c | 5 ipc/sem.c | 5 ipc/shm.c | 4 kernel/Makefile | 2 kernel/audit.c | 167 ++++++- kernel/audit.h | 88 ++++ kernel/auditfilter.c | 651 +++++++++++++++++++++++++++++ kernel/auditsc.c | 891 +++++++++++++++++++++-------------------- net/core/dev.c | 7 security/dummy.c | 14 security/selinux/hooks.c | 98 ++-- security/selinux/nlmsgtab.c | 9 security/selinux/selinuxfs.c | 11 security/selinux/ss/services.c | 15 29 files changed, 1697 insertions(+), 603 deletions(-) --- NEW FILE linux-2.6-audit-git.patch --- diff --git a/arch/i386/kernel/ptrace.c b/arch/i386/kernel/ptrace.c index 5c1fb6a..4caeee9 100644 --- a/arch/i386/kernel/ptrace.c +++ b/arch/i386/kernel/ptrace.c @@ -670,9 +670,11 @@ int do_syscall_trace(struct pt_regs *reg secure_computing(regs->orig_eax); if (unlikely(current->audit_context)) { - if (entryexit) - audit_syscall_exit(current, AUDITSC_RESULT(regs->eax), - regs->eax); + if (entryexit) { + if (audit_invoke_exit()) + audit_syscall_exit(current, AUDITSC_RESULT(regs->eax), + regs->eax); + } /* Debug traps, when using PTRACE_SINGLESTEP, must be sent only * on the syscall exit path. Normally, when TIF_SYSCALL_AUDIT is * not used, entry.S will call us only on syscall exit, not @@ -719,14 +721,14 @@ int do_syscall_trace(struct pt_regs *reg } ret = is_sysemu; out: - if (unlikely(current->audit_context) && !entryexit) + if (audit_invoke_entry() && !entryexit) audit_syscall_entry(current, AUDIT_ARCH_I386, regs->orig_eax, - regs->ebx, regs->ecx, regs->edx, regs->esi); + regs->ebx, regs->ecx, regs->edx, regs->esi); if (ret == 0) return 0; regs->orig_eax = -1; /* force skip of syscall restarting */ - if (unlikely(current->audit_context)) + if (audit_invoke_exit()) audit_syscall_exit(current, AUDITSC_RESULT(regs->eax), regs->eax); return 1; diff --git a/arch/i386/kernel/vm86.c b/arch/i386/kernel/vm86.c index f51c894..aee14fa 100644 --- a/arch/i386/kernel/vm86.c +++ b/arch/i386/kernel/vm86.c @@ -43,6 +43,7 @@ #include #include #include +#include #include #include @@ -252,6 +253,7 @@ out: #ifndef CONFIG_X86_NO_TSS struct tss_struct *tss; #endif + long eax; /* * make sure the vm86() system call doesn't try to do anything silly */ @@ -305,13 +307,19 @@ static void do_sys_vm86(struct kernel_vm tsk->thread.screen_bitmap = info->screen_bitmap; if (info->flags & VM86_SCREEN_BITMAP) mark_screen_rdonly(tsk->mm); + __asm__ __volatile__("xorl %eax,%eax; movl %eax,%fs; movl %eax,%gs\n\t"); + __asm__ __volatile__("movl %%eax, %0\n" :"=r"(eax)); + + /*call audit_syscall_exit since we do not exit via the normal paths */ + if (unlikely(current->audit_context)) + audit_syscall_exit(current, AUDITSC_RESULT(eax), eax); + __asm__ __volatile__( - "xorl %%eax,%%eax; movl %%eax,%%fs; movl %%eax,%%gs\n\t" "movl %0,%%esp\n\t" "movl %1,%%ebp\n\t" "jmp resume_userspace" : /* no outputs */ - :"r" (&info->regs), "r" (task_thread_info(tsk)) : "ax"); + :"r" (&info->regs), "r" (task_thread_info(tsk))); /* we never return here */ } diff --git a/arch/ia64/kernel/ptrace.c b/arch/ia64/kernel/ptrace.c index eaed14a..bc3fdc0 100644 --- a/arch/ia64/kernel/ptrace.c +++ b/arch/ia64/kernel/ptrace.c @@ -1632,7 +1632,7 @@ syscall_trace_enter (long arg0, long arg && (current->ptrace & PT_PTRACED)) syscall_trace(); - if (unlikely(current->audit_context)) { + if (audit_invoke_entry()) { long syscall; int arch; @@ -1656,8 +1656,14 @@ syscall_trace_leave (long arg0, long arg long arg4, long arg5, long arg6, long arg7, struct pt_regs regs) { - if (unlikely(current->audit_context)) - audit_syscall_exit(current, AUDITSC_RESULT(regs.r10), regs.r8); + if (audit_invoke_exit()) { + int success = AUDITSC_RESULT(regs.r10); + long result = regs.r8; + + if (success != AUDITSC_SUCCESS) + result = -result; + audit_syscall_exit(current, success, result); + } if (test_thread_flag(TIF_SYSCALL_TRACE) && (current->ptrace & PT_PTRACED)) diff --git a/arch/mips/kernel/ptrace.c b/arch/mips/kernel/ptrace.c index f838b36..f3da86d 100644 --- a/arch/mips/kernel/ptrace.c +++ b/arch/mips/kernel/ptrace.c @@ -468,7 +468,7 @@ static inline int audit_arch(void) */ asmlinkage void do_syscall_trace(struct pt_regs *regs, int entryexit) { - if (unlikely(current->audit_context) && entryexit) + if (audit_invoke_exit() && entryexit) audit_syscall_exit(current, AUDITSC_RESULT(regs->regs[2]), regs->regs[2]); @@ -492,7 +492,7 @@ asmlinkage void do_syscall_trace(struct current->exit_code = 0; } out: - if (unlikely(current->audit_context) && !entryexit) + if (audit_invoke_entry() && !entryexit) audit_syscall_entry(current, audit_arch(), regs->regs[2], regs->regs[4], regs->regs[5], regs->regs[6], regs->regs[7]); diff --git a/arch/powerpc/kernel/ptrace.c b/arch/powerpc/kernel/ptrace.c index 400793c..068d114 100644 --- a/arch/powerpc/kernel/ptrace.c +++ b/arch/powerpc/kernel/ptrace.c @@ -537,16 +537,16 @@ void do_syscall_trace_enter(struct pt_re && (current->ptrace & PT_PTRACED)) do_syscall_trace(); - if (unlikely(current->audit_context)) + if (audit_invoke_entry()) audit_syscall_entry(current, #ifdef CONFIG_PPC32 - AUDIT_ARCH_PPC, + AUDIT_ARCH_PPC, #else - test_thread_flag(TIF_32BIT)?AUDIT_ARCH_PPC:AUDIT_ARCH_PPC64, + test_thread_flag(TIF_32BIT)?AUDIT_ARCH_PPC:AUDIT_ARCH_PPC64, #endif - regs->gpr[0], - regs->gpr[3], regs->gpr[4], - regs->gpr[5], regs->gpr[6]); + regs->gpr[0], + regs->gpr[3], regs->gpr[4], + regs->gpr[5], regs->gpr[6]); } void do_syscall_trace_leave(struct pt_regs *regs) @@ -555,10 +555,10 @@ void do_syscall_trace_leave(struct pt_re secure_computing(regs->gpr[0]); #endif - if (unlikely(current->audit_context)) + if (audit_invoke_exit()) audit_syscall_exit(current, - (regs->ccr&0x1000)?AUDITSC_FAILURE:AUDITSC_SUCCESS, - regs->result); + (regs->ccr&0x1000)?AUDITSC_FAILURE:AUDITSC_SUCCESS, + regs->result); if ((test_thread_flag(TIF_SYSCALL_TRACE) #ifdef CONFIG_PPC64 diff --git a/arch/s390/kernel/ptrace.c b/arch/s390/kernel/ptrace.c index 37dfe33..a7e94f4 100644 --- a/arch/s390/kernel/ptrace.c +++ b/arch/s390/kernel/ptrace.c @@ -733,7 +733,7 @@ out: asmlinkage void syscall_trace(struct pt_regs *regs, int entryexit) { - if (unlikely(current->audit_context) && entryexit) + if (audit_invoke_exit() && entryexit) audit_syscall_exit(current, AUDITSC_RESULT(regs->gprs[2]), regs->gprs[2]); if (!test_thread_flag(TIF_SYSCALL_TRACE)) @@ -760,7 +760,7 @@ syscall_trace(struct pt_regs *regs, int current->exit_code = 0; } out: - if (unlikely(current->audit_context) && !entryexit) + if (audit_invoke_entry() && !entryexit) audit_syscall_entry(current, test_thread_flag(TIF_31BIT)?AUDIT_ARCH_S390:AUDIT_ARCH_S390X, regs->gprs[2], regs->orig_gpr2, regs->gprs[3], diff --git a/arch/sparc64/kernel/ptrace.c b/arch/sparc64/kernel/ptrace.c index 3f9746f..5516f2c 100644 --- a/arch/sparc64/kernel/ptrace.c +++ b/arch/sparc64/kernel/ptrace.c @@ -620,7 +620,7 @@ asmlinkage void syscall_trace(struct pt_ [...3310 lines suppressed...] - rc = len; - goto out_free; - } - if (size < len) { - rc = -ERANGE; - goto out_free; - } + if (strcmp(name, XATTR_SELINUX_SUFFIX)) + return -EOPNOTSUPP; - if (err > 0) { - if ((len == err) && !(memcmp(context, buffer, len))) { - /* Don't need to canonicalize value */ - rc = err; - goto out_free; - } - memset(buffer, 0, size); - } - memcpy(buffer, context, len); - rc = len; -out_free: - kfree(context); -out: - return rc; + return selinux_getsecurity(isec->sid, buffer, size); } static int selinux_inode_setsecurity(struct inode *inode, const char *name, @@ -4022,6 +4020,13 @@ static int selinux_ipc_permission(struct return ipc_has_perm(ipcp, av); } +static int selinux_ipc_getsecurity(struct kern_ipc_perm *ipcp, void *buffer, size_t size) +{ + struct ipc_security_struct *isec = ipcp->security; + + return selinux_getsecurity(isec->sid, buffer, size); +} + /* module stacking operations */ static int selinux_register_security (const char *name, struct security_operations *ops) { @@ -4063,8 +4068,7 @@ static int selinux_getprocattr(struct ta char *name, void *value, size_t size) { struct task_security_struct *tsec; - u32 sid, len; - char *context; + u32 sid; int error; if (current != p) { @@ -4073,9 +4077,6 @@ static int selinux_getprocattr(struct ta return error; } - if (!size) - return -ERANGE; - tsec = p->security; if (!strcmp(name, "current")) @@ -4092,16 +4093,7 @@ static int selinux_getprocattr(struct ta if (!sid) return 0; - error = security_sid_to_context(sid, &context, &len); - if (error) - return error; - if (len > size) { - kfree(context); - return -ERANGE; - } - memcpy(value, context, len); - kfree(context); - return len; + return selinux_getsecurity(sid, value, size); } static int selinux_setprocattr(struct task_struct *p, @@ -4259,6 +4251,7 @@ static struct security_operations selinu .inode_getxattr = selinux_inode_getxattr, .inode_listxattr = selinux_inode_listxattr, .inode_removexattr = selinux_inode_removexattr, + .inode_xattr_getsuffix = selinux_inode_xattr_getsuffix, .inode_getsecurity = selinux_inode_getsecurity, .inode_setsecurity = selinux_inode_setsecurity, .inode_listsecurity = selinux_inode_listsecurity, @@ -4296,6 +4289,7 @@ static struct security_operations selinu .task_to_inode = selinux_task_to_inode, .ipc_permission = selinux_ipc_permission, + .ipc_getsecurity = selinux_ipc_getsecurity, .msg_msg_alloc_security = selinux_msg_msg_alloc_security, .msg_msg_free_security = selinux_msg_msg_free_security, diff --git a/security/selinux/nlmsgtab.c b/security/selinux/nlmsgtab.c index 69b9329..7315824 100644 --- a/security/selinux/nlmsgtab.c +++ b/security/selinux/nlmsgtab.c @@ -99,6 +99,9 @@ static struct nlmsg_perm nlmsg_audit_per { AUDIT_LIST, NETLINK_AUDIT_SOCKET__NLMSG_READPRIV }, { AUDIT_ADD, NETLINK_AUDIT_SOCKET__NLMSG_WRITE }, { AUDIT_DEL, NETLINK_AUDIT_SOCKET__NLMSG_WRITE }, + { AUDIT_LIST_RULES, NETLINK_AUDIT_SOCKET__NLMSG_READPRIV }, + { AUDIT_ADD_RULE, NETLINK_AUDIT_SOCKET__NLMSG_WRITE }, + { AUDIT_DEL_RULE, NETLINK_AUDIT_SOCKET__NLMSG_WRITE }, { AUDIT_USER, NETLINK_AUDIT_SOCKET__NLMSG_RELAY }, { AUDIT_SIGNAL_INFO, NETLINK_AUDIT_SOCKET__NLMSG_READ }, }; @@ -145,8 +148,10 @@ int selinux_nlmsg_lookup(u16 sclass, u16 break; case SECCLASS_NETLINK_AUDIT_SOCKET: - if (nlmsg_type >= AUDIT_FIRST_USER_MSG && - nlmsg_type <= AUDIT_LAST_USER_MSG) { + if ((nlmsg_type >= AUDIT_FIRST_USER_MSG && + nlmsg_type <= AUDIT_LAST_USER_MSG) || + (nlmsg_type >= AUDIT_FIRST_USER_MSG2 && + nlmsg_type <= AUDIT_LAST_USER_MSG2)) { *perm = NETLINK_AUDIT_SOCKET__NLMSG_RELAY; } else { err = nlmsg_perm(nlmsg_type, perm, nlmsg_audit_perms, diff --git a/security/selinux/selinuxfs.c b/security/selinux/selinuxfs.c index b5fa02d..5eba666 100644 --- a/security/selinux/selinuxfs.c +++ b/security/selinux/selinuxfs.c @@ -21,6 +21,7 @@ #include #include #include +#include #include #include @@ -126,6 +127,10 @@ static ssize_t sel_write_enforce(struct length = task_has_security(current, SECURITY__SETENFORCE); if (length) goto out; + audit_log(current->audit_context, GFP_KERNEL, AUDIT_MAC_STATUS, + "enforcing=%d old_enforcing=%d auid=%u", new_value, + selinux_enforcing, + audit_get_loginuid(current->audit_context)); selinux_enforcing = new_value; if (selinux_enforcing) avc_ss_reset(0); @@ -176,6 +181,9 @@ static ssize_t sel_write_disable(struct length = selinux_disable(); if (length < 0) goto out; + audit_log(current->audit_context, GFP_KERNEL, AUDIT_MAC_STATUS, + "selinux=0 auid=%u", + audit_get_loginuid(current->audit_context)); } length = count; @@ -261,6 +269,9 @@ static ssize_t sel_write_load(struct fil length = ret; else length = count; + audit_log(current->audit_context, GFP_KERNEL, AUDIT_MAC_POLICY_LOAD, + "policy loaded auid=%u", + audit_get_loginuid(current->audit_context)); out: up(&sel_sem); vfree(data); diff --git a/security/selinux/ss/services.c b/security/selinux/ss/services.c index 8a76492..d877cd1 100644 --- a/security/selinux/ss/services.c +++ b/security/selinux/ss/services.c @@ -1758,19 +1758,22 @@ int security_set_bools(int len, int *val goto out; } - printk(KERN_INFO "security: committed booleans { "); for (i = 0; i < len; i++) { + if (!!values[i] != policydb.bool_val_to_struct[i]->state) { + audit_log(current->audit_context, GFP_ATOMIC, + AUDIT_MAC_CONFIG_CHANGE, + "bool=%s val=%d old_val=%d auid=%u", + policydb.p_bool_val_to_name[i], + !!values[i], + policydb.bool_val_to_struct[i]->state, + audit_get_loginuid(current->audit_context)); + } if (values[i]) { policydb.bool_val_to_struct[i]->state = 1; } else { policydb.bool_val_to_struct[i]->state = 0; } - if (i != 0) - printk(", "); - printk("%s:%d", policydb.p_bool_val_to_name[i], - policydb.bool_val_to_struct[i]->state); } - printk(" }\n"); for (cur = policydb.cond_list; cur != NULL; cur = cur->next) { rc = evaluate_cond_node(&policydb, cur); From fedora-cvs-commits at redhat.com Wed Mar 8 21:34:36 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 8 Mar 2006 16:34:36 -0500 Subject: rpms/geronimo-specs/devel geronimo-specs.spec,1.14,1.15 Message-ID: <200603082134.k28LYaLj019973@cvs.devel.redhat.com> Author: rafaels Update of /cvs/dist/rpms/geronimo-specs/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv19955 Modified Files: geronimo-specs.spec Log Message: excluded s390[x] and ppc64 due to eclipse Index: geronimo-specs.spec =================================================================== RCS file: /cvs/dist/rpms/geronimo-specs/devel/geronimo-specs.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- geronimo-specs.spec 11 Feb 2006 03:03:34 -0000 1.14 +++ geronimo-specs.spec 8 Mar 2006 21:34:17 -0000 1.15 @@ -2,7 +2,7 @@ %define name geronimo-specs %define version 1.0 %define mstone M2 -%define release 0.%{mstone}.2jpp_7fc +%define release 0.%{mstone}.2jpp_8fc %define section free Summary: Geronimo J2EE server J2EE specifications @@ -27,6 +27,9 @@ Requires(post): java-gcj-compat >= 1.0.31 Requires(postun): java-gcj-compat >= 1.0.31 +# excluded due to eclipse +ExcludeArch: s390 s390x ppc64 + %description Geronimo is Apache's ASF-licenced J2EE server project. These are the J2EE-Specifications @@ -120,6 +123,9 @@ %{_javadir}/*.jar %changelog +* Wed Mar 8 2006 Rafael Schloming - 0:1.0-0.%{mstone}.2jpp_8fc +- excluded s390[x] and ppc64 due to eclipse + * Fri Feb 10 2006 Jesse Keating - 0:1.0-0.M2.2jpp_7fc - bump again for double-long bug on ppc(64) From fedora-cvs-commits at redhat.com Wed Mar 8 21:45:33 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 8 Mar 2006 16:45:33 -0500 Subject: rpms/hsqldb/devel hsqldb.spec,1.15,1.16 Message-ID: <200603082145.k28LjXoY015736@cvs.devel.redhat.com> Author: notting Update of /cvs/dist/rpms/hsqldb/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv14706 Modified Files: hsqldb.spec Log Message: fix scriplets. - use an assigned uid/gid - don't run usermod - add prereqs Index: hsqldb.spec =================================================================== RCS file: /cvs/dist/rpms/hsqldb/devel/hsqldb.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- hsqldb.spec 6 Mar 2006 21:48:12 -0000 1.15 +++ hsqldb.spec 8 Mar 2006 21:45:31 -0000 1.16 @@ -3,7 +3,7 @@ %define name hsqldb %define version 1.80.1 %define cvs_version 1_8_0_1 -%define release 1jpp_8fc +%define release 1jpp_9fc Name: %{name} Version: %{version} @@ -29,6 +29,9 @@ BuildRequires: java-gcj-compat-devel >= 1.0.31 Requires(post): java-gcj-compat >= 1.0.31 Requires(postun): java-gcj-compat >= 1.0.31 +Requires(pre): shadow-utils +Requires(post): coreutils +Requires(preun): coreutils %description HSQLdb is a relational database engine written in JavaTM , with a JDBC @@ -145,8 +148,8 @@ %pre # Add the "hsqldb" user and group # we need a shell to be able to use su - later -%{_sbindir}/groupadd -r %{name} 2> /dev/null || : -%{_sbindir}/useradd -g %{name} -s /sbin/nologin \ +%{_sbindir}/groupadd -g 95 -f -r %{name} 2> /dev/null || : +%{_sbindir}/useradd -u 95 -g %{name} -s /sbin/nologin \ -d %{_localstatedir}/lib/%{name} -r %{name} 2> /dev/null || : %post @@ -158,10 +161,6 @@ ) %{_bindir}/rebuild-gcj-db -if [ "$1" -ge "2" ]; then - chsh -s /sbin/nologin %{name} -fi - %preun if [ "$1" = "0" ]; then rm -f %{_localstatedir}/lib/%{name}/lib/hsqldb.jar @@ -209,6 +208,11 @@ %{_datadir}/%{name} %changelog +* Wed Mar 8 2006 Bill Nottingham - 0:1.80.1-1jpp_9fc +- use an assigned user/group id +- don't do usermod +- add missing requirements (#182796, #182797) + * Mon Mar 6 2006 Jeremy Katz - 0:1.80.1-1jpp_8fc - stop scriptlet spew From fedora-cvs-commits at redhat.com Wed Mar 8 21:50:32 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 8 Mar 2006 16:50:32 -0500 Subject: rpms/hsqldb/devel hsqldb.spec,1.16,1.17 Message-ID: <200603082150.k28LoW8w027321@cvs.devel.redhat.com> Author: notting Update of /cvs/dist/rpms/hsqldb/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv27307 Modified Files: hsqldb.spec Log Message: fix buildreq Index: hsqldb.spec =================================================================== RCS file: /cvs/dist/rpms/hsqldb/devel/hsqldb.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- hsqldb.spec 8 Mar 2006 21:45:31 -0000 1.16 +++ hsqldb.spec 8 Mar 2006 21:50:29 -0000 1.17 @@ -22,7 +22,7 @@ BuildRequires: ant BuildRequires: junit BuildRequires: jpackage-utils >= 0:1.5 -BuildRequires: servletapi5 +BuildRequires: tomcat5-servlet-2.4-api Group: Development/Java Buildroot: %{_tmppath}/%{name}-%{version}-buildroot # libgcj aot-compiled native libraries From fedora-cvs-commits at redhat.com Wed Mar 8 21:56:13 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 8 Mar 2006 16:56:13 -0500 Subject: rpms/kernel/devel kernel-2.6.spec,1.2032.2.1,1.2032.2.2 Message-ID: <200603082156.k28LuDY3004006@cvs.devel.redhat.com> Author: sgrubb Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv3887 Modified Files: Tag: private-lspp-11-branch kernel-2.6.spec Log Message: version number update Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.2032.2.1 retrieving revision 1.2032.2.2 diff -u -r1.2032.2.1 -r1.2032.2.2 --- kernel-2.6.spec 8 Mar 2006 21:13:02 -0000 1.2032.2.1 +++ kernel-2.6.spec 8 Mar 2006 21:56:09 -0000 1.2032.2.2 @@ -24,7 +24,7 @@ %define sublevel 15 %define kversion 2.6.%{sublevel} %define rpmversion 2.6.%{sublevel} -%define rhbsys lspp.11 +%define rhbsys .lspp.11 %define release %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})_FC5%{rhbsys} %define signmodules 0 %define make_target bzImage From fedora-cvs-commits at redhat.com Wed Mar 8 21:59:49 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 8 Mar 2006 16:59:49 -0500 Subject: rpms/castor/devel castor.spec,1.7,1.8 Message-ID: <200603082159.k28LxnGn005484@cvs.devel.redhat.com> Author: rafaels Update of /cvs/dist/rpms/castor/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv5459 Modified Files: castor.spec Log Message: excluded s390[x] and ppc64 due to eclipse Index: castor.spec =================================================================== RCS file: /cvs/dist/rpms/castor/devel/castor.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- castor.spec 6 Mar 2006 22:01:34 -0000 1.7 +++ castor.spec 8 Mar 2006 21:59:46 -0000 1.8 @@ -1,6 +1,6 @@ %define name castor %define version 0.9.5 -%define release 1jpp_2fc +%define release 1jpp_3fc %define section free Summary: An open source data binding framework for Java @@ -36,6 +36,9 @@ BuildRequires: regexp BuildRequires: xerces-j2 +# excluded due to eclipse +ExcludeArch: s390 s390x ppc64 + %description Castor is an open source data binding framework for Java. It's basically the shortest path between Java objects, XML documents and SQL tables. @@ -172,6 +175,9 @@ %doc build/doc/* %changelog +* Wed Mar 8 2006 Rafael Schloming - 0:0.9.5-1jpp_3fc +- excluded s390[x] and ppc64 due to eclipse + * Mon Mar 6 2006 Jeremy Katz - 0:0.9.5-1jpp_2fc - stop scriptlet spew From fedora-cvs-commits at redhat.com Wed Mar 8 22:02:16 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 8 Mar 2006 17:02:16 -0500 Subject: rpms/hsqldb/devel hsqldb.spec,1.17,1.18 Message-ID: <200603082202.k28M2GaK005728@cvs.devel.redhat.com> Author: notting Update of /cvs/dist/rpms/hsqldb/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv5693 Modified Files: hsqldb.spec Log Message: add exclusivearch so this will build Index: hsqldb.spec =================================================================== RCS file: /cvs/dist/rpms/hsqldb/devel/hsqldb.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- hsqldb.spec 8 Mar 2006 21:50:29 -0000 1.17 +++ hsqldb.spec 8 Mar 2006 22:02:09 -0000 1.18 @@ -33,6 +33,10 @@ Requires(post): coreutils Requires(preun): coreutils +# tomcat5-servlet-2.4-api is only available here +ExcludeArch: ppc64 s390 s390x + + %description HSQLdb is a relational database engine written in JavaTM , with a JDBC driver, supporting a subset of ANSI-92 SQL. It offers a small (about From fedora-cvs-commits at redhat.com Wed Mar 8 22:06:07 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 8 Mar 2006 17:06:07 -0500 Subject: rpms/system-config-bind/devel .cvsignore, 1.24, 1.25 sources, 1.41, 1.42 system-config-bind.spec, 1.49, 1.50 Message-ID: <200603082206.k28M678k006077@cvs.devel.redhat.com> Author: jvdias Update of /cvs/dist/rpms/system-config-bind/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv6047 Modified Files: .cvsignore sources system-config-bind.spec Log Message: fix bug 184065; ship updated translations; Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/system-config-bind/devel/.cvsignore,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- .cvsignore 1 Mar 2006 19:20:05 -0000 1.24 +++ .cvsignore 8 Mar 2006 22:06:04 -0000 1.25 @@ -21,3 +21,4 @@ system-config-bind-4.0.0-34_FC5.tar.gz system-config-bind-4.0.0-36_FC5.tar.gz system-config-bind-4.0.0-38_FC5.tar.gz +system-config-bind-4.0.0-40_FC5.tar.gz Index: sources =================================================================== RCS file: /cvs/dist/rpms/system-config-bind/devel/sources,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- sources 1 Mar 2006 19:20:05 -0000 1.41 +++ sources 8 Mar 2006 22:06:04 -0000 1.42 @@ -1 +1 @@ -6e055067c2df5dd217fdc16239d441cc system-config-bind-4.0.0-38_FC5.tar.gz +10aa4862497593c55d74cbaff1f751d0 system-config-bind-4.0.0-40_FC5.tar.gz Index: system-config-bind.spec =================================================================== RCS file: /cvs/dist/rpms/system-config-bind/devel/system-config-bind.spec,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- system-config-bind.spec 1 Mar 2006 19:20:05 -0000 1.49 +++ system-config-bind.spec 8 Mar 2006 22:06:04 -0000 1.50 @@ -1,7 +1,7 @@ Summary: The Red Hat BIND DNS Configuration Tool. Name: system-config-bind Version: 4.0.0 -Release: 38_FC5 +Release: 40_FC5 License: GPL Group: Applications/System URL: http://people.redhat.com/~jvdias/system-config-bind @@ -91,6 +91,11 @@ fi %changelog +* Wed Mar 08 2006 Jason Vas Dias - 4.0.0-40 +- fix bug 184065: prompts to place slave / DDNS updateable zone + files in slaves/ +- ship updated translations + * Tue Mar 01 2006 Jason Vas Dias - 4.0.0-38 - fix bug 182857: add Requires(post): hicolor-icon-them - ship updated translations From fedora-cvs-commits at redhat.com Wed Mar 8 22:11:19 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 8 Mar 2006 17:11:19 -0500 Subject: rpms/selinux-policy/devel policy-20060207.patch, 1.41, 1.42 selinux-policy.spec, 1.142, 1.143 Message-ID: <200603082211.k28MBJpx007347@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/selinux-policy/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv7300 Modified Files: policy-20060207.patch selinux-policy.spec Log Message: * Wed Mar 8 2006 Dan Walsh 2.2.23-9 - Fix blkid specification - Allow postfix to execute mailman_que policy-20060207.patch: Rules.modular | 2 policy/modules/admin/readahead.te | 2 policy/modules/admin/rpm.fc | 2 policy/modules/admin/su.fc | 1 policy/modules/admin/su.if | 6 policy/modules/admin/vbetool.te | 5 policy/modules/kernel/corenetwork.te.in | 3 policy/modules/kernel/devices.if | 20 +++ policy/modules/kernel/files.fc | 8 - policy/modules/kernel/files.if | 20 ++- policy/modules/kernel/filesystem.te | 1 policy/modules/kernel/kernel.if | 102 ++++++++++++++++ policy/modules/kernel/kernel.te | 3 policy/modules/services/apache.fc | 2 policy/modules/services/apache.if | 5 policy/modules/services/apm.fc | 2 policy/modules/services/apm.te | 4 policy/modules/services/bluetooth.te | 19 +-- policy/modules/services/cron.te | 3 policy/modules/services/cups.fc | 2 policy/modules/services/cups.if | 22 +++ policy/modules/services/cups.te | 7 - policy/modules/services/cvs.te | 2 policy/modules/services/hal.if | 41 ++++++ policy/modules/services/hal.te | 8 + policy/modules/services/ktalk.fc | 1 policy/modules/services/ktalk.te | 6 policy/modules/services/mailman.if | 25 ++++ policy/modules/services/nscd.if | 2 policy/modules/services/postfix.te | 4 policy/modules/services/samba.te | 2 policy/modules/system/fstools.te | 1 policy/modules/system/init.te | 5 policy/modules/system/libraries.fc | 2 policy/modules/system/locallogin.te | 1 policy/modules/system/lvm.fc | 1 policy/modules/system/lvm.te | 3 policy/modules/system/selinuxutil.fc | 6 policy/modules/system/selinuxutil.te | 4 policy/modules/system/sysnetwork.te | 3 policy/modules/system/udev.te | 2 policy/modules/system/unconfined.te | 8 - policy/modules/system/xend.fc | 19 +++ policy/modules/system/xend.if | 71 +++++++++++ policy/modules/system/xend.te | 198 ++++++++++++++++++++++++++++++++ support/Makefile.devel | 5 46 files changed, 616 insertions(+), 45 deletions(-) Index: policy-20060207.patch =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20060207.patch,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- policy-20060207.patch 8 Mar 2006 20:40:43 -0000 1.41 +++ policy-20060207.patch 8 Mar 2006 22:11:17 -0000 1.42 @@ -122,13 +122,13 @@ + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.fc serefpolicy-2.2.23/policy/modules/kernel/files.fc --- nsaserefpolicy/policy/modules/kernel/files.fc 2006-03-04 00:06:34.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/kernel/files.fc 2006-03-08 13:59:25.000000000 -0500 ++++ serefpolicy-2.2.23/policy/modules/kernel/files.fc 2006-03-08 16:26:29.000000000 -0500 @@ -45,7 +45,7 @@ /etc(/.*)? gen_context(system_u:object_r:etc_t,s0) /etc/\.fstab\.hal\..+ -- gen_context(system_u:object_r:etc_runtime_t,s0) /etc/asound\.state -- gen_context(system_u:object_r:etc_runtime_t,s0) -/etc/blkid\.tab.* -- gen_context(system_u:object_r:etc_runtime_t,s0) -+/etc/blkid(/.*)? -- gen_context(system_u:object_r:etc_runtime_t,s0) ++/etc/blkid(/.*)? gen_context(system_u:object_r:etc_runtime_t,s0) /etc/fstab\.REVOKE -- gen_context(system_u:object_r:etc_runtime_t,s0) /etc/HOSTNAME -- gen_context(system_u:object_r:etc_runtime_t,s0) /etc/ioctl\.save -- gen_context(system_u:object_r:etc_runtime_t,s0) @@ -695,6 +695,38 @@ miscfiles_read_localization(ktalkd_t) +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mailman.if serefpolicy-2.2.23/policy/modules/services/mailman.if +--- nsaserefpolicy/policy/modules/services/mailman.if 2006-03-04 00:06:36.000000000 -0500 ++++ serefpolicy-2.2.23/policy/modules/services/mailman.if 2006-03-08 16:59:01.000000000 -0500 +@@ -275,3 +275,28 @@ + allow $1 mailman_archive_t:file r_file_perms; + allow $1 mailman_archive_t:lnk_file { getattr read }; + ') ++ ++ ++####################################### ++## ++## Execute mailman_queue in the mailman_queue domain. ++## ++## ++## ++## Domain allowed access. ++## ++## ++# ++interface(`mailman_queue_domtrans',` ++ gen_require(` ++ type mailman_queue_exec_t, mailman_queue_t; ++ ') ++ ++ domain_auto_trans($1, mailman_queue_exec_t, mailman_queue_t) ++ ++ allow $1 mailman_queue_t:fd use; ++ allow mailman_queue_t $1:fd use; ++ allow mailman_queue_t $1:fifo_file rw_file_perms; ++ allow mailman_queue_t $1:process sigchld; ++') ++ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nscd.if serefpolicy-2.2.23/policy/modules/services/nscd.if --- nsaserefpolicy/policy/modules/services/nscd.if 2006-02-10 21:34:14.000000000 -0500 +++ serefpolicy-2.2.23/policy/modules/services/nscd.if 2006-03-07 13:42:37.000000000 -0500 @@ -708,6 +740,20 @@ dontaudit $1 nscd_var_run_t:file { getattr read }; ') +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postfix.te serefpolicy-2.2.23/policy/modules/services/postfix.te +--- nsaserefpolicy/policy/modules/services/postfix.te 2006-03-04 00:06:36.000000000 -0500 ++++ serefpolicy-2.2.23/policy/modules/services/postfix.te 2006-03-08 16:58:41.000000000 -0500 +@@ -406,6 +406,10 @@ + procmail_domtrans(postfix_pipe_t) + ') + ++optional_policy(`mailman',` ++ mailman_queue_domtrans(postfix_pipe_t) ++') ++ + ######################################## + # + # Postfix postdrop local policy diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/samba.te serefpolicy-2.2.23/policy/modules/services/samba.te --- nsaserefpolicy/policy/modules/services/samba.te 2006-03-04 00:06:36.000000000 -0500 +++ serefpolicy-2.2.23/policy/modules/services/samba.te 2006-03-07 13:42:37.000000000 -0500 Index: selinux-policy.spec =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v retrieving revision 1.142 retrieving revision 1.143 diff -u -r1.142 -r1.143 --- selinux-policy.spec 8 Mar 2006 20:40:43 -0000 1.142 +++ selinux-policy.spec 8 Mar 2006 22:11:17 -0000 1.143 @@ -10,7 +10,7 @@ Summary: SELinux policy configuration Name: selinux-policy Version: 2.2.23 -Release: 8 +Release: 9 License: GPL Group: System Environment/Base Source: serefpolicy-%{version}.tgz @@ -299,6 +299,10 @@ %fileList strict %changelog +* Wed Mar 8 2006 Dan Walsh 2.2.23-9 +- Fix blkid specification +- Allow postfix to execute mailman_que + * Wed Mar 8 2006 Dan Walsh 2.2.23-8 - Blkid changes - Allow udev access to usb_device_t From fedora-cvs-commits at redhat.com Wed Mar 8 22:14:05 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 8 Mar 2006 17:14:05 -0500 Subject: rpms/struts/devel struts.spec,1.29,1.30 Message-ID: <200603082214.k28ME5TJ008636@cvs.devel.redhat.com> Author: rafaels Update of /cvs/dist/rpms/struts/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv8607 Modified Files: struts.spec Log Message: excluded s390[x] and ppc64 due to eclipse Index: struts.spec =================================================================== RCS file: /cvs/dist/rpms/struts/devel/struts.spec,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- struts.spec 24 Feb 2006 22:16:51 -0000 1.29 +++ struts.spec 8 Mar 2006 22:14:03 -0000 1.30 @@ -1,7 +1,7 @@ %define name struts %define full_name jakarta-%{name} %define version 1.2.8 -%define release 2jpp_9fc +%define release 2jpp_10fc %define tomcat5appsdir %{_localstatedir}/lib/tomcat5/webapps %define tomcat5ctxdir %{_sysconfdir}/tomcat5/Catalina/localhost %define section free @@ -52,6 +52,9 @@ Requires(post): java-gcj-compat >= 1.0.31 Requires(postun): java-gcj-compat >= 1.0.31 +# excluded due to eclipse +ExcludeArch: s390 s390x ppc64 + %description Welcome to the Struts Framework! The goal of this project is to provide an open source framework useful in building web applications with Java @@ -210,6 +213,9 @@ %attr(-,root,root) %{_libdir}/gcj/%{name}/*classes.jar.* %changelog +* Wed Mar 8 2006 Rafael Schloming - 0:1.2.8-2jpp_10fc +- excluded s390[x] and ppc64 due to eclipse + * Fri Feb 24 2006 Rafael Schloming - 0:1.2.8-2jpp_9fc - Removed the webapps-tomcat{3,4} subpackages. From fedora-cvs-commits at redhat.com Wed Mar 8 22:20:30 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 8 Mar 2006 17:20:30 -0500 Subject: rpms/hsqldb/devel hsqldb.spec,1.18,1.19 Message-ID: <200603082220.k28MKU1H024010@cvs.devel.redhat.com> Author: notting Update of /cvs/dist/rpms/hsqldb/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv23760 Modified Files: hsqldb.spec Log Message: radius was using 95. Choose 96. Index: hsqldb.spec =================================================================== RCS file: /cvs/dist/rpms/hsqldb/devel/hsqldb.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- hsqldb.spec 8 Mar 2006 22:02:09 -0000 1.18 +++ hsqldb.spec 8 Mar 2006 22:20:16 -0000 1.19 @@ -152,8 +152,8 @@ %pre # Add the "hsqldb" user and group # we need a shell to be able to use su - later -%{_sbindir}/groupadd -g 95 -f -r %{name} 2> /dev/null || : -%{_sbindir}/useradd -u 95 -g %{name} -s /sbin/nologin \ +%{_sbindir}/groupadd -g 96 -f -r %{name} 2> /dev/null || : +%{_sbindir}/useradd -u 96 -g %{name} -s /sbin/nologin \ -d %{_localstatedir}/lib/%{name} -r %{name} 2> /dev/null || : %post From fedora-cvs-commits at redhat.com Wed Mar 8 22:34:07 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 8 Mar 2006 17:34:07 -0500 Subject: rpms/system-config-bind/FC-4 .cvsignore, 1.23, 1.24 sources, 1.39, 1.40 system-config-bind.spec, 1.50, 1.51 Message-ID: <200603082234.k28MY7dw028172@cvs.devel.redhat.com> Author: jvdias Update of /cvs/dist/rpms/system-config-bind/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv28142 Modified Files: .cvsignore sources system-config-bind.spec Log Message: fix bug 184065; ship updated translations Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/system-config-bind/FC-4/.cvsignore,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- .cvsignore 12 Jan 2006 16:47:13 -0000 1.23 +++ .cvsignore 8 Mar 2006 22:33:49 -0000 1.24 @@ -21,3 +21,4 @@ system-config-bind-4.0.0-33_FC4.tar.gz system-config-bind-4.0.0-36_FC4.tar.gz system-config-bind-4.0.0-38_FC4.tar.gz +system-config-bind-4.0.0-40_FC4.tar.gz Index: sources =================================================================== RCS file: /cvs/dist/rpms/system-config-bind/FC-4/sources,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- sources 12 Jan 2006 16:47:13 -0000 1.39 +++ sources 8 Mar 2006 22:33:49 -0000 1.40 @@ -1 +1 @@ -bc31b0ac45d6c3d4f0a1052cb743ea2c system-config-bind-4.0.0-38_FC4.tar.gz +b307434aebd39867adbccf9b97b1dee9 system-config-bind-4.0.0-40_FC4.tar.gz Index: system-config-bind.spec =================================================================== RCS file: /cvs/dist/rpms/system-config-bind/FC-4/system-config-bind.spec,v retrieving revision 1.50 retrieving revision 1.51 diff -u -r1.50 -r1.51 --- system-config-bind.spec 12 Jan 2006 16:47:13 -0000 1.50 +++ system-config-bind.spec 8 Mar 2006 22:33:49 -0000 1.51 @@ -1,7 +1,7 @@ Summary: The Red Hat BIND DNS Configuration Tool. Name: system-config-bind Version: 4.0.0 -Release: 38_FC4 +Release: 40_FC4 License: GPL Group: Applications/System URL: http://people.redhat.com/~jvdias/system-config-bind @@ -12,6 +12,7 @@ Requires: python >= 2.2 Requires: pygtk2, gnome-python2, pygtk2-libglade, gnome-python2-canvas Requires: bind, bind-utils +Requires(post): hicolor-icon-theme Obsoletes: redhat-config-bind Obsoletes: bindconf @@ -90,8 +91,14 @@ fi %changelog -* Thu Jan 12 2006 Jason Vas Dias - 4.0.0-38 -- fix bug 177602: restore pre-FC5 pam configuration file +* Wed Mar 08 2006 Jason Vas Dias - 4.0.0-40 +- fix bug 184065: prompts to place slave / DDNS updateable zone + files in slaves/ +- ship updated translations + +* Tue Mar 01 2006 Jason Vas Dias - 4.0.0-38 +- fix bug 182857: add Requires(post): hicolor-icon-them +- ship updated translations * Tue Jan 10 2006 Jason Vas Dias - 4.0.0-36 - fix bug 176142 (final!) : ship the Serbian translations From fedora-cvs-commits at redhat.com Wed Mar 8 22:39:50 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 8 Mar 2006 17:39:50 -0500 Subject: rpms/xalan-j2/devel xalan-j2.spec,1.43,1.44 Message-ID: <200603082239.k28MdoI0029648@cvs.devel.redhat.com> Author: rafaels Update of /cvs/dist/rpms/xalan-j2/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv29624 Modified Files: xalan-j2.spec Log Message: excluded s390[x] and ppc64 due to eclipse Index: xalan-j2.spec =================================================================== RCS file: /cvs/dist/rpms/xalan-j2/devel/xalan-j2.spec,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- xalan-j2.spec 6 Mar 2006 22:32:57 -0000 1.43 +++ xalan-j2.spec 8 Mar 2006 22:39:46 -0000 1.44 @@ -4,7 +4,7 @@ Name: xalan-j2 Version: %{version} -Release: 3jpp_9fc +Release: 3jpp_10fc Epoch: 0 Summary: Java XSLT processor License: Apache Software License @@ -30,6 +30,9 @@ Requires(post): java-gcj-compat >= 1.0.31 Requires(postun): java-gcj-compat >= 1.0.31 +# excluded due to eclipse +ExcludeArch: s390 s390x ppc64 + %description Xalan is an XSLT processor for transforming XML documents into HTML, text, or other XML document types. It implements the W3C Recommendations @@ -216,6 +219,9 @@ %attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-samples.jar.* %changelog +* Wed Mar 8 2006 Rafael Schloming - 0:2.6.0-3jpp_10fc +- excluded s390[x] and ppc64 due to eclipse + * Mon Mar 6 2006 Jeremy Katz - 0:2.6.0-3jpp_9fc - stop scriptlet spew From fedora-cvs-commits at redhat.com Wed Mar 8 22:43:27 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 8 Mar 2006 17:43:27 -0500 Subject: rpms/quagga/devel quagga.spec,1.30,1.31 Message-ID: <200603082243.k28MhRF0031287@cvs.devel.redhat.com> Author: notting Update of /cvs/dist/rpms/quagga/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv31207 Modified Files: quagga.spec Log Message: use an assigned gid for quaggavt Index: quagga.spec =================================================================== RCS file: /cvs/dist/rpms/quagga/devel/quagga.spec,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- quagga.spec 11 Feb 2006 05:26:32 -0000 1.30 +++ quagga.spec 8 Mar 2006 22:43:24 -0000 1.31 @@ -15,6 +15,7 @@ %define quagga_gid 92 %define quagga_user quagga %define vty_group quaggavt +%define vty_gid 85 # path defines %define _sysconfdir /etc/quagga @@ -31,7 +32,7 @@ Summary: Routing daemon Name: quagga Version: 0.98.5 -Release: 3.2.1 +Release: 4 Epoch: 0 License: GPL Group: System Environment/Daemons @@ -195,7 +196,7 @@ %pre # add vty_group %if %vty_group -groupadd -r %vty_group 2> /dev/null || : +groupadd -g %vty_gid -r %vty_group 2> /dev/null || : %endif # add quagga user and group %if %quagga_user @@ -345,6 +346,9 @@ %endif %changelog +* Wed Mar 8 2006 Bill Nottingham - 0:0.98.5-4 +- use an assigned gid for quaggavt + * Fri Feb 10 2006 Jesse Keating - 0:0.98.5-3.2.1 - bump again for double-long bug on ppc(64) From fedora-cvs-commits at redhat.com Wed Mar 8 22:43:34 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 8 Mar 2006 17:43:34 -0500 Subject: rpms/jakarta-commons-fileupload/devel jakarta-commons-fileupload.spec, 1.14, 1.15 Message-ID: <200603082243.k28MhYeX031367@cvs.devel.redhat.com> Author: rafaels Update of /cvs/dist/rpms/jakarta-commons-fileupload/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv31335 Modified Files: jakarta-commons-fileupload.spec Log Message: excluded s390[x] and ppc64 due to eclipse Index: jakarta-commons-fileupload.spec =================================================================== RCS file: /cvs/dist/rpms/jakarta-commons-fileupload/devel/jakarta-commons-fileupload.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- jakarta-commons-fileupload.spec 6 Mar 2006 23:09:20 -0000 1.14 +++ jakarta-commons-fileupload.spec 8 Mar 2006 22:43:32 -0000 1.15 @@ -2,7 +2,7 @@ %define short_name commons-%{base_name} %define name jakarta-%{short_name} %define version 1.0 -%define release 3jpp_5fc +%define release 3jpp_6fc %define section free Name: %{name} @@ -30,6 +30,9 @@ # RHEL3 and FC2 Obsoletes: %{short_name} <= 0:1.0 +# excluded due to eclipse +ExcludeArch: s390 s390x ppc64 + %description The javax.servlet package lacks support for rfc 1867, html file upload. This package provides a simple to use api for working with @@ -109,6 +112,9 @@ # ----------------------------------------------------------------------------- %changelog +* Wed Mar 8 2006 Rafael Schloming - 1:1.0-3jpp_6fc +- excluded s390[x] and ppc64 due to eclipse + * Mon Mar 6 2006 Jeremy Katz - 1:1.0-3jpp_5fc - stop scriptlet spew From fedora-cvs-commits at redhat.com Wed Mar 8 22:44:44 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 8 Mar 2006 17:44:44 -0500 Subject: rpms/booty/devel .cvsignore, 1.40, 1.41 booty.spec, 1.44, 1.45 sources, 1.43, 1.44 Message-ID: <200603082244.k28MiiBg031974@cvs.devel.redhat.com> Author: pjones Update of /cvs/dist/rpms/booty/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv31914 Modified Files: .cvsignore booty.spec sources Log Message: - update to 0.70-1 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/booty/devel/.cvsignore,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- .cvsignore 6 Mar 2006 18:49:48 -0000 1.40 +++ .cvsignore 8 Mar 2006 22:44:42 -0000 1.41 @@ -1 +1 @@ -booty-0.69.tar.bz2 +booty-0.70.tar.bz2 Index: booty.spec =================================================================== RCS file: /cvs/dist/rpms/booty/devel/booty.spec,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- booty.spec 6 Mar 2006 18:49:48 -0000 1.44 +++ booty.spec 8 Mar 2006 22:44:42 -0000 1.45 @@ -1,6 +1,6 @@ Summary: simple python bootloader config lib Name: booty -Version: 0.69 +Version: 0.70 Release: 1 License: LGPL Source0: %{name}-%{version}.tar.bz2 @@ -34,6 +34,9 @@ %changelog +* Wed Mar 8 2006 Peter Jones - 0.70-1 +- don't make fd0 entries in device.map, they screw up suspend/hibernate + * Mon Mar 6 2006 Jeremy Katz - 0.69-1 - adjust for changed xen kernel naming Index: sources =================================================================== RCS file: /cvs/dist/rpms/booty/devel/sources,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- sources 6 Mar 2006 18:49:48 -0000 1.43 +++ sources 8 Mar 2006 22:44:42 -0000 1.44 @@ -1 +1 @@ -3dc3a3e365872c07143e7357d0ab1347 booty-0.69.tar.bz2 +ee1653cb0485e639786dde24f2368b89 booty-0.70.tar.bz2 From fedora-cvs-commits at redhat.com Wed Mar 8 22:49:09 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 8 Mar 2006 17:49:09 -0500 Subject: rpms/jakarta-taglibs-standard/devel jakarta-taglibs-standard.spec, 1.13, 1.14 Message-ID: <200603082249.k28Mn9cP013886@cvs.devel.redhat.com> Author: rafaels Update of /cvs/dist/rpms/jakarta-taglibs-standard/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv13853 Modified Files: jakarta-taglibs-standard.spec Log Message: excluded s390[x] and ppc64 due to eclipse Index: jakarta-taglibs-standard.spec =================================================================== RCS file: /cvs/dist/rpms/jakarta-taglibs-standard/devel/jakarta-taglibs-standard.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- jakarta-taglibs-standard.spec 6 Mar 2006 23:04:42 -0000 1.13 +++ jakarta-taglibs-standard.spec 8 Mar 2006 22:49:06 -0000 1.14 @@ -4,7 +4,7 @@ %define section free %define jversion 1.1.1 %define version 1.1.1 -%define release 4jpp_3fc +%define release 4jpp_4fc Name: %{name} Version: %{version} @@ -26,6 +26,9 @@ BuildRequires: servletapi5 >= 0:5.0.16 Requires: servletapi5 >= 0:5.0.16 +# excluded due to eclipse +ExcludeArch: s390 s390x ppc64 + %description This directory contains releases for the 1.1.x versions of the Standard Tag Library, Jakarta Taglibs's open-source implementation of the JSP @@ -98,6 +101,9 @@ %changelog +* Wed Mar 8 2006 Rafael Schloming - 0:1.1.1-4jpp_4fc +- excluded s390[x] and ppc64 due to eclipse + * Mon Mar 6 2006 Jeremy Katz - 0:1.1.1-4jpp_3fc - stop scriptlet spew From fedora-cvs-commits at redhat.com Wed Mar 8 22:54:40 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 8 Mar 2006 17:54:40 -0500 Subject: rpms/perl/devel perl.spec,1.87,1.88 Message-ID: <200603082254.k28Mseod016444@cvs.devel.redhat.com> Author: jvdias Update of /cvs/dist/rpms/perl/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv16414 Modified Files: perl.spec Log Message: remove "Conflicts: perl-NDBM-File..." tag; nothing Provides: perl-NDBM-File anymore Index: perl.spec =================================================================== RCS file: /cvs/dist/rpms/perl/devel/perl.spec,v retrieving revision 1.87 retrieving revision 1.88 diff -u -r1.87 -r1.88 --- perl.spec 1 Mar 2006 23:26:55 -0000 1.87 +++ perl.spec 8 Mar 2006 22:54:37 -0000 1.88 @@ -219,7 +219,7 @@ # Provides: perl(LWP::UserAgent) # Provides: perl(URI::URL) -Conflicts: perl-NDBM_File <= 1:1.75-34.99.6 +# Conflicts: perl-NDBM_File <= 1:1.75-34.99.6 Obsoletes: perl-Digest-MD5 Obsoletes: perl-MIME-Base64 From fedora-cvs-commits at redhat.com Wed Mar 8 23:08:05 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 8 Mar 2006 18:08:05 -0500 Subject: rpms/velocity/devel velocity.spec,1.13,1.14 Message-ID: <200603082308.k28N850i019345@cvs.devel.redhat.com> Author: rafaels Update of /cvs/dist/rpms/velocity/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv19321 Modified Files: velocity.spec Log Message: excluded s390[x] and ppc64 due to eclipse Index: velocity.spec =================================================================== RCS file: /cvs/dist/rpms/velocity/devel/velocity.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- velocity.spec 6 Mar 2006 22:35:01 -0000 1.13 +++ velocity.spec 8 Mar 2006 23:08:02 -0000 1.14 @@ -5,7 +5,7 @@ Name: velocity Version: %{my_version} -Release: 3jpp_4fc +Release: 3jpp_5fc Epoch: 0 Summary: Java-based template engine License: Apache Software License @@ -39,6 +39,9 @@ BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot +# excluded due to eclipse +ExcludeArch: s390 s390x ppc64 + %description Velocity is a Java-based template engine. It permits anyone to use the simple yet powerful template language to reference objects defined in @@ -173,6 +176,9 @@ # ----------------------------------------------------------------------------- %changelog +* Wed Mar 8 2006 Rafael Schloming - 0:1.4-3jpp_5fc +- excluded s390[x] and ppc64 due to eclipse + * Mon Mar 6 2006 Jeremy Katz - 0:1.4-3jpp_4fc - stop scriptlet spew From fedora-cvs-commits at redhat.com Wed Mar 8 23:08:37 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 8 Mar 2006 18:08:37 -0500 Subject: rpms/perl-DBD-Pg/devel .cvsignore, 1.12, 1.13 perl-DBD-Pg.spec, 1.26, 1.27 sources, 1.12, 1.13 Message-ID: <200603082308.k28N8bXa019521@cvs.devel.redhat.com> Author: jvdias Update of /cvs/dist/rpms/perl-DBD-Pg/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv19492 Modified Files: .cvsignore perl-DBD-Pg.spec sources Log Message: upgrade to upstream version 1.45 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/perl-DBD-Pg/devel/.cvsignore,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- .cvsignore 28 Jun 2005 23:16:11 -0000 1.12 +++ .cvsignore 8 Mar 2006 23:08:35 -0000 1.13 @@ -1 +1,2 @@ DBD-Pg-1.43.tar.gz +DBD-Pg-1.45.tar.gz Index: perl-DBD-Pg.spec =================================================================== RCS file: /cvs/dist/rpms/perl-DBD-Pg/devel/perl-DBD-Pg.spec,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- perl-DBD-Pg.spec 11 Feb 2006 05:03:18 -0000 1.26 +++ perl-DBD-Pg.spec 8 Mar 2006 23:08:35 -0000 1.27 @@ -1,6 +1,6 @@ Name: perl-DBD-Pg -Version: 1.43 -Release: 2.2.2 +Version: 1.45 +Release: 1 Summary: A PostgresSQL interface for perl Group: Development/Libraries @@ -55,6 +55,9 @@ %changelog +* Wed Feb 08 2006 Jason Vas Dias - 1.45-1 +- Upgrade to upstream version 1.45 + * Fri Feb 10 2006 Jesse Keating - 1.43-2.2.2 - bump again for double-long bug on ppc(64) Index: sources =================================================================== RCS file: /cvs/dist/rpms/perl-DBD-Pg/devel/sources,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- sources 28 Jun 2005 23:16:11 -0000 1.12 +++ sources 8 Mar 2006 23:08:35 -0000 1.13 @@ -1 +1 @@ -1ddefc3cb5f8c0d20eaf6ba7aa11049d DBD-Pg-1.43.tar.gz +321a8e0487b436d0643348919959a0e3 DBD-Pg-1.45.tar.gz From fedora-cvs-commits at redhat.com Wed Mar 8 23:09:08 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 8 Mar 2006 18:09:08 -0500 Subject: rpms/perl-DBD-Pg/devel perl-DBD-Pg.spec,1.27,1.28 Message-ID: <200603082309.k28N985p019739@cvs.devel.redhat.com> Author: jvdias Update of /cvs/dist/rpms/perl-DBD-Pg/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv19709 Modified Files: perl-DBD-Pg.spec Log Message: upgrade to upstream version 1.45 Index: perl-DBD-Pg.spec =================================================================== RCS file: /cvs/dist/rpms/perl-DBD-Pg/devel/perl-DBD-Pg.spec,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- perl-DBD-Pg.spec 8 Mar 2006 23:08:35 -0000 1.27 +++ perl-DBD-Pg.spec 8 Mar 2006 23:09:06 -0000 1.28 @@ -55,7 +55,7 @@ %changelog -* Wed Feb 08 2006 Jason Vas Dias - 1.45-1 +* Wed Mar 08 2006 Jason Vas Dias - 1.45-1 - Upgrade to upstream version 1.45 * Fri Feb 10 2006 Jesse Keating - 1.43-2.2.2 From fedora-cvs-commits at redhat.com Wed Mar 8 23:14:55 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 8 Mar 2006 18:14:55 -0500 Subject: rpms/perl-Archive-Tar/devel .cvsignore, 1.6, 1.7 perl-Archive-Tar.spec, 1.16, 1.17 sources, 1.6, 1.7 Message-ID: <200603082314.k28NEtgu022294@cvs.devel.redhat.com> Author: jvdias Update of /cvs/dist/rpms/perl-Archive-Tar/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv22265 Modified Files: .cvsignore perl-Archive-Tar.spec sources Log Message: upgrade to upstream version 1.29 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/perl-Archive-Tar/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 3 Feb 2006 18:07:13 -0000 1.6 +++ .cvsignore 8 Mar 2006 23:14:52 -0000 1.7 @@ -1,3 +1,4 @@ Archive-Tar-1.23.tar.gz Archive-Tar-1.26.tar.gz Archive-Tar-1.28.tar.gz +Archive-Tar-1.29.tar.gz Index: perl-Archive-Tar.spec =================================================================== RCS file: /cvs/dist/rpms/perl-Archive-Tar/devel/perl-Archive-Tar.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- perl-Archive-Tar.spec 3 Feb 2006 18:07:13 -0000 1.16 +++ perl-Archive-Tar.spec 8 Mar 2006 23:14:52 -0000 1.17 @@ -1,5 +1,5 @@ Name: perl-Archive-Tar -Version: 1.28 +Version: 1.29 Release: 1 Summary: A module for Perl manipulation of .tar files @@ -54,6 +54,9 @@ %changelog +* Wed Mar 08 2006 Jason Vas Dias - 1.29-1 +- Upgrade to upstream version 1.29 + * Fri Feb 02 2006 Jason Vas Dias - 1.28-1 - Upgrade to upstream version 1.28 - Rebuild for perl-5.8.8 Index: sources =================================================================== RCS file: /cvs/dist/rpms/perl-Archive-Tar/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 3 Feb 2006 18:07:13 -0000 1.6 +++ sources 8 Mar 2006 23:14:52 -0000 1.7 @@ -1 +1 @@ -6056f238b3d2ea706470b46ef8eac555 Archive-Tar-1.28.tar.gz +a4c09ec0d0ada293150a3c0a5db07ee9 Archive-Tar-1.29.tar.gz From fedora-cvs-commits at redhat.com Wed Mar 8 23:24:56 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 8 Mar 2006 18:24:56 -0500 Subject: rpms/perl-Net-DNS/devel .cvsignore, 1.9, 1.10 perl-Net-DNS.spec, 1.22, 1.23 sources, 1.9, 1.10 Message-ID: <200603082324.k28NOuH0006820@cvs.devel.redhat.com> Author: jvdias Update of /cvs/dist/rpms/perl-Net-DNS/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv6790 Modified Files: .cvsignore perl-Net-DNS.spec sources Log Message: upgrade to upstream version 0.57 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/perl-Net-DNS/devel/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 19 Dec 2005 18:15:10 -0000 1.9 +++ .cvsignore 8 Mar 2006 23:24:54 -0000 1.10 @@ -1,2 +1,3 @@ Net-DNS-0.53.tar.gz Net-DNS-0.55.tar.gz +Net-DNS-0.57.tar.gz Index: perl-Net-DNS.spec =================================================================== RCS file: /cvs/dist/rpms/perl-Net-DNS/devel/perl-Net-DNS.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- perl-Net-DNS.spec 11 Feb 2006 05:05:41 -0000 1.22 +++ perl-Net-DNS.spec 8 Mar 2006 23:24:54 -0000 1.23 @@ -1,6 +1,6 @@ Name: perl-Net-DNS -Version: 0.55 -Release: 1.1.2 +Version: 0.57 +Release: 1 Summary: DNS resolver modules for Perl License: GPL or Artistic Group: Development/Libraries @@ -52,6 +52,9 @@ %exclude %{_mandir}/man3/Net::DNS::Resolver::Win32.3* %changelog +* Wed Mar 08 2006 Jason Vas Dias - 0.57-1 +- Upgrade to upstream version 0.57 + * Fri Feb 10 2006 Jesse Keating - 0.55-1.1.2 - bump again for double-long bug on ppc(64) Index: sources =================================================================== RCS file: /cvs/dist/rpms/perl-Net-DNS/devel/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 19 Dec 2005 18:15:26 -0000 1.9 +++ sources 8 Mar 2006 23:24:54 -0000 1.10 @@ -1 +1 @@ -11c09089eb36aede51704031713399eb Net-DNS-0.55.tar.gz +9511a7052e553f2a29a5bae32c20bc44 Net-DNS-0.57.tar.gz From fedora-cvs-commits at redhat.com Wed Mar 8 23:48:05 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 8 Mar 2006 18:48:05 -0500 Subject: rpms/gdb/FC-4 gdb-6.3-cfaval-20060303.patch, 1.2, 1.3 gdb-6.3-prelink-core-20060223.patch, 1.3, 1.4 gdb.spec, 1.174, 1.175 Message-ID: <200603082348.k28Nm5WO016785@cvs.devel.redhat.com> Author: aoliva Update of /cvs/dist/rpms/gdb/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv16747/gdb-FC-4 Modified Files: gdb-6.3-cfaval-20060303.patch gdb-6.3-prelink-core-20060223.patch gdb.spec Log Message: * Wed Mar 8 2006 Alexandre Oliva - 6.3.0.0-1.119 - Fix regression in PIE debugging (BZ 133944) (re?)introduced by the prelink fix (BZ 175075). Improve testcase for the prelink fix. - Revert dwarf2 frame identifier change. gdb-6.3-cfaval-20060303.patch: gdb/dwarf2-frame.c | 88 ++++++++++ gdb/dwarf2-frame.h | 4 gdb/testsuite/gdb.dwarf2/cfa-val-expr-1.c | 261 ++++++++++++++++++++++++++++++ gdb/testsuite/gdb.dwarf2/cfa-val-expr-2.c | 226 +++++++++++++++++++++++++ gdb/testsuite/gdb.dwarf2/cfa-val-expr.exp | 91 ++++++++++ gdb/valarith.c | 9 - include/elf/dwarf2.h | 68 +++++++ 7 files changed, 742 insertions(+), 5 deletions(-) Index: gdb-6.3-cfaval-20060303.patch =================================================================== RCS file: /cvs/dist/rpms/gdb/FC-4/gdb-6.3-cfaval-20060303.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- gdb-6.3-cfaval-20060303.patch 7 Mar 2006 05:13:17 -0000 1.2 +++ gdb-6.3-cfaval-20060303.patch 8 Mar 2006 23:48:02 -0000 1.3 @@ -54,8 +54,8 @@ Index: gdb-6.3/gdb/dwarf2-frame.c =================================================================== ---- gdb-6.3.orig/gdb/dwarf2-frame.c 2006-03-04 09:17:24.000000000 -0300 -+++ gdb-6.3/gdb/dwarf2-frame.c 2006-03-07 01:44:55.000000000 -0300 +--- gdb-6.3.orig/gdb/dwarf2-frame.c 2006-03-07 01:45:13.000000000 -0300 ++++ gdb-6.3/gdb/dwarf2-frame.c 2006-03-08 18:01:37.000000000 -0300 @@ -435,6 +435,34 @@ bad CFI data; mismatched DW_CFA_restore_ fs->regs.reg[reg].loc.offset = offset; break; @@ -136,15 +136,6 @@ struct dwarf2_frame_cache -@@ -734,7 +793,7 @@ dwarf2_frame_this_id (struct frame_info - struct dwarf2_frame_cache *cache = - dwarf2_frame_cache (next_frame, this_cache); - -- (*this_id) = frame_id_build (cache->cfa, frame_func_unwind (next_frame)); -+ (*this_id) = frame_id_build (cache->cfa, frame_pc_unwind (next_frame)); - } - - static void @@ -797,6 +856,28 @@ dwarf2_frame_prev_register (struct frame } break; @@ -190,8 +181,8 @@ { Index: gdb-6.3/gdb/dwarf2-frame.h =================================================================== ---- gdb-6.3.orig/gdb/dwarf2-frame.h 2006-03-04 09:17:24.000000000 -0300 -+++ gdb-6.3/gdb/dwarf2-frame.h 2006-03-04 09:17:24.000000000 -0300 +--- gdb-6.3.orig/gdb/dwarf2-frame.h 2006-03-07 01:45:13.000000000 -0300 ++++ gdb-6.3/gdb/dwarf2-frame.h 2006-03-07 01:45:13.000000000 -0300 @@ -55,6 +55,10 @@ enum dwarf2_frame_reg_rule register. */ DWARF2_FRAME_REG_INDIRECT, @@ -206,7 +197,7 @@ Index: gdb-6.3/gdb/testsuite/gdb.dwarf2/cfa-val-expr-1.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ gdb-6.3/gdb/testsuite/gdb.dwarf2/cfa-val-expr-1.c 2006-03-04 09:17:24.000000000 -0300 ++++ gdb-6.3/gdb/testsuite/gdb.dwarf2/cfa-val-expr-1.c 2006-03-07 01:45:13.000000000 -0300 @@ -0,0 +1,261 @@ +/* This testcase is part of GDB, the GNU debugger. + @@ -472,7 +463,7 @@ Index: gdb-6.3/gdb/testsuite/gdb.dwarf2/cfa-val-expr-2.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ gdb-6.3/gdb/testsuite/gdb.dwarf2/cfa-val-expr-2.c 2006-03-04 09:17:24.000000000 -0300 ++++ gdb-6.3/gdb/testsuite/gdb.dwarf2/cfa-val-expr-2.c 2006-03-07 01:45:13.000000000 -0300 @@ -0,0 +1,226 @@ +/* This testcase is part of GDB, the GNU debugger. + @@ -703,7 +694,7 @@ Index: gdb-6.3/gdb/testsuite/gdb.dwarf2/cfa-val-expr.exp =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ gdb-6.3/gdb/testsuite/gdb.dwarf2/cfa-val-expr.exp 2006-03-07 01:35:17.000000000 -0300 ++++ gdb-6.3/gdb/testsuite/gdb.dwarf2/cfa-val-expr.exp 2006-03-07 01:45:13.000000000 -0300 @@ -0,0 +1,91 @@ +# Copyright 2006 Free Software Foundation, Inc. + @@ -798,8 +789,8 @@ +return 0 Index: gdb-6.3/include/elf/dwarf2.h =================================================================== ---- gdb-6.3.orig/include/elf/dwarf2.h 2006-03-04 09:15:43.000000000 -0300 -+++ gdb-6.3/include/elf/dwarf2.h 2006-03-04 09:17:24.000000000 -0300 +--- gdb-6.3.orig/include/elf/dwarf2.h 2006-03-07 01:45:08.000000000 -0300 ++++ gdb-6.3/include/elf/dwarf2.h 2006-03-07 01:45:13.000000000 -0300 @@ -1,7 +1,7 @@ -/* Declarations and definitions of codes relating to the DWARF2 symbolic - debugging information format. @@ -935,8 +926,8 @@ /* UPC. */ Index: gdb-6.3/gdb/valarith.c =================================================================== ---- gdb-6.3.orig/gdb/valarith.c 2006-03-04 09:15:43.000000000 -0300 -+++ gdb-6.3/gdb/valarith.c 2006-03-04 09:17:24.000000000 -0300 +--- gdb-6.3.orig/gdb/valarith.c 2006-03-07 01:45:08.000000000 -0300 ++++ gdb-6.3/gdb/valarith.c 2006-03-07 01:45:13.000000000 -0300 @@ -881,7 +881,14 @@ value_binop (struct value *arg1, struct Use the signedness of the operand with the greater length. If both operands are of equal length, use unsigned operation gdb-6.3-prelink-core-20060223.patch: Makefile.in | 2 mipsnbsd-tdep.c | 6 + solib-legacy.c | 11 +++ solib-svr4.c | 127 +++++++++++++++++++++++++++++++++++---- solib-svr4.h | 6 + testsuite/gdb.base/prelink-lib.c | 34 ++++++++++ testsuite/gdb.base/prelink.c | 30 +++++++++ testsuite/gdb.base/prelink.exp | 116 +++++++++++++++++++++++++++++++++++ 8 files changed, 320 insertions(+), 12 deletions(-) Index: gdb-6.3-prelink-core-20060223.patch =================================================================== RCS file: /cvs/dist/rpms/gdb/FC-4/gdb-6.3-prelink-core-20060223.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- gdb-6.3-prelink-core-20060223.patch 7 Mar 2006 05:13:17 -0000 1.3 +++ gdb-6.3-prelink-core-20060223.patch 8 Mar 2006 23:48:02 -0000 1.4 @@ -1,4 +1,10 @@ for gdb/ChangeLog +2006-03-08 Alexandre Oliva + + * solib-svr4.c (svr4_current_sos): Move up initialization of + l_addr, such that it covers all cases. + (info_linkmap_command): Initialize l_addr. + 2006-02-28 Alexandre Oliva * solib-svr4.h (struct link_map_offsets): Add l_ld_offset and @@ -18,6 +24,11 @@ * Makefile.in (solib-svr4.o): Depend on $(elf_bfd_h). for gdb/testsuite/ChangeLog +2006-03-08 Alexandre Oliva + + * gdb.base/prelink.exp: Anchor tested-for regular expression + on gdb prompt. + 2006-03-07 Alexandre Oliva * gdb.base/prelink.c, gdb.base/prelink-lib.c: Update FSF address. @@ -33,8 +44,8 @@ Index: gdb-6.3/gdb/mipsnbsd-tdep.c =================================================================== ---- gdb-6.3.orig/gdb/mipsnbsd-tdep.c 2006-03-07 01:45:10.000000000 -0300 -+++ gdb-6.3/gdb/mipsnbsd-tdep.c 2006-03-07 01:45:13.000000000 -0300 +--- gdb-6.3.orig/gdb/mipsnbsd-tdep.c 2006-03-08 18:39:08.000000000 -0300 ++++ gdb-6.3/gdb/mipsnbsd-tdep.c 2006-03-08 19:41:32.000000000 -0300 @@ -295,6 +295,9 @@ mipsnbsd_ilp32_solib_svr4_fetch_link_map lmo.l_name_offset = 8; lmo.l_name_size = 4; @@ -57,8 +68,8 @@ Index: gdb-6.3/gdb/solib-legacy.c =================================================================== ---- gdb-6.3.orig/gdb/solib-legacy.c 2006-03-07 01:45:10.000000000 -0300 -+++ gdb-6.3/gdb/solib-legacy.c 2006-03-07 01:45:13.000000000 -0300 +--- gdb-6.3.orig/gdb/solib-legacy.c 2006-03-08 18:39:08.000000000 -0300 ++++ gdb-6.3/gdb/solib-legacy.c 2006-03-08 19:41:32.000000000 -0300 @@ -68,6 +68,9 @@ legacy_svr4_fetch_link_map_offsets (void lmo.l_next_offset = offsetof (struct link_map, l_next); lmo.l_next_size = fieldsize (struct link_map, l_next); @@ -93,8 +104,8 @@ #endif /* HAVE_STRUCT_LINK_MAP_WITH_L_MEMBERS */ Index: gdb-6.3/gdb/solib-svr4.c =================================================================== ---- gdb-6.3.orig/gdb/solib-svr4.c 2006-03-07 01:45:10.000000000 -0300 -+++ gdb-6.3/gdb/solib-svr4.c 2006-03-07 01:45:13.000000000 -0300 +--- gdb-6.3.orig/gdb/solib-svr4.c 2006-03-08 18:39:08.000000000 -0300 ++++ gdb-6.3/gdb/solib-svr4.c 2006-03-08 20:34:48.000000000 -0300 @@ -36,10 +36,13 @@ #include "inferior.h" #include "command.h" @@ -227,15 +238,15 @@ static CORE_ADDR LM_NEXT (struct so_list *so) { -@@ -773,6 +870,7 @@ svr4_current_sos (void) - - /* We need this in the list of shared libs we return because - solib_add_stub will loop through it and add the symbol file. */ -+ new->lm_info->l_addr = (CORE_ADDR)-1; - new->next = 0; - *link_ptr = new; - link_ptr = &new->next; -@@ -831,10 +929,10 @@ svr4_current_sos (void) +@@ -693,6 +790,7 @@ svr4_current_sos (void) + new->lm_info = xmalloc (sizeof (struct lm_info)); + make_cleanup (xfree, new->lm_info); + ++ new->lm_info->l_addr = (CORE_ADDR)-1; + new->lm_info->lm = xmalloc (lmo->link_map_size); + make_cleanup (xfree, new->lm_info->lm); + memset (new->lm_info->lm, 0, lmo->link_map_size); +@@ -831,10 +929,9 @@ svr4_current_sos (void) IGNORE_FIRST_LINK_MAP_ENTRY (new)); } @@ -243,14 +254,13 @@ - *link_ptr = new; - link_ptr = &new->next; - -+ new->lm_info->l_addr = (CORE_ADDR)-1; + new->next = 0; + *link_ptr = new; + link_ptr = &new->next; } } } -@@ -1106,7 +1204,7 @@ enable_break (void) +@@ -1106,7 +1203,7 @@ enable_break (void) if (strcmp (buf, so->so_original_name) == 0) { load_addr_found = 1; @@ -259,7 +269,7 @@ break; } so = so->next; -@@ -1470,8 +1568,10 @@ static void +@@ -1470,8 +1567,10 @@ static void svr4_relocate_section_addresses (struct so_list *so, struct section_table *sec) { @@ -272,7 +282,7 @@ } -@@ -1587,6 +1687,8 @@ svr4_ilp32_fetch_link_map_offsets (void) +@@ -1587,6 +1686,8 @@ svr4_ilp32_fetch_link_map_offsets (void) lmo.l_addr_size = 4; lmo.l_name_offset = 4; lmo.l_name_size = 4; @@ -281,7 +291,7 @@ lmo.l_next_offset = 12; lmo.l_next_size = 4; lmo.l_prev_offset = 16; -@@ -1620,6 +1722,8 @@ svr4_lp64_fetch_link_map_offsets (void) +@@ -1620,6 +1721,8 @@ svr4_lp64_fetch_link_map_offsets (void) lmo.l_addr_size = 8; lmo.l_name_offset = 8; lmo.l_name_size = 8; @@ -290,7 +300,22 @@ lmo.l_next_offset = 24; lmo.l_next_size = 8; lmo.l_prev_offset = 32; -@@ -1682,7 +1786,7 @@ info_linkmap_command (char *cmd, int fro +@@ -1669,7 +1772,8 @@ info_linkmap_command (char *cmd, int fro + + new->lm_info = xmalloc (sizeof (struct lm_info)); + make_cleanup (xfree, new->lm_info); +- ++ ++ new->lm_info->l_addr = (CORE_ADDR)-1; + new->lm_info->lm = xmalloc (lmo->link_map_size); + make_cleanup (xfree, new->lm_info->lm); + memset (new->lm_info->lm, 0, lmo->link_map_size); +@@ -1678,11 +1782,12 @@ info_linkmap_command (char *cmd, int fro + fprintf_unfiltered (gdb_stdlog, + "svr4_print_linkmap: read lm at 0x%s\n", paddr_nz(lm)); + read_memory (lm, new->lm_info->lm, lmo->link_map_size); ++ + lm = LM_NEXT (new); /* Load address. */ @@ -301,8 +326,8 @@ SO_NAME_MAX_PATH_SIZE - 1, &errcode); Index: gdb-6.3/gdb/solib-svr4.h =================================================================== ---- gdb-6.3.orig/gdb/solib-svr4.h 2006-03-07 01:45:10.000000000 -0300 -+++ gdb-6.3/gdb/solib-svr4.h 2006-03-07 01:45:13.000000000 -0300 +--- gdb-6.3.orig/gdb/solib-svr4.h 2006-03-08 18:39:08.000000000 -0300 ++++ gdb-6.3/gdb/solib-svr4.h 2006-03-08 19:41:32.000000000 -0300 @@ -51,6 +51,12 @@ struct link_map_offsets /* Size of l_addr field in struct link_map. */ int l_addr_size; @@ -318,8 +343,8 @@ Index: gdb-6.3/gdb/Makefile.in =================================================================== ---- gdb-6.3.orig/gdb/Makefile.in 2006-03-07 01:45:10.000000000 -0300 -+++ gdb-6.3/gdb/Makefile.in 2006-03-07 01:45:13.000000000 -0300 +--- gdb-6.3.orig/gdb/Makefile.in 2006-03-08 18:39:08.000000000 -0300 ++++ gdb-6.3/gdb/Makefile.in 2006-03-08 19:41:32.000000000 -0300 @@ -2535,7 +2535,7 @@ solib-sunos.o: solib-sunos.c $(defs_h) $ solib-svr4.o: solib-svr4.c $(defs_h) $(elf_external_h) $(elf_common_h) \ $(elf_mips_h) $(symtab_h) $(bfd_h) $(symfile_h) $(objfiles_h) \ @@ -332,7 +357,7 @@ Index: gdb-6.3/gdb/testsuite/gdb.base/prelink-lib.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ gdb-6.3/gdb/testsuite/gdb.base/prelink-lib.c 2006-03-07 01:45:13.000000000 -0300 ++++ gdb-6.3/gdb/testsuite/gdb.base/prelink-lib.c 2006-03-08 19:41:32.000000000 -0300 @@ -0,0 +1,34 @@ +/* This testcase is part of GDB, the GNU debugger. + @@ -371,7 +396,7 @@ Index: gdb-6.3/gdb/testsuite/gdb.base/prelink.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ gdb-6.3/gdb/testsuite/gdb.base/prelink.c 2006-03-07 01:45:13.000000000 -0300 ++++ gdb-6.3/gdb/testsuite/gdb.base/prelink.c 2006-03-08 19:41:32.000000000 -0300 @@ -0,0 +1,30 @@ +/* This testcase is part of GDB, the GNU debugger. + @@ -406,8 +431,8 @@ Index: gdb-6.3/gdb/testsuite/gdb.base/prelink.exp =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ gdb-6.3/gdb/testsuite/gdb.base/prelink.exp 2006-03-07 01:50:42.000000000 -0300 -@@ -0,0 +1,115 @@ ++++ gdb-6.3/gdb/testsuite/gdb.base/prelink.exp 2006-03-08 20:40:36.000000000 -0300 +@@ -0,0 +1,116 @@ +# Copyright 2006 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify @@ -513,8 +538,9 @@ +gdb_load ${binfile} + +set test "prelink" ++global gdb_prompt +gdb_test_multiple "core-file $objdir/$subdir/prelink.core" "$test" { -+ -re "warning: \.dynamic section.*not at the expected address.*warning: difference.*caused by prelink, adjusting expectations." { ++ -re "warning: \.dynamic section.*not at the expected address.*warning: difference.*caused by prelink, adjusting expectations.*$gdb_prompt $" { + pass "$test" + } +} Index: gdb.spec =================================================================== RCS file: /cvs/dist/rpms/gdb/FC-4/gdb.spec,v retrieving revision 1.174 retrieving revision 1.175 diff -u -r1.174 -r1.175 --- gdb.spec 7 Mar 2006 05:17:58 -0000 1.174 +++ gdb.spec 8 Mar 2006 23:48:02 -0000 1.175 @@ -11,7 +11,7 @@ Version: 6.3.0.0 # The release always contains a leading reserved number, start it at 0. -Release: 1.117 +Release: 1.121 License: GPL Group: Development/Debuggers @@ -549,7 +549,15 @@ # don't include the files in include, they are part of binutils %changelog -* Tue Mar 7 2006 Alexandre Oliva - 6.3.0.0-1.117 +* Wed Mar 8 2006 Alexandre Oliva - 6.3.0.0-1.121 +- Bump up release number. + +* Wed Mar 8 2006 Alexandre Oliva - 6.3.0.0-1.119 +- Fix regression in PIE debugging (BZ 133944) (re?)introduced by +the prelink fix (BZ 175075). Improve testcase for the prelink fix. +- Revert dwarf2 frame identifier change. + +* Tue Mar 7 2006 Alexandre Oliva - 6.3.0.0-1.118 - Bump up release number. * Tue Mar 7 2006 Alexandre Oliva - 6.3.0.0-1.115 From fedora-cvs-commits at redhat.com Wed Mar 8 23:48:05 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 8 Mar 2006 18:48:05 -0500 Subject: rpms/gdb/devel gdb-6.3-cfaval-20060303.patch, 1.2, 1.3 gdb-6.3-prelink-core-20060223.patch, 1.3, 1.4 gdb.spec, 1.177, 1.178 Message-ID: <200603082348.k28Nm5jc016778@cvs.devel.redhat.com> Author: aoliva Update of /cvs/dist/rpms/gdb/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv16747/gdb-devel Modified Files: gdb-6.3-cfaval-20060303.patch gdb-6.3-prelink-core-20060223.patch gdb.spec Log Message: * Wed Mar 8 2006 Alexandre Oliva - 6.3.0.0-1.119 - Fix regression in PIE debugging (BZ 133944) (re?)introduced by the prelink fix (BZ 175075). Improve testcase for the prelink fix. - Revert dwarf2 frame identifier change. gdb-6.3-cfaval-20060303.patch: gdb/dwarf2-frame.c | 88 ++++++++++ gdb/dwarf2-frame.h | 4 gdb/testsuite/gdb.dwarf2/cfa-val-expr-1.c | 261 ++++++++++++++++++++++++++++++ gdb/testsuite/gdb.dwarf2/cfa-val-expr-2.c | 226 +++++++++++++++++++++++++ gdb/testsuite/gdb.dwarf2/cfa-val-expr.exp | 91 ++++++++++ gdb/valarith.c | 9 - include/elf/dwarf2.h | 68 +++++++ 7 files changed, 742 insertions(+), 5 deletions(-) Index: gdb-6.3-cfaval-20060303.patch =================================================================== RCS file: /cvs/dist/rpms/gdb/devel/gdb-6.3-cfaval-20060303.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- gdb-6.3-cfaval-20060303.patch 7 Mar 2006 05:13:18 -0000 1.2 +++ gdb-6.3-cfaval-20060303.patch 8 Mar 2006 23:48:02 -0000 1.3 @@ -54,8 +54,8 @@ Index: gdb-6.3/gdb/dwarf2-frame.c =================================================================== ---- gdb-6.3.orig/gdb/dwarf2-frame.c 2006-03-04 09:17:24.000000000 -0300 -+++ gdb-6.3/gdb/dwarf2-frame.c 2006-03-07 01:44:55.000000000 -0300 +--- gdb-6.3.orig/gdb/dwarf2-frame.c 2006-03-07 01:45:13.000000000 -0300 ++++ gdb-6.3/gdb/dwarf2-frame.c 2006-03-08 18:01:37.000000000 -0300 @@ -435,6 +435,34 @@ bad CFI data; mismatched DW_CFA_restore_ fs->regs.reg[reg].loc.offset = offset; break; @@ -136,15 +136,6 @@ struct dwarf2_frame_cache -@@ -734,7 +793,7 @@ dwarf2_frame_this_id (struct frame_info - struct dwarf2_frame_cache *cache = - dwarf2_frame_cache (next_frame, this_cache); - -- (*this_id) = frame_id_build (cache->cfa, frame_func_unwind (next_frame)); -+ (*this_id) = frame_id_build (cache->cfa, frame_pc_unwind (next_frame)); - } - - static void @@ -797,6 +856,28 @@ dwarf2_frame_prev_register (struct frame } break; @@ -190,8 +181,8 @@ { Index: gdb-6.3/gdb/dwarf2-frame.h =================================================================== ---- gdb-6.3.orig/gdb/dwarf2-frame.h 2006-03-04 09:17:24.000000000 -0300 -+++ gdb-6.3/gdb/dwarf2-frame.h 2006-03-04 09:17:24.000000000 -0300 +--- gdb-6.3.orig/gdb/dwarf2-frame.h 2006-03-07 01:45:13.000000000 -0300 ++++ gdb-6.3/gdb/dwarf2-frame.h 2006-03-07 01:45:13.000000000 -0300 @@ -55,6 +55,10 @@ enum dwarf2_frame_reg_rule register. */ DWARF2_FRAME_REG_INDIRECT, @@ -206,7 +197,7 @@ Index: gdb-6.3/gdb/testsuite/gdb.dwarf2/cfa-val-expr-1.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ gdb-6.3/gdb/testsuite/gdb.dwarf2/cfa-val-expr-1.c 2006-03-04 09:17:24.000000000 -0300 ++++ gdb-6.3/gdb/testsuite/gdb.dwarf2/cfa-val-expr-1.c 2006-03-07 01:45:13.000000000 -0300 @@ -0,0 +1,261 @@ +/* This testcase is part of GDB, the GNU debugger. + @@ -472,7 +463,7 @@ Index: gdb-6.3/gdb/testsuite/gdb.dwarf2/cfa-val-expr-2.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ gdb-6.3/gdb/testsuite/gdb.dwarf2/cfa-val-expr-2.c 2006-03-04 09:17:24.000000000 -0300 ++++ gdb-6.3/gdb/testsuite/gdb.dwarf2/cfa-val-expr-2.c 2006-03-07 01:45:13.000000000 -0300 @@ -0,0 +1,226 @@ +/* This testcase is part of GDB, the GNU debugger. + @@ -703,7 +694,7 @@ Index: gdb-6.3/gdb/testsuite/gdb.dwarf2/cfa-val-expr.exp =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ gdb-6.3/gdb/testsuite/gdb.dwarf2/cfa-val-expr.exp 2006-03-07 01:35:17.000000000 -0300 ++++ gdb-6.3/gdb/testsuite/gdb.dwarf2/cfa-val-expr.exp 2006-03-07 01:45:13.000000000 -0300 @@ -0,0 +1,91 @@ +# Copyright 2006 Free Software Foundation, Inc. + @@ -798,8 +789,8 @@ +return 0 Index: gdb-6.3/include/elf/dwarf2.h =================================================================== ---- gdb-6.3.orig/include/elf/dwarf2.h 2006-03-04 09:15:43.000000000 -0300 -+++ gdb-6.3/include/elf/dwarf2.h 2006-03-04 09:17:24.000000000 -0300 +--- gdb-6.3.orig/include/elf/dwarf2.h 2006-03-07 01:45:08.000000000 -0300 ++++ gdb-6.3/include/elf/dwarf2.h 2006-03-07 01:45:13.000000000 -0300 @@ -1,7 +1,7 @@ -/* Declarations and definitions of codes relating to the DWARF2 symbolic - debugging information format. @@ -935,8 +926,8 @@ /* UPC. */ Index: gdb-6.3/gdb/valarith.c =================================================================== ---- gdb-6.3.orig/gdb/valarith.c 2006-03-04 09:15:43.000000000 -0300 -+++ gdb-6.3/gdb/valarith.c 2006-03-04 09:17:24.000000000 -0300 +--- gdb-6.3.orig/gdb/valarith.c 2006-03-07 01:45:08.000000000 -0300 ++++ gdb-6.3/gdb/valarith.c 2006-03-07 01:45:13.000000000 -0300 @@ -881,7 +881,14 @@ value_binop (struct value *arg1, struct Use the signedness of the operand with the greater length. If both operands are of equal length, use unsigned operation gdb-6.3-prelink-core-20060223.patch: Makefile.in | 2 mipsnbsd-tdep.c | 6 + solib-legacy.c | 11 +++ solib-svr4.c | 127 +++++++++++++++++++++++++++++++++++---- solib-svr4.h | 6 + testsuite/gdb.base/prelink-lib.c | 34 ++++++++++ testsuite/gdb.base/prelink.c | 30 +++++++++ testsuite/gdb.base/prelink.exp | 116 +++++++++++++++++++++++++++++++++++ 8 files changed, 320 insertions(+), 12 deletions(-) Index: gdb-6.3-prelink-core-20060223.patch =================================================================== RCS file: /cvs/dist/rpms/gdb/devel/gdb-6.3-prelink-core-20060223.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- gdb-6.3-prelink-core-20060223.patch 7 Mar 2006 05:13:18 -0000 1.3 +++ gdb-6.3-prelink-core-20060223.patch 8 Mar 2006 23:48:02 -0000 1.4 @@ -1,4 +1,10 @@ for gdb/ChangeLog +2006-03-08 Alexandre Oliva + + * solib-svr4.c (svr4_current_sos): Move up initialization of + l_addr, such that it covers all cases. + (info_linkmap_command): Initialize l_addr. + 2006-02-28 Alexandre Oliva * solib-svr4.h (struct link_map_offsets): Add l_ld_offset and @@ -18,6 +24,11 @@ * Makefile.in (solib-svr4.o): Depend on $(elf_bfd_h). for gdb/testsuite/ChangeLog +2006-03-08 Alexandre Oliva + + * gdb.base/prelink.exp: Anchor tested-for regular expression + on gdb prompt. + 2006-03-07 Alexandre Oliva * gdb.base/prelink.c, gdb.base/prelink-lib.c: Update FSF address. @@ -33,8 +44,8 @@ Index: gdb-6.3/gdb/mipsnbsd-tdep.c =================================================================== ---- gdb-6.3.orig/gdb/mipsnbsd-tdep.c 2006-03-07 01:45:10.000000000 -0300 -+++ gdb-6.3/gdb/mipsnbsd-tdep.c 2006-03-07 01:45:13.000000000 -0300 +--- gdb-6.3.orig/gdb/mipsnbsd-tdep.c 2006-03-08 18:39:08.000000000 -0300 ++++ gdb-6.3/gdb/mipsnbsd-tdep.c 2006-03-08 19:41:32.000000000 -0300 @@ -295,6 +295,9 @@ mipsnbsd_ilp32_solib_svr4_fetch_link_map lmo.l_name_offset = 8; lmo.l_name_size = 4; @@ -57,8 +68,8 @@ Index: gdb-6.3/gdb/solib-legacy.c =================================================================== ---- gdb-6.3.orig/gdb/solib-legacy.c 2006-03-07 01:45:10.000000000 -0300 -+++ gdb-6.3/gdb/solib-legacy.c 2006-03-07 01:45:13.000000000 -0300 +--- gdb-6.3.orig/gdb/solib-legacy.c 2006-03-08 18:39:08.000000000 -0300 ++++ gdb-6.3/gdb/solib-legacy.c 2006-03-08 19:41:32.000000000 -0300 @@ -68,6 +68,9 @@ legacy_svr4_fetch_link_map_offsets (void lmo.l_next_offset = offsetof (struct link_map, l_next); lmo.l_next_size = fieldsize (struct link_map, l_next); @@ -93,8 +104,8 @@ #endif /* HAVE_STRUCT_LINK_MAP_WITH_L_MEMBERS */ Index: gdb-6.3/gdb/solib-svr4.c =================================================================== ---- gdb-6.3.orig/gdb/solib-svr4.c 2006-03-07 01:45:10.000000000 -0300 -+++ gdb-6.3/gdb/solib-svr4.c 2006-03-07 01:45:13.000000000 -0300 +--- gdb-6.3.orig/gdb/solib-svr4.c 2006-03-08 18:39:08.000000000 -0300 ++++ gdb-6.3/gdb/solib-svr4.c 2006-03-08 20:34:48.000000000 -0300 @@ -36,10 +36,13 @@ #include "inferior.h" #include "command.h" @@ -227,15 +238,15 @@ static CORE_ADDR LM_NEXT (struct so_list *so) { -@@ -773,6 +870,7 @@ svr4_current_sos (void) - - /* We need this in the list of shared libs we return because - solib_add_stub will loop through it and add the symbol file. */ -+ new->lm_info->l_addr = (CORE_ADDR)-1; - new->next = 0; - *link_ptr = new; - link_ptr = &new->next; -@@ -831,10 +929,10 @@ svr4_current_sos (void) +@@ -693,6 +790,7 @@ svr4_current_sos (void) + new->lm_info = xmalloc (sizeof (struct lm_info)); + make_cleanup (xfree, new->lm_info); + ++ new->lm_info->l_addr = (CORE_ADDR)-1; + new->lm_info->lm = xmalloc (lmo->link_map_size); + make_cleanup (xfree, new->lm_info->lm); + memset (new->lm_info->lm, 0, lmo->link_map_size); +@@ -831,10 +929,9 @@ svr4_current_sos (void) IGNORE_FIRST_LINK_MAP_ENTRY (new)); } @@ -243,14 +254,13 @@ - *link_ptr = new; - link_ptr = &new->next; - -+ new->lm_info->l_addr = (CORE_ADDR)-1; + new->next = 0; + *link_ptr = new; + link_ptr = &new->next; } } } -@@ -1106,7 +1204,7 @@ enable_break (void) +@@ -1106,7 +1203,7 @@ enable_break (void) if (strcmp (buf, so->so_original_name) == 0) { load_addr_found = 1; @@ -259,7 +269,7 @@ break; } so = so->next; -@@ -1470,8 +1568,10 @@ static void +@@ -1470,8 +1567,10 @@ static void svr4_relocate_section_addresses (struct so_list *so, struct section_table *sec) { @@ -272,7 +282,7 @@ } -@@ -1587,6 +1687,8 @@ svr4_ilp32_fetch_link_map_offsets (void) +@@ -1587,6 +1686,8 @@ svr4_ilp32_fetch_link_map_offsets (void) lmo.l_addr_size = 4; lmo.l_name_offset = 4; lmo.l_name_size = 4; @@ -281,7 +291,7 @@ lmo.l_next_offset = 12; lmo.l_next_size = 4; lmo.l_prev_offset = 16; -@@ -1620,6 +1722,8 @@ svr4_lp64_fetch_link_map_offsets (void) +@@ -1620,6 +1721,8 @@ svr4_lp64_fetch_link_map_offsets (void) lmo.l_addr_size = 8; lmo.l_name_offset = 8; lmo.l_name_size = 8; @@ -290,7 +300,22 @@ lmo.l_next_offset = 24; lmo.l_next_size = 8; lmo.l_prev_offset = 32; -@@ -1682,7 +1786,7 @@ info_linkmap_command (char *cmd, int fro +@@ -1669,7 +1772,8 @@ info_linkmap_command (char *cmd, int fro + + new->lm_info = xmalloc (sizeof (struct lm_info)); + make_cleanup (xfree, new->lm_info); +- ++ ++ new->lm_info->l_addr = (CORE_ADDR)-1; + new->lm_info->lm = xmalloc (lmo->link_map_size); + make_cleanup (xfree, new->lm_info->lm); + memset (new->lm_info->lm, 0, lmo->link_map_size); +@@ -1678,11 +1782,12 @@ info_linkmap_command (char *cmd, int fro + fprintf_unfiltered (gdb_stdlog, + "svr4_print_linkmap: read lm at 0x%s\n", paddr_nz(lm)); + read_memory (lm, new->lm_info->lm, lmo->link_map_size); ++ + lm = LM_NEXT (new); /* Load address. */ @@ -301,8 +326,8 @@ SO_NAME_MAX_PATH_SIZE - 1, &errcode); Index: gdb-6.3/gdb/solib-svr4.h =================================================================== ---- gdb-6.3.orig/gdb/solib-svr4.h 2006-03-07 01:45:10.000000000 -0300 -+++ gdb-6.3/gdb/solib-svr4.h 2006-03-07 01:45:13.000000000 -0300 +--- gdb-6.3.orig/gdb/solib-svr4.h 2006-03-08 18:39:08.000000000 -0300 ++++ gdb-6.3/gdb/solib-svr4.h 2006-03-08 19:41:32.000000000 -0300 @@ -51,6 +51,12 @@ struct link_map_offsets /* Size of l_addr field in struct link_map. */ int l_addr_size; @@ -318,8 +343,8 @@ Index: gdb-6.3/gdb/Makefile.in =================================================================== ---- gdb-6.3.orig/gdb/Makefile.in 2006-03-07 01:45:10.000000000 -0300 -+++ gdb-6.3/gdb/Makefile.in 2006-03-07 01:45:13.000000000 -0300 +--- gdb-6.3.orig/gdb/Makefile.in 2006-03-08 18:39:08.000000000 -0300 ++++ gdb-6.3/gdb/Makefile.in 2006-03-08 19:41:32.000000000 -0300 @@ -2535,7 +2535,7 @@ solib-sunos.o: solib-sunos.c $(defs_h) $ solib-svr4.o: solib-svr4.c $(defs_h) $(elf_external_h) $(elf_common_h) \ $(elf_mips_h) $(symtab_h) $(bfd_h) $(symfile_h) $(objfiles_h) \ @@ -332,7 +357,7 @@ Index: gdb-6.3/gdb/testsuite/gdb.base/prelink-lib.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ gdb-6.3/gdb/testsuite/gdb.base/prelink-lib.c 2006-03-07 01:45:13.000000000 -0300 ++++ gdb-6.3/gdb/testsuite/gdb.base/prelink-lib.c 2006-03-08 19:41:32.000000000 -0300 @@ -0,0 +1,34 @@ +/* This testcase is part of GDB, the GNU debugger. + @@ -371,7 +396,7 @@ Index: gdb-6.3/gdb/testsuite/gdb.base/prelink.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ gdb-6.3/gdb/testsuite/gdb.base/prelink.c 2006-03-07 01:45:13.000000000 -0300 ++++ gdb-6.3/gdb/testsuite/gdb.base/prelink.c 2006-03-08 19:41:32.000000000 -0300 @@ -0,0 +1,30 @@ +/* This testcase is part of GDB, the GNU debugger. + @@ -406,8 +431,8 @@ Index: gdb-6.3/gdb/testsuite/gdb.base/prelink.exp =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ gdb-6.3/gdb/testsuite/gdb.base/prelink.exp 2006-03-07 01:50:42.000000000 -0300 -@@ -0,0 +1,115 @@ ++++ gdb-6.3/gdb/testsuite/gdb.base/prelink.exp 2006-03-08 20:40:36.000000000 -0300 +@@ -0,0 +1,116 @@ +# Copyright 2006 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify @@ -513,8 +538,9 @@ +gdb_load ${binfile} + +set test "prelink" ++global gdb_prompt +gdb_test_multiple "core-file $objdir/$subdir/prelink.core" "$test" { -+ -re "warning: \.dynamic section.*not at the expected address.*warning: difference.*caused by prelink, adjusting expectations." { ++ -re "warning: \.dynamic section.*not at the expected address.*warning: difference.*caused by prelink, adjusting expectations.*$gdb_prompt $" { + pass "$test" + } +} Index: gdb.spec =================================================================== RCS file: /cvs/dist/rpms/gdb/devel/gdb.spec,v retrieving revision 1.177 retrieving revision 1.178 diff -u -r1.177 -r1.178 --- gdb.spec 7 Mar 2006 05:17:56 -0000 1.177 +++ gdb.spec 8 Mar 2006 23:48:02 -0000 1.178 @@ -11,7 +11,7 @@ Version: 6.3.0.0 # The release always contains a leading reserved number, start it at 0. -Release: 1.118 +Release: 1.122 License: GPL Group: Development/Debuggers @@ -549,6 +549,14 @@ # don't include the files in include, they are part of binutils %changelog +* Wed Mar 8 2006 Alexandre Oliva - 6.3.0.0-1.122 +- Bump up release number. + +* Wed Mar 8 2006 Alexandre Oliva - 6.3.0.0-1.119 +- Fix regression in PIE debugging (BZ 133944) (re?)introduced by +the prelink fix (BZ 175075). Improve testcase for the prelink fix. +- Revert dwarf2 frame identifier change. + * Tue Mar 7 2006 Alexandre Oliva - 6.3.0.0-1.118 - Bump up release number. From fedora-cvs-commits at redhat.com Wed Mar 8 23:55:09 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 8 Mar 2006 18:55:09 -0500 Subject: rpms/kernel/devel/configs config-i586,1.7,1.8 Message-ID: <200603082355.k28Nt9aN025500@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel/configs In directory cvs.devel.redhat.com:/tmp/cvs-serv25361/configs Modified Files: config-i586 Log Message: add back some of the more aggressively pruned options to i586 Index: config-i586 =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/configs/config-i586,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- config-i586 23 Jan 2006 05:03:15 -0000 1.7 +++ config-i586 8 Mar 2006 23:55:07 -0000 1.8 @@ -9,7 +9,6 @@ # CONFIG_I8K is not set # CONFIG_DELL_RBU is not set # CONFIG_DCDBAS is not set -# CONFIG_KEXEC is not set # CONFIG_ACPI_ASUS is not set # CONFIG_ACPI_IBM is not set # CONFIG_ACPI_TOSHIBA is not set @@ -21,11 +20,8 @@ # CONFIG_X86_P4_CLOCKMOD is not set # CONFIG_HOTPLUG_PCI_PCIE is not set # CONFIG_PCI_MSI is not set -# CONFIG_PCI_LEGACY_PROC is not set # CONFIG_HOTPLUG_PCI is not set # CONFIG_NET_PKTGEN is not set -# CONFIG_IRDA is not set -# CONFIG_BT is not set # CONFIG_MTD is not set # CONFIG_CDROM_PKTCDVD is not set # CONFIG_DISKDUMP is not set @@ -43,7 +39,6 @@ # CONFIG_DTLK is not set # CONFIG_R3964 is not set # CONFIG_SONYPI is not set -# CONFIG_DRM is not set # CONFIG_HPET is not set # CONFIG_W1 is not set # CONFIG_SENSORS_HDAPS is not set @@ -52,15 +47,10 @@ # CONFIG_MMC is not set # CONFIG_INFINIBAND is not set # CONFIG_KPROBES is not set -CONFIG_AGP=y -# CONFIG_AGP_ALI is not set # CONFIG_AGP_ATI is not set # CONFIG_AGP_AMD is not set # CONFIG_AGP_AMD64 is not set -CONFIG_AGP_INTEL=y # CONFIG_AGP_NVIDIA is not set -# CONFIG_AGP_SIS is not set # CONFIG_AGP_SWORKS is not set # CONFIG_AGP_VIA is not set -# CONFIG_AGP_EFFICEON is not set From fedora-cvs-commits at redhat.com Wed Mar 8 23:57:59 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 8 Mar 2006 18:57:59 -0500 Subject: rpms/gphoto2/devel gphoto2.spec,1.57,1.58 Message-ID: <200603082357.k28Nvx00026779@cvs.devel.redhat.com> Author: notting Update of /cvs/dist/rpms/gphoto2/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv26363 Modified Files: gphoto2.spec Log Message: fix file conflict on the fdi file - remove the comment that had the path to the buildroot Index: gphoto2.spec =================================================================== RCS file: /cvs/dist/rpms/gphoto2/devel/gphoto2.spec,v retrieving revision 1.57 retrieving revision 1.58 diff -u -r1.57 -r1.58 --- gphoto2.spec 3 Mar 2006 12:57:55 -0000 1.57 +++ gphoto2.spec 8 Mar 2006 23:57:57 -0000 1.58 @@ -5,7 +5,7 @@ %define libpkg libgphoto2 %define libver 2.1.99 Version: %{pkgver} -Release: 7 +Release: 8 License: LGPL Group: Applications/Multimedia BuildRoot: %{_tmppath}/%{name}-%{version}-root @@ -124,7 +124,7 @@ install -d -m755 %{buildroot}/usr/share/hal/fdi/information/20thirdparty/ export LIBDIR=$RPM_BUILD_ROOT%{_libdir} export CAMLIBS=$RPM_BUILD_ROOT%{_libdir}/%{libpkg}/%{libver} - ./print-usb-usermap --fdi > $RPM_BUILD_ROOT/%{_datadir}/hal/fdi/information/20thirdparty/10-camera-libgphoto2.fdi + ./print-usb-usermap --fdi | grep -v " &startpage.extra; From fedora-cvs-commits at redhat.com Mon Mar 13 16:54:45 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 13 Mar 2006 11:54:45 -0500 Subject: rpms/gtkhtml3/devel .cvsignore, 1.32, 1.33 gtkhtml3.spec, 1.57, 1.58 sources, 1.32, 1.33 Message-ID: <200603131654.k2DGsjlG018887@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/gtkhtml3/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv18784 Modified Files: .cvsignore gtkhtml3.spec sources Log Message: - Update to 3.10.0 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/gtkhtml3/devel/.cvsignore,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- .cvsignore 27 Feb 2006 22:27:31 -0000 1.32 +++ .cvsignore 13 Mar 2006 16:54:41 -0000 1.33 @@ -1 +1 @@ -gtkhtml-3.9.92.tar.bz2 +gtkhtml-3.10.0.tar.bz2 Index: gtkhtml3.spec =================================================================== RCS file: /cvs/dist/rpms/gtkhtml3/devel/gtkhtml3.spec,v retrieving revision 1.57 retrieving revision 1.58 diff -u -r1.57 -r1.58 --- gtkhtml3.spec 27 Feb 2006 22:27:31 -0000 1.57 +++ gtkhtml3.spec 13 Mar 2006 16:54:41 -0000 1.58 @@ -4,7 +4,7 @@ Summary: gtkhtml library Name: gtkhtml3 -Version: 3.9.92 +Version: 3.10.0 Release: 1 License: LGPL/GPL Group: System Environment/Libraries @@ -59,7 +59,7 @@ %install rm -rf $RPM_BUILD_ROOT export tagname=CC -%makeinstall LIBTOOL=/usr/bin/libtool +make install LIBTOOL=/usr/bin/libtool DESTDIR=$RPM_BUILD_ROOT rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la rm -f $RPM_BUILD_ROOT/%{_libdir}/*.a @@ -96,8 +96,8 @@ %{_libdir}/pkgconfig/*.pc %changelog -* Mon Feb 27 2006 Ray Strode - 3.9.92-1 -- Update to 3.9.92 +* Mon Mar 13 2006 Ray Strode - 3.10.0-1 +- Update to 3.10.0 * Mon Feb 13 2006 Matthias Clasen - 3.9.91-1 - Update to 3.9.91 Index: sources =================================================================== RCS file: /cvs/dist/rpms/gtkhtml3/devel/sources,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- sources 27 Feb 2006 22:27:31 -0000 1.32 +++ sources 13 Mar 2006 16:54:42 -0000 1.33 @@ -1 +1 @@ -ac1ff0fd9a0dd0adf5bde482739dd5b6 gtkhtml-3.9.92.tar.bz2 +1d564a2d9a7a4911c8d1b50868acef81 gtkhtml-3.10.0.tar.bz2 From fedora-cvs-commits at redhat.com Mon Mar 13 16:57:27 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 13 Mar 2006 11:57:27 -0500 Subject: rpms/shadow-utils/FC-4 shadow-4.0.12-symlinks.patch, 1.1, 1.2 shadow-970616.login.defs, 1.1, 1.2 shadow-utils.spec, 1.56, 1.57 Message-ID: <200603131657.k2DGvRTq020096@cvs.devel.redhat.com> Author: pvrabec Update of /cvs/dist/rpms/shadow-utils/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv20002 Modified Files: shadow-4.0.12-symlinks.patch shadow-970616.login.defs shadow-utils.spec Log Message: - fix lrename() function to handle relative symlinks too - set default umask to 077 in login.defs (#185290) shadow-4.0.12-symlinks.patch: commonio.c | 30 +++++++++++++++++++++++++++++- 1 files changed, 29 insertions(+), 1 deletion(-) Index: shadow-4.0.12-symlinks.patch =================================================================== RCS file: /cvs/dist/rpms/shadow-utils/FC-4/shadow-4.0.12-symlinks.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- shadow-4.0.12-symlinks.patch 6 Mar 2006 15:19:45 -0000 1.1 +++ shadow-4.0.12-symlinks.patch 13 Mar 2006 16:57:22 -0000 1.2 @@ -1,10 +1,10 @@ ---- shadow-4.0.12/lib/commonio.c.symlinks 2006-03-06 11:13:18.000000000 -0500 -+++ shadow-4.0.12/lib/commonio.c 2006-03-06 11:18:05.000000000 -0500 +--- shadow-4.0.12/lib/commonio.c.symlinks 2006-03-10 14:08:15.000000000 -0500 ++++ shadow-4.0.12/lib/commonio.c 2006-03-10 14:11:48.000000000 -0500 @@ -5,6 +5,8 @@ RCSID ("$Id$") #include "defines.h" #include -+#include ++#include +#include #include #include @@ -17,82 +17,39 @@ static int check_link_count (const char *); static int do_lock_file (const char *, const char *); static FILE *fopen_set_perms (const char *, const char *, const struct stat *); -@@ -36,6 +39,74 @@ +@@ -36,6 +39,31 @@ static int lock_count = 0; static int nscd_need_reload = 0; +/* + * Simple rename(P) alternative that attempts to rename to symlink -+ * target. If symlink target is on different device, or resolving target -+ * fails for any reason, then falls back to POSIX rename(). -+ * -+ * This function helps preserve symbolic link structures when -+ * attempting to do atomic file replacement. ++ * target. + */ +int +lrename(const char *old, const char *new) +{ -+ const char *new0 = new; -+ char *target = NULL; -+ size_t targetlen = 0; ++ ++ char resolved_path[PATH_MAX]; + int res; +#if defined(S_ISLNK) + struct stat sb = {0}; -+#if defined(_POSIX_SYMLOOP_MAX) -+ int maxloops = _POSIX_SYMLOOP_MAX; -+#elif defined(_SYMLOOP_MAX) -+ int maxloops = _SYMLOOP_MAX; -+#else -+ int maxloops = sysconf(_SC_SYMLOOP_MAX); -+ if (maxloops <= 0) -+ maxloops = 8; -+#endif -+ while (maxloops-- > 0 && lstat(new, &sb) == 0 && S_ISLNK(sb.st_mode)) -+ { -+ size_t len; -+ size_t bufflen = sb.st_size + 1; -+ char *buff = malloc(bufflen); -+ if (!buff) -+ { -+ new = new0; -+ break; -+ } -+ len = readlink(new, buff, bufflen - 1); -+ if (target) // aka new -+ { -+ free(target); -+ target = NULL; ++ if (lstat(new, &sb) == 0 && S_ISLNK(sb.st_mode)) { ++ if (realpath(new, resolved_path)==NULL) { ++ perror("realpath in lrename()"); + } -+ target = buff; -+ targetlen = bufflen; -+ if (len == -1) -+ { -+ // could be a dangling link -+ new = new0; -+ break; -+ } -+ else -+ { -+ target[len] = '\0'; -+ new = target; ++ else { ++ new = resolved_path; + } + } +#endif + res = rename(old, new); -+ if (res != 0 && new == target) -+ res = rename(old, new0); -+ if (target) -+ { -+ free(target); -+ target = NULL; -+ } + return res; +} + static int check_link_count (const char *file) { struct stat sb; -@@ -705,7 +776,7 @@ +@@ -705,7 +733,7 @@ goto fail; } Index: shadow-970616.login.defs =================================================================== RCS file: /cvs/dist/rpms/shadow-utils/FC-4/shadow-970616.login.defs,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- shadow-970616.login.defs 9 Sep 2004 12:21:14 -0000 1.1 +++ shadow-970616.login.defs 13 Mar 2006 16:57:22 -0000 1.2 @@ -45,3 +45,5 @@ # CREATE_HOME yes +UMASK 077 + Index: shadow-utils.spec =================================================================== RCS file: /cvs/dist/rpms/shadow-utils/FC-4/shadow-utils.spec,v retrieving revision 1.56 retrieving revision 1.57 diff -u -r1.56 -r1.57 --- shadow-utils.spec 6 Mar 2006 15:19:45 -0000 1.56 +++ shadow-utils.spec 13 Mar 2006 16:57:22 -0000 1.57 @@ -7,7 +7,7 @@ Summary: Utilities for managing accounts and shadow password files. Name: shadow-utils Version: 4.0.12 -Release: 7.FC4 +Release: 8.FC4 Epoch: 2 URL: http://shadow.pld.org.pl/ Source0: ftp://ftp.pld.org.pl/software/shadow/shadow-%{version}.tar.bz2 @@ -240,6 +240,10 @@ %{_mandir}/*/man8/faillog.8* %changelog +* Fri Mar 10 2006 Peter Vrabec 2:4.0.12-8.FC4 +- fix lrename() function to handle relative symlinks too +- set default umask to 077 in login.defs (#185290) + * Mon Mar 06 2006 Peter Vrabec 2:4.0.12-7.FC4 - use lrename() function, which follow a destination symbolic link(#181977) From fedora-cvs-commits at redhat.com Mon Mar 13 16:57:54 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 13 Mar 2006 11:57:54 -0500 Subject: rpms/mkinitrd/devel .cvsignore, 1.100, 1.101 mkinitrd.spec, 1.113, 1.114 sources, 1.111, 1.112 Message-ID: <200603131657.k2DGvsG3020366@cvs.devel.redhat.com> Author: pjones Update of /cvs/dist/rpms/mkinitrd/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv20334 Modified Files: .cvsignore mkinitrd.spec sources Log Message: - update to 5.0.32-1 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/mkinitrd/devel/.cvsignore,v retrieving revision 1.100 retrieving revision 1.101 diff -u -r1.100 -r1.101 --- .cvsignore 10 Mar 2006 15:21:27 -0000 1.100 +++ .cvsignore 13 Mar 2006 16:57:52 -0000 1.101 @@ -1 +1 @@ -mkinitrd-5.0.31.tar.bz2 +mkinitrd-5.0.32.tar.bz2 Index: mkinitrd.spec =================================================================== RCS file: /cvs/dist/rpms/mkinitrd/devel/mkinitrd.spec,v retrieving revision 1.113 retrieving revision 1.114 diff -u -r1.113 -r1.114 --- mkinitrd.spec 10 Mar 2006 15:21:27 -0000 1.113 +++ mkinitrd.spec 13 Mar 2006 16:57:52 -0000 1.114 @@ -1,6 +1,6 @@ Summary: Creates an initial ramdisk image for preloading modules. Name: mkinitrd -Version: 5.0.31 +Version: 5.0.32 Release: 1 License: GPL Group: System Environment/Base @@ -63,6 +63,10 @@ %attr(644,root,root) %{_mandir}/man8/grubby.8* %changelog +* Mon Mar 13 2006 Peter Jones - 5.0.32-1 +- handle sd_mod on scsi_mod in findmodule, not in the scsi setup. This + fixes the "no scsi_hostadapter" alias problem better (#182008). + * Fri Mar 10 2006 Peter Jones - 5.0.31-1 - add segv handler for nash Index: sources =================================================================== RCS file: /cvs/dist/rpms/mkinitrd/devel/sources,v retrieving revision 1.111 retrieving revision 1.112 diff -u -r1.111 -r1.112 --- sources 10 Mar 2006 15:32:26 -0000 1.111 +++ sources 13 Mar 2006 16:57:52 -0000 1.112 @@ -1 +1 @@ -47f9f95d90320b99fe4eec1c94311c7c mkinitrd-5.0.31.tar.bz2 +c4e6f261b3f8126b74445f6099d275ef mkinitrd-5.0.32.tar.bz2 From fedora-cvs-commits at redhat.com Mon Mar 13 17:08:48 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 13 Mar 2006 12:08:48 -0500 Subject: rpms/thunderbird/devel thunderbird.spec,1.66,1.67 Message-ID: <200603131708.k2DH8mfm022351@cvs.devel.redhat.com> Author: caillon Update of /cvs/dist/rpms/thunderbird/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv22314 Modified Files: thunderbird.spec Log Message: add some BR Index: thunderbird.spec =================================================================== RCS file: /cvs/dist/rpms/thunderbird/devel/thunderbird.spec,v retrieving revision 1.66 retrieving revision 1.67 diff -u -r1.66 -r1.67 --- thunderbird.spec 13 Mar 2006 16:44:29 -0000 1.66 +++ thunderbird.spec 13 Mar 2006 17:08:34 -0000 1.67 @@ -66,6 +66,8 @@ BuildRequires: libIDL-devel BuildRequires: tcsh BuildRequires: freetype-devel +BuildRequires: libXt-devel +BuildRequires: libXrender-devel Prereq: desktop-file-utils >= %{desktop_file_utils_version} Obsoletes: MozillaThunderbird From fedora-cvs-commits at redhat.com Mon Mar 13 17:09:18 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 13 Mar 2006 12:09:18 -0500 Subject: rpms/evolution-connector/devel .cvsignore, 1.28, 1.29 evolution-connector.spec, 1.54, 1.55 sources, 1.28, 1.29 Message-ID: <200603131709.k2DH9Iop022474@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/evolution-connector/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv22420 Modified Files: .cvsignore evolution-connector.spec sources Log Message: - 2.6.0 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/evolution-connector/devel/.cvsignore,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- .cvsignore 28 Feb 2006 20:12:51 -0000 1.28 +++ .cvsignore 13 Mar 2006 17:09:15 -0000 1.29 @@ -1 +1 @@ -evolution-exchange-2.5.92.tar.bz2 +evolution-exchange-2.6.0.tar.bz2 Index: evolution-connector.spec =================================================================== RCS file: /cvs/dist/rpms/evolution-connector/devel/evolution-connector.spec,v retrieving revision 1.54 retrieving revision 1.55 diff -u -r1.54 -r1.55 --- evolution-connector.spec 28 Feb 2006 20:12:52 -0000 1.54 +++ evolution-connector.spec 13 Mar 2006 17:09:15 -0000 1.55 @@ -6,7 +6,7 @@ %define plibdir %(pkg-config evolution-shell-%{evo_major} --variable=privlibdir 2>/dev/null) Name: evolution-connector -Version: 2.5.92 +Version: 2.6.0 Release: 1 License: GPL Group: Applications/Productivity @@ -96,6 +96,9 @@ %{_datadir}/evolution-exchange/%{evo_major}/ui/ximian-connector.xml %changelog +* Mon Mar 13 2006 Ray Strode - 2.6.0-1 +- 2.6.0 + * Tue Feb 28 2006 Ray Strode - 2.5.92-1 - 2.5.92 Index: sources =================================================================== RCS file: /cvs/dist/rpms/evolution-connector/devel/sources,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- sources 28 Feb 2006 20:12:53 -0000 1.28 +++ sources 13 Mar 2006 17:09:16 -0000 1.29 @@ -1 +1 @@ -91bf7edcad265c391b3bd9832d087414 evolution-exchange-2.5.92.tar.bz2 +f83177e571fdac31e6d32904a46a2029 evolution-exchange-2.6.0.tar.bz2 From fedora-cvs-commits at redhat.com Mon Mar 13 17:14:01 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 13 Mar 2006 12:14:01 -0500 Subject: rpms/kernel/devel xen-sched-sedf.patch, NONE, 1.1 kernel-2.6.spec, 1.2046, 1.2047 Message-ID: <200603131714.k2DHE1Lr023959@cvs.devel.redhat.com> Author: jmorris Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv23159 Modified Files: kernel-2.6.spec Added Files: xen-sched-sedf.patch Log Message: Modify default parameters for dom0 sched-sedf so that domX's don't get soft cpu lockups when dom0 and they are under heavy load. Addresses bz 181856. xen-sched-sedf.patch: sched_sedf.c | 6 ++++++ 1 files changed, 6 insertions(+) --- NEW FILE xen-sched-sedf.patch --- Signed-off-by: James Morris --- xen-3.0.1/xen/common/sched_sedf.c 2006-03-01 17:39:01.000000000 -0500 +++ xen-3.0.1.w/xen/common/sched_sedf.c 2006-03-13 02:29:18.000000000 -0500 @@ -374,9 +374,15 @@ if ( d->domain->domain_id == 0 ) { /*set dom0 to something useful to boot the machine*/ + /* + * jmorris at redhat.com: workaround to stop soft cpu lockups + * in guests, per + * http://lists.xensource.com/archives/html/xen-devel/2006-02/msg00721.html + */ inf->period = MILLISECS(20); inf->slice = MILLISECS(15); inf->latency = 0; + inf->extraweight = 1; inf->deadl_abs = 0; inf->status = EXTRA_AWARE | SEDF_ASLEEP; } Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.2046 retrieving revision 1.2047 diff -u -r1.2046 -r1.2047 --- kernel-2.6.spec 12 Mar 2006 00:53:16 -0000 1.2046 +++ kernel-2.6.spec 13 Mar 2006 17:13:58 -0000 1.2047 @@ -421,6 +421,9 @@ # Do not add anything non-trivial here. Patch10001: linux-2.6-random-patches.patch +# Xen hypervisor patches +Patch20000: xen-sched-sedf.patch + # END OF PATCH DEFINITIONS BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root @@ -705,6 +708,7 @@ %if %{buildxen} cd xen # Any necessary hypervisor patches go here +%patch20000 -p2 cd .. %endif cd linux-%{kversion}.%{_target_cpu} From fedora-cvs-commits at redhat.com Mon Mar 13 17:14:09 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 13 Mar 2006 12:14:09 -0500 Subject: rpms/evolution-data-server/devel .cvsignore, 1.40, 1.41 evolution-data-server.spec, 1.86, 1.87 sources, 1.40, 1.41 Message-ID: <200603131714.k2DHE9vh024012@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/evolution-data-server/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv23910 Modified Files: .cvsignore evolution-data-server.spec sources Log Message: - 1.6.0 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/evolution-data-server/devel/.cvsignore,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- .cvsignore 27 Feb 2006 20:45:21 -0000 1.40 +++ .cvsignore 13 Mar 2006 17:14:05 -0000 1.41 @@ -1 +1 @@ -evolution-data-server-1.5.92.tar.bz2 +evolution-data-server-1.6.0.tar.bz2 Index: evolution-data-server.spec =================================================================== RCS file: /cvs/dist/rpms/evolution-data-server/devel/evolution-data-server.spec,v retrieving revision 1.86 retrieving revision 1.87 diff -u -r1.86 -r1.87 --- evolution-data-server.spec 27 Feb 2006 20:45:21 -0000 1.86 +++ evolution-data-server.spec 13 Mar 2006 17:14:05 -0000 1.87 @@ -24,7 +24,7 @@ Summary: Backend data server for evolution Name: evolution-data-server -Version: 1.5.92 +Version: 1.6.0 Release: 1 License: LGPL Group: System Environment/Libraries @@ -321,6 +321,9 @@ %changelog +* Mon Mar 13 2006 Ray Strode - 1.6.0-1 +- 1.6.0 + * Mon Feb 27 2006 Ray Strode - 1.5.92-1 - 1.5.92 Index: sources =================================================================== RCS file: /cvs/dist/rpms/evolution-data-server/devel/sources,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- sources 27 Feb 2006 20:45:21 -0000 1.40 +++ sources 13 Mar 2006 17:14:05 -0000 1.41 @@ -1 +1 @@ -7c3887b0315a75d149bc06cd5f80a4ca evolution-data-server-1.5.92.tar.bz2 +1d775148a4f88559cb375924b9f7b79f evolution-data-server-1.6.0.tar.bz2 From fedora-cvs-commits at redhat.com Mon Mar 13 17:18:33 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 13 Mar 2006 12:18:33 -0500 Subject: rpms/mkinitrd/devel sources,1.112,1.113 Message-ID: <200603131718.k2DHIXKS005790@cvs.devel.redhat.com> Author: pjones Update of /cvs/dist/rpms/mkinitrd/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv5759 Modified Files: sources Log Message: - update tarball Index: sources =================================================================== RCS file: /cvs/dist/rpms/mkinitrd/devel/sources,v retrieving revision 1.112 retrieving revision 1.113 diff -u -r1.112 -r1.113 --- sources 13 Mar 2006 16:57:52 -0000 1.112 +++ sources 13 Mar 2006 17:18:29 -0000 1.113 @@ -1 +1 @@ -c4e6f261b3f8126b74445f6099d275ef mkinitrd-5.0.32.tar.bz2 +5e5dd8469e5bbb73d33571c385761913 mkinitrd-5.0.32.tar.bz2 From fedora-cvs-commits at redhat.com Mon Mar 13 17:21:32 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 13 Mar 2006 12:21:32 -0500 Subject: rpms/gail/devel .cvsignore, 1.18, 1.19 gail.spec, 1.39, 1.40 sources, 1.18, 1.19 Message-ID: <200603131721.k2DHLWmP007177@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/gail/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv7038 Modified Files: .cvsignore gail.spec sources Log Message: 1.8.11 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/gail/devel/.cvsignore,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- .cvsignore 22 Feb 2006 15:23:24 -0000 1.18 +++ .cvsignore 13 Mar 2006 17:21:28 -0000 1.19 @@ -7,3 +7,4 @@ gail-1.8.8.tar.bz2 gail-1.8.9.tar.bz2 gail-1.8.10.tar.bz2 +gail-1.8.11.tar.bz2 Index: gail.spec =================================================================== RCS file: /cvs/dist/rpms/gail/devel/gail.spec,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- gail.spec 10 Mar 2006 19:24:50 -0000 1.39 +++ gail.spec 13 Mar 2006 17:21:28 -0000 1.40 @@ -4,8 +4,8 @@ Summary: Accessibility implementation for GTK+ and GNOME libraries Name: gail -Version: 1.8.10 -Release: 2 +Version: 1.8.11 +Release: 1 URL: http://developer.gnome.org/projects/gap Source0: %{name}-%{version}.tar.bz2 License: LGPL @@ -21,8 +21,7 @@ BuildRequires: atk-devel >= %{atk_version} BuildRequires: libgnomecanvas-devel >= %{libgnomecanvas_version} -Patch0: gail-1.8.8-combobox-name.patch -Patch1: gail-1.8.10-a11y-crash.patch +#Patch0: gail-1.8.8-combobox-name.patch %description GAIL implements the abstract interfaces found in ATK for GTK+ and @@ -44,8 +43,7 @@ %prep %setup -q -%patch0 -p1 -b .combobox-name -%patch1 -p1 -b .a11y-crash +#%patch0 -p1 -b .combobox-name %build libtoolize --force @@ -88,6 +86,9 @@ %{_datadir}/gtk-doc %changelog +* Mon Mar 13 2006 Matthias Clasen - 1.8.11-1 +- Update to 1.8.11 + * Fri Mar 10 2006 Matthias Clasen - 1.8.10-2 - Fix a treeview crash Index: sources =================================================================== RCS file: /cvs/dist/rpms/gail/devel/sources,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- sources 22 Feb 2006 15:23:24 -0000 1.18 +++ sources 13 Mar 2006 17:21:28 -0000 1.19 @@ -1 +1 @@ -f7dbebcda98a5eb0cc22074b56a62d29 gail-1.8.10.tar.bz2 +ff79df7dd0cf7a5109c089b9b5fbe17f gail-1.8.11.tar.bz2 From fedora-cvs-commits at redhat.com Mon Mar 13 17:37:23 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 13 Mar 2006 12:37:23 -0500 Subject: rpms/gnome-mag/devel .cvsignore, 1.16, 1.17 gnome-mag.spec, 1.28, 1.29 sources, 1.16, 1.17 Message-ID: <200603131737.k2DHbNAV011245@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/gnome-mag/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv11221 Modified Files: .cvsignore gnome-mag.spec sources Log Message: 0.12.4 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/gnome-mag/devel/.cvsignore,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- .cvsignore 19 Jan 2006 17:50:55 -0000 1.16 +++ .cvsignore 13 Mar 2006 17:37:20 -0000 1.17 @@ -6,3 +6,4 @@ gnome-mag-0.12.1.tar.bz2 gnome-mag-0.12.2.tar.bz2 gnome-mag-0.12.3.tar.bz2 +gnome-mag-0.12.4.tar.bz2 Index: gnome-mag.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-mag/devel/gnome-mag.spec,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- gnome-mag.spec 28 Feb 2006 14:25:00 -0000 1.28 +++ gnome-mag.spec 13 Mar 2006 17:37:20 -0000 1.29 @@ -2,8 +2,8 @@ Summary: GNOME Magnifier Name: gnome-mag -Version: 0.12.3 -Release: 3 +Version: 0.12.4 +Release: 1 License: LGPL Group: Desktop/Accessibility URL: http://www.gnome.org/ @@ -70,6 +70,9 @@ %{_datadir}/doc/gnome-mag* %changelog +* Mon Mar 13 2006 Matthias Clasen 0.12.4-1 +- Update to 0.12.4 + * Tue Feb 28 2006 Karsten Hopp 0.12.3-3 - BuildRequires: libXt-devel Index: sources =================================================================== RCS file: /cvs/dist/rpms/gnome-mag/devel/sources,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- sources 19 Jan 2006 17:50:55 -0000 1.16 +++ sources 13 Mar 2006 17:37:20 -0000 1.17 @@ -1 +1 @@ -f04ccfa081a9433538300ca07e8be1a2 gnome-mag-0.12.3.tar.bz2 +5616186b04c2e8ad001dd61707a3fb3a gnome-mag-0.12.4.tar.bz2 From fedora-cvs-commits at redhat.com Mon Mar 13 17:41:53 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 13 Mar 2006 12:41:53 -0500 Subject: rpms/atk/devel .cvsignore, 1.19, 1.20 atk.spec, 1.29, 1.30 sources, 1.19, 1.20 Message-ID: <200603131741.k2DHfruM012794@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/atk/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv12741 Modified Files: .cvsignore atk.spec sources Log Message: 1.11.3 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/atk/devel/.cvsignore,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- .cvsignore 18 Jan 2006 04:48:15 -0000 1.19 +++ .cvsignore 13 Mar 2006 17:41:51 -0000 1.20 @@ -6,3 +6,4 @@ atk-1.10.3.tar.bz2 atk-1.11.0.tar.bz2 atk-1.11.2.tar.bz2 +atk-1.11.3.tar.bz2 Index: atk.spec =================================================================== RCS file: /cvs/dist/rpms/atk/devel/atk.spec,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- atk.spec 11 Feb 2006 01:58:11 -0000 1.29 +++ atk.spec 13 Mar 2006 17:41:51 -0000 1.30 @@ -2,8 +2,8 @@ Summary: Interfaces for accessibility support. Name: atk -Version: 1.11.2 -Release: 1.2 +Version: 1.11.3 +Release: 1 License: LGPL Group: System Environment/Libraries Source: atk-%{version}.tar.bz2 @@ -68,6 +68,9 @@ %{_datadir}/gtk-doc/ %changelog +* Mon Mar 13 2006 Matthias Clasen - 1.11.3-1 +- Update to 1.11.3 + * Fri Feb 10 2006 Jesse Keating - 1.11.2-1.2 - bump again for double-long bug on ppc(64) Index: sources =================================================================== RCS file: /cvs/dist/rpms/atk/devel/sources,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- sources 18 Jan 2006 04:48:16 -0000 1.19 +++ sources 13 Mar 2006 17:41:51 -0000 1.20 @@ -1 +1 @@ -fd1f2349ece8a63257c7ffedfa6316af atk-1.11.2.tar.bz2 +b9ab9ad4ac99cb7c00deb5bbb6cca2e4 atk-1.11.3.tar.bz2 From fedora-cvs-commits at redhat.com Mon Mar 13 17:45:49 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 13 Mar 2006 12:45:49 -0500 Subject: rpms/evolution/devel .cvsignore, 1.45, 1.46 evolution.spec, 1.127, 1.128 sources, 1.45, 1.46 Message-ID: <200603131745.k2DHjnSj016763@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/evolution/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv14594 Modified Files: .cvsignore evolution.spec sources Log Message: - 2.6.0 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/evolution/devel/.cvsignore,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- .cvsignore 28 Feb 2006 18:13:23 -0000 1.45 +++ .cvsignore 13 Mar 2006 17:45:46 -0000 1.46 @@ -1 +1 @@ -evolution-2.5.92.tar.bz2 +evolution-2.6.0.tar.bz2 Index: evolution.spec =================================================================== RCS file: /cvs/dist/rpms/evolution/devel/evolution.spec,v retrieving revision 1.127 retrieving revision 1.128 diff -u -r1.127 -r1.128 --- evolution.spec 28 Feb 2006 18:13:23 -0000 1.127 +++ evolution.spec 13 Mar 2006 17:45:46 -0000 1.128 @@ -38,7 +38,7 @@ %define evo_plugin_dir %{_libdir}/evolution/%{evo_major}/plugins Name: evolution -Version: 2.5.92 +Version: 2.6.0 Release: 1 License: GPL BuildRoot: %{_tmppath}/%{name}-%{version}-root @@ -634,6 +634,9 @@ %{_libdir}/evolution/%{evo_major}/libmenus.so %changelog +* Mon Mar 13 2006 Ray Strode - 2.6.0-1 +- 2.6.0 + * Mon Feb 27 2006 Ray Strode - 2.5.92-1 - 2.5.92 Index: sources =================================================================== RCS file: /cvs/dist/rpms/evolution/devel/sources,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- sources 28 Feb 2006 18:13:23 -0000 1.45 +++ sources 13 Mar 2006 17:45:46 -0000 1.46 @@ -1 +1 @@ -1dd17db843eeb66740b40ebb9024261f evolution-2.5.92.tar.bz2 +5c98650b2ccf3581e7cf5af3927b95d1 evolution-2.6.0.tar.bz2 From fedora-cvs-commits at redhat.com Mon Mar 13 17:53:21 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 13 Mar 2006 12:53:21 -0500 Subject: rpms/gtk2/devel .cvsignore, 1.47, 1.48 gtk2.spec, 1.131, 1.132 sources, 1.50, 1.51 Message-ID: <200603131753.k2DHrLUk030032@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/gtk2/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv29971 Modified Files: .cvsignore gtk2.spec sources Log Message: 2.8.15 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/gtk2/devel/.cvsignore,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- .cvsignore 8 Mar 2006 18:21:18 -0000 1.47 +++ .cvsignore 13 Mar 2006 17:53:17 -0000 1.48 @@ -30,3 +30,4 @@ gtk+-2.8.12.tar.bz2 gtk+-2.8.13.tar.bz2 gtk+-2.8.14.tar.bz2 +gtk+-2.8.15.tar.bz2 Index: gtk2.spec =================================================================== RCS file: /cvs/dist/rpms/gtk2/devel/gtk2.spec,v retrieving revision 1.131 retrieving revision 1.132 diff -u -r1.131 -r1.132 --- gtk2.spec 10 Mar 2006 19:05:34 -0000 1.131 +++ gtk2.spec 13 Mar 2006 17:53:17 -0000 1.132 @@ -10,7 +10,7 @@ %define cairo_version %{cairo_base_version}-1 %define libpng_version 2:1.2.2-16 -%define base_version 2.8.14 +%define base_version 2.8.15 %define bin_version 2.4.0 Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X. @@ -28,8 +28,6 @@ Patch1: gtk+-2.8.6-inputmethod.patch # Fedora patch Patch3: gtk+-2.8.10-set-invisible-char-to-bullet.patch -# Crash in treeview a11y -Patch4: gtk+-2.8.14-a11y-crash.patch BuildPrereq: atk-devel >= %{atk_version} BuildPrereq: pango-devel >= %{pango_version} @@ -97,7 +95,6 @@ %patch0 -p1 -b .lib64 %patch1 -p1 -b .inputmethod %patch3 -p1 -b .set-invisible-char-to-bullet -%patch4 -p1 -b .a11y-crash for i in config.guess config.sub ; do test -f %{_datadir}/libtool/$i && cp %{_datadir}/libtool/$i . @@ -268,6 +265,10 @@ %doc tmpdocs/examples %changelog +* Mon Mar 13 2006 Matthias Clasen - 2.8.15-1 +- Update to 2.8.15 +- Drop upstreamed patch + * Fri Mar 10 2006 Matthias Clasen - 2.8.14-2 - Fix a crash when using accessible treeviews Index: sources =================================================================== RCS file: /cvs/dist/rpms/gtk2/devel/sources,v retrieving revision 1.50 retrieving revision 1.51 diff -u -r1.50 -r1.51 --- sources 8 Mar 2006 18:21:19 -0000 1.50 +++ sources 13 Mar 2006 17:53:17 -0000 1.51 @@ -1,2 +1,2 @@ d8c012f67a8f23fa9aa495fca5331784 update-scripts.tar.gz -45125f53046fff3b649ddedf53bee9b0 gtk+-2.8.14.tar.bz2 +1256dd8bad3f94750a066b0e337156ee gtk+-2.8.15.tar.bz2 From fedora-cvs-commits at redhat.com Mon Mar 13 17:54:43 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 13 Mar 2006 12:54:43 -0500 Subject: rpms/gtk2/devel gtk2.spec,1.132,1.133 Message-ID: <200603131754.k2DHsh1i030667@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/gtk2/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv30627 Modified Files: gtk2.spec Log Message: fix release Index: gtk2.spec =================================================================== RCS file: /cvs/dist/rpms/gtk2/devel/gtk2.spec,v retrieving revision 1.132 retrieving revision 1.133 diff -u -r1.132 -r1.133 --- gtk2.spec 13 Mar 2006 17:53:17 -0000 1.132 +++ gtk2.spec 13 Mar 2006 17:54:39 -0000 1.133 @@ -16,7 +16,7 @@ Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X. Name: gtk2 Version: %{base_version} -Release: 2 +Release: 1 License: LGPL Group: System Environment/Libraries Source: gtk+-%{version}.tar.bz2 From fedora-cvs-commits at redhat.com Mon Mar 13 17:58:00 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 13 Mar 2006 12:58:00 -0500 Subject: rpms/evolution/devel evolution.spec,1.128,1.129 Message-ID: <200603131758.k2DHw0nC032147@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/evolution/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv32022 Modified Files: evolution.spec Log Message: - 2.6.0 - turn on the "error on missing prototypes" check thing Index: evolution.spec =================================================================== RCS file: /cvs/dist/rpms/evolution/devel/evolution.spec,v retrieving revision 1.128 retrieving revision 1.129 diff -u -r1.128 -r1.129 --- evolution.spec 13 Mar 2006 17:45:46 -0000 1.128 +++ evolution.spec 13 Mar 2006 17:57:56 -0000 1.129 @@ -31,7 +31,7 @@ # Upstream tarballs often contain instances of undeclared functions; these tend # to work on i386 but fail on 64-bit architectures. Leave this on to trap the # warnings as errors (and ideally get the flag into the upstream build): -%define require_function_declarations 0 +%define require_function_declarations 1 %define redhat_menus_version 5.0.4 @@ -636,6 +636,7 @@ %changelog * Mon Mar 13 2006 Ray Strode - 2.6.0-1 - 2.6.0 +- turn on the "error on missing prototypes" check thing * Mon Feb 27 2006 Ray Strode - 2.5.92-1 - 2.5.92 From fedora-cvs-commits at redhat.com Mon Mar 13 18:02:19 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 13 Mar 2006 13:02:19 -0500 Subject: rpms/mkinitrd/devel sources,1.113,1.114 Message-ID: <200603131802.k2DI2JCF000627@cvs.devel.redhat.com> Author: pjones Update of /cvs/dist/rpms/mkinitrd/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv590 Modified Files: sources Log Message: - update tarball Index: sources =================================================================== RCS file: /cvs/dist/rpms/mkinitrd/devel/sources,v retrieving revision 1.113 retrieving revision 1.114 diff -u -r1.113 -r1.114 --- sources 13 Mar 2006 17:18:29 -0000 1.113 +++ sources 13 Mar 2006 18:01:59 -0000 1.114 @@ -1 +1 @@ -5e5dd8469e5bbb73d33571c385761913 mkinitrd-5.0.32.tar.bz2 +73c36d759e845737c9571a856f6f8605 mkinitrd-5.0.32.tar.bz2 From fedora-cvs-commits at redhat.com Mon Mar 13 18:05:56 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 13 Mar 2006 13:05:56 -0500 Subject: rpms/gtk2/devel .cvsignore,1.48,1.49 sources,1.51,1.52 Message-ID: <200603131805.k2DI5qOS000999@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/gtk2/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv985 Modified Files: .cvsignore sources Log Message: 2.8.15 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/gtk2/devel/.cvsignore,v retrieving revision 1.48 retrieving revision 1.49 diff -u -r1.48 -r1.49 --- .cvsignore 13 Mar 2006 17:53:17 -0000 1.48 +++ .cvsignore 13 Mar 2006 18:05:50 -0000 1.49 @@ -31,3 +31,4 @@ gtk+-2.8.13.tar.bz2 gtk+-2.8.14.tar.bz2 gtk+-2.8.15.tar.bz2 +gtk+-2.8.15.tar.bz2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/gtk2/devel/sources,v retrieving revision 1.51 retrieving revision 1.52 diff -u -r1.51 -r1.52 --- sources 13 Mar 2006 17:53:17 -0000 1.51 +++ sources 13 Mar 2006 18:05:50 -0000 1.52 @@ -1,2 +1,2 @@ d8c012f67a8f23fa9aa495fca5331784 update-scripts.tar.gz -1256dd8bad3f94750a066b0e337156ee gtk+-2.8.15.tar.bz2 +df49f7498ec8275519ee92087f8d04db gtk+-2.8.15.tar.bz2 From fedora-cvs-commits at redhat.com Mon Mar 13 18:15:40 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 13 Mar 2006 13:15:40 -0500 Subject: rpms/gtk2/devel gtk2.spec,1.133,1.134 Message-ID: <200603131815.k2DIFeko003990@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/gtk2/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv3904 Modified Files: gtk2.spec Log Message: turn off make check Index: gtk2.spec =================================================================== RCS file: /cvs/dist/rpms/gtk2/devel/gtk2.spec,v retrieving revision 1.133 retrieving revision 1.134 diff -u -r1.133 -r1.134 --- gtk2.spec 13 Mar 2006 17:54:39 -0000 1.133 +++ gtk2.spec 13 Mar 2006 18:15:36 -0000 1.134 @@ -125,7 +125,8 @@ ## smp_mflags doesn't work for now due to gdk-pixbuf.loaders, may be fixed ## past gtk 2.1.2 make ## %{?_smp_mflags} -make check +# turn off for now, since floatingtest needs a display +#make check %install rm -rf $RPM_BUILD_ROOT From fedora-cvs-commits at redhat.com Mon Mar 13 18:37:35 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 13 Mar 2006 13:37:35 -0500 Subject: rpms/kernel/devel patch-2.6.16-rc6-git1.bz2.sign, NONE, 1.1 .cvsignore, 1.378, 1.379 kernel-2.6.spec, 1.2047, 1.2048 sources, 1.319, 1.320 upstream, 1.292, 1.293 Message-ID: <200603131837.k2DIbZrY016049@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv16032 Modified Files: .cvsignore kernel-2.6.spec sources upstream Added Files: patch-2.6.16-rc6-git1.bz2.sign Log Message: git1 --- NEW FILE patch-2.6.16-rc6-git1.bz2.sign --- -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.2.1 (GNU/Linux) Comment: See http://www.kernel.org/signature.html for info iD8DBQBEFRjryGugalF9Dw4RAj9LAKCEoUcCmOf0P4eKaLSAWb2vs35PEQCgg53V +8NvpNctIY43huZAN0MIWeQ= =6I3L -----END PGP SIGNATURE----- Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v retrieving revision 1.378 retrieving revision 1.379 diff -u -r1.378 -r1.379 --- .cvsignore 12 Mar 2006 00:25:24 -0000 1.378 +++ .cvsignore 13 Mar 2006 18:37:32 -0000 1.379 @@ -4,3 +4,4 @@ linux-2.6.15.tar.bz2 xen-20060301.tar.bz2 patch-2.6.16-rc6.bz2 +patch-2.6.16-rc6-git1.bz2 Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.2047 retrieving revision 1.2048 diff -u -r1.2047 -r1.2048 --- kernel-2.6.spec 13 Mar 2006 17:13:58 -0000 1.2047 +++ kernel-2.6.spec 13 Mar 2006 18:37:32 -0000 1.2048 @@ -218,6 +218,7 @@ # Patches 0 through 100 are meant for core subsystem upgrades # Patch1: patch-2.6.16-rc6.bz2 +Patch2: patch-2.6.16-rc6-git1.bz2 # Patches 100 through 500 are meant for architecture patches Patch100: linux-2.6-bzimage.patch @@ -715,6 +716,7 @@ # Update to latest upstream. %patch1 -p1 +%patch2 -p1 # # Patches 10 through 100 are meant for core subsystem upgrades @@ -1653,6 +1655,9 @@ %endif %changelog +* Mon Mar 13 2006 Dave Jones +- 2.6.16-rc6-git1 + * Sat Mar 11 2006 Dave Jones - 2.6.16-rc6 - 2.6.16-rc5-git15 & -git16 Index: sources =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/sources,v retrieving revision 1.319 retrieving revision 1.320 diff -u -r1.319 -r1.320 --- sources 12 Mar 2006 00:25:24 -0000 1.319 +++ sources 13 Mar 2006 18:37:32 -0000 1.320 @@ -1,3 +1,4 @@ cdf95e00f5111e31f78e1d97304d9522 linux-2.6.15.tar.bz2 cdfde609af8adcf58d7ff626599b2d90 xen-20060301.tar.bz2 67fe4dce92d3103e56dd8d2d3c20b3ed patch-2.6.16-rc6.bz2 +b134a01cb392d9abf0b3537a48f0d0fe patch-2.6.16-rc6-git1.bz2 Index: upstream =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/upstream,v retrieving revision 1.292 retrieving revision 1.293 diff -u -r1.292 -r1.293 --- upstream 12 Mar 2006 00:25:24 -0000 1.292 +++ upstream 13 Mar 2006 18:37:32 -0000 1.293 @@ -1,2 +1,3 @@ linux-2.6.15.tar.bz2 patch-2.6.16-rc6.bz2 +patch-2.6.16-rc6-git1.bz2 From fedora-cvs-commits at redhat.com Mon Mar 13 18:43:35 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 13 Mar 2006 13:43:35 -0500 Subject: rpms/libcroco/devel .cvsignore, 1.5, 1.6 libcroco.spec, 1.15, 1.16 sources, 1.5, 1.6 Message-ID: <200603131843.k2DIhZhA016469@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/libcroco/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv16449 Modified Files: .cvsignore libcroco.spec sources Log Message: 0.6.1 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/libcroco/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 9 Sep 2004 07:23:24 -0000 1.5 +++ .cvsignore 13 Mar 2006 18:43:32 -0000 1.6 @@ -1 +1,2 @@ libcroco-0.6.0.tar.bz2 +libcroco-0.6.1.tar.bz2 Index: libcroco.spec =================================================================== RCS file: /cvs/dist/rpms/libcroco/devel/libcroco.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- libcroco.spec 11 Feb 2006 03:54:09 -0000 1.15 +++ libcroco.spec 13 Mar 2006 18:43:32 -0000 1.16 @@ -1,7 +1,7 @@ Name: libcroco Summary: A CSS2 parsing library -Version: 0.6.0 -Release: 6.2.1 +Version: 0.6.1 +Release: 1 License: LGPL Group: System Environment/Libraries Source: %{name}-%{version}.tar.bz2 @@ -78,6 +78,9 @@ %{_libdir}/pkgconfig/libcroco-0.6.pc %changelog +* Mon Mar 13 2006 Matthias Clasen - 0.6.1-1 +- Update to 0.6.1 + * Fri Feb 10 2006 Jesse Keating - 0.6.0-6.2.1 - bump again for double-long bug on ppc(64) Index: sources =================================================================== RCS file: /cvs/dist/rpms/libcroco/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 9 Sep 2004 07:23:24 -0000 1.5 +++ sources 13 Mar 2006 18:43:32 -0000 1.6 @@ -1 +1 @@ -78fb2bf78d469df83b1fc94ce196c1c4 libcroco-0.6.0.tar.bz2 +b0975bd01eb11964f1b3f254f267a43d libcroco-0.6.1.tar.bz2 From fedora-cvs-commits at redhat.com Mon Mar 13 18:54:58 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 13 Mar 2006 13:54:58 -0500 Subject: rpms/libcroco/devel libcroco.spec,1.16,1.17 Message-ID: <200603131854.k2DIsw80005739@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/libcroco/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv5676 Modified Files: libcroco.spec Log Message: drop patches Index: libcroco.spec =================================================================== RCS file: /cvs/dist/rpms/libcroco/devel/libcroco.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- libcroco.spec 13 Mar 2006 18:43:32 -0000 1.16 +++ libcroco.spec 13 Mar 2006 18:54:55 -0000 1.17 @@ -5,8 +5,6 @@ License: LGPL Group: System Environment/Libraries Source: %{name}-%{version}.tar.bz2 -Patch0: libcroco-0.6.0-memset.patch -Patch1: libcroco-0.6.0-glib.patch BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildRequires: pkgconfig >= 0.8 Requires: glib2 >= 2.0 @@ -37,9 +35,6 @@ %prep %setup -q -n libcroco-%{version} -%patch0 -p1 -b .memset -%patch1 -p1 - %build :%configure --enable-seleng=yes --enable-layeng=yes make @@ -80,6 +75,7 @@ %changelog * Mon Mar 13 2006 Matthias Clasen - 0.6.1-1 - Update to 0.6.1 +- Drop upstreamed patches * Fri Feb 10 2006 Jesse Keating - 0.6.0-6.2.1 - bump again for double-long bug on ppc(64) From fedora-cvs-commits at redhat.com Mon Mar 13 19:16:53 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 13 Mar 2006 14:16:53 -0500 Subject: rpms/evolution/devel evolution-2.6.0-prototypes.patch, NONE, 1.1 evolution.spec, 1.129, 1.130 Message-ID: <200603131916.k2DJGrvG014863@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/evolution/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv12819 Modified Files: evolution.spec Added Files: evolution-2.6.0-prototypes.patch Log Message: - 2.6.0 - turn on the "error on missing prototypes" check thing evolution-2.6.0-prototypes.patch: cal-prefs-dialog.c | 1 + 1 files changed, 1 insertion(+) --- NEW FILE evolution-2.6.0-prototypes.patch --- --- evolution-2.6.0/calendar/gui/dialogs/cal-prefs-dialog.c.prototypes 2006-03-13 14:14:07.000000000 -0500 +++ evolution-2.6.0/calendar/gui/dialogs/cal-prefs-dialog.c 2006-03-13 14:14:24.000000000 -0500 @@ -32,6 +32,7 @@ #include "../calendar-config.h" #include "cal-prefs-dialog.h" #include +#include #include #include #include Index: evolution.spec =================================================================== RCS file: /cvs/dist/rpms/evolution/devel/evolution.spec,v retrieving revision 1.129 retrieving revision 1.130 diff -u -r1.129 -r1.130 --- evolution.spec 13 Mar 2006 17:57:56 -0000 1.129 +++ evolution.spec 13 Mar 2006 19:16:49 -0000 1.130 @@ -100,6 +100,7 @@ Patch805: evolution-2.5.4-fix-missing-declarations.patch Patch806: evolution-2.5.5.1-notification-cleanups.patch Patch808: evolution-2.5.5.1-fix-missing-declarations-2.5.5.1.patch +Patch809: evolution-2.6.0-prototypes.patch Summary: GNOME's next-generation groupware suite Group: Applications/Productivity @@ -244,6 +245,7 @@ %patch805 -p1 -b .fix-missing-declarations-2-5-4 %patch806 -p1 -b .notification-cleanups %patch808 -p1 -b .fix-missing-declarations-2.5.5.1 +%patch809 -p1 -b .prototypes mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib From fedora-cvs-commits at redhat.com Mon Mar 13 19:33:26 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 13 Mar 2006 14:33:26 -0500 Subject: rpms/evolution/devel evolution-2.6.0-prototypes.patch,1.1,1.2 Message-ID: <200603131933.k2DJXQfd029745@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/evolution/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv29694 Modified Files: evolution-2.6.0-prototypes.patch Log Message: add more prototypes evolution-2.6.0-prototypes.patch: alarm-dialog.c | 1 + cal-prefs-dialog.c | 1 + 2 files changed, 2 insertions(+) Index: evolution-2.6.0-prototypes.patch =================================================================== RCS file: /cvs/dist/rpms/evolution/devel/evolution-2.6.0-prototypes.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- evolution-2.6.0-prototypes.patch 13 Mar 2006 19:16:49 -0000 1.1 +++ evolution-2.6.0-prototypes.patch 13 Mar 2006 19:32:46 -0000 1.2 @@ -1,3 +1,13 @@ +--- evolution-2.6.0/calendar/gui/dialogs/alarm-dialog.c.prototypes 2006-03-13 14:29:57.000000000 -0500 ++++ evolution-2.6.0/calendar/gui/dialogs/alarm-dialog.c 2006-03-13 14:30:56.000000000 -0500 +@@ -41,6 +41,7 @@ + #include + #include + #include ++#include + #include + #include + #include --- evolution-2.6.0/calendar/gui/dialogs/cal-prefs-dialog.c.prototypes 2006-03-13 14:14:07.000000000 -0500 +++ evolution-2.6.0/calendar/gui/dialogs/cal-prefs-dialog.c 2006-03-13 14:14:24.000000000 -0500 @@ -32,6 +32,7 @@ From fedora-cvs-commits at redhat.com Mon Mar 13 19:47:01 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 13 Mar 2006 14:47:01 -0500 Subject: rpms/thunderbird/devel thunderbird.spec,1.67,1.68 Message-ID: <200603131947.k2DJl1sH009638@cvs.devel.redhat.com> Author: caillon Update of /cvs/dist/rpms/thunderbird/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv9573 Modified Files: thunderbird.spec Log Message: * Mon Mar 13 2006 Christopher Aillon - 1.5.6 - Temporarily disable other arches that we don't ship FC5 with, for time Index: thunderbird.spec =================================================================== RCS file: /cvs/dist/rpms/thunderbird/devel/thunderbird.spec,v retrieving revision 1.67 retrieving revision 1.68 diff -u -r1.67 -r1.68 --- thunderbird.spec 13 Mar 2006 17:08:34 -0000 1.67 +++ thunderbird.spec 13 Mar 2006 19:46:58 -0000 1.68 @@ -5,10 +5,13 @@ %define official_branding 1 + +ExcludeArch: s390x s390 ppc64 ia64 + Summary: Mozilla Thunderbird mail/newsgroup client Name: thunderbird Version: 1.5 -Release: 5 +Release: 6 Epoch: 0 URL: http://www.mozilla.org/projects/thunderbird/ License: MPL @@ -106,6 +109,7 @@ %patch100 -p1 %patch101 -p1 +%patch102 -p1 %{__rm} -f .mozconfig %{__cp} %{SOURCE10} .mozconfig @@ -216,6 +220,9 @@ #=============================================================================== %changelog +* Mon Mar 13 2006 Christopher Aillon - 1.5.6 +- Temporarily disable other arches that we don't ship FC5 with, for time + * Mon Mar 13 2006 Christopher Aillon - 1.5-5 - Add a notice to the mail start page denoting this is a pango enabled build. From fedora-cvs-commits at redhat.com Mon Mar 13 20:22:38 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 13 Mar 2006 15:22:38 -0500 Subject: rpms/control-center/devel control-center-2.13.90-fedora-apps.patch, 1.1, 1.2 Message-ID: <200603132022.k2DKMcRx005102@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/control-center/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv4949 Modified Files: control-center-2.13.90-fedora-apps.patch Log Message: - frob a patch so that it will apply control-center-2.13.90-fedora-apps.patch: gnome-default-applications.xml.in | 111 ++++++++------------------------------ 1 files changed, 24 insertions(+), 87 deletions(-) Index: control-center-2.13.90-fedora-apps.patch =================================================================== RCS file: /cvs/dist/rpms/control-center/devel/control-center-2.13.90-fedora-apps.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- control-center-2.13.90-fedora-apps.patch 30 Jan 2006 19:25:15 -0000 1.1 +++ control-center-2.13.90-fedora-apps.patch 13 Mar 2006 20:22:34 -0000 1.2 @@ -141,7 +141,7 @@ + + <_name>Sylpheed-Claws -- ylpheed-claws +- sylpheed-claws + sylpheed-claws sylpheed-claws --compose %s sylpheed From fedora-cvs-commits at redhat.com Mon Mar 13 20:49:13 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 13 Mar 2006 15:49:13 -0500 Subject: rpms/gnome-panel/devel gnome-panel-2.14.0-gpm-integration.patch, NONE, 1.1 gnome-panel-2.14.0-remove-duplicate-entry.patch, NONE, 1.1 .cvsignore, 1.39, 1.40 gnome-panel.spec, 1.117, 1.118 sources, 1.39, 1.40 gnome-panel-2.13.91-gpm-integration.patch, 1.5, NONE Message-ID: <200603132049.k2DKnDqL025906@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/gnome-panel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv25704 Modified Files: .cvsignore gnome-panel.spec sources Added Files: gnome-panel-2.14.0-gpm-integration.patch gnome-panel-2.14.0-remove-duplicate-entry.patch Removed Files: gnome-panel-2.13.91-gpm-integration.patch Log Message: - patch frobbing - po file fixing gnome-panel-2.14.0-gpm-integration.patch: configure.in | 4 gnome-panel/Makefile.am | 2 gnome-panel/panel-action-button.c | 57 +++- gnome-panel/panel-enums.h | 1 gnome-panel/panel-logout.c | 31 +- gnome-panel/panel-menu-items.c | 26 + gnome-panel/panel-power-manager.c | 533 ++++++++++++++++++++++++++++++++++++++ gnome-panel/panel-power-manager.h | 83 +++++ 8 files changed, 724 insertions(+), 13 deletions(-) --- NEW FILE gnome-panel-2.14.0-gpm-integration.patch --- --- gnome-panel-2.14.0/gnome-panel/Makefile.am.gpm-integration 2006-02-12 14:07:03.000000000 -0500 +++ gnome-panel-2.14.0/gnome-panel/Makefile.am 2006-03-13 15:30:00.000000000 -0500 @@ -116,6 +116,7 @@ panel_sources = \ panel-addto.c \ panel-logout.c \ panel-gdm.c \ + panel-power-manager.c \ $(EGG_RECENT_FILES_C) \ $(NULL) @@ -164,6 +165,7 @@ panel_headers = \ panel-addto.h \ panel-logout.h \ panel-gdm.h \ + panel-power-manager.h \ $(EGG_RECENT_FILES_H) \ $(NULL) --- gnome-panel-2.14.0/gnome-panel/panel-logout.c.gpm-integration 2006-03-13 15:30:00.000000000 -0500 +++ gnome-panel-2.14.0/gnome-panel/panel-logout.c 2006-03-13 15:33:06.000000000 -0500 @@ -32,6 +32,7 @@ #include "panel-logout.h" #include "panel-gdm.h" +#include "panel-power-manager.h" #include "panel-session.h" #define PANEL_LOGOUT_DIALOG_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PANEL_TYPE_LOGOUT_DIALOG, PanelLogoutDialogPrivate)) @@ -49,6 +50,7 @@ enum { struct _PanelLogoutDialogPrivate { PanelLogoutDialogType type; + PanelPowerManager *power_manager; int timeout; unsigned int timeout_id; @@ -60,7 +62,7 @@ static PanelLogoutDialog *current_dialog static void panel_logout_destroy (PanelLogoutDialog *logout_dialog, gpointer data); -static void panel_logout_response (GtkWidget *logout_dialog, +static void panel_logout_response (PanelLogoutDialog *logout_dialog, guint response_id, gpointer data); @@ -137,6 +139,8 @@ panel_logout_init (PanelLogoutDialog *lo gtk_window_set_keep_above (GTK_WINDOW (logout_dialog), TRUE); gtk_window_stick (GTK_WINDOW (logout_dialog)); + logout_dialog->priv->power_manager = panel_get_power_manager (); + g_signal_connect (logout_dialog, "destroy", G_CALLBACK (panel_logout_destroy), NULL); g_signal_connect (logout_dialog, "response", @@ -151,15 +155,21 @@ panel_logout_destroy (PanelLogoutDialog g_source_remove (logout_dialog->priv->timeout_id); logout_dialog->priv->timeout_id = 0; + g_object_unref (logout_dialog->priv->power_manager); + logout_dialog->priv->power_manager = NULL; + current_dialog = NULL; } static void -panel_logout_response (GtkWidget *logout_dialog, +panel_logout_response (PanelLogoutDialog *logout_dialog, guint response_id, gpointer data) { - gtk_widget_destroy (logout_dialog); + PanelPowerManager *power_manager; + + power_manager = g_object_ref (logout_dialog->priv->power_manager); + gtk_widget_destroy (GTK_WIDGET (logout_dialog)); switch (response_id) { case GTK_RESPONSE_CANCEL: @@ -180,11 +190,15 @@ panel_logout_response (GtkWidget *logout panel_session_request_logout (); break; case PANEL_LOGOUT_RESPONSE_STD: - gdm_set_logout_action (GDM_LOGOUT_ACTION_SUSPEND); - panel_session_request_logout (); + if (gdm_supports_logout_action (GDM_LOGOUT_ACTION_SUSPEND)) + gdm_set_logout_action (GDM_LOGOUT_ACTION_SUSPEND); + else if (panel_power_manager_can_sleep_and_power_down (power_manager)) + panel_power_manager_request_sleep_and_power_down (power_manager); + break; case PANEL_LOGOUT_RESPONSE_STR: - //FIXME + if (panel_power_manager_can_sleep (power_manager)) + panel_power_manager_request_sleep (power_manager); break; case GTK_RESPONSE_NONE: case GTK_RESPONSE_DELETE_EVENT: @@ -192,6 +206,7 @@ panel_logout_response (GtkWidget *logout default: g_assert_not_reached (); } + g_object_unref (power_manager); } static gboolean @@ -323,10 +338,10 @@ panel_logout_new (PanelLogoutDialogType logout_dialog->priv->default_response = PANEL_LOGOUT_RESPONSE_SHUTDOWN; //FIXME see previous FIXME -#if 0 +#if 1 /* TODO: disable this for 2.14 since this is stupid (the user * don't want to log out of his session when suspending) */ - if (gdm_supports_logout_action (GDM_LOGOUT_ACTION_SUSPEND)) + if (panel_power_manager_can_sleep_and_power_down (logout_dialog->priv->power_manager)) gtk_dialog_add_button (GTK_DIALOG (logout_dialog), _("_Suspend"), PANEL_LOGOUT_RESPONSE_STD); --- gnome-panel-2.14.0/gnome-panel/panel-action-button.c.gpm-integration 2006-02-12 07:36:56.000000000 -0500 +++ gnome-panel-2.14.0/gnome-panel/panel-action-button.c 2006-03-13 15:30:00.000000000 -0500 @@ -47,10 +47,16 @@ #include "panel-lockdown.h" #include "panel-logout.h" #include "panel-compatibility.h" +#include "panel-power-manager.h" #include "panel-gdm.h" #define PANEL_ACTION_BUTTON_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PANEL_TYPE_ACTION_BUTTON, PanelActionButtonPrivate)) +static gboolean panel_action_can_suspend (void); +static gboolean panel_action_logout_is_disabled (void); +static gboolean panel_action_suspend_is_disabled (void); +static void panel_action_suspend (GtkWidget *widget); + enum { PROP_0, PROP_ACTION_TYPE, @@ -77,6 +83,7 @@ static GConfEnumStringPair panel_action_ { PANEL_ACTION_FORCE_QUIT, "force-quit" }, { PANEL_ACTION_CONNECT_SERVER, "connect-server" }, { PANEL_ACTION_SHUTDOWN, "shutdown" }, + { PANEL_ACTION_SUSPEND, "suspend" }, /* compatibility with GNOME < 2.13.90 */ { PANEL_ACTION_SCREENSHOT, "screenshot" }, { 0, NULL }, @@ -167,12 +174,47 @@ panel_action_shutdown (GtkWidget *widget } static gboolean +panel_action_can_suspend (void) +{ + PanelPowerManager *manager; + gboolean can_suspend; + + manager = panel_get_power_manager (); + + can_suspend = panel_power_manager_can_sleep (manager); + + g_object_unref (manager); + + return can_suspend; +} + +static gboolean panel_action_shutdown_is_disabled (void) { return (panel_lockdown_get_disable_log_out() || + /* panel_action_can_suspend() || */ !gdm_supports_logout_action (GDM_LOGOUT_ACTION_SHUTDOWN)); } + +static gboolean +panel_action_suspend_is_disabled (void) +{ + return !panel_action_can_suspend (); +} + +static void +panel_action_suspend (GtkWidget *widget) +{ + PanelPowerManager *manager; + + manager = panel_get_power_manager (); + + panel_power_manager_request_sleep (manager); + + g_object_unref (manager); +} + /* Run Application */ static void @@ -308,8 +350,8 @@ static PanelAction actions [] = { "gospanel-20", "ACTION:logout:NEW", panel_action_logout, NULL, NULL, - panel_lockdown_get_disable_log_out - }, + panel_lockdown_get_disable_log_out + }, { PANEL_ACTION_RUN, PANEL_RUN_ICON, @@ -358,6 +400,16 @@ static PanelAction actions [] = { panel_action_shutdown, NULL, NULL, panel_action_shutdown_is_disabled }, + { + PANEL_ACTION_SUSPEND, + "screensaver", + N_("Suspend"), + N_("Suspend the computer"), + "gospanel-20", + "ACTION:suspend:NEW", + panel_action_suspend, NULL, NULL, + panel_action_suspend_is_disabled + }, /* deprecated actions */ { PANEL_ACTION_SCREENSHOT, @@ -861,6 +913,7 @@ panel_action_button_invoke_menu (PanelAc actions [button->priv->type].invoke_menu (button, callback_name); } + gboolean panel_action_button_load_from_drag (PanelToplevel *toplevel, int position, --- /dev/null 2006-03-13 10:25:56.453532000 -0500 +++ gnome-panel-2.14.0/gnome-panel/panel-power-manager.h 2006-03-13 15:30:00.000000000 -0500 @@ -0,0 +1,83 @@ +/* panel-power-manager.h - functions for powering down, restarting, and + * suspending the computer + * + * Copyright (C) 2006 Ray Strode + * + * 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., 59 Temple Place - Suite 330, Boston, MA + * 02111-1307, USA. + */ +#ifndef PANEL_POWER_MANAGER_H +#define PANEL_POWER_MANAGER_H + +#include +#include + +G_BEGIN_DECLS +#define PANEL_TYPE_POWER_MANAGER (panel_power_manager_get_type ()) +#define PANEL_POWER_MANAGER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PANEL_TYPE_POWER_MANAGER, PanelPowerManager)) +#define PANEL_POWER_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PANEL_TYPE_POWER_MANAGER, PanelPowerManagerClass)) +#define PANEL_IS_POWER_MANAGER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PANEL_TYPE_POWER_MANAGER)) +#define PANEL_IS_POWER_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PANEL_TYPE_POWER_MANAGER)) +#define PANEL_POWER_MANAGER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), PANEL_TYPE_POWER_MANAGER, PanelPowerManagerClass)) +#define PANEL_POWER_MANAGER_ERROR (panel_power_manager_error_quark ()) +typedef struct _PanelPowerManager PanelPowerManager; +typedef struct _PanelPowerManagerClass PanelPowerManagerClass; +typedef struct _PanelPowerManagerPrivate PanelPowerManagerPrivate; +typedef struct _PanelPowerManagerRequest PanelPowerManagerRequest; +typedef enum _PanelPowerManagerError PanelPowerManagerError; + +struct _PanelPowerManager +{ + GObject parent; + + /*< private > */ + PanelPowerManagerPrivate *priv; +}; + +struct _PanelPowerManagerClass +{ + GObjectClass parent_class; + + /* signals */ + void (* request_failed) (PanelPowerManager *manager, + GError *error); +}; + +enum _PanelPowerManagerError +{ + PANEL_POWER_MANAGER_ERROR_SLEEPING = 0, + PANEL_POWER_MANAGER_ERROR_SLEEPING_AND_POWERING_DOWN +}; + +GType panel_power_manager_get_type (void); +GQuark panel_power_manager_error_quark (void); + +PanelPowerManager *panel_power_manager_new (void) G_GNUC_MALLOC; + +gboolean panel_power_manager_can_sleep (PanelPowerManager *manager); +gboolean panel_power_manager_can_sleep_and_power_down (PanelPowerManager *manager); +gboolean panel_power_manager_can_power_down (PanelPowerManager *manager); +gboolean panel_power_manager_can_restart (PanelPowerManager *manager); + +PanelPowerManagerRequest *panel_power_manager_request_sleep (PanelPowerManager *manager); +PanelPowerManagerRequest *panel_power_manager_request_sleep_and_power_down (PanelPowerManager *manager); + +void panel_power_manager_cancel_request (PanelPowerManager *manager, + PanelPowerManagerRequest *request); + + +PanelPowerManager *panel_get_power_manager (void); +G_END_DECLS +#endif /* PANEL_POWER_MANAGER_H */ --- gnome-panel-2.14.0/gnome-panel/panel-enums.h.gpm-integration 2006-01-22 07:08:24.000000000 -0500 +++ gnome-panel-2.14.0/gnome-panel/panel-enums.h 2006-03-13 15:30:00.000000000 -0500 @@ -96,6 +96,7 @@ typedef enum { PANEL_ACTION_FORCE_QUIT, PANEL_ACTION_CONNECT_SERVER, PANEL_ACTION_SHUTDOWN, + PANEL_ACTION_SUSPEND, /* compatibility with GNOME < 2.13.90 */ PANEL_ACTION_SCREENSHOT, PANEL_ACTION_LAST --- gnome-panel-2.14.0/gnome-panel/panel-menu-items.c.gpm-integration 2006-03-13 15:30:00.000000000 -0500 +++ gnome-panel-2.14.0/gnome-panel/panel-menu-items.c 2006-03-13 15:30:00.000000000 -0500 @@ -49,6 +49,7 @@ #include "panel-recent.h" #include "panel-stock-icons.h" #include "panel-util.h" +#include "panel-power-manager.h" #define BOOKMARKS_FILENAME ".gtk-bookmarks" #define DESKTOP_IS_HOME_DIR_DIR "/apps/nautilus/preferences" @@ -1011,8 +1012,21 @@ panel_desktop_menu_item_new (gboolean us menuitem->priv->append_lock_logout = append_lock_logout; if (append_lock_logout) - panel_lockdown_notify_add (G_CALLBACK (panel_desktop_menu_item_recreate_menu), - menuitem); + { + PanelPowerManager *manager; + + panel_lockdown_notify_add (G_CALLBACK (panel_desktop_menu_item_recreate_menu), + menuitem); + + manager = panel_get_power_manager (); + + g_signal_connect_swapped (manager, "notify::is-connected", + G_CALLBACK + (panel_desktop_menu_item_recreate_menu), + menuitem); + + g_object_unref (manager); + } menuitem->priv->menu = panel_desktop_menu_item_create_menu (menuitem); gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem), @@ -1118,6 +1132,14 @@ panel_menu_items_append_lock_logout (Gtk gtk_menu_shell_append (GTK_MENU_SHELL (menu), item); } + item = panel_menu_items_create_action_item (PANEL_ACTION_SUSPEND); + if (item != NULL) { + if (!separator_inserted) + add_menu_separator (menu); + + gtk_menu_shell_append (GTK_MENU_SHELL (menu), item); + } + item = panel_menu_items_create_action_item (PANEL_ACTION_SHUTDOWN); if (item != NULL) { if (!separator_inserted) --- /dev/null 2006-03-13 10:25:56.453532000 -0500 +++ gnome-panel-2.14.0/gnome-panel/panel-power-manager.c 2006-03-13 15:30:00.000000000 -0500 @@ -0,0 +1,533 @@ +/* panel-power-manager.c - functions for powering down, restarting, and + * suspending the computer + * + * Copyright (C) 2006 Ray Strode + * + * 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., 59 Temple Place - Suite 330, Boston, MA + * 02111-1307, USA. + */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + +#include "panel-power-manager.h" + +#include +#include + +#include +#include +#include + +#include + +struct _PanelPowerManagerPrivate +{ + DBusGConnection *dbus_connection; + DBusGProxy *bus_proxy; + DBusGProxy *gpm_proxy; + guint32 is_connected : 1; +}; + + +static void panel_power_manager_finalize (GObject *object); +static void panel_power_manager_class_install_signals (PanelPowerManagerClass * manager_class); +static void +panel_power_manager_class_install_properties (PanelPowerManagerClass * + manager_class); + +static void panel_power_manager_get_property (GObject * object, + guint prop_id, + GValue * value, + GParamSpec * pspec); + +static gboolean panel_power_manager_ensure_gpm_connection (PanelPowerManager *manager, + GError **error); +enum +{ + PROP_0 = 0, + PROP_IS_CONNECTED +}; + +enum +{ + REQUEST_FAILED = 0, + NUMBER_OF_SIGNALS +}; + +static guint panel_power_manager_signals[NUMBER_OF_SIGNALS]; + +G_DEFINE_TYPE (PanelPowerManager, panel_power_manager, G_TYPE_OBJECT); + +static void +panel_power_manager_class_init (PanelPowerManagerClass * manager_class) +{ + GObjectClass *object_class; + + object_class = G_OBJECT_CLASS (manager_class); + + object_class->finalize = panel_power_manager_finalize; + + panel_power_manager_class_install_properties (manager_class); + panel_power_manager_class_install_signals (manager_class); + + g_type_class_add_private (manager_class, sizeof (PanelPowerManagerPrivate)); +} + +static void +panel_power_manager_class_install_signals (PanelPowerManagerClass * + manager_class) +{ + GObjectClass *object_class; + + object_class = G_OBJECT_CLASS (manager_class); + + panel_power_manager_signals[REQUEST_FAILED] = + g_signal_new ("request-failed", G_OBJECT_CLASS_TYPE (object_class), + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET (PanelPowerManagerClass, request_failed), + NULL, NULL, g_cclosure_marshal_VOID__POINTER, + G_TYPE_NONE, 1, G_TYPE_POINTER); + manager_class->request_failed = NULL; +} + +static void +panel_power_manager_class_install_properties (PanelPowerManagerClass * + manager_class) +{ + GObjectClass *object_class; + GParamSpec *param_spec; + + object_class = G_OBJECT_CLASS (manager_class); + object_class->get_property = panel_power_manager_get_property; + + param_spec = g_param_spec_boolean ("is-connected", _("Is connected"), + _("whether the the panel is connected " + "to the power manager"), + FALSE, + G_PARAM_READABLE); + g_object_class_install_property (object_class, PROP_IS_CONNECTED, param_spec); +} + +static void +panel_power_manager_on_name_owner_changed (DBusGProxy *bus_proxy, + const char *name, + const char *prev_owner, + const char *new_owner, + PanelPowerManager *manager) +{ + gboolean is_online; + + is_online = strcmp (new_owner, "") != 0; + + if (strcmp (name, "org.gnome.PowerManager") != 0) + return; + + if (manager->priv->gpm_proxy != NULL) + { + g_object_unref (manager->priv->gpm_proxy); + manager->priv->gpm_proxy = NULL; + } + + panel_power_manager_ensure_gpm_connection (manager, NULL); +} + +static gboolean +panel_power_manager_ensure_gpm_connection (PanelPowerManager *manager, + GError **error) +{ + GError *connection_error; + gboolean is_connected; + + connection_error = NULL; + if (manager->priv->dbus_connection == NULL) + { + manager->priv->dbus_connection = dbus_g_bus_get (DBUS_BUS_SESSION, + &connection_error); + + if (manager->priv->dbus_connection == NULL) + { + g_propagate_error (error, connection_error); + is_connected = FALSE; + goto out; + } + } + + g_assert (connection_error == NULL); + + if (manager->priv->bus_proxy == NULL) + { + manager->priv->bus_proxy = + dbus_g_proxy_new_for_name_owner (manager->priv->dbus_connection, + DBUS_SERVICE_DBUS, + DBUS_PATH_DBUS, + DBUS_INTERFACE_DBUS, + &connection_error); + + if (manager->priv->bus_proxy == NULL) + { + g_propagate_error (error, connection_error); + is_connected = FALSE; + goto out; + } + + dbus_g_proxy_add_signal (manager->priv->bus_proxy, + "NameOwnerChanged", + G_TYPE_STRING, + G_TYPE_STRING, + G_TYPE_STRING, + G_TYPE_INVALID); + dbus_g_proxy_connect_signal (manager->priv->bus_proxy, + "NameOwnerChanged", + G_CALLBACK (panel_power_manager_on_name_owner_changed), + manager, NULL); + } + + g_assert (connection_error == NULL); + + if (manager->priv->gpm_proxy == NULL) + { + manager->priv->gpm_proxy = + dbus_g_proxy_new_for_name_owner (manager->priv->dbus_connection, + "org.gnome.PowerManager", + "/org/gnome/PowerManager", + "org.gnome.PowerManager", + &connection_error); + + if (manager->priv->gpm_proxy == NULL) + { + g_propagate_error (error, connection_error); + is_connected = FALSE; + goto out; + } + } + is_connected = TRUE; + +out: + if (manager->priv->is_connected != is_connected) + { + manager->priv->is_connected = is_connected; + g_object_notify (G_OBJECT (manager), "is-connected"); + } + + if (!is_connected) + { + if (manager->priv->dbus_connection == NULL) + { + if (manager->priv->bus_proxy != NULL) + { + g_object_unref (manager->priv->bus_proxy); + manager->priv->bus_proxy = NULL; + } + + if (manager->priv->gpm_proxy != NULL) + { + g_object_unref (manager->priv->gpm_proxy); + manager->priv->gpm_proxy = NULL; + } + } + else if (manager->priv->bus_proxy == NULL) + { + if (manager->priv->gpm_proxy != NULL) + { + g_object_unref (manager->priv->gpm_proxy); + manager->priv->gpm_proxy = NULL; + } + } + } + + return is_connected; +} + +static void +panel_power_manager_init (PanelPowerManager *manager) +{ + GError *error; + + manager->priv = G_TYPE_INSTANCE_GET_PRIVATE (manager, + PANEL_TYPE_POWER_MANAGER, + PanelPowerManagerPrivate); + + manager->priv->dbus_connection = NULL; + manager->priv->bus_proxy = NULL; + manager->priv->gpm_proxy = NULL; + manager->priv->is_connected = FALSE; + + error = NULL; + if (!panel_power_manager_ensure_gpm_connection (manager, &error)) + { + g_message ("could not connect to power manager - %s", error->message); + g_error_free (error); + } +} + +static void +panel_power_manager_finalize (GObject * object) +{ + PanelPowerManager *manager; + GObjectClass *parent_class; + + manager = PANEL_POWER_MANAGER (object); + + parent_class = G_OBJECT_CLASS (panel_power_manager_parent_class); + + if (parent_class->finalize != NULL) + parent_class->finalize (object); +} + +static void +panel_power_manager_get_property (GObject * object, + guint prop_id, + GValue * value, GParamSpec * pspec) +{ + PanelPowerManager *manager = PANEL_POWER_MANAGER (object); + + switch (prop_id) + { + case PROP_IS_CONNECTED: + g_value_set_boolean (value, manager->priv->is_connected); + break; + + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + } +} + +GQuark +panel_power_manager_error_quark (void) +{ + static GQuark error_quark = 0; + + if (error_quark == 0) + error_quark = g_quark_from_static_string ("panel-power-manager-error"); + + return error_quark; +} + +PanelPowerManager * +panel_power_manager_new (void) +{ + PanelPowerManager *manager; + + manager = g_object_new (PANEL_TYPE_POWER_MANAGER, NULL); + + return manager; +} + +gboolean +panel_power_manager_can_sleep (PanelPowerManager *manager) +{ + GError *error; + gboolean can_sleep; + + error = NULL; + + if (!panel_power_manager_ensure_gpm_connection (manager, &error)) + { + g_message ("could not connect to power manager - %s", error->message); + g_error_free (error); + return FALSE; + } + + can_sleep = FALSE; + if (!dbus_g_proxy_call (manager->priv->gpm_proxy, "CanSuspend", &error, + G_TYPE_INVALID, + G_TYPE_BOOLEAN, &can_sleep, G_TYPE_INVALID)) + { + if (error != NULL) + { + g_message ("could not ask power manager if user can suspend - %s", + error->message); + g_error_free (error); + } + can_sleep = FALSE; + } + + return can_sleep; +} + +gboolean +panel_power_manager_can_sleep_and_power_down (PanelPowerManager *manager) +{ + GError *error; + gboolean can_sleep_and_power_down; + + error = NULL; + + if (!panel_power_manager_ensure_gpm_connection (manager, &error)) + { + g_message ("could not connect to power manager - %s", error->message); + g_error_free (error); + return FALSE; + } + + can_sleep_and_power_down = FALSE; + if (!dbus_g_proxy_call (manager->priv->gpm_proxy, "CanHibernate", &error, + G_TYPE_INVALID, + G_TYPE_BOOLEAN, &can_sleep_and_power_down, + G_TYPE_INVALID)) + { + if (error != NULL) + { + g_message ("could not ask power manager if user can suspend - %s", + error->message); + g_error_free (error); + } + can_sleep_and_power_down = FALSE; + } + + return can_sleep_and_power_down; +} + +PanelPowerManagerRequest * +panel_power_manager_request_sleep (PanelPowerManager *manager) +{ + GError *error; + + error = NULL; + + if (!panel_power_manager_ensure_gpm_connection (manager, &error)) + { + g_warning ("could not connect to power manager - %s", error->message); + g_error_free (error); + return NULL; + } + + if (!dbus_g_proxy_call (manager->priv->gpm_proxy, "Suspend", &error, + G_TYPE_INVALID, G_TYPE_INVALID) && (error != NULL)) + { + + GError *call_error; + g_warning ("could not ask power manager to suspend - %s", + error->message); + call_error = g_error_new_literal (PANEL_POWER_MANAGER_ERROR, + PANEL_POWER_MANAGER_ERROR_SLEEPING, + error->message); + g_error_free (error); + g_signal_emit (G_OBJECT (manager), + panel_power_manager_signals[REQUEST_FAILED], + 0, call_error); + g_error_free (call_error); + } + + return (PanelPowerManagerRequest *) !NULL; +} + +PanelPowerManagerRequest * +panel_power_manager_request_sleep_and_power_down (PanelPowerManager *manager) +{ + GError *error; + + error = NULL; + + if (!panel_power_manager_ensure_gpm_connection (manager, &error)) + { + g_warning ("could not connect to power manager - %s", error->message); + g_error_free (error); + return NULL; + } + + if (!dbus_g_proxy_call (manager->priv->gpm_proxy, "Hibernate", &error, + G_TYPE_INVALID, G_TYPE_INVALID) && (error != NULL)) + { + GError *call_error; + + g_warning ("could not ask power manager to hibernate - %s", + error->message); + call_error = g_error_new_literal (PANEL_POWER_MANAGER_ERROR, + PANEL_POWER_MANAGER_ERROR_SLEEPING_AND_POWERING_DOWN, + error->message); + g_error_free (error); + g_signal_emit (G_OBJECT (manager), + panel_power_manager_signals[REQUEST_FAILED], + 0, call_error); + g_error_free (call_error); + return NULL; + } + + return (PanelPowerManagerRequest *) !NULL; +} + +void +panel_power_manager_cancel_request (PanelPowerManager *manager, + PanelPowerManagerRequest *request) +{ +} + +PanelPowerManager * +panel_get_power_manager (void) +{ + static PanelPowerManager *manager = NULL; + + if (manager == NULL) + manager = panel_power_manager_new (); + + return g_object_ref (manager); +} + + +#ifdef PANEL_POWER_MANAGER_ENABLE_TEST + +#include +#include + +int +main (int argc, char **argv) +{ + PanelPowerManager *manager; + int exit_code; + + g_log_set_always_fatal (G_LOG_LEVEL_ERROR + | G_LOG_LEVEL_CRITICAL | G_LOG_LEVEL_WARNING); + + g_type_init (); + + g_print ("creating instance of 'power manager' object... "); + manager = panel_power_manager_new (); + g_print ("done\n"); + + g_print ("checking if user can put machine to sleep... "); + if (panel_power_manager_can_sleep (manager)) + g_print ("yes\n"); + else + g_print ("no\n"); + + g_print ("checking if user can hibernate machine... "); + if (panel_power_manager_can_sleep_and_power_down (manager)) + g_print ("yes\n"); + else + g_print ("no\n"); + + g_print ("attempting to suspend machine... "); + if (panel_power_manager_request_sleep (manager) != NULL) + g_print ("yes\n"); + else + g_print ("no\n"); + + g_print ("attempting to hibernate machine... "); + if (panel_power_manager_request_sleep_and_power_down (manager) != NULL) + g_print ("yes\n"); + else + g_print ("no\n"); + + g_print ("destroying previously created 'power manager' object... "); + g_object_unref (manager); + g_print ("done\n"); + + exit_code = 0; + + return exit_code; +} +#endif /* PANEL_POWER_MANAGER_ENABLE_TEST */ --- gnome-panel-2.14.0/configure.in.gpm-integration 2006-03-13 14:47:14.000000000 -0500 +++ gnome-panel-2.14.0/configure.in 2006-03-13 15:30:00.000000000 -0500 @@ -58,10 +58,12 @@ LIBGNOME_MENU_REQUIRED=2.11.1 LIBECAL_REQUIRED=0.0.97 LIBEDATASERVERUI_REQUIRED=1.2.0 CAIRO_REQUIRED=1.0.0 +DBUS_REQUIRED=0.60 +DBUS_GLIB_REQUIRED=0.60 dnl pkg-config dependency checks -PKG_CHECK_MODULES(PANEL, ORBit-2.0 >= $ORBIT_REQUIRED gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED gtk+-2.0 >= $GTK_REQUIRED libgnome-2.0 >= $LIBGNOME_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED gnome-vfs-2.0 >= $GNOME_VFS_REQUIRED libglade-2.0 >= $LIBGLADE_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libgnome-menu >= $LIBGNOME_MENU_REQUIRED) +PKG_CHECK_MODULES(PANEL, ORBit-2.0 >= $ORBIT_REQUIRED gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED gtk+-2.0 >= $GTK_REQUIRED libgnome-2.0 >= $LIBGNOME_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED gnome-vfs-2.0 >= $GNOME_VFS_REQUIRED libglade-2.0 >= $LIBGLADE_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libgnome-menu >= $LIBGNOME_MENU_REQUIRED dbus-1 >= $DBUS_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED) AC_SUBST(PANEL_CFLAGS) AC_SUBST(PANEL_LIBS) gnome-panel-2.14.0-remove-duplicate-entry.patch: lt.po | 3 --- 1 files changed, 3 deletions(-) --- NEW FILE gnome-panel-2.14.0-remove-duplicate-entry.patch --- --- gnome-panel-2.14.0/po/lt.po.remove-duplicate-entry 2006-03-13 15:43:09.000000000 -0500 +++ gnome-panel-2.14.0/po/lt.po 2006-03-13 15:43:12.000000000 -0500 @@ -2848,6 +2848,3 @@ msgstr "??t_aisas:" #: ../libpanel-applet/panel-test-applets.glade.h:5 msgid "_Prefs Dir:" msgstr "_Nustatym?? aplankas:" - -msgid "System" -msgstr "Sistema" Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/gnome-panel/devel/.cvsignore,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- .cvsignore 15 Feb 2006 05:26:02 -0000 1.39 +++ .cvsignore 13 Mar 2006 20:49:10 -0000 1.40 @@ -1,11 +1 @@ -gnome-panel-2.10.1.tar.bz2 -gnome-panel-2.11.4.tar.bz2 -gnome-panel-2.11.90.tar.bz2 -gnome-panel-2.12.1.tar.bz2 -gnome-panel-2.12.0.tar.bz2 -gnome-panel-2.13.2.tar.bz2 -gnome-panel-2.13.3.tar.bz2 -gnome-panel-2.13.4.tar.bz2 -gnome-panel-2.13.5.tar.bz2 -gnome-panel-2.13.90.tar.bz2 -gnome-panel-2.13.91.tar.bz2 +gnome-panel-2.14.0.tar.bz2 Index: gnome-panel.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-panel/devel/gnome-panel.spec,v retrieving revision 1.117 retrieving revision 1.118 diff -u -r1.117 -r1.118 --- gnome-panel.spec 28 Feb 2006 16:10:17 -0000 1.117 +++ gnome-panel.spec 13 Mar 2006 20:49:10 -0000 1.118 @@ -19,8 +19,8 @@ Summary: GNOME panel Name: gnome-panel -Version: 2.13.91 -Release: 5 +Version: 2.14.0 +Release: 1 URL: http://www.gnome.org Source0: ftp://ftp.gnome.org/pub/GNOME/pre-gnome2/sources/gnome-panel/%{name}-%{version}.tar.bz2 Source1: redhat-panel-default-setup.entries @@ -70,9 +70,10 @@ Patch4: gnome-panel-2.13.2-rename-system-menu.patch Patch5: gnome-panel-2.12.1-about-fedora.patch Patch6: gnome-panel-2.13.5-switch-user.patch -Patch7: gnome-panel-2.13.91-gpm-integration.patch +Patch7: gnome-panel-2.14.0-gpm-integration.patch Patch8: gnome-panel-2.13.90-use-beagle.patch Patch9: gnome-panel-2.13.91-ignore-unknown-options.patch +Patch10: gnome-panel-2.14.0-remove-duplicate-entry.patch Conflicts: gnome-power-manager < 2.13.5.0.20060207-1 @@ -103,6 +104,7 @@ %patch7 -p1 -b .gpm-integration %patch8 -p1 -b .use-beagle %patch9 -p1 -b .ignore-unknown-options +%patch10 -p1 -b .remove-duplicate-entry cp -f %{SOURCE1} gnome-panel/panel-default-setup.entries cp -f %{SOURCE2} m4 @@ -219,6 +221,9 @@ %{_datadir}/gtk-doc %changelog +* Mon Mar 13 2006 Ray Strode - 2.14.0-1 +- update to 2.14.0 + * Tue Feb 28 2006 Karsten Hopp 2.13.91-5 - Buildrequires: ORBit2-devel, which, libxml2-python, libX11-devel, libXt-devel, gnome-doc-utils, dbus-devel Index: sources =================================================================== RCS file: /cvs/dist/rpms/gnome-panel/devel/sources,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- sources 15 Feb 2006 05:26:02 -0000 1.39 +++ sources 13 Mar 2006 20:49:10 -0000 1.40 @@ -1 +1 @@ -6a23bffd45e29b21c727c01677798675 gnome-panel-2.13.91.tar.bz2 +85a2815aefd7d3c3acf93c588149b75b gnome-panel-2.14.0.tar.bz2 --- gnome-panel-2.13.91-gpm-integration.patch DELETED --- From fedora-cvs-commits at redhat.com Mon Mar 13 21:05:37 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 13 Mar 2006 16:05:37 -0500 Subject: rpms/kernel/devel kernel-2.6.spec,1.2048,1.2049 Message-ID: <200603132105.k2DL5a9G023911@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv23869 Modified Files: kernel-2.6.spec Log Message: disable slab debug again Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.2048 retrieving revision 1.2049 diff -u -r1.2048 -r1.2049 --- kernel-2.6.spec 13 Mar 2006 18:37:32 -0000 1.2048 +++ kernel-2.6.spec 13 Mar 2006 21:05:31 -0000 1.2049 @@ -1657,6 +1657,7 @@ %changelog * Mon Mar 13 2006 Dave Jones - 2.6.16-rc6-git1 +- Disable slab debug yet again. * Sat Mar 11 2006 Dave Jones - 2.6.16-rc6 From fedora-cvs-commits at redhat.com Mon Mar 13 21:05:37 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 13 Mar 2006 16:05:37 -0500 Subject: rpms/kernel/devel/configs config-generic, 1.159, 1.160 config-s390-generic, 1.11, 1.12 config-xen-generic, 1.12, 1.13 Message-ID: <200603132105.k2DL5bTW023904@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel/configs In directory cvs.devel.redhat.com:/tmp/cvs-serv23869/configs Modified Files: config-generic config-s390-generic config-xen-generic Log Message: disable slab debug again Index: config-generic =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/configs/config-generic,v retrieving revision 1.159 retrieving revision 1.160 diff -u -r1.159 -r1.160 --- config-generic 11 Mar 2006 20:37:38 -0000 1.159 +++ config-generic 13 Mar 2006 21:05:33 -0000 1.160 @@ -2404,22 +2404,26 @@ # CONFIG_DEBUG_KERNEL=y CONFIG_MAGIC_SYSRQ=y -CONFIG_DEBUG_SPINLOCK=y -CONFIG_DEBUG_HIGHMEM=y CONFIG_DEBUG_INFO=y -CONFIG_DEBUG_SPINLOCK_SLEEP=y # CONFIG_FRAME_POINTER is not set CONFIG_CC_OPTIMIZE_FOR_SIZE=y # CONFIG_DEBUG_DRIVER is not set # CONFIG_RCU_TORTURE_TEST is not set -CONFIG_BOOT_DELAY=y # Turn off these debug options for production kernels. -CONFIG_DEBUG_SLAB=y -CONFIG_DEBUG_SLAB_LEAK=y +# CONFIG_DEBUG_SLAB is not set # CONFIG_DEBUG_MUTEXES is not set # CONFIG_DEBUG_VM is not set +# These debug options are deliberatly left on. +# They aren't that much of a performance impact, and the value +# from getting out-of-tree modules fixed is worth the trade-off. +CONFIG_DEBUG_HIGHMEM=y +CONFIG_DEBUG_SPINLOCK=y +CONFIG_DEBUG_SPINLOCK_SLEEP=y +CONFIG_BOOT_DELAY=y +CONFIG_DEBUG_SLAB_LEAK=y + # # Security options # Index: config-s390-generic =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/configs/config-s390-generic,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- config-s390-generic 9 Feb 2006 21:45:33 -0000 1.11 +++ config-s390-generic 13 Mar 2006 21:05:33 -0000 1.12 @@ -144,13 +144,11 @@ # # Kernel hacking # -# The s390 used to blow up with slab debugging, recheck if it works now -CONFIG_DEBUG_SLAB=y # # S390 specific stack options; needs gcc 3.5 so off for now # -CONFIG_PACK_STACK=y +CONFIG_PACK_STACK=y # CONFIG_CHECK_STACK is not set # CONFIG_WARN_STACK is not set # CONFIG_SMALL_STACK is not set Index: config-xen-generic =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/configs/config-xen-generic,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- config-xen-generic 10 Mar 2006 20:51:52 -0000 1.12 +++ config-xen-generic 13 Mar 2006 21:05:33 -0000 1.13 @@ -83,7 +83,7 @@ # # Disabled until I figure out a way to make next_ram_page work -# +# # CONFIG_NETDUMP is not set # CONFIG_DISKDUMP is not set From fedora-cvs-commits at redhat.com Mon Mar 13 21:09:06 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 13 Mar 2006 16:09:06 -0500 Subject: rpms/file-roller/devel .cvsignore, 1.33, 1.34 file-roller.spec, 1.51, 1.52 sources, 1.34, 1.35 Message-ID: <200603132109.k2DL96nq024127@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/file-roller/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv24111 Modified Files: .cvsignore file-roller.spec sources Log Message: 2.14.0 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/file-roller/devel/.cvsignore,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- .cvsignore 28 Feb 2006 02:25:55 -0000 1.33 +++ .cvsignore 13 Mar 2006 21:09:03 -0000 1.34 @@ -19,3 +19,4 @@ file-roller-2.13.90.tar.bz2 file-roller-2.13.91.tar.bz2 file-roller-2.13.92.tar.bz2 +file-roller-2.14.0.tar.bz2 Index: file-roller.spec =================================================================== RCS file: /cvs/dist/rpms/file-roller/devel/file-roller.spec,v retrieving revision 1.51 retrieving revision 1.52 diff -u -r1.51 -r1.52 --- file-roller.spec 28 Feb 2006 02:25:55 -0000 1.51 +++ file-roller.spec 13 Mar 2006 21:09:03 -0000 1.52 @@ -10,7 +10,7 @@ Summary: File Roller is a tool for viewing and creating archives. Name: file-roller -Version: 2.13.92 +Version: 2.14.0 Release: 1 License: GPL @@ -107,6 +107,9 @@ %{_libdir}/nautilus/extensions-1.0/libnautilus-fileroller.so %changelog +* Mon Mar 13 2006 Matthias Clasen - 2.14.0-1 +- Update to 2.14.0 + * Mon Feb 27 2006 Matthias Clasen - 2.13.92-1 - Update to 2.13.92 Index: sources =================================================================== RCS file: /cvs/dist/rpms/file-roller/devel/sources,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- sources 28 Feb 2006 02:25:55 -0000 1.34 +++ sources 13 Mar 2006 21:09:03 -0000 1.35 @@ -1 +1 @@ -e6db26370b9014a564b43c3d908e2da8 file-roller-2.13.92.tar.bz2 +500a12d54a6c1211a92982171d30db16 file-roller-2.14.0.tar.bz2 From fedora-cvs-commits at redhat.com Mon Mar 13 21:12:22 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 13 Mar 2006 16:12:22 -0500 Subject: rpms/gnome-utils/devel .cvsignore, 1.43, 1.44 gnome-utils.spec, 1.101, 1.102 sources, 1.46, 1.47 Message-ID: <200603132112.k2DLCMGD024493@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/gnome-utils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv24475 Modified Files: .cvsignore gnome-utils.spec sources Log Message: 2.14.0 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/gnome-utils/devel/.cvsignore,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- .cvsignore 13 Mar 2006 15:18:08 -0000 1.43 +++ .cvsignore 13 Mar 2006 21:12:19 -0000 1.44 @@ -15,3 +15,4 @@ gnome-utils-2.14.0.tar.bz2 gucharmap-1.6.0.tar.bz2 gcalctool-5.7.32.tar.gz +zenity-2.14.0.tar.bz2 Index: gnome-utils.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-utils/devel/gnome-utils.spec,v retrieving revision 1.101 retrieving revision 1.102 diff -u -r1.101 -r1.102 --- gnome-utils.spec 13 Mar 2006 15:18:08 -0000 1.101 +++ gnome-utils.spec 13 Mar 2006 21:12:19 -0000 1.102 @@ -14,14 +14,14 @@ %define gcalctool_version 5.7.32 %define gucharmap_version 1.6.0 -%define zenity_version 2.13.90 +%define zenity_version 2.14.0 %define dbus_version 0.60 Summary: GNOME utility programs. Name: gnome-utils Version: 2.14.0 -Release: 2 +Release: 3 Epoch: 1 License: GPL Group: Applications/System @@ -227,6 +227,9 @@ %{_sysconfdir}/pam.d/gnome-system-log %changelog +* Mon Mar 13 2006 Matthias Clasen 2.14.0-3 +- Update to zenity 2.14.0 + * Mon Mar 13 2006 Matthias Clasen 2.14.0-2 - Update to gcalctool 5.7.32 Index: sources =================================================================== RCS file: /cvs/dist/rpms/gnome-utils/devel/sources,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- sources 13 Mar 2006 15:18:08 -0000 1.46 +++ sources 13 Mar 2006 21:12:19 -0000 1.47 @@ -1,4 +1,4 @@ -a5f7d3d6524f7f2da0978541c74aa40b zenity-2.13.90.tar.bz2 d1d16ff6bfc1f6ddc110d18ec4dfdbfa gnome-utils-2.14.0.tar.bz2 8af03f350c988d1565922b10776bc725 gucharmap-1.6.0.tar.bz2 c4d4234f6951389027399e9c596a8abe gcalctool-5.7.32.tar.gz +872f0f25a3c41b9a4e89cb3be9518e11 zenity-2.14.0.tar.bz2 From fedora-cvs-commits at redhat.com Mon Mar 13 21:16:22 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 13 Mar 2006 16:16:22 -0500 Subject: rpms/libwnck/devel .cvsignore, 1.30, 1.31 libwnck.spec, 1.43, 1.44 sources, 1.30, 1.31 Message-ID: <200603132116.k2DLGMHf025024@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/libwnck/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv24985 Modified Files: .cvsignore libwnck.spec sources Log Message: - Update to 2.14.0 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/libwnck/devel/.cvsignore,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- .cvsignore 28 Feb 2006 02:59:37 -0000 1.30 +++ .cvsignore 13 Mar 2006 21:16:12 -0000 1.31 @@ -1,10 +1 @@ -libwnck-2.11.91.tar.gz -libwnck-2.12.0.tar.bz2 -libwnck-2.12.1.tar.bz2 -libwnck-2.13.2.tar.bz2 -libwnck-2.13.3.tar.bz2 -libwnck-2.13.4.tar.bz2 -libwnck-2.13.5.tar.bz2 -libwnck-2.13.90.tar.bz2 -libwnck-2.13.91.tar.bz2 -libwnck-2.13.92.tar.bz2 +libwnck-2.14.0.tar.bz2 Index: libwnck.spec =================================================================== RCS file: /cvs/dist/rpms/libwnck/devel/libwnck.spec,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- libwnck.spec 28 Feb 2006 02:59:37 -0000 1.43 +++ libwnck.spec 13 Mar 2006 21:16:12 -0000 1.44 @@ -5,7 +5,7 @@ Summary: Window Navigator Construction Kit Name: libwnck -Version: 2.13.92 +Version: 2.14.0 Release: 1 URL: http://ftp.gnome.org/pub/GNOME/sources/libwnck/ Source0: %{name}-%{version}.tar.bz2 @@ -57,7 +57,7 @@ %install rm -rf $RPM_BUILD_ROOT -%makeinstall +make install DESTDIR=$RPM_BUILD_ROOT rm -f $RPM_BUILD_ROOT%{_libdir}/*.la @@ -87,6 +87,9 @@ %{_datadir}/gtk-doc/html/libwnck %changelog +* Mon Mar 13 2006 Ray Strode - 2.14.0-1 +- Update to 2.14.0 + * Mon Feb 27 2006 Matthias Clasen - 2.13.92-1 - Update to 2.13.92 Index: sources =================================================================== RCS file: /cvs/dist/rpms/libwnck/devel/sources,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- sources 28 Feb 2006 02:59:37 -0000 1.30 +++ sources 13 Mar 2006 21:16:12 -0000 1.31 @@ -1 +1 @@ -3ea5e4bf2a06ff64de2eeb02e7a3dd34 libwnck-2.13.92.tar.bz2 +fd592a8cef2a8ae7712a09cb10e48ed1 libwnck-2.14.0.tar.bz2 From fedora-cvs-commits at redhat.com Mon Mar 13 21:16:32 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 13 Mar 2006 16:16:32 -0500 Subject: rpms/eog/devel .cvsignore, 1.27, 1.28 eog.spec, 1.44, 1.45 sources, 1.27, 1.28 Message-ID: <200603132116.k2DLGWZI025098@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/eog/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv25045 Modified Files: .cvsignore eog.spec sources Log Message: 2.14.0 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/eog/devel/.cvsignore,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- .cvsignore 4 Mar 2006 05:40:44 -0000 1.27 +++ .cvsignore 13 Mar 2006 21:16:29 -0000 1.28 @@ -14,3 +14,4 @@ eog-2.13.90.tar.bz2 eog-2.13.91.tar.bz2 eog-2.13.92.tar.bz2 +eog-2.14.0.tar.bz2 Index: eog.spec =================================================================== RCS file: /cvs/dist/rpms/eog/devel/eog.spec,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- eog.spec 4 Mar 2006 05:40:44 -0000 1.44 +++ eog.spec 13 Mar 2006 21:16:29 -0000 1.45 @@ -12,7 +12,7 @@ Summary: Eye of GNOME image viewer Name: eog -Version: 2.13.92 +Version: 2.14.0 Release: 1 URL: http://www.gnome.org Source: ftp://ftp.gnome.org/pub/GNOME/pre-gnome2/sources/eog/%{name}-%{version}.tar.bz2 @@ -98,6 +98,9 @@ %{_sysconfdir}/gconf/schemas/*.schemas %changelog +* Mon Mar 13 2006 Matthias Clasen - 2.14.0-1 +- Update to 2.14.0 + * Sat Mar 4 2006 Matthias Clasen - 2.13.92-1 - Update to 2.13.92 - Drop upstreamed patch Index: sources =================================================================== RCS file: /cvs/dist/rpms/eog/devel/sources,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- sources 4 Mar 2006 05:40:44 -0000 1.27 +++ sources 13 Mar 2006 21:16:29 -0000 1.28 @@ -1 +1 @@ -9dfe7a92cd2aada2ef3800b1ae39c6fb eog-2.13.92.tar.bz2 +8e73c94511aeacdc79039fac238bb6b2 eog-2.14.0.tar.bz2 From fedora-cvs-commits at redhat.com Mon Mar 13 21:17:09 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 13 Mar 2006 16:17:09 -0500 Subject: rpms/gnome-utils/devel gnome-utils.spec,1.102,1.103 Message-ID: <200603132117.k2DLH9cH027886@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/gnome-utils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv26979 Modified Files: gnome-utils.spec Log Message: fix file names Index: gnome-utils.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-utils/devel/gnome-utils.spec,v retrieving revision 1.102 retrieving revision 1.103 diff -u -r1.102 -r1.103 --- gnome-utils.spec 13 Mar 2006 21:12:19 -0000 1.102 +++ gnome-utils.spec 13 Mar 2006 21:17:06 -0000 1.103 @@ -26,7 +26,7 @@ License: GPL Group: Applications/System Source: ftp://ftp.gnome.org/pub/GNOME/sources/gnome-utils/gnome-utils-%{version}.tar.bz2 -Source2: gcalctool-%{gcalctool_version}.tar.bz2 +Source2: gcalctool-%{gcalctool_version}.tar.gz Source3: gucharmap-%{gucharmap_version}.tar.bz2 Source4: zenity-%{zenity_version}.tar.bz2 Source5: gnome-system-log.console From fedora-cvs-commits at redhat.com Mon Mar 13 21:22:17 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 13 Mar 2006 16:22:17 -0500 Subject: rpms/gnome-session/devel gnome-session-2.13.5-critical.patch, NONE, 1.1 .cvsignore, 1.20, 1.21 gnome-session.spec, 1.63, 1.64 sources, 1.20, 1.21 Message-ID: <200603132122.k2DLMHsJ006138@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/gnome-session/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv5997 Modified Files: .cvsignore gnome-session.spec sources Added Files: gnome-session-2.13.5-critical.patch Log Message: 2.14.0 gnome-session-2.13.5-critical.patch: gsm-remove-client.c | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE gnome-session-2.13.5-critical.patch --- --- gnome-session-2.13.5/gnome-session/gsm-remove-client.c.critical 2006-02-17 23:59:31.000000000 -0500 +++ gnome-session-2.13.5/gnome-session/gsm-remove-client.c 2006-02-18 00:00:07.000000000 -0500 @@ -62,7 +62,7 @@ if (client->program != NULL) client_program = g_strdup (client->program); - else + else if (client->command != NULL) { char **argv = NULL; int argc; Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/gnome-session/devel/.cvsignore,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- .cvsignore 28 Feb 2006 18:46:50 -0000 1.20 +++ .cvsignore 13 Mar 2006 21:22:14 -0000 1.21 @@ -1 +1,2 @@ gnome-session-2.13.92.tar.bz2 +gnome-session-2.14.0.tar.bz2 Index: gnome-session.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-session/devel/gnome-session.spec,v retrieving revision 1.63 retrieving revision 1.64 diff -u -r1.63 -r1.64 --- gnome-session.spec 9 Mar 2006 19:57:33 -0000 1.63 +++ gnome-session.spec 13 Mar 2006 21:22:14 -0000 1.64 @@ -13,8 +13,8 @@ Summary: GNOME session manager Name: gnome-session -Version: 2.13.92 -Release: 5 +Version: 2.14.0 +Release: 1 URL: http://www.gnome.org Source0: %{name}-%{version}.tar.bz2 Source1: redhat-default-session @@ -168,6 +168,9 @@ %{_datadir}/gnome/autostart %changelog +* Mon Mar 13 2006 Matthias Clasen - 2.14.0-1 +- Update to 2.14.0 + * Thu Mar 09 2006 Ray Strode - 2.13.92-5 - fix up path creation functions Index: sources =================================================================== RCS file: /cvs/dist/rpms/gnome-session/devel/sources,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- sources 28 Feb 2006 18:46:50 -0000 1.20 +++ sources 13 Mar 2006 21:22:14 -0000 1.21 @@ -1 +1 @@ -71b9c1e96f28b4fc8674e06fc57bbdd4 gnome-session-2.13.92.tar.bz2 +def891553bda47cd660be80cf09fe0ee gnome-session-2.14.0.tar.bz2 From fedora-cvs-commits at redhat.com Mon Mar 13 21:23:03 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 13 Mar 2006 16:23:03 -0500 Subject: rpms/dasher/devel .cvsignore, 1.10, 1.11 dasher.spec, 1.35, 1.36 sources, 1.10, 1.11 Message-ID: <200603132123.k2DLN38f006295@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/dasher/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv6242 Modified Files: .cvsignore dasher.spec sources Log Message: - Update to 4.0.0 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/dasher/devel/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 27 Feb 2006 03:09:23 -0000 1.10 +++ .cvsignore 13 Mar 2006 21:23:00 -0000 1.11 @@ -1,9 +1 @@ -dasher-3.2.11.tar.bz2 -dasher-3.2.12.tar.bz2 -dasher-3.2.13.tar.bz2 -dasher-3.2.15.tar.bz2 -dasher-3.2.18.tar.bz2 -dasher-3.99.1.tar.bz2 -dasher-3.99.2.tar.bz2 -dasher-3.99.4.tar.bz2 -dasher-3.99.5.tar.bz2 +dasher-4.0.0.tar.bz2 Index: dasher.spec =================================================================== RCS file: /cvs/dist/rpms/dasher/devel/dasher.spec,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- dasher.spec 27 Feb 2006 03:21:29 -0000 1.35 +++ dasher.spec 13 Mar 2006 21:23:00 -0000 1.36 @@ -1,6 +1,6 @@ Summary: GNOME Accessibility method Name: dasher -Version: 3.99.5 +Version: 4.0.0 Release: 1 License: GPL Group: Desktop/Accessibility @@ -40,7 +40,7 @@ rm -rf $RPM_BUILD_ROOT export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 -%makeinstall +make install DESTDIR=$RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/gconf/schemas/ install -m 644 Data/dasher.schemas $RPM_BUILD_ROOT/%{_sysconfdir}/gconf/schemas/ @@ -93,6 +93,9 @@ %{_sysconfdir}/gconf/schemas/dasher.schemas %changelog +* Mon Mar 13 2006 Ray Strode - 4.0.0-1 +- Update to 4.0.0 + * Sun Feb 26 2006 Matthias Clasen - 3.99.5-1 - Update to 3.99.5 Index: sources =================================================================== RCS file: /cvs/dist/rpms/dasher/devel/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 27 Feb 2006 03:09:23 -0000 1.10 +++ sources 13 Mar 2006 21:23:00 -0000 1.11 @@ -1 +1 @@ -dc930a11b796aeb664f7a8fde7e77d61 dasher-3.99.5.tar.bz2 +257482ce4f98b0aa5dc01ff917eea4a6 dasher-4.0.0.tar.bz2 From fedora-cvs-commits at redhat.com Mon Mar 13 21:24:02 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 13 Mar 2006 16:24:02 -0500 Subject: rpms/gnome-utils/devel gnome-utils.spec,1.103,1.104 Message-ID: <200603132124.k2DLO2hg006425@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/gnome-utils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv6398 Modified Files: gnome-utils.spec Log Message: fix commands Index: gnome-utils.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-utils/devel/gnome-utils.spec,v retrieving revision 1.103 retrieving revision 1.104 diff -u -r1.103 -r1.104 --- gnome-utils.spec 13 Mar 2006 21:17:06 -0000 1.103 +++ gnome-utils.spec 13 Mar 2006 21:24:00 -0000 1.104 @@ -82,7 +82,7 @@ echo "NoDisplay=true" >> gfloppy.desktop.in popd -tar xjf %{SOURCE2} +tar xzf %{SOURCE2} tar xjf %{SOURCE3} tar xjf %{SOURCE4} From fedora-cvs-commits at redhat.com Mon Mar 13 21:35:27 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 13 Mar 2006 16:35:27 -0500 Subject: rpms/perl/FC-4 perl-5.8.6-bz178343.patch, 1.1, 1.2 perl.spec, 1.70, 1.71 Message-ID: <200603132135.k2DLZRsb007555@cvs.devel.redhat.com> Author: jvdias Update of /cvs/dist/rpms/perl/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv7533 Modified Files: perl-5.8.6-bz178343.patch perl.spec Log Message: fix bug 185242: ioctl 3rd arg length defaults to 256 if not specified; further fix for 178343: backport Configure cppsymbols generation from 5.8.8 perl-5.8.6-bz178343.patch: Configure | 39 +++++++++++++++++++++++++++++---------- utils/h2ph.PL | 17 ++++++++++++----- 2 files changed, 41 insertions(+), 15 deletions(-) Index: perl-5.8.6-bz178343.patch =================================================================== RCS file: /cvs/dist/rpms/perl/FC-4/perl-5.8.6-bz178343.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-5.8.6-bz178343.patch 2 Feb 2006 23:51:48 -0000 1.1 +++ perl-5.8.6-bz178343.patch 13 Mar 2006 21:35:22 -0000 1.2 @@ -1,6 +1,43 @@ ---- perl-5.8.6/Configure.bz178343 2005-12-14 13:25:11.000000000 -0500 -+++ perl-5.8.6/Configure 2006-02-02 18:46:23.000000000 -0500 -@@ -19727,6 +19727,17 @@ +--- perl-5.8.6/Configure.bz178343 2006-03-13 15:57:50.000000000 -0500 ++++ perl-5.8.6/Configure 2006-03-13 15:58:17.000000000 -0500 +@@ -19703,16 +19703,26 @@ + $startsh + cat <<'EOCP' > try.c + #include ++#if cpp_stuff == 1 ++#define STRINGIFY(a) "a" ++#endif ++#if cpp_stuff == 42 ++#define StGiFy(a) #a ++#define STRINGIFY(a) StGiFy(a) ++#endif ++#if $cpp_stuff != 1 && $cpp_stuff != 42 ++# include "Bletch: How does this C preprocessor stringify macros?" ++#endif + int main() { + EOCP + $awk \\ + EOSH + cat <<'EOSH' >> Cppsym.try + 'length($1) > 0 { +- printf "#ifdef %s\n#if %s+0\nprintf(\"%s=%%ld\\n\", (long)%s);\n#else\nprintf(\"%s\\n\");\n#endif\n#endif\n", $1, $1, $1, $1, $1 +- printf "#ifdef _%s\n#if _%s+0\nprintf(\"_%s=%%ld\\n\", (long)_%s);\n#else\nprintf(\"_%s\\n\");\n#endif\n#endif\n", $1, $1, $1, $1, $1 +- printf "#ifdef __%s\n#if __%s+0\nprintf(\"__%s=%%ld\\n\", (long)__%s);\n#else\nprintf(\"__%s\\n\");\n#endif\n#endif\n", $1, $1, $1, $1, $1 +- printf "#ifdef __%s__\n#if __%s__+0\nprintf(\"__%s__=%%ld\\n\", (long)__%s__);\n#else\nprintf(\"__%s__\\n\");\n#endif\n#endif\n", $1, $1, $1, $1, $1 ++ printf "#ifdef %s\nprintf(\"%s=%%s\\n\", STRINGIFY(%s));\n#endif\n", $1, $1, $1 ++ printf "#ifdef _%s\nprintf(\"_%s=%%s\\n\", STRINGIFY(_%s));\n#endif\n", $1, $1, $1 ++ printf "#ifdef __%s\nprintf(\"__%s=%%s\\n\", STRINGIFY(__%s));\n#endif\n", $1, $1, $1 ++ printf "#ifdef __%s__\nprintf(\"__%s__=%%s\\n\", STRINGIFY(__%s__));\n#endif\n", $1, $1, $1 + }' >> try.c + echo 'return 0;}' >> try.c + EOSH +@@ -19722,11 +19732,22 @@ + irix-) ccflags="\$ccflags -woff 1178" ;; + os2-*) ccflags="\$ccflags -Zlinker /PM:VIO" ;; + esac +-$cc -o try $optimize \$ccflags $ldflags try.c $libs && $run ./try ++$cc -o try -Dcpp_stuff=$cpp_stuff $optimize \$ccflags $ldflags try.c $libs && $run ./try | $sed 's/ /\\\\ /g' + EOSH chmod +x Cppsym.try $eunicefix Cppsym.try ./Cppsym < Cppsym.know > Cppsym.true @@ -18,8 +55,23 @@ : now check the C compiler for additional symbols postprocess_cc_v='' case "$osname" in ---- perl-5.8.6/utils/h2ph.PL.bz178343 2005-12-14 13:25:11.000000000 -0500 -+++ perl-5.8.6/utils/h2ph.PL 2006-02-02 18:46:23.000000000 -0500 +@@ -19758,11 +19779,9 @@ + + $awk '/\=/ { print $0; next } + { print $0"=1" }' ccsym.raw >ccsym.list +-$awk '/\=/ { print $0; next } +- { print $0"=1" }' Cppsym.true >ccsym.true +-$comm -13 ccsym.true ccsym.list >ccsym.own +-$comm -12 ccsym.true ccsym.list >ccsym.com +-$comm -23 ccsym.true ccsym.list >ccsym.cpp ++$comm -13 Cppsym.true ccsym.list >ccsym.own ++$comm -12 Cppsym.true ccsym.list >ccsym.com ++$comm -23 Cppsym.true ccsym.list >ccsym.cpp + also='' + if $test -z ccsym.raw; then + echo "Your C compiler doesn't seem to define any symbols!" >&4 +--- perl-5.8.6/utils/h2ph.PL.bz178343 2006-03-13 15:57:50.000000000 -0500 ++++ perl-5.8.6/utils/h2ph.PL 2006-03-13 15:57:53.000000000 -0500 @@ -776,8 +776,16 @@ if ($opt_D) { print PREAMBLE "# $_=$define{$_}\n"; Index: perl.spec =================================================================== RCS file: /cvs/dist/rpms/perl/FC-4/perl.spec,v retrieving revision 1.70 retrieving revision 1.71 diff -u -r1.70 -r1.71 --- perl.spec 3 Feb 2006 00:53:24 -0000 1.70 +++ perl.spec 13 Mar 2006 21:35:22 -0000 1.71 @@ -68,7 +68,7 @@ %define __perl_requires %{SOURCE11} -Conflicts: perl-NDBM_File <= 1:1.75-34.99.6 +# Conflicts: perl-NDBM_File <= 1:1.75-34.99.6 Obsoletes: perl-Digest-MD5 Obsoletes: perl-MIME-Base64 @@ -146,6 +146,8 @@ Patch178343: perl-5.8.6-bz178343.patch +Patch185242: perl-5.8.6-bz185242.patch + # module updatesd # Patch202: perl-5.8.0-Safe2.09.patch @@ -291,6 +293,8 @@ %patch178343 -p1 +%patch185242 -p1 + find . -name \*.orig -exec rm -fv {} \; %build @@ -431,12 +435,15 @@ mkdir -p $RPM_BUILD_ROOT/%{_libdir}/perl5/%{perlver}/Net install -m 0644 %{SOURCE12} $RPM_BUILD_ROOT/%{_libdir}/perl5/%{perlver}/Net/libnet.cfg -find $RPM_BUILD_ROOT -name '*HiRes*' | xargs rm -rfv -find $RPM_BUILD_ROOT -name '*Filter*' | xargs rm -rfv -find $RPM_BUILD_ROOT -name '*NDBM*' | xargs rm -rfv - -find $RPM_BUILD_ROOT -type f -name '*.bs' -a -empty -exec rm -f {} ';' - +# Remove conflicts with separate perl-Filter package (ONLY!): +rm -rf $RPM_BUILD_ROOT{%{_libdir}/perl5/%{perlver}/{,%{_arch}-%{_os}%{thread_arch}{,/auto}}/Filter,%{_mandir}/man3/Filter::*} || :; +# Remove conflicts with separate perl-Time-HiRes package (ONLY!): +rm -rf $RPM_BUILD_ROOT{%{_libdir}/perl5/%{perlver}/%{_arch}-%{_os}%{thread_arch}{,/auto}/Time,%{_mandir}/man3/Time::HiRes*} || :; +# Remove obsolete NDBM modules: +find $RPM_BUILD_ROOT -name '*NDBM*' -delete || :; +# Remove empty .bs files: +find $RPM_BUILD_ROOT -type f -name '*.bs' -a -empty -delete || :; +# Build MANIFEST: find $RPM_BUILD_ROOT -type f -or -type l > MANIFEST.all find $RPM_BUILD_ROOT -type d -printf "%%%%dir %p\n" >> MANIFEST.all @@ -482,6 +489,10 @@ %endif %changelog +* Mon Mar 03 2006 Jason Vas Dias - 3:5.8.6-24 +- fix bug 185242: restore default minimum ioctl 3rd arg length of 256 +- fix bug 84671: cleanup NDBM removal; restore DBM_Filter* . + * Thu Feb 02 2006 Jason Vas Dias - 3:5.8.6-24 - fix bug 178343: include cpp built-in macros in $Config{cppsymbols} From fedora-cvs-commits at redhat.com Mon Mar 13 21:36:38 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 13 Mar 2006 16:36:38 -0500 Subject: rpms/perl/FC-4 perl-5.8.6-bz185242.patch,NONE,1.1 Message-ID: <200603132136.k2DLacx1007610@cvs.devel.redhat.com> Author: jvdias Update of /cvs/dist/rpms/perl/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv7587 Added Files: perl-5.8.6-bz185242.patch Log Message: fix bug 185242: ioctl 3rd arg length defaults to 256 if not specified perl-5.8.6-bz185242.patch: perl.h | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE perl-5.8.6-bz185242.patch --- --- perl-5.8.6/perl.h.bz185242 2006-03-13 12:52:42.000000000 -0500 +++ perl-5.8.6/perl.h 2006-03-13 13:12:44.000000000 -0500 @@ -2265,7 +2265,7 @@ # else # ifdef _IOC_SIZE /* on Linux systems we're safe */ -# define IOCPARM_LEN(x) _IOC_SIZE(x) +# define IOCPARM_LEN(x) ( _IOC_SIZE(x) ? _IOC_SIZE(x) : 256 ) # else /* otherwise guess at what's safe (we're UNSAFE!) */ # warning "unsafe assumption of IOCPARM_LEN=256" From fedora-cvs-commits at redhat.com Mon Mar 13 21:46:32 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 13 Mar 2006 16:46:32 -0500 Subject: rpms/nautilus-cd-burner/devel .cvsignore, 1.29, 1.30 nautilus-cd-burner.spec, 1.52, 1.53 sources, 1.29, 1.30 Message-ID: <200603132146.k2DLkWLc023228@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/nautilus-cd-burner/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv21878 Modified Files: .cvsignore nautilus-cd-burner.spec sources Log Message: - Update to 2.14.0.1 * Mon Mar 13 2006 Matthias Clasen - 2.14.0-1 - Update to 2.14.0 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/nautilus-cd-burner/devel/.cvsignore,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- .cvsignore 13 Mar 2006 15:06:52 -0000 1.29 +++ .cvsignore 13 Mar 2006 21:46:29 -0000 1.30 @@ -1,22 +1 @@ -nautilus-cd-burner-2.7.6.tar.bz2 -nautilus-cd-burner-2.8.0.tar.bz2 -nautilus-cd-burner-2.8.1.tar.bz2 -nautilus-cd-burner-2.8.2.tar.bz2 -nautilus-cd-burner-2.8.3.tar.bz2 -nautilus-cd-burner-2.9.5.tar.bz2 -nautilus-cd-burner-2.9.6.tar.bz2 -nautilus-cd-burner-2.9.8.tar.bz2 -nautilus-cd-burner-2.10.0.tar.bz2 -nautilus-cd-burner-2.11.4.tar.bz2 -nautilus-cd-burner-2.11.5.tar.bz2 -nautilus-cd-burner-2.11.6.tar.bz2 -nautilus-cd-burner-2.12.0.tar.bz2 -nautilus-cd-burner-2.12.1.tar.bz2 -nautilus-cd-burner-2.13.2.tar.bz2 -nautilus-cd-burner-2.13.3.tar.bz2 -nautilus-cd-burner-2.13.4.tar.bz2 -nautilus-cd-burner-2.13.5.tar.bz2 -nautilus-cd-burner-2.13.90.tar.bz2 -nautilus-cd-burner-2.13.91.tar.bz2 -nautilus-cd-burner-2.13.92.tar.bz2 -nautilus-cd-burner-2.14.0.tar.bz2 +nautilus-cd-burner-2.14.0.1.tar.bz2 Index: nautilus-cd-burner.spec =================================================================== RCS file: /cvs/dist/rpms/nautilus-cd-burner/devel/nautilus-cd-burner.spec,v retrieving revision 1.52 retrieving revision 1.53 diff -u -r1.52 -r1.53 --- nautilus-cd-burner.spec 13 Mar 2006 15:06:52 -0000 1.52 +++ nautilus-cd-burner.spec 13 Mar 2006 21:46:29 -0000 1.53 @@ -1,6 +1,6 @@ Summary: Easy to use CD burning for Gnome Name: nautilus-cd-burner -Version: 2.14.0 +Version: 2.14.0.1 Release: 1 Source0: %{name}-%{version}.tar.bz2 License: LGPL/GPL @@ -60,7 +60,7 @@ %install rm -rf $RPM_BUILD_ROOT export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 -%makeinstall +make install DESTDIR=$RPM_BUILD_ROOT unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL %find_lang %name @@ -102,7 +102,10 @@ %changelog -* Mon Mar 13 2006 Matthias Clasen - 2.14.0-11 +* Mon Mar 13 2006 Ray Strode - 2.14.0.1-1 +- Update to 2.14.0.1 + +* Mon Mar 13 2006 Matthias Clasen - 2.14.0-1 - Update to 2.14.0 * Mon Feb 27 2006 Matthias Clasen - 2.13.92-2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/nautilus-cd-burner/devel/sources,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- sources 13 Mar 2006 15:06:52 -0000 1.29 +++ sources 13 Mar 2006 21:46:29 -0000 1.30 @@ -1 +1 @@ -f1624ead9d768b0149d1b91acb360d35 nautilus-cd-burner-2.14.0.tar.bz2 +f04a32baed530c3f6181f86cd79fd59e nautilus-cd-burner-2.14.0.1.tar.bz2 From fedora-cvs-commits at redhat.com Mon Mar 13 22:02:01 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 13 Mar 2006 17:02:01 -0500 Subject: rpms/grub/devel grub-0.97-once.patch,1.1,1.2 grub.spec,1.38,1.39 Message-ID: <200603132202.k2DM1mfQ015346@cvs.devel.redhat.com> Author: pjones Update of /cvs/dist/rpms/grub/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv15135 Modified Files: grub-0.97-once.patch grub.spec Log Message: - make "savedefault --once" work again (part of patch was dropped going from 0.95 to 0.97) grub-0.97-once.patch: builtins.c | 306 ++++++++++++++++++++++++++++++++++++------------------------- shared.h | 2 2 files changed, 183 insertions(+), 125 deletions(-) Index: grub-0.97-once.patch =================================================================== RCS file: /cvs/dist/rpms/grub/devel/grub-0.97-once.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- grub-0.97-once.patch 14 Dec 2005 22:50:23 -0000 1.1 +++ grub-0.97-once.patch 13 Mar 2006 22:00:51 -0000 1.2 @@ -343,3 +343,31 @@ /* Stage 2 identifiers */ #define STAGE2_ID_STAGE2 0 #define STAGE2_ID_FFS_STAGE1_5 1 +--- grub-0.97/stage2/builtins.c.bootonce 2006-03-13 16:55:11.000000000 -0500 ++++ grub-0.97/stage2/builtins.c 2006-03-13 16:56:01.000000000 -0500 +@@ -761,11 +761,25 @@ + }; + + ++#if !defined(SUPPORT_DISKLESS) && !defined(GRUB_UTIL) ++static int savedefault_helper(int); ++#endif + /* default */ + static int + default_func (char *arg, int flags) + { + #ifndef SUPPORT_DISKLESS ++#ifndef GRUB_UTIL ++ /* Has a forced once-only default been specified? */ ++ if ((saved_entryno & STAGE2_ONCEONLY_ENTRY) != 0) ++ { ++ int old_defaults=saved_entryno & ~STAGE2_ONCEONLY_ENTRY; ++ grub_timeout = 0; ++ default_entry = old_defaults >> 8; ++ savedefault_helper(old_defaults & 0xff); ++ return 0; ++ } ++#endif + if (grub_strcmp (arg, "saved") == 0) + { + default_entry = saved_entryno; Index: grub.spec =================================================================== RCS file: /cvs/dist/rpms/grub/devel/grub.spec,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- grub.spec 9 Mar 2006 16:03:21 -0000 1.38 +++ grub.spec 13 Mar 2006 22:00:53 -0000 1.39 @@ -1,6 +1,6 @@ Name: grub Version: 0.97 -Release: 4 +Release: 5 Summary: GRUB - the Grand Unified Boot Loader. Group: System Environment/Base License: GPL @@ -223,6 +223,9 @@ %{_datadir}/grub %changelog +* Mon Mar 13 2006 Peter Jones - 0.97-5 +- Fix merge error for "bootonce" patch (broken in 0.95->0.97 update) + * Mon Mar 9 2006 Peter Jones - 0.97-4 - Fix running "install" multiple times on the same fs in the same invocation of grub. (bz #158426 , patch from lxo at redhat.com) From fedora-cvs-commits at redhat.com Mon Mar 13 22:18:00 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 13 Mar 2006 17:18:00 -0500 Subject: rpms/kernel/devel linux-2.6-crashdump-common.patch, 1.10, 1.11 linux-2.6-crashdump-reboot-exports.patch, 1.3, 1.4 linux-2.6-debug-latency-tracing.patch, 1.9, 1.10 linux-2.6-debug-spinlock-panic.patch, 1.5, 1.6 linux-2.6-debug-taint-vm.patch, 1.5, 1.6 linux-2.6-dump_smp_call_function.patch, 1.5, 1.6 linux-2.6-tux.patch, 1.11, 1.12 Message-ID: <200603132218.k2DMI0qi031460@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv29222 Modified Files: linux-2.6-crashdump-common.patch linux-2.6-crashdump-reboot-exports.patch linux-2.6-debug-latency-tracing.patch linux-2.6-debug-spinlock-panic.patch linux-2.6-debug-taint-vm.patch linux-2.6-dump_smp_call_function.patch linux-2.6-tux.patch Log Message: Convert a bunch of exports to _GPL linux-2.6-crashdump-common.patch: linux-2.6.12/Documentation/sysrq.txt | 8 linux-2.6.12/arch/i386/kernel/nmi.c | 1 linux-2.6.12/arch/i386/kernel/traps.c | 3 linux-2.6.12/arch/i386/mm/init.c | 47 +++++ linux-2.6.12/arch/i386/mm/pgtable.c | 2 linux-2.6.12/arch/ia64/kernel/process.c | 30 ++- linux-2.6.12/arch/ia64/kernel/traps.c | 6 linux-2.6.12/arch/ia64/mm/contig.c | 3 linux-2.6.12/arch/ia64/mm/discontig.c | 3 linux-2.6.12/arch/ia64/mm/init.c | 90 +++++++++ linux-2.6.12/arch/powerpc/kernel/process.c | 1 linux-2.6.12/arch/powerpc/kernel/traps.c | 3 linux-2.6.12/arch/powerpc/mm/mem.c | 29 +++ linux-2.6.12/arch/s390/kernel/traps.c | 6 linux-2.6.12/arch/x86_64/kernel/process.c | 2 linux-2.6.12/arch/x86_64/kernel/traps.c | 6 linux-2.6.12/arch/x86_64/mm/init.c | 32 +++ linux-2.6.12/drivers/char/sysrq.c | 2 linux-2.6.12/include/asm-generic/crashdump.h | 47 +++++ linux-2.6.12/include/asm-i386/crashdump.h | 123 +++++++++++++ linux-2.6.12/include/asm-i386/kmap_types.h | 4 linux-2.6.12/include/asm-ia64/crashdump.h | 72 +++++++ linux-2.6.12/include/asm-powerpc/crashdump.h | 61 ++++++ linux-2.6.12/include/asm-x86_64/crashdump.h | 86 +++++++++ linux-2.6.12/include/linux/kernel.h | 18 + linux-2.6.12/kernel/Makefile | 2 linux-2.6.12/kernel/dump.c | 246 +++++++++++++++++++++++++++ linux-2.6.12/kernel/panic.c | 4 linux-2.6.12/kernel/printk.c | 20 ++ linux-2.6.12/kernel/sched.c | 2 linux-2.6.13/arch/x86_64/mm/fault.c | 1 linux-2.6.13/drivers/char/sysrq.c | 5 32 files changed, 951 insertions(+), 14 deletions(-) Index: linux-2.6-crashdump-common.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-crashdump-common.patch,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- linux-2.6-crashdump-common.patch 6 Mar 2006 16:31:46 -0000 1.10 +++ linux-2.6-crashdump-common.patch 13 Mar 2006 22:17:56 -0000 1.11 @@ -923,7 +923,7 @@ EXPORT_SYMBOL(release_lapic_nmi); EXPORT_SYMBOL(disable_timer_nmi_watchdog); EXPORT_SYMBOL(enable_timer_nmi_watchdog); -+EXPORT_SYMBOL(touch_nmi_watchdog); ++EXPORT_SYMBOL_GPL(touch_nmi_watchdog); --- linux-2.6.13/arch/x86_64/mm/fault.c~ 2005-09-13 00:42:55.000000000 -0400 +++ linux-2.6.13/arch/x86_64/mm/fault.c 2005-09-13 00:43:20.000000000 -0400 @@ -536,6 +536,7 @@ no_context: linux-2.6-crashdump-reboot-exports.patch: linux-2.6.12/arch/i386/kernel/process.c | 2 ++ linux-2.6.12/arch/i386/kernel/reboot.c | 4 ++++ linux-2.6.12/arch/powerpc/kernel/setup-common.c | 2 ++ linux-2.6.12/arch/powerpc/kernel/setup_64.c | 2 ++ linux-2.6.12/arch/s390/kernel/process.c | 2 ++ linux-2.6.12/arch/s390/kernel/setup.c | 4 ++++ linux-2.6.12/arch/x86_64/kernel/reboot.c | 4 ++++ linux-2.6.14/arch/ia64/kernel/process.c | 2 ++ 8 files changed, 22 insertions(+) Index: linux-2.6-crashdump-reboot-exports.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-crashdump-reboot-exports.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- linux-2.6-crashdump-reboot-exports.patch 11 Nov 2005 18:04:27 -0000 1.3 +++ linux-2.6-crashdump-reboot-exports.patch 13 Mar 2006 22:17:56 -0000 1.4 @@ -4,7 +4,7 @@ show_trace(0,(unsigned long *) regs->gprs[15]); } -+EXPORT_SYMBOL(show_regs); ++EXPORT_SYMBOL_GPL(show_regs); + extern void kernel_thread_starter(void); @@ -15,7 +15,7 @@ _machine_restart(command); } -+EXPORT_SYMBOL(machine_restart); ++EXPORT_SYMBOL_GPL(machine_restart); + void machine_halt(void) { @@ -23,7 +23,7 @@ _machine_halt(); } -+EXPORT_SYMBOL(machine_halt); ++EXPORT_SYMBOL_GPL(machine_halt); + void machine_power_off(void) { @@ -34,7 +34,7 @@ (void) notify_die(DIE_MACHINE_RESTART, restart_cmd, NULL, 0, 0, 0); (*efi.reset_system)(EFI_RESET_WARM, 0, 0, NULL); } -+EXPORT_SYMBOL(machine_restart); ++EXPORT_SYMBOL_GPL(machine_restart); void machine_halt (void) @@ -42,7 +42,7 @@ (void) notify_die(DIE_MACHINE_HALT, "", NULL, 0, 0, 0); cpu_halt(); } -+EXPORT_SYMBOL(machine_halt); ++EXPORT_SYMBOL_GPL(machine_halt); void machine_power_off (void) @@ -52,7 +52,7 @@ while (1) ; } -+EXPORT_SYMBOL(machine_restart); ++EXPORT_SYMBOL_GPL(machine_restart); + void machine_power_off(void) { @@ -63,7 +63,7 @@ while (1) ; } -+EXPORT_SYMBOL(machine_halt); ++EXPORT_SYMBOL_GPL(machine_halt); + static int ppc64_panic_event(struct notifier_block *this, unsigned long event, void *ptr) @@ -74,7 +74,7 @@ show_trace(NULL, ®s->esp); } -+EXPORT_SYMBOL(show_regs); ++EXPORT_SYMBOL_GPL(show_regs); + /* * This gets run with %ebx containing the @@ -85,13 +85,13 @@ machine_emergency_restart(); } -+EXPORT_SYMBOL(machine_restart); ++EXPORT_SYMBOL_GPL(machine_restart); + void machine_halt(void) { } -+EXPORT_SYMBOL(machine_halt); ++EXPORT_SYMBOL_GPL(machine_halt); + void machine_power_off(void) { @@ -102,13 +102,13 @@ machine_emergency_restart(); } -+EXPORT_SYMBOL(machine_restart); ++EXPORT_SYMBOL_GPL(machine_restart); + void machine_halt(void) { } -+EXPORT_SYMBOL(machine_halt); ++EXPORT_SYMBOL_GPL(machine_halt); + void machine_power_off(void) { linux-2.6-debug-latency-tracing.patch: kernel/latency.c | 4 linux-2.6.14/include/asm-x86_64/unistd.h | 1 linux-2.6.14/kernel/latency.c | 2 linux-latency-tracing.q/Makefile | 10 linux-latency-tracing.q/arch/arm/boot/compressed/head.S | 13 linux-latency-tracing.q/arch/arm/kernel/calls.S | 6 linux-latency-tracing.q/arch/arm/kernel/entry-common.S | 111 linux-latency-tracing.q/arch/arm/kernel/fiq.c | 4 linux-latency-tracing.q/arch/arm/kernel/irq.c | 4 linux-latency-tracing.q/arch/arm/kernel/traps.c | 2 linux-latency-tracing.q/arch/arm/mm/copypage-v4mc.c | 4 linux-latency-tracing.q/arch/arm/mm/copypage-xscale.c | 4 linux-latency-tracing.q/arch/arm/mm/fault.c | 14 linux-latency-tracing.q/arch/i386/Kconfig | 2 linux-latency-tracing.q/arch/i386/boot/compressed/misc.c | 8 linux-latency-tracing.q/arch/i386/kernel/Makefile | 1 linux-latency-tracing.q/arch/i386/kernel/entry.S | 41 linux-latency-tracing.q/arch/i386/kernel/irq.c | 8 linux-latency-tracing.q/arch/i386/kernel/mcount-wrapper.S | 27 linux-latency-tracing.q/arch/ppc/boot/Makefile | 9 linux-latency-tracing.q/arch/ppc/kernel/entry.S | 82 linux-latency-tracing.q/arch/x86_64/kernel/entry.S | 48 linux-latency-tracing.q/arch/x86_64/kernel/vsyscall.c | 2 linux-latency-tracing.q/fs/proc/proc_misc.c | 17 linux-latency-tracing.q/include/asm-arm/pgalloc.h | 4 linux-latency-tracing.q/include/asm-arm/timex.h | 10 linux-latency-tracing.q/include/asm-arm/unistd.h | 3 linux-latency-tracing.q/include/asm-i386/system.h | 8 linux-latency-tracing.q/include/linux/interrupt.h | 10 linux-latency-tracing.q/include/linux/latency_hist.h | 32 linux-latency-tracing.q/include/linux/linkage.h | 2 linux-latency-tracing.q/include/linux/preempt.h | 20 linux-latency-tracing.q/include/linux/sched.h | 86 linux-latency-tracing.q/init/main.c | 9 linux-latency-tracing.q/kernel/Makefile | 3 linux-latency-tracing.q/kernel/latency.c | 2390 ++++++++++++++ linux-latency-tracing.q/kernel/latency_hist.c | 267 + linux-latency-tracing.q/kernel/sched.c | 103 linux-latency-tracing.q/kernel/sysctl.c | 77 linux-latency-tracing.q/kernel/time.c | 19 linux-latency-tracing.q/lib/Kconfig.debug | 149 linux/arch/arm/boot/compressed/misc.c | 1 linux/arch/arm26/boot/compressed/misc.c | 1 linux/arch/i386/boot/compressed/misc.c | 1 linux/arch/ppc/boot/lib/Makefile | 48 linux/arch/x86_64/boot/compressed/misc.c | 1 linux/lib/inflate.c | 44 linux/lib/zlib_inflate/inftrees.c | 45 48 files changed, 3655 insertions(+), 102 deletions(-) Index: linux-2.6-debug-latency-tracing.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-debug-latency-tracing.patch,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- linux-2.6-debug-latency-tracing.patch 3 Jan 2006 15:29:58 -0000 1.9 +++ linux-2.6-debug-latency-tracing.patch 13 Mar 2006 22:17:56 -0000 1.10 @@ -2159,14 +2159,14 @@ + ___trace(TRACE_SPECIAL, CALLER_ADDR0, 0, v1, v2, v3); +} + -+EXPORT_SYMBOL(trace_special); ++EXPORT_SYMBOL_GPL(trace_special); + +void notrace trace_special_pid(int pid, unsigned long v1, unsigned long v2) +{ + ___trace(TRACE_SPECIAL_PID, CALLER_ADDR0, 0, pid, v1, v2); +} + -+EXPORT_SYMBOL(trace_special_pid); ++EXPORT_SYMBOL_GPL(trace_special_pid); + +void notrace trace_special_u64(unsigned long long v1, unsigned long v2) +{ @@ -2174,7 +2174,7 @@ + (unsigned long) (v1 >> 32), (unsigned long) (v1 & 0xFFFFFFFF), v2); +} + -+EXPORT_SYMBOL(trace_special_u64); ++EXPORT_SYMBOL_GPL(trace_special_u64); + +/* + * Non-inlined function: @@ -2186,7 +2186,7 @@ + +extern void mcount(void); + -+EXPORT_SYMBOL(mcount); ++EXPORT_SYMBOL_GPL(mcount); + +void notrace __mcount(void) +{ @@ -3077,7 +3077,7 @@ + atomic_dec(&tr->disabled); + } +} -+EXPORT_SYMBOL(touch_critical_timing); ++EXPORT_SYMBOL_GPL(touch_critical_timing); + +void notrace stop_critical_timing(void) +{ @@ -3085,7 +3085,7 @@ + + tr->critical_start = 0; +} -+EXPORT_SYMBOL(stop_critical_timing); ++EXPORT_SYMBOL_GPL(stop_critical_timing); + +static inline void notrace +__start_critical_timing(unsigned long eip, unsigned long parent_eip, int latency_type) @@ -3157,7 +3157,7 @@ + __start_critical_timing(CALLER_ADDR0, CALLER_ADDR1, INTERRUPT_LATENCY); +} + -+EXPORT_SYMBOL(trace_irqs_off); ++EXPORT_SYMBOL_GPL(trace_irqs_off); + +void notrace trace_irqs_on(void) +{ @@ -3171,7 +3171,7 @@ + __raw_local_irq_restore(flags); +} + -+EXPORT_SYMBOL(trace_irqs_on); ++EXPORT_SYMBOL_GPL(trace_irqs_on); + +#endif + @@ -3233,14 +3233,14 @@ +#endif + (void)eip, (void)parent_eip; +} -+EXPORT_SYMBOL(add_preempt_count_ti); ++EXPORT_SYMBOL_GPL(add_preempt_count_ti); + +void notrace add_preempt_count(unsigned int val) +{ + add_preempt_count_ti(current_thread_info(), val); +} + -+EXPORT_SYMBOL(add_preempt_count); ++EXPORT_SYMBOL_GPL(add_preempt_count); + +void notrace sub_preempt_count_ti(struct thread_info *ti, unsigned int val) +{ @@ -3272,14 +3272,14 @@ + ti->preempt_count -= val; +} + -+EXPORT_SYMBOL(sub_preempt_count_ti); ++EXPORT_SYMBOL_GPL(sub_preempt_count_ti); + +void notrace sub_preempt_count(unsigned int val) +{ + sub_preempt_count_ti(current_thread_info(), val); +} + -+EXPORT_SYMBOL(sub_preempt_count); ++EXPORT_SYMBOL_GPL(sub_preempt_count); + +void notrace mask_preempt_count(unsigned int mask) +{ @@ -3303,7 +3303,7 @@ +#endif + (void) eip, (void) parent_eip; +} -+EXPORT_SYMBOL(mask_preempt_count); ++EXPORT_SYMBOL_GPL(mask_preempt_count); + +void notrace unmask_preempt_count(unsigned int mask) +{ @@ -3322,7 +3322,7 @@ +#endif + preempt_count() &= ~mask; +} -+EXPORT_SYMBOL(unmask_preempt_count); ++EXPORT_SYMBOL_GPL(unmask_preempt_count); + + +#endif @@ -3663,7 +3663,7 @@ + return 0; +} + -+EXPORT_SYMBOL(user_trace_stop); ++EXPORT_SYMBOL_GPL(user_trace_stop); + +void stop_trace(void) +{ linux-2.6-debug-spinlock-panic.patch: spinlock_debug.c | 16 +++++++++++++++- 1 files changed, 15 insertions(+), 1 deletion(-) Index: linux-2.6-debug-spinlock-panic.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-debug-spinlock-panic.patch,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- linux-2.6-debug-spinlock-panic.patch 7 Dec 2005 07:20:11 -0000 1.5 +++ linux-2.6-debug-spinlock-panic.patch 13 Mar 2006 22:17:56 -0000 1.6 @@ -17,7 +17,7 @@ + nopanic = 1; + return 1; +} -+EXPORT_SYMBOL(nopanic); ++EXPORT_SYMBOL_GPL(nopanic); +__setup("dontpanic", nopanic_setup); + + linux-2.6-debug-taint-vm.patch: linux-2.6.11/include/asm-generic/bug.h | 8 ++++++-- linux-2.6.15/mm/page_alloc.c | 4 ++-- linux-2.6.15/mm/slab.c | 4 ++-- linux-2000/kernel/panic.c | 1 + 4 files changed, 11 insertions(+), 6 deletions(-) Index: linux-2.6-debug-taint-vm.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-debug-taint-vm.patch,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- linux-2.6-debug-taint-vm.patch 12 Jan 2006 23:52:50 -0000 1.5 +++ linux-2.6-debug-taint-vm.patch 13 Mar 2006 22:17:56 -0000 1.6 @@ -32,7 +32,7 @@ snprintf(buf, sizeof(buf), "Not tainted"); return(buf); } -+EXPORT_SYMBOL(print_tainted); ++EXPORT_SYMBOL_GPL(print_tainted); void add_taint(unsigned flag) { linux-2.6-dump_smp_call_function.patch: arch/i386/kernel/smp.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ arch/ia64/kernel/smp.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ arch/powerpc/kernel/smp.c | 45 ++++++++++++++++++++++++++++++++++++++++++++- arch/x86_64/kernel/smp.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ drivers/block/diskdump.c | 2 +- drivers/net/netdump.c | 2 +- include/linux/smp.h | 2 ++ 7 files changed, 181 insertions(+), 3 deletions(-) Index: linux-2.6-dump_smp_call_function.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-dump_smp_call_function.patch,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- linux-2.6-dump_smp_call_function.patch 5 Nov 2005 17:36:40 -0000 1.5 +++ linux-2.6-dump_smp_call_function.patch 13 Mar 2006 22:17:56 -0000 1.6 @@ -59,7 +59,7 @@ + /* Don't wait */ + spin_unlock(&dump_call_lock); +} -+EXPORT_SYMBOL(dump_smp_call_function); ++EXPORT_SYMBOL_GPL(dump_smp_call_function); + +/* * this function sends a 'generic call function' IPI to all other CPUs @@ -125,7 +125,7 @@ + spin_unlock(&dump_call_lock); +} + -+EXPORT_SYMBOL(dump_smp_call_function); ++EXPORT_SYMBOL_GPL(dump_smp_call_function); + +/* * This function sends a 'generic call function' IPI to all other CPUs @@ -187,7 +187,7 @@ + spin_unlock(&dump_call_lock); +} + -+EXPORT_SYMBOL(dump_smp_call_function); ++EXPORT_SYMBOL_GPL(dump_smp_call_function); /* * this function sends a 'generic call function' IPI to all other CPUs @@ -255,7 +255,7 @@ + /* Don't wait */ + spin_unlock(&dump_call_lock); +} -+EXPORT_SYMBOL(dump_smp_call_function); ++EXPORT_SYMBOL_GPL(dump_smp_call_function); void lock_ipi_call_lock(void) { linux-2.6-tux.patch: arch/alpha/kernel/systbls.S | 8 arch/i386/kernel/syscall_table.S | 10 arch/ia64/kernel/entry.S | 8 arch/ia64/kernel/ia64_ksyms.c | 5 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-generic/fcntl.h | 4 include/asm-i386/unistd.h | 5 include/asm-ia64/unistd.h | 2 include/asm-sparc/fcntl.h | 1 include/asm-sparc64/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 | 2 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 | 8 include/net/tcp.h | 3 include/net/tux.h | 804 ++++++++++++++ include/net/tux_u.h | 163 ++ kernel/exit.c | 7 kernel/fork.c | 1 kernel/kmod.c | 28 kernel/signal.c | 1 mm/filemap.c | 19 mm/truncate.c | 2 net/Kconfig | 1 net/Makefile | 1 net/core/sock.c | 5 net/ipv4/tcp.c | 3 net/ipv4/tcp_input.c | 1 net/ipv4/tcp_output.c | 3 net/socket.c | 197 ++- net/tux/Kconfig | 25 net/tux/Makefile | 12 net/tux/abuf.c | 190 +++ net/tux/accept.c | 863 +++++++++++++++ net/tux/cachemiss.c | 265 ++++ net/tux/cgi.c | 171 +++ net/tux/directory.c | 302 +++++ net/tux/extcgi.c | 329 +++++ net/tux/gzip.c | 40 net/tux/input.c | 641 +++++++++++ net/tux/logger.c | 837 ++++++++++++++ net/tux/main.c | 1417 +++++++++++++++++++++++++ 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 | 1555 +++++++++++++++++++++++++++ net/tux/proto_http.c | 2197 +++++++++++++++++++++++++++++++++++++++ net/tux/redirect.c | 172 +++ net/tux/times.c | 392 ++++++ net/tux/times.h | 26 net/tux/userspace.c | 27 72 files changed, 12775 insertions(+), 98 deletions(-) Index: linux-2.6-tux.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-tux.patch,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- linux-2.6-tux.patch 9 Feb 2006 21:45:32 -0000 1.11 +++ linux-2.6-tux.patch 13 Mar 2006 22:17:56 -0000 1.12 @@ -70,8 +70,8 @@ +#define __KERNEL_SYSCALLS__ +#include -+EXPORT_SYMBOL(sys_execve); -+EXPORT_SYMBOL(clone); ++EXPORT_SYMBOL_GPL(sys_execve); ++EXPORT_SYMBOL_GPL(clone); + /* from arch/ia64/lib */ extern void __divsi3(void); From fedora-cvs-commits at redhat.com Mon Mar 13 22:44:37 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 13 Mar 2006 17:44:37 -0500 Subject: rpms/grub/devel grub-0.97-mdadm-path.patch, 1.1, 1.2 grub-0.97-once.patch, 1.2, 1.3 grub.spec, 1.39, 1.40 Message-ID: <200603132244.k2DMibpp006080@cvs.devel.redhat.com> Author: pjones Update of /cvs/dist/rpms/grub/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv6048 Modified Files: grub-0.97-mdadm-path.patch grub-0.97-once.patch grub.spec Log Message: - get rid of grub 0.97's "default" stuff. grub-0.97-mdadm-path.patch: grub-install.in | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) Index: grub-0.97-mdadm-path.patch =================================================================== RCS file: /cvs/dist/rpms/grub/devel/grub-0.97-mdadm-path.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- grub-0.97-mdadm-path.patch 14 Dec 2005 22:50:23 -0000 1.1 +++ grub-0.97-mdadm-path.patch 13 Mar 2006 22:44:34 -0000 1.2 @@ -1,14 +1,13 @@ --- grub-0.97/util/grub-install.in.mdadm-path 2005-12-12 18:42:23.000000000 -0500 +++ grub-0.97/util/grub-install.in 2005-12-12 18:44:15.000000000 -0500 -@@ -30,6 +30,7 @@ +@@ -30,5 +30,6 @@ pkglibdir=${libdir}/${PACKAGE}/${host_cpu}-${host_vendor} grub_shell=${sbindir}/grub +mdadm=${sbindir}/mdadm - grub_set_default=${sbindir}/grub-set-default log_file=/tmp/grub-install.log.$$ img_file=/tmp/grub-install.img.$$ -@@ -218,7 +219,7 @@ +@@ -217,7 +218,7 @@ is_raid1_device () { case "$host_os" in linux*) @@ -17,7 +16,7 @@ awk '/Raid Level :/ {print $4}'` if [ "$level" = "raid1" ]; then return 0 -@@ -237,7 +238,7 @@ +@@ -236,7 +237,7 @@ linux*) if is_raid1_device $source_device ; then list="" grub-0.97-once.patch: stage2/builtins.c | 306 ++++++++++++++++++++++++++++++--------------------- stage2/shared.h | 2 stage2/stage2.c | 30 ----- util/grub-install.in | 4 4 files changed, 183 insertions(+), 159 deletions(-) Index: grub-0.97-once.patch =================================================================== RCS file: /cvs/dist/rpms/grub/devel/grub-0.97-once.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- grub-0.97-once.patch 13 Mar 2006 22:00:51 -0000 1.2 +++ grub-0.97-once.patch 13 Mar 2006 22:44:34 -0000 1.3 @@ -371,3 +371,64 @@ if (grub_strcmp (arg, "saved") == 0) { default_entry = saved_entryno; +--- grub-0.97/stage2/stage2.c.bootonce 2006-03-13 17:27:40.000000000 -0500 ++++ grub-0.97/stage2/stage2.c 2006-03-13 17:29:11.000000000 -0500 +@@ -960,38 +960,8 @@ + if (use_config_file) + #endif /* GRUB_UTIL */ + { +- char *default_file = (char *) DEFAULT_FILE_BUF; + int i; +- +- /* Get a saved default entry if possible. */ +- saved_entryno = 0; +- *default_file = 0; +- grub_strncat (default_file, config_file, DEFAULT_FILE_BUFLEN); +- for (i = grub_strlen(default_file); i >= 0; i--) +- if (default_file[i] == '/') +- { +- i++; +- break; +- } +- default_file[i] = 0; +- grub_strncat (default_file + i, "default", DEFAULT_FILE_BUFLEN - i); +- if (grub_open (default_file)) +- { +- char buf[10]; /* This is good enough. */ +- char *p = buf; +- int len; +- +- len = grub_read (buf, sizeof (buf)); +- if (len > 0) +- { +- buf[sizeof (buf) - 1] = 0; +- safe_parse_maxint (&p, &saved_entryno); +- } + +- grub_close (); +- } +- errnum = ERR_NONE; +- + do + { + /* STATE 0: Before any title command. +--- grub-0.97/util/grub-install.in.bootonce 2006-03-13 17:39:35.000000000 -0500 ++++ grub-0.97/util/grub-install.in 2006-03-13 17:39:50.000000000 -0500 +@@ -30,7 +30,6 @@ + pkglibdir=${libdir}/${PACKAGE}/${host_cpu}-${host_vendor} + + grub_shell=${sbindir}/grub +-grub_set_default=${sbindir}/grub-set-default + log_file=/tmp/grub-install.log.$$ + img_file=/tmp/grub-install.img.$$ + rootdir= +@@ -432,9 +431,6 @@ + exit 1 + fi + +-# Make a default file. +-${grub_set_default} --root-directory=${rootdir} default +- + # Make sure that GRUB reads the same images as the host OS. + test -n "$mkimg" && img_file=`$mkimg` + test -n "$mklog" && log_file=`$mklog` Index: grub.spec =================================================================== RCS file: /cvs/dist/rpms/grub/devel/grub.spec,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- grub.spec 13 Mar 2006 22:00:53 -0000 1.39 +++ grub.spec 13 Mar 2006 22:44:34 -0000 1.40 @@ -213,7 +213,6 @@ /boot/grub /sbin/grub /sbin/grub-install -/sbin/grub-set-default /sbin/grub-terminfo /sbin/grub-md5-crypt %{_bindir}/mbchk @@ -225,6 +224,8 @@ %changelog * Mon Mar 13 2006 Peter Jones - 0.97-5 - Fix merge error for "bootonce" patch (broken in 0.95->0.97 update) +- Get rid of the 0.97 "default" stuff, since it conflicts with our working + method. * Mon Mar 9 2006 Peter Jones - 0.97-4 - Fix running "install" multiple times on the same fs in the same invocation From fedora-cvs-commits at redhat.com Mon Mar 13 22:48:23 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 13 Mar 2006 17:48:23 -0500 Subject: rpms/anaconda/devel .cvsignore, 1.236, 1.237 anaconda.spec, 1.357, 1.358 sources, 1.356, 1.357 Message-ID: <200603132248.k2DMmNS4019727@cvs.devel.redhat.com> Author: katzj Update of /cvs/dist/rpms/anaconda/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv19681/devel Modified Files: .cvsignore anaconda.spec sources Log Message: auto-import anaconda-11.0.3-1 on branch devel from anaconda-11.0.3-1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/anaconda/devel/.cvsignore,v retrieving revision 1.236 retrieving revision 1.237 diff -u -r1.236 -r1.237 --- .cvsignore 9 Mar 2006 04:51:01 -0000 1.236 +++ .cvsignore 13 Mar 2006 22:48:19 -0000 1.237 @@ -1 +1 @@ -anaconda-11.0.2.tar.bz2 +anaconda-11.0.3.tar.bz2 Index: anaconda.spec =================================================================== RCS file: /cvs/dist/rpms/anaconda/devel/anaconda.spec,v retrieving revision 1.357 retrieving revision 1.358 diff -u -r1.357 -r1.358 --- anaconda.spec 9 Mar 2006 04:51:01 -0000 1.357 +++ anaconda.spec 13 Mar 2006 22:48:19 -0000 1.358 @@ -1,5 +1,5 @@ Name: anaconda -Version: 11.0.2 +Version: 11.0.3 Release: 1 License: GPL Summary: Graphical system installer @@ -79,6 +79,19 @@ /sbin/chkconfig --del reconfig >/dev/null 2>&1 || : %changelog +* Mon Mar 13 2006 Jeremy Katz - 11.0.3-1 +- Check for none in size test (clumens, #185172) +- Fix hard drive install (clumens) +- Don't clobber network on upgrade (pnasrat, #183203) +- Fix some simple syntax errors (#185275) +- Allow 128M PE sizes (#185272) + +* Thu Mar 9 2006 Jeremy Katz - 11.0.2-1 +- adjust blkid location +- don't try to download packages being erased (clumens, #184531) +- don't show group selection on upgrade (pnasrat, #184528) +- don't make file conflicts kill upgrades (pnasrat, #184461) + * Wed Mar 8 2006 Jeremy Katz - 11.0.2-1 - error handling on fs label reading (#184412) - add sis190 driver Index: sources =================================================================== RCS file: /cvs/dist/rpms/anaconda/devel/sources,v retrieving revision 1.356 retrieving revision 1.357 diff -u -r1.356 -r1.357 --- sources 9 Mar 2006 04:51:01 -0000 1.356 +++ sources 13 Mar 2006 22:48:19 -0000 1.357 @@ -1 +1 @@ -439ad7be0fd963fb243ff1567646341a anaconda-11.0.2.tar.bz2 +28d54aa986411e4863d065b2c37b0b80 anaconda-11.0.3.tar.bz2 From fedora-cvs-commits at redhat.com Mon Mar 13 22:52:52 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 13 Mar 2006 17:52:52 -0500 Subject: rpms/grub/devel grub-0.97-once.patch,1.3,1.4 Message-ID: <200603132252.k2DMqqQa021636@cvs.devel.redhat.com> Author: pjones Update of /cvs/dist/rpms/grub/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv21493 Modified Files: grub-0.97-once.patch Log Message: - get rid of grub-set-default entirely, since it has no chance of working grub-0.97-once.patch: configure | 3 configure.ac | 2 stage2/builtins.c | 306 ++++++++++++++++++++++++++++++--------------------- stage2/shared.h | 2 stage2/stage2.c | 30 ----- util/Makefile.am | 3 util/Makefile.in | 11 - util/grub-install.in | 4 8 files changed, 189 insertions(+), 172 deletions(-) Index: grub-0.97-once.patch =================================================================== RCS file: /cvs/dist/rpms/grub/devel/grub-0.97-once.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- grub-0.97-once.patch 13 Mar 2006 22:44:34 -0000 1.3 +++ grub-0.97-once.patch 13 Mar 2006 22:52:48 -0000 1.4 @@ -432,3 +432,82 @@ # Make sure that GRUB reads the same images as the host OS. test -n "$mkimg" && img_file=`$mkimg` test -n "$mklog" && log_file=`$mklog` +--- grub-0.97/configure.bootonce 2006-03-13 17:49:05.000000000 -0500 ++++ grub-0.97/configure 2006-03-13 17:49:16.000000000 -0500 +@@ -6135,7 +6135,7 @@ + + + +- ac_config_files="$ac_config_files Makefile stage1/Makefile stage2/Makefile docs/Makefile lib/Makefile util/Makefile grub/Makefile netboot/Makefile util/grub-image util/grub-install util/grub-md5-crypt util/grub-terminfo util/grub-set-default" ++ ac_config_files="$ac_config_files Makefile stage1/Makefile stage2/Makefile docs/Makefile lib/Makefile util/Makefile grub/Makefile netboot/Makefile util/grub-image util/grub-install util/grub-md5-crypt util/grub-terminfo" + + cat >confcache <<\_ACEOF + # This file is a shell script that caches the results of configure +@@ -6754,7 +6754,6 @@ + "util/grub-install" ) CONFIG_FILES="$CONFIG_FILES util/grub-install" ;; + "util/grub-md5-crypt" ) CONFIG_FILES="$CONFIG_FILES util/grub-md5-crypt" ;; + "util/grub-terminfo" ) CONFIG_FILES="$CONFIG_FILES util/grub-terminfo" ;; +- "util/grub-set-default" ) CONFIG_FILES="$CONFIG_FILES util/grub-set-default" ;; + "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; + "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; + *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 +--- grub-0.97/configure.ac.bootonce 2006-03-13 17:47:24.000000000 -0500 ++++ grub-0.97/configure.ac 2006-03-13 17:47:37.000000000 -0500 +@@ -666,5 +666,5 @@ + docs/Makefile lib/Makefile util/Makefile \ + grub/Makefile netboot/Makefile util/grub-image \ + util/grub-install util/grub-md5-crypt \ +- util/grub-terminfo util/grub-set-default]) ++ util/grub-terminfo]) + AC_OUTPUT +--- grub-0.97/util/Makefile.am.bootonce 2006-03-13 17:48:39.000000000 -0500 ++++ grub-0.97/util/Makefile.am 2006-03-13 17:48:45.000000000 -0500 +@@ -1,6 +1,5 @@ + bin_PROGRAMS = mbchk +-sbin_SCRIPTS = grub-install grub-md5-crypt grub-terminfo \ +- grub-set-default ++sbin_SCRIPTS = grub-install grub-md5-crypt grub-terminfo + noinst_SCRIPTS = grub-image mkbimage + + EXTRA_DIST = mkbimage +--- grub-0.97/util/Makefile.in.bootonce 2006-03-13 17:47:56.000000000 -0500 ++++ grub-0.97/util/Makefile.in 2006-03-13 17:48:34.000000000 -0500 +@@ -43,8 +43,7 @@ + subdir = util + DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(srcdir)/grub-image.in $(srcdir)/grub-install.in \ +- $(srcdir)/grub-md5-crypt.in $(srcdir)/grub-set-default.in \ +- $(srcdir)/grub-terminfo.in ++ $(srcdir)/grub-md5-crypt.in $(srcdir)/grub-terminfo.in + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/configure.ac +@@ -52,8 +51,7 @@ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = grub-image grub-install grub-md5-crypt \ +- grub-terminfo grub-set-default ++CONFIG_CLEAN_FILES = grub-image grub-install grub-md5-crypt grub-terminfo + am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(sbindir)" + binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) + PROGRAMS = $(bin_PROGRAMS) +@@ -183,8 +181,7 @@ + sharedstatedir = @sharedstatedir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-sbin_SCRIPTS = grub-install grub-md5-crypt grub-terminfo \ +- grub-set-default ++sbin_SCRIPTS = grub-install grub-md5-crypt grub-terminfo + + noinst_SCRIPTS = grub-image mkbimage + EXTRA_DIST = mkbimage +@@ -234,8 +231,6 @@ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ + grub-terminfo: $(top_builddir)/config.status $(srcdir)/grub-terminfo.in + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ +-grub-set-default: $(top_builddir)/config.status $(srcdir)/grub-set-default.in +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ + install-binPROGRAMS: $(bin_PROGRAMS) + @$(NORMAL_INSTALL) + test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)" From fedora-cvs-commits at redhat.com Mon Mar 13 23:12:02 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 13 Mar 2006 18:12:02 -0500 Subject: rpms/gdm/devel .cvsignore, 1.23, 1.24 gdm.spec, 1.141, 1.142 sources, 1.25, 1.26 gdm-2.13.0.9-disable-sounds-completely.patch, 1.1, NONE Message-ID: <200603132312.k2DNC2ob026478@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/gdm/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv26383 Modified Files: .cvsignore gdm.spec sources Removed Files: gdm-2.13.0.9-disable-sounds-completely.patch Log Message: - Update to 2.14.0 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/gdm/devel/.cvsignore,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- .cvsignore 28 Feb 2006 15:38:45 -0000 1.23 +++ .cvsignore 13 Mar 2006 23:11:59 -0000 1.24 @@ -1 +1 @@ -gdm-2.13.0.9.tar.bz2 +gdm-2.14.0.tar.bz2 Index: gdm.spec =================================================================== RCS file: /cvs/dist/rpms/gdm/devel/gdm.spec,v retrieving revision 1.141 retrieving revision 1.142 diff -u -r1.141 -r1.142 --- gdm.spec 7 Mar 2006 17:03:45 -0000 1.141 +++ gdm.spec 13 Mar 2006 23:11:59 -0000 1.142 @@ -14,8 +14,8 @@ Summary: The GNOME Display Manager. Name: gdm -Version: 2.13.0.9 -Release: 4 +Version: 2.14.0 +Release: 1 Epoch: 1 License: LGPL/GPL Group: User Interface/X @@ -43,7 +43,6 @@ Patch18: gdm-2.8.0.4-dont-call-xsm.patch Patch19: gdm-2.13.0.4-add-gnome-cflags.patch Patch22: gdm-2.13.0.7-pam_stack.patch -Patch23: gdm-2.13.0.9-disable-sounds-completely.patch BuildRoot: %{_tmppath}/gdm-%{PACKAGE_VERSION}-root @@ -115,7 +114,6 @@ %patch18 -p1 -b .dont-call-xsm %patch19 -p1 -b .add-gnome-cflags %patch22 -p1 -b .pam_stack -%patch23 -p1 -b .disable-sounds-completely # fix the time format for ja perl -pi -e "s|^msgstr \"%a %b %d, %H:%M\"|msgstr \"%m/%d \(%a\) %H:%M\"|; s|^msgstr \"%a %b %d, %I:%M %p\"|msgstr \"%m/%d \(%a\) %p %I:%M\"|" po/ja.po @@ -310,6 +308,9 @@ %attr(1770, root, gdm) %dir %{_localstatedir}/gdm %changelog +* Mon Mar 13 2006 Ray Strode - 1:2.14.0-1 +- Update to 2.14.0 + * Tue Mar 7 2006 Ray Strode - 1:2.13.0.9-4 - Follow Solaris's lead and default to AlwaysRestartServer=True (may work around bug 182957) Index: sources =================================================================== RCS file: /cvs/dist/rpms/gdm/devel/sources,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- sources 28 Feb 2006 15:38:45 -0000 1.25 +++ sources 13 Mar 2006 23:11:59 -0000 1.26 @@ -1 +1 @@ -ba35c31baeccdb65774b0fcec26d85ce gdm-2.13.0.9.tar.bz2 +1f82485c4e8cd8ca2f1523a91a624eff gdm-2.14.0.tar.bz2 --- gdm-2.13.0.9-disable-sounds-completely.patch DELETED --- From fedora-cvs-commits at redhat.com Mon Mar 13 23:16:04 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 13 Mar 2006 18:16:04 -0500 Subject: rpms/kernel/devel linux-2.6-xen-time-went-backwards.patch, NONE, 1.1 kernel-2.6.spec, 1.2049, 1.2050 Message-ID: <200603132316.k2DNG4lH032179@cvs.devel.redhat.com> Author: riel Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv31879 Modified Files: kernel-2.6.spec Added Files: linux-2.6-xen-time-went-backwards.patch Log Message: fix "Time went backwards" Xen kernel bug linux-2.6-xen-time-went-backwards.patch: time-xen.c | 16 +++++++++++++++- 1 files changed, 15 insertions(+), 1 deletion(-) --- NEW FILE linux-2.6-xen-time-went-backwards.patch --- --- linux-2.6.15.x86_64/arch/i386/kernel/time-xen.c.overflow 2006-03-10 00:35:53.000000000 -0500 +++ linux-2.6.15.x86_64/arch/i386/kernel/time-xen.c 2006-03-13 18:02:41.000000000 -0500 @@ -671,6 +671,10 @@ */ if (stolen > 0) { delta_cpu -= stolen; + if (unlikely(delta_cpu < 0)) { + stolen += delta_cpu; + delta_cpu = blocked = 0; + } do_div(stolen, NS_PER_TICK); per_cpu(processed_stolen_time, cpu) += stolen * NS_PER_TICK; per_cpu(processed_system_time, cpu) += stolen * NS_PER_TICK; @@ -684,13 +688,23 @@ */ if (blocked > 0) { delta_cpu -= blocked; + if (unlikely(delta_cpu < 0)) { + blocked += delta_cpu; + delta_cpu = 0; + } do_div(blocked, NS_PER_TICK); per_cpu(processed_blocked_time, cpu) += blocked * NS_PER_TICK; per_cpu(processed_system_time, cpu) += blocked * NS_PER_TICK; account_steal_time(idle_task(cpu), (cputime_t)blocked); } - /* Account user/system ticks. */ + /* + * Account user/system ticks. + * This gets excess time accounted when blocked and/or stolen get + * rounded down, but the "if (delta_cpu < 0)" tests above compensate + * for that to keep cpu local processed_system_time from advancing + * too far. + */ if (delta_cpu > 0) { do_div(delta_cpu, NS_PER_TICK); per_cpu(processed_system_time, cpu) += delta_cpu * NS_PER_TICK; Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.2049 retrieving revision 1.2050 diff -u -r1.2049 -r1.2050 --- kernel-2.6.spec 13 Mar 2006 21:05:31 -0000 1.2049 +++ kernel-2.6.spec 13 Mar 2006 23:16:02 -0000 1.2050 @@ -263,6 +263,7 @@ Patch709: linux-2.6-percpu-NR_CPUS-hotplug-fix.patch Patch710: linux-2.6-xen-kva-mmap.patch Patch711: linux-2.6-xen-disable_ati_timer_quirk.patch +Patch712: linux-2.6-xen-time-went-backwards.patch # # Patches 800 through 899 are reserved for bugfixes to the core system @@ -820,6 +821,7 @@ %patch709 -p1 %patch710 -p2 %patch711 -p1 +%patch712 -p1 %endif @@ -1655,6 +1657,9 @@ %endif %changelog +* Mon Mar 13 2006 Rik van Riel +- fix "Time went backwards" Xen kernel bug + * Mon Mar 13 2006 Dave Jones - 2.6.16-rc6-git1 - Disable slab debug yet again. From fedora-cvs-commits at redhat.com Mon Mar 13 23:48:40 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 13 Mar 2006 18:48:40 -0500 Subject: rpms/metacity/devel .cvsignore, 1.34, 1.35 metacity-2.13.144-bling.patch, 1.1, 1.2 metacity.spec, 1.62, 1.63 sources, 1.34, 1.35 Message-ID: <200603132348.k2DNmeAk032288@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/metacity/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv32195 Modified Files: .cvsignore metacity-2.13.144-bling.patch metacity.spec sources Log Message: - update to 2.14.0 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/metacity/devel/.cvsignore,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- .cvsignore 7 Mar 2006 05:09:39 -0000 1.34 +++ .cvsignore 13 Mar 2006 23:48:36 -0000 1.35 @@ -1,2 +1,2 @@ -libcm-0.0.16.0.2006.03.06.tar.bz2 -metacity-2.13.144.tar.bz2 +metacity-2.14.0.tar.bz2 +libcm-0.0.16.0.2006.03.07.tar.bz2 metacity-2.13.144-bling.patch: Makefile.am | 4 c-screen.c | 520 +++++++++++++++++++ c-screen.h | 40 + compositor.c | 1360 ++++++++++++---------------------------------------- display.c | 103 +++ errors.c | 40 + errors.h | 8 metacity.schemas.in | 14 prefs.c | 46 + prefs.h | 4 screen.c | 117 +++- spring-model.c | 410 +++++++++++++++ spring-model.h | 31 + window.c | 65 +- 14 files changed, 1654 insertions(+), 1108 deletions(-) Index: metacity-2.13.144-bling.patch =================================================================== RCS file: /cvs/dist/rpms/metacity/devel/metacity-2.13.144-bling.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- metacity-2.13.144-bling.patch 7 Mar 2006 05:09:41 -0000 1.1 +++ metacity-2.13.144-bling.patch 13 Mar 2006 23:48:36 -0000 1.2 @@ -38,16 +38,6 @@ gboolean last_request_was_roundtrip); --- metacity-2.13.144/src/window.c.bling 2006-03-06 23:10:00.000000000 -0500 +++ metacity-2.13.144/src/window.c 2006-03-06 23:18:42.000000000 -0500 -@@ -979,7 +979,8 @@ meta_window_free (MetaWindow *window) - if (window->display->focus_window == window) - window->display->focus_window = NULL; - -- unmaximize_window_before_freeing (window); -+ if (window->maximized_horizontally || window->maximized_vertically) -+ unmaximize_window_before_freeing (window); - - meta_window_unqueue_calc_showing (window); - meta_window_unqueue_move_resize (window); @@ -1319,6 +1320,7 @@ finish_minimize (gpointer data) meta_window_hide (window); if (window->has_focus) Index: metacity.spec =================================================================== RCS file: /cvs/dist/rpms/metacity/devel/metacity.spec,v retrieving revision 1.62 retrieving revision 1.63 diff -u -r1.62 -r1.63 --- metacity.spec 7 Mar 2006 05:09:41 -0000 1.62 +++ metacity.spec 13 Mar 2006 23:48:36 -0000 1.63 @@ -2,7 +2,7 @@ %define libcm_version 0.0.16 %define libcm_snapshot_date 2006.03.06 -%define metacity_version 2.13.144 +%define metacity_version 2.14.0 Summary: Metacity window manager Name: metacity @@ -142,6 +142,9 @@ %{_mandir}/man1/* %changelog +* Mon Mar 13 2006 Ray Strode - 2.14.0-1 +- update to 2.14.0 + * Mon Mar 6 2006 Ray Strode - 2.13.144-1 - update to 2.13.144 - add bling patch from HEAD Index: sources =================================================================== RCS file: /cvs/dist/rpms/metacity/devel/sources,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- sources 7 Mar 2006 05:09:41 -0000 1.34 +++ sources 13 Mar 2006 23:48:36 -0000 1.35 @@ -1,2 +1,2 @@ -eba1b4b6d6a18eb4fc28e35045b63b0e libcm-0.0.16.0.2006.03.06.tar.bz2 -81126bb03bfa77c63e1c49452a8e198c metacity-2.13.144.tar.bz2 +2480951fb0636d3fc6a78ab8a54f355d metacity-2.14.0.tar.bz2 +622fa01952a1285f7bb06c9259cfaf93 libcm-0.0.16.0.2006.03.07.tar.bz2 From fedora-cvs-commits at redhat.com Mon Mar 13 23:55:06 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 13 Mar 2006 18:55:06 -0500 Subject: rpms/metacity/devel .cvsignore,1.35,1.36 sources,1.35,1.36 Message-ID: <200603132355.k2DNt6Q5002799@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/metacity/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv2767 Modified Files: .cvsignore sources Log Message: update sources Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/metacity/devel/.cvsignore,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- .cvsignore 13 Mar 2006 23:48:36 -0000 1.35 +++ .cvsignore 13 Mar 2006 23:55:02 -0000 1.36 @@ -1,2 +1,2 @@ +libcm-0.0.16.0.2006.03.06.tar.bz2 metacity-2.14.0.tar.bz2 -libcm-0.0.16.0.2006.03.07.tar.bz2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/metacity/devel/sources,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- sources 13 Mar 2006 23:48:36 -0000 1.35 +++ sources 13 Mar 2006 23:55:02 -0000 1.36 @@ -1,2 +1,2 @@ +eba1b4b6d6a18eb4fc28e35045b63b0e libcm-0.0.16.0.2006.03.06.tar.bz2 2480951fb0636d3fc6a78ab8a54f355d metacity-2.14.0.tar.bz2 -622fa01952a1285f7bb06c9259cfaf93 libcm-0.0.16.0.2006.03.07.tar.bz2 From fedora-cvs-commits at redhat.com Tue Mar 14 00:24:16 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 13 Mar 2006 19:24:16 -0500 Subject: rpms/kernel/devel kernel-2.6.spec,1.2050,1.2051 Message-ID: <200603140024.k2E0OGAL010266@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv10247 Modified Files: kernel-2.6.spec Log Message: bug id. Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.2050 retrieving revision 1.2051 diff -u -r1.2050 -r1.2051 --- kernel-2.6.spec 13 Mar 2006 23:16:02 -0000 1.2050 +++ kernel-2.6.spec 14 Mar 2006 00:24:14 -0000 1.2051 @@ -1658,7 +1658,7 @@ %changelog * Mon Mar 13 2006 Rik van Riel -- fix "Time went backwards" Xen kernel bug +- fix "Time went backwards" Xen kernel bug. (#185317) * Mon Mar 13 2006 Dave Jones - 2.6.16-rc6-git1 From fedora-cvs-commits at redhat.com Tue Mar 14 02:03:41 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 13 Mar 2006 21:03:41 -0500 Subject: rpms/gnome-session/devel gnome-session.spec, 1.64, 1.65 gnome-session-2.13.92-fix-session-editing.patch, 1.1, NONE gnome-session-2.13.92-preserve-backward-compat.patch, 1.2, NONE Message-ID: <200603140203.k2E23fW4012331@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/gnome-session/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv12276 Modified Files: gnome-session.spec Removed Files: gnome-session-2.13.92-fix-session-editing.patch gnome-session-2.13.92-preserve-backward-compat.patch Log Message: - drop unused patches Index: gnome-session.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-session/devel/gnome-session.spec,v retrieving revision 1.64 retrieving revision 1.65 diff -u -r1.64 -r1.65 --- gnome-session.spec 13 Mar 2006 21:22:14 -0000 1.64 +++ gnome-session.spec 14 Mar 2006 02:03:02 -0000 1.65 @@ -51,8 +51,6 @@ Patch8: gnome-session-2.12.0-shaped.patch # too much crashing Patch9: gnome-session-2.13.4-no-crashes.patch -Patch10: gnome-session-2.13.92-preserve-backward-compat.patch -Patch11: gnome-session-2.13.92-fix-session-editing.patch Patch12: gnome-session-2.13.92-desensitize-invalid-buttons.patch Patch13: gnome-session-2.13.92-make-config-dir.patch @@ -87,8 +85,6 @@ %patch7 -p1 -b .user-share %patch8 -p1 -b .shaped %patch9 -p1 -b .no-crashes -%patch10 -p1 -b .preserve-backward-compat -%patch11 -p1 -b .fix-session-editing %patch12 -p1 -b .desensitize-invalid-buttons %patch13 -p1 -b .make-config-dir --- gnome-session-2.13.92-fix-session-editing.patch DELETED --- --- gnome-session-2.13.92-preserve-backward-compat.patch DELETED --- From fedora-cvs-commits at redhat.com Tue Mar 14 05:42:50 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 14 Mar 2006 00:42:50 -0500 Subject: rpms/evolution/devel evolution.spec,1.130,1.131 Message-ID: <200603140542.k2E5go0C011133@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/evolution/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv11120 Modified Files: evolution.spec Log Message: - enable file entry widget Index: evolution.spec =================================================================== RCS file: /cvs/dist/rpms/evolution/devel/evolution.spec,v retrieving revision 1.130 retrieving revision 1.131 diff -u -r1.130 -r1.131 --- evolution.spec 13 Mar 2006 19:16:49 -0000 1.130 +++ evolution.spec 14 Mar 2006 05:42:48 -0000 1.131 @@ -327,9 +327,9 @@ # Do the make, with various flags: %if %{require_function_declarations} -make %{?_smp_mflags} LIBTOOL=%{_bindir}/libtool CFLAGS="$CFLAGS -Werror-implicit-function-declaration" +make %{?_smp_mflags} LIBTOOL=%{_bindir}/libtool CFLAGS="$CFLAGS -Werror-implicit-function-declaration -UGNOME_DISABLE_DEPRECATED" %else -make %{?_smp_mflags} LIBTOOL=%{_bindir}/libtool CFLAGS="$CFLAGS" +make %{?_smp_mflags} LIBTOOL=%{_bindir}/libtool CFLAGS="$CFLAGS -UGNOME_DISABLE_DEPRECATED" %endif #cat /dev/null > default_user/local/Inbox/mbox From fedora-cvs-commits at redhat.com Tue Mar 14 06:01:42 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 14 Mar 2006 01:01:42 -0500 Subject: rpms/evolution/devel evolution-2.6.0-prototypes.patch,1.2,1.3 Message-ID: <200603140601.k2E61gD2001686@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/evolution/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv1611 Modified Files: evolution-2.6.0-prototypes.patch Log Message: add another explicit prototype evolution-2.6.0-prototypes.patch: cal-prefs-dialog.c | 1 + event-page.c | 2 ++ 2 files changed, 3 insertions(+) Index: evolution-2.6.0-prototypes.patch =================================================================== RCS file: /cvs/dist/rpms/evolution/devel/evolution-2.6.0-prototypes.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- evolution-2.6.0-prototypes.patch 13 Mar 2006 19:32:46 -0000 1.2 +++ evolution-2.6.0-prototypes.patch 14 Mar 2006 06:01:38 -0000 1.3 @@ -1,13 +1,14 @@ ---- evolution-2.6.0/calendar/gui/dialogs/alarm-dialog.c.prototypes 2006-03-13 14:29:57.000000000 -0500 -+++ evolution-2.6.0/calendar/gui/dialogs/alarm-dialog.c 2006-03-13 14:30:56.000000000 -0500 -@@ -41,6 +41,7 @@ - #include - #include - #include -+#include - #include - #include - #include +--- evolution-2.6.0/calendar/gui/dialogs/event-page.c.prototypes 2006-03-14 01:00:04.000000000 -0500 ++++ evolution-2.6.0/calendar/gui/dialogs/event-page.c 2006-03-14 01:00:21.000000000 -0500 +@@ -59,6 +59,8 @@ + #include "event-page.h" + #include "e-send-options-utils.h" + ++GtkWidget *alarm_list_dialog_peek (ECal *ecal, EAlarmList *list_store); ++ + + + /* Private part of the EventPage structure */ --- evolution-2.6.0/calendar/gui/dialogs/cal-prefs-dialog.c.prototypes 2006-03-13 14:14:07.000000000 -0500 +++ evolution-2.6.0/calendar/gui/dialogs/cal-prefs-dialog.c 2006-03-13 14:14:24.000000000 -0500 @@ -32,6 +32,7 @@ From fedora-cvs-commits at redhat.com Tue Mar 14 06:03:44 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 14 Mar 2006 01:03:44 -0500 Subject: rpms/evolution/devel evolution.spec,1.131,1.132 Message-ID: <200603140603.k2E63i7R001813@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/evolution/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv1756 Modified Files: evolution.spec Log Message: turn back off the implicit decls check Index: evolution.spec =================================================================== RCS file: /cvs/dist/rpms/evolution/devel/evolution.spec,v retrieving revision 1.131 retrieving revision 1.132 diff -u -r1.131 -r1.132 --- evolution.spec 14 Mar 2006 05:42:48 -0000 1.131 +++ evolution.spec 14 Mar 2006 06:03:41 -0000 1.132 @@ -31,7 +31,7 @@ # Upstream tarballs often contain instances of undeclared functions; these tend # to work on i386 but fail on 64-bit architectures. Leave this on to trap the # warnings as errors (and ideally get the flag into the upstream build): -%define require_function_declarations 1 +%define require_function_declarations 0 %define redhat_menus_version 5.0.4 From fedora-cvs-commits at redhat.com Tue Mar 14 06:16:19 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 14 Mar 2006 01:16:19 -0500 Subject: rpms/opal/devel opal.spec,1.6,1.7 Message-ID: <200603140616.k2E6GJQ2010462@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/opal/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv8964 Modified Files: opal.spec Log Message: - rebuild Index: opal.spec =================================================================== RCS file: /cvs/dist/rpms/opal/devel/opal.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- opal.spec 12 Mar 2006 23:14:08 -0000 1.6 +++ opal.spec 14 Mar 2006 06:16:16 -0000 1.7 @@ -1,7 +1,7 @@ Summary: Open Phone Abstraction Library Name: opal Version: 2.2.0 -Release: 1 +Release: 2 URL: http://www.openh323.org/ Source0: http://www.ekiga.org/%{name}-%{version}.tar.gz License: MPL @@ -56,6 +56,9 @@ %{_datadir}/opal %changelog +* Tue Mar 14 2006 Ray Strode - 2.2.0-2 +- rebuild + * Mon Mar 13 2006 Daniel Veillard - 2.2.0-1 - final version for ekiga-2.0.0 From fedora-cvs-commits at redhat.com Tue Mar 14 06:38:35 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 14 Mar 2006 01:38:35 -0500 Subject: rpms/evolution/devel evolution.spec,1.132,1.133 Message-ID: <200603140638.k2E6cZpV025191@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/evolution/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv25046 Modified Files: evolution.spec Log Message: remove legacy mime support files from the file list Index: evolution.spec =================================================================== RCS file: /cvs/dist/rpms/evolution/devel/evolution.spec,v retrieving revision 1.132 retrieving revision 1.133 diff -u -r1.132 -r1.133 --- evolution.spec 14 Mar 2006 06:03:41 -0000 1.132 +++ evolution.spec 14 Mar 2006 06:38:32 -0000 1.133 @@ -421,10 +421,6 @@ # IDL files (should this be in devel subpackage?) %{_datadir}/idl/evolution-%{evo_major} -# mime-info data: -%{_datadir}/mime-info/evolution-%{evo_major}.keys -%{_datadir}/mime-info/evolution-%{evo_major}.mime - # The main data directory # (have not attempted to split this up into an explicit list) %dir %{_datadir}/evolution From fedora-cvs-commits at redhat.com Tue Mar 14 06:57:37 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 14 Mar 2006 01:57:37 -0500 Subject: rpms/evolution/devel evolution.spec,1.133,1.134 Message-ID: <200603140657.k2E6vbDF013706@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/evolution/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv13383 Modified Files: evolution.spec Log Message: more mime cruft removal, and remove a desktop file that got renamed but we don't ship Index: evolution.spec =================================================================== RCS file: /cvs/dist/rpms/evolution/devel/evolution.spec,v retrieving revision 1.133 retrieving revision 1.134 diff -u -r1.133 -r1.134 --- evolution.spec 14 Mar 2006 06:38:32 -0000 1.133 +++ evolution.spec 14 Mar 2006 06:57:34 -0000 1.134 @@ -367,7 +367,10 @@ ln -sf ../desktop-menu-patches/redhat-evolution-tasks.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/ # remove upstream desktop file; use the symlinks from above (#103826) -rm -f $RPM_BUILD_ROOT/%{_datadir}/applications/evolution-%{evo_major}.desktop +rm -f $RPM_BUILD_ROOT/%{_datadir}/applications/evolution.desktop + +rm -f $RPM_BUILD_ROOT%{_datadir}/mime-info/evolution.keys +rm -f $RPM_BUILD_ROOT%{_datadir}/mime-info/evolution.mime # evolution link ln -sf ./evolution-%{evo_major} $RPM_BUILD_ROOT/%{_bindir}/evolution From fedora-cvs-commits at redhat.com Tue Mar 14 07:09:47 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 14 Mar 2006 02:09:47 -0500 Subject: rpms/ekiga/devel ekiga.spec,1.13,1.14 Message-ID: <200603140709.k2E79lAx015734@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/ekiga/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv15655 Modified Files: ekiga.spec Log Message: --disable-scrollkeeper Index: ekiga.spec =================================================================== RCS file: /cvs/dist/rpms/ekiga/devel/ekiga.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- ekiga.spec 13 Mar 2006 15:18:53 -0000 1.13 +++ ekiga.spec 14 Mar 2006 07:09:44 -0000 1.14 @@ -43,13 +43,13 @@ %build CXXFLAGS="$RPM_OPT_FLAGS -DLDAP_DEPRECATED=1 -fPIC" # We disable howl for now, waiting for ekiga 2.0 to ship with avahi support -%configure --disable-avahi +%configure --disable-avahi --disable-scrollkeeper make %install rm -rf $RPM_BUILD_ROOT export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 -%makeinstall +make install DESTDIR=$RPM_BUILD_ROOT unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL rm -rf $RPM_BUILD_ROOT/var/scrollkeeper From fedora-cvs-commits at redhat.com Tue Mar 14 08:39:54 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 14 Mar 2006 03:39:54 -0500 Subject: rpms/file/devel file-4.17-init-mem.patch, NONE, 1.1 file-4.17-mp3_flac.patch, NONE, 1.1 file-4.17-wctype-header.patch, NONE, 1.1 file.spec, 1.47, 1.48 Message-ID: <200603140839.k2E8dsuP014778@cvs.devel.redhat.com> Author: rvokal Update of /cvs/dist/rpms/file/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv14675 Modified Files: file.spec Added Files: file-4.17-init-mem.patch file-4.17-mp3_flac.patch file-4.17-wctype-header.patch Log Message: - fix segfault when compiling magic - add check for wctype.h - fix for flac and mp3 files file-4.17-init-mem.patch: apprentice.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) --- NEW FILE file-4.17-init-mem.patch --- --- file-4.17/src/apprentice.c +++ file-4.17/src/apprentice.c @@ -380,8 +380,8 @@ apprentice_file(struct magic_set *ms, st return -1; } - maxmagic = MAXMAGIS; - if ((marray = malloc(maxmagic * sizeof(*marray))) == NULL) { + maxmagic = MAXMAGIS; + if ((marray = calloc(maxmagic, sizeof(*marray))) == NULL) { (void)fclose(f); file_oomem(ms); return -1; @@ -509,7 +509,7 @@ parse(struct magic_set *ms, struct magic char *t; private const char *fops = FILE_OPS; uint32_t val; - uint32_t cont_level, cont_count; + uint32_t cont_level; cont_level = 0; file-4.17-mp3_flac.patch: audio | 34 +++++++++++++++++++++++++++++++++- 1 files changed, 33 insertions(+), 1 deletion(-) --- NEW FILE file-4.17-mp3_flac.patch --- --- file-4.17/magic/Magdir/audio.mp3 2006-03-02 22:45:25.000000000 +0100 +++ file-4.17/magic/Magdir/audio 2006-03-14 09:28:12.000000000 +0100 @@ -221,9 +221,41 @@ # SGI SoundTrack 0 string _SGI_SoundTrack SGI SoundTrack project file # ID3 version 2 tags -0 string ID3 MP3 file with ID3 version 2. +0 string ID3 Audio file with ID3 version 2 >3 ubyte <0xff \b%d. >4 ubyte <0xff \b%d tag +>2584 string fLaC \b, FLAC encoding +>>2588 byte&0x7f >0 \b, unknown version +>>2588 byte&0x7f 0 \b +# some common bits/sample values +>>>2600 beshort&0x1f0 0x030 \b, 4 bit +>>>2600 beshort&0x1f0 0x050 \b, 6 bit +>>>2600 beshort&0x1f0 0x070 \b, 8 bit +>>>2600 beshort&0x1f0 0x0b0 \b, 12 bit +>>>2600 beshort&0x1f0 0x0f0 \b, 16 bit +>>>2600 beshort&0x1f0 0x170 \b, 24 bit +>>>2600 byte&0xe 0x0 \b, mono +>>>2600 byte&0xe 0x2 \b, stereo +>>>2600 byte&0xe 0x4 \b, 3 channels +>>>2600 byte&0xe 0x6 \b, 4 channels +>>>2600 byte&0xe 0x8 \b, 5 channels +>>>2600 byte&0xe 0xa \b, 6 channels +>>>2600 byte&0xe 0xc \b, 7 channels +>>>2600 byte&0xe 0xe \b, 8 channels +# some common sample rates +>>>2597 belong&0xfffff0 0x0ac440 \b, 44.1 kHz +>>>2597 belong&0xfffff0 0x0bb800 \b, 48 kHz +>>>2597 belong&0xfffff0 0x07d000 \b, 32 kHz +>>>2597 belong&0xfffff0 0x056220 \b, 22.05 kHz +>>>2597 belong&0xfffff0 0x05dc00 \b, 24 kHz +>>>2597 belong&0xfffff0 0x03e800 \b, 16 kHz +>>>2597 belong&0xfffff0 0x02b110 \b, 11.025 kHz +>>>2597 belong&0xfffff0 0x02ee00 \b, 12 kHz +>>>2597 belong&0xfffff0 0x01f400 \b, 8 kHz +>>>2597 belong&0xfffff0 0x177000 \b, 96 kHz +>>>2597 belong&0xfffff0 0x0fa000 \b, 64 kHz +>>>2601 byte&0xf >0 \b, >4G samples +>2584 string !fLaC \b, MP3 encoding # NSF (NES sound file) magic 0 string NESM\x1a NES Sound File file-4.17-wctype-header.patch: configure.in | 1 + src/funcs.c | 3 +++ 2 files changed, 4 insertions(+) --- NEW FILE file-4.17-wctype-header.patch --- --- file-4.17/configure.in +++ file-4.17/configure.in @@ -88,6 +88,7 @@ AC_CHECK_HEADERS(utime.h) AC_CHECK_HEADERS(sys/utime.h) AC_CHECK_HEADERS(wchar.h) +AC_CHECK_HEADERS(wctype.h) dnl Checks for typedefs, structures, and compiler characteristics. AC_C_CONST --- file-4.17/src/funcs.c +++ file-4.17/src/funcs.c @@ -33,6 +33,9 @@ #if defined(HAVE_WCHAR_H) #include #endif +#if defined(HAVE_WCTYPE_H) +#include +#endif #ifndef lint FILE_RCSID("@(#)$Id: funcs.c,v 1.19 2006/03/02 22:10:26 christos Exp $") Index: file.spec =================================================================== RCS file: /cvs/dist/rpms/file/devel/file.spec,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- file.spec 13 Mar 2006 07:28:43 -0000 1.47 +++ file.spec 14 Mar 2006 08:39:51 -0000 1.48 @@ -3,7 +3,7 @@ Summary: A utility for determining file types. Name: file Version: 4.17 -Release: 1 +Release: 2 License: distributable Group: Applications/File Source0: ftp://ftp.astron.com/pub/file/file-%{version}.tar.gz @@ -15,6 +15,9 @@ Patch6: file-4.13-quick.patch Patch8: file-4.15-berkeley.patch Patch12: file-4.16-xen.patch +Patch13: file-4.17-init-mem.patch +Patch14: file-4.17-wctype-header.patch +Patch15: file-4.17-mp3_flac.patch BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildRequires: zlib-devel @@ -36,6 +39,9 @@ %patch6 -p1 -b .quick %patch8 -p1 -b .berkeley %patch12 -p1 -b .xen +%patch13 -p1 -b .mem +%patch14 -p1 -b .wctype +%patch15 -p1 -b .mp3 iconv -f iso-8859-1 -t utf-8 < doc/libmagic.man > doc/libmagic.man_ mv doc/libmagic.man_ doc/libmagic.man @@ -81,6 +87,11 @@ %{_libdir}/libmagic.* %changelog +* Tue Mar 14 2006 Radek Vok??l 4.17-2 +- fix segfault when compiling magic +- add check for wctype.h +- fix for flac and mp3 files + * Mon Mar 13 2006 Radek Vok??l 4.17-1 - upgrade to file-4.17, patch clean-up From fedora-cvs-commits at redhat.com Tue Mar 14 10:37:22 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 14 Mar 2006 05:37:22 -0500 Subject: rpms/selinux-policy/devel selinux-policy.spec,1.149,1.150 Message-ID: <200603141037.k2EAbMwq024547@cvs.devel.redhat.com> Author: karsten Update of /cvs/dist/rpms/selinux-policy/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv24197 Modified Files: selinux-policy.spec Log Message: - remove mkdir /usr/share/selinux/, it's not required and even wrong without a prepended $RPM_BUILD_ROOT (#185391) Index: selinux-policy.spec =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v retrieving revision 1.149 retrieving revision 1.150 diff -u -r1.149 -r1.150 --- selinux-policy.spec 9 Mar 2006 21:50:18 -0000 1.149 +++ selinux-policy.spec 14 Mar 2006 10:37:14 -0000 1.150 @@ -10,7 +10,7 @@ Summary: SELinux policy configuration Name: selinux-policy Version: 2.2.23 -Release: 15 +Release: 16 License: GPL Group: System Environment/Base Source: serefpolicy-%{version}.tgz @@ -151,7 +151,6 @@ install -m 644 man/man8/*.8 ${RPM_BUILD_ROOT}%{_mandir}/man8/ mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/selinux mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig -mkdir -p %{_usr}/share/selinux touch $RPM_BUILD_ROOT%{_sysconfdir}/selinux/config touch $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/selinux @@ -299,6 +298,9 @@ %fileList strict %changelog +* Tue Mar 14 2006 Karsten Hopp 2.2.23-16 +- fix buildroot usage (#185391) + * Thu Mar 9 2006 Dan Walsh 2.2.23-15 - Get rid of mount/fsdisk scan of /dev messages - Additional fixes for suspend/resume From fedora-cvs-commits at redhat.com Tue Mar 14 10:37:41 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 14 Mar 2006 05:37:41 -0500 Subject: rpms/openoffice.org/devel openoffice.org-2.0.2.ooo63155.sfx2.badscript.patch, NONE, 1.1 openoffice.org.spec, 1.639, 1.640 Message-ID: <200603141037.k2EAbfrE024610@cvs.devel.redhat.com> Author: caolanm Update of /cvs/dist/rpms/openoffice.org/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv24545 Modified Files: openoffice.org.spec Added Files: openoffice.org-2.0.2.ooo63155.sfx2.badscript.patch Log Message: fix for rh#185390# openoffice.org-2.0.2.ooo63155.sfx2.badscript.patch: sfx2/source/dialog/cfg.cxx | 2 +- source/dialog/cfg.cxx | 0 2 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE openoffice.org-2.0.2.ooo63155.sfx2.badscript.patch --- Index: source/dialog/cfg.cxx =================================================================== RCS file: /cvs/framework/sfx2/source/dialog/cfg.cxx,v retrieving revision 1.53 diff -u -p -u -r1.53 cfg.cxx --- openoffice.org.orig/sfx2/source/dialog/cfg.cxx 7 Sep 2005 18:12:28 -0000 1.53 +++ openoffice.org/sfx2/source/dialog/cfg.cxx 14 Mar 2006 10:50:22 -0000 @@ -1746,7 +1746,7 @@ void SfxConfigGroupListBox_Impl::Request bDisplay=FALSE; } } - if (children[n]->getType() != browse::BrowseNodeTypes::SCRIPT && bDisplay ) + if ( children[n].is() && children[n]->getType() != browse::BrowseNodeTypes::SCRIPT && bDisplay ) { /* Index: openoffice.org.spec =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v retrieving revision 1.639 retrieving revision 1.640 diff -u -r1.639 -r1.640 --- openoffice.org.spec 13 Mar 2006 12:40:43 -0000 1.639 +++ openoffice.org.spec 14 Mar 2006 10:37:25 -0000 1.640 @@ -204,6 +204,7 @@ Patch34: openoffice.org-2.0.2-ooo61841.vcl.honourfontconfigoverrides.patch Patch35: openoffice.org-2.0.2.ooo62030.solenv._version.patch Patch36: openoffice.org-2.0.2.oooXXXXX.config_office.noppds.patch +Patch37: openoffice.org-2.0.2.ooo63155.sfx2.badscript.patch %define instdir %{_libdir}/openoffice.org2.0 @@ -861,6 +862,7 @@ %patch34 -p1 -b .ooo61841.vcl.honourfontconfigoverrides.patch %patch35 -p1 -b .ooo62030.solenv._version.patch %patch36 -p1 -b .oooXXXXX.config_office.noppds.patch +%patch37 -p1 -b .ooo63155.sfx2.badscript.patch %if %{includingexternals} #start ludicrous workaround @@ -3349,6 +3351,7 @@ - ooo#59997# replacement opens___.ttf updated - drop integrated openoffice.org-2.0.0.ooo56651.sw.rtfcrash.patch - drop integrated openoffice.org-1.9.114.ooo51718.rpath.patch +- add openoffice.org-2.0.2.ooo63155.sfx2.badscript.patch for rh#185390# * Fri Mar 10 2006 Bill Nottingham - 1:2.0.2-5.2 - rebuild for PPC TLS issue (#184446) From fedora-cvs-commits at redhat.com Tue Mar 14 11:52:59 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 14 Mar 2006 06:52:59 -0500 Subject: rpms/glibc/FC-4 glibc-bz2013.patch, NONE, 1.1 glibc-dlsym-RTLD_NEXT.patch, NONE, 1.1 glibc-ldconfig-prelink.patch, NONE, 1.1 glibc-rh183350.patch, NONE, 1.1 glibc.spec, 1.165, 1.166 Message-ID: <200603141152.k2EBqxOL024157@cvs.devel.redhat.com> Author: jakub Update of /cvs/dist/rpms/glibc/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv24078 Modified Files: glibc.spec Added Files: glibc-bz2013.patch glibc-dlsym-RTLD_NEXT.patch glibc-ldconfig-prelink.patch glibc-rh183350.patch Log Message: 2.3.6-3 glibc-bz2013.patch: memccpy.S | 53 +++++++++++++++++++++++++++++++++++++++++++++-------- 1 files changed, 45 insertions(+), 8 deletions(-) --- NEW FILE glibc-bz2013.patch --- 2006-01-05 H.J. Lu [BZ #2013] * sysdeps/ia64/memccpy.S: Properly handle recovery for predicated speculative load. --- libc/sysdeps/ia64/memccpy.S 19 Nov 2003 06:11:26 -0000 1.7 +++ libc/sysdeps/ia64/memccpy.S 2 Mar 2006 04:49:27 -0000 1.8 @@ -183,27 +183,64 @@ ENTRY(memccpy) br.ret.sptk.many b0 .recovery1: - adds src = -(MEMLAT + 6 + 1) * 8, asrc +#if MEMLAT != 6 +# error "MEMLAT must be 6!" +#endif + adds src = -8, asrc mov loopcnt = ar.lc - mov tmp = ar.ec ;; + mov tmp = ar.ec + ;; +(p[0]) adds src = -8, src + ;; +(p[1]) adds src = -8, src sub sh1 = (MEMLAT + 6 + 1), tmp - shr.u sh2 = sh2, 3 - ;; + ;; +(p[2]) adds src = -8, src + ;; +(p[3]) adds src = -8, src shl loopcnt = loopcnt, 3 - sub src = src, sh2 + ;; +(p[4]) adds src = -8, src + ;; +(p[5]) adds src = -8, src shl sh1 = sh1, 3 + ;; +(p[6]) adds src = -8, src + ;; +(p[7]) adds src = -8, src shl tmp = tmp, 3 ;; +(p[8]) adds src = -8, src + ;; +(p[9]) adds src = -8, src + shr.u sh2 = sh2, 3 + ;; +(p[10]) adds src = -8, src + ;; +(p[11]) adds src = -8, src add len = len, loopcnt - add src = sh1, src ;; + ;; + sub src = src, sh2 + ;; add len = tmp, len -.back1: + add src = sh1, src br.cond.sptk .cpyfew .recovery2: - add tmp = -(MEMLAT + 3) * 8, src +#if MEMLAT != 6 +# error "MEMLAT must be 6!" +#endif + add tmp = -8, src (p7) br.cond.spnt .gotit ;; +(p[0]) add tmp = -8, tmp ;; +(p[1]) add tmp = -8, tmp ;; +(p[2]) add tmp = -8, tmp ;; +(p[3]) add tmp = -8, tmp ;; +(p[4]) add tmp = -8, tmp ;; +(p[5]) add tmp = -8, tmp ;; +(p[6]) add tmp = -8, tmp ;; +(p[7]) add tmp = -8, tmp ;; ld8 r[MEMLAT+2] = [tmp] ;; xor pos0[1] = r[MEMLAT+2], charx8 ;; czx1.r pos0[1] = pos0[1] ;; glibc-dlsym-RTLD_NEXT.patch: dl-sym.c | 2 +- do-lookup.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) --- NEW FILE glibc-dlsym-RTLD_NEXT.patch --- 2006-02-26 Ulrich Drepper * elf/do-lookup.h (do_lookup_x): No need to compare SKIP to NULL before comparison with MAP. * elf/dl-sym.c (do_sym): For RTLD_NEXT, pass MATCH to dl_lookup_symbol_x instead of L. --- libc/elf/dl-sym.c 6 Jan 2005 22:40:25 -0000 1.25 +++ libc/elf/dl-sym.c 26 Feb 2006 20:48:48 -0000 1.27 @@ -103,7 +103,7 @@ RTLD_NEXT used in code not dynamically l while (l->l_loader != NULL) l = l->l_loader; - result = GLRO(dl_lookup_symbol_x) (name, l, &ref, l->l_local_scope, + result = GLRO(dl_lookup_symbol_x) (name, match, &ref, l->l_local_scope, vers, 0, 0, match); } else --- libc/elf/do-lookup.h 18 Mar 2005 11:10:53 -0000 1.32 +++ libc/elf/do-lookup.h 26 Feb 2006 20:49:35 -0000 1.33 @@ -45,7 +45,7 @@ do_lookup_x (const char *undef_name, uns map = list[i]->l_real; /* Here come the extra test needed for `_dl_lookup_symbol_skip'. */ - if (skip != NULL && map == skip) + if (map == skip) continue; /* Don't search the executable when resolving a copy reloc. */ glibc-ldconfig-prelink.patch: ldconfig.c | 15 ++++++++++++++- 1 files changed, 14 insertions(+), 1 deletion(-) --- NEW FILE glibc-ldconfig-prelink.patch --- 2005-12-27 Jakub Jelinek * elf/ldconfig.c (search_dir): Skip prelink temporaries. --- libc/elf/ldconfig.c 1 Jan 2006 19:15:56 -0000 1.52 +++ libc/elf/ldconfig.c 6 Mar 2006 08:40:11 -0000 1.53 @@ -693,7 +693,20 @@ search_dir (const struct dir_entry *entr #endif !is_hwcap_platform (direntry->d_name))) continue; - len = strlen (entry->path) + strlen (direntry->d_name); + len = strlen (direntry->d_name); + /* Skip temporary files created by the prelink program. Files with + names like these are never really DSOs we want to look at. */ + if (len >= sizeof (".#prelink#") - 1) + { + if (strcmp (direntry->d_name + len - sizeof (".#prelink#") + 1, + ".#prelink#") == 0) + continue; + if (len >= sizeof (".#prelink#.XXXXXX") - 1 + && memcmp (direntry->d_name + len - sizeof (".#prelink#.XXXXXX") + + 1, ".#prelink#.", sizeof (".#prelink#.") - 1) == 0) + continue; + } + len += strlen (entry->path); if (len > file_name_len) { file_name_len = len + 1; glibc-rh183350.patch: Versions | 1 + res_data.c | 29 +++++++++++++++++++++++++++++ 2 files changed, 30 insertions(+) --- NEW FILE glibc-rh183350.patch --- 2006-03-14 Jakub Jelinek * resolv/res_data.c: Include sys/syscall.h and errno.h. (__res_iclose): New function. * resolv/Versions (libresolv): Export __res_iclose@@GLIBC_PRIVATE. --- libc/resolv/res_data.c.jj 2006-03-14 12:02:51.000000000 +0100 +++ libc/resolv/res_data.c 2006-03-14 12:06:58.000000000 +0100 @@ -38,6 +38,8 @@ static const char rcsid[] = "$BINDId: re #include #include #include +#include +#include const char *_res_opcodes[] = { "QUERY", @@ -321,6 +323,33 @@ local_hostname_length(const char *hostna #endif +#if defined _LIBC && defined SHARED +void +__attribute__((noinline)) +__res_iclose(res_state statp, bool free_addr) { + int ns, saved_errno = errno; + + if (statp->_vcsock >= 0) { + syscall (SYS_close, statp->_vcsock); + statp->_vcsock = -1; + statp->_flags &= ~(RES_F_VC | RES_F_CONN); + } + for (ns = 0; ns < MAXNS; ns++) + if (statp->_u._ext.nsaddrs[ns]) { + if (statp->_u._ext.nssocks[ns] != -1) { + syscall (SYS_close, + statp->_u._ext.nssocks[ns]); + statp->_u._ext.nssocks[ns] = -1; + } + if (free_addr) { + free (statp->_u._ext.nsaddrs[ns]); + statp->_u._ext.nsaddrs[ns] = NULL; + } + } + statp->_u._ext.nsinit = 0; + errno = saved_errno; +} +#endif #include --- libc/resolv/Versions.jj 2006-02-09 22:35:54.000000000 +0100 +++ libc/resolv/Versions 2006-03-14 12:08:57.000000000 +0100 @@ -79,6 +79,7 @@ libresolv { __ns_name_unpack; __ns_name_ntop; __ns_get16; __ns_get32; __libc_res_nquery; __libc_res_nsearch; + __res_iclose; } } Index: glibc.spec =================================================================== RCS file: /cvs/dist/rpms/glibc/FC-4/glibc.spec,v retrieving revision 1.165 retrieving revision 1.166 diff -u -r1.165 -r1.166 --- glibc.spec 23 Feb 2006 14:39:32 -0000 1.165 +++ glibc.spec 14 Mar 2006 11:52:56 -0000 1.166 @@ -3,7 +3,7 @@ %define glibcsrcdir glibc-20050524T1606 %define glibc_release_tarballs 0 %define glibcversion 2.3.6 -%define glibcrelease 2 +%define glibcrelease 3 %define auxarches i586 i686 athlon sparcv9 alphaev6 %define prelinkarches noarch %define nptlarches i386 i686 athlon x86_64 ia64 s390 s390x sparcv9 sparc64 ppc ppc64 @@ -89,6 +89,10 @@ Patch54: glibc-localedata-fixes.patch Patch55: glibc-i686-memset.patch Patch56: glibc-aio-rh171968.patch +Patch57: glibc-bz2013.patch +Patch58: glibc-dlsym-RTLD_NEXT.patch +Patch59: glibc-ldconfig-prelink.patch +Patch60: glibc-rh183350.patch Buildroot: %{_tmppath}/glibc-%{PACKAGE_VERSION}-root Obsoletes: zoneinfo, libc-static, libc-devel, libc-profile, libc-headers, Obsoletes: linuxthreads, gencat, locale, ldconfig, locale-ja @@ -410,6 +414,10 @@ %patch54 -p1 %patch55 -p1 #%patch56 -p1 +%patch57 -p1 +%patch58 -p1 +%patch59 -p1 +%patch60 -p1 sed -i -e 's/2.3.5/2.3.6/' version.h @@ -1456,6 +1464,13 @@ %endif %changelog +* Tue Mar 14 2006 Jakub Jelinek 2.3.6-3 +- ignore prelink temporaries in ldconfig (#176570) +- fix memccpy on ia64 (BZ#2013) +- provide __res_iclose@@GLIBC_PRIVATE symbol in libresolv.so.2 + to ease upgrades from older FC4 glibcs (#183350) +- fix dlsym (RTLD_NEXT, ...) + * Thu Feb 23 2006 Jakub Jelinek 2.3.6-2 - revert removal of i386/bits/string.h - avoid __sched_yield PLT slot in libc.so From fedora-cvs-commits at redhat.com Tue Mar 14 12:10:51 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 14 Mar 2006 07:10:51 -0500 Subject: rpms/glibc/FC-4 glibc-rh183350.patch,1.1,1.2 Message-ID: <200603141210.k2ECApZY020197@cvs.devel.redhat.com> Author: jakub Update of /cvs/dist/rpms/glibc/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv20185 Modified Files: glibc-rh183350.patch Log Message: 2.3.6-3 glibc-rh183350.patch: Versions | 1 + res_data.c | 29 +++++++++++++++++++++++++++++ 2 files changed, 30 insertions(+) Index: glibc-rh183350.patch =================================================================== RCS file: /cvs/dist/rpms/glibc/FC-4/glibc-rh183350.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- glibc-rh183350.patch 14 Mar 2006 11:52:56 -0000 1.1 +++ glibc-rh183350.patch 14 Mar 2006 12:10:32 -0000 1.2 @@ -26,14 +26,14 @@ + int ns, saved_errno = errno; + + if (statp->_vcsock >= 0) { -+ syscall (SYS_close, statp->_vcsock); ++ syscall (__NR_close, statp->_vcsock); + statp->_vcsock = -1; + statp->_flags &= ~(RES_F_VC | RES_F_CONN); + } + for (ns = 0; ns < MAXNS; ns++) + if (statp->_u._ext.nsaddrs[ns]) { + if (statp->_u._ext.nssocks[ns] != -1) { -+ syscall (SYS_close, ++ syscall (__NR_close, + statp->_u._ext.nssocks[ns]); + statp->_u._ext.nssocks[ns] = -1; + } From fedora-cvs-commits at redhat.com Tue Mar 14 12:17:24 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 14 Mar 2006 07:17:24 -0500 Subject: rpms/man-pages/devel man-pages-2.25-dbopen.patch, NONE, 1.1 .cvsignore, 1.20, 1.21 man-pages.spec, 1.37, 1.38 sources, 1.20, 1.21 Message-ID: <200603141217.k2ECHObE000307@cvs.devel.redhat.com> Author: varekova Update of /cvs/dist/rpms/man-pages/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv32758 Modified Files: .cvsignore man-pages.spec sources Added Files: man-pages-2.25-dbopen.patch Log Message: - update to 2.25 - remove mbind and set_mempolicy files - fix dbopen man page (#185310) man-pages-2.25-dbopen.patch: dbopen.3 | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE man-pages-2.25-dbopen.patch --- --- man-pages-2.25/man3/dbopen.3.pom 2006-03-14 12:07:54.000000000 +0100 +++ man-pages-2.25/man3/dbopen.3 2006-03-14 12:10:21.591863712 +0100 @@ -40,7 +40,7 @@ .ft B #include #include -#include +#include DB * dbopen(const char *file, int flags, int mode, DBTYPE type, Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/man-pages/devel/.cvsignore,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- .cvsignore 16 Jan 2006 12:32:25 -0000 1.20 +++ .cvsignore 14 Mar 2006 12:17:21 -0000 1.21 @@ -1,3 +1,3 @@ man-pages-extralocale.tar.bz2 man2.tar.gz -man-pages-2.21.tar.gz +man-pages-2.25.tar.gz Index: man-pages.spec =================================================================== RCS file: /cvs/dist/rpms/man-pages/devel/man-pages.spec,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- man-pages.spec 16 Jan 2006 12:32:25 -0000 1.37 +++ man-pages.spec 14 Mar 2006 12:17:21 -0000 1.38 @@ -1,6 +1,6 @@ Summary: Man (manual) pages from the Linux Documentation Project. Name: man-pages -Version: 2.21 +Version: 2.25 Release: 1 License: distributable Group: Documentation @@ -23,6 +23,7 @@ Patch20: man-pages-2.13-aio.patch Patch21: man-pages-2.16-mmap.patch Patch22: man-pages-2.20-nscd.conf.patch +Patch23: man-pages-2.25-dbopen.patch Buildroot: %{_tmppath}/%{name}-%{version}-root @@ -54,6 +55,7 @@ %patch20 -p1 %patch21 -p1 %patch22 -p1 +%patch23 -p1 %build @@ -112,6 +114,9 @@ # Part of libattr-devel rm -f man2/{fgetxattr,flistxattr,fremovexattr,fsetxattr,getxattr,lgetxattr,listxattr,llistxattr,lremovexattr,lsetxattr,removexattr,setxattr}.2* +# Part of numactl +rm -f man2/{mbind,set_mempolicy}.2 + find . -name "*sudo*" -exec rm {} \; for l1 in man[1-9]*/* @@ -147,6 +152,12 @@ %{_mandir}/en/man*/* %changelog +* Tue Mar 14 2006 Ivana Varekova 2.25-1 +- update to 2.25 +- remove mbind and set_mempolicy files +- fix dbopen man page (#185310) + + * Mon Jan 16 2006 Ivana Varekova 2.21-1 - update to 2.21 - add the description of reload-count option (nscd.conf Index: sources =================================================================== RCS file: /cvs/dist/rpms/man-pages/devel/sources,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- sources 16 Jan 2006 12:32:25 -0000 1.20 +++ sources 14 Mar 2006 12:17:21 -0000 1.21 @@ -1,3 +1,3 @@ 57f2e0500d177e05647990eae439a8ee man-pages-extralocale.tar.bz2 af09d031dcee66929510e078d00066f2 man2.tar.gz -b14c8c4bac497013d8d7f0e0701fc7bb man-pages-2.21.tar.gz +e08fe1037a97eaa9821e86427e1fdc98 man-pages-2.25.tar.gz From fedora-cvs-commits at redhat.com Tue Mar 14 12:56:26 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 14 Mar 2006 07:56:26 -0500 Subject: rpms/opal/devel .cvsignore, 1.2, 1.3 opal.spec, 1.7, 1.8 sources, 1.3, 1.4 Message-ID: <200603141256.k2ECuQLj032272@cvs.devel.redhat.com> Author: veillard Update of /cvs/dist/rpms/opal/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv32134 Modified Files: .cvsignore opal.spec sources Log Message: Opal 2.2.0 was borken, new release fixes it, Daniel Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/opal/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 12 Mar 2006 23:14:08 -0000 1.2 +++ .cvsignore 14 Mar 2006 12:56:22 -0000 1.3 @@ -1,2 +1,3 @@ opal-2.1.tar.gz opal-2.2.0.tar.gz +opal-2.2.1.tar.gz Index: opal.spec =================================================================== RCS file: /cvs/dist/rpms/opal/devel/opal.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- opal.spec 14 Mar 2006 06:16:16 -0000 1.7 +++ opal.spec 14 Mar 2006 12:56:22 -0000 1.8 @@ -1,7 +1,7 @@ Summary: Open Phone Abstraction Library Name: opal -Version: 2.2.0 -Release: 2 +Version: 2.2.1 +Release: 1 URL: http://www.openh323.org/ Source0: http://www.ekiga.org/%{name}-%{version}.tar.gz License: MPL @@ -56,6 +56,9 @@ %{_datadir}/opal %changelog +* Tue Mar 14 2006 Daniel Veillard - 2.2.1-1 +- last minute break fix and new release + * Tue Mar 14 2006 Ray Strode - 2.2.0-2 - rebuild Index: sources =================================================================== RCS file: /cvs/dist/rpms/opal/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 12 Mar 2006 23:14:08 -0000 1.3 +++ sources 14 Mar 2006 12:56:22 -0000 1.4 @@ -1 +1 @@ -aa1d4ffb4db30ed76dffeee9f24cc0e3 opal-2.2.0.tar.gz +bc6079100e831cf117597bb99b266a0c opal-2.2.1.tar.gz From fedora-cvs-commits at redhat.com Tue Mar 14 13:03:18 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 14 Mar 2006 08:03:18 -0500 Subject: rpms/kernel/devel linux-2.6-cell-is-cbea.patch, NONE, 1.1 kernel-2.6.spec, 1.2051, 1.2052 Message-ID: <200603141303.k2ED3I5t001653@cvs.devel.redhat.com> Author: dwmw2 Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv1553 Modified Files: kernel-2.6.spec Added Files: linux-2.6-cell-is-cbea.patch Log Message: Recognise 'IBM,CBEA' as Cell platform for future IBM Cell blades. linux-2.6-cell-is-cbea.patch: prom_init.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletion(-) --- NEW FILE linux-2.6-cell-is-cbea.patch --- diff --git a/arch/powerpc/kernel/prom_init.c b/arch/powerpc/kernel/prom_init.c index 813c2cd..b8c2183 100644 --- a/arch/powerpc/kernel/prom_init.c +++ b/arch/powerpc/kernel/prom_init.c @@ -1503,7 +1503,8 @@ static int __init prom_find_machine_type #ifdef CONFIG_PPC64 if (strstr(p, RELOC("Momentum,Maple"))) return PLATFORM_MAPLE; - if (strstr(p, RELOC("IBM,CPB"))) + if (strstr(p, RELOC("IBM,CPB")) || + strstr(p, RELOC("IBM,CBEA"))) return PLATFORM_CELL; #endif i += sl + 1; Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.2051 retrieving revision 1.2052 diff -u -r1.2051 -r1.2052 --- kernel-2.6.spec 14 Mar 2006 00:24:14 -0000 1.2051 +++ kernel-2.6.spec 14 Mar 2006 13:03:14 -0000 1.2052 @@ -237,6 +237,7 @@ # 300 - 399 ppc(64) Patch301: linux-2.6-cell-numa-init.patch +Patch302: linux-2.6-cell-is-cbea.patch Patch305: linux-2.6-cell-mambo-drivers.patch Patch306: linux-2.6-hvc-console.patch Patch310: linux-2.6-cell-spiderpic-no-devtree.patch @@ -763,6 +764,8 @@ # # Arnd says don't call cell_spumem_init() till he fixes it. %patch301 -p1 +# IBM will use 'IBM,CBEA' for future Cell systems +%patch302 -p1 # Support the IBM Mambo simulator; core as well as disk and network drivers. %patch305 -p1 # Make HVC console generic; support simulator console device using it. @@ -1657,6 +1660,9 @@ %endif %changelog +* Tue Mar 14 2006 David Woodhouse +- Recognise 'IBM,CBEA' as Cell platform too. + * Mon Mar 13 2006 Rik van Riel - fix "Time went backwards" Xen kernel bug. (#185317) From fedora-cvs-commits at redhat.com Tue Mar 14 13:48:43 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 14 Mar 2006 08:48:43 -0500 Subject: rpms/sane-backends/devel sane-backends.spec,1.55,1.56 Message-ID: <200603141348.k2EDmhSS009340@cvs.devel.redhat.com> Author: nphilipp Update of /cvs/dist/rpms/sane-backends/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv9237 Modified Files: sane-backends.spec Log Message: buildrequire automake, autoconf, libtool (#178596) don't require /sbin/ldconfig, /bin/mktemp, /bin/grep, /bin/cat, /bin/rm Index: sane-backends.spec =================================================================== RCS file: /cvs/dist/rpms/sane-backends/devel/sane-backends.spec,v retrieving revision 1.55 retrieving revision 1.56 diff -u -r1.55 -r1.56 --- sane-backends.spec 22 Feb 2006 13:17:03 -0000 1.55 +++ sane-backends.spec 14 Mar 2006 13:48:41 -0000 1.56 @@ -4,7 +4,7 @@ Summary: Scanner access software Name: sane-backends Version: 1.0.17 -Release: 4 +Release: 5 License: GPL (programs), relaxed LGPL (libraries), and public domain (docs) Group: System Environment/Libraries Source0: ftp://ftp.sane-project.org/pub/sane/%{name}-%{version}/%{name}-%{version}.tar.gz @@ -15,10 +15,10 @@ URL: http://www.sane-project.org BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%__id_u -n) BuildRequires: tetex-latex libusb-devel libieee1284-devel libjpeg-devel +BuildRequires: automake autoconf libtool %if %{gphoto2_support} BuildRequires: gphoto2-devel %endif -Prereq: /sbin/ldconfig, /bin/mktemp, /bin/grep, /bin/cat, /bin/rm Requires: pam >= 0.78-2, udev ExcludeArch: s390 s390x @@ -76,8 +76,9 @@ # We patched configure.in, so regenerate configure. sed '/^# libtool\.m4/,$d' < acinclude.m4 > acinclude.m4.new mv -f acinclude.m4{.new,} -aclocal libtoolize --force --copy +aclocal +automake autoconf %build @@ -155,6 +156,10 @@ %{_docdir}/%{name}-%{version}/sane.ps %changelog +* Tue Mar 14 2006 Nils Philippsen - 1.0.17-5 +- buildrequire automake, autoconf, libtool (#178596) +- don't require /sbin/ldconfig, /bin/mktemp, /bin/grep, /bin/cat, /bin/rm + * Thu Feb 22 2006 Nils Philippsen - 1.0.17-4 - split off generated documentation into separate subpackage to avoid conflicts on multilib systems From fedora-cvs-commits at redhat.com Tue Mar 14 14:01:02 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 14 Mar 2006 09:01:02 -0500 Subject: rpms/ekiga/devel .cvsignore, 1.3, 1.4 ekiga.spec, 1.14, 1.15 sources, 1.3, 1.4 Message-ID: <200603141401.k2EE1267007708@cvs.devel.redhat.com> Author: veillard Update of /cvs/dist/rpms/ekiga/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv7678 Modified Files: .cvsignore ekiga.spec sources Log Message: Bug fix release, Daniel Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/ekiga/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 12 Mar 2006 23:20:55 -0000 1.3 +++ .cvsignore 14 Mar 2006 14:00:59 -0000 1.4 @@ -1,3 +1,4 @@ ekiga-1.99.0.tar.gz ekiga-1.99.1.tar.gz ekiga-2.0.0.tar.gz +ekiga-2.0.1.tar.gz Index: ekiga.spec =================================================================== RCS file: /cvs/dist/rpms/ekiga/devel/ekiga.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- ekiga.spec 14 Mar 2006 07:09:44 -0000 1.14 +++ ekiga.spec 14 Mar 2006 14:00:59 -0000 1.15 @@ -1,6 +1,6 @@ Summary: A Gnome based SIP/H323 teleconferencing application Name: ekiga -Version: 2.0.0 +Version: 2.0.1 Release: 1 URL: http://www.ekiga.org/ Source0: http://www.ekiga.org/ekiga-%{version}.tar.gz @@ -8,7 +8,7 @@ Group: Applications/Communications BuildRoot: %{_tmppath}/%{name}-%{version}-root Requires: pwlib >= 1.10.0 -Requires: opal >= 2.2.0 +Requires: opal >= 2.2.1 Requires: GConf2 >= 1.2.1 Requires: libgnomeui >= 2.0 Requires: libgnome >= 2.0 @@ -20,7 +20,7 @@ BuildRequires: libgnome-devel >= 2.0 BuildRequires: openldap-devel BuildRequires: pwlib-devel >= 1.10.0 -BuildRequires: opal-devel >= 2.2.0 +BuildRequires: opal-devel >= 2.2.1 BuildRequires: libxml2-devel >= 2.5.0 BuildRequires: SDL-devel BuildRequires: intltool >= 0.22 @@ -86,6 +86,9 @@ %{_sysconfdir}/gconf/schemas/ekiga.schemas %changelog +* Tue Mar 14 2006 Daniel Veillard - 2.0.1 +- last minute bug rerelease 2.0.1 + * Mon Mar 13 2006 Daniel Veillard - 2.0.0 - final release of 2.0.0 Index: sources =================================================================== RCS file: /cvs/dist/rpms/ekiga/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 12 Mar 2006 23:20:55 -0000 1.3 +++ sources 14 Mar 2006 14:00:59 -0000 1.4 @@ -1 +1 @@ -e1bb54ba26a7c0bf9757a91348c4345f ekiga-2.0.0.tar.gz +9f0a2bcce380677e38b23991320df171 ekiga-2.0.1.tar.gz From fedora-cvs-commits at redhat.com Tue Mar 14 14:31:56 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 14 Mar 2006 09:31:56 -0500 Subject: rpms/cpio/devel cpio-2.6-toAsciiError.patch, NONE, 1.1 cpio-largeFileGrew.patch, NONE, 1.1 cpio.spec, 1.34, 1.35 Message-ID: <200603141431.k2EEVuGa031087@cvs.devel.redhat.com> Author: pvrabec Update of /cvs/dist/rpms/cpio/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv31050 Modified Files: cpio.spec Added Files: cpio-2.6-toAsciiError.patch cpio-largeFileGrew.patch Log Message: - fix warn_if_file_changed() and set exit code to #1 when cpio fails to store file > 4GB (#183224) cpio-2.6-toAsciiError.patch: copyout.c | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE cpio-2.6-toAsciiError.patch --- --- cpio-2.6/src/copyout.c.toAsciiError 2006-03-14 13:06:23.000000000 -0500 +++ cpio-2.6/src/copyout.c 2006-03-14 13:07:13.000000000 -0500 @@ -316,7 +316,7 @@ static void field_width_error (const char *filename, const char *fieldname) { - error (0, 0, _("%s: field width not sufficient for storing %s"), + error (1, 0, _("%s: field width not sufficient for storing %s"), filename, fieldname); } cpio-largeFileGrew.patch: cpiohdr.h | 2 +- extern.h | 2 +- util.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) --- NEW FILE cpio-largeFileGrew.patch --- --- cpio/src/cpiohdr.h.largeFileGrew 2005-05-19 05:35:29.000000000 -0400 +++ cpio/src/cpiohdr.h 2006-03-01 15:04:46.000000000 -0500 @@ -77,7 +77,7 @@ unsigned long c_gid; unsigned long c_nlink; unsigned long c_mtime; - unsigned long c_filesize; + off_t c_filesize; long c_dev_maj; long c_dev_min; long c_rdev_maj; --- cpio/src/extern.h.largeFileGrew 2005-11-12 09:35:59.000000000 -0500 +++ cpio/src/extern.h 2006-03-01 15:05:29.000000000 -0500 @@ -164,7 +164,7 @@ void copy_files_tape_to_disk (int in_des, int out_des, off_t num_bytes); void copy_files_disk_to_tape (int in_des, int out_des, off_t num_bytes, char *filename); void copy_files_disk_to_disk (int in_des, int out_des, off_t num_bytes, char *filename); -void warn_if_file_changed (char *file_name, unsigned long old_file_size, +void warn_if_file_changed (char *file_name, off_t old_file_size, unsigned long old_file_mtime); void create_all_directories (char *name); void prepare_append (int out_file_des); --- cpio/src/util.c.largeFileGrew 2005-10-28 09:03:06.000000000 -0400 +++ cpio/src/util.c 2006-03-01 15:04:46.000000000 -0500 @@ -552,7 +552,7 @@ /* Warn if file changed while it was being copied. */ void -warn_if_file_changed (char *file_name, unsigned long old_file_size, +warn_if_file_changed (char *file_name, off_t old_file_size, unsigned long old_file_mtime) { struct stat new_file_stat; Index: cpio.spec =================================================================== RCS file: /cvs/dist/rpms/cpio/devel/cpio.spec,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- cpio.spec 11 Feb 2006 02:19:38 -0000 1.34 +++ cpio.spec 14 Mar 2006 14:31:54 -0000 1.35 @@ -6,7 +6,7 @@ Summary: A GNU archiving program. Name: cpio Version: 2.6 -Release: 11.2.1 +Release: 12 License: GPL Group: Applications/Archiving URL: http://www.gnu.org/software/cpio/ @@ -21,7 +21,8 @@ Patch20: cpio-2.6-warnings.patch Patch21: cpio-2.6-checksum.patch Patch22: cpio-2.6-writeOutHeaderBufferOverflow.patch - +Patch23: cpio-2.6-largeFileGrew.patch +Patch24: cpio-2.6-toAsciiError.patch %ifnos linux Prereq: /sbin/rmt %endif @@ -55,7 +56,8 @@ %patch20 -p1 -b .warnings %patch21 -p1 -b .checksum %patch22 -p1 -b .bufferOverflow - +%patch23 -p1 -b .largeFileGrew +%patch24 -p1 -b .toAsciiError autoheader %build @@ -105,6 +107,10 @@ %{_infodir}/*.info* %changelog +* Tue Mar 14 2006 Peter Vrabec 2.6-12 +- fix warn_if_file_changed() and set exit code to #1 when + cpio fails to store file > 4GB (#183224) + * Fri Feb 10 2006 Jesse Keating - 2.6-11.2.1 - bump again for double-long bug on ppc(64) From fedora-cvs-commits at redhat.com Tue Mar 14 14:44:13 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 14 Mar 2006 09:44:13 -0500 Subject: rpms/cpio/devel cpio-2.6-largeFileGrew.patch, NONE, 1.1 cpio-largeFileGrew.patch, 1.1, NONE Message-ID: <200603141444.k2EEiD1D001990@cvs.devel.redhat.com> Author: pvrabec Update of /cvs/dist/rpms/cpio/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv1845 Added Files: cpio-2.6-largeFileGrew.patch Removed Files: cpio-largeFileGrew.patch Log Message: switch patches cpio-2.6-largeFileGrew.patch: cpiohdr.h | 2 +- extern.h | 2 +- util.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) --- NEW FILE cpio-2.6-largeFileGrew.patch --- --- cpio-2.6/src/cpiohdr.h.largeFileGrew 2003-11-21 09:48:13.000000000 -0500 +++ cpio-2.6/src/cpiohdr.h 2006-03-14 12:44:26.000000000 -0500 @@ -76,7 +76,7 @@ unsigned long c_gid; unsigned long c_nlink; unsigned long c_mtime; - unsigned long c_filesize; + off_t c_filesize; long c_dev_maj; long c_dev_min; long c_rdev_maj; --- cpio-2.6/src/extern.h.largeFileGrew 2006-03-14 12:43:45.000000000 -0500 +++ cpio-2.6/src/extern.h 2006-03-14 12:45:12.000000000 -0500 @@ -168,7 +168,7 @@ void copy_files_tape_to_disk P_((int in_des, int out_des, unsigned long num_bytes)); void copy_files_disk_to_tape P_((int in_des, int out_des, unsigned long num_bytes, char *filename)); void copy_files_disk_to_disk P_((int in_des, int out_des, unsigned long num_bytes, char *filename)); -void warn_if_file_changed P_((char *file_name, unsigned long old_file_size, +void warn_if_file_changed P_((char *file_name, off_t old_file_size, unsigned long old_file_mtime)); void create_all_directories P_((char *name)); void prepare_append P_((int out_file_des)); --- cpio-2.6/src/util.c.largeFileGrew 2006-03-14 12:43:45.000000000 -0500 +++ cpio-2.6/src/util.c 2006-03-14 12:44:26.000000000 -0500 @@ -548,7 +548,7 @@ /* Warn if file changed while it was being copied. */ void -warn_if_file_changed (char *file_name, unsigned long old_file_size, +warn_if_file_changed (char *file_name, off_t old_file_size, unsigned long old_file_mtime) { struct stat new_file_stat; --- cpio-largeFileGrew.patch DELETED --- From fedora-cvs-commits at redhat.com Tue Mar 14 15:47:44 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 14 Mar 2006 10:47:44 -0500 Subject: rpms/kernel/devel kernel-2.6.spec,1.2052,1.2053 Message-ID: <200603141547.k2EFliOP024820@cvs.devel.redhat.com> Author: jmorris Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv24749 Modified Files: kernel-2.6.spec Log Message: Updated changelog Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.2052 retrieving revision 1.2053 diff -u -r1.2052 -r1.2053 --- kernel-2.6.spec 14 Mar 2006 13:03:14 -0000 1.2052 +++ kernel-2.6.spec 14 Mar 2006 15:47:41 -0000 1.2053 @@ -1666,6 +1666,10 @@ * Mon Mar 13 2006 Rik van Riel - fix "Time went backwards" Xen kernel bug. (#185317) +* Mon Mar 13 2006 James Morris +- Modify sched-sedf defaults for dom0 so domU does not + get soft cpu lockup under load. + * Mon Mar 13 2006 Dave Jones - 2.6.16-rc6-git1 - Disable slab debug yet again. From fedora-cvs-commits at redhat.com Tue Mar 14 16:27:11 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 14 Mar 2006 11:27:11 -0500 Subject: rpms/bluez-pin/devel bluez-pin-0.27-dbus-local.patch, NONE, 1.1 bluez-pin-0.27-to-0.30.patch, NONE, 1.1 bluez-pin-0.30-dbus-die-die-die.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 bluez-pin.spec, 1.12, 1.13 sources, 1.4, 1.5 bluez-pin-0.24-new_dbus_api.patch, 1.1, NONE Message-ID: <200603141627.k2EGRB5Y008922@cvs.devel.redhat.com> Author: dwmw2 Update of /cvs/dist/rpms/bluez-pin/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv8902 Modified Files: .cvsignore bluez-pin.spec sources Added Files: bluez-pin-0.27-dbus-local.patch bluez-pin-0.27-to-0.30.patch bluez-pin-0.30-dbus-die-die-die.patch Removed Files: bluez-pin-0.24-new_dbus_api.patch Log Message: Update to bluez-pin 0.30 and make it all actually work bluez-pin-0.27-dbus-local.patch: main.c | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE bluez-pin-0.27-dbus-local.patch --- --- bluez-pin-0.27/main.c.orig 2006-03-14 16:13:31.000000000 +0000 +++ bluez-pin-0.27/main.c 2006-03-14 16:13:41.000000000 +0000 @@ -47,7 +47,7 @@ handler_func (DBusConnection *connec return bluez_pin_handle_dbus_request (connection, message); if (dbus_message_is_signal (message, - DBUS_INTERFACE_ORG_FREEDESKTOP_LOCAL, + DBUS_INTERFACE_LOCAL, "Disconnected")) exit (0); bluez-pin-0.27-to-0.30.patch: ChangeLog | 5 +++-- main.c | 32 +++++++------------------------- 2 files changed, 10 insertions(+), 27 deletions(-) --- NEW FILE bluez-pin-0.27-to-0.30.patch --- diff -ur bluez-pin-0.27/ChangeLog bluez-pin-0.30/ChangeLog --- bluez-pin-0.27/ChangeLog 2005-12-26 14:05:55.000000000 +0000 +++ bluez-pin-0.30/ChangeLog 2005-12-26 15:31:33.000000000 +0000 @@ -4,8 +4,9 @@ 2005-12-26 Phil Blundell - * Makefile (CFLAGS): Add -D_BSD_SOURCE. - + * Makefile (CFLAGS): Add -D_BSD_SOURCE. + * main.c: Remove support for "old" interfaces. + 2005-09-05 Phil Blundell * Version 0.26 released. diff -ur bluez-pin-0.27/main.c bluez-pin-0.30/main.c --- bluez-pin-0.27/main.c 2005-12-26 11:59:23.000000000 +0000 +++ bluez-pin-0.30/main.c 2005-12-26 14:50:07.000000000 +0000 @@ -25,11 +25,8 @@ #include "pin-ui.h" -#define OLD_SERVICE_NAME "org.handhelds.gpe.bluez" -#define OLD_INTERFACE_NAME OLD_SERVICE_NAME ".PinAgent" - -#define NEW_SERVICE_NAME "org.bluez.PinAgent" -#define NEW_INTERFACE_NAME NEW_SERVICE_NAME +#define SERVICE_NAME "org.bluez.PinAgent" +#define INTERFACE_NAME SERVICE_NAME #define _(x) gettext(x) @@ -40,14 +37,11 @@ DBusMessage *message, void *user_data) { - if (dbus_message_is_method_call (message, NEW_INTERFACE_NAME, "PinRequest")) + if (dbus_message_is_method_call (message, INTERFACE_NAME, "PinRequest")) return bluez_pin_handle_dbus_request (connection, message); - if (dbus_message_is_method_call (message, OLD_INTERFACE_NAME, "PinRequest")) - return bluez_pin_handle_dbus_request (connection, message); - if (dbus_message_is_signal (message, - DBUS_INTERFACE_ORG_FREEDESKTOP_LOCAL, + DBUS_INTERFACE_LOCAL, "Disconnected")) exit (0); @@ -67,7 +61,6 @@ DBusError error; static const char *old_object_path = "/org/handhelds/gpe/bluez/PinAgent"; static const char *new_object_path = "/org/bluez/PinAgent"; - int errors = 0; dbus_error_init (&error); connection = dbus_bus_get (DBUS_BUS_SYSTEM, &error); @@ -84,24 +77,13 @@ dbus_connection_register_object_path (connection, new_object_path, &dbus_vtable, NULL); dbus_connection_register_object_path (connection, old_object_path, &dbus_vtable, NULL); - dbus_bus_acquire_service (connection, NEW_SERVICE_NAME, 0, &error); - if (dbus_error_is_set (&error)) - { - fprintf (stderr, "Failed to acquire %s service: %s\n", NEW_SERVICE_NAME, error.message); - dbus_error_free (&error); - errors++; - } - - dbus_bus_acquire_service (connection, OLD_SERVICE_NAME, 0, &error); + dbus_bus_request_name (connection, SERVICE_NAME, 0, &error); if (dbus_error_is_set (&error)) { - fprintf (stderr, "Failed to acquire %s service: %s\n", OLD_SERVICE_NAME, error.message); + fprintf (stderr, "Failed to acquire %s service: %s\n", SERVICE_NAME, error.message); dbus_error_free (&error); - errors++; + exit (1); } - - if (errors == 2) /* Both services unavailable? */ - exit (1); } void bluez-pin-0.30-dbus-die-die-die.patch: pin-dbus.c | 56 +++++++++++++------------------------------------------- 1 files changed, 13 insertions(+), 43 deletions(-) --- NEW FILE bluez-pin-0.30-dbus-die-die-die.patch --- --- bluez-pin-0.30/pin-dbus.c.orig 2006-03-14 14:35:18.000000000 +0000 +++ bluez-pin-0.30/pin-dbus.c 2006-03-14 15:07:50.000000000 +0000 @@ -39,17 +39,9 @@ extern void bluez_pin_request (struct pi static void bluez_pin_send_dbus_reply (DBusConnection *connection, DBusMessage *message, const char *pin) { -#ifndef HAVE_DBUS_MESSAGE_ITER_GET_BASIC - DBusMessageIter iter; - - dbus_message_append_iter_init (message, &iter); - if (pin) - dbus_message_iter_append_string (&iter, pin); -#else dbus_message_append_args(message, DBUS_TYPE_STRING, &pin, DBUS_TYPE_INVALID); -#endif dbus_connection_send (connection, message, NULL); @@ -81,45 +81,23 @@ bluez_pin_handle_dbus_request (DBusConne unsigned char *bytes; int nbytes; BluetoothPinRequest *req; + DBusError error = { 0 }; - dbus_message_iter_init (message, &iter); - - type = dbus_message_iter_get_arg_type (&iter); - if (type != DBUS_TYPE_BOOLEAN) - { - reply = dbus_message_new_error (message, WRONG_ARGS_ERROR, - "Boolean expected, other type given"); + memset(&bdaddr, 0, 6); + dbus_error_init(&error); + dbus_message_get_args(message, &error, + DBUS_TYPE_BOOLEAN, &out, + DBUS_TYPE_ARRAY, DBUS_TYPE_BYTE, &bytes, &nbytes, + DBUS_TYPE_INVALID); + if (dbus_error_is_set(&error)) { + reply = dbus_message_new_error(message, WRONG_ARGS_ERROR, + error.name); + dbus_error_free(&error); goto error; } - -#ifdef HAVE_DBUS_MESSAGE_ITER_GET_BASIC - dbus_message_iter_get_basic (&iter, &out); -#else - out = dbus_message_iter_get_boolean (&iter); -#endif - - if (! dbus_message_iter_next (&iter)) - { - reply = dbus_message_new_error (message, WRONG_ARGS_ERROR, - "Byte array expected but missing"); - goto error; - } - - type = dbus_message_iter_get_arg_type (&iter); - -#ifdef HAVE_DBUS_MESSAGE_ITER_GET_BASIC - nbytes = 0; - if (type == DBUS_TYPE_ARRAY) - dbus_message_iter_get_fixed_array (&iter, &bytes, &nbytes); - if (nbytes != sizeof (bdaddr)) -#else - if (type != DBUS_TYPE_ARRAY - || ! dbus_message_iter_get_byte_array (&iter, &bytes, &nbytes) - || nbytes != sizeof (bdaddr)) -#endif - { + if (nbytes != sizeof(bdaddr)) { reply = dbus_message_new_error (message, WRONG_ARGS_ERROR, - "Byte array expected, other type given"); + "Byte array incorrect size"); goto error; } Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/bluez-pin/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 2 Mar 2005 12:52:14 -0000 1.4 +++ .cvsignore 14 Mar 2006 16:27:09 -0000 1.5 @@ -1 +1 @@ -bluez-pin-0.24.tar.gz +bluez-pin-0.27.tar.gz Index: bluez-pin.spec =================================================================== RCS file: /cvs/dist/rpms/bluez-pin/devel/bluez-pin.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- bluez-pin.spec 11 Feb 2006 02:10:05 -0000 1.12 +++ bluez-pin.spec 14 Mar 2006 16:27:09 -0000 1.13 @@ -1,13 +1,15 @@ Summary: D-BUS Bluetooth PIN helper Name: bluez-pin -Version: 0.24 -Release: 3.2.1 +Version: 0.30 +Release: 1 License: GPL Group: Applications/System -Source: ftp://ftp.handhelds.org/projects/gpe/source/%{name}-%{version}.tar.gz +Source: ftp://ftp.handhelds.org/projects/gpe/source/%{name}-0.27.tar.gz +Source1: bluez-pin.desktop Patch0: bluez-pin-0.23-strip.patch Patch1: bluez-pin-0.24-cflags.patch -Patch2: bluez-pin-0.24-new_dbus_api.patch +Patch2: bluez-pin-0.27-to-0.30.patch +Patch3: bluez-pin-0.30-dbus-die-die-die.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: dbus-devel >= 0.60, gtk2-devel, libglade2-devel, GConf2-devel BuildRequires: bluez-libs-devel, gettext @@ -20,10 +22,11 @@ The BLUETOOTH trademarks are owned by Bluetooth SIG, Inc., U.S.A. %prep -%setup -q +%setup -q -n bluez-pin-0.27 %patch0 -p1 %patch1 -p1 -%patch2 -p1 -b .new_dbus_api +%patch2 -p1 +%patch3 -p1 %build make PREFIX=%{_prefix} SYSCONFDIR=%{_sysconfdir} @@ -32,6 +35,7 @@ rm -rf $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT PREFIX=%{_prefix} SYSCONFDIR=%{_sysconfdir} install rm -f $RPM_BUILD_ROOT%{_prefix}/share/bluez-pin/bluez-pin-gpe.glade +install -D -m0644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/bluez-pin.desktop %find_lang %{name} %clean @@ -43,8 +47,14 @@ %{_prefix}/bin/bluez-pin %{_prefix}/share/pixmaps/bt-logo.png %{_prefix}/share/bluez-pin/bluez-pin.glade +%{_sysconfdir}/xdg/autostart/bluez-pin.desktop %changelog +* Tue Mar 14 2006 david Woodhouse - 0.30-1 +- Update to bluez-pin 0.27, patched to 0.30 to avoid autocrap breakage +- Fix dbus harder +- Run automatically in X session + * Fri Feb 10 2006 Jesse Keating - 0.24-3.2.1 - bump again for double-long bug on ppc(64) Index: sources =================================================================== RCS file: /cvs/dist/rpms/bluez-pin/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 2 Mar 2005 12:52:14 -0000 1.4 +++ sources 14 Mar 2006 16:27:09 -0000 1.5 @@ -1 +1 @@ -1f04ce0d9d456a3824cda709735f4be8 bluez-pin-0.24.tar.gz +469b772f791265acc14b24ab970d7c2e bluez-pin-0.27.tar.gz --- bluez-pin-0.24-new_dbus_api.patch DELETED --- From fedora-cvs-commits at redhat.com Tue Mar 14 16:29:20 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 14 Mar 2006 11:29:20 -0500 Subject: rpms/bluez-pin/devel bluez-pin.desktop,NONE,1.1 Message-ID: <200603141629.k2EGTKYH008996@cvs.devel.redhat.com> Author: dwmw2 Update of /cvs/dist/rpms/bluez-pin/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv8984 Added Files: bluez-pin.desktop Log Message: add desktop file --- NEW FILE bluez-pin.desktop --- [Desktop Entry] Encoding=UTF-8 Name=Bluez PIN agent Comment=PIN helper for Bluetooth connections Exec=bluez-pin --dbus Terminal=false Type=Application Categories= From fedora-cvs-commits at redhat.com Tue Mar 14 16:38:48 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 14 Mar 2006 11:38:48 -0500 Subject: rpms/selinux-policy-targeted/FC-4 policy-20050916.patch, 1.28, 1.29 selinux-policy-targeted.spec, 1.361, 1.362 Message-ID: <200603141638.k2EGcm0p009242@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/selinux-policy-targeted/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv9223 Modified Files: policy-20050916.patch selinux-policy-targeted.spec Log Message: * Tue Mar 14 2006 Dan Walsh 1.27.1-2.26 - Allow updfstab to getattr on swapfile - Allow ypserv to communicate with ypxfr_t - File context for in.talkd policy-20050916.patch: Makefile | 26 +- attrib.te | 100 +++++++++- domains/admin.te | 2 domains/misc/kernel.te | 2 domains/program/crond.te | 2 domains/program/fsadm.te | 9 domains/program/getty.te | 2 domains/program/hostname.te | 2 domains/program/ifconfig.te | 10 - domains/program/init.te | 2 domains/program/initrc.te | 26 ++ domains/program/ldconfig.te | 3 domains/program/load_policy.te | 11 - domains/program/login.te | 23 +- domains/program/logrotate.te | 2 domains/program/modutil.te | 27 +- domains/program/mount.te | 6 domains/program/netutils.te | 3 domains/program/newrole.te | 4 domains/program/passwd.te | 2 domains/program/restorecon.te | 6 domains/program/setfiles.te | 4 domains/program/ssh.te | 6 domains/program/su.te | 12 + domains/program/syslogd.te | 7 domains/program/tmpreaper.te | 2 domains/program/unused/NetworkManager.te | 13 + domains/program/unused/alsa.te | 2 domains/program/unused/amanda.te | 74 +------ domains/program/unused/anaconda.te | 5 domains/program/unused/apache.te | 27 +- domains/program/unused/apmd.te | 25 ++ domains/program/unused/auditd.te | 14 + domains/program/unused/automount.te | 4 domains/program/unused/avahi.te | 31 +++ domains/program/unused/bluetooth.te | 72 +++++++ domains/program/unused/cups.te | 24 +- domains/program/unused/cvs.te | 2 domains/program/unused/cyrus.te | 10 - domains/program/unused/dbusd.te | 4 domains/program/unused/dcc.te | 5 domains/program/unused/dhcpc.te | 6 domains/program/unused/dhcpd.te | 4 domains/program/unused/dovecot.te | 6 domains/program/unused/exim.te | 309 +++++++++++++++++++++++++++++++ domains/program/unused/ftpd.te | 6 domains/program/unused/hald.te | 5 domains/program/unused/hotplug.te | 10 - domains/program/unused/hwclock.te | 1 domains/program/unused/ipsec.te | 2 domains/program/unused/kudzu.te | 5 domains/program/unused/mta.te | 7 domains/program/unused/mysqld.te | 10 - domains/program/unused/named.te | 27 ++ domains/program/unused/nscd.te | 1 domains/program/unused/ntpd.te | 10 - domains/program/unused/openct.te | 16 + domains/program/unused/pamconsole.te | 4 domains/program/unused/pegasus.te | 36 +++ domains/program/unused/ping.te | 2 domains/program/unused/postfix.te | 65 ++++-- domains/program/unused/postgresql.te | 11 - domains/program/unused/pppd.te | 23 +- domains/program/unused/privoxy.te | 2 domains/program/unused/procmail.te | 16 + domains/program/unused/radius.te | 3 domains/program/unused/readahead.te | 21 ++ domains/program/unused/rlogind.te | 4 domains/program/unused/roundup.te | 29 ++ domains/program/unused/rpcd.te | 18 + domains/program/unused/rpm.te | 4 domains/program/unused/rsync.te | 3 domains/program/unused/samba.te | 15 + domains/program/unused/saslauthd.te | 1 domains/program/unused/sendmail.te | 3 domains/program/unused/slapd.te | 28 ++ domains/program/unused/snmpd.te | 6 domains/program/unused/spamd.te | 28 -- domains/program/unused/squid.te | 4 domains/program/unused/udev.te | 10 - domains/program/unused/updfstab.te | 1 domains/program/unused/utempter.te | 2 domains/program/unused/webalizer.te | 3 domains/program/unused/winbind.te | 1 domains/program/unused/xdm.te | 3 domains/program/unused/yppasswdd.te | 40 ++++ domains/program/unused/ypserv.te | 11 + domains/program/unused/zebra.te | 6 domains/program/useradd.te | 5 file_contexts/distros.fc | 2 file_contexts/program/apache.fc | 3 file_contexts/program/bluetooth.fc | 3 file_contexts/program/compat.fc | 4 file_contexts/program/dhcpc.fc | 2 file_contexts/program/dhcpd.fc | 5 file_contexts/program/ftpd.fc | 5 file_contexts/program/games.fc | 11 - file_contexts/program/innd.fc | 15 - file_contexts/program/ipsec.fc | 1 file_contexts/program/ktalkd.fc | 1 file_contexts/program/openct.fc | 2 file_contexts/program/pegasus.fc | 9 file_contexts/program/pppd.fc | 2 file_contexts/program/privoxy.fc | 1 file_contexts/program/readahead.fc | 1 file_contexts/program/roundup.fc | 2 file_contexts/program/rpm.fc | 4 file_contexts/program/rshd.fc | 1 file_contexts/program/rsync.fc | 2 file_contexts/program/slapd.fc | 12 + file_contexts/program/squid.fc | 3 file_contexts/program/xdm.fc | 2 file_contexts/program/yppasswdd.fc | 2 file_contexts/program/ypserv.fc | 1 file_contexts/types.fc | 6 genfs_contexts | 3 macros/base_user_macros.te | 7 macros/core_macros.te | 9 macros/global_macros.te | 35 ++- macros/home_macros.te | 9 macros/network_macros.te | 19 + macros/program/apache_macros.te | 13 + macros/program/bonobo_macros.te | 2 macros/program/cdrecord_macros.te | 6 macros/program/chkpwd_macros.te | 8 macros/program/crontab_macros.te | 2 macros/program/dbusd_macros.te | 7 macros/program/gconf_macros.te | 2 macros/program/gift_macros.te | 2 macros/program/gpg_macros.te | 2 macros/program/i18n_input_macros.te | 21 ++ macros/program/lpr_macros.te | 2 macros/program/mta_macros.te | 4 macros/program/newrole_macros.te | 2 macros/program/pyzor_macros.te | 2 macros/program/razor_macros.te | 2 macros/program/su_macros.te | 4 macros/program/uml_macros.te | 2 macros/program/xdm_macros.te | 2 macros/program/ypbind_macros.te | 1 macros/user_macros.te | 7 man/man8/ftpd_selinux.8 | 19 + man/man8/httpd_selinux.8 | 9 man/man8/rsync_selinux.8 | 12 - man/man8/samba_selinux.8 | 9 mcs | 210 ++++++++------------- mls | 270 ++++++++++----------------- net_contexts | 15 + targeted/appconfig/root_default_contexts | 4 targeted/assert.te | 2 targeted/domains/program/compat.te | 1 targeted/domains/program/sendmail.te | 1 targeted/domains/program/ssh.te | 3 targeted/domains/program/xdm.te | 4 targeted/domains/unconfined.te | 15 + tunables/distro.tun | 2 tunables/tunable.tun | 4 types/device.te | 4 types/devpts.te | 4 types/file.te | 48 +--- types/network.te | 15 - types/nfs.te | 1 types/security.te | 6 163 files changed, 1691 insertions(+), 690 deletions(-) Index: policy-20050916.patch =================================================================== RCS file: /cvs/dist/rpms/selinux-policy-targeted/FC-4/policy-20050916.patch,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- policy-20050916.patch 15 Feb 2006 19:23:10 -0000 1.28 +++ policy-20050916.patch 14 Mar 2006 16:38:45 -0000 1.29 @@ -3006,6 +3006,14 @@ +range_transition kernel_t udev_exec_t s0 - s0:c0.c255; +range_transition initrc_t udev_exec_t s0 - s0:c0.c255; +') +diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/unused/updfstab.te policy-1.27.1/domains/program/unused/updfstab.te +--- nsapolicy/domains/program/unused/updfstab.te 2005-09-16 11:17:27.000000000 -0400 ++++ policy-1.27.1/domains/program/unused/updfstab.te 2006-03-14 11:35:48.000000000 -0500 +@@ -79,3 +79,4 @@ + can_unix_connect(updfstab_t, hald_t) + ') + ++allow updfstab_t swapfile_t:file getattr; diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/unused/utempter.te policy-1.27.1/domains/program/unused/utempter.te --- nsapolicy/domains/program/unused/utempter.te 2005-09-16 11:17:27.000000000 -0400 +++ policy-1.27.1/domains/program/unused/utempter.te 2005-11-30 16:42:28.000000000 -0500 @@ -3098,8 +3106,8 @@ +rw_dir_create_file(yppasswdd_t, var_yp_t) diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/unused/ypserv.te policy-1.27.1/domains/program/unused/ypserv.te --- nsapolicy/domains/program/unused/ypserv.te 2005-09-16 11:17:27.000000000 -0400 -+++ policy-1.27.1/domains/program/unused/ypserv.te 2005-11-30 16:42:28.000000000 -0500 -@@ -39,3 +39,12 @@ ++++ policy-1.27.1/domains/program/unused/ypserv.te 2006-03-10 16:38:34.000000000 -0500 +@@ -39,3 +39,14 @@ ') allow ypserv_t reserved_port_t:{ udp_socket tcp_socket } name_bind; dontaudit ypserv_t reserved_port_type:{ tcp_socket udp_socket } name_bind; @@ -3107,11 +3115,13 @@ + +application_domain(ypxfr, `, nscd_client_domain') +can_network_client(ypxfr_t) -+allow ypxfr_t etc_t:file { getattr read }; +allow ypxfr_t portmap_port_t:tcp_socket name_connect; +allow ypxfr_t reserved_port_t:tcp_socket name_connect; +dontaudit ypxfr_t reserved_port_type:tcp_socket name_connect; +allow ypxfr_t self:unix_stream_socket create_stream_socket_perms; ++ ++allow ypserv_t etc_t:file { getattr read }; ++allow ypserv_t self:unix_stream_socket create_stream_socket_perms; diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/unused/zebra.te policy-1.27.1/domains/program/unused/zebra.te --- nsapolicy/domains/program/unused/zebra.te 2005-09-16 11:17:27.000000000 -0400 +++ policy-1.27.1/domains/program/unused/zebra.te 2006-02-15 10:20:03.000000000 -0500 @@ -3361,6 +3371,13 @@ # Kame /usr/sbin/racoon -- system_u:object_r:ipsec_exec_t +diff --exclude-from=exclude -N -u -r nsapolicy/file_contexts/program/ktalkd.fc policy-1.27.1/file_contexts/program/ktalkd.fc +--- nsapolicy/file_contexts/program/ktalkd.fc 2005-09-16 11:17:27.000000000 -0400 ++++ policy-1.27.1/file_contexts/program/ktalkd.fc 2006-02-17 14:28:57.000000000 -0500 +@@ -1,2 +1,3 @@ + # kde talk daemon + /usr/bin/ktalkd -- system_u:object_r:ktalkd_exec_t ++/usr/sbin/in.talkd -- system_u:object_r:ktalkd_exec_t diff --exclude-from=exclude -N -u -r nsapolicy/file_contexts/program/openct.fc policy-1.27.1/file_contexts/program/openct.fc --- nsapolicy/file_contexts/program/openct.fc 1969-12-31 19:00:00.000000000 -0500 +++ policy-1.27.1/file_contexts/program/openct.fc 2005-11-30 16:42:28.000000000 -0500 Index: selinux-policy-targeted.spec =================================================================== RCS file: /cvs/dist/rpms/selinux-policy-targeted/FC-4/selinux-policy-targeted.spec,v retrieving revision 1.361 retrieving revision 1.362 diff -u -r1.361 -r1.362 --- selinux-policy-targeted.spec 15 Feb 2006 19:23:10 -0000 1.361 +++ selinux-policy-targeted.spec 14 Mar 2006 16:38:45 -0000 1.362 @@ -9,7 +9,7 @@ Summary: SELinux %{type} policy configuration Name: selinux-policy-%{type} Version: 1.27.1 -Release: 2.25 +Release: 2.26 License: GPL Group: System Environment/Base Source: http://www.nsa.gov/selinux/archives/policy-%{version}.tgz @@ -234,6 +234,11 @@ exit 0 %changelog +* Tue Mar 14 2006 Dan Walsh 1.27.1-2.26 +- Allow updfstab to getattr on swapfile +- Allow ypserv to communicate with ypxfr_t +- File context for in.talkd + * Wed Feb 15 2006 Dan Walsh 1.27.1-2.25 - Zebra wants to listen on router_port_t - auditctl wants to read proc From fedora-cvs-commits at redhat.com Tue Mar 14 17:34:58 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 14 Mar 2006 12:34:58 -0500 Subject: rpms/bluez-pin/devel bluez-pin-0.30-null-pin.patch, NONE, 1.1 bluez-pin.spec, 1.13, 1.14 Message-ID: <200603141734.k2EHYwnG022246@cvs.devel.redhat.com> Author: dwmw2 Update of /cvs/dist/rpms/bluez-pin/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv22170 Modified Files: bluez-pin.spec Added Files: bluez-pin-0.30-null-pin.patch Log Message: More dbus breakage bluez-pin-0.30-null-pin.patch: pin-dbus.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) --- NEW FILE bluez-pin-0.30-null-pin.patch --- --- bluez-pin-0.27/pin-dbus.c~ 2006-03-14 17:04:40.000000000 +0000 +++ bluez-pin-0.27/pin-dbus.c 2006-03-14 17:32:32.000000000 +0000 @@ -39,9 +39,10 @@ extern void bluez_pin_request (struct pi static void bluez_pin_send_dbus_reply (DBusConnection *connection, DBusMessage *message, const char *pin) { - dbus_message_append_args(message, - DBUS_TYPE_STRING, &pin, - DBUS_TYPE_INVALID); + if (pin) + dbus_message_append_args(message, + DBUS_TYPE_STRING, &pin, + DBUS_TYPE_INVALID); dbus_connection_send (connection, message, NULL); Index: bluez-pin.spec =================================================================== RCS file: /cvs/dist/rpms/bluez-pin/devel/bluez-pin.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- bluez-pin.spec 14 Mar 2006 16:27:09 -0000 1.13 +++ bluez-pin.spec 14 Mar 2006 17:34:47 -0000 1.14 @@ -10,6 +10,7 @@ Patch1: bluez-pin-0.24-cflags.patch Patch2: bluez-pin-0.27-to-0.30.patch Patch3: bluez-pin-0.30-dbus-die-die-die.patch +Patch4: bluez-pin-0.30-null-pin.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: dbus-devel >= 0.60, gtk2-devel, libglade2-devel, GConf2-devel BuildRequires: bluez-libs-devel, gettext @@ -27,6 +28,7 @@ %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 %build make PREFIX=%{_prefix} SYSCONFDIR=%{_sysconfdir} @@ -50,6 +52,9 @@ %{_sysconfdir}/xdg/autostart/bluez-pin.desktop %changelog +* Tue Mar 14 2006 david Woodhouse - 0.30-2 +- Don't abort when user cancels a PIN request + * Tue Mar 14 2006 david Woodhouse - 0.30-1 - Update to bluez-pin 0.27, patched to 0.30 to avoid autocrap breakage - Fix dbus harder From fedora-cvs-commits at redhat.com Tue Mar 14 17:35:32 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 14 Mar 2006 12:35:32 -0500 Subject: rpms/bluez-pin/devel bluez-pin.spec,1.14,1.15 Message-ID: <200603141735.k2EHZWWl022372@cvs.devel.redhat.com> Author: dwmw2 Update of /cvs/dist/rpms/bluez-pin/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv22355 Modified Files: bluez-pin.spec Log Message: Update release Index: bluez-pin.spec =================================================================== RCS file: /cvs/dist/rpms/bluez-pin/devel/bluez-pin.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- bluez-pin.spec 14 Mar 2006 17:34:47 -0000 1.14 +++ bluez-pin.spec 14 Mar 2006 17:35:24 -0000 1.15 @@ -1,7 +1,7 @@ Summary: D-BUS Bluetooth PIN helper Name: bluez-pin Version: 0.30 -Release: 1 +Release: 2 License: GPL Group: Applications/System Source: ftp://ftp.handhelds.org/projects/gpe/source/%{name}-0.27.tar.gz From fedora-cvs-commits at redhat.com Tue Mar 14 18:54:21 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 14 Mar 2006 13:54:21 -0500 Subject: rpms/selinux-policy-targeted/FC-4 policy-20050916.patch, 1.29, 1.30 selinux-policy-targeted.spec, 1.362, 1.363 Message-ID: <200603141854.k2EIsLwr018606@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/selinux-policy-targeted/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv18572 Modified Files: policy-20050916.patch selinux-policy-targeted.spec Log Message: * Tue Mar 14 2006 Dan Walsh 1.27.1-2.27 - Allow updfstab to getattr on swapfile - Allow ypserv to communicate with ypxfr_t - File context for in.talkd policy-20050916.patch: Makefile | 26 +- attrib.te | 100 +++++++++- domains/admin.te | 2 domains/misc/kernel.te | 2 domains/program/crond.te | 2 domains/program/fsadm.te | 11 - domains/program/getty.te | 2 domains/program/hostname.te | 2 domains/program/ifconfig.te | 10 - domains/program/init.te | 2 domains/program/initrc.te | 26 ++ domains/program/ldconfig.te | 3 domains/program/load_policy.te | 11 - domains/program/login.te | 23 +- domains/program/logrotate.te | 2 domains/program/modutil.te | 27 +- domains/program/mount.te | 6 domains/program/netutils.te | 3 domains/program/newrole.te | 4 domains/program/passwd.te | 2 domains/program/restorecon.te | 6 domains/program/setfiles.te | 4 domains/program/ssh.te | 6 domains/program/su.te | 12 + domains/program/syslogd.te | 7 domains/program/tmpreaper.te | 2 domains/program/unused/NetworkManager.te | 13 + domains/program/unused/alsa.te | 2 domains/program/unused/amanda.te | 74 +------ domains/program/unused/anaconda.te | 5 domains/program/unused/apache.te | 27 +- domains/program/unused/apmd.te | 25 ++ domains/program/unused/auditd.te | 14 + domains/program/unused/automount.te | 4 domains/program/unused/avahi.te | 31 +++ domains/program/unused/bluetooth.te | 72 +++++++ domains/program/unused/cups.te | 24 +- domains/program/unused/cvs.te | 2 domains/program/unused/cyrus.te | 10 - domains/program/unused/dbusd.te | 4 domains/program/unused/dcc.te | 5 domains/program/unused/dhcpc.te | 6 domains/program/unused/dhcpd.te | 4 domains/program/unused/dovecot.te | 6 domains/program/unused/exim.te | 309 +++++++++++++++++++++++++++++++ domains/program/unused/ftpd.te | 6 domains/program/unused/hald.te | 5 domains/program/unused/hotplug.te | 10 - domains/program/unused/hwclock.te | 1 domains/program/unused/ipsec.te | 2 domains/program/unused/kudzu.te | 5 domains/program/unused/mta.te | 7 domains/program/unused/mysqld.te | 10 - domains/program/unused/named.te | 27 ++ domains/program/unused/nscd.te | 1 domains/program/unused/ntpd.te | 10 - domains/program/unused/openct.te | 16 + domains/program/unused/pamconsole.te | 4 domains/program/unused/pegasus.te | 36 +++ domains/program/unused/ping.te | 2 domains/program/unused/postfix.te | 65 ++++-- domains/program/unused/postgresql.te | 11 - domains/program/unused/pppd.te | 23 +- domains/program/unused/privoxy.te | 2 domains/program/unused/procmail.te | 16 + domains/program/unused/radius.te | 3 domains/program/unused/readahead.te | 21 ++ domains/program/unused/rlogind.te | 4 domains/program/unused/roundup.te | 29 ++ domains/program/unused/rpcd.te | 18 + domains/program/unused/rpm.te | 4 domains/program/unused/rsync.te | 3 domains/program/unused/samba.te | 15 + domains/program/unused/saslauthd.te | 1 domains/program/unused/sendmail.te | 3 domains/program/unused/slapd.te | 28 ++ domains/program/unused/snmpd.te | 6 domains/program/unused/spamd.te | 28 -- domains/program/unused/squid.te | 4 domains/program/unused/udev.te | 10 - domains/program/unused/updfstab.te | 1 domains/program/unused/utempter.te | 2 domains/program/unused/webalizer.te | 3 domains/program/unused/winbind.te | 1 domains/program/unused/xdm.te | 3 domains/program/unused/yppasswdd.te | 40 ++++ domains/program/unused/ypserv.te | 11 + domains/program/unused/zebra.te | 6 domains/program/useradd.te | 5 file_contexts/distros.fc | 2 file_contexts/program/apache.fc | 3 file_contexts/program/bluetooth.fc | 3 file_contexts/program/compat.fc | 4 file_contexts/program/dhcpc.fc | 2 file_contexts/program/dhcpd.fc | 5 file_contexts/program/ftpd.fc | 5 file_contexts/program/games.fc | 11 - file_contexts/program/innd.fc | 15 - file_contexts/program/ipsec.fc | 1 file_contexts/program/ktalkd.fc | 1 file_contexts/program/openct.fc | 2 file_contexts/program/pegasus.fc | 9 file_contexts/program/pppd.fc | 2 file_contexts/program/privoxy.fc | 1 file_contexts/program/readahead.fc | 1 file_contexts/program/roundup.fc | 2 file_contexts/program/rpm.fc | 4 file_contexts/program/rshd.fc | 1 file_contexts/program/rsync.fc | 2 file_contexts/program/slapd.fc | 12 + file_contexts/program/squid.fc | 3 file_contexts/program/xdm.fc | 2 file_contexts/program/yppasswdd.fc | 2 file_contexts/program/ypserv.fc | 1 file_contexts/types.fc | 6 genfs_contexts | 3 macros/base_user_macros.te | 7 macros/core_macros.te | 9 macros/global_macros.te | 35 ++- macros/home_macros.te | 9 macros/network_macros.te | 19 + macros/program/apache_macros.te | 13 + macros/program/bonobo_macros.te | 2 macros/program/cdrecord_macros.te | 6 macros/program/chkpwd_macros.te | 8 macros/program/crontab_macros.te | 2 macros/program/dbusd_macros.te | 7 macros/program/gconf_macros.te | 2 macros/program/gift_macros.te | 2 macros/program/gpg_macros.te | 2 macros/program/i18n_input_macros.te | 21 ++ macros/program/lpr_macros.te | 2 macros/program/mta_macros.te | 4 macros/program/newrole_macros.te | 2 macros/program/pyzor_macros.te | 2 macros/program/razor_macros.te | 2 macros/program/su_macros.te | 4 macros/program/uml_macros.te | 2 macros/program/xdm_macros.te | 2 macros/program/ypbind_macros.te | 1 macros/user_macros.te | 7 man/man8/ftpd_selinux.8 | 19 + man/man8/httpd_selinux.8 | 9 man/man8/rsync_selinux.8 | 12 - man/man8/samba_selinux.8 | 9 mcs | 210 ++++++++------------- mls | 270 ++++++++++----------------- net_contexts | 15 + targeted/appconfig/root_default_contexts | 4 targeted/assert.te | 2 targeted/domains/program/compat.te | 1 targeted/domains/program/sendmail.te | 1 targeted/domains/program/ssh.te | 3 targeted/domains/program/xdm.te | 4 targeted/domains/unconfined.te | 15 + tunables/distro.tun | 2 tunables/tunable.tun | 4 types/device.te | 4 types/devpts.te | 4 types/file.te | 48 +--- types/network.te | 15 - types/nfs.te | 1 types/security.te | 6 163 files changed, 1692 insertions(+), 691 deletions(-) Index: policy-20050916.patch =================================================================== RCS file: /cvs/dist/rpms/selinux-policy-targeted/FC-4/policy-20050916.patch,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- policy-20050916.patch 14 Mar 2006 16:38:45 -0000 1.29 +++ policy-20050916.patch 14 Mar 2006 18:54:19 -0000 1.30 @@ -198,7 +198,7 @@ allow system_crond_t self:capability { dac_read_search chown setgid setuid fowner net_bind_service fsetid }; diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/fsadm.te policy-1.27.1/domains/program/fsadm.te --- nsapolicy/domains/program/fsadm.te 2005-09-16 11:17:27.000000000 -0400 -+++ policy-1.27.1/domains/program/fsadm.te 2005-11-30 16:42:28.000000000 -0500 ++++ policy-1.27.1/domains/program/fsadm.te 2006-03-14 13:53:33.000000000 -0500 @@ -12,7 +12,7 @@ # administration. # fsadm_exec_t is the type of the corresponding programs. @@ -208,7 +208,15 @@ role system_r types fsadm_t; role sysadm_r types fsadm_t; -@@ -102,10 +102,10 @@ +@@ -95,17 +95,17 @@ + allow fsadm_t device_t:lnk_file { unlink create }; + + # Enable swapping to devices and files +-allow fsadm_t swapfile_t:file { getattr swapon }; ++allow fsadm_t swapfile_t:file { write read getattr swapon }; + allow fsadm_t fixed_disk_device_t:blk_file { getattr swapon }; + + # Allow console log change (updfstab) allow fsadm_t kernel_t:system syslog_console; # Access terminals. Index: selinux-policy-targeted.spec =================================================================== RCS file: /cvs/dist/rpms/selinux-policy-targeted/FC-4/selinux-policy-targeted.spec,v retrieving revision 1.362 retrieving revision 1.363 diff -u -r1.362 -r1.363 --- selinux-policy-targeted.spec 14 Mar 2006 16:38:45 -0000 1.362 +++ selinux-policy-targeted.spec 14 Mar 2006 18:54:19 -0000 1.363 @@ -9,7 +9,7 @@ Summary: SELinux %{type} policy configuration Name: selinux-policy-%{type} Version: 1.27.1 -Release: 2.26 +Release: 2.27 License: GPL Group: System Environment/Base Source: http://www.nsa.gov/selinux/archives/policy-%{version}.tgz @@ -234,7 +234,7 @@ exit 0 %changelog -* Tue Mar 14 2006 Dan Walsh 1.27.1-2.26 +* Tue Mar 14 2006 Dan Walsh 1.27.1-2.27 - Allow updfstab to getattr on swapfile - Allow ypserv to communicate with ypxfr_t - File context for in.talkd From fedora-cvs-commits at redhat.com Tue Mar 14 19:51:55 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 14 Mar 2006 14:51:55 -0500 Subject: rpms/gnome-power-manager/devel .cvsignore, 1.14, 1.15 gnome-power-manager.spec, 1.34, 1.35 sources, 1.14, 1.15 gnome-power-manager-2.13.5.0.20060207-panel-integration.patch, 1.1, NONE gnome-power-manager-2.13.93-ignore-timeout.patch, 1.1, NONE Message-ID: <200603141951.k2EJpt3K030427@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/gnome-power-manager/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv30260 Modified Files: .cvsignore gnome-power-manager.spec sources Removed Files: gnome-power-manager-2.13.5.0.20060207-panel-integration.patch gnome-power-manager-2.13.93-ignore-timeout.patch Log Message: - Update to 2.14.0 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/gnome-power-manager/devel/.cvsignore,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- .cvsignore 3 Mar 2006 22:58:49 -0000 1.14 +++ .cvsignore 14 Mar 2006 19:51:52 -0000 1.15 @@ -1 +1 @@ -gnome-power-manager-2.13.93.tar.bz2 +gnome-power-manager-2.14.0.tar.bz2 Index: gnome-power-manager.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-power-manager/devel/gnome-power-manager.spec,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- gnome-power-manager.spec 7 Mar 2006 05:09:23 -0000 1.34 +++ gnome-power-manager.spec 14 Mar 2006 19:51:52 -0000 1.35 @@ -4,8 +4,8 @@ Summary: GNOME Power Manager Name: gnome-power-manager -Version: 2.13.93 -Release: 4 +Version: 2.14.0 +Release: 1 License: GPL Group: Applications/System Source: gnome-power-manager-%{version}.tar.bz2 @@ -25,7 +25,6 @@ Requires: dbus-glib >= %{dbus_version} Requires: dbus-x11 >= %{dbus_version} Requires: scrollkeeper -Patch0: gnome-power-manager-2.13.93-ignore-timeout.patch %description GNOME Power Manager uses the information and facilities provided by HAL @@ -35,7 +34,6 @@ %prep %setup -q -%patch0 -p1 -b .ignore-timeout %build %configure --disable-scrollkeeper --disable-actions-menu @@ -92,6 +90,9 @@ %{_datadir}/icons/hicolor/24x24/apps/* %changelog +* Tue Mar 14 2006 Ray Strode - 2.14.0-1 +- Update to 2.14.0 + * Mon Mar 6 2006 Ray Strode - 2.13.93-4 - fix the fix in -2 and -3 Index: sources =================================================================== RCS file: /cvs/dist/rpms/gnome-power-manager/devel/sources,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- sources 3 Mar 2006 22:58:49 -0000 1.14 +++ sources 14 Mar 2006 19:51:52 -0000 1.15 @@ -1 +1 @@ -ac50df4b39c883ed0c402ea53307a066 gnome-power-manager-2.13.93.tar.bz2 +d98f7e2a920e3d94dd8b65b476cd88ce gnome-power-manager-2.14.0.tar.bz2 --- gnome-power-manager-2.13.5.0.20060207-panel-integration.patch DELETED --- --- gnome-power-manager-2.13.93-ignore-timeout.patch DELETED --- From fedora-cvs-commits at redhat.com Tue Mar 14 20:10:01 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 14 Mar 2006 15:10:01 -0500 Subject: rpms/libbonobo/devel .cvsignore, 1.15, 1.16 libbonobo.spec, 1.37, 1.38 sources, 1.15, 1.16 Message-ID: <200603142010.k2EKA1p3012592@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/libbonobo/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv12368 Modified Files: .cvsignore libbonobo.spec sources Log Message: - Update to 2.14.0 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/libbonobo/devel/.cvsignore,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- .cvsignore 7 Mar 2006 20:12:46 -0000 1.15 +++ .cvsignore 14 Mar 2006 20:09:58 -0000 1.16 @@ -1,8 +1 @@ -libbonobo-2.6.2.tar.bz2 -libbonobo-2.8.0.tar.bz2 -libbonobo-2.8.1.tar.bz2 -libbonobo-2.10.0.tar.bz2 -libbonobo-2.10.1.tar.bz2 -libbonobo-2.13.0.tar.bz2 -libbonobo-2.13.1.tar.bz2 -libbonobo-2.13.93.tar.bz2 +libbonobo-2.14.0.tar.bz2 Index: libbonobo.spec =================================================================== RCS file: /cvs/dist/rpms/libbonobo/devel/libbonobo.spec,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- libbonobo.spec 7 Mar 2006 20:22:06 -0000 1.37 +++ libbonobo.spec 14 Mar 2006 20:09:58 -0000 1.38 @@ -5,7 +5,7 @@ Summary: Bonobo component system Name: libbonobo -Version: 2.13.93 +Version: 2.14.0 Release: 1 URL: http://ftp.gnome.org Source0: %{name}-%{version}.tar.bz2 @@ -116,6 +116,9 @@ %{_datadir}/gtk-doc/html/bonobo-activation %changelog +* Tue Mar 14 2006 Ray Strode 2.14.0-1 +- Update to 2.14.0 + * Tue Mar 7 2006 Matthias Clasen - Update to 2.13.93 Index: sources =================================================================== RCS file: /cvs/dist/rpms/libbonobo/devel/sources,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- sources 7 Mar 2006 20:12:46 -0000 1.15 +++ sources 14 Mar 2006 20:09:58 -0000 1.16 @@ -1 +1 @@ -2891b4da52322ef71f1d0b37a2cd3e4a libbonobo-2.13.93.tar.bz2 +f1f0255f94e3354250d142b688013fad libbonobo-2.14.0.tar.bz2 From fedora-cvs-commits at redhat.com Tue Mar 14 20:13:33 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 14 Mar 2006 15:13:33 -0500 Subject: rpms/selinux-policy/devel policy-20060207.patch, 1.48, 1.49 selinux-policy.spec, 1.150, 1.151 Message-ID: <200603142013.k2EKDXY4015025@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/selinux-policy/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv14980 Modified Files: policy-20060207.patch selinux-policy.spec Log Message: * Mon Mar 13 2006 Dan Walsh 2.2.23-17 - MLS Fixes dmidecode needs mls_file_read_up - add ypxfr_t - run init needs access to nscd - udev needs setuid - another xen log file - Dontaudit mount getattr proc_kcore_t policy-20060207.patch: Rules.modular | 2 policy/mcs | 4 policy/modules/admin/bootloader.te | 2 policy/modules/admin/dmidecode.te | 2 policy/modules/admin/readahead.te | 2 policy/modules/admin/rpm.fc | 2 policy/modules/admin/su.fc | 1 policy/modules/admin/su.if | 6 policy/modules/admin/updfstab.te | 4 policy/modules/admin/vbetool.te | 9 + policy/modules/kernel/corenetwork.te.in | 3 policy/modules/kernel/devices.fc | 1 policy/modules/kernel/devices.if | 21 ++- policy/modules/kernel/files.fc | 8 - policy/modules/kernel/files.if | 21 ++- policy/modules/kernel/filesystem.te | 1 policy/modules/kernel/kernel.if | 102 ++++++++++++++ policy/modules/kernel/kernel.te | 3 policy/modules/kernel/terminal.if | 2 policy/modules/services/apache.fc | 2 policy/modules/services/apache.if | 5 policy/modules/services/apm.fc | 2 policy/modules/services/apm.te | 4 policy/modules/services/bluetooth.te | 19 +- policy/modules/services/cron.te | 3 policy/modules/services/cups.fc | 2 policy/modules/services/cups.if | 22 +++ policy/modules/services/cups.te | 7 - policy/modules/services/cvs.te | 2 policy/modules/services/hal.if | 41 +++++ policy/modules/services/hal.te | 13 + policy/modules/services/ktalk.fc | 1 policy/modules/services/ktalk.te | 6 policy/modules/services/mailman.if | 25 +++ policy/modules/services/nis.fc | 1 policy/modules/services/nis.if | 25 +++ policy/modules/services/nis.te | 28 ++++ policy/modules/services/nscd.if | 2 policy/modules/services/postfix.te | 4 policy/modules/services/samba.te | 2 policy/modules/system/fstools.if | 18 ++ policy/modules/system/fstools.te | 3 policy/modules/system/init.te | 5 policy/modules/system/libraries.fc | 2 policy/modules/system/locallogin.te | 1 policy/modules/system/lvm.fc | 1 policy/modules/system/lvm.te | 3 policy/modules/system/mount.te | 3 policy/modules/system/selinuxutil.fc | 6 policy/modules/system/selinuxutil.if | 2 policy/modules/system/selinuxutil.te | 9 + policy/modules/system/sysnetwork.te | 7 + policy/modules/system/udev.te | 2 policy/modules/system/unconfined.te | 8 - policy/modules/system/xend.fc | 23 +++ policy/modules/system/xend.if | 71 ++++++++++ policy/modules/system/xend.te | 219 ++++++++++++++++++++++++++++++++ support/Makefile.devel | 5 58 files changed, 744 insertions(+), 56 deletions(-) Index: policy-20060207.patch =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20060207.patch,v retrieving revision 1.48 retrieving revision 1.49 diff -u -r1.48 -r1.49 --- policy-20060207.patch 9 Mar 2006 21:54:28 -0000 1.48 +++ policy-20060207.patch 14 Mar 2006 20:13:28 -0000 1.49 @@ -12,6 +12,30 @@ # new file labels must be dominated by the relabeling subject clearance mlsconstrain { dir lnk_file chr_file blk_file sock_file fifo_file } { relabelfrom } +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/bootloader.te serefpolicy-2.2.23/policy/modules/admin/bootloader.te +--- nsaserefpolicy/policy/modules/admin/bootloader.te 2006-03-02 18:45:54.000000000 -0500 ++++ serefpolicy-2.2.23/policy/modules/admin/bootloader.te 2006-03-13 12:23:12.000000000 -0500 +@@ -103,7 +103,7 @@ + files_manage_boot_symlinks(bootloader_t) + files_read_etc_files(bootloader_t) + files_exec_etc_files(bootloader_t) +-files_read_etc_runtime_files(bootloader_t) ++files_manage_etc_runtime_files(bootloader_t) + files_read_usr_src_files(bootloader_t) + files_read_usr_files(bootloader_t) + files_read_var_files(bootloader_t) +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/dmidecode.te serefpolicy-2.2.23/policy/modules/admin/dmidecode.te +--- nsaserefpolicy/policy/modules/admin/dmidecode.te 2006-03-04 00:06:33.000000000 -0500 ++++ serefpolicy-2.2.23/policy/modules/admin/dmidecode.te 2006-03-13 12:26:24.000000000 -0500 +@@ -32,6 +32,8 @@ + + locallogin_use_fds(dmidecode_t) + ++mls_file_read_up(dmidecode_t) ++ + ifdef(`targeted_policy',` + term_use_generic_ptys(dmidecode_t) + term_use_unallocated_ttys(dmidecode_t) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/readahead.te serefpolicy-2.2.23/policy/modules/admin/readahead.te --- nsaserefpolicy/policy/modules/admin/readahead.te 2006-03-04 00:06:33.000000000 -0500 +++ serefpolicy-2.2.23/policy/modules/admin/readahead.te 2006-03-07 13:42:37.000000000 -0500 @@ -61,6 +85,18 @@ kernel_read_system_state($1_su_t) kernel_read_kernel_sysctls($1_su_t) +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/updfstab.te serefpolicy-2.2.23/policy/modules/admin/updfstab.te +--- nsaserefpolicy/policy/modules/admin/updfstab.te 2006-03-04 00:06:33.000000000 -0500 ++++ serefpolicy-2.2.23/policy/modules/admin/updfstab.te 2006-03-14 11:34:03.000000000 -0500 +@@ -125,6 +125,6 @@ + udev_read_db(updfstab_t) + ') + +-ifdef(`TODO',` +-allow updfstab_t tmpfs_t:dir getattr; ++optional_policy(`fstools',` ++ fstools_getattr_swap_files(updfstab_t) + ') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/vbetool.te serefpolicy-2.2.23/policy/modules/admin/vbetool.te --- nsaserefpolicy/policy/modules/admin/vbetool.te 2006-02-01 08:23:27.000000000 -0500 +++ serefpolicy-2.2.23/policy/modules/admin/vbetool.te 2006-03-09 16:31:49.000000000 -0500 @@ -382,6 +418,19 @@ # # Sysctl types # +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/terminal.if serefpolicy-2.2.23/policy/modules/kernel/terminal.if +--- nsaserefpolicy/policy/modules/kernel/terminal.if 2006-02-14 07:20:25.000000000 -0500 ++++ serefpolicy-2.2.23/policy/modules/kernel/terminal.if 2006-03-13 15:57:21.000000000 -0500 +@@ -588,8 +588,8 @@ + type devpts_t; + ') + +- dev_list_all_dev_nodes($1) + allow $1 devpts_t:dir r_dir_perms; ++ dev_list_all_dev_nodes($1) + allow $1 ptynode:chr_file { rw_term_perms lock append }; + ') + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.fc serefpolicy-2.2.23/policy/modules/services/apache.fc --- nsaserefpolicy/policy/modules/services/apache.fc 2006-02-27 17:17:23.000000000 -0500 +++ serefpolicy-2.2.23/policy/modules/services/apache.fc 2006-03-07 13:42:37.000000000 -0500 @@ -785,6 +834,102 @@ + allow mailman_queue_t $1:process sigchld; +') + +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nis.fc serefpolicy-2.2.23/policy/modules/services/nis.fc +--- nsaserefpolicy/policy/modules/services/nis.fc 2005-11-28 21:48:04.000000000 -0500 ++++ serefpolicy-2.2.23/policy/modules/services/nis.fc 2006-03-10 16:47:00.000000000 -0500 +@@ -7,3 +7,4 @@ + /usr/sbin/ypserv -- gen_context(system_u:object_r:ypserv_exec_t,s0) + + /var/yp(/.*)? gen_context(system_u:object_r:var_yp_t,s0) ++/usr/sbin/rpc.ypxfr -- gen_context(system_u:object_r:ypxfr_exec_t,s0) +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nis.if serefpolicy-2.2.23/policy/modules/services/nis.if +--- nsaserefpolicy/policy/modules/services/nis.if 2006-02-10 21:34:14.000000000 -0500 ++++ serefpolicy-2.2.23/policy/modules/services/nis.if 2006-03-10 16:45:39.000000000 -0500 +@@ -277,3 +277,28 @@ + files_search_etc($1) + allow $1 ypserv_conf_t:file { getattr read }; + ') ++ ++ ++######################################## ++## ++## Execute ypxfr in the ypxfr domain. ++## ++## ++## ++## Domain allowed access. ++## ++## ++# ++interface(`nis_domtrans_ypxfr',` ++ gen_require(` ++ type ypxfr_t, ypxfr_exec_t; ++ ') ++ ++ corecmd_search_bin($1) ++ domain_auto_trans($1,ypxfr_exec_t,ypxfr_t) ++ ++ allow $1 ypxfr_t:fd use; ++ allow ypxfr_t $1:fd use; ++ allow ypxfr_t $1:fifo_file rw_file_perms; ++ allow ypxfr_t $1:process sigchld; ++') +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nis.te serefpolicy-2.2.23/policy/modules/services/nis.te +--- nsaserefpolicy/policy/modules/services/nis.te 2006-03-04 00:06:36.000000000 -0500 ++++ serefpolicy-2.2.23/policy/modules/services/nis.te 2006-03-13 13:32:08.000000000 -0500 +@@ -31,6 +31,10 @@ + type ypserv_exec_t; + init_daemon_domain(ypserv_t,ypserv_exec_t) + ++type ypxfr_t; ++type ypxfr_exec_t; ++init_daemon_domain(ypxfr_t,ypxfr_exec_t) ++ + type ypserv_conf_t; + files_type(ypserv_conf_t) + +@@ -245,6 +249,7 @@ + allow ypserv_t self:fifo_file rw_file_perms; + allow ypserv_t self:process signal_perms; + allow ypserv_t self:unix_dgram_socket create_socket_perms; ++allow ypserv_t self:unix_stream_socket create_stream_socket_perms; + allow ypserv_t self:netlink_route_socket r_netlink_socket_perms; + allow ypserv_t self:tcp_socket connected_stream_socket_perms; + allow ypserv_t self:udp_socket create_socket_perms; +@@ -306,6 +311,8 @@ + + miscfiles_read_localization(ypserv_t) + ++nis_domtrans_ypxfr(ypserv_t) ++ + sysnet_read_config(ypserv_t) + + userdom_dontaudit_use_unpriv_user_fds(ypserv_t) +@@ -326,3 +333,24 @@ + optional_policy(`udev',` + udev_read_db(ypserv_t) + ') ++ ++corenet_tcp_sendrecv_all_if(ypxfr_t) ++corenet_udp_sendrecv_all_if(ypxfr_t) ++corenet_raw_sendrecv_all_if(ypxfr_t) ++corenet_tcp_sendrecv_all_nodes(ypxfr_t) ++corenet_udp_sendrecv_all_nodes(ypxfr_t) ++corenet_raw_sendrecv_all_nodes(ypxfr_t) ++corenet_tcp_sendrecv_all_ports(ypxfr_t) ++corenet_udp_sendrecv_all_ports(ypxfr_t) ++corenet_non_ipsec_sendrecv(ypxfr_t) ++corenet_tcp_bind_all_nodes(ypxfr_t) ++corenet_udp_bind_all_nodes(ypxfr_t) ++corenet_tcp_bind_reserved_port(ypxfr_t) ++corenet_udp_bind_reserved_port(ypxfr_t) ++corenet_dontaudit_tcp_bind_all_reserved_ports(ypxfr_t) ++corenet_dontaudit_udp_bind_all_reserved_ports(ypxfr_t) ++corenet_tcp_connect_all_ports(ypxfr_t) ++allow ypxfr_t self:unix_stream_socket create_stream_socket_perms; ++ ++allow ypxfr_t etc_t:file { getattr read }; ++files_read_etc_files(ypxfr_t) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nscd.if serefpolicy-2.2.23/policy/modules/services/nscd.if --- nsaserefpolicy/policy/modules/services/nscd.if 2006-02-10 21:34:14.000000000 -0500 +++ serefpolicy-2.2.23/policy/modules/services/nscd.if 2006-03-07 13:42:37.000000000 -0500 @@ -824,9 +969,34 @@ files_config_file(samba_share_t) type samba_var_t; +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/fstools.if serefpolicy-2.2.23/policy/modules/system/fstools.if +--- nsaserefpolicy/policy/modules/system/fstools.if 2006-02-10 21:34:15.000000000 -0500 ++++ serefpolicy-2.2.23/policy/modules/system/fstools.if 2006-03-14 11:33:20.000000000 -0500 +@@ -110,3 +110,21 @@ + + allow $1 fsadm_exec_t:file create_file_perms; + ') ++ ++######################################## ++## ++## Getattr swapfile ++## ++## ++## ++## The type of the process performing this action. ++## ++## ++# ++interface(`fstools_getattr_swap_files',` ++ gen_require(` ++ type swapfile_t; ++ ') ++ ++ allow $1 swapfile_t:file getattr; ++') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/fstools.te serefpolicy-2.2.23/policy/modules/system/fstools.te --- nsaserefpolicy/policy/modules/system/fstools.te 2006-03-04 00:06:37.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/system/fstools.te 2006-03-09 16:38:01.000000000 -0500 ++++ serefpolicy-2.2.23/policy/modules/system/fstools.te 2006-03-14 11:32:08.000000000 -0500 @@ -53,6 +53,7 @@ kernel_change_ring_buffer_level(fsadm_t) # mkreiserfs needs this @@ -936,8 +1106,16 @@ fs_search_auto_mountpoints(lvm_t) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.te serefpolicy-2.2.23/policy/modules/system/mount.te --- nsaserefpolicy/policy/modules/system/mount.te 2006-03-04 00:06:37.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/system/mount.te 2006-03-09 16:54:17.000000000 -0500 -@@ -33,6 +33,7 @@ ++++ serefpolicy-2.2.23/policy/modules/system/mount.te 2006-03-14 14:40:50.000000000 -0500 +@@ -26,6 +26,7 @@ + files_tmp_filetrans(mount_t,mount_tmp_t,{ file dir }) + + kernel_read_system_state(mount_t) ++kernel_dontaudit_getattr_core_if(mount_t) + + corenet_dontaudit_tcp_bind_all_reserved_ports(mount_t) + corenet_dontaudit_udp_bind_all_reserved_ports(mount_t) +@@ -33,6 +34,7 @@ dev_getattr_all_blk_files(mount_t) dev_list_all_dev_nodes(mount_t) dev_rw_lvm_control(mount_t) @@ -945,7 +1123,7 @@ dev_dontaudit_getattr_memory_dev(mount_t) dev_getattr_sound_dev(mount_t) -@@ -73,6 +74,7 @@ +@@ -73,6 +75,7 @@ init_use_fds(mount_t) init_use_script_ptys(mount_t) @@ -969,9 +1147,21 @@ /etc/selinux/([^/]*/)?users(/.*)? -- gen_context(system_u:object_r:selinux_config_t,s15:c0.c255) # +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.if serefpolicy-2.2.23/policy/modules/system/selinuxutil.if +--- nsaserefpolicy/policy/modules/system/selinuxutil.if 2006-02-23 09:25:09.000000000 -0500 ++++ serefpolicy-2.2.23/policy/modules/system/selinuxutil.if 2006-03-13 12:46:45.000000000 -0500 +@@ -853,7 +853,7 @@ + ') + + files_search_etc($1) +- allow $1 selinux_config_t:dir rw_dir_perms; ++ allow $1 selinux_config_t:dir create_dir_perms; + type_transition $1 selinux_config_t:dir semanage_store_t; + + allow $1 semanage_store_t:dir create_dir_perms; diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.te serefpolicy-2.2.23/policy/modules/system/selinuxutil.te --- nsaserefpolicy/policy/modules/system/selinuxutil.te 2006-03-04 00:06:37.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/system/selinuxutil.te 2006-03-07 13:42:37.000000000 -0500 ++++ serefpolicy-2.2.23/policy/modules/system/selinuxutil.te 2006-03-13 13:21:24.000000000 -0500 @@ -192,6 +192,9 @@ selinux_load_policy(load_policy_t) selinux_set_boolean(load_policy_t) @@ -990,6 +1180,18 @@ term_use_all_user_ttys(newrole_t) term_use_all_user_ptys(newrole_t) term_relabel_all_user_ttys(newrole_t) +@@ -476,6 +480,11 @@ + optional_policy(`daemontools',` + daemontools_domtrans_start(run_init_t) + ') ++ ++ optional_policy(`nscd',` ++ nscd_socket_use(run_init_t) ++ ') ++ + ') dnl end ifdef targeted policy + + ######################################## diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/sysnetwork.te serefpolicy-2.2.23/policy/modules/system/sysnetwork.te --- nsaserefpolicy/policy/modules/system/sysnetwork.te 2006-03-04 00:06:37.000000000 -0500 +++ serefpolicy-2.2.23/policy/modules/system/sysnetwork.te 2006-03-09 11:15:56.000000000 -0500 @@ -1016,13 +1218,13 @@ term_use_generic_ptys(ifconfig_t) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.te serefpolicy-2.2.23/policy/modules/system/udev.te --- nsaserefpolicy/policy/modules/system/udev.te 2006-03-04 00:06:37.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/system/udev.te 2006-03-07 13:42:37.000000000 -0500 ++++ serefpolicy-2.2.23/policy/modules/system/udev.te 2006-03-13 12:21:29.000000000 -0500 @@ -39,7 +39,7 @@ # Local policy # -allow udev_t self:capability { chown dac_override dac_read_search fowner fsetid sys_admin mknod net_raw net_admin sys_nice sys_rawio sys_resource sys_nice }; -+allow udev_t self:capability { chown dac_override dac_read_search fowner fsetid sys_admin mknod net_raw net_admin sys_nice sys_rawio sys_resource setgid sys_nice }; ++allow udev_t self:capability { chown dac_override dac_read_search fowner fsetid sys_admin mknod net_raw net_admin sys_nice sys_rawio sys_resource setuid setgid sys_nice }; dontaudit udev_t self:capability sys_tty_config; allow udev_t self:process ~{ ptrace setcurrent setexec setfscreate setrlimit execmem execstack execheap }; allow udev_t self:process { execmem setfscreate }; @@ -1053,8 +1255,8 @@ ') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xend.fc serefpolicy-2.2.23/policy/modules/system/xend.fc --- nsaserefpolicy/policy/modules/system/xend.fc 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/system/xend.fc 2006-03-09 10:11:00.000000000 -0500 -@@ -0,0 +1,22 @@ ++++ serefpolicy-2.2.23/policy/modules/system/xend.fc 2006-03-10 16:48:34.000000000 -0500 +@@ -0,0 +1,23 @@ +# xend executable will have: +# label: system_u:object_r:xend_exec_t +# MLS sensitivity: s0 @@ -1065,6 +1267,7 @@ + +/var/log/xend\.log -- system_u:object_r:xend_var_log_t:s0 +/var/log/xend-debug\.log -- system_u:object_r:xend_var_log_t:s0 ++/var/log/xen-hotplug\.log -- system_u:object_r:xend_var_log_t:s0 +/var/lib/xen(/.*)? system_u:object_r:xend_var_lib_t:s0 +/var/lib/xend(/.*)? system_u:object_r:xend_var_lib_t:s0 +/var/lib/xenstored(/.*)? system_u:object_r:xenstored_var_lib_t:s0 @@ -1154,8 +1357,8 @@ + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xend.te serefpolicy-2.2.23/policy/modules/system/xend.te --- nsaserefpolicy/policy/modules/system/xend.te 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/system/xend.te 2006-03-09 13:10:10.000000000 -0500 -@@ -0,0 +1,217 @@ ++++ serefpolicy-2.2.23/policy/modules/system/xend.te 2006-03-13 16:17:27.000000000 -0500 +@@ -0,0 +1,219 @@ +policy_module(xend,1.0.0) + +######################################## @@ -1294,6 +1497,8 @@ +term_dontaudit_getattr_all_user_ptys(xend_t) +term_dontaudit_use_generic_ptys(xend_t) + ++storage_raw_read_fixed_disk(xend_t) ++ +xend_store_stream_connect(xend_t) + +################################ xenconsoled_t ############################## Index: selinux-policy.spec =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v retrieving revision 1.150 retrieving revision 1.151 diff -u -r1.150 -r1.151 --- selinux-policy.spec 14 Mar 2006 10:37:14 -0000 1.150 +++ selinux-policy.spec 14 Mar 2006 20:13:28 -0000 1.151 @@ -10,7 +10,7 @@ Summary: SELinux policy configuration Name: selinux-policy Version: 2.2.23 -Release: 16 +Release: 17 License: GPL Group: System Environment/Base Source: serefpolicy-%{version}.tgz @@ -298,6 +298,15 @@ %fileList strict %changelog +* Mon Mar 13 2006 Dan Walsh 2.2.23-17 +- MLS Fixes + dmidecode needs mls_file_read_up +- add ypxfr_t +- run init needs access to nscd +- udev needs setuid +- another xen log file +- Dontaudit mount getattr proc_kcore_t + * Tue Mar 14 2006 Karsten Hopp 2.2.23-16 - fix buildroot usage (#185391) From fedora-cvs-commits at redhat.com Tue Mar 14 20:14:15 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 14 Mar 2006 15:14:15 -0500 Subject: rpms/libsetrans/devel .cvsignore, 1.20, 1.21 libsetrans.spec, 1.30, 1.31 sources, 1.25, 1.26 Message-ID: <200603142014.k2EKEF5C015606@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/libsetrans/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv15564 Modified Files: .cvsignore libsetrans.spec sources Log Message: * Mon Mar 13 2006 Dan Walsh 0.1.20-1 - Fix handling of untranslated sensitivities Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/libsetrans/devel/.cvsignore,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- .cvsignore 13 Mar 2006 15:47:03 -0000 1.20 +++ .cvsignore 14 Mar 2006 20:14:12 -0000 1.21 @@ -18,3 +18,4 @@ libsetrans-0.1.17.tgz libsetrans-0.1.18.tgz libsetrans-0.1.19.tgz +libsetrans-0.1.20.tgz Index: libsetrans.spec =================================================================== RCS file: /cvs/dist/rpms/libsetrans/devel/libsetrans.spec,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- libsetrans.spec 13 Mar 2006 15:45:33 -0000 1.30 +++ libsetrans.spec 14 Mar 2006 20:14:12 -0000 1.31 @@ -1,6 +1,6 @@ Summary: SELinux Translation library Name: libsetrans -Version: 0.1.19 +Version: 0.1.20 Release: 1 License: LGPL Group: System Environment/Libraries @@ -51,6 +51,9 @@ %{_mandir}/man8/mcs.8.gz %changelog +* Mon Mar 13 2006 Dan Walsh 0.1.20-1 +- Fix handling of untranslated sensitivities + * Mon Mar 13 2006 Dan Walsh 0.1.19-1 - Fix segfault error on badly formated setrans file Index: sources =================================================================== RCS file: /cvs/dist/rpms/libsetrans/devel/sources,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- sources 13 Mar 2006 15:47:03 -0000 1.25 +++ sources 14 Mar 2006 20:14:12 -0000 1.26 @@ -1 +1 @@ -24fe1370fdc6b2d2727e2a03113cd9da libsetrans-0.1.19.tgz +79deb2119b69159e05c09345ed327fe1 libsetrans-0.1.20.tgz From fedora-cvs-commits at redhat.com Tue Mar 14 20:15:35 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 14 Mar 2006 15:15:35 -0500 Subject: rpms/selinux-policy/devel selinux-policy.spec,1.151,1.152 Message-ID: <200603142015.k2EKFZLS016569@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/selinux-policy/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv16471 Modified Files: selinux-policy.spec Log Message: * Tue Mar 14 2006 Dan Walsh 2.2.23-17 - MLS Fixes dmidecode needs mls_file_read_up - add ypxfr_t - run init needs access to nscd - udev needs setuid - another xen log file - Dontaudit mount getattr proc_kcore_t Index: selinux-policy.spec =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v retrieving revision 1.151 retrieving revision 1.152 diff -u -r1.151 -r1.152 --- selinux-policy.spec 14 Mar 2006 20:13:28 -0000 1.151 +++ selinux-policy.spec 14 Mar 2006 20:15:31 -0000 1.152 @@ -298,7 +298,7 @@ %fileList strict %changelog -* Mon Mar 13 2006 Dan Walsh 2.2.23-17 +* Tue Mar 14 2006 Dan Walsh 2.2.23-17 - MLS Fixes dmidecode needs mls_file_read_up - add ypxfr_t From fedora-cvs-commits at redhat.com Tue Mar 14 20:18:20 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 14 Mar 2006 15:18:20 -0500 Subject: rpms/selinux-policy-strict/FC-4 policy-20050916.patch, 1.23, 1.24 selinux-policy-strict.spec, 1.339, 1.340 Message-ID: <200603142018.k2EKIKfw026050@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/selinux-policy-strict/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv25884 Modified Files: policy-20050916.patch selinux-policy-strict.spec Log Message: * Tue Mar 14 2006 Dan Walsh 1.27.1-2.27 - Allow updfstab to getattr on swapfile - Allow ypserv to communicate with ypxfr_t - File context for in.talkd policy-20050916.patch: Makefile | 26 +- domains/admin.te | 2 domains/misc/kernel.te | 2 domains/program/crond.te | 2 domains/program/fsadm.te | 11 - domains/program/getty.te | 2 domains/program/hostname.te | 2 domains/program/ifconfig.te | 10 - domains/program/init.te | 2 domains/program/initrc.te | 26 ++ domains/program/ldconfig.te | 3 domains/program/load_policy.te | 11 - domains/program/login.te | 23 +- domains/program/logrotate.te | 2 domains/program/modutil.te | 27 +- domains/program/mount.te | 6 domains/program/netutils.te | 3 domains/program/newrole.te | 4 domains/program/passwd.te | 2 domains/program/restorecon.te | 6 domains/program/setfiles.te | 4 domains/program/ssh.te | 6 domains/program/su.te | 12 + domains/program/syslogd.te | 7 domains/program/tmpreaper.te | 2 domains/program/unused/NetworkManager.te | 13 + domains/program/unused/alsa.te | 2 domains/program/unused/amanda.te | 74 +------ domains/program/unused/anaconda.te | 5 domains/program/unused/apache.te | 27 +- domains/program/unused/apmd.te | 25 ++ domains/program/unused/auditd.te | 14 + domains/program/unused/automount.te | 4 domains/program/unused/avahi.te | 31 +++ domains/program/unused/bluetooth.te | 72 +++++++ domains/program/unused/cups.te | 24 +- domains/program/unused/cvs.te | 2 domains/program/unused/cyrus.te | 10 - domains/program/unused/dbusd.te | 4 domains/program/unused/dcc.te | 5 domains/program/unused/dhcpc.te | 6 domains/program/unused/dhcpd.te | 4 domains/program/unused/dovecot.te | 6 domains/program/unused/exim.te | 309 +++++++++++++++++++++++++++++++ domains/program/unused/ftpd.te | 6 domains/program/unused/hald.te | 5 domains/program/unused/hotplug.te | 10 - domains/program/unused/hwclock.te | 1 domains/program/unused/ipsec.te | 2 domains/program/unused/kudzu.te | 5 domains/program/unused/mta.te | 7 domains/program/unused/mysqld.te | 10 - domains/program/unused/named.te | 27 ++ domains/program/unused/nscd.te | 1 domains/program/unused/ntpd.te | 10 - domains/program/unused/openct.te | 16 + domains/program/unused/pamconsole.te | 4 domains/program/unused/pegasus.te | 36 +++ domains/program/unused/ping.te | 2 domains/program/unused/postfix.te | 65 ++++-- domains/program/unused/postgresql.te | 11 - domains/program/unused/pppd.te | 23 +- domains/program/unused/privoxy.te | 2 domains/program/unused/procmail.te | 16 + domains/program/unused/radius.te | 3 domains/program/unused/readahead.te | 21 ++ domains/program/unused/rlogind.te | 4 domains/program/unused/roundup.te | 29 ++ domains/program/unused/rpcd.te | 18 + domains/program/unused/rpm.te | 4 domains/program/unused/rsync.te | 3 domains/program/unused/samba.te | 15 + domains/program/unused/saslauthd.te | 1 domains/program/unused/sendmail.te | 3 domains/program/unused/slapd.te | 28 ++ domains/program/unused/snmpd.te | 6 domains/program/unused/spamd.te | 28 -- domains/program/unused/squid.te | 4 domains/program/unused/udev.te | 10 - domains/program/unused/updfstab.te | 1 domains/program/unused/utempter.te | 2 domains/program/unused/webalizer.te | 3 domains/program/unused/winbind.te | 1 domains/program/unused/xdm.te | 3 domains/program/unused/yppasswdd.te | 40 ++++ domains/program/unused/ypserv.te | 11 + domains/program/unused/zebra.te | 6 domains/program/useradd.te | 5 file_contexts/distros.fc | 2 file_contexts/program/apache.fc | 3 file_contexts/program/bluetooth.fc | 3 file_contexts/program/compat.fc | 4 file_contexts/program/dhcpc.fc | 2 file_contexts/program/dhcpd.fc | 5 file_contexts/program/ftpd.fc | 5 file_contexts/program/games.fc | 11 - file_contexts/program/innd.fc | 15 - file_contexts/program/ipsec.fc | 1 file_contexts/program/ktalkd.fc | 1 file_contexts/program/openct.fc | 2 file_contexts/program/pegasus.fc | 9 file_contexts/program/pppd.fc | 2 file_contexts/program/privoxy.fc | 1 file_contexts/program/readahead.fc | 1 file_contexts/program/roundup.fc | 2 file_contexts/program/rpm.fc | 4 file_contexts/program/rshd.fc | 1 file_contexts/program/rsync.fc | 2 file_contexts/program/slapd.fc | 12 + file_contexts/program/squid.fc | 3 file_contexts/program/xdm.fc | 2 file_contexts/program/yppasswdd.fc | 2 file_contexts/program/ypserv.fc | 1 file_contexts/types.fc | 6 genfs_contexts | 3 macros/base_user_macros.te | 7 macros/core_macros.te | 9 macros/global_macros.te | 35 ++- macros/home_macros.te | 9 macros/network_macros.te | 19 + macros/program/apache_macros.te | 13 + macros/program/bonobo_macros.te | 2 macros/program/cdrecord_macros.te | 6 macros/program/chkpwd_macros.te | 8 macros/program/crontab_macros.te | 2 macros/program/dbusd_macros.te | 7 macros/program/gconf_macros.te | 2 macros/program/gift_macros.te | 2 macros/program/gpg_macros.te | 2 macros/program/i18n_input_macros.te | 21 ++ macros/program/lpr_macros.te | 2 macros/program/mta_macros.te | 4 macros/program/newrole_macros.te | 2 macros/program/pyzor_macros.te | 2 macros/program/razor_macros.te | 2 macros/program/su_macros.te | 4 macros/program/uml_macros.te | 2 macros/program/xdm_macros.te | 2 macros/program/ypbind_macros.te | 1 macros/user_macros.te | 7 man/man8/ftpd_selinux.8 | 19 + man/man8/httpd_selinux.8 | 9 man/man8/rsync_selinux.8 | 12 - man/man8/samba_selinux.8 | 9 mcs | 210 ++++++++------------- mls | 270 ++++++++++----------------- net_contexts | 15 + policy-1.27.1/attrib.te | 100 +++++++++- targeted/appconfig/root_default_contexts | 4 targeted/assert.te | 2 targeted/domains/program/compat.te | 1 targeted/domains/program/sendmail.te | 1 targeted/domains/program/ssh.te | 3 targeted/domains/program/xdm.te | 4 targeted/domains/unconfined.te | 15 + tunables/distro.tun | 2 tunables/tunable.tun | 4 types/device.te | 4 types/devpts.te | 4 types/file.te | 48 +--- types/network.te | 15 - types/nfs.te | 1 types/security.te | 6 163 files changed, 1692 insertions(+), 691 deletions(-) Index: policy-20050916.patch =================================================================== RCS file: /cvs/dist/rpms/selinux-policy-strict/FC-4/policy-20050916.patch,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- policy-20050916.patch 10 Feb 2006 21:09:19 -0000 1.23 +++ policy-20050916.patch 14 Mar 2006 20:18:18 -0000 1.24 @@ -160,7 +160,6 @@ # For labeling of file_context domains which users can change files to rather # then the default file context. These file_context can survive a relabeling # of the file system. -diff --exclude-from=exclude -N -u -r nsapolicy/domains/admin.te policy-1.27.1/domains/admin.te --- nsapolicy/domains/admin.te 2005-09-16 11:17:27.000000000 -0400 +++ policy-1.27.1/domains/admin.te 2005-11-30 16:42:28.000000000 -0500 @@ -4,7 +4,7 @@ @@ -172,7 +171,6 @@ ; dnl end of sysadm_t type declaration allow privhome home_root_t:dir { getattr search }; -diff --exclude-from=exclude -N -u -r nsapolicy/domains/misc/kernel.te policy-1.27.1/domains/misc/kernel.te --- nsapolicy/domains/misc/kernel.te 2005-09-16 11:17:27.000000000 -0400 +++ policy-1.27.1/domains/misc/kernel.te 2005-11-30 16:42:28.000000000 -0500 @@ -30,7 +30,7 @@ @@ -184,7 +182,6 @@ ') # Share state with the init process. -diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/crond.te policy-1.27.1/domains/program/crond.te --- nsapolicy/domains/program/crond.te 2005-09-16 11:17:27.000000000 -0400 +++ policy-1.27.1/domains/program/crond.te 2005-11-30 16:42:28.000000000 -0500 @@ -106,7 +106,7 @@ @@ -196,9 +193,8 @@ # Use capabilities. allow system_crond_t self:capability { dac_read_search chown setgid setuid fowner net_bind_service fsetid }; -diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/fsadm.te policy-1.27.1/domains/program/fsadm.te --- nsapolicy/domains/program/fsadm.te 2005-09-16 11:17:27.000000000 -0400 -+++ policy-1.27.1/domains/program/fsadm.te 2005-11-30 16:42:28.000000000 -0500 ++++ policy-1.27.1/domains/program/fsadm.te 2006-03-14 13:53:33.000000000 -0500 @@ -12,7 +12,7 @@ # administration. # fsadm_exec_t is the type of the corresponding programs. @@ -208,7 +204,15 @@ role system_r types fsadm_t; role sysadm_r types fsadm_t; -@@ -102,10 +102,10 @@ +@@ -95,17 +95,17 @@ + allow fsadm_t device_t:lnk_file { unlink create }; + + # Enable swapping to devices and files +-allow fsadm_t swapfile_t:file { getattr swapon }; ++allow fsadm_t swapfile_t:file { write read getattr swapon }; + allow fsadm_t fixed_disk_device_t:blk_file { getattr swapon }; + + # Allow console log change (updfstab) allow fsadm_t kernel_t:system syslog_console; # Access terminals. @@ -228,7 +232,6 @@ + +# for tune2fs +allow fsadm_t file_type:dir { getattr search }; -diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/getty.te policy-1.27.1/domains/program/getty.te --- nsapolicy/domains/program/getty.te 2005-09-16 11:17:27.000000000 -0400 +++ policy-1.27.1/domains/program/getty.te 2005-11-30 16:42:28.000000000 -0500 @@ -8,7 +8,7 @@ @@ -240,7 +243,6 @@ etcdir_domain(getty) -diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/hostname.te policy-1.27.1/domains/program/hostname.te --- nsapolicy/domains/program/hostname.te 2005-09-16 11:17:27.000000000 -0400 +++ policy-1.27.1/domains/program/hostname.te 2005-11-30 16:42:28.000000000 -0500 @@ -24,5 +24,5 @@ @@ -250,7 +252,6 @@ -allow hostname_t initrc_devpts_t:chr_file { read write }; +can_access_pty(hostname_t, initrc) allow hostname_t initrc_t:fd use; -diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/ifconfig.te policy-1.27.1/domains/program/ifconfig.te --- nsapolicy/domains/program/ifconfig.te 2005-09-16 11:17:27.000000000 -0400 +++ policy-1.27.1/domains/program/ifconfig.te 2005-11-30 16:57:09.000000000 -0500 @@ -35,7 +35,12 @@ @@ -285,7 +286,6 @@ allow ifconfig_t fs_t:filesystem getattr; -diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/initrc.te policy-1.27.1/domains/program/initrc.te --- nsapolicy/domains/program/initrc.te 2005-09-16 11:17:27.000000000 -0400 +++ policy-1.27.1/domains/program/initrc.te 2005-11-30 16:42:28.000000000 -0500 @@ -12,7 +12,7 @@ @@ -346,7 +346,6 @@ +ifdef(`use_mcs', ` +range_transition sysadm_t initrc_exec_t s0; +') -diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/init.te policy-1.27.1/domains/program/init.te --- nsapolicy/domains/program/init.te 2005-09-16 11:17:27.000000000 -0400 +++ policy-1.27.1/domains/program/init.te 2005-11-30 16:42:28.000000000 -0500 @@ -14,7 +14,7 @@ @@ -358,7 +357,6 @@ role system_r types init_t; uses_shlib(init_t); type init_exec_t, file_type, sysadmfile, exec_type; -diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/ldconfig.te policy-1.27.1/domains/program/ldconfig.te --- nsapolicy/domains/program/ldconfig.te 2005-09-16 11:17:27.000000000 -0400 +++ policy-1.27.1/domains/program/ldconfig.te 2005-11-30 16:42:28.000000000 -0500 @@ -16,7 +16,8 @@ @@ -371,7 +369,6 @@ allow ldconfig_t privfd:fd use; uses_shlib(ldconfig_t) -diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/load_policy.te policy-1.27.1/domains/program/load_policy.te --- nsapolicy/domains/program/load_policy.te 2005-09-16 11:17:27.000000000 -0400 +++ policy-1.27.1/domains/program/load_policy.te 2005-11-30 16:42:28.000000000 -0500 @@ -8,6 +8,10 @@ @@ -401,7 +398,6 @@ uses_shlib(load_policy_t) allow load_policy_t self:capability dac_override; -diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/login.te policy-1.27.1/domains/program/login.te --- nsapolicy/domains/program/login.te 2005-09-16 11:17:27.000000000 -0400 +++ policy-1.27.1/domains/program/login.te 2005-11-30 16:42:28.000000000 -0500 @@ -13,7 +13,7 @@ @@ -462,7 +458,6 @@ +range_transition getty_t login_exec_t s0 - s0:c0.c127; +') +') -diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/logrotate.te policy-1.27.1/domains/program/logrotate.te --- nsapolicy/domains/program/logrotate.te 2005-09-16 11:17:27.000000000 -0400 +++ policy-1.27.1/domains/program/logrotate.te 2005-11-30 16:42:28.000000000 -0500 @@ -13,7 +13,7 @@ @@ -474,7 +469,6 @@ role system_r types logrotate_t; role sysadm_r types logrotate_t; uses_shlib(logrotate_t) -diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/modutil.te policy-1.27.1/domains/program/modutil.te --- nsapolicy/domains/program/modutil.te 2005-09-16 11:17:27.000000000 -0400 +++ policy-1.27.1/domains/program/modutil.te 2005-11-30 16:42:28.000000000 -0500 @@ -59,7 +59,8 @@ @@ -561,7 +555,6 @@ can_exec(update_modules_t, insmod_exec_t) allow update_modules_t urandom_device_t:chr_file { getattr read }; -diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/mount.te policy-1.27.1/domains/program/mount.te --- nsapolicy/domains/program/mount.te 2005-09-16 11:17:27.000000000 -0400 +++ policy-1.27.1/domains/program/mount.te 2005-11-30 16:42:28.000000000 -0500 @@ -16,13 +16,14 @@ @@ -587,7 +580,6 @@ allow mount_t self:capability { setgid setuid }; -allow user_t mount_t:tcp_socket write; allow mount_t proc_t:lnk_file read; -diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/netutils.te policy-1.27.1/domains/program/netutils.te --- nsapolicy/domains/program/netutils.te 2005-09-16 11:17:27.000000000 -0400 +++ policy-1.27.1/domains/program/netutils.te 2005-11-30 16:42:28.000000000 -0500 @@ -55,7 +55,8 @@ @@ -600,7 +592,6 @@ ifdef(`gnome-pty-helper.te', `allow netutils_t sysadm_gph_t:fd use;') allow netutils_t proc_t:dir search; -diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/newrole.te policy-1.27.1/domains/program/newrole.te --- nsapolicy/domains/program/newrole.te 2005-09-16 11:17:27.000000000 -0400 +++ policy-1.27.1/domains/program/newrole.te 2005-11-30 16:42:28.000000000 -0500 @@ -18,3 +18,7 @@ @@ -611,7 +602,6 @@ +ifdef(`targeted_policy', ` +typeattribute newrole_t unconfinedtrans; +') -diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/passwd.te policy-1.27.1/domains/program/passwd.te --- nsapolicy/domains/program/passwd.te 2005-09-16 11:17:27.000000000 -0400 +++ policy-1.27.1/domains/program/passwd.te 2005-11-30 16:42:28.000000000 -0500 @@ -42,7 +42,7 @@ @@ -623,7 +613,6 @@ # Access terminals. allow $1_t { ttyfile ptyfile }:chr_file rw_file_perms; -diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/restorecon.te policy-1.27.1/domains/program/restorecon.te --- nsapolicy/domains/program/restorecon.te 2005-09-16 11:17:27.000000000 -0400 +++ policy-1.27.1/domains/program/restorecon.te 2005-11-30 16:42:28.000000000 -0500 @@ -19,7 +19,7 @@ @@ -643,7 +632,6 @@ +ifdef(`targeted_policy', ` +allow restorecon_t devpts_t:chr_file getattr; +') -diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/setfiles.te policy-1.27.1/domains/program/setfiles.te --- nsapolicy/domains/program/setfiles.te 2005-09-16 11:17:27.000000000 -0400 +++ policy-1.27.1/domains/program/setfiles.te 2005-11-30 16:42:28.000000000 -0500 @@ -12,7 +12,7 @@ @@ -664,7 +652,6 @@ allow setfiles_t { ttyfile ptyfile tty_device_t admin_tty_type devtty_t }:chr_file { read write ioctl }; allow setfiles_t self:unix_dgram_socket create_socket_perms; -diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/ssh.te policy-1.27.1/domains/program/ssh.te --- nsapolicy/domains/program/ssh.te 2005-09-16 11:17:27.000000000 -0400 +++ policy-1.27.1/domains/program/ssh.te 2005-11-30 16:42:28.000000000 -0500 @@ -153,6 +153,7 @@ @@ -691,7 +678,6 @@ +ifdef(`use_mcs', ` +range_transition initrc_t sshd_exec_t s0 - s0:c0.c255; +') -diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/su.te policy-1.27.1/domains/program/su.te --- nsapolicy/domains/program/su.te 2005-09-16 11:17:27.000000000 -0400 +++ policy-1.27.1/domains/program/su.te 2005-11-30 16:42:28.000000000 -0500 @@ -12,3 +12,15 @@ @@ -710,7 +696,6 @@ +rw_dir_create_file(sysadm_su_t, home_dir_type) +') +') -diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/syslogd.te policy-1.27.1/domains/program/syslogd.te --- nsapolicy/domains/program/syslogd.te 2005-09-16 11:17:27.000000000 -0400 +++ policy-1.27.1/domains/program/syslogd.te 2005-11-30 16:42:28.000000000 -0500 @@ -14,9 +14,9 @@ @@ -742,7 +727,6 @@ ') # Allow access to /proc/kmsg for syslog-ng -diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/tmpreaper.te policy-1.27.1/domains/program/tmpreaper.te --- nsapolicy/domains/program/tmpreaper.te 2005-09-16 11:17:27.000000000 -0400 +++ policy-1.27.1/domains/program/tmpreaper.te 2005-11-30 16:42:28.000000000 -0500 @@ -8,7 +8,7 @@ @@ -754,7 +738,6 @@ type tmpreaper_exec_t, file_type, sysadmfile, exec_type; role system_r types tmpreaper_t; -diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/unused/alsa.te policy-1.27.1/domains/program/unused/alsa.te --- nsapolicy/domains/program/unused/alsa.te 2005-09-16 11:17:27.000000000 -0400 +++ policy-1.27.1/domains/program/unused/alsa.te 2005-11-30 16:42:28.000000000 -0500 @@ -11,6 +11,8 @@ @@ -766,7 +749,6 @@ type alsa_etc_rw_t, file_type, sysadmfile, usercanread; rw_dir_create_file(alsa_t,alsa_etc_rw_t) allow alsa_t self:capability { setgid setuid ipc_owner }; -diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/unused/amanda.te policy-1.27.1/domains/program/unused/amanda.te --- nsapolicy/domains/program/unused/amanda.te 2005-09-16 11:17:27.000000000 -0400 +++ policy-1.27.1/domains/program/unused/amanda.te 2005-11-30 16:42:28.000000000 -0500 @@ -84,7 +84,6 @@ @@ -928,7 +910,6 @@ -dontaudit amanda_t usbfs_t:dir getattr; +#amanda wants to check attributes on fifo_files +allow amanda_t file_type:fifo_file getattr; -diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/unused/anaconda.te policy-1.27.1/domains/program/unused/anaconda.te --- nsapolicy/domains/program/unused/anaconda.te 2005-09-16 11:17:27.000000000 -0400 +++ policy-1.27.1/domains/program/unused/anaconda.te 2005-11-30 16:42:28.000000000 -0500 @@ -17,11 +17,6 @@ @@ -943,7 +924,6 @@ # Run other rc scripts in the anaconda_t domain. domain_auto_trans(anaconda_t, initrc_exec_t, initrc_t) -diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/unused/apache.te policy-1.27.1/domains/program/unused/apache.te --- nsapolicy/domains/program/unused/apache.te 2005-09-16 11:17:27.000000000 -0400 +++ policy-1.27.1/domains/program/unused/apache.te 2006-01-30 13:44:40.000000000 -0500 @@ -66,7 +66,7 @@ @@ -1033,7 +1013,6 @@ +allow httpd_t ftp_port_t:tcp_socket name_bind; +} + -diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/unused/apmd.te policy-1.27.1/domains/program/unused/apmd.te --- nsapolicy/domains/program/unused/apmd.te 2005-09-16 11:17:27.000000000 -0400 +++ policy-1.27.1/domains/program/unused/apmd.te 2005-11-30 16:42:28.000000000 -0500 @@ -9,7 +9,7 @@ @@ -1085,9 +1064,8 @@ +allow NetworkManager_t apmd_t:dbus send_msg; +') +') -diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/unused/auditd.te policy-1.27.1/domains/program/unused/auditd.te --- nsapolicy/domains/program/unused/auditd.te 2005-09-16 11:17:27.000000000 -0400 -+++ policy-1.27.1/domains/program/unused/auditd.te 2006-02-02 13:55:10.000000000 -0500 ++++ policy-1.27.1/domains/program/unused/auditd.te 2006-02-15 14:11:11.000000000 -0500 @@ -12,6 +12,12 @@ daemon_domain(auditd) @@ -1101,7 +1079,16 @@ allow auditd_t self:netlink_audit_socket { create_netlink_socket_perms nlmsg_relay nlmsg_readpriv }; allow auditd_t self:unix_dgram_socket create_socket_perms; allow auditd_t self:capability { audit_write audit_control sys_nice sys_resource }; -@@ -58,10 +64,16 @@ +@@ -36,6 +42,8 @@ + uses_shlib(auditctl_t) + allow auditctl_t self:netlink_audit_socket { create_netlink_socket_perms nlmsg_relay nlmsg_readpriv }; + allow auditctl_t self:capability { audit_write audit_control }; ++r_dir_file(auditctl_t, self) ++ + allow auditctl_t etc_t:file { getattr read }; + allow auditctl_t admin_tty_type:chr_file rw_file_perms; + +@@ -58,10 +66,16 @@ dontaudit auditctl_t local_login_t:fd use; allow auditctl_t proc_t:dir search; @@ -1118,7 +1105,6 @@ +allow auditd_t sbin_t:dir search; +can_exec(auditd_t, sbin_t) +allow auditd_t self:fifo_file rw_file_perms; -diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/unused/automount.te policy-1.27.1/domains/program/unused/automount.te --- nsapolicy/domains/program/unused/automount.te 2005-09-16 11:17:27.000000000 -0400 +++ policy-1.27.1/domains/program/unused/automount.te 2005-11-30 16:42:28.000000000 -0500 @@ -34,7 +34,9 @@ @@ -1144,7 +1130,6 @@ allow automount_t var_lib_t:dir search; allow automount_t var_lib_nfs_t:dir search; + -diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/unused/avahi.te policy-1.27.1/domains/program/unused/avahi.te --- nsapolicy/domains/program/unused/avahi.te 1969-12-31 19:00:00.000000000 -0500 +++ policy-1.27.1/domains/program/unused/avahi.te 2005-11-30 16:42:28.000000000 -0500 @@ -0,0 +1,31 @@ @@ -1179,7 +1164,6 @@ +') +') + -diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/unused/bluetooth.te policy-1.27.1/domains/program/unused/bluetooth.te --- nsapolicy/domains/program/unused/bluetooth.te 2005-09-16 11:17:27.000000000 -0400 +++ policy-1.27.1/domains/program/unused/bluetooth.te 2005-11-30 16:42:28.000000000 -0500 @@ -11,16 +11,23 @@ @@ -1282,7 +1266,6 @@ +allow bluetooth_helper_t xserver_log_t:dir search; +allow bluetooth_helper_t xserver_log_t:file { getattr read }; +') -diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/unused/cups.te policy-1.27.1/domains/program/unused/cups.te --- nsapolicy/domains/program/unused/cups.te 2005-09-16 11:17:27.000000000 -0400 +++ policy-1.27.1/domains/program/unused/cups.te 2005-11-30 16:42:28.000000000 -0500 @@ -44,11 +44,11 @@ @@ -1370,7 +1353,6 @@ +range_transition initrc_t cupsd_exec_t s0 - s0:c0.c255; +') + -diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/unused/cvs.te policy-1.27.1/domains/program/unused/cvs.te --- nsapolicy/domains/program/unused/cvs.te 2005-09-16 11:17:27.000000000 -0400 +++ policy-1.27.1/domains/program/unused/cvs.te 2005-11-30 16:42:28.000000000 -0500 @@ -23,6 +23,8 @@ @@ -1382,7 +1364,6 @@ allow cvs_t { krb5_keytab_t krb5_conf_t }:file r_file_perms; dontaudit cvs_t krb5_conf_t:file write; +') -diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/unused/cyrus.te policy-1.27.1/domains/program/unused/cyrus.te --- nsapolicy/domains/program/unused/cyrus.te 2005-09-16 11:17:27.000000000 -0400 +++ policy-1.27.1/domains/program/unused/cyrus.te 2005-11-30 16:42:28.000000000 -0500 @@ -42,7 +42,7 @@ @@ -1406,7 +1387,6 @@ +allow postfix_master_t cyrus_var_lib_t:sock_file write; +') + -diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/unused/dbusd.te policy-1.27.1/domains/program/unused/dbusd.te --- nsapolicy/domains/program/unused/dbusd.te 2005-09-16 11:17:27.000000000 -0400 +++ policy-1.27.1/domains/program/unused/dbusd.te 2005-11-30 16:42:28.000000000 -0500 @@ -12,7 +12,7 @@ @@ -1424,7 +1404,6 @@ allow system_dbusd_t self:unix_stream_socket connectto; +allow system_dbusd_t self:unix_stream_socket connectto; +allow system_dbusd_t self:netlink_audit_socket { create_netlink_socket_perms nlmsg_relay }; -diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/unused/dcc.te policy-1.27.1/domains/program/unused/dcc.te --- nsapolicy/domains/program/unused/dcc.te 2005-09-16 11:17:27.000000000 -0400 +++ policy-1.27.1/domains/program/unused/dcc.te 2005-11-30 16:42:28.000000000 -0500 @@ -200,9 +200,8 @@ @@ -1439,7 +1418,6 @@ # Start up the daemon process. These scripts run 'su' to change to # the dcc user (even though the default dcc user is root). -diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/unused/dhcpc.te policy-1.27.1/domains/program/unused/dhcpc.te --- nsapolicy/domains/program/unused/dhcpc.te 2005-09-16 11:17:27.000000000 -0400 +++ policy-1.27.1/domains/program/unused/dhcpc.te 2005-11-30 16:42:28.000000000 -0500 @@ -120,6 +120,8 @@ @@ -1473,7 +1451,6 @@ ') +ifdef(`netutils.te', `domain_auto_trans(dhcpc_t, netutils_exec_t, netutils_t)') +allow dhcpc_t locale_t:file write; -diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/unused/dhcpd.te policy-1.27.1/domains/program/unused/dhcpd.te --- nsapolicy/domains/program/unused/dhcpd.te 2005-09-16 11:17:27.000000000 -0400 +++ policy-1.27.1/domains/program/unused/dhcpd.te 2005-11-30 16:42:28.000000000 -0500 @@ -17,8 +17,6 @@ @@ -1501,7 +1478,6 @@ allow dhcpd_t etc_t:lnk_file read; allow dhcpd_t { etc_t etc_runtime_t }:file r_file_perms; -diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/unused/dovecot.te policy-1.27.1/domains/program/unused/dovecot.te --- nsapolicy/domains/program/unused/dovecot.te 2005-09-16 11:17:27.000000000 -0400 +++ policy-1.27.1/domains/program/unused/dovecot.te 2005-11-30 16:42:28.000000000 -0500 @@ -43,7 +43,9 @@ @@ -1521,7 +1497,6 @@ dontaudit dovecot_auth_t selinux_config_t:dir search; - +allow dovecot_auth_t etc_runtime_t:file { getattr read }; -diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/unused/exim.te policy-1.27.1/domains/program/unused/exim.te --- nsapolicy/domains/program/unused/exim.te 1969-12-31 19:00:00.000000000 -0500 +++ policy-1.27.1/domains/program/unused/exim.te 2005-11-30 16:42:28.000000000 -0500 @@ -0,0 +1,309 @@ @@ -1834,7 +1809,6 @@ +exim_db_base(exim_db_ro) +exim_db_base(exim_db_rw) +rw_dir_file(exim_db_rw_t, exim_spool_db_t) -diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/unused/ftpd.te policy-1.27.1/domains/program/unused/ftpd.te --- nsapolicy/domains/program/unused/ftpd.te 2005-09-16 11:17:27.000000000 -0400 +++ policy-1.27.1/domains/program/unused/ftpd.te 2005-11-30 16:42:28.000000000 -0500 @@ -99,9 +99,11 @@ @@ -1851,7 +1825,6 @@ } if (use_nfs_home_dirs && ftp_home_dir) { r_dir_file(ftpd_t, nfs_t) -diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/unused/hald.te policy-1.27.1/domains/program/unused/hald.te --- nsapolicy/domains/program/unused/hald.te 2005-09-16 11:17:27.000000000 -0400 +++ policy-1.27.1/domains/program/unused/hald.te 2005-11-30 16:42:28.000000000 -0500 @@ -24,7 +24,8 @@ @@ -1870,7 +1843,6 @@ ') - +r_dir_file(hald_t, hwdata_t) -diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/unused/hotplug.te policy-1.27.1/domains/program/unused/hotplug.te --- nsapolicy/domains/program/unused/hotplug.te 2005-09-16 11:17:27.000000000 -0400 +++ policy-1.27.1/domains/program/unused/hotplug.te 2005-11-30 16:42:28.000000000 -0500 @@ -11,9 +11,9 @@ @@ -1906,7 +1878,6 @@ allow { insmod_t kernel_t } hotplug_etc_t:dir { search getattr }; allow hotplug_t self:netlink_route_socket r_netlink_socket_perms; -diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/unused/hwclock.te policy-1.27.1/domains/program/unused/hwclock.te --- nsapolicy/domains/program/unused/hwclock.te 2005-09-16 11:17:27.000000000 -0400 +++ policy-1.27.1/domains/program/unused/hwclock.te 2005-11-30 16:42:28.000000000 -0500 @@ -47,3 +47,4 @@ @@ -1914,7 +1885,6 @@ dontaudit hwclock_t file_t:dir search; allow hwclock_t self:netlink_audit_socket { create_netlink_socket_perms nlmsg_relay }; +r_dir_file(hwclock_t, etc_t) -diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/unused/ipsec.te policy-1.27.1/domains/program/unused/ipsec.te --- nsapolicy/domains/program/unused/ipsec.te 2005-09-16 11:17:27.000000000 -0400 +++ policy-1.27.1/domains/program/unused/ipsec.te 2005-11-30 16:42:28.000000000 -0500 @@ -219,7 +219,7 @@ @@ -1926,7 +1896,6 @@ allow ipsec_mgmt_t dev_fs:file_class_set getattr; dontaudit ipsec_mgmt_t device_t:lnk_file read; allow ipsec_mgmt_t self:{ tcp_socket udp_socket } create_socket_perms; -diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/unused/kudzu.te policy-1.27.1/domains/program/unused/kudzu.te --- nsapolicy/domains/program/unused/kudzu.te 2005-09-16 11:17:27.000000000 -0400 +++ policy-1.27.1/domains/program/unused/kudzu.te 2005-11-30 16:42:28.000000000 -0500 @@ -20,7 +20,7 @@ @@ -1955,7 +1924,6 @@ ') allow kudzu_t initrc_t:unix_stream_socket connectto; -diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/unused/mta.te policy-1.27.1/domains/program/unused/mta.te --- nsapolicy/domains/program/unused/mta.te 2005-09-16 11:17:27.000000000 -0400 +++ policy-1.27.1/domains/program/unused/mta.te 2005-11-30 17:01:28.000000000 -0500 @@ -31,6 +31,10 @@ @@ -1976,7 +1944,6 @@ +ifdef(`targeted_policy', ` +typealias system_mail_t alias sysadm_mail_t; +') -diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/unused/mysqld.te policy-1.27.1/domains/program/unused/mysqld.te --- nsapolicy/domains/program/unused/mysqld.te 2005-09-16 11:17:27.000000000 -0400 +++ policy-1.27.1/domains/program/unused/mysqld.te 2005-11-30 16:42:28.000000000 -0500 @@ -12,7 +12,7 @@ @@ -2009,7 +1976,6 @@ can_ypbind(mysqld_t) # read config files -diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/unused/named.te policy-1.27.1/domains/program/unused/named.te --- nsapolicy/domains/program/unused/named.te 2005-09-16 11:17:27.000000000 -0400 +++ policy-1.27.1/domains/program/unused/named.te 2005-11-30 16:42:28.000000000 -0500 @@ -36,7 +36,7 @@ @@ -2065,7 +2031,6 @@ allow { ndc_t initrc_t } named_conf_t:file { getattr read }; allow ndc_t etc_t:dir r_dir_perms; -diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/unused/NetworkManager.te policy-1.27.1/domains/program/unused/NetworkManager.te --- nsapolicy/domains/program/unused/NetworkManager.te 2005-09-16 11:17:27.000000000 -0400 +++ policy-1.27.1/domains/program/unused/NetworkManager.te 2005-11-30 16:42:28.000000000 -0500 @@ -11,7 +11,7 @@ @@ -2100,7 +2065,6 @@ +can_exec(NetworkManager_t, consoletype_exec_t) +') + -diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/unused/nscd.te policy-1.27.1/domains/program/unused/nscd.te --- nsapolicy/domains/program/unused/nscd.te 2005-09-16 11:17:27.000000000 -0400 +++ policy-1.27.1/domains/program/unused/nscd.te 2005-11-30 16:42:28.000000000 -0500 @@ -76,3 +76,4 @@ @@ -2108,7 +2072,6 @@ r_dir_file(nscd_t, cert_t) allow nscd_t tun_tap_device_t:chr_file { read write }; +allow nscd_t self:netlink_audit_socket { create_netlink_socket_perms nlmsg_relay }; -diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/unused/ntpd.te policy-1.27.1/domains/program/unused/ntpd.te --- nsapolicy/domains/program/unused/ntpd.te 2005-09-16 11:17:27.000000000 -0400 +++ policy-1.27.1/domains/program/unused/ntpd.te 2005-11-30 16:42:28.000000000 -0500 @@ -26,11 +26,11 @@ @@ -2136,7 +2099,6 @@ ') can_exec(ntpd_t, initrc_exec_t) -diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/unused/openct.te policy-1.27.1/domains/program/unused/openct.te --- nsapolicy/domains/program/unused/openct.te 1969-12-31 19:00:00.000000000 -0500 +++ policy-1.27.1/domains/program/unused/openct.te 2005-11-30 16:42:28.000000000 -0500 @@ -0,0 +1,16 @@ @@ -2156,7 +2118,6 @@ +# +rw_dir_file(openct_t, usbfs_t) +allow openct_t etc_t:file r_file_perms; -diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/unused/pamconsole.te policy-1.27.1/domains/program/unused/pamconsole.te --- nsapolicy/domains/program/unused/pamconsole.te 2005-09-16 11:17:27.000000000 -0400 +++ policy-1.27.1/domains/program/unused/pamconsole.te 2005-11-30 16:42:28.000000000 -0500 @@ -3,7 +3,7 @@ @@ -2181,7 +2142,6 @@ allow initrc_t pam_var_console_t:file unlink; allow pam_console_t file_context_t:file { getattr read }; +nsswitch_domain(pam_console_t) -diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/unused/pegasus.te policy-1.27.1/domains/program/unused/pegasus.te --- nsapolicy/domains/program/unused/pegasus.te 1969-12-31 19:00:00.000000000 -0500 +++ policy-1.27.1/domains/program/unused/pegasus.te 2005-11-30 16:42:28.000000000 -0500 @@ -0,0 +1,36 @@ @@ -2221,7 +2181,6 @@ +file_type_auto_trans(pegasus_t, pegasus_conf_t, pegasus_data_t) +rw_dir_create_file(pegasus_t, pegasus_data_t) +dontaudit pegasus_t selinux_config_t:dir search; -diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/unused/ping.te policy-1.27.1/domains/program/unused/ping.te --- nsapolicy/domains/program/unused/ping.te 2005-09-16 11:17:27.000000000 -0400 +++ policy-1.27.1/domains/program/unused/ping.te 2005-11-30 16:42:28.000000000 -0500 @@ -58,6 +58,6 @@ @@ -2232,9 +2191,8 @@ +dontaudit ping_t init_t:fd use; ') -diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/unused/postfix.te policy-1.27.1/domains/program/unused/postfix.te --- nsapolicy/domains/program/unused/postfix.te 2005-09-16 11:17:27.000000000 -0400 -+++ policy-1.27.1/domains/program/unused/postfix.te 2005-11-30 16:42:28.000000000 -0500 ++++ policy-1.27.1/domains/program/unused/postfix.te 2006-02-13 12:12:48.000000000 -0500 @@ -54,6 +54,8 @@ allow postfix_$1_t proc_net_t:dir search; allow postfix_$1_t proc_net_t:file { getattr read }; @@ -2413,7 +2371,13 @@ postfix_public_domain(pickup) allow postfix_pickup_t postfix_public_t:fifo_file rw_file_perms; -@@ -329,7 +351,8 @@ +@@ -325,11 +347,14 @@ + allow postfix_pipe_t self:fifo_file { read write }; + allow postfix_pipe_t postfix_private_t:dir search; + allow postfix_pipe_t postfix_private_t:sock_file write; ++allow postfix_pipe_t postfix_public_t:fifo_file { getattr write }; ++ + ifdef(`procmail.te', ` domain_auto_trans(postfix_pipe_t, procmail_exec_t, procmail_t) ') ifdef(`sendmail.te', ` @@ -2423,13 +2387,12 @@ ') # Program for creating database files -@@ -348,5 +371,3 @@ +@@ -348,5 +373,3 @@ dontaudit postfix_map_t var_t:dir search; can_network_server(postfix_map_t) allow postfix_map_t port_type:tcp_socket name_connect; -allow postfix_local_t mail_spool_t:dir { remove_name }; -allow postfix_local_t mail_spool_t:file { unlink }; -diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/unused/postgresql.te policy-1.27.1/domains/program/unused/postgresql.te --- nsapolicy/domains/program/unused/postgresql.te 2005-09-16 11:17:27.000000000 -0400 +++ policy-1.27.1/domains/program/unused/postgresql.te 2005-11-30 16:42:28.000000000 -0500 @@ -51,7 +51,6 @@ @@ -2459,7 +2422,6 @@ +if (allow_postgresql_use_pam) { +domain_auto_trans(postgresql_t, chkpwd_exec_t, system_chkpwd_t) +} -diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/unused/pppd.te policy-1.27.1/domains/program/unused/pppd.te --- nsapolicy/domains/program/unused/pppd.te 2005-09-16 11:17:27.000000000 -0400 +++ policy-1.27.1/domains/program/unused/pppd.te 2005-11-30 16:42:28.000000000 -0500 @@ -14,7 +14,7 @@ @@ -2538,7 +2500,6 @@ type pppd_script_exec_t, file_type, sysadmfile; domain_auto_trans(pppd_t, pppd_script_exec_t, initrc_t) +allow pppd_t initrc_t:process noatsecure; -diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/unused/privoxy.te policy-1.27.1/domains/program/unused/privoxy.te --- nsapolicy/domains/program/unused/privoxy.te 2005-09-16 11:17:27.000000000 -0400 +++ policy-1.27.1/domains/program/unused/privoxy.te 2005-11-30 16:42:28.000000000 -0500 @@ -25,3 +25,5 @@ @@ -2548,7 +2509,6 @@ +type privoxy_etc_rw_t, file_type, sysadmfile; +allow privoxy_t privoxy_etc_rw_t:file rw_file_perms; \ No newline at end of file -diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/unused/procmail.te policy-1.27.1/domains/program/unused/procmail.te --- nsapolicy/domains/program/unused/procmail.te 2005-09-16 11:17:27.000000000 -0400 +++ policy-1.27.1/domains/program/unused/procmail.te 2005-11-30 16:42:28.000000000 -0500 @@ -18,9 +18,9 @@ @@ -2581,7 +2541,6 @@ ') # Search /var/run. -diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/unused/radius.te policy-1.27.1/domains/program/unused/radius.te --- nsapolicy/domains/program/unused/radius.te 2005-09-16 11:17:27.000000000 -0400 +++ policy-1.27.1/domains/program/unused/radius.te 2005-11-30 16:42:28.000000000 -0500 @@ -10,7 +10,7 @@ @@ -2598,7 +2557,6 @@ allow radiusd_t self:unix_stream_socket create_stream_socket_perms; +allow radiusd_t urandom_device_t:chr_file { getattr read }; -diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/unused/readahead.te policy-1.27.1/domains/program/unused/readahead.te --- nsapolicy/domains/program/unused/readahead.te 1969-12-31 19:00:00.000000000 -0500 +++ policy-1.27.1/domains/program/unused/readahead.te 2005-11-30 16:42:28.000000000 -0500 @@ -0,0 +1,21 @@ @@ -2623,7 +2581,6 @@ +dontaudit readahead_t file_type:sock_file getattr; +allow readahead_t proc_t:file { getattr read }; +dontaudit readahead_t device_type:blk_file read; -diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/unused/rlogind.te policy-1.27.1/domains/program/unused/rlogind.te --- nsapolicy/domains/program/unused/rlogind.te 2005-09-16 11:17:27.000000000 -0400 +++ policy-1.27.1/domains/program/unused/rlogind.te 2005-11-30 16:42:28.000000000 -0500 @@ -35,4 +35,6 @@ @@ -2634,7 +2591,6 @@ +ifdef(`kerberos.te', ` +allow rlogind_t krb5_keytab_t:file { getattr read }; +') -diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/unused/roundup.te policy-1.27.1/domains/program/unused/roundup.te --- nsapolicy/domains/program/unused/roundup.te 1969-12-31 19:00:00.000000000 -0500 +++ policy-1.27.1/domains/program/unused/roundup.te 2005-11-30 16:42:28.000000000 -0500 @@ -0,0 +1,29 @@ @@ -2667,7 +2623,6 @@ +allow roundup_t usr_t:file { getattr read }; +allow roundup_t urandom_device_t:chr_file { getattr read }; +allow roundup_t etc_t:file { getattr read }; -diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/unused/rpcd.te policy-1.27.1/domains/program/unused/rpcd.te --- nsapolicy/domains/program/unused/rpcd.te 2005-09-16 11:17:27.000000000 -0400 +++ policy-1.27.1/domains/program/unused/rpcd.te 2005-11-30 16:42:28.000000000 -0500 @@ -19,7 +19,7 @@ @@ -2701,7 +2656,6 @@ +allow gssd_t user_tmpfile:file write; +') +} -diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/unused/rpm.te policy-1.27.1/domains/program/unused/rpm.te --- nsapolicy/domains/program/unused/rpm.te 2005-09-16 11:17:27.000000000 -0400 +++ policy-1.27.1/domains/program/unused/rpm.te 2005-11-30 16:42:28.000000000 -0500 @@ -10,7 +10,7 @@ @@ -2722,7 +2676,6 @@ # policy for rpm scriptlet role system_r types rpm_script_t; uses_shlib(rpm_script_t) -diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/unused/rsync.te policy-1.27.1/domains/program/unused/rsync.te --- nsapolicy/domains/program/unused/rsync.te 2005-09-16 11:17:27.000000000 -0400 +++ policy-1.27.1/domains/program/unused/rsync.te 2005-11-30 16:42:28.000000000 -0500 @@ -15,5 +15,4 @@ @@ -2732,7 +2685,6 @@ - - +allow rsync_t self:capability sys_chroot; -diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/unused/samba.te policy-1.27.1/domains/program/unused/samba.te --- nsapolicy/domains/program/unused/samba.te 2005-09-16 11:17:27.000000000 -0400 +++ policy-1.27.1/domains/program/unused/samba.te 2005-11-30 16:42:28.000000000 -0500 @@ -25,6 +25,9 @@ @@ -2779,7 +2731,6 @@ anonymous_domain(smbd) ifdef(`logrotate.te', ` -diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/unused/saslauthd.te policy-1.27.1/domains/program/unused/saslauthd.te --- nsapolicy/domains/program/unused/saslauthd.te 2005-09-16 11:17:27.000000000 -0400 +++ policy-1.27.1/domains/program/unused/saslauthd.te 2005-11-30 16:42:28.000000000 -0500 @@ -39,3 +39,4 @@ @@ -2787,7 +2738,6 @@ allow saslauthd_t mysqld_var_run_t:sock_file rw_file_perms; ') +dontaudit saslauthd_t self:capability setuid; -diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/unused/sendmail.te policy-1.27.1/domains/program/unused/sendmail.te --- nsapolicy/domains/program/unused/sendmail.te 2005-09-16 11:17:27.000000000 -0400 +++ policy-1.27.1/domains/program/unused/sendmail.te 2005-11-30 16:42:28.000000000 -0500 @@ -13,9 +13,6 @@ @@ -2800,7 +2750,6 @@ daemon_domain(sendmail, `, nscd_client_domain, mta_delivery_agent, mail_server_domain, mail_server_sender', nosysadm) tmp_domain(sendmail) -diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/unused/slapd.te policy-1.27.1/domains/program/unused/slapd.te --- nsapolicy/domains/program/unused/slapd.te 2005-09-16 11:17:27.000000000 -0400 +++ policy-1.27.1/domains/program/unused/slapd.te 2005-12-20 15:45:56.000000000 -0500 @@ -22,10 +22,12 @@ @@ -2853,7 +2802,6 @@ +rw_dir_create_file(slapd_t, slapd_cert_t) +allow slapd_t usr_t:dir { add_name write }; +allow slapd_t usr_t:file { create write }; -diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/unused/snmpd.te policy-1.27.1/domains/program/unused/snmpd.te --- nsapolicy/domains/program/unused/snmpd.te 2005-09-16 11:17:27.000000000 -0400 +++ policy-1.27.1/domains/program/unused/snmpd.te 2005-11-30 16:42:28.000000000 -0500 @@ -22,8 +22,9 @@ @@ -2883,7 +2831,6 @@ +allow snmpd_t domain:process signull; dontaudit snmpd_t selinux_config_t:dir search; -diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/unused/spamd.te policy-1.27.1/domains/program/unused/spamd.te --- nsapolicy/domains/program/unused/spamd.te 2005-09-16 11:17:27.000000000 -0400 +++ policy-1.27.1/domains/program/unused/spamd.te 2006-02-06 10:36:59.000000000 -0500 @@ -9,21 +9,23 @@ @@ -2936,7 +2883,6 @@ - - +ifdef(`targeted_policy', `home_domain_access(spamd_t, user)') -diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/unused/squid.te policy-1.27.1/domains/program/unused/squid.te --- nsapolicy/domains/program/unused/squid.te 2005-09-16 11:17:27.000000000 -0400 +++ policy-1.27.1/domains/program/unused/squid.te 2005-11-30 16:42:28.000000000 -0500 @@ -60,7 +60,7 @@ @@ -2959,7 +2905,6 @@ allow winbind_helper_t squid_t:tcp_socket rw_socket_perms; +allow winbind_helper_t squid_log_t:file ra_file_perms; ') -diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/unused/udev.te policy-1.27.1/domains/program/unused/udev.te --- nsapolicy/domains/program/unused/udev.te 2005-09-16 11:17:27.000000000 -0400 +++ policy-1.27.1/domains/program/unused/udev.te 2005-11-30 16:42:28.000000000 -0500 @@ -28,12 +28,12 @@ @@ -2991,7 +2936,13 @@ +range_transition kernel_t udev_exec_t s0 - s0:c0.c255; +range_transition initrc_t udev_exec_t s0 - s0:c0.c255; +') -diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/unused/utempter.te policy-1.27.1/domains/program/unused/utempter.te +--- nsapolicy/domains/program/unused/updfstab.te 2005-09-16 11:17:27.000000000 -0400 ++++ policy-1.27.1/domains/program/unused/updfstab.te 2006-03-14 11:35:48.000000000 -0500 +@@ -79,3 +79,4 @@ + can_unix_connect(updfstab_t, hald_t) + ') + ++allow updfstab_t swapfile_t:file getattr; --- nsapolicy/domains/program/unused/utempter.te 2005-09-16 11:17:27.000000000 -0400 +++ policy-1.27.1/domains/program/unused/utempter.te 2005-11-30 16:42:28.000000000 -0500 @@ -19,6 +19,8 @@ @@ -3003,7 +2954,6 @@ # Use capabilities. allow utempter_t self:capability setgid; -diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/unused/webalizer.te policy-1.27.1/domains/program/unused/webalizer.te --- nsapolicy/domains/program/unused/webalizer.te 2005-09-16 11:17:27.000000000 -0400 +++ policy-1.27.1/domains/program/unused/webalizer.te 2005-11-30 16:42:28.000000000 -0500 @@ -20,6 +20,9 @@ @@ -3016,7 +2966,6 @@ #r/w /var/lib/webalizer var_lib_domain(webalizer) -diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/unused/winbind.te policy-1.27.1/domains/program/unused/winbind.te --- nsapolicy/domains/program/unused/winbind.te 2005-09-16 11:17:27.000000000 -0400 +++ policy-1.27.1/domains/program/unused/winbind.te 2005-11-30 16:42:28.000000000 -0500 @@ -44,6 +44,7 @@ @@ -3027,7 +2976,6 @@ allow winbind_helper_t winbind_var_run_t:dir r_dir_perms; can_winbind(winbind_helper_t) allow winbind_helper_t privfd:fd use; -diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/unused/xdm.te policy-1.27.1/domains/program/unused/xdm.te --- nsapolicy/domains/program/unused/xdm.te 2005-09-16 11:17:27.000000000 -0400 +++ policy-1.27.1/domains/program/unused/xdm.te 2005-11-30 16:42:28.000000000 -0500 @@ -371,3 +371,6 @@ @@ -3037,7 +2985,6 @@ +ifdef(`use_mcs', ` +range_transition initrc_t xdm_exec_t s0 - s0:c0.c255; +') -diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/unused/yppasswdd.te policy-1.27.1/domains/program/unused/yppasswdd.te --- nsapolicy/domains/program/unused/yppasswdd.te 1969-12-31 19:00:00.000000000 -0500 +++ policy-1.27.1/domains/program/unused/yppasswdd.te 2005-11-30 16:42:28.000000000 -0500 @@ -0,0 +1,40 @@ @@ -3081,10 +3028,9 @@ +can_exec(yppasswdd_t, { bin_t shell_exec_t hostname_exec_t }) +allow yppasswdd_t self:fifo_file rw_file_perms; +rw_dir_create_file(yppasswdd_t, var_yp_t) -diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/unused/ypserv.te policy-1.27.1/domains/program/unused/ypserv.te --- nsapolicy/domains/program/unused/ypserv.te 2005-09-16 11:17:27.000000000 -0400 -+++ policy-1.27.1/domains/program/unused/ypserv.te 2005-11-30 16:42:28.000000000 -0500 -@@ -39,3 +39,12 @@ ++++ policy-1.27.1/domains/program/unused/ypserv.te 2006-03-10 16:38:34.000000000 -0500 +@@ -39,3 +39,14 @@ ') allow ypserv_t reserved_port_t:{ udp_socket tcp_socket } name_bind; dontaudit ypserv_t reserved_port_type:{ tcp_socket udp_socket } name_bind; @@ -3092,14 +3038,15 @@ + +application_domain(ypxfr, `, nscd_client_domain') +can_network_client(ypxfr_t) -+allow ypxfr_t etc_t:file { getattr read }; +allow ypxfr_t portmap_port_t:tcp_socket name_connect; +allow ypxfr_t reserved_port_t:tcp_socket name_connect; +dontaudit ypxfr_t reserved_port_type:tcp_socket name_connect; +allow ypxfr_t self:unix_stream_socket create_stream_socket_perms; -diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/unused/zebra.te policy-1.27.1/domains/program/unused/zebra.te ++ ++allow ypserv_t etc_t:file { getattr read }; ++allow ypserv_t self:unix_stream_socket create_stream_socket_perms; --- nsapolicy/domains/program/unused/zebra.te 2005-09-16 11:17:27.000000000 -0400 -+++ policy-1.27.1/domains/program/unused/zebra.te 2006-02-10 12:07:40.000000000 -0500 ++++ policy-1.27.1/domains/program/unused/zebra.te 2006-02-15 10:20:03.000000000 -0500 @@ -8,7 +8,7 @@ type zebra_conf_t, file_type, sysadmfile; r_dir_file({ initrc_t zebra_t }, zebra_conf_t) @@ -3109,18 +3056,18 @@ can_ypbind(zebra_t) allow zebra_t { etc_t etc_runtime_t }:file { getattr read }; -@@ -24,8 +24,9 @@ +@@ -24,8 +24,10 @@ allow zebra_t self:unix_dgram_socket create_socket_perms; allow zebra_t self:unix_stream_socket { connectto create_stream_socket_perms }; allow zebra_t self:rawip_socket create_socket_perms; -allow zebra_t self:netlink_route_socket r_netlink_socket_perms; +allow zebra_t self:netlink_route_socket rw_netlink_socket_perms; allow zebra_t zebra_port_t:tcp_socket name_bind; ++allow zebra_t router_port_t:tcp_socket name_bind; +allow zebra_t bgp_port_t:tcp_socket { name_bind name_connect }; allow zebra_t proc_t:file { getattr read }; allow zebra_t { sysctl_t sysctl_net_t }:dir search; -diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/useradd.te policy-1.27.1/domains/program/useradd.te --- nsapolicy/domains/program/useradd.te 2005-09-16 11:17:27.000000000 -0400 +++ policy-1.27.1/domains/program/useradd.te 2005-11-30 16:42:28.000000000 -0500 @@ -55,7 +55,6 @@ @@ -3144,7 +3091,6 @@ # for getting the number of groups read_sysctl(useradd_t) -diff --exclude-from=exclude -N -u -r nsapolicy/file_contexts/distros.fc policy-1.27.1/file_contexts/distros.fc --- nsapolicy/file_contexts/distros.fc 2005-09-16 11:17:27.000000000 -0400 +++ policy-1.27.1/file_contexts/distros.fc 2005-11-30 16:42:28.000000000 -0500 @@ -89,6 +89,7 @@ @@ -3163,7 +3109,6 @@ # Fedora Extras packages: ladspa, imlib2, ocaml /usr/lib/ladspa/analogue_osc_1416\.so -- system_u:object_r:texrel_shlib_t -diff --exclude-from=exclude -N -u -r nsapolicy/file_contexts/program/apache.fc policy-1.27.1/file_contexts/program/apache.fc --- nsapolicy/file_contexts/program/apache.fc 2005-09-16 11:17:27.000000000 -0400 +++ policy-1.27.1/file_contexts/program/apache.fc 2005-11-30 16:42:28.000000000 -0500 @@ -9,6 +9,8 @@ @@ -3183,7 +3128,6 @@ /var/lib/php/session(/.*)? system_u:object_r:httpd_var_run_t /etc/apache-ssl(2)?(/.*)? system_u:object_r:httpd_config_t /usr/lib/apache-ssl/.+ -- system_u:object_r:httpd_exec_t -diff --exclude-from=exclude -N -u -r nsapolicy/file_contexts/program/bluetooth.fc policy-1.27.1/file_contexts/program/bluetooth.fc --- nsapolicy/file_contexts/program/bluetooth.fc 2005-09-16 11:17:27.000000000 -0400 +++ policy-1.27.1/file_contexts/program/bluetooth.fc 2005-11-30 16:42:28.000000000 -0500 @@ -1,8 +1,11 @@ @@ -3198,7 +3142,6 @@ /usr/sbin/hid2hci -- system_u:object_r:bluetooth_exec_t +/usr/bin/blue.*pin -- system_u:object_r:bluetooth_helper_exec_t +/var/lib/bluetooth(/.*)? system_u:object_r:bluetooth_var_lib_t -diff --exclude-from=exclude -N -u -r nsapolicy/file_contexts/program/compat.fc policy-1.27.1/file_contexts/program/compat.fc --- nsapolicy/file_contexts/program/compat.fc 2005-09-16 11:17:27.000000000 -0400 +++ policy-1.27.1/file_contexts/program/compat.fc 2005-11-30 16:42:28.000000000 -0500 @@ -43,6 +43,7 @@ @@ -3219,7 +3162,6 @@ ifdef(`kudzu.te', `', ` # kudzu /usr/sbin/kudzu -- system_u:object_r:kudzu_exec_t -diff --exclude-from=exclude -N -u -r nsapolicy/file_contexts/program/dhcpc.fc policy-1.27.1/file_contexts/program/dhcpc.fc --- nsapolicy/file_contexts/program/dhcpc.fc 2005-09-16 11:17:27.000000000 -0400 +++ policy-1.27.1/file_contexts/program/dhcpc.fc 2005-11-30 16:42:28.000000000 -0500 @@ -4,9 +4,11 @@ @@ -3234,7 +3176,6 @@ /var/run/dhclient.*\.pid -- system_u:object_r:dhcpc_var_run_t /var/run/dhclient.*\.leases -- system_u:object_r:dhcpc_var_run_t # pump -diff --exclude-from=exclude -N -u -r nsapolicy/file_contexts/program/dhcpd.fc policy-1.27.1/file_contexts/program/dhcpd.fc --- nsapolicy/file_contexts/program/dhcpd.fc 2005-09-16 11:17:27.000000000 -0400 +++ policy-1.27.1/file_contexts/program/dhcpd.fc 2005-11-30 16:42:28.000000000 -0500 @@ -2,10 +2,10 @@ @@ -3258,7 +3199,6 @@ /var/lib/dhcp/dhcpd\.leases.* -- system_u:object_r:dhcpd_state_t /var/run/dhcp/dhcpd\.pid -- system_u:object_r:dhcpd_var_run_t -diff --exclude-from=exclude -N -u -r nsapolicy/file_contexts/program/ftpd.fc policy-1.27.1/file_contexts/program/ftpd.fc --- nsapolicy/file_contexts/program/ftpd.fc 2005-09-16 11:17:27.000000000 -0400 +++ policy-1.27.1/file_contexts/program/ftpd.fc 2005-11-30 16:42:28.000000000 -0500 @@ -10,7 +10,8 @@ @@ -3272,7 +3212,6 @@ -/srv/([^/]*/)?ftp(/.*)? system_u:object_r:ftpd_anon_t +/var/ftp(/.*)? system_u:object_r:public_content_t +/srv/([^/]*/)?ftp(/.*)? system_u:object_r:public_content_t -diff --exclude-from=exclude -N -u -r nsapolicy/file_contexts/program/games.fc policy-1.27.1/file_contexts/program/games.fc --- nsapolicy/file_contexts/program/games.fc 2005-09-16 11:17:27.000000000 -0400 +++ policy-1.27.1/file_contexts/program/games.fc 2005-11-30 16:42:28.000000000 -0500 @@ -1,8 +1,10 @@ @@ -3297,7 +3236,6 @@ +/usr/bin/civserver.* -- system_u:object_r:games_exec_t +')dnl end non-Debian section -diff --exclude-from=exclude -N -u -r nsapolicy/file_contexts/program/innd.fc policy-1.27.1/file_contexts/program/innd.fc --- nsapolicy/file_contexts/program/innd.fc 2005-09-16 11:17:27.000000000 -0400 +++ policy-1.27.1/file_contexts/program/innd.fc 2005-11-30 16:42:28.000000000 -0500 @@ -18,25 +18,26 @@ @@ -3334,7 +3272,6 @@ /usr/lib(64)?/news/bin/nnrpd -- system_u:object_r:innd_exec_t /usr/lib(64)?/news/bin/nntpget -- system_u:object_r:innd_exec_t /usr/lib(64)?/news/bin/ovdb_recover -- system_u:object_r:innd_exec_t -diff --exclude-from=exclude -N -u -r nsapolicy/file_contexts/program/ipsec.fc policy-1.27.1/file_contexts/program/ipsec.fc --- nsapolicy/file_contexts/program/ipsec.fc 2005-09-16 11:17:27.000000000 -0400 +++ policy-1.27.1/file_contexts/program/ipsec.fc 2005-11-30 16:42:28.000000000 -0500 @@ -21,6 +21,7 @@ @@ -3345,13 +3282,17 @@ # Kame /usr/sbin/racoon -- system_u:object_r:ipsec_exec_t -diff --exclude-from=exclude -N -u -r nsapolicy/file_contexts/program/openct.fc policy-1.27.1/file_contexts/program/openct.fc +--- nsapolicy/file_contexts/program/ktalkd.fc 2005-09-16 11:17:27.000000000 -0400 ++++ policy-1.27.1/file_contexts/program/ktalkd.fc 2006-02-17 14:28:57.000000000 -0500 +@@ -1,2 +1,3 @@ + # kde talk daemon + /usr/bin/ktalkd -- system_u:object_r:ktalkd_exec_t ++/usr/sbin/in.talkd -- system_u:object_r:ktalkd_exec_t --- nsapolicy/file_contexts/program/openct.fc 1969-12-31 19:00:00.000000000 -0500 +++ policy-1.27.1/file_contexts/program/openct.fc 2005-11-30 16:42:28.000000000 -0500 @@ -0,0 +1,2 @@ +/usr/sbin/openct-control -- system_u:object_r:openct_exec_t +/var/run/openct(/.*)? system_u:object_r:openct_var_run_t -diff --exclude-from=exclude -N -u -r nsapolicy/file_contexts/program/pegasus.fc policy-1.27.1/file_contexts/program/pegasus.fc --- nsapolicy/file_contexts/program/pegasus.fc 1969-12-31 19:00:00.000000000 -0500 +++ policy-1.27.1/file_contexts/program/pegasus.fc 2005-11-30 16:42:28.000000000 -0500 @@ -0,0 +1,9 @@ @@ -3364,7 +3305,6 @@ +/usr/share/Pegasus/mof(/.*)?/.*\.mof system_u:object_r:pegasus_mof_t +/etc/Pegasus/pegasus_current.conf system_u:object_r:pegasus_data_t + -diff --exclude-from=exclude -N -u -r nsapolicy/file_contexts/program/pppd.fc policy-1.27.1/file_contexts/program/pppd.fc --- nsapolicy/file_contexts/program/pppd.fc 2005-09-16 11:17:27.000000000 -0400 +++ policy-1.27.1/file_contexts/program/pppd.fc 2005-11-30 16:42:28.000000000 -0500 @@ -20,6 +20,6 @@ @@ -3375,7 +3315,6 @@ +/var/run/pptp(/.*)? system_u:object_r:pptp_var_run_t # Fix /etc/ppp {up,down} family scripts (see man pppd) /etc/ppp/(auth|ip(v6|x)?)-(up|down) -- system_u:object_r:pppd_script_exec_t -diff --exclude-from=exclude -N -u -r nsapolicy/file_contexts/program/privoxy.fc policy-1.27.1/file_contexts/program/privoxy.fc --- nsapolicy/file_contexts/program/privoxy.fc 2005-09-16 11:17:27.000000000 -0400 +++ policy-1.27.1/file_contexts/program/privoxy.fc 2005-11-30 16:42:28.000000000 -0500 @@ -1,3 +1,4 @@ @@ -3383,18 +3322,15 @@ /usr/sbin/privoxy -- system_u:object_r:privoxy_exec_t /var/log/privoxy(/.*)? system_u:object_r:privoxy_log_t +/etc/privoxy/user\.action system_u:object_r:privoxy_etc_rw_t -diff --exclude-from=exclude -N -u -r nsapolicy/file_contexts/program/readahead.fc policy-1.27.1/file_contexts/program/readahead.fc --- nsapolicy/file_contexts/program/readahead.fc 1969-12-31 19:00:00.000000000 -0500 +++ policy-1.27.1/file_contexts/program/readahead.fc 2005-11-30 16:42:28.000000000 -0500 @@ -0,0 +1 @@ +/usr/sbin/readahead -- system_u:object_r:readahead_exec_t -diff --exclude-from=exclude -N -u -r nsapolicy/file_contexts/program/roundup.fc policy-1.27.1/file_contexts/program/roundup.fc --- nsapolicy/file_contexts/program/roundup.fc 1969-12-31 19:00:00.000000000 -0500 +++ policy-1.27.1/file_contexts/program/roundup.fc 2005-11-30 16:42:28.000000000 -0500 @@ -0,0 +1,2 @@ +/usr/bin/roundup-server -- system_u:object_r:roundup_exec_t +/var/lib/roundup(/.*)? -- system_u:object_r:roundup_var_lib_t -diff --exclude-from=exclude -N -u -r nsapolicy/file_contexts/program/rpm.fc policy-1.27.1/file_contexts/program/rpm.fc --- nsapolicy/file_contexts/program/rpm.fc 2005-09-16 11:17:27.000000000 -0400 +++ policy-1.27.1/file_contexts/program/rpm.fc 2005-11-30 16:42:28.000000000 -0500 @@ -23,3 +23,7 @@ @@ -3405,7 +3341,6 @@ +ifdef(`mls_policy', ` +/sbin/cpio -- system_u:object_r:rpm_exec_t +') -diff --exclude-from=exclude -N -u -r nsapolicy/file_contexts/program/rshd.fc policy-1.27.1/file_contexts/program/rshd.fc --- nsapolicy/file_contexts/program/rshd.fc 2005-09-16 11:17:27.000000000 -0400 +++ policy-1.27.1/file_contexts/program/rshd.fc 2005-11-30 16:42:28.000000000 -0500 @@ -1,3 +1,4 @@ @@ -3413,7 +3348,6 @@ /usr/sbin/in\.rshd -- system_u:object_r:rshd_exec_t +/usr/sbin/in\.rexecd -- system_u:object_r:rshd_exec_t /usr/kerberos/sbin/kshd -- system_u:object_r:rshd_exec_t -diff --exclude-from=exclude -N -u -r nsapolicy/file_contexts/program/rsync.fc policy-1.27.1/file_contexts/program/rsync.fc --- nsapolicy/file_contexts/program/rsync.fc 2005-09-16 11:17:27.000000000 -0400 +++ policy-1.27.1/file_contexts/program/rsync.fc 2005-11-30 16:42:28.000000000 -0500 @@ -1,3 +1,3 @@ @@ -3421,7 +3355,6 @@ /usr/bin/rsync -- system_u:object_r:rsync_exec_t -/srv/([^/]*/)?rsync(/.*)? system_u:object_r:ftpd_anon_t +/srv/([^/]*/)?rsync(/.*)? system_u:object_r:public_content_t -diff --exclude-from=exclude -N -u -r nsapolicy/file_contexts/program/slapd.fc policy-1.27.1/file_contexts/program/slapd.fc --- nsapolicy/file_contexts/program/slapd.fc 2005-09-16 11:17:27.000000000 -0400 +++ policy-1.27.1/file_contexts/program/slapd.fc 2005-11-30 16:42:28.000000000 -0500 @@ -5,3 +5,15 @@ @@ -3440,7 +3373,6 @@ +/opt/(fedora|redhat)-ds/slapd-[^/]+/stop-slapd system_u:object_r:initrc_exec_t +/opt/(fedora|redhat)-ds/alias(/.*)? system_u:object_r:slapd_cert_t +/opt/(fedora|redhat)-ds/alias/[^/]+so.* system_u:object_r:shlib_t -diff --exclude-from=exclude -N -u -r nsapolicy/file_contexts/program/squid.fc policy-1.27.1/file_contexts/program/squid.fc --- nsapolicy/file_contexts/program/squid.fc 2005-09-16 11:17:27.000000000 -0400 +++ policy-1.27.1/file_contexts/program/squid.fc 2005-11-30 16:42:28.000000000 -0500 @@ -6,3 +6,6 @@ @@ -3450,7 +3382,6 @@ +ifdef(`apache.te', ` +/usr/lib/squid/cachemgr.cgi -- system_u:object_r:httpd_exec_t +') -diff --exclude-from=exclude -N -u -r nsapolicy/file_contexts/program/xdm.fc policy-1.27.1/file_contexts/program/xdm.fc --- nsapolicy/file_contexts/program/xdm.fc 2005-09-16 11:17:27.000000000 -0400 +++ policy-1.27.1/file_contexts/program/xdm.fc 2005-11-30 16:42:28.000000000 -0500 @@ -3,7 +3,7 @@ @@ -3462,13 +3393,11 @@ /var/[xgk]dm(/.*)? system_u:object_r:xserver_log_t /usr/var/[xgkw]dm(/.*)? system_u:object_r:xserver_log_t /var/log/[kw]dm\.log -- system_u:object_r:xserver_log_t -diff --exclude-from=exclude -N -u -r nsapolicy/file_contexts/program/yppasswdd.fc policy-1.27.1/file_contexts/program/yppasswdd.fc --- nsapolicy/file_contexts/program/yppasswdd.fc 1969-12-31 19:00:00.000000000 -0500 +++ policy-1.27.1/file_contexts/program/yppasswdd.fc 2005-11-30 16:42:28.000000000 -0500 @@ -0,0 +1,2 @@ +# yppasswd +/usr/sbin/rpc.yppasswdd -- system_u:object_r:yppasswdd_exec_t -diff --exclude-from=exclude -N -u -r nsapolicy/file_contexts/program/ypserv.fc policy-1.27.1/file_contexts/program/ypserv.fc --- nsapolicy/file_contexts/program/ypserv.fc 2005-09-16 11:17:27.000000000 -0400 +++ policy-1.27.1/file_contexts/program/ypserv.fc 2005-11-30 16:42:28.000000000 -0500 @@ -1,3 +1,4 @@ @@ -3476,7 +3405,6 @@ /usr/sbin/ypserv -- system_u:object_r:ypserv_exec_t +/usr/lib/yp/.+ -- system_u:object_r:bin_t /etc/ypserv\.conf -- system_u:object_r:ypserv_conf_t -diff --exclude-from=exclude -N -u -r nsapolicy/file_contexts/types.fc policy-1.27.1/file_contexts/types.fc --- nsapolicy/file_contexts/types.fc 2005-09-16 11:17:27.000000000 -0400 +++ policy-1.27.1/file_contexts/types.fc 2005-11-30 16:42:28.000000000 -0500 @@ -72,6 +72,7 @@ @@ -3517,7 +3445,6 @@ +/etc/sysconfig/network-scripts/ifup-.* -- system_u:object_r:bin_t +/etc/sysconfig/network-scripts/ifdown-.* -- system_u:object_r:bin_t -diff --exclude-from=exclude -N -u -r nsapolicy/genfs_contexts policy-1.27.1/genfs_contexts --- nsapolicy/genfs_contexts 2005-09-16 11:17:27.000000000 -0400 +++ policy-1.27.1/genfs_contexts 2005-11-30 16:42:28.000000000 -0500 @@ -94,7 +94,8 @@ @@ -3530,7 +3457,6 @@ # needs more work genfscon eventpollfs / system_u:object_r:eventpollfs_t -diff --exclude-from=exclude -N -u -r nsapolicy/macros/base_user_macros.te policy-1.27.1/macros/base_user_macros.te --- nsapolicy/macros/base_user_macros.te 2005-09-16 11:17:27.000000000 -0400 +++ policy-1.27.1/macros/base_user_macros.te 2005-11-30 16:42:28.000000000 -0500 @@ -40,6 +40,12 @@ @@ -3554,7 +3480,6 @@ ifdef(`crontab.te', `crontab_domain($1)') ifdef(`screen.te', `screen_domain($1)') -diff --exclude-from=exclude -N -u -r nsapolicy/macros/core_macros.te policy-1.27.1/macros/core_macros.te --- nsapolicy/macros/core_macros.te 2005-09-16 11:17:27.000000000 -0400 +++ policy-1.27.1/macros/core_macros.te 2005-11-30 16:42:28.000000000 -0500 @@ -306,8 +306,10 @@ @@ -3600,7 +3525,6 @@ # Read and write my pty files. allow $1_t $1_devpts_t:chr_file { setattr rw_file_perms }; ') -diff --exclude-from=exclude -N -u -r nsapolicy/macros/global_macros.te policy-1.27.1/macros/global_macros.te --- nsapolicy/macros/global_macros.te 2005-09-16 11:17:27.000000000 -0400 +++ policy-1.27.1/macros/global_macros.te 2006-01-18 11:23:58.000000000 -0500 @@ -157,6 +157,11 @@ @@ -3724,7 +3648,6 @@ +allow $1 var_lib_t:dir r_dir_perms; +rw_dir_file($1, var_auth_t) ') -diff --exclude-from=exclude -N -u -r nsapolicy/macros/home_macros.te policy-1.27.1/macros/home_macros.te --- nsapolicy/macros/home_macros.te 2005-09-16 11:17:27.000000000 -0400 +++ policy-1.27.1/macros/home_macros.te 2005-11-30 16:42:28.000000000 -0500 @@ -68,7 +68,11 @@ @@ -3752,7 +3675,6 @@ ') dnl home_domain_access #################################################################### -diff --exclude-from=exclude -N -u -r nsapolicy/macros/network_macros.te policy-1.27.1/macros/network_macros.te --- nsapolicy/macros/network_macros.te 2005-09-16 11:17:27.000000000 -0400 +++ policy-1.27.1/macros/network_macros.te 2006-01-18 11:23:25.000000000 -0500 @@ -12,6 +12,8 @@ @@ -3792,7 +3714,6 @@ +can_ldap($1) +can_winbind($1) +') -diff --exclude-from=exclude -N -u -r nsapolicy/macros/program/apache_macros.te policy-1.27.1/macros/program/apache_macros.te --- nsapolicy/macros/program/apache_macros.te 2005-09-16 11:17:27.000000000 -0400 +++ policy-1.27.1/macros/program/apache_macros.te 2005-11-30 16:42:28.000000000 -0500 @@ -38,7 +38,7 @@ @@ -3835,7 +3756,6 @@ + + ') -diff --exclude-from=exclude -N -u -r nsapolicy/macros/program/bonobo_macros.te policy-1.27.1/macros/program/bonobo_macros.te --- nsapolicy/macros/program/bonobo_macros.te 2005-09-16 11:17:27.000000000 -0400 +++ policy-1.27.1/macros/program/bonobo_macros.te 2005-11-30 16:42:28.000000000 -0500 @@ -72,9 +72,7 @@ @@ -3848,7 +3768,6 @@ ') dnl ifdef bonobo_domain_args ') dnl bonobo_domain -diff --exclude-from=exclude -N -u -r nsapolicy/macros/program/cdrecord_macros.te policy-1.27.1/macros/program/cdrecord_macros.te --- nsapolicy/macros/program/cdrecord_macros.te 2005-09-16 11:17:27.000000000 -0400 +++ policy-1.27.1/macros/program/cdrecord_macros.te 2005-11-30 16:42:28.000000000 -0500 @@ -41,9 +41,13 @@ @@ -3866,7 +3785,6 @@ +} ') -diff --exclude-from=exclude -N -u -r nsapolicy/macros/program/chkpwd_macros.te policy-1.27.1/macros/program/chkpwd_macros.te --- nsapolicy/macros/program/chkpwd_macros.te 2005-09-16 11:17:27.000000000 -0400 +++ policy-1.27.1/macros/program/chkpwd_macros.te 2005-11-30 16:42:28.000000000 -0500 @@ -19,6 +19,9 @@ @@ -3895,7 +3813,6 @@ # Write to the user domain tty. access_terminal($1_chkpwd_t, $1) -diff --exclude-from=exclude -N -u -r nsapolicy/macros/program/crontab_macros.te policy-1.27.1/macros/program/crontab_macros.te --- nsapolicy/macros/program/crontab_macros.te 2005-09-16 11:17:27.000000000 -0400 +++ policy-1.27.1/macros/program/crontab_macros.te 2005-11-30 16:42:28.000000000 -0500 @@ -40,7 +40,7 @@ @@ -3907,7 +3824,6 @@ # Type for temporary files. file_type_auto_trans($1_crontab_t, tmp_t, $1_tmp_t, { dir file }) -diff --exclude-from=exclude -N -u -r nsapolicy/macros/program/dbusd_macros.te policy-1.27.1/macros/program/dbusd_macros.te --- nsapolicy/macros/program/dbusd_macros.te 2005-09-16 11:17:27.000000000 -0400 +++ policy-1.27.1/macros/program/dbusd_macros.te 2005-11-30 16:42:28.000000000 -0500 @@ -29,9 +29,7 @@ @@ -3943,7 +3859,6 @@ ') # can_dbusd_converse(dbus_type, domain_prefix_a, domain_prefix_b) -diff --exclude-from=exclude -N -u -r nsapolicy/macros/program/gconf_macros.te policy-1.27.1/macros/program/gconf_macros.te --- nsapolicy/macros/program/gconf_macros.te 2005-09-16 11:17:27.000000000 -0400 +++ policy-1.27.1/macros/program/gconf_macros.te 2005-11-30 16:42:28.000000000 -0500 @@ -31,8 +31,8 @@ @@ -3956,7 +3871,6 @@ allow xdm_t $1_gconfd_t:process signal; ') -diff --exclude-from=exclude -N -u -r nsapolicy/macros/program/gift_macros.te policy-1.27.1/macros/program/gift_macros.te --- nsapolicy/macros/program/gift_macros.te 2005-09-16 11:17:27.000000000 -0400 +++ policy-1.27.1/macros/program/gift_macros.te 2005-11-30 16:42:28.000000000 -0500 @@ -90,9 +90,7 @@ @@ -3969,7 +3883,6 @@ ') dnl giftd_domain -diff --exclude-from=exclude -N -u -r nsapolicy/macros/program/gpg_macros.te policy-1.27.1/macros/program/gpg_macros.te --- nsapolicy/macros/program/gpg_macros.te 2005-09-16 11:17:27.000000000 -0400 +++ policy-1.27.1/macros/program/gpg_macros.te 2005-11-30 16:42:28.000000000 -0500 @@ -108,8 +108,6 @@ @@ -3981,7 +3894,6 @@ -') ')dnl end gpg_domain definition -diff --exclude-from=exclude -N -u -r nsapolicy/macros/program/i18n_input_macros.te policy-1.27.1/macros/program/i18n_input_macros.te --- nsapolicy/macros/program/i18n_input_macros.te 1969-12-31 19:00:00.000000000 -0500 +++ policy-1.27.1/macros/program/i18n_input_macros.te 2005-11-30 16:42:28.000000000 -0500 @@ -0,0 +1,21 @@ @@ -4006,7 +3918,6 @@ +') + + -diff --exclude-from=exclude -N -u -r nsapolicy/macros/program/lpr_macros.te policy-1.27.1/macros/program/lpr_macros.te --- nsapolicy/macros/program/lpr_macros.te 2005-09-16 11:17:27.000000000 -0400 +++ policy-1.27.1/macros/program/lpr_macros.te 2005-11-30 16:42:28.000000000 -0500 @@ -39,7 +39,7 @@ @@ -4018,7 +3929,6 @@ allow $1_lpr_t self:unix_stream_socket create_stream_socket_perms; -diff --exclude-from=exclude -N -u -r nsapolicy/macros/program/mta_macros.te policy-1.27.1/macros/program/mta_macros.te --- nsapolicy/macros/program/mta_macros.te 2005-09-16 11:17:27.000000000 -0400 +++ policy-1.27.1/macros/program/mta_macros.te 2005-11-30 16:42:28.000000000 -0500 @@ -34,7 +34,7 @@ @@ -4039,7 +3949,6 @@ ', ` # For when the user wants to send mail via port 25 localhost -diff --exclude-from=exclude -N -u -r nsapolicy/macros/program/newrole_macros.te policy-1.27.1/macros/program/newrole_macros.te --- nsapolicy/macros/program/newrole_macros.te 2005-09-16 11:17:27.000000000 -0400 +++ policy-1.27.1/macros/program/newrole_macros.te 2005-11-30 16:42:28.000000000 -0500 @@ -20,6 +20,8 @@ @@ -4051,7 +3960,6 @@ # for when the user types "exec newrole" at the command line allow $1_t privfd:process sigchld; -diff --exclude-from=exclude -N -u -r nsapolicy/macros/program/pyzor_macros.te policy-1.27.1/macros/program/pyzor_macros.te --- nsapolicy/macros/program/pyzor_macros.te 2005-09-16 11:17:27.000000000 -0400 +++ policy-1.27.1/macros/program/pyzor_macros.te 2005-11-30 16:42:28.000000000 -0500 @@ -64,6 +64,6 @@ @@ -4062,7 +3970,6 @@ +can_access_pty($1_pyzor_t, $1) allow $1_pyzor_t sshd_t:fd use; ') -diff --exclude-from=exclude -N -u -r nsapolicy/macros/program/razor_macros.te policy-1.27.1/macros/program/razor_macros.te --- nsapolicy/macros/program/razor_macros.te 2005-09-16 11:17:27.000000000 -0400 +++ policy-1.27.1/macros/program/razor_macros.te 2005-11-30 16:42:28.000000000 -0500 @@ -70,6 +70,6 @@ @@ -4073,7 +3980,6 @@ +can_access_pty($1_razor_t, $1) allow $1_razor_t sshd_t:fd use; ') -diff --exclude-from=exclude -N -u -r nsapolicy/macros/program/su_macros.te policy-1.27.1/macros/program/su_macros.te --- nsapolicy/macros/program/su_macros.te 2005-09-16 11:17:27.000000000 -0400 +++ policy-1.27.1/macros/program/su_macros.te 2005-11-30 16:42:28.000000000 -0500 @@ -54,7 +54,7 @@ @@ -4094,7 +4000,6 @@ dontaudit $1_su_t self:capability sys_tty_config; # # Caused by su - init scripts -diff --exclude-from=exclude -N -u -r nsapolicy/macros/program/uml_macros.te policy-1.27.1/macros/program/uml_macros.te --- nsapolicy/macros/program/uml_macros.te 2005-09-16 11:17:27.000000000 -0400 +++ policy-1.27.1/macros/program/uml_macros.te 2005-11-30 16:42:28.000000000 -0500 @@ -81,7 +81,7 @@ @@ -4106,7 +4011,6 @@ dontaudit uml_net_t $1_uml_rw_t:dir { getattr search }; ')dnl end ifdef uml_net.te -diff --exclude-from=exclude -N -u -r nsapolicy/macros/program/xdm_macros.te policy-1.27.1/macros/program/xdm_macros.te --- nsapolicy/macros/program/xdm_macros.te 2005-09-16 11:17:27.000000000 -0400 +++ policy-1.27.1/macros/program/xdm_macros.te 2005-11-30 16:42:28.000000000 -0500 @@ -6,6 +6,8 @@ @@ -4118,7 +4022,6 @@ allow $1 xdm_t:fifo_file { getattr read write ioctl }; +') ') dnl can_pipe_xdm -diff --exclude-from=exclude -N -u -r nsapolicy/macros/program/ypbind_macros.te policy-1.27.1/macros/program/ypbind_macros.te --- nsapolicy/macros/program/ypbind_macros.te 2005-09-16 11:17:27.000000000 -0400 +++ policy-1.27.1/macros/program/ypbind_macros.te 2005-11-30 16:42:28.000000000 -0500 @@ -1,4 +1,3 @@ @@ -4126,7 +4029,6 @@ define(`uncond_can_ypbind', ` can_network($1) r_dir_file($1,var_yp_t) -diff --exclude-from=exclude -N -u -r nsapolicy/macros/user_macros.te policy-1.27.1/macros/user_macros.te --- nsapolicy/macros/user_macros.te 2005-09-16 11:17:27.000000000 -0400 +++ policy-1.27.1/macros/user_macros.te 2005-11-30 16:42:28.000000000 -0500 @@ -121,6 +121,8 @@ @@ -4164,7 +4066,6 @@ allow $1_t self:lnk_file read; allow $1_t self:unix_stream_socket create_socket_perms; -diff --exclude-from=exclude -N -u -r nsapolicy/Makefile policy-1.27.1/Makefile --- nsapolicy/Makefile 2005-09-16 11:17:27.000000000 -0400 +++ policy-1.27.1/Makefile 2005-11-30 16:42:28.000000000 -0500 @@ -29,15 +29,10 @@ @@ -4245,7 +4146,6 @@ @echo "Enabling MCS in the Makefile" @sed "s/MCS=y/MCS=y/" Makefile > Makefile.new @mv Makefile.new Makefile -diff --exclude-from=exclude -N -u -r nsapolicy/man/man8/ftpd_selinux.8 policy-1.27.1/man/man8/ftpd_selinux.8 --- nsapolicy/man/man8/ftpd_selinux.8 2005-09-16 11:17:27.000000000 -0400 +++ policy-1.27.1/man/man8/ftpd_selinux.8 2006-01-14 00:36:07.000000000 -0500 @@ -8,23 +8,24 @@ @@ -4282,7 +4182,6 @@ .SH BOOLEANS SELinux ftp daemon policy is customizable based on least access required. So by -diff --exclude-from=exclude -N -u -r nsapolicy/man/man8/httpd_selinux.8 policy-1.27.1/man/man8/httpd_selinux.8 --- nsapolicy/man/man8/httpd_selinux.8 2005-09-16 11:17:27.000000000 -0400 +++ policy-1.27.1/man/man8/httpd_selinux.8 2005-11-30 16:42:28.000000000 -0500 @@ -45,6 +45,15 @@ @@ -4301,7 +4200,6 @@ .SH BOOLEANS SELinux policy is customizable based on least access required. So by default SElinux prevents certain http scripts from working. httpd policy is extremely flexible and has several booleans that allow you to manipulate the policy and run httpd with the tightest access possible. -diff --exclude-from=exclude -N -u -r nsapolicy/man/man8/rsync_selinux.8 policy-1.27.1/man/man8/rsync_selinux.8 --- nsapolicy/man/man8/rsync_selinux.8 2005-09-16 11:17:27.000000000 -0400 +++ policy-1.27.1/man/man8/rsync_selinux.8 2005-11-30 16:42:28.000000000 -0500 @@ -8,16 +8,22 @@ @@ -4330,7 +4228,6 @@ .SH BOOLEANS .TP -diff --exclude-from=exclude -N -u -r nsapolicy/man/man8/samba_selinux.8 policy-1.27.1/man/man8/samba_selinux.8 --- nsapolicy/man/man8/samba_selinux.8 2005-09-16 11:17:27.000000000 -0400 +++ policy-1.27.1/man/man8/samba_selinux.8 2005-11-30 16:42:28.000000000 -0500 @@ -20,6 +20,11 @@ @@ -4356,7 +4253,6 @@ .SH AUTHOR This manual page was written by Dan Walsh . -diff --exclude-from=exclude -N -u -r nsapolicy/mcs policy-1.27.1/mcs --- nsapolicy/mcs 2005-09-16 11:17:27.000000000 -0400 +++ policy-1.27.1/mcs 2005-11-30 16:42:28.000000000 -0500 @@ -18,141 +18,77 @@ @@ -4591,7 +4487,6 @@ # XXX # -diff --exclude-from=exclude -N -u -r nsapolicy/mls policy-1.27.1/mls --- nsapolicy/mls 2005-09-16 11:17:27.000000000 -0400 +++ policy-1.27.1/mls 2005-11-30 16:42:28.000000000 -0500 @@ -13,12 +13,17 @@ @@ -4946,10 +4841,15 @@ # -diff --exclude-from=exclude -N -u -r nsapolicy/net_contexts policy-1.27.1/net_contexts --- nsapolicy/net_contexts 2005-09-16 11:17:27.000000000 -0400 -+++ policy-1.27.1/net_contexts 2006-02-09 08:58:02.000000000 -0500 -@@ -50,6 +50,10 @@ ++++ policy-1.27.1/net_contexts 2006-02-15 10:19:23.000000000 -0500 +@@ -45,11 +45,16 @@ + portcon tcp 465 system_u:object_r:smtp_port_t + portcon tcp 587 system_u:object_r:smtp_port_t + ++portcon udp 520 system_u:object_r:router_port_t + portcon udp 500 system_u:object_r:isakmp_port_t + portcon udp 53 system_u:object_r:dns_port_t portcon tcp 53 system_u:object_r:dns_port_t portcon udp 67 system_u:object_r:dhcpd_port_t @@ -4960,7 +4860,7 @@ portcon udp 68 system_u:object_r:dhcpc_port_t portcon udp 70 system_u:object_r:gopher_port_t portcon tcp 70 system_u:object_r:gopher_port_t -@@ -61,6 +65,7 @@ +@@ -61,6 +66,7 @@ portcon tcp 443 system_u:object_r:http_port_t portcon tcp 488 system_u:object_r:http_port_t portcon tcp 8008 system_u:object_r:http_port_t @@ -4968,7 +4868,7 @@ portcon tcp 106 system_u:object_r:pop_port_t portcon tcp 109 system_u:object_r:pop_port_t -@@ -111,8 +116,6 @@ +@@ -111,8 +117,6 @@ portcon tcp 749 system_u:object_r:kerberos_admin_port_t portcon tcp 750 system_u:object_r:kerberos_port_t portcon udp 750 system_u:object_r:kerberos_port_t @@ -4977,7 +4877,7 @@ portcon tcp 783 system_u:object_r:spamd_port_t portcon tcp 540 system_u:object_r:uucpd_port_t portcon tcp 2401 system_u:object_r:cvs_port_t -@@ -145,7 +148,9 @@ +@@ -145,7 +149,9 @@ portcon udp 4569 system_u:object_r:asterisk_port_t portcon udp 5060 system_u:object_r:asterisk_port_t portcon tcp 2000 system_u:object_r:mail_port_t @@ -4987,7 +4887,7 @@ portcon tcp 2628 system_u:object_r:dict_port_t portcon tcp 3306 system_u:object_r:mysqld_port_t portcon tcp 3632 system_u:object_r:distccd_port_t -@@ -161,9 +166,14 @@ +@@ -161,9 +167,14 @@ portcon tcp 5432 system_u:object_r:postgresql_port_t portcon tcp 5666 system_u:object_r:inetd_child_port_t portcon tcp 5703 system_u:object_r:ptal_port_t @@ -5002,7 +4902,6 @@ portcon tcp 6000 system_u:object_r:xserver_port_t portcon tcp 6001 system_u:object_r:xserver_port_t portcon tcp 6002 system_u:object_r:xserver_port_t -diff --exclude-from=exclude -N -u -r nsapolicy/targeted/appconfig/root_default_contexts policy-1.27.1/targeted/appconfig/root_default_contexts --- nsapolicy/targeted/appconfig/root_default_contexts 2005-09-16 11:17:27.000000000 -0400 +++ policy-1.27.1/targeted/appconfig/root_default_contexts 2005-11-30 16:42:28.000000000 -0500 @@ -1,2 +1,6 @@ @@ -5012,7 +4911,6 @@ +system_r:remote_login_t system_r:unconfined_t +system_r:rshd_t system_r:unconfined_t +system_r:crond_t system_r:unconfined_t -diff --exclude-from=exclude -N -u -r nsapolicy/targeted/assert.te policy-1.27.1/targeted/assert.te --- nsapolicy/targeted/assert.te 2005-09-16 11:17:27.000000000 -0400 +++ policy-1.27.1/targeted/assert.te 2005-11-30 16:42:28.000000000 -0500 @@ -22,7 +22,7 @@ @@ -5024,7 +4922,6 @@ # Confined domains must never see /proc/pid entries for an unconfined domain. neverallow { domain -unrestricted -snmpd_t } unconfined_t:dir { getattr search }; -diff --exclude-from=exclude -N -u -r nsapolicy/targeted/domains/program/compat.te policy-1.27.1/targeted/domains/program/compat.te --- nsapolicy/targeted/domains/program/compat.te 2005-09-16 11:17:27.000000000 -0400 +++ policy-1.27.1/targeted/domains/program/compat.te 2005-11-30 16:42:28.000000000 -0500 @@ -1,3 +1,4 @@ @@ -5032,7 +4929,6 @@ typealias bin_t alias dmesg_exec_t; typealias bin_t alias loadkeys_exec_t; +typealias sbin_t alias lvm_exec_t; -diff --exclude-from=exclude -N -u -r nsapolicy/targeted/domains/program/sendmail.te policy-1.27.1/targeted/domains/program/sendmail.te --- nsapolicy/targeted/domains/program/sendmail.te 2005-09-16 11:17:27.000000000 -0400 +++ policy-1.27.1/targeted/domains/program/sendmail.te 2005-11-30 16:42:28.000000000 -0500 @@ -12,7 +12,6 @@ @@ -5043,7 +4939,6 @@ domain_auto_trans(initrc_t, sendmail_exec_t, sendmail_t) var_run_domain(sendmail) -diff --exclude-from=exclude -N -u -r nsapolicy/targeted/domains/program/ssh.te policy-1.27.1/targeted/domains/program/ssh.te --- nsapolicy/targeted/domains/program/ssh.te 2005-09-16 11:17:27.000000000 -0400 +++ policy-1.27.1/targeted/domains/program/ssh.te 2005-11-30 16:42:28.000000000 -0500 @@ -17,3 +17,6 @@ @@ -5053,7 +4948,6 @@ +ifdef(`use_mcs', ` +range_transition initrc_t sshd_exec_t s0 - s0:c0.c255; +') -diff --exclude-from=exclude -N -u -r nsapolicy/targeted/domains/program/xdm.te policy-1.27.1/targeted/domains/program/xdm.te --- nsapolicy/targeted/domains/program/xdm.te 2005-09-16 11:17:27.000000000 -0400 +++ policy-1.27.1/targeted/domains/program/xdm.te 2005-11-30 16:42:28.000000000 -0500 @@ -20,3 +20,7 @@ @@ -5064,7 +4958,6 @@ +range_transition init_t xdm_exec_t s0 - s0:c0.c255; +range_transition initrc_t xdm_exec_t s0 - s0:c0.c255; +') -diff --exclude-from=exclude -N -u -r nsapolicy/targeted/domains/unconfined.te policy-1.27.1/targeted/domains/unconfined.te --- nsapolicy/targeted/domains/unconfined.te 2005-09-16 11:17:27.000000000 -0400 +++ policy-1.27.1/targeted/domains/unconfined.te 2005-11-30 16:42:28.000000000 -0500 @@ -63,6 +63,7 @@ @@ -5093,7 +4986,6 @@ +role system_r types sysadm_su_t; +') + -diff --exclude-from=exclude -N -u -r nsapolicy/tunables/distro.tun policy-1.27.1/tunables/distro.tun --- nsapolicy/tunables/distro.tun 2005-09-16 11:17:27.000000000 -0400 +++ policy-1.27.1/tunables/distro.tun 2005-11-30 16:42:28.000000000 -0500 @@ -5,7 +5,7 @@ @@ -5105,7 +4997,6 @@ dnl define(`distro_suse') -diff --exclude-from=exclude -N -u -r nsapolicy/tunables/tunable.tun policy-1.27.1/tunables/tunable.tun --- nsapolicy/tunables/tunable.tun 2005-09-16 11:17:27.000000000 -0400 +++ policy-1.27.1/tunables/tunable.tun 2005-11-30 16:42:28.000000000 -0500 @@ -1,5 +1,5 @@ @@ -5124,7 +5015,6 @@ # Allow user_r to reach sysadm_r via su, sudo, or userhelper. # Otherwise, only staff_r can do so. -diff --exclude-from=exclude -N -u -r nsapolicy/types/device.te policy-1.27.1/types/device.te --- nsapolicy/types/device.te 2005-09-16 11:17:27.000000000 -0400 +++ policy-1.27.1/types/device.te 2005-11-30 16:42:28.000000000 -0500 @@ -131,8 +131,8 @@ @@ -5138,7 +5028,6 @@ # Type for /dev/pmu type power_device_t, device_type, dev_fs; -diff --exclude-from=exclude -N -u -r nsapolicy/types/devpts.te policy-1.27.1/types/devpts.te --- nsapolicy/types/devpts.te 2005-09-16 11:17:27.000000000 -0400 +++ policy-1.27.1/types/devpts.te 2005-11-30 16:42:28.000000000 -0500 @@ -18,4 +18,6 @@ @@ -5149,7 +5038,6 @@ +ifdef(`targeted_policy', ` +typeattribute devpts_t ttyfile; +') -diff --exclude-from=exclude -N -u -r nsapolicy/types/file.te policy-1.27.1/types/file.te --- nsapolicy/types/file.te 2005-09-16 11:17:27.000000000 -0400 +++ policy-1.27.1/types/file.te 2005-12-02 18:26:35.000000000 -0500 @@ -84,6 +84,9 @@ @@ -5252,10 +5140,9 @@ +type hwdata_t, file_type, sysadmfile; +allow { fs_type file_type } self:filesystem associate; + -diff --exclude-from=exclude -N -u -r nsapolicy/types/network.te policy-1.27.1/types/network.te --- nsapolicy/types/network.te 2005-09-16 11:17:27.000000000 -0400 -+++ policy-1.27.1/types/network.te 2006-02-09 08:58:32.000000000 -0500 -@@ -18,7 +18,7 @@ ++++ policy-1.27.1/types/network.te 2006-02-15 10:19:44.000000000 -0500 +@@ -18,11 +18,12 @@ type dhcpd_port_t, port_type, reserved_port_type; type smbd_port_t, port_type, reserved_port_type; type nmbd_port_t, port_type, reserved_port_type; @@ -5264,7 +5151,12 @@ type http_port_t, port_type, reserved_port_type; type ipp_port_t, port_type, reserved_port_type; type gopher_port_t, port_type, reserved_port_type; -@@ -45,7 +45,6 @@ + type isakmp_port_t, port_type, reserved_port_type; ++type router_port_t, port_type, reserved_port_type; + + allow web_client_domain { http_cache_port_t http_port_t }:tcp_socket name_connect; + type pop_port_t, port_type, reserved_port_type; +@@ -45,7 +46,6 @@ # type kerberos_port_t, port_type, reserved_port_type; type kerberos_admin_port_t, port_type, reserved_port_type; @@ -5272,7 +5164,7 @@ # # Ports used to communicate with portmap server -@@ -105,7 +104,7 @@ +@@ -105,7 +105,7 @@ type printer_port_t, port_type, reserved_port_type; type mysqld_port_t, port_type; type postgresql_port_t, port_type; @@ -5281,7 +5173,7 @@ type howl_port_t, port_type; type dict_port_t, port_type; type syslogd_port_t, port_type, reserved_port_type; -@@ -117,14 +116,17 @@ +@@ -117,14 +117,17 @@ type dhcpc_port_t, port_type, reserved_port_type; type ntp_port_t, port_type, reserved_port_type; type stunnel_port_t, port_type; @@ -5301,7 +5193,7 @@ type postgrey_port_t, port_type; type asterisk_port_t, port_type; type utcpserver_port_t, port_type; -@@ -157,7 +159,7 @@ +@@ -157,7 +160,7 @@ type telnetd_port_t, port_type, reserved_port_type; type comsat_port_t, port_type, reserved_port_type; type cvs_port_t, port_type; @@ -5310,7 +5202,6 @@ type inetd_child_port_t, port_type, reserved_port_type; type ktalkd_port_t, port_type, reserved_port_type; type rsync_port_t, port_type, reserved_port_type; -diff --exclude-from=exclude -N -u -r nsapolicy/types/nfs.te policy-1.27.1/types/nfs.te --- nsapolicy/types/nfs.te 2005-09-16 11:17:27.000000000 -0400 +++ policy-1.27.1/types/nfs.te 2005-11-30 16:42:28.000000000 -0500 @@ -18,5 +18,4 @@ @@ -5319,7 +5210,6 @@ # -allow nfs_t self:filesystem associate; allow file_type nfs_t:filesystem associate; -diff --exclude-from=exclude -N -u -r nsapolicy/types/security.te policy-1.27.1/types/security.te --- nsapolicy/types/security.te 2005-09-16 11:17:27.000000000 -0400 +++ policy-1.27.1/types/security.te 2005-11-30 16:42:28.000000000 -0500 @@ -13,12 +13,18 @@ Index: selinux-policy-strict.spec =================================================================== RCS file: /cvs/dist/rpms/selinux-policy-strict/FC-4/selinux-policy-strict.spec,v retrieving revision 1.339 retrieving revision 1.340 diff -u -r1.339 -r1.340 --- selinux-policy-strict.spec 10 Feb 2006 21:09:19 -0000 1.339 +++ selinux-policy-strict.spec 14 Mar 2006 20:18:18 -0000 1.340 @@ -11,7 +11,7 @@ Summary: SELinux %{type} policy configuration Name: selinux-policy-%{type} Version: 1.27.1 -Release: 2.23 +Release: 2.27 License: GPL Group: System Environment/Base Source: http://www.nsa.gov/selinux/archives/policy-%{version}.tgz @@ -229,6 +229,15 @@ exit 0 %changelog +* Tue Mar 14 2006 Dan Walsh 1.27.1-2.27 +- Allow updfstab to getattr on swapfile +- Allow ypserv to communicate with ypxfr_t +- File context for in.talkd + +* Wed Feb 15 2006 Dan Walsh 1.27.1-2.25 +- Zebra wants to listen on router_port_t +- auditctl wants to read proc + * Fri Feb 10 2006 Dan Walsh 1.27.1-2.23 - Final fix for zebra From fedora-cvs-commits at redhat.com Tue Mar 14 20:26:17 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 14 Mar 2006 15:26:17 -0500 Subject: rpms/gnome-desktop/devel .cvsignore, 1.27, 1.28 gnome-desktop.spec, 1.51, 1.52 sources, 1.27, 1.28 Message-ID: <200603142026.k2EKQHwX004063@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/gnome-desktop/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv3897 Modified Files: .cvsignore gnome-desktop.spec sources Log Message: - Update to 2.14.0 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/gnome-desktop/devel/.cvsignore,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- .cvsignore 28 Feb 2006 02:56:33 -0000 1.27 +++ .cvsignore 14 Mar 2006 20:26:13 -0000 1.28 @@ -1,17 +1 @@ -gnome-desktop-2.7.92.tar.bz2 -gnome-desktop-2.8.0.tar.bz2 -gnome-desktop-2.9.90.tar.bz2 -gnome-desktop-2.9.90.1.tar.bz2 -gnome-desktop-2.9.91.tar.bz2 -gnome-desktop-2.10.0.tar.bz2 -gnome-desktop-2.11.4.tar.bz2 -gnome-desktop-2.11.90.tar.bz2 -gnome-desktop-2.12.0.tar.bz2 -gnome-desktop-2.12.1.tar.bz2 -gnome-desktop-2.13.2.tar.bz2 -gnome-desktop-2.13.3.tar.bz2 -gnome-desktop-2.13.4.tar.bz2 -gnome-desktop-2.13.5.tar.bz2 -gnome-desktop-2.13.90.tar.bz2 -gnome-desktop-2.13.91.tar.bz2 -gnome-desktop-2.13.92.tar.bz2 +gnome-desktop-2.14.0.tar.bz2 Index: gnome-desktop.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-desktop/devel/gnome-desktop.spec,v retrieving revision 1.51 retrieving revision 1.52 diff -u -r1.51 -r1.52 --- gnome-desktop.spec 28 Feb 2006 14:33:05 -0000 1.51 +++ gnome-desktop.spec 14 Mar 2006 20:26:13 -0000 1.52 @@ -11,8 +11,8 @@ Summary: Package containing code shared among gnome-panel, gnome-session, nautilus, etc. Name: gnome-desktop -Version: 2.13.92 -Release: 2 +Version: 2.14.0 +Release: 1 URL: http://www.gnome.org Source0: ftp://ftp.gnome.org/pub/GNOME/pre-gnome2/sources/gnome-desktop/%{name}-%{version}.tar.bz2 Source1: %{name}-2.8.0-extrapo.tar.bz2 @@ -91,7 +91,7 @@ %install rm -rf $RPM_BUILD_ROOT -%makeinstall +make install DESTDIR=$RPM_BUILD_ROOT # stuff we don't want rm -rf $RPM_BUILD_ROOT/var/scrollkeeper @@ -134,6 +134,9 @@ #%{_datadir}/gtk-doc %changelog +* Tue Mar 14 2006 Ray Strode - 2.14.0-1 +- Update to 2.14.0 + * Tue Feb 28 2006 Karsten Hopp 2.13.92-2 - BuildRequires: gnome-doc-utils Index: sources =================================================================== RCS file: /cvs/dist/rpms/gnome-desktop/devel/sources,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- sources 28 Feb 2006 02:56:33 -0000 1.27 +++ sources 14 Mar 2006 20:26:13 -0000 1.28 @@ -1 +1 @@ -0e3fb44bc5f2ee40862e85fa5fee816a gnome-desktop-2.13.92.tar.bz2 +b8daad3194f8d5d48546a9b4d4585503 gnome-desktop-2.14.0.tar.bz2 From fedora-cvs-commits at redhat.com Tue Mar 14 20:41:54 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 14 Mar 2006 15:41:54 -0500 Subject: rpms/kernel/devel patch-2.6.16-rc6-git3.bz2.sign, NONE, 1.1 .cvsignore, 1.379, 1.380 kernel-2.6.spec, 1.2053, 1.2054 sources, 1.320, 1.321 upstream, 1.293, 1.294 patch-2.6.16-rc6-git1.bz2.sign, 1.1, NONE Message-ID: <200603142041.k2EKfsS4009551@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv9466 Modified Files: .cvsignore kernel-2.6.spec sources upstream Added Files: patch-2.6.16-rc6-git3.bz2.sign Removed Files: patch-2.6.16-rc6-git1.bz2.sign Log Message: git3 --- NEW FILE patch-2.6.16-rc6-git3.bz2.sign --- -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.2.1 (GNU/Linux) Comment: See http://www.kernel.org/signature.html for info iD8DBQBEFxMsyGugalF9Dw4RAsnwAJ4wCiMnw/QQhcgsvb1bBp4EYi5iXQCeO7XV XXqHheZWwgGpvqM8DZVlEAg= =qXfL -----END PGP SIGNATURE----- Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v retrieving revision 1.379 retrieving revision 1.380 diff -u -r1.379 -r1.380 --- .cvsignore 13 Mar 2006 18:37:32 -0000 1.379 +++ .cvsignore 14 Mar 2006 20:41:50 -0000 1.380 @@ -4,4 +4,4 @@ linux-2.6.15.tar.bz2 xen-20060301.tar.bz2 patch-2.6.16-rc6.bz2 -patch-2.6.16-rc6-git1.bz2 +patch-2.6.16-rc6-git3.bz2 Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.2053 retrieving revision 1.2054 diff -u -r1.2053 -r1.2054 --- kernel-2.6.spec 14 Mar 2006 15:47:41 -0000 1.2053 +++ kernel-2.6.spec 14 Mar 2006 20:41:50 -0000 1.2054 @@ -218,7 +218,7 @@ # Patches 0 through 100 are meant for core subsystem upgrades # Patch1: patch-2.6.16-rc6.bz2 -Patch2: patch-2.6.16-rc6-git1.bz2 +Patch2: patch-2.6.16-rc6-git3.bz2 # Patches 100 through 500 are meant for architecture patches Patch100: linux-2.6-bzimage.patch @@ -1660,6 +1660,9 @@ %endif %changelog +* Tue Mar 14 2006 Dave Jones +- 2.6.16-rc6-git3 + * Tue Mar 14 2006 David Woodhouse - Recognise 'IBM,CBEA' as Cell platform too. Index: sources =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/sources,v retrieving revision 1.320 retrieving revision 1.321 diff -u -r1.320 -r1.321 --- sources 13 Mar 2006 18:37:32 -0000 1.320 +++ sources 14 Mar 2006 20:41:50 -0000 1.321 @@ -1,4 +1,4 @@ cdf95e00f5111e31f78e1d97304d9522 linux-2.6.15.tar.bz2 cdfde609af8adcf58d7ff626599b2d90 xen-20060301.tar.bz2 67fe4dce92d3103e56dd8d2d3c20b3ed patch-2.6.16-rc6.bz2 -b134a01cb392d9abf0b3537a48f0d0fe patch-2.6.16-rc6-git1.bz2 +7c26e731eb4ec33b3a5793656adcc081 patch-2.6.16-rc6-git3.bz2 Index: upstream =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/upstream,v retrieving revision 1.293 retrieving revision 1.294 diff -u -r1.293 -r1.294 --- upstream 13 Mar 2006 18:37:32 -0000 1.293 +++ upstream 14 Mar 2006 20:41:50 -0000 1.294 @@ -1,3 +1,3 @@ linux-2.6.15.tar.bz2 patch-2.6.16-rc6.bz2 -patch-2.6.16-rc6-git1.bz2 +patch-2.6.16-rc6-git3.bz2 --- patch-2.6.16-rc6-git1.bz2.sign DELETED --- From fedora-cvs-commits at redhat.com Tue Mar 14 20:50:16 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 14 Mar 2006 15:50:16 -0500 Subject: rpms/libbonoboui/devel .cvsignore, 1.19, 1.20 libbonoboui.spec, 1.37, 1.38 sources, 1.20, 1.21 ta.po, 1.1, NONE Message-ID: <200603142050.k2EKoG3S021608@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/libbonoboui/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv21477 Modified Files: .cvsignore libbonoboui.spec sources Removed Files: ta.po Log Message: - Update to 2.14.0 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/libbonoboui/devel/.cvsignore,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- .cvsignore 17 Jan 2006 02:55:33 -0000 1.19 +++ .cvsignore 14 Mar 2006 20:50:13 -0000 1.20 @@ -1,10 +1 @@ -libbonoboui-2.6.1.tar.bz2 -libbonoboui-2.8.0.tar.bz2 -libbonoboui-2.8.0-cvs20040927.tar.gz -libbonoboui-2.8.0.99cvs20040927.tar.gz -libbonoboui-2.8.0.99cvs20040929.tar.gz -libbonoboui-2.8.1.tar.bz2 -libbonoboui-2.10.0.tar.bz2 -libbonoboui-2.10.1.tar.bz2 -libbonoboui-2.13.0.tar.bz2 -libbonoboui-2.13.1.tar.bz2 +libbonoboui-2.14.0.tar.bz2 Index: libbonoboui.spec =================================================================== RCS file: /cvs/dist/rpms/libbonoboui/devel/libbonoboui.spec,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- libbonoboui.spec 11 Feb 2006 03:53:09 -0000 1.37 +++ libbonoboui.spec 14 Mar 2006 20:50:13 -0000 1.38 @@ -13,12 +13,10 @@ Summary: Bonobo user interface components Name: libbonoboui -Version: 2.13.1 -Release: 4.2 +Version: 2.14.0 +Release: 1 URL: http://ftp.gnome.org Source0: %{name}-%{version}.tar.bz2 -Source1: ta.po -Patch: libbonoboui-2.8.1-desktop.patch License: LGPL Group: System Environment/Libraries BuildRoot: %{_tmppath}/%{name}-root @@ -77,8 +75,6 @@ %prep %setup -q -n %{name}-%{version} -%patch -p1 -b .menu -cp ${RPM_SOURCE_DIR}/ta.po po %build @@ -132,6 +128,9 @@ %{_datadir}/gtk-doc %changelog +* Tue Mar 14 2006 Ray Strode 2.14.0-1 +- Update to 2.14.0 + * Fri Feb 10 2006 Jesse Keating - 2.13.1-4.2 - bump again for double-long bug on ppc(64) Index: sources =================================================================== RCS file: /cvs/dist/rpms/libbonoboui/devel/sources,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- sources 17 Jan 2006 02:55:33 -0000 1.20 +++ sources 14 Mar 2006 20:50:13 -0000 1.21 @@ -1 +1 @@ -076905fc924b22e9b5656a51490ea07e libbonoboui-2.13.1.tar.bz2 +dc26dc17cddc625cac37ecfab263a51a libbonoboui-2.14.0.tar.bz2 --- ta.po DELETED --- From fedora-cvs-commits at redhat.com Tue Mar 14 20:56:25 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 14 Mar 2006 15:56:25 -0500 Subject: rpms/NetworkManager/devel NetworkManager-0.6.0-device-up.patch, NONE, 1.1 NetworkManager.spec, 1.100, 1.101 Message-ID: <200603142056.k2EKuOfp024204@cvs.devel.redhat.com> Author: pjones Update of /cvs/dist/rpms/NetworkManager/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv24057 Modified Files: NetworkManager.spec Added Files: NetworkManager-0.6.0-device-up.patch Log Message: - Fix device bringup on resume - changelog + release bump NetworkManager-0.6.0-device-up.patch: nm-device.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) --- NEW FILE NetworkManager-0.6.0-device-up.patch --- --- NetworkManager-0.6.0/src/nm-device.c.device-up 2006-02-15 16:19:09.000000000 -0500 +++ NetworkManager-0.6.0/src/nm-device.c 2006-03-14 15:53:22.000000000 -0500 @@ -215,9 +215,11 @@ if (NM_DEVICE_GET_CLASS (dev)->init) NM_DEVICE_GET_CLASS (dev)->init (dev); + /* This ref should logically go in nm_device_worker, but we need the + ref to be taken before the worker thread is scheduled on a cpu. */ + g_object_ref (G_OBJECT (dev)); dev->priv->worker = g_thread_create (nm_device_worker, dev, TRUE, NULL); g_assert (dev->priv->worker); - g_object_ref (G_OBJECT (dev)); /* For the worker thread */ /* Block until our device thread has actually had a chance to start. */ args[0] = &dev->priv->worker_started; @@ -1924,8 +1926,6 @@ * reference. */ - nm_device_stop (self); - nm_system_device_free_system_config (self, self->priv->system_config_data); if (self->priv->ip4_config) { Index: NetworkManager.spec =================================================================== RCS file: /cvs/dist/rpms/NetworkManager/devel/NetworkManager.spec,v retrieving revision 1.100 retrieving revision 1.101 diff -u -r1.100 -r1.101 --- NetworkManager.spec 6 Mar 2006 15:32:31 -0000 1.100 +++ NetworkManager.spec 14 Mar 2006 20:56:22 -0000 1.101 @@ -15,7 +15,7 @@ Name: NetworkManager Summary: Network connection manager and user applications Version: 0.6.0 -Release: 2%{?nm_cvs_version} +Release: 3%{?nm_cvs_version} Group: System Environment/Base License: GPL URL: http://www.gnome.org/projects/NetworkManager/ @@ -24,6 +24,7 @@ Patch0: special-case-madwifi.patch Patch1: no-wpa-no-scan1.patch +Patch2: NetworkManager-0.6.0-device-up.patch PreReq: chkconfig Requires: wireless-tools >= %{wireless_tools_version} @@ -119,6 +120,7 @@ %setup -q %patch0 -p0 -b .madwifi %patch1 -p0 -b .no-wpa-no-scan1 +%patch2 -p1 -b .device-up %build %configure --with-named=/usr/sbin/named --with-named-dir=/var/named/data --with-named-user=named --enable-notify=yes @@ -213,6 +215,9 @@ %changelog +* Tue Mar 14 2006 Peter Jones - 0.6.0-3 +- Fix device bringup on resume + * Mon Mar 6 2006 Dan Williams 0.6.0-2 - Don't let wpa_supplicant perform scanning with non-WPA drivers From fedora-cvs-commits at redhat.com Tue Mar 14 21:06:19 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 14 Mar 2006 16:06:19 -0500 Subject: rpms/ORBit2/devel .cvsignore, 1.16, 1.17 ORBit2.spec, 1.33, 1.34 sources, 1.16, 1.17 Message-ID: <200603142106.k2EL6JjK026371@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/ORBit2/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv26279 Modified Files: .cvsignore ORBit2.spec sources Log Message: - Update to 2.14.1 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/ORBit2/devel/.cvsignore,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- .cvsignore 7 Feb 2006 03:41:33 -0000 1.16 +++ .cvsignore 14 Mar 2006 21:06:05 -0000 1.17 @@ -1,6 +1 @@ -ORBit2-2.12.0.tar.bz2 -ORBit2-2.12.1.tar.bz2 -ORBit2-2.12.2.tar.bz2 -ORBit2-2.12.4.tar.bz2 -ORBit2-2.13.2.tar.bz2 -ORBit2-2.13.3.tar.bz2 +ORBit2-2.14.0.tar.bz2 Index: ORBit2.spec =================================================================== RCS file: /cvs/dist/rpms/ORBit2/devel/ORBit2.spec,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- ORBit2.spec 13 Feb 2006 18:43:24 -0000 1.33 +++ ORBit2.spec 14 Mar 2006 21:06:05 -0000 1.34 @@ -3,8 +3,8 @@ Summary: A high-performance CORBA Object Request Broker. Name: ORBit2 -Version: 2.13.3 -Release: 1.2 +Version: 2.14.0 +Release: 1 Source: %{name}-%{version}.tar.bz2 Group: System Environment/Daemons License: LGPL/GPL @@ -94,6 +94,9 @@ %{_datadir}/gtk-doc %changelog +* Tue Mar 14 2006 Ray Strode - 2.14.1-1 +- Update to 2.14.1 + * Mon Feb 13 2006 Jesse Keating - 2.13.3-1.2 - rebump for build order issues during double-long bump Index: sources =================================================================== RCS file: /cvs/dist/rpms/ORBit2/devel/sources,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- sources 7 Feb 2006 03:41:33 -0000 1.16 +++ sources 14 Mar 2006 21:06:05 -0000 1.17 @@ -1 +1 @@ -f879b3b77880df9a15ffdea171bb2e82 ORBit2-2.13.3.tar.bz2 +bb1b4859522cb6e1a3a3dc4b7397db64 ORBit2-2.14.0.tar.bz2 From fedora-cvs-commits at redhat.com Tue Mar 14 21:07:21 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 14 Mar 2006 16:07:21 -0500 Subject: rpms/anaconda/devel .cvsignore, 1.237, 1.238 anaconda.spec, 1.358, 1.359 sources, 1.357, 1.358 Message-ID: <200603142107.k2EL7Lse026582@cvs.devel.redhat.com> Author: clumens Update of /cvs/dist/rpms/anaconda/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv26529/devel Modified Files: .cvsignore anaconda.spec sources Log Message: auto-import anaconda-11.0.4-1 on branch devel from anaconda-11.0.4-1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/anaconda/devel/.cvsignore,v retrieving revision 1.237 retrieving revision 1.238 diff -u -r1.237 -r1.238 --- .cvsignore 13 Mar 2006 22:48:19 -0000 1.237 +++ .cvsignore 14 Mar 2006 21:07:08 -0000 1.238 @@ -1 +1 @@ -anaconda-11.0.3.tar.bz2 +anaconda-11.0.4.tar.bz2 Index: anaconda.spec =================================================================== RCS file: /cvs/dist/rpms/anaconda/devel/anaconda.spec,v retrieving revision 1.358 retrieving revision 1.359 diff -u -r1.358 -r1.359 --- anaconda.spec 13 Mar 2006 22:48:19 -0000 1.358 +++ anaconda.spec 14 Mar 2006 21:07:18 -0000 1.359 @@ -1,5 +1,5 @@ Name: anaconda -Version: 11.0.3 +Version: 11.0.4 Release: 1 License: GPL Summary: Graphical system installer @@ -79,6 +79,9 @@ /sbin/chkconfig --del reconfig >/dev/null 2>&1 || : %changelog +* Tue Mar 14 2006 Chris Lumens 11.0.4-1 +- Remove Amharic and Thai from lang-table + * Mon Mar 13 2006 Jeremy Katz - 11.0.3-1 - Check for none in size test (clumens, #185172) - Fix hard drive install (clumens) Index: sources =================================================================== RCS file: /cvs/dist/rpms/anaconda/devel/sources,v retrieving revision 1.357 retrieving revision 1.358 diff -u -r1.357 -r1.358 --- sources 13 Mar 2006 22:48:19 -0000 1.357 +++ sources 14 Mar 2006 21:07:19 -0000 1.358 @@ -1 +1 @@ -28d54aa986411e4863d065b2c37b0b80 anaconda-11.0.3.tar.bz2 +6e4f5e6b0996ac8bed5028a8f2059a01 anaconda-11.0.4.tar.bz2 From fedora-cvs-commits at redhat.com Tue Mar 14 21:21:20 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 14 Mar 2006 16:21:20 -0500 Subject: rpms/booty/devel .cvsignore, 1.41, 1.42 booty.spec, 1.45, 1.46 sources, 1.44, 1.45 Message-ID: <200603142121.k2ELLKnx009704@cvs.devel.redhat.com> Author: pjones Update of /cvs/dist/rpms/booty/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv9640 Modified Files: .cvsignore booty.spec sources Log Message: - update to 0.71-1 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/booty/devel/.cvsignore,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- .cvsignore 8 Mar 2006 22:44:42 -0000 1.41 +++ .cvsignore 14 Mar 2006 21:21:15 -0000 1.42 @@ -1 +1 @@ -booty-0.70.tar.bz2 +booty-0.71.tar.bz2 Index: booty.spec =================================================================== RCS file: /cvs/dist/rpms/booty/devel/booty.spec,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- booty.spec 8 Mar 2006 22:44:42 -0000 1.45 +++ booty.spec 14 Mar 2006 21:21:15 -0000 1.46 @@ -1,6 +1,6 @@ Summary: simple python bootloader config lib Name: booty -Version: 0.70 +Version: 0.71 Release: 1 License: LGPL Source0: %{name}-%{version}.tar.bz2 @@ -34,6 +34,9 @@ %changelog +* Tue Mar 14 2006 Peter Jones - 0.71-1 +- pass through pci= boot arguments + * Wed Mar 8 2006 Peter Jones - 0.70-1 - don't make fd0 entries in device.map, they screw up suspend/hibernate Index: sources =================================================================== RCS file: /cvs/dist/rpms/booty/devel/sources,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- sources 8 Mar 2006 22:44:42 -0000 1.44 +++ sources 14 Mar 2006 21:21:15 -0000 1.45 @@ -1 +1 @@ -ee1653cb0485e639786dde24f2368b89 booty-0.70.tar.bz2 +50dd1a34e60c3191d4898cef90f45319 booty-0.71.tar.bz2 From fedora-cvs-commits at redhat.com Tue Mar 14 21:20:59 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 14 Mar 2006 16:20:59 -0500 Subject: rpms/kudzu/devel .cvsignore, 1.114, 1.115 kudzu.spec, 1.129, 1.130 sources, 1.128, 1.129 Message-ID: <200603142120.k2ELKxAe009661@cvs.devel.redhat.com> Author: notting Update of /cvs/dist/rpms/kudzu/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv9582 Modified Files: .cvsignore kudzu.spec sources Log Message: update Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/kudzu/devel/.cvsignore,v retrieving revision 1.114 retrieving revision 1.115 diff -u -r1.114 -r1.115 --- .cvsignore 9 Mar 2006 18:50:57 -0000 1.114 +++ .cvsignore 14 Mar 2006 21:20:54 -0000 1.115 @@ -1 +1 @@ -kudzu-1.2.34.2.tar.gz +kudzu-1.2.34.3.tar.gz Index: kudzu.spec =================================================================== RCS file: /cvs/dist/rpms/kudzu/devel/kudzu.spec,v retrieving revision 1.129 retrieving revision 1.130 diff -u -r1.129 -r1.130 --- kudzu.spec 9 Mar 2006 18:50:57 -0000 1.129 +++ kudzu.spec 14 Mar 2006 21:20:55 -0000 1.130 @@ -1,5 +1,5 @@ Name: kudzu -Version: 1.2.34.2 +Version: 1.2.34.3 Release: 1 License: GPL Summary: The Red Hat Linux hardware probing tool. @@ -79,6 +79,9 @@ %{_includedir}/kudzu %changelog +* Tue Mar 14 2006 Bill Nottingham - 1.2.34.3-1 +- fix scsi probe to not return devices of the wrong class + * Thu Mar 9 2006 Bill Nottingham - 1.2.34.2-1 - special-case xen to not use vm86 (works around #179013) Index: sources =================================================================== RCS file: /cvs/dist/rpms/kudzu/devel/sources,v retrieving revision 1.128 retrieving revision 1.129 diff -u -r1.128 -r1.129 --- sources 9 Mar 2006 18:50:57 -0000 1.128 +++ sources 14 Mar 2006 21:20:55 -0000 1.129 @@ -1 +1 @@ -72df9c195da341f9b3766471ed4af45d kudzu-1.2.34.2.tar.gz +7846871272da61f50547901937717704 kudzu-1.2.34.3.tar.gz From fedora-cvs-commits at redhat.com Tue Mar 14 21:36:10 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 14 Mar 2006 16:36:10 -0500 Subject: rpms/gnbd-kernel/devel gnbd-kernel.spec,1.148,1.149 Message-ID: <200603142136.k2ELaAY4021585@cvs.devel.redhat.com> Author: cfeist Update of /cvs/dist/rpms/gnbd-kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv21540 Modified Files: gnbd-kernel.spec Log Message: Removed ARCH=xen for xen builds. Index: gnbd-kernel.spec =================================================================== RCS file: /cvs/dist/rpms/gnbd-kernel/devel/gnbd-kernel.spec,v retrieving revision 1.148 retrieving revision 1.149 diff -u -r1.148 -r1.149 --- gnbd-kernel.spec 12 Mar 2006 01:38:03 -0000 1.148 +++ gnbd-kernel.spec 14 Mar 2006 21:35:56 -0000 1.149 @@ -11,7 +11,7 @@ ############################################################################### %define buildup 1 %define buildsmp 1 -%define buildxen 0 +%define buildxen 1 %define kernel_version 2.6.15-1.2041_FC5 %define subversion 2 @@ -125,11 +125,7 @@ exit 1 fi ./configure --kernel_src=$kernel_src --incdir=%{_includedir} - if [ "$flavor" == "xenU" -o "$flavor" == "xen0" ]; then - make ARCH=xen %{?_smp_mflags} - else - make %{?_smp_mflags} - fi + make %{?_smp_mflags} } %if %{buildup} @@ -166,9 +162,9 @@ %if %{buildxen} cd ../xenU -make install DESTDIR=$RPM_BUILD_ROOT ARCH=xen +make install DESTDIR=$RPM_BUILD_ROOT cd ../xen0 -make install DESTDIR=$RPM_BUILD_ROOT ARCH=xen +make install DESTDIR=$RPM_BUILD_ROOT %endif @@ -218,6 +214,9 @@ %{_includedir}/linux/gnbd.h %changelog +* Tue Mar 14 2006 Chris Feist +- Removed 'ARCH=xen' for xen builds. + * Tue Feb 07 2006 Jesse Keating - 2.6.15.0-20051108.134753.FC5.18.1 - rebuilt for new gcc4.1 snapshot and glibc changes From fedora-cvs-commits at redhat.com Tue Mar 14 22:13:55 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 14 Mar 2006 17:13:55 -0500 Subject: rpms/libgtk-java/devel GdkCairoFix.patch, NONE, 1.1 libgtk-java.spec, 1.44, 1.45 Message-ID: <200603142213.k2EMDtqJ013068@cvs.devel.redhat.com> Author: ajocksch Update of /cvs/dist/rpms/libgtk-java/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv12939 Modified Files: libgtk-java.spec Added Files: GdkCairoFix.patch Log Message: * Tue Mar 14 2006 Adam Jocksch - 2.8.3.0.20060301.rh1-1 - Added GdkCairoFix.patch to address bug in GdkCairo class. GdkCairoFix.patch: org_gnu_gdk_GdkCairo.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) --- NEW FILE GdkCairoFix.patch --- Index: src/jni/org_gnu_gdk_GdkCairo.c =================================================================== RCS file: /cvs/gnome/libgtk-java/src/jni/org_gnu_gdk_GdkCairo.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- src/jni/org_gnu_gdk_GdkCairo.c 28 Feb 2006 02:43:32 -0000 1.5 +++ src/jni/org_gnu_gdk_GdkCairo.c 8 Mar 2006 15:51:05 -0000 1.6 @@ -30,8 +30,8 @@ drawable_g = (GdkDrawable*)getPointerFromHandle(env, drawable); cr = gdk_cairo_create(drawable_g); - - return getStructHandle(env, cr, NULL, (JGFreeFunc) cairo_destroy); + + return getHandleFromPointer(env, cr); } /* Index: libgtk-java.spec =================================================================== RCS file: /cvs/dist/rpms/libgtk-java/devel/libgtk-java.spec,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- libgtk-java.spec 1 Mar 2006 21:36:23 -0000 1.44 +++ libgtk-java.spec 14 Mar 2006 22:13:53 -0000 1.45 @@ -13,7 +13,7 @@ %define name_base libgtk-java %define version 2.8.3.0.20060301.rh1 -%define release 0 +%define release 1 Summary: Java bindings for GTK+ @@ -35,6 +35,9 @@ BuildRequires: %{c_pkg_prefix}gtk2-devel >= 2.8.0 BuildRequires: java-devel >= 1.4.2, gcc-java >= 3.3.3, docbook-utils +# patch that fixes occaision NPE in GdkCairo +Patch0: GdkCairoFix.patch + ExcludeArch: s390x %description @@ -53,6 +56,7 @@ %prep %setup -q -n %{name_base}-%{version} +%patch0 %build # if either the C or Java packages has a prefix declared, then we will @@ -123,6 +127,9 @@ %changelog +* Tue Mar 14 2006 Adam Jocksch - 2.8.3.0.20060301.rh1-1 +- Added GdkCairoFix.patch to address bug in GdkCairo class. + * Wed Mar 01 2006 Adam Jocksch - 2.8.3.0.20060301.rh1-0 - Imported new tarball to address bg #183538, updated dependancies. From fedora-cvs-commits at redhat.com Tue Mar 14 22:14:12 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 14 Mar 2006 17:14:12 -0500 Subject: rpms/gnome-media/devel .cvsignore, 1.28, 1.29 gnome-media.spec, 1.62, 1.63 Message-ID: <200603142214.k2EMECcH013147@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/gnome-media/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv13056 Modified Files: .cvsignore gnome-media.spec Log Message: - rebuild Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/gnome-media/devel/.cvsignore,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- .cvsignore 13 Mar 2006 02:12:39 -0000 1.28 +++ .cvsignore 14 Mar 2006 22:14:01 -0000 1.29 @@ -1,8 +1 @@ -gnome-media-2.11.91.tar.bz2 -gnome-media-2.12.0.tar.bz2 -gnome-media-2.13.5.tar.bz2 -gnome-media-2.13.7.tar.bz2 -gnome-media-2.13.91.tar.bz2 -gnome-media-2.13.92.tar.bz2 -gnome-media-2.13.93.tar.bz2 gnome-media-2.14.0.tar.bz2 Index: gnome-media.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-media/devel/gnome-media.spec,v retrieving revision 1.62 retrieving revision 1.63 diff -u -r1.62 -r1.63 --- gnome-media.spec 13 Mar 2006 02:12:39 -0000 1.62 +++ gnome-media.spec 14 Mar 2006 22:14:01 -0000 1.63 @@ -11,7 +11,7 @@ Summary: GNOME media programs. Name: gnome-media Version: 2.14.0 -Release: 1 +Release: 2 License: GPL Group: Applications/Multimedia Source: ftp://ftp.gnome.org/pub/GNOME/sources/gnome-media/2.11/gnome-media-%{version}.tar.bz2 @@ -73,7 +73,7 @@ rm -rf $RPM_BUILD_ROOT export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 -%makeinstall +make install DESTDIR=$RPM_BUILD_ROOT unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL #remove gnome-sound-recorder because it does not work @@ -153,6 +153,9 @@ %{_libdir}/pkgconfig/* %changelog +* Tue Mar 14 2006 Ray Strode - 2.14.0-2 +- rebuild + * Sun Mar 12 2006 Matthias Clasen - 2.14.0-1 - Update to 2.14.0 From fedora-cvs-commits at redhat.com Tue Mar 14 22:21:33 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 14 Mar 2006 17:21:33 -0500 Subject: rpms/gnome-themes/devel gnome-themes.spec,1.53,1.54 Message-ID: <200603142221.k2EMLXCO021171@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/gnome-themes/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv20975 Modified Files: gnome-themes.spec Log Message: - Update to 2.14.0 Index: gnome-themes.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-themes/devel/gnome-themes.spec,v retrieving revision 1.53 retrieving revision 1.54 diff -u -r1.53 -r1.54 --- gnome-themes.spec 9 Feb 2006 18:15:26 -0000 1.53 +++ gnome-themes.spec 14 Mar 2006 22:21:20 -0000 1.54 @@ -3,8 +3,8 @@ Summary: Themes collection for GNOME Name: gnome-themes -Version: 2.13.90 -Release: 3 +Version: 2.14.0 +Release: 1 URL: http://ftp.gnome.org/pub/GNOME/sources/gnome-themes/ Source: %{name}-%{version}.tar.bz2 Source1: clearlooks-%{clearlooks_version}.tar.bz2 @@ -62,7 +62,7 @@ %install rm -rf $RPM_BUILD_ROOT export tagname=CC -%makeinstall LIBTOOL=/usr/bin/libtool +make install DESTDIR=$RPM_BUILD_ROOT LIBTOOL=/usr/bin/libtool /bin/rm -f $RPM_BUILD_ROOT%{_datadir}/themes/ThinIce/README.html /bin/rm -f $RPM_BUILD_ROOT%{_datadir}/themes/ThinIce/ICON.png @@ -90,6 +90,9 @@ %doc AUTHORS ChangeLog COPYING NEWS README %changelog +* Tue Mar 14 2006 Ray Strode - 2.14.0-1 +- Update to 2.14.0 + * Thu Feb 9 2006 Matthias Clasen - 2.13.90-3 - Fix a warning From fedora-cvs-commits at redhat.com Tue Mar 14 22:27:13 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 14 Mar 2006 17:27:13 -0500 Subject: rpms/gnome-themes/devel .cvsignore,1.26,1.27 sources,1.26,1.27 Message-ID: <200603142227.k2EMRDpb028020@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/gnome-themes/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv27800 Modified Files: .cvsignore sources Log Message: update sources Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/gnome-themes/devel/.cvsignore,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- .cvsignore 31 Jan 2006 04:25:09 -0000 1.26 +++ .cvsignore 14 Mar 2006 22:27:07 -0000 1.27 @@ -1,18 +1,3 @@ -clearlooks-0.4.tar.bz2 -gnome-themes-2.10.0.tar.bz2 -clearlooks-0.5.tar.bz2 -MCity-clearlooks-metacity-0.5.tar.gz -gnome-themes-2.10.1.tar.bz2 -gnome-themes-2.11.3.tar.bz2 -clearlooks-0.6.1.tar.bz2 -gnome-themes-2.11.90.tar.bz2 clearlooks-0.6.2.tar.bz2 -clearlooks-metacity-0.6.tar.gz -gnome-themes-2.11.91.tar.bz2 -gnome-themes-2.12.0.tar.bz2 -gnome-themes-2.12.1.tar.bz2 -stock_info.png -inverse_stock_info.png -gnome-themes-2.13.2.tar.bz2 clearlooks-metacity-2.0.tar.gz -gnome-themes-2.13.90.tar.bz2 +gnome-themes-2.14.0.tar.bz2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/gnome-themes/devel/sources,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- sources 31 Jan 2006 04:25:09 -0000 1.26 +++ sources 14 Mar 2006 22:27:07 -0000 1.27 @@ -1,3 +1,3 @@ 451ef33d1bffa261c5cbe01182199f97 clearlooks-0.6.2.tar.bz2 64bffb05ef1c8d2f3a3cbb18480cd3f0 clearlooks-metacity-2.0.tar.gz -f51bbb272627ce119bb7755c17331f28 gnome-themes-2.13.90.tar.bz2 +329cfbfcb0add306e8bf6a09ada6f85b gnome-themes-2.14.0.tar.bz2 From fedora-cvs-commits at redhat.com Tue Mar 14 22:34:30 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 14 Mar 2006 17:34:30 -0500 Subject: rpms/totem/devel totem.spec,1.55,1.56 Message-ID: <200603142234.k2EMYUSa031752@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/totem/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv31557 Modified Files: totem.spec Log Message: - Update to 1.4.0 From fedora-cvs-commits at redhat.com Tue Mar 14 22:43:49 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 14 Mar 2006 17:43:49 -0500 Subject: rpms/selinux-policy/devel policy-20060207.patch, 1.49, 1.50 selinux-policy.spec, 1.152, 1.153 Message-ID: <200603142243.k2EMhn21001848@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/selinux-policy/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv1806 Modified Files: policy-20060207.patch selinux-policy.spec Log Message: * Tue Mar 14 2006 Dan Walsh 2.2.23-18 - Allow secadmin to shutdown system - Allow sendmail to exec newalias policy-20060207.patch: Rules.modular | 2 policy/mcs | 4 policy/modules/admin/bootloader.te | 2 policy/modules/admin/dmidecode.te | 2 policy/modules/admin/readahead.te | 2 policy/modules/admin/rpm.fc | 2 policy/modules/admin/rpm.if | 3 policy/modules/admin/rpm.te | 1 policy/modules/admin/su.fc | 1 policy/modules/admin/su.if | 6 policy/modules/admin/updfstab.te | 4 policy/modules/admin/vbetool.te | 9 + policy/modules/kernel/corenetwork.te.in | 3 policy/modules/kernel/devices.fc | 1 policy/modules/kernel/devices.if | 21 ++- policy/modules/kernel/files.fc | 8 - policy/modules/kernel/files.if | 21 ++- policy/modules/kernel/filesystem.te | 1 policy/modules/kernel/kernel.if | 102 ++++++++++++++ policy/modules/kernel/kernel.te | 3 policy/modules/kernel/terminal.if | 2 policy/modules/services/apache.fc | 2 policy/modules/services/apache.if | 5 policy/modules/services/apm.fc | 2 policy/modules/services/apm.te | 4 policy/modules/services/bluetooth.te | 19 +- policy/modules/services/cron.te | 3 policy/modules/services/cups.fc | 2 policy/modules/services/cups.if | 22 +++ policy/modules/services/cups.te | 7 - policy/modules/services/cvs.te | 2 policy/modules/services/hal.if | 41 +++++ policy/modules/services/hal.te | 13 + policy/modules/services/ktalk.fc | 1 policy/modules/services/ktalk.te | 6 policy/modules/services/mailman.if | 25 +++ policy/modules/services/nis.fc | 1 policy/modules/services/nis.if | 25 +++ policy/modules/services/nis.te | 28 ++++ policy/modules/services/nscd.if | 2 policy/modules/services/postfix.te | 4 policy/modules/services/samba.te | 2 policy/modules/services/sendmail.te | 1 policy/modules/system/fstools.if | 18 ++ policy/modules/system/fstools.te | 3 policy/modules/system/init.te | 5 policy/modules/system/libraries.fc | 2 policy/modules/system/locallogin.te | 1 policy/modules/system/lvm.fc | 1 policy/modules/system/lvm.te | 3 policy/modules/system/mount.te | 3 policy/modules/system/selinuxutil.fc | 6 policy/modules/system/selinuxutil.if | 23 ++- policy/modules/system/selinuxutil.te | 16 ++ policy/modules/system/sysnetwork.te | 7 + policy/modules/system/udev.te | 2 policy/modules/system/unconfined.te | 8 - policy/modules/system/userdomain.te | 1 policy/modules/system/xend.fc | 23 +++ policy/modules/system/xend.if | 71 ++++++++++ policy/modules/system/xend.te | 219 ++++++++++++++++++++++++++++++++ support/Makefile.devel | 5 62 files changed, 776 insertions(+), 58 deletions(-) Index: policy-20060207.patch =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20060207.patch,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- policy-20060207.patch 14 Mar 2006 20:13:28 -0000 1.49 +++ policy-20060207.patch 14 Mar 2006 22:43:44 -0000 1.50 @@ -60,6 +60,30 @@ # SuSE ifdef(`distro_suse', ` +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.if serefpolicy-2.2.23/policy/modules/admin/rpm.if +--- nsaserefpolicy/policy/modules/admin/rpm.if 2006-03-04 00:06:33.000000000 -0500 ++++ serefpolicy-2.2.23/policy/modules/admin/rpm.if 2006-03-14 17:08:39.000000000 -0500 +@@ -78,6 +78,9 @@ + role $2 types rpm_t; + role $2 types rpm_script_t; + seutil_run_loadpolicy(rpm_script_t,$2,$3) ++ seutil_run_semanage(rpm_script_t,$2,$3) ++ seutil_run_setfiles(rpm_script_t,$2,$3) ++ seutil_run_restorecon(rpm_script_t,$2,$3) + allow rpm_t $3:chr_file rw_term_perms; + ') + +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.te serefpolicy-2.2.23/policy/modules/admin/rpm.te +--- nsaserefpolicy/policy/modules/admin/rpm.te 2006-03-04 00:06:33.000000000 -0500 ++++ serefpolicy-2.2.23/policy/modules/admin/rpm.te 2006-03-14 16:51:22.000000000 -0500 +@@ -326,6 +326,7 @@ + + seutil_domtrans_loadpolicy(rpm_script_t) + seutil_domtrans_restorecon(rpm_script_t) ++seutil_domtrans_semanage(rpm_script_t) + + userdom_use_all_users_fds(rpm_script_t) + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/su.fc serefpolicy-2.2.23/policy/modules/admin/su.fc --- nsaserefpolicy/policy/modules/admin/su.fc 2005-11-14 18:24:06.000000000 -0500 +++ serefpolicy-2.2.23/policy/modules/admin/su.fc 2006-03-07 13:42:37.000000000 -0500 @@ -969,6 +993,17 @@ files_config_file(samba_share_t) type samba_var_t; +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/sendmail.te serefpolicy-2.2.23/policy/modules/services/sendmail.te +--- nsaserefpolicy/policy/modules/services/sendmail.te 2006-03-04 00:06:36.000000000 -0500 ++++ serefpolicy-2.2.23/policy/modules/services/sendmail.te 2006-03-14 15:56:20.000000000 -0500 +@@ -125,6 +125,7 @@ + ') + + optional_policy(`postfix',` ++ postfix_exec_master(sendmail_t) + postfix_read_config(sendmail_t) + postfix_search_spool(sendmail_t) + ') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/fstools.if serefpolicy-2.2.23/policy/modules/system/fstools.if --- nsaserefpolicy/policy/modules/system/fstools.if 2006-02-10 21:34:15.000000000 -0500 +++ serefpolicy-2.2.23/policy/modules/system/fstools.if 2006-03-14 11:33:20.000000000 -0500 @@ -1149,7 +1184,18 @@ # diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.if serefpolicy-2.2.23/policy/modules/system/selinuxutil.if --- nsaserefpolicy/policy/modules/system/selinuxutil.if 2006-02-23 09:25:09.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/system/selinuxutil.if 2006-03-13 12:46:45.000000000 -0500 ++++ serefpolicy-2.2.23/policy/modules/system/selinuxutil.if 2006-03-14 17:32:57.000000000 -0500 +@@ -675,8 +675,8 @@ + + files_search_etc($1) + allow $1 selinux_config_t:dir search; +- allow $1 file_context_t:dir r_dir_perms; +- allow $1 file_context_t:file rw_file_perms; ++ allow $1 file_context_t:dir rw_dir_perms; ++ allow $1 file_context_t:file create_file_perms; + allow $1 file_context_t:lnk_file { getattr read }; + ') + @@ -853,7 +853,7 @@ ') @@ -1159,9 +1205,30 @@ type_transition $1 selinux_config_t:dir semanage_store_t; allow $1 semanage_store_t:dir create_dir_perms; +@@ -899,3 +899,20 @@ + allow $1 selinux_config_t:dir search_dir_perms; + allow $1 semanage_trans_lock_t:file rw_file_perms; + ') ++ ++ ++######################################## ++# ++# seutil_manage_config(domain) ++# ++interface(`seutil_manage_selinux_config',` ++ gen_require(` ++ type selinux_config_t; ++ ') ++ ++ files_search_etc($1) ++ allow $1 selinux_config_t:dir rw_dir_perms; ++ allow $1 selinux_config_t:file create_file_perms; ++ allow $1 selinux_config_t:lnk_file { getattr read }; ++') ++ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.te serefpolicy-2.2.23/policy/modules/system/selinuxutil.te --- nsaserefpolicy/policy/modules/system/selinuxutil.te 2006-03-04 00:06:37.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/system/selinuxutil.te 2006-03-13 13:21:24.000000000 -0500 ++++ serefpolicy-2.2.23/policy/modules/system/selinuxutil.te 2006-03-14 17:32:51.000000000 -0500 @@ -192,6 +192,9 @@ selinux_load_policy(load_policy_t) selinux_set_boolean(load_policy_t) @@ -1192,6 +1259,41 @@ ') dnl end ifdef targeted policy ######################################## +@@ -499,6 +508,7 @@ + + mls_file_write_down(semanage_t) + mls_rangetrans_target(semanage_t) ++mls_file_read_up(semanage_t) + + selinux_get_enforce_mode(semanage_t) + +@@ -510,6 +520,7 @@ + + seutil_search_default_contexts(semanage_t) + seutil_rw_file_contexts(semanage_t) ++seutil_manage_selinux_config(semanage_t) + seutil_domtrans_setfiles(semanage_t) + seutil_domtrans_loadpolicy(semanage_t) + seutil_read_config(semanage_t) +@@ -519,6 +530,10 @@ + seutil_get_semanage_trans_lock(semanage_t) + seutil_get_semanage_read_lock(semanage_t) + ++optional_policy(`nscd',` ++ nscd_socket_use(semanage_t) ++') ++ + ######################################## + # + # Setfiles local policy +@@ -581,6 +596,7 @@ + miscfiles_read_localization(setfiles_t) + + seutil_get_semanage_read_lock(setfiles_t) ++seutil_get_semanage_trans_lock(setfiles_t) + + userdom_use_all_users_fds(setfiles_t) + # for config files in a home directory diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/sysnetwork.te serefpolicy-2.2.23/policy/modules/system/sysnetwork.te --- nsaserefpolicy/policy/modules/system/sysnetwork.te 2006-03-04 00:06:37.000000000 -0500 +++ serefpolicy-2.2.23/policy/modules/system/sysnetwork.te 2006-03-09 11:15:56.000000000 -0500 @@ -1253,6 +1355,17 @@ optional_policy(`netutils',` netutils_domtrans_ping(unconfined_t) ') +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-2.2.23/policy/modules/system/userdomain.te +--- nsaserefpolicy/policy/modules/system/userdomain.te 2006-03-04 00:06:37.000000000 -0500 ++++ serefpolicy-2.2.23/policy/modules/system/userdomain.te 2006-03-14 15:57:25.000000000 -0500 +@@ -179,6 +179,7 @@ + logging_read_audit_log(secadm_t) + logging_domtrans_auditctl(secadm_t) + userdom_dontaudit_append_staff_home_content_files(secadm_t) ++ init_exec(secadm_t) + ', ` + logging_domtrans_auditctl(sysadm_t) + logging_read_audit_log(sysadm_t) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xend.fc serefpolicy-2.2.23/policy/modules/system/xend.fc --- nsaserefpolicy/policy/modules/system/xend.fc 1969-12-31 19:00:00.000000000 -0500 +++ serefpolicy-2.2.23/policy/modules/system/xend.fc 2006-03-10 16:48:34.000000000 -0500 Index: selinux-policy.spec =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v retrieving revision 1.152 retrieving revision 1.153 diff -u -r1.152 -r1.153 --- selinux-policy.spec 14 Mar 2006 20:15:31 -0000 1.152 +++ selinux-policy.spec 14 Mar 2006 22:43:44 -0000 1.153 @@ -10,7 +10,7 @@ Summary: SELinux policy configuration Name: selinux-policy Version: 2.2.23 -Release: 17 +Release: 18 License: GPL Group: System Environment/Base Source: serefpolicy-%{version}.tgz @@ -142,7 +142,7 @@ %prep %setup -q -n serefpolicy-%{version} -%patch0 -p1 +%patch -p1 %install # Build targeted policy @@ -298,6 +298,10 @@ %fileList strict %changelog +* Tue Mar 14 2006 Dan Walsh 2.2.23-18 +- Allow secadmin to shutdown system +- Allow sendmail to exec newalias + * Tue Mar 14 2006 Dan Walsh 2.2.23-17 - MLS Fixes dmidecode needs mls_file_read_up From fedora-cvs-commits at redhat.com Tue Mar 14 22:45:13 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 14 Mar 2006 17:45:13 -0500 Subject: rpms/gok/devel .cvsignore, 1.16, 1.17 gok.spec, 1.30, 1.31 sources, 1.16, 1.17 Message-ID: <200603142245.k2EMjDXm002466@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/gok/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv2341 Modified Files: .cvsignore gok.spec sources Log Message: - Update to 1.0.7 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/gok/devel/.cvsignore,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- .cvsignore 13 Feb 2006 20:03:01 -0000 1.16 +++ .cvsignore 14 Mar 2006 22:45:08 -0000 1.17 @@ -1,9 +1 @@ -gok-0.11.7.tar.bz2 -gok-0.11.8.tar.bz2 -gok-0.12.1.tar.bz2 -gok-0.12.3.tar.bz2 -gok-1.0.1.tar.bz2 -gok-1.0.2.tar.bz2 -gok-1.0.3.tar.bz2 -gok-1.0.5.tar.bz2 -gok-1.0.6.tar.bz2 +gok-1.0.7.tar.bz2 Index: gok.spec =================================================================== RCS file: /cvs/dist/rpms/gok/devel/gok.spec,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- gok.spec 1 Mar 2006 13:25:29 -0000 1.30 +++ gok.spec 14 Mar 2006 22:45:09 -0000 1.31 @@ -2,8 +2,8 @@ Summary: GNOME Onscreen Keyboard Name: gok -Version: 1.0.6 -Release: 2 +Version: 1.0.7 +Release: 1 License: GPL Group: Desktop/Accessibility URL: http://www.gok.ca/ @@ -59,7 +59,7 @@ rm -rf $RPM_BUILD_ROOT export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 -%makeinstall +make install DESTDIR=$RPM_BUILD_ROOT unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL /bin/rm -rf $RPM_BUILD_ROOT/var/scrollkeeper @@ -104,6 +104,9 @@ %{_libdir}/pkgconfig/*pc %changelog +* Tue Mar 14 2006 Ray Strode 1.0.7-1 +- Update to 1.0.7 + * Wed Mar 01 2006 Karsten Hopp 1.0.6-2 - BuildRequires: libXt-devel Index: sources =================================================================== RCS file: /cvs/dist/rpms/gok/devel/sources,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- sources 13 Feb 2006 20:03:04 -0000 1.16 +++ sources 14 Mar 2006 22:45:09 -0000 1.17 @@ -1 +1 @@ -9dba56d24a16784d7945a18c95dabc55 gok-1.0.6.tar.bz2 +2473d55e2627408587bb0e8c8f567fba gok-1.0.7.tar.bz2 From fedora-cvs-commits at redhat.com Tue Mar 14 22:50:26 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 14 Mar 2006 17:50:26 -0500 Subject: rpms/gnbd-kernel/devel gnbd-kernel.spec,1.149,1.150 Message-ID: <200603142250.k2EMoQLi010821@cvs.devel.redhat.com> Author: cfeist Update of /cvs/dist/rpms/gnbd-kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv10762 Modified Files: gnbd-kernel.spec Log Message: Bumped rev. Index: gnbd-kernel.spec =================================================================== RCS file: /cvs/dist/rpms/gnbd-kernel/devel/gnbd-kernel.spec,v retrieving revision 1.149 retrieving revision 1.150 diff -u -r1.149 -r1.150 --- gnbd-kernel.spec 14 Mar 2006 21:35:56 -0000 1.149 +++ gnbd-kernel.spec 14 Mar 2006 22:50:22 -0000 1.150 @@ -25,7 +25,7 @@ Name: gnbd-kernel Version: 2.6.15 -Release: 5.FC5.18 +Release: 5.FC5.19 License: GPL Group: System Environment/Kernel Summary: gnbd-kernel - The kernel module for GFS's Network Block Device From fedora-cvs-commits at redhat.com Tue Mar 14 22:53:56 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 14 Mar 2006 17:53:56 -0500 Subject: rpms/gnbd-kernel/devel gnbd-kernel.spec,1.150,1.151 Message-ID: <200603142253.k2EMru37012395@cvs.devel.redhat.com> Author: cfeist Update of /cvs/dist/rpms/gnbd-kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv12354 Modified Files: gnbd-kernel.spec Log Message: Updated Kernel Version Index: gnbd-kernel.spec =================================================================== RCS file: /cvs/dist/rpms/gnbd-kernel/devel/gnbd-kernel.spec,v retrieving revision 1.150 retrieving revision 1.151 diff -u -r1.150 -r1.151 --- gnbd-kernel.spec 14 Mar 2006 22:50:22 -0000 1.150 +++ gnbd-kernel.spec 14 Mar 2006 22:53:54 -0000 1.151 @@ -25,7 +25,7 @@ Name: gnbd-kernel Version: 2.6.15 -Release: 5.FC5.19 +Release: 5.FC5.20 License: GPL Group: System Environment/Kernel Summary: gnbd-kernel - The kernel module for GFS's Network Block Device From fedora-cvs-commits at redhat.com Tue Mar 14 22:55:48 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 14 Mar 2006 17:55:48 -0500 Subject: rpms/initscripts/devel .cvsignore, 1.97, 1.98 initscripts.spec, 1.111, 1.112 sources, 1.106, 1.107 Message-ID: <200603142255.k2EMtmcK013220@cvs.devel.redhat.com> Author: notting Update of /cvs/dist/rpms/initscripts/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv13179 Modified Files: .cvsignore initscripts.spec sources Log Message: update Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/initscripts/devel/.cvsignore,v retrieving revision 1.97 retrieving revision 1.98 diff -u -r1.97 -r1.98 --- .cvsignore 6 Mar 2006 04:13:10 -0000 1.97 +++ .cvsignore 14 Mar 2006 22:55:45 -0000 1.98 @@ -1 +1 @@ -initscripts-8.31.tar.bz2 +initscripts-8.31.1.tar.bz2 Index: initscripts.spec =================================================================== RCS file: /cvs/dist/rpms/initscripts/devel/initscripts.spec,v retrieving revision 1.111 retrieving revision 1.112 diff -u -r1.111 -r1.112 --- initscripts.spec 6 Mar 2006 04:13:10 -0000 1.111 +++ initscripts.spec 14 Mar 2006 22:55:45 -0000 1.112 @@ -1,6 +1,6 @@ Summary: The inittab file and the /etc/init.d scripts. Name: initscripts -Version: 8.31 +Version: 8.31.1 License: GPL Group: System Environment/Base Release: 1 @@ -208,6 +208,10 @@ %ghost %attr(0664,root,utmp) /var/run/utmp %changelog +* Tue Mar 14 2006 Bill Nottingham 8.31.1-1 +- fix context of /dev/pts (#185436) +- translation updates + * Sun Mar 5 2006 Bill Nottingham 8.31-1 - fix kexec support () - translation updates Index: sources =================================================================== RCS file: /cvs/dist/rpms/initscripts/devel/sources,v retrieving revision 1.106 retrieving revision 1.107 diff -u -r1.106 -r1.107 --- sources 6 Mar 2006 04:32:20 -0000 1.106 +++ sources 14 Mar 2006 22:55:45 -0000 1.107 @@ -1 +1 @@ -284dd7a83319a3d4233a8a12022a3e29 initscripts-8.31.tar.bz2 +fc2a0f9a94bac45f96764ae1a8eef7cd initscripts-8.31.1.tar.bz2 From fedora-cvs-commits at redhat.com Tue Mar 14 22:56:46 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 14 Mar 2006 17:56:46 -0500 Subject: rpms/gnbd-kernel/devel gnbd-kernel.spec,1.151,1.152 Message-ID: <200603142256.k2EMukkJ013682@cvs.devel.redhat.com> Author: cfeist Update of /cvs/dist/rpms/gnbd-kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv13600 Modified Files: gnbd-kernel.spec Log Message: Updated Kernel Version Index: gnbd-kernel.spec =================================================================== RCS file: /cvs/dist/rpms/gnbd-kernel/devel/gnbd-kernel.spec,v retrieving revision 1.151 retrieving revision 1.152 diff -u -r1.151 -r1.152 --- gnbd-kernel.spec 14 Mar 2006 22:53:54 -0000 1.151 +++ gnbd-kernel.spec 14 Mar 2006 22:56:44 -0000 1.152 @@ -25,7 +25,7 @@ Name: gnbd-kernel Version: 2.6.15 -Release: 5.FC5.20 +Release: 5.FC5.21 License: GPL Group: System Environment/Kernel Summary: gnbd-kernel - The kernel module for GFS's Network Block Device From fedora-cvs-commits at redhat.com Tue Mar 14 22:58:12 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 14 Mar 2006 17:58:12 -0500 Subject: rpms/gnbd-kernel/devel gnbd-kernel.spec,1.152,1.153 Message-ID: <200603142258.k2EMwCBF014232@cvs.devel.redhat.com> Author: cfeist Update of /cvs/dist/rpms/gnbd-kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv14219 Modified Files: gnbd-kernel.spec Log Message: Updated Kernel Version Index: gnbd-kernel.spec =================================================================== RCS file: /cvs/dist/rpms/gnbd-kernel/devel/gnbd-kernel.spec,v retrieving revision 1.152 retrieving revision 1.153 diff -u -r1.152 -r1.153 --- gnbd-kernel.spec 14 Mar 2006 22:56:44 -0000 1.152 +++ gnbd-kernel.spec 14 Mar 2006 22:58:10 -0000 1.153 @@ -12,7 +12,7 @@ %define buildup 1 %define buildsmp 1 %define buildxen 1 -%define kernel_version 2.6.15-1.2041_FC5 +%define kernel_version 2.6.15-1.2054_FC5 %define subversion 2 %ifnarch i686 @@ -25,7 +25,7 @@ Name: gnbd-kernel Version: 2.6.15 -Release: 5.FC5.21 +Release: 5.FC5.22 License: GPL Group: System Environment/Kernel Summary: gnbd-kernel - The kernel module for GFS's Network Block Device From fedora-cvs-commits at redhat.com Tue Mar 14 23:06:34 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 14 Mar 2006 18:06:34 -0500 Subject: rpms/gnbd-kernel/devel gnbd-kernel.spec,1.153,1.154 Message-ID: <200603142306.k2EN6Yqa015634@cvs.devel.redhat.com> Author: cfeist Update of /cvs/dist/rpms/gnbd-kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv15577 Modified Files: gnbd-kernel.spec Log Message: Added requirement on kernel-xenU/0. Index: gnbd-kernel.spec =================================================================== RCS file: /cvs/dist/rpms/gnbd-kernel/devel/gnbd-kernel.spec,v retrieving revision 1.153 retrieving revision 1.154 diff -u -r1.153 -r1.154 --- gnbd-kernel.spec 14 Mar 2006 22:58:10 -0000 1.153 +++ gnbd-kernel.spec 14 Mar 2006 23:06:20 -0000 1.154 @@ -25,12 +25,15 @@ Name: gnbd-kernel Version: 2.6.15 -Release: 5.FC5.22 +Release: 5.FC5.23 License: GPL Group: System Environment/Kernel Summary: gnbd-kernel - The kernel module for GFS's Network Block Device BuildRequires: kernel = %{kernel_version} BuildRequires: kernel-smp = %{kernel_version} +BuildRequires: kernel-xenU = %{kernel_version} +BuildRequires: kernel-xen0 = %{kernel_version} +BuildRequires: kernel-smp = %{kernel_version} BuildRequires: kernel-devel = %{kernel_version} BuildRequires: kernel-smp-devel = %{kernel_version} BuildRequires: kernel-xenU-devel = %{kernel_version} From fedora-cvs-commits at redhat.com Tue Mar 14 23:12:04 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 14 Mar 2006 18:12:04 -0500 Subject: rpms/anaconda/devel .cvsignore, 1.238, 1.239 anaconda.spec, 1.359, 1.360 sources, 1.358, 1.359 Message-ID: <200603142312.k2ENC4De016572@cvs.devel.redhat.com> Author: pnasrat Update of /cvs/dist/rpms/anaconda/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv16533/devel Modified Files: .cvsignore anaconda.spec sources Log Message: auto-import anaconda-11.0.5-1 on branch devel from anaconda-11.0.5-1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/anaconda/devel/.cvsignore,v retrieving revision 1.238 retrieving revision 1.239 diff -u -r1.238 -r1.239 --- .cvsignore 14 Mar 2006 21:07:08 -0000 1.238 +++ .cvsignore 14 Mar 2006 23:11:52 -0000 1.239 @@ -1 +1 @@ -anaconda-11.0.4.tar.bz2 +anaconda-11.0.5.tar.bz2 Index: anaconda.spec =================================================================== RCS file: /cvs/dist/rpms/anaconda/devel/anaconda.spec,v retrieving revision 1.359 retrieving revision 1.360 diff -u -r1.359 -r1.360 --- anaconda.spec 14 Mar 2006 21:07:18 -0000 1.359 +++ anaconda.spec 14 Mar 2006 23:11:52 -0000 1.360 @@ -1,5 +1,5 @@ Name: anaconda -Version: 11.0.4 +Version: 11.0.5 Release: 1 License: GPL Summary: Graphical system installer @@ -79,6 +79,9 @@ /sbin/chkconfig --del reconfig >/dev/null 2>&1 || : %changelog +* Tue Mar 14 2006 Paul Nasrat 11.0.5-1 +- Fix import for rescue mode + * Tue Mar 14 2006 Chris Lumens 11.0.4-1 - Remove Amharic and Thai from lang-table Index: sources =================================================================== RCS file: /cvs/dist/rpms/anaconda/devel/sources,v retrieving revision 1.358 retrieving revision 1.359 diff -u -r1.358 -r1.359 --- sources 14 Mar 2006 21:07:19 -0000 1.358 +++ sources 14 Mar 2006 23:11:52 -0000 1.359 @@ -1 +1 @@ -6e4f5e6b0996ac8bed5028a8f2059a01 anaconda-11.0.4.tar.bz2 +f814e7d0011dd44c3c3cf12b6ddb5b40 anaconda-11.0.5.tar.bz2 From fedora-cvs-commits at redhat.com Tue Mar 14 23:18:29 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 14 Mar 2006 18:18:29 -0500 Subject: rpms/cman-kernel/devel cman-kernel.spec,1.158,1.159 Message-ID: <200603142318.k2ENITCB031410@cvs.devel.redhat.com> Author: cfeist Update of /cvs/dist/rpms/cman-kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv31380 Modified Files: cman-kernel.spec Log Message: Updated Kernel Version Index: cman-kernel.spec =================================================================== RCS file: /cvs/dist/rpms/cman-kernel/devel/cman-kernel.spec,v retrieving revision 1.158 retrieving revision 1.159 diff -u -r1.158 -r1.159 --- cman-kernel.spec 12 Mar 2006 04:35:59 -0000 1.158 +++ cman-kernel.spec 14 Mar 2006 23:18:27 -0000 1.159 @@ -12,7 +12,7 @@ %define buildup 1 %define buildsmp 1 %define buildxen 0 -%define kernel_version 2.6.15-1.2041_FC5 +%define kernel_version 2.6.15-1.2054_FC5 %define subversion 0 %define tempversion 2.6.15 @@ -26,7 +26,7 @@ Name: cman-kernel Version: 2.6.15.1 -Release: 0.FC5.13 +Release: 0.FC5.14 License: GPL Group: System Environment/Kernel Summary: cman-kernel - The Cluster Manager kernel modules From fedora-cvs-commits at redhat.com Tue Mar 14 23:18:48 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 14 Mar 2006 18:18:48 -0500 Subject: rpms/dlm-kernel/devel dlm-kernel.spec,1.128,1.129 Message-ID: <200603142318.k2ENImXJ031602@cvs.devel.redhat.com> Author: cfeist Update of /cvs/dist/rpms/dlm-kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv31567 Modified Files: dlm-kernel.spec Log Message: Updated Kernel Version Index: dlm-kernel.spec =================================================================== RCS file: /cvs/dist/rpms/dlm-kernel/devel/dlm-kernel.spec,v retrieving revision 1.128 retrieving revision 1.129 diff -u -r1.128 -r1.129 --- dlm-kernel.spec 12 Mar 2006 04:36:31 -0000 1.128 +++ dlm-kernel.spec 14 Mar 2006 23:18:45 -0000 1.129 @@ -12,7 +12,7 @@ %define buildup 1 %define buildsmp 1 %define buildxen 0 -%define kernel_version 2.6.15-1.2041_FC5 +%define kernel_version 2.6.15-1.2054_FC5 %define tempversion 2.6.15 %define subversion 0 @@ -26,7 +26,7 @@ Name: dlm-kernel Version: 2.6.15.1 -Release: 0.FC5.11 +Release: 0.FC5.12 License: GPL Group: System Environment/Kernel Summary: dlm-kernel - The Distributed Lock Manager kernel modules. From fedora-cvs-commits at redhat.com Tue Mar 14 23:19:05 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 14 Mar 2006 18:19:05 -0500 Subject: rpms/GFS-kernel/devel GFS-kernel.spec,1.147,1.148 Message-ID: <200603142319.k2ENJ5UV031786@cvs.devel.redhat.com> Author: cfeist Update of /cvs/dist/rpms/GFS-kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv31749 Modified Files: GFS-kernel.spec Log Message: Updated Kernel Version Index: GFS-kernel.spec =================================================================== RCS file: /cvs/dist/rpms/GFS-kernel/devel/GFS-kernel.spec,v retrieving revision 1.147 retrieving revision 1.148 diff -u -r1.147 -r1.148 --- GFS-kernel.spec 12 Mar 2006 04:36:24 -0000 1.147 +++ GFS-kernel.spec 14 Mar 2006 23:19:03 -0000 1.148 @@ -12,7 +12,7 @@ %define buildup 1 %define buildsmp 1 %define buildxen 0 -%define kernel_version 2.6.15-1.2041_FC5 +%define kernel_version 2.6.15-1.2054_FC5 %define tempversion 2.6.15 %define subversion 2 @@ -26,7 +26,7 @@ Name: GFS-kernel Version: 2.6.15.1 -Release: 5.FC5.15 +Release: 5.FC5.16 License: GPL Group: System Environment/Kernel Summary: GFS-kernel - The Global File System kernel modules From fedora-cvs-commits at redhat.com Tue Mar 14 23:19:45 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 14 Mar 2006 18:19:45 -0500 Subject: rpms/cman-kernel/devel cman-kernel.spec,1.159,1.160 Message-ID: <200603142319.k2ENJjF9032143@cvs.devel.redhat.com> Author: cfeist Update of /cvs/dist/rpms/cman-kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv32095 Modified Files: cman-kernel.spec Log Message: Removed ARCH=xen for xen builds. Index: cman-kernel.spec =================================================================== RCS file: /cvs/dist/rpms/cman-kernel/devel/cman-kernel.spec,v retrieving revision 1.159 retrieving revision 1.160 diff -u -r1.159 -r1.160 --- cman-kernel.spec 14 Mar 2006 23:18:27 -0000 1.159 +++ cman-kernel.spec 14 Mar 2006 23:19:43 -0000 1.160 @@ -11,7 +11,7 @@ ############################################################################### %define buildup 1 %define buildsmp 1 -%define buildxen 0 +%define buildxen 1 %define kernel_version 2.6.15-1.2054_FC5 %define subversion 0 %define tempversion 2.6.15 @@ -26,16 +26,18 @@ Name: cman-kernel Version: 2.6.15.1 -Release: 0.FC5.14 +Release: 0.FC5.15 License: GPL Group: System Environment/Kernel Summary: cman-kernel - The Cluster Manager kernel modules BuildRequires: kernel = %{kernel_version} BuildRequires: kernel-smp = %{kernel_version} +BuildRequires: kernel-xen0 = %{kernel_version} +BuildRequires: kernel-xenU = %{kernel_version} BuildRequires: kernel-devel = %{kernel_version} BuildRequires: kernel-smp-devel = %{kernel_version} -#BuildRequires: kernel-xen0-devel = %{kernel_version} -#BuildRequires: kernel-xenU-devel = %{kernel_version} +BuildRequires: kernel-xen0-devel = %{kernel_version} +BuildRequires: kernel-xenU-devel = %{kernel_version} Conflicts: GFS <= 6.0 Conflicts: GFS-modules GFS-modules-smp GFS-modules-hugemem Requires: kernel = %{kernel_version} @@ -227,6 +229,9 @@ %{_includedir}/cluster/* %changelog +* Tue Mar 14 2006 Chris Feist +- Removed 'ARCH=xen' for xen builds. + * Tue Feb 07 2006 Jesse Keating - 2.6.15.0-20051219.162641.FC5.11.1 - rebuilt for new gcc4.1 snapshot and glibc changes From fedora-cvs-commits at redhat.com Tue Mar 14 23:21:25 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 14 Mar 2006 18:21:25 -0500 Subject: rpms/dlm-kernel/devel dlm-kernel.spec,1.129,1.130 Message-ID: <200603142321.k2ENLPL6000487@cvs.devel.redhat.com> Author: cfeist Update of /cvs/dist/rpms/dlm-kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv440 Modified Files: dlm-kernel.spec Log Message: Removed ARCH=xen for xen builds. Index: dlm-kernel.spec =================================================================== RCS file: /cvs/dist/rpms/dlm-kernel/devel/dlm-kernel.spec,v retrieving revision 1.129 retrieving revision 1.130 diff -u -r1.129 -r1.130 --- dlm-kernel.spec 14 Mar 2006 23:18:45 -0000 1.129 +++ dlm-kernel.spec 14 Mar 2006 23:21:23 -0000 1.130 @@ -11,7 +11,7 @@ ############################################################################### %define buildup 1 %define buildsmp 1 -%define buildxen 0 +%define buildxen 1 %define kernel_version 2.6.15-1.2054_FC5 %define tempversion 2.6.15 %define subversion 0 @@ -26,22 +26,24 @@ Name: dlm-kernel Version: 2.6.15.1 -Release: 0.FC5.12 +Release: 0.FC5.13 License: GPL Group: System Environment/Kernel Summary: dlm-kernel - The Distributed Lock Manager kernel modules. BuildRequires: cman-kernheaders >= 2.6.9 BuildRequires: kernel = %{kernel_version} BuildRequires: kernel-smp = %{kernel_version} +BuildRequires: kernel-xen0 = %{kernel_version} +BuildRequires: kernel-xenU = %{kernel_version} BuildRequires: kernel-devel = %{kernel_version} BuildRequires: kernel-smp-devel = %{kernel_version} -#BuildRequires: kernel-xen0-devel = %{kernel_version} -#BuildRequires: kernel-xenU-devel = %{kernel_version} +BuildRequires: kernel-xen0-devel = %{kernel_version} +BuildRequires: kernel-xenU-devel = %{kernel_version} BuildRequires: cman-kernel >= 2.6.14 BuildRequires: cman-kernel-smp >= 2.6.14 -#BuildRequires: cman-kernel-xen0 >= 2.6.14 -#BuildRequires: cman-kernel-xenU >= 2.6.14 +BuildRequires: cman-kernel-xen0 >= 2.6.14 +BuildRequires: cman-kernel-xenU >= 2.6.14 BuildRequires: cman-kernheaders >= 2.6.14 Conflicts: GFS <= 6.0 Conflicts: GFS-modules GFS-module-smp GFS-module-hugemem @@ -138,10 +140,7 @@ fi ./configure --kernel_src=$kernel_src --incdir=%{_includedir} - if [ "$flavor" == "xenU" -o "$flavor" == "xen0" ]; then - make %{?_smp_mflags} symverfile=/lib/modules/%{kernel_version}$flavor/kernel/cluster/cman.symvers ARCH=xen - else - make %{?_smp_mflags} symverfile=/lib/modules/%{kernel_version}$flavor/kernel/cluster/cman.symvers + make %{?_smp_mflags} symverfile=/lib/modules/%{kernel_version}$flavor/kernel/cluster/cman.symvers fi $kernel_src/scripts/mod/modpost -m -i /lib/modules/%{kernel_version}$flavor/kernel/cluster/cman.symvers src/dlm.o -o dlm.symvers @@ -182,10 +181,10 @@ %if %{buildxen} cd ../xenU -make install DESTDIR=$RPM_BUILD_ROOT symverfile=/lib/modules/%{kernel_version}xenU/kernel/cluster/cman.symvers ARCH=xen +make install DESTDIR=$RPM_BUILD_ROOT symverfile=/lib/modules/%{kernel_version}xenU/kernel/cluster/cman.symvers install dlm.symvers $RPM_BUILD_ROOT/lib/modules/%{kernel_version}xenU/kernel/cluster/ cd ../xen0 -make install DESTDIR=$RPM_BUILD_ROOT symverfile=/lib/modules/%{kernel_version}xen0/kernel/cluster/cman.symvers ARCH=xen +make install DESTDIR=$RPM_BUILD_ROOT symverfile=/lib/modules/%{kernel_version}xen0/kernel/cluster/cman.symvers install dlm.symvers $RPM_BUILD_ROOT/lib/modules/%{kernel_version}xen0/kernel/cluster/ %endif @@ -235,6 +234,9 @@ %{_includedir}/cluster/* %changelog +* Tue Mar 14 2006 Chris Feist +- Removed 'ARCH=xen' for xen builds. + * Tue Feb 07 2006 Jesse Keating - 2.6.15.0-20051219.162641.FC5.9.1 - rebuilt for new gcc4.1 snapshot and glibc changes From fedora-cvs-commits at redhat.com Tue Mar 14 23:22:32 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 14 Mar 2006 18:22:32 -0500 Subject: rpms/GFS-kernel/devel GFS-kernel.spec,1.148,1.149 Message-ID: <200603142322.k2ENMWgC000993@cvs.devel.redhat.com> Author: cfeist Update of /cvs/dist/rpms/GFS-kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv954 Modified Files: GFS-kernel.spec Log Message: Removed ARCH=xen for xen builds. Index: GFS-kernel.spec =================================================================== RCS file: /cvs/dist/rpms/GFS-kernel/devel/GFS-kernel.spec,v retrieving revision 1.148 retrieving revision 1.149 diff -u -r1.148 -r1.149 --- GFS-kernel.spec 14 Mar 2006 23:19:03 -0000 1.148 +++ GFS-kernel.spec 14 Mar 2006 23:22:29 -0000 1.149 @@ -11,7 +11,7 @@ ############################################################################### %define buildup 1 %define buildsmp 1 -%define buildxen 0 +%define buildxen 1 %define kernel_version 2.6.15-1.2054_FC5 %define tempversion 2.6.15 %define subversion 2 @@ -26,23 +26,23 @@ Name: GFS-kernel Version: 2.6.15.1 -Release: 5.FC5.16 +Release: 5.FC5.17 License: GPL Group: System Environment/Kernel Summary: GFS-kernel - The Global File System kernel modules BuildRequires: gulm-devel dlm-devel dlm-kernheaders BuildRequires: kernel = %{kernel_version} BuildRequires: kernel-smp = %{kernel_version} -#BuildRequires: kernel-xen0 = %{kernel_version} -#BuildRequires: kernel-xenU = %{kernel_version} +BuildRequires: kernel-xen0 = %{kernel_version} +BuildRequires: kernel-xenU = %{kernel_version} BuildRequires: kernel-devel = %{kernel_version} BuildRequires: kernel-smp-devel = %{kernel_version} -#BuildRequires: kernel-xen0-devel = %{kernel_version} -#BuildRequires: kernel-xenU-devel = %{kernel_version} +BuildRequires: kernel-xen0-devel = %{kernel_version} +BuildRequires: kernel-xenU-devel = %{kernel_version} BuildRequires: dlm-kernel BuildRequires: dlm-kernel-smp -#BuildRequires: dlm-kernel-xen0 -#BuildRequires: dlm-kernel-xenU +BuildRequires: dlm-kernel-xen0 +BuildRequires: dlm-kernel-xenU BuildRequires: dlm-kernheaders >= 2.6.14 BuildRequires: cman-kernheaders >= 2.6.14 Conflicts: GFS <= 6.0 @@ -143,11 +143,7 @@ fi ./configure --kernel_src=$kernel_src --incdir=%{_includedir} - if [ "$flavor" == "xenU" -o "$flavor" == "xen0" ]; then - make %{?_smp_mflags} DLMSYMVERFILE=/lib/modules/%{kernel_version}$flavor/kernel/cluster/dlm.symvers ARCH=xen - else - make %{?_smp_mflags} DLMSYMVERFILE=/lib/modules/%{kernel_version}$flavor/kernel/cluster/dlm.symvers - fi + make %{?_smp_mflags} DLMSYMVERFILE=/lib/modules/%{kernel_version}$flavor/kernel/cluster/dlm.symvers } @@ -184,9 +180,9 @@ %if %{buildxen} cd ../xenU -make install DESTDIR=$RPM_BUILD_ROOT DLMSYMVERFILE=/lib/modules/%{kernel_version}xenU/kernel/cluster/dlm.symvers ARCH=xen +make install DESTDIR=$RPM_BUILD_ROOT DLMSYMVERFILE=/lib/modules/%{kernel_version}xenU/kernel/cluster/dlm.symvers cd ../xen0 -make install DESTDIR=$RPM_BUILD_ROOT DLMSYMVERFILE=/lib/modules/%{kernel_version}xen0/kernel/cluster/dlm.symvers ARCH=xen +make install DESTDIR=$RPM_BUILD_ROOT DLMSYMVERFILE=/lib/modules/%{kernel_version}xen0/kernel/cluster/dlm.symvers %endif ################################################################################ @@ -251,6 +247,9 @@ %{_includedir}/linux/* %changelog +* Tue Mar 14 2006 Chris Feist +- Removed 'ARCH=xen' for xen builds. + * Tue Feb 07 2006 Jesse Keating - 2.6.15.0-20051219.162641.FC5.10.1 - rebuilt for new gcc4.1 snapshot and glibc changes From fedora-cvs-commits at redhat.com Tue Mar 14 23:23:18 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 14 Mar 2006 18:23:18 -0500 Subject: rpms/cman-kernel/devel cman-kernel.spec,1.160,1.161 Message-ID: <200603142323.k2ENNIPa001386@cvs.devel.redhat.com> Author: cfeist Update of /cvs/dist/rpms/cman-kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv1347 Modified Files: cman-kernel.spec Log Message: Really remove ARCH=xen. Index: cman-kernel.spec =================================================================== RCS file: /cvs/dist/rpms/cman-kernel/devel/cman-kernel.spec,v retrieving revision 1.160 retrieving revision 1.161 diff -u -r1.160 -r1.161 --- cman-kernel.spec 14 Mar 2006 23:19:43 -0000 1.160 +++ cman-kernel.spec 14 Mar 2006 23:23:15 -0000 1.161 @@ -26,7 +26,7 @@ Name: cman-kernel Version: 2.6.15.1 -Release: 0.FC5.15 +Release: 0.FC5.16 License: GPL Group: System Environment/Kernel Summary: cman-kernel - The Cluster Manager kernel modules @@ -127,11 +127,7 @@ fi ./configure --kernel_src=$kernel_src --incdir=%{_includedir} - if [ "$flavor" == "xenU" -o "$flavor" == "xen0" ]; then - make ARCH=xen %{?_smp_mflags} - else - make %{?_smp_mflags} - fi + make %{?_smp_mflags} $kernel_src/scripts/mod/modpost -m -i $kernel_src/Module.symvers src/cman.o -o cman.symvers } @@ -172,10 +168,10 @@ %if %{buildxen} cd ../xenU -make install DESTDIR=$RPM_BUILD_ROOT ARCH=xen +make install DESTDIR=$RPM_BUILD_ROOT install cman.symvers $RPM_BUILD_ROOT/lib/modules/%{kernel_version}xenU/kernel/cluster/ cd ../xen0 -make install DESTDIR=$RPM_BUILD_ROOT ARCH=xen +make install DESTDIR=$RPM_BUILD_ROOT install cman.symvers $RPM_BUILD_ROOT/lib/modules/%{kernel_version}xen0/kernel/cluster/ %endif From fedora-cvs-commits at redhat.com Tue Mar 14 23:24:00 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 14 Mar 2006 18:24:00 -0500 Subject: rpms/dlm-kernel/devel dlm-kernel.spec,1.130,1.131 Message-ID: <200603142324.k2ENO0rD001761@cvs.devel.redhat.com> Author: cfeist Update of /cvs/dist/rpms/dlm-kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv1725 Modified Files: dlm-kernel.spec Log Message: Removed extraneous 'fi' Index: dlm-kernel.spec =================================================================== RCS file: /cvs/dist/rpms/dlm-kernel/devel/dlm-kernel.spec,v retrieving revision 1.130 retrieving revision 1.131 diff -u -r1.130 -r1.131 --- dlm-kernel.spec 14 Mar 2006 23:21:23 -0000 1.130 +++ dlm-kernel.spec 14 Mar 2006 23:23:58 -0000 1.131 @@ -26,7 +26,7 @@ Name: dlm-kernel Version: 2.6.15.1 -Release: 0.FC5.13 +Release: 0.FC5.14 License: GPL Group: System Environment/Kernel Summary: dlm-kernel - The Distributed Lock Manager kernel modules. @@ -141,7 +141,6 @@ ./configure --kernel_src=$kernel_src --incdir=%{_includedir} make %{?_smp_mflags} symverfile=/lib/modules/%{kernel_version}$flavor/kernel/cluster/cman.symvers - fi $kernel_src/scripts/mod/modpost -m -i /lib/modules/%{kernel_version}$flavor/kernel/cluster/cman.symvers src/dlm.o -o dlm.symvers } From fedora-cvs-commits at redhat.com Tue Mar 14 23:44:18 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 14 Mar 2006 18:44:18 -0500 Subject: rpms/bluez-utils/devel bluez-utils.spec,1.37,1.38 Message-ID: <200603142344.k2ENiIn5018083@cvs.devel.redhat.com> Author: dwmw2 Update of /cvs/dist/rpms/bluez-utils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv18042 Modified Files: bluez-utils.spec Log Message: require bluez-pin Index: bluez-utils.spec =================================================================== RCS file: /cvs/dist/rpms/bluez-utils/devel/bluez-utils.spec,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- bluez-utils.spec 7 Mar 2006 16:14:55 -0000 1.37 +++ bluez-utils.spec 14 Mar 2006 23:44:13 -0000 1.38 @@ -1,7 +1,7 @@ Summary: Bluetooth utilities Name: bluez-utils Version: 2.25 -Release: 3 +Release: 4 License: GPL Group: Applications/System Source: http://bluez.sourceforge.net/download/%{name}-%{version}.tar.gz @@ -23,6 +23,7 @@ Obsoletes: bluez-pan, bluez-sdp Requires: initscripts, bluez-libs >= %{version} Requires: dbus >= 0.60 +Requires: bluez-pin Prereq: /sbin/chkconfig, /sbin/service %description @@ -110,6 +111,9 @@ %{_libdir}/cups/backend/bluetooth %changelog +* Wed Mar 14 2006 David Woodhouse - 2.25-4 +- Require bluez-pin, since we're configured to use it by default + * Tue Mar 7 2006 Jeremy Katz - 2.25-3 - more initscript tweaking From fedora-cvs-commits at redhat.com Wed Mar 15 09:46:31 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 15 Mar 2006 04:46:31 -0500 Subject: rpms/system-config-soundcard/devel system-config-soundcard-1.2.17-volume.patch, NONE, 1.1 system-config-soundcard.spec, 1.36, 1.37 Message-ID: <200603150946.k2F9kVQe009024@cvs.devel.redhat.com> Author: stransky Update of /cvs/dist/rpms/system-config-soundcard/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv8776 Modified Files: system-config-soundcard.spec Added Files: system-config-soundcard-1.2.17-volume.patch Log Message: small fix in volume settings, inspired by #184299 system-config-soundcard-1.2.17-volume.patch: soundcardBackend.py | 5 ++++- 1 files changed, 4 insertions(+), 1 deletion(-) --- NEW FILE system-config-soundcard-1.2.17-volume.patch --- --- system-config-soundcard-1.2.17/src/soundcardBackend.py.old 2006-03-15 10:37:56.000000000 +0100 +++ system-config-soundcard-1.2.17/src/soundcardBackend.py 2006-03-15 10:42:48.000000000 +0100 @@ -203,10 +203,13 @@ return device, module, maker, model - def playTestSound(self, module, index): + def playTestSound(self, module, index): if self.aplay_pid != 0: return + # set volume before playing test sound + self.setVolume(index, self.volume) + path = "/usr/share/system-config-soundcard/system-config-soundcard.play" if kernel_type == '2.6': Index: system-config-soundcard.spec =================================================================== RCS file: /cvs/dist/rpms/system-config-soundcard/devel/system-config-soundcard.spec,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- system-config-soundcard.spec 10 Mar 2006 13:18:39 -0000 1.36 +++ system-config-soundcard.spec 15 Mar 2006 09:46:26 -0000 1.37 @@ -1,7 +1,7 @@ Summary: A graphical interface for detecting and configuring soundcards Name: system-config-soundcard Version: 1.2.17 -Release: 3 +Release: 4 URL: http://fedora.redhat.com/projects/config-tools/redhat-config-soundcard.html License: GPL ExclusiveOS: Linux @@ -12,6 +12,7 @@ Patch0: system-config-soundcard-1.2.17-switch.patch Patch1: system-config-soundcard-1.2.17-ok-button.patch Patch2: system-config-soundcard-1.2.17-save.patch +Patch3: system-config-soundcard-1.2.17-volume.patch BuildRequires: desktop-file-utils BuildRequires: gettext ExcludeArch: s390 s390x @@ -34,7 +35,8 @@ %setup -q %patch -p1 %patch1 -p1 -%patch2 -p1 -b .sv +%patch2 -p1 +%patch3 -p1 %build make @@ -90,6 +92,9 @@ %ghost /root/scsound.log %changelog +* Wed Mar 15 2006 Martin Stransky 1.2.17-4 +- small fix in volume settings, inspired by #184299 + * Wed Mar 10 2006 Martin Stransky 1.2.17-3 - fixed kudzu logging and saving settings during firstboot From fedora-cvs-commits at redhat.com Wed Mar 15 12:29:11 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 15 Mar 2006 07:29:11 -0500 Subject: rpms/ekiga/devel ekiga.spec,1.15,1.16 Message-ID: <200603151229.k2FCTB2U008612@cvs.devel.redhat.com> Author: veillard Update of /cvs/dist/rpms/ekiga/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv8428 Modified Files: ekiga.spec Log Message: Try to fix #178929, Daniel Index: ekiga.spec =================================================================== RCS file: /cvs/dist/rpms/ekiga/devel/ekiga.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- ekiga.spec 14 Mar 2006 14:00:59 -0000 1.15 +++ ekiga.spec 15 Mar 2006 12:29:08 -0000 1.16 @@ -1,7 +1,7 @@ Summary: A Gnome based SIP/H323 teleconferencing application Name: ekiga Version: 2.0.1 -Release: 1 +Release: 2 URL: http://www.ekiga.org/ Source0: http://www.ekiga.org/ekiga-%{version}.tar.gz License: GPL @@ -65,6 +65,7 @@ export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/ekiga.schemas > /dev/null 2>&1 gconftool-2 --shutdown +ekiga-config-tool --install-schemas scrollkeeper-update %postun @@ -86,10 +87,13 @@ %{_sysconfdir}/gconf/schemas/ekiga.schemas %changelog -* Tue Mar 14 2006 Daniel Veillard - 2.0.1 +* Wed Mar 15 2006 Daniel Veillard - 2.0.1-2 +- run 'ekiga-config-tool --install-schemas' in %post, c.f. #178929 + +* Tue Mar 14 2006 Daniel Veillard - 2.0.1-1 - last minute bug rerelease 2.0.1 -* Mon Mar 13 2006 Daniel Veillard - 2.0.0 +* Mon Mar 13 2006 Daniel Veillard - 2.0.0-1 - final release of 2.0.0 * Mon Feb 20 2006 Karsten Hopp 1.99.1-2 From fedora-cvs-commits at redhat.com Wed Mar 15 12:44:08 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 15 Mar 2006 07:44:08 -0500 Subject: rpms/ekiga/devel ekiga.spec,1.16,1.17 Message-ID: <200603151244.k2FCi8lE013604@cvs.devel.redhat.com> Author: veillard Update of /cvs/dist/rpms/ekiga/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv13452 Modified Files: ekiga.spec Log Message: cleanup post, Daniel Index: ekiga.spec =================================================================== RCS file: /cvs/dist/rpms/ekiga/devel/ekiga.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- ekiga.spec 15 Mar 2006 12:29:08 -0000 1.16 +++ ekiga.spec 15 Mar 2006 12:44:03 -0000 1.17 @@ -65,7 +65,7 @@ export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/ekiga.schemas > /dev/null 2>&1 gconftool-2 --shutdown -ekiga-config-tool --install-schemas +(yes | ekiga-config-tool --install-schemas) > /dev/null 2>&1 scrollkeeper-update %postun From fedora-cvs-commits at redhat.com Wed Mar 15 14:20:59 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 15 Mar 2006 09:20:59 -0500 Subject: rpms/squid/FC-4 squid-2.5.STABLE12-libbind.patch, NONE, 1.1 .cvsignore, 1.15, 1.16 sources, 1.15, 1.16 squid.spec, 1.37, 1.38 squid-2.5.STABLE11-CACHE_HTTP_PORT.patch, 1.1, NONE squid-2.5.STABLE11-CNAME.patch, 1.1, NONE squid-2.5.STABLE11-IMS-HEAD.patch, 1.1, NONE squid-2.5.STABLE11-delaypools_truncated.patch, 1.1, NONE squid-2.5.STABLE11-httpd_accel-internal.patch, 1.1, NONE squid-2.5.STABLE11-ldap_auth.patch, 1.1, NONE squid-2.5.STABLE11-libbind.patch, 1.1, NONE squid-2.5.STABLE11-redirect-CONNECT.patch, 1.1, NONE squid-2.5.STABLE11-rfc1738_do_escape.patch, 1.1, NONE squid-2.5.STABLE11-setcookie.patch, 1.1, NONE squid-2.5.STABLE11-tcp_outgoing_xxx.patch, 1.1, NONE squid-2.5.STABLE11.accel_single_host_pconn.patch, 1.1, NONE Message-ID: <200603151420.k2FEKxkm001988@cvs.devel.redhat.com> Author: stransky Update of /cvs/dist/rpms/squid/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv1841 Modified Files: .cvsignore sources squid.spec Added Files: squid-2.5.STABLE12-libbind.patch Removed Files: squid-2.5.STABLE11-CACHE_HTTP_PORT.patch squid-2.5.STABLE11-CNAME.patch squid-2.5.STABLE11-IMS-HEAD.patch squid-2.5.STABLE11-delaypools_truncated.patch squid-2.5.STABLE11-httpd_accel-internal.patch squid-2.5.STABLE11-ldap_auth.patch squid-2.5.STABLE11-libbind.patch squid-2.5.STABLE11-redirect-CONNECT.patch squid-2.5.STABLE11-rfc1738_do_escape.patch squid-2.5.STABLE11-setcookie.patch squid-2.5.STABLE11-tcp_outgoing_xxx.patch squid-2.5.STABLE11.accel_single_host_pconn.patch Log Message: new upstream squid-2.5.STABLE12-libbind.patch: configure | 92 +++++++++++++++++++++++++++++++------------------------------- 1 files changed, 46 insertions(+), 46 deletions(-) --- NEW FILE squid-2.5.STABLE12-libbind.patch --- --- squid-2.5.STABLE12/configure.old 2005-10-22 11:56:01.000000000 +0200 +++ squid-2.5.STABLE12/configure 2005-11-09 10:37:51.000000000 +0100 @@ -7089,52 +7089,52 @@ echo "$ac_t""no" 1>&6 fi -echo $ac_n "checking for gethostbyname in -lbind""... $ac_c" 1>&6 -echo "configure:7094: checking for gethostbyname in -lbind" >&5 -ac_lib_var=`echo bind'_'gethostbyname | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - ac_save_LIBS="$LIBS" -LIBS="-lbind $LIBS" -cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" - -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_lib=HAVE_LIB`echo bind | sed -e 's/[^a-zA-Z0-9_]/_/g' \ - -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` - cat >> confdefs.h <&6 -fi +#echo $ac_n "checking for gethostbyname in -lbind""... $ac_c" 1>&6 +#echo "configure:7094: checking for gethostbyname in -lbind" >&5 +#ac_lib_var=`echo bind'_'gethostbyname | sed 'y%./+-%__p_%'` +#if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then +# echo $ac_n "(cached) $ac_c" 1>&6 +#else +# ac_save_LIBS="$LIBS" +#LIBS="-lbind $LIBS" +#cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +# rm -rf conftest* +# eval "ac_cv_lib_$ac_lib_var=yes" +#else +# echo "configure: failed program was:" >&5 +# cat conftest.$ac_ext >&5 +# rm -rf conftest* +# eval "ac_cv_lib_$ac_lib_var=no" +#fi +#rm -f conftest* +#LIBS="$ac_save_LIBS" +# +#fi +#if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then +# echo "$ac_t""yes" 1>&6 +# ac_tr_lib=HAVE_LIB`echo bind | sed -e 's/[^a-zA-Z0-9_]/_/g' \ +# -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` +# cat >> confdefs.h <&6 +#fi if test $ac_cv_lib_bind_gethostbyname = "no" ; then case "$host" in Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/squid/FC-4/.cvsignore,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- .cvsignore 23 Sep 2005 11:54:52 -0000 1.15 +++ .cvsignore 15 Mar 2006 14:20:45 -0000 1.16 @@ -1,2 +1,3 @@ squid-2.5.STABLE9.tar.bz2 squid-2.5.STABLE11.tar.bz2 +squid-2.5.STABLE13.tar.bz2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/squid/FC-4/sources,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- sources 23 Sep 2005 11:54:52 -0000 1.15 +++ sources 15 Mar 2006 14:20:45 -0000 1.16 @@ -1 +1 @@ -5e7f13ad95b64b60ddd6cdc2ab800d67 squid-2.5.STABLE11.tar.bz2 +3e64468e123be1246d17486dab6bee87 squid-2.5.STABLE13.tar.bz2 Index: squid.spec =================================================================== RCS file: /cvs/dist/rpms/squid/FC-4/squid.spec,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- squid.spec 20 Oct 2005 08:44:28 -0000 1.37 +++ squid.spec 15 Mar 2006 14:20:45 -0000 1.38 @@ -4,8 +4,8 @@ Summary: The Squid proxy caching server. Name: squid -Version: 2.5.STABLE11 -Release: 3.FC4 +Version: 2.5.STABLE13 +Release: 1.FC4 Epoch: 7 License: GPL Group: System Environment/Daemons @@ -18,18 +18,6 @@ Source98: perl-requires-squid.sh ## Source99: filter-requires-squid.sh -Patch100: squid-2.5.STABLE11-delaypools_truncated.patch -Patch101: squid-2.5.STABLE11-tcp_outgoing_xxx.patch -Patch102: squid-2.5.STABLE11-ldap_auth.patch -Patch103: squid-2.5.STABLE11.accel_single_host_pconn.patch -Patch104: squid-2.5.STABLE11-CACHE_HTTP_PORT.patch -Patch105: squid-2.5.STABLE11-CNAME.patch -Patch106: squid-2.5.STABLE11-httpd_accel-internal.patch -Patch107: squid-2.5.STABLE11-IMS-HEAD.patch -Patch108: squid-2.5.STABLE11-redirect-CONNECT.patch -Patch109: squid-2.5.STABLE11-setcookie.patch -Patch110: squid-2.5.STABLE11-rfc1738_do_escape.patch - # Local patches # Applying upstream patches first makes it less likely that local patches # will break upstream ones. @@ -38,7 +26,7 @@ Patch203: squid-2.5.STABLE7-build.patch Patch204: squid-2.5.STABLE4-perlpath.patch Patch205: squid-2.5.STABLE5-pipe.patch -Patch206: squid-2.5.STABLE11-libbind.patch +Patch206: squid-2.5.STABLE12-libbind.patch BuildRoot: %{_tmppath}/%{name}-%{version}-root Prereq: /sbin/chkconfig logrotate shadow-utils @@ -61,18 +49,6 @@ %prep %setup -q -%patch100 -p1 -%patch101 -p1 -%patch102 -p1 -%patch103 -p1 -%patch104 -p1 -%patch105 -p1 -%patch106 -p1 -%patch107 -p1 -%patch108 -p1 -%patch109 -p1 -%patch110 -p1 - %patch201 -p1 -b .config %patch202 -p1 -b .location %patch203 -p1 -b .build @@ -302,6 +278,9 @@ chgrp squid /var/cache/samba/winbindd_privileged > /dev/null 2>& 1 || true %changelog +* Wed Mar 15 2006 Martin Stransky 7:2.5.STABLE13-1.FC4 +- new upstream + * Thu Oct 20 2005 Martin Stransky 7:2.5.STABLE11-3.FC4 - fix for #171213 - CVE-2005-3258 Squid crash due to malformed FTP response - more fixes from upstream --- squid-2.5.STABLE11-CACHE_HTTP_PORT.patch DELETED --- --- squid-2.5.STABLE11-CNAME.patch DELETED --- --- squid-2.5.STABLE11-IMS-HEAD.patch DELETED --- --- squid-2.5.STABLE11-delaypools_truncated.patch DELETED --- --- squid-2.5.STABLE11-httpd_accel-internal.patch DELETED --- --- squid-2.5.STABLE11-ldap_auth.patch DELETED --- --- squid-2.5.STABLE11-libbind.patch DELETED --- --- squid-2.5.STABLE11-redirect-CONNECT.patch DELETED --- --- squid-2.5.STABLE11-rfc1738_do_escape.patch DELETED --- --- squid-2.5.STABLE11-setcookie.patch DELETED --- --- squid-2.5.STABLE11-tcp_outgoing_xxx.patch DELETED --- --- squid-2.5.STABLE11.accel_single_host_pconn.patch DELETED --- From fedora-cvs-commits at redhat.com Wed Mar 15 14:24:51 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 15 Mar 2006 09:24:51 -0500 Subject: rpms/squid/FC-3 squid-2.5.STABLE12-libbind.patch, NONE, 1.1 .cvsignore, 1.12, 1.13 sources, 1.15, 1.16 squid.spec, 1.36, 1.37 squid-2.5.STABLE11-CACHE_HTTP_PORT.patch, 1.1, NONE squid-2.5.STABLE11-CNAME.patch, 1.1, NONE squid-2.5.STABLE11-IMS-HEAD.patch, 1.1, NONE squid-2.5.STABLE11-delaypools_truncated.patch, 1.1, NONE squid-2.5.STABLE11-httpd_accel-internal.patch, 1.1, NONE squid-2.5.STABLE11-ldap_auth.patch, 1.1, NONE squid-2.5.STABLE11-libbind.patch, 1.1, NONE squid-2.5.STABLE11-redirect-CONNECT.patch, 1.1, NONE squid-2.5.STABLE11-rfc1738_do_escape.patch, 1.1, NONE squid-2.5.STABLE11-setcookie.patch, 1.1, NONE squid-2.5.STABLE11-tcp_outgoing_xxx.patch, 1.1, NONE squid-2.5.STABLE11.accel_single_host_pconn.patch, 1.1, NONE Message-ID: <200603151424.k2FEOpJe011612@cvs.devel.redhat.com> Author: stransky Update of /cvs/dist/rpms/squid/FC-3 In directory cvs.devel.redhat.com:/tmp/cvs-serv11562 Modified Files: .cvsignore sources squid.spec Added Files: squid-2.5.STABLE12-libbind.patch Removed Files: squid-2.5.STABLE11-CACHE_HTTP_PORT.patch squid-2.5.STABLE11-CNAME.patch squid-2.5.STABLE11-IMS-HEAD.patch squid-2.5.STABLE11-delaypools_truncated.patch squid-2.5.STABLE11-httpd_accel-internal.patch squid-2.5.STABLE11-ldap_auth.patch squid-2.5.STABLE11-libbind.patch squid-2.5.STABLE11-redirect-CONNECT.patch squid-2.5.STABLE11-rfc1738_do_escape.patch squid-2.5.STABLE11-setcookie.patch squid-2.5.STABLE11-tcp_outgoing_xxx.patch squid-2.5.STABLE11.accel_single_host_pconn.patch Log Message: new upstream squid-2.5.STABLE12-libbind.patch: configure | 92 +++++++++++++++++++++++++++++++------------------------------- 1 files changed, 46 insertions(+), 46 deletions(-) --- NEW FILE squid-2.5.STABLE12-libbind.patch --- --- squid-2.5.STABLE12/configure.old 2005-10-22 11:56:01.000000000 +0200 +++ squid-2.5.STABLE12/configure 2005-11-09 10:37:51.000000000 +0100 @@ -7089,52 +7089,52 @@ echo "$ac_t""no" 1>&6 fi -echo $ac_n "checking for gethostbyname in -lbind""... $ac_c" 1>&6 -echo "configure:7094: checking for gethostbyname in -lbind" >&5 -ac_lib_var=`echo bind'_'gethostbyname | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - ac_save_LIBS="$LIBS" -LIBS="-lbind $LIBS" -cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" - -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_lib=HAVE_LIB`echo bind | sed -e 's/[^a-zA-Z0-9_]/_/g' \ - -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` - cat >> confdefs.h <&6 -fi +#echo $ac_n "checking for gethostbyname in -lbind""... $ac_c" 1>&6 +#echo "configure:7094: checking for gethostbyname in -lbind" >&5 +#ac_lib_var=`echo bind'_'gethostbyname | sed 'y%./+-%__p_%'` +#if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then +# echo $ac_n "(cached) $ac_c" 1>&6 +#else +# ac_save_LIBS="$LIBS" +#LIBS="-lbind $LIBS" +#cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +# rm -rf conftest* +# eval "ac_cv_lib_$ac_lib_var=yes" +#else +# echo "configure: failed program was:" >&5 +# cat conftest.$ac_ext >&5 +# rm -rf conftest* +# eval "ac_cv_lib_$ac_lib_var=no" +#fi +#rm -f conftest* +#LIBS="$ac_save_LIBS" +# +#fi +#if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then +# echo "$ac_t""yes" 1>&6 +# ac_tr_lib=HAVE_LIB`echo bind | sed -e 's/[^a-zA-Z0-9_]/_/g' \ +# -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` +# cat >> confdefs.h <&6 +#fi if test $ac_cv_lib_bind_gethostbyname = "no" ; then case "$host" in Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/squid/FC-3/.cvsignore,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- .cvsignore 23 Sep 2005 12:14:45 -0000 1.12 +++ .cvsignore 15 Mar 2006 14:24:48 -0000 1.13 @@ -1,3 +1,4 @@ squid-2.5.STABLE5.tar.bz2 squid-2.5.STABLE6.tar.bz2 squid-2.5.STABLE11.tar.bz2 +squid-2.5.STABLE13.tar.bz2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/squid/FC-3/sources,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- sources 23 Sep 2005 12:14:45 -0000 1.15 +++ sources 15 Mar 2006 14:24:48 -0000 1.16 @@ -1 +1 @@ -5e7f13ad95b64b60ddd6cdc2ab800d67 squid-2.5.STABLE11.tar.bz2 +3e64468e123be1246d17486dab6bee87 squid-2.5.STABLE13.tar.bz2 Index: squid.spec =================================================================== RCS file: /cvs/dist/rpms/squid/FC-3/squid.spec,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- squid.spec 20 Oct 2005 08:55:44 -0000 1.36 +++ squid.spec 15 Mar 2006 14:24:48 -0000 1.37 @@ -4,8 +4,8 @@ Summary: The Squid proxy caching server. Name: squid -Version: 2.5.STABLE11 -Release: 3.FC3 +Version: 2.5.STABLE13 +Release: 1.FC3 Epoch: 7 License: GPL Group: System Environment/Daemons @@ -18,17 +18,6 @@ Source98: perl-requires-squid.sh # Upstream patches -Patch100: squid-2.5.STABLE11-delaypools_truncated.patch -Patch101: squid-2.5.STABLE11-tcp_outgoing_xxx.patch -Patch102: squid-2.5.STABLE11-ldap_auth.patch -Patch103: squid-2.5.STABLE11.accel_single_host_pconn.patch -Patch104: squid-2.5.STABLE11-CACHE_HTTP_PORT.patch -Patch105: squid-2.5.STABLE11-CNAME.patch -Patch106: squid-2.5.STABLE11-httpd_accel-internal.patch -Patch107: squid-2.5.STABLE11-IMS-HEAD.patch -Patch108: squid-2.5.STABLE11-redirect-CONNECT.patch -Patch109: squid-2.5.STABLE11-setcookie.patch -Patch110: squid-2.5.STABLE11-rfc1738_do_escape.patch # Local patches # Putting upstream patches first lowers the chances that we'll need to modify @@ -38,7 +27,7 @@ Patch203: squid-2.5.STABLE7-build.patch Patch204: squid-2.5.STABLE4-perlpath.patch Patch205: squid-2.5.STABLE5-pipe.patch -Patch206: squid-2.5.STABLE11-libbind.patch +Patch206: squid-2.5.STABLE12-libbind.patch BuildRoot: %{_tmppath}/%{name}-%{version}-root Prereq: /sbin/chkconfig logrotate shadow-utils @@ -61,18 +50,6 @@ %prep %setup -q -%patch100 -p1 -%patch101 -p1 -%patch102 -p1 -%patch103 -p1 -%patch104 -p1 -%patch105 -p1 -%patch106 -p1 -%patch107 -p1 -%patch108 -p1 -%patch109 -p1 -%patch110 -p1 - %patch201 -p1 -b .config %patch202 -p1 -b .location %patch203 -p1 -b .build @@ -303,6 +280,9 @@ chgrp squid /var/cache/samba/winbindd_privileged > /dev/null 2>& 1 || true %changelog +* Wed Mar 15 2006 Martin Stransky 7:2.5.STABLE13-1.FC3 +- new upstream + * Thu Oct 20 2005 Martin Stransky 7:2.5.STABLE11-3.FC3 - fix for #171213 - CVE-2005-3258 Squid crash due to malformed FTP response - more fixes from upstream --- squid-2.5.STABLE11-CACHE_HTTP_PORT.patch DELETED --- --- squid-2.5.STABLE11-CNAME.patch DELETED --- --- squid-2.5.STABLE11-IMS-HEAD.patch DELETED --- --- squid-2.5.STABLE11-delaypools_truncated.patch DELETED --- --- squid-2.5.STABLE11-httpd_accel-internal.patch DELETED --- --- squid-2.5.STABLE11-ldap_auth.patch DELETED --- --- squid-2.5.STABLE11-libbind.patch DELETED --- --- squid-2.5.STABLE11-redirect-CONNECT.patch DELETED --- --- squid-2.5.STABLE11-rfc1738_do_escape.patch DELETED --- --- squid-2.5.STABLE11-setcookie.patch DELETED --- --- squid-2.5.STABLE11-tcp_outgoing_xxx.patch DELETED --- --- squid-2.5.STABLE11.accel_single_host_pconn.patch DELETED --- From fedora-cvs-commits at redhat.com Wed Mar 15 16:14:19 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 15 Mar 2006 11:14:19 -0500 Subject: rpms/libgtk-java/devel libgtk-java-glib-timer-gc.patch,NONE,1.1 Message-ID: <200603151614.k2FGEJCM001935@cvs.devel.redhat.com> Author: pmuldoon Update of /cvs/dist/rpms/libgtk-java/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv1409 Added Files: libgtk-java-glib-timer-gc.patch Log Message: 2006-03-15 Phil Muldoon * libgtk-java-glib-timer-gc.patch: Added. libgtk-java-glib-timer-gc.patch: org_gnu_glib_Timer.c | 13 ++++++++++--- 1 files changed, 10 insertions(+), 3 deletions(-) --- NEW FILE libgtk-java-glib-timer-gc.patch --- --- libgtk-java-2.8.3.0.20060301.rh1/src/jni/org_gnu_glib_Timer.c.orig 2006-03-15 11:03:15.000000000 -0500 +++ libgtk-java-2.8.3.0.20060301.rh1/src/jni/org_gnu_glib_Timer.c 2006-03-15 11:07:15.000000000 -0500 @@ -22,10 +22,17 @@ // reset handle field jclass cls = (*env)->GetObjectClass(env, obj); jfieldID fid = (*env)->GetFieldID(env, cls, "handle", "I"); - (*env)->SetIntField(env, obj, fid, (jint)-1); - // delete back pointer - (*env)->DeleteGlobalRef(env, obj); + jint handleValue = (*env)->GetIntField(env, obj, fid); + + //check of the pointer has already been freed + if(handleValue != -1){ + (*env)->SetIntField(env, obj, fid, (jint)-1); + + // delete back pointer + (*env)->DeleteGlobalRef(env, obj); + } + } static gboolean fire_method_invoker(gpointer data) From fedora-cvs-commits at redhat.com Wed Mar 15 16:15:40 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 15 Mar 2006 11:15:40 -0500 Subject: rpms/libgtk-java/devel libgtk-java.spec,1.45,1.46 Message-ID: <200603151615.k2FGFet8002979@cvs.devel.redhat.com> Author: pmuldoon Update of /cvs/dist/rpms/libgtk-java/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv2202 Modified Files: libgtk-java.spec Log Message: 2005-03-15 Phil Muldoon * libgtk-java.spec: Added patch for http://sourceware.org/bugzilla/show_bug.cgi?id=2333 Index: libgtk-java.spec =================================================================== RCS file: /cvs/dist/rpms/libgtk-java/devel/libgtk-java.spec,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- libgtk-java.spec 14 Mar 2006 22:13:53 -0000 1.45 +++ libgtk-java.spec 15 Mar 2006 16:15:37 -0000 1.46 @@ -13,7 +13,7 @@ %define name_base libgtk-java %define version 2.8.3.0.20060301.rh1 -%define release 1 +%define release 2 Summary: Java bindings for GTK+ @@ -37,6 +37,8 @@ # patch that fixes occaision NPE in GdkCairo Patch0: GdkCairoFix.patch +# fixes: http://sourceware.org/bugzilla/show_bug.cgi?id=2333 +Patch10: libgtk-java-glib-timer-gc.patch ExcludeArch: s390x @@ -57,6 +59,7 @@ %setup -q -n %{name_base}-%{version} %patch0 +%patch10 %build # if either the C or Java packages has a prefix declared, then we will @@ -102,7 +105,7 @@ %post /sbin/ldconfig - +libgtk-java-glib-timer-gc.patch %postun /sbin/ldconfig @@ -127,6 +130,9 @@ %changelog +* Wed Mar 15 2006 Phil Muldoon - 2.8.3.020060301.rh1-2 +- Added libgtk-java-glib-timer-gc.patch to fix double free on Timer GC + * Tue Mar 14 2006 Adam Jocksch - 2.8.3.0.20060301.rh1-1 - Added GdkCairoFix.patch to address bug in GdkCairo class. From fedora-cvs-commits at redhat.com Wed Mar 15 16:23:58 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 15 Mar 2006 11:23:58 -0500 Subject: rpms/cpio/devel cpio-2.6-lfs.patch, 1.2, 1.3 cpio-2.6-warnings.patch, 1.1, 1.2 cpio-2.6-writeOutHeaderBufferOverflow.patch, 1.2, 1.3 cpio.spec, 1.35, 1.36 cpio-2.6-largeFileGrew.patch, 1.1, NONE cpio-2.6-toAsciiError.patch, 1.1, NONE Message-ID: <200603151623.k2FGNwWF019899@cvs.devel.redhat.com> Author: pvrabec Update of /cvs/dist/rpms/cpio/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv19750 Modified Files: cpio-2.6-lfs.patch cpio-2.6-warnings.patch cpio-2.6-writeOutHeaderBufferOverflow.patch cpio.spec Removed Files: cpio-2.6-largeFileGrew.patch cpio-2.6-toAsciiError.patch Log Message: - merge toAsciiError.patch with writeOutHeaderBufferOverflow.patch - merge largeFileGrew.patch with lfs.patch - fix large file support, cpio is able to store files<8GB in 'old ascii' format (-H odc option) - adjust warnings.patch cpio-2.6-lfs.patch: copyin.c | 6 +++--- cpiohdr.h | 6 +++--- extern.h | 14 +++++++------- util.c | 60 ++++++++++++++++++++++++++++++------------------------------ 4 files changed, 43 insertions(+), 43 deletions(-) Index: cpio-2.6-lfs.patch =================================================================== RCS file: /cvs/dist/rpms/cpio/devel/cpio-2.6-lfs.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- cpio-2.6-lfs.patch 1 Jul 2005 14:37:24 -0000 1.2 +++ cpio-2.6-lfs.patch 15 Mar 2006 16:23:55 -0000 1.3 @@ -1,127 +1,163 @@ ---- cpio-2.6/src/copyin.c.lfs 2005-07-01 13:48:05.000000000 +0200 -+++ cpio-2.6/src/copyin.c 2005-07-01 13:48:18.000000000 +0200 +--- cpio-2.6/src/copyin.c.lfs 2006-03-15 16:30:48.000000000 -0500 ++++ cpio-2.6/src/copyin.c 2006-03-15 16:35:33.000000000 -0500 @@ -106,7 +106,7 @@ header type. */ static void -tape_skip_padding (int in_file_des, int offset) -+tape_skip_padding (int in_file_des, unsigned long offset) ++tape_skip_padding (int in_file_des, off_t offset) { int pad; ---- cpio-2.6/src/extern.h.lfs 2004-09-08 12:49:57.000000000 +0200 -+++ cpio-2.6/src/extern.h 2005-07-01 13:47:20.000000000 +0200 -@@ -161,13 +161,13 @@ +@@ -911,7 +911,7 @@ + printf ("%3u, %3u ", file_hdr->c_rdev_maj, + file_hdr->c_rdev_min); + else +- printf ("%8lu ", file_hdr->c_filesize); ++ printf ("%8llu ", file_hdr->c_filesize); + + printf ("%s ", tbuf + 4); + +@@ -1153,7 +1153,7 @@ + tape_buffered_read (ascii_header, in_des, 70L); + ascii_header[70] = '\0'; + sscanf (ascii_header, +- "%6lo%6lo%6lo%6lo%6lo%6lo%6lo%11lo%6lo%11lo", ++ "%6lo%6lo%6lo%6lo%6lo%6lo%6lo%11lo%6lo%11llo", + &dev, &file_hdr->c_ino, + &file_hdr->c_mode, &file_hdr->c_uid, &file_hdr->c_gid, + &file_hdr->c_nlink, &rdev, &file_hdr->c_mtime, +--- cpio-2.6/src/extern.h.lfs 2004-09-08 06:49:57.000000000 -0400 ++++ cpio-2.6/src/extern.h 2006-03-15 16:28:46.000000000 -0500 +@@ -161,14 +161,14 @@ void tape_empty_output_buffer P_((int out_des)); void disk_empty_output_buffer P_((int out_des)); void swahw_array P_((char *ptr, int count)); -void tape_buffered_write P_((char *in_buf, int out_des, long num_bytes)); -+void tape_buffered_write P_((char *in_buf, int out_des, unsigned long num_bytes)); - void tape_buffered_read P_((char *in_buf, int in_des, long num_bytes)); +-void tape_buffered_read P_((char *in_buf, int in_des, long num_bytes)); ++void tape_buffered_write P_((char *in_buf, int out_des, off_t num_bytes)); ++void tape_buffered_read P_((char *in_buf, int in_des, off_t num_bytes)); int tape_buffered_peek P_((char *peek_buf, int in_des, int num_bytes)); -void tape_toss_input P_((int in_des, long num_bytes)); -void copy_files_tape_to_disk P_((int in_des, int out_des, long num_bytes)); -void copy_files_disk_to_tape P_((int in_des, int out_des, long num_bytes, char *filename)); -void copy_files_disk_to_disk P_((int in_des, int out_des, long num_bytes, char *filename)); -+void tape_toss_input P_((int in_des, unsigned long num_bytes)); -+void copy_files_tape_to_disk P_((int in_des, int out_des, unsigned long num_bytes)); -+void copy_files_disk_to_tape P_((int in_des, int out_des, unsigned long num_bytes, char *filename)); -+void copy_files_disk_to_disk P_((int in_des, int out_des, unsigned long num_bytes, char *filename)); - void warn_if_file_changed P_((char *file_name, unsigned long old_file_size, +-void warn_if_file_changed P_((char *file_name, unsigned long old_file_size, ++void tape_toss_input P_((int in_des, off_t num_bytes)); ++void copy_files_tape_to_disk P_((int in_des, int out_des, off_t num_bytes)); ++void copy_files_disk_to_tape P_((int in_des, int out_des, off_t num_bytes, char *filename)); ++void copy_files_disk_to_disk P_((int in_des, int out_des, off_t num_bytes, char *filename)); ++void warn_if_file_changed P_((char *file_name, off_t old_file_size, unsigned long old_file_mtime)); void create_all_directories P_((char *name)); ---- cpio-2.6/src/util.c.lfs 2004-09-08 12:44:49.000000000 +0200 -+++ cpio-2.6/src/util.c 2005-07-01 13:56:49.000000000 +0200 + void prepare_append P_((int out_file_des)); +--- cpio-2.6/src/util.c.lfs 2004-09-08 06:44:49.000000000 -0400 ++++ cpio-2.6/src/util.c 2006-03-15 16:29:20.000000000 -0500 @@ -207,7 +207,7 @@ Exit with an error if end of file is reached. */ static int -disk_fill_input_buffer (int in_des, int num_bytes) -+disk_fill_input_buffer (int in_des, unsigned long num_bytes) ++disk_fill_input_buffer (int in_des, off_t num_bytes) { in_buff = input_buffer; num_bytes = (num_bytes < DISK_IO_BLOCK_SIZE) ? num_bytes : DISK_IO_BLOCK_SIZE; -@@ -227,9 +227,9 @@ +@@ -227,10 +227,10 @@ When `out_buff' fills up, flush it to file descriptor OUT_DES. */ void -tape_buffered_write (char *in_buf, int out_des, long num_bytes) -+tape_buffered_write (char *in_buf, int out_des, unsigned long num_bytes) ++tape_buffered_write (char *in_buf, int out_des, off_t num_bytes) { - register long bytes_left = num_bytes; /* Bytes needing to be copied. */ -+ register unsigned long bytes_left = num_bytes; /* Bytes needing to be copied. */ - register long space_left; /* Room left in output buffer. */ +- register long space_left; /* Room left in output buffer. */ ++ off_t bytes_left = num_bytes; /* Bytes needing to be copied. */ ++ off_t space_left; /* Room left in output buffer. */ while (bytes_left > 0) -@@ -254,9 +254,9 @@ + { +@@ -254,10 +254,10 @@ When `out_buff' fills up, flush it to file descriptor OUT_DES. */ void -disk_buffered_write (char *in_buf, int out_des, long num_bytes) -+disk_buffered_write (char *in_buf, int out_des, unsigned long num_bytes) ++disk_buffered_write (char *in_buf, int out_des, off_t num_bytes) + { +- register long bytes_left = num_bytes; /* Bytes needing to be copied. */ +- register long space_left; /* Room left in output buffer. */ ++ off_t bytes_left = num_bytes; /* Bytes needing to be copied. */ ++ off_t space_left; /* Room left in output buffer. */ + + while (bytes_left > 0) + { +@@ -282,10 +282,10 @@ + When `in_buff' is exhausted, refill it from file descriptor IN_DES. */ + + void +-tape_buffered_read (char *in_buf, int in_des, long num_bytes) ++tape_buffered_read (char *in_buf, int in_des, off_t num_bytes) { - register long bytes_left = num_bytes; /* Bytes needing to be copied. */ -+ register unsigned long bytes_left = num_bytes; /* Bytes needing to be copied. */ - register long space_left; /* Room left in output buffer. */ +- register long space_left; /* Bytes to copy from input buffer. */ ++ off_t bytes_left = num_bytes; /* Bytes needing to be copied. */ ++ off_t space_left; /* Bytes to copy from input buffer. */ while (bytes_left > 0) -@@ -376,9 +376,9 @@ + { +@@ -376,10 +376,10 @@ /* Skip the next NUM_BYTES bytes of file descriptor IN_DES. */ void -tape_toss_input (int in_des, long num_bytes) -+tape_toss_input (int in_des, unsigned long num_bytes) ++tape_toss_input (int in_des, off_t num_bytes) { - register long bytes_left = num_bytes; /* Bytes needing to be copied. */ -+ register unsigned long bytes_left = num_bytes; /* Bytes needing to be copied. */ - register long space_left; /* Bytes to copy from input buffer. */ +- register long space_left; /* Bytes to copy from input buffer. */ ++ off_t bytes_left = num_bytes; /* Bytes needing to be copied. */ ++ off_t space_left; /* Bytes to copy from input buffer. */ while (bytes_left > 0) + { @@ -404,12 +404,12 @@ } static void -write_nuls_to_file (long num_bytes, int out_des, -+write_nuls_to_file (unsigned long num_bytes, int out_des, - void (*writer) (char *in_buf, int out_des, long num_bytes)) +- void (*writer) (char *in_buf, int out_des, long num_bytes)) ++write_nuls_to_file (off_t num_bytes, int out_des, ++ void (*writer) (char *in_buf, int out_des, off_t num_bytes)) { - long blocks; -+ unsigned long blocks; - long extra_bytes; +- long extra_bytes; - long i; -+ unsigned long i; ++ off_t blocks; ++ off_t extra_bytes; ++ off_t i; blocks = num_bytes / 512; extra_bytes = num_bytes % 512; -@@ -428,10 +428,10 @@ +@@ -428,7 +428,7 @@ NUM_BYTES is the number of bytes to copy. */ void -copy_files_tape_to_disk (int in_des, int out_des, long num_bytes) -+copy_files_tape_to_disk (int in_des, int out_des, unsigned long num_bytes) ++copy_files_tape_to_disk (int in_des, int out_des, off_t num_bytes) { -- long size; -- long k; -+ unsigned long size; -+ unsigned long k; - - while (num_bytes > 0) - { + long size; + long k; @@ -458,13 +458,13 @@ NUM_BYTES is the number of bytes to copy. */ void -copy_files_disk_to_tape (int in_des, int out_des, long num_bytes, -+copy_files_disk_to_tape (int in_des, int out_des, unsigned long num_bytes, ++copy_files_disk_to_tape (int in_des, int out_des, off_t num_bytes, char *filename) { -- long size; -- long k; -+ unsigned long size; -+ unsigned long k; + long size; + long k; int rc; - long original_num_bytes; -+ unsigned long original_num_bytes; ++ off_t original_num_bytes; original_num_bytes = num_bytes; @@ -143,15 +179,13 @@ void -copy_files_disk_to_disk (int in_des, int out_des, long num_bytes, -+copy_files_disk_to_disk (int in_des, int out_des, unsigned long num_bytes, ++copy_files_disk_to_disk (int in_des, int out_des, off_t num_bytes, char *filename) { -- long size; -- long k; + long size; + long k; - long original_num_bytes; -+ unsigned long size; -+ unsigned long k; -+ unsigned long original_num_bytes; ++ off_t original_num_bytes; int rc; original_num_bytes = num_bytes; @@ -168,3 +202,45 @@ original_num_bytes - num_bytes, filename); write_nuls_to_file (num_bytes, out_des, disk_buffered_write); break; +@@ -544,7 +544,7 @@ + /* Warn if file changed while it was being copied. */ + + void +-warn_if_file_changed (char *file_name, unsigned long old_file_size, ++warn_if_file_changed (char *file_name, off_t old_file_size, + unsigned long old_file_mtime) + { + struct stat new_file_stat; +@@ -696,8 +696,8 @@ + temp = (temp + 1) % hash_size) + { + if (hash_table[temp]->inode == node_num +- && hash_table[start]->major_num == major_num +- && hash_table[start]->minor_num == minor_num) ++ && hash_table[temp]->major_num == major_num ++ && hash_table[temp]->minor_num == minor_num) + return hash_table[temp]->file_name; + } + } +--- cpio-2.6/src/cpiohdr.h.lfs 2003-11-21 09:48:13.000000000 -0500 ++++ cpio-2.6/src/cpiohdr.h 2006-03-15 16:27:30.000000000 -0500 +@@ -34,8 +34,8 @@ + unsigned short c_mtimes[2]; + unsigned short c_namesize; + unsigned short c_filesizes[2]; +- unsigned long c_mtime; /* Long-aligned copy of `c_mtimes'. */ +- unsigned long c_filesize; /* Long-aligned copy of `c_filesizes'. */ ++ unsigned int c_mtime; /* aligned copy of `c_mtimes'. */ ++ unsigned int c_filesize; /* aligned copy of `c_filesizes'. */ + char *c_name; + }; + +@@ -76,7 +76,7 @@ + unsigned long c_gid; + unsigned long c_nlink; + unsigned long c_mtime; +- unsigned long c_filesize; ++ off_t c_filesize; + long c_dev_maj; + long c_dev_min; + long c_rdev_maj; cpio-2.6-warnings.patch: copyin.c | 19 +++++++++---------- copyout.c | 2 +- tar.c | 1 - util.c | 14 +++++++++----- 4 files changed, 19 insertions(+), 17 deletions(-) Index: cpio-2.6-warnings.patch =================================================================== RCS file: /cvs/dist/rpms/cpio/devel/cpio-2.6-warnings.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- cpio-2.6-warnings.patch 17 May 2005 12:13:59 -0000 1.1 +++ cpio-2.6-warnings.patch 15 Mar 2006 16:23:55 -0000 1.2 @@ -1,21 +1,3 @@ -2005-05-04 Dmitry V. Levin - - Deal with compilation warnings generated by gcc compiler. - - * src/copyin.c (list_file, copyin_regular_file, long_format, - process_copy_in): Fix format strings. - (create_defered_links_to_skipped): Remove unused variable - `link_res'. - (process_copy_in): Initialize tty_in, tty_out and rename_in. - * src/copyout.c (write_out_header): Initialize dev along with - rdev. - * src/tar.c (is_tar_filename_too_long): Remove unused variable `p'; - * src/util.c: Include and - (sparse_write): Add forward declaration. Initialize write_count - and cur_write_start variables. - (copy_files_disk_to_tape, copy_files_disk_to_disk): Add - parentheses around assignment. - diff -uprk.orig cpio-2.6.orig/src/copyin.c cpio-2.6/src/copyin.c --- cpio-2.6.orig/src/copyin.c 2004-09-08 11:10:02 +0000 +++ cpio-2.6/src/copyin.c 2005-05-04 12:43:42 +0000 @@ -24,7 +6,7 @@ if (crc != file_hdr->c_chksum) { - error (0, 0, _("%s: checksum error (0x%x, should be 0x%x)"), -+ error (0, 0, _("%s: checksum error (0x%lx, should be 0x%lx)"), ++ error (0, 0, _("%s: checksum error (0x%x, should be 0x%lx)"), file_hdr->c_name, crc, file_hdr->c_chksum); } } @@ -41,7 +23,7 @@ { if (crc != file_hdr->c_chksum) - error (0, 0, _("%s: checksum error (0x%x, should be 0x%x)"), -+ error (0, 0, _("%s: checksum error (0x%lx, should be 0x%lx)"), ++ error (0, 0, _("%s: checksum error (0x%x, should be 0x%lx)"), file_hdr->c_name, crc, file_hdr->c_chksum); } tape_skip_padding (in_file_des, file_hdr->c_filesize); @@ -50,7 +32,7 @@ { if (crc != file_hdr->c_chksum) - error (0, 0, _("%s: checksum error (0x%x, should be 0x%x)"), -+ error (0, 0, _("%s: checksum error (0x%lx, should be 0x%lx)"), ++ error (0, 0, _("%s: checksum error (0x%x, should be 0x%lx)"), file_hdr->c_name, crc, file_hdr->c_chksum); } @@ -90,7 +72,7 @@ if (crc != file_hdr.c_chksum) { - error (0, 0, _("%s: checksum error (0x%x, should be 0x%x)"), -+ error (0, 0, _("%s: checksum error (0x%lx, should be 0x%lx)"), ++ error (0, 0, _("%s: checksum error (0x%x, should be 0x%lx)"), file_hdr.c_name, crc, file_hdr.c_chksum); } /* Debian hack: -v and -V now work with --only-verify-crc. cpio-2.6-writeOutHeaderBufferOverflow.patch: copyout.c | 448 ++++++++++++++++++++++++++++++++++++++++++-------------------- extern.h | 2 2 files changed, 305 insertions(+), 145 deletions(-) Index: cpio-2.6-writeOutHeaderBufferOverflow.patch =================================================================== RCS file: /cvs/dist/rpms/cpio/devel/cpio-2.6-writeOutHeaderBufferOverflow.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- cpio-2.6-writeOutHeaderBufferOverflow.patch 24 Nov 2005 12:36:50 -0000 1.2 +++ cpio-2.6-writeOutHeaderBufferOverflow.patch 15 Mar 2006 16:23:55 -0000 1.3 @@ -55,7 +55,7 @@ +static void +field_width_error (const char *filename, const char *fieldname) +{ -+ error (0, 0, _("%s: field width not sufficient for storing %s"), ++ error (1, 0, _("%s: field width not sufficient for storing %s"), + filename, fieldname); +} + Index: cpio.spec =================================================================== RCS file: /cvs/dist/rpms/cpio/devel/cpio.spec,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- cpio.spec 14 Mar 2006 14:31:54 -0000 1.35 +++ cpio.spec 15 Mar 2006 16:23:55 -0000 1.36 @@ -6,7 +6,7 @@ Summary: A GNU archiving program. Name: cpio Version: 2.6 -Release: 12 +Release: 13 License: GPL Group: Applications/Archiving URL: http://www.gnu.org/software/cpio/ @@ -21,8 +21,6 @@ Patch20: cpio-2.6-warnings.patch Patch21: cpio-2.6-checksum.patch Patch22: cpio-2.6-writeOutHeaderBufferOverflow.patch -Patch23: cpio-2.6-largeFileGrew.patch -Patch24: cpio-2.6-toAsciiError.patch %ifnos linux Prereq: /sbin/rmt %endif @@ -56,8 +54,6 @@ %patch20 -p1 -b .warnings %patch21 -p1 -b .checksum %patch22 -p1 -b .bufferOverflow -%patch23 -p1 -b .largeFileGrew -%patch24 -p1 -b .toAsciiError autoheader %build @@ -107,6 +103,13 @@ %{_infodir}/*.info* %changelog +* Wed Mar 15 2006 Peter Vrabec 2.6-13 +- merge toAsciiError.patch with writeOutHeaderBufferOverflow.patch +- merge largeFileGrew.patch with lfs.patch +- fix large file support, cpio is able to store files<8GB + in 'old ascii' format (-H odc option) +- adjust warnings.patch + * Tue Mar 14 2006 Peter Vrabec 2.6-12 - fix warn_if_file_changed() and set exit code to #1 when cpio fails to store file > 4GB (#183224) --- cpio-2.6-largeFileGrew.patch DELETED --- --- cpio-2.6-toAsciiError.patch DELETED --- From fedora-cvs-commits at redhat.com Wed Mar 15 16:35:59 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 15 Mar 2006 11:35:59 -0500 Subject: rpms/libgtk-java/devel libgtk-java-glib-timer-gc.patch,1.1,1.2 Message-ID: <200603151635.k2FGZxCP023943@cvs.devel.redhat.com> Author: pmuldoon Update of /cvs/dist/rpms/libgtk-java/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv23812 Modified Files: libgtk-java-glib-timer-gc.patch Log Message: 2005-03-13 Phil Muldoon * libgtk-java-glib-timer-gc.patch: regen patch to match same patch roots as other patches. libgtk-java-glib-timer-gc.patch: org_gnu_glib_Timer.c | 13 ++++++++++--- 1 files changed, 10 insertions(+), 3 deletions(-) Index: libgtk-java-glib-timer-gc.patch =================================================================== RCS file: /cvs/dist/rpms/libgtk-java/devel/libgtk-java-glib-timer-gc.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- libgtk-java-glib-timer-gc.patch 15 Mar 2006 16:14:14 -0000 1.1 +++ libgtk-java-glib-timer-gc.patch 15 Mar 2006 16:35:35 -0000 1.2 @@ -1,5 +1,5 @@ ---- libgtk-java-2.8.3.0.20060301.rh1/src/jni/org_gnu_glib_Timer.c.orig 2006-03-15 11:03:15.000000000 -0500 -+++ libgtk-java-2.8.3.0.20060301.rh1/src/jni/org_gnu_glib_Timer.c 2006-03-15 11:07:15.000000000 -0500 +--- src/jni/org_gnu_glib_Timer.c.orig 2006-03-15 11:29:28.000000000 -0500 ++++ src/jni/org_gnu_glib_Timer.c 2006-03-15 11:30:05.000000000 -0500 @@ -22,10 +22,17 @@ // reset handle field jclass cls = (*env)->GetObjectClass(env, obj); From fedora-cvs-commits at redhat.com Wed Mar 15 19:05:27 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 15 Mar 2006 14:05:27 -0500 Subject: rpms/gnome-vfs2/devel gnome-vfs2.spec,1.101,1.102 Message-ID: <200603151905.k2FJ5RX6004272@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/gnome-vfs2/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv4261 Modified Files: gnome-vfs2.spec Log Message: - don't try to install a schema we don't ship anymore (bug 185549) Index: gnome-vfs2.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-vfs2/devel/gnome-vfs2.spec,v retrieving revision 1.101 retrieving revision 1.102 diff -u -r1.101 -r1.102 --- gnome-vfs2.spec 13 Mar 2006 13:50:16 -0000 1.101 +++ gnome-vfs2.spec 15 Mar 2006 19:05:11 -0000 1.102 @@ -11,7 +11,7 @@ Summary: The GNOME virtual file-system libraries. Name: gnome-vfs2 Version: 2.14.0 -Release: 1 +Release: 2 License: LGPL Group: System Environment/Libraries Source0: gnome-vfs-%{version}.tar.bz2 @@ -139,7 +139,7 @@ %post export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` -SCHEMAS="system_http_proxy.schemas system_dns_sd.schemas system_smb.schemas desktop_gnome_url_handlers.schemas desktop_default_applications.schemas system_storage.schemas" +SCHEMAS="system_http_proxy.schemas system_dns_sd.schemas system_smb.schemas desktop_gnome_url_handlers.schemas desktop_default_applications.schemas" for S in $SCHEMAS; do gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/$S > /dev/null done @@ -182,6 +182,9 @@ %config %{_sysconfdir}/gnome-vfs-2.0/modules/smb-module.conf %changelog +* Wed Mar 15 2006 Ray Strode - 2.14.0-2 +- don't try to install a schema we don't ship anymore (bug 185549) + * Mon Mar 13 2006 Matthias Clasen - 2.14.0-1 - Update to 2.14.0 - Drop upstreamed patches From fedora-cvs-commits at redhat.com Wed Mar 15 19:16:21 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 15 Mar 2006 14:16:21 -0500 Subject: rpms/gtk2/devel .cvsignore, 1.49, 1.50 gtk2.spec, 1.134, 1.135 sources, 1.52, 1.53 Message-ID: <200603151916.k2FJGL0G011306@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/gtk2/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv10128 Modified Files: .cvsignore gtk2.spec sources Log Message: 2.8.16 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/gtk2/devel/.cvsignore,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- .cvsignore 13 Mar 2006 18:05:50 -0000 1.49 +++ .cvsignore 15 Mar 2006 19:16:19 -0000 1.50 @@ -32,3 +32,4 @@ gtk+-2.8.14.tar.bz2 gtk+-2.8.15.tar.bz2 gtk+-2.8.15.tar.bz2 +gtk+-2.8.16.tar.bz2 Index: gtk2.spec =================================================================== RCS file: /cvs/dist/rpms/gtk2/devel/gtk2.spec,v retrieving revision 1.134 retrieving revision 1.135 diff -u -r1.134 -r1.135 --- gtk2.spec 13 Mar 2006 18:15:36 -0000 1.134 +++ gtk2.spec 15 Mar 2006 19:16:19 -0000 1.135 @@ -10,7 +10,7 @@ %define cairo_version %{cairo_base_version}-1 %define libpng_version 2:1.2.2-16 -%define base_version 2.8.15 +%define base_version 2.8.16 %define bin_version 2.4.0 Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X. @@ -266,6 +266,9 @@ %doc tmpdocs/examples %changelog +* Wed Mar 15 2006 Matthias Clasen - 2.8.16-1 +- Update to 2.8.16 + * Mon Mar 13 2006 Matthias Clasen - 2.8.15-1 - Update to 2.8.15 - Drop upstreamed patch Index: sources =================================================================== RCS file: /cvs/dist/rpms/gtk2/devel/sources,v retrieving revision 1.52 retrieving revision 1.53 diff -u -r1.52 -r1.53 --- sources 13 Mar 2006 18:05:50 -0000 1.52 +++ sources 15 Mar 2006 19:16:19 -0000 1.53 @@ -1,2 +1,2 @@ d8c012f67a8f23fa9aa495fca5331784 update-scripts.tar.gz -df49f7498ec8275519ee92087f8d04db gtk+-2.8.15.tar.bz2 +6dea9b6f546bd858401729d12bbd5919 gtk+-2.8.16.tar.bz2 From fedora-cvs-commits at redhat.com Wed Mar 15 19:22:37 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 15 Mar 2006 14:22:37 -0500 Subject: rpms/cairo/devel .cvsignore, 1.10, 1.11 cairo.spec, 1.33, 1.34 sources, 1.10, 1.11 Message-ID: <200603151922.k2FJMbAc017188@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/cairo/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv17173 Modified Files: .cvsignore cairo.spec sources Log Message: 1.0.4 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/cairo/devel/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 6 Oct 2005 14:46:16 -0000 1.10 +++ .cvsignore 15 Mar 2006 19:22:34 -0000 1.11 @@ -1 +1,2 @@ cairo-1.0.2.tar.gz +cairo-1.0.4.tar.gz Index: cairo.spec =================================================================== RCS file: /cvs/dist/rpms/cairo/devel/cairo.spec,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- cairo.spec 3 Mar 2006 20:42:28 -0000 1.33 +++ cairo.spec 15 Mar 2006 19:22:34 -0000 1.34 @@ -3,8 +3,8 @@ Summary: A vector graphics library Name: cairo -Version: 1.0.2 -Release: 5 +Version: 1.0.4 +Release: 1 URL: http://cairographics.org Source0: %{name}-%{version}.tar.gz License: LGPL/MPL @@ -89,6 +89,9 @@ %{_datadir}/gtk-doc/* %changelog +* Wed Mar 15 2006 Matthias Clasen - 1.0.4-1 +- Update to 1.0.4 + * Fri Mar 3 2006 Carl Worth - 1.0.2-5 - add patch to chunk Xlib glyph compositing (bug 182416 and CVE-20060528) Index: sources =================================================================== RCS file: /cvs/dist/rpms/cairo/devel/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 6 Oct 2005 14:46:16 -0000 1.10 +++ sources 15 Mar 2006 19:22:34 -0000 1.11 @@ -1 +1 @@ -d0b7111a14f90ec3afa777ec40c44984 cairo-1.0.2.tar.gz +9002b0e69b3f94831a22d3f2a7735ce2 cairo-1.0.4.tar.gz From fedora-cvs-commits at redhat.com Wed Mar 15 19:26:03 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 15 Mar 2006 14:26:03 -0500 Subject: rpms/cairo/devel cairo.spec,1.34,1.35 Message-ID: <200603151926.k2FJQ3Mw017239@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/cairo/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv17226 Modified Files: cairo.spec Log Message: 1.0.4 Index: cairo.spec =================================================================== RCS file: /cvs/dist/rpms/cairo/devel/cairo.spec,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- cairo.spec 15 Mar 2006 19:22:34 -0000 1.34 +++ cairo.spec 15 Mar 2006 19:26:01 -0000 1.35 @@ -24,8 +24,6 @@ BuildRequires: fontconfig-devel >= %{fontconfig_version} Patch0: cairo-1.0.2-embedded-bitmaps.patch -Patch1: cairo-1.0.2-fix-build.patch -Patch2: cairo-1.0.2-chunk-glyphs-CVE-2006-0528.patch %description Cairo is a vector graphics library designed to provide high-quality @@ -53,8 +51,6 @@ %prep %setup -q %patch0 -p1 -b .embedded-bitmaps -%patch1 -p1 -b .fix-build -%patch2 -p1 -b .chunk-glyphs-CVS-2006-0528 %build %configure --enable-warnings --disable-glitz --disable-quartz \ @@ -91,6 +87,7 @@ %changelog * Wed Mar 15 2006 Matthias Clasen - 1.0.4-1 - Update to 1.0.4 +- Drop upstreamed patches * Fri Mar 3 2006 Carl Worth - 1.0.2-5 - add patch to chunk Xlib glyph compositing (bug 182416 and From fedora-cvs-commits at redhat.com Wed Mar 15 22:07:37 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 15 Mar 2006 17:07:37 -0500 Subject: rpms/mysql/devel mysql.logrotate,1.5,1.6 Message-ID: <200603152207.k2FM7aJL017421@cvs.devel.redhat.com> Author: tgl Update of /cvs/dist/rpms/mysql/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv17403 Modified Files: mysql.logrotate Log Message: Commit fix for bug #182025. Since I'm about to remove the logrotate script entirely for bug #180639, this is kinda pointless, but I thought I'd make sure CVS had the good version of the scipt in case we resurrect it someday. Index: mysql.logrotate =================================================================== RCS file: /cvs/dist/rpms/mysql/devel/mysql.logrotate,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- mysql.logrotate 9 Sep 2004 08:56:18 -0000 1.5 +++ mysql.logrotate 15 Mar 2006 22:07:24 -0000 1.6 @@ -2,9 +2,9 @@ missingok create 0640 mysql mysql prerotate - [ -e /var/lock/subsys/mysqld ] && /bin/kill -HUP `cat /var/run/mysqld/mysqld.pid 2> /dev/null ` || /bin/true + [ -e /var/lock/subsys/mysqld -a -r /var/run/mysqld/mysqld.pid ] && /bin/kill -HUP `cat /var/run/mysqld/mysqld.pid 2> /dev/null ` || /bin/true endscript postrotate - [ -e /var/lock/subsys/mysqld ] && /bin/kill -HUP `cat /var/run/mysqld/mysqld.pid 2> /dev/null ` || /bin/true + [ -e /var/lock/subsys/mysqld -a -r /var/run/mysqld/mysqld.pid ] && /bin/kill -HUP `cat /var/run/mysqld/mysqld.pid 2> /dev/null ` || /bin/true endscript } From fedora-cvs-commits at redhat.com Wed Mar 15 22:16:36 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 15 Mar 2006 17:16:36 -0500 Subject: rpms/cman-kernel/FC-4 cman-kernel.spec,1.118,1.119 Message-ID: <200603152216.k2FMGajH024555@cvs.devel.redhat.com> Author: cfeist Update of /cvs/dist/rpms/cman-kernel/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv23928 Modified Files: cman-kernel.spec Log Message: Updated Kernel Version Index: cman-kernel.spec =================================================================== RCS file: /cvs/dist/rpms/cman-kernel/FC-4/cman-kernel.spec,v retrieving revision 1.118 retrieving revision 1.119 diff -u -r1.118 -r1.119 --- cman-kernel.spec 7 Mar 2006 20:28:20 -0000 1.118 +++ cman-kernel.spec 15 Mar 2006 22:16:33 -0000 1.119 @@ -25,7 +25,7 @@ Name: cman-kernel Version: 2.6.11.5 -Release: %{subversion}.23 +Release: %{subversion}.24 License: GPL Group: System Environment/Kernel Summary: cman-kernel - The Cluster Manager kernel modules From fedora-cvs-commits at redhat.com Wed Mar 15 22:16:59 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 15 Mar 2006 17:16:59 -0500 Subject: rpms/gnbd-kernel/FC-4 gnbd-kernel.spec,1.100,1.101 Message-ID: <200603152216.k2FMGx0n028862@cvs.devel.redhat.com> Author: cfeist Update of /cvs/dist/rpms/gnbd-kernel/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv28275 Modified Files: gnbd-kernel.spec Log Message: Updated Kernel Version Index: gnbd-kernel.spec =================================================================== RCS file: /cvs/dist/rpms/gnbd-kernel/FC-4/gnbd-kernel.spec,v retrieving revision 1.100 retrieving revision 1.101 diff -u -r1.100 -r1.101 --- gnbd-kernel.spec 7 Mar 2006 20:28:29 -0000 1.100 +++ gnbd-kernel.spec 15 Mar 2006 22:16:56 -0000 1.101 @@ -25,7 +25,7 @@ Name: gnbd-kernel Version: 2.6.11.2 -Release: %{subversion}.58 +Release: %{subversion}.59 License: GPL Group: System Environment/Kernel Summary: gnbd-kernel - The kernel module for GFS's Network Block Device From fedora-cvs-commits at redhat.com Wed Mar 15 22:22:45 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 15 Mar 2006 17:22:45 -0500 Subject: rpms/kernel/devel .cvsignore, 1.380, 1.381 kernel-2.6.spec, 1.2054, 1.2055 sources, 1.321, 1.322 upstream, 1.294, 1.295 Message-ID: <200603152222.k2FMMjuG030392@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv30378 Modified Files: .cvsignore kernel-2.6.spec sources upstream Log Message: git5 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v retrieving revision 1.380 retrieving revision 1.381 diff -u -r1.380 -r1.381 --- .cvsignore 14 Mar 2006 20:41:50 -0000 1.380 +++ .cvsignore 15 Mar 2006 22:22:42 -0000 1.381 @@ -4,4 +4,4 @@ linux-2.6.15.tar.bz2 xen-20060301.tar.bz2 patch-2.6.16-rc6.bz2 -patch-2.6.16-rc6-git3.bz2 +patch-2.6.16-rc6-git5.bz2 View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.2054 -r 1.2055 kernel-2.6.spec Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.2054 retrieving revision 1.2055 diff -u -r1.2054 -r1.2055 --- kernel-2.6.spec 14 Mar 2006 20:41:50 -0000 1.2054 +++ kernel-2.6.spec 15 Mar 2006 22:22:42 -0000 1.2055 @@ -218,7 +218,7 @@ # Patches 0 through 100 are meant for core subsystem upgrades # Patch1: patch-2.6.16-rc6.bz2 -Patch2: patch-2.6.16-rc6-git3.bz2 +Patch2: patch-2.6.16-rc6-git5.bz2 # Patches 100 through 500 are meant for architecture patches Patch100: linux-2.6-bzimage.patch @@ -1660,2513 +1660,10 @@ %endif %changelog +* Wed Mar 15 2006 Dave Jones +- 2.6.16rc6-git5 + * Tue Mar 14 2006 Dave Jones +- FC5 final kernel - 2.6.16-rc6-git3 -* Tue Mar 14 2006 David Woodhouse -- Recognise 'IBM,CBEA' as Cell platform too. - -* Mon Mar 13 2006 Rik van Riel -- fix "Time went backwards" Xen kernel bug. (#185317) - -* Mon Mar 13 2006 James Morris -- Modify sched-sedf defaults for dom0 so domU does not - get soft cpu lockup under load. - -* Mon Mar 13 2006 Dave Jones -- 2.6.16-rc6-git1 -- Disable slab debug yet again. - -* Sat Mar 11 2006 Dave Jones -- 2.6.16-rc6 -- 2.6.16-rc5-git15 & -git16 -- Set x86 ACPI cut-off date to 1999 on advice from upstream acpi maintainer. - -* Fri Mar 10 2006 Dave Jones -- 2.6.16-rc5-git14 -- Don't do an explict 'make version.h', which causes obscure - breakage 1 time in a billion builds. *sigh* (the dreaded #182731) -- Turn slab debug back off. - -* Fri Mar 10 2006 Dave Jones -- Turn slab debug back on for one more build - -* Thu Mar 9 2006 Dave Jones -- Add viro's slab leak detector. - -* Thu Mar 9 2006 Stephen Tweedie -- Disable a bunch of hardware drivers in xenU that have no business - being built in an unprivileged guest. -- Fix conflict between Xen and ati patch from latest git tree - -* Thu Mar 9 2006 Dave Jones -- 2.6.16rc5-git12/git13 -- Make 'quiet' work again. -- Turn off some debugging stuff. -- Fix up some debug spew that could occur during resume. - -* Wed Mar 8 2006 Dave Jones -- 2.6.16rc5-git10/git11 - -* Tue Mar 7 2006 John W. Linville -- Temporarily disable automatic load of bcm43xx driver (causes hangs on some systems) - -* Tue Mar 7 2006 Stephen Tweedie -- Include xen header files in -devel packages if we're building xen. - (bug 180198) -- Disable CONFIG_B44 for Xen builds for now: it results in - "b44.ko needs unknown symbol dma_get_cache_alignment" errors. - -* Tue Mar 7 2006 Dave Jones -- 2.6.16rc5-git9 -- Fix NMI watchdog on i386. - -* Mon Mar 6 2006 Dave Jones -- Disable DRI on Radeon R300 and above, due to instability. (#174646,#182196) -- Don't do voluntary preempt until after bootup - -* Mon Mar 6 2006 Stephen Tweedie -- Merge xen rebase with 1.2016 kernel -- Rename kernel-xen-(hypervisor|guest) to kernel-xen(0|U) for consistency - with upstream and to make kernel subtype suffixes match the subpackage - names. (From Jeremy Katz.) -- Export mmap-able kva interface for xen to find the xenstore page - (xen-unstable cset 9130) -- Remove stale linux-2.6-xen-module-fault.patch file -- Add workaround for non-xen ia64 builds: temporarily back-out the ia64- - specific portions of linux-2.6-xen.patch. - -* Sun Mar 5 2006 Dave Jones -- 2.6.16rc5-git8 -- Add a safety net to softlockup so that it doesn't prevent installs. - -* Sat Mar 4 2006 Dave Jones -- Silence noisy SATA printk. - -* Fri Mar 3 2006 Dave Jones -- 2.6.16rc5-git7 -- Fix cpu_index >= NR_CPUS always false warnings. - -* Thu Mar 2 2006 John W. Linville -- Update to current bcm43xx code - -* Thu Mar 2 2006 Stephen Tweedie -- Rebase to rawhide 1.2009 -- Disable xen PAE build again - -* Thu Mar 2 2006 Dave Jones -- 2.6.16rc5-git6 -- Fix acpi_os_acquire_object() with IRQs disabled debug msgs. -- Mark unwind info for signal trampolines in vDSOs - -* Thu Mar 2 2006 Juan Quintela -- rebase with rawhide 2008. - -* Thu Mar 2 2006 Stephen Tweedie -- Fix xen/execshield VSYSCALL_BASE conflict - -* Thu Mar 2 2006 Dave Jones -- Fix acpi_os_acquire_object() with IRQs disabled debug msgs. -- Mark unwind info for signal trampolines in vDSOs - -* Wed Mar 1 2006 Juan Quintela -- disable ia64 build again. - -* Wed Mar 1 2006 Stephen Tweedie -- Rebase to xen kernel patches and HV from xen-unstable cset 9022 -- Delete xen cpu steal patches (now upstream) -- Delete xen_net_read_mac export patch (now upstream) -- Revert xen cset 8948 (vdso updates which execshield already performs) -- Delete unneeded linux-2.6-xen-gcc-4.1-compile-fix.patch - -* Wed Mar 1 2006 Juan Quintela -- remove xen ia64 bits, they break ia64 build. -- riel cpusteal hv fix. - -* Wed Mar 1 2006 Juan Quintela -- enable ia64 again - -* Wed Mar 1 2006 Dave Jones -- 2.6.16rc5-git4 -- Fix leak in RAID1 -- Further fixing of selinuxfs link count. (#182001) -- Enable PATA ports on Promise SATA. (#179369) -- NFS: writes should not clobber utimes() calls. (#183208) - -* Tue Feb 28 2006 Juan Quintela -- fix x86_64 xen build. - -* Tue Feb 28 2006 Juan Quintela -- rebase with rawhide 1.1993. -- enable ia64 again. -- rebase with rawhide 1.1991. - -* Tue Feb 28 2006 Dave Jones -- 2.6.16rc5-git3 - -* Tue Feb 28 2006 David Woodhouse -- Fix gettimeofday() in the 64-bit PowerPC vDSO - -* Mon Feb 27 2006 Dave Jones -- 2.6.16rc5 & rc5-git1 - -* Sun Feb 26 2006 Dave Jones -- 2.6.16rc4-git9 & -git10 -- Temporarily disable xen due to build breakage. - -* Sat Feb 25 2006 Dave Jones -- 2.6.16rc4-git8 - -* Fri Feb 24 2006 Stephen Tweedie -- Disable ia64 until we work out the Xen interactions -- Fix config confusion on ia64 -- Execshield/vdso fixes (quintela at redhat.com) - -* Fri Feb 24 2006 Dave Jones -- 2.6.16rc4-git7 - -* Fri Feb 24 2006 John W. Linville -- Add/enable IPW2200_MONITOR config option for i686 and x86_64 - -* Thu Feb 23 2006 David Woodhouse -- Shut up the debugging messages from pmac platform stuff - -* Thu Feb 23 2006 Dave Jones -- 2.6.16rc4-git6 - -* Tue Feb 21 2006 Dave Jones [...2135 lines suppressed...] -* Thu Jun 10 2004 Arjan van de Ven -- disable mlock-uses-rlimit patch, it has a security hole and needs more thought -- revert airo driver to the FC2 one since the new one breaks - -* Tue Jun 8 2004 Dave Jones -- Update to 2.6.7rc3 - -* Fri Jun 4 2004 Arjan van de Ven -- fix the mlock-uses-rlimit patch - -* Wed Jun 2 2004 David Woodhouse -- Add ppc64 (Mac G5) - -* Wed Jun 2 2004 Arjan van de Ven -- add a forward port of the mlock-uses-rlimit patch -- add NX support for x86 (Intel, Ingo) - -* Tue Jun 1 2004 Arjan van de Ven -- refresh ext3 reservation patch - -* Sun May 30 2004 Arjan van de Ven -- 2.6.7-rc2 -- set the ACPI OS name to "Microsoft Windows XP" for better compatibility - -* Thu May 27 2004 Pete Zaitcev -- Fix qeth and zfcp (s390 drivers): align qib by 256, embedded into qdio_irq. - -* Thu May 27 2004 Dave Jones -- Fix the crashes on boot on Asus P4P800 boards. (#121819) - -* Wed May 26 2004 Dave Jones -- Lots more updates to the SCSI whitelist for various - USB card readers. (#112778, among others..) - -* Wed May 26 2004 Arjan van de Ven -- back out ehci suspend/resume patch, it breaks -- add fix for 3c59x-meets-kudzu bug from Alan - -* Tue May 25 2004 Arjan van de Ven -- try improving suspend/resume by restoring more PCI state -- 2.6.7-rc1-bk1 - -* Mon May 24 2004 Dave Jones -- Add yet another multi-card reader to the whitelist (#85851) - -* Sun May 23 2004 Dave Jones -- Add another multi-card reader to the whitelist (#124048) - -* Wed May 19 2004 Arjan van de Ven -- put firewire race fix in (datacorruptor) - -* Tue May 18 2004 Dave Jones -- Fix typo in ibmtr driver preventing compile (#123391) - -* Mon May 17 2004 Arjan van de Ven -- update to 2.6.6-bk3 -- made kernel-source and kernel-doc noarch.rpm's since they are not - architecture specific. - -* Sat May 08 2004 Arjan van de Ven -- fix non-booting on Transmeta cpus (Peter Anvin) -- fix count leak in message queues - -* Fri May 07 2004 Arjan van de Ven -- more ide cache flush work -- patch from scsi-bk to fix sd refcounting - -* Thu May 06 2004 Arjan van de Ven -- some more ide cache flush fixes - -* Wed May 05 2004 Arjan van de Ven -- fix bug 122504 -- convert b44 to ethtool ops (jgarzik) -- make IDE do a cache-flush on shutdown (me/Alan) - -* Tue May 04 2004 Arjan van de Ven -- work around i810/i830 DRM issue - -* Fri Apr 30 2004 Arjan van de Ven -- 2.6.6-rc3-bk1 -- make amd64 boot again -- fix vm86-vs-4g4g interaction (Ingo) - -* Thu Apr 22 2004 Arjan van de Ven -- 2.6.6-rc2 - -* Tue Apr 20 2004 Arjan van de Ven -- add the ext3 online resize patch - -* Mon Apr 19 2004 Arjan van de Ven -- 2.6.6-rc1-bk3 -- add the objrmap vm from the -mm tree; it needs testing - -* Thu Apr 15 2004 Arjan van de Ven -- 2.6.5-bk2 -- disable DISCONTIGMEM on ia64 for performance -- fix sleep_on use in reiserfs (Chris Mason) - -* Tue Apr 13 2004 Arjan van de Ven -- 2.6.5-mc4 -- reenable sg driver for scsi tape changers and such -- the sk98lin driver oopses on module unload, preven that - -* Mon Apr 12 2004 Arjan van de Ven -- fix "bad pmd" bug with patch from Ingo - -* Fri Apr 09 2004 Arjan van de Ven -- 2.6.5-mc3 -- finish up the -mc2 merge -- latest 4g/4g patch from Ingo -- latest execshield patch from Ingo -- fix a few framebuffer bugs - -* Thu Apr 08 2004 Arjan van de Ven -- first attempt at a 2.6.5-mc2 merge - -* Thu Apr 08 2004 Dave Jones -- Add in missing SiS AGP fix. - -* Tue Apr 06 2004 Dave Jones -- More agpgart fixes. - -* Fri Apr 02 2004 Arjan van de Ven -- fix another 4g/4g-vs-resume bug - -* Tue Mar 30 2004 Arjan van de Ven -- 2.6.5-rc3 -- fix PCI posting bug in i830 DRM - -* Mon Mar 29 2004 Arjan van de Ven -- 2.6.5-rc2-bk8 - -* Mon Mar 29 2004 Dave Jones -- Include latest agpgart fixes. - -* Thu Mar 25 2004 Arjan van de Ven -- more DRM fixes -- add the fsync patches from akpm - -* Tue Mar 23 2004 Arjan van de Ven -- 2.6.5-rc2-bk3 -- fix direct userspace memory access in i830 drm driver - -* Mon Mar 22 2004 Arjan van de Ven -- 2.6.5-rc2-bk2 -- some stackbloat reductions from Dave and me - -* Sat Mar 20 2004 Arjan van de Ven -- 2.6.5-rc2 - -* Tue Mar 16 2004 Dave Jones -- 2.6.5-rc1 - -* Mon Mar 15 2004 Arjan van de Ven -- 2.6.4-bk3 -- fix oops in toshiba_acpi (Barry K. Nathan) - -* Sat Mar 13 2004 Arjan van de Ven -- 2.6.4-bk2 merge - -* Thu Mar 11 2004 Arjan van de Ven -- renable sonypi driver that was off accidentally -- 2.6.4-final -- fix the oops on alsa module unloads - -* Wed Mar 10 2004 Arjan van de Ven -- add ppc64/iseries, ppc32 (powermac/ibook) and ia64 architectures -- 2.6.4-rc3 - -* Tue Mar 09 2004 Arjan van de Ven -- 2.6.4-rc2-bk5 -- fix nfs-vs-selinux issue -- fix typo in URL as per #117849 - -* Mon Mar 08 2004 Arjan van de Ven -- fix race in lp.c (#117710) -- 2.6.4-rc2-bk3 -- attempt to fix S3 suspend-to-ram with 4g/4g split - -* Sat Mar 06 2004 Arjan van de Ven -- fix reiserfs -- set HZ to 1000 again for some tests - -* Wed Feb 25 2004 Arjan van de Ven -- merge back a bunch of fedora fixes -- disable audit - -* Tue Feb 24 2004 Arjan van de Ven -- audit bugfixes -- update tux to a working version -- 2.6.3-bk5 merge - -* Fri Feb 20 2004 Arjan van de Ven -- re-add and enable the Auditing patch -- switch several cpufreq modules to built in since detecting in userspace - which to use is unpleasant - -* Thu Jul 03 2003 Arjan van de Ven -- 2.6 start - Index: sources =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/sources,v retrieving revision 1.321 retrieving revision 1.322 diff -u -r1.321 -r1.322 --- sources 14 Mar 2006 20:41:50 -0000 1.321 +++ sources 15 Mar 2006 22:22:42 -0000 1.322 @@ -1,4 +1,4 @@ cdf95e00f5111e31f78e1d97304d9522 linux-2.6.15.tar.bz2 cdfde609af8adcf58d7ff626599b2d90 xen-20060301.tar.bz2 67fe4dce92d3103e56dd8d2d3c20b3ed patch-2.6.16-rc6.bz2 -7c26e731eb4ec33b3a5793656adcc081 patch-2.6.16-rc6-git3.bz2 +110d544412276afa369b10cfcaf09740 patch-2.6.16-rc6-git5.bz2 Index: upstream =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/upstream,v retrieving revision 1.294 retrieving revision 1.295 diff -u -r1.294 -r1.295 --- upstream 14 Mar 2006 20:41:50 -0000 1.294 +++ upstream 15 Mar 2006 22:22:42 -0000 1.295 @@ -1,3 +1,3 @@ linux-2.6.15.tar.bz2 patch-2.6.16-rc6.bz2 -patch-2.6.16-rc6-git3.bz2 +patch-2.6.16-rc6-git5.bz2 From fedora-cvs-commits at redhat.com Wed Mar 15 22:24:41 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 15 Mar 2006 17:24:41 -0500 Subject: rpms/kernel/devel patch-2.6.16-rc6-git5.bz2.sign,NONE,1.1 Message-ID: <200603152224.k2FMOfSr030422@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv30410 Added Files: patch-2.6.16-rc6-git5.bz2.sign Log Message: sign --- NEW FILE patch-2.6.16-rc6-git5.bz2.sign --- -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.2.2 (GNU/Linux) Comment: See http://www.kernel.org/signature.html for info iD8DBQBEGGSryGugalF9Dw4RAiNxAJ9EwFK8Ymop0JLEDU6HS0jhuKJvAgCfaHwb nQ15f3BGq6g9GtsWYEXRZw8= =y/PS -----END PGP SIGNATURE----- From fedora-cvs-commits at redhat.com Wed Mar 15 22:25:27 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 15 Mar 2006 17:25:27 -0500 Subject: rpms/kernel/devel kernel-2.6.spec, 1.2055, 1.2056 linux-2.6-debug-taint-vm.patch, 1.6, 1.7 Message-ID: <200603152225.k2FMPROh030450@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv30435 Modified Files: kernel-2.6.spec linux-2.6-debug-taint-vm.patch Log Message: Mark 'print_tainted' as a GPL symbol again. Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.2055 retrieving revision 1.2056 diff -u -r1.2055 -r1.2056 --- kernel-2.6.spec 15 Mar 2006 22:22:42 -0000 1.2055 +++ kernel-2.6.spec 15 Mar 2006 22:25:23 -0000 1.2056 @@ -1662,6 +1662,7 @@ %changelog * Wed Mar 15 2006 Dave Jones - 2.6.16rc6-git5 +- Mark 'print_tainted' as a GPL symbol again. * Tue Mar 14 2006 Dave Jones - FC5 final kernel linux-2.6-debug-taint-vm.patch: linux-2.6.11/include/asm-generic/bug.h | 8 ++++++-- linux-2.6.15/mm/page_alloc.c | 4 ++-- linux-2.6.15/mm/slab.c | 4 ++-- linux-2000/kernel/panic.c | 1 + 4 files changed, 11 insertions(+), 6 deletions(-) Index: linux-2.6-debug-taint-vm.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-debug-taint-vm.patch,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- linux-2.6-debug-taint-vm.patch 13 Mar 2006 22:17:56 -0000 1.6 +++ linux-2.6-debug-taint-vm.patch 15 Mar 2006 22:25:23 -0000 1.7 @@ -32,7 +32,7 @@ snprintf(buf, sizeof(buf), "Not tainted"); return(buf); } -+EXPORT_SYMBOL_GPL(print_tainted); ++EXPORT_SYMBOL(print_tainted); void add_taint(unsigned flag) { From fedora-cvs-commits at redhat.com Wed Mar 15 22:25:47 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 15 Mar 2006 17:25:47 -0500 Subject: rpms/kernel/devel kernel-2.6.spec,1.2056,1.2057 Message-ID: <200603152225.k2FMPlv3030495@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv30482 Modified Files: kernel-2.6.spec Log Message: better changelog Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.2056 retrieving revision 1.2057 diff -u -r1.2056 -r1.2057 --- kernel-2.6.spec 15 Mar 2006 22:25:23 -0000 1.2056 +++ kernel-2.6.spec 15 Mar 2006 22:25:45 -0000 1.2057 @@ -1662,7 +1662,7 @@ %changelog * Wed Mar 15 2006 Dave Jones - 2.6.16rc6-git5 -- Mark 'print_tainted' as a GPL symbol again. +- Unmark 'print_tainted' as a GPL symbol. * Tue Mar 14 2006 Dave Jones - FC5 final kernel From fedora-cvs-commits at redhat.com Wed Mar 15 22:36:25 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 15 Mar 2006 17:36:25 -0500 Subject: rpms/kernel/devel linux-2.6-cell-is-cbea.patch,1.1,1.2 Message-ID: <200603152236.k2FMaPaD031006@cvs.devel.redhat.com> Author: dwmw2 Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv30992 Modified Files: linux-2.6-cell-is-cbea.patch Log Message: It's CBEA, not IBM,CBEA linux-2.6-cell-is-cbea.patch: prom_init.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletion(-) Index: linux-2.6-cell-is-cbea.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-cell-is-cbea.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- linux-2.6-cell-is-cbea.patch 14 Mar 2006 13:03:14 -0000 1.1 +++ linux-2.6-cell-is-cbea.patch 15 Mar 2006 22:36:23 -0000 1.2 @@ -8,7 +8,7 @@ return PLATFORM_MAPLE; - if (strstr(p, RELOC("IBM,CPB"))) + if (strstr(p, RELOC("IBM,CPB")) || -+ strstr(p, RELOC("IBM,CBEA"))) ++ strstr(p, RELOC("CBEA"))) return PLATFORM_CELL; #endif i += sl + 1; From fedora-cvs-commits at redhat.com Wed Mar 15 23:46:34 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 15 Mar 2006 18:46:34 -0500 Subject: rpms/evolution-data-server/devel evolution-data-server.spec, 1.87, 1.87.2.1 Message-ID: <200603152346.k2FNkYYQ004619@cvs.devel.redhat.com> Author: dwmw2 Update of /cvs/dist/rpms/evolution-data-server/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv32102 Modified Files: Tag: private-1_6-check-only-active-folders-branch evolution-data-server.spec Log Message: Test build Index: evolution-data-server.spec =================================================================== RCS file: /cvs/dist/rpms/evolution-data-server/devel/evolution-data-server.spec,v retrieving revision 1.87 retrieving revision 1.87.2.1 diff -u -r1.87 -r1.87.2.1 --- evolution-data-server.spec 13 Mar 2006 17:14:05 -0000 1.87 +++ evolution-data-server.spec 15 Mar 2006 23:46:32 -0000 1.87.2.1 @@ -25,7 +25,7 @@ Summary: Backend data server for evolution Name: evolution-data-server Version: 1.6.0 -Release: 1 +Release: 1.dwmw2.1 License: LGPL Group: System Environment/Libraries Source0: ftp://ftp.gnome.org/pub/gnome/sources/evolution-data-server/1.0/%{name}-%{version}.tar.bz2 @@ -49,6 +49,9 @@ Patch300: evolution-data-server-1.5.4-make_imap4_optional.patch +Patch400: evolution-data-server-1.5.91-check-only-active-folders.patch +Patch401: evolution-data-server-1.2.0-vcrap.patch + BuildRoot: %{_tmppath}/%{name}-root Requires: libsoup >= %{soup_version} Requires: ORBit2 >= %{orbit2_version} @@ -125,6 +128,10 @@ %patch201 -p0 -b .fix-comp-ref-leak %patch300 -p1 -b .make_imap4_optional +%patch400 -p1 -b .checksub +%patch401 -p1 -b .vcrap + + mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib mkdir -p krb5-fakeprefix/%{_lib} From fedora-cvs-commits at redhat.com Wed Mar 15 23:55:43 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 15 Mar 2006 18:55:43 -0500 Subject: rpms/readahead/devel readahead.early.files.in, 1.5, 1.6 readahead.files.in, 1.5, 1.6 readahead.spec, 1.25, 1.26 Message-ID: <200603152355.k2FNth5J004784@cvs.devel.redhat.com> Author: kzak Update of /cvs/dist/rpms/readahead/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv4767 Modified Files: readahead.early.files.in readahead.files.in readahead.spec Log Message: update *.in lists Index: readahead.early.files.in =================================================================== RCS file: /cvs/dist/rpms/readahead/devel/readahead.early.files.in,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- readahead.early.files.in 13 Jan 2006 08:37:50 -0000 1.5 +++ readahead.early.files.in 15 Mar 2006 23:55:41 -0000 1.6 @@ -2,11 +2,9 @@ /bin/basename /bin/bash /bin/cat -/bin/chgrp -/bin/chmod -/bin/chown /bin/cut /bin/date +/bin/dbus-daemon /bin/dd /bin/dmesg /bin/egrep @@ -14,6 +12,9 @@ /bin/grep /bin/gzip /bin/hostname +/bin/chgrp +/bin/chmod +/bin/chown /bin/ipcalc /bin/loadkeys /bin/login @@ -42,7 +43,7 @@ /etc/asound.state /etc/auto.master /etc/bashrc -/etc/blkid.tab +/etc/blkid/blkid.tab /etc/bluetooth/hcid.conf /etc/bluetooth/pin /etc/bluetooth/rfcomm.conf @@ -71,16 +72,16 @@ /etc/fonts/local.conf /etc/fstab /etc/group -/etc/gtk-2.0/gtkrc /etc/gtk-2.0/%{_arch}-redhat-linux-gnu/gdk-pixbuf.loaders /etc/gtk-2.0/%{_arch}-redhat-linux-gnu/gtk.immodules +/etc/gtk-2.0/gtkrc /etc/hesiod.conf /etc/host.conf /etc/hosts /etc/hotplug/blacklist +/etc/hotplug.d/default/default.hotplug /etc/hotplug.d/default/10-udev.hotplug /etc/hotplug.d/default/20-hal.hotplug -/etc/hotplug.d/default/default.hotplug /etc/hotplug/input.agent /etc/hotplug/net.agent /etc/hotplug/usb.agent @@ -101,7 +102,6 @@ /etc/mail/sendmail.cf /etc/mail/submit.cf /etc/mail/trusted-users -/etc/makedev.d/00macros /etc/makedev.d/alsa /etc/makedev.d/cciss /etc/makedev.d/cdrom @@ -121,12 +121,13 @@ /etc/makedev.d/qic /etc/makedev.d/raid /etc/makedev.d/redhat -/etc/makedev.d/s390 /etc/makedev.d/sound /etc/makedev.d/std +/etc/makedev.d/s390 /etc/makedev.d/undocumented /etc/makedev.d/usb /etc/makedev.d/v4l +/etc/makedev.d/00macros /etc/modprobe.conf /etc/modprobe.conf.dist /etc/modprobe.d/modprobe.conf.dist @@ -151,6 +152,27 @@ /etc/profile.d/less.sh /etc/profile.d/which-2.sh /etc/protocols +/etc/rc.d/init.d/bluetooth +/etc/rc.d/init.d/crond +/etc/rc.d/init.d/cups +/etc/rc.d/init.d/cups-config-daemon +/etc/rc.d/init.d/functions +/etc/rc.d/init.d/haldaemon +/etc/rc.d/init.d/mDNSResponder +/etc/rc.d/init.d/messagebus +/etc/rc.d/init.d/nfslock +/etc/rc.d/init.d/rpcidmapd +/etc/rc.d/rc +/etc/rc.d/rc.sysinit +/etc/rc.d/rc5.d/S14nfslock +/etc/rc.d/rc5.d/S18rpcidmapd +/etc/rc.d/rc5.d/S25bluetooth +/etc/rc.d/rc5.d/S34mDNSResponder +/etc/rc.d/rc5.d/S55cups +/etc/rc.d/rc5.d/S90crond +/etc/rc.d/rc5.d/S97messagebus +/etc/rc.d/rc5.d/S98cups-config-daemon +/etc/rc.d/rc5.d/S98haldaemon /etc/rc5.d/K05saslauthd /etc/rc5.d/K10psacct /etc/rc5.d/K20nfs @@ -201,27 +223,6 @@ /etc/rc5.d/S98cups-config-daemon /etc/rc5.d/S98haldaemon /etc/rc5.d/S99local -/etc/rc.d/init.d/bluetooth -/etc/rc.d/init.d/crond -/etc/rc.d/init.d/cups -/etc/rc.d/init.d/cups-config-daemon -/etc/rc.d/init.d/functions -/etc/rc.d/init.d/haldaemon -/etc/rc.d/init.d/mDNSResponder -/etc/rc.d/init.d/messagebus -/etc/rc.d/init.d/nfslock -/etc/rc.d/init.d/rpcidmapd -/etc/rc.d/rc -/etc/rc.d/rc5.d/S14nfslock -/etc/rc.d/rc5.d/S18rpcidmapd -/etc/rc.d/rc5.d/S25bluetooth -/etc/rc.d/rc5.d/S34mDNSResponder -/etc/rc.d/rc5.d/S55cups -/etc/rc.d/rc5.d/S90crond -/etc/rc.d/rc5.d/S97messagebus -/etc/rc.d/rc5.d/S98cups-config-daemon -/etc/rc.d/rc5.d/S98haldaemon -/etc/rc.d/rc.sysinit /etc/redhat-release /etc/resolv.conf /etc/rhgb/temp/display @@ -254,10 +255,10 @@ /etc/sysconfig/desktop /etc/sysconfig/firstboot /etc/sysconfig/hwconf -/etc/sysconfig/i18n /etc/sysconfig/init /etc/sysconfig/iptables /etc/sysconfig/iptables-config +/etc/sysconfig/i18n /etc/sysconfig/keyboard /etc/sysconfig/kudzu /etc/sysconfig/mouse @@ -277,10 +278,6 @@ /etc/termcap /etc/udev/rules.d/10-wacom.rules /etc/udev/rules.d/50-udev.rules -/lib/udev/check-cdrom.sh -/lib/udev/ide-media.sh -/lib/udev/MAKEDEV.dev -/lib/udev/pam_console.dev /etc/udev/udev.conf /etc/X11/fs/config /etc/X11/gdm/gdm.conf @@ -289,13 +286,25 @@ /etc/X11/xdm/Xsetup_0 /etc/X11/xorg.conf /etc/X11/Xresources -/usr/lib/xserver/SecurityPolicy /%{_lib}/iptables/libipt_icmp.so /%{_lib}/iptables/libipt_REJECT.so /%{_lib}/iptables/libipt_standard.so /%{_lib}/iptables/libipt_state.so /%{_lib}/iptables/libipt_tcp.so /%{_lib}/iptables/libipt_udp.so +/lib/kbd/keymaps/amiga/amiga-de.map.gz +/lib/kbd/keymaps/amiga/amiga-us.map.gz +/lib/kbd/keymaps/atari/atari-de.map.gz +/lib/kbd/keymaps/atari/atari-se.map.gz +/lib/kbd/keymaps/atari/atari-uk-falcon.map.gz +/lib/kbd/keymaps/atari/atari-us.map.gz +/lib/kbd/keymaps/i386/qwerty/../include/compose.inc +/lib/kbd/keymaps/i386/qwerty/../../include/compose.latin1 +/lib/kbd/keymaps/i386/qwerty/../include/euro1.map.gz +/lib/kbd/keymaps/i386/qwerty/../include/linux-keys-bare.inc +/lib/kbd/keymaps/i386/qwerty/../include/linux-with-alt-and-altgr.inc +/lib/kbd/keymaps/i386/qwerty/../include/qwerty-layout.inc +/lib/kbd/keymaps/i386/qwerty/us.map.gz /%{_lib}/ld-linux-x86-64.so.2 /%{_lib}/libacl.so.1 /%{_lib}/libasound.so.2 @@ -306,7 +315,10 @@ /%{_lib}/libcrypto.so.6 /%{_lib}/libcrypt.so.1 /%{_lib}/libc.so.6 +/%{_lib}/libdbus-1.so.2 +/%{_lib}/libdb-4.3.so /%{_lib}/libdl.so.2 +/%{_lib}/libexpat.so.0 /%{_lib}/libiw.so.28 /%{_lib}/libm.so.6 /%{_lib}/libnsl.so.1 @@ -325,27 +337,6 @@ /%{_lib}/libtermcap.so.2 /%{_lib}/libutil.so.1 /%{_lib}/libuuid.so.1 -/%{_lib}/security/pam_console.so -/%{_lib}/security/pam_deny.so -/%{_lib}/security/pam_env.so -/%{_lib}/security/pam_nologin.so -/%{_lib}/security/pam_securetty.so -/%{_lib}/security/pam_selinux.so -/%{_lib}/security/pam_stack.so -/%{_lib}/libdb-4.3.so -/lib/kbd/keymaps/amiga/amiga-de.map.gz -/lib/kbd/keymaps/amiga/amiga-us.map.gz -/lib/kbd/keymaps/atari/atari-de.map.gz -/lib/kbd/keymaps/atari/atari-se.map.gz -/lib/kbd/keymaps/atari/atari-uk-falcon.map.gz -/lib/kbd/keymaps/atari/atari-us.map.gz -/lib/kbd/keymaps/i386/qwerty/../include/compose.inc -/lib/kbd/keymaps/i386/qwerty/../../include/compose.latin1 -/lib/kbd/keymaps/i386/qwerty/../include/euro1.map.gz -/lib/kbd/keymaps/i386/qwerty/../include/linux-keys-bare.inc -/lib/kbd/keymaps/i386/qwerty/../include/linux-with-alt-and-altgr.inc -/lib/kbd/keymaps/i386/qwerty/../include/qwerty-layout.inc -/lib/kbd/keymaps/i386/qwerty/us.map.gz /lib/security/../../%{_lib}/security/pam_cracklib.so /lib/security/../../%{_lib}/security/pam_deny.so /lib/security/../../%{_lib}/security/pam_env.so @@ -354,11 +345,21 @@ /lib/security/../../%{_lib}/security/pam_permit.so /lib/security/../../%{_lib}/security/pam_succeed_if.so /lib/security/../../%{_lib}/security/pam_unix.so +/%{_lib}/security/pam_console.so +/%{_lib}/security/pam_deny.so +/%{_lib}/security/pam_env.so +/%{_lib}/security/pam_nologin.so +/%{_lib}/security/pam_securetty.so +/%{_lib}/security/pam_selinux.so +/%{_lib}/security/pam_stack.so +/lib/udev/check-cdrom.sh +/lib/udev/ide-media.sh +/lib/udev/MAKEDEV.dev +/lib/udev/pam_console.dev /sbin/alsactl /sbin/arping /sbin/auditctl /sbin/cardmgr -/sbin/change_console /sbin/consoletype /sbin/dhclient /sbin/ethtool @@ -368,6 +369,7 @@ /sbin/fsck.ext3 /sbin/getkey /sbin/hwclock +/sbin/change_console /sbin/ifconfig /sbin/ifenslave /sbin/insmod @@ -403,15 +405,9 @@ /sbin/vconfig /usr/bin/cpp /usr/bin/cups-config-daemon -/usr/bin/dbus-daemon /usr/bin/dircolors /usr/bin/fc-cache /usr/bin/find -/usr/sbin/gdm -/usr/sbin/gdm-binary -/usr/libexec/gdmchooser -/usr/libexec/gdmgreeter -/usr/libexec/gdmlogin /usr/bin/gnome-session /usr/bin/id /usr/bin/lesspipe.sh @@ -423,11 +419,14 @@ /usr/bin/rfcomm /usr/bin/rhgb /usr/bin/rhgb-client +/usr/bin/setxkbmap /usr/bin/tee /usr/bin/udevinfo /usr/bin/uniq -/usr/bin/setxkbmap /usr/bin/X +/usr/bin/X +/usr/bin/xfs +/usr/bin/xrdb /usr/%{_lib}/autofs/lookup_ldap.so /usr/%{_lib}/autofs/mount_bind.so /usr/%{_lib}/autofs/mount_nfs.so @@ -450,6 +449,19 @@ /usr/%{_lib}/cups/filter/pstops /usr/%{_lib}/cups/filter/pstoraster /usr/%{_lib}/cups/filter/texttops +/usr/libexec/gcc/%{_arch}-redhat-linux/4.1.0/cc1 +/usr/libexec/gcc/%{_arch}-redhat-linux/4.1.0/collect2 +/usr/libexec/gdmgreeter +/usr/libexec/gdmchooser +/usr/libexec/gdmlogin +/usr/libexec/hald-addon-acpi +/usr/libexec/hald-addon-storage +/usr/libexec/hald-add-selinux-mount-option +/usr/libexec/hald-probe-input +/usr/libexec/hald-probe-pc-floppy +/usr/libexec/hald-probe-smbios +/usr/libexec/hald-probe-storage +/usr/libexec/hald-probe-volume /usr/%{_lib}/gconv/gconv-modules.cache /usr/%{_lib}/gconv/ISO8859-1.so /usr/%{_lib}/gtk-2.0/2.4.0/engines/libclearlooks.so @@ -458,16 +470,14 @@ /usr/%{_lib}/libart_lgpl_2.so.2 /usr/%{_lib}/libatk-1.0.so.0 /usr/%{_lib}/libbluetooth.so.1 -/usr/%{_lib}/libbonobo-2.so.0 /usr/%{_lib}/libbonobo-activation.so.4 +/usr/%{_lib}/libbonobo-2.so.0 /usr/%{_lib}/libbz2.so.1 /usr/%{_lib}/libcrack.so.2 /usr/%{_lib}/libcroco-0.6.so.3 /usr/%{_lib}/libcups.so.2 -/usr/%{_lib}/libdbus-1.so.2 /usr/%{_lib}/libdbus-glib-1.so.2 /usr/%{_lib}/libdes425.so.3 -/usr/%{_lib}/libexpat.so.0 /usr/%{_lib}/libfontconfig.so.1 /usr/%{_lib}/libfreetype.so.6 /usr/%{_lib}/libgconf-2.so.4 @@ -486,30 +496,45 @@ /usr/%{_lib}/libhal-storage.so.1 /usr/%{_lib}/libhesiod.so.0 /usr/%{_lib}/libhowl.so.0 -/usr/%{_lib}/libk5crypto.so.3 +/usr/%{_lib}/libICE.so.6 /usr/%{_lib}/libkrb4.so.2 /usr/%{_lib}/libkrb5.so.3 /usr/%{_lib}/libkrb5support.so.0 +/usr/%{_lib}/libk5crypto.so.3 /usr/%{_lib}/liblber-2.3.so.0 /usr/%{_lib}/libldap-2.3.so.0 /usr/%{_lib}/libncurses.so.5 -/usr/%{_lib}/libORBit-2.so.0 /usr/%{_lib}/libORBitCosNaming-2.so.0 -/usr/%{_lib}/libpango-1.0.so.0 +/usr/%{_lib}/libORBit-2.so.0 /usr/%{_lib}/libpangoft2-1.0.so.0 -/usr/%{_lib}/libpangox-1.0.so.0 /usr/%{_lib}/libpangoxft-1.0.so.0 +/usr/%{_lib}/libpangox-1.0.so.0 +/usr/%{_lib}/libpango-1.0.so.0 /usr/%{_lib}/libpng12.so.0 /usr/%{_lib}/libpopt.so.0 /usr/%{_lib}/libpython2.4.so.1.0 /usr/%{_lib}/librsvg-2.so.2 /usr/%{_lib}/libsasl2.so.2 +/usr/%{_lib}/libSM.so.6 /usr/%{_lib}/libusb-0.1.so.4 /usr/%{_lib}/libvte.so.4 /usr/%{_lib}/libwrap.so.0 +/usr/%{_lib}/libXcursor.so.1 +/usr/%{_lib}/libXext.so.6 +/usr/%{_lib}/libXfixes.so.3 +/usr/%{_lib}/libXfont.so.1 +/usr/%{_lib}/libXft.so.2 +/usr/%{_lib}/libXinerama.so.1 +/usr/%{_lib}/libXi.so.6 +/usr/%{_lib}/libxkbfile.so.1 /usr/%{_lib}/libxml2.so.2 +/usr/%{_lib}/libXmuu.so.1 +/usr/%{_lib}/libXrandr.so.2 +/usr/%{_lib}/libXrender.so.1 +/usr/%{_lib}/libX11.so.6 /usr/%{_lib}/libz.so.1 -/usr/%{_lib}/pango/1.4.0/modules/pango-basic-fc.so +/usr/lib/locale/locale-archive +/usr/%{_lib}/pango/1.5.0/modules/pango-basic-fc.so /usr/%{_lib}/python2.4/codecs.py /usr/%{_lib}/python2.4/codecs.pyo /usr/%{_lib}/python2.4/copy.py @@ -616,36 +641,122 @@ /usr/%{_lib}/sasl2/libsasldb.so.2 /usr/%{_lib}/sasl2/Sendmail.conf /usr/%{_lib}/vte/gnome-pty-helper -/usr/libexec/gcc/%{_arch}-redhat-linux/4.1.0/cc1 -/usr/libexec/gcc/%{_arch}-redhat-linux/4.1.0/collect2 -/usr/libexec/hald-addon-acpi -/usr/libexec/hald-addon-storage -/usr/libexec/hald-add-selinux-mount-option -/usr/libexec/hald-probe-input -/usr/libexec/hald-probe-pc-floppy -/usr/libexec/hald-probe-smbios -/usr/libexec/hald-probe-storage -/usr/libexec/hald-probe-volume -/usr/lib/locale/locale-archive -/usr/share/X11/fonts/misc/6x13-ISO8859-1.pcf.gz -/usr/share/X11/fonts/misc/cursor.pcf.gz -/usr/share/X11/fonts/misc/fonts.alias -/usr/share/X11/fonts/misc/fonts.dir -/usr/share/X11/locale/locale.alias +/usr/%{_lib}/xorg/modules/drivers/apm_drv.so +/usr/%{_lib}/xorg/modules/drivers/ark_drv.so +/usr/%{_lib}/xorg/modules/drivers/ati_drv.so +/usr/%{_lib}/xorg/modules/drivers/atimisc_drv.so +/usr/%{_lib}/xorg/modules/drivers/cirrus_alpine.so +/usr/%{_lib}/xorg/modules/drivers/cirrus_drv.so +/usr/%{_lib}/xorg/modules/drivers/cirrus_laguna.so +/usr/%{_lib}/xorg/modules/drivers/cyrix_drv.so +/usr/%{_lib}/xorg/modules/drivers/dummy_drv.so +/usr/%{_lib}/xorg/modules/drivers/fbdev_drv.so +/usr/%{_lib}/xorg/modules/drivers/glint_drv.so +/usr/%{_lib}/xorg/modules/drivers/chips_drv.so +/usr/%{_lib}/xorg/modules/drivers/i128_drv.so +/usr/%{_lib}/xorg/modules/drivers/i810_drv.so +/usr/%{_lib}/xorg/modules/drivers/mga_drv.so +/usr/%{_lib}/xorg/modules/drivers/neomagic_drv.so +/usr/%{_lib}/xorg/modules/drivers/nv_drv.so +/usr/%{_lib}/xorg/modules/drivers/radeon_drv.so +/usr/%{_lib}/xorg/modules/drivers/rendition_drv.so +/usr/%{_lib}/xorg/modules/drivers/riva128.so +/usr/%{_lib}/xorg/modules/drivers/r128_drv.so +/usr/%{_lib}/xorg/modules/drivers/savage_drv.so +/usr/%{_lib}/xorg/modules/drivers/siliconmotion_drv.so +/usr/%{_lib}/xorg/modules/drivers/sis_drv.so +/usr/%{_lib}/xorg/modules/drivers/s3_drv.so +/usr/%{_lib}/xorg/modules/drivers/s3virge_drv.so +/usr/%{_lib}/xorg/modules/drivers/tdfx_drv.so +/usr/%{_lib}/xorg/modules/drivers/tga_drv.so +/usr/%{_lib}/xorg/modules/drivers/trident_drv.so +/usr/%{_lib}/xorg/modules/drivers/tseng_drv.so +/usr/%{_lib}/xorg/modules/drivers/vesa_drv.so +/usr/%{_lib}/xorg/modules/drivers/vga_drv.so +/usr/%{_lib}/xorg/modules/drivers/vmware_drv.so +/usr/%{_lib}/xorg/modules/drivers/v4l_drv.so +/usr/%{_lib}/xorg/modules/extensions/libdbe.so +/usr/%{_lib}/xorg/modules/extensions/libdri.so +/usr/%{_lib}/xorg/modules/extensions/libextmod.so +/usr/%{_lib}/xorg/modules/extensions/libGLcore.so +/usr/%{_lib}/xorg/modules/extensions/libglx.so +/usr/%{_lib}/xorg/modules/extensions/librecord.so +/usr/%{_lib}/xorg/modules/extensions/libvnc.so +/usr/%{_lib}/xorg/modules/extensions/libxtrap.so +/usr/%{_lib}/xorg/modules/fonts/libbitmap.so +/usr/%{_lib}/xorg/modules/fonts/libfreetype.so +/usr/%{_lib}/xorg/modules/fonts/libtype1.so +/usr/%{_lib}/xorg/modules/input/acecad_drv.so +/usr/%{_lib}/xorg/modules/input/aiptek_drv.so +/usr/%{_lib}/xorg/modules/input/calcomp_drv.so +/usr/%{_lib}/xorg/modules/input/citron_drv.so +/usr/%{_lib}/xorg/modules/input/digitaledge_drv.so +/usr/%{_lib}/xorg/modules/input/dmc_drv.so +/usr/%{_lib}/xorg/modules/input/dynapro_drv.so +/usr/%{_lib}/xorg/modules/input/elographics_drv.so +/usr/%{_lib}/xorg/modules/input/fpit_drv.so +/usr/%{_lib}/xorg/modules/input/hyperpen_drv.so +/usr/%{_lib}/xorg/modules/input/js_x_drv.so +/usr/%{_lib}/xorg/modules/input/kbd_drv.so +/usr/%{_lib}/xorg/modules/input/keyboard_drv.so +/usr/%{_lib}/xorg/modules/input/magellan_drv.so +/usr/%{_lib}/xorg/modules/input/microtouch_drv.so +/usr/%{_lib}/xorg/modules/input/mouse_drv.so +/usr/%{_lib}/xorg/modules/input/mutouch_drv.so +/usr/%{_lib}/xorg/modules/input/palmax_drv.so +/usr/%{_lib}/xorg/modules/input/penmount_drv.so +/usr/%{_lib}/xorg/modules/input/spaceorb_drv.so +/usr/%{_lib}/xorg/modules/input/summa_drv.so +/usr/%{_lib}/xorg/modules/input/synaptics_drv.so +/usr/%{_lib}/xorg/modules/input/tek4957_drv.so +/usr/%{_lib}/xorg/modules/input/ur98_drv.so +/usr/%{_lib}/xorg/modules/input/void_drv.so +/usr/%{_lib}/xorg/modules/input/wacom_drv.so +/usr/%{_lib}/xorg/modules/libafb.so +/usr/%{_lib}/xorg/modules/libcfb.so +/usr/%{_lib}/xorg/modules/libcfb16.so +/usr/%{_lib}/xorg/modules/libcfb24.so +/usr/%{_lib}/xorg/modules/libcfb32.so +/usr/%{_lib}/xorg/modules/libcw.so +/usr/%{_lib}/xorg/modules/libdamage.so +/usr/%{_lib}/xorg/modules/libddc.so +/usr/%{_lib}/xorg/modules/libfb.so +/usr/%{_lib}/xorg/modules/libint10.so +/usr/%{_lib}/xorg/modules/libi2c.so +/usr/%{_lib}/xorg/modules/liblayer.so +/usr/%{_lib}/xorg/modules/libmfb.so +/usr/%{_lib}/xorg/modules/libpcidata.so +/usr/%{_lib}/xorg/modules/librac.so +/usr/%{_lib}/xorg/modules/libramdac.so +/usr/%{_lib}/xorg/modules/libscanpci.so +/usr/%{_lib}/xorg/modules/libshadow.so +/usr/%{_lib}/xorg/modules/libvbe.so +/usr/%{_lib}/xorg/modules/libvgahw.so +/usr/%{_lib}/xorg/modules/libxaa.so +/usr/%{_lib}/xorg/modules/libxf24_32bpp.so +/usr/%{_lib}/xorg/modules/libxf4bpp.so +/usr/%{_lib}/xorg/modules/libxf8_16bpp.so +/usr/%{_lib}/xorg/modules/libxf8_32bpp.so +/usr/%{_lib}/xorg/modules/linux/libdrm.so +/usr/%{_lib}/xorg/modules/linux/libfbdevhw.so +/usr/%{_lib}/xorg/modules/v20002d.uc +/usr/lib/xserver/SecurityPolicy /usr/sbin/acpid /usr/sbin/anacron /usr/sbin/atd /usr/sbin/automount -/usr/sbin/chkfontpath /usr/sbin/cpuspeed /usr/sbin/crond /usr/sbin/cupsd /usr/sbin/fstab-sync +/usr/sbin/gdm +/usr/sbin/gdm-binary /usr/sbin/gdmsetup /usr/sbin/gpm /usr/sbin/hald /usr/sbin/hcid /usr/sbin/hid2hci +/usr/sbin/chkfontpath /usr/sbin/kudzu /usr/sbin/printconf-backend /usr/sbin/rhnsd @@ -661,21 +772,26 @@ /usr/share/cups/banners/standard /usr/share/cups/banners/topsecret /usr/share/cups/banners/unclassified -/usr/share/cups/model/deskjet2.ppd.gz /usr/share/cups/model/deskjet.ppd.gz +/usr/share/cups/model/deskjet2.ppd.gz /usr/share/cups/model/dymo.ppd.gz /usr/share/cups/model/epson24.ppd.gz /usr/share/cups/model/epson9.ppd.gz /usr/share/cups/model/laserjet.ppd.gz -/usr/share/cups/model/okidat24.ppd.gz /usr/share/cups/model/okidata9.ppd.gz +/usr/share/cups/model/okidat24.ppd.gz /usr/share/cups/model/postscript.ppd.gz -/usr/share/cups/model/stcolor2.ppd.gz /usr/share/cups/model/stcolor.ppd.gz -/usr/share/cups/model/stphoto2.ppd.gz +/usr/share/cups/model/stcolor2.ppd.gz /usr/share/cups/model/stphoto.ppd.gz +/usr/share/cups/model/stphoto2.ppd.gz /usr/share/cups/model/textonly.ppd /usr/share/cups/model/zebra.ppd.gz +/usr/share/fonts/bitmap-fonts/console8x16.pcf +/usr/share/fonts/bitmap-fonts/console8x8.pcf +/usr/share/fonts/bitmap-fonts/fonts.cache-1 +/usr/share/fonts/bitmap-fonts/lutRS10.pcf +/usr/share/fonts/bitmap-fonts/lutRS12.pcf /usr/share/fonts/bitmap-fonts/10x20.pcf /usr/share/fonts/bitmap-fonts/5x8.pcf /usr/share/fonts/bitmap-fonts/6x10.pcf @@ -684,11 +800,6 @@ /usr/share/fonts/bitmap-fonts/6x9.pcf /usr/share/fonts/bitmap-fonts/9x15.pcf /usr/share/fonts/bitmap-fonts/9x18.pcf -/usr/share/fonts/bitmap-fonts/console8x16.pcf -/usr/share/fonts/bitmap-fonts/console8x8.pcf -/usr/share/fonts/bitmap-fonts/fonts.cache-1 -/usr/share/fonts/bitmap-fonts/lutRS10.pcf -/usr/share/fonts/bitmap-fonts/lutRS12.pcf /usr/share/fonts/bitstream-vera/fonts.cache-1 /usr/share/fonts/bitstream-vera/VeraBd.ttf /usr/share/fonts/bitstream-vera/VeraBI.ttf @@ -756,129 +867,17 @@ /usr/share/themes/Clearlooks/index.theme /usr/share/vte/termcap/xterm /usr/share/xsessions/gnome.desktop -/usr/share/zoneinfo/Universal -/usr/bin/X -/usr/bin/xfs -/usr/bin/xrdb -/usr/%{_lib}/libICE.so.6 -/usr/%{_lib}/libSM.so.6 -/usr/%{_lib}/libX11.so.6 -/usr/%{_lib}/libXcursor.so.1 -/usr/%{_lib}/libXext.so.6 -/usr/%{_lib}/libXfixes.so.3 -/usr/%{_lib}/libXfont.so.1 -/usr/%{_lib}/libXft.so.2 -/usr/%{_lib}/libXinerama.so.1 -/usr/%{_lib}/libXi.so.6 -/usr/%{_lib}/libxkbfile.so.1 -/usr/%{_lib}/libXmuu.so.1 -/usr/%{_lib}/libXrandr.so.2 -/usr/%{_lib}/libXrender.so.1 -/usr/%{_lib}/xorg/modules/drivers/apm_drv.so -/usr/%{_lib}/xorg/modules/drivers/ark_drv.so -/usr/%{_lib}/xorg/modules/drivers/ati_drv.so -/usr/%{_lib}/xorg/modules/drivers/atimisc_drv.so -/usr/%{_lib}/xorg/modules/drivers/chips_drv.so -/usr/%{_lib}/xorg/modules/drivers/cirrus_alpine.so -/usr/%{_lib}/xorg/modules/drivers/cirrus_drv.so -/usr/%{_lib}/xorg/modules/drivers/cirrus_laguna.so -/usr/%{_lib}/xorg/modules/drivers/cyrix_drv.so -/usr/%{_lib}/xorg/modules/drivers/dummy_drv.so -/usr/%{_lib}/xorg/modules/drivers/fbdev_drv.so -/usr/%{_lib}/xorg/modules/drivers/glint_drv.so -/usr/%{_lib}/xorg/modules/drivers/i128_drv.so -/usr/%{_lib}/xorg/modules/drivers/i810_drv.so -/usr/%{_lib}/xorg/modules/drivers/linux/v4l_drv.so -/usr/%{_lib}/xorg/modules/drivers/mga_drv.so -/usr/%{_lib}/xorg/modules/drivers/neomagic_drv.so -/usr/%{_lib}/xorg/modules/drivers/nv_drv.so -/usr/%{_lib}/xorg/modules/drivers/r128_drv.so -/usr/%{_lib}/xorg/modules/drivers/radeon_drv.so -/usr/%{_lib}/xorg/modules/drivers/rendition_drv.so -/usr/%{_lib}/xorg/modules/drivers/riva128.so -/usr/%{_lib}/xorg/modules/drivers/s3_drv.so -/usr/%{_lib}/xorg/modules/drivers/s3virge_drv.so -/usr/%{_lib}/xorg/modules/drivers/savage_drv.so -/usr/%{_lib}/xorg/modules/drivers/siliconmotion_drv.so -/usr/%{_lib}/xorg/modules/drivers/sis_drv.so -/usr/%{_lib}/xorg/modules/drivers/tdfx_drv.so -/usr/%{_lib}/xorg/modules/drivers/tga_drv.so -/usr/%{_lib}/xorg/modules/drivers/trident_drv.so -/usr/%{_lib}/xorg/modules/drivers/tseng_drv.so -/usr/%{_lib}/xorg/modules/drivers/vesa_drv.so -/usr/%{_lib}/xorg/modules/drivers/vga_drv.so -/usr/%{_lib}/xorg/modules/drivers/vmware_drv.so -/usr/%{_lib}/xorg/modules/extensions/libdbe.so -/usr/%{_lib}/xorg/modules/extensions/libdri.so -/usr/%{_lib}/xorg/modules/extensions/libextmod.so -/usr/%{_lib}/xorg/modules/extensions/libGLcore.so -/usr/%{_lib}/xorg/modules/extensions/libglx.so -/usr/%{_lib}/xorg/modules/extensions/librecord.so -/usr/%{_lib}/xorg/modules/extensions/libxtrap.so -/usr/%{_lib}/xorg/modules/extensions/libvnc.so -/usr/%{_lib}/xorg/modules/fonts/libbitmap.so -/usr/%{_lib}/xorg/modules/fonts/libfreetype.so -/usr/%{_lib}/xorg/modules/fonts/libtype1.so -/usr/%{_lib}/xorg/modules/input/acecad_drv.so -/usr/%{_lib}/xorg/modules/input/aiptek_drv.so -/usr/%{_lib}/xorg/modules/input/calcomp_drv.so -/usr/%{_lib}/xorg/modules/input/citron_drv.so -/usr/%{_lib}/xorg/modules/input/digitaledge_drv.so -/usr/%{_lib}/xorg/modules/input/dmc_drv.so -/usr/%{_lib}/xorg/modules/input/dynapro_drv.so -/usr/%{_lib}/xorg/modules/input/elographics_drv.so -/usr/%{_lib}/xorg/modules/input/fpit_drv.so -/usr/%{_lib}/xorg/modules/input/hyperpen_drv.so -/usr/%{_lib}/xorg/modules/input/js_x_drv.so -/usr/%{_lib}/xorg/modules/input/kbd_drv.so -/usr/%{_lib}/xorg/modules/input/keyboard_drv.so -/usr/%{_lib}/xorg/modules/input/ur98_drv.so -/usr/%{_lib}/xorg/modules/input/magellan_drv.so -/usr/%{_lib}/xorg/modules/input/microtouch_drv.so -/usr/%{_lib}/xorg/modules/input/mouse_drv.so -/usr/%{_lib}/xorg/modules/input/mutouch_drv.so -/usr/%{_lib}/xorg/modules/input/palmax_drv.so -/usr/%{_lib}/xorg/modules/input/penmount_drv.so -/usr/%{_lib}/xorg/modules/input/spaceorb_drv.so -/usr/%{_lib}/xorg/modules/input/summa_drv.so -/usr/%{_lib}/xorg/modules/input/synaptics_drv.so -/usr/%{_lib}/xorg/modules/input/tek4957_drv.so -/usr/%{_lib}/xorg/modules/input/void_drv.so -/usr/%{_lib}/xorg/modules/input/wacom_drv.so -/usr/%{_lib}/xorg/modules/libafb.so -/usr/%{_lib}/xorg/modules/libcfb16.so -/usr/%{_lib}/xorg/modules/libcfb24.so -/usr/%{_lib}/xorg/modules/libcfb32.so -/usr/%{_lib}/xorg/modules/libcfb.so -/usr/%{_lib}/xorg/modules/libcw.so -/usr/%{_lib}/xorg/modules/libdamage.so -/usr/%{_lib}/xorg/modules/libddc.so -/usr/%{_lib}/xorg/modules/libfb.so -/usr/%{_lib}/xorg/modules/libi2c.so -/usr/%{_lib}/xorg/modules/libint10.so -/usr/%{_lib}/xorg/modules/liblayer.so -/usr/%{_lib}/xorg/modules/libmfb.so -/usr/%{_lib}/xorg/modules/libpcidata.so -/usr/%{_lib}/xorg/modules/librac.so -/usr/%{_lib}/xorg/modules/libramdac.so -/usr/%{_lib}/xorg/modules/libscanpci.so -/usr/%{_lib}/xorg/modules/libshadow.so -/usr/%{_lib}/xorg/modules/libvbe.so -/usr/%{_lib}/xorg/modules/libvgahw.so -/usr/%{_lib}/xorg/modules/libxaa.so -/usr/%{_lib}/xorg/modules/libxf24_32bpp.so -/usr/%{_lib}/xorg/modules/libxf4bpp.so -/usr/%{_lib}/xorg/modules/libxf8_16bpp.so -/usr/%{_lib}/xorg/modules/libxf8_32bpp.so -/usr/%{_lib}/xorg/modules/linux/libdrm.so -/usr/%{_lib}/xorg/modules/linux/libfbdevhw.so -/usr/%{_lib}/xorg/modules/linux/libint10.so -/usr/%{_lib}/xorg/modules/v20002d.uc +/usr/share/X11/fonts/misc/cursor.pcf.gz +/usr/share/X11/fonts/misc/cursor.pcf.gz +/usr/share/X11/fonts/misc/fonts.alias /usr/share/X11/fonts/misc/fonts.alias -/usr/share/X11/fonts/misc/fonts.dir /usr/share/X11/fonts/misc/fonts.alias -/usr/share/X11/fonts/misc/fonts.dir -/usr/share/X11/fonts/misc/6x13-ISO8859-1.pcf.gz -/usr/share/X11/fonts/misc/cursor.pcf.gz /usr/share/X11/fonts/misc/fonts.alias /usr/share/X11/fonts/misc/fonts.dir +/usr/share/X11/fonts/misc/fonts.dir +/usr/share/X11/fonts/misc/fonts.dir +/usr/share/X11/fonts/misc/fonts.dir +/usr/share/X11/fonts/misc/6x13-ISO8859-1.pcf.gz +/usr/share/X11/fonts/misc/6x13-ISO8859-1.pcf.gz +/usr/share/X11/locale/locale.alias +/usr/share/zoneinfo/Universal Index: readahead.files.in =================================================================== RCS file: /cvs/dist/rpms/readahead/devel/readahead.files.in,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- readahead.files.in 13 Jan 2006 08:37:50 -0000 1.5 +++ readahead.files.in 15 Mar 2006 23:55:41 -0000 1.6 @@ -369,7 +369,6 @@ /usr/bin/system-config-date /usr/bin/which /usr/bin/xmodmap -/usr/bin/xscreensaver /usr/bin/xsetroot /usr/%{_lib}/bonobo/monikers/libmoniker_std_2.so /usr/%{_lib}/bonobo/servers/Accessibility_Registry.server @@ -433,7 +432,6 @@ /usr/%{_lib}/bonobo/servers/Nautilus_shell.server /usr/%{_lib}/evolution-data-server-1.2/camel-providers/libcamelgroupwise.urls /usr/%{_lib}/evolution-data-server-1.2/camel-providers/libcamelimap.urls -/usr/%{_lib}/evolution-data-server-1.2/camel-providers/libcamelimap4.urls /usr/%{_lib}/evolution-data-server-1.2/camel-providers/libcamellocal.so /usr/%{_lib}/evolution-data-server-1.2/camel-providers/libcamellocal.urls /usr/%{_lib}/evolution-data-server-1.2/camel-providers/libcamelnntp.urls @@ -550,524 +548,524 @@ /usr/libexec/mixer_applet2 /usr/libexec/notification-area-applet /usr/libexec/wnck-applet -/usr/%{_lib}/firefox-1.5/browserconfig.properties -/usr/%{_lib}/firefox-1.5/components/accessibility-atk.xpt -/usr/%{_lib}/firefox-1.5/components/accessibility.xpt -/usr/%{_lib}/firefox-1.5/components/alerts.xpt -/usr/%{_lib}/firefox-1.5/components/appshell.xpt -/usr/%{_lib}/firefox-1.5/components/appstartup.xpt -/usr/%{_lib}/firefox-1.5/components/autocomplete.xpt -/usr/%{_lib}/firefox-1.5/components/autoconfig.xpt -/usr/%{_lib}/firefox-1.5/components/bookmarks.xpt -/usr/%{_lib}/firefox-1.5/components/browsercompsbase.xpt -/usr/%{_lib}/firefox-1.5/components/caps.xpt -/usr/%{_lib}/firefox-1.5/components/commandhandler.xpt -/usr/%{_lib}/firefox-1.5/components/commandlines.xpt -/usr/%{_lib}/firefox-1.5/components/composer.xpt -/usr/%{_lib}/firefox-1.5/components/content_base.xpt -/usr/%{_lib}/firefox-1.5/components/content_htmldoc.xpt -/usr/%{_lib}/firefox-1.5/components/content_html.xpt -/usr/%{_lib}/firefox-1.5/components/content_xmldoc.xpt -/usr/%{_lib}/firefox-1.5/components/content_xslt.xpt -/usr/%{_lib}/firefox-1.5/components/content_xtf.xpt -/usr/%{_lib}/firefox-1.5/components/cookie.xpt -/usr/%{_lib}/firefox-1.5/components/directory.xpt -/usr/%{_lib}/firefox-1.5/components/docshell.xpt -/usr/%{_lib}/firefox-1.5/components/dom_base.xpt -/usr/%{_lib}/firefox-1.5/components/dom_canvas.xpt -/usr/%{_lib}/firefox-1.5/components/dom_core.xpt -/usr/%{_lib}/firefox-1.5/components/dom_css.xpt -/usr/%{_lib}/firefox-1.5/components/dom_events.xpt -/usr/%{_lib}/firefox-1.5/components/dom_html.xpt -/usr/%{_lib}/firefox-1.5/components/dom_loadsave.xpt -/usr/%{_lib}/firefox-1.5/components/dom_range.xpt -/usr/%{_lib}/firefox-1.5/components/dom_stylesheets.xpt -/usr/%{_lib}/firefox-1.5/components/dom_svg.xpt -/usr/%{_lib}/firefox-1.5/components/dom_traversal.xpt -/usr/%{_lib}/firefox-1.5/components/dom_views.xpt -/usr/%{_lib}/firefox-1.5/components/dom_xbl.xpt -/usr/%{_lib}/firefox-1.5/components/dom_xpath.xpt -/usr/%{_lib}/firefox-1.5/components/dom.xpt -/usr/%{_lib}/firefox-1.5/components/dom_xul.xpt -/usr/%{_lib}/firefox-1.5/components/downloads.xpt -/usr/%{_lib}/firefox-1.5/components/editor.xpt -/usr/%{_lib}/firefox-1.5/components/embed_base.xpt -/usr/%{_lib}/firefox-1.5/components/extensions.xpt -/usr/%{_lib}/firefox-1.5/components/exthandler.xpt -/usr/%{_lib}/firefox-1.5/components/fastfind.xpt -/usr/%{_lib}/firefox-1.5/components/filepicker.xpt -/usr/%{_lib}/firefox-1.5/components/find.xpt -/usr/%{_lib}/firefox-1.5/components/gfx.xpt -/usr/%{_lib}/firefox-1.5/components/gksvgrenderer.xpt -/usr/%{_lib}/firefox-1.5/components/history.xpt -/usr/%{_lib}/firefox-1.5/components/htmlparser.xpt -/usr/%{_lib}/firefox-1.5/components/chardet.xpt -/usr/%{_lib}/firefox-1.5/components/chrome.xpt -/usr/%{_lib}/firefox-1.5/components/imgicon.xpt -/usr/%{_lib}/firefox-1.5/components/imglib2.xpt -/usr/%{_lib}/firefox-1.5/components/intl.xpt -/usr/%{_lib}/firefox-1.5/components/jar.xpt -/usr/%{_lib}/firefox-1.5/components/jsconsole-clhandler.js -/usr/%{_lib}/firefox-1.5/components/jsconsole.xpt -/usr/%{_lib}/firefox-1.5/components/jsdservice.xpt -/usr/%{_lib}/firefox-1.5/components/layout_base.xpt -/usr/%{_lib}/firefox-1.5/components/layout_printing.xpt -/usr/%{_lib}/firefox-1.5/components/layout_xul_tree.xpt -/usr/%{_lib}/firefox-1.5/components/layout_xul.xpt -/usr/%{_lib}/firefox-1.5/components/libaccessibility.so -/usr/%{_lib}/firefox-1.5/components/libappcomps.so -/usr/%{_lib}/firefox-1.5/components/libauth.so -/usr/%{_lib}/firefox-1.5/components/libautoconfig.so -/usr/%{_lib}/firefox-1.5/components/libbrowsercomps.so -/usr/%{_lib}/firefox-1.5/components/libbrowserdirprovider.so -/usr/%{_lib}/firefox-1.5/components/libcaps.so -/usr/%{_lib}/firefox-1.5/components/libcommandlines.so -/usr/%{_lib}/firefox-1.5/components/libcomposer.so -/usr/%{_lib}/firefox-1.5/components/libcookie.so -/usr/%{_lib}/firefox-1.5/components/libdocshell.so -/usr/%{_lib}/firefox-1.5/components/libeditor.so -/usr/%{_lib}/firefox-1.5/components/libembedcomponents.so -/usr/%{_lib}/firefox-1.5/components/libfileview.so -/usr/%{_lib}/firefox-1.5/components/libgfx_gtk.so -/usr/%{_lib}/firefox-1.5/components/libgfxps.so -/usr/%{_lib}/firefox-1.5/components/libgklayout.so -/usr/%{_lib}/firefox-1.5/components/libgkplugin.so -/usr/%{_lib}/firefox-1.5/components/libhtmlpars.so -/usr/%{_lib}/firefox-1.5/components/libchrome.so -/usr/%{_lib}/firefox-1.5/components/libimgicon.so -/usr/%{_lib}/firefox-1.5/components/libimglib2.so -/usr/%{_lib}/firefox-1.5/components/libi18n.so -/usr/%{_lib}/firefox-1.5/components/libjar50.so -/usr/%{_lib}/firefox-1.5/components/libjsd.so -/usr/%{_lib}/firefox-1.5/components/libmork.so -/usr/%{_lib}/firefox-1.5/components/libmozfind.so -/usr/%{_lib}/firefox-1.5/components/libmozgnome.so -/usr/%{_lib}/firefox-1.5/components/libnecko.so -/usr/%{_lib}/firefox-1.5/components/libnecko2.so -/usr/%{_lib}/firefox-1.5/components/libnkgnomevfs.so -/usr/%{_lib}/firefox-1.5/components/libnsappshell.so -/usr/%{_lib}/firefox-1.5/components/liboji.so -/usr/%{_lib}/firefox-1.5/components/libpermissions.so -/usr/%{_lib}/firefox-1.5/components/libpipboot.so -/usr/%{_lib}/firefox-1.5/components/libpipnss.so -/usr/%{_lib}/firefox-1.5/components/libpippki.so -/usr/%{_lib}/firefox-1.5/components/libpref.so -/usr/%{_lib}/firefox-1.5/components/librdf.so -/usr/%{_lib}/firefox-1.5/components/libremoteservice.so -/usr/%{_lib}/firefox-1.5/components/libsearchservice.so -/usr/%{_lib}/firefox-1.5/components/libsystem-pref.so -/usr/%{_lib}/firefox-1.5/components/libtoolkitcomps.so -/usr/%{_lib}/firefox-1.5/components/libtransformiix.so -/usr/%{_lib}/firefox-1.5/components/libtxmgr.so -/usr/%{_lib}/firefox-1.5/components/libuconv.so -/usr/%{_lib}/firefox-1.5/components/libucvmath.so -/usr/%{_lib}/firefox-1.5/components/libuniversalchardet.so -/usr/%{_lib}/firefox-1.5/components/libwebbrwsr.so -/usr/%{_lib}/firefox-1.5/components/libwebsrvcs.so -/usr/%{_lib}/firefox-1.5/components/libwidget_gtk2.so -/usr/%{_lib}/firefox-1.5/components/libxmlextras.so -/usr/%{_lib}/firefox-1.5/components/libxpcom_compat_c.so -/usr/%{_lib}/firefox-1.5/components/libxpconnect.so -/usr/%{_lib}/firefox-1.5/components/libxpinstall.so -/usr/%{_lib}/firefox-1.5/components/locale.xpt -/usr/%{_lib}/firefox-1.5/components/lwbrk.xpt -/usr/%{_lib}/firefox-1.5/components/migration.xpt -/usr/%{_lib}/firefox-1.5/components/mimetype.xpt -/usr/%{_lib}/firefox-1.5/components/mozbrwsr.xpt -/usr/%{_lib}/firefox-1.5/components/mozfind.xpt -/usr/%{_lib}/firefox-1.5/components/mozgnome.xpt -/usr/%{_lib}/firefox-1.5/components/necko_about.xpt -/usr/%{_lib}/firefox-1.5/components/necko_cache.xpt -/usr/%{_lib}/firefox-1.5/components/necko_cookie.xpt -/usr/%{_lib}/firefox-1.5/components/necko_data.xpt -/usr/%{_lib}/firefox-1.5/components/necko_dns.xpt -/usr/%{_lib}/firefox-1.5/components/necko_file.xpt -/usr/%{_lib}/firefox-1.5/components/necko_ftp.xpt -/usr/%{_lib}/firefox-1.5/components/necko_http.xpt -/usr/%{_lib}/firefox-1.5/components/necko_res.xpt -/usr/%{_lib}/firefox-1.5/components/necko_socket.xpt -/usr/%{_lib}/firefox-1.5/components/necko_strconv.xpt -/usr/%{_lib}/firefox-1.5/components/necko_viewsource.xpt -/usr/%{_lib}/firefox-1.5/components/necko.xpt -/usr/%{_lib}/firefox-1.5/components/nsBrowserContentHandler.js -/usr/%{_lib}/firefox-1.5/components/nsBrowserGlue.js -/usr/%{_lib}/firefox-1.5/components/nsCloseAllWindows.js -/usr/%{_lib}/firefox-1.5/components/nsDefaultCLH.js -/usr/%{_lib}/firefox-1.5/components/nsDictionary.js -/usr/%{_lib}/firefox-1.5/components/nsExtensionManager.js -/usr/%{_lib}/firefox-1.5/components/nsFilePicker.js -/usr/%{_lib}/firefox-1.5/components/nsHelperAppDlg.js -/usr/%{_lib}/firefox-1.5/components/nsInterfaceInfoToIDL.js -/usr/%{_lib}/firefox-1.5/components/nsKillAll.js -/usr/%{_lib}/firefox-1.5/components/nsProgressDialog.js -/usr/%{_lib}/firefox-1.5/components/nsProxyAutoConfig.js -/usr/%{_lib}/firefox-1.5/components/nsResetPref.js -/usr/%{_lib}/firefox-1.5/components/nsSetDefaultBrowser.js -/usr/%{_lib}/firefox-1.5/components/nsSidebar.js -/usr/%{_lib}/firefox-1.5/components/nsUpdateService.js -/usr/%{_lib}/firefox-1.5/components/nsXmlRpcClient.js -/usr/%{_lib}/firefox-1.5/components/oji.xpt -/usr/%{_lib}/firefox-1.5/components/passwordmgr.xpt -/usr/%{_lib}/firefox-1.5/components/pipboot.xpt -/usr/%{_lib}/firefox-1.5/components/pipnss.xpt -/usr/%{_lib}/firefox-1.5/components/pippki.xpt -/usr/%{_lib}/firefox-1.5/components/plugin.xpt -/usr/%{_lib}/firefox-1.5/components/prefetch.xpt -/usr/%{_lib}/firefox-1.5/components/pref.xpt -/usr/%{_lib}/firefox-1.5/components/profile.xpt -/usr/%{_lib}/firefox-1.5/components/progressDlg.xpt -/usr/%{_lib}/firefox-1.5/components/proxyObjInst.xpt -/usr/%{_lib}/firefox-1.5/components/rdf.xpt -/usr/%{_lib}/firefox-1.5/components/satchel.xpt -/usr/%{_lib}/firefox-1.5/components/search.xpt -/usr/%{_lib}/firefox-1.5/components/shellservice.xpt -/usr/%{_lib}/firefox-1.5/components/shistory.xpt -/usr/%{_lib}/firefox-1.5/components/sidebar.xpt -/usr/%{_lib}/firefox-1.5/components/toolkitprofile.xpt -/usr/%{_lib}/firefox-1.5/components/toolkitremote.xpt -/usr/%{_lib}/firefox-1.5/components/txmgr.xpt -/usr/%{_lib}/firefox-1.5/components/txtsvc.xpt -/usr/%{_lib}/firefox-1.5/components/uconv.xpt -/usr/%{_lib}/firefox-1.5/components/unicharutil.xpt -/usr/%{_lib}/firefox-1.5/components/update.xpt -/usr/%{_lib}/firefox-1.5/components/uriloader.xpt -/usr/%{_lib}/firefox-1.5/components/webBrowser_core.xpt -/usr/%{_lib}/firefox-1.5/components/webbrowserpersist.xpt -/usr/%{_lib}/firefox-1.5/components/webshell_idls.xpt -/usr/%{_lib}/firefox-1.5/components/websrvcs.xpt -/usr/%{_lib}/firefox-1.5/components/widget.xpt -/usr/%{_lib}/firefox-1.5/components/windowds.xpt -/usr/%{_lib}/firefox-1.5/components/windowwatcher.xpt -/usr/%{_lib}/firefox-1.5/components/xmlextras.xpt -/usr/%{_lib}/firefox-1.5/components/xml-rpc.xpt -/usr/%{_lib}/firefox-1.5/components/xpcom_base.xpt -/usr/%{_lib}/firefox-1.5/components/xpcom_components.xpt -/usr/%{_lib}/firefox-1.5/components/xpcom_ds.xpt -/usr/%{_lib}/firefox-1.5/components/xpcom_io.xpt -/usr/%{_lib}/firefox-1.5/components/xpcom_obsolete.xpt -/usr/%{_lib}/firefox-1.5/components/xpcom_threads.xpt -/usr/%{_lib}/firefox-1.5/components/xpcom_xpti.xpt -/usr/%{_lib}/firefox-1.5/components/xpconnect.xpt -/usr/%{_lib}/firefox-1.5/components/xpinstall.xpt -/usr/%{_lib}/firefox-1.5/components/xulapp.xpt -/usr/%{_lib}/firefox-1.5/components/xuldoc.xpt -/usr/%{_lib}/firefox-1.5/components/xultmpl.xpt -/usr/%{_lib}/firefox-1.5/defaults/autoconfig -/usr/%{_lib}/firefox-1.5/defaults/autoconfig/platform.js -/usr/%{_lib}/firefox-1.5/defaults/autoconfig/prefcalls.js -/usr/%{_lib}/firefox-1.5/defaults/pref/all-redhat.js -/usr/%{_lib}/firefox-1.5/defaults/pref/firefox.js -/usr/%{_lib}/firefox-1.5/defaults/pref/firefox-l10n.js -/usr/%{_lib}/firefox-1.5/defaults/pref/channel-prefs.js -/usr/%{_lib}/firefox-1.5/defaults/pref/reporter.js -/usr/%{_lib}/firefox-1.5/defaults/profile/bookmarks.html -/usr/%{_lib}/firefox-1.5/defaults/profile/chrome -/usr/%{_lib}/firefox-1.5/defaults/profile/chrome/userContent-example.css -/usr/%{_lib}/firefox-1.5/defaults/profile/chrome/userChrome-example.css -/usr/%{_lib}/firefox-1.5/defaults/profile/localstore.rdf -/usr/%{_lib}/firefox-1.5/defaults/profile/mimeTypes.rdf -/usr/%{_lib}/firefox-1.5/defaults/profile/prefs.js -/usr/%{_lib}/firefox-1.5/defaults/profile/search.rdf -/usr/%{_lib}/firefox-1.5/dependentlibs.list -/usr/%{_lib}/firefox-1.5/extensions/inspector at mozilla.org -/usr/%{_lib}/firefox-1.5/extensions/inspector at mozilla.org/components -/usr/%{_lib}/firefox-1.5/extensions/inspector at mozilla.org/components/inspector-cmdline.js -/usr/%{_lib}/firefox-1.5/extensions/inspector at mozilla.org/components/inspector.xpt -/usr/%{_lib}/firefox-1.5/extensions/inspector at mozilla.org/components/libinspector.so -/usr/%{_lib}/firefox-1.5/extensions/inspector at mozilla.org/defaults -/usr/%{_lib}/firefox-1.5/extensions/inspector at mozilla.org/defaults/preferences -/usr/%{_lib}/firefox-1.5/extensions/inspector at mozilla.org/defaults/preferences/inspector.js -/usr/%{_lib}/firefox-1.5/extensions/inspector at mozilla.org/chrome -/usr/%{_lib}/firefox-1.5/extensions/inspector at mozilla.org/chrome/chromelist.txt -/usr/%{_lib}/firefox-1.5/extensions/inspector at mozilla.org/chrome/inspector.jar -/usr/%{_lib}/firefox-1.5/extensions/inspector at mozilla.org/chrome.manifest -/usr/%{_lib}/firefox-1.5/extensions/inspector at mozilla.org/install.rdf -/usr/%{_lib}/firefox-1.5/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd} -/usr/%{_lib}/firefox-1.5/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf -/usr/%{_lib}/firefox-1.5/firefox -/usr/%{_lib}/firefox-1.5/firefox-bin -/usr/%{_lib}/firefox-1.5/firefox-xremote-client -/usr/%{_lib}/firefox-1.5/greprefs/all.js -/usr/%{_lib}/firefox-1.5/greprefs/all-redhat.js -/usr/%{_lib}/firefox-1.5/greprefs/security-prefs.js -/usr/%{_lib}/firefox-1.5/greprefs/xpinstall.js -/usr/%{_lib}/firefox-1.5/chrome/browser.jar -/usr/%{_lib}/firefox-1.5/chrome/browser.manifest -/usr/%{_lib}/firefox-1.5/chrome/classic.jar -/usr/%{_lib}/firefox-1.5/chrome/classic.manifest -/usr/%{_lib}/firefox-1.5/chrome/comm.jar -/usr/%{_lib}/firefox-1.5/chrome/comm.manifest -/usr/%{_lib}/firefox-1.5/chrome/en-US.jar -/usr/%{_lib}/firefox-1.5/chrome/en-US.manifest -/usr/%{_lib}/firefox-1.5/chrome/chromelist.txt -/usr/%{_lib}/firefox-1.5/chrome/icons -/usr/%{_lib}/firefox-1.5/chrome/icons/default -/usr/%{_lib}/firefox-1.5/chrome/icons/default/default.xpm -/usr/%{_lib}/firefox-1.5/chrome/pippki.jar -/usr/%{_lib}/firefox-1.5/chrome/pippki.manifest -/usr/%{_lib}/firefox-1.5/chrome/reporter.jar -/usr/%{_lib}/firefox-1.5/chrome/reporter.manifest -/usr/%{_lib}/firefox-1.5/chrome/toolkit.jar -/usr/%{_lib}/firefox-1.5/chrome/toolkit.manifest -/usr/%{_lib}/firefox-1.5/icons/default.xpm -/usr/%{_lib}/firefox-1.5/icons/document.png -/usr/%{_lib}/firefox-1.5/icons/mozicon128.png -/usr/%{_lib}/firefox-1.5/icons/mozicon16.xpm -/usr/%{_lib}/firefox-1.5/icons/mozicon50.xpm -/usr/%{_lib}/firefox-1.5/init.d -/usr/%{_lib}/firefox-1.5/init.d/README -/usr/%{_lib}/firefox-1.5/libgfxpsshar.so -/usr/%{_lib}/firefox-1.5/libgkgfx.so -/usr/%{_lib}/firefox-1.5/libgtkembedmoz.so -/usr/%{_lib}/firefox-1.5/libgtkxtbin.so -/usr/%{_lib}/firefox-1.5/libjsj.so -/usr/%{_lib}/firefox-1.5/libmozjs.so -/usr/%{_lib}/firefox-1.5/libxpcom_compat.so -/usr/%{_lib}/firefox-1.5/libxpcom_core.so -/usr/%{_lib}/firefox-1.5/libxpcom.so -/usr/%{_lib}/firefox-1.5/libxpistub.so -/usr/%{_lib}/firefox-1.5/mozilla-xremote-client -/usr/%{_lib}/firefox-1.5/plugins/libnullplugin.so -/usr/%{_lib}/firefox-1.5/plugins/libunixprintplugin.so -/usr/%{_lib}/firefox-1.5/removed-files -/usr/%{_lib}/firefox-1.5/res/arrowd.gif -/usr/%{_lib}/firefox-1.5/res/arrow.gif -/usr/%{_lib}/firefox-1.5/res/bloatcycle.html -/usr/%{_lib}/firefox-1.5/res/broken-image.gif -/usr/%{_lib}/firefox-1.5/res/cmessage.txt -/usr/%{_lib}/firefox-1.5/res/dtd/mathml.dtd -/usr/%{_lib}/firefox-1.5/res/dtd/xhtml11.dtd -/usr/%{_lib}/firefox-1.5/res/EditorOverride.css -/usr/%{_lib}/firefox-1.5/res/entityTables/htmlEntityVersions.properties -/usr/%{_lib}/firefox-1.5/res/entityTables/html40Latin1.properties -/usr/%{_lib}/firefox-1.5/res/entityTables/html40Special.properties -/usr/%{_lib}/firefox-1.5/res/entityTables/html40Symbols.properties -/usr/%{_lib}/firefox-1.5/res/entityTables/mathml20.properties -/usr/%{_lib}/firefox-1.5/res/entityTables/transliterate.properties -/usr/%{_lib}/firefox-1.5/res/fonts -/usr/%{_lib}/firefox-1.5/res/fonts/fontEncoding.properties -/usr/%{_lib}/firefox-1.5/res/fonts/mathfontCMEX10.properties -/usr/%{_lib}/firefox-1.5/res/fonts/mathfontCMSY10.properties -/usr/%{_lib}/firefox-1.5/res/fonts/mathfontMath1.properties -/usr/%{_lib}/firefox-1.5/res/fonts/mathfontMath2.properties -/usr/%{_lib}/firefox-1.5/res/fonts/mathfontMath4.properties -/usr/%{_lib}/firefox-1.5/res/fonts/mathfontMTExtra.properties -/usr/%{_lib}/firefox-1.5/res/fonts/mathfont.properties -/usr/%{_lib}/firefox-1.5/res/fonts/mathfontPUA.properties -/usr/%{_lib}/firefox-1.5/res/fonts/mathfontSymbol.properties -/usr/%{_lib}/firefox-1.5/res/fonts/pangoFontEncoding.properties -/usr/%{_lib}/firefox-1.5/res/forms.css -/usr/%{_lib}/firefox-1.5/res/grabber.gif -/usr/%{_lib}/firefox-1.5/res/hiddenWindow.html -/usr/%{_lib}/firefox-1.5/res/html.css -/usr/%{_lib}/firefox-1.5/res/html/gopher-audio.gif -/usr/%{_lib}/firefox-1.5/res/html/gopher-binary.gif -/usr/%{_lib}/firefox-1.5/res/html/gopher-find.gif -/usr/%{_lib}/firefox-1.5/res/html/gopher-image.gif -/usr/%{_lib}/firefox-1.5/res/html/gopher-menu.gif -/usr/%{_lib}/firefox-1.5/res/html/gopher-movie.gif -/usr/%{_lib}/firefox-1.5/res/html/gopher-sound.gif -/usr/%{_lib}/firefox-1.5/res/html/gopher-telnet.gif -/usr/%{_lib}/firefox-1.5/res/html/gopher-text.gif -/usr/%{_lib}/firefox-1.5/res/html/gopher-unknown.gif -/usr/%{_lib}/firefox-1.5/res/charsetalias.properties -/usr/%{_lib}/firefox-1.5/res/charsetData.properties -/usr/%{_lib}/firefox-1.5/res/langGroups.properties -/usr/%{_lib}/firefox-1.5/res/language.properties -/usr/%{_lib}/firefox-1.5/res/loading-image.gif -/usr/%{_lib}/firefox-1.5/res/mathml.css -/usr/%{_lib}/firefox-1.5/res/quirk.css -/usr/%{_lib}/firefox-1.5/res/sample.unixpsfonts.properties -/usr/%{_lib}/firefox-1.5/res/svg.css -/usr/%{_lib}/firefox-1.5/res/table-add-column-after-active.gif -/usr/%{_lib}/firefox-1.5/res/table-add-column-after.gif -/usr/%{_lib}/firefox-1.5/res/table-add-column-after-hover.gif -/usr/%{_lib}/firefox-1.5/res/table-add-column-before-active.gif -/usr/%{_lib}/firefox-1.5/res/table-add-column-before.gif -/usr/%{_lib}/firefox-1.5/res/table-add-column-before-hover.gif -/usr/%{_lib}/firefox-1.5/res/table-add-row-after-active.gif -/usr/%{_lib}/firefox-1.5/res/table-add-row-after.gif -/usr/%{_lib}/firefox-1.5/res/table-add-row-after-hover.gif -/usr/%{_lib}/firefox-1.5/res/table-add-row-before-active.gif -/usr/%{_lib}/firefox-1.5/res/table-add-row-before.gif -/usr/%{_lib}/firefox-1.5/res/table-add-row-before-hover.gif -/usr/%{_lib}/firefox-1.5/res/table-remove-column-active.gif -/usr/%{_lib}/firefox-1.5/res/table-remove-column.gif -/usr/%{_lib}/firefox-1.5/res/table-remove-column-hover.gif -/usr/%{_lib}/firefox-1.5/res/table-remove-row-active.gif -/usr/%{_lib}/firefox-1.5/res/table-remove-row.gif -/usr/%{_lib}/firefox-1.5/res/table-remove-row-hover.gif -/usr/%{_lib}/firefox-1.5/res/ua.css -/usr/%{_lib}/firefox-1.5/res/unixcharset.properties -/usr/%{_lib}/firefox-1.5/res/viewer.properties -/usr/%{_lib}/firefox-1.5/res/viewsource.css -/usr/%{_lib}/firefox-1.5/run-mozilla.sh -/usr/%{_lib}/firefox-1.5/searchplugins/amazondotcom.png -/usr/%{_lib}/firefox-1.5/searchplugins/amazondotcom.src -/usr/%{_lib}/firefox-1.5/searchplugins/answers.png -/usr/%{_lib}/firefox-1.5/searchplugins/answers.src -/usr/%{_lib}/firefox-1.5/searchplugins/creativecommons.png -/usr/%{_lib}/firefox-1.5/searchplugins/creativecommons.src -/usr/%{_lib}/firefox-1.5/searchplugins/eBay.gif -/usr/%{_lib}/firefox-1.5/searchplugins/eBay.src -/usr/%{_lib}/firefox-1.5/searchplugins/google.gif -/usr/%{_lib}/firefox-1.5/searchplugins/google.src -/usr/%{_lib}/firefox-1.5/searchplugins/yahoo.gif -/usr/%{_lib}/firefox-1.5/searchplugins/yahoo.src -/usr/%{_lib}/firefox-1.5/updater -/usr/%{_lib}/firefox-1.5/updater.ini -/usr/%{_lib}/firefox-1.5/xpicleanup +/usr/libexec/xscreensaver +/usr/%{_lib}/firefox-1.5.0.1/browserconfig.properties +/usr/%{_lib}/firefox-1.5.0.1/components/accessibility-atk.xpt +/usr/%{_lib}/firefox-1.5.0.1/components/accessibility.xpt +/usr/%{_lib}/firefox-1.5.0.1/components/alerts.xpt +/usr/%{_lib}/firefox-1.5.0.1/components/appshell.xpt +/usr/%{_lib}/firefox-1.5.0.1/components/appstartup.xpt +/usr/%{_lib}/firefox-1.5.0.1/components/autocomplete.xpt +/usr/%{_lib}/firefox-1.5.0.1/components/autoconfig.xpt +/usr/%{_lib}/firefox-1.5.0.1/components/bookmarks.xpt +/usr/%{_lib}/firefox-1.5.0.1/components/browsercompsbase.xpt +/usr/%{_lib}/firefox-1.5.0.1/components/caps.xpt +/usr/%{_lib}/firefox-1.5.0.1/components/commandhandler.xpt +/usr/%{_lib}/firefox-1.5.0.1/components/commandlines.xpt +/usr/%{_lib}/firefox-1.5.0.1/components/composer.xpt +/usr/%{_lib}/firefox-1.5.0.1/components/content_base.xpt +/usr/%{_lib}/firefox-1.5.0.1/components/content_htmldoc.xpt +/usr/%{_lib}/firefox-1.5.0.1/components/content_html.xpt +/usr/%{_lib}/firefox-1.5.0.1/components/content_xmldoc.xpt +/usr/%{_lib}/firefox-1.5.0.1/components/content_xslt.xpt +/usr/%{_lib}/firefox-1.5.0.1/components/content_xtf.xpt +/usr/%{_lib}/firefox-1.5.0.1/components/cookie.xpt +/usr/%{_lib}/firefox-1.5.0.1/components/directory.xpt +/usr/%{_lib}/firefox-1.5.0.1/components/docshell.xpt +/usr/%{_lib}/firefox-1.5.0.1/components/dom_base.xpt +/usr/%{_lib}/firefox-1.5.0.1/components/dom_canvas.xpt +/usr/%{_lib}/firefox-1.5.0.1/components/dom_core.xpt +/usr/%{_lib}/firefox-1.5.0.1/components/dom_css.xpt +/usr/%{_lib}/firefox-1.5.0.1/components/dom_events.xpt +/usr/%{_lib}/firefox-1.5.0.1/components/dom_html.xpt +/usr/%{_lib}/firefox-1.5.0.1/components/dom_loadsave.xpt +/usr/%{_lib}/firefox-1.5.0.1/components/dom_range.xpt +/usr/%{_lib}/firefox-1.5.0.1/components/dom_stylesheets.xpt +/usr/%{_lib}/firefox-1.5.0.1/components/dom_svg.xpt +/usr/%{_lib}/firefox-1.5.0.1/components/dom_traversal.xpt +/usr/%{_lib}/firefox-1.5.0.1/components/dom_views.xpt +/usr/%{_lib}/firefox-1.5.0.1/components/dom_xbl.xpt +/usr/%{_lib}/firefox-1.5.0.1/components/dom_xpath.xpt +/usr/%{_lib}/firefox-1.5.0.1/components/dom.xpt +/usr/%{_lib}/firefox-1.5.0.1/components/dom_xul.xpt +/usr/%{_lib}/firefox-1.5.0.1/components/downloads.xpt +/usr/%{_lib}/firefox-1.5.0.1/components/editor.xpt +/usr/%{_lib}/firefox-1.5.0.1/components/embed_base.xpt +/usr/%{_lib}/firefox-1.5.0.1/components/extensions.xpt +/usr/%{_lib}/firefox-1.5.0.1/components/exthandler.xpt +/usr/%{_lib}/firefox-1.5.0.1/components/fastfind.xpt +/usr/%{_lib}/firefox-1.5.0.1/components/filepicker.xpt +/usr/%{_lib}/firefox-1.5.0.1/components/find.xpt +/usr/%{_lib}/firefox-1.5.0.1/components/gfx.xpt +/usr/%{_lib}/firefox-1.5.0.1/components/gksvgrenderer.xpt +/usr/%{_lib}/firefox-1.5.0.1/components/history.xpt +/usr/%{_lib}/firefox-1.5.0.1/components/htmlparser.xpt +/usr/%{_lib}/firefox-1.5.0.1/components/chardet.xpt +/usr/%{_lib}/firefox-1.5.0.1/components/chrome.xpt +/usr/%{_lib}/firefox-1.5.0.1/components/imgicon.xpt +/usr/%{_lib}/firefox-1.5.0.1/components/imglib2.xpt +/usr/%{_lib}/firefox-1.5.0.1/components/intl.xpt +/usr/%{_lib}/firefox-1.5.0.1/components/jar.xpt +/usr/%{_lib}/firefox-1.5.0.1/components/jsconsole-clhandler.js +/usr/%{_lib}/firefox-1.5.0.1/components/jsconsole.xpt +/usr/%{_lib}/firefox-1.5.0.1/components/jsdservice.xpt +/usr/%{_lib}/firefox-1.5.0.1/components/layout_base.xpt +/usr/%{_lib}/firefox-1.5.0.1/components/layout_printing.xpt +/usr/%{_lib}/firefox-1.5.0.1/components/layout_xul_tree.xpt +/usr/%{_lib}/firefox-1.5.0.1/components/layout_xul.xpt +/usr/%{_lib}/firefox-1.5.0.1/components/libaccessibility.so +/usr/%{_lib}/firefox-1.5.0.1/components/libappcomps.so +/usr/%{_lib}/firefox-1.5.0.1/components/libauth.so +/usr/%{_lib}/firefox-1.5.0.1/components/libautoconfig.so +/usr/%{_lib}/firefox-1.5.0.1/components/libbrowsercomps.so +/usr/%{_lib}/firefox-1.5.0.1/components/libbrowserdirprovider.so +/usr/%{_lib}/firefox-1.5.0.1/components/libcaps.so +/usr/%{_lib}/firefox-1.5.0.1/components/libcommandlines.so +/usr/%{_lib}/firefox-1.5.0.1/components/libcomposer.so +/usr/%{_lib}/firefox-1.5.0.1/components/libcookie.so +/usr/%{_lib}/firefox-1.5.0.1/components/libdocshell.so +/usr/%{_lib}/firefox-1.5.0.1/components/libeditor.so +/usr/%{_lib}/firefox-1.5.0.1/components/libembedcomponents.so +/usr/%{_lib}/firefox-1.5.0.1/components/libfileview.so +/usr/%{_lib}/firefox-1.5.0.1/components/libgfx_gtk.so +/usr/%{_lib}/firefox-1.5.0.1/components/libgfxps.so +/usr/%{_lib}/firefox-1.5.0.1/components/libgklayout.so +/usr/%{_lib}/firefox-1.5.0.1/components/libgkplugin.so +/usr/%{_lib}/firefox-1.5.0.1/components/libhtmlpars.so +/usr/%{_lib}/firefox-1.5.0.1/components/libchrome.so +/usr/%{_lib}/firefox-1.5.0.1/components/libimgicon.so +/usr/%{_lib}/firefox-1.5.0.1/components/libimglib2.so +/usr/%{_lib}/firefox-1.5.0.1/components/libi18n.so +/usr/%{_lib}/firefox-1.5.0.1/components/libjar50.so +/usr/%{_lib}/firefox-1.5.0.1/components/libjsd.so +/usr/%{_lib}/firefox-1.5.0.1/components/libmork.so +/usr/%{_lib}/firefox-1.5.0.1/components/libmozfind.so +/usr/%{_lib}/firefox-1.5.0.1/components/libmozgnome.so +/usr/%{_lib}/firefox-1.5.0.1/components/libnecko.so +/usr/%{_lib}/firefox-1.5.0.1/components/libnecko2.so +/usr/%{_lib}/firefox-1.5.0.1/components/libnkgnomevfs.so +/usr/%{_lib}/firefox-1.5.0.1/components/libnsappshell.so +/usr/%{_lib}/firefox-1.5.0.1/components/liboji.so +/usr/%{_lib}/firefox-1.5.0.1/components/libpermissions.so +/usr/%{_lib}/firefox-1.5.0.1/components/libpipboot.so +/usr/%{_lib}/firefox-1.5.0.1/components/libpipnss.so +/usr/%{_lib}/firefox-1.5.0.1/components/libpippki.so +/usr/%{_lib}/firefox-1.5.0.1/components/libpref.so +/usr/%{_lib}/firefox-1.5.0.1/components/librdf.so +/usr/%{_lib}/firefox-1.5.0.1/components/libremoteservice.so +/usr/%{_lib}/firefox-1.5.0.1/components/libsearchservice.so +/usr/%{_lib}/firefox-1.5.0.1/components/libsystem-pref.so +/usr/%{_lib}/firefox-1.5.0.1/components/libtoolkitcomps.so +/usr/%{_lib}/firefox-1.5.0.1/components/libtransformiix.so +/usr/%{_lib}/firefox-1.5.0.1/components/libtxmgr.so +/usr/%{_lib}/firefox-1.5.0.1/components/libuconv.so +/usr/%{_lib}/firefox-1.5.0.1/components/libucvmath.so +/usr/%{_lib}/firefox-1.5.0.1/components/libuniversalchardet.so +/usr/%{_lib}/firefox-1.5.0.1/components/libwebbrwsr.so +/usr/%{_lib}/firefox-1.5.0.1/components/libwebsrvcs.so +/usr/%{_lib}/firefox-1.5.0.1/components/libwidget_gtk2.so +/usr/%{_lib}/firefox-1.5.0.1/components/libxmlextras.so +/usr/%{_lib}/firefox-1.5.0.1/components/libxpcom_compat_c.so +/usr/%{_lib}/firefox-1.5.0.1/components/libxpconnect.so +/usr/%{_lib}/firefox-1.5.0.1/components/libxpinstall.so +/usr/%{_lib}/firefox-1.5.0.1/components/locale.xpt +/usr/%{_lib}/firefox-1.5.0.1/components/lwbrk.xpt +/usr/%{_lib}/firefox-1.5.0.1/components/migration.xpt +/usr/%{_lib}/firefox-1.5.0.1/components/mimetype.xpt +/usr/%{_lib}/firefox-1.5.0.1/components/mozbrwsr.xpt +/usr/%{_lib}/firefox-1.5.0.1/components/mozfind.xpt +/usr/%{_lib}/firefox-1.5.0.1/components/mozgnome.xpt +/usr/%{_lib}/firefox-1.5.0.1/components/necko_about.xpt +/usr/%{_lib}/firefox-1.5.0.1/components/necko_cache.xpt +/usr/%{_lib}/firefox-1.5.0.1/components/necko_cookie.xpt +/usr/%{_lib}/firefox-1.5.0.1/components/necko_data.xpt +/usr/%{_lib}/firefox-1.5.0.1/components/necko_dns.xpt +/usr/%{_lib}/firefox-1.5.0.1/components/necko_file.xpt +/usr/%{_lib}/firefox-1.5.0.1/components/necko_ftp.xpt +/usr/%{_lib}/firefox-1.5.0.1/components/necko_http.xpt +/usr/%{_lib}/firefox-1.5.0.1/components/necko_res.xpt +/usr/%{_lib}/firefox-1.5.0.1/components/necko_socket.xpt +/usr/%{_lib}/firefox-1.5.0.1/components/necko_strconv.xpt +/usr/%{_lib}/firefox-1.5.0.1/components/necko_viewsource.xpt +/usr/%{_lib}/firefox-1.5.0.1/components/necko.xpt +/usr/%{_lib}/firefox-1.5.0.1/components/nsBrowserContentHandler.js +/usr/%{_lib}/firefox-1.5.0.1/components/nsBrowserGlue.js +/usr/%{_lib}/firefox-1.5.0.1/components/nsCloseAllWindows.js +/usr/%{_lib}/firefox-1.5.0.1/components/nsDefaultCLH.js +/usr/%{_lib}/firefox-1.5.0.1/components/nsDictionary.js +/usr/%{_lib}/firefox-1.5.0.1/components/nsExtensionManager.js +/usr/%{_lib}/firefox-1.5.0.1/components/nsFilePicker.js +/usr/%{_lib}/firefox-1.5.0.1/components/nsHelperAppDlg.js +/usr/%{_lib}/firefox-1.5.0.1/components/nsInterfaceInfoToIDL.js +/usr/%{_lib}/firefox-1.5.0.1/components/nsKillAll.js +/usr/%{_lib}/firefox-1.5.0.1/components/nsProgressDialog.js +/usr/%{_lib}/firefox-1.5.0.1/components/nsProxyAutoConfig.js +/usr/%{_lib}/firefox-1.5.0.1/components/nsResetPref.js +/usr/%{_lib}/firefox-1.5.0.1/components/nsSetDefaultBrowser.js +/usr/%{_lib}/firefox-1.5.0.1/components/nsSidebar.js +/usr/%{_lib}/firefox-1.5.0.1/components/nsUpdateService.js +/usr/%{_lib}/firefox-1.5.0.1/components/nsXmlRpcClient.js +/usr/%{_lib}/firefox-1.5.0.1/components/oji.xpt +/usr/%{_lib}/firefox-1.5.0.1/components/passwordmgr.xpt +/usr/%{_lib}/firefox-1.5.0.1/components/pipboot.xpt +/usr/%{_lib}/firefox-1.5.0.1/components/pipnss.xpt +/usr/%{_lib}/firefox-1.5.0.1/components/pippki.xpt +/usr/%{_lib}/firefox-1.5.0.1/components/plugin.xpt +/usr/%{_lib}/firefox-1.5.0.1/components/prefetch.xpt +/usr/%{_lib}/firefox-1.5.0.1/components/pref.xpt +/usr/%{_lib}/firefox-1.5.0.1/components/profile.xpt +/usr/%{_lib}/firefox-1.5.0.1/components/progressDlg.xpt +/usr/%{_lib}/firefox-1.5.0.1/components/proxyObjInst.xpt +/usr/%{_lib}/firefox-1.5.0.1/components/rdf.xpt +/usr/%{_lib}/firefox-1.5.0.1/components/satchel.xpt +/usr/%{_lib}/firefox-1.5.0.1/components/search.xpt +/usr/%{_lib}/firefox-1.5.0.1/components/shellservice.xpt +/usr/%{_lib}/firefox-1.5.0.1/components/shistory.xpt +/usr/%{_lib}/firefox-1.5.0.1/components/sidebar.xpt +/usr/%{_lib}/firefox-1.5.0.1/components/toolkitprofile.xpt +/usr/%{_lib}/firefox-1.5.0.1/components/toolkitremote.xpt +/usr/%{_lib}/firefox-1.5.0.1/components/txmgr.xpt +/usr/%{_lib}/firefox-1.5.0.1/components/txtsvc.xpt +/usr/%{_lib}/firefox-1.5.0.1/components/uconv.xpt +/usr/%{_lib}/firefox-1.5.0.1/components/unicharutil.xpt +/usr/%{_lib}/firefox-1.5.0.1/components/update.xpt +/usr/%{_lib}/firefox-1.5.0.1/components/uriloader.xpt +/usr/%{_lib}/firefox-1.5.0.1/components/webBrowser_core.xpt +/usr/%{_lib}/firefox-1.5.0.1/components/webbrowserpersist.xpt +/usr/%{_lib}/firefox-1.5.0.1/components/webshell_idls.xpt +/usr/%{_lib}/firefox-1.5.0.1/components/websrvcs.xpt +/usr/%{_lib}/firefox-1.5.0.1/components/widget.xpt +/usr/%{_lib}/firefox-1.5.0.1/components/windowds.xpt +/usr/%{_lib}/firefox-1.5.0.1/components/windowwatcher.xpt +/usr/%{_lib}/firefox-1.5.0.1/components/xmlextras.xpt +/usr/%{_lib}/firefox-1.5.0.1/components/xml-rpc.xpt +/usr/%{_lib}/firefox-1.5.0.1/components/xpcom_base.xpt +/usr/%{_lib}/firefox-1.5.0.1/components/xpcom_components.xpt +/usr/%{_lib}/firefox-1.5.0.1/components/xpcom_ds.xpt +/usr/%{_lib}/firefox-1.5.0.1/components/xpcom_io.xpt +/usr/%{_lib}/firefox-1.5.0.1/components/xpcom_obsolete.xpt +/usr/%{_lib}/firefox-1.5.0.1/components/xpcom_threads.xpt +/usr/%{_lib}/firefox-1.5.0.1/components/xpcom_xpti.xpt +/usr/%{_lib}/firefox-1.5.0.1/components/xpconnect.xpt +/usr/%{_lib}/firefox-1.5.0.1/components/xpinstall.xpt +/usr/%{_lib}/firefox-1.5.0.1/components/xulapp.xpt +/usr/%{_lib}/firefox-1.5.0.1/components/xuldoc.xpt +/usr/%{_lib}/firefox-1.5.0.1/components/xultmpl.xpt +/usr/%{_lib}/firefox-1.5.0.1/defaults/autoconfig +/usr/%{_lib}/firefox-1.5.0.1/defaults/autoconfig/platform.js +/usr/%{_lib}/firefox-1.5.0.1/defaults/autoconfig/prefcalls.js +/usr/%{_lib}/firefox-1.5.0.1/defaults/pref/all-redhat.js +/usr/%{_lib}/firefox-1.5.0.1/defaults/pref/firefox.js +/usr/%{_lib}/firefox-1.5.0.1/defaults/pref/firefox-l10n.js +/usr/%{_lib}/firefox-1.5.0.1/defaults/pref/channel-prefs.js +/usr/%{_lib}/firefox-1.5.0.1/defaults/pref/reporter.js +/usr/%{_lib}/firefox-1.5.0.1/defaults/profile/bookmarks.html +/usr/%{_lib}/firefox-1.5.0.1/defaults/profile/chrome +/usr/%{_lib}/firefox-1.5.0.1/defaults/profile/chrome/userContent-example.css +/usr/%{_lib}/firefox-1.5.0.1/defaults/profile/chrome/userChrome-example.css +/usr/%{_lib}/firefox-1.5.0.1/defaults/profile/localstore.rdf +/usr/%{_lib}/firefox-1.5.0.1/defaults/profile/mimeTypes.rdf +/usr/%{_lib}/firefox-1.5.0.1/defaults/profile/prefs.js +/usr/%{_lib}/firefox-1.5.0.1/defaults/profile/search.rdf +/usr/%{_lib}/firefox-1.5.0.1/dependentlibs.list +/usr/%{_lib}/firefox-1.5.0.1/extensions/inspector at mozilla.org +/usr/%{_lib}/firefox-1.5.0.1/extensions/inspector at mozilla.org/components +/usr/%{_lib}/firefox-1.5.0.1/extensions/inspector at mozilla.org/components/inspector-cmdline.js +/usr/%{_lib}/firefox-1.5.0.1/extensions/inspector at mozilla.org/components/inspector.xpt +/usr/%{_lib}/firefox-1.5.0.1/extensions/inspector at mozilla.org/components/libinspector.so +/usr/%{_lib}/firefox-1.5.0.1/extensions/inspector at mozilla.org/defaults +/usr/%{_lib}/firefox-1.5.0.1/extensions/inspector at mozilla.org/defaults/preferences +/usr/%{_lib}/firefox-1.5.0.1/extensions/inspector at mozilla.org/defaults/preferences/inspector.js +/usr/%{_lib}/firefox-1.5.0.1/extensions/inspector at mozilla.org/chrome +/usr/%{_lib}/firefox-1.5.0.1/extensions/inspector at mozilla.org/chrome/chromelist.txt +/usr/%{_lib}/firefox-1.5.0.1/extensions/inspector at mozilla.org/chrome/inspector.jar +/usr/%{_lib}/firefox-1.5.0.1/extensions/inspector at mozilla.org/chrome.manifest +/usr/%{_lib}/firefox-1.5.0.1/extensions/inspector at mozilla.org/install.rdf +/usr/%{_lib}/firefox-1.5.0.1/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd} +/usr/%{_lib}/firefox-1.5.0.1/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf +/usr/%{_lib}/firefox-1.5.0.1/firefox +/usr/%{_lib}/firefox-1.5.0.1/firefox-bin +/usr/%{_lib}/firefox-1.5.0.1/firefox-xremote-client +/usr/%{_lib}/firefox-1.5.0.1/greprefs/all.js +/usr/%{_lib}/firefox-1.5.0.1/greprefs/all-redhat.js +/usr/%{_lib}/firefox-1.5.0.1/greprefs/security-prefs.js +/usr/%{_lib}/firefox-1.5.0.1/greprefs/xpinstall.js +/usr/%{_lib}/firefox-1.5.0.1/chrome/browser.jar +/usr/%{_lib}/firefox-1.5.0.1/chrome/browser.manifest +/usr/%{_lib}/firefox-1.5.0.1/chrome/classic.jar +/usr/%{_lib}/firefox-1.5.0.1/chrome/classic.manifest +/usr/%{_lib}/firefox-1.5.0.1/chrome/comm.jar +/usr/%{_lib}/firefox-1.5.0.1/chrome/comm.manifest +/usr/%{_lib}/firefox-1.5.0.1/chrome/en-US.jar +/usr/%{_lib}/firefox-1.5.0.1/chrome/en-US.manifest +/usr/%{_lib}/firefox-1.5.0.1/chrome/chromelist.txt +/usr/%{_lib}/firefox-1.5.0.1/chrome/icons +/usr/%{_lib}/firefox-1.5.0.1/chrome/icons/default +/usr/%{_lib}/firefox-1.5.0.1/chrome/icons/default/default.xpm +/usr/%{_lib}/firefox-1.5.0.1/chrome/pippki.jar +/usr/%{_lib}/firefox-1.5.0.1/chrome/pippki.manifest +/usr/%{_lib}/firefox-1.5.0.1/chrome/reporter.jar +/usr/%{_lib}/firefox-1.5.0.1/chrome/reporter.manifest +/usr/%{_lib}/firefox-1.5.0.1/chrome/toolkit.jar +/usr/%{_lib}/firefox-1.5.0.1/chrome/toolkit.manifest +/usr/%{_lib}/firefox-1.5.0.1/icons/default.xpm +/usr/%{_lib}/firefox-1.5.0.1/icons/document.png +/usr/%{_lib}/firefox-1.5.0.1/icons/mozicon128.png +/usr/%{_lib}/firefox-1.5.0.1/icons/mozicon16.xpm +/usr/%{_lib}/firefox-1.5.0.1/icons/mozicon50.xpm +/usr/%{_lib}/firefox-1.5.0.1/init.d +/usr/%{_lib}/firefox-1.5.0.1/init.d/README +/usr/%{_lib}/firefox-1.5.0.1/libgfxpsshar.so +/usr/%{_lib}/firefox-1.5.0.1/libgkgfx.so +/usr/%{_lib}/firefox-1.5.0.1/libgtkembedmoz.so +/usr/%{_lib}/firefox-1.5.0.1/libgtkxtbin.so +/usr/%{_lib}/firefox-1.5.0.1/libjsj.so +/usr/%{_lib}/firefox-1.5.0.1/libmozjs.so +/usr/%{_lib}/firefox-1.5.0.1/libxpcom_compat.so +/usr/%{_lib}/firefox-1.5.0.1/libxpcom_core.so +/usr/%{_lib}/firefox-1.5.0.1/libxpcom.so +/usr/%{_lib}/firefox-1.5.0.1/libxpistub.so +/usr/%{_lib}/firefox-1.5.0.1/mozilla-xremote-client +/usr/%{_lib}/firefox-1.5.0.1/plugins/libnullplugin.so +/usr/%{_lib}/firefox-1.5.0.1/plugins/libunixprintplugin.so +/usr/%{_lib}/firefox-1.5.0.1/removed-files +/usr/%{_lib}/firefox-1.5.0.1/res/arrowd.gif +/usr/%{_lib}/firefox-1.5.0.1/res/arrow.gif +/usr/%{_lib}/firefox-1.5.0.1/res/bloatcycle.html +/usr/%{_lib}/firefox-1.5.0.1/res/broken-image.gif +/usr/%{_lib}/firefox-1.5.0.1/res/cmessage.txt +/usr/%{_lib}/firefox-1.5.0.1/res/dtd/mathml.dtd +/usr/%{_lib}/firefox-1.5.0.1/res/dtd/xhtml11.dtd +/usr/%{_lib}/firefox-1.5.0.1/res/EditorOverride.css +/usr/%{_lib}/firefox-1.5.0.1/res/entityTables/htmlEntityVersions.properties +/usr/%{_lib}/firefox-1.5.0.1/res/entityTables/html40Latin1.properties +/usr/%{_lib}/firefox-1.5.0.1/res/entityTables/html40Special.properties +/usr/%{_lib}/firefox-1.5.0.1/res/entityTables/html40Symbols.properties +/usr/%{_lib}/firefox-1.5.0.1/res/entityTables/mathml20.properties +/usr/%{_lib}/firefox-1.5.0.1/res/entityTables/transliterate.properties +/usr/%{_lib}/firefox-1.5.0.1/res/fonts +/usr/%{_lib}/firefox-1.5.0.1/res/fonts/fontEncoding.properties +/usr/%{_lib}/firefox-1.5.0.1/res/fonts/mathfontCMEX10.properties +/usr/%{_lib}/firefox-1.5.0.1/res/fonts/mathfontCMSY10.properties +/usr/%{_lib}/firefox-1.5.0.1/res/fonts/mathfontMath1.properties +/usr/%{_lib}/firefox-1.5.0.1/res/fonts/mathfontMath2.properties +/usr/%{_lib}/firefox-1.5.0.1/res/fonts/mathfontMath4.properties +/usr/%{_lib}/firefox-1.5.0.1/res/fonts/mathfontMTExtra.properties +/usr/%{_lib}/firefox-1.5.0.1/res/fonts/mathfont.properties +/usr/%{_lib}/firefox-1.5.0.1/res/fonts/mathfontPUA.properties +/usr/%{_lib}/firefox-1.5.0.1/res/fonts/mathfontSymbol.properties +/usr/%{_lib}/firefox-1.5.0.1/res/fonts/pangoFontEncoding.properties +/usr/%{_lib}/firefox-1.5.0.1/res/forms.css +/usr/%{_lib}/firefox-1.5.0.1/res/grabber.gif +/usr/%{_lib}/firefox-1.5.0.1/res/hiddenWindow.html +/usr/%{_lib}/firefox-1.5.0.1/res/html.css +/usr/%{_lib}/firefox-1.5.0.1/res/html/gopher-audio.gif +/usr/%{_lib}/firefox-1.5.0.1/res/html/gopher-binary.gif +/usr/%{_lib}/firefox-1.5.0.1/res/html/gopher-find.gif +/usr/%{_lib}/firefox-1.5.0.1/res/html/gopher-image.gif +/usr/%{_lib}/firefox-1.5.0.1/res/html/gopher-menu.gif +/usr/%{_lib}/firefox-1.5.0.1/res/html/gopher-movie.gif +/usr/%{_lib}/firefox-1.5.0.1/res/html/gopher-sound.gif +/usr/%{_lib}/firefox-1.5.0.1/res/html/gopher-telnet.gif +/usr/%{_lib}/firefox-1.5.0.1/res/html/gopher-text.gif +/usr/%{_lib}/firefox-1.5.0.1/res/html/gopher-unknown.gif +/usr/%{_lib}/firefox-1.5.0.1/res/charsetalias.properties +/usr/%{_lib}/firefox-1.5.0.1/res/charsetData.properties +/usr/%{_lib}/firefox-1.5.0.1/res/langGroups.properties +/usr/%{_lib}/firefox-1.5.0.1/res/language.properties +/usr/%{_lib}/firefox-1.5.0.1/res/loading-image.gif +/usr/%{_lib}/firefox-1.5.0.1/res/mathml.css +/usr/%{_lib}/firefox-1.5.0.1/res/quirk.css +/usr/%{_lib}/firefox-1.5.0.1/res/sample.unixpsfonts.properties +/usr/%{_lib}/firefox-1.5.0.1/res/svg.css +/usr/%{_lib}/firefox-1.5.0.1/res/table-add-column-after-active.gif +/usr/%{_lib}/firefox-1.5.0.1/res/table-add-column-after.gif +/usr/%{_lib}/firefox-1.5.0.1/res/table-add-column-after-hover.gif +/usr/%{_lib}/firefox-1.5.0.1/res/table-add-column-before-active.gif +/usr/%{_lib}/firefox-1.5.0.1/res/table-add-column-before.gif +/usr/%{_lib}/firefox-1.5.0.1/res/table-add-column-before-hover.gif +/usr/%{_lib}/firefox-1.5.0.1/res/table-add-row-after-active.gif +/usr/%{_lib}/firefox-1.5.0.1/res/table-add-row-after.gif +/usr/%{_lib}/firefox-1.5.0.1/res/table-add-row-after-hover.gif +/usr/%{_lib}/firefox-1.5.0.1/res/table-add-row-before-active.gif +/usr/%{_lib}/firefox-1.5.0.1/res/table-add-row-before.gif +/usr/%{_lib}/firefox-1.5.0.1/res/table-add-row-before-hover.gif +/usr/%{_lib}/firefox-1.5.0.1/res/table-remove-column-active.gif +/usr/%{_lib}/firefox-1.5.0.1/res/table-remove-column.gif +/usr/%{_lib}/firefox-1.5.0.1/res/table-remove-column-hover.gif +/usr/%{_lib}/firefox-1.5.0.1/res/table-remove-row-active.gif +/usr/%{_lib}/firefox-1.5.0.1/res/table-remove-row.gif +/usr/%{_lib}/firefox-1.5.0.1/res/table-remove-row-hover.gif +/usr/%{_lib}/firefox-1.5.0.1/res/ua.css +/usr/%{_lib}/firefox-1.5.0.1/res/unixcharset.properties +/usr/%{_lib}/firefox-1.5.0.1/res/viewer.properties +/usr/%{_lib}/firefox-1.5.0.1/res/viewsource.css +/usr/%{_lib}/firefox-1.5.0.1/run-mozilla.sh +/usr/%{_lib}/firefox-1.5.0.1/searchplugins/amazondotcom.png +/usr/%{_lib}/firefox-1.5.0.1/searchplugins/amazondotcom.src +/usr/%{_lib}/firefox-1.5.0.1/searchplugins/answers.png +/usr/%{_lib}/firefox-1.5.0.1/searchplugins/answers.src +/usr/%{_lib}/firefox-1.5.0.1/searchplugins/creativecommons.png +/usr/%{_lib}/firefox-1.5.0.1/searchplugins/creativecommons.src +/usr/%{_lib}/firefox-1.5.0.1/searchplugins/eBay.gif +/usr/%{_lib}/firefox-1.5.0.1/searchplugins/eBay.src +/usr/%{_lib}/firefox-1.5.0.1/searchplugins/google.gif +/usr/%{_lib}/firefox-1.5.0.1/searchplugins/google.src +/usr/%{_lib}/firefox-1.5.0.1/searchplugins/yahoo.gif +/usr/%{_lib}/firefox-1.5.0.1/searchplugins/yahoo.src +/usr/%{_lib}/firefox-1.5.0.1/updater +/usr/%{_lib}/firefox-1.5.0.1/updater.ini +/usr/%{_lib}/firefox-1.5.0.1/xpicleanup /usr/%{_lib}/GConf/2/libgconfbackend-xml.so /usr/%{_lib}/gconv/UTF-16.so /usr/%{_lib}/gnome-vfs-2.0/modules/libfile.so /usr/%{_lib}/gnome-vfs-2.0/modules/libmapping.so -/usr/%{_lib}/gstreamer-0.8/libgstac3parse.so -/usr/%{_lib}/gstreamer-0.8/libgstadder.so -/usr/%{_lib}/gstreamer-0.8/libgstalaw.so -/usr/%{_lib}/gstreamer-0.8/libgstalphacolor.so -/usr/%{_lib}/gstreamer-0.8/libgstalpha.so -/usr/%{_lib}/gstreamer-0.8/libgstalsa.so -/usr/%{_lib}/gstreamer-0.8/libgstapetag.so -/usr/%{_lib}/gstreamer-0.8/libgstartsdsink.so -/usr/%{_lib}/gstreamer-0.8/libgstarts.so -/usr/%{_lib}/gstreamer-0.8/libgstasf.so -/usr/%{_lib}/gstreamer-0.8/libgstaudioconvert.so -/usr/%{_lib}/gstreamer-0.8/libgstaudiofile.so -/usr/%{_lib}/gstreamer-0.8/libgstaudiofilter.so -/usr/%{_lib}/gstreamer-0.8/libgstaudiorate.so -/usr/%{_lib}/gstreamer-0.8/libgstaudioscale.so -/usr/%{_lib}/gstreamer-0.8/libgstaudio.so -/usr/%{_lib}/gstreamer-0.8/libgstauparse.so -/usr/%{_lib}/gstreamer-0.8/libgstautodetect.so -/usr/%{_lib}/gstreamer-0.8/libgstavi.so -/usr/%{_lib}/gstreamer-0.8/libgstbasicgthreadscheduler.so -/usr/%{_lib}/gstreamer-0.8/libgstbasicomegascheduler.so -/usr/%{_lib}/gstreamer-0.8/libgstbytestream.so -/usr/%{_lib}/gstreamer-0.8/libgstcdparanoia.so -/usr/%{_lib}/gstreamer-0.8/libgstcdplayer.so -/usr/%{_lib}/gstreamer-0.8/libgstcdxaparse.so -/usr/%{_lib}/gstreamer-0.8/libgstcolorspace.so -/usr/%{_lib}/gstreamer-0.8/libgstcutter.so -/usr/%{_lib}/gstreamer-0.8/libgstdataprotocol.so -/usr/%{_lib}/gstreamer-0.8/libgstdebug.so -/usr/%{_lib}/gstreamer-0.8/libgstdecodebin.so -/usr/%{_lib}/gstreamer-0.8/libgstdeinterlace.so -/usr/%{_lib}/gstreamer-0.8/libgstdvdec.so -/usr/%{_lib}/gstreamer-0.8/libgstdvdlpcmdec.so -/usr/%{_lib}/gstreamer-0.8/libgstefence.so -/usr/%{_lib}/gstreamer-0.8/libgsteffectv.so -/usr/%{_lib}/gstreamer-0.8/libgstelements.so -/usr/%{_lib}/gstreamer-0.8/libgstentrygthreadscheduler.so -/usr/%{_lib}/gstreamer-0.8/libgstentryomegascheduler.so -/usr/%{_lib}/gstreamer-0.8/libgstequalizer.so -/usr/%{_lib}/gstreamer-0.8/libgstesd.so -/usr/%{_lib}/gstreamer-0.8/libgstfairgthreadscheduler.so -/usr/%{_lib}/gstreamer-0.8/libgstfestival.so -/usr/%{_lib}/gstreamer-0.8/libgstffmpegcolorspace.so -/usr/%{_lib}/gstreamer-0.8/libgstfilter.so -/usr/%{_lib}/gstreamer-0.8/libgstflac.so -/usr/%{_lib}/gstreamer-0.8/libgstflxdec.so -/usr/%{_lib}/gstreamer-0.8/libgstgamma.so -/usr/%{_lib}/gstreamer-0.8/libgstgconfelements.so -/usr/%{_lib}/gstreamer-0.8/libgstgdkpixbuf.so -/usr/%{_lib}/gstreamer-0.8/libgstgetbits.so -/usr/%{_lib}/gstreamer-0.8/libgstglimagesink.so -/usr/%{_lib}/gstreamer-0.8/libgstgnomevfs.so -/usr/%{_lib}/gstreamer-0.8/libgstgoom.so -/usr/%{_lib}/gstreamer-0.8/libgstchart.so -/usr/%{_lib}/gstreamer-0.8/libgstidct.so -/usr/%{_lib}/gstreamer-0.8/libgstindexers.so -/usr/%{_lib}/gstreamer-0.8/libgstinterleave.so -/usr/%{_lib}/gstreamer-0.8/libgstjpeg.so -/usr/%{_lib}/gstreamer-0.8/libgstlevel.so -/usr/%{_lib}/gstreamer-0.8/libgstmatroska.so -/usr/%{_lib}/gstreamer-0.8/libgstmedian.so -/usr/%{_lib}/gstreamer-0.8/libgstmixmatrix.so -/usr/%{_lib}/gstreamer-0.8/libgstmng.so -/usr/%{_lib}/gstreamer-0.8/libgstmodplug.so -/usr/%{_lib}/gstreamer-0.8/libgstmonoscope.so -/usr/%{_lib}/gstreamer-0.8/libgstmulaw.so -/usr/%{_lib}/gstreamer-0.8/libgstmultifilesink.so -/usr/%{_lib}/gstreamer-0.8/libgstmultipart.so -/usr/%{_lib}/gstreamer-0.8/libgstnavigationtest.so -/usr/%{_lib}/gstreamer-0.8/libgstogg.so -/usr/%{_lib}/gstreamer-0.8/libgstoptgthreadscheduler.so -/usr/%{_lib}/gstreamer-0.8/libgstoptomegascheduler.so -/usr/%{_lib}/gstreamer-0.8/libgstoptscheduler.so -/usr/%{_lib}/gstreamer-0.8/libgstossaudio.so -/usr/%{_lib}/gstreamer-0.8/libgstoverlay.so -/usr/%{_lib}/gstreamer-0.8/libgstpassthrough.so -/usr/%{_lib}/gstreamer-0.8/libgstplaybin.so -/usr/%{_lib}/gstreamer-0.8/libgstplayondemand.so -/usr/%{_lib}/gstreamer-0.8/libgstpng.so -/usr/%{_lib}/gstreamer-0.8/libgstpuzzle.so -/usr/%{_lib}/gstreamer-0.8/libgstqtdemux.so -/usr/%{_lib}/gstreamer-0.8/libgstresample.so -/usr/%{_lib}/gstreamer-0.8/libgstrfbsrc.so -/usr/%{_lib}/gstreamer-0.8/libgstriff.so -/usr/%{_lib}/gstreamer-0.8/libgstrmdemux.so -/usr/%{_lib}/gstreamer-0.8/libgstrtjpeg.so -/usr/%{_lib}/gstreamer-0.8/libgstrtp.so -/usr/%{_lib}/gstreamer-0.8/libgstsdlvideosink.so -/usr/%{_lib}/gstreamer-0.8/libgstsilence.so -/usr/%{_lib}/gstreamer-0.8/libgstsinesrc.so -/usr/%{_lib}/gstreamer-0.8/libgstsmooth.so -/usr/%{_lib}/gstreamer-0.8/libgstsmoothwave.so -/usr/%{_lib}/gstreamer-0.8/libgstsmpte.so -/usr/%{_lib}/gstreamer-0.8/libgstsnapshot.so -/usr/%{_lib}/gstreamer-0.8/libgstspectrum.so -/usr/%{_lib}/gstreamer-0.8/libgstspeed.so -/usr/%{_lib}/gstreamer-0.8/libgstspeex.so -/usr/%{_lib}/gstreamer-0.8/libgstspider.so -/usr/%{_lib}/gstreamer-0.8/libgststereo.so -/usr/%{_lib}/gstreamer-0.8/libgstsubparse.so -/usr/%{_lib}/gstreamer-0.8/libgstswitch.so -/usr/%{_lib}/gstreamer-0.8/libgstsynaesthesia.so -/usr/%{_lib}/gstreamer-0.8/libgsttagedit.so -/usr/%{_lib}/gstreamer-0.8/libgsttcp.so -/usr/%{_lib}/gstreamer-0.8/libgsttextoverlay.so -/usr/%{_lib}/gstreamer-0.8/libgsttheora.so -/usr/%{_lib}/gstreamer-0.8/libgsttimeoverlay.so -/usr/%{_lib}/gstreamer-0.8/libgsttrm.so -/usr/%{_lib}/gstreamer-0.8/libgsttta.so -/usr/%{_lib}/gstreamer-0.8/libgsttypefindfunctions.so -/usr/%{_lib}/gstreamer-0.8/libgstudp.so -/usr/%{_lib}/gstreamer-0.8/libgstvbidec.so -/usr/%{_lib}/gstreamer-0.8/libgstvcdsrc.so -/usr/%{_lib}/gstreamer-0.8/libgstvideobalance.so -/usr/%{_lib}/gstreamer-0.8/libgstvideobox.so -/usr/%{_lib}/gstreamer-0.8/libgstvideocrop.so -/usr/%{_lib}/gstreamer-0.8/libgstvideodrop.so -/usr/%{_lib}/gstreamer-0.8/libgstvideofilter.so -/usr/%{_lib}/gstreamer-0.8/libgstvideoflip.so -/usr/%{_lib}/gstreamer-0.8/libgstvideomixer.so -/usr/%{_lib}/gstreamer-0.8/libgstvideorate.so -/usr/%{_lib}/gstreamer-0.8/libgstvideoscale.so -/usr/%{_lib}/gstreamer-0.8/libgstvideo.so -/usr/%{_lib}/gstreamer-0.8/libgstvideotestsrc.so -/usr/%{_lib}/gstreamer-0.8/libgstvideo4linux.so -/usr/%{_lib}/gstreamer-0.8/libgstvideo4linux2.so -/usr/%{_lib}/gstreamer-0.8/libgstvolenv.so -/usr/%{_lib}/gstreamer-0.8/libgstvolume.so -/usr/%{_lib}/gstreamer-0.8/libgstvorbis.so -/usr/%{_lib}/gstreamer-0.8/libgstwavenc.so -/usr/%{_lib}/gstreamer-0.8/libgstwavparse.so -/usr/%{_lib}/gstreamer-0.8/libgstximagesink.so -/usr/%{_lib}/gstreamer-0.8/libgstxvimagesink.so -/usr/%{_lib}/gstreamer-0.8/libgstxwindowlistener.so -/usr/%{_lib}/gstreamer-0.8/libgsty4menc.so -/usr/%{_lib}/gstreamer-0.8/libgst1394.so +/usr/%{_lib}/gstreamer-0.10/libgstadder.so +/usr/%{_lib}/gstreamer-0.10/libgstalaw.so +/usr/%{_lib}/gstreamer-0.10/libgstalphacolor.so +/usr/%{_lib}/gstreamer-0.10/libgstalpha.so +/usr/%{_lib}/gstreamer-0.10/libgstalsa.so +/usr/%{_lib}/gstreamer-0.10/libgstapetag.so +/usr/%{_lib}/gstreamer-0.10/libgstartsdsink.so +/usr/%{_lib}/gstreamer-0.10/libgstarts.so +/usr/%{_lib}/gstreamer-0.10/libgstasf.so +/usr/%{_lib}/gstreamer-0.10/libgstaudioconvert.so +/usr/%{_lib}/gstreamer-0.10/libgstaudiofile.so +/usr/%{_lib}/gstreamer-0.10/libgstaudiofilter.so +/usr/%{_lib}/gstreamer-0.10/libgstaudiorate.so +/usr/%{_lib}/gstreamer-0.10/libgstaudioscale.so +/usr/%{_lib}/gstreamer-0.10/libgstaudio.so +/usr/%{_lib}/gstreamer-0.10/libgstauparse.so +/usr/%{_lib}/gstreamer-0.10/libgstautodetect.so +/usr/%{_lib}/gstreamer-0.10/libgstavi.so +/usr/%{_lib}/gstreamer-0.10/libgstbasicgthreadscheduler.so +/usr/%{_lib}/gstreamer-0.10/libgstbasicomegascheduler.so +/usr/%{_lib}/gstreamer-0.10/libgstbytestream.so +/usr/%{_lib}/gstreamer-0.10/libgstcdparanoia.so +/usr/%{_lib}/gstreamer-0.10/libgstcdplayer.so +/usr/%{_lib}/gstreamer-0.10/libgstcdxaparse.so +/usr/%{_lib}/gstreamer-0.10/libgstcolorspace.so +/usr/%{_lib}/gstreamer-0.10/libgstcutter.so +/usr/%{_lib}/gstreamer-0.10/libgstdataprotocol.so +/usr/%{_lib}/gstreamer-0.10/libgstdebug.so +/usr/%{_lib}/gstreamer-0.10/libgstdecodebin.so +/usr/%{_lib}/gstreamer-0.10/libgstdeinterlace.so +/usr/%{_lib}/gstreamer-0.10/libgstdvdec.so +/usr/%{_lib}/gstreamer-0.10/libgstdvdlpcmdec.so +/usr/%{_lib}/gstreamer-0.10/libgstefence.so +/usr/%{_lib}/gstreamer-0.10/libgsteffectv.so +/usr/%{_lib}/gstreamer-0.10/libgstelements.so +/usr/%{_lib}/gstreamer-0.10/libgstentrygthreadscheduler.so +/usr/%{_lib}/gstreamer-0.10/libgstentryomegascheduler.so +/usr/%{_lib}/gstreamer-0.10/libgstequalizer.so +/usr/%{_lib}/gstreamer-0.10/libgstesd.so +/usr/%{_lib}/gstreamer-0.10/libgstfairgthreadscheduler.so +/usr/%{_lib}/gstreamer-0.10/libgstfestival.so +/usr/%{_lib}/gstreamer-0.10/libgstffmpegcolorspace.so +/usr/%{_lib}/gstreamer-0.10/libgstfilter.so +/usr/%{_lib}/gstreamer-0.10/libgstflac.so +/usr/%{_lib}/gstreamer-0.10/libgstflxdec.so +/usr/%{_lib}/gstreamer-0.10/libgstgamma.so +/usr/%{_lib}/gstreamer-0.10/libgstgconfelements.so +/usr/%{_lib}/gstreamer-0.10/libgstgdkpixbuf.so +/usr/%{_lib}/gstreamer-0.10/libgstgetbits.so +/usr/%{_lib}/gstreamer-0.10/libgstglimagesink.so +/usr/%{_lib}/gstreamer-0.10/libgstgnomevfs.so +/usr/%{_lib}/gstreamer-0.10/libgstgoom.so +/usr/%{_lib}/gstreamer-0.10/libgstchart.so +/usr/%{_lib}/gstreamer-0.10/libgstidct.so +/usr/%{_lib}/gstreamer-0.10/libgstindexers.so +/usr/%{_lib}/gstreamer-0.10/libgstinterleave.so +/usr/%{_lib}/gstreamer-0.10/libgstjpeg.so +/usr/%{_lib}/gstreamer-0.10/libgstlevel.so +/usr/%{_lib}/gstreamer-0.10/libgstmatroska.so +/usr/%{_lib}/gstreamer-0.10/libgstmedian.so +/usr/%{_lib}/gstreamer-0.10/libgstmixmatrix.so +/usr/%{_lib}/gstreamer-0.10/libgstmng.so +/usr/%{_lib}/gstreamer-0.10/libgstmodplug.so +/usr/%{_lib}/gstreamer-0.10/libgstmonoscope.so +/usr/%{_lib}/gstreamer-0.10/libgstmulaw.so +/usr/%{_lib}/gstreamer-0.10/libgstmultifilesink.so +/usr/%{_lib}/gstreamer-0.10/libgstmultipart.so +/usr/%{_lib}/gstreamer-0.10/libgstnavigationtest.so +/usr/%{_lib}/gstreamer-0.10/libgstogg.so +/usr/%{_lib}/gstreamer-0.10/libgstoptgthreadscheduler.so +/usr/%{_lib}/gstreamer-0.10/libgstoptomegascheduler.so +/usr/%{_lib}/gstreamer-0.10/libgstoptscheduler.so +/usr/%{_lib}/gstreamer-0.10/libgstossaudio.so +/usr/%{_lib}/gstreamer-0.10/libgstoverlay.so +/usr/%{_lib}/gstreamer-0.10/libgstpassthrough.so +/usr/%{_lib}/gstreamer-0.10/libgstplaybin.so +/usr/%{_lib}/gstreamer-0.10/libgstplayondemand.so +/usr/%{_lib}/gstreamer-0.10/libgstpng.so +/usr/%{_lib}/gstreamer-0.10/libgstpuzzle.so +/usr/%{_lib}/gstreamer-0.10/libgstqtdemux.so +/usr/%{_lib}/gstreamer-0.10/libgstresample.so +/usr/%{_lib}/gstreamer-0.10/libgstrfbsrc.so +/usr/%{_lib}/gstreamer-0.10/libgstriff.so +/usr/%{_lib}/gstreamer-0.10/libgstrmdemux.so +/usr/%{_lib}/gstreamer-0.10/libgstrtjpeg.so +/usr/%{_lib}/gstreamer-0.10/libgstrtp.so +/usr/%{_lib}/gstreamer-0.10/libgstsdlvideosink.so +/usr/%{_lib}/gstreamer-0.10/libgstsilence.so +/usr/%{_lib}/gstreamer-0.10/libgstsinesrc.so +/usr/%{_lib}/gstreamer-0.10/libgstsmooth.so +/usr/%{_lib}/gstreamer-0.10/libgstsmoothwave.so +/usr/%{_lib}/gstreamer-0.10/libgstsmpte.so +/usr/%{_lib}/gstreamer-0.10/libgstsnapshot.so +/usr/%{_lib}/gstreamer-0.10/libgstspectrum.so +/usr/%{_lib}/gstreamer-0.10/libgstspeed.so +/usr/%{_lib}/gstreamer-0.10/libgstspeex.so +/usr/%{_lib}/gstreamer-0.10/libgstspider.so +/usr/%{_lib}/gstreamer-0.10/libgststereo.so +/usr/%{_lib}/gstreamer-0.10/libgstsubparse.so +/usr/%{_lib}/gstreamer-0.10/libgstswitch.so +/usr/%{_lib}/gstreamer-0.10/libgstsynaesthesia.so +/usr/%{_lib}/gstreamer-0.10/libgsttagedit.so +/usr/%{_lib}/gstreamer-0.10/libgsttcp.so +/usr/%{_lib}/gstreamer-0.10/libgsttextoverlay.so +/usr/%{_lib}/gstreamer-0.10/libgsttheora.so +/usr/%{_lib}/gstreamer-0.10/libgsttimeoverlay.so +/usr/%{_lib}/gstreamer-0.10/libgsttrm.so +/usr/%{_lib}/gstreamer-0.10/libgsttta.so +/usr/%{_lib}/gstreamer-0.10/libgsttypefindfunctions.so +/usr/%{_lib}/gstreamer-0.10/libgstudp.so +/usr/%{_lib}/gstreamer-0.10/libgstvbidec.so +/usr/%{_lib}/gstreamer-0.10/libgstvcdsrc.so +/usr/%{_lib}/gstreamer-0.10/libgstvideobalance.so +/usr/%{_lib}/gstreamer-0.10/libgstvideobox.so +/usr/%{_lib}/gstreamer-0.10/libgstvideocrop.so +/usr/%{_lib}/gstreamer-0.10/libgstvideodrop.so +/usr/%{_lib}/gstreamer-0.10/libgstvideofilter.so +/usr/%{_lib}/gstreamer-0.10/libgstvideoflip.so +/usr/%{_lib}/gstreamer-0.10/libgstvideomixer.so +/usr/%{_lib}/gstreamer-0.10/libgstvideorate.so +/usr/%{_lib}/gstreamer-0.10/libgstvideoscale.so +/usr/%{_lib}/gstreamer-0.10/libgstvideo.so +/usr/%{_lib}/gstreamer-0.10/libgstvideotestsrc.so +/usr/%{_lib}/gstreamer-0.10/libgstvideo4linux.so +/usr/%{_lib}/gstreamer-0.10/libgstvideo4linux2.so +/usr/%{_lib}/gstreamer-0.10/libgstvolenv.so +/usr/%{_lib}/gstreamer-0.10/libgstvolume.so +/usr/%{_lib}/gstreamer-0.10/libgstvorbis.so +/usr/%{_lib}/gstreamer-0.10/libgstwavenc.so +/usr/%{_lib}/gstreamer-0.10/libgstwavparse.so +/usr/%{_lib}/gstreamer-0.10/libgstximagesink.so +/usr/%{_lib}/gstreamer-0.10/libgstxvimagesink.so +/usr/%{_lib}/gstreamer-0.10/libgstxwindowlistener.so +/usr/%{_lib}/gstreamer-0.10/libgsty4menc.so +/usr/%{_lib}/gstreamer-0.10/libgst1394.so /usr/%{_lib}/gtk-2.0/2.4.0/loaders/libpixbufloader-xpm.so /usr/%{_lib}/libaudiofile.so.0 /usr/%{_lib}/libbeecrypt.so.6 /usr/%{_lib}/libbonoboui-2.so.0 -/usr/%{_lib}/libcamel-provider-1.2.so.7 +/usr/%{_lib}/libcamel-provider-1.2.so.8 /usr/%{_lib}/libcamel-1.2.so.0 /usr/%{_lib}/libebook-1.2.so.5 /usr/%{_lib}/libecal-1.2.so.3 /usr/%{_lib}/libedata-book-1.2.so.2 /usr/%{_lib}/libedata-cal-1.2.so.1 -/usr/%{_lib}/libedataserverui-1.2.so.6 +/usr/%{_lib}/libedataserverui-1.2.so.8 /usr/%{_lib}/libedataserver-1.2.so.6 /usr/%{_lib}/libeel-2.so.2 /usr/%{_lib}/libegroupwise-1.2.so.9 @@ -1094,7 +1092,7 @@ /usr/%{_lib}/libgpg-error.so.0 /usr/lib/libgssapi_krb5.so.2 /usr/%{_lib}/libgstinterfaces-0.8.so.0 -/usr/%{_lib}/libgstreamer-0.8.so.1 +/usr/%{_lib}/libgstreamer-0.10.so.1 /usr/%{_lib}/libgtkhtml-2.so.0 /usr/%{_lib}/libIDL-2.so.0 /usr/%{_lib}/libjpeg.so.62 @@ -1104,7 +1102,7 @@ /usr/%{_lib}/libmetacity-private.so.0 /usr/%{_lib}/libnautilus-extension.so.1 /usr/%{_lib}/libnautilus-private.so.2 -/usr/%{_lib}/libneon.so.24 +/usr/%{_lib}/libneon.so.25 /usr/%{_lib}/libnspr4.so /usr/lib/libnssckbi.so /usr/lib/libnss3.so Index: readahead.spec =================================================================== RCS file: /cvs/dist/rpms/readahead/devel/readahead.spec,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- readahead.spec 11 Feb 2006 05:30:12 -0000 1.25 +++ readahead.spec 15 Mar 2006 23:55:41 -0000 1.26 @@ -1,7 +1,7 @@ Summary: Read a preset list of files into memory. Name: readahead Version: 1.2 -Release: %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?}).2 +Release: %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?}) Epoch: 1 Group: System Environment/Base License: GPL/OSL @@ -76,6 +76,9 @@ %changelog +* Thu Mar 16 2006 Karel Zak +- update versions in *.in lists + * Fri Feb 10 2006 Jesse Keating - 1:1.2-1.24.2 - bump again for double-long bug on ppc(64) From fedora-cvs-commits at redhat.com Thu Mar 16 08:43:12 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 16 Mar 2006 03:43:12 -0500 Subject: rpms/make/devel make-3.80-patvar-2.patch, NONE, 1.1 make.spec, 1.26, 1.27 Message-ID: <200603160843.k2G8hC4k027430@cvs.devel.redhat.com> Author: pmachata Update of /cvs/dist/rpms/make/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv27414 Modified Files: make.spec Added Files: make-3.80-patvar-2.patch Log Message: #52962: allow make to handle several matching pattern-specific variables. make-3.80-patvar-2.patch: rule.c | 19 ++++++------------- rule.h | 3 ++- tests/scripts/features/patspecific_vars | 10 +++++----- variable.c | 26 +++++++++++++++----------- 4 files changed, 28 insertions(+), 30 deletions(-) --- NEW FILE make-3.80-patvar-2.patch --- diff -Bburp make-3.80/rule.c make-3.80-pm/rule.c --- make-3.80/rule.c 2002-07-08 15:05:02.000000000 +0200 +++ make-3.80-pm/rule.c 2006-03-15 22:10:13.000000000 +0100 @@ -55,10 +55,6 @@ unsigned int max_pattern_dep_length; static struct pattern_var *pattern_vars; -/* Pointer to last struct in the chain, so we can add onto the end. */ - -static struct pattern_var *last_pattern_var; - /* Pointer to structure for the file .SUFFIXES whose dependencies are the suffixes to be searched. */ @@ -565,12 +561,8 @@ create_pattern_var (target, suffix) if (p == 0) { p = (struct pattern_var *) xmalloc (sizeof (struct pattern_var)); - if (last_pattern_var != 0) - last_pattern_var->next = p; - else + p->next = pattern_vars; pattern_vars = p; - last_pattern_var = p; - p->next = 0; p->target = target; p->len = len; p->suffix = suffix + 1; @@ -580,16 +572,17 @@ create_pattern_var (target, suffix) return p; } -/* Look up a target in the pattern-specific variable list. */ +/* Look up a target in the pattern-specific variable list, optionally + starting after the last target we looked at. */ struct pattern_var * -lookup_pattern_var (target) +lookup_pattern_var (target, p) char *target; -{ struct pattern_var *p; +{ unsigned int targlen = strlen(target); - for (p = pattern_vars; p != 0; p = p->next) + for (p = p ? p->next : pattern_vars; p != 0; p = p->next) { char *stem; unsigned int stemlen; diff -Bburp make-3.80/rule.h make-3.80-pm/rule.h --- make-3.80/rule.h 1999-03-05 06:55:36.000000000 +0100 +++ make-3.80-pm/rule.h 2006-03-15 22:10:13.000000000 +0100 @@ -62,7 +62,8 @@ extern unsigned int maxsuffix; extern void install_pattern_rule PARAMS ((struct pspec *p, int terminal)); extern int new_pattern_rule PARAMS ((struct rule *rule, int override)); extern struct pattern_var *create_pattern_var PARAMS ((char *target, char *suffix)); -extern struct pattern_var *lookup_pattern_var PARAMS ((char *target)); +extern struct pattern_var *lookup_pattern_var PARAMS ((char *target, + struct pattern_var *p)); extern void count_implicit_rule_limits PARAMS ((void)); extern void convert_to_pattern PARAMS ((void)); extern void create_pattern_rule PARAMS ((char **targets, diff -Bburp make-3.80/variable.c make-3.80-pm/variable.c --- make-3.80/variable.c 2002-10-04 04:13:42.000000000 +0200 +++ make-3.80-pm/variable.c 2006-03-15 22:10:13.000000000 +0100 @@ -388,7 +388,7 @@ initialize_file_variables (file, reading struct file *file; int reading; { - register struct variable_set_list *l = file->variables; + register struct variable_set_list *l = file->variables, *v; if (l == 0) { @@ -424,24 +424,28 @@ initialize_file_variables (file, reading if (!reading && !file->pat_searched) { - struct pattern_var *p = lookup_pattern_var (file->name); + struct pattern_var *p = NULL; - file->pat_searched = 1; - if (p != 0) + while ((p = lookup_pattern_var (file->name, p))) { - /* If we found one, insert it between the current target's - variables and the next set, whatever it is. */ - file->pat_variables = (struct variable_set_list *) + struct variable_set_list *pat_variables = (struct variable_set_list *) xmalloc (sizeof (struct variable_set_list)); - file->pat_variables->set = p->vars->set; + pat_variables->set = p->vars->set; + pat_variables->next = file->pat_variables; + file->pat_variables = pat_variables; } + + file->pat_searched = 1; } /* If we have a pattern variable match, set it up. */ - if (file->pat_variables != 0) + for (v = file->pat_variables; v; v = v->next) { - file->pat_variables->next = l->next; - l->next = file->pat_variables; + struct variable_set_list *vt = (struct variable_set_list *) + xmalloc (sizeof (struct variable_set_list)); + vt->set = v->set; + vt->next = l->next; + l->next = vt; } } diff -Bburp make-3.80/tests/scripts/features/patspecific_vars make-3.80-pm/tests/scripts/features/patspecific_vars --- make-3.80/tests/scripts/features/patspecific_vars 2000-02-05 08:37:40.000000000 +0100 +++ make-3.80-pm/tests/scripts/features/patspecific_vars 2006-03-15 23:16:09.000000000 +0100 @@ -14,10 +14,10 @@ FOO = foo BAR = bar BAZ = baz thr% : override BAZ = three -t%.x: BAR = four %.x: BAR = two %.x: override BAZ = three -one.x: override FOO = one +t%.x: BAR = four +one.x: override BAR = two one.x two.x three.x: ; @echo $(FOO) $(BAR) $(BAZ) four.x: baz ; @echo $(FOO) $(BAR) $(BAZ) baz: ; @echo $(FOO) $(BAR) $(BAZ) @@ -29,14 +29,14 @@ close(MAKEFILE); # TEST #1 -- basics &run_make_with_options($makefile, "", &get_logfile); -$answer = "one two three\nfoo four baz\nfoo bar three\n"; +$answer = "foo two three\nfoo four three\nfoo four three\n"; &compare_output($answer,&get_logfile(1)); # TEST #2 -- try the override feature -&run_make_with_options($makefile, "BAZ=five", &get_logfile); -$answer = "one two three\nfoo four five\nfoo bar three\n"; +&run_make_with_options($makefile, "BAZ=five BAR=six", &get_logfile); +$answer = "foo two three\nfoo six three\nfoo six three\n"; &compare_output($answer,&get_logfile(1)); Index: make.spec =================================================================== RCS file: /cvs/dist/rpms/make/devel/make.spec,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- make.spec 11 Feb 2006 04:28:02 -0000 1.26 +++ make.spec 16 Mar 2006 08:43:09 -0000 1.27 @@ -2,19 +2,20 @@ Name: make Epoch: 1 Version: 3.80 -Release: 10.2 +Release: 11 License: GPL Group: Development/Tools URL: http://www.gnu.org/software/make/ Source: ftp://ftp.gnu.org/gnu/make/make-%{version}.tar.bz2 Patch: make-3.79.1-noclock_gettime.patch -Patch2: make-3.79.1-siglist.patch +#Patch2: make-3.79.1-siglist.patch Patch3: make-3.80-cvs.patch Patch4: make-3.80-j8k.patch Patch5: make-3.80-getcwd.patch Patch6: make-3.80-err-reporting.patch #Patch7: make-3.80-memory-1.patch #buggy, fixed in memory-2.patch Patch7: make-3.80-memory-2.patch +Patch8: make-3.80-patvar-2.patch Prereq: /sbin/install-info Prefix: %{_prefix} Buildroot: %{_tmppath}/%{name}-root @@ -39,19 +40,15 @@ %patch5 -p1 %patch6 -p1 %patch7 -p1 +%patch8 -p1 %build -#aclocal config/missing --run aclocal -I config -#automake -a config/missing --run automake --gnu Makefile -#autoconf config/missing --run autoconf -#autoreconf -f --install %configure #touch .deps/remote-stub.Po # Workaround for broken automake files make %{?_smp_mflags} -make check %install rm -rf ${RPM_BUILD_ROOT} @@ -67,6 +64,11 @@ %find_lang %name +%check +echo ============TESTING=============== +make check +echo ============END TESTING=========== + %clean rm -rf ${RPM_BUILD_ROOT} @@ -86,6 +88,23 @@ %{_infodir}/*.info* %changelog +* Wed Mar 15 2006 Petr Machata 1:3.80-11 +- Applied (five years old) patch from Jonathan Kamens to allow make to + handle several pattern-specific variables (#52962). + + The patch was changed so that it forces make to process pattern + specific variables in the same order as they appear in file. + (Upstream make behaves this way, too.) This is change from old make + behavior, which processed the variables in reverse order. In case + you used only x=a assignments, this had the effect of using the + first pattern specific variable that matched. For x+=a this just + doesn't work, and it produces absolutely nonintuitive results. + +- (It would be great if make's target-specific variables were handled + the same way as pattern-specific ones, just without the pattern + component. However current handling is documented and considered a + feature.) + * Fri Feb 10 2006 Jesse Keating - 1:3.80-10.2 - bump again for double-long bug on ppc(64) From fedora-cvs-commits at redhat.com Thu Mar 16 11:40:19 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 16 Mar 2006 06:40:19 -0500 Subject: rpms/man-pages/devel man-pages-2.25-malloc.patch, NONE, 1.1 man-pages.spec, 1.38, 1.39 Message-ID: <200603161140.k2GBeJdJ006749@cvs.devel.redhat.com> Author: varekova Update of /cvs/dist/rpms/man-pages/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv6734 Modified Files: man-pages.spec Added Files: man-pages-2.25-malloc.patch Log Message: - fix MALLOC_CHECK_ description (#185502) man-pages-2.25-malloc.patch: malloc.3 | 18 +++++++++++------- 1 files changed, 11 insertions(+), 7 deletions(-) --- NEW FILE man-pages-2.25-malloc.patch --- --- man-pages-2.25/man3/malloc.3.pom 2006-03-16 10:56:03.000000000 +0100 +++ man-pages-2.25/man3/malloc.3 2006-03-16 11:21:15.428524576 +0100 @@ -159,13 +159,17 @@ with the same argument, or overruns of a single byte (off-by-one bugs). Not all such errors can be protected against, however, and memory leaks can result. -If -.BR MALLOC_CHECK_ -is set to 0, any detected heap corruption is silently ignored; -if set to 1, a diagnostic is printed on stderr; -if set to 2, -.BR abort () -is called immediately. This can be useful because otherwise +If +.BR MALLOC_CHECK_ +is set to 0, any detected heap corruption is silently ignored and +an error message is not generated; +if set to 1, the error message is printed on stderr, but the program +is not aborted; +if set to 2, +.BR abort() +is called immediately, but the error message is not generated; +if set to 3, the error message is printed on stderr and program is aborted. +This can be useful because otherwise a crash may happen much later, and the true cause for the problem is then very hard to track down. .SH BUGS Index: man-pages.spec =================================================================== RCS file: /cvs/dist/rpms/man-pages/devel/man-pages.spec,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- man-pages.spec 14 Mar 2006 12:17:21 -0000 1.38 +++ man-pages.spec 16 Mar 2006 11:40:17 -0000 1.39 @@ -1,7 +1,7 @@ Summary: Man (manual) pages from the Linux Documentation Project. Name: man-pages Version: 2.25 -Release: 1 +Release: 2 License: distributable Group: Documentation Source0: http://www.kernel.org/pub/linux/docs/manpages/man-pages-%{version}.tar.gz @@ -24,6 +24,7 @@ Patch21: man-pages-2.16-mmap.patch Patch22: man-pages-2.20-nscd.conf.patch Patch23: man-pages-2.25-dbopen.patch +Patch24: man-pages-2.25-malloc.patch Buildroot: %{_tmppath}/%{name}-%{version}-root @@ -56,6 +57,7 @@ %patch21 -p1 %patch22 -p1 %patch23 -p1 +%patch24 -p1 %build @@ -152,12 +154,14 @@ %{_mandir}/en/man*/* %changelog +* Thu Mar 16 2006 Ivana Varekova 2.25-2 +- fix MALLOC_CHECK_ description (#185502) + * Tue Mar 14 2006 Ivana Varekova 2.25-1 - update to 2.25 - remove mbind and set_mempolicy files - fix dbopen man page (#185310) - * Mon Jan 16 2006 Ivana Varekova 2.21-1 - update to 2.21 - add the description of reload-count option (nscd.conf From fedora-cvs-commits at redhat.com Thu Mar 16 12:40:48 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 16 Mar 2006 07:40:48 -0500 Subject: rpms/mc/devel mc-showfree.patch,1.5,1.6 mc.spec,1.84,1.85 Message-ID: <200603161240.k2GCemkt032095@cvs.devel.redhat.com> Author: jnovy Update of /cvs/dist/rpms/mc/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv32071 Modified Files: mc-showfree.patch mc.spec Log Message: * Thu Mar 16 2006 Jindrich Novy 4.6.1a-11 - display the Layout dialog correctly on console (#185189) mc-showfree.patch: layout.c | 59 +++++++++++++++++++++++++++++++++-------------------------- layout.h | 1 + screen.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ setup.c | 1 + 4 files changed, 80 insertions(+), 26 deletions(-) Index: mc-showfree.patch =================================================================== RCS file: /cvs/dist/rpms/mc/devel/mc-showfree.patch,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- mc-showfree.patch 28 Feb 2006 11:14:11 -0000 1.5 +++ mc-showfree.patch 16 Mar 2006 12:40:46 -0000 1.6 @@ -237,3 +237,39 @@ extern int horizontal_split; extern int nice_rotating_dash; +--- mc-4.6.1a/src/layout.c.jn 2006-03-16 10:20:31.000000000 +0100 ++++ mc-4.6.1a/src/layout.c 2006-03-16 10:23:14.000000000 +0100 +@@ -296,9 +296,9 @@ layout_callback (struct Dlg_head *h, dlg + if (old_output_lines != _output_lines){ + old_output_lines = _output_lines; + attrset (COLOR_NORMAL); +- dlg_move (h, 9, 16 + first_width); ++ dlg_move (h, 10, 16 + first_width); + addstr (output_lines_label); +- dlg_move (h, 9, 10 + first_width); ++ dlg_move (h, 10, 10 + first_width); + tty_printf ("%02d", _output_lines); + } + } +@@ -341,7 +341,7 @@ layout_callback (struct Dlg_head *h, dlg + if (old_output_lines != _output_lines){ + old_output_lines = _output_lines; + attrset (COLOR_NORMAL); +- dlg_move (h, 9, 10 + first_width); ++ dlg_move (h, 10, 10 + first_width); + tty_printf ("%02d", _output_lines); + } + } +@@ -452,10 +452,10 @@ init_layout (void) + 0)); + if (console_flag) { + add_widget (layout_dlg, +- button_new (9, 12 + first_width, B_MINUS, ++ button_new (10, 12 + first_width, B_MINUS, + NARROW_BUTTON, "&-", bminus_cback)); + add_widget (layout_dlg, +- button_new (9, 7 + first_width, B_PLUS, NARROW_BUTTON, ++ button_new (10, 7 + first_width, B_PLUS, NARROW_BUTTON, + "&+", bplus_cback)); + } + #define XTRACT(i) *check_options[i].variable, check_options[i].text Index: mc.spec =================================================================== RCS file: /cvs/dist/rpms/mc/devel/mc.spec,v retrieving revision 1.84 retrieving revision 1.85 diff -u -r1.84 -r1.85 --- mc.spec 8 Mar 2006 11:13:51 -0000 1.84 +++ mc.spec 16 Mar 2006 12:40:46 -0000 1.85 @@ -1,7 +1,7 @@ Summary: User-friendly text console file manager and visual shell. Name: mc Version: 4.6.1a -Release: 10 +Release: 11 Epoch: 1 License: GPL Group: System Environment/Shells @@ -192,6 +192,9 @@ %dir %{_sysconfdir}/mc %changelog +* Thu Mar 16 2006 Jindrich Novy 4.6.1a-11 +- display the Layout dialog correctly on console (#185189) + * Wed Mar 8 2006 Jindrich Novy 4.6.1a-10 - fix typo in extensions patch so that C sources are highlighted correctly (#184228) From fedora-cvs-commits at redhat.com Thu Mar 16 13:13:53 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 16 Mar 2006 08:13:53 -0500 Subject: rpms/openoffice.org/devel openoffice.org.spec,1.640,1.641 Message-ID: <200603161313.k2GDDrhS012387@cvs.devel.redhat.com> Author: caolanm Update of /cvs/dist/rpms/openoffice.org/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv12373 Modified Files: openoffice.org.spec Log Message: ldap backend is for configuration only, and no use to us Index: openoffice.org.spec =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v retrieving revision 1.640 retrieving revision 1.641 diff -u -r1.640 -r1.641 --- openoffice.org.spec 14 Mar 2006 10:37:25 -0000 1.640 +++ openoffice.org.spec 16 Mar 2006 13:13:51 -0000 1.641 @@ -1081,6 +1081,9 @@ #remove evolution 1 address book driver rm -f $RPM_BUILD_ROOT/%{instdir}/program/libevoab1.so +#remove worthless ldap configuration backend +rm -f $RPM_BUILD_ROOT/%{instdir}/program/ldapbe2.uno.so + #remove the email mailmerge impl if packageing without it %if ! %{includeemailmerge} rm -rf $RPM_BUILD_ROOT/%{instdir}/program/mailmerge.py* @@ -2312,7 +2315,6 @@ %{instdir}/program/javavm.uno.so %{instdir}/program/jvmfwk3rc %{instdir}/program/kde-open-url -%{instdir}/program/ldapbe2.uno.so %{instdir}/program/legacy_binfilters.rdb %{instdir}/program/libabp680*.so %{instdir}/program/libadabas2.so From fedora-cvs-commits at redhat.com Thu Mar 16 13:17:22 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 16 Mar 2006 08:17:22 -0500 Subject: rpms/openoffice.org/devel openoffice.org.spec,1.641,1.642 Message-ID: <200603161317.k2GDHMQL024919@cvs.devel.redhat.com> Author: caolanm Update of /cvs/dist/rpms/openoffice.org/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv24904 Modified Files: openoffice.org.spec Log Message: missing comment Index: openoffice.org.spec =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v retrieving revision 1.641 retrieving revision 1.642 diff -u -r1.641 -r1.642 --- openoffice.org.spec 16 Mar 2006 13:13:51 -0000 1.641 +++ openoffice.org.spec 16 Mar 2006 13:17:19 -0000 1.642 @@ -917,7 +917,7 @@ export NO_HIDS=true #enable parallel build export MAXPROCESS=$RPM_BUILD_NCPUS -dmake has limit of 10 processes apparently +#dmake has limit of 10 processes apparently if [ $MAXPROCESS -gt 10 ]; then export MAXPROCESS=10 fi From fedora-cvs-commits at redhat.com Thu Mar 16 14:41:20 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 16 Mar 2006 09:41:20 -0500 Subject: rpms/selinux-policy/devel policy-20060207.patch, 1.50, 1.51 selinux-policy.spec, 1.153, 1.154 Message-ID: <200603161441.k2GEfKZ5018610@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/selinux-policy/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv18595 Modified Files: policy-20060207.patch selinux-policy.spec Log Message: * Wed Mar 15 2006 Dan Walsh 2.2.23-19 - Get transition rules to create policy.20 at SystemHigh policy-20060207.patch: Rules.modular | 2 policy/mcs | 4 policy/modules/admin/bootloader.te | 2 policy/modules/admin/dmidecode.te | 2 policy/modules/admin/readahead.te | 2 policy/modules/admin/rpm.fc | 2 policy/modules/admin/rpm.if | 3 policy/modules/admin/rpm.te | 1 policy/modules/admin/su.fc | 1 policy/modules/admin/su.if | 6 policy/modules/admin/updfstab.te | 4 policy/modules/admin/vbetool.te | 9 + policy/modules/kernel/corenetwork.te.in | 3 policy/modules/kernel/devices.fc | 1 policy/modules/kernel/devices.if | 21 ++- policy/modules/kernel/files.fc | 8 - policy/modules/kernel/files.if | 21 ++- policy/modules/kernel/filesystem.te | 1 policy/modules/kernel/kernel.if | 102 ++++++++++++++ policy/modules/kernel/kernel.te | 3 policy/modules/kernel/terminal.if | 2 policy/modules/services/apache.fc | 2 policy/modules/services/apache.if | 5 policy/modules/services/apm.fc | 2 policy/modules/services/apm.te | 4 policy/modules/services/bluetooth.te | 20 +- policy/modules/services/cron.te | 3 policy/modules/services/cups.fc | 2 policy/modules/services/cups.if | 22 +++ policy/modules/services/cups.te | 7 - policy/modules/services/cvs.te | 2 policy/modules/services/hal.if | 41 +++++ policy/modules/services/hal.te | 13 + policy/modules/services/ktalk.fc | 1 policy/modules/services/ktalk.te | 6 policy/modules/services/mailman.if | 25 +++ policy/modules/services/nis.fc | 1 policy/modules/services/nis.if | 25 +++ policy/modules/services/nis.te | 28 ++++ policy/modules/services/nscd.if | 2 policy/modules/services/postfix.te | 4 policy/modules/services/samba.te | 2 policy/modules/services/sendmail.te | 1 policy/modules/system/fstools.if | 18 ++ policy/modules/system/fstools.te | 3 policy/modules/system/init.te | 5 policy/modules/system/libraries.fc | 2 policy/modules/system/locallogin.te | 1 policy/modules/system/lvm.fc | 1 policy/modules/system/lvm.te | 3 policy/modules/system/mount.te | 3 policy/modules/system/selinuxutil.fc | 6 policy/modules/system/selinuxutil.if | 23 ++- policy/modules/system/selinuxutil.te | 16 ++ policy/modules/system/sysnetwork.te | 7 + policy/modules/system/udev.te | 2 policy/modules/system/unconfined.te | 8 - policy/modules/system/userdomain.te | 1 policy/modules/system/xend.fc | 23 +++ policy/modules/system/xend.if | 71 ++++++++++ policy/modules/system/xend.te | 219 ++++++++++++++++++++++++++++++++ support/Makefile.devel | 5 62 files changed, 777 insertions(+), 58 deletions(-) Index: policy-20060207.patch =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20060207.patch,v retrieving revision 1.50 retrieving revision 1.51 diff -u -r1.50 -r1.51 --- policy-20060207.patch 14 Mar 2006 22:43:44 -0000 1.50 +++ policy-20060207.patch 16 Mar 2006 14:41:17 -0000 1.51 @@ -75,7 +75,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.te serefpolicy-2.2.23/policy/modules/admin/rpm.te --- nsaserefpolicy/policy/modules/admin/rpm.te 2006-03-04 00:06:33.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/admin/rpm.te 2006-03-14 16:51:22.000000000 -0500 ++++ serefpolicy-2.2.23/policy/modules/admin/rpm.te 2006-03-15 09:22:44.000000000 -0500 @@ -326,6 +326,7 @@ seutil_domtrans_loadpolicy(rpm_script_t) @@ -514,7 +514,7 @@ ') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bluetooth.te serefpolicy-2.2.23/policy/modules/services/bluetooth.te --- nsaserefpolicy/policy/modules/services/bluetooth.te 2006-03-04 00:06:35.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/services/bluetooth.te 2006-03-08 11:35:36.000000000 -0500 ++++ serefpolicy-2.2.23/policy/modules/services/bluetooth.te 2006-03-16 09:30:42.000000000 -0500 @@ -115,6 +115,7 @@ corecmd_exec_shell(bluetooth_t) @@ -523,9 +523,11 @@ files_read_etc_files(bluetooth_t) files_read_etc_runtime_files(bluetooth_t) -@@ -146,6 +147,9 @@ +@@ -145,7 +146,11 @@ + optional_policy(`dbus',` dbus_system_bus_client_template(bluetooth,bluetooth_t) ++ dbus_connect_system_bus(bluetooth_t) dbus_send_system_bus(bluetooth_t) + dbus_system_bus_client_template(bluetooth_helper,bluetooth_helper_t) + dbus_connect_system_bus(bluetooth_helper_t) @@ -533,7 +535,7 @@ ') optional_policy(`nis',` -@@ -170,6 +174,7 @@ +@@ -170,6 +175,7 @@ allow bluetooth_helper_t self:fifo_file rw_file_perms; allow bluetooth_helper_t self:shm create_shm_perms; allow bluetooth_helper_t self:unix_stream_socket { create_stream_socket_perms connectto }; @@ -541,7 +543,7 @@ allow bluetooth_helper_t bluetooth_t:socket { read write }; -@@ -202,20 +207,17 @@ +@@ -202,20 +208,17 @@ miscfiles_read_localization(bluetooth_helper_t) miscfiles_read_fonts(bluetooth_helper_t) @@ -566,7 +568,7 @@ ifdef(`strict_policy',` ifdef(`xdm.te',` allow bluetooth_helper_t xdm_xserver_tmp_t:sock_file { read write }; -@@ -227,4 +229,7 @@ +@@ -227,4 +230,7 @@ files_rw_generic_tmp_sockets(bluetooth_helper_t) allow bluetooth_helper_t tmpfs_t:file { read write }; allow bluetooth_helper_t unconfined_t:unix_stream_socket connectto; @@ -1058,7 +1060,7 @@ libs_use_shared_libs(fsadm_t) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.te serefpolicy-2.2.23/policy/modules/system/init.te --- nsaserefpolicy/policy/modules/system/init.te 2006-03-04 00:06:37.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/system/init.te 2006-03-07 13:42:37.000000000 -0500 ++++ serefpolicy-2.2.23/policy/modules/system/init.te 2006-03-15 09:44:32.000000000 -0500 @@ -349,6 +349,7 @@ files_mounton_isid_type_dirs(initrc_t) files_list_default(initrc_t) @@ -1168,7 +1170,7 @@ libs_use_shared_libs(mount_t) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.fc serefpolicy-2.2.23/policy/modules/system/selinuxutil.fc --- nsaserefpolicy/policy/modules/system/selinuxutil.fc 2006-02-23 09:25:09.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/system/selinuxutil.fc 2006-03-07 13:42:37.000000000 -0500 ++++ serefpolicy-2.2.23/policy/modules/system/selinuxutil.fc 2006-03-15 16:33:44.000000000 -0500 @@ -8,9 +8,9 @@ /etc/selinux/([^/]*/)?contexts/files(/.*)? gen_context(system_u:object_r:file_context_t,s0) /etc/selinux/([^/]*/)?policy(/.*)? gen_context(system_u:object_r:policy_config_t,s15:c0.c255) @@ -1176,7 +1178,7 @@ -/etc/selinux([^/]*/)?modules/(active|tmp|previous)(/.*)? -- gen_context(system_u:object_r:semanage_store_t,s0) -/etc/selinux([^/]*/)?modules/semanage.read.LOCK -- gen_context(system_u:object_r:semanage_read_lock_t,s0) -/etc/selinux([^/]*/)?modules/semanage.trans.LOCK -- gen_context(system_u:object_r:semanage_trans_lock_t,s0) -+/etc/selinux/([^/]*/)?modules/(active|tmp|previous)(/.*)? -- gen_context(system_u:object_r:semanage_store_t,s0) ++/etc/selinux/([^/]*/)?modules/(active|tmp|previous)(/.*)? gen_context(system_u:object_r:semanage_store_t,s0) +/etc/selinux/([^/]*/)?modules/semanage.read.LOCK -- gen_context(system_u:object_r:semanage_read_lock_t,s0) +/etc/selinux/([^/]*/)?modules/semanage.trans.LOCK -- gen_context(system_u:object_r:semanage_trans_lock_t,s0) /etc/selinux/([^/]*/)?users(/.*)? -- gen_context(system_u:object_r:selinux_config_t,s15:c0.c255) @@ -1228,7 +1230,7 @@ + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.te serefpolicy-2.2.23/policy/modules/system/selinuxutil.te --- nsaserefpolicy/policy/modules/system/selinuxutil.te 2006-03-04 00:06:37.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/system/selinuxutil.te 2006-03-14 17:32:51.000000000 -0500 ++++ serefpolicy-2.2.23/policy/modules/system/selinuxutil.te 2006-03-15 09:23:03.000000000 -0500 @@ -192,6 +192,9 @@ selinux_load_policy(load_policy_t) selinux_set_boolean(load_policy_t) Index: selinux-policy.spec =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v retrieving revision 1.153 retrieving revision 1.154 diff -u -r1.153 -r1.154 --- selinux-policy.spec 14 Mar 2006 22:43:44 -0000 1.153 +++ selinux-policy.spec 16 Mar 2006 14:41:17 -0000 1.154 @@ -10,7 +10,7 @@ Summary: SELinux policy configuration Name: selinux-policy Version: 2.2.23 -Release: 18 +Release: 19 License: GPL Group: System Environment/Base Source: serefpolicy-%{version}.tgz @@ -298,6 +298,9 @@ %fileList strict %changelog +* Wed Mar 15 2006 Dan Walsh 2.2.23-19 +- Get transition rules to create policy.20 at SystemHigh + * Tue Mar 14 2006 Dan Walsh 2.2.23-18 - Allow secadmin to shutdown system - Allow sendmail to exec newalias From fedora-cvs-commits at redhat.com Thu Mar 16 15:02:58 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 16 Mar 2006 10:02:58 -0500 Subject: rpms/openoffice.org/devel sources,1.160,1.161 Message-ID: <200603161502.k2GF2wUb031560@cvs.devel.redhat.com> Author: caolanm Update of /cvs/dist/rpms/openoffice.org/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv31547 Modified Files: sources Log Message: update irish translations Index: sources =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/devel/sources,v retrieving revision 1.160 retrieving revision 1.161 diff -u -r1.160 -r1.161 --- sources 13 Mar 2006 10:20:45 -0000 1.160 +++ sources 16 Mar 2006 15:02:56 -0000 1.161 @@ -6,7 +6,7 @@ 8bc013e30e432ce3927e402e9aaa8c9f redhat-templates.tar.gz 1b4d9a03ebb4c864015620153afb77c6 Tigert-templates.tar.gz fae552b2b9d556920b930a97a2e3e9ab openoffice.org-myspell-contrib.tar.gz -0fc9c0b585e2c92a7ac05adebeb4caf2 GSI_ga.sdf 20789fc643e2b857291e1973075fccb0 OOB680_m5.tar.bz2 67ba19cf8ac46671799ff63a48901e8b openoffice.org-simple-crash_report.sh 1fb6d1fc0b5c6f4425b3cd779727b30c opens___.ttf +8d8c4222654f718436c234582c8fd529 GSI_ga.sdf From fedora-cvs-commits at redhat.com Thu Mar 16 16:08:07 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 16 Mar 2006 11:08:07 -0500 Subject: rpms/gedit/devel .cvsignore, 1.37, 1.38 gedit.spec, 1.77, 1.78 sources, 1.39, 1.40 Message-ID: <200603161608.k2GG87FP024917@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/gedit/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv24902 Modified Files: .cvsignore gedit.spec sources Log Message: 2.14.1 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/gedit/devel/.cvsignore,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- .cvsignore 13 Mar 2006 05:27:30 -0000 1.37 +++ .cvsignore 16 Mar 2006 16:08:04 -0000 1.38 @@ -12,3 +12,4 @@ gedit-2.13.91.tar.bz2 gedit-2.13.92.tar.bz2 gedit-2.14.0.tar.bz2 +gedit-2.14.1.tar.bz2 Index: gedit.spec =================================================================== RCS file: /cvs/dist/rpms/gedit/devel/gedit.spec,v retrieving revision 1.77 retrieving revision 1.78 diff -u -r1.77 -r1.78 --- gedit.spec 13 Mar 2006 05:27:30 -0000 1.77 +++ gedit.spec 16 Mar 2006 16:08:04 -0000 1.78 @@ -16,7 +16,7 @@ Summary: gEdit is a small but powerful text editor for GNOME. Name: gedit -Version: 2.14.0 +Version: 2.14.1 Release: 1 Epoch: 1 License: GPL @@ -158,6 +158,9 @@ %{_libdir}/pkgconfig/gedit-2.14.pc %changelog +* Thu Mar 16 2006 Matthias Clasen 2.14.1-1 +- Update to 2.14.1 + * Mon Mar 13 2006 Matthias Clasen 2.14.0-1 - Update to 2.14.0 Index: sources =================================================================== RCS file: /cvs/dist/rpms/gedit/devel/sources,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- sources 13 Mar 2006 05:27:30 -0000 1.39 +++ sources 16 Mar 2006 16:08:04 -0000 1.40 @@ -1 +1 @@ -38a07758991396fd93214bd84fe72be8 gedit-2.14.0.tar.bz2 +b51974a4bcaad0b14644c9f5a22f13f2 gedit-2.14.1.tar.bz2 From fedora-cvs-commits at redhat.com Thu Mar 16 17:50:43 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 16 Mar 2006 12:50:43 -0500 Subject: rpms/libxklavier/devel .cvsignore, 1.7, 1.8 libxklavier.spec, 1.19, 1.20 sources, 1.7, 1.8 Message-ID: <200603161750.k2GHohNG011227@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/libxklavier/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv11209 Modified Files: .cvsignore libxklavier.spec sources Log Message: - Update to 2.2 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/libxklavier/devel/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 24 Feb 2006 01:22:55 -0000 1.7 +++ .cvsignore 16 Mar 2006 17:50:41 -0000 1.8 @@ -1 +1 @@ -libxklavier-2.1.0.2006.02.23.tar.bz2 +libxklavier-2.2.tar.bz2 Index: libxklavier.spec =================================================================== RCS file: /cvs/dist/rpms/libxklavier/devel/libxklavier.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- libxklavier.spec 9 Mar 2006 20:41:18 -0000 1.19 +++ libxklavier.spec 16 Mar 2006 17:50:41 -0000 1.20 @@ -1,7 +1,7 @@ Summary: library providing high-level API for X Keyboard Extension Name: libxklavier -Version: 2.1.0.2006.02.23 -Release: 2 +Version: 2.2 +Release: 1 License: LGPL Group: Development/Libraries Url: http://gswitchit.sourceforge.net/ @@ -9,7 +9,7 @@ BuildRequires: libxml2-devel BuildRequires: libxkbfile-devel BuildRequires: libX11-devel -Source: http://gswitchit.sourceforge.net/%{name}-%{version}.tar.bz2 +Source: http://gswitchit.sourceforge.net/%{name}-%{version}.tar.gz Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root Patch0: libxklavier-1.14-werror.patch @@ -69,6 +69,9 @@ %{_includedir}/* %changelog +* Mon Mar 13 2006 Ray Strode - 2.2-1 +- Update to 2.2 + * Thu Mar 9 2006 Ray Strode - 2.1.0.2006.02.23-2 - trap X error reply to limit the damage of bug 183569. Index: sources =================================================================== RCS file: /cvs/dist/rpms/libxklavier/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 24 Feb 2006 01:22:55 -0000 1.7 +++ sources 16 Mar 2006 17:50:41 -0000 1.8 @@ -1 +1 @@ -dd8d58e79c76339008597f58b7ff5b44 libxklavier-2.1.0.2006.02.23.tar.bz2 +1c53646f35d77564f42d3f4342cd443f libxklavier-2.2.tar.bz2 From fedora-cvs-commits at redhat.com Thu Mar 16 17:52:24 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 16 Mar 2006 12:52:24 -0500 Subject: rpms/libxklavier/devel libxklavier.spec,1.20,1.21 Message-ID: <200603161752.k2GHqOUK011300@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/libxklavier/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv11287 Modified Files: libxklavier.spec Log Message: s/tar.gz/tar.bz2/ Index: libxklavier.spec =================================================================== RCS file: /cvs/dist/rpms/libxklavier/devel/libxklavier.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- libxklavier.spec 16 Mar 2006 17:50:41 -0000 1.20 +++ libxklavier.spec 16 Mar 2006 17:52:21 -0000 1.21 @@ -9,7 +9,7 @@ BuildRequires: libxml2-devel BuildRequires: libxkbfile-devel BuildRequires: libX11-devel -Source: http://gswitchit.sourceforge.net/%{name}-%{version}.tar.gz +Source: http://gswitchit.sourceforge.net/%{name}-%{version}.tar.bz2 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root Patch0: libxklavier-1.14-werror.patch From fedora-cvs-commits at redhat.com Thu Mar 16 21:03:25 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 16 Mar 2006 16:03:25 -0500 Subject: rpms/gstreamer/FC-5 .cvsignore, 1.19, 1.20 gstreamer.spec, 1.47, 1.48 sources, 1.20, 1.21 Message-ID: <200603162103.k2GL3Pcr006879@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/gstreamer/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv6771 Modified Files: .cvsignore gstreamer.spec sources Log Message: - Update to 0.10.4 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/gstreamer/FC-5/.cvsignore,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- .cvsignore 11 Feb 2006 01:49:12 -0000 1.19 +++ .cvsignore 16 Mar 2006 21:03:07 -0000 1.20 @@ -1 +1 @@ -gstreamer-0.10.3.tar.bz2 +gstreamer-0.10.4.tar.bz2 Index: gstreamer.spec =================================================================== RCS file: /cvs/dist/rpms/gstreamer/FC-5/gstreamer.spec,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- gstreamer.spec 14 Feb 2006 16:49:12 -0000 1.47 +++ gstreamer.spec 16 Mar 2006 21:03:07 -0000 1.48 @@ -5,8 +5,8 @@ %define _libxml2 2.4.0 Name: %{gstreamer} -Version: 0.10.3 -Release: 3 +Version: 0.10.4 +Release: 1 Summary: GStreamer streaming media framework runtime Group: Applications/Multimedia @@ -111,7 +111,7 @@ rm -rf $RPM_BUILD_ROOT # Install doc temporarily in order to be included later by rpm -%makeinstall docdir="`pwd`/installed-doc" +make install DESTDIR=$RPM_BUILD_ROOT docdir="`pwd`/installed-doc" %find_lang gstreamer-%{majorminor} # Clean out files that should not be part of the rpm. @@ -201,7 +201,10 @@ %doc %{_datadir}/gtk-doc/html/gstreamer-plugins-%{majorminor}/* %changelog -* Tue Feb 14 2006 Rik van Riel - 0.10-3-3 +* Thu Mar 16 2006 Ray Strode - 0.10.4-1 +- Update to 0.10.4 + +* Tue Feb 14 2006 Rik van Riel - 0.10.3-3 - Obsolete gstreamer-plugins (#181296) * Mon Feb 13 2006 Christopher Aillon - 0.10.3-2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/gstreamer/FC-5/sources,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- sources 11 Feb 2006 01:49:13 -0000 1.20 +++ sources 16 Mar 2006 21:03:07 -0000 1.21 @@ -1 +1 @@ -bee72ad6bccc334e5c8af72c1ff4ffce gstreamer-0.10.3.tar.bz2 +263a7800ecf44d0f38d0cbc80bce65ff gstreamer-0.10.4.tar.bz2 From fedora-cvs-commits at redhat.com Thu Mar 16 21:11:11 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 16 Mar 2006 16:11:11 -0500 Subject: rpms/shared-mime-info/devel .cvsignore, 1.9, 1.10 shared-mime-info.spec, 1.37, 1.38 sources, 1.9, 1.10 Message-ID: <200603162111.k2GLBBPA008699@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/shared-mime-info/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv6975 Modified Files: .cvsignore shared-mime-info.spec sources Log Message: 0.17 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/shared-mime-info/devel/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 12 Feb 2006 23:33:41 -0000 1.9 +++ .cvsignore 16 Mar 2006 21:11:06 -0000 1.10 @@ -1 +1,2 @@ shared-mime-info-0.16.cvs20060212.tar.gz +shared-mime-info-0.17.tar.gz Index: shared-mime-info.spec =================================================================== RCS file: /cvs/dist/rpms/shared-mime-info/devel/shared-mime-info.spec,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- shared-mime-info.spec 13 Feb 2006 16:09:30 -0000 1.37 +++ shared-mime-info.spec 16 Mar 2006 21:11:06 -0000 1.38 @@ -1,7 +1,7 @@ Summary: Shared MIME information database Name: shared-mime-info -Version: 0.16.cvs20060212 -Release: 3 +Version: 0.17 +Release: 1 License: GPL Group: System Environment/Libraries URL: http://freedesktop.org/Software/shared-mime-info @@ -62,6 +62,9 @@ %{_mandir}/man*/* %changelog +* Thu Mar 16 2006 Matthiass Clasen - 0.17-1 +- Update to 0.17 + * Mon Feb 13 2006 Ray Strode - 0.16.cvs20060212-3 - add gthumb as fallback Index: sources =================================================================== RCS file: /cvs/dist/rpms/shared-mime-info/devel/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 12 Feb 2006 23:33:41 -0000 1.9 +++ sources 16 Mar 2006 21:11:06 -0000 1.10 @@ -1 +1 @@ -17da05901ea08f31e6cde0cc04666b74 shared-mime-info-0.16.cvs20060212.tar.gz +f1014ad243b5245279c0abe1b95d9e38 shared-mime-info-0.17.tar.gz From fedora-cvs-commits at redhat.com Thu Mar 16 21:22:46 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 16 Mar 2006 16:22:46 -0500 Subject: rpms/net-tools/devel net-tools-1.60-fgets.patch, NONE, 1.1 net-tools.spec, 1.59, 1.60 Message-ID: <200603162122.k2GLMkx0024972@cvs.devel.redhat.com> Author: rvokal Update of /cvs/dist/rpms/net-tools/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv24914 Modified Files: net-tools.spec Added Files: net-tools-1.60-fgets.patch Log Message: - remove duplicate arp entries (#185604) net-tools-1.60-fgets.patch: arp.c | 15 +++++++++------ 1 files changed, 9 insertions(+), 6 deletions(-) --- NEW FILE net-tools-1.60-fgets.patch --- Fix for when arp_disp_2() is called without opt_n set. If there is a DNS lookup, an entry is added to /proc/net/arp after fopen(), resulting in a duplicate entry. --- net-tools-1.60/arp.c.fgets 2005-12-10 14:52:04.000000000 -0500 +++ net-tools-1.60/arp.c 2005-12-11 00:15:59.000000000 -0500 @@ -528,7 +528,7 @@ static int arp_show(char *name) int type, flags; FILE *fp; char *hostname; - int num, entries = 0, showed = 0; + int num, entries, showed = 0; host[0] = '\0'; @@ -546,18 +546,21 @@ static int arp_show(char *name) perror(_PATH_PROCNET_ARP); return (-1); } + /* Count number of entries, in case file changes */ + for (entries = 0; fgets(line, sizeof(line), fp); entries++); + entries--; + fseek (fp, 0L, SEEK_SET); /* Bypass header -- read until newline */ if (fgets(line, sizeof(line), fp) != (char *) NULL) { strcpy(mask, "-"); strcpy(dev, "-"); /* Read the ARP cache entries. */ - for (; fgets(line, sizeof(line), fp);) { - num = sscanf(line, "%s 0x%x 0x%x %100s %100s %100s\n", - ip, &type, &flags, hwa, mask, dev); - if (num < 4) + for (num = 0; num < entries; num++) { + fgets(line, sizeof(line), fp); + if (sscanf(line, "%s 0x%x 0x%x %100s %100s %100s\n", + ip, &type, &flags, hwa, mask, dev) < 4) break; - entries++; /* if the user specified hw-type differs, skip it */ if (hw_set && (type != hw->type)) continue; Index: net-tools.spec =================================================================== RCS file: /cvs/dist/rpms/net-tools/devel/net-tools.spec,v retrieving revision 1.59 retrieving revision 1.60 diff -u -r1.59 -r1.60 --- net-tools.spec 10 Mar 2006 08:53:39 -0000 1.59 +++ net-tools.spec 16 Mar 2006 21:22:44 -0000 1.60 @@ -3,7 +3,7 @@ Summary: Basic networking tools. Name: net-tools Version: 1.60 -Release: 63 +Release: 64 License: GPL Group: System Environment/Base Source0: http://www.tazenda.demon.co.uk/phil/net-tools/net-tools-%{version}.tar.bz2 @@ -60,6 +60,7 @@ Patch46: net-tools-1.60-selinux.patch Patch47: net-tools-1.60-netstat_stop_trim.patch Patch48: net-tools-1.60-netstat_inode.patch +Patch49: net-tools-1.60-fgets.patch BuildRoot: %{_tmppath}/%{name}-root Requires(post,preun): chkconfig @@ -116,6 +117,7 @@ %patch46 -p1 -b .selinux %patch47 -p1 -b .trim %patch48 -p1 -b .inode +%patch49 -p1 -b .fgets cp %SOURCE2 ./config.h cp %SOURCE3 ./config.make @@ -227,6 +229,9 @@ %{_sysconfdir}/rc.d/init.d/netplugd %changelog +* Thu Mar 16 2006 Radek Vok??l - 1.60-54 +- remove duplicate arp entries (#185604) + * Thu Feb 23 2006 Radek Vok??l - 1.60-63 - show inodes in netstat (#180974) From fedora-cvs-commits at redhat.com Thu Mar 16 21:39:09 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 16 Mar 2006 16:39:09 -0500 Subject: rpms/gstreamer-plugins-base/FC-5 .cvsignore, 1.4, 1.5 gstreamer-plugins-base.spec, 1.11, 1.12 sources, 1.5, 1.6 Message-ID: <200603162139.k2GLd9H0030239@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/gstreamer-plugins-base/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv30162 Modified Files: .cvsignore gstreamer-plugins-base.spec sources Log Message: - Update to 0.10.5 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/gstreamer-plugins-base/FC-5/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 18 Jan 2006 16:29:49 -0000 1.4 +++ .cvsignore 16 Mar 2006 21:39:04 -0000 1.5 @@ -1,3 +1 @@ -gst-plugins-base-0.10.0.tar.bz2 -gst-plugins-base-0.10.1.tar.bz2 -gst-plugins-base-0.10.2.tar.bz2 +gst-plugins-base-0.10.5.tar.bz2 Index: gstreamer-plugins-base.spec =================================================================== RCS file: /cvs/dist/rpms/gstreamer-plugins-base/FC-5/gstreamer-plugins-base.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- gstreamer-plugins-base.spec 1 Mar 2006 12:18:00 -0000 1.11 +++ gstreamer-plugins-base.spec 16 Mar 2006 21:39:04 -0000 1.12 @@ -4,8 +4,8 @@ %define _gst 0.10.2 Name: %{gstreamer}-plugins-base -Version: 0.10.3 -Release: 3 +Version: 0.10.5 +Release: 1 Summary: GStreamer streaming media framework base plug-ins Group: Applications/Multimedia @@ -59,7 +59,7 @@ %install rm -rf $RPM_BUILD_ROOT -%makeinstall +make install DESTDIR=$RPM_BUILD_ROOT # Clean out files that should not be part of the rpm. rm -f $RPM_BUILD_ROOT%{_libdir}/gstreamer-%{majorminor}/*.la @@ -190,6 +190,9 @@ %doc %{_datadir}/gtk-doc/html/gst-plugins-base-plugins-%{majorminor} %changelog +* Thu Mar 16 2006 Ray Strode 0.10.5-1 +- Update to 0.10.5 + * Wed Mar 01 2006 Karsten Hopp 0.10.3-3 - really add BuildRequires: cdparanoia-devel (#179034) Index: sources =================================================================== RCS file: /cvs/dist/rpms/gstreamer-plugins-base/FC-5/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 11 Feb 2006 03:11:24 -0000 1.5 +++ sources 16 Mar 2006 21:39:04 -0000 1.6 @@ -1 +1 @@ -8fb69b7c5eb98f15c45c659cad3cb614 gst-plugins-base-0.10.3.tar.bz2 +2b5958fb0baaf8d1b4eae18f7b13d49b gst-plugins-base-0.10.5.tar.bz2 From fedora-cvs-commits at redhat.com Thu Mar 16 22:18:08 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 16 Mar 2006 17:18:08 -0500 Subject: rpms/gstreamer-plugins-base/FC-5 gstreamer-plugins-base.spec, 1.12, 1.13 Message-ID: <200603162218.k2GMI8NL004970@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/gstreamer-plugins-base/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv2614 Modified Files: gstreamer-plugins-base.spec Log Message: - add build req on latest gstreamer Index: gstreamer-plugins-base.spec =================================================================== RCS file: /cvs/dist/rpms/gstreamer-plugins-base/FC-5/gstreamer-plugins-base.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- gstreamer-plugins-base.spec 16 Mar 2006 21:39:04 -0000 1.12 +++ gstreamer-plugins-base.spec 16 Mar 2006 22:18:06 -0000 1.13 @@ -1,7 +1,7 @@ %define gstreamer gstreamer %define majorminor 0.10 -%define _gst 0.10.2 +%define _gst 0.10.4 Name: %{gstreamer}-plugins-base Version: 0.10.5 From fedora-cvs-commits at redhat.com Thu Mar 16 22:26:36 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 16 Mar 2006 17:26:36 -0500 Subject: rpms/kernel/devel patch-2.6.16-rc6-git7.bz2.sign, NONE, 1.1 .cvsignore, 1.381, 1.382 kernel-2.6.spec, 1.2057, 1.2058 sources, 1.322, 1.323 upstream, 1.295, 1.296 patch-2.6.16-rc6-git3.bz2.sign, 1.1, NONE patch-2.6.16-rc6-git5.bz2.sign, 1.1, NONE Message-ID: <200603162226.k2GMQaPX009872@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv9819 Modified Files: .cvsignore kernel-2.6.spec sources upstream Added Files: patch-2.6.16-rc6-git7.bz2.sign Removed Files: patch-2.6.16-rc6-git3.bz2.sign patch-2.6.16-rc6-git5.bz2.sign Log Message: git7 --- NEW FILE patch-2.6.16-rc6-git7.bz2.sign --- -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.2.2 (GNU/Linux) Comment: See http://www.kernel.org/signature.html for info iD8DBQBEGbYryGugalF9Dw4RAgfVAJ9b8q5/QhP8ukv2ai0MSLTvCmNkCQCfXFh/ ZyOaOYPq/anPRv2qEvi7SXk= =GUDj -----END PGP SIGNATURE----- Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v retrieving revision 1.381 retrieving revision 1.382 diff -u -r1.381 -r1.382 --- .cvsignore 15 Mar 2006 22:22:42 -0000 1.381 +++ .cvsignore 16 Mar 2006 22:26:33 -0000 1.382 @@ -4,4 +4,4 @@ linux-2.6.15.tar.bz2 xen-20060301.tar.bz2 patch-2.6.16-rc6.bz2 -patch-2.6.16-rc6-git5.bz2 +patch-2.6.16-rc6-git7.bz2 Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.2057 retrieving revision 1.2058 diff -u -r1.2057 -r1.2058 --- kernel-2.6.spec 15 Mar 2006 22:25:45 -0000 1.2057 +++ kernel-2.6.spec 16 Mar 2006 22:26:33 -0000 1.2058 @@ -218,7 +218,7 @@ # Patches 0 through 100 are meant for core subsystem upgrades # Patch1: patch-2.6.16-rc6.bz2 -Patch2: patch-2.6.16-rc6-git5.bz2 +Patch2: patch-2.6.16-rc6-git7.bz2 # Patches 100 through 500 are meant for architecture patches Patch100: linux-2.6-bzimage.patch @@ -1660,6 +1660,9 @@ %endif %changelog +* Thu Mar 16 2006 Dave Jones +- 2.6.16rc6-git7 + * Wed Mar 15 2006 Dave Jones - 2.6.16rc6-git5 - Unmark 'print_tainted' as a GPL symbol. Index: sources =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/sources,v retrieving revision 1.322 retrieving revision 1.323 diff -u -r1.322 -r1.323 --- sources 15 Mar 2006 22:22:42 -0000 1.322 +++ sources 16 Mar 2006 22:26:33 -0000 1.323 @@ -1,4 +1,4 @@ cdf95e00f5111e31f78e1d97304d9522 linux-2.6.15.tar.bz2 cdfde609af8adcf58d7ff626599b2d90 xen-20060301.tar.bz2 67fe4dce92d3103e56dd8d2d3c20b3ed patch-2.6.16-rc6.bz2 -110d544412276afa369b10cfcaf09740 patch-2.6.16-rc6-git5.bz2 +0fde34dbde844c26b32f10c7bef175b5 patch-2.6.16-rc6-git7.bz2 Index: upstream =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/upstream,v retrieving revision 1.295 retrieving revision 1.296 diff -u -r1.295 -r1.296 --- upstream 15 Mar 2006 22:22:42 -0000 1.295 +++ upstream 16 Mar 2006 22:26:33 -0000 1.296 @@ -1,3 +1,3 @@ linux-2.6.15.tar.bz2 patch-2.6.16-rc6.bz2 -patch-2.6.16-rc6-git5.bz2 +patch-2.6.16-rc6-git7.bz2 --- patch-2.6.16-rc6-git3.bz2.sign DELETED --- --- patch-2.6.16-rc6-git5.bz2.sign DELETED --- From fedora-cvs-commits at redhat.com Thu Mar 16 22:53:00 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 16 Mar 2006 17:53:00 -0500 Subject: rpms/avahi/devel avahi.spec,1.46,1.47 Message-ID: <200603162253.k2GMr0Vt024034@cvs.devel.redhat.com> Author: jvdias Update of /cvs/dist/rpms/avahi/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv24021 Modified Files: avahi.spec Log Message: fix bug 185692: install avahi-sharp into %{_prefix}/lib, not %{_libdir} Index: avahi.spec =================================================================== RCS file: /cvs/dist/rpms/avahi/devel/avahi.spec,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- avahi.spec 9 Mar 2006 15:38:11 -0000 1.46 +++ avahi.spec 16 Mar 2006 22:52:58 -0000 1.47 @@ -4,7 +4,7 @@ %endif Name: avahi Version: 0.6.9 -Release: 4 +Release: 6 Summary: Local network service discovery Group: System Environment/Base License: LGPL @@ -308,12 +308,15 @@ %if %{WITH_MONO} %files sharp %defattr(0644, root, root, 0755) -%{_libdir}/mono/avahi-sharp -%{_libdir}/mono/gac/avahi-sharp -%{_libdir}/pkgconfig/avahi-sharp.pc +%{_prefix}/lib/mono/avahi-sharp +%{_prefix}/lib/mono/gac/avahi-sharp +%{_prefix}/lib/pkgconfig/avahi-sharp.pc %endif %changelog +* Thu Mar 16 2006 Jason Vas Dias - 0.6.9-6 +- Fix bug 185692: install avahi-sharp into %{prefix}/lib, not %{_libdir} + * Thu Mar 09 2006 Jason Vas Dias - 0.6.9-4 - fix scriptlet error introduced by last fix: if user has disabled avahi-daemon, do not enable it during %post From fedora-cvs-commits at redhat.com Thu Mar 16 23:09:39 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 16 Mar 2006 18:09:39 -0500 Subject: rpms/avahi/devel avahi.spec,1.47,1.48 Message-ID: <200603162309.k2GN9dSi024343@cvs.devel.redhat.com> Author: jvdias Update of /cvs/dist/rpms/avahi/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv24305 Modified Files: avahi.spec Log Message: fix bug 185692: install avahi-sharp into %{_prefix}/lib, not %{_libdir} Index: avahi.spec =================================================================== RCS file: /cvs/dist/rpms/avahi/devel/avahi.spec,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- avahi.spec 16 Mar 2006 22:52:58 -0000 1.47 +++ avahi.spec 16 Mar 2006 23:09:37 -0000 1.48 @@ -186,6 +186,11 @@ # Make /etc/avahi/etc/localtime owned by avahi: mkdir -p $RPM_BUILD_ROOT/etc/avahi/etc touch $RPM_BUILD_ROOT/etc/avahi/etc/localtime +# +# Fix avahi-sharp default installation into /usr/lib64 on x86_64: +if [ ! -e $RPM_BUILD_ROOT/%{_prefix}/lib/mono ] && [ -e $RPM_BUILD_ROOT/%{_libdir}/mono ]; then + mv -f $RPM_BUILD_ROOT/%{_libdir}/mono $RPM_BUILD_ROOT/%{_prefix}/lib; +fi :; %clean @@ -310,12 +315,12 @@ %defattr(0644, root, root, 0755) %{_prefix}/lib/mono/avahi-sharp %{_prefix}/lib/mono/gac/avahi-sharp -%{_prefix}/lib/pkgconfig/avahi-sharp.pc +%{_libdir}/lib/pkgconfig/avahi-sharp.pc %endif %changelog * Thu Mar 16 2006 Jason Vas Dias - 0.6.9-6 -- Fix bug 185692: install avahi-sharp into %{prefix}/lib, not %{_libdir} +- Fix bug 185692: install avahi-sharp into %{_prefix}/lib, not %{_libdir} * Thu Mar 09 2006 Jason Vas Dias - 0.6.9-4 - fix scriptlet error introduced by last fix: From fedora-cvs-commits at redhat.com Thu Mar 16 23:30:56 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 16 Mar 2006 18:30:56 -0500 Subject: rpms/avahi/devel avahi.spec,1.48,1.49 Message-ID: <200603162330.k2GNUuI3004655@cvs.devel.redhat.com> Author: jvdias Update of /cvs/dist/rpms/avahi/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv4641 Modified Files: avahi.spec Log Message: fix bug 185692: install avahi-sharp into %{_prefix}/lib, not %{_libdir} Index: avahi.spec =================================================================== RCS file: /cvs/dist/rpms/avahi/devel/avahi.spec,v retrieving revision 1.48 retrieving revision 1.49 diff -u -r1.48 -r1.49 --- avahi.spec 16 Mar 2006 23:09:37 -0000 1.48 +++ avahi.spec 16 Mar 2006 23:30:39 -0000 1.49 @@ -315,7 +315,7 @@ %defattr(0644, root, root, 0755) %{_prefix}/lib/mono/avahi-sharp %{_prefix}/lib/mono/gac/avahi-sharp -%{_libdir}/lib/pkgconfig/avahi-sharp.pc +%{_libdir}/pkgconfig/avahi-sharp.pc %endif %changelog From fedora-cvs-commits at redhat.com Thu Mar 16 23:32:22 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 16 Mar 2006 18:32:22 -0500 Subject: rpms/lftp/devel .cvsignore, 1.23, 1.24 lftp.spec, 1.43, 1.44 sources, 1.23, 1.24 Message-ID: <200603162332.k2GNWIFj004676@cvs.devel.redhat.com> Author: jvdias Update of /cvs/dist/rpms/lftp/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv4659 Modified Files: .cvsignore lftp.spec sources Log Message: Upgrade to upstream version 3.4.3 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/lftp/devel/.cvsignore,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- .cvsignore 8 Feb 2006 16:19:09 -0000 1.23 +++ .cvsignore 16 Mar 2006 23:32:00 -0000 1.24 @@ -12,3 +12,5 @@ lftp-3.4.0.tar.bz2.asc lftp-3.4.1.tar.bz2 lftp-3.4.2.tar.bz2 +lftp-3.4.3.tar.gz +lftp-3.4.3.tar.bz2 Index: lftp.spec =================================================================== RCS file: /cvs/dist/rpms/lftp/devel/lftp.spec,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- lftp.spec 10 Mar 2006 06:03:08 -0000 1.43 +++ lftp.spec 16 Mar 2006 23:32:00 -0000 1.44 @@ -1,7 +1,7 @@ Summary: A sophisticated file transfer program Name: lftp -Version: 3.4.2 -Release: 5 +Version: 3.4.3 +Release: 1 License: GPL Group: Applications/Internet Source0: http://ftp.yars.free.net/lftp/lftp-%{version}.tar.bz2 @@ -13,8 +13,6 @@ Patch2: lftp-3.4.1-dont_core.patch Patch181694: lftp-3.4.2-fix-redirect-coredump.patch -#%define debug_package %{nil} - %description LFTP is a sophisticated ftp/http file transfer program. Like bash, it has job control and uses the readline library for input. It has bookmarks, built-in @@ -27,7 +25,8 @@ #^- now fixed upstream #%patch2 -p1 -b .dont_core #^- now fixed upstream -%patch181694 -p1 -b .bz181694 +#%patch181694 -p1 -b .bz181694 +#^- now fixed upstream %build if pkg-config openssl ; then @@ -39,6 +38,11 @@ export tagname=CC make LIBTOOL=%{_bindir}/libtool +%{?!DEBUG: %define DEBUG 0} +%if %{DEBUG} +%define debug_package %{nil} +%endif + %install rm -rf $RPM_BUILD_ROOT export tagname=CC @@ -49,8 +53,11 @@ # Remove files from $RPM_BUILD_ROOT that we aren't shipping. rm -f $RPM_BUILD_ROOT%{_libdir}/lftp/%{version}/*.a %find_lang %{name} -#/usr/lib/rpm/brp-compress -#exit 0 +%if %{DEBUG} +/usr/lib/rpm/brp-compress +exit 0 +%endif +:; %clean rm -rf $RPM_BUILD_ROOT @@ -77,6 +84,9 @@ %{_libdir}/lftp/%{version}/proto-sftp.so %changelog +* Thu Mar 16 2006 Jason Vas Dias - 3.4.3-1 +- Upgrade to upstream version 3.4.3 + * Fri Mar 10 2006 Bill Nottingham - 3.4.2-5 - rebuild for ppc TLS issue (#184446) Index: sources =================================================================== RCS file: /cvs/dist/rpms/lftp/devel/sources,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- sources 8 Feb 2006 16:19:09 -0000 1.23 +++ sources 16 Mar 2006 23:32:00 -0000 1.24 @@ -1 +1,3 @@ a572a3ab4490a58bb10b51ef97ef5c30 lftp-3.4.2.tar.bz2 +23ba6191cf33b749a99c236733f8ba7f lftp-3.4.3.tar.gz +87c58c1b94f5d5095c24dbf235ad0aef lftp-3.4.3.tar.bz2 From fedora-cvs-commits at redhat.com Fri Mar 17 04:43:38 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 16 Mar 2006 23:43:38 -0500 Subject: rpms/NetworkManager/devel .cvsignore, 1.34, 1.35 NetworkManager.spec, 1.101, 1.102 sources, 1.50, 1.51 no-wpa-no-scan1.patch, 1.1, NONE Message-ID: <200603170443.k2H4hcAg001403@cvs.devel.redhat.com> Author: caillon Update of /cvs/dist/rpms/NetworkManager/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv1388 Modified Files: .cvsignore NetworkManager.spec sources Removed Files: no-wpa-no-scan1.patch Log Message: * Thu Mar 16 2006 Christopher Aillon 0.6.1-1 - Update to 0.6.1 release Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/NetworkManager/devel/.cvsignore,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- .cvsignore 6 Mar 2006 15:15:19 -0000 1.34 +++ .cvsignore 17 Mar 2006 04:43:36 -0000 1.35 @@ -1,4 +1 @@ -NetworkManager-0.5.1.cvs20060227.tar.gz -NetworkManager-0.5.1.cvs20060301.tar.gz -NetworkManager-0.5.1.cvs20060302.tar.gz -NetworkManager-0.6.0.tar.gz +NetworkManager-0.6.1.tar.bz2 Index: NetworkManager.spec =================================================================== RCS file: /cvs/dist/rpms/NetworkManager/devel/NetworkManager.spec,v retrieving revision 1.101 retrieving revision 1.102 diff -u -r1.101 -r1.102 --- NetworkManager.spec 14 Mar 2006 20:56:22 -0000 1.101 +++ NetworkManager.spec 17 Mar 2006 04:43:36 -0000 1.102 @@ -14,16 +14,15 @@ Name: NetworkManager Summary: Network connection manager and user applications -Version: 0.6.0 -Release: 3%{?nm_cvs_version} +Version: 0.6.1 +Release: 1%{?nm_cvs_version} Group: System Environment/Base License: GPL URL: http://www.gnome.org/projects/NetworkManager/ -Source: %{name}-%{version}%{?nm_cvs_version}.tar.gz +Source: %{name}-%{version}%{?nm_cvs_version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-root Patch0: special-case-madwifi.patch -Patch1: no-wpa-no-scan1.patch Patch2: NetworkManager-0.6.0-device-up.patch PreReq: chkconfig @@ -119,7 +118,6 @@ %prep %setup -q %patch0 -p0 -b .madwifi -%patch1 -p0 -b .no-wpa-no-scan1 %patch2 -p1 -b .device-up %build @@ -215,6 +213,9 @@ %changelog +* Thu Mar 16 2006 Christopher Aillon 0.6.1-1 +- Update to 0.6.1 release + * Tue Mar 14 2006 Peter Jones - 0.6.0-3 - Fix device bringup on resume Index: sources =================================================================== RCS file: /cvs/dist/rpms/NetworkManager/devel/sources,v retrieving revision 1.50 retrieving revision 1.51 diff -u -r1.50 -r1.51 --- sources 6 Mar 2006 15:15:19 -0000 1.50 +++ sources 17 Mar 2006 04:43:36 -0000 1.51 @@ -1 +1 @@ -87e748bcd0fe866204d79f609802b4b8 NetworkManager-0.6.0.tar.gz +e9e2b95425ff0c639344d11af759076e NetworkManager-0.6.1.tar.bz2 --- no-wpa-no-scan1.patch DELETED --- From fedora-cvs-commits at redhat.com Fri Mar 17 04:46:58 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 16 Mar 2006 23:46:58 -0500 Subject: rpms/thunderbird/devel thunderbird.spec,1.68,1.69 Message-ID: <200603170446.k2H4kwE3014033@cvs.devel.redhat.com> Author: caillon Update of /cvs/dist/rpms/thunderbird/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv14020 Modified Files: thunderbird.spec Log Message: * Thu Mar 16 2006 Christopher Aillon - 1.5-7 - Bring the other arches back Index: thunderbird.spec =================================================================== RCS file: /cvs/dist/rpms/thunderbird/devel/thunderbird.spec,v retrieving revision 1.68 retrieving revision 1.69 diff -u -r1.68 -r1.69 --- thunderbird.spec 13 Mar 2006 19:46:58 -0000 1.68 +++ thunderbird.spec 17 Mar 2006 04:46:56 -0000 1.69 @@ -5,13 +5,10 @@ %define official_branding 1 - -ExcludeArch: s390x s390 ppc64 ia64 - Summary: Mozilla Thunderbird mail/newsgroup client Name: thunderbird Version: 1.5 -Release: 6 +Release: 7 Epoch: 0 URL: http://www.mozilla.org/projects/thunderbird/ License: MPL @@ -220,6 +217,9 @@ #=============================================================================== %changelog +* Thu Mar 16 2006 Christopher Aillon - 1.5-7 +- Bring the other arches back + * Mon Mar 13 2006 Christopher Aillon - 1.5.6 - Temporarily disable other arches that we don't ship FC5 with, for time From fedora-cvs-commits at redhat.com Fri Mar 17 09:12:22 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 17 Mar 2006 04:12:22 -0500 Subject: rpms/logwatch/devel logwatch-7.2.1-audit.patch, NONE, 1.1 logwatch-7.2.1-http.patch, NONE, 1.1 logwatch-7.2.1-mountd.patch, NONE, 1.1 logwatch-7.2.1-named.patch, NONE, 1.1 logwatch-7.2.1-nosegfault.patch, NONE, 1.1 logwatch-7.2.1-pam_unix.patch, NONE, 1.1 logwatch-7.2.1-secure.patch, NONE, 1.1 logwatch-7.2.1-smart.patch, NONE, 1.1 logwatch-7.2.1-sshd.patch, NONE, 1.1 .cvsignore, 1.12, 1.13 logwatch.spec, 1.35, 1.36 sources, 1.12, 1.13 logwatch-7.0-nosegfault.patch, 1.1, NONE logwatch-7.1-audit.patch, 1.1, NONE logwatch-7.1-http.patch, 1.1, NONE logwatch-7.1-http2.patch, 1.1, NONE logwatch-7.1-iptables.patch, 1.1, NONE logwatch-7.1-named.patch, 1.2, NONE logwatch-7.1-pam_unix.patch, 1.2, NONE logwatch-7.1-samba.patch, 1.1, NONE logwatch-7.1-secure.patch, 1.1, NONE logwatch-7.1-sshd.patch, 1.1, NONE Message-ID: <200603170912.k2H9CMA9019789@cvs.devel.redhat.com> Author: varekova Update of /cvs/dist/rpms/logwatch/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv19749 Modified Files: .cvsignore logwatch.spec sources Added Files: logwatch-7.2.1-audit.patch logwatch-7.2.1-http.patch logwatch-7.2.1-mountd.patch logwatch-7.2.1-named.patch logwatch-7.2.1-nosegfault.patch logwatch-7.2.1-pam_unix.patch logwatch-7.2.1-secure.patch logwatch-7.2.1-smart.patch logwatch-7.2.1-sshd.patch Removed Files: logwatch-7.0-nosegfault.patch logwatch-7.1-audit.patch logwatch-7.1-http.patch logwatch-7.1-http2.patch logwatch-7.1-iptables.patch logwatch-7.1-named.patch logwatch-7.1-pam_unix.patch logwatch-7.1-samba.patch logwatch-7.1-secure.patch logwatch-7.1-sshd.patch Log Message: - update to 7.2.1 - update nosegfault, pam_unix, http patches - added sshd, smart, named, audit, secure and mountd services patches logwatch-7.2.1-audit.patch: audit | 3 ++- 1 files changed, 2 insertions(+), 1 deletion(-) --- NEW FILE logwatch-7.2.1-audit.patch --- --- logwatch-7.2.1/scripts/services/audit.pom 2005-12-06 03:36:35.000000000 +0100 +++ logwatch-7.2.1/scripts/services/audit 2006-03-16 13:48:35.655605784 +0100 @@ -63,7 +63,8 @@ ( $ThisLine =~ /audit_backlog_limit=[0-9]* old=[0-9]*(?: by auid=[0-9]*)?/) or ( $ThisLine =~ /SELinux: unrecognized netlink message type=[0-9]+ for sclass=[0-9]+/) or ( $ThisLine =~ /audit\([0-9.]+:[0-9]+\): saddr=[0-9]+/) or - ( $ThisLine =~ /nargs=[0-9]+ a0=[0-9a-f]+ a1=[0-9a-f]+ a2=[0-9a-f]+ a3=[0-9a-f]+ a4=[0-9a-f]+ a5=[0-9a-f]+/) + ( $ThisLine =~ /nargs=[0-9]+ a0=[0-9a-f]+ a1=[0-9a-f]+ a2=[0-9a-f]+ a3=[0-9a-f]+ a4=[0-9a-f]+ a5=[0-9a-f]+/) or + ( $ThisLine =~ /^audit\([0-9.]+:[0-9]+\): ( ?(path|cwd|item|name|flags)=["\/A-Za-z0-9]*)*$/) ) { # Ignore these entries } elsif ( $ThisLine =~ /audit\([0-9]{10}.[0-9]{3}:[0-9]\): initialized$/) { logwatch-7.2.1-http.patch: http | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE logwatch-7.2.1-http.patch --- --- logwatch-7.2.1/scripts/services/http.pom 2006-01-04 22:26:08.000000000 +0100 +++ logwatch-7.2.1/scripts/services/http 2006-03-15 13:27:31.935011448 +0100 @@ -266,7 +266,7 @@ # what to look for as an attack USE LOWER CASE!!!!!! # my @exploits = ( - 'null', + '^null$', '/\.\./\.\./\.\./', '\.\./\.\./config\.sys', '/\.\./\.\./\.\./autoexec\.bat', logwatch-7.2.1-mountd.patch: mountd | 10 ++++++++++ 1 files changed, 10 insertions(+) --- NEW FILE logwatch-7.2.1-mountd.patch --- --- logwatch-7.2.1/scripts/services/mountd.pom 2005-02-24 18:08:04.000000000 +0100 +++ logwatch-7.2.1/scripts/services/mountd 2006-03-16 13:54:42.943769496 +0100 @@ -47,6 +47,9 @@ $Mount = " " . $Mount; $Mounted{$Name}{$Mount}++; } + elsif ( ($Number) = ($ThisLine =~ /Caught signal ([0-9]*), un-registering and exiting/) ) { + $SignalExit{$Number}++; + } else { # Report any unmatched entries... push @OtherList,$ThisLine; @@ -70,6 +73,13 @@ } } +if (keys %SignalExit) { + printf "\nExit after catching signal:\n"; + foreach $Number (keys %SignalExit) { + print " Signal " . $Number. ": " . $SignalExit{$Number} . " Time(s)\n"; + } +} + if (($Detail >= 5) and (keys %Mounted)) { print "\nSuccessful NFS mounts:\n"; foreach $ThisOne (keys %Mounted) { logwatch-7.2.1-named.patch: named | 3 ++- 1 files changed, 2 insertions(+), 1 deletion(-) --- NEW FILE logwatch-7.2.1-named.patch --- --- logwatch-7.2.1/scripts/services/named.pom 2005-11-30 06:01:44.000000000 +0100 +++ logwatch-7.2.1/scripts/services/named 2006-03-16 13:51:39.351679736 +0100 @@ -130,7 +130,8 @@ ($ThisLine =~ /sending notifies/) or # file syntax error get reported twice and are already caught below ($ThisLine =~ /loading master file/) or - ($ThisLine =~ /^ succeeded$/) + ($ThisLine =~ /^ succeeded$/) or + ($ThisLine =~ /\*\*\* POKED TIMER \*\*\*/) ) { # Don't care about these... } elsif ( logwatch-7.2.1-nosegfault.patch: kernel.conf | 3 +++ 1 files changed, 3 insertions(+) --- NEW FILE logwatch-7.2.1-nosegfault.patch --- --- logwatch-7.2.1/conf/services/kernel.conf.pom 2006-01-04 22:06:53.000000000 +0100 +++ logwatch-7.2.1/conf/services/kernel.conf 2006-03-14 14:01:29.290219488 +0100 @@ -20,6 +20,9 @@ # Only give lines pertaining to the kernel service... *OnlyService = (kernel|SUNW,[-\w]+?) *RemoveHeaders +*Remove = segfault +*Remove = locate module + ######################################################## # This was written and is maintained by: logwatch-7.2.1-pam_unix.patch: pam_unix | 7 +++++-- secure | 1 + sshd | 1 + 3 files changed, 7 insertions(+), 2 deletions(-) --- NEW FILE logwatch-7.2.1-pam_unix.patch --- --- logwatch-7.2.1/scripts/services/sshd.pom 2005-12-01 05:13:47.000000000 +0100 +++ logwatch-7.2.1/scripts/services/sshd 2006-03-16 13:42:52.220815808 +0100 @@ -191,6 +191,7 @@ ($ThisLine =~ m/^pam_ldap: error trying to bind as user "[^"]+" \(Invalid credentials\)/) or ($ThisLine =~ m/^pam_ldap: ldap_starttls_s: Can't contact LDAP server/) or ($ThisLine =~ m/^\(pam_unix\) .*/) or + ($ThisLine =~ m/^pam_unix\(.*:.*\)/) or # We won't count the following two because they're always followed by a # failed login entry... ($ThisLine =~ /^input_userauth_request: (illegal|invalid) user (.*)$/ ) or --- logwatch-7.2.1/scripts/services/pam_unix.pom 2005-12-01 05:15:04.000000000 +0100 +++ logwatch-7.2.1/scripts/services/pam_unix 2006-03-16 13:42:52.221815656 +0100 @@ -99,12 +99,15 @@ } elsif ( $line =~ s/^... .. ..:..:.. .+ [^\s:\[\]]+: [0-9:\[\]\.]+ \(pam_unix\) //) { $service =~ s/^... .. ..:..:.. .+ ([^\s:\[\]]+): [0-9:\[\]\.]+ \(pam_unix\) .*$/$1/; #for debian woody - } elsif ( ( $line =~ s/^... .. ..:..:.. .+ PAM_unix\[\d+\]: \((.*?)\) // )) { + } elsif ( $line =~ s/^... .. ..:..:.. .+ PAM_unix\[\d+\]: \((.*?)\) // ) { $service =~ s/^... .. ..:..:.. .+ PAM_unix\[\d+\]: \(([^ ]*)\) .*/$1/; + } elsif ( $line =~ s/^... .. ..:..:.. .+ pam_unix(.+:.+): // ) { + $service =~ s/^... .. ..:..:.. .+ pam_unix\((.+):.+\): .*$/$1/; + #new version } else { next; } - #lowercase the service + #lowercase the service $service = lc($service); if (($service eq 'sshd') or ($service eq 'login') or ($service eq 'ftp') or ($service eq 'rsh')) { if ($line =~ s/^session opened for user (.+) by \(uid=\d+\)/$1/) { --- logwatch-7.2.1/scripts/services/secure.pom 2005-12-06 03:37:34.000000000 +0100 +++ logwatch-7.2.1/scripts/services/secure 2006-03-16 13:42:52.222815504 +0100 @@ -114,6 +114,7 @@ ( $ThisLine =~ /pam_succeed_if: requirement "uid < 100" (was|not) met by user /) or ( $ThisLine =~ /pam_rhosts_auth\[\d+\]: allowed to [^ ]+ as \w+/) or ( $ThisLine =~ /^(.*)\(pam_unix\)/) or + ( $ThisLine =~ /pam_unix\(.*:.*\)/) or ( $ThisLine =~ m/^[^ ]+\[\d+\]: connect from localhost$/ ) or ( $ThisLine =~ /^\/usr\/bin\/sudo:/) or ( $ThisLine =~ /^halt:/) or logwatch-7.2.1-secure.patch: secure | 15 ++++++++++++++- 1 files changed, 14 insertions(+), 1 deletion(-) --- NEW FILE logwatch-7.2.1-secure.patch --- --- logwatch-7.2.1/scripts/services/secure.pom 2006-03-16 13:40:03.105525240 +0100 +++ logwatch-7.2.1/scripts/services/secure 2006-03-16 13:39:03.000000000 +0100 @@ -133,7 +133,9 @@ ( $ThisLine =~ /^ipop3d\[\d+\]:/) or ( $ThisLine =~ /pam_timestamp: updated timestamp file/) or ( $ThisLine =~ /pam_timestamp: timestamp file `([^ ]+)' is only \d+ seconds old, allowing access to ([^ ]+) for user ([^ ]+)/) or - ( $ThisLine =~ /pam_timestamp: timestamp file `([^ ]+)' has unacceptable age \(\d+ seconds\), disallowing access to ([^ ]+) for user ([^ ]+)/) + ( $ThisLine =~ /pam_timestamp: timestamp file `([^ ]+)' has unacceptable age \(\d+ seconds\), disallowing access to ([^ ]+) for user ([^ ]+)/) or + ( $ThisLine =~ /userhelper\[\d+\]: running '([^ ]+)' with [^ ]+ context/) or + ( $ThisLine =~ /pam_timestamp\(.*:session\): updated timestamp file `\/var\/run\/sudo.*'/) ) { # Ignore these entries } elsif ($ThisLine =~ /^spop3d/ || $ThisLine =~ /^pop\(\w+\)\[\d+\]:/) { @@ -319,6 +321,8 @@ $PwdChange{"$User"}++; } elsif ( ($User) = ($ThisLine =~ /^cvs: password mismatch for ([^']+): ([^']+) vs. ([^']+)/) ){ $cvs_passwd_mismatch{$User}++; + } elsif ( ($User,$From,$To) = ($ThisLine =~ /usermod\[[0-9]*\]: change user `([^ ]*)' shell from `([^ ]*)' to `([^ ]*)'/) ) { + $ChangedShell{"$User,$From,$To"}++; } else { # Unmatched entries... push @OtherList, "$ThisLine\n"; @@ -592,6 +596,15 @@ } } +if (keys %ChangedShell) { + print "\nChanged users default login shell: \n"; + foreach (keys %ChangedShell) { + ($User,$From,$To) = split ","; + print " User " . $User . " change shell from " . $From . " to " . $To . ": " . $ChangedShell{"$User,$From,$To"} . " Time(s)\n"; + } + +} + if (keys %cvs_passwd_mismatch) { print "\n cvs:"; print "\n Authentication Failures:\n"; logwatch-7.2.1-smart.patch: smartd | 29 ++++++++++++++++++++++++++++- 1 files changed, 28 insertions(+), 1 deletion(-) --- NEW FILE logwatch-7.2.1-smart.patch --- --- logwatch-7.2.1/scripts/services/smartd.pom 2005-12-02 17:41:12.000000000 +0100 +++ logwatch-7.2.1/scripts/services/smartd 2006-03-16 14:37:37.034448232 +0100 @@ -13,7 +13,10 @@ my %Offsectors = (); my %NumOffsectors = (); my %Warnings = (); +my %UnableToReg = (); my @OtherList = (); +my $ShutdownFailed = 0; +my $StartupFailed = 0; my $Detail = $ENV{'LOGWATCH_DETAIL_LEVEL'} || 0; my $IgnoreUnmatched = $ENV{'smartd_ignore_unmatched'} || 0; @@ -60,7 +63,10 @@ || ($ThisLine =~ /smartd received signal 15: Terminated/) || ($ThisLine =~ /smartd is exiting \(exit status 0\)/) || ($ThisLine =~ /smartd has fork/) - || ($ThisLine =~ /smartd startup succeeded/) ) { + || ($ThisLine =~ /smartd startup succeeded/) + || ($ThisLine =~ /Unable to register device (.*) \(no Directive -d removable\). Exiting/) + || ($ThisLine =~ /Device (.*), SATA disks accessed via libata are not currently supported by smartmontools./) ) + { # ignore # } elsif ( ($Device,$Msg) = ($ThisLine =~ /^Device: ([^,]+), (.*)$/)) { @@ -80,6 +86,12 @@ $NumOffsectors{$Device} = $Num; } elsif ( ( $ThisLine =~ /warning/i ) ) { $Warnings{$ThisLine}++; + } elsif ( ($ThisLine =~ /smartd startup failed/ ) ) { + $StartupFailed++; + } elsif ( ($ThisLine =~ /smartd shutdown failed/ ) ) { + $ShutdownFailed++; + } elsif ( my ($Device) = ($ThisLine =~ /Unable to register SCSI device (.*) at line 1 of file \/etc\/smartd.conf/) ) { + $UnableToReg{$Device}++ } else { # Report any unmatched entries... push @OtherList,"$ThisLine\n"; @@ -156,6 +168,21 @@ } } +if ($StartupFailed) { + print "\n Smartd startup failed: " . $StartupFailed . " Time(s)\n"; +} + +if ($ShutdownFailed) { + print "\n Smartd shutdown failed: " . $ShutdownFailed . " Time(s)\n"; +} + +if ( (keys %UnableToReg) ) { + print "\n Wrong configuration for devices:\n"; + foreach my $Device (sort keys %UnableToReg) { + print " " . $Device .": ". $UnableToReg{$Device} . " Time(s)\n"; + } +} + if (($#OtherList >= 0) and (not $IgnoreUnmatched)){ print "\n**Unmatched Entries**\n"; print @OtherList; logwatch-7.2.1-sshd.patch: sshd | 39 ++++++++++++++++++++++++++++++++++++++- 1 files changed, 38 insertions(+), 1 deletion(-) --- NEW FILE logwatch-7.2.1-sshd.patch --- --- logwatch-7.2.1/scripts/services/sshd.pom 2006-03-16 14:17:12.221648080 +0100 +++ logwatch-7.2.1/scripts/services/sshd 2006-03-16 14:20:13.607073304 +0100 @@ -140,6 +140,9 @@ my %NoShellUsers = (); my %DeprecatedOption = (); my %MisMatch = (); +my %KrbAutFail = (); +my %KrbAutErr = (); +my %KrbErr = (); my @BadRSA = (); my @Scanned = (); my %OtherList = (); @@ -195,7 +198,8 @@ # We won't count the following two because they're always followed by a # failed login entry... ($ThisLine =~ /^input_userauth_request: (illegal|invalid) user (.*)$/ ) or - ($ThisLine =~ m/^(Illegal|Invalid) user (.*) from ([^ ]+)/ ) + ($ThisLine =~ m/^(Illegal|Invalid) user (.*) from ([^ ]+)/ ) or + ($ThisLine =~ /pam_krb5: authentication succeeds for `([^ ]*)'/) ) { # Ignore these } elsif ( my ($Method,$User,$Host,$Port) = ($ThisLine =~ /^Accepted (\S+) for (\S+) from ([\d\.:a-f]+) port (\d+)/) ) { @@ -311,6 +315,16 @@ push @Scanned, $IP; } elsif ( my ($Line,$Option) = ($ThisLine =~ /^rexec line (\d+): Deprecated option (.*)$/)) { $DeprecatedOption{"$Option - line $Line"}++; + } elsif ( my ($Pom1,$Pom2,$User) = ($ThisLine =~ /pam_krb5(\[\d*\])?: authentication fails for (`|')([^ ]*)'/)) { + $KrbAutFail{$User}++; + } elsif ( my ($Error) = ($ThisLine =~ /pam_krb5: authenticate error: (.*)$/)) { + $KrbAutErr{$Error}++; + } elsif ( ($ThisLine =~ /pam_krb5: unable to determine uid\/gid for user$/)) { + $KrbAutErr{"unable to determine uid/gid for user"}++; + } elsif ( my ($Error) = ($ThisLine =~ /pam_krb5: error removing file (.*)$/)) { + $KrbErr{"error removing file " . $Error}++; + } elsif ( my ($Pom,$Error) = ($ThisLine =~ /pam_krb5(\[\d*\]): error resolving user name '[^ ]*' to uid\/gid pai/)) { + $KrbErr{"error resolving user name '$Error' to uid\/gid pai"}++; } else { # Report any unmatched entries... unless ($ThisLine =~ /fwd X11 connect/) { @@ -499,6 +513,29 @@ } } +if (keys %KrbAutFail) { + print "\n\Failed pam_krb5 authentication:\n"; + foreach my $User (sort keys %KrbAutFail) { + print " $User: " . $KrbAutFail{$User} . " Time(s)\n"; + } +} + +if (keys %KrbAutErr) { + print "\n\pam_krb5 authentication errors:\n"; + foreach my $Error (sort keys %KrbAutErr) { + print " $Error: " . $KrbAutErr{$Error} . " Time(s)\n"; + } +} + + +if (keys %KrbErr) { + print "\n pam_krb5 errors:\n"; + foreach my $Error (sort keys %KrbErr) { + print " $Error: " . $KrbErr{$Error} . " Time(s)\n"; + } +} + + if (keys %DisconnectReceived) { print "\n\nReceived disconnect:\n"; foreach my $Reason (sort {$a cmp $b} keys %DisconnectReceived) { Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/logwatch/devel/.cvsignore,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- .cvsignore 23 Nov 2005 14:30:46 -0000 1.12 +++ .cvsignore 17 Mar 2006 09:12:20 -0000 1.13 @@ -1 +1 @@ -logwatch-7.1.tar.gz +logwatch-7.2.1.tar.gz Index: logwatch.spec =================================================================== RCS file: /cvs/dist/rpms/logwatch/devel/logwatch.spec,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- logwatch.spec 20 Feb 2006 08:42:37 -0000 1.35 +++ logwatch.spec 17 Mar 2006 09:12:20 -0000 1.36 @@ -1,21 +1,20 @@ Summary: A log file analysis program. Name: logwatch -Version: 7.1 -Release: 8 +Version: 7.2.1 +Release: 1 License: MIT Group: Applications/System URL: http://www.logwatch.org/ Source: ftp://ftp.kaybee.org/pub/linux/logwatch-%{version}.tar.gz -Patch2: logwatch-7.0-nosegfault.patch -Patch3: logwatch-7.1-sshd.patch -Patch4: logwatch-7.1-samba.patch -Patch5: logwatch-7.1-named.patch -Patch6: logwatch-7.1-secure.patch -Patch7: logwatch-7.1-iptables.patch -Patch8: logwatch-7.1-audit.patch -Patch9: logwatch-7.1-http.patch -Patch10: logwatch-7.1-pam_unix.patch -Patch11: logwatch-7.1-http2.patch +Patch2: logwatch-7.2.1-nosegfault.patch +Patch10: logwatch-7.2.1-pam_unix.patch +Patch11: logwatch-7.2.1-http.patch +Patch12: logwatch-7.2.1-sshd.patch +Patch13: logwatch-7.2.1-smart.patch +Patch14: logwatch-7.2.1-named.patch +Patch15: logwatch-7.2.1-audit.patch +Patch16: logwatch-7.2.1-secure.patch +Patch17: logwatch-7.2.1-mountd.patch Requires: textutils sh-utils grep mailx BuildRoot: %{_tmppath}/logwatch-build @@ -30,15 +29,14 @@ %prep %setup -q %patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 -%patch6 -p1 -%patch7 -p1 -%patch8 -p1 -%patch9 -p1 %patch10 -p1 %patch11 -p1 +%patch12 -p1 +%patch13 -p1 +%patch14 -p1 +%patch15 -p1 +%patch16 -p1 +%patch17 -p1 %install @@ -140,6 +138,12 @@ %doc License project/CHANGES project/TODO %changelog +* Fri Mar 17 2006 Ivana Varekova 7.2.1-1 +- update to 7.2.1 +- update nosegfault, pam_unix, http patches +- added sshd, smart, named, audit, secure and mountd services + patches + * Mon Feb 20 2006 Ivana Varekova 7.1-8 - fix http exploit problem #181802 Index: sources =================================================================== RCS file: /cvs/dist/rpms/logwatch/devel/sources,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- sources 23 Nov 2005 14:30:46 -0000 1.12 +++ sources 17 Mar 2006 09:12:20 -0000 1.13 @@ -1 +1 @@ -6abe774abb10f45472c387f5e646a251 logwatch-7.1.tar.gz +a3b6f24d8976bbcf9e6e956891560635 logwatch-7.2.1.tar.gz --- logwatch-7.0-nosegfault.patch DELETED --- --- logwatch-7.1-audit.patch DELETED --- --- logwatch-7.1-http.patch DELETED --- --- logwatch-7.1-http2.patch DELETED --- --- logwatch-7.1-iptables.patch DELETED --- --- logwatch-7.1-named.patch DELETED --- --- logwatch-7.1-pam_unix.patch DELETED --- --- logwatch-7.1-samba.patch DELETED --- --- logwatch-7.1-secure.patch DELETED --- --- logwatch-7.1-sshd.patch DELETED --- From fedora-cvs-commits at redhat.com Fri Mar 17 12:11:02 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 17 Mar 2006 07:11:02 -0500 Subject: rpms/cups/devel cups-no-gzip-man.patch, NONE, 1.1 cups-policy.patch, NONE, 1.1 cups-users.patch, NONE, 1.1 cups-1.1.15-initscript.patch, 1.3, 1.4 cups-1.1.16-system-auth.patch, 1.3, 1.4 cups-1.1.17-ppdsdat.patch, 1.3, 1.4 cups-1.1.17-rcp.patch, 1.2, 1.3 cups-CAN-2005-0064.patch, 1.1, 1.2 cups-dest-cache-v2.patch, 1.1, 1.2 cups-locale.patch, 1.1, 1.2 cups-lpd, 1.2, 1.3 cups-pie.patch, 1.4, 1.5 cups-relro.patch, 1.2, 1.3 cups.spec, 1.134, 1.135 sources, 1.15, 1.16 cups-1.1.14-doclink.patch, 1.1, NONE cups-1.1.17-pdftops.patch, 1.4, NONE cups-1.1.17-sanity.patch, 1.2, NONE cups-1.1.19-lpstat.patch, 1.1, NONE cups-CAN-2004-0888.patch, 1.1, NONE cups-CAN-2005-2097.patch, 1.1, NONE cups-CVE-2005-3625, 6, 7.patch, 1.1, NONE cups-autodetected-tag.patch, 1.1, NONE cups-dbus.patch, 1.12, NONE cups-enabledisable.patch, 1.3, NONE cups-finddest.patch, 1.1, NONE cups-gcc34.patch, 1.1, NONE cups-gcc4.patch, 1.1, NONE cups-sigchld.patch, 1.1, NONE cups-slow.patch, 1.1, NONE cups-str1023.patch, 1.4, NONE cups-str1068.patch, 1.1, NONE cups-str1249.! patch, 1.1, NONE cups-str1284.patch, 1.2, NONE cups-str1290.patch, 1.1, NONE cups-str1301.patch, 1.1, NONE Message-ID: <200603171211.k2HCB2cg030903@cvs.devel.redhat.com> Author: twaugh Update of /cvs/dist/rpms/cups/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv30883 Modified Files: cups-1.1.15-initscript.patch cups-1.1.16-system-auth.patch cups-1.1.17-ppdsdat.patch cups-1.1.17-rcp.patch cups-CAN-2005-0064.patch cups-dest-cache-v2.patch cups-locale.patch cups-lpd cups-pie.patch cups-relro.patch cups.spec sources Added Files: cups-no-gzip-man.patch cups-policy.patch cups-users.patch Removed Files: cups-1.1.14-doclink.patch cups-1.1.17-pdftops.patch cups-1.1.17-sanity.patch cups-1.1.19-lpstat.patch cups-CAN-2004-0888.patch cups-CAN-2005-2097.patch cups-CVE-2005-3625,6,7.patch cups-autodetected-tag.patch cups-dbus.patch cups-enabledisable.patch cups-finddest.patch cups-gcc34.patch cups-gcc4.patch cups-sigchld.patch cups-slow.patch cups-str1023.patch cups-str1068.patch cups-str1249.patch cups-str1284.patch cups-str1290.patch cups-str1301.patch Log Message: * Fri Mar 17 2006 Tim Waugh 1:1.2-0.1.b2.2 - Rebuilt. cups-no-gzip-man.patch: cups-manpages.m4 | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) --- NEW FILE cups-no-gzip-man.patch --- --- cups-1.2svn-r5102/config-scripts/cups-manpages.m4.no-gzip-man 2006-02-13 02:46:10.000000000 +0000 +++ cups-1.2svn-r5102/config-scripts/cups-manpages.m4 2006-02-17 09:55:45.000000000 +0000 @@ -80,10 +80,10 @@ ;; Linux* | GNU*) # Linux and GNU Hurd - MAN1EXT=1.gz - MAN5EXT=5.gz - MAN7EXT=7.gz - MAN8EXT=8.gz + MAN1EXT=1 + MAN5EXT=5 + MAN7EXT=7 + MAN8EXT=8 MAN8DIR=8 ;; *) cups-policy.patch: conf.c | 1 + 1 files changed, 1 insertion(+) --- NEW FILE cups-policy.patch --- --- cups-1.2b2/scheduler/conf.c.policy 2006-03-14 10:38:30.000000000 +0000 +++ cups-1.2b2/scheduler/conf.c 2006-03-14 10:39:53.000000000 +0000 @@ -785,6 +785,7 @@ cupsdLogMessage(CUPSD_LOG_ERROR, "Default policy \"%s\" not found!", DefaultPolicy); + cupsdSetString(&DefaultPolicy, "default"); if ((DefaultPolicyPtr = cupsdFindPolicy("default")) != NULL) cupsdLogMessage(CUPSD_LOG_INFO, "Using policy \"default\" as the default!"); cups-users.patch: admin.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) --- NEW FILE cups-users.patch --- --- cups-1.2b2/cgi-bin/admin.c.users 2006-03-14 12:17:55.000000000 +0000 +++ cups-1.2b2/cgi-bin/admin.c 2006-03-14 12:32:01.000000000 +0000 @@ -2624,11 +2624,11 @@ NULL, uri); if (num_users == 0) - ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME, + ippAddString(request, IPP_TAG_PRINTER, IPP_TAG_NAME, "requesting-user-name-allowed", NULL, "all"); else { - attr = ippAddStrings(request, IPP_TAG_OPERATION, IPP_TAG_NAME, + attr = ippAddStrings(request, IPP_TAG_PRINTER, IPP_TAG_NAME, type, num_users, NULL, NULL); for (i = 0, ptr = (char *)users; *ptr; i ++) cups-1.1.15-initscript.patch: Makefile | 28 +--------------------------- 1 files changed, 1 insertion(+), 27 deletions(-) Index: cups-1.1.15-initscript.patch =================================================================== RCS file: /cvs/dist/rpms/cups/devel/cups-1.1.15-initscript.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- cups-1.1.15-initscript.patch 9 Sep 2004 04:12:00 -0000 1.3 +++ cups-1.1.15-initscript.patch 17 Mar 2006 12:10:57 -0000 1.4 @@ -1,55 +1,41 @@ ---- cups-1.1.21rc2/systemv/Makefile.noinit 2004-08-11 15:10:22.000000000 +0100 -+++ cups-1.1.21rc2/systemv/Makefile 2004-08-24 12:30:31.868411346 +0100 -@@ -77,7 +77,7 @@ - $(INSTALL_BIN) lp $(BINDIR) - $(INSTALL_BIN) lpoptions $(BINDIR) - $(INSTALL_BIN) lpstat $(BINDIR) -- -$(INSTALL_BIN) -m 4755 -o $(CUPS_USER) -g $(CUPS_GROUP) lppasswd $(BINDIR) -+ -$(INSTALL_BIN) -m 4755 lppasswd $(BINDIR) - if test ! -x $(BINDIR)/lppasswd; then \ - chmod 755 $(BINDIR)/lppasswd; \ - fi ---- cups-1.1.21rc2/Makefile.noinit 2004-02-25 20:14:50.000000000 +0000 -+++ cups-1.1.21rc2/Makefile 2004-08-24 12:28:17.704029413 +0100 -@@ -89,30 +89,6 @@ +--- cups-1.2svn-r5238/Makefile.noinit 2006-03-07 09:37:02.000000000 +0000 ++++ cups-1.2svn-r5238/Makefile 2006-03-07 09:42:51.000000000 +0000 +@@ -1,4 +1,4 @@ +-# ++ + # "$Id$" + # + # Top-level Makefile for the Common UNIX Printing System (CUPS). +@@ -80,32 +80,6 @@ echo Installing cups-config script... - $(INSTALL_DIR) $(BINDIR) + $(INSTALL_DIR) -m 755 $(BINDIR) $(INSTALL_SCRIPT) cups-config $(BINDIR)/cups-config - echo Installing startup script... - if test "x$(INITDIR)" != "x"; then \ -- $(INSTALL_DIR) $(BUILDROOT)$(INITDIR)/init.d; \ -- $(INSTALL_SCRIPT) cups.sh $(BUILDROOT)$(INITDIR)/init.d/cups; \ -- $(INSTALL_DIR) $(BUILDROOT)$(INITDIR)/rc0.d; \ -- $(INSTALL_SCRIPT) cups.sh $(BUILDROOT)$(INITDIR)/rc0.d/K00cups; \ -- $(INSTALL_DIR) $(BUILDROOT)$(INITDIR)/rc2.d; \ -- $(INSTALL_SCRIPT) cups.sh $(BUILDROOT)$(INITDIR)/rc2.d/S99cups; \ -- $(INSTALL_DIR) $(BUILDROOT)$(INITDIR)/rc3.d; \ -- $(INSTALL_SCRIPT) cups.sh $(BUILDROOT)$(INITDIR)/rc3.d/S99cups; \ -- $(INSTALL_DIR) $(BUILDROOT)$(INITDIR)/rc5.d; \ -- $(INSTALL_SCRIPT) cups.sh $(BUILDROOT)$(INITDIR)/rc5.d/S99cups; \ +- $(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/init.d; \ +- $(INSTALL_SCRIPT) init/cups.sh $(BUILDROOT)$(INITDIR)/init.d/cups; \ +- $(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/rc0.d; \ +- $(INSTALL_SCRIPT) init/cups.sh $(BUILDROOT)$(INITDIR)/rc0.d/K00cups; \ +- $(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/rc2.d; \ +- $(INSTALL_SCRIPT) init/cups.sh $(BUILDROOT)$(INITDIR)/rc2.d/S99cups; \ +- $(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/rc3.d; \ +- $(INSTALL_SCRIPT) init/cups.sh $(BUILDROOT)$(INITDIR)/rc3.d/S99cups; \ +- $(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/rc5.d; \ +- $(INSTALL_SCRIPT) init/cups.sh $(BUILDROOT)$(INITDIR)/rc5.d/S99cups; \ - fi - if test "x$(INITDIR)" = "x" -a "x$(INITDDIR)" != "x"; then \ - $(INSTALL_DIR) $(BUILDROOT)$(INITDDIR); \ - if test "$(INITDDIR)" = "/System/Library/StartupItems/PrintingServices"; then \ -- $(INSTALL_SCRIPT) cups.osx $(BUILDROOT)$(INITDDIR)/PrintingServices; \ -- $(INSTALL_DATA) cups.plist $(BUILDROOT)$(INITDDIR)/StartupParameters.plist; \ -- $(INSTALL_DIR) $(BUILDROOT)$(INITDDIR)/Resources/English.lproj; \ -- $(INSTALL_DATA) cups.strings $(BUILDROOT)$(INITDDIR)/Resources/English.lproj/Localizable.strings; \ +- $(INSTALL_SCRIPT) init/PrintingServices $(BUILDROOT)$(INITDDIR)/PrintingServices; \ +- $(INSTALL_DATA) init/StartupParameters.plist $(BUILDROOT)$(INITDDIR)/StartupParameters.plist; \ +- $(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDDIR)/Resources/English.lproj; \ +- $(INSTALL_DATA) init/Localizable.strings $(BUILDROOT)$(INITDDIR)/Resources/English.lproj/Localizable.strings; \ +- elif test "$(INITDDIR)" = "/System/Library/LaunchDaemons"; then \ +- $(INSTALL_DATA) init/org.cups.cupsd.plist $(BUILDROOT)$(DEFAULT_LAUNCHD_CONF); \ - else \ -- $(INSTALL_SCRIPT) cups.sh $(BUILDROOT)$(INITDDIR)/cups; \ +- $(INSTALL_SCRIPT) init/cups.sh $(BUILDROOT)$(INITDDIR)/cups; \ - fi \ - fi - - # - # Install source and header files... ---- cups-1.1.21rc2/Makedefs.in.noinit 2004-06-29 04:14:19.000000000 +0100 -+++ cups-1.1.21rc2/Makedefs.in 2004-08-24 12:28:17.713027695 +0100 -@@ -47,7 +47,7 @@ - # Installation programs... - # - --INSTALL_BIN = $(LIBTOOL) $(INSTALL) -m 755 -s -+INSTALL_BIN = $(LIBTOOL) $(INSTALL) -m 755 - INSTALL_DATA = $(INSTALL) -m 644 - INSTALL_DIR = $(INSTALL) -d - INSTALL_LIB = $(LIBTOOL) $(INSTALL) -m 755 + if test "x$(DBUSDIR)" != "x"; then \ + echo Installing cups.conf in $(DBUSDIR)...;\ + $(INSTALL_DIR) -m 755 $(BUILDROOT)$(DBUSDIR); \ cups-1.1.16-system-auth.patch: Makefile | 10 +++++++--- cups.system-auth | 3 +++ 2 files changed, 10 insertions(+), 3 deletions(-) Index: cups-1.1.16-system-auth.patch =================================================================== RCS file: /cvs/dist/rpms/cups/devel/cups-1.1.16-system-auth.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- cups-1.1.16-system-auth.patch 30 Sep 2005 12:20:31 -0000 1.3 +++ cups-1.1.16-system-auth.patch 17 Mar 2006 12:10:57 -0000 1.4 @@ -1,21 +1,26 @@ ---- /dev/null 2004-02-23 21:02:56.000000000 +0000 -+++ cups-1.1.21rc1/conf/cups.system-auth 2004-06-03 15:14:55.795385144 +0100 -@@ -0,0 +1,3 @@ -+#%PAM-1.0 -+auth include system-auth -+account include system-auth ---- cups-1.1.21rc1/conf/Makefile.system-auth 2004-02-26 16:51:59.000000000 +0000 -+++ cups-1.1.21rc1/conf/Makefile 2004-06-03 15:32:52.108540894 +0100 -@@ -67,7 +67,11 @@ +--- cups-1.2svn-r5238/conf/Makefile.system-auth 2006-03-07 09:34:20.000000000 +0000 ++++ cups-1.2svn-r5238/conf/Makefile 2006-03-07 09:45:41.000000000 +0000 +@@ -79,10 +79,14 @@ done - -if test x$(PAMDIR) != x$(BUILDROOT); then \ - $(INSTALL_DIR) $(PAMDIR); \ -- $(INSTALL_DATA) $(PAMFILE) $(PAMDIR)/cups; \ + -if test x$(PAMDIR) != x; then \ + $(INSTALL_DIR) -m 755 $(BUILDROOT)$(PAMDIR); \ +- if test -r $(BUILDROOT)$(PAMDIR)/cups/$(PAMFILE) ; then \ +- $(INSTALL_DATA) $(PAMFILE) $(BUILDROOT)$(PAMDIR)/cups.N ; \ + if test -f /etc/pam.d/system-auth; then \ -+ $(INSTALL_DATA) cups.system-auth $(PAMDIR)/cups ; \ -+ else \ -+ $(INSTALL_DATA) $(PAMFILE) $(PAMDIR)/cups; \ -+ fi \ ++ $(INSTALL_DATA) cups.system-auth $(BUILDROOT)$(PAMDIR)/cups ; \ + else \ +- $(INSTALL_DATA) $(PAMFILE) $(BUILDROOT)$(PAMDIR)/cups ; \ ++ if test -r $(BUILDROOT)$(PAMDIR)/cups/$(PAMFILE) ; then \ ++ $(INSTALL_DATA) $(PAMFILE) $(BUILDROOT)$(PAMDIR)/cups.N ; \ ++ else \ ++ $(INSTALL_DATA) $(PAMFILE) $(BUILDROOT)$(PAMDIR)/cups ; \ ++ fi ; \ + fi ; \ fi - +--- /dev/null 2006-03-07 09:12:30.964372750 +0000 ++++ cups-1.2svn-r5238/conf/cups.system-auth 2006-03-07 09:43:12.000000000 +0000 +@@ -0,0 +1,3 @@ ++#%PAM-1.0 ++auth include system-auth ++account include system-auth cups-1.1.17-ppdsdat.patch: main.c | 27 ++++++++++++++++++++++++--- 1 files changed, 24 insertions(+), 3 deletions(-) Index: cups-1.1.17-ppdsdat.patch =================================================================== RCS file: /cvs/dist/rpms/cups/devel/cups-1.1.17-ppdsdat.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- cups-1.1.17-ppdsdat.patch 9 Sep 2004 04:08:38 -0000 1.3 +++ cups-1.1.17-ppdsdat.patch 17 Mar 2006 12:10:57 -0000 1.4 @@ -1,14 +1,14 @@ ---- cups-1.1.21rc1/scheduler/main.c.ppdsdat 2004-05-27 19:17:54.000000000 +0100 -+++ cups-1.1.21rc1/scheduler/main.c 2004-06-03 15:33:51.054269593 +0100 -@@ -91,6 +91,7 @@ +--- cups-1.2svn-r5083/scheduler/main.c.ppdsdat 2006-02-05 21:58:58.000000000 +0000 ++++ cups-1.2svn-r5083/scheduler/main.c 2006-02-10 13:46:19.000000000 +0000 +@@ -115,6 +115,7 @@ int i; /* Looping var */ char *opt; /* Option character */ int fg; /* Run in the foreground */ + int only_ppds; /* Just build ppds.dat */ - int fds; /* Number of ready descriptors select returns */ + int fds; /* Number of ready descriptors */ fd_set *input, /* Input set for select() */ *output; /* Output set for select() */ -@@ -120,10 +121,25 @@ +@@ -150,10 +151,25 @@ */ fg = 0; @@ -28,22 +28,22 @@ + { + fprintf(stderr, "cupsd: Unknown option \'%s\' - aborting!\n", + &argv[i][2]); -+ usage(); ++ usage(1); + } + } + else for (opt = argv[i] + 1; *opt != '\0'; opt ++) switch (*opt) { case 'c' : /* Configuration file */ -@@ -166,6 +182,7 @@ - usage(); +@@ -227,6 +243,7 @@ + usage(1); break; } + } else { - fprintf(stderr, "cupsd: Unknown argument \'%s\' - aborting!\n", argv[i]); -@@ -375,6 +392,9 @@ + _cupsLangPrintf(stderr, _("cupsd: Unknown argument \"%s\" - aborting!\n"), +@@ -467,6 +484,9 @@ signal(SIGTERM, sigterm_handler); #endif /* HAVE_SIGSET */ @@ -53,12 +53,20 @@ #ifdef __sgi /* * Try to create a fake lpsched lock file if one is not already there. -@@ -1310,7 +1330,7 @@ - static void - usage(void) +@@ -2311,13 +2331,14 @@ + usage(int status) /* O - Exit status */ { -- fputs("Usage: cupsd [-c config-file] [-f] [-F]\n", stderr); -+ fputs("Usage: cupsd [-c config-file] [-f] [-F] --ppdsdat\n", stderr); - exit(1); + _cupsLangPuts(status ? stderr : stdout, +- _("Usage: cupsd [-c config-file] [-f] [-F] [-h] [-l]\n" ++ _("Usage: cupsd [-c config-file] [-f] [-F] [-h] [-l] [--ppdsdat]\n" + "\n" + "-c config-file Load alternate configuration file\n" + "-f Run in the foreground\n" + "-F Run in the foreground but detach\n" + "-h Show this usage message\n" +- "-l Run cupsd from launchd(8)\n")); ++ "-l Run cupsd from launchd(8)\n" ++ "--ppdsdat Just build ppds.dat\n")); + exit(status); } cups-1.1.17-rcp.patch: printers.tmpl | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) Index: cups-1.1.17-rcp.patch =================================================================== RCS file: /cvs/dist/rpms/cups/devel/cups-1.1.17-rcp.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- cups-1.1.17-rcp.patch 9 Sep 2004 04:06:15 -0000 1.2 +++ cups-1.1.17-rcp.patch 17 Mar 2006 12:10:57 -0000 1.3 @@ -1,11 +1,11 @@ ---- cups-1.1.17/templates/printers.tmpl.rcp 2000-09-05 22:08:31.000000000 +0100 -+++ cups-1.1.17/templates/printers.tmpl 2003-01-22 14:17:56.000000000 +0000 -@@ -16,7 +16,7 @@ - - - -- Description: {printer_info}
-+ {printer_info=Created by redhat-config-printer 0.6.x?Use system-config-printer to edit this!:Description: {printer_info}}
- Location: {printer_location}
- Printer State: {printer_state=3?idle:{printer_state=4?processing:stopped}}, - {printer_is_accepting_jobs=0?rejecting jobs:accepting jobs}. +--- cups-1.2svn-r4964/templates/printers.tmpl.rcp 2006-01-14 20:37:40.000000000 +0000 ++++ cups-1.2svn-r4964/templates/printers.tmpl 2006-01-24 17:13:14.000000000 +0000 +@@ -7,7 +7,7 @@ + + + +-Description: {printer_info}
++{printer_info=Created by redhat-config-printer 0.6.x?Use system-config-printer to edit this!:Description: {printer_info}}
+ Location: {printer_location}
+ Make and Model: {printer_make_and_model}
+ Printer State: {printer_state=3?idle:{printer_state=4?processing:stopped}}, cups-CAN-2005-0064.patch: Decrypt.cxx | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletion(-) Index: cups-CAN-2005-0064.patch =================================================================== RCS file: /cvs/dist/rpms/cups/devel/cups-CAN-2005-0064.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- cups-CAN-2005-0064.patch 19 Jan 2005 14:23:42 -0000 1.1 +++ cups-CAN-2005-0064.patch 17 Mar 2006 12:10:57 -0000 1.2 @@ -1,6 +1,6 @@ ---- cups-1.1.17/pdftops/Decrypt.cxx 2005-01-14 14:26:55.679891237 +0000 -+++ cups-1.1.17/pdftops/Decrypt.cxx 2005-01-17 14:21:58.917198715 +0000 -@@ -116,13 +116,19 @@ +--- cups-1.2svn-r4929/pdftops/Decrypt.cxx.CAN-2005-0064 2005-09-17 15:52:15.000000000 +0100 ++++ cups-1.2svn-r4929/pdftops/Decrypt.cxx 2006-01-20 14:31:21.000000000 +0000 +@@ -135,11 +135,16 @@ Guchar *buf; Guchar test[32]; Guchar fState[256]; @@ -14,14 +14,11 @@ + if ( !keyLength || keyLength > 16 ) { + return gFalse; + } -+ ++ // generate file key - buf = (Guchar *)gmalloc(68 + fileID->getLength()); -+ tmpKey = (Guchar *)gmalloc(keyLength * sizeof(Guchar)); + buf = (Guchar *)gmalloc(72 + fileID->getLength()); if (userPassword) { - len = userPassword->getLength(); - if (len < 32) { -@@ -175,6 +181,7 @@ +@@ -201,6 +206,7 @@ ok = gFalse; } cups-dest-cache-v2.patch: dest.c | 180 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 180 insertions(+) Index: cups-dest-cache-v2.patch =================================================================== RCS file: /cvs/dist/rpms/cups/devel/cups-dest-cache-v2.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- cups-dest-cache-v2.patch 10 Jan 2006 18:53:00 -0000 1.1 +++ cups-dest-cache-v2.patch 17 Mar 2006 12:10:57 -0000 1.2 @@ -1,18 +1,17 @@ ---- cups-1.1.23/cups/dest.c.dest-cache-v2 2005-01-03 19:29:45.000000000 +0000 -+++ cups-1.1.23/cups/dest.c 2006-01-10 17:52:39.000000000 +0000 -@@ -45,7 +45,10 @@ - #include "string.h" +--- cups-1.2svn-r5238/cups/dest.c.dest-cache-v2 2006-03-07 09:35:05.000000000 +0000 ++++ cups-1.2svn-r5238/cups/dest.c 2006-03-07 10:17:06.000000000 +0000 +@@ -44,7 +44,10 @@ + #include "globals.h" #include #include -- +#include -+#include + #include +#include +#include - /* - * Local functions... -@@ -204,6 +207,146 @@ + #ifdef HAVE_NOTIFY_H + # include +@@ -214,6 +217,144 @@ /* @@ -57,7 +56,7 @@ + close(fd); + return(-1); + } -+ ++ + /* populate the destinations structure */ + for (i=0; i < num_dests; i++) + { @@ -70,7 +69,7 @@ + return(-1); + strcpy((*dests)[i].instance, &buf[offset]); + offset += strlen((*dests)[i].instance) +1; -+ ++ + /* get number of options */ + strcpy(word, &buf[offset]); + offset += strlen(word)+1; @@ -153,13 +152,11 @@ + } +} + -+ -+ +/* - * 'cupsGetDests()' - Get the list of destinations. - */ - -@@ -211,8 +354,44 @@ + * 'cupsGetDests()' - Get the list of destinations from the default server. + * + * Starting with CUPS 1.2, the returned list of destinations include the +@@ -226,8 +367,44 @@ cupsGetDests(cups_dest_t **dests) /* O - Destinations */ { int num_dests; /* Number of destinations */ @@ -204,7 +201,7 @@ /* * Connect to the CUPS server and get the destination list and options... -@@ -225,6 +404,9 @@ +@@ -240,6 +417,9 @@ if (http) httpClose(http); cups-locale.patch: language.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) Index: cups-locale.patch =================================================================== RCS file: /cvs/dist/rpms/cups/devel/cups-locale.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- cups-locale.patch 9 Sep 2004 04:05:22 -0000 1.1 +++ cups-locale.patch 17 Mar 2006 12:10:57 -0000 1.2 @@ -1,28 +1,39 @@ -diff -ruN cups-1.1.19.orig/cups/language.c cups-1.1.19/cups/language.c ---- cups-1.1.19.orig/cups/language.c 2003-08-14 20:13:18.000000000 +0900 -+++ cups-1.1.19/cups/language.c 2003-08-14 20:37:37.000000000 +0900 -@@ -188,6 +188,7 @@ - charset[16], /* Character set */ - *ptr, /* Pointer into language/ */ +--- cups-1.2svn-r5137/cups/language.c.locale 2006-02-15 20:11:10.000000000 +0000 ++++ cups-1.2svn-r5137/cups/language.c 2006-02-23 14:43:59.000000000 +0000 +@@ -276,6 +276,7 @@ + #endif /* CODESET */ + *ptr, /* Pointer into language/charset */ real[48], /* Real language name */ + ll_cc[48], /* Language + Country name */ - filename[1024], /* Filename for language locale file */ - *localedir; /* Directory for locale files */ + filename[1024]; /* Filename for language locale file */ cups_encoding_t encoding; /* Encoding to use */ -@@ -356,6 +357,7 @@ - */ + cups_lang_t *lang; /* Current language... */ +@@ -445,8 +446,10 @@ + country[0] = '\0'; - snprintf(real, sizeof(real), "%s_%s", langname, country); -+ strcpy(ll_cc, real); + if (language == NULL || !language[0] || +- !strcmp(language, "POSIX")) ++ !strcmp(language, "POSIX")) { + strcpy(langname, "C"); ++ strcpy(ll_cc, langname); ++ } + else + { + /* +@@ -476,6 +479,7 @@ + *ptr = '\0'; + } - if ((lang = cups_cache_lookup(real, encoding)) != NULL) - return (lang); -@@ -468,7 +470,7 @@ ++ snprintf(ll_cc, sizeof(ll_cc), "%s_%s", langname, country); + if (*language == '.' && !charset[0]) + { + /* +@@ -617,7 +621,7 @@ */ lang->used ++; - strlcpy(lang->language, real, sizeof(lang->language)); + strlcpy(lang->language, ll_cc, sizeof(lang->language)); - if (charset[0]) + if (encoding != CUPS_AUTO_ENCODING) lang->encoding = encoding; Index: cups-lpd =================================================================== RCS file: /cvs/dist/rpms/cups/devel/cups-lpd,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- cups-lpd 9 Sep 2004 04:02:40 -0000 1.2 +++ cups-lpd 17 Mar 2006 12:10:57 -0000 1.3 @@ -7,5 +7,5 @@ protocol = tcp wait = no user = lp - server = @LIBDIR@/cups/daemon/cups-lpd + server = /usr/lib/cups/daemon/cups-lpd } cups-pie.patch: cups/Makefile | 1 + filter/Makefile | 23 +++++++++++++++++------ pdftops/Makefile | 7 +++++++ scheduler/Makefile | 3 +++ systemv/Makefile | 3 ++- 5 files changed, 30 insertions(+), 7 deletions(-) Index: cups-pie.patch =================================================================== RCS file: /cvs/dist/rpms/cups/devel/cups-pie.patch,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- cups-pie.patch 9 Sep 2004 04:07:27 -0000 1.4 +++ cups-pie.patch 17 Mar 2006 12:10:57 -0000 1.5 @@ -1,65 +1,19 @@ ---- cups-1.1.19/cups/Makefile.pie 2003-03-20 02:45:21.000000000 +0000 -+++ cups-1.1.19/cups/Makefile 2003-11-20 15:53:43.000000000 +0000 -@@ -25,6 +25,7 @@ - # - - include ../Makedefs -+CFLAGS += -fpic - - # - # Object files... ---- cups-1.1.19/scheduler/Makefile.pie 2003-04-10 15:30:48.000000000 +0100 -+++ cups-1.1.19/scheduler/Makefile 2003-11-20 15:23:39.000000000 +0000 -@@ -24,6 +24,9 @@ - - include ../Makedefs - -+CFLAGS += -fpie -+LDFLAGS += -pie -+ - CUPSDOBJS = auth.o banners.o cert.o classes.o client.o conf.o devices.o \ - dirsvc.o main.o ipp.o listen.o job.o log.o network.o \ - ppds.o printers.o quotas.o server.o ---- cups-1.1.20/config-scripts/cups-compiler.m4.pie 2004-02-05 11:46:38.000000000 +0000 -+++ cups-1.1.20/config-scripts/cups-compiler.m4 2004-02-05 11:46:45.000000000 +0000 -@@ -65,10 +65,6 @@ - fi - fi - -- if test $PICFLAG = 1 -a $uname != AIX; then -- OPTIM="-fPIC $OPTIM" -- fi -- - if test "x$with_optim" = x; then - OPTIM="-Wall $OPTIM" - fi ---- cups-1.1.20/pdftops/Makefile.pie 2003-05-14 21:03:03.000000000 +0100 -+++ cups-1.1.20/pdftops/Makefile 2004-02-05 12:05:48.000000000 +0000 -@@ -9,6 +9,7 @@ - - - include ../Makedefs -+LDFLAGS += -pie - +--- cups-1.2b2/systemv/Makefile.pie 2006-03-05 16:48:12.000000000 +0000 ++++ cups-1.2b2/systemv/Makefile 2006-03-13 14:22:03.000000000 +0000 +@@ -192,9 +192,10 @@ + # lppasswd # - # Object files... -@@ -58,9 +59,14 @@ - UnicodeMap.o \ - XRef.o -+# For libxpdf.a: -+$(LIBOBJS): CXXFLAGS += -fPIC -+$(LIBOBJS): CFLAGS += -fPIC ++lppasswd.o: CFLAGS += -fPIE + lppasswd: lppasswd.o ../cups/$(LIBCUPS) + echo Linking $@... +- $(CC) $(LDFLAGS) -o lppasswd lppasswd.o $(LIBZ) $(LIBS) ++ $(CC) -pie $(LDFLAGS) -o lppasswd lppasswd.o $(LIBZ) $(LIBS) - OBJS = pdftops.o $(LIBOBJS) -+pdftops.o: CXXFLAGS += -fPIE -+ - # - # Make everything... # ---- cups-1.1.20/filter/Makefile.pie 2003-11-17 22:04:53.000000000 +0000 -+++ cups-1.1.20/filter/Makefile 2004-02-05 12:42:53.000000000 +0000 +--- cups-1.2b2/filter/Makefile.pie 2006-03-10 04:00:38.000000000 +0000 ++++ cups-1.2b2/filter/Makefile 2006-03-13 14:25:09.000000000 +0000 @@ -25,6 +25,7 @@ # @@ -67,66 +21,99 @@ +LDFLAGS += -pie FILTERS = gziptoany hpgltops texttops pstops imagetops imagetoraster \ - rastertodymo rastertoepson rastertohp -@@ -37,10 +38,21 @@ - image-sgi.o image-sgilib.o image-sun.o image-tiff.o \ - image-zoom.o image.o raster.o + rastertolabel rastertoepson rastertohp +@@ -45,11 +46,21 @@ + IMAGE32OBJS = $(IMAGEOBJS:.o=.32.o) + IMAGE64OBJS = $(IMAGEOBJS:.o=.64.o) FORMOBJS = form-attr.o form-main.o form-ps.o form-text.o form-tree.o -OBJS = $(HPGLOBJS) $(IMAGEOBJS) $(FORMOBJS) \ - gziptoany.o imagetops.o imagetoraster.o common.o pstops.o \ -+LIBOBJS = $(HPGLOBJS) $(IMAGEOBJS) $(FORMOBJS) ++LIBOBJS = $(HPGLOBJS) $(IMAGEOBJS) $(FORMOBJS) +BINOBJS = gziptoany.o imagetops.o imagetoraster.o common.o pstops.o \ - rastertodymo.o rastertoepson.o rastertohp.o \ - texttops.o textcommon.o + raster.o rastertoepson.o rastertohp.o rastertolabel.o \ + testimage.o testraster.o textcommon.o texttops.o +OBJS = $(LIBOBJS) $(BINOBJS) -+ -+FORMOBJSPIE = $(patsubst %.o,%.opie,$(FORMOBJS)) -+HPGLOBJSPIE = $(patsubst %.o,%.opie,$(HPGLOBJS)) + ++FORMOBJSPIE = $(patsubst %.o,%.opie,$(FORMOBJS)) ++HPGLOBJSPIE = $(patsubst %.o,%.opie,$(HPGLOBJS)) +$(LIBOBJS): CFLAGS += -fpic + -+$(BINOBJS): CFLAGS += -fpie ++$(BINOBJS): CFLAGS += -fPIE +.SUFFIXES: .opie +.c.opie: + echo Compiling $<... -+ $(CC) $(OPTIM) $(CFLAGS) -fpie -c $< -o $@ ++ $(CC) $(OPTIM) $(CFLAGS) -fPIE -c $< -o $@ # # Make all targets... -@@ -101,9 +113,9 @@ +@@ -178,9 +189,9 @@ # formtops # --formtops: $(FORMOBJS) common.o ../Makedefs ../cups/$(LIBCUPS) -+formtops: $(FORMOBJSPIE) common.o ../Makedefs ../cups/$(LIBCUPS) +-formtops: $(FORMOBJS) common.o ../cups/$(LIBCUPS) ++formtops: $(FORMOBJSPIE) common.o ../cups/$(LIBCUPS) echo Linking $@... - $(CC) $(LDFLAGS) -o $@ $(FORMOBJS) common.o $(LIBS) -lm + $(CC) $(LDFLAGS) -o $@ $(FORMOBJSPIE) common.o $(LIBS) -lm # -@@ -119,9 +131,9 @@ +@@ -196,9 +207,9 @@ # hpgltops # --hpgltops: $(HPGLOBJS) common.o ../Makedefs ../cups/$(LIBCUPS) -+hpgltops: $(HPGLOBJSPIE) common.o ../Makedefs ../cups/$(LIBCUPS) +-hpgltops: $(HPGLOBJS) common.o ../cups/$(LIBCUPS) ++hpgltops: $(HPGLOBJSPIE) common.o ../cups/$(LIBCUPS) echo Linking $@... - $(CC) $(LDFLAGS) -o $@ $(HPGLOBJS) common.o $(LIBS) -lm + $(CC) $(LDFLAGS) -o $@ $(HPGLOBJSPIE) common.o $(LIBS) -lm # ---- cups-1.1.20/systemv/Makefile.pie 2004-05-11 14:38:24.000000000 +0100 -+++ cups-1.1.20/systemv/Makefile 2004-05-11 14:40:22.000000000 +0100 -@@ -170,9 +170,10 @@ - # lppasswd +--- cups-1.2b2/pdftops/Makefile.pie 2006-03-05 16:48:12.000000000 +0000 ++++ cups-1.2b2/pdftops/Makefile 2006-03-13 14:22:03.000000000 +0000 +@@ -9,6 +9,7 @@ + + + include ../Makedefs ++LDFLAGS += -pie + # + # Object files... +@@ -86,8 +87,14 @@ + XRef.o -+lppasswd.o: CFLAGS += -fpie - lppasswd: lppasswd.o ../cups/$(LIBCUPS) - echo Linking $@... -- $(CC) $(LDFLAGS) -o lppasswd lppasswd.o $(LIBZ) $(LIBS) -+ $(CC) -pie $(LDFLAGS) -o lppasswd lppasswd.o $(LIBZ) $(LIBS) ++# For libxpdf.a: ++$(LIBOBJS): CXXFLAGS += -fPIC ++$(LIBOBJS): CFLAGS += -fPIC ++ + OBJS = pdftops.o $(LIBOBJS) + ++pdftops.o: CXXFLAGS += -fPIE ++ + TARGETS = libxpdf.a pdftops + + +--- cups-1.2b2/scheduler/Makefile.pie 2006-03-05 16:48:12.000000000 +0000 ++++ cups-1.2b2/scheduler/Makefile 2006-03-13 14:22:03.000000000 +0000 +@@ -24,6 +24,9 @@ + + include ../Makedefs + ++CFLAGS += -fPIE ++LDFLAGS += -pie ++ + CUPSDOBJS = \ + auth.o \ + banners.o \ +--- cups-1.2b2/cups/Makefile.pie 2006-03-10 04:42:19.000000000 +0000 ++++ cups-1.2b2/cups/Makefile 2006-03-13 14:22:03.000000000 +0000 +@@ -25,6 +25,7 @@ + # + + include ../Makedefs ++CFLAGS += -fpic # + # Object files... cups-relro.patch: Makefile | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) Index: cups-relro.patch =================================================================== RCS file: /cvs/dist/rpms/cups/devel/cups-relro.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- cups-relro.patch 19 Dec 2005 18:21:05 -0000 1.2 +++ cups-relro.patch 17 Mar 2006 12:10:57 -0000 1.3 @@ -1,5 +1,5 @@ ---- cups-1.1.23/pdftops/Makefile.relro 2005-12-19 16:48:14.000000000 +0000 -+++ cups-1.1.23/pdftops/Makefile 2005-12-19 16:50:49.000000000 +0000 +--- cups-1.2svn-r4964/pdftops/Makefile.relro 2006-01-25 16:56:03.000000000 +0000 ++++ cups-1.2svn-r4964/pdftops/Makefile 2006-01-25 16:56:40.000000000 +0000 @@ -9,7 +9,7 @@ Index: cups.spec =================================================================== RCS file: /cvs/dist/rpms/cups/devel/cups.spec,v retrieving revision 1.134 retrieving revision 1.135 diff -u -r1.134 -r1.135 --- cups.spec 13 Feb 2006 15:14:55 -0000 1.134 +++ cups.spec 17 Mar 2006 12:10:57 -0000 1.135 @@ -1,15 +1,16 @@ %define initdir /etc/rc.d/init.d %define use_alternatives 1 -%define use_dbus 1 %define build_as_pie 1 +%define beta b2 +%define cups_serverbin %{_exec_prefix}/lib/cups Summary: Common Unix Printing System Name: cups -Version: 1.1.23 -Release: 30.2 +Version: 1.2 +Release: 0.1.%{beta}.2 License: GPL Group: System Environment/Daemons -Source: ftp://ftp.easysw.com/pub/cups/test/cups-%{version}-source.tar.bz2 +Source: ftp://ftp.easysw.com/pub/cups/test/cups-1.2%{beta}-source.tar.bz2 Source1: cups.init Source2: cupsprinter.png Source5: cups-lpd @@ -21,44 +22,26 @@ Source11: cups.conf Source12: cups.cron Patch0: cups-1.1.15-initscript.patch -Patch1: cups-1.1.14-doclink.patch +Patch1: cups-no-gzip-man.patch Patch2: cups-1.1.16-system-auth.patch Patch3: cups-1.1.17-backend.patch Patch4: cups-ext.patch -Patch5: cups-str1023.patch -Patch6: cups-1.1.17-pdftops.patch +Patch5: cups-policy.patch +Patch6: cups-users.patch Patch7: cups-logfileperm.patch Patch8: cups-1.1.17-rcp.patch Patch9: cups-1.1.17-ppdsdat.patch -Patch10: cups-1.1.17-sanity.patch -Patch11: cups-1.1.19-lpstat.patch Patch12: cups-locale.patch Patch13: cups-CAN-2005-0064.patch -Patch14: cups-str1068.patch -Patch15: cups-sigchld.patch Patch16: cups-pie.patch Patch17: cups-1.1.19-no_rpath.patch Patch18: cups-language.patch -Patch19: cups-gcc34.patch -Patch20: cups-gcc4.patch -Patch21: cups-slow.patch Patch22: cups-dest-cache-v2.patch -Patch23: cups-autodetected-tag.patch Patch24: cups-maxlogsize.patch -Patch25: cups-enabledisable.patch Patch28: cups-no-propagate-ipp-port.patch Patch32: cups-pid.patch -Patch33: cups-CAN-2004-0888.patch -Patch34: cups-CAN-2005-2097.patch -Patch35: cups-finddest.patch -Patch36: cups-str1249.patch -Patch37: cups-str1284.patch -Patch38: cups-str1290.patch -Patch39: cups-str1301.patch Patch40: cups-link.patch Patch41: cups-relro.patch -Patch42: cups-CVE-2005-3625,6,7.patch -Patch43: cups-dbus.patch Epoch: 1 Url: http://www.cups.org/ BuildRoot: %{_tmppath}/%{name}-root @@ -74,15 +57,15 @@ Provides: lpd lpr LPRng = 3.8.15-3 BuildPrereq: pam-devel openssl-devel pkgconfig +BuildPrereq: gnutls-devel BuildRequires: make >= 1:3.80 +BuildRequires: php-devel, aspell-devel, pcre-devel # -fstack-protector-all requires GCC 4.0.1 BuildRequires: gcc >= 4.0.1 -%if %use_dbus BuildPrereq: dbus-devel >= 0.60 Requires: dbus >= 0.60 -%endif %package devel Summary: Common Unix Printing System - development environment @@ -124,50 +107,30 @@ lpd emulation. %prep -%setup -q +%setup -q -n %{name}-%{version}%{beta} %patch0 -p1 -b .noinit -%patch1 -p1 -b .doclink +%patch1 -p1 -b .no-gzip-man %patch2 -p1 -b .system-auth %patch3 -p1 -b .backend %patch4 -p1 -b .ext -%patch5 -p1 -b .str1023 -%patch6 -p1 -b .pdftops +%patch5 -p1 -b .policy +%patch6 -p1 -b .users %patch7 -p1 -b .logfileperm %patch8 -p1 -b .rcp %patch9 -p1 -b .ppdsdat -%patch10 -p1 -b .sanity -%patch11 -p1 -b .lpstat %patch12 -p1 -b .locale %patch13 -p1 -b .CAN-2005-0064 -%patch14 -p1 -b .str1068 -%patch15 -p1 -b .sigchld %if %build_as_pie %patch16 -p1 -b .pie %endif %patch17 -p1 -b .no_rpath %patch18 -p1 -b .language -%patch19 -p1 -b .gcc34 -%patch20 -p1 -b .gcc4 -%patch21 -p1 -b .slow %patch22 -p1 -b .dest-cache-v2 -%patch23 -p1 -b .autodetected-tag %patch24 -p1 -b .maxlogsize -%patch25 -p1 -b .enabledisable %patch28 -p1 -b .no-propagate-ipp-port %patch32 -p1 -b .pid -%patch33 -p1 -b .CAN-2004-0888 -%patch34 -p1 -b .CAN-2005-2097 -%patch35 -p1 -b .finddest -%patch36 -p1 -b .str1249 -%patch37 -p1 -b .str1284 -%patch38 -p1 -b .str1290 -%patch39 -p1 -b .str1301 %patch40 -p1 -b .link %patch41 -p1 -b .relro -%patch42 -p1 -b .CVE-2005-3625,6,7 -%if %use_dbus -%patch43 -p1 -b .dbus -%endif perl -pi -e 's,^#(Printcap\s+/etc/printcap),$1,' conf/cupsd.conf.in aclocal -I config-scripts autoconf @@ -178,11 +141,6 @@ # Let's look at the compilation command lines. perl -pi -e "s,^.SILENT:,," Makedefs.in -for i in man/{es,fr}/*.man templates/{de,fr}/*.tmpl; do - iconv -f iso-8859-1 -t utf-8 < "$i" > "${i}_" - mv "${i}_" "$i" -done - %build if pkg-config openssl ; then export CFLAGS=`pkg-config --cflags openssl` @@ -227,7 +185,7 @@ install -c -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/pixmaps install -c -m 644 cups-lpd.real $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d/cups-lpd install -c -m 644 %{SOURCE9} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/cups -install -c -m 755 %{SOURCE10} $RPM_BUILD_ROOT%{_libdir}/cups/backend/ncp +install -c -m 755 %{SOURCE10} $RPM_BUILD_ROOT%{cups_serverbin}/backend/ncp install -c -m 755 %{SOURCE12} $RPM_BUILD_ROOT%{_sysconfdir}/cron.daily/cups ln -s ../doc/%{name}-%{version} $RPM_BUILD_ROOT%{_datadir}/%{name}/doc # Deal with users trying to access the admin tool at @@ -256,29 +214,21 @@ done # Ship pstoraster (bug #69573). -install -c -m 755 %{SOURCE6} $RPM_BUILD_ROOT%{_libdir}/cups/filter +install -c -m 755 %{SOURCE6} $RPM_BUILD_ROOT%{cups_serverbin}/filter install -c -m 644 %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}/cups # Ship a generic postscript PPD file (#73061) install -c -m 644 %{SOURCE8} $RPM_BUILD_ROOT%{_datadir}/cups/model -%if %use_dbus -# D-BUS configuration. -mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/dbus-1/system.d -install -c -m 644 %{SOURCE11} $RPM_BUILD_ROOT%{_sysconfdir}/dbus-1/system.d/cups.conf -%endif +# Ship a clients.conf file. +touch $RPM_BUILD_ROOT%{_sysconfdir}/cups/client.conf + +# Ship an SSL directory +mkdir $RPM_BUILD_ROOT%{_sysconfdir}/cups/ssl # Remove unshipped files. rm -rf $RPM_BUILD_ROOT%{_mandir}/cat? $RPM_BUILD_ROOT%{_mandir}/*/cat? -# Remove .pdf from docs, fix links -for pdf in cmp.pdf ipp.pdf sam.pdf spm.pdf ssr.pdf sum.pdf translation.pdf \ - idd.pdf overview.pdf sdd.pdf sps.pdf stp.pdf svd.pdf -do - perl -p -i -e "s@$pdf at http://www.cups.org/$pdf@" $RPM_BUILD_ROOT%{_docdir}/cups-%{version}/documentation.html -done -find $RPM_BUILD_ROOT%{_docdir}/cups-%{version} -name *.pdf |xargs rm - %post /sbin/chkconfig --del cupsd 2>/dev/null || true # Make sure old versions aren't there anymore @@ -327,90 +277,78 @@ exit 0 %triggerin -- samba-client -ln -sf ../../../bin/smbspool %{_libdir}/cups/backend/smb || : +ln -sf ../../../bin/smbspool %{cups_serverbin}/backend/smb || : exit 0 %triggerun -- samba-client [ $2 = 0 ] || exit 0 -rm -f %{_libdir}/cups/backend/smb +rm -f %{cups_serverbin}/backend/smb %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) -%dir %attr(0775,root,sys) /etc/cups -%dir %attr(0711,root,sys) /etc/cups/certs -%config(noreplace) %attr(0640,root,sys) /etc/cups/classes.conf -%config(noreplace) %attr(0640,root,sys) /etc/cups/cupsd.conf -%config(noreplace) %attr(0640,root,sys) /etc/cups/printers.conf -%config(noreplace) /etc/cups/client.conf +%dir %attr(0755,root,nobody) /etc/cups +%dir %attr(0511,lp,sys) /var/run/cups/certs +%config(noreplace) %attr(0640,root,nobody) /etc/cups/cupsd.conf +%attr(0640,root,nobody) /etc/cups/cupsd.conf.default +%config(noreplace) %attr(0644,root,nobody) /etc/cups/client.conf /etc/cups/interfaces %config(noreplace) /etc/cups/mime.types %config(noreplace) /etc/cups/mime.convs -%dir %attr(0755,root,sys) /etc/cups/ppd +%dir %attr(0755,root,nobody) /etc/cups/ppd +%dir %attr(0700,root,nobody) /etc/cups/ssl /etc/cups/pstoraster.convs %config(noreplace) /etc/pam.d/cups %dir %{_docdir}/cups-%{version} +%{_docdir}/cups-%{version}/favicon.ico %{_docdir}/cups-%{version}/images +%{_docdir}/cups-%{version}/ja %{_docdir}/cups-%{version}/*.css -%{_docdir}/cups-%{version}/documentation.html -%{_docdir}/cups-%{version}/?? %{_docdir}/cups-%{version}/admin %{_docdir}/cups-%{version}/classes %{_docdir}/cups-%{version}/jobs %{_docdir}/cups-%{version}/printers %doc %{_docdir}/cups-%{version}/index.html -%doc %{_docdir}/cups-%{version}/cmp.html -%doc %{_docdir}/cups-%{version}/idd.html -%doc %{_docdir}/cups-%{version}/ipp.html -%doc %{_docdir}/cups-%{version}/overview.html -%doc %{_docdir}/cups-%{version}/sam.html -%doc %{_docdir}/cups-%{version}/sdd.html -%doc %{_docdir}/cups-%{version}/spm.html -%doc %{_docdir}/cups-%{version}/sps.html -%doc %{_docdir}/cups-%{version}/ssr.html -%doc %{_docdir}/cups-%{version}/stp.html -%doc %{_docdir}/cups-%{version}/sum.html -%doc %{_docdir}/cups-%{version}/svd.html -%doc %{_docdir}/cups-%{version}/translation.html +%doc %{_docdir}/cups-%{version}/help %doc %{_docdir}/cups-%{version}/robots.txt %config(noreplace) %{initdir}/cups %{_bindir}/cupstestppd %{_bindir}/cancel* -%{_bindir}/enable* -%{_bindir}/disable* -%{_bindir}/cupsenable* -%{_bindir}/cupsdisable* %{_bindir}/lp* -%dir %{_libdir}/cups -%{_libdir}/cups/backend -%{_libdir}/cups/cgi-bin -%dir %{_libdir}/cups/daemon -%{_libdir}/cups/daemon/cups-polld -%{_libdir}/cups/filter +%dir %{cups_serverbin} +%{cups_serverbin}/backend +%{cups_serverbin}/cgi-bin +%dir %{cups_serverbin}/daemon +%{cups_serverbin}/daemon/cups-polld +%{cups_serverbin}/daemon/cups-deviced +%{cups_serverbin}/daemon/cups-driverd +%{cups_serverbin}/notifier/mailto +%{cups_serverbin}/notifier/testnotify +%{cups_serverbin}/filter +%{cups_serverbin}/monitor %{_mandir}/man?/* -%{_mandir}/*/man?/* %{_sbindir}/* %dir %{_datadir}/cups %dir %{_datadir}/cups/banners %config(noreplace) %{_datadir}/cups/banners/* %{_datadir}/cups/charsets +%{_datadir}/cups/charmaps %{_datadir}/cups/data %{_datadir}/cups/doc %{_datadir}/cups/fonts %{_datadir}/cups/model %{_datadir}/cups/templates %{_datadir}/locale/*/* -%dir %attr(1770,root,sys) /var/spool/cups/tmp -%dir %attr(0710,root,sys) /var/spool/cups +%dir %attr(1770,root,nobody) /var/spool/cups/tmp +%dir %attr(0710,root,nobody) /var/spool/cups %dir %attr(0755,lp,sys) /var/log/cups %config(noreplace) %{_sysconfdir}/logrotate.d/cups %{_datadir}/pixmaps/cupsprinter.png %{_sysconfdir}/cron.daily/cups -%if %use_dbus %{_sysconfdir}/dbus-1/system.d/cups.conf -%endif +%{_libdir}/php/modules/*.so %files libs %defattr(-,root,root) @@ -420,28 +358,71 @@ %defattr(-,root,root) %{_bindir}/cups-config %{_libdir}/*.so -%{_libdir}/*.a %{_includedir}/cups %files lpd %defattr(-,root,root) %config(noreplace) %{_sysconfdir}/xinetd.d/cups-lpd -%dir %{_libdir}/cups -%dir %{_libdir}/cups/daemon -%{_libdir}/cups/daemon/cups-lpd +%dir %{cups_serverbin} +%dir %{cups_serverbin}/daemon +%{cups_serverbin}/daemon/cups-lpd %changelog -* Mon Feb 13 2006 Tim Waugh -- Removed (unapplied) session printing patch. +* Fri Mar 17 2006 Tim Waugh 1:1.2-0.1.b2.2 +- Rebuilt. + +* Tue Mar 14 2006 Tim Waugh 1:1.2-0.1.b2.1 +- Build requires gnutls-devel. +- Fixed default policy name. +- Fixed 'set-allowed-users' in web UI. + +* Mon Mar 13 2006 Tim Waugh 1:1.2-0.1.b2.0 +- 1.2b2. +- Use new CUPS_SERVERBIN location (/usr/lib/cups even on 64-bit hosts). + +* Fri Mar 10 2006 Tim Waugh +- Fixed some permissions. + +* Fri Mar 10 2006 Tim Waugh 1:1.2-0.1.b1.1 +- Ship /etc/cups/ssl directory. -* Fri Feb 10 2006 Jesse Keating - 1:1.1.23-30.2 -- bump again for double-long bug on ppc(64) +* Thu Mar 9 2006 Tim Waugh 1:1.2-0.1.b1.0 +- 1.2b1. No longer need devid patch. + +* Wed Mar 8 2006 Tim Waugh 1:1.2-0.0.svn5238.2 +- Fixed 'device-id' attribute in GET_DEVICES requests (STR #1467). + +* Tue Mar 7 2006 Tim Waugh 1:1.2-0.0.svn5238.1 +- New svn snapshot. +- No longer need browse or raw patches. + +* Wed Mar 1 2006 Tim Waugh 1:1.2-0.0.svn5137.1 +- Fixed raw printing. +- Removed (unapplied) session printing patch. +- Fixed browse info. -* Tue Feb 07 2006 Jesse Keating - 1:1.1.23-30.1 -- rebuilt for new gcc4.1 snapshot and glibc changes +* Thu Feb 23 2006 Tim Waugh 1:1.2-0.0.svn5137.0 +- New svn snapshot. -* Wed Jan 25 2006 Tim Waugh -- Fixed link patch. +* Fri Feb 17 2006 Tim Waugh 1:1.2-0.0.svn5102.0 +- New svn snapshot. +- No longer need enabledisable patch. +- Fixed double-free in scheduler/policy.c (STR #1428). + +* Fri Feb 10 2006 Tim Waugh 1:1.2-0.0.svn5083.0 +- New svn snapshot. + +* Wed Jan 25 2006 Tim Waugh 1:1.2-0.0.svn4964.0 +- Use -fPIE not -fpie in PIE patch. +- Fix link patch. +- Patch in PIE instead of using --enable-pie, since that doesn't work. + +* Fri Jan 20 2006 Tim Waugh +- 1.2 svn snapshot. +- No longer need doclink, str1023, pdftops, sanity, lpstat, str1068, + sigchld, gcc34, gcc4, slow, CAN-2004-0888, CAN-2005-2097, finddest, + str1249, str1284, str1290, str1301, CVE-2005-3625,6,7 patches. +- Removed autodetect-tag patch. * Tue Jan 17 2006 Tim Waugh 1:1.1.23-30 - Include 'Autodetected' tag for better integration with autodetection tools. Index: sources =================================================================== RCS file: /cvs/dist/rpms/cups/devel/sources,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- sources 4 Jan 2005 12:24:50 -0000 1.15 +++ sources 17 Mar 2006 12:10:57 -0000 1.16 @@ -1,2 +1,2 @@ b0bb017098e8e76b8a25e666c41ce540 postscript.ppd.gz -4ce09b1dce09b6b9398af0daae9adf63 cups-1.1.23-source.tar.bz2 +67a912af67de02e290a149f3947da96d cups-1.2b2-source.tar.bz2 --- cups-1.1.14-doclink.patch DELETED --- --- cups-1.1.17-pdftops.patch DELETED --- --- cups-1.1.17-sanity.patch DELETED --- --- cups-1.1.19-lpstat.patch DELETED --- --- cups-CAN-2004-0888.patch DELETED --- --- cups-CAN-2005-2097.patch DELETED --- ***** Not enough context to create diffstat for file: cups-CVE-2005-3625,6,7.patch,1.1,NONE ***** Not enough context to create diff for file: cups-CVE-2005-3625,6,7.patch,1.1,NONE --- cups-autodetected-tag.patch DELETED --- --- cups-dbus.patch DELETED --- --- cups-enabledisable.patch DELETED --- --- cups-finddest.patch DELETED --- --- cups-gcc34.patch DELETED --- --- cups-gcc4.patch DELETED --- --- cups-sigchld.patch DELETED --- --- cups-slow.patch DELETED --- --- cups-str1023.patch DELETED --- --- cups-str1068.patch DELETED --- --- cups-str1249.patch DELETED --- --- cups-str1284.patch DELETED --- --- cups-str1290.patch DELETED --- --- cups-str1301.patch DELETED --- From fedora-cvs-commits at redhat.com Fri Mar 17 12:31:16 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 17 Mar 2006 07:31:16 -0500 Subject: rpms/scim-anthy/devel scim-anthy-symbol-style.patch, NONE, 1.1 scim-anthy.spec, 1.25, 1.26 Message-ID: <200603171231.k2HCVGnc011199@cvs.devel.redhat.com> Author: tagoh Update of /cvs/dist/rpms/scim-anthy/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv11185 Modified Files: scim-anthy.spec Added Files: scim-anthy-symbol-style.patch Log Message: * Fri Mar 17 2006 Akira TAGOH - 0.9.0-3.fc6 * scim-anthy-symbol-style.patch: applied a backport patch from upstream CVS to add an UI for the symbol style. (#178400) scim-anthy-symbol-style.patch: data/atok.sty | 6 - data/canna.sty | 8 +- data/msime.sty | 6 - data/vje-delta.sty | 4 - data/wnn.sty | 6 - src/scim_anthy_conversion.cpp | 2 src/scim_anthy_default_tables.cpp | 52 +++++++++++++ src/scim_anthy_default_tables.h | 14 +++ src/scim_anthy_factory.cpp | 14 +++ src/scim_anthy_factory.h | 2 src/scim_anthy_imengine.cpp | 145 ++++++++++++++++++++++++++++++++++++++ src/scim_anthy_imengine.h | 2 src/scim_anthy_key2kana_table.cpp | 86 ++++++++++++++++++++++ src/scim_anthy_key2kana_table.h | 18 ++++ src/scim_anthy_preedit.cpp | 24 ++++++ src/scim_anthy_preedit.h | 4 + src/scim_anthy_prefs.cpp | 20 +++++ src/scim_anthy_prefs.h | 4 + src/scim_anthy_reading.cpp | 24 ++++++ src/scim_anthy_reading.h | 4 + src/scim_anthy_setup.cpp | 95 ++++++++++++++++++++++-- 21 files changed, 512 insertions(+), 28 deletions(-) --- NEW FILE scim-anthy-symbol-style.patch --- 2006-02-28 Takuro Ashie * src/scim_anthy_conversion.cpp: Strange bihavior of resizing segment after partial commit has been fixed. 2006-02-14 Takuro Ashie * src/scim_anthy_setup.cpp: Modify order of symbol style. 2006-02-14 Takuro Ashie * src/scim_anthy_imengine.cpp: Install symbol style properties. * src/scim_anthy_setup.cpp: Show check box for symbol style label. 2006-02-13 Takuro Ashie * data/atok.sty, data/canna.sty, data/msime.sty, data/vje-delta.sty, data/wnn.sty: "/", "[", "]" entries in romaji table aren't needed anymore. 2006-02-13 Takuro Ashie * src/scim_anthy_factory.{cpp,h}, src/scim_anthy_imengine.cpp, src/scim_anthy_prefs.{cpp,h}, src/scim_anthy_setup.cpp: Add a preference to show or hide symbol style label on toolbar. But label itself is not added yet. 2006-02-13 Takuro Ashie * src/scim_anthy_setup.cpp: Split symbol related preferences from "Common" page. Change order of candidates in some combos. 2006-02-13 Takuro Ashie * src/scim_anthy_factory.cpp: Fix credit. 2006-02-08 Takuro Ashie * src/scim_anthy_setup.cpp: Add version information. 2006-02-08 Akira TAGOH * src/scim_anthy_default_tables.{cpp,h}, src/scim_anthy_factory.{cpp,h}, src/scim_anthy_imengine.{cpp,h}, src/scim_anthy_key2kana_table.{cpp,h}, src/scim_anthy_preedit.{cpp,h}, src/scim_anthy_prefs.{cpp,h}, src/scim_anthy_reading.{cpp,h}, src/scim_anthy_setup.cpp: Add symbol style preference. Index: data/atok.sty =================================================================== RCS file: /cvsroot/scim-imengine/scim-anthy/data/atok.sty,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- data/atok.sty 29 Nov 2005 14:31:28 -0000 1.22 +++ data/atok.sty 13 Feb 2006 10:49:00 -0000 1.23 @@ -85,9 +85,9 @@ # Override fundamental table [RomajiTable/FundamentalTable] - = ?? -/ = ?? -[ = ?? -] = ?? +#/ = ?? +#[ = ?? +#] = ?? a = ?? ba = ?? be = ?? Index: data/canna.sty =================================================================== RCS file: /cvsroot/scim-imengine/scim-anthy/data/canna.sty,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- data/canna.sty 5 Nov 2005 14:17:36 -0000 1.11 +++ data/canna.sty 13 Feb 2006 10:49:00 -0000 1.12 @@ -307,10 +307,10 @@ n' = ?? @@ = ?? - = ?? -[ = ?? -] = ?? -, = ?? -. = ?? +#[ = ?? +#] = ?? +#, = ?? +#. = ?? @( = ?? @) = ?? @{ = ?? Index: data/msime.sty =================================================================== RCS file: /cvsroot/scim-imengine/scim-anthy/data/msime.sty,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- data/msime.sty 11 Nov 2005 17:58:20 -0000 1.24 +++ data/msime.sty 13 Feb 2006 10:49:00 -0000 1.25 @@ -85,9 +85,9 @@ # Override fundamental table [RomajiTable/FundamentalTable] - = ?? -/ = ?? -[ = ?? -] = ?? +#/ = ?? +#[ = ?? +#] = ?? la = ?? xa = ?? a = ?? Index: data/vje-delta.sty =================================================================== RCS file: /cvsroot/scim-imengine/scim-anthy/data/vje-delta.sty,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- data/vje-delta.sty 5 Nov 2005 14:17:36 -0000 1.5 +++ data/vje-delta.sty 13 Feb 2006 10:49:00 -0000 1.6 @@ -85,8 +85,8 @@ # Override fundamental table [RomajiTable/FundamentalTable] - = ?? -[ = ?? -] = ?? +#[ = ?? +#] = ?? a = ?? i = ?? u = ?? Index: data/wnn.sty =================================================================== RCS file: /cvsroot/scim-imengine/scim-anthy/data/wnn.sty,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- data/wnn.sty 26 Dec 2005 02:47:20 -0000 1.6 +++ data/wnn.sty 13 Feb 2006 10:49:00 -0000 1.7 @@ -83,9 +83,9 @@ # Override fundamental table [RomajiTable/FundamentalTable] - = ?? -/ = ?? -[ = ?? -] = ?? +#/ = ?? +#[ = ?? +#] = ?? z. = ?? z- = ?? a = ?? Index: src/scim_anthy_conversion.cpp =================================================================== RCS file: /cvsroot/scim-imengine/scim-anthy/src/scim_anthy_conversion.cpp,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- src/scim_anthy_conversion.cpp 19 Nov 2005 06:57:53 -0000 1.35 +++ src/scim_anthy_conversion.cpp 28 Feb 2006 06:10:37 -0000 1.36 @@ -487,7 +487,7 @@ struct anthy_segment_stat seg_stat; anthy_get_segment_stat (m_anthy_context, i, &seg_stat); m_segments.push_back ( - ConversionSegment (get_segment_string (i, 0), 0, + ConversionSegment (get_segment_string (i - m_start_id, 0), 0, seg_stat.seg_len)); } } Index: src/scim_anthy_default_tables.cpp =================================================================== RCS file: /cvsroot/scim-imengine/scim-anthy/src/scim_anthy_default_tables.cpp,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- src/scim_anthy_default_tables.cpp 15 Dec 2005 10:26:01 -0000 1.20 +++ src/scim_anthy_default_tables.cpp 13 Feb 2006 08:06:25 -0000 1.21 @@ -26,8 +26,10 @@ /* from Suikyo */ ConvRule scim_anthy_romaji_typing_rule[] = { {"-", "???", ""}, +#if 0 {"[", "???", ""}, {"]", "???", ""}, +#endif {"a", "???", ""}, {"i", "???", ""}, {"u", "???", ""}, @@ -456,7 +458,9 @@ {"O", "???", ""}, {"P", "", "???"}, {"`", "???", ""}, +#if 0 {"{", "???", ""}, +#endif {"A", "", "???"}, {"S", "", "???"}, @@ -469,7 +473,9 @@ {"L", "???", ""}, {"+", "???", ""}, {"*", "???", ""}, +#if 0 {"}", "???", ""}, +#endif {"Z", "???", ""}, {"X", "", "???"}, @@ -478,7 +484,9 @@ {"B", "", "???"}, {"M", "???", ""}, {"N", "???", ""}, +#if 0 {"?", "???", ""}, +#endif {"_", "???", ""}, {NULL, NULL, NULL}, }; @@ -592,6 +600,50 @@ {NULL, NULL, NULL}, }; +ConvRule scim_anthy_romaji_ja_bracket_rule[] = { +{"[", "???", ""}, +{"]", "???", ""}, +{NULL, NULL, NULL}, +}; + +ConvRule scim_anthy_romaji_wide_bracket_rule[] = { +{"[", "???", ""}, +{"]", "???", ""}, +{NULL, NULL, NULL}, +}; + +ConvRule scim_anthy_kana_ja_bracket_rule[] = { +{"{", "???", ""}, +{"}", "???", ""}, +{NULL, NULL, NULL}, +}; + +ConvRule scim_anthy_kana_wide_bracket_rule[] = { +{"{", "???", ""}, +{"}", "???", ""}, +{NULL, NULL, NULL}, +}; + +ConvRule scim_anthy_romaji_ja_slash_rule[] = { +{"/", "???", ""}, +{NULL, NULL, NULL}, +}; + +ConvRule scim_anthy_romaji_wide_slash_rule[] = { +{"/", "???", ""}, +{NULL, NULL, NULL}, +}; + +ConvRule scim_anthy_kana_ja_slash_rule[] = { +{"?", "???", ""}, +{NULL, NULL, NULL}, +}; + +ConvRule scim_anthy_kana_wide_slash_rule[] = { +{"?", "???", ""}, +{NULL, NULL, NULL}, +}; + HiraganaKatakanaRule scim_anthy_hiragana_katakana_table[] = { {"???", "???", "???"}, {"???", "???", "???"}, Index: src/scim_anthy_default_tables.h =================================================================== RCS file: /cvsroot/scim-imengine/scim-anthy/src/scim_anthy_default_tables.h,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- src/scim_anthy_default_tables.h 26 Jul 2005 09:16:42 -0000 1.8 +++ src/scim_anthy_default_tables.h 13 Feb 2006 08:06:25 -0000 1.9 @@ -91,6 +91,20 @@ extern ConvRule scim_anthy_kana_wide_comma_rule[]; extern ConvRule scim_anthy_kana_half_comma_rule[]; +// bracket table +extern ConvRule scim_anthy_romaji_ja_bracket_rule[]; +extern ConvRule scim_anthy_romaji_wide_bracket_rule[]; + +extern ConvRule scim_anthy_kana_ja_bracket_rule[]; +extern ConvRule scim_anthy_kana_wide_bracket_rule[]; + +// slash table +extern ConvRule scim_anthy_romaji_ja_slash_rule[]; +extern ConvRule scim_anthy_romaji_wide_slash_rule[]; + +extern ConvRule scim_anthy_kana_ja_slash_rule[]; +extern ConvRule scim_anthy_kana_wide_slash_rule[]; + // misc extern HiraganaKatakanaRule scim_anthy_hiragana_katakana_table[]; extern WideRule scim_anthy_wide_table[]; Index: src/scim_anthy_factory.cpp =================================================================== RCS file: /cvsroot/scim-imengine/scim-anthy/src/scim_anthy_factory.cpp,v retrieving revision 1.40 retrieving revision 1.43 diff -u -r1.40 -r1.43 --- src/scim_anthy_factory.cpp 8 Dec 2005 03:25:52 -0000 1.40 +++ src/scim_anthy_factory.cpp 13 Feb 2006 10:24:36 -0000 1.43 @@ -108,6 +108,7 @@ m_typing_method (SCIM_ANTHY_CONFIG_TYPING_METHOD_DEFAULT), m_conversion_mode (SCIM_ANTHY_CONFIG_CONVERSION_MODE_DEFAULT), m_period_style (SCIM_ANTHY_CONFIG_PERIOD_STYLE_DEFAULT), + m_symbol_style (SCIM_ANTHY_CONFIG_SYMBOL_STYLE_DEFAULT), m_space_type (SCIM_ANTHY_CONFIG_SPACE_TYPE_DEFAULT), m_ten_key_type (SCIM_ANTHY_CONFIG_TEN_KEY_TYPE_DEFAULT), m_behavior_on_period (SCIM_ANTHY_CONFIG_BEHAVIOR_ON_PERIOD_DEFAULT), @@ -129,6 +130,7 @@ m_show_conv_mode_label (SCIM_ANTHY_CONFIG_SHOW_INPUT_MODE_LABEL_DEFAULT), m_show_typing_method_label (SCIM_ANTHY_CONFIG_SHOW_TYPING_METHOD_LABEL_DEFAULT), m_show_period_style_label (SCIM_ANTHY_CONFIG_SHOW_PERIOD_STYLE_LABEL_DEFAULT), + m_show_symbol_style_label (SCIM_ANTHY_CONFIG_SHOW_SYMBOL_STYLE_LABEL_DEFAULT), m_show_dict_label (SCIM_ANTHY_CONFIG_SHOW_DICT_LABEL_DEFAULT), m_show_dict_admin_label (SCIM_ANTHY_CONFIG_SHOW_DICT_ADMIN_LABEL_DEFAULT), m_show_add_word_label (SCIM_ANTHY_CONFIG_SHOW_ADD_WORD_LABEL_DEFAULT), @@ -200,7 +202,9 @@ AnthyFactory::get_credits () const { return utf8_mbstowcs ( - _("Special thanks:\n" + _("Art work:\n" + " SHIMODA Hiroshi \n" + "Special thanks:\n" " UTUMI Hirosi \n" " Yukiko Bando \n" " Mike Fabian \n" @@ -434,6 +438,10 @@ = config->read (String (SCIM_ANTHY_CONFIG_PERIOD_STYLE), String (SCIM_ANTHY_CONFIG_PERIOD_STYLE_DEFAULT)); + m_symbol_style + = config->read (String (SCIM_ANTHY_CONFIG_SYMBOL_STYLE), + String (SCIM_ANTHY_CONFIG_SYMBOL_STYLE_DEFAULT)); + m_space_type = config->read (String (SCIM_ANTHY_CONFIG_SPACE_TYPE), String (SCIM_ANTHY_CONFIG_SPACE_TYPE_DEFAULT)); @@ -526,6 +534,10 @@ = config->read (String (SCIM_ANTHY_CONFIG_SHOW_PERIOD_STYLE_LABEL), SCIM_ANTHY_CONFIG_SHOW_PERIOD_STYLE_LABEL_DEFAULT); + m_show_symbol_style_label + = config->read (String (SCIM_ANTHY_CONFIG_SHOW_SYMBOL_STYLE_LABEL), + SCIM_ANTHY_CONFIG_SHOW_SYMBOL_STYLE_LABEL_DEFAULT); + m_show_dict_label = config->read (String (SCIM_ANTHY_CONFIG_SHOW_DICT_LABEL), SCIM_ANTHY_CONFIG_SHOW_DICT_LABEL_DEFAULT); Index: src/scim_anthy_factory.h =================================================================== RCS file: /cvsroot/scim-imengine/scim-anthy/src/scim_anthy_factory.h,v retrieving revision 1.19 retrieving revision 1.21 diff -u -r1.19 -r1.21 --- src/scim_anthy_factory.h 15 Nov 2005 09:31:26 -0000 1.19 +++ src/scim_anthy_factory.h 13 Feb 2006 10:24:36 -0000 1.21 @@ -75,6 +75,7 @@ String m_typing_method; String m_conversion_mode; String m_period_style; + String m_symbol_style; String m_space_type; String m_ten_key_type; String m_behavior_on_period; @@ -104,6 +105,7 @@ bool m_show_conv_mode_label; bool m_show_typing_method_label; bool m_show_period_style_label; + bool m_show_symbol_style_label; bool m_show_dict_label; bool m_show_dict_admin_label; bool m_show_add_word_label; Index: src/scim_anthy_imengine.cpp =================================================================== RCS file: /cvsroot/scim-imengine/scim-anthy/src/scim_anthy_imengine.cpp,v retrieving revision 1.134 retrieving revision 1.138 diff -u -r1.134 -r1.138 --- src/scim_anthy_imengine.cpp 21 Jan 2006 05:21:40 -0000 1.134 +++ src/scim_anthy_imengine.cpp 14 Feb 2006 02:59:57 -0000 1.138 @@ -70,10 +70,25 @@ #define SCIM_PROP_PERIOD_STYLE_WIDE_LATIN_JAPANESE \ "/IMEngine/Anthy/PeriodType/WideRatin_Japanese" +#define SCIM_PROP_SYMBOL_STYLE "/IMEngine/Anthy/SymbolType" +#define SCIM_PROP_SYMBOL_STYLE_JAPANESE "/IMEngine/Anthy/SymbolType/Japanese" +#define SCIM_PROP_SYMBOL_STYLE_BRACKET_SLASH "/IMEngine/Anthy/SymbolType/WideBracket_WideSlash" +#define SCIM_PROP_SYMBOL_STYLE_CORNER_BRACKET_SLASH \ + "/IMEngine/Anthy/SymbolType/CornerBracket_WideSlash" +#define SCIM_PROP_SYMBOL_STYLE_BRACKET_MIDDLE_DOT \ + "/IMEngine/Anthy/SymbolType/WideBracket_MiddleDot" + #define SCIM_PROP_DICT "/IMEngine/Anthy/Dictionary" #define SCIM_PROP_DICT_ADD_WORD "/IMEngine/Anthy/Dictionary/AddWord" #define SCIM_PROP_DICT_LAUNCH_ADMIN_TOOL "/IMEngine/Anthy/Dictionary/LaunchAdminTool" +#define UTF8_BRACKET_CORNER_BEGIN "\xE3\x80\x8C" +#define UTF8_BRACKET_CORNER_END "\xE3\x80\x8D" +#define UTF8_BRACKET_WIDE_BEGIN "\xEF\xBC\xBB" +#define UTF8_BRACKET_WIDE_END "\xEF\xBC\xBD" +#define UTF8_MIDDLE_DOT "\xE3\x83\xBB" +#define UTF8_SLASH_WIDE "\xEF\xBC\x8F" + AnthyInstance::AnthyInstance (AnthyFactory *factory, const String &encoding, int id) @@ -611,6 +626,56 @@ m_properties.push_back (prop); } + if (m_factory->m_show_symbol_style_label) { + prop = Property (SCIM_PROP_SYMBOL_STYLE, + UTF8_BRACKET_CORNER_BEGIN + UTF8_BRACKET_CORNER_END + UTF8_MIDDLE_DOT, + String (""), + _("Symbol style")); + m_properties.push_back (prop); + + prop = Property (SCIM_PROP_SYMBOL_STYLE_JAPANESE, + UTF8_BRACKET_CORNER_BEGIN + UTF8_BRACKET_CORNER_END + UTF8_MIDDLE_DOT, + String (""), + UTF8_BRACKET_CORNER_BEGIN + UTF8_BRACKET_CORNER_END + UTF8_MIDDLE_DOT); + m_properties.push_back (prop); + + prop = Property (SCIM_PROP_SYMBOL_STYLE_CORNER_BRACKET_SLASH, + UTF8_BRACKET_CORNER_BEGIN + UTF8_BRACKET_CORNER_END + UTF8_SLASH_WIDE, + String (""), + UTF8_BRACKET_CORNER_BEGIN + UTF8_BRACKET_CORNER_END + UTF8_SLASH_WIDE); + m_properties.push_back (prop); + + prop = Property (SCIM_PROP_SYMBOL_STYLE_BRACKET_MIDDLE_DOT, + UTF8_BRACKET_WIDE_BEGIN + UTF8_BRACKET_WIDE_END + UTF8_MIDDLE_DOT, + String (""), + UTF8_BRACKET_WIDE_BEGIN + UTF8_BRACKET_WIDE_END + UTF8_MIDDLE_DOT); + m_properties.push_back (prop); + + prop = Property (SCIM_PROP_SYMBOL_STYLE_BRACKET_SLASH, + UTF8_BRACKET_WIDE_BEGIN + UTF8_BRACKET_WIDE_END + UTF8_SLASH_WIDE, + String (""), + UTF8_BRACKET_WIDE_BEGIN + UTF8_BRACKET_WIDE_END + UTF8_SLASH_WIDE); + m_properties.push_back (prop); + } + if (m_factory->m_show_dict_label) { prop = Property (SCIM_PROP_DICT, String(""), //_("Dictionary"), @@ -641,6 +706,8 @@ set_typing_method (get_typing_method ()); set_period_style (m_preedit.get_period_style (), m_preedit.get_comma_style ()); + set_symbol_style (m_preedit.get_bracket_style (), + m_preedit.get_slash_style ()); register_properties (m_properties); } @@ -810,6 +877,50 @@ m_preedit.set_comma_style (comma); } +void +AnthyInstance::set_symbol_style (BracketStyle bracket, + SlashStyle slash) +{ + String label; + + switch (bracket) { + case SCIM_ANTHY_BRACKET_JAPANESE: + label = UTF8_BRACKET_CORNER_BEGIN UTF8_BRACKET_CORNER_END; + break; + case SCIM_ANTHY_BRACKET_WIDE: + label = UTF8_BRACKET_WIDE_BEGIN UTF8_BRACKET_WIDE_END; + break; + default: + break; + } + + switch (slash) { + case SCIM_ANTHY_SLASH_JAPANESE: + label += UTF8_MIDDLE_DOT; + break; + case SCIM_ANTHY_SLASH_WIDE: + label += UTF8_SLASH_WIDE; + break; + default: + break; + } + + if (label.length () > 0) { + PropertyList::iterator it = std::find (m_properties.begin (), + m_properties.end (), + SCIM_PROP_SYMBOL_STYLE); + if (it != m_properties.end ()) { + it->set_label (label.c_str ()); + update_property (*it); + } + } + + if (bracket != m_preedit.get_bracket_style ()) + m_preedit.set_bracket_style (bracket); + if (slash != m_preedit.get_slash_style ()) + m_preedit.set_slash_style (slash); +} + bool AnthyInstance::is_selecting_candidates (void) { @@ -1959,6 +2070,20 @@ set_period_style (SCIM_ANTHY_PERIOD_HALF, SCIM_ANTHY_COMMA_HALF); + // symbol type + } else if (property == SCIM_PROP_SYMBOL_STYLE_JAPANESE) { + set_symbol_style (SCIM_ANTHY_BRACKET_JAPANESE, + SCIM_ANTHY_SLASH_JAPANESE); + } else if (property == SCIM_PROP_SYMBOL_STYLE_CORNER_BRACKET_SLASH) { + set_symbol_style (SCIM_ANTHY_BRACKET_JAPANESE, + SCIM_ANTHY_SLASH_WIDE); + } else if (property == SCIM_PROP_SYMBOL_STYLE_BRACKET_MIDDLE_DOT) { + set_symbol_style (SCIM_ANTHY_BRACKET_WIDE, + SCIM_ANTHY_SLASH_JAPANESE); + } else if (property == SCIM_PROP_SYMBOL_STYLE_BRACKET_SLASH) { + set_symbol_style (SCIM_ANTHY_BRACKET_WIDE, + SCIM_ANTHY_SLASH_WIDE); + // dictionary } else if (property == SCIM_PROP_DICT_ADD_WORD) { action_add_word (); @@ -2090,6 +2215,26 @@ } } + // set symbol style + if (m_on_init || !m_factory->m_show_symbol_style_label) { + if (m_factory->m_symbol_style == "Japanese") { + m_preedit.set_bracket_style (SCIM_ANTHY_BRACKET_JAPANESE); + m_preedit.set_slash_style (SCIM_ANTHY_SLASH_JAPANESE); + } else if (m_factory->m_symbol_style == "WideBracket_WideSlash") { + m_preedit.set_bracket_style (SCIM_ANTHY_BRACKET_WIDE); + m_preedit.set_slash_style (SCIM_ANTHY_SLASH_WIDE); + } else if (m_factory->m_symbol_style == "CornerBracket_WideSlash") { + m_preedit.set_bracket_style (SCIM_ANTHY_BRACKET_JAPANESE); + m_preedit.set_slash_style (SCIM_ANTHY_SLASH_WIDE); + } else if (m_factory->m_symbol_style == "WideBracket_MiddleDot") { + m_preedit.set_bracket_style (SCIM_ANTHY_BRACKET_WIDE); + m_preedit.set_slash_style (SCIM_ANTHY_SLASH_JAPANESE); + } else { + m_preedit.set_bracket_style (SCIM_ANTHY_BRACKET_JAPANESE); + m_preedit.set_slash_style (SCIM_ANTHY_SLASH_JAPANESE); + } + } + // set lookup table if (m_factory->m_cand_win_page_size > 0) m_lookup_table.set_page_size (m_factory->m_cand_win_page_size); Index: src/scim_anthy_imengine.h =================================================================== RCS file: /cvsroot/scim-imengine/scim-anthy/src/scim_anthy_imengine.h,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- src/scim_anthy_imengine.h 7 Dec 2005 02:17:12 -0000 1.46 +++ src/scim_anthy_imengine.h 13 Feb 2006 08:06:25 -0000 1.47 @@ -221,6 +221,8 @@ void set_typing_method (TypingMethod method); void set_period_style (PeriodStyle period, CommaStyle comma); + void set_symbol_style (BracketStyle bracket, + SlashStyle slash); bool is_selecting_candidates (void); void select_candidate_no_direct (unsigned int item); bool convert_kana (CandidateType type); Index: src/scim_anthy_key2kana_table.cpp =================================================================== RCS file: /cvsroot/scim-imengine/scim-anthy/src/scim_anthy_key2kana_table.cpp,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- src/scim_anthy_key2kana_table.cpp 19 Nov 2005 07:14:17 -0000 1.19 +++ src/scim_anthy_key2kana_table.cpp 13 Feb 2006 08:06:25 -0000 1.20 @@ -96,6 +96,36 @@ utf8_mbstowcs ("DefaultKanaHalfCommaTable"), scim_anthy_kana_half_comma_rule); +// bracket +static Key2KanaTable romaji_ja_bracket_table ( + utf8_mbstowcs ("DefaultRomajiJaBracketTable"), + scim_anthy_romaji_ja_bracket_rule); +static Key2KanaTable romaji_wide_bracket_table ( + utf8_mbstowcs ("DefaultRomajiWideBracketTable"), + scim_anthy_romaji_wide_bracket_rule); + +static Key2KanaTable kana_ja_bracket_table ( + utf8_mbstowcs ("DefaultKanaJaBracketTable"), + scim_anthy_kana_ja_bracket_rule); +static Key2KanaTable kana_wide_bracket_table ( + utf8_mbstowcs ("DefaultRomajiWideBracketTable"), + scim_anthy_kana_wide_bracket_rule); + +// slash +static Key2KanaTable romaji_ja_slash_table ( + utf8_mbstowcs ("DefaultRomajiJaSlashTable"), + scim_anthy_romaji_ja_slash_rule); +static Key2KanaTable romaji_wide_slash_table ( + utf8_mbstowcs ("DefaultRomajiWideSlashTable"), + scim_anthy_romaji_wide_slash_rule); + +static Key2KanaTable kana_ja_slash_table ( + utf8_mbstowcs ("DefaultKanaJaSlashTable"), + scim_anthy_kana_ja_slash_rule); +static Key2KanaTable kana_wide_slash_table ( + utf8_mbstowcs ("DefaultRomajiWideSlashTable"), + scim_anthy_kana_wide_slash_rule); + Key2KanaRule::Key2KanaRule () { @@ -229,6 +259,8 @@ m_typing_method (SCIM_ANTHY_TYPING_METHOD_ROMAJI), m_period_style (SCIM_ANTHY_PERIOD_JAPANESE), m_comma_style (SCIM_ANTHY_COMMA_JAPANESE), + m_bracket_style (SCIM_ANTHY_BRACKET_JAPANESE), + m_slash_style (SCIM_ANTHY_SLASH_JAPANESE), m_use_half_symbol (false), m_use_half_number (false) { @@ -276,6 +308,20 @@ reset_tables (); } +void +Key2KanaTableSet::set_bracket_style (BracketStyle style) +{ + m_bracket_style = style; + reset_tables (); +} + +void +Key2KanaTableSet::set_slash_style (SlashStyle style) +{ + m_slash_style = style; + reset_tables (); +} + static void create_voiced_consonant_table (Key2KanaTable &table, Key2KanaTable &fund_table) { @@ -397,6 +443,46 @@ } } + if (is_romaji || is_kana) + { + switch (m_bracket_style) { + case SCIM_ANTHY_BRACKET_JAPANESE: + if (is_romaji) + m_all_tables.push_back (&romaji_ja_bracket_table); + else + m_all_tables.push_back (&kana_ja_bracket_table); + break; + case SCIM_ANTHY_BRACKET_WIDE: + if (is_romaji) + m_all_tables.push_back (&romaji_wide_bracket_table); + else + m_all_tables.push_back (&kana_wide_bracket_table); + break; + default: + break; + } + } + + if (is_romaji || is_kana) + { + switch (m_slash_style) { + case SCIM_ANTHY_SLASH_JAPANESE: + if (is_romaji) + m_all_tables.push_back (&romaji_ja_slash_table); + else + m_all_tables.push_back (&kana_ja_slash_table); + break; + case SCIM_ANTHY_SLASH_WIDE: + if (is_romaji) + m_all_tables.push_back (&romaji_wide_slash_table); + else + m_all_tables.push_back (&kana_wide_slash_table); + break; + default: + break; + } + } + if (!m_fundamental_table) { if (is_romaji) { m_all_tables.push_back (&romaji_double_consonant_table); Index: src/scim_anthy_key2kana_table.h =================================================================== RCS file: /cvsroot/scim-imengine/scim-anthy/src/scim_anthy_key2kana_table.h,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- src/scim_anthy_key2kana_table.h 27 Dec 2005 01:51:02 -0000 1.10 +++ src/scim_anthy_key2kana_table.h 13 Feb 2006 08:06:25 -0000 1.11 @@ -41,6 +41,16 @@ } CommaStyle; typedef enum { + SCIM_ANTHY_BRACKET_JAPANESE, + SCIM_ANTHY_BRACKET_WIDE, +} BracketStyle; + +typedef enum { + SCIM_ANTHY_SLASH_JAPANESE, + SCIM_ANTHY_SLASH_WIDE, +} SlashStyle; + +typedef enum { SCIM_ANTHY_TYPING_METHOD_ROMAJI, SCIM_ANTHY_TYPING_METHOD_KANA, SCIM_ANTHY_TYPING_METHOD_NICOLA, @@ -120,6 +130,8 @@ void set_number_width (bool half); void set_period_style (PeriodStyle style); void set_comma_style (CommaStyle style); + void set_bracket_style (BracketStyle style); + void set_slash_style (SlashStyle style); TypingMethod get_typing_method (void) { return m_typing_method; } @@ -129,6 +141,10 @@ get_period_style (void) { return m_period_style; } CommaStyle get_comma_style (void) { return m_comma_style; } + BracketStyle + get_bracket_style (void) { return m_bracket_style; } + SlashStyle + get_slash_style (void) { return m_slash_style; } #if 0 void set_use_consonant_table (bool use); @@ -160,6 +176,8 @@ TypingMethod m_typing_method; PeriodStyle m_period_style; CommaStyle m_comma_style; + BracketStyle m_bracket_style; + SlashStyle m_slash_style; bool m_use_half_symbol; bool m_use_half_number; }; Index: src/scim_anthy_preedit.cpp =================================================================== RCS file: /cvsroot/scim-imengine/scim-anthy/src/scim_anthy_preedit.cpp,v retrieving revision 1.63 retrieving revision 1.64 diff -u -r1.63 -r1.64 --- src/scim_anthy_preedit.cpp 19 Nov 2005 05:10:43 -0000 1.63 +++ src/scim_anthy_preedit.cpp 13 Feb 2006 08:06:25 -0000 1.64 @@ -429,6 +429,30 @@ } void +Preedit::set_bracket_style (BracketStyle style) +{ + m_reading.set_bracket_style (style); +} + +BracketStyle +Preedit::get_bracket_style (void) +{ + return m_reading.get_bracket_style (); +} + +void +Preedit::set_slash_style (SlashStyle style) +{ + m_reading.set_slash_style (style); +} + +SlashStyle +Preedit::get_slash_style (void) +{ + return m_reading.get_slash_style (); +} + +void Preedit::set_symbol_width (bool half) { m_reading.set_symbol_width (half); Index: src/scim_anthy_preedit.h =================================================================== RCS file: /cvsroot/scim-imengine/scim-anthy/src/scim_anthy_preedit.h,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- src/scim_anthy_preedit.h 19 Nov 2005 06:57:53 -0000 1.41 +++ src/scim_anthy_preedit.h 13 Feb 2006 08:06:25 -0000 1.42 @@ -113,6 +113,10 @@ virtual PeriodStyle get_period_style (void); virtual void set_comma_style (CommaStyle style); virtual CommaStyle get_comma_style (void); + virtual void set_bracket_style (BracketStyle style); + virtual BracketStyle get_bracket_style (void); + virtual void set_slash_style (SlashStyle style); + virtual SlashStyle get_slash_style (void); virtual void set_symbol_width (bool half); virtual bool get_symbol_width (void); virtual void set_number_width (bool half); Index: src/scim_anthy_prefs.cpp =================================================================== RCS file: /cvsroot/scim-imengine/scim-anthy/src/scim_anthy_prefs.cpp,v retrieving revision 1.30 retrieving revision 1.32 diff -u -r1.30 -r1.32 --- src/scim_anthy_prefs.cpp 27 Dec 2005 07:10:51 -0000 1.30 +++ src/scim_anthy_prefs.cpp 13 Feb 2006 10:24:36 -0000 1.32 @@ -155,6 +155,16 @@ false, }, { + SCIM_ANTHY_CONFIG_SHOW_SYMBOL_STYLE_LABEL, + SCIM_ANTHY_CONFIG_SHOW_SYMBOL_STYLE_LABEL_DEFAULT, + SCIM_ANTHY_CONFIG_SHOW_SYMBOL_STYLE_LABEL_DEFAULT, + N_("Show _symbol style label"), + NULL, + NULL, + NULL, + false, + }, + { SCIM_ANTHY_CONFIG_SHOW_DICT_LABEL, SCIM_ANTHY_CONFIG_SHOW_DICT_LABEL_DEFAULT, SCIM_ANTHY_CONFIG_SHOW_DICT_LABEL_DEFAULT, @@ -291,6 +301,16 @@ false, }, { + SCIM_ANTHY_CONFIG_SYMBOL_STYLE, + SCIM_ANTHY_CONFIG_SYMBOL_STYLE_DEFAULT, + SCIM_ANTHY_CONFIG_SYMBOL_STYLE_DEFAULT, + N_("Symb_ol input style: "), + NULL, + NULL, + NULL, + false, + }, + { SCIM_ANTHY_CONFIG_SPACE_TYPE, SCIM_ANTHY_CONFIG_SPACE_TYPE_DEFAULT, SCIM_ANTHY_CONFIG_SPACE_TYPE_DEFAULT, Index: src/scim_anthy_prefs.h =================================================================== RCS file: /cvsroot/scim-imengine/scim-anthy/src/scim_anthy_prefs.h,v retrieving revision 1.67 retrieving revision 1.69 diff -u -r1.67 -r1.69 --- src/scim_anthy_prefs.h 27 Dec 2005 07:10:51 -0000 1.67 +++ src/scim_anthy_prefs.h 13 Feb 2006 10:24:36 -0000 1.69 @@ -26,6 +26,7 @@ #define SCIM_ANTHY_CONFIG_TYPING_METHOD "/IMEngine/Anthy/TypingMethod" #define SCIM_ANTHY_CONFIG_CONVERSION_MODE "/IMEngine/Anthy/ConversionMode" #define SCIM_ANTHY_CONFIG_PERIOD_STYLE "/IMEngine/Anthy/PeriodStyle" +#define SCIM_ANTHY_CONFIG_SYMBOL_STYLE "/IMEngine/Anthy/SymbolStyle" #define SCIM_ANTHY_CONFIG_SPACE_TYPE "/IMEngine/Anthy/SpaceType" #define SCIM_ANTHY_CONFIG_TEN_KEY_TYPE "/IMEngine/Anthy/TenKeyType" #define SCIM_ANTHY_CONFIG_BEHAVIOR_ON_PERIOD "/IMEngine/Anthy/BehaviorOnPeriod" @@ -62,6 +63,7 @@ #define SCIM_ANTHY_CONFIG_SHOW_TYPING_METHOD_LABEL "/IMEngine/Anthy/ShowTypingMethodLabel" #define SCIM_ANTHY_CONFIG_SHOW_CONVERSION_MODE_LABEL "/IMEngine/Anthy/ShowConversionModeLabel" #define SCIM_ANTHY_CONFIG_SHOW_PERIOD_STYLE_LABEL "/IMEngine/Anthy/ShowPeriodStyleLabel" +#define SCIM_ANTHY_CONFIG_SHOW_SYMBOL_STYLE_LABEL "/IMEngine/Anthy/ShowSymbolStyleLabel" #define SCIM_ANTHY_CONFIG_SHOW_DICT_LABEL "/IMEngine/Anthy/ShowDictLabel" #define SCIM_ANTHY_CONFIG_SHOW_DICT_ADMIN_LABEL "/IMEngine/Anthy/ShowDictAdminLabel" #define SCIM_ANTHY_CONFIG_SHOW_ADD_WORD_LABEL "/IMEngine/Anthy/ShowAddWordLabel" @@ -156,6 +158,7 @@ #define SCIM_ANTHY_CONFIG_TYPING_METHOD_DEFAULT "Romaji" #define SCIM_ANTHY_CONFIG_CONVERSION_MODE_DEFAULT "MultiSeg" #define SCIM_ANTHY_CONFIG_PERIOD_STYLE_DEFAULT "Japanese" +#define SCIM_ANTHY_CONFIG_SYMBOL_STYLE_DEFAULT "Japanese" #define SCIM_ANTHY_CONFIG_SPACE_TYPE_DEFAULT "FollowMode" #define SCIM_ANTHY_CONFIG_TEN_KEY_TYPE_DEFAULT "FollowMode" #define SCIM_ANTHY_CONFIG_BEHAVIOR_ON_PERIOD_DEFAULT "None" @@ -192,6 +195,7 @@ #define SCIM_ANTHY_CONFIG_SHOW_TYPING_METHOD_LABEL_DEFAULT false #define SCIM_ANTHY_CONFIG_SHOW_CONVERSION_MODE_LABEL_DEFAULT true #define SCIM_ANTHY_CONFIG_SHOW_PERIOD_STYLE_LABEL_DEFAULT false +#define SCIM_ANTHY_CONFIG_SHOW_SYMBOL_STYLE_LABEL_DEFAULT false #define SCIM_ANTHY_CONFIG_SHOW_DICT_LABEL_DEFAULT true #define SCIM_ANTHY_CONFIG_SHOW_DICT_ADMIN_LABEL_DEFAULT true #define SCIM_ANTHY_CONFIG_SHOW_ADD_WORD_LABEL_DEFAULT true Index: src/scim_anthy_reading.cpp =================================================================== RCS file: /cvsroot/scim-imengine/scim-anthy/src/scim_anthy_reading.cpp,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- src/scim_anthy_reading.cpp 25 Nov 2005 04:28:50 -0000 1.35 +++ src/scim_anthy_reading.cpp 13 Feb 2006 08:06:25 -0000 1.36 @@ -604,6 +604,30 @@ } void +Reading::set_bracket_style (BracketStyle style) +{ + m_key2kana_tables.set_bracket_style (style); +} + +BracketStyle +Reading::get_bracket_style (void) +{ + return m_key2kana_tables.get_bracket_style (); +} + +void +Reading::set_slash_style (SlashStyle style) +{ + m_key2kana_tables.set_slash_style (style); +} + +SlashStyle +Reading::get_slash_style (void) +{ + return m_key2kana_tables.get_slash_style (); +} + +void Reading::set_symbol_width (bool half) { m_key2kana_tables.set_symbol_width (half); Index: src/scim_anthy_reading.h =================================================================== RCS file: /cvsroot/scim-imengine/scim-anthy/src/scim_anthy_reading.h,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- src/scim_anthy_reading.h 19 Nov 2005 05:28:59 -0000 1.23 +++ src/scim_anthy_reading.h 13 Feb 2006 08:06:25 -0000 1.24 @@ -96,6 +96,10 @@ PeriodStyle get_period_style (void); void set_comma_style (CommaStyle style); CommaStyle get_comma_style (void); + void set_bracket_style (BracketStyle style); + BracketStyle get_bracket_style (void); + void set_slash_style (SlashStyle style); + SlashStyle get_slash_style (void); void set_symbol_width (bool half); bool get_symbol_width (void); void set_number_width (bool half); Index: src/scim_anthy_setup.cpp =================================================================== RCS file: /cvsroot/scim-imengine/scim-anthy/src/scim_anthy_setup.cpp,v retrieving revision 1.58 retrieving revision 1.63 diff -u -r1.58 -r1.63 --- src/scim_anthy_setup.cpp 15 Nov 2005 09:31:26 -0000 1.58 +++ src/scim_anthy_setup.cpp 14 Feb 2006 04:04:12 -0000 1.63 @@ -233,19 +233,28 @@ {NULL, NULL}, }; +static ComboConfigCandidate symbol_styles[] = +{ + {"\xE3\x80\x8C\xE3\x80\x8D\xE3\x83\xBB", "Japanese"}, + {"\xE3\x80\x8C\xE3\x80\x8D\xEF\xBC\x8F", "CornerBracket_WideSlash"}, + {"\xEF\xBC\xBB\xEF\xBC\xBD\xE3\x83\xBB", "WideBracket_MiddleDot"}, + {"\xEF\xBC\xBB\xEF\xBC\xBD\xEF\xBC\x8F", "WideBracket_WideSlash"}, + {NULL, NULL}, +}; + static ComboConfigCandidate space_types[] = { + {N_("Follow input mode"), "FollowMode"}, {N_("Wide"), "Wide"}, {N_("Half"), "Half"}, - {N_("Follow input mode"), "FollowMode"}, {NULL, NULL}, }; static ComboConfigCandidate ten_key_types[] = { + {N_("Follow input mode"), "FollowMode"}, {N_("Wide"), "Wide"}, {N_("Half"), "Half"}, - {N_("Follow input mode"), "FollowMode"}, {NULL, NULL}, }; @@ -756,7 +765,7 @@ vbox = gtk_vbox_new (FALSE, 0); gtk_widget_show (vbox); - table = gtk_table_new (6, 2, FALSE); + table = gtk_table_new (7, 2, FALSE); gtk_box_pack_start (GTK_BOX (vbox), table, FALSE, FALSE, 0); gtk_widget_show (table); @@ -775,25 +784,45 @@ (gpointer) &conversion_modes, GTK_TABLE (table), 2); + return vbox; +} + +static GtkWidget * +create_symbols_page (void) +{ + GtkWidget *vbox, *table, *widget; + + vbox = gtk_vbox_new (FALSE, 0); + gtk_widget_show (vbox); + + table = gtk_table_new (7, 2, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), table, FALSE, FALSE, 0); + gtk_widget_show (table); + /* period style */ widget = create_combo (SCIM_ANTHY_CONFIG_PERIOD_STYLE, (gpointer) &period_styles, GTK_TABLE (table), 3); + /* symbol style */ + widget = create_combo (SCIM_ANTHY_CONFIG_SYMBOL_STYLE, + (gpointer) &symbol_styles, + GTK_TABLE (table), 4); + /* space_style */ widget = create_combo (SCIM_ANTHY_CONFIG_SPACE_TYPE, (gpointer) &space_types, - GTK_TABLE (table), 4); + GTK_TABLE (table), 5); /* ten key_style */ widget = create_combo (SCIM_ANTHY_CONFIG_TEN_KEY_TYPE, (gpointer) &ten_key_types, - GTK_TABLE (table), 5); + GTK_TABLE (table), 6); /* behavior on period */ widget = create_combo (SCIM_ANTHY_CONFIG_BEHAVIOR_ON_PERIOD, (gpointer) &behavior_on_period, - GTK_TABLE (table), 6); + GTK_TABLE (table), 7); return vbox; } @@ -1136,6 +1165,9 @@ widget = create_check_button (SCIM_ANTHY_CONFIG_SHOW_PERIOD_STYLE_LABEL); gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE, FALSE, 2); + widget = create_check_button (SCIM_ANTHY_CONFIG_SHOW_SYMBOL_STYLE_LABEL); + gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE, FALSE, 2); + /* dictionary menu */ widget = create_check_button (SCIM_ANTHY_CONFIG_SHOW_DICT_LABEL); g_signal_connect ((gpointer) widget, "toggled", @@ -1148,15 +1180,11 @@ gtk_widget_show (hbox); label = gtk_label_new (" "); gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0); + gtk_widget_show (label); widget = create_check_button (SCIM_ANTHY_CONFIG_SHOW_DICT_ADMIN_LABEL); gtk_box_pack_start (GTK_BOX (hbox), widget, FALSE, FALSE, 0); - hbox = gtk_hbox_new (FALSE, 0); - gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 2); - gtk_widget_show (hbox); - label = gtk_label_new (" "); - gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0); gtk_widget_show (label); widget = create_check_button (SCIM_ANTHY_CONFIG_SHOW_ADD_WORD_LABEL); gtk_box_pack_start (GTK_BOX (hbox), widget, FALSE, FALSE, 0); @@ -1234,6 +1262,39 @@ } static GtkWidget * +create_about_page () +{ + GtkWidget *vbox, *label; + gchar str[256]; + + vbox = gtk_vbox_new (FALSE, 0); + gtk_widget_show (vbox); + + g_snprintf ( + str, 256, + _("" + "%s-%s" + "\n\n" + + "" + "A Japanese input method module\nfor SCIM using Anthy" + "\n\n\n\n" + + "" + "Copyright 2005-2006, Takuro Ashie <ashie at homa.ne.jp>" + ""), + PACKAGE, PACKAGE_VERSION); + + label = gtk_label_new (NULL); + gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_CENTER); + gtk_label_set_markup (GTK_LABEL (label), str); + gtk_box_pack_start (GTK_BOX (vbox), label, TRUE, TRUE, 0); + gtk_widget_show (label); + + return vbox; +} + +static GtkWidget * create_setup_window (void) { static GtkWidget *window = NULL; @@ -1251,6 +1312,12 @@ gtk_widget_show (label); gtk_notebook_append_page (GTK_NOTEBOOK (notebook), page, label); + // Create the symbols page. + page = create_symbols_page (); + label = gtk_label_new (_("Symbols")); + gtk_widget_show (label); + gtk_notebook_append_page (GTK_NOTEBOOK (notebook), page, label); + // Create the key bind page. page = create_keyboard_page (); label = gtk_label_new (_("Key bindings")); @@ -1305,6 +1372,12 @@ gtk_widget_show (label); gtk_notebook_append_page (GTK_NOTEBOOK (notebook), page, label); + // Create the appearance page. + page = create_about_page (); + label = gtk_label_new (_("About")); + gtk_widget_show (label); + gtk_notebook_append_page (GTK_NOTEBOOK (notebook), page, label); + // for preventing enabling left arrow. gtk_notebook_set_current_page (GTK_NOTEBOOK (notebook), 1); gtk_notebook_set_current_page (GTK_NOTEBOOK (notebook), 0); Index: scim-anthy.spec =================================================================== RCS file: /cvs/dist/rpms/scim-anthy/devel/scim-anthy.spec,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- scim-anthy.spec 11 Feb 2006 05:39:04 -0000 1.25 +++ scim-anthy.spec 17 Mar 2006 12:31:14 -0000 1.26 @@ -2,7 +2,7 @@ Name: scim-anthy Version: 0.9.0 -Release: 2.fc5.1 +Release: 3.fc6 License: GPL URL: http://scim-imengine.sourceforge.jp/ @@ -13,6 +13,7 @@ %if %{with_libstdc_preview} Buildrequires: libstdc++so7-devel %endif +Patch0: scim-anthy-symbol-style.patch Patch1: scim-anthy-helper-moduledir.patch Summary: SCIM IMEngine for anthy for Japanese input @@ -25,6 +26,7 @@ %prep %setup -q +%patch0 -p0 -b .symbol-style %patch1 -p1 -b .1-moduledir # patch1 touches src/Makefile.am automake @@ -68,6 +70,10 @@ %changelog +* Fri Mar 17 2006 Akira TAGOH - 0.9.0-3.fc6 +* scim-anthy-symbol-style.patch: applied a backport patch from upstream CVS to + add an UI for the symbol style. (#178400) + * Fri Feb 10 2006 Jesse Keating - 0.9.0-2.fc5.1 - bump again for double-long bug on ppc(64) From fedora-cvs-commits at redhat.com Fri Mar 17 13:33:06 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 17 Mar 2006 08:33:06 -0500 Subject: rpms/anthy/devel anthy-2832.patch, NONE, 1.1 anthy-2834.patch, NONE, 1.1 anthy-gcanna-nakaguro.patch, NONE, 1.1 .cvsignore, 1.10, 1.11 anthy.spec, 1.18, 1.19 sources, 1.10, 1.11 Message-ID: <200603171333.k2HDX6u9004312@cvs.devel.redhat.com> Author: tagoh Update of /cvs/dist/rpms/anthy/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv4300 Modified Files: .cvsignore anthy.spec sources Added Files: anthy-2832.patch anthy-2834.patch anthy-gcanna-nakaguro.patch Log Message: * Fri Mar 17 2006 Akira TAGOH 7500-1 - New upstream release. - larning words works now. (#178764) - anthy-2832.patch: patch from upstream that fixes wrong order of candidate list. - anthy-2834.patch: patch from upstream that fixes unexpected word segment. - anthy-gcanna-nakaguro.patch: added a word to dictionary to convert nakaguro to slash. anthy-2832.patch: dic_ent.h | 1 + ext_ent.c | 8 ++++++++ word_dic.c | 12 +++++++++--- 3 files changed, 18 insertions(+), 3 deletions(-) --- NEW FILE anthy-2832.patch --- diff -ur anthy-7500/src-worddic/dic_ent.h anthy-7500b/src-worddic/dic_ent.h --- anthy-7500/src-worddic/dic_ent.h 2006-03-04 18:28:22.000000000 +0900 +++ anthy-7500b/src-worddic/dic_ent.h 2006-03-12 20:12:32.000000000 +0900 @@ -65,6 +65,7 @@ int anthy_get_nr_dic_ents_of_ext_ent(struct seq_ent *se,xstr *xs); int anthy_get_nth_dic_ent_str_of_ext_ent(seq_ent_t ,xstr *,int ,xstr *); int anthy_get_nth_dic_ent_wtype_of_ext_ent(xstr *,int ,wtype_t *); +int anthy_get_nth_dic_ent_freq_of_ext_ent(struct seq_ent *se, int nth); int anthy_get_ext_seq_ent_wtype(struct seq_ent *, wtype_t ); seq_ent_t anthy_get_ext_seq_ent_from_xstr(xstr *x, int is_reverse); int anthy_get_ext_seq_ent_pos(struct seq_ent *, int); diff -ur anthy-7500/src-worddic/ext_ent.c anthy-7500b/src-worddic/ext_ent.c --- anthy-7500/src-worddic/ext_ent.c 2006-03-04 18:28:22.000000000 +0900 +++ anthy-7500b/src-worddic/ext_ent.c 2006-03-12 20:13:24.000000000 +0900 @@ -513,6 +513,14 @@ } int +anthy_get_nth_dic_ent_freq_of_ext_ent(struct seq_ent *se, int nth) +{ + (void)se; + (void)nth; + return 100; +} + +int anthy_get_ext_seq_ent_wtype(struct seq_ent *se, wtype_t w) { if (se == &num_ent) { diff -ur anthy-7500/src-worddic/word_dic.c anthy-7500b/src-worddic/word_dic.c --- anthy-7500/src-worddic/word_dic.c 2006-03-04 18:28:22.000000000 +0900 +++ anthy-7500b/src-worddic/word_dic.c 2006-03-12 20:11:39.000000000 +0900 @@ -247,13 +247,19 @@ } int -anthy_get_nth_dic_ent_freq(seq_ent_t se, int n) +anthy_get_nth_dic_ent_freq(seq_ent_t se, int nth) { struct seq_ent *s = se; - if (!s || s->nr_dic_ents <= n) { + if (!s) { return 0; } - return s->dic_ents[n]->freq; + if (!s->dic_ents) { + return anthy_get_nth_dic_ent_freq_of_ext_ent(se, nth); + } + if (s->nr_dic_ents <= nth) { + return anthy_get_nth_dic_ent_freq_of_ext_ent(se, nth - se->nr_dic_ents); + } + return s->dic_ents[nth]->freq; } int anthy-2834.patch: noun.depword | 1 + 1 files changed, 1 insertion(+) --- NEW FILE anthy-2834.patch --- diff -cr anthy-7500/depgraph/noun.depword anthy-7500b/depgraph/noun.depword *** anthy-7500/depgraph/noun.depword Sat Mar 4 18:28:22 2006 --- anthy-7500b/depgraph/noun.depword Tue Mar 14 22:37:45 2006 *************** *** 91,96 **** --- 91,97 ---- #@?????????? "" Hv@???? @?????????? "" @?????????????? @?????????? "" :Sr@ + @?????????? "" .@?????????????? .@?????? .@???????? .@??(??????) # @?????????????? "" @?? @??(??????) @?? @?? @???? @?????????????? "" @???? @??(??????) @?? @?? @?? @?? anthy-gcanna-nakaguro.patch: gcanna.ctd | 1 + 1 files changed, 1 insertion(+) --- NEW FILE anthy-gcanna-nakaguro.patch --- diff -ruN anthy-7500.orig/anthy_gcanna_ut-20051002/gcanna.ctd anthy-7500/anthy_gcanna_ut-20051002/gcanna.ctd --- anthy-7500.orig/anthy_gcanna_ut-20051002/gcanna.ctd 2005-10-02 17:56:27.000000000 +0900 +++ anthy-7500/anthy_gcanna_ut-20051002/gcanna.ctd 2006-03-17 22:19:17.000000000 +0900 @@ -1,5 +1,6 @@ ?? #KJ ?? ?? ?? #KJ / ?? ?? +?? #KJ ?? / ?? #KJ*40 ?? #KJ*4 ?? #KJ ?? ?? ?? ???? #KJ*40 ???? #KJ*38 ???? #KJ*26 ???? #KJ*12 ???? ???? ?? #KJ*40 ?? #KJ*4 ?? #KJ ?? ?? ?? Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/anthy/devel/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 4 Nov 2005 20:12:50 -0000 1.10 +++ .cvsignore 17 Mar 2006 13:32:32 -0000 1.11 @@ -13,3 +13,4 @@ anthy-7015.tar.gz anthy-7029.tar.gz anthy-7100b.tar.gz +anthy-7500.tar.gz Index: anthy.spec =================================================================== RCS file: /cvs/dist/rpms/anthy/devel/anthy.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- anthy.spec 11 Feb 2006 01:36:52 -0000 1.18 +++ anthy.spec 17 Mar 2006 13:32:32 -0000 1.19 @@ -1,10 +1,10 @@ -%define version 7100b +%define version 7500 %define gcanna_ver 20051002 %{expand: %%define build_with_xemacs %{?_with_xemacs:1}%{!?_with_xemacs:0}} Name: anthy Version: %{version} -Release: 2.2.1 +Release: 1 License: GPL URL: http://sourceforge.jp/projects/anthy/ Buildroot: %{_tmppath}/%{name}-%{version}-buildroot @@ -14,6 +14,9 @@ Source0: http://prdownloads.sourceforge.jp/anthy/9723/anthy-%{version}.tar.gz Source1: anthy-init.el Source2: http://www.geocities.jp/ep3797/snapshot/tmp/anthy_gcanna_ut-%{gcanna_ver}.tar.bz2 +Patch0: anthy-2832.patch +Patch1: anthy-2834.patch +Patch2: anthy-gcanna-nakaguro.patch Summary: Japanese character set input library Group: System Environment/Libraries @@ -55,6 +58,9 @@ %prep %setup -q -a 2 +%patch0 -p1 +%patch1 -p1 +%patch2 -p1 %build %configure @@ -117,6 +123,13 @@ %endif %changelog +* Fri Mar 17 2006 Akira TAGOH 7500-1 +- New upstream release. + - larning words works now. (#178764) +- anthy-2832.patch: patch from upstream that fixes wrong order of candidate list. +- anthy-2834.patch: patch from upstream that fixes unexpected word segment. +- anthy-gcanna-nakaguro.patch: added a word to dictionary to convert nakaguro to slash. + * Fri Feb 10 2006 Jesse Keating - 7100b-2.2.1 - bump again for double-long bug on ppc(64) Index: sources =================================================================== RCS file: /cvs/dist/rpms/anthy/devel/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 4 Nov 2005 20:12:50 -0000 1.10 +++ sources 17 Mar 2006 13:32:32 -0000 1.11 @@ -1,2 +1,2 @@ d0f6128b6e000e85764abbc030399db7 anthy_gcanna_ut-20051002.tar.bz2 -099514a261b1c3757f95de034a4fbc0d anthy-7100b.tar.gz +c086a19b7590caa2a08406459eb577f8 anthy-7500.tar.gz From fedora-cvs-commits at redhat.com Fri Mar 17 17:06:11 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 17 Mar 2006 12:06:11 -0500 Subject: rpms/initscripts/FC-5 .cvsignore, 1.98, 1.99 initscripts.spec, 1.112, 1.113 sources, 1.107, 1.108 Message-ID: <200603171706.k2HH6BRp029139@cvs.devel.redhat.com> Author: notting Update of /cvs/dist/rpms/initscripts/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv29107 Modified Files: .cvsignore initscripts.spec sources Log Message: update Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/initscripts/FC-5/.cvsignore,v retrieving revision 1.98 retrieving revision 1.99 diff -u -r1.98 -r1.99 --- .cvsignore 14 Mar 2006 22:55:45 -0000 1.98 +++ .cvsignore 17 Mar 2006 17:06:07 -0000 1.99 @@ -1 +1 @@ -initscripts-8.31.1.tar.bz2 +initscripts-8.31.2.tar.bz2 Index: initscripts.spec =================================================================== RCS file: /cvs/dist/rpms/initscripts/FC-5/initscripts.spec,v retrieving revision 1.112 retrieving revision 1.113 diff -u -r1.112 -r1.113 --- initscripts.spec 14 Mar 2006 22:55:45 -0000 1.112 +++ initscripts.spec 17 Mar 2006 17:06:07 -0000 1.113 @@ -1,6 +1,6 @@ Summary: The inittab file and the /etc/init.d scripts. Name: initscripts -Version: 8.31.1 +Version: 8.31.2 License: GPL Group: System Environment/Base Release: 1 @@ -189,6 +189,7 @@ /sbin/getkey %attr(2755,root,root) /sbin/netreport /sbin/initlog +/lib/udev/rename_device /sbin/service /sbin/ppp-watch %{_mandir}/man*/* @@ -208,6 +209,9 @@ %ghost %attr(0664,root,utmp) /var/run/utmp %changelog +* Fri Mar 17 2006 Bill Nottingham 8.31.2-1 +- add udev helper to rename network devices on device creation + * Tue Mar 14 2006 Bill Nottingham 8.31.1-1 - fix context of /dev/pts (#185436) - translation updates Index: sources =================================================================== RCS file: /cvs/dist/rpms/initscripts/FC-5/sources,v retrieving revision 1.107 retrieving revision 1.108 diff -u -r1.107 -r1.108 --- sources 14 Mar 2006 22:55:45 -0000 1.107 +++ sources 17 Mar 2006 17:06:08 -0000 1.108 @@ -1 +1 @@ -fc2a0f9a94bac45f96764ae1a8eef7cd initscripts-8.31.1.tar.bz2 +d8c76864e7e247e5eed0a36961ec1634 initscripts-8.31.2.tar.bz2 From fedora-cvs-commits at redhat.com Fri Mar 17 17:08:33 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 17 Mar 2006 12:08:33 -0500 Subject: rpms/initscripts/FC-5 sources,1.108,1.109 Message-ID: <200603171708.k2HH8X2I029278@cvs.devel.redhat.com> Author: notting Update of /cvs/dist/rpms/initscripts/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv29254 Modified Files: sources Log Message: fix build Index: sources =================================================================== RCS file: /cvs/dist/rpms/initscripts/FC-5/sources,v retrieving revision 1.108 retrieving revision 1.109 diff -u -r1.108 -r1.109 --- sources 17 Mar 2006 17:06:08 -0000 1.108 +++ sources 17 Mar 2006 17:08:30 -0000 1.109 @@ -1 +1 @@ -d8c76864e7e247e5eed0a36961ec1634 initscripts-8.31.2.tar.bz2 +8a1cad67e3c57c871492cca6e1460eff initscripts-8.31.2.tar.bz2 From fedora-cvs-commits at redhat.com Fri Mar 17 17:11:42 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 17 Mar 2006 12:11:42 -0500 Subject: rpms/libsepol/devel .cvsignore, 1.87, 1.88 libsepol.spec, 1.114, 1.115 sources, 1.88, 1.89 Message-ID: <200603171711.k2HHBgoJ029412@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/libsepol/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv29397 Modified Files: .cvsignore libsepol.spec sources Log Message: * Fri Mar 10 2006 Dan Walsh 1.12 - Upgrade to latest from NSA * Updated version for release. * Merged cond_evaluate_expr fix from Serge Hallyn (IBM). * Fixed bug in copy_avrule_list reported by Ivan Gyurdiev. * Merged sepol_policydb_mls_enabled interface and error handling changes from Ivan Gyurdiev. Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/libsepol/devel/.cvsignore,v retrieving revision 1.87 retrieving revision 1.88 diff -u -r1.87 -r1.88 --- .cvsignore 17 Feb 2006 19:47:41 -0000 1.87 +++ .cvsignore 17 Mar 2006 17:11:39 -0000 1.88 @@ -85,3 +85,6 @@ libsepol-1.11.14.tgz libsepol-1.11.17.tgz libsepol-1.11.18.tgz +libsepol-1.11.19.tgz +libsepol-1.11.20.tgz +libsepol-1.12.tgz Index: libsepol.spec =================================================================== RCS file: /cvs/dist/rpms/libsepol/devel/libsepol.spec,v retrieving revision 1.114 retrieving revision 1.115 diff -u -r1.114 -r1.115 --- libsepol.spec 21 Feb 2006 03:32:41 -0000 1.114 +++ libsepol.spec 17 Mar 2006 17:11:39 -0000 1.115 @@ -1,7 +1,7 @@ Summary: SELinux binary policy manipulation library Name: libsepol -Version: 1.11.18 -Release: 2 +Version: 1.12 +Release: 1 License: GPL Group: System Environment/Libraries Source: http://www.nsa.gov/selinux/archives/libsepol-%{version}.tgz @@ -80,8 +80,17 @@ %{_includedir}/sepol/policydb/*.h %changelog +* Fri Mar 10 2006 Dan Walsh 1.12 +- Upgrade to latest from NSA + * Updated version for release. + * Merged cond_evaluate_expr fix from Serge Hallyn (IBM). + * Fixed bug in copy_avrule_list reported by Ivan Gyurdiev. + * Merged sepol_policydb_mls_enabled interface and error handling + changes from Ivan Gyurdiev. + * Mon Feb 20 2006 Dan Walsh 1.11.18-2 - Rebuild for fc5-head + * Fri Feb 17 2006 Dan Walsh 1.11.18-1 - Upgrade to latest from NSA * Merged node_expand_addr bugfix and node_compare* change from Index: sources =================================================================== RCS file: /cvs/dist/rpms/libsepol/devel/sources,v retrieving revision 1.88 retrieving revision 1.89 diff -u -r1.88 -r1.89 --- sources 17 Feb 2006 19:47:41 -0000 1.88 +++ sources 17 Mar 2006 17:11:39 -0000 1.89 @@ -1 +1 @@ -0390cbb550f2c99e179f9f93ac4969df libsepol-1.11.18.tgz +08db3a3dbcbe6234d842208980cf8f40 libsepol-1.12.tgz From fedora-cvs-commits at redhat.com Fri Mar 17 17:21:00 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 17 Mar 2006 12:21:00 -0500 Subject: rpms/libselinux/devel .cvsignore, 1.101, 1.102 libselinux-rhat.patch, 1.74, 1.75 libselinux.spec, 1.181, 1.182 sources, 1.103, 1.104 Message-ID: <200603171721.k2HHL0O6009707@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/libselinux/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv9690 Modified Files: .cvsignore libselinux-rhat.patch libselinux.spec sources Log Message: * Fri Mar 10 2006 Dan Walsh 1.30-1 - Make some fixes so it will build on RHEL4 - Upgrade to latest from NSA * Updated version for release. * Altered rpm_execcon fallback logic for permissive mode to also handle case where /selinux/enforce is not available. Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/libselinux/devel/.cvsignore,v retrieving revision 1.101 retrieving revision 1.102 diff -u -r1.101 -r1.102 --- .cvsignore 20 Jan 2006 16:17:43 -0000 1.101 +++ .cvsignore 17 Mar 2006 17:20:57 -0000 1.102 @@ -75,3 +75,5 @@ libselinux-1.29.5.tgz libselinux-1.29.6.tgz libselinux-1.29.7.tgz +libselinux-1.29.8.tgz +libselinux-1.30.tgz libselinux-rhat.patch: Makefile | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) Index: libselinux-rhat.patch =================================================================== RCS file: /cvs/dist/rpms/libselinux/devel/libselinux-rhat.patch,v retrieving revision 1.74 retrieving revision 1.75 diff -u -r1.74 -r1.75 --- libselinux-rhat.patch 14 Jan 2006 05:05:18 -0000 1.74 +++ libselinux-rhat.patch 17 Mar 2006 17:20:57 -0000 1.75 @@ -1,36 +1,11 @@ -diff --exclude-from=exclude -N -u -r nsalibselinux/Makefile libselinux-1.29.5/Makefile ---- nsalibselinux/Makefile 2005-02-09 17:04:51.000000000 -0500 -+++ libselinux-1.29.5/Makefile 2006-01-13 23:54:13.000000000 -0500 -@@ -2,12 +2,18 @@ - $(MAKE) -C src - $(MAKE) -C utils - -+pywrap: -+ $(MAKE) -C src pywrap -+ - install: - $(MAKE) -C include install - $(MAKE) -C src install - $(MAKE) -C utils install - $(MAKE) -C man install - -+install-pywrap: -+ $(MAKE) -C src install-pywrap -+ - relabel: - $(MAKE) -C src relabel - -diff --exclude-from=exclude -N -u -r nsalibselinux/src/Makefile libselinux-1.29.5/src/Makefile ---- nsalibselinux/src/Makefile 2006-01-04 10:37:34.000000000 -0500 -+++ libselinux-1.29.5/src/Makefile 2006-01-13 23:54:50.000000000 -0500 -@@ -26,7 +26,9 @@ - - SWIG = swig -Wall -python -o $(SWIGCOUT) -outdir ./ - --all: $(LIBA) $(LIBSO) $(SWIGSO) -+all: $(LIBA) $(LIBSO) -+ -+pywrap: $(SWIGSO) - - $(LIBA): $(OBJS) - $(AR) rcs $@ $^ +--- libselinux-1.29.7/src/Makefile~ 2006-01-20 10:37:52.000000000 -0500 ++++ libselinux-1.29.7/src/Makefile 2006-03-16 17:22:52.000000000 -0500 +@@ -3,7 +3,7 @@ + LIBDIR ?= $(PREFIX)/lib + SHLIBDIR ?= $(DESTDIR)/lib + INCLUDEDIR ?= $(PREFIX)/include +-PYLIBVER ?= python2.4 ++PYLIBVER ?= $(shell python -c 'import sys;print "python%d.%d" % sys.version_info[0:2]') + PYINC ?= /usr/include/$(PYLIBVER) + PYLIB ?= /usr/lib/$(PYLIBVER) + PYTHONLIBDIR ?= $(LIBDIR)/$(PYLIBVER) Index: libselinux.spec =================================================================== RCS file: /cvs/dist/rpms/libselinux/devel/libselinux.spec,v retrieving revision 1.181 retrieving revision 1.182 diff -u -r1.181 -r1.182 --- libselinux.spec 11 Feb 2006 04:12:30 -0000 1.181 +++ libselinux.spec 17 Mar 2006 17:20:57 -0000 1.182 @@ -1,12 +1,13 @@ -%define libsepolver 1.11.9-1 +%define libsepolver 1.11.20-1 %define libsetransver 0.1.18-1 Summary: SELinux library and simple utilities Name: libselinux -Version: 1.29.7 -Release: 1.2 +Version: 1.30 +Release: 1 License: Public domain (uncopyrighted) Group: System Environment/Libraries Source: http://www.nsa.gov/selinux/archives/%{name}-%{version}.tgz +Patch: libselinux-rhat.patch BuildRequires: libsepol-devel >= %{libsepolver} Requires: libsepol >= %{libsepolver} @@ -33,6 +34,7 @@ Summary: python bindings for libselinux Group: Development/Libraries Requires: libselinux = %{version}-%{release} +BuildRequires: python-devel %description python The libselinux-python package contains the python bindings for developing SELinux @@ -49,6 +51,7 @@ %prep %setup -q +%patch -p1 -b .rhat %build make clean @@ -104,10 +107,17 @@ %files python %defattr(-,root,root,0755) -%{_libdir}/python2.4/site-packages/_selinux.so -%{_libdir}/python2.4/site-packages/selinux.py* +%{_libdir}/python*/site-packages/_selinux.so +%{_libdir}/python*/site-packages/selinux.py* %changelog +* Fri Mar 10 2006 Dan Walsh 1.30-1 +- Make some fixes so it will build on RHEL4 +- Upgrade to latest from NSA + * Updated version for release. + * Altered rpm_execcon fallback logic for permissive mode to also + handle case where /selinux/enforce is not available. + * Fri Feb 10 2006 Jesse Keating - 1.29.7-1.2 - bump again for double-long bug on ppc(64) Index: sources =================================================================== RCS file: /cvs/dist/rpms/libselinux/devel/sources,v retrieving revision 1.103 retrieving revision 1.104 diff -u -r1.103 -r1.104 --- sources 20 Jan 2006 16:17:43 -0000 1.103 +++ sources 17 Mar 2006 17:20:57 -0000 1.104 @@ -1 +1 @@ -880560e5229cbf090b0f4608a5c3b95e libselinux-1.29.7.tgz +b0834c79eac17c87c690542b0874cc53 libselinux-1.30.tgz From fedora-cvs-commits at redhat.com Fri Mar 17 17:28:04 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 17 Mar 2006 12:28:04 -0500 Subject: rpms/SysVinit/devel SysVinit.spec, 1.41, 1.42 sysvinit-2.86-haltman.patch, 1.1, 1.2 Message-ID: <200603171728.k2HHS47h009904@cvs.devel.redhat.com> Author: notting Update of /cvs/dist/rpms/SysVinit/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv9857 Modified Files: SysVinit.spec sysvinit-2.86-haltman.patch Log Message: document that the kernel may sync even if reboot is called with -n Index: SysVinit.spec =================================================================== RCS file: /cvs/dist/rpms/SysVinit/devel/SysVinit.spec,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- SysVinit.spec 13 Feb 2006 16:16:39 -0000 1.41 +++ SysVinit.spec 17 Mar 2006 17:28:01 -0000 1.42 @@ -1,7 +1,7 @@ Summary: Programs which control basic system processes. Name: SysVinit Version: 2.86 -Release: 2.2.2 +Release: 3 License: GPL Group: System Environment/Base Source: ftp://ftp.cistron.nl/pub/people/miquels/sysvinit/sysvinit-%{version}.tar.gz @@ -124,6 +124,9 @@ /dev/initctl %changelog +* Fri Mar 17 2006 Bill Nottingham - 2.86-3 +- document that the kernel may sync even if reboot is called with -n (#180967) + * Mon Feb 13 2006 Bill Nottingham - 2.86-2.2.2 - and again... sysvinit-2.86-haltman.patch: halt.8 | 15 ++++++++++++--- 1 files changed, 12 insertions(+), 3 deletions(-) Index: sysvinit-2.86-haltman.patch =================================================================== RCS file: /cvs/dist/rpms/SysVinit/devel/sysvinit-2.86-haltman.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sysvinit-2.86-haltman.patch 20 Dec 2005 20:22:31 -0000 1.1 +++ sysvinit-2.86-haltman.patch 17 Mar 2006 17:28:01 -0000 1.2 @@ -18,3 +18,33 @@ +.BR init (8), +.BR pam_console (8) .\"}}} +--- sysvinit-2.86/man/halt.8.haltman 2001-11-21 16:11:22.000000000 -0500 ++++ sysvinit-2.86/man/halt.8 2006-03-17 12:26:39.000000000 -0500 +@@ -50,7 +50,8 @@ + .\"{{{ Options + .SH OPTIONS + .IP \fB\-n\fP +-Don't sync before reboot or halt. ++Don't sync before reboot or halt. Note that the kernel and storage ++drivers may still sync. + .IP \fB\-w\fP + Don't actually reboot or halt but only write the wtmp record + (in the \fI/var/log/wtmp\fP file). +@@ -69,6 +70,9 @@ + .\"{{{ Diagnostics + .SH DIAGNOSTICS + If you're not the superuser, you will get the message `must be superuser'. ++Users logged in locally on the console can call \fBhalt\fP, ++\fBreboot\fP, and \fBpoweroff\fP without supplying the root password, ++due to pam_console (8). + .\"}}} + .\"{{{ Notes + .SH NOTES +@@ -98,5 +102,6 @@ + .\"{{{ See also + .SH "SEE ALSO" + .BR shutdown (8), +-.BR init (8) ++.BR init (8), ++.BR pam_console (8) + .\"}}} From fedora-cvs-commits at redhat.com Fri Mar 17 17:36:32 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 17 Mar 2006 12:36:32 -0500 Subject: rpms/SysVinit/devel sysvinit-2.86-haltman.patch,1.2,1.3 Message-ID: <200603171736.k2HHaW9b010185@cvs.devel.redhat.com> Author: notting Update of /cvs/dist/rpms/SysVinit/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv10162 Modified Files: sysvinit-2.86-haltman.patch Log Message: fix build sysvinit-2.86-haltman.patch: halt.8 | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) Index: sysvinit-2.86-haltman.patch =================================================================== RCS file: /cvs/dist/rpms/SysVinit/devel/sysvinit-2.86-haltman.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sysvinit-2.86-haltman.patch 17 Mar 2006 17:28:01 -0000 1.2 +++ sysvinit-2.86-haltman.patch 17 Mar 2006 17:36:28 -0000 1.3 @@ -30,21 +30,3 @@ .IP \fB\-w\fP Don't actually reboot or halt but only write the wtmp record (in the \fI/var/log/wtmp\fP file). -@@ -69,6 +70,9 @@ - .\"{{{ Diagnostics - .SH DIAGNOSTICS - If you're not the superuser, you will get the message `must be superuser'. -+Users logged in locally on the console can call \fBhalt\fP, -+\fBreboot\fP, and \fBpoweroff\fP without supplying the root password, -+due to pam_console (8). - .\"}}} - .\"{{{ Notes - .SH NOTES -@@ -98,5 +102,6 @@ - .\"{{{ See also - .SH "SEE ALSO" - .BR shutdown (8), --.BR init (8) -+.BR init (8), -+.BR pam_console (8) - .\"}}} From fedora-cvs-commits at redhat.com Fri Mar 17 18:22:21 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 17 Mar 2006 13:22:21 -0500 Subject: rpms/samba/devel .cvsignore, 1.27, 1.28 samba.spec, 1.61, 1.62 sources, 1.29, 1.30 Message-ID: <200603171822.k2HIMLOn003540@cvs.devel.redhat.com> Author: fenlason Update of /cvs/dist/rpms/samba/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv3525 Modified Files: .cvsignore samba.spec sources Log Message: 3.0.21c Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/samba/devel/.cvsignore,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- .cvsignore 13 Feb 2006 16:26:38 -0000 1.27 +++ .cvsignore 17 Mar 2006 18:22:19 -0000 1.28 @@ -1 +1 @@ -samba-3.0.21b.tar.gz +samba-3.0.21c.tar.gz Index: samba.spec =================================================================== RCS file: /cvs/dist/rpms/samba/devel/samba.spec,v retrieving revision 1.61 retrieving revision 1.62 diff -u -r1.61 -r1.62 --- samba.spec 13 Feb 2006 16:27:32 -0000 1.61 +++ samba.spec 17 Mar 2006 18:22:19 -0000 1.62 @@ -2,7 +2,7 @@ Summary: The Samba SMB server. Name: samba -Version: 3.0.21b +Version: 3.0.21c Release: 2 Epoch: 0 License: GNU GPL Version 2 @@ -443,6 +443,9 @@ %{_mandir}/man7/libsmbclient.7* %changelog +* Fri Mar 17 2006 Jay Fenlason 2.0.21c-2 +- New upstream version. + * Mon Feb 13 2006 Jay Fenlason 3.0.21b-2 - New upstream version. - Since the rawhide kernel has dropped support for smbfs, remove smbmount Index: sources =================================================================== RCS file: /cvs/dist/rpms/samba/devel/sources,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- sources 13 Feb 2006 16:26:39 -0000 1.29 +++ sources 17 Mar 2006 18:22:19 -0000 1.30 @@ -1 +1 @@ -bb73dffb33f4a39386ef9f3e07ae28ff samba-3.0.21b.tar.gz +9deeda292399d2bbad120f98a290f5da samba-3.0.21c.tar.gz From fedora-cvs-commits at redhat.com Fri Mar 17 18:33:47 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 17 Mar 2006 13:33:47 -0500 Subject: rpms/libselinux/devel libselinux.spec,1.182,1.183 Message-ID: <200603171833.k2HIXl1Q003738@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/libselinux/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv3724 Modified Files: libselinux.spec Log Message: * Fri Mar 10 2006 Dan Walsh 1.30-1 - Make some fixes so it will build on RHEL4 - Upgrade to latest from NSA * Updated version for release. * Altered rpm_execcon fallback logic for permissive mode to also handle case where /selinux/enforce is not available. Index: libselinux.spec =================================================================== RCS file: /cvs/dist/rpms/libselinux/devel/libselinux.spec,v retrieving revision 1.182 retrieving revision 1.183 diff -u -r1.182 -r1.183 --- libselinux.spec 17 Mar 2006 17:20:57 -0000 1.182 +++ libselinux.spec 17 Mar 2006 18:33:18 -0000 1.183 @@ -1,5 +1,5 @@ -%define libsepolver 1.11.20-1 -%define libsetransver 0.1.18-1 +%define libsepolver 1.12-1 +%define libsetransver 0.1.20-1 Summary: SELinux library and simple utilities Name: libselinux Version: 1.30 From fedora-cvs-commits at redhat.com Fri Mar 17 18:36:39 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 17 Mar 2006 13:36:39 -0500 Subject: rpms/checkpolicy/devel .cvsignore, 1.57, 1.58 checkpolicy.spec, 1.94, 1.95 sources, 1.58, 1.59 Message-ID: <200603171836.k2HIadRI003831@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/checkpolicy/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv3800 Modified Files: .cvsignore checkpolicy.spec sources Log Message: * Fri Mar 17 2006 Dan Walsh - 1.30-1 - Latest upgrade from NSA * Updated version for release. * Fixed bug in role dominance (define_role_dom). Index: checkpolicy.spec =================================================================== RCS file: /cvs/dist/rpms/checkpolicy/devel/checkpolicy.spec,v retrieving revision 1.94 retrieving revision 1.95 diff -u -r1.94 -r1.95 --- checkpolicy.spec 17 Feb 2006 20:00:08 -0000 1.94 +++ checkpolicy.spec 17 Mar 2006 18:36:26 -0000 1.95 @@ -1,7 +1,7 @@ -%define libsepolver 1.11.18-1 +%define libsepolver 1.12-1 Summary: SELinux policy compiler Name: checkpolicy -Version: 1.29.4 +Version: 1.30 Release: 1 License: GPL Group: Development/System @@ -47,7 +47,12 @@ %{_mandir}/man8/checkmodule.8.gz %changelog -* Fri Feb 16 2006 Dan Walsh - 1.29.4-1 +* Fri Mar 17 2006 Dan Walsh - 1.30-1 +- Latest upgrade from NSA + * Updated version for release. + * Fixed bug in role dominance (define_role_dom). + +* Fri Feb 17 2006 Dan Walsh - 1.29.4-1 - Latest upgrade from NSA * Added a check for failure to declare each sensitivity in a level definition. Index: sources =================================================================== RCS file: /cvs/dist/rpms/checkpolicy/devel/sources,v retrieving revision 1.58 retrieving revision 1.59 diff -u -r1.58 -r1.59 --- sources 16 Feb 2006 18:44:15 -0000 1.58 +++ sources 17 Mar 2006 18:36:26 -0000 1.59 @@ -1 +1 @@ -ccc15309265965702935f2a2f5107389 checkpolicy-1.29.4.tgz +20f388415dbdd002f0cb3bf726df0536 checkpolicy-1.30.tgz From fedora-cvs-commits at redhat.com Fri Mar 17 18:39:08 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 17 Mar 2006 13:39:08 -0500 Subject: rpms/kernel/devel patch-2.6.16-rc6-git8.bz2.sign, NONE, 1.1 .cvsignore, 1.382, 1.383 kernel-2.6.spec, 1.2058, 1.2059 sources, 1.323, 1.324 upstream, 1.296, 1.297 patch-2.6.16-rc6-git7.bz2.sign, 1.1, NONE Message-ID: <200603171839.k2HId8dU003972@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv3722 Modified Files: .cvsignore kernel-2.6.spec sources upstream Added Files: patch-2.6.16-rc6-git8.bz2.sign Removed Files: patch-2.6.16-rc6-git7.bz2.sign Log Message: git8 --- NEW FILE patch-2.6.16-rc6-git8.bz2.sign --- -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.2.2 (GNU/Linux) Comment: See http://www.kernel.org/signature.html for info iD8DBQBEGl7ryGugalF9Dw4RAhM9AKCE2W2zZtNop2JRfSSMhsgZ7NCffQCfXDDY 1i+m8YZ7Qf/l/pj9Ht6wPkU= =VBx9 -----END PGP SIGNATURE----- Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v retrieving revision 1.382 retrieving revision 1.383 diff -u -r1.382 -r1.383 --- .cvsignore 16 Mar 2006 22:26:33 -0000 1.382 +++ .cvsignore 17 Mar 2006 18:39:05 -0000 1.383 @@ -4,4 +4,4 @@ linux-2.6.15.tar.bz2 xen-20060301.tar.bz2 patch-2.6.16-rc6.bz2 -patch-2.6.16-rc6-git7.bz2 +patch-2.6.16-rc6-git8.bz2 Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.2058 retrieving revision 1.2059 diff -u -r1.2058 -r1.2059 --- kernel-2.6.spec 16 Mar 2006 22:26:33 -0000 1.2058 +++ kernel-2.6.spec 17 Mar 2006 18:39:05 -0000 1.2059 @@ -218,7 +218,7 @@ # Patches 0 through 100 are meant for core subsystem upgrades # Patch1: patch-2.6.16-rc6.bz2 -Patch2: patch-2.6.16-rc6-git7.bz2 +Patch2: patch-2.6.16-rc6-git8.bz2 # Patches 100 through 500 are meant for architecture patches Patch100: linux-2.6-bzimage.patch @@ -1660,6 +1660,9 @@ %endif %changelog +* Fri Mar 17 2006 Dave Jones +- 2.6.16rc6-git8 + * Thu Mar 16 2006 Dave Jones - 2.6.16rc6-git7 Index: sources =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/sources,v retrieving revision 1.323 retrieving revision 1.324 diff -u -r1.323 -r1.324 --- sources 16 Mar 2006 22:26:33 -0000 1.323 +++ sources 17 Mar 2006 18:39:05 -0000 1.324 @@ -1,4 +1,4 @@ cdf95e00f5111e31f78e1d97304d9522 linux-2.6.15.tar.bz2 cdfde609af8adcf58d7ff626599b2d90 xen-20060301.tar.bz2 67fe4dce92d3103e56dd8d2d3c20b3ed patch-2.6.16-rc6.bz2 -0fde34dbde844c26b32f10c7bef175b5 patch-2.6.16-rc6-git7.bz2 +bf76b5d267eb9f03f579045fd21e0781 patch-2.6.16-rc6-git8.bz2 Index: upstream =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/upstream,v retrieving revision 1.296 retrieving revision 1.297 diff -u -r1.296 -r1.297 --- upstream 16 Mar 2006 22:26:33 -0000 1.296 +++ upstream 17 Mar 2006 18:39:05 -0000 1.297 @@ -1,3 +1,3 @@ linux-2.6.15.tar.bz2 patch-2.6.16-rc6.bz2 -patch-2.6.16-rc6-git7.bz2 +patch-2.6.16-rc6-git8.bz2 --- patch-2.6.16-rc6-git7.bz2.sign DELETED --- From fedora-cvs-commits at redhat.com Fri Mar 17 18:39:49 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 17 Mar 2006 13:39:49 -0500 Subject: rpms/libsepol/devel libsepol.spec,1.115,1.116 Message-ID: <200603171839.k2HIdn20004073@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/libsepol/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv4058 Modified Files: libsepol.spec Log Message: * Fri Mar 10 2006 Dan Walsh 1.12-2 - Upgrade to latest from NSA * Updated version for release. * Merged cond_evaluate_expr fix from Serge Hallyn (IBM). * Fixed bug in copy_avrule_list reported by Ivan Gyurdiev. * Merged sepol_policydb_mls_enabled interface and error handling changes from Ivan Gyurdiev. Index: libsepol.spec =================================================================== RCS file: /cvs/dist/rpms/libsepol/devel/libsepol.spec,v retrieving revision 1.115 retrieving revision 1.116 diff -u -r1.115 -r1.116 --- libsepol.spec 17 Mar 2006 17:11:39 -0000 1.115 +++ libsepol.spec 17 Mar 2006 18:39:47 -0000 1.116 @@ -1,7 +1,7 @@ Summary: SELinux binary policy manipulation library Name: libsepol Version: 1.12 -Release: 1 +Release: 2 License: GPL Group: System Environment/Libraries Source: http://www.nsa.gov/selinux/archives/libsepol-%{version}.tgz @@ -80,7 +80,7 @@ %{_includedir}/sepol/policydb/*.h %changelog -* Fri Mar 10 2006 Dan Walsh 1.12 +* Fri Mar 10 2006 Dan Walsh 1.12-2 - Upgrade to latest from NSA * Updated version for release. * Merged cond_evaluate_expr fix from Serge Hallyn (IBM). From fedora-cvs-commits at redhat.com Fri Mar 17 19:10:43 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 17 Mar 2006 14:10:43 -0500 Subject: rpms/beagle/FC-5 beagle.spec, 1.45, 1.46 sources, 1.9, 1.10 beagle-0.2.0-security-fix.patch, 1.2, NONE beagle-0.2.1-crawl-system-cron.patch, 1.1, NONE beagle-0.2.1-sqlite3.patch, 1.2, NONE Message-ID: <200603171910.k2HJAhVS017232@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/beagle/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv17218 Modified Files: beagle.spec sources Removed Files: beagle-0.2.0-security-fix.patch beagle-0.2.1-crawl-system-cron.patch beagle-0.2.1-sqlite3.patch Log Message: - Update to 0.2.3 Index: beagle.spec =================================================================== RCS file: /cvs/dist/rpms/beagle/FC-5/beagle.spec,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- beagle.spec 8 Mar 2006 15:23:21 -0000 1.45 +++ beagle.spec 17 Mar 2006 19:10:41 -0000 1.46 @@ -1,6 +1,6 @@ Name: beagle -Version: 0.2.2 -Release: 3 +Version: 0.2.3 +Release: 1 Summary: The Beagle Search Infrastructure Group: User Interface/Desktops @@ -25,7 +25,6 @@ Requires: sqlite >= 3.3.1 Requires: zip unzip sed grep mono-core poppler-utils Patch0: beagle-0.2.2-security-fix.patch -Patch1: beagle-0.2.2-textcache-crash.patch Patch2: beagle-0.2.1-crawl.patch Patch3: beagle-0.2.1-spew.patch Patch4: beagle-0.2.2-crawl-system-cron.patch @@ -63,7 +62,6 @@ %prep %setup -q %patch0 -p1 -b .security-fix -%patch1 -p1 -b .textcache-crash %patch2 -p1 -b .crawl %patch3 -p1 -b .spew %patch4 -p1 -b .crawl-system-cron @@ -214,6 +212,9 @@ %{_prefix}/lib/python*/site-packages/beagle.so %changelog +* Fri Mar 17 2006 Ray Strode - 0.2.3-1 +- Update to 0.2.3 + * Wed Mar 8 2006 Ray Strode - 0.2.2-3 - turn off beagle by default to limit the severity of bug 183898 Index: sources =================================================================== RCS file: /cvs/dist/rpms/beagle/FC-5/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 7 Mar 2006 15:54:55 -0000 1.9 +++ sources 17 Mar 2006 19:10:41 -0000 1.10 @@ -1,3 +1,3 @@ 6f0f121a9269662071eb5c260b54f86f beagle.desktop 777250265dc910964f5acd9da29cc64c beagle-crawl-system.cron -d8c4765a30b9bf989a769f4337f35b3f beagle-0.2.2.tar.bz2 +4519156a909e8371c59454cab882c616 beagle-0.2.3.tar.bz2 --- beagle-0.2.0-security-fix.patch DELETED --- --- beagle-0.2.1-crawl-system-cron.patch DELETED --- --- beagle-0.2.1-sqlite3.patch DELETED --- From fedora-cvs-commits at redhat.com Fri Mar 17 20:25:35 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 17 Mar 2006 15:25:35 -0500 Subject: rpms/libsemanage/devel .cvsignore, 1.54, 1.55 libsemanage-rhat.patch, 1.10, 1.11 libsemanage.spec, 1.77, 1.78 sources, 1.56, 1.57 Message-ID: <200603172025.k2HKPZm6023071@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/libsemanage/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv23055 Modified Files: .cvsignore libsemanage-rhat.patch libsemanage.spec sources Log Message: * Fri Mar 17 2006 Dan Walsh - 1.6 - Make work on RHEL4 - Upgrade to latest from NSA * Merged abort early on merge errors patch from Ivan Gyurdiev. * Cleaned up error handling in semanage_split_fc based on a patch by Serge Hallyn (IBM) and suggestions by Ivan Gyurdiev. * Merged MLS handling fixes from Ivan Gyurdiev. Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/libsemanage/devel/.cvsignore,v retrieving revision 1.54 retrieving revision 1.55 diff -u -r1.54 -r1.55 --- .cvsignore 17 Feb 2006 20:00:24 -0000 1.54 +++ .cvsignore 17 Mar 2006 20:25:31 -0000 1.55 @@ -57,3 +57,6 @@ libsemanage-1.5.23.tgz libsemanage-1.5.26.tgz libsemanage-1.5.28.tgz +libsemanage-1.5.29.tgz +libsemanage-1.5.31.tgz +libsemanage-1.6.tgz libsemanage-rhat.patch: Makefile | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) Index: libsemanage-rhat.patch =================================================================== RCS file: /cvs/dist/rpms/libsemanage/devel/libsemanage-rhat.patch,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- libsemanage-rhat.patch 10 Feb 2006 16:42:07 -0000 1.10 +++ libsemanage-rhat.patch 17 Mar 2006 20:25:31 -0000 1.11 @@ -1,57 +1,11 @@ -diff -Naurp --exclude-from excludes old/libsemanage/src/direct_api.c new/libsemanage/src/direct_api.c ---- old/libsemanage/src/direct_api.c 2006-02-08 03:20:08.000000000 -0500 -+++ new/libsemanage/src/direct_api.c 2006-02-09 19:14:15.000000000 -0500 -@@ -475,7 +475,7 @@ static int semanage_direct_commit(semana - - /* ==================== File-backed ================== */ - -- /* write the linked file contexts template */ -+ /* File Contexts */ - if ((ofilename = semanage_path(SEMANAGE_TMP, SEMANAGE_FC_TMPL)) == NULL || - write_file(sh, ofilename, sepol_module_package_get_file_contexts(base), - sepol_module_package_get_file_contexts_len(base)) == -1) { -@@ -484,29 +484,36 @@ static int semanage_direct_commit(semana - - if (semanage_split_fc(sh)) - goto cleanup; -- -+ -+ pfcontexts->dtable->drop_cache(pfcontexts->dbase); -+ -+ /* Seusers */ - if (sepol_module_package_get_seusers_len(base)) { - if ((ofilename = semanage_path(SEMANAGE_TMP, SEMANAGE_SEUSERS)) == NULL || - write_file(sh, ofilename, sepol_module_package_get_seusers(base), - sepol_module_package_get_seusers_len(base)) == -1) { - goto cleanup; - } -+ pseusers->dtable->drop_cache(pseusers->dbase); -+ -+ } else { -+ if (pseusers->dtable->clear(sh, pseusers->dbase) < 0) -+ goto cleanup; - } - -+ /* Users_extra */ - if (sepol_module_package_get_user_extra_len(base)) { - if ((ofilename = semanage_path(SEMANAGE_TMP, SEMANAGE_USER_EXTRA)) == NULL || - write_file(sh, ofilename, sepol_module_package_get_user_extra(base), - sepol_module_package_get_user_extra_len(base)) == -1) { - goto cleanup; - } -- } -+ pusers_extra->dtable->drop_cache(pusers_extra->dbase); - -- /* Drop any cached content for file_contexts, seusers, or users_extra, -- * since it is now superceded by the files just written, and needs to be -- * re-cached */ -- pfcontexts->dtable->drop_cache(pfcontexts->dbase); -- pseusers->dtable->drop_cache(pseusers->dbase); -- pusers_extra->dtable->drop_cache(pusers_extra->dbase); -+ } else { -+ if (pusers_extra->dtable->clear(sh, pusers_extra->dbase) < 0) -+ goto cleanup; -+ } - - /* ==================== Policydb-backed ================ */ +--- libsemanage-1.5.28/src/Makefile~ 2006-02-17 14:45:52.000000000 -0500 ++++ libsemanage-1.5.28/src/Makefile 2006-03-17 08:44:29.000000000 -0500 +@@ -3,7 +3,7 @@ + LIBDIR ?= $(PREFIX)/lib + SHLIBDIR ?= $(DESTDIR)/lib + INCLUDEDIR ?= $(PREFIX)/include +-PYLIBVER ?= python2.4 ++PYLIBVER ?= $(shell python -c 'import sys;print "python%d.%d" % sys.version_info[0:2]') + PYINC ?= /usr/include/${PYLIBVER} + PYLIBDIR ?= $(LIBDIR)/${PYLIBVER} Index: libsemanage.spec =================================================================== RCS file: /cvs/dist/rpms/libsemanage/devel/libsemanage.spec,v retrieving revision 1.77 retrieving revision 1.78 diff -u -r1.77 -r1.78 --- libsemanage.spec 17 Feb 2006 20:00:24 -0000 1.77 +++ libsemanage.spec 17 Mar 2006 20:25:31 -0000 1.78 @@ -1,12 +1,13 @@ -%define libsepolver 1.11.18-1 -%define libselinuxver 1.29.6-1 +%define libsepolver 1.12-1 +%define libselinuxver 1.30-1 Summary: SELinux binary policy manipulation library Name: libsemanage -Version: 1.5.28 +Version: 1.6 Release: 1 License: GPL Group: System Environment/Libraries Source: http://www.nsa.gov/selinux/archives/libsemanage-%{version}.tgz +Patch: libsemanage-rhat.patch BuildRoot: %{_tmppath}/%{name}-buildroot BuildRequires: libselinux-devel >= %{libselinuxver} @@ -39,6 +40,7 @@ %prep %setup -q +%patch -p1 -b .rhat %build make clean @@ -59,10 +61,7 @@ %config(noreplace) /etc/selinux/semanage.conf /%{_lib}/libsemanage.so.1 %{_libdir}/libsemanage.so -%{_libdir}/python2.4/site-packages/_semanage.so -%{_libdir}/python2.4/site-packages/semanage.py -%{_libdir}/python2.4/site-packages/semanage.pyc -%{_libdir}/python2.4/site-packages/semanage.pyo +%{_libdir}/python*/site-packages/* %post -p /sbin/ldconfig @@ -75,6 +74,14 @@ %{_mandir}/man3/* %changelog +* Fri Mar 17 2006 Dan Walsh - 1.6 +- Make work on RHEL4 +- Upgrade to latest from NSA + * Merged abort early on merge errors patch from Ivan Gyurdiev. + * Cleaned up error handling in semanage_split_fc based on a patch + by Serge Hallyn (IBM) and suggestions by Ivan Gyurdiev. + * Merged MLS handling fixes from Ivan Gyurdiev. + * Fri Feb 17 2006 Dan Walsh - 1.5.28-1 - Upgrade to latest from NSA * Merged bug fix for fcontext validate handler from Ivan Gyurdiev. Index: sources =================================================================== RCS file: /cvs/dist/rpms/libsemanage/devel/sources,v retrieving revision 1.56 retrieving revision 1.57 diff -u -r1.56 -r1.57 --- sources 17 Feb 2006 20:00:24 -0000 1.56 +++ sources 17 Mar 2006 20:25:31 -0000 1.57 @@ -1 +1 @@ -42110b5a329e91eb8aff0c2cad7e2b72 libsemanage-1.5.28.tgz +3f547c9b5ca5d300957a2b36230dbb30 libsemanage-1.6.tgz From fedora-cvs-commits at redhat.com Fri Mar 17 20:29:41 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 17 Mar 2006 15:29:41 -0500 Subject: rpms/policycoreutils/devel .cvsignore, 1.103, 1.104 policycoreutils-rhat.patch, 1.167, 1.168 policycoreutils.spec, 1.241, 1.242 sources, 1.107, 1.108 Message-ID: <200603172029.k2HKTfiU023189@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/policycoreutils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv23165 Modified Files: .cvsignore policycoreutils-rhat.patch policycoreutils.spec sources Log Message: * Fri Mar 10 2006 Dan Walsh 1.29.27-1 - Add restorecond Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/policycoreutils/devel/.cvsignore,v retrieving revision 1.103 retrieving revision 1.104 diff -u -r1.103 -r1.104 --- .cvsignore 21 Feb 2006 19:09:17 -0000 1.103 +++ .cvsignore 17 Mar 2006 20:29:37 -0000 1.104 @@ -92,3 +92,5 @@ policycoreutils-1.29.20.tgz policycoreutils-1.29.23.tgz policycoreutils-1.29.26.tgz +policycoreutils-1.29.27.tgz +policycoreutils-1.30.tgz policycoreutils-rhat.patch: Makefile | 2 restorecond/Makefile | 29 ++ restorecond/restorecond.8 | 31 ++ restorecond/restorecond.c | 463 +++++++++++++++++++++++++++++++++++++++++++ restorecond/restorecond.conf | 3 restorecond/restorecond.h | 4 restorecond/restorecond.init | 54 +++++ restorecond/stringslist.c | 120 +++++++++++ restorecond/stringslist.h | 10 restorecond/utmpwatcher.c | 105 +++++++++ restorecond/utmpwatcher.h | 2 scripts/Makefile | 2 scripts/fixfiles | 5 semanage/seobject.py | 7 14 files changed, 830 insertions(+), 7 deletions(-) Index: policycoreutils-rhat.patch =================================================================== RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v retrieving revision 1.167 retrieving revision 1.168 diff -u -r1.167 -r1.168 --- policycoreutils-rhat.patch 6 Mar 2006 14:45:58 -0000 1.167 +++ policycoreutils-rhat.patch 17 Mar 2006 20:29:37 -0000 1.168 @@ -1,324 +1,876 @@ -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/audit2allow/audit2allow policycoreutils-1.29.26/audit2allow/audit2allow ---- nsapolicycoreutils/audit2allow/audit2allow 2005-12-08 12:52:44.000000000 -0500 -+++ policycoreutils-1.29.26/audit2allow/audit2allow 2006-03-06 09:44:31.000000000 -0500 -@@ -25,6 +25,118 @@ - # - # - import commands, sys, os, pwd, string, getopt, re, selinux -+ -+obj="(\{[^\}]*\}|[^ \t:]*)" -+allow_regexp="allow[ \t]+%s[ \t]*%s[ \t]*:[ \t]*%s[ \t]*%s" % (obj, obj, obj, obj) -+ -+awk_script='/^[[:blank:]]*interface[[:blank:]]*\(/ {\n\ -+ IFACEFILE=FILENAME\n\ -+ IFACENAME = gensub("^[[:blank:]]*interface[[:blank:]]*\\\\(\`?","","g",$0);\n\ -+ IFACENAME = gensub("\'?,.*$","","g",IFACENAME);\n\ -+}\n\ -+\n\ -+/^[[:blank:]]*allow[[:blank:]]+.*;[[:blank:]]*$/ {\n\ -+\n\ -+ if ((length(IFACENAME) > 0) && (IFACEFILE == FILENAME)){\n\ -+ ALLOW = gensub("^[[:blank:]]*","","g",$0)\n\ -+ ALLOW = gensub(";[[:blank:]]*$","","g",$0)\n\ -+ print FILENAME "\\t" IFACENAME "\\t" ALLOW;\n\ -+ }\n\ -+}\ -+' -+ -+class accessTrans: -+ def __init__(self): -+ self.dict={} -+ try: -+ fd=open("/usr/share/selinux/devel/include/support/obj_perm_sets.spt") -+ except IOError, error: -+ raise IOError("Reference policy generation requires the policy development package.\n%s" % error) -+ records=fd.read().split("\n") -+ regexp="^define *\(`([^']*)' *, *` *\{([^}]*)}'" -+ for r in records: -+ m=re.match(regexp,r) -+ if m!=None: -+ self.dict[m.groups()[0]] = m.groups()[1].split() -+ fd.close() -+ def get(self, var): -+ l=[] -+ for v in var: -+ if v in self.dict.keys(): -+ l += self.dict[v] -+ else: -+ if v not in ("{", "}"): -+ l.append(v) -+ return l -+ -+class interfaces: -+ def __init__(self): -+ self.dict={} -+ trans=accessTrans() -+ (input, output) = os.popen2("awk -f - /usr/share/selinux/devel/include/*/*.if 2> /dev/null") -+ input.write(awk_script) -+ input.close() -+ records=output.read().split("\n") -+ input.close() -+ if len(records) > 0: -+ regexp="([^ \t]*)[ \t]+([^ \t]*)[ \t]+%s" % allow_regexp -+ for r in records: -+ m=re.match(regexp,r) -+ if m==None: -+ continue -+ else: -+ val=m.groups() -+ file=os.path.basename(val[0]).split(".")[0] -+ iface=val[1] -+ Scon=val[2].split() -+ Tcon=val[3].split() -+ Class=val[4].split() -+ Access=trans.get(val[5].split()) -+ for s in Scon: -+ for t in Tcon: -+ for c in Class: -+ if (s, t, c) not in self.dict.keys(): -+ self.dict[(s, t, c)]=[] -+ self.dict[(s, t, c)].append((Access, file, iface)) -+ def out(self): -+ keys=self.dict.keys() -+ keys.sort() -+ for k in keys: -+ print k -+ for i in self.dict[k]: -+ print "\t", i -+ -+ def match(self, Scon, Tcon, Class, Access): -+ keys=self.dict.keys() -+ ret=[] -+ if (Scon, Tcon, Class) in keys: -+ for i in self.dict[(Scon, Tcon, Class)]: -+ if Access in i[0]: -+ if i[2].find(Access) >= 0: -+ ret.insert(0, i) -+ else: -+ ret.append(i) -+ return ret -+ if ("$1", Tcon, Class) in keys: -+ for i in self.dict[("$1", Tcon, Class)]: -+ if Access in i[0]: -+ if i[2].find(Access) >= 0: -+ ret.insert(0, i) -+ else: -+ ret.append(i) -+ return ret -+ if (Scon, "$1", Class) in keys: -+ for i in self.dict[(Scon, "$1", Class)]: -+ if Access in i[0]: -+ if i[2].find(Access) >= 0: -+ ret.insert(0, i) -+ else: -+ ret.append(i) -+ return ret -+ else: -+ return ret -+ -+ - class serule: - def __init__(self, type, source, target, seclass): - self.type=type -@@ -32,6 +144,8 @@ - self.target=target - self.seclass=seclass - self.avcinfo={} -+ self.iface=None -+ - def add(self, avc): - for a in avc[0]: - if a not in self.avcinfo.keys(): -@@ -67,6 +181,33 @@ - ret=ret + " : " + i - return ret - -+ def gen_reference_policy(self, iface): -+ ret="" -+ Scon=self.source -+ Tcon=self.gettarget() -+ Class=self.seclass -+ Access=self.getAccess() -+ m=iface.match(Scon,Tcon,Class,Access) -+ if len(m)==0: -+ return self.out() -+ else: -+ file=m[0][1] -+ ret="\n#%s\n"% self.out() -+ ret += "optional_policy(`%s', `\n" % m[0][1] -+ first=True -+ for i in m: -+ if file != i[1]: -+ ret += "')\ngen_require(`%s', `\n" % i[1] -+ file = i[1] -+ first=True -+ if first: -+ ret += "\t%s(%s)\n" % (i[2], Scon) -+ first=False -+ else: -+ ret += "#\t%s(%s)\n" % (i[2], Scon) -+ ret += "');" -+ return ret -+ - def gettarget(self): - if self.source == self.target: - return "self" -@@ -81,7 +222,12 @@ - self.types=[] - self.roles=[] - self.load(input, te_ind) -- -+ self.gen_ref_policy = False -+ -+ def gen_reference_policy(self): -+ self.gen_ref_policy = True -+ self.iface=interfaces() -+ - def warning(self, error): - sys.stderr.write("%s: " % sys.argv[0]) - sys.stderr.write("%s\n" % error) -@@ -104,7 +250,8 @@ - while line: - rec=line.split() - for i in rec: -- if i=="avc:" or i=="message=avc:": -+ if i=="avc:" or i=="message=avc:" or i=="msg='avc:": -+ - found=1 - else: - avc.append(i) -@@ -166,7 +313,7 @@ - self.add_seclass(seclass, access) - self.add_type(tcon) - self.add_type(scon) -- if (type, scon, tcon, seclass) not in self.seRules.keys(): -+ if (rule_type, scon, tcon, seclass) not in self.seRules.keys(): - self.seRules[(rule_type, scon, tcon, seclass)]=serule(rule_type, scon, tcon, seclass) - - self.seRules[(rule_type, scon, tcon, seclass)].add((access, msg, comm, name )) -@@ -182,9 +329,10 @@ - if "security_compute_sid" in avc: - return - -+ if "load_policy" in avc and self.last_reload: -+ self.seRules={} -+ - if "granted" in avc: -- if "load_policy" in avc and self.last_reload: -- self.seRules={} - return - try: - for i in range (0, len(avc)): -@@ -292,7 +440,10 @@ - keys=self.seRules.keys() - keys.sort() - for i in keys: -- rec += self.seRules[i].out(verbose)+"\n" -+ if self.gen_ref_policy: -+ rec += self.seRules[i].gen_reference_policy(self.iface)+"\n" -+ else: -+ rec += self.seRules[i].out(verbose)+"\n" - return rec - - if __name__ == '__main__': -@@ -342,11 +493,12 @@ - buildPP=0 - input_ind=0 - output_ind=0 -+ ref_ind=False - te_ind=0 - - fc_file="" - gopts, cmds = getopt.getopt(sys.argv[1:], -- 'adf:hi:lm:M:o:rtv', -+ 'adf:hi:lm:M:o:rtvR', - ['all', - 'dmesg', - 'fcfile=', -@@ -356,6 +508,7 @@ - 'module=', - 'output=', - 'requires', -+ 'reference', - 'tefile', - 'verbose' - ]) -@@ -397,6 +550,9 @@ - if auditlogs: - usage() - te_ind=1 -+ if o == "-R" or o == "--reference": -+ ref_ind=True -+ - if o == "-o" or o == "--output": - if module != "" or a[0]=="-": - usage() -@@ -413,6 +569,10 @@ - - out=seruleRecords(input, last_reload, verbose, te_ind) - -+ -+ if ref_ind: -+ out.gen_reference_policy() -+ - if auditlogs: - input=os.popen("ausearch -m avc") - out.load(input) -@@ -423,15 +583,15 @@ - output.flush() - if buildPP: - cmd="checkmodule %s -m -o %s.mod %s.te" % (get_mls_flag(), module, module) -- print "Compiling policy: %s" % cmd -+ print "Compiling policy" -+ print cmd - rc=commands.getstatusoutput(cmd) - if rc[0]==0: - cmd="semodule_package -o %s.pp -m %s.mod" % (module, module) -- print cmd - if fc_file != "": - cmd = "%s -f %s" % (cmd, fc_file) - -- print "Building package: %s" % cmd -+ print cmd - rc=commands.getstatusoutput(cmd) - if rc[0]==0: - print ("\n******************** IMPORTANT ***********************\n") -@@ -446,6 +606,6 @@ - except ValueError, error: - errorExit(error.args[0]) - except IOError, error: -- errorExit(error.args[1]) -+ errorExit(error) - except KeyboardInterrupt, error: - sys.exit(0) -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/audit2allow/audit2allow.1 policycoreutils-1.29.26/audit2allow/audit2allow.1 ---- nsapolicycoreutils/audit2allow/audit2allow.1 2005-12-01 10:11:27.000000000 -0500 -+++ policycoreutils-1.29.26/audit2allow/audit2allow.1 2006-02-23 16:32:45.000000000 -0500 -@@ -65,6 +65,9 @@ - .B "\-r" | "\-\-requires" - Generate require output syntax for loadable modules. - .TP -+.B "\-R" | "\-\-reference" -+Generate reference policy using installed macros -+.TP - .B "\-t " | "\-\-tefile" - Indicates input file is a te (type enforcement) file. This can be used to translate old te format to new policy format. - .TP -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/scripts/chcat policycoreutils-1.29.26/scripts/chcat ---- nsapolicycoreutils/scripts/chcat 2006-01-27 01:16:33.000000000 -0500 -+++ policycoreutils-1.29.26/scripts/chcat 2006-03-03 18:21:05.000000000 -0500 -@@ -320,7 +320,7 @@ - if len(cats) > 1 and cats[1] != "s0": - print "%s: %s" % (u, cats[1]) - else: -- print "%s:" % u -+ print "%s: %s" % (u, cats[0]) - - def error(msg): - print "%s: %s" % (sys.argv[0], msg) -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/scripts/fixfiles policycoreutils-1.29.26/scripts/fixfiles +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/Makefile policycoreutils-1.29.27/Makefile +--- nsapolicycoreutils/Makefile 2005-11-29 10:55:01.000000000 -0500 ++++ policycoreutils-1.29.27/Makefile 2006-03-15 16:06:43.000000000 -0500 +@@ -1,4 +1,4 @@ +-SUBDIRS=setfiles semanage load_policy newrole run_init restorecon audit2allow audit2why scripts sestatus semodule_package semodule semodule_link semodule_expand setsebool po ++SUBDIRS=setfiles semanage load_policy newrole run_init restorecon restorecond audit2allow audit2why scripts sestatus semodule_package semodule semodule_link semodule_expand setsebool po + + all install relabel clean: + @for subdir in $(SUBDIRS); do \ +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/restorecond/Makefile policycoreutils-1.29.27/restorecond/Makefile +--- nsapolicycoreutils/restorecond/Makefile 1969-12-31 19:00:00.000000000 -0500 ++++ policycoreutils-1.29.27/restorecond/Makefile 2006-03-15 16:08:46.000000000 -0500 +@@ -0,0 +1,29 @@ ++# Installation directories. ++PREFIX ?= ${DESTDIR}/usr ++SBINDIR ?= $(PREFIX)/sbin ++MANDIR = $(PREFIX)/share/man ++INITDIR = $(DESTDIR)/etc/rc.d/init.d ++SELINUXDIR = $(DESTDIR)/etc/selinux ++ ++CFLAGS ?= -g -Werror -Wall -W ++override CFLAGS += -I$(PREFIX)/include -D_FILE_OFFSET_BITS=64 ++LDLIBS += -lselinux -L$(PREFIX)/lib ++ ++all: restorecond ++ ++restorecond: restorecond.o utmpwatcher.o stringslist.o ++ $(CC) $(LDFLAGS) -o $@ $^ $(LDLIBS) ++ ++install: all ++ [ -d $(MANDIR)/man8 ] || mkdir -p $(MANDIR)/man8 ++ -mkdir -p $(SBINDIR) ++ install -m 755 restorecond $(SBINDIR) ++ install -m 644 restorecond.8 $(MANDIR)/man8 ++ -mkdir -p $(INITDIR) ++ install -m 644 restorecond.init $(INITDIR)/restorecond ++ -mkdir -p $(SELINUXDIR) ++ install -m 600 restorecond.conf $(SELINUXDIR)/restorecond.conf ++ ++clean: ++ -rm -f restorecond *.o *~ ++ +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/restorecond/restorecond.8 policycoreutils-1.29.27/restorecond/restorecond.8 +--- nsapolicycoreutils/restorecond/restorecond.8 1969-12-31 19:00:00.000000000 -0500 ++++ policycoreutils-1.29.27/restorecond/restorecond.8 2006-03-15 16:06:43.000000000 -0500 +@@ -0,0 +1,31 @@ ++.TH "restorecond" "8" "2002031409" "" "" ++.SH "NAME" ++restorecond \- daemon that watches for file creation and then corrects file context ++ ++.SH "SYNOPSIS" ++.B restorecond [\-d] ++.P ++ ++.SH "DESCRIPTION" ++This manual page describes the ++.BR restorecond ++program. ++.P ++This daemon uses inotify to watch files listed in the /etc/selinux/POLICYTYPE/restorconfiles.conf, when they are created, this daemon will make sure they have ++the correct file context associated with the policy. ++ ++.SH "OPTIONS" ++.TP ++.B \-d ++Turns on debugging mode. Application will stay in the foreground and lots of ++debugs messages start printing. ++ ++.SH "AUTHOR" ++This man page was written by Dan Walsh . ++The program was written by Dan Walsh . ++ ++.SH "FILES" ++/etc/selinux/POLICYTYPE/restorconfiles.conf ++ ++.SH "SEE ALSO" ++.BR restorecon (8), +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/restorecond/restorecond.c policycoreutils-1.29.27/restorecond/restorecond.c +--- nsapolicycoreutils/restorecond/restorecond.c 1969-12-31 19:00:00.000000000 -0500 ++++ policycoreutils-1.29.27/restorecond/restorecond.c 2006-03-15 16:06:43.000000000 -0500 +@@ -0,0 +1,463 @@ ++/* ++ * restorecond ++ * ++ * AUTHOR: Dan Walsh ++ * ++ * Copyright (C) 2006 Red Hat ++ * see file 'COPYING' for use and warranty information ++ * ++ * semanage is a tool for managing SELinux configuration files ++ * ++ * 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 ++ * ++*/ ++ ++/* ++ * PURPOSE: ++ * This daemon program watches for the creation of files listed in a config file ++ * and makes sure that there security context matches the systems defaults ++ * ++ * USAGE: ++ * restorecond [-d] ++ * ++ * -d Run in debug mode ++ * ++ * EXAMPLE USAGE: ++ * restorecond ++ * ++ */ ++ ++#define _GNU_SOURCE ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#include "restorecond.h" ++#include "stringslist.h" ++#include "utmpwatcher.h" ++ ++extern char *dirname(char *path); ++static int master_fd=-1; ++static int master_wd=-1; ++#include ++#include ++ ++/* size of the event structure, not counting name */ ++#define EVENT_SIZE (sizeof (struct inotify_event)) ++/* reasonable guess as to size of 1024 events */ ++#define BUF_LEN (1024 * (EVENT_SIZE + 16)) ++ ++static int debug_mode=0; ++ ++static void restore(const char *filename); ++ ++struct watchList { ++ struct watchList *next; ++ int wd; ++ char *dir; ++ struct stringsList *files; ++}; ++struct watchList *firstDir=NULL; ++ ++/* Compare two contexts to see if their differences are "significant", ++ * or whether the only difference is in the user. */ ++static int only_changed_user(const char *a, const char *b) ++{ ++ char *rest_a, *rest_b; /* Rest of the context after the user */ ++ if (!a || !b) return 0; ++ rest_a = strchr(a, ':'); ++ rest_b = strchr(b, ':'); ++ if (!rest_a || !rest_b) return 0; ++ return (strcmp(rest_a, rest_b) == 0); ++} ++ ++/* ++ A file was in a direcroty has been created. This function checks to ++ see if it is one that we are watching. ++*/ ++ ++static int watch_list_find(int wd, const char *file) { ++ struct watchList *ptr=NULL; ++ ptr=firstDir; ++ ++ if (debug_mode) ++ printf("%d: File=%s\n", wd, file); ++ while (ptr != NULL) { ++ if (ptr->wd == wd) { ++ if (strings_list_find(ptr->files, file) == 0) { ++ char *path=NULL; ++ if (asprintf(&path, "%s/%s",ptr->dir, file) < 0) ++ exitApp("Error allocating memory."); ++ restore (path); ++ free(path); ++ return 0; ++ } ++ if (debug_mode) ++ strings_list_print(ptr->files); ++ ++ /* Not found in this directory */ ++ return -1; ++ } ++ ptr=ptr->next; ++ } ++ /* Did not find a directory */ ++ return -1; ++} ++ ++static void watch_list_free(int fd) { ++ struct watchList *ptr=NULL; ++ struct watchList *prev=NULL; ++ ptr=firstDir; ++ ++ while (ptr!=NULL) { ++ inotify_rm_watch(fd, ptr->wd); ++ strings_list_free(ptr->files); ++ free(ptr->dir); ++ prev=ptr; ++ ptr=ptr->next; ++ free(prev); ++ } ++ firstDir=NULL; ++} ++ ++/* ++ Set the file context to the default file context for this system. ++ Same as restorecon. ++*/ ++static void restore(const char *filename) { ++ int retcontext=0; ++ security_context_t scontext=NULL; ++ security_context_t prev_context=NULL; ++ struct stat st; ++ char path[PATH_MAX+1]; ++ if (debug_mode) ++ printf("restore %s\n", filename); ++ ++ if (lstat(filename, &st)!=0) return; ++ ++ if (S_ISLNK(st.st_mode)) { ++ char *p = NULL, *file_sep; ++ char *tmp_path = strdupa(filename); ++ size_t len=0; ++ if (!tmp_path) { ++ exitApp("Out of Memory"); ++ } ++ file_sep = strrchr(tmp_path, '/'); ++ if(file_sep) ++ { ++ *file_sep = 0; ++ file_sep++; ++ p = realpath(tmp_path, path); ++ } ++ else { ++ file_sep = tmp_path; ++ p = realpath("./", path); ++ } ++ if(p) ++ len = strlen(p); ++ if (!p || len + strlen(file_sep) + 2 > PATH_MAX) { ++ syslog(LOG_ERR,"realpath(%s) failed %s\n", filename, strerror(errno)); ++ return; ++ } ++ p += len; ++ *p = '/'; ++ p++; ++ strcpy(p, file_sep); ++ filename = path; ++ } else { ++ char *p; ++ p = realpath(filename, path); ++ if (!p) { ++ syslog(LOG_ERR,"realpath(%s) failed %s\n", filename, strerror(errno)); ++ return; ++ } ++ filename = p; ++ } ++ if (matchpathcon(filename, st.st_mode, &scontext) < 0) { ++ if (errno == ENOENT) ++ return; ++ syslog(LOG_ERR,"matchpathcon(%s) failed %s\n", filename,strerror(errno)); ++ return; ++ } ++ retcontext=lgetfilecon(filename,&prev_context); ++ ++ if (retcontext >= 0 || errno == ENODATA) { ++ if (retcontext < 0) prev_context=NULL; ++ if (retcontext < 0 || ++ (strcmp(prev_context,scontext) != 0)) { ++ ++ if (only_changed_user(scontext, prev_context) != 0) { ++ free(scontext); ++ free(prev_context); ++ return; ++ } ++ ++ if (lsetfilecon(filename,scontext) < 0) { ++ syslog(LOG_ERR,"set context %s->%s failed:'%s'\n", ++ filename, scontext, strerror(errno)); ++ if (retcontext >= 0) ++ free(prev_context); ++ free(scontext); ++ return; ++ } ++ syslog(LOG_WARNING,"Reset file context %s: %s->%s\n", filename, prev_context, scontext); ++ } ++ if (retcontext >= 0) ++ free(prev_context); ++ } ++ else { ++ syslog(LOG_ERR,"get context on %s failed: '%s'\n", ++ filename, strerror(errno)); ++ } ++ free(scontext); ++} ++ ++static void process_config(int fd, FILE *cfg) { ++ char *line_buf=NULL; ++ unsigned int len=0; ++ ++ while (getline(&line_buf, &len, cfg)>0) { ++ char *buffer=line_buf; ++ while(isspace(*buffer)) ++ buffer++; ++ if(buffer[0] == '#') continue; ++ int l=strlen(buffer)-1; ++ if ( l <= 0 ) continue; ++ buffer[l]=0; ++ if(buffer[0] == '~') ++ utmpwatcher_add(fd, &buffer[1]); ++ else { ++ watch_list_add(fd, buffer); ++ } ++ } ++ free(line_buf); ++} ++ ++/* ++ Read config file ignoring Comment lines ++ Files specified one per line. Files with "~" will be expanded to the logged in users ++ homedirs. ++*/ ++ ++static void read_config(int fd) { ++ char *watch_file_path="/etc/selinux/restorecond.conf"; ++ ++ FILE *cfg = NULL; ++ if (debug_mode) ++ printf("Read Config\n"); ++ ++ watch_list_free(fd); ++ ++ cfg=fopen(watch_file_path, "r"); ++ if (!cfg) exitApp("Error reading config file."); ++ process_config(fd, cfg); ++ fclose(cfg); ++ ++ inotify_rm_watch(fd, master_wd); ++ master_wd=inotify_add_watch (fd, watch_file_path, IN_MOVED_FROM | IN_MODIFY); ++} ++ ++/* ++ Inotify watch loop ++*/ ++static int watch(int fd) { ++ char buf[BUF_LEN]; ++ int len, i = 0; ++ len = read(fd, buf, BUF_LEN); ++ if (len < 0) { ++ return -1; ++ } else if (!len) ++ /* BUF_LEN too small? */ ++ return -1; ++ while (i < len) { ++ struct inotify_event *event; ++ event = (struct inotify_event *) &buf[i]; ++ if (debug_mode) ++ printf ("wd=%d mask=%u cookie=%u len=%u\n", ++ event->wd, event->mask, ++ event->cookie, event->len); ++ if (event->wd == master_wd) ++ read_config(fd); ++ else { ++ switch (utmpwatcher_handle(fd, event->wd)) { ++ case -1: /* Message was not for utmpwatcher */ ++ if (event->len) ++ watch_list_find (event->wd, event->name); ++ break; ++ ++ case 1: /* utmp has changed need to reload */ ++ read_config(fd); ++ break; ++ ++ default: /* No users logged in or out */ ++ break; ++ } ++ } ++ ++ ++ i += EVENT_SIZE + event->len; ++ } ++ return 0; ++} ++ ++static const char *pidfile = "/var/run/restorecond.pid"; ++ ++static int write_pid_file(void) ++{ ++ int pidfd, len; ++ char val[16]; ++ ++ len = snprintf(val, sizeof(val), "%u\n", getpid()); ++ if (len < 0) { ++ syslog(LOG_ERR, "Pid error (%s)", strerror(errno)); ++ pidfile = 0; ++ return 1; ++ } ++ pidfd = open(pidfile, O_CREAT | O_TRUNC | O_NOFOLLOW | O_WRONLY, 0644); ++ if (pidfd < 0) { ++ syslog(LOG_ERR, "Unable to set pidfile (%s)", ++ strerror(errno)); ++ pidfile = 0; ++ return 1; ++ } ++ (void)write(pidfd, val, (unsigned int)len); ++ close(pidfd); ++ return 0; ++} ++ ++/* ++ * SIGTERM handler ++ */ ++static void term_handler() ++{ ++ /* trigger a failure in the watch */ ++ close(master_fd); ++} ++ ++ ++static void usage(char *program) { ++ printf("%s [-d] \n", program); ++ exit(0); ++} ++ ++void exitApp(const char *msg) { ++ perror(msg); ++ exit(-1); ++} ++ ++/* ++ Add a file to the watch list. We are watching for file creation, so we actually ++ put the watch on the directory and then examine all files created in that directory ++ to see if it is one that we are watching. ++*/ ++ ++void watch_list_add(int fd, const char *path) { ++ struct watchList *ptr=NULL; ++ struct watchList *prev=NULL; ++ char *x=strdup(path); ++ if (!x) exitApp("Out of Memory"); ++ char *dir=dirname(x); ++ char *file=basename(path); ++ ptr=firstDir; ++ ++ restore(path); ++ ++ while (ptr!=NULL) { ++ if (strcmp(dir, ptr->dir) == 0) { ++ strings_list_add(&ptr->files, file); ++ free(x); ++ return; ++ } ++ prev=ptr; ++ ptr=ptr->next; ++ } ++ ptr=calloc(1, sizeof(struct watchList)); ++ ++ if (!ptr) exitApp("Out of Memory"); ++ ptr->wd=inotify_add_watch (fd, dir, IN_CREATE); ++ ++ ptr->dir=strdup(dir); ++ if (!ptr->dir) exitApp("Out of Memory"); ++ ++ strings_list_add(&ptr->files, file); ++ if (prev) ++ prev->next=ptr; ++ else ++ firstDir=ptr; ++ ++ if (debug_mode) ++ printf("%d: Dir=%s, File=%s\n", ptr->wd, ptr->dir, file); ++ ++ free(x); ++} ++ ++int main(int argc, char **argv) { ++ int opt; ++ struct sigaction sa; ++ ++#ifndef DEBUG ++ /* Make sure we are root */ ++ if (getuid() != 0) { ++ fprintf(stderr, "You must be root to run this program.\n"); ++ return 4; ++ } ++#endif ++ ++ /* Register sighandlers */ ++ sa.sa_flags = 0 ; ++ sa.sa_handler = term_handler; ++ sigemptyset( &sa.sa_mask ) ; ++ sigaction( SIGTERM, &sa, NULL ); ++ ++ master_fd = inotify_init (); ++ if (master_fd < 0) ++ exitApp("inotify_init"); ++ ++ while ((opt = getopt(argc, argv, "d")) > 0) { ++ switch (opt) { ++ case 'd': ++ debug_mode = 1; ++ break; ++ case '?': ++ usage(argv[0]); ++ } ++ } ++ read_config(master_fd); ++ ++ write_pid_file(); ++ ++ if (! debug_mode) ++ daemon(0, 0); ++ ++ while (watch(master_fd) == 0 ) {}; ++ ++ watch_list_free(master_fd); ++ close(master_fd); ++ if (pidfile) ++ unlink(pidfile); ++ ++ return 0; ++} +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/restorecond/restorecond.conf policycoreutils-1.29.27/restorecond/restorecond.conf +--- nsapolicycoreutils/restorecond/restorecond.conf 1969-12-31 19:00:00.000000000 -0500 ++++ policycoreutils-1.29.27/restorecond/restorecond.conf 2006-03-15 16:06:43.000000000 -0500 +@@ -0,0 +1,3 @@ ++/etc/resolv.conf ++/etc/mtab ++~/public_html +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/restorecond/restorecond.h policycoreutils-1.29.27/restorecond/restorecond.h +--- nsapolicycoreutils/restorecond/restorecond.h 1969-12-31 19:00:00.000000000 -0500 ++++ policycoreutils-1.29.27/restorecond/restorecond.h 2006-03-15 16:06:43.000000000 -0500 +@@ -0,0 +1,4 @@ ++void exitApp(const char *msg); ++void watch_list_add(int inotify_fd, const char *path); ++ ++ +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/restorecond/restorecond.init policycoreutils-1.29.27/restorecond/restorecond.init +--- nsapolicycoreutils/restorecond/restorecond.init 1969-12-31 19:00:00.000000000 -0500 ++++ policycoreutils-1.29.27/restorecond/restorecond.init 2006-03-15 16:13:32.000000000 -0500 +@@ -0,0 +1,54 @@ ++#!/bin/sh ++# ++# restorecond: Daemo used to maintain path file context ++# ++# chkconfig: 2345 10 90 ++# description: restorecond uses inotify to look for creation of new files listed in the ++# /etc/selinux/POLICYTYPE/restorefiles.conf file, and sets the correct security ++# context. ++# ++ ++# Source function library. ++. /etc/rc.d/init.d/functions ++ ++start() ++{ ++ echo -n $"Starting restorecond: " ++ daemon /usr/sbin/restorecond ++ ++ touch /var/lock/subsys/restorecond ++ echo ++} ++ ++stop() ++{ ++ echo -n $"Shutting down restorecond: " ++ killproc restorecond ++ ++ rm -f /var/lock/subsys/restorecond ++ echo ++} ++ ++[ -f /usr/sbin/restorecond ] || exit 0 ++ ++# See how we were called. ++case "$1" in ++ start) ++ start ++ ;; ++ stop) ++ stop ++ ;; ++ restart|reload) ++ stop ++ start ++ ;; ++ condrestart) ++ [ -e /var/lock/subsys/restorecond ] && (stop; start) ++ ;; ++ *) ++ echo $"Usage: $0 {start|stop|restart|reload|condrestart}" ++ exit 1 ++esac ++ ++exit 0 +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/restorecond/stringslist.c policycoreutils-1.29.27/restorecond/stringslist.c +--- nsapolicycoreutils/restorecond/stringslist.c 1969-12-31 19:00:00.000000000 -0500 ++++ policycoreutils-1.29.27/restorecond/stringslist.c 2006-03-15 16:06:43.000000000 -0500 +@@ -0,0 +1,120 @@ ++/* ++ ++ * AUTHOR: Dan Walsh ++ ++ * Copyright (C) 2006 Red Hat ++ * see file 'COPYING' for use and warranty information ++ * ++ * semanage is a tool for managing SELinux configuration files ++ * ++ * 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 ++ * ++*/ ++ ++#include ++#include ++#include ++#include "stringslist.h" ++#include "restorecond.h" ++ ++/* Sorted lists */ ++void strings_list_add(struct stringsList **list, const char *string) { ++ struct stringsList *ptr=*list; ++ struct stringsList *prev=NULL; ++ struct stringsList *newptr=NULL; ++ while(ptr) { ++ int cmp=strcmp(string, ptr->string); ++ if (cmp < 0) break; /* Not on list break out to add */ ++ if (cmp == 0) return; /* Already on list */ ++ prev=ptr; ++ ptr=ptr->next; ++ } ++ newptr=calloc(1, sizeof(struct stringsList)); ++ if (!newptr) exitApp("Out of Memory"); ++ newptr->string=strdup(string); ++ newptr->next = ptr; ++ if (prev) ++ prev->next=newptr; ++ else ++ *list=newptr; ++} ++ ++int strings_list_find(struct stringsList *ptr, const char *string) { ++ while (ptr) { ++ int cmp=strcmp(string, ptr->string); ++ if (cmp < 0) return -1; /* Not on list break out to add */ ++ if (cmp == 0) return 0; /* Already on list */ ++ ptr=ptr->next; ++ } ++ return -1; ++} ++ ++void strings_list_free(struct stringsList *ptr) { ++ struct stringsList *prev=NULL; ++ while (ptr) { ++ free(ptr->string); ++ prev=ptr; ++ ptr=ptr->next; ++ free(prev); ++ } ++} ++ ++int strings_list_diff(struct stringsList *from, struct stringsList *to) { ++ while (from != NULL && to != NULL) { ++ if (strcmp(from->string, to->string) != 0) return 1; ++ from=from->next; ++ to=to->next; ++ } ++ if (from != NULL || to != NULL) return 1; ++ return 0; ++} ++ ++void strings_list_print(struct stringsList *ptr) { ++ while (ptr) { ++ printf("%s\n", ptr->string); ++ ptr=ptr->next; ++ } ++} ++ ++ ++#ifdef TEST ++void exitApp(const char *msg) { ++ perror(msg); ++ exit(-1); ++} ++ ++int main(int argc, char **argv) { ++ struct stringsList *list=NULL; ++ struct stringsList *list1=NULL; ++ strings_list_add(&list, "/etc/resolv.conf"); ++ strings_list_add(&list, "/etc/walsh"); ++ strings_list_add(&list, "/etc/mtab"); ++ strings_list_add(&list, "/etc/walsh"); ++ if (strings_list_diff(list, list) != 0) printf ("strings_list_diff test1 bug\n"); ++ strings_list_add(&list1, "/etc/walsh"); ++ if (strings_list_diff(list, list1) == 0) printf ("strings_list_diff test2 bug\n"); ++ strings_list_add(&list1, "/etc/walsh"); ++ strings_list_add(&list1, "/etc/resolv.conf"); ++ strings_list_add(&list1, "/etc/mtab1"); ++ if (strings_list_diff(list, list1) == 0) printf ("strings_list_diff test3 bug\n"); ++ printf ("strings list\n"); ++ strings_list_print(list); ++ printf ("strings list1\n"); ++ strings_list_print(list1); ++ strings_list_free(list); ++ strings_list_free(list1); ++} ++#endif +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/restorecond/stringslist.h policycoreutils-1.29.27/restorecond/stringslist.h +--- nsapolicycoreutils/restorecond/stringslist.h 1969-12-31 19:00:00.000000000 -0500 ++++ policycoreutils-1.29.27/restorecond/stringslist.h 2006-03-15 16:06:43.000000000 -0500 +@@ -0,0 +1,10 @@ ++struct stringsList { ++ struct stringsList *next; ++ char *string; ++}; ++ ++void strings_list_free(struct stringsList *list); ++void strings_list_add(struct stringsList **list, const char *string); ++void strings_list_print(struct stringsList *list); ++int strings_list_find(struct stringsList *list, const char *string); ++int strings_list_diff(struct stringsList *from, struct stringsList *to); +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/restorecond/utmpwatcher.c policycoreutils-1.29.27/restorecond/utmpwatcher.c +--- nsapolicycoreutils/restorecond/utmpwatcher.c 1969-12-31 19:00:00.000000000 -0500 ++++ policycoreutils-1.29.27/restorecond/utmpwatcher.c 2006-03-15 16:06:43.000000000 -0500 +@@ -0,0 +1,105 @@ ++/* ++ * restorecond ++ * ++ * AUTHOR: Dan Walsh ++ * ++ * Copyright (C) 2006 Red Hat ++ * see file 'COPYING' for use and warranty information ++ * ++ * semanage is a tool for managing SELinux configuration files ++ * ++ * 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 ++ * ++*/ ++ ++#define _GNU_SOURCE ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#include ++#include ++#include ++#include ++#include "restorecond.h" ++#include "utmpwatcher.h" ++#include "stringslist.h" ++ ++static struct stringsList *utmp_ptr=NULL; ++static int utmp_wd=-1; ++ ++unsigned int utmpwatcher_handle(int inotify_fd, int wd) { ++ int changed=0; ++ struct utmp u; ++ char *utmp_path="/var/run/utmp"; ++ struct stringsList *prev_utmp_ptr=utmp_ptr; ++ if (wd != utmp_wd) return -1; ++ ++ utmp_ptr=NULL; ++ FILE *cfg=fopen(utmp_path, "r"); ++ if (!cfg) exitApp("Error reading config file."); ++ ++ while (fread(&u, sizeof(struct utmp), 1, cfg) > 0) { ++ if (u.ut_type == USER_PROCESS) ++ strings_list_add(&utmp_ptr, u.ut_user); ++ } ++ fclose(cfg); ++ if (utmp_wd >= 0) ++ inotify_rm_watch(inotify_fd, utmp_wd); ++ ++ utmp_wd=inotify_add_watch (inotify_fd, utmp_path, IN_MOVED_FROM | IN_MODIFY); ++ if (prev_utmp_ptr) { ++ changed=strings_list_diff(prev_utmp_ptr, utmp_ptr); ++ strings_list_free(prev_utmp_ptr); ++ } ++ return changed; ++} ++ ++static void watch_file(int inotify_fd, const char *file) { ++ struct stringsList *ptr=utmp_ptr; ++ ++ while(ptr) { ++ struct passwd *pwd=getpwnam(ptr->string); ++ if (pwd) { ++ char *path=NULL; ++ if (asprintf(&path, "%s%s",pwd->pw_dir, file) < 0) ++ exitApp("Error allocating memory."); ++ watch_list_add(inotify_fd, path); ++ free(path); ++ } ++ ptr=ptr->next; ++ } ++} ++ ++void utmpwatcher_add(int inotify_fd, const char *path) { ++ if (utmp_ptr == NULL) { ++ utmpwatcher_handle(inotify_fd, utmp_wd); ++ } ++ watch_file(inotify_fd, path); ++} ++ ++#ifdef TEST ++int main(int argc, char **argv) { ++ read_utmp(); ++ return 0; ++} ++#endif ++ ++ +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/restorecond/utmpwatcher.h policycoreutils-1.29.27/restorecond/utmpwatcher.h +--- nsapolicycoreutils/restorecond/utmpwatcher.h 1969-12-31 19:00:00.000000000 -0500 ++++ policycoreutils-1.29.27/restorecond/utmpwatcher.h 2006-03-15 16:06:43.000000000 -0500 +@@ -0,0 +1,2 @@ ++unsigned int utmpwatcher_handle(int inotify_fd, int wd); ++void utmpwatcher_add(int inotify_fd, const char *path); +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/scripts/fixfiles policycoreutils-1.29.27/scripts/fixfiles --- nsapolicycoreutils/scripts/fixfiles 2006-01-04 13:07:46.000000000 -0500 -+++ policycoreutils-1.29.26/scripts/fixfiles 2006-02-23 17:12:53.000000000 -0500 ++++ policycoreutils-1.29.27/scripts/fixfiles 2006-03-15 16:06:43.000000000 -0500 @@ -124,7 +124,10 @@ exit $? fi @@ -331,756 +883,32 @@ exit $? fi LogReadOnly -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/semanage/semanage policycoreutils-1.29.26/semanage/semanage ---- nsapolicycoreutils/semanage/semanage 2006-02-16 13:35:28.000000000 -0500 -+++ policycoreutils-1.29.26/semanage/semanage 2006-02-23 16:32:45.000000000 -0500 -@@ -22,6 +22,9 @@ - # - import os, sys, getopt - import seobject -+import selinux -+ -+is_mls_enabled=selinux.is_selinux_mls_enabled() - - if __name__ == '__main__': - -@@ -57,13 +60,13 @@ - -p (named pipe) \n\n\ - \ - -p, --proto Port protocol (tcp or udp)\n\ -- -L, --level Default SELinux Level\n\ -+ -L, --level Default SELinux Level (MLS/MCS Systems only)\n\ - -R, --roles SELinux Roles (ex: "sysadm_r staff_r")\n\ - -T, --trans SELinux Level Translation\n\n\ - \ - -s, --seuser SELinux User Name\n\ - -t, --type SELinux Type for the object\n\ -- -r, --range MLS/MCS Security Range\n\ -+ -r, --range MLS/MCS Security Range (MLS/MCS Systems only\n\ - ' - print message - sys.exit(1) -@@ -167,12 +170,16 @@ - modify = 1 - - if o == "-r" or o == '--range': -+ if is_mls_enabled == 0: -+ errorExit("range not supported on Non MLS machines") - serange = a - - if o == "-l" or o == "--list": - list = 1 - - if o == "-L" or o == '--level': -+ if is_mls_enabled == 0: -+ errorExit("range not supported on Non MLS machines") - selevel = a - - if o == "-p" or o == '--proto': -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/semanage/semanage.8 policycoreutils-1.29.26/semanage/semanage.8 ---- nsapolicycoreutils/semanage/semanage.8 2006-01-27 01:16:33.000000000 -0500 -+++ policycoreutils-1.29.26/semanage/semanage.8 2006-02-23 16:32:45.000000000 -0500 -@@ -46,7 +46,7 @@ - List the OBJECTS - .TP - .I \-L, \-\-level --Default SELinux Level for SELinux use. (s0) -+Default SELinux Level for SELinux use, s0 Default. (MLS/MCS Systems only) - .TP - .I \-m, \-\-modify - Modify a OBJECT record NAME -@@ -58,7 +58,7 @@ - Protocol for the specified port (tcp|udp). - .TP - .I \-r, \-\-range --MLS/MCS Security Range -+MLS/MCS Security Range (MLS/MCS Systems only) - .TP - .I \-R, \-\-role - SELinux Roles. You must enclose multiple roles within quotes, separate by spaces. Or specify \-R multiple times. -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/semanage/seobject.py policycoreutils-1.29.26/semanage/seobject.py ---- nsapolicycoreutils/semanage/seobject.py 2006-02-16 13:35:28.000000000 -0500 -+++ policycoreutils-1.29.26/semanage/seobject.py 2006-03-03 18:20:37.000000000 -0500 -@@ -21,9 +21,43 @@ - # - # - --import pwd, string, selinux, tempfile, os, re -+import pwd, string, selinux, tempfile, os, re, sys - from semanage import *; - -+is_mls_enabled=selinux.is_selinux_mls_enabled() -+import syslog -+try: -+ import audit -+ class logger: -+ def __init__(self): -+ self.audit_fd=audit.audit_open() -+ -+ def log(self, success, msg, name="", sename="", serole="", serange="", old_sename="", old_serole="", old_serange=""): -+ audit.audit_log_semanage_message(self.audit_fd, audit.AUDIT_USER_ROLE_CHANGE, sys.argv[0],msg, name, 0, sename, serole, serange, old_sename, old_serole, old_serange, "", "", "", success); -+except: -+ class logger: -+ def log(self, success, msg, name="", sename="", serole="", serange="", old_sename="", old_serole="", old_serange=""): -+ if success == 1: -+ message = "Successful: " -+ else: -+ message = "Failed: " -+ message += " %s name=%s" % (msg,name) -+ if sename != "": -+ message += " sename=" + sename -+ if old_sename != "": -+ message += " old_sename=" + old_sename -+ if serole != "": -+ message += " role=" + serole -+ if old_serole != "": -+ message += " old_role=" + old_serole -+ if serange != "": -+ message += " MLSRange=" + serange -+ if old_serange != "": -+ message += " old_MLSRange=" + old_serange -+ syslog.syslog(message); -+ -+mylog=logger() -+ - def validate_level(raw): - sensitivity="s([0-9]|1[0-5])" - category="c(1?[0-9]?[0-9]|2[0-4][0-9]|25[0-5])" -@@ -143,6 +177,7 @@ - def __init__(self): - self.sh = semanage_handle_create() - self.semanaged = semanage_is_managed(self.sh) -+ - if not self.semanaged: - semanage_handle_destroy(self.sh) - raise ValueError("SELinux policy is not managed or store cannot be accessed.") -@@ -162,127 +197,154 @@ - semanageRecords.__init__(self) - - def add(self, name, sename, serange): -- if serange == "": -- serange = "s0" -- else: -- serange = untranslate(serange) -+ if is_mls_enabled == 1: -+ if serange == "": -+ serange = "s0" -+ else: -+ serange = untranslate(serange) - - if sename == "": - sename = "user_u" - -- (rc,k) = semanage_seuser_key_create(self.sh, name) -- if rc < 0: -- raise ValueError("Could not create a key for %s" % name) -- -- (rc,exists) = semanage_seuser_exists(self.sh, k) -- if rc < 0: -- raise ValueError("Could not check if login mapping for %s is defined" % name) -- if exists: -- raise ValueError("Login mapping for %s is already defined" % name) - try: -- pwd.getpwnam(name) -- except: -- raise ValueError("Linux User %s does not exist" % name) -- -- (rc,u) = semanage_seuser_create(self.sh) -- if rc < 0: -- raise ValueError("Could not create login mapping for %s" % name) -+ (rc,k) = semanage_seuser_key_create(self.sh, name) -+ if rc < 0: -+ raise ValueError("Could not create a key for %s" % name) - -- rc = semanage_seuser_set_name(self.sh, u, name) -- if rc < 0: -- raise ValueError("Could not set name for %s" % name) -+ (rc,exists) = semanage_seuser_exists(self.sh, k) -+ if rc < 0: -+ raise ValueError("Could not check if login mapping for %s is defined" % name) -+ if exists: -+ raise ValueError("Login mapping for %s is already defined" % name) -+ try: -+ pwd.getpwnam(name) -+ except: -+ raise ValueError("Linux User %s does not exist" % name) - -- rc = semanage_seuser_set_mlsrange(self.sh, u, serange) -- if rc < 0: -- raise ValueError("Could not set MLS range for %s" % name) -+ (rc,u) = semanage_seuser_create(self.sh) -+ if rc < 0: -+ raise ValueError("Could not create login mapping for %s" % name) - -- rc = semanage_seuser_set_sename(self.sh, u, sename) -- if rc < 0: -- raise ValueError("Could not set SELinux user for %s" % name) -+ rc = semanage_seuser_set_name(self.sh, u, name) -+ if rc < 0: -+ raise ValueError("Could not set name for %s" % name) +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/scripts/Makefile policycoreutils-1.29.27/scripts/Makefile +--- nsapolicycoreutils/scripts/Makefile 2005-12-08 12:59:25.000000000 -0500 ++++ policycoreutils-1.29.27/scripts/Makefile 2006-03-15 16:06:43.000000000 -0500 +@@ -13,7 +13,7 @@ + -mkdir -p $(BINDIR) + install -m 755 $(TARGETS) $(SBINDIR) + install -m 755 chcat $(BINDIR) +- install -m 755 fixfiles $(DESTDIR)/sbin ++ install -m 755 fixfiles $(PREFIX)/sbin + -mkdir -p $(MANDIR)/man8 + install -m 644 fixfiles.8 $(MANDIR)/man8/ + install -m 644 genhomedircon.8 $(MANDIR)/man8/ +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/semanage/seobject.py policycoreutils-1.29.27/semanage/seobject.py +--- nsapolicycoreutils/semanage/seobject.py 2006-03-10 09:48:05.000000000 -0500 ++++ policycoreutils-1.29.27/semanage/seobject.py 2006-03-15 16:06:43.000000000 -0500 +@@ -229,10 +229,9 @@ + if rc < 0: + raise ValueError("Could not set name for %s" % name) -- rc = semanage_begin_transaction(self.sh) -- if rc < 0: -- raise ValueError("Could not start semanage transaction") +- if serange != "": +- rc = semanage_seuser_set_mlsrange(self.sh, u, serange) +- if rc < 0: +- raise ValueError("Could not set MLS range for %s" % name) + rc = semanage_seuser_set_mlsrange(self.sh, u, serange) + if rc < 0: + raise ValueError("Could not set MLS range for %s" % name) -- rc = semanage_seuser_modify_local(self.sh, k, u) -- if rc < 0: -- raise ValueError("Could not add login mapping for %s" % name) -+ rc = semanage_seuser_set_sename(self.sh, u, sename) -+ if rc < 0: -+ raise ValueError("Could not set SELinux user for %s" % name) - -- rc = semanage_commit(self.sh) -- if rc < 0: -- raise ValueError("Could not add login mapping for %s" % name) -+ rc = semanage_begin_transaction(self.sh) -+ if rc < 0: -+ raise ValueError("Could not start semanage transaction") - -+ rc = semanage_seuser_modify_local(self.sh, k, u) -+ if rc < 0: -+ raise ValueError("Could not add login mapping for %s" % name) -+ -+ rc = semanage_commit(self.sh) -+ if rc < 0: -+ raise ValueError("Could not add login mapping for %s" % name) -+ -+ except ValueError, error: -+ mylog.log(0, "add SELinux user mapping", name, sename, "", serange); -+ raise error -+ -+ mylog.log(1, "add SELinux user mapping", name, sename, "", serange); - semanage_seuser_key_free(k) - semanage_seuser_free(u) - - def modify(self, name, sename = "", serange = ""): -- if sename == "" and serange == "": -- raise ValueError("Requires seuser or serange") -+ oldsename="" -+ oldserange="" -+ try: -+ if sename == "" and serange == "": -+ raise ValueError("Requires seuser or serange") - -- (rc,k) = semanage_seuser_key_create(self.sh, name) -- if rc < 0: -- raise ValueError("Could not create a key for %s" % name) -+ (rc,k) = semanage_seuser_key_create(self.sh, name) -+ if rc < 0: -+ raise ValueError("Could not create a key for %s" % name) - -- (rc,exists) = semanage_seuser_exists(self.sh, k) -- if rc < 0: -- raise ValueError("Could not check if login mapping for %s is defined" % name) -- if not exists: -- raise ValueError("Login mapping for %s is not defined" % name) -+ (rc,exists) = semanage_seuser_exists(self.sh, k) -+ if rc < 0: -+ raise ValueError("Could not check if login mapping for %s is defined" % name) -+ if not exists: -+ raise ValueError("Login mapping for %s is not defined" % name) - -- (rc,u) = semanage_seuser_query(self.sh, k) -- if rc < 0: -- raise ValueError("Could not query seuser for %s" % name) -+ (rc,u) = semanage_seuser_query(self.sh, k) -+ if rc < 0: -+ raise ValueError("Could not query seuser for %s" % name) - -- if serange != "": -- semanage_seuser_set_mlsrange(self.sh, u, untranslate(serange)) -- if sename != "": -- semanage_seuser_set_sename(self.sh, u, sename) -+ oldserange=semanage_seuser_get_mlsrange(u) -+ oldsename=semanage_seuser_get_sename(u) -+ if serange != "": -+ semanage_seuser_set_mlsrange(self.sh, u, untranslate(serange)) -+ else: -+ serange=oldserange -+ if sename != "": -+ semanage_seuser_set_sename(self.sh, u, sename) -+ else: -+ sename=oldsename - -- rc = semanage_begin_transaction(self.sh) -- if rc < 0: -- raise ValueError("Could not srart semanage transaction") -+ rc = semanage_begin_transaction(self.sh) -+ if rc < 0: -+ raise ValueError("Could not srart semanage transaction") - -- rc = semanage_seuser_modify_local(self.sh, k, u) -- if rc < 0: -- raise ValueError("Could not modify login mapping for %s" % name) -- -- rc = semanage_commit(self.sh) -- if rc < 0: -- raise ValueError("Could not modify login mapping for %s" % name) -+ rc = semanage_seuser_modify_local(self.sh, k, u) -+ if rc < 0: -+ raise ValueError("Could not modify login mapping for %s" % name) -+ -+ rc = semanage_commit(self.sh) -+ if rc < 0: -+ raise ValueError("Could not modify login mapping for %s" % name) - -+ except ValueError, error: -+ mylog.log(0,"modify selinux user mapping", name, sename,"", serange, oldsename, "", oldserange); -+ raise error -+ -+ mylog.log(1,"modify selinux user mapping", name, sename, "", serange, oldsename, "", oldserange); - semanage_seuser_key_free(k) - semanage_seuser_free(u) - - def delete(self, name): -- (rc,k) = semanage_seuser_key_create(self.sh, name) -- if rc < 0: -- raise ValueError("Could not create a key for %s" % name) -+ try: -+ (rc,k) = semanage_seuser_key_create(self.sh, name) -+ if rc < 0: -+ raise ValueError("Could not create a key for %s" % name) - -- (rc,exists) = semanage_seuser_exists(self.sh, k) -- if rc < 0: -- raise ValueError("Could not check if login mapping for %s is defined" % name) -- if not exists: -- raise ValueError("Login mapping for %s is not defined" % name) -+ (rc,exists) = semanage_seuser_exists(self.sh, k) -+ if rc < 0: -+ raise ValueError("Could not check if login mapping for %s is defined" % name) -+ if not exists: -+ raise ValueError("Login mapping for %s is not defined" % name) - -- (rc,exists) = semanage_seuser_exists_local(self.sh, k) -- if rc < 0: -- raise ValueError("Could not check if login mapping for %s is defined" % name) -- if not exists: -- raise ValueError("Login mapping for %s is defined in policy, cannot be deleted" % name) -+ (rc,exists) = semanage_seuser_exists_local(self.sh, k) -+ if rc < 0: -+ raise ValueError("Could not check if login mapping for %s is defined" % name) -+ if not exists: -+ raise ValueError("Login mapping for %s is defined in policy, cannot be deleted" % name) - -- rc = semanage_begin_transaction(self.sh) -- if rc < 0: -- raise ValueError("Could not start semanage transaction") -+ rc = semanage_begin_transaction(self.sh) -+ if rc < 0: -+ raise ValueError("Could not start semanage transaction") - -- rc = semanage_seuser_del_local(self.sh, k) -+ rc = semanage_seuser_del_local(self.sh, k) - -- if rc < 0: -- raise ValueError("Could not delete login mapping for %s" % name) -+ if rc < 0: -+ raise ValueError("Could not delete login mapping for %s" % name) - -- rc = semanage_commit(self.sh) -- if rc < 0: -- raise ValueError("Could not delete login mapping for %s" % name) -- -+ rc = semanage_commit(self.sh) -+ if rc < 0: -+ raise ValueError("Could not delete login mapping for %s" % name) -+ -+ except ValueError, error: -+ mylog.log(0,"delete SELinux user mapping", name); -+ raise error -+ -+ mylog.log(1,"delete SELinux user mapping", name); - semanage_seuser_key_free(k) - - -@@ -298,150 +360,179 @@ - return ddict - - def list(self,heading=1): -- if heading: -- print "\n%-25s %-25s %-25s\n" % ("Login Name", "SELinux User", "MLS/MCS Range") - ddict=self.get_all() - keys=ddict.keys() - keys.sort() -- for k in keys: -- print "%-25s %-25s %-25s" % (k, ddict[k][0], translate(ddict[k][1])) -+ if is_mls_enabled == 1: -+ if heading: -+ print "\n%-25s %-25s %-25s\n" % ("Login Name", "SELinux User", "MLS/MCS Range") -+ for k in keys: -+ print "%-25s %-25s %-25s" % (k, ddict[k][0], translate(ddict[k][1])) -+ else: -+ if heading: -+ print "\n%-25s %-25s\n" % ("Login Name", "SELinux User") -+ for k in keys: -+ print "%-25s %-25s %-25s" % (k, ddict[k][0]) - - class seluserRecords(semanageRecords): - def __init__(self): - semanageRecords.__init__(self) - - def add(self, name, roles, selevel, serange): -- if serange == "": -- serange = "s0" -- else: -- serange = untranslate(serange) -+ if is_mls_enabled == 1: -+ if serange == "": -+ serange = "s0" -+ else: -+ serange = untranslate(serange) - -- if selevel == "": -- selevel = "s0" -- else: -- selevel = untranslate(selevel) -- -- (rc,k) = semanage_user_key_create(self.sh, name) -- if rc < 0: -- raise ValueError("Could not create a key for %s" % name) -- -- (rc,exists) = semanage_user_exists(self.sh, k) -- if rc < 0: -- raise ValueError("Could not check if SELinux user %s is defined" % name) -- if exists: -- raise ValueError("SELinux user %s is already defined" % name) -- -- (rc,u) = semanage_user_create(self.sh) -- if rc < 0: -- raise ValueError("Could not create SELinux user for %s" % name) -+ if selevel == "": -+ selevel = "s0" -+ else: -+ selevel = untranslate(selevel) -+ -+ seroles=" ".join(roles) -+ try: -+ (rc,k) = semanage_user_key_create(self.sh, name) -+ if rc < 0: -+ raise ValueError("Could not create a key for %s" % name) - -- rc = semanage_user_set_name(self.sh, u, name) -- if rc < 0: -- raise ValueError("Could not set name for %s" % name) -+ (rc,exists) = semanage_user_exists(self.sh, k) -+ if rc < 0: -+ raise ValueError("Could not check if SELinux user %s is defined" % name) -+ if exists: -+ raise ValueError("SELinux user %s is already defined" % name) - -- for r in roles: -- rc = semanage_user_add_role(self.sh, u, r) -+ (rc,u) = semanage_user_create(self.sh) + rc = semanage_seuser_set_sename(self.sh, u, sename) if rc < 0: -- raise ValueError("Could not add role %s for %s" % (r, name)) -+ raise ValueError("Could not create SELinux user for %s" % name) - -- rc = semanage_user_set_mlsrange(self.sh, u, serange) -- if rc < 0: -- raise ValueError("Could not set MLS range for %s" % name) -+ rc = semanage_user_set_name(self.sh, u, name) -+ if rc < 0: -+ raise ValueError("Could not set name for %s" % name) - -- rc = semanage_user_set_mlslevel(self.sh, u, selevel) -- if rc < 0: -- raise ValueError("Could not set MLS level for %s" % name) -+ for r in roles: -+ rc = semanage_user_add_role(self.sh, u, r) -+ if rc < 0: -+ raise ValueError("Could not add role %s for %s" % (r, name)) -+ -+ if is_mls_enabled == 1: -+ rc = semanage_user_set_mlsrange(self.sh, u, serange) -+ if rc < 0: -+ raise ValueError("Could not set MLS range for %s" % name) -+ -+ rc = semanage_user_set_mlslevel(self.sh, u, selevel) -+ if rc < 0: -+ raise ValueError("Could not set MLS level for %s" % name) - -- (rc,key) = semanage_user_key_extract(self.sh,u) -- if rc < 0: -- raise ValueError("Could not extract key for %s" % name) -+ (rc,key) = semanage_user_key_extract(self.sh,u) -+ if rc < 0: -+ raise ValueError("Could not extract key for %s" % name) - -- rc = semanage_begin_transaction(self.sh) -- if rc < 0: -- raise ValueError("Could not start semanage transaction") -+ rc = semanage_begin_transaction(self.sh) -+ if rc < 0: -+ raise ValueError("Could not start semanage transaction") - -- rc = semanage_user_modify_local(self.sh, k, u) -- if rc < 0: -- raise ValueError("Could not add SELinux user %s" % name) -+ rc = semanage_user_modify_local(self.sh, k, u) -+ if rc < 0: -+ raise ValueError("Could not add SELinux user %s" % name) - -- rc = semanage_commit(self.sh) -- if rc < 0: -- raise ValueError("Could not add SELinux user %s" % name) -+ rc = semanage_commit(self.sh) -+ if rc < 0: -+ raise ValueError("Could not add SELinux user %s" % name) - -+ except ValueError, error: -+ mylog.log(0,"add SELinux user record", name, name, seroles, serange) -+ raise error -+ -+ mylog.log(1,"add SELinux user record", name, name, seroles, serange) - semanage_user_key_free(k) - semanage_user_free(u) - - def modify(self, name, roles = [], selevel = "", serange = ""): -- if len(roles) == 0 and serange == "" and selevel == "": -- raise ValueError("Requires roles, level or range") -+ try: -+ if len(roles) == 0 and serange == "" and selevel == "": -+ if is_mls_enabled == 1: -+ raise ValueError("Requires roles, level or range") -+ else: -+ raise ValueError("Requires roles") - -- (rc,k) = semanage_user_key_create(self.sh, name) -- if rc < 0: -- raise ValueError("Could not create a key for %s" % name) -+ (rc,k) = semanage_user_key_create(self.sh, name) -+ if rc < 0: -+ raise ValueError("Could not create a key for %s" % name) - -- (rc,exists) = semanage_user_exists(self.sh, k) -- if rc < 0: -- raise ValueError("Could not check if SELinux user %s is defined" % name) -- if not exists: -- raise ValueError("SELinux user %s is not defined" % name) -- -- (rc,u) = semanage_user_query(self.sh, k) -- if rc < 0: -- raise ValueError("Could not query user for %s" % name) -+ (rc,exists) = semanage_user_exists(self.sh, k) -+ if rc < 0: -+ raise ValueError("Could not check if SELinux user %s is defined" % name) -+ if not exists: -+ raise ValueError("SELinux user %s is not defined" % name) - -- if serange != "": -- semanage_user_set_mlsrange(self.sh, u, untranslate(serange)) -- if selevel != "": -- semanage_user_set_mlslevel(self.sh, u, untranslate(selevel)) -- -- if len(roles) != 0: -- for r in roles: -- semanage_user_add_role(self.sh, u, r) -+ (rc,u) = semanage_user_query(self.sh, k) -+ if rc < 0: -+ raise ValueError("Could not query user for %s" % name) - -- rc = semanage_begin_transaction(self.sh) -- if rc < 0: -- raise ValueError("Could not start semanage transaction") -+ if serange != "": -+ semanage_user_set_mlsrange(self.sh, u, untranslate(serange)) -+ if selevel != "": -+ semanage_user_set_mlslevel(self.sh, u, untranslate(selevel)) -+ -+ if len(roles) != 0: -+ for r in roles: -+ semanage_user_add_role(self.sh, u, r) - -- rc = semanage_user_modify_local(self.sh, k, u) -- if rc < 0: -- raise ValueError("Could not modify SELinux user %s" % name) -+ rc = semanage_begin_transaction(self.sh) -+ if rc < 0: -+ raise ValueError("Could not start semanage transaction") - -- rc = semanage_commit(self.sh) -- if rc < 0: -- raise ValueError("Could not modify SELinux user %s" % name) -+ rc = semanage_user_modify_local(self.sh, k, u) -+ if rc < 0: -+ raise ValueError("Could not modify SELinux user %s" % name) -+ -+ rc = semanage_commit(self.sh) -+ if rc < 0: -+ raise ValueError("Could not modify SELinux user %s" % name) -+ -+ except ValueError, error: -+ mylog.log(0,"modify SELinux user record", name, seuser, seroles, serange, oldseuser, oldseroles, olrserange) -+ raise error - -+ mylog.log(1,"modify SELinux user record", name, seuser, seroles, serange, oldseuser, oldseroles, olrserange) - semanage_user_key_free(k) - semanage_user_free(u) - - def delete(self, name): -- (rc,k) = semanage_user_key_create(self.sh, name) -- if rc < 0: -- raise ValueError("Could not create a key for %s" % name) -- -- (rc,exists) = semanage_user_exists(self.sh, k) -- if rc < 0: -- raise ValueError("Could not check if SELinux user %s is defined" % name) -- if not exists: -- raise ValueError("SELinux user %s is not defined" % name) -+ try: -+ (rc,k) = semanage_user_key_create(self.sh, name) -+ if rc < 0: -+ raise ValueError("Could not create a key for %s" % name) -+ -+ (rc,exists) = semanage_user_exists(self.sh, k) -+ if rc < 0: -+ raise ValueError("Could not check if SELinux user %s is defined" % name) -+ if not exists: -+ raise ValueError("SELinux user %s is not defined" % name) - -- (rc,exists) = semanage_user_exists_local(self.sh, k) -- if rc < 0: -- raise ValueError("Could not check if SELinux user %s is defined" % name) -- if not exists: -- raise ValueError("SELinux user %s is defined in policy, cannot be deleted" % name) -+ (rc,exists) = semanage_user_exists_local(self.sh, k) -+ if rc < 0: -+ raise ValueError("Could not check if SELinux user %s is defined" % name) -+ if not exists: -+ raise ValueError("SELinux user %s is defined in policy, cannot be deleted" % name) - -- rc = semanage_begin_transaction(self.sh) -- if rc < 0: -- raise ValueError("Could not start semanage transaction") -+ rc = semanage_begin_transaction(self.sh) -+ if rc < 0: -+ raise ValueError("Could not start semanage transaction") - -- rc = semanage_user_del_local(self.sh, k) -- if rc < 0: -- raise ValueError("Could not delete SELinux user %s" % name) -+ rc = semanage_user_del_local(self.sh, k) -+ if rc < 0: -+ raise ValueError("Could not delete SELinux user %s" % name) - -- rc = semanage_commit(self.sh) -- if rc < 0: -- raise ValueError("Could not delete SELinux user %s" % name) -+ rc = semanage_commit(self.sh) -+ if rc < 0: -+ raise ValueError("Could not delete SELinux user %s" % name) -+ except ValueError, error: -+ mylog.log(0,"delete SELinux user record", name) -+ raise error - -+ mylog.log(1,"delete SELinux user record", name) - semanage_user_key_free(k) - - def get_all(self): -@@ -462,14 +553,20 @@ - return ddict - - def list(self, heading=1): -- if heading: -- print "\n%-15s %-10s %-30s" % ("", "MLS/", "MLS/") -- print "%-15s %-10s %-30s %s\n" % ("SELinux User", "MCS Level", "MCS Range", "SELinux Roles") - ddict=self.get_all() - keys=ddict.keys() - keys.sort() -- for k in keys: -- print "%-15s %-10s %-30s %s" % (k, translate(ddict[k][0]), translate(ddict[k][1]), ddict[k][2]) -+ if is_mls_enabled == 1: -+ if heading: -+ print "\n%-15s %-10s %-30s" % ("", "MLS/", "MLS/") -+ print "%-15s %-10s %-30s %s\n" % ("SELinux User", "MCS Level", "MCS Range", "SELinux Roles") -+ for k in keys: -+ print "%-15s %-10s %-30s %s" % (k, translate(ddict[k][0]), translate(ddict[k][1]), ddict[k][2]) -+ else: -+ if heading: -+ print "%-15s %s\n" % ("SELinux User", "SELinux Roles") -+ for k in keys: -+ print "%-15s %s" % (k, ddict[k][2]) - - class portRecords(semanageRecords): - def __init__(self): -@@ -500,10 +597,11 @@ - return ( k, proto_d, low, high ) - - def add(self, port, proto, serange, type): -- if serange == "": -- serange="s0" -- else: -- serange=untranslate(serange) -+ if is_mls_enabled == 1: -+ if serange == "": -+ serange="s0" -+ else: -+ serange=untranslate(serange) - - if type == "": - raise ValueError("Type is required") -@@ -564,7 +662,10 @@ - - def modify(self, port, proto, serange, setype): - if serange == "" and setype == "": -- raise ValueError("Requires setype or serange") -+ if is_mls_enabled == 1: -+ raise ValueError("Requires setype or serange") -+ else: -+ raise ValueError("Requires setype") - - ( k, proto_d, low, high ) = self.__genkey(port, proto) - -@@ -688,10 +789,11 @@ - semanageRecords.__init__(self) - - def add(self, interface, serange, ctype): -- if serange == "": -- serange="s0" -- else: -- serange=untranslate(serange) -+ if is_mls_enabled == 1: -+ if serange == "": -+ serange="s0" -+ else: -+ serange=untranslate(serange) - - if ctype == "": - raise ValueError("SELinux Type is required") -@@ -869,14 +971,14 @@ - self.file_types["named pipe"] = SEMANAGE_FCONTEXT_PIPE; - - -- def add(self, target, type, ftype="", serange="s0", seuser="system_u"): -+ def add(self, target, type, ftype="", serange="", seuser="system_u"): - if seuser == "": - seuser="system_u" -- -- if serange == "": -- serange="s0" -- else: -- serange=untranslate(serange) -+ if is_mls_enabled == 1: -+ if serange == "": -+ serange="s0" -+ else: -+ serange=untranslate(serange) - - if type == "": - raise ValueError("SELinux Type is required") -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/setsebool/Makefile policycoreutils-1.29.26/setsebool/Makefile ---- nsapolicycoreutils/setsebool/Makefile 2005-11-04 15:37:49.000000000 -0500 -+++ policycoreutils-1.29.26/setsebool/Makefile 2006-02-25 06:56:54.000000000 -0500 -@@ -17,6 +17,8 @@ - install: all - -mkdir -p $(SBINDIR) - install -m 755 setsebool $(SBINDIR) -+ -mkdir -p $(MANDIR)/man8 -+ install -m 644 setsebool.8 $(MANDIR)/man8/ - - relabel: - Index: policycoreutils.spec =================================================================== RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils.spec,v retrieving revision 1.241 retrieving revision 1.242 diff -u -r1.241 -r1.242 --- policycoreutils.spec 10 Mar 2006 19:19:11 -0000 1.241 +++ policycoreutils.spec 17 Mar 2006 20:29:37 -0000 1.242 @@ -1,11 +1,11 @@ %define libauditver 1.1.4-3 -%define libsepolver 1.11.18-1 -%define libsemanagever 1.5.28-1 -%define libselinuxver 1.29.7-1 +%define libsepolver 1.12-1 +%define libsemanagever 1.6-1 +%define libselinuxver 1.30-1 Summary: SELinux policy core utilities. Name: policycoreutils -Version: 1.29.26 -Release: 6 +Version: 1.30 +Release: 1 License: GPL Group: System Environment/Base Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz @@ -42,6 +42,7 @@ %install rm -rf ${RPM_BUILD_ROOT} +mkdir -p $RPM_BUILD_ROOT/etc/rc.d/init.d mkdir -p ${RPM_BUILD_ROOT}%{_bindir} mkdir -p ${RPM_BUILD_ROOT}%{_sbindir} mkdir -p ${RPM_BUILD_ROOT}/sbin @@ -57,8 +58,9 @@ %files -f %{name}.lang %defattr(-,root,root) -/sbin/fixfiles /sbin/restorecon +%{_sbindir}/restorecond +%{_sbindir}/fixfiles %{_sbindir}/setfiles %{_sbindir}/setsebool %{_sbindir}/semodule @@ -76,6 +78,7 @@ %{_bindir}/semodule_link %{_bindir}/semodule_package %{_mandir}/man8/chcat.8.gz +%{_mandir}/man8/restorecond.8.gz %{_mandir}/man8/restorecon.8.gz %{_mandir}/man8/sestatus.8.gz %{_mandir}/man8/semanage.8.gz @@ -97,8 +100,13 @@ %config %{_sysconfdir}/pam.d/run_init %config(noreplace) %{_sysconfdir}/sestatus.conf %{_libdir}/python2.4/site-packages/seobject.py* +%attr(755,root,root) /etc/rc.d/init.d/restorecond +%config(noreplace) /etc/selinux/restorecond.conf %changelog +* Fri Mar 10 2006 Dan Walsh 1.29.27-1 +- Add restorecond + * Fri Mar 10 2006 Dan Walsh 1.29.26-6 - Remove prereq Index: sources =================================================================== RCS file: /cvs/dist/rpms/policycoreutils/devel/sources,v retrieving revision 1.107 retrieving revision 1.108 diff -u -r1.107 -r1.108 --- sources 21 Feb 2006 19:09:17 -0000 1.107 +++ sources 17 Mar 2006 20:29:37 -0000 1.108 @@ -1 +1 @@ -58fe44013f3515957fc626d0c11baf7c policycoreutils-1.29.26.tgz +e017bfddf27e124cef2743496dcfcc49 policycoreutils-1.30.tgz From fedora-cvs-commits at redhat.com Fri Mar 17 20:33:05 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 17 Mar 2006 15:33:05 -0500 Subject: rpms/policycoreutils/devel policycoreutils.spec,1.242,1.243 Message-ID: <200603172033.k2HKX5Mv023296@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/policycoreutils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv23282 Modified Files: policycoreutils.spec Log Message: * Fri Mar 17 2006 Dan Walsh 1.30-1 - Update to upstream Index: policycoreutils.spec =================================================================== RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils.spec,v retrieving revision 1.242 retrieving revision 1.243 diff -u -r1.242 -r1.243 --- policycoreutils.spec 17 Mar 2006 20:29:37 -0000 1.242 +++ policycoreutils.spec 17 Mar 2006 20:32:59 -0000 1.243 @@ -104,6 +104,9 @@ %config(noreplace) /etc/selinux/restorecond.conf %changelog +* Fri Mar 17 2006 Dan Walsh 1.30-1 +- Update to upstream + * Fri Mar 10 2006 Dan Walsh 1.29.27-1 - Add restorecond From fedora-cvs-commits at redhat.com Fri Mar 17 20:44:29 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 17 Mar 2006 15:44:29 -0500 Subject: rpms/policycoreutils/devel policycoreutils-rhat.patch,1.168,1.169 Message-ID: <200603172044.k2HKiTGP023579@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/policycoreutils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv23563 Modified Files: policycoreutils-rhat.patch Log Message: * Fri Mar 17 2006 Dan Walsh 1.30-1 - Update to upstream policycoreutils-rhat.patch: Makefile | 2 restorecond/Makefile | 29 ++ restorecond/restorecond.8 | 31 ++ restorecond/restorecond.c | 462 +++++++++++++++++++++++++++++++++++++++++++ restorecond/restorecond.conf | 3 restorecond/restorecond.h | 31 ++ restorecond/restorecond.init | 57 +++++ restorecond/stringslist.c | 118 ++++++++++ restorecond/stringslist.h | 37 +++ restorecond/utmpwatcher.c | 105 +++++++++ restorecond/utmpwatcher.h | 29 ++ scripts/Makefile | 2 scripts/fixfiles | 5 semanage/seobject.py | 15 - 14 files changed, 915 insertions(+), 11 deletions(-) Index: policycoreutils-rhat.patch =================================================================== RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v retrieving revision 1.168 retrieving revision 1.169 diff -u -r1.168 -r1.169 --- policycoreutils-rhat.patch 17 Mar 2006 20:29:37 -0000 1.168 +++ policycoreutils-rhat.patch 17 Mar 2006 20:44:25 -0000 1.169 @@ -1,15 +1,15 @@ -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/Makefile policycoreutils-1.29.27/Makefile +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/Makefile policycoreutils-1.30/Makefile --- nsapolicycoreutils/Makefile 2005-11-29 10:55:01.000000000 -0500 -+++ policycoreutils-1.29.27/Makefile 2006-03-15 16:06:43.000000000 -0500 ++++ policycoreutils-1.30/Makefile 2006-03-17 15:37:21.000000000 -0500 @@ -1,4 +1,4 @@ -SUBDIRS=setfiles semanage load_policy newrole run_init restorecon audit2allow audit2why scripts sestatus semodule_package semodule semodule_link semodule_expand setsebool po +SUBDIRS=setfiles semanage load_policy newrole run_init restorecon restorecond audit2allow audit2why scripts sestatus semodule_package semodule semodule_link semodule_expand setsebool po all install relabel clean: @for subdir in $(SUBDIRS); do \ -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/restorecond/Makefile policycoreutils-1.29.27/restorecond/Makefile +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/restorecond/Makefile policycoreutils-1.30/restorecond/Makefile --- nsapolicycoreutils/restorecond/Makefile 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.29.27/restorecond/Makefile 2006-03-15 16:08:46.000000000 -0500 ++++ policycoreutils-1.30/restorecond/Makefile 2006-03-17 15:37:21.000000000 -0500 @@ -0,0 +1,29 @@ +# Installation directories. +PREFIX ?= ${DESTDIR}/usr @@ -40,9 +40,9 @@ +clean: + -rm -f restorecond *.o *~ + -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/restorecond/restorecond.8 policycoreutils-1.29.27/restorecond/restorecond.8 +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/restorecond/restorecond.8 policycoreutils-1.30/restorecond/restorecond.8 --- nsapolicycoreutils/restorecond/restorecond.8 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.29.27/restorecond/restorecond.8 2006-03-15 16:06:43.000000000 -0500 ++++ policycoreutils-1.30/restorecond/restorecond.8 2006-03-17 15:37:21.000000000 -0500 @@ -0,0 +1,31 @@ +.TH "restorecond" "8" "2002031409" "" "" +.SH "NAME" @@ -75,20 +75,16 @@ + +.SH "SEE ALSO" +.BR restorecon (8), -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/restorecond/restorecond.c policycoreutils-1.29.27/restorecond/restorecond.c +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/restorecond/restorecond.c policycoreutils-1.30/restorecond/restorecond.c --- nsapolicycoreutils/restorecond/restorecond.c 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.29.27/restorecond/restorecond.c 2006-03-15 16:06:43.000000000 -0500 -@@ -0,0 +1,463 @@ ++++ policycoreutils-1.30/restorecond/restorecond.c 2006-03-17 15:43:36.000000000 -0500 +@@ -0,0 +1,462 @@ +/* + * restorecond + * -+ * AUTHOR: Dan Walsh -+ * + * Copyright (C) 2006 Red Hat + * see file 'COPYING' for use and warranty information + * -+ * semanage is a tool for managing SELinux configuration files -+ * + * 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 @@ -104,6 +100,9 @@ + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA + * 02111-1307 USA + * ++ * Authors: ++ * Dan Walsh ++ * +*/ + +/* @@ -542,25 +541,52 @@ + + return 0; +} -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/restorecond/restorecond.conf policycoreutils-1.29.27/restorecond/restorecond.conf +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/restorecond/restorecond.conf policycoreutils-1.30/restorecond/restorecond.conf --- nsapolicycoreutils/restorecond/restorecond.conf 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.29.27/restorecond/restorecond.conf 2006-03-15 16:06:43.000000000 -0500 ++++ policycoreutils-1.30/restorecond/restorecond.conf 2006-03-17 15:37:21.000000000 -0500 @@ -0,0 +1,3 @@ +/etc/resolv.conf +/etc/mtab +~/public_html -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/restorecond/restorecond.h policycoreutils-1.29.27/restorecond/restorecond.h +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/restorecond/restorecond.h policycoreutils-1.30/restorecond/restorecond.h --- nsapolicycoreutils/restorecond/restorecond.h 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.29.27/restorecond/restorecond.h 2006-03-15 16:06:43.000000000 -0500 -@@ -0,0 +1,4 @@ ++++ policycoreutils-1.30/restorecond/restorecond.h 2006-03-17 15:40:56.000000000 -0500 +@@ -0,0 +1,31 @@ ++/* restorecond.h -- ++ * Copyright 2006 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 ++ * ++ * Authors: ++ * Dan Walsh ++ * ++ */ ++ ++#ifndef RESTORED_CONFIG_H ++#define RESTORED_CONFIG_H ++ +void exitApp(const char *msg); +void watch_list_add(int inotify_fd, const char *path); + ++#endif + -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/restorecond/restorecond.init policycoreutils-1.29.27/restorecond/restorecond.init +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/restorecond/restorecond.init policycoreutils-1.30/restorecond/restorecond.init --- nsapolicycoreutils/restorecond/restorecond.init 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.29.27/restorecond/restorecond.init 2006-03-15 16:13:32.000000000 -0500 -@@ -0,0 +1,54 @@ ++++ policycoreutils-1.30/restorecond/restorecond.init 2006-03-17 15:37:21.000000000 -0500 +@@ -0,0 +1,57 @@ +#!/bin/sh +# +# restorecond: Daemo used to maintain path file context @@ -602,6 +628,9 @@ + stop) + stop + ;; ++ status) ++ status restorecond ++ ;; + restart|reload) + stop + start @@ -615,19 +644,14 @@ +esac + +exit 0 -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/restorecond/stringslist.c policycoreutils-1.29.27/restorecond/stringslist.c +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/restorecond/stringslist.c policycoreutils-1.30/restorecond/stringslist.c --- nsapolicycoreutils/restorecond/stringslist.c 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.29.27/restorecond/stringslist.c 2006-03-15 16:06:43.000000000 -0500 -@@ -0,0 +1,120 @@ ++++ policycoreutils-1.30/restorecond/stringslist.c 2006-03-17 15:42:58.000000000 -0500 +@@ -0,0 +1,118 @@ +/* -+ -+ * AUTHOR: Dan Walsh -+ + * Copyright (C) 2006 Red Hat + * see file 'COPYING' for use and warranty information + * -+ * semanage is a tool for managing SELinux configuration files -+ * + * 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 @@ -643,6 +667,9 @@ + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA + * 02111-1307 USA + * ++ * Authors: ++ * Dan Walsh ++ * +*/ + +#include @@ -739,10 +766,35 @@ + strings_list_free(list1); +} +#endif -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/restorecond/stringslist.h policycoreutils-1.29.27/restorecond/stringslist.h +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/restorecond/stringslist.h policycoreutils-1.30/restorecond/stringslist.h --- nsapolicycoreutils/restorecond/stringslist.h 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.29.27/restorecond/stringslist.h 2006-03-15 16:06:43.000000000 -0500 -@@ -0,0 +1,10 @@ ++++ policycoreutils-1.30/restorecond/stringslist.h 2006-03-17 15:41:47.000000000 -0500 +@@ -0,0 +1,37 @@ ++/* stringslist.h -- ++ * Copyright 2006 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 ++ * ++ * Authors: ++ * Dan Walsh ++ * ++ */ ++#ifndef STRINGSLIST_H ++#define STRINGSLIST_H ++ +struct stringsList { + struct stringsList *next; + char *string; @@ -753,20 +805,18 @@ +void strings_list_print(struct stringsList *list); +int strings_list_find(struct stringsList *list, const char *string); +int strings_list_diff(struct stringsList *from, struct stringsList *to); -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/restorecond/utmpwatcher.c policycoreutils-1.29.27/restorecond/utmpwatcher.c ++ ++#endif +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/restorecond/utmpwatcher.c policycoreutils-1.30/restorecond/utmpwatcher.c --- nsapolicycoreutils/restorecond/utmpwatcher.c 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.29.27/restorecond/utmpwatcher.c 2006-03-15 16:06:43.000000000 -0500 ++++ policycoreutils-1.30/restorecond/utmpwatcher.c 2006-03-17 15:43:12.000000000 -0500 @@ -0,0 +1,105 @@ +/* -+ * restorecond -+ * -+ * AUTHOR: Dan Walsh ++ * utmpwatcher.c + * + * Copyright (C) 2006 Red Hat + * see file 'COPYING' for use and warranty information + * -+ * semanage is a tool for managing SELinux configuration files -+ * + * 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 @@ -782,6 +832,10 @@ + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA + * 02111-1307 USA + * ++ * Authors: ++ * Dan Walsh ++ * ++ * +*/ + +#define _GNU_SOURCE @@ -862,15 +916,42 @@ +#endif + + -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/restorecond/utmpwatcher.h policycoreutils-1.29.27/restorecond/utmpwatcher.h +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/restorecond/utmpwatcher.h policycoreutils-1.30/restorecond/utmpwatcher.h --- nsapolicycoreutils/restorecond/utmpwatcher.h 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.29.27/restorecond/utmpwatcher.h 2006-03-15 16:06:43.000000000 -0500 -@@ -0,0 +1,2 @@ ++++ policycoreutils-1.30/restorecond/utmpwatcher.h 2006-03-17 15:40:46.000000000 -0500 +@@ -0,0 +1,29 @@ ++/* utmpwatcher.h -- ++ * Copyright 2006 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 ++ * ++ * Authors: ++ * Dan Walsh ++ * ++ */ ++#ifndef UTMPWATCHER_H ++#define UTMPWATCHER_H ++ +unsigned int utmpwatcher_handle(int inotify_fd, int wd); +void utmpwatcher_add(int inotify_fd, const char *path); -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/scripts/fixfiles policycoreutils-1.29.27/scripts/fixfiles ++ ++#endif +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/scripts/fixfiles policycoreutils-1.30/scripts/fixfiles --- nsapolicycoreutils/scripts/fixfiles 2006-01-04 13:07:46.000000000 -0500 -+++ policycoreutils-1.29.27/scripts/fixfiles 2006-03-15 16:06:43.000000000 -0500 ++++ policycoreutils-1.30/scripts/fixfiles 2006-03-17 15:37:21.000000000 -0500 @@ -124,7 +124,10 @@ exit $? fi @@ -883,9 +964,9 @@ exit $? fi LogReadOnly -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/scripts/Makefile policycoreutils-1.29.27/scripts/Makefile +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/scripts/Makefile policycoreutils-1.30/scripts/Makefile --- nsapolicycoreutils/scripts/Makefile 2005-12-08 12:59:25.000000000 -0500 -+++ policycoreutils-1.29.27/scripts/Makefile 2006-03-15 16:06:43.000000000 -0500 ++++ policycoreutils-1.30/scripts/Makefile 2006-03-17 15:37:21.000000000 -0500 @@ -13,7 +13,7 @@ -mkdir -p $(BINDIR) install -m 755 $(TARGETS) $(SBINDIR) @@ -895,9 +976,9 @@ -mkdir -p $(MANDIR)/man8 install -m 644 fixfiles.8 $(MANDIR)/man8/ install -m 644 genhomedircon.8 $(MANDIR)/man8/ -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/semanage/seobject.py policycoreutils-1.29.27/semanage/seobject.py +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/semanage/seobject.py policycoreutils-1.30/semanage/seobject.py --- nsapolicycoreutils/semanage/seobject.py 2006-03-10 09:48:05.000000000 -0500 -+++ policycoreutils-1.29.27/semanage/seobject.py 2006-03-15 16:06:43.000000000 -0500 ++++ policycoreutils-1.30/semanage/seobject.py 2006-03-17 15:37:21.000000000 -0500 @@ -229,10 +229,9 @@ if rc < 0: raise ValueError("Could not set name for %s" % name) @@ -912,3 +993,26 @@ rc = semanage_seuser_set_sename(self.sh, u, sename) if rc < 0: +@@ -549,7 +548,7 @@ + raise ValueError("Could not list roles for user %s" % name) + + roles = string.join(rlist, ' '); +- ddict[semanage_user_get_name(u)] = (semanage_user_get_mlslevel(u), semanage_user_get_mlsrange(u), roles) ++ ddict[semanage_user_get_name(u)] = (semanage_user_get_prefix(u), semanage_user_get_mlslevel(u), semanage_user_get_mlsrange(u), roles) + + return ddict + +@@ -559,10 +558,10 @@ + keys.sort() + if is_mls_enabled == 1: + if heading: +- print "\n%-15s %-10s %-30s" % ("", "MLS/", "MLS/") +- print "%-15s %-10s %-30s %s\n" % ("SELinux User", "MCS Level", "MCS Range", "SELinux Roles") ++ print "\n%-15s %-10s %-10s %-30s" % ("", "Labeling", "MLS/", "MLS/") ++ print "%-15s %-10s %-10s %-30s %s\n" % ("SELinux User", "Prefix", "MCS Level", "MCS Range", "SELinux Roles") + for k in keys: +- print "%-15s %-10s %-30s %s" % (k, translate(ddict[k][0]), translate(ddict[k][1]), ddict[k][2]) ++ print "%-15s %-10s %-10s %-30s %s" % (k, ddict[k][0], translate(ddict[k][1]), translate(ddict[k][2]), ddict[k][3]) + else: + if heading: + print "%-15s %s\n" % ("SELinux User", "SELinux Roles") From fedora-cvs-commits at redhat.com Fri Mar 17 21:08:16 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 17 Mar 2006 16:08:16 -0500 Subject: rpms/beagle/FC-5 beagle.spec,1.46,1.47 Message-ID: <200603172108.k2HL8Gje004141@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/beagle/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv4128 Modified Files: beagle.spec Log Message: - use /bin/nologin instead of /bin/false for beagle user shell Index: beagle.spec =================================================================== RCS file: /cvs/dist/rpms/beagle/FC-5/beagle.spec,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- beagle.spec 17 Mar 2006 19:10:41 -0000 1.46 +++ beagle.spec 17 Mar 2006 21:08:14 -0000 1.47 @@ -1,6 +1,6 @@ Name: beagle Version: 0.2.3 -Release: 1 +Release: 2 Summary: The Beagle Search Infrastructure Group: User Interface/Desktops @@ -138,7 +138,7 @@ %define beagle_user_uid 58 /usr/sbin/groupadd -g %{beagle_user_uid} -r beagleindex 2> /dev/null || : -/usr/sbin/useradd -r -u %{beagle_user_uid} -s /bin/false -c "User for Beagle indexing" -d /var/cache/beagle -g beagleindex beagleindex 2> /dev/null || : +/usr/sbin/useradd -r -u %{beagle_user_uid} -s /bin/nologin -c "User for Beagle indexing" -d /var/cache/beagle -g beagleindex beagleindex 2> /dev/null || : %post if rpm -q firefox > /dev/null; then @@ -212,6 +212,10 @@ %{_prefix}/lib/python*/site-packages/beagle.so %changelog +* Fri Mar 17 2006 Ray Strode - 0.2.3-2 +- use /bin/nologin instead of /bin/false for beagle user + shell + * Fri Mar 17 2006 Ray Strode - 0.2.3-1 - Update to 0.2.3 From fedora-cvs-commits at redhat.com Fri Mar 17 21:10:52 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 17 Mar 2006 16:10:52 -0500 Subject: rpms/beagle/FC-5 beagle-0.2.2-textcache-crash.patch,1.1,NONE Message-ID: <200603172110.k2HLAqUt004217@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/beagle/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv4205 Removed Files: beagle-0.2.2-textcache-crash.patch Log Message: drop unused patch --- beagle-0.2.2-textcache-crash.patch DELETED --- From fedora-cvs-commits at redhat.com Fri Mar 17 21:22:23 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 17 Mar 2006 16:22:23 -0500 Subject: rpms/beagle/FC-5 beagle.spec,1.47,1.48 Message-ID: <200603172122.k2HLMN16016852@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/beagle/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv16839 Modified Files: beagle.spec Log Message: use /sbin/nologin instead of /bin/nologin Index: beagle.spec =================================================================== RCS file: /cvs/dist/rpms/beagle/FC-5/beagle.spec,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- beagle.spec 17 Mar 2006 21:08:14 -0000 1.47 +++ beagle.spec 17 Mar 2006 21:22:21 -0000 1.48 @@ -1,6 +1,6 @@ Name: beagle Version: 0.2.3 -Release: 2 +Release: 3 Summary: The Beagle Search Infrastructure Group: User Interface/Desktops @@ -138,7 +138,7 @@ %define beagle_user_uid 58 /usr/sbin/groupadd -g %{beagle_user_uid} -r beagleindex 2> /dev/null || : -/usr/sbin/useradd -r -u %{beagle_user_uid} -s /bin/nologin -c "User for Beagle indexing" -d /var/cache/beagle -g beagleindex beagleindex 2> /dev/null || : +/usr/sbin/useradd -r -u %{beagle_user_uid} -s /sbin/nologin -c "User for Beagle indexing" -d /var/cache/beagle -g beagleindex beagleindex 2> /dev/null || : %post if rpm -q firefox > /dev/null; then @@ -212,6 +212,10 @@ %{_prefix}/lib/python*/site-packages/beagle.so %changelog +* Fri Mar 17 2006 Ray Strode - 0.2.3-3 +- use /sbin/nologin instead of /bin/nologin for beagle user + shell + * Fri Mar 17 2006 Ray Strode - 0.2.3-2 - use /bin/nologin instead of /bin/false for beagle user shell From fedora-cvs-commits at redhat.com Fri Mar 17 21:39:24 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 17 Mar 2006 16:39:24 -0500 Subject: rpms/policycoreutils/devel policycoreutils-rhat.patch, 1.169, 1.170 policycoreutils.spec, 1.243, 1.244 Message-ID: <200603172139.k2HLdOpQ017356@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/policycoreutils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv17338 Modified Files: policycoreutils-rhat.patch policycoreutils.spec Log Message: * Fri Mar 17 2006 Dan Walsh 1.30-1 - Update to upstream policycoreutils-rhat.patch: Makefile | 2 restorecond/Makefile | 29 ++ restorecond/restorecond.8 | 31 ++ restorecond/restorecond.c | 462 +++++++++++++++++++++++++++++++++++++++++++ restorecond/restorecond.conf | 3 restorecond/restorecond.h | 31 ++ restorecond/restorecond.init | 57 +++++ restorecond/stringslist.c | 118 ++++++++++ restorecond/stringslist.h | 37 +++ restorecond/utmpwatcher.c | 105 +++++++++ restorecond/utmpwatcher.h | 29 ++ scripts/Makefile | 4 scripts/fixfiles | 10 semanage/seobject.py | 15 - 14 files changed, 921 insertions(+), 12 deletions(-) Index: policycoreutils-rhat.patch =================================================================== RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v retrieving revision 1.169 retrieving revision 1.170 diff -u -r1.169 -r1.170 --- policycoreutils-rhat.patch 17 Mar 2006 20:44:25 -0000 1.169 +++ policycoreutils-rhat.patch 17 Mar 2006 21:39:21 -0000 1.170 @@ -951,28 +951,42 @@ +#endif diff --exclude-from=exclude -N -u -r nsapolicycoreutils/scripts/fixfiles policycoreutils-1.30/scripts/fixfiles --- nsapolicycoreutils/scripts/fixfiles 2006-01-04 13:07:46.000000000 -0500 -+++ policycoreutils-1.30/scripts/fixfiles 2006-03-17 15:37:21.000000000 -0500 -@@ -124,7 +124,10 @@ ++++ policycoreutils-1.30/scripts/fixfiles 2006-03-17 16:26:25.000000000 -0500 +@@ -124,7 +124,15 @@ exit $? fi if [ ! -z "$DIRS" ]; then - ${RESTORECON} ${OUTFILES} ${FORCEFLAG} -R $1 -v $DIRS 2>&1 >> $LOGFILE -+ for d in ${DIRS} ; do find $d \ -+ ! \( -fstype ext2 -o -fstype ext3 -o -fstype jfs -o -fstype xfs \) -prune -o -print; \ -+ ${RESTORECON} ${OUTFILES} ${FORCEFLAG} $1 -v -f - 2>&1 >> $LOGFILE -+ done ++ if [ -x /usr/bin/find ]; then ++ for d in ${DIRS} ; do find $d \ ++ ! \( -fstype ext2 -o -fstype ext3 -o -fstype jfs -o -fstype xfs \) -prune -o -print; \ ++ ${RESTORECON} ${OUTFILES} ${FORCEFLAG} $1 -v -f - 2>&1 >> $LOGFILE ++ done ++ else ++ ${RESTORECON} ${OUTFILES} ${FORCEFLAG} -R $1 -v $DIRS 2>&1 >> $LOGFILE ++ fi ++ exit $? fi LogReadOnly diff --exclude-from=exclude -N -u -r nsapolicycoreutils/scripts/Makefile policycoreutils-1.30/scripts/Makefile --- nsapolicycoreutils/scripts/Makefile 2005-12-08 12:59:25.000000000 -0500 -+++ policycoreutils-1.30/scripts/Makefile 2006-03-17 15:37:21.000000000 -0500 ++++ policycoreutils-1.30/scripts/Makefile 2006-03-17 16:27:22.000000000 -0500 +@@ -1,7 +1,7 @@ + # Installation directories. + PREFIX ?= ${DESTDIR}/usr + BINDIR ?= $(PREFIX)/bin +-SBINDIR ?= $(PREFIX)/sbin ++SBINDIR ?= $(DESTDIR)/sbin + MANDIR ?= $(PREFIX)/share/man + LOCALEDIR ?= /usr/share/locale + @@ -13,7 +13,7 @@ -mkdir -p $(BINDIR) install -m 755 $(TARGETS) $(SBINDIR) install -m 755 chcat $(BINDIR) - install -m 755 fixfiles $(DESTDIR)/sbin -+ install -m 755 fixfiles $(PREFIX)/sbin ++ install -m 755 fixfiles $(SBINDIR) -mkdir -p $(MANDIR)/man8 install -m 644 fixfiles.8 $(MANDIR)/man8/ install -m 644 genhomedircon.8 $(MANDIR)/man8/ Index: policycoreutils.spec =================================================================== RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils.spec,v retrieving revision 1.243 retrieving revision 1.244 diff -u -r1.243 -r1.244 --- policycoreutils.spec 17 Mar 2006 20:32:59 -0000 1.243 +++ policycoreutils.spec 17 Mar 2006 21:39:21 -0000 1.244 @@ -59,8 +59,8 @@ %files -f %{name}.lang %defattr(-,root,root) /sbin/restorecon +/sbin/fixfiles %{_sbindir}/restorecond -%{_sbindir}/fixfiles %{_sbindir}/setfiles %{_sbindir}/setsebool %{_sbindir}/semodule From fedora-cvs-commits at redhat.com Fri Mar 17 21:43:33 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 17 Mar 2006 16:43:33 -0500 Subject: rpms/policycoreutils/devel policycoreutils-rhat.patch,1.170,1.171 Message-ID: <200603172143.k2HLhXWQ017465@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/policycoreutils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv17448 Modified Files: policycoreutils-rhat.patch Log Message: * Fri Mar 17 2006 Dan Walsh 1.30-1 - Update to upstream policycoreutils-rhat.patch: Makefile | 2 restorecond/Makefile | 29 ++ restorecond/restorecond.8 | 31 ++ restorecond/restorecond.c | 462 +++++++++++++++++++++++++++++++++++++++++++ restorecond/restorecond.conf | 3 restorecond/restorecond.h | 31 ++ restorecond/restorecond.init | 57 +++++ restorecond/stringslist.c | 118 ++++++++++ restorecond/stringslist.h | 37 +++ restorecond/utmpwatcher.c | 105 +++++++++ restorecond/utmpwatcher.h | 29 ++ scripts/fixfiles | 10 semanage/seobject.py | 15 - 13 files changed, 919 insertions(+), 10 deletions(-) Index: policycoreutils-rhat.patch =================================================================== RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v retrieving revision 1.170 retrieving revision 1.171 diff -u -r1.170 -r1.171 --- policycoreutils-rhat.patch 17 Mar 2006 21:39:21 -0000 1.170 +++ policycoreutils-rhat.patch 17 Mar 2006 21:43:31 -0000 1.171 @@ -969,27 +969,6 @@ exit $? fi LogReadOnly -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/scripts/Makefile policycoreutils-1.30/scripts/Makefile ---- nsapolicycoreutils/scripts/Makefile 2005-12-08 12:59:25.000000000 -0500 -+++ policycoreutils-1.30/scripts/Makefile 2006-03-17 16:27:22.000000000 -0500 -@@ -1,7 +1,7 @@ - # Installation directories. - PREFIX ?= ${DESTDIR}/usr - BINDIR ?= $(PREFIX)/bin --SBINDIR ?= $(PREFIX)/sbin -+SBINDIR ?= $(DESTDIR)/sbin - MANDIR ?= $(PREFIX)/share/man - LOCALEDIR ?= /usr/share/locale - -@@ -13,7 +13,7 @@ - -mkdir -p $(BINDIR) - install -m 755 $(TARGETS) $(SBINDIR) - install -m 755 chcat $(BINDIR) -- install -m 755 fixfiles $(DESTDIR)/sbin -+ install -m 755 fixfiles $(SBINDIR) - -mkdir -p $(MANDIR)/man8 - install -m 644 fixfiles.8 $(MANDIR)/man8/ - install -m 644 genhomedircon.8 $(MANDIR)/man8/ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/semanage/seobject.py policycoreutils-1.30/semanage/seobject.py --- nsapolicycoreutils/semanage/seobject.py 2006-03-10 09:48:05.000000000 -0500 +++ policycoreutils-1.30/semanage/seobject.py 2006-03-17 15:37:21.000000000 -0500 From fedora-cvs-commits at redhat.com Fri Mar 17 22:22:37 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 17 Mar 2006 17:22:37 -0500 Subject: rpms/kernel/devel patch-2.6.16-rc6-git9.bz2.sign, NONE, 1.1 .cvsignore, 1.383, 1.384 kernel-2.6.spec, 1.2059, 1.2060 sources, 1.324, 1.325 upstream, 1.297, 1.298 patch-2.6.16-rc6-git8.bz2.sign, 1.1, NONE Message-ID: <200603172222.k2HMMb75011532@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv11517 Modified Files: .cvsignore kernel-2.6.spec sources upstream Added Files: patch-2.6.16-rc6-git9.bz2.sign Removed Files: patch-2.6.16-rc6-git8.bz2.sign Log Message: git9 --- NEW FILE patch-2.6.16-rc6-git9.bz2.sign --- -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.2.2 (GNU/Linux) Comment: See http://www.kernel.org/signature.html for info iD8DBQBEGwfnyGugalF9Dw4RAr13AKCUIstvydjJsG0L9lDjmIswZZ/LoACfZFtb Sat2H77QMZTGhQyDxyNt/R0= =XXJe -----END PGP SIGNATURE----- Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v retrieving revision 1.383 retrieving revision 1.384 diff -u -r1.383 -r1.384 --- .cvsignore 17 Mar 2006 18:39:05 -0000 1.383 +++ .cvsignore 17 Mar 2006 22:22:35 -0000 1.384 @@ -4,4 +4,4 @@ linux-2.6.15.tar.bz2 xen-20060301.tar.bz2 patch-2.6.16-rc6.bz2 -patch-2.6.16-rc6-git8.bz2 +patch-2.6.16-rc6-git9.bz2 Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.2059 retrieving revision 1.2060 diff -u -r1.2059 -r1.2060 --- kernel-2.6.spec 17 Mar 2006 18:39:05 -0000 1.2059 +++ kernel-2.6.spec 17 Mar 2006 22:22:35 -0000 1.2060 @@ -218,7 +218,7 @@ # Patches 0 through 100 are meant for core subsystem upgrades # Patch1: patch-2.6.16-rc6.bz2 -Patch2: patch-2.6.16-rc6-git8.bz2 +Patch2: patch-2.6.16-rc6-git9.bz2 # Patches 100 through 500 are meant for architecture patches Patch100: linux-2.6-bzimage.patch @@ -1661,7 +1661,7 @@ %changelog * Fri Mar 17 2006 Dave Jones -- 2.6.16rc6-git8 +- 2.6.16rc6-git8 & git9 * Thu Mar 16 2006 Dave Jones - 2.6.16rc6-git7 Index: sources =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/sources,v retrieving revision 1.324 retrieving revision 1.325 diff -u -r1.324 -r1.325 --- sources 17 Mar 2006 18:39:05 -0000 1.324 +++ sources 17 Mar 2006 22:22:35 -0000 1.325 @@ -1,4 +1,4 @@ cdf95e00f5111e31f78e1d97304d9522 linux-2.6.15.tar.bz2 cdfde609af8adcf58d7ff626599b2d90 xen-20060301.tar.bz2 67fe4dce92d3103e56dd8d2d3c20b3ed patch-2.6.16-rc6.bz2 -bf76b5d267eb9f03f579045fd21e0781 patch-2.6.16-rc6-git8.bz2 +ef3f6498d6aedc9a632f67ebc47c2fb0 patch-2.6.16-rc6-git9.bz2 Index: upstream =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/upstream,v retrieving revision 1.297 retrieving revision 1.298 diff -u -r1.297 -r1.298 --- upstream 17 Mar 2006 18:39:05 -0000 1.297 +++ upstream 17 Mar 2006 22:22:35 -0000 1.298 @@ -1,3 +1,3 @@ linux-2.6.15.tar.bz2 patch-2.6.16-rc6.bz2 -patch-2.6.16-rc6-git8.bz2 +patch-2.6.16-rc6-git9.bz2 --- patch-2.6.16-rc6-git8.bz2.sign DELETED --- From fedora-cvs-commits at redhat.com Sat Mar 18 00:53:38 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 17 Mar 2006 19:53:38 -0500 Subject: rpms/f-spot/devel .cvsignore, 1.6, 1.7 f-spot.spec, 1.18, 1.19 sources, 1.6, 1.7 Message-ID: <200603180053.k2I0rcZE015407@cvs.devel.redhat.com> Author: caillon Update of /cvs/dist/rpms/f-spot/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv15391 Modified Files: .cvsignore f-spot.spec sources Log Message: * Fri Mar 17 2006 Christopher Aillon 0.1.11-1 - Update to 0.1.11 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/f-spot/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 24 Feb 2006 15:59:50 -0000 1.6 +++ .cvsignore 18 Mar 2006 00:53:36 -0000 1.7 @@ -1 +1 @@ -f-spot-0.1.10.tar.bz2 +f-spot-0.1.11.tar.bz2 Index: f-spot.spec =================================================================== RCS file: /cvs/dist/rpms/f-spot/devel/f-spot.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- f-spot.spec 24 Feb 2006 16:18:44 -0000 1.18 +++ f-spot.spec 18 Mar 2006 00:53:36 -0000 1.19 @@ -1,5 +1,5 @@ Name: f-spot -Version: 0.1.10 +Version: 0.1.11 Release: 1 Summary: Photo management application @@ -72,6 +72,9 @@ %{_datadir}/gnome-screensaver/themes/f-spot-screensaver.desktop %changelog +* Fri Mar 17 2006 Christopher Aillon 0.1.11-1 +- Update to 0.1.11 + * Fri Feb 24 2006 Christopher Aillon 0.1.10-1 - Update to 0.1.10 Index: sources =================================================================== RCS file: /cvs/dist/rpms/f-spot/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 24 Feb 2006 15:59:50 -0000 1.6 +++ sources 18 Mar 2006 00:53:36 -0000 1.7 @@ -1 +1 @@ -a49b74f2ac28011d12ce9e2fd5fe4831 f-spot-0.1.10.tar.bz2 +d4d75f6a5272fa15b5658abdf708b050 f-spot-0.1.11.tar.bz2 From fedora-cvs-commits at redhat.com Sat Mar 18 01:58:16 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 17 Mar 2006 20:58:16 -0500 Subject: rpms/stunnel/devel stunnel-4.15-nogroup.patch, NONE, 1.1 stunnel-4.15-sample.patch, NONE, 1.1 .cvsignore, 1.16, 1.17 sources, 1.16, 1.17 stunnel.spec, 1.37, 1.38 stunnel-4.12-sample.patch, 1.1, NONE Message-ID: <200603180158.k2I1wG9x008744@cvs.devel.redhat.com> Author: mitr Update of /cvs/dist/rpms/stunnel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv8726 Modified Files: .cvsignore sources stunnel.spec Added Files: stunnel-4.15-nogroup.patch stunnel-4.15-sample.patch Removed Files: stunnel-4.12-sample.patch Log Message: * Sat Mar 18 2006 Miloslav Trmac - 4.15-1 - Update to stunnel-4.15 stunnel-4.15-nogroup.patch: Makefile.am | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE stunnel-4.15-nogroup.patch --- --- stunnel-4.15/tools/Makefile.am.nogroup 2006-03-18 02:37:19.000000000 +0100 +++ stunnel-4.15/tools/Makefile.am 2006-03-18 02:38:09.000000000 +0100 @@ -28,7 +28,7 @@ ${INSTALL} -m 600 stunnel.pem $(DESTDIR)$(confdir)/stunnel.pem; \ rm stunnel.pem; \ fi - ${INSTALL} -d -m 1770 -g nogroup $(DESTDIR)$(prefix)/var/lib/stunnel + ${INSTALL} -d -m 1770 $(DESTDIR)$(prefix)/var/lib/stunnel if uname | grep SunOS; then \ ${INSTALL} -d -m 755 $(DESTDIR)$(prefix)/var/lib/stunnel/dev; \ mknod $(DESTDIR)$(prefix)/var/lib/stunnel/dev/zero c 13 12; \ stunnel-4.15-sample.patch: stunnel.conf-sample.in | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) --- NEW FILE stunnel-4.15-sample.patch --- You shouldn't use the sample as-is, but people do. --- stunnel-4.15/tools/stunnel.conf-sample.in.sample 2005-09-30 16:20:01.000000000 +0200 +++ stunnel-4.15/tools/stunnel.conf-sample.in 2005-09-30 16:22:02.000000000 +0200 @@ -3,13 +3,13 @@ ; Please make sure you understand them (especially the effect of chroot jail) ; Certificate/key is needed in server mode and optional in client mode -cert = @prefix@/etc/stunnel/mail.pem -;key = @prefix@/etc/stunnel/mail.pem +cert = @sysconfdir@/stunnel/mail.crt +;key = @sysconfdir@/stunnel/mail.key ; Some security enhancements for UNIX systems - comment them out on Win32 -chroot = @prefix@/var/lib/stunnel/ +chroot = @localstatedir@/run/stunnel/ setuid = nobody -setgid = nogroup +setgid = nobody ; PID is created inside chroot jail pid = /stunnel.pid @@ -27,12 +27,13 @@ ; CApath is located inside chroot jail ;CApath = /certs ; It's often easier to use CAfile -;CAfile = @prefix@/etc/stunnel/certs.pem +;CAfile = @sysconfdir@/stunnel/certs.pem +;CAfile = @datadir@/ssl/certs/ca-bundle.crt ; Don't forget to c_rehash CRLpath ; CRLpath is located inside chroot jail ;CRLpath = /crls ; Alternatively you can use CRLfile -;CRLfile = @prefix@/etc/stunnel/crls.pem +;CRLfile = @sysconfdir@/stunnel/crls.pem ; Some debugging stuff useful for troubleshooting ;debug = 7 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/stunnel/devel/.cvsignore,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- .cvsignore 3 Nov 2005 00:37:24 -0000 1.16 +++ .cvsignore 18 Mar 2006 01:58:13 -0000 1.17 @@ -1,2 +1,2 @@ -stunnel-4.14.tar.gz -stunnel-4.14.tar.gz.asc +stunnel-4.15.tar.gz +stunnel-4.15.tar.gz.asc Index: sources =================================================================== RCS file: /cvs/dist/rpms/stunnel/devel/sources,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- sources 3 Nov 2005 00:37:24 -0000 1.16 +++ sources 18 Mar 2006 01:58:13 -0000 1.17 @@ -1,2 +1,2 @@ -0969cc4868dfd75f22792ecccc9ec555 stunnel-4.14.tar.gz -99e54fa6cb263ffd29be7a02f4e9b536 stunnel-4.14.tar.gz.asc +2c00153ad099a5f9c5609e8d1dbbe470 stunnel-4.15.tar.gz +71ddec1b83133d7479e477ad0ce229c6 stunnel-4.15.tar.gz.asc Index: stunnel.spec =================================================================== RCS file: /cvs/dist/rpms/stunnel/devel/stunnel.spec,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- stunnel.spec 11 Feb 2006 05:44:47 -0000 1.37 +++ stunnel.spec 18 Mar 2006 01:58:13 -0000 1.38 @@ -1,7 +1,7 @@ Summary: An SSL-encrypting socket wrapper. Name: stunnel -Version: 4.14 -Release: 3.2 +Version: 4.15 +Release: 1 License: GPL Group: Applications/Internet URL: http://stunnel.mirt.net/ @@ -14,12 +14,12 @@ Source6: pop3-redirect.xinetd Source7: stunnel-pop3s-client.conf Patch0: stunnel-4.08-authpriv.patch -Patch1: stunnel-4.12-sample.patch -Patch2: stunnel-4.14-am_.patch +Patch1: stunnel-4.15-sample.patch +Patch2: stunnel-4.15-nogroup.patch Buildroot: %{_tmppath}/stunnel-root # util-linux is needed for rename BuildRequires: openssl-devel, pkgconfig, tcp_wrappers, util-linux -# For stunnel-4.14-am_.patch +# For stunnel-4.15-nogroup.patch BuildRequires: autoconf, automake, libtool %description @@ -31,7 +31,7 @@ %setup -q %patch0 -p1 -b .authpriv %patch1 -p1 -b .sample -%patch2 -p1 -b .am_ +%patch2 -p1 -b .nogroup iconv -f iso-8859-1 -t utf-8 < doc/stunnel.fr.8 > doc/stunnel.fr.8_ mv doc/stunnel.fr.8_ doc/stunnel.fr.8 @@ -39,13 +39,13 @@ mv doc/stunnel.pl.8_ doc/stunnel.pl.8 %build -autoreconf -f # For stunnel-4.14-am_.patch +autoreconf -f # For stunnel-4.15-nogroup.patch CFLAGS="$RPM_OPT_FLAGS -fPIC"; export CFLAGS if pkg-config openssl ; then CFLAGS="$CFLAGS `pkg-config --cflags openssl`"; LDFLAGS="`pkg-config --libs-only-L openssl`"; export LDFLAGS fi -%configure --enable-ipv6 --with-threads=pthread \ +%configure --enable-ipv6 \ CPPFLAGS="-UPIDFILE -DPIDFILE='\"%{_localstatedir}/run/stunnel.pid\"'" make LDADD="-pie -Wl,-z,defs,-z,relro" @@ -91,6 +91,9 @@ %exclude %{_sysconfdir}/stunnel/* %changelog +* Sat Mar 18 2006 Miloslav Trmac - 4.15-1 +- Update to stunnel-4.15 + * Fri Feb 10 2006 Jesse Keating - 4.14-3.2 - bump again for double-long bug on ppc(64) --- stunnel-4.12-sample.patch DELETED --- From fedora-cvs-commits at redhat.com Sat Mar 18 02:36:16 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 17 Mar 2006 21:36:16 -0500 Subject: rpms/mrtg/devel .cvsignore, 1.10, 1.11 mrtg.spec, 1.26, 1.27 sources, 1.10, 1.11 Message-ID: <200603180236.k2I2aGlx021541@cvs.devel.redhat.com> Author: mitr Update of /cvs/dist/rpms/mrtg/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv21526 Modified Files: .cvsignore mrtg.spec sources Log Message: * Sat Mar 18 2006 Miloslav Trmac - 2.13.2-1 - Update to mrtg-2.13.2 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/mrtg/devel/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 30 Jan 2006 22:57:28 -0000 1.10 +++ .cvsignore 18 Mar 2006 02:36:14 -0000 1.11 @@ -1 +1,2 @@ -mrtg-2.13.0.tar.gz +mrtg-2.13.2.tar.gz +mrtg-2.13.2.tar.gz.md5.pgp Index: mrtg.spec =================================================================== RCS file: /cvs/dist/rpms/mrtg/devel/mrtg.spec,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- mrtg.spec 11 Feb 2006 04:38:34 -0000 1.26 +++ mrtg.spec 18 Mar 2006 02:36:14 -0000 1.27 @@ -5,14 +5,15 @@ Summary: Multi Router Traffic Grapher Name: mrtg -Version: 2.13.0 -Release: 1.2 +Version: 2.13.2 +Release: 1 URL: http://ee-staff.ethz.ch/~oetiker/webtools/mrtg/ -Source0: http://www.ee.ethz.ch/~oetiker/webtools/mrtg/pub/%{name}-%{version}.tar.gz -Source1: mrtg.cfg -Source2: filter-requires-mrtg.sh -Source3: mrtg.crond.in -Source4: mrtg-httpd.conf +Source0: http://people.ee.ethz.ch/~oetiker/webtools/mrtg/pub/mrtg-%{version}.tar.gz +Source1: http://people.ee.ethz.ch/~oetiker/webtools/mrtg/pub/mrtg-%{version}.tar.gz.md5.pgp +Source2: mrtg.cfg +Source3: filter-requires-mrtg.sh +Source4: mrtg.crond.in +Source5: mrtg-httpd.conf Patch0: mrtg-2.9.17-lib64.patch Patch1: mrtg-2.10.5-norpath.patch License: GPL @@ -21,7 +22,7 @@ Buildroot: %{_tmppath}/%{name}-%{version}-root BuildRequires: gd-devel, libpng-devel -%define __find_requires %{SOURCE2} +%define __find_requires %{SOURCE3} %description The Multi Router Traffic Grapher (MRTG) is a tool to monitor the traffic @@ -61,14 +62,14 @@ install -m 644 images/* $RPM_BUILD_ROOT%{contentdir}/ sed 's, at CONTENTDIR@,%{contentdir},g; s, at LIBDIR@,%{_localstatedir}/lib/mrtg,g' \ - %{SOURCE1} > $RPM_BUILD_ROOT%{_sysconfdir}/mrtg/mrtg.cfg + %{SOURCE2} > $RPM_BUILD_ROOT%{_sysconfdir}/mrtg/mrtg.cfg chmod 644 $RPM_BUILD_ROOT%{_sysconfdir}/mrtg/mrtg.cfg sed -e 's, at bindir@,%{_bindir},g; s, at sysconfdir@,%{_sysconfdir},g;' \ - -e 's, at localstatedir@,%{_localstatedir},g' %{SOURCE3} \ + -e 's, at localstatedir@,%{_localstatedir},g' %{SOURCE4} \ > $RPM_BUILD_ROOT%{_sysconfdir}/cron.d/mrtg chmod 644 $RPM_BUILD_ROOT%{_sysconfdir}/cron.d/mrtg -install -m 644 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/mrtg.conf +install -m 644 %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/mrtg.conf for i in mrtg cfgmaker indexmaker; do %{__perl} -pi -e 's;\@\@lib\@\@;%{_lib};g' $RPM_BUILD_ROOT%{_bindir}/$i @@ -110,6 +111,9 @@ %dir %{_localstatedir}/lock/mrtg %changelog +* Sat Mar 18 2006 Miloslav Trmac - 2.13.2-1 +- Update to mrtg-2.13.2 + * Fri Feb 10 2006 Jesse Keating - 2.13.0-1.2 - bump again for double-long bug on ppc(64) Index: sources =================================================================== RCS file: /cvs/dist/rpms/mrtg/devel/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 30 Jan 2006 22:57:28 -0000 1.10 +++ sources 18 Mar 2006 02:36:14 -0000 1.11 @@ -1 +1,2 @@ -18fc58377fc6e697fdf7ac2f66e3e6ff mrtg-2.13.0.tar.gz +daab44b14d608cda831b4dc481cec38a mrtg-2.13.2.tar.gz +9392855c1ebc8104d7a409d95306dc50 mrtg-2.13.2.tar.gz.md5.pgp From fedora-cvs-commits at redhat.com Sat Mar 18 02:43:50 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 17 Mar 2006 21:43:50 -0500 Subject: rpms/f-spot/devel f-spot.spec, 1.19, 1.20 f-spot-0.1.9-security-fix.patch, 1.1, NONE Message-ID: <200603180243.k2I2hooc021634@cvs.devel.redhat.com> Author: caillon Update of /cvs/dist/rpms/f-spot/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv21621 Modified Files: f-spot.spec Removed Files: f-spot-0.1.9-security-fix.patch Log Message: f-spot-0.1.9-security-fix.patch has been upstreamed finally Index: f-spot.spec =================================================================== RCS file: /cvs/dist/rpms/f-spot/devel/f-spot.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- f-spot.spec 18 Mar 2006 00:53:36 -0000 1.19 +++ f-spot.spec 18 Mar 2006 02:43:48 -0000 1.20 @@ -25,7 +25,6 @@ # No libgphoto etc on s390 ExcludeArch: s390 -Patch0: f-spot-0.1.9-security-fix.patch Patch1: f-spot-0.1.3-sqlite3.patch %description @@ -35,7 +34,6 @@ %prep %setup -q -%patch0 -p1 -b .security-fix %patch1 -p1 -b .sqlite3 %build --- f-spot-0.1.9-security-fix.patch DELETED --- From fedora-cvs-commits at redhat.com Sat Mar 18 02:51:35 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 17 Mar 2006 21:51:35 -0500 Subject: rpms/f-spot/devel f-spot.spec, 1.20, 1.21 f-spot-0.1.3-sqlite3.patch, 1.1, NONE Message-ID: <200603180251.k2I2pZDf001770@cvs.devel.redhat.com> Author: caillon Update of /cvs/dist/rpms/f-spot/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv1755 Modified Files: f-spot.spec Removed Files: f-spot-0.1.3-sqlite3.patch Log Message: f-spot-0.1.3-sqlite3.patch has an upstream equivalent checked in Index: f-spot.spec =================================================================== RCS file: /cvs/dist/rpms/f-spot/devel/f-spot.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- f-spot.spec 18 Mar 2006 02:43:48 -0000 1.20 +++ f-spot.spec 18 Mar 2006 02:51:33 -0000 1.21 @@ -25,8 +25,6 @@ # No libgphoto etc on s390 ExcludeArch: s390 -Patch1: f-spot-0.1.3-sqlite3.patch - %description F-Spot is an application designed to provide personal photo management to the GNOME desktop. Features include import, export, printing and advanced @@ -34,7 +32,6 @@ %prep %setup -q -%patch1 -p1 -b .sqlite3 %build export MONO_SHARED_DIR=%{_builddir}/%{?buildsubdir} --- f-spot-0.1.3-sqlite3.patch DELETED --- From fedora-cvs-commits at redhat.com Sat Mar 18 03:14:24 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 17 Mar 2006 22:14:24 -0500 Subject: rpms/tcsh/FC-5 tcsh-6.14.00-sigint.patch, NONE, 1.1 tcsh-6.14.00-wide-crash.patch, NONE, 1.1 tcsh.spec, 1.36, 1.37 Message-ID: <200603180314.k2I3EOoQ002078@cvs.devel.redhat.com> Author: mitr Update of /cvs/dist/rpms/tcsh/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv2061 Modified Files: tcsh.spec Added Files: tcsh-6.14.00-sigint.patch tcsh-6.14.00-wide-crash.patch Log Message: * Sat Mar 18 2006 Miloslav Trmac - 6.14-5.fc5.1 - Fix a crash when reading scripts with multibyte characters (#183267) - Block SIGINT while waiting for children (#177366) tcsh-6.14.00-sigint.patch: sh.proc.c | 28 ++++++++-------------------- 1 files changed, 8 insertions(+), 20 deletions(-) --- NEW FILE tcsh-6.14.00-sigint.patch --- --- tcsh-6.14.00/sh.proc.c.sigint 2006-02-19 05:07:32.000000000 +0100 +++ tcsh-6.14.00/sh.proc.c 2006-02-19 05:29:52.000000000 +0100 @@ -543,9 +543,7 @@ { struct process *fp; int jobflags, reason; -#ifdef BSDSIGS - sigmask_t omask; -#endif /* BSDSIGS */ + sigset_t omask, pause_mask; #ifdef UNRELSIGS signalfun_t inthandler; #endif /* UNRELSIGS */ @@ -562,17 +560,16 @@ * target process, or any of its friends, are running */ fp = pp; -#ifdef BSDSIGS - omask = sigblock(sigmask(SIGCHLD)); -#endif /* BSDSIGS */ + sigprocmask(SIG_BLOCK, NULL, &omask); + sighold(SIGINT); + sigprocmask(SIG_BLOCK, NULL, &pause_mask); + sighold(SIGCHLD); + sigdelset(&pause_mask, SIGCHLD); #ifdef UNRELSIGS if (setintr) inthandler = signal(SIGINT, SIG_IGN); #endif /* UNRELSIGS */ for (;;) { -#ifndef BSDSIGS - (void) sighold(SIGCHLD); -#endif /* !BSDSIGS */ jobflags = 0; do jobflags |= fp->p_flags; @@ -583,21 +580,12 @@ xprintf("%d starting to sigpause for SIGCHLD on %d\n", getpid(), fp->p_procid); #endif /* JOBDEBUG */ -#ifdef BSDSIGS - /* (void) sigpause(sigblock((sigmask_t) 0) &~ sigmask(SIGCHLD)); */ - (void) sigpause(omask & ~sigmask(SIGCHLD)); -#else /* !BSDSIGS */ - (void) sigpause(SIGCHLD); -#endif /* !BSDSIGS */ + sigsuspend(&pause_mask); } #ifdef JOBDEBUG xprintf("%d returned from sigpause loop\n", getpid()); #endif /* JOBDEBUG */ -#ifdef BSDSIGS - (void) sigsetmask(omask); -#else /* !BSDSIGS */ - (void) sigrelse(SIGCHLD); -#endif /* !BSDSIGS */ + sigprocmask(SIG_SETMASK, &omask, NULL); #ifdef UNRELSIGS if (setintr) (void) signal(SIGINT, inthandler); tcsh-6.14.00-wide-crash.patch: sh.lex.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) --- NEW FILE tcsh-6.14.00-wide-crash.patch --- --- tcsh-6.14.00/sh.lex.c.wide-crash 2006-02-28 03:34:58.000000000 +0100 +++ tcsh-6.14.00/sh.lex.c 2006-02-28 03:35:31.000000000 +0100 @@ -1710,13 +1710,13 @@ break; partial += r; i = 0; - while (i < partial) { + while (i < partial && nchars != 0) { int len; len = normal_mbtowc(buf + res, cbuf + i, partial - i); if (len == -1) { reset_mbtowc(); - if (partial < MB_LEN_MAX && r > 0) + if (partial - i < MB_LEN_MAX && r > 0) /* Maybe a partial character and there is still a chance to read more */ break; @@ -1735,7 +1735,7 @@ if (i != partial) memmove(cbuf, cbuf + i, partial - i); partial -= i; - } while (partial != 0); + } while (partial != 0 && nchars != 0); /* Throwing away possible partial multibyte characters on error */ return res != 0 ? res : r; } Index: tcsh.spec =================================================================== RCS file: /cvs/dist/rpms/tcsh/FC-5/tcsh.spec,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- tcsh.spec 11 Feb 2006 05:48:39 -0000 1.36 +++ tcsh.spec 18 Mar 2006 03:14:22 -0000 1.37 @@ -3,7 +3,7 @@ Summary: An enhanced version of csh, the C shell. Name: tcsh Version: 6.14 -Release: 5.2.1 +Release: 6.fc5.1 License: distributable Group: System Environment/Shells Source: ftp://ftp.astron.com/pub/tcsh/tcsh-%{version}.00.tar.gz @@ -13,6 +13,8 @@ Patch3: tcsh-6.14.00-lsF.patch Patch4: tcsh-6.14.00-dashn.patch Patch5: tcsh-6.14.00-read.patch +Patch6: tcsh-6.14.00-sigint.patch +Patch7: tcsh-6.14.00-wide-crash.patch Provides: csh = %{version} Prereq: fileutils, grep URL: http://www.tcsh.org/ @@ -35,6 +37,8 @@ %patch3 -p1 -b .lsF %patch4 -p1 -b .dashn %patch5 -p1 -b .read +%patch6 -p1 -b .sigint +%patch7 -p1 -b .wide-crash nroff -me eight-bit.me > eight-bit.txt @@ -102,6 +106,10 @@ %{_mandir}/*/* %changelog +* Sat Mar 18 2006 Miloslav Trmac - 6.14-5.fc5.1 +- Fix a crash when reading scripts with multibyte characters (#183267) +- Block SIGINT while waiting for children (#177366) + * Fri Feb 10 2006 Jesse Keating - 6.14-5.2.1 - bump again for double-long bug on ppc(64) From fedora-cvs-commits at redhat.com Sat Mar 18 03:17:06 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 17 Mar 2006 22:17:06 -0500 Subject: rpms/tcsh/FC-5 tcsh.spec,1.37,1.38 Message-ID: <200603180317.k2I3H6WL014666@cvs.devel.redhat.com> Author: mitr Update of /cvs/dist/rpms/tcsh/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv12722 Modified Files: tcsh.spec Log Message: Fix changelog Index: tcsh.spec =================================================================== RCS file: /cvs/dist/rpms/tcsh/FC-5/tcsh.spec,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- tcsh.spec 18 Mar 2006 03:14:22 -0000 1.37 +++ tcsh.spec 18 Mar 2006 03:17:04 -0000 1.38 @@ -106,7 +106,7 @@ %{_mandir}/*/* %changelog -* Sat Mar 18 2006 Miloslav Trmac - 6.14-5.fc5.1 +* Sat Mar 18 2006 Miloslav Trmac - 6.14-6.fc5.1 - Fix a crash when reading scripts with multibyte characters (#183267) - Block SIGINT while waiting for children (#177366) From fedora-cvs-commits at redhat.com Sat Mar 18 03:19:34 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 17 Mar 2006 22:19:34 -0500 Subject: rpms/tcsh/devel tcsh-6.14.00-sigint.patch, NONE, 1.1 tcsh-6.14.00-wide-crash.patch, NONE, 1.1 tcsh.spec, 1.36, 1.37 Message-ID: <200603180319.k2I3JYDm014698@cvs.devel.redhat.com> Author: mitr Update of /cvs/dist/rpms/tcsh/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv14681 Modified Files: tcsh.spec Added Files: tcsh-6.14.00-sigint.patch tcsh-6.14.00-wide-crash.patch Log Message: * Sat Mar 18 2006 Miloslav Trmac - 6.14-7 - Fix a crash when reading scripts with multibyte characters (#183267) - Block SIGINT while waiting for children (#177366) tcsh-6.14.00-sigint.patch: sh.proc.c | 28 ++++++++-------------------- 1 files changed, 8 insertions(+), 20 deletions(-) --- NEW FILE tcsh-6.14.00-sigint.patch --- --- tcsh-6.14.00/sh.proc.c.sigint 2006-02-19 05:07:32.000000000 +0100 +++ tcsh-6.14.00/sh.proc.c 2006-02-19 05:29:52.000000000 +0100 @@ -543,9 +543,7 @@ { struct process *fp; int jobflags, reason; -#ifdef BSDSIGS - sigmask_t omask; -#endif /* BSDSIGS */ + sigset_t omask, pause_mask; #ifdef UNRELSIGS signalfun_t inthandler; #endif /* UNRELSIGS */ @@ -562,17 +560,16 @@ * target process, or any of its friends, are running */ fp = pp; -#ifdef BSDSIGS - omask = sigblock(sigmask(SIGCHLD)); -#endif /* BSDSIGS */ + sigprocmask(SIG_BLOCK, NULL, &omask); + sighold(SIGINT); + sigprocmask(SIG_BLOCK, NULL, &pause_mask); + sighold(SIGCHLD); + sigdelset(&pause_mask, SIGCHLD); #ifdef UNRELSIGS if (setintr) inthandler = signal(SIGINT, SIG_IGN); #endif /* UNRELSIGS */ for (;;) { -#ifndef BSDSIGS - (void) sighold(SIGCHLD); -#endif /* !BSDSIGS */ jobflags = 0; do jobflags |= fp->p_flags; @@ -583,21 +580,12 @@ xprintf("%d starting to sigpause for SIGCHLD on %d\n", getpid(), fp->p_procid); #endif /* JOBDEBUG */ -#ifdef BSDSIGS - /* (void) sigpause(sigblock((sigmask_t) 0) &~ sigmask(SIGCHLD)); */ - (void) sigpause(omask & ~sigmask(SIGCHLD)); -#else /* !BSDSIGS */ - (void) sigpause(SIGCHLD); -#endif /* !BSDSIGS */ + sigsuspend(&pause_mask); } #ifdef JOBDEBUG xprintf("%d returned from sigpause loop\n", getpid()); #endif /* JOBDEBUG */ -#ifdef BSDSIGS - (void) sigsetmask(omask); -#else /* !BSDSIGS */ - (void) sigrelse(SIGCHLD); -#endif /* !BSDSIGS */ + sigprocmask(SIG_SETMASK, &omask, NULL); #ifdef UNRELSIGS if (setintr) (void) signal(SIGINT, inthandler); tcsh-6.14.00-wide-crash.patch: sh.lex.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) --- NEW FILE tcsh-6.14.00-wide-crash.patch --- --- tcsh-6.14.00/sh.lex.c.wide-crash 2006-02-28 03:34:58.000000000 +0100 +++ tcsh-6.14.00/sh.lex.c 2006-02-28 03:35:31.000000000 +0100 @@ -1710,13 +1710,13 @@ break; partial += r; i = 0; - while (i < partial) { + while (i < partial && nchars != 0) { int len; len = normal_mbtowc(buf + res, cbuf + i, partial - i); if (len == -1) { reset_mbtowc(); - if (partial < MB_LEN_MAX && r > 0) + if (partial - i < MB_LEN_MAX && r > 0) /* Maybe a partial character and there is still a chance to read more */ break; @@ -1735,7 +1735,7 @@ if (i != partial) memmove(cbuf, cbuf + i, partial - i); partial -= i; - } while (partial != 0); + } while (partial != 0 && nchars != 0); /* Throwing away possible partial multibyte characters on error */ return res != 0 ? res : r; } Index: tcsh.spec =================================================================== RCS file: /cvs/dist/rpms/tcsh/devel/tcsh.spec,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- tcsh.spec 11 Feb 2006 05:48:39 -0000 1.36 +++ tcsh.spec 18 Mar 2006 03:19:31 -0000 1.37 @@ -3,7 +3,7 @@ Summary: An enhanced version of csh, the C shell. Name: tcsh Version: 6.14 -Release: 5.2.1 +Release: 7 License: distributable Group: System Environment/Shells Source: ftp://ftp.astron.com/pub/tcsh/tcsh-%{version}.00.tar.gz @@ -13,6 +13,8 @@ Patch3: tcsh-6.14.00-lsF.patch Patch4: tcsh-6.14.00-dashn.patch Patch5: tcsh-6.14.00-read.patch +Patch6: tcsh-6.14.00-sigint.patch +Patch7: tcsh-6.14.00-wide-crash.patch Provides: csh = %{version} Prereq: fileutils, grep URL: http://www.tcsh.org/ @@ -35,6 +37,8 @@ %patch3 -p1 -b .lsF %patch4 -p1 -b .dashn %patch5 -p1 -b .read +%patch6 -p1 -b .sigint +%patch7 -p1 -b .wide-crash nroff -me eight-bit.me > eight-bit.txt @@ -102,6 +106,10 @@ %{_mandir}/*/* %changelog +* Sat Mar 18 2006 Miloslav Trmac - 6.14-7 +- Fix a crash when reading scripts with multibyte characters (#183267) +- Block SIGINT while waiting for children (#177366) + * Fri Feb 10 2006 Jesse Keating - 6.14-5.2.1 - bump again for double-long bug on ppc(64) From fedora-cvs-commits at redhat.com Sat Mar 18 03:35:26 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 17 Mar 2006 22:35:26 -0500 Subject: rpms/mlocate/FC-5 .cvsignore, 1.3, 1.4 mlocate.spec, 1.6, 1.7 sources, 1.3, 1.4 Message-ID: <200603180335.k2I3ZQmV014810@cvs.devel.redhat.com> Author: mitr Update of /cvs/dist/rpms/mlocate/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv14794 Modified Files: .cvsignore mlocate.spec sources Log Message: * Sat Mar 18 2006 Miloslav Trmac - 0.14-0.fc5.1 - Update to mlocate-0.14 (#182015) Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/mlocate/FC-5/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 31 Dec 2005 22:50:16 -0000 1.3 +++ .cvsignore 18 Mar 2006 03:35:23 -0000 1.4 @@ -1 +1 @@ -mlocate-0.12.tar.gz +mlocate-0.14.tar.gz Index: mlocate.spec =================================================================== RCS file: /cvs/dist/rpms/mlocate/FC-5/mlocate.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- mlocate.spec 11 Feb 2006 04:36:49 -0000 1.6 +++ mlocate.spec 18 Mar 2006 03:35:23 -0000 1.7 @@ -1,7 +1,7 @@ Summary: An utility for finding files by name Name: mlocate -Version: 0.12 -Release: 1.2 +Version: 0.14 +Release: 0.fc5.1 License: GPLv2 Group: Applications/System Source0: %{name}-%{version}.tar.gz @@ -66,6 +66,9 @@ %ghost /var/lib/mlocate/mlocate.db %changelog +* Sat Mar 18 2006 Miloslav Trmac - 0.14-0.fc5.1 +- Update to mlocate-0.14 (#182015) + * Fri Feb 10 2006 Jesse Keating - 0.12-1.2 - bump again for double-long bug on ppc(64) Index: sources =================================================================== RCS file: /cvs/dist/rpms/mlocate/FC-5/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 31 Dec 2005 22:50:16 -0000 1.3 +++ sources 18 Mar 2006 03:35:23 -0000 1.4 @@ -1 +1 @@ -d6658fe8cbe10fa91fd089bffe38229e mlocate-0.12.tar.gz +cbbf17d3b02f728038e7f5510e4e3849 mlocate-0.14.tar.gz From fedora-cvs-commits at redhat.com Sat Mar 18 03:41:30 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 17 Mar 2006 22:41:30 -0500 Subject: rpms/mlocate/devel .cvsignore, 1.3, 1.4 mlocate.spec, 1.6, 1.7 sources, 1.3, 1.4 Message-ID: <200603180341.k2I3fUVb014921@cvs.devel.redhat.com> Author: mitr Update of /cvs/dist/rpms/mlocate/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv14907 Modified Files: .cvsignore mlocate.spec sources Log Message: * Sat Mar 18 2006 Miloslav Trmac - 0.14-1 - Update to mlocate-0.14 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/mlocate/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 31 Dec 2005 22:50:16 -0000 1.3 +++ .cvsignore 18 Mar 2006 03:41:27 -0000 1.4 @@ -1 +1 @@ -mlocate-0.12.tar.gz +mlocate-0.14.tar.gz Index: mlocate.spec =================================================================== RCS file: /cvs/dist/rpms/mlocate/devel/mlocate.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- mlocate.spec 11 Feb 2006 04:36:49 -0000 1.6 +++ mlocate.spec 18 Mar 2006 03:41:27 -0000 1.7 @@ -1,7 +1,7 @@ Summary: An utility for finding files by name Name: mlocate -Version: 0.12 -Release: 1.2 +Version: 0.14 +Release: 1 License: GPLv2 Group: Applications/System Source0: %{name}-%{version}.tar.gz @@ -66,6 +66,9 @@ %ghost /var/lib/mlocate/mlocate.db %changelog +* Sat Mar 18 2006 Miloslav Trmac - 0.14-1 +- Update to mlocate-0.14 + * Fri Feb 10 2006 Jesse Keating - 0.12-1.2 - bump again for double-long bug on ppc(64) Index: sources =================================================================== RCS file: /cvs/dist/rpms/mlocate/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 31 Dec 2005 22:50:16 -0000 1.3 +++ sources 18 Mar 2006 03:41:27 -0000 1.4 @@ -1 +1 @@ -d6658fe8cbe10fa91fd089bffe38229e mlocate-0.12.tar.gz +cbbf17d3b02f728038e7f5510e4e3849 mlocate-0.14.tar.gz From fedora-cvs-commits at redhat.com Sat Mar 18 03:49:22 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 17 Mar 2006 22:49:22 -0500 Subject: rpms/mlocate/devel mlocate.spec,1.7,1.8 Message-ID: <200603180349.k2I3nMvQ027590@cvs.devel.redhat.com> Author: mitr Update of /cvs/dist/rpms/mlocate/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv27577 Modified Files: mlocate.spec Log Message: * Sat Mar 18 2006 Miloslav Trmac - 0.14-2 - Ship NEWS Index: mlocate.spec =================================================================== RCS file: /cvs/dist/rpms/mlocate/devel/mlocate.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- mlocate.spec 18 Mar 2006 03:41:27 -0000 1.7 +++ mlocate.spec 18 Mar 2006 03:49:20 -0000 1.8 @@ -1,7 +1,7 @@ Summary: An utility for finding files by name Name: mlocate Version: 0.14 -Release: 1 +Release: 2 License: GPLv2 Group: Applications/System Source0: %{name}-%{version}.tar.gz @@ -56,7 +56,7 @@ %files -f mlocate.lang %defattr(-,root,root,-) -%doc AUTHORS COPYING README +%doc AUTHORS COPYING NEWS README /etc/cron.daily/mlocate.cron %config(noreplace) %{_sysconfdir}/updatedb.conf %attr(2711,root,slocate) %{_bindir}/locate @@ -66,6 +66,9 @@ %ghost /var/lib/mlocate/mlocate.db %changelog +* Sat Mar 18 2006 Miloslav Trmac - 0.14-2 +- Ship NEWS + * Sat Mar 18 2006 Miloslav Trmac - 0.14-1 - Update to mlocate-0.14 From fedora-cvs-commits at redhat.com Sat Mar 18 04:09:14 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 17 Mar 2006 23:09:14 -0500 Subject: rpms/selinux-policy/devel .cvsignore, 1.47, 1.48 policy-20060207.patch, 1.51, 1.52 selinux-policy.spec, 1.154, 1.155 sources, 1.51, 1.52 Message-ID: <200603180409.k2I49Eon027853@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/selinux-policy/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv27835 Modified Files: .cvsignore policy-20060207.patch selinux-policy.spec sources Log Message: * Wed Mar 17 2006 Dan Walsh 2.2.24-1 - Update to upstream Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/.cvsignore,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- .cvsignore 4 Mar 2006 14:49:35 -0000 1.47 +++ .cvsignore 18 Mar 2006 04:09:10 -0000 1.48 @@ -48,3 +48,4 @@ serefpolicy-2.2.21.tgz serefpolicy-2.2.22.tgz serefpolicy-2.2.23.tgz +serefpolicy-2.2.24.tgz policy-20060207.patch: Rules.modular | 2 policy/mcs | 4 policy/modules/admin/bootloader.te | 2 policy/modules/admin/dmidecode.te | 2 policy/modules/admin/readahead.te | 2 policy/modules/admin/rpm.fc | 2 policy/modules/admin/rpm.if | 3 policy/modules/admin/rpm.te | 1 policy/modules/admin/su.fc | 1 policy/modules/admin/su.if | 6 policy/modules/admin/updfstab.te | 4 policy/modules/admin/vbetool.te | 9 + policy/modules/kernel/corenetwork.te.in | 1 policy/modules/kernel/devices.fc | 1 policy/modules/kernel/devices.if | 21 ++- policy/modules/kernel/files.fc | 8 - policy/modules/kernel/files.if | 21 ++- policy/modules/kernel/filesystem.te | 1 policy/modules/kernel/kernel.if | 102 ++++++++++++++ policy/modules/kernel/kernel.te | 3 policy/modules/services/apache.fc | 2 policy/modules/services/apache.if | 5 policy/modules/services/apm.fc | 2 policy/modules/services/apm.te | 4 policy/modules/services/bluetooth.te | 20 +- policy/modules/services/cron.te | 3 policy/modules/services/cups.fc | 2 policy/modules/services/cups.if | 22 +++ policy/modules/services/cups.te | 7 - policy/modules/services/cvs.te | 2 policy/modules/services/hal.if | 41 +++++ policy/modules/services/hal.te | 13 + policy/modules/services/ktalk.fc | 1 policy/modules/services/ktalk.te | 6 policy/modules/services/mailman.if | 25 +++ policy/modules/services/nis.fc | 1 policy/modules/services/nis.if | 25 +++ policy/modules/services/nis.te | 28 ++++ policy/modules/services/nscd.if | 2 policy/modules/services/postfix.te | 4 policy/modules/services/samba.te | 2 policy/modules/services/sendmail.te | 1 policy/modules/system/fstools.if | 18 ++ policy/modules/system/fstools.te | 3 policy/modules/system/init.te | 5 policy/modules/system/libraries.fc | 2 policy/modules/system/locallogin.te | 1 policy/modules/system/lvm.fc | 1 policy/modules/system/lvm.te | 3 policy/modules/system/mount.te | 3 policy/modules/system/selinuxutil.fc | 6 policy/modules/system/selinuxutil.if | 23 ++- policy/modules/system/selinuxutil.te | 16 ++ policy/modules/system/sysnetwork.te | 7 + policy/modules/system/udev.te | 2 policy/modules/system/unconfined.te | 8 - policy/modules/system/userdomain.te | 1 policy/modules/system/xend.fc | 23 +++ policy/modules/system/xend.if | 71 ++++++++++ policy/modules/system/xend.te | 219 ++++++++++++++++++++++++++++++++ 60 files changed, 774 insertions(+), 52 deletions(-) Index: policy-20060207.patch =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20060207.patch,v retrieving revision 1.51 retrieving revision 1.52 diff -u -r1.51 -r1.52 --- policy-20060207.patch 16 Mar 2006 14:41:17 -0000 1.51 +++ policy-20060207.patch 18 Mar 2006 04:09:10 -0000 1.52 @@ -147,15 +147,6 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corenetwork.te.in serefpolicy-2.2.23/policy/modules/kernel/corenetwork.te.in --- nsaserefpolicy/policy/modules/kernel/corenetwork.te.in 2006-02-20 14:07:36.000000000 -0500 +++ serefpolicy-2.2.23/policy/modules/kernel/corenetwork.te.in 2006-03-07 13:42:37.000000000 -0500 -@@ -66,7 +66,7 @@ - network_port(giftd, tcp,1213,s0) - network_port(gopher, tcp,70,s0, udp,70,s0) - network_port(http_cache, tcp,3128,s0, udp,3130,s0, tcp,8080,s0, tcp,8118,s0) # 8118 is for privoxy --network_port(http, tcp,80,s0, tcp,443,s0, tcp,488,s0, tcp,8008,s0) -+network_port(http, tcp,80,s0, tcp,443,s0, tcp,488,s0, tcp,8008,s0, tcp, 9050, s0) # 9050 is for Tor - network_port(howl, tcp,5335,s0, udp,5353,s0) - network_port(hplip, tcp,50000,s0, tcp,50002,s0) - network_port(i18n_input, tcp,9010,s0) @@ -126,6 +126,7 @@ network_port(uucpd, tcp,540,s0) network_port(vnc, tcp,5900,s0) @@ -442,19 +433,6 @@ # # Sysctl types # -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/terminal.if serefpolicy-2.2.23/policy/modules/kernel/terminal.if ---- nsaserefpolicy/policy/modules/kernel/terminal.if 2006-02-14 07:20:25.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/kernel/terminal.if 2006-03-13 15:57:21.000000000 -0500 -@@ -588,8 +588,8 @@ - type devpts_t; - ') - -- dev_list_all_dev_nodes($1) - allow $1 devpts_t:dir r_dir_perms; -+ dev_list_all_dev_nodes($1) - allow $1 ptynode:chr_file { rw_term_perms lock append }; - ') - diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.fc serefpolicy-2.2.23/policy/modules/services/apache.fc --- nsaserefpolicy/policy/modules/services/apache.fc 2006-02-27 17:17:23.000000000 -0500 +++ serefpolicy-2.2.23/policy/modules/services/apache.fc 2006-03-07 13:42:37.000000000 -0500 @@ -1705,18 +1683,3 @@ $(verbose) install -m 644 $(TMPDIR)/customizable_types $@ ######################################## -diff --exclude-from=exclude -N -u -r nsaserefpolicy/support/Makefile.devel serefpolicy-2.2.23/support/Makefile.devel ---- nsaserefpolicy/support/Makefile.devel 2006-02-22 14:09:04.000000000 -0500 -+++ serefpolicy-2.2.23/support/Makefile.devel 2006-03-07 13:42:37.000000000 -0500 -@@ -6,10 +6,7 @@ - SED ?= sed - EINFO ?= echo - PYTHON ?= python -- --NAME ?= $(shell $(AWK) -F= '/^SELINUXTYPE/{ print $$2 }' /etc/selinux/config) --SHAREDIR ?= /usr/share/selinux --HEADERDIR ?= $(SHAREDIR)/$(NAME)/include -+HEADERDIR ?= . - - include $(HEADERDIR)/build.conf - Index: selinux-policy.spec =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v retrieving revision 1.154 retrieving revision 1.155 diff -u -r1.154 -r1.155 --- selinux-policy.spec 16 Mar 2006 14:41:17 -0000 1.154 +++ selinux-policy.spec 18 Mar 2006 04:09:10 -0000 1.155 @@ -5,12 +5,12 @@ %define BUILD_TARGETED 0 %define BUILD_MLS 1 %define POLICYVER 20 -%define POLICYCOREUTILSVER 1.29.26-1 -%define CHECKPOLICYVER 1.29.4-1 +%define POLICYCOREUTILSVER 1.30-1 +%define CHECKPOLICYVER 1.30-1 Summary: SELinux policy configuration Name: selinux-policy -Version: 2.2.23 -Release: 19 +Version: 2.2.24 +Release: 1 License: GPL Group: System Environment/Base Source: serefpolicy-%{version}.tgz @@ -133,7 +133,7 @@ . %{_sysconfdir}/selinux/config; \ FILE_CONTEXT=%{_sysconfdir}/selinux/%1/contexts/files/file_contexts; \ if [ "${SELINUXTYPE}" == %1 -a -f ${FILE_CONTEXT}.pre ]; then \ - fixfiles -C ${FILE_CONTEXT}.pre restore; \ + /usr/sbin/fixfiles -C ${FILE_CONTEXT}.pre restore; \ rm -f ${FILE_CONTEXT}.pre; \ fi; @@ -298,6 +298,9 @@ %fileList strict %changelog +* Wed Mar 17 2006 Dan Walsh 2.2.24-1 +- Update to upstream + * Wed Mar 15 2006 Dan Walsh 2.2.23-19 - Get transition rules to create policy.20 at SystemHigh Index: sources =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/sources,v retrieving revision 1.51 retrieving revision 1.52 diff -u -r1.51 -r1.52 --- sources 4 Mar 2006 14:49:35 -0000 1.51 +++ sources 18 Mar 2006 04:09:10 -0000 1.52 @@ -1 +1 @@ -bf76b7f77de4a36a1842db5cb0a98fa7 serefpolicy-2.2.23.tgz +de72e7453c9213a41bb2ec0c14ef11c3 serefpolicy-2.2.24.tgz From fedora-cvs-commits at redhat.com Sat Mar 18 04:58:52 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 17 Mar 2006 23:58:52 -0500 Subject: rpms/policycoreutils/devel policycoreutils-rhat.patch, 1.171, 1.172 policycoreutils.spec, 1.244, 1.245 Message-ID: <200603180458.k2I4wqdF020671@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/policycoreutils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv20656 Modified Files: policycoreutils-rhat.patch policycoreutils.spec Log Message: * Fri Mar 17 2006 Dan Walsh 1.30-2 - Restorecon has to handle suspend/resume policycoreutils-rhat.patch: Makefile | 2 restorecond/Makefile | 29 ++ restorecond/restorecond.8 | 31 ++ restorecond/restorecond.c | 469 +++++++++++++++++++++++++++++++++++++++++++ restorecond/restorecond.conf | 3 restorecond/restorecond.h | 31 ++ restorecond/restorecond.init | 57 +++++ restorecond/stringslist.c | 118 ++++++++++ restorecond/stringslist.h | 37 +++ restorecond/utmpwatcher.c | 105 +++++++++ restorecond/utmpwatcher.h | 29 ++ scripts/fixfiles | 10 semanage/seobject.py | 15 - 13 files changed, 926 insertions(+), 10 deletions(-) Index: policycoreutils-rhat.patch =================================================================== RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v retrieving revision 1.171 retrieving revision 1.172 diff -u -r1.171 -r1.172 --- policycoreutils-rhat.patch 17 Mar 2006 21:43:31 -0000 1.171 +++ policycoreutils-rhat.patch 18 Mar 2006 04:58:48 -0000 1.172 @@ -1,6 +1,6 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/Makefile policycoreutils-1.30/Makefile --- nsapolicycoreutils/Makefile 2005-11-29 10:55:01.000000000 -0500 -+++ policycoreutils-1.30/Makefile 2006-03-17 15:37:21.000000000 -0500 ++++ policycoreutils-1.30/Makefile 2006-03-17 23:29:02.000000000 -0500 @@ -1,4 +1,4 @@ -SUBDIRS=setfiles semanage load_policy newrole run_init restorecon audit2allow audit2why scripts sestatus semodule_package semodule semodule_link semodule_expand setsebool po +SUBDIRS=setfiles semanage load_policy newrole run_init restorecon restorecond audit2allow audit2why scripts sestatus semodule_package semodule semodule_link semodule_expand setsebool po @@ -9,7 +9,7 @@ @for subdir in $(SUBDIRS); do \ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/restorecond/Makefile policycoreutils-1.30/restorecond/Makefile --- nsapolicycoreutils/restorecond/Makefile 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.30/restorecond/Makefile 2006-03-17 15:37:21.000000000 -0500 ++++ policycoreutils-1.30/restorecond/Makefile 2006-03-17 23:29:02.000000000 -0500 @@ -0,0 +1,29 @@ +# Installation directories. +PREFIX ?= ${DESTDIR}/usr @@ -42,7 +42,7 @@ + diff --exclude-from=exclude -N -u -r nsapolicycoreutils/restorecond/restorecond.8 policycoreutils-1.30/restorecond/restorecond.8 --- nsapolicycoreutils/restorecond/restorecond.8 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.30/restorecond/restorecond.8 2006-03-17 15:37:21.000000000 -0500 ++++ policycoreutils-1.30/restorecond/restorecond.8 2006-03-17 23:29:02.000000000 -0500 @@ -0,0 +1,31 @@ +.TH "restorecond" "8" "2002031409" "" "" +.SH "NAME" @@ -77,8 +77,8 @@ +.BR restorecon (8), diff --exclude-from=exclude -N -u -r nsapolicycoreutils/restorecond/restorecond.c policycoreutils-1.30/restorecond/restorecond.c --- nsapolicycoreutils/restorecond/restorecond.c 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.30/restorecond/restorecond.c 2006-03-17 15:43:36.000000000 -0500 -@@ -0,0 +1,462 @@ ++++ policycoreutils-1.30/restorecond/restorecond.c 2006-03-17 23:56:29.000000000 -0500 +@@ -0,0 +1,469 @@ +/* + * restorecond + * @@ -142,6 +142,8 @@ +extern char *dirname(char *path); +static int master_fd=-1; +static int master_wd=-1; ++static int terminate=0; ++ +#include +#include + @@ -367,7 +369,12 @@ + char buf[BUF_LEN]; + int len, i = 0; + len = read(fd, buf, BUF_LEN); -+ if (len < 0) { ++ if (len < 0) { ++ if (terminate == 0) { ++ syslog(LOG_ERR, "Read error (%s)", strerror(errno)); ++ return 0; ++ } ++ syslog(LOG_ERR, "terminated"); + return -1; + } else if (!len) + /* BUF_LEN too small? */ @@ -433,11 +440,11 @@ + */ +static void term_handler() +{ ++ terminate=1; + /* trigger a failure in the watch */ + close(master_fd); +} + -+ +static void usage(char *program) { + printf("%s [-d] \n", program); + exit(0); @@ -543,14 +550,14 @@ +} diff --exclude-from=exclude -N -u -r nsapolicycoreutils/restorecond/restorecond.conf policycoreutils-1.30/restorecond/restorecond.conf --- nsapolicycoreutils/restorecond/restorecond.conf 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.30/restorecond/restorecond.conf 2006-03-17 15:37:21.000000000 -0500 ++++ policycoreutils-1.30/restorecond/restorecond.conf 2006-03-17 23:29:02.000000000 -0500 @@ -0,0 +1,3 @@ +/etc/resolv.conf +/etc/mtab +~/public_html diff --exclude-from=exclude -N -u -r nsapolicycoreutils/restorecond/restorecond.h policycoreutils-1.30/restorecond/restorecond.h --- nsapolicycoreutils/restorecond/restorecond.h 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.30/restorecond/restorecond.h 2006-03-17 15:40:56.000000000 -0500 ++++ policycoreutils-1.30/restorecond/restorecond.h 2006-03-17 23:29:02.000000000 -0500 @@ -0,0 +1,31 @@ +/* restorecond.h -- + * Copyright 2006 Red Hat Inc., Durham, North Carolina. @@ -585,7 +592,7 @@ + diff --exclude-from=exclude -N -u -r nsapolicycoreutils/restorecond/restorecond.init policycoreutils-1.30/restorecond/restorecond.init --- nsapolicycoreutils/restorecond/restorecond.init 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.30/restorecond/restorecond.init 2006-03-17 15:37:21.000000000 -0500 ++++ policycoreutils-1.30/restorecond/restorecond.init 2006-03-17 23:29:02.000000000 -0500 @@ -0,0 +1,57 @@ +#!/bin/sh +# @@ -646,7 +653,7 @@ +exit 0 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/restorecond/stringslist.c policycoreutils-1.30/restorecond/stringslist.c --- nsapolicycoreutils/restorecond/stringslist.c 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.30/restorecond/stringslist.c 2006-03-17 15:42:58.000000000 -0500 ++++ policycoreutils-1.30/restorecond/stringslist.c 2006-03-17 23:29:02.000000000 -0500 @@ -0,0 +1,118 @@ +/* + * Copyright (C) 2006 Red Hat @@ -768,7 +775,7 @@ +#endif diff --exclude-from=exclude -N -u -r nsapolicycoreutils/restorecond/stringslist.h policycoreutils-1.30/restorecond/stringslist.h --- nsapolicycoreutils/restorecond/stringslist.h 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.30/restorecond/stringslist.h 2006-03-17 15:41:47.000000000 -0500 ++++ policycoreutils-1.30/restorecond/stringslist.h 2006-03-17 23:29:02.000000000 -0500 @@ -0,0 +1,37 @@ +/* stringslist.h -- + * Copyright 2006 Red Hat Inc., Durham, North Carolina. @@ -809,7 +816,7 @@ +#endif diff --exclude-from=exclude -N -u -r nsapolicycoreutils/restorecond/utmpwatcher.c policycoreutils-1.30/restorecond/utmpwatcher.c --- nsapolicycoreutils/restorecond/utmpwatcher.c 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.30/restorecond/utmpwatcher.c 2006-03-17 15:43:12.000000000 -0500 ++++ policycoreutils-1.30/restorecond/utmpwatcher.c 2006-03-17 23:29:02.000000000 -0500 @@ -0,0 +1,105 @@ +/* + * utmpwatcher.c @@ -918,7 +925,7 @@ + diff --exclude-from=exclude -N -u -r nsapolicycoreutils/restorecond/utmpwatcher.h policycoreutils-1.30/restorecond/utmpwatcher.h --- nsapolicycoreutils/restorecond/utmpwatcher.h 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.30/restorecond/utmpwatcher.h 2006-03-17 15:40:46.000000000 -0500 ++++ policycoreutils-1.30/restorecond/utmpwatcher.h 2006-03-17 23:29:02.000000000 -0500 @@ -0,0 +1,29 @@ +/* utmpwatcher.h -- + * Copyright 2006 Red Hat Inc., Durham, North Carolina. @@ -951,7 +958,7 @@ +#endif diff --exclude-from=exclude -N -u -r nsapolicycoreutils/scripts/fixfiles policycoreutils-1.30/scripts/fixfiles --- nsapolicycoreutils/scripts/fixfiles 2006-01-04 13:07:46.000000000 -0500 -+++ policycoreutils-1.30/scripts/fixfiles 2006-03-17 16:26:25.000000000 -0500 ++++ policycoreutils-1.30/scripts/fixfiles 2006-03-17 23:29:02.000000000 -0500 @@ -124,7 +124,15 @@ exit $? fi @@ -971,7 +978,7 @@ LogReadOnly diff --exclude-from=exclude -N -u -r nsapolicycoreutils/semanage/seobject.py policycoreutils-1.30/semanage/seobject.py --- nsapolicycoreutils/semanage/seobject.py 2006-03-10 09:48:05.000000000 -0500 -+++ policycoreutils-1.30/semanage/seobject.py 2006-03-17 15:37:21.000000000 -0500 ++++ policycoreutils-1.30/semanage/seobject.py 2006-03-17 23:29:02.000000000 -0500 @@ -229,10 +229,9 @@ if rc < 0: raise ValueError("Could not set name for %s" % name) Index: policycoreutils.spec =================================================================== RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils.spec,v retrieving revision 1.244 retrieving revision 1.245 diff -u -r1.244 -r1.245 --- policycoreutils.spec 17 Mar 2006 21:39:21 -0000 1.244 +++ policycoreutils.spec 18 Mar 2006 04:58:48 -0000 1.245 @@ -5,7 +5,7 @@ Summary: SELinux policy core utilities. Name: policycoreutils Version: 1.30 -Release: 1 +Release: 2 License: GPL Group: System Environment/Base Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz @@ -104,6 +104,9 @@ %config(noreplace) /etc/selinux/restorecond.conf %changelog +* Fri Mar 17 2006 Dan Walsh 1.30-2 +- Restorecon has to handle suspend/resume + * Fri Mar 17 2006 Dan Walsh 1.30-1 - Update to upstream From fedora-cvs-commits at redhat.com Sat Mar 18 21:56:07 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sat, 18 Mar 2006 16:56:07 -0500 Subject: rpms/kernel/devel patch-2.6.16-rc6-git11.bz2.sign, NONE, 1.1 .cvsignore, 1.384, 1.385 kernel-2.6.spec, 1.2060, 1.2061 sources, 1.325, 1.326 upstream, 1.298, 1.299 patch-2.6.16-rc6-git9.bz2.sign, 1.1, NONE Message-ID: <200603182156.k2ILu79e029742@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv29727 Modified Files: .cvsignore kernel-2.6.spec sources upstream Added Files: patch-2.6.16-rc6-git11.bz2.sign Removed Files: patch-2.6.16-rc6-git9.bz2.sign Log Message: git11 --- NEW FILE patch-2.6.16-rc6-git11.bz2.sign --- -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.2.2 (GNU/Linux) Comment: See http://www.kernel.org/signature.html for info iD8DBQBEHFkryGugalF9Dw4RAvO/AJ9XpkHU1KfvfKdaOVDF8srLKwVPuwCbBjH7 dfmAxQTS+6menkEbPwrm5RM= =NW32 -----END PGP SIGNATURE----- Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v retrieving revision 1.384 retrieving revision 1.385 diff -u -r1.384 -r1.385 --- .cvsignore 17 Mar 2006 22:22:35 -0000 1.384 +++ .cvsignore 18 Mar 2006 21:56:05 -0000 1.385 @@ -4,4 +4,4 @@ linux-2.6.15.tar.bz2 xen-20060301.tar.bz2 patch-2.6.16-rc6.bz2 -patch-2.6.16-rc6-git9.bz2 +patch-2.6.16-rc6-git11.bz2 Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.2060 retrieving revision 1.2061 diff -u -r1.2060 -r1.2061 --- kernel-2.6.spec 17 Mar 2006 22:22:35 -0000 1.2060 +++ kernel-2.6.spec 18 Mar 2006 21:56:05 -0000 1.2061 @@ -218,7 +218,7 @@ # Patches 0 through 100 are meant for core subsystem upgrades # Patch1: patch-2.6.16-rc6.bz2 -Patch2: patch-2.6.16-rc6-git9.bz2 +Patch2: patch-2.6.16-rc6-git11.bz2 # Patches 100 through 500 are meant for architecture patches Patch100: linux-2.6-bzimage.patch @@ -1660,6 +1660,9 @@ %endif %changelog +* Sat Mar 18 2006 Dave Jones +- 2.6.16rc6-git10 & git11 + * Fri Mar 17 2006 Dave Jones - 2.6.16rc6-git8 & git9 Index: sources =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/sources,v retrieving revision 1.325 retrieving revision 1.326 diff -u -r1.325 -r1.326 --- sources 17 Mar 2006 22:22:35 -0000 1.325 +++ sources 18 Mar 2006 21:56:05 -0000 1.326 @@ -1,4 +1,4 @@ cdf95e00f5111e31f78e1d97304d9522 linux-2.6.15.tar.bz2 cdfde609af8adcf58d7ff626599b2d90 xen-20060301.tar.bz2 67fe4dce92d3103e56dd8d2d3c20b3ed patch-2.6.16-rc6.bz2 -ef3f6498d6aedc9a632f67ebc47c2fb0 patch-2.6.16-rc6-git9.bz2 +fbb0346acc83646b5ae40090c9204317 patch-2.6.16-rc6-git11.bz2 Index: upstream =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/upstream,v retrieving revision 1.298 retrieving revision 1.299 diff -u -r1.298 -r1.299 --- upstream 17 Mar 2006 22:22:35 -0000 1.298 +++ upstream 18 Mar 2006 21:56:05 -0000 1.299 @@ -1,3 +1,3 @@ linux-2.6.15.tar.bz2 patch-2.6.16-rc6.bz2 -patch-2.6.16-rc6-git9.bz2 +patch-2.6.16-rc6-git11.bz2 --- patch-2.6.16-rc6-git9.bz2.sign DELETED --- From fedora-cvs-commits at redhat.com Sun Mar 19 03:43:43 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sat, 18 Mar 2006 22:43:43 -0500 Subject: rpms/texinfo/devel texinfo.spec,1.34,1.35 Message-ID: <200603190343.k2J3hhks006263@cvs.devel.redhat.com> Author: mitr Update of /cvs/dist/rpms/texinfo/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv6250 Modified Files: texinfo.spec Log Message: * Sun Mar 19 2006 Miloslav Trmac - 4.8-10 - Remove incorrect Prefix: - Drop info/README - Convert change log to UTF-8 Index: texinfo.spec =================================================================== RCS file: /cvs/dist/rpms/texinfo/devel/texinfo.spec,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- texinfo.spec 11 Feb 2006 05:51:24 -0000 1.34 +++ texinfo.spec 19 Mar 2006 03:43:40 -0000 1.35 @@ -1,7 +1,7 @@ Summary: Tools needed to create Texinfo format documentation files. Name: texinfo Version: 4.8 -Release: 9.2 +Release: 10 License: GPL Group: Applications/Publishing Url: http://www.gnu.org/software/texinfo/ @@ -11,7 +11,6 @@ Patch1: texinfo-4.8-zlib.patch Patch2: texinfo-CAN-2005-3011.patch Prereq: /sbin/install-info -Prefix: %{_prefix} Buildroot: %{_tmppath}/%{name}-%{version}-root BuildRequires: zlib-devel, ncurses-devel Requires: tetex @@ -96,7 +95,6 @@ %files -f %{name}.lang %defattr(-,root,root) %doc AUTHORS ChangeLog INSTALL INTRODUCTION NEWS README TODO -%doc --parents info/README %{_bindir}/makeinfo %{_bindir}/texindex %{_bindir}/texi2dvi @@ -123,6 +121,11 @@ %{_mandir}/man5/info.5* %changelog +* Sun Mar 19 2006 Miloslav Trmac - 4.8-10 +- Remove incorrect Prefix: +- Drop info/README +- Convert change log to UTF-8 + * Fri Feb 10 2006 Jesse Keating - 4.8-9.2 - bump again for double-long bug on ppc(64) @@ -266,7 +269,7 @@ * Tue Apr 24 2001 Bernhard Rosenkraenzer 4.0a-1 - Update to 4.0a, the patch looks sane -* Fri Feb 23 2001 Trond Eivind Glomsr?d +* Fri Feb 23 2001 Trond Eivind Glomsr??d - langify - don't create desktop file in spec file @@ -282,7 +285,7 @@ * Thu Sep 7 2000 Jeff Johnson - FHS packaging (64bit systems need to use %%_libdir not /usr/lib). -* Sat Aug 19 2000 Trond Eivind Glomsr?d +* Sat Aug 19 2000 Trond Eivind Glomsr??d - really do it - #16120 * Mon Aug 14 2000 Helge Deller @@ -325,7 +328,7 @@ * Thu Jan 13 2000 Jeff Johnson - recompile to eliminate ncurses foul-up. -* Tue Nov 9 1999 Bernhard Rosenkr?nzer +* Tue Nov 9 1999 Bernhard Rosenkr??nzer - 4.0 - handle RPM_OPT_FLAGS From fedora-cvs-commits at redhat.com Sun Mar 19 23:42:04 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sun, 19 Mar 2006 18:42:04 -0500 Subject: rpms/kernel/devel patch-2.6.16-rc6-git12.bz2.sign, NONE, 1.1 .cvsignore, 1.385, 1.386 kernel-2.6.spec, 1.2061, 1.2062 sources, 1.326, 1.327 upstream, 1.299, 1.300 patch-2.6.16-rc6-git11.bz2.sign, 1.1, NONE Message-ID: <200603192342.k2JNg4aJ025635@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv25618 Modified Files: .cvsignore kernel-2.6.spec sources upstream Added Files: patch-2.6.16-rc6-git12.bz2.sign Removed Files: patch-2.6.16-rc6-git11.bz2.sign Log Message: git12 --- NEW FILE patch-2.6.16-rc6-git12.bz2.sign --- -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.2.2 (GNU/Linux) Comment: See http://www.kernel.org/signature.html for info iD8DBQBEHQHsyGugalF9Dw4RAjG3AJ9hVby8q9cwT9saMJhup4g6XugsKQCfdXkS CtxbDyIe3JRQ3JtIyqeintU= =5EmS -----END PGP SIGNATURE----- Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v retrieving revision 1.385 retrieving revision 1.386 diff -u -r1.385 -r1.386 --- .cvsignore 18 Mar 2006 21:56:05 -0000 1.385 +++ .cvsignore 19 Mar 2006 23:42:02 -0000 1.386 @@ -4,4 +4,4 @@ linux-2.6.15.tar.bz2 xen-20060301.tar.bz2 patch-2.6.16-rc6.bz2 -patch-2.6.16-rc6-git11.bz2 +patch-2.6.16-rc6-git12.bz2 Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.2061 retrieving revision 1.2062 diff -u -r1.2061 -r1.2062 --- kernel-2.6.spec 18 Mar 2006 21:56:05 -0000 1.2061 +++ kernel-2.6.spec 19 Mar 2006 23:42:02 -0000 1.2062 @@ -218,7 +218,7 @@ # Patches 0 through 100 are meant for core subsystem upgrades # Patch1: patch-2.6.16-rc6.bz2 -Patch2: patch-2.6.16-rc6-git11.bz2 +Patch2: patch-2.6.16-rc6-git12.bz2 # Patches 100 through 500 are meant for architecture patches Patch100: linux-2.6-bzimage.patch @@ -1660,6 +1660,9 @@ %endif %changelog +* Sun Mar 19 2006 Dave Jones +- 2.6.16rc6-git12 + * Sat Mar 18 2006 Dave Jones - 2.6.16rc6-git10 & git11 Index: sources =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/sources,v retrieving revision 1.326 retrieving revision 1.327 diff -u -r1.326 -r1.327 --- sources 18 Mar 2006 21:56:05 -0000 1.326 +++ sources 19 Mar 2006 23:42:02 -0000 1.327 @@ -1,4 +1,4 @@ cdf95e00f5111e31f78e1d97304d9522 linux-2.6.15.tar.bz2 cdfde609af8adcf58d7ff626599b2d90 xen-20060301.tar.bz2 67fe4dce92d3103e56dd8d2d3c20b3ed patch-2.6.16-rc6.bz2 -fbb0346acc83646b5ae40090c9204317 patch-2.6.16-rc6-git11.bz2 +44504264411ae68b14438de19c0f9cb3 patch-2.6.16-rc6-git12.bz2 Index: upstream =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/upstream,v retrieving revision 1.299 retrieving revision 1.300 diff -u -r1.299 -r1.300 --- upstream 18 Mar 2006 21:56:05 -0000 1.299 +++ upstream 19 Mar 2006 23:42:02 -0000 1.300 @@ -1,3 +1,3 @@ linux-2.6.15.tar.bz2 patch-2.6.16-rc6.bz2 -patch-2.6.16-rc6-git11.bz2 +patch-2.6.16-rc6-git12.bz2 --- patch-2.6.16-rc6-git11.bz2.sign DELETED --- From fedora-cvs-commits at redhat.com Sun Mar 19 23:46:39 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sun, 19 Mar 2006 18:46:39 -0500 Subject: rpms/kernel/FC-5 patch-2.6.16-rc6-git12.bz2.sign, NONE, 1.1 .cvsignore, 1.381, 1.382 kernel-2.6.spec, 1.2057, 1.2058 sources, 1.322, 1.323 upstream, 1.295, 1.296 patch-2.6.16-rc6-git3.bz2.sign, 1.1, NONE patch-2.6.16-rc6-git5.bz2.sign, 1.1, NONE Message-ID: <200603192346.k2JNkdPu005795@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv5779 Modified Files: .cvsignore kernel-2.6.spec sources upstream Added Files: patch-2.6.16-rc6-git12.bz2.sign Removed Files: patch-2.6.16-rc6-git3.bz2.sign patch-2.6.16-rc6-git5.bz2.sign Log Message: git12 --- NEW FILE patch-2.6.16-rc6-git12.bz2.sign --- -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.2.2 (GNU/Linux) Comment: See http://www.kernel.org/signature.html for info iD8DBQBEHQHsyGugalF9Dw4RAjG3AJ9hVby8q9cwT9saMJhup4g6XugsKQCfdXkS CtxbDyIe3JRQ3JtIyqeintU= =5EmS -----END PGP SIGNATURE----- Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-5/.cvsignore,v retrieving revision 1.381 retrieving revision 1.382 diff -u -r1.381 -r1.382 --- .cvsignore 15 Mar 2006 22:22:42 -0000 1.381 +++ .cvsignore 19 Mar 2006 23:46:37 -0000 1.382 @@ -4,4 +4,4 @@ linux-2.6.15.tar.bz2 xen-20060301.tar.bz2 patch-2.6.16-rc6.bz2 -patch-2.6.16-rc6-git5.bz2 +patch-2.6.16-rc6-git12.bz2 Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-5/kernel-2.6.spec,v retrieving revision 1.2057 retrieving revision 1.2058 diff -u -r1.2057 -r1.2058 --- kernel-2.6.spec 15 Mar 2006 22:25:45 -0000 1.2057 +++ kernel-2.6.spec 19 Mar 2006 23:46:37 -0000 1.2058 @@ -218,7 +218,7 @@ # Patches 0 through 100 are meant for core subsystem upgrades # Patch1: patch-2.6.16-rc6.bz2 -Patch2: patch-2.6.16-rc6-git5.bz2 +Patch2: patch-2.6.16-rc6-git12.bz2 # Patches 100 through 500 are meant for architecture patches Patch100: linux-2.6-bzimage.patch @@ -1660,6 +1660,18 @@ %endif %changelog +* Sun Mar 19 2006 Dave Jones +- 2.6.16rc6-git12 + +* Sat Mar 18 2006 Dave Jones +- 2.6.16rc6-git10 & git11 + +* Fri Mar 17 2006 Dave Jones +- 2.6.16rc6-git8 & git9 + +* Thu Mar 16 2006 Dave Jones +- 2.6.16rc6-git7 + * Wed Mar 15 2006 Dave Jones - 2.6.16rc6-git5 - Unmark 'print_tainted' as a GPL symbol. Index: sources =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-5/sources,v retrieving revision 1.322 retrieving revision 1.323 diff -u -r1.322 -r1.323 --- sources 15 Mar 2006 22:22:42 -0000 1.322 +++ sources 19 Mar 2006 23:46:37 -0000 1.323 @@ -1,4 +1,4 @@ cdf95e00f5111e31f78e1d97304d9522 linux-2.6.15.tar.bz2 cdfde609af8adcf58d7ff626599b2d90 xen-20060301.tar.bz2 67fe4dce92d3103e56dd8d2d3c20b3ed patch-2.6.16-rc6.bz2 -110d544412276afa369b10cfcaf09740 patch-2.6.16-rc6-git5.bz2 +44504264411ae68b14438de19c0f9cb3 patch-2.6.16-rc6-git12.bz2 Index: upstream =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-5/upstream,v retrieving revision 1.295 retrieving revision 1.296 diff -u -r1.295 -r1.296 --- upstream 15 Mar 2006 22:22:42 -0000 1.295 +++ upstream 19 Mar 2006 23:46:37 -0000 1.296 @@ -1,3 +1,3 @@ linux-2.6.15.tar.bz2 patch-2.6.16-rc6.bz2 -patch-2.6.16-rc6-git5.bz2 +patch-2.6.16-rc6-git12.bz2 --- patch-2.6.16-rc6-git3.bz2.sign DELETED --- --- patch-2.6.16-rc6-git5.bz2.sign DELETED --- From fedora-cvs-commits at redhat.com Mon Mar 20 00:05:38 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sun, 19 Mar 2006 19:05:38 -0500 Subject: rpms/kernel/devel kernel-2.6.spec,1.2062,1.2063 Message-ID: <200603200005.k2K05cHp005949@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv5928 Modified Files: kernel-2.6.spec Log Message: Branch for FC-6, reenable debug. Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.2062 retrieving revision 1.2063 diff -u -r1.2062 -r1.2063 --- kernel-2.6.spec 19 Mar 2006 23:42:02 -0000 1.2062 +++ kernel-2.6.spec 20 Mar 2006 00:05:17 -0000 1.2063 @@ -25,7 +25,7 @@ %define kversion 2.6.%{sublevel} %define rpmversion 2.6.%{sublevel} %define rhbsys %([ -r /etc/beehive-root -o -n "%{?__beehive_build}" ] && echo || echo .`whoami`) -%define release %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})_FC5%{rhbsys} +%define release %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})_FC6%{rhbsys} %define signmodules 0 %define make_target bzImage %define kernel_image x86 From fedora-cvs-commits at redhat.com Mon Mar 20 00:05:38 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sun, 19 Mar 2006 19:05:38 -0500 Subject: rpms/kernel/devel/configs config-generic,1.160,1.161 Message-ID: <200603200005.k2K05ca0005953@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel/configs In directory cvs.devel.redhat.com:/tmp/cvs-serv5928/configs Modified Files: config-generic Log Message: Branch for FC-6, reenable debug. Index: config-generic =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/configs/config-generic,v retrieving revision 1.160 retrieving revision 1.161 diff -u -r1.160 -r1.161 --- config-generic 13 Mar 2006 21:05:33 -0000 1.160 +++ config-generic 20 Mar 2006 00:05:25 -0000 1.161 @@ -2411,9 +2411,9 @@ # CONFIG_RCU_TORTURE_TEST is not set # Turn off these debug options for production kernels. -# CONFIG_DEBUG_SLAB is not set -# CONFIG_DEBUG_MUTEXES is not set -# CONFIG_DEBUG_VM is not set +CONFIG_DEBUG_SLAB=y +CONFIG_DEBUG_MUTEXES=y +CONFIG_DEBUG_VM=y # These debug options are deliberatly left on. # They aren't that much of a performance impact, and the value From fedora-cvs-commits at redhat.com Mon Mar 20 00:23:36 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sun, 19 Mar 2006 19:23:36 -0500 Subject: rpms/kernel/devel kernel-2.6.spec,1.2063,1.2064 Message-ID: <200603200023.k2K0Na1F018533@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv18514 Modified Files: kernel-2.6.spec Log Message: Enable EFI on x86. Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.2063 retrieving revision 1.2064 diff -u -r1.2063 -r1.2064 --- kernel-2.6.spec 20 Mar 2006 00:05:17 -0000 1.2063 +++ kernel-2.6.spec 20 Mar 2006 00:23:33 -0000 1.2064 @@ -1662,6 +1662,7 @@ %changelog * Sun Mar 19 2006 Dave Jones - 2.6.16rc6-git12 +- Enable EFI on x86. * Sat Mar 18 2006 Dave Jones - 2.6.16rc6-git10 & git11 From fedora-cvs-commits at redhat.com Mon Mar 20 00:23:36 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sun, 19 Mar 2006 19:23:36 -0500 Subject: rpms/kernel/devel/configs config-x86-generic,1.39,1.40 Message-ID: <200603200023.k2K0NaLZ018543@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel/configs In directory cvs.devel.redhat.com:/tmp/cvs-serv18514/configs Modified Files: config-x86-generic Log Message: Enable EFI on x86. Index: config-x86-generic =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/configs/config-x86-generic,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- config-x86-generic 12 Mar 2006 00:53:17 -0000 1.39 +++ config-x86-generic 20 Mar 2006 00:23:34 -0000 1.40 @@ -77,9 +77,12 @@ CONFIG_X86_UP_IOAPIC=y CONFIG_X86_PM_TIMER=y -# CONFIG_EFI is not set -CONFIG_REGPARM=y +CONFIG_EFI=y +CONFIG_EFI_VARS=y +CONFIG_EFI_PCDP=y +CONFIG_EFI_RTC=y +CONFIG_REGPARM=y # CONFIG_PCI_GOBIOS is not set # CONFIG_PCI_GODIRECT is not set From fedora-cvs-commits at redhat.com Mon Mar 20 02:39:58 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sun, 19 Mar 2006 21:39:58 -0500 Subject: rpms/GConf2/devel .cvsignore, 1.24, 1.25 GConf2.spec, 1.39, 1.40 sources, 1.24, 1.25 GConf2-2.13.5-sync-less.patch, 1.1, NONE Message-ID: <200603200239.k2K2dovs004243@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/GConf2/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv4228 Modified Files: .cvsignore GConf2.spec sources Removed Files: GConf2-2.13.5-sync-less.patch Log Message: - Update to 2.14.0 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/GConf2/devel/.cvsignore,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- .cvsignore 17 Jan 2006 03:35:51 -0000 1.24 +++ .cvsignore 20 Mar 2006 02:39:47 -0000 1.25 @@ -1,4 +1 @@ -GConf-2.11.90.tar.bz2 -GConf-2.12.0.tar.bz2 -GConf-2.12.1.tar.bz2 -GConf-2.13.5.tar.bz2 +GConf-2.14.0.tar.bz2 Index: GConf2.spec =================================================================== RCS file: /cvs/dist/rpms/GConf2/devel/GConf2.spec,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- GConf2.spec 6 Mar 2006 16:03:42 -0000 1.39 +++ GConf2.spec 20 Mar 2006 02:39:48 -0000 1.40 @@ -4,8 +4,8 @@ Summary: A process-transparent configuration system Name: GConf2 -Version: 2.13.5 -Release: 5 +Version: 2.14.0 +Release: 1 License: LGPL Group: System Environment/Base Source: ftp://ftp.gnome.org/pub/GNOME/unstable/sources/GConf/GConf-%{version}.tar.bz2 @@ -24,7 +24,6 @@ BuildRequires: openldap-devel Patch0: GConf2-2.8.1-reload.patch -Patch1: GConf2-2.13.5-sync-less.patch %description GConf is a process-transparent configuration database API used to @@ -47,7 +46,6 @@ %prep %setup -q -n GConf-%{version} %patch0 -p1 -b .reload -%patch1 -p1 -b .sync-less %build %configure @@ -103,6 +101,9 @@ %{_libdir}/pkgconfig/* %changelog +* Sun Mar 19 2006 Ray Strode 2.14.0-1 +- Update to 2.14.0 + * Mon Mar 6 2006 Ray Strode 2.13.5-5 - Only sync the database once when installing multiple schema files. Patch by Josselin Mouette . Index: sources =================================================================== RCS file: /cvs/dist/rpms/GConf2/devel/sources,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- sources 17 Jan 2006 03:35:51 -0000 1.24 +++ sources 20 Mar 2006 02:39:48 -0000 1.25 @@ -1 +1 @@ -097823748dac6afc7a138001df6d3c35 GConf-2.13.5.tar.bz2 +d07c2efcaf477cf34225c604a04b6271 GConf-2.14.0.tar.bz2 --- GConf2-2.13.5-sync-less.patch DELETED --- From fedora-cvs-commits at redhat.com Mon Mar 20 02:45:57 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sun, 19 Mar 2006 21:45:57 -0500 Subject: rpms/GConf2/FC-5 .cvsignore, 1.24, 1.25 GConf2.spec, 1.39, 1.40 sources, 1.24, 1.25 GConf-2.12.1-unescape-key-fix.patch, 1.1, NONE GConf2-2.10.0-evolution-mail-account-backend.patch, 1.3, NONE GConf2-2.13.5-sync-less.patch, 1.1, NONE Message-ID: <200603200245.k2K2jvLI009775@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/GConf2/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv7533 Modified Files: .cvsignore GConf2.spec sources Removed Files: GConf-2.12.1-unescape-key-fix.patch GConf2-2.10.0-evolution-mail-account-backend.patch GConf2-2.13.5-sync-less.patch Log Message: - Update to 2.14.0 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/GConf2/FC-5/.cvsignore,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- .cvsignore 17 Jan 2006 03:35:51 -0000 1.24 +++ .cvsignore 20 Mar 2006 02:45:54 -0000 1.25 @@ -1,4 +1 @@ -GConf-2.11.90.tar.bz2 -GConf-2.12.0.tar.bz2 -GConf-2.12.1.tar.bz2 -GConf-2.13.5.tar.bz2 +GConf-2.14.0.tar.bz2 Index: GConf2.spec =================================================================== RCS file: /cvs/dist/rpms/GConf2/FC-5/GConf2.spec,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- GConf2.spec 6 Mar 2006 16:03:42 -0000 1.39 +++ GConf2.spec 20 Mar 2006 02:45:54 -0000 1.40 @@ -4,8 +4,8 @@ Summary: A process-transparent configuration system Name: GConf2 -Version: 2.13.5 -Release: 5 +Version: 2.14.0 +Release: 1 License: LGPL Group: System Environment/Base Source: ftp://ftp.gnome.org/pub/GNOME/unstable/sources/GConf/GConf-%{version}.tar.bz2 @@ -24,7 +24,6 @@ BuildRequires: openldap-devel Patch0: GConf2-2.8.1-reload.patch -Patch1: GConf2-2.13.5-sync-less.patch %description GConf is a process-transparent configuration database API used to @@ -47,7 +46,6 @@ %prep %setup -q -n GConf-%{version} %patch0 -p1 -b .reload -%patch1 -p1 -b .sync-less %build %configure @@ -103,6 +101,9 @@ %{_libdir}/pkgconfig/* %changelog +* Sun Mar 19 2006 Ray Strode 2.14.0-1 +- Update to 2.14.0 + * Mon Mar 6 2006 Ray Strode 2.13.5-5 - Only sync the database once when installing multiple schema files. Patch by Josselin Mouette . Index: sources =================================================================== RCS file: /cvs/dist/rpms/GConf2/FC-5/sources,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- sources 17 Jan 2006 03:35:51 -0000 1.24 +++ sources 20 Mar 2006 02:45:54 -0000 1.25 @@ -1 +1 @@ -097823748dac6afc7a138001df6d3c35 GConf-2.13.5.tar.bz2 +d07c2efcaf477cf34225c604a04b6271 GConf-2.14.0.tar.bz2 --- GConf-2.12.1-unescape-key-fix.patch DELETED --- --- GConf2-2.10.0-evolution-mail-account-backend.patch DELETED --- --- GConf2-2.13.5-sync-less.patch DELETED --- From fedora-cvs-commits at redhat.com Mon Mar 20 06:53:51 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 20 Mar 2006 01:53:51 -0500 Subject: rpms/kernel/devel linux-2.6.16.tar.bz2.sign, NONE, 1.1 .cvsignore, 1.386, 1.387 kernel-2.6.spec, 1.2064, 1.2065 sources, 1.327, 1.328 upstream, 1.300, 1.301 linux-2.6.15.tar.bz2.sign, 1.1, NONE patch-2.6.16-rc6-git12.bz2.sign, 1.1, NONE patch-2.6.16-rc6.bz2.sign, 1.1, NONE Message-ID: <200603200653.k2K6rppL020165@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv20151 Modified Files: .cvsignore kernel-2.6.spec sources upstream Added Files: linux-2.6.16.tar.bz2.sign Removed Files: linux-2.6.15.tar.bz2.sign patch-2.6.16-rc6-git12.bz2.sign patch-2.6.16-rc6.bz2.sign Log Message: .16 at last. --- NEW FILE linux-2.6.16.tar.bz2.sign --- -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.2.2 (GNU/Linux) Comment: See http://www.kernel.org/signature.html for info iD8DBQBEHkvVyGugalF9Dw4RAjwOAJ0cSl/JxfHUGsfOzkXTikTK/opIfgCfdegH bYUe57rJLc9oZJYLFmc2/aE= =YZjA -----END PGP SIGNATURE----- Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v retrieving revision 1.386 retrieving revision 1.387 diff -u -r1.386 -r1.387 --- .cvsignore 19 Mar 2006 23:42:02 -0000 1.386 +++ .cvsignore 20 Mar 2006 06:53:48 -0000 1.387 @@ -1,7 +1,5 @@ kernel-2.6.*.config temp-* -kernel-2.6.15 -linux-2.6.15.tar.bz2 +kernel-2.6.16 xen-20060301.tar.bz2 -patch-2.6.16-rc6.bz2 -patch-2.6.16-rc6-git12.bz2 +linux-2.6.16.tar.bz2 Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.2064 retrieving revision 1.2065 diff -u -r1.2064 -r1.2065 --- kernel-2.6.spec 20 Mar 2006 00:23:33 -0000 1.2064 +++ kernel-2.6.spec 20 Mar 2006 06:53:48 -0000 1.2065 @@ -21,7 +21,7 @@ # that the kernel isn't the stock distribution kernel, for example by # adding some text to the end of the version number. # -%define sublevel 15 +%define sublevel 16 %define kversion 2.6.%{sublevel} %define rpmversion 2.6.%{sublevel} %define rhbsys %([ -r /etc/beehive-root -o -n "%{?__beehive_build}" ] && echo || echo .`whoami`) @@ -217,8 +217,6 @@ # # Patches 0 through 100 are meant for core subsystem upgrades # -Patch1: patch-2.6.16-rc6.bz2 -Patch2: patch-2.6.16-rc6-git12.bz2 # Patches 100 through 500 are meant for architecture patches Patch100: linux-2.6-bzimage.patch @@ -717,8 +715,6 @@ cd linux-%{kversion}.%{_target_cpu} # Update to latest upstream. -%patch1 -p1 -%patch2 -p1 # # Patches 10 through 100 are meant for core subsystem upgrades @@ -1660,6 +1656,9 @@ %endif %changelog +* Mon Mar 20 2006 Dave Jones +- 2.6.16 + * Sun Mar 19 2006 Dave Jones - 2.6.16rc6-git12 - Enable EFI on x86. Index: sources =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/sources,v retrieving revision 1.327 retrieving revision 1.328 diff -u -r1.327 -r1.328 --- sources 19 Mar 2006 23:42:02 -0000 1.327 +++ sources 20 Mar 2006 06:53:48 -0000 1.328 @@ -1,4 +1,2 @@ -cdf95e00f5111e31f78e1d97304d9522 linux-2.6.15.tar.bz2 +9a91b2719949ff0856b40bc467fd47be linux-2.6.16.tar.bz2 cdfde609af8adcf58d7ff626599b2d90 xen-20060301.tar.bz2 -67fe4dce92d3103e56dd8d2d3c20b3ed patch-2.6.16-rc6.bz2 -44504264411ae68b14438de19c0f9cb3 patch-2.6.16-rc6-git12.bz2 Index: upstream =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/upstream,v retrieving revision 1.300 retrieving revision 1.301 diff -u -r1.300 -r1.301 --- upstream 19 Mar 2006 23:42:02 -0000 1.300 +++ upstream 20 Mar 2006 06:53:48 -0000 1.301 @@ -1,3 +1 @@ -linux-2.6.15.tar.bz2 -patch-2.6.16-rc6.bz2 -patch-2.6.16-rc6-git12.bz2 +linux-2.6.16.tar.bz2 --- linux-2.6.15.tar.bz2.sign DELETED --- --- patch-2.6.16-rc6-git12.bz2.sign DELETED --- --- patch-2.6.16-rc6.bz2.sign DELETED --- From fedora-cvs-commits at redhat.com Mon Mar 20 07:00:32 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 20 Mar 2006 02:00:32 -0500 Subject: rpms/kernel/FC-5 linux-2.6.16.tar.bz2.sign, NONE, 1.1 .cvsignore, 1.382, 1.383 kernel-2.6.spec, 1.2058, 1.2059 sources, 1.323, 1.324 upstream, 1.296, 1.297 linux-2.6.15.tar.bz2.sign, 1.1, NONE patch-2.6.16-rc6-git12.bz2.sign, 1.1, NONE patch-2.6.16-rc6.bz2.sign, 1.1, NONE Message-ID: <200603200700.k2K70W1o020267@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv20236 Modified Files: .cvsignore kernel-2.6.spec sources upstream Added Files: linux-2.6.16.tar.bz2.sign Removed Files: linux-2.6.15.tar.bz2.sign patch-2.6.16-rc6-git12.bz2.sign patch-2.6.16-rc6.bz2.sign Log Message: .16 --- NEW FILE linux-2.6.16.tar.bz2.sign --- -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.2.2 (GNU/Linux) Comment: See http://www.kernel.org/signature.html for info iD8DBQBEHkvVyGugalF9Dw4RAjwOAJ0cSl/JxfHUGsfOzkXTikTK/opIfgCfdegH bYUe57rJLc9oZJYLFmc2/aE= =YZjA -----END PGP SIGNATURE----- Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-5/.cvsignore,v retrieving revision 1.382 retrieving revision 1.383 diff -u -r1.382 -r1.383 --- .cvsignore 19 Mar 2006 23:46:37 -0000 1.382 +++ .cvsignore 20 Mar 2006 07:00:18 -0000 1.383 @@ -1,7 +1,5 @@ kernel-2.6.*.config temp-* -kernel-2.6.15 -linux-2.6.15.tar.bz2 +kernel-2.6.16 xen-20060301.tar.bz2 -patch-2.6.16-rc6.bz2 -patch-2.6.16-rc6-git12.bz2 +linux-2.6.16.tar.bz2 Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-5/kernel-2.6.spec,v retrieving revision 1.2058 retrieving revision 1.2059 diff -u -r1.2058 -r1.2059 --- kernel-2.6.spec 19 Mar 2006 23:46:37 -0000 1.2058 +++ kernel-2.6.spec 20 Mar 2006 07:00:21 -0000 1.2059 @@ -21,7 +21,7 @@ # that the kernel isn't the stock distribution kernel, for example by # adding some text to the end of the version number. # -%define sublevel 15 +%define sublevel 16 %define kversion 2.6.%{sublevel} %define rpmversion 2.6.%{sublevel} %define rhbsys %([ -r /etc/beehive-root -o -n "%{?__beehive_build}" ] && echo || echo .`whoami`) @@ -217,8 +217,6 @@ # # Patches 0 through 100 are meant for core subsystem upgrades # -Patch1: patch-2.6.16-rc6.bz2 -Patch2: patch-2.6.16-rc6-git12.bz2 # Patches 100 through 500 are meant for architecture patches Patch100: linux-2.6-bzimage.patch @@ -717,8 +715,6 @@ cd linux-%{kversion}.%{_target_cpu} # Update to latest upstream. -%patch1 -p1 -%patch2 -p1 # # Patches 10 through 100 are meant for core subsystem upgrades @@ -1660,6 +1656,9 @@ %endif %changelog +* Mon Mar 20 2006 Dave Jones +- 2.6.16 + * Sun Mar 19 2006 Dave Jones - 2.6.16rc6-git12 Index: sources =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-5/sources,v retrieving revision 1.323 retrieving revision 1.324 diff -u -r1.323 -r1.324 --- sources 19 Mar 2006 23:46:37 -0000 1.323 +++ sources 20 Mar 2006 07:00:29 -0000 1.324 @@ -1,4 +1,2 @@ -cdf95e00f5111e31f78e1d97304d9522 linux-2.6.15.tar.bz2 +9a91b2719949ff0856b40bc467fd47be linux-2.6.16.tar.bz2 cdfde609af8adcf58d7ff626599b2d90 xen-20060301.tar.bz2 -67fe4dce92d3103e56dd8d2d3c20b3ed patch-2.6.16-rc6.bz2 -44504264411ae68b14438de19c0f9cb3 patch-2.6.16-rc6-git12.bz2 Index: upstream =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-5/upstream,v retrieving revision 1.296 retrieving revision 1.297 diff -u -r1.296 -r1.297 --- upstream 19 Mar 2006 23:46:37 -0000 1.296 +++ upstream 20 Mar 2006 07:00:29 -0000 1.297 @@ -1,3 +1 @@ -linux-2.6.15.tar.bz2 -patch-2.6.16-rc6.bz2 -patch-2.6.16-rc6-git12.bz2 +linux-2.6.16.tar.bz2 --- linux-2.6.15.tar.bz2.sign DELETED --- --- patch-2.6.16-rc6-git12.bz2.sign DELETED --- --- patch-2.6.16-rc6.bz2.sign DELETED --- From fedora-cvs-commits at redhat.com Mon Mar 20 10:21:09 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 20 Mar 2006 05:21:09 -0500 Subject: rpms/firstboot/devel .cvsignore, 1.49, 1.50 firstboot.spec, 1.68, 1.69 sources, 1.65, 1.66 Message-ID: <200603201021.k2KAL9IH011996@cvs.devel.redhat.com> Author: stransky Update of /cvs/dist/rpms/firstboot/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv11981 Modified Files: .cvsignore firstboot.spec sources Log Message: replaced Play test button by Play button for s-c-s (#185931) Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/firstboot/devel/.cvsignore,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- .cvsignore 3 Mar 2006 23:26:01 -0000 1.49 +++ .cvsignore 20 Mar 2006 10:21:07 -0000 1.50 @@ -21,3 +21,4 @@ firstboot-1.4.4.tar.bz2 firstboot-1.4.5.tar.bz2 firstboot-1.4.6.tar.bz2 +firstboot-1.4.7.tar.bz2 Index: firstboot.spec =================================================================== RCS file: /cvs/dist/rpms/firstboot/devel/firstboot.spec,v retrieving revision 1.68 retrieving revision 1.69 diff -u -r1.68 -r1.69 --- firstboot.spec 3 Mar 2006 23:26:01 -0000 1.68 +++ firstboot.spec 20 Mar 2006 10:21:07 -0000 1.69 @@ -1,6 +1,6 @@ Summary: Initial system configuration utility Name: firstboot -Version: 1.4.6 +Version: 1.4.7 Release: 1 URL: http://fedora.redhat.com/projects/config-tools/ License: GPL @@ -109,6 +109,9 @@ %changelog +* Mon Mar 20 2006 Martin Stransky 1.4.7-1 +- replaced "Play test button" by "Play" button for s-c-s (#185931) + * Fri Mar 03 2006 Chris Lumens 1.4.6-1 - Revert UI changes that broke s-c-keyboard (#183718). Index: sources =================================================================== RCS file: /cvs/dist/rpms/firstboot/devel/sources,v retrieving revision 1.65 retrieving revision 1.66 diff -u -r1.65 -r1.66 --- sources 3 Mar 2006 23:26:01 -0000 1.65 +++ sources 20 Mar 2006 10:21:07 -0000 1.66 @@ -1 +1 @@ -bea227cd82be988b9638e239f3380dfb firstboot-1.4.6.tar.bz2 +32ec5c5965255384f7e6e55320ebb977 firstboot-1.4.7.tar.bz2 From fedora-cvs-commits at redhat.com Mon Mar 20 10:27:57 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 20 Mar 2006 05:27:57 -0500 Subject: rpms/openoffice.org/devel sources,1.161,1.162 Message-ID: <200603201027.k2KARv3e012081@cvs.devel.redhat.com> Author: caolanm Update of /cvs/dist/rpms/openoffice.org/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv12068 Modified Files: sources Log Message: rh#185806# missing croatian Index: sources =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/devel/sources,v retrieving revision 1.161 retrieving revision 1.162 diff -u -r1.161 -r1.162 --- sources 16 Mar 2006 15:02:56 -0000 1.161 +++ sources 20 Mar 2006 10:27:55 -0000 1.162 @@ -5,8 +5,8 @@ b54bcc9fdb23389e961b281508d9110c documentation.openoffice.org-templates.tar.gz 8bc013e30e432ce3927e402e9aaa8c9f redhat-templates.tar.gz 1b4d9a03ebb4c864015620153afb77c6 Tigert-templates.tar.gz -fae552b2b9d556920b930a97a2e3e9ab openoffice.org-myspell-contrib.tar.gz 20789fc643e2b857291e1973075fccb0 OOB680_m5.tar.bz2 67ba19cf8ac46671799ff63a48901e8b openoffice.org-simple-crash_report.sh 1fb6d1fc0b5c6f4425b3cd779727b30c opens___.ttf 8d8c4222654f718436c234582c8fd529 GSI_ga.sdf +bfa60acd8b0c30a1a6d14165da45c1dd openoffice.org-myspell-contrib.tar.gz From fedora-cvs-commits at redhat.com Mon Mar 20 10:28:12 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 20 Mar 2006 05:28:12 -0500 Subject: rpms/openoffice.org/FC-5 sources,1.161,1.162 Message-ID: <200603201028.k2KASClT012103@cvs.devel.redhat.com> Author: caolanm Update of /cvs/dist/rpms/openoffice.org/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv12090 Modified Files: sources Log Message: rh#185806# missing croatian Index: sources =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/FC-5/sources,v retrieving revision 1.161 retrieving revision 1.162 diff -u -r1.161 -r1.162 --- sources 16 Mar 2006 15:02:56 -0000 1.161 +++ sources 20 Mar 2006 10:28:10 -0000 1.162 @@ -5,8 +5,8 @@ b54bcc9fdb23389e961b281508d9110c documentation.openoffice.org-templates.tar.gz 8bc013e30e432ce3927e402e9aaa8c9f redhat-templates.tar.gz 1b4d9a03ebb4c864015620153afb77c6 Tigert-templates.tar.gz -fae552b2b9d556920b930a97a2e3e9ab openoffice.org-myspell-contrib.tar.gz 20789fc643e2b857291e1973075fccb0 OOB680_m5.tar.bz2 67ba19cf8ac46671799ff63a48901e8b openoffice.org-simple-crash_report.sh 1fb6d1fc0b5c6f4425b3cd779727b30c opens___.ttf 8d8c4222654f718436c234582c8fd529 GSI_ga.sdf +bfa60acd8b0c30a1a6d14165da45c1dd openoffice.org-myspell-contrib.tar.gz From fedora-cvs-commits at redhat.com Mon Mar 20 11:23:18 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 20 Mar 2006 06:23:18 -0500 Subject: rpms/net-snmp/devel net-snmp.spec,1.66,1.67 Message-ID: <200603201123.k2KBNIL3004970@cvs.devel.redhat.com> Author: rvokal Update of /cvs/dist/rpms/net-snmp/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv4957 Modified Files: net-snmp.spec Log Message: - allow disman/event-mib Index: net-snmp.spec =================================================================== RCS file: /cvs/dist/rpms/net-snmp/devel/net-snmp.spec,v retrieving revision 1.66 retrieving revision 1.67 diff -u -r1.66 -r1.67 --- net-snmp.spec 11 Feb 2006 04:44:37 -0000 1.66 +++ net-snmp.spec 20 Mar 2006 11:23:16 -0000 1.67 @@ -3,7 +3,7 @@ Summary: A collection of SNMP protocol tools and libraries. Name: net-snmp Version: 5.3 -Release: 4.2 +Release: 5 License: BSDish Group: System Environment/Daemons URL: http://net-snmp.sourceforge.net/ @@ -150,7 +150,7 @@ --with-logfile="/var/log/snmpd.log" \ --with-persistent-directory="/var/net-snmp" \ %ifarch %{ix86} x86_64 - --with-mib-modules="host agentx smux ucd-snmp/lmSensors ucd-snmp/diskio" \ + --with-mib-modules="host agentx smux ucd-snmp/lmSensors ucd-snmp/diskio disman/event-mib" \ %else --with-mib-modules="host agentx smux " \ %endif @@ -172,9 +172,8 @@ pushd perl # Use just built libs for perl module building, not the system libs. -perl Makefile.PL -NET-SNMP-IN-SOURCE=true PREFIX=${RPM_BUILD_ROOT}/%{_prefix} INSTALLDIRS=vendor +perl Makefile.PL -NET-SNMP-IN-SOURCE=true PREFIX=${RPM_BUILD_ROOT}/%{_prefix} INSTALLDIRS=vendor -NET-SNMP-CONFIG="sh ../../net-snmp-config" perl -pi -e 's/^LD_RUN_PATH.*//;s/LD_RUN_PATH=\".*\" //;' default_store/Makefile OID/Makefile agent/Makefile agent/default_store/Makefile ASN/Makefile SNMP/Makefile -#perl Makefile.PL PREFIX=${RPM_BUILD_ROOT}/%{_prefix} INSTALLDIRS=vendor -NET-SNMP-CONFIG="sh ../../net-snmp-config" -NET-SNMP-IN-SOURCE=true make popd @@ -317,6 +316,9 @@ %{_libdir}/*.a %changelog +* Mon Mar 20 2006 Radek Vokal 5.3-5 +- allow disman/event-mib + * Fri Feb 10 2006 Jesse Keating - 5.3-4.2 - bump again for double-long bug on ppc(64) From fedora-cvs-commits at redhat.com Mon Mar 20 11:30:33 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 20 Mar 2006 06:30:33 -0500 Subject: rpms/gnome-applet-vm/FC-5 .cvsignore, 1.4, 1.5 gnome-applet-vm.spec, 1.6, 1.7 sources, 1.4, 1.5 Message-ID: <200603201130.k2KBUX7h005153@cvs.devel.redhat.com> Author: kzak Update of /cvs/dist/rpms/gnome-applet-vm/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv5141 Modified Files: .cvsignore gnome-applet-vm.spec sources Log Message: update to 0.0.7 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/gnome-applet-vm/FC-5/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 10 Feb 2006 16:16:24 -0000 1.4 +++ .cvsignore 20 Mar 2006 11:30:17 -0000 1.5 @@ -1 +1 @@ -gnome-applet-vm-0.0.6.tar.gz +gnome-applet-vm-0.0.7.tar.bz2 Index: gnome-applet-vm.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-applet-vm/FC-5/gnome-applet-vm.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- gnome-applet-vm.spec 10 Feb 2006 16:16:24 -0000 1.6 +++ gnome-applet-vm.spec 20 Mar 2006 11:30:17 -0000 1.7 @@ -1,12 +1,12 @@ Summary: Simple virtual domains monitor which embed themselves in the GNOME panel Name: gnome-applet-vm -Version: 0.0.6 +Version: 0.0.7 Release: 1 License: GPL Group: User Interface/Desktops -Source: gnome-applet-vm-%{version}.tar.gz +Source: gnome-applet-vm-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-root -URL: http://people.redhat.com/kzak +URL: http://people.redhat.com/kzak/gnome-applet-vm ExclusiveArch: i386 x86_64 %define glib2_version 2.2.0 @@ -38,7 +38,7 @@ %setup -q %build -%configure +%configure --enable-consolehelper make %install @@ -50,6 +50,9 @@ # Clean up unpackaged files rm -rf $RPM_BUILD_ROOT%{_localstatedir}/scrollkeeper +# userhelper +mkdir -p $RPM_BUILD_ROOT/%{_bindir} +ln -s consolehelper $RPM_BUILD_ROOT/%{_bindir}/vm_applet_wrapper %clean rm -rf $RPM_BUILD_ROOT @@ -81,9 +84,16 @@ %{_datadir}/omf/* %{_libdir}/bonobo/servers/* %{_libexecdir}/* +%{_sbindir}/* +%{_bindir}/* %{_sysconfdir}/gconf/schemas/* +%config %{_sysconfdir}/pam.d/vm_applet_wrapper +%config %{_sysconfdir}/security/console.apps/vm_applet_wrapper %changelog +* Mon Mar 20 2006 Karel Zak 0.0.7-1 +- new upstream version + * Fri Feb 10 2006 Karel Zak 0.0.6-1 - new upstream version Index: sources =================================================================== RCS file: /cvs/dist/rpms/gnome-applet-vm/FC-5/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 10 Feb 2006 16:16:24 -0000 1.4 +++ sources 20 Mar 2006 11:30:17 -0000 1.5 @@ -1 +1 @@ -664b870e292233ebd05bd8dd56c06692 gnome-applet-vm-0.0.6.tar.gz +b68a3f4e79aabd26195126b1a5f705dc gnome-applet-vm-0.0.7.tar.bz2 From fedora-cvs-commits at redhat.com Mon Mar 20 11:45:02 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 20 Mar 2006 06:45:02 -0500 Subject: rpms/gnome-applet-vm/FC-5 gnome-applet-vm.spec,1.7,1.8 Message-ID: <200603201145.k2KBj2uB005442@cvs.devel.redhat.com> Author: kzak Update of /cvs/dist/rpms/gnome-applet-vm/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv5421 Modified Files: gnome-applet-vm.spec Log Message: fix spec file Index: gnome-applet-vm.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-applet-vm/FC-5/gnome-applet-vm.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- gnome-applet-vm.spec 20 Mar 2006 11:30:17 -0000 1.7 +++ gnome-applet-vm.spec 20 Mar 2006 11:45:00 -0000 1.8 @@ -60,20 +60,12 @@ %post /sbin/ldconfig scrollkeeper-update -touch --no-create %{_datadir}/icons/hicolor -if [ -x /usr/bin/gtk-update-icon-cache ]; then - gtk-update-icon-cache -q %{_datadir}/icons/hicolor -fi export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/vm-applet.schemas > /dev/null %postun /sbin/ldconfig -touch --no-create %{_datadir}/icons/hicolor -if [ -x /usr/bin/gtk-update-icon-cache ]; then - gtk-update-icon-cache -q %{_datadir}/icons/hicolor -fi %files %defattr(-, root, root) From fedora-cvs-commits at redhat.com Mon Mar 20 12:34:41 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 20 Mar 2006 07:34:41 -0500 Subject: rpms/nfs-utils/FC-4 nfs-utils.spec, 1.61, 1.62 nfs.init, 1.20, 1.21 rpcidmapd.init, 1.3, 1.4 Message-ID: <200603201234.k2KCYfOL030918@cvs.devel.redhat.com> Author: steved Update of /cvs/dist/rpms/nfs-utils/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv30899 Modified Files: nfs-utils.spec nfs.init rpcidmapd.init Log Message: Fixed small typo in nfs initscript (bz 158866) Updated rpcidmapd initscript to get rid of extra [OK] Index: nfs-utils.spec =================================================================== RCS file: /cvs/dist/rpms/nfs-utils/FC-4/nfs-utils.spec,v retrieving revision 1.61 retrieving revision 1.62 diff -u -r1.61 -r1.62 --- nfs-utils.spec 27 Sep 2005 17:09:55 -0000 1.61 +++ nfs-utils.spec 20 Mar 2006 12:34:38 -0000 1.62 @@ -1,7 +1,7 @@ Summary: NFS utlilities and supporting daemons for the kernel NFS server. Name: nfs-utils Version: 1.0.7 -Release: 12.FC4 +Release: 13.FC4 # group all 32bit related archs %define all_32bit_archs i386 i686 athlon @@ -252,6 +252,10 @@ %config /etc/rc.d/init.d/nfslock %changelog +* Mon Mar 20 2006 Steve Dickson 1.0.7-13 +- Fixed small typo in nfs initscript (bz 158866) +- Updated rpcidmapd initscript to get rid of extra [OK] + * Tue Sep 27 2005 Steve Dickson 1.0.7-12 - Bug fixes for the ctlbits patch - Updated the rquotad Makfile to deal with new interface. Index: nfs.init =================================================================== RCS file: /cvs/dist/rpms/nfs-utils/FC-4/nfs.init,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- nfs.init 15 Jul 2005 13:23:41 -0000 1.20 +++ nfs.init 20 Mar 2006 12:34:38 -0000 1.21 @@ -121,7 +121,6 @@ ;; status) [ -x /usr/sbin/rpc.svcgssd ] && /sbin/service rpcsvcgssd status - echo -n $"Shutting down NFS mountd: " status rpc.mountd status nfsd if [ -n "$RQUOTAD" -a "$RQUOTAD" != "no" ]; then Index: rpcidmapd.init =================================================================== RCS file: /cvs/dist/rpms/nfs-utils/FC-4/rpcidmapd.init,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- rpcidmapd.init 14 Feb 2005 19:29:31 -0000 1.3 +++ rpcidmapd.init 20 Mar 2006 12:34:38 -0000 1.4 @@ -29,10 +29,10 @@ case "$1" in start|condstart) # Make sure the daemon is not already running. - if status $prog > /dev/null ; then - [ "$1" = "condstart" ] && killproc $prog "-SIGHUP" + [ "$1" = "condstart" -a -n "`pidofproc $prog`" ] && { + killproc $prog "-SIGHUP" > /dev/null exit 0 - fi + } rm -f /var/lock/subsys/$prog echo -n $"Starting RPC idmapd: " From fedora-cvs-commits at redhat.com Mon Mar 20 13:30:25 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 20 Mar 2006 08:30:25 -0500 Subject: rpms/nfs-utils/FC-5 nfs-utils.spec,1.85,1.86 nfs.init,1.20,1.21 Message-ID: <200603201330.k2KDUP2g023923@cvs.devel.redhat.com> Author: steved Update of /cvs/dist/rpms/nfs-utils/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv23891 Modified Files: nfs-utils.spec nfs.init Log Message: Fixed typo in nfs initscript (bz 158866) Index: nfs-utils.spec =================================================================== RCS file: /cvs/dist/rpms/nfs-utils/FC-5/nfs-utils.spec,v retrieving revision 1.85 retrieving revision 1.86 diff -u -r1.85 -r1.86 --- nfs-utils.spec 11 Feb 2006 04:45:47 -0000 1.85 +++ nfs-utils.spec 20 Mar 2006 13:30:05 -0000 1.86 @@ -1,7 +1,7 @@ Summary: NFS utlilities and supporting daemons for the kernel NFS server. Name: nfs-utils Version: 1.0.8.rc2 -Release: 4.FC5.2 +Release: 5.FC5 # group all 32bit related archs %define all_32bit_archs i386 i686 athlon @@ -223,6 +223,9 @@ %config /etc/rc.d/init.d/nfslock %changelog +* Mon Mar 20 2006 Steve Dickson 1.0.8.rc2-5.FC5 +- Fixed typo in nfs initscript (bz 158866) + * Fri Feb 10 2006 Jesse Keating - 1.0.8.rc2-4.FC5.2 - bump again for double-long bug on ppc(64) Index: nfs.init =================================================================== RCS file: /cvs/dist/rpms/nfs-utils/FC-5/nfs.init,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- nfs.init 23 Sep 2005 13:48:25 -0000 1.20 +++ nfs.init 20 Mar 2006 13:30:05 -0000 1.21 @@ -121,7 +121,6 @@ ;; status) [ -x /usr/sbin/rpc.svcgssd ] && /sbin/service rpcsvcgssd status - echo -n $"Shutting down NFS mountd: " status rpc.mountd status nfsd if [ -n "$RQUOTAD" -a "$RQUOTAD" != "no" ]; then From fedora-cvs-commits at redhat.com Mon Mar 20 13:53:26 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 20 Mar 2006 08:53:26 -0500 Subject: rpms/man-pages-ja/devel .cvsignore, 1.34, 1.35 man-pages-ja.spec, 1.40, 1.41 sources, 1.33, 1.34 Message-ID: <200603201353.k2KDrQMG004240@cvs.devel.redhat.com> Author: tagoh Update of /cvs/dist/rpms/man-pages-ja/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv4225 Modified Files: .cvsignore man-pages-ja.spec sources Log Message: * Mon Mar 20 2006 Akira TAGOH - 20060315-1 - updates to 20060315. Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/man-pages-ja/devel/.cvsignore,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- .cvsignore 9 Mar 2006 08:46:40 -0000 1.34 +++ .cvsignore 20 Mar 2006 13:53:24 -0000 1.35 @@ -21,3 +21,4 @@ man-pages-ja-20051215.tar.gz man-pages-ja-20060115.tar.gz man-pages-ja-20060215.tar.gz +man-pages-ja-20060315.tar.gz Index: man-pages-ja.spec =================================================================== RCS file: /cvs/dist/rpms/man-pages-ja/devel/man-pages-ja.spec,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- man-pages-ja.spec 9 Mar 2006 08:46:40 -0000 1.40 +++ man-pages-ja.spec 20 Mar 2006 13:53:24 -0000 1.41 @@ -1,4 +1,4 @@ -%define manver 20060215 +%define manver 20060315 %define use_utf8 1 Summary: Japanese man (manual) pages from the Japanese Manual Project @@ -99,6 +99,9 @@ %changelog +* Mon Mar 20 2006 Akira TAGOH - 20060315-1 +- updates to 20060315. + * Thu Mar 9 2006 Akira TAGOH - 20060215-1 - updates to 20060215. Index: sources =================================================================== RCS file: /cvs/dist/rpms/man-pages-ja/devel/sources,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- sources 9 Mar 2006 08:46:40 -0000 1.33 +++ sources 20 Mar 2006 13:53:24 -0000 1.34 @@ -1 +1 @@ -d10ee0ca41947f8dba6b902816704fd8 man-pages-ja-20060215.tar.gz +37d8ab6e78c397fdeb4c930076479423 man-pages-ja-20060315.tar.gz From fedora-cvs-commits at redhat.com Mon Mar 20 14:22:57 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 20 Mar 2006 09:22:57 -0500 Subject: rpms/xorg-x11-proto-devel/devel .cvsignore, 1.11, 1.12 sources, 1.10, 1.11 xorg-x11-proto-devel.spec, 1.23, 1.24 Message-ID: <200603201422.k2KEMvdF017099@cvs.devel.redhat.com> Author: ajackson Update of /cvs/dist/rpms/xorg-x11-proto-devel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv17076/devel Modified Files: .cvsignore sources xorg-x11-proto-devel.spec Log Message: auto-import xorg-x11-proto-devel-7.0-7 on branch devel from xorg-x11-proto-devel-7.0-7.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/xorg-x11-proto-devel/devel/.cvsignore,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- .cvsignore 2 Mar 2006 02:50:34 -0000 1.11 +++ .cvsignore 20 Mar 2006 14:22:55 -0000 1.12 @@ -1,12 +1,9 @@ bigreqsproto-1.0.2.tar.bz2 -compositeproto-0.2.2.tar.bz2 damageproto-1.0.3.tar.bz2 dmxproto-2.2.2.tar.bz2 evieext-1.0.2.tar.bz2 -fixesproto-3.0.2.tar.bz2 fontcacheproto-0.1.2.tar.bz2 fontsproto-2.0.2.tar.bz2 -glproto-1.4.3.tar.bz2 inputproto-1.3.2.tar.bz2 kbproto-1.0.2.tar.bz2 printproto-1.0.3.tar.bz2 @@ -28,5 +25,6 @@ xineramaproto-1.1.2.tar.bz2 xproto-7.0.4.tar.bz2 xproxymanagementprotocol-1.0.2.tar.bz2 -glproto-1.4.4.tar.bz2 -glproto-1.4.5.tar.bz2 +compositeproto-0.3.tar.bz2 +fixesproto-4.0.tar.bz2 +glproto-1.4.6.tar.bz2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/xorg-x11-proto-devel/devel/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 2 Mar 2006 02:50:34 -0000 1.10 +++ sources 20 Mar 2006 14:22:55 -0000 1.11 @@ -1,12 +1,9 @@ 95c29d9d10bf2868996c0c47a3b9a8dc bigreqsproto-1.0.2.tar.bz2 -a590eb95951567f3b371c70531fa2e87 compositeproto-0.2.2.tar.bz2 b3eaee9850bb23020b9ac751626c7976 damageproto-1.0.3.tar.bz2 d80acad88411e7944b9b085463d53302 dmxproto-2.2.2.tar.bz2 2507b5d0f4b2848147fbddd155aa6cfe evieext-1.0.2.tar.bz2 -cc8916ab773525e9d16061edbd1c2472 fixesproto-3.0.2.tar.bz2 60df6b625074a9790e28543dcea71651 fontcacheproto-0.1.2.tar.bz2 c946f166107b016a21cc7a02e1132724 fontsproto-2.0.2.tar.bz2 -bf3f623303876f0708b692eedd55d1a0 glproto-1.4.5.tar.bz2 e0b7df0fc69f0712aa7f2161faa94e1d inputproto-1.3.2.tar.bz2 3ae193c317a3621966c3c53d83a254f4 kbproto-1.0.2.tar.bz2 0f4e7982c6d4ec3b2cf38502dd1293a3 printproto-1.0.3.tar.bz2 @@ -28,3 +25,6 @@ 1cc292c562962ad0ad3a253cae68c632 xineramaproto-1.1.2.tar.bz2 9b7c807841c28289151f911fc1bea707 xproto-7.0.4.tar.bz2 d28007a50976204960fc1fc07b4ca093 xproxymanagementprotocol-1.0.2.tar.bz2 +85e7abb79de5b49cb83524a608744b0b compositeproto-0.3.tar.bz2 +8b298cc3424597f8138c7faf7763dce9 fixesproto-4.0.tar.bz2 +b30bff86821f0636563289e5911c74c6 glproto-1.4.6.tar.bz2 Index: xorg-x11-proto-devel.spec =================================================================== RCS file: /cvs/dist/rpms/xorg-x11-proto-devel/devel/xorg-x11-proto-devel.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- xorg-x11-proto-devel.spec 2 Mar 2006 02:50:34 -0000 1.23 +++ xorg-x11-proto-devel.spec 20 Mar 2006 14:22:55 -0000 1.24 @@ -10,20 +10,20 @@ Summary: X.Org X11 Protocol headers Name: xorg-x11-proto-devel Version: 7.0 -Release: 6 +Release: 7 License: The Open Group License Group: Development/System URL: http://www.x.org %define sourceurl http://xorg.freedesktop.org/releases/X11R7.0/src/everything Source0: %{sourceurl}/bigreqsproto-1.0.2.tar.bz2 -Source1: %{sourceurl}/compositeproto-0.2.2.tar.bz2 +Source1: %{sourceurl}/compositeproto-0.3.tar.bz2 Source2: %{sourceurl}/damageproto-1.0.3.tar.bz2 Source3: %{sourceurl}/dmxproto-2.2.2.tar.bz2 Source4: %{sourceurl}/evieext-1.0.2.tar.bz2 -Source5: %{sourceurl}/fixesproto-3.0.2.tar.bz2 +Source5: %{sourceurl}/fixesproto-4.0.tar.bz2 Source6: %{sourceurl}/fontcacheproto-0.1.2.tar.bz2 Source7: %{sourceurl}/fontsproto-2.0.2.tar.bz2 -Source8: %{sourceurl}/glproto-1.4.5.tar.bz2 +Source8: %{sourceurl}/glproto-1.4.6.tar.bz2 Source9: %{sourceurl}/inputproto-1.3.2.tar.bz2 Source10: %{sourceurl}/kbproto-1.0.2.tar.bz2 # NOTE: What once was known as PanoramiX, is now known as Xinerama @@ -278,6 +278,9 @@ %{_libdir}/pkgconfig/xproxymngproto.pc %changelog +* Wed Mar 15 2006 Adam Jackson 7.0-7 +- Update to fixesproto-4.0, compositeproto-0.3, and glproto-1.4.6 + * Wed Mar 01 2006 Mike A. Harris 7.0-6 - Update to glproto-1.4.5 - Remove xorg-x11-proto-devel-7.0-buffer-values.patch which is in 1.4.5. From fedora-cvs-commits at redhat.com Mon Mar 20 14:31:20 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 20 Mar 2006 09:31:20 -0500 Subject: rpms/ImageMagick/FC-5 ImageMagick.spec,1.55,1.56 Message-ID: <200603201431.k2KEVKJ5017243@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/ImageMagick/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv17214 Modified Files: ImageMagick.spec Log Message: Don't ship .la files Index: ImageMagick.spec =================================================================== RCS file: /cvs/dist/rpms/ImageMagick/FC-5/ImageMagick.spec,v retrieving revision 1.55 retrieving revision 1.56 diff -u -r1.55 -r1.56 --- ImageMagick.spec 13 Feb 2006 18:41:08 -0000 1.55 +++ ImageMagick.spec 20 Mar 2006 14:31:06 -0000 1.56 @@ -9,7 +9,7 @@ %else Version: %{VER} %endif -Release: 4.2.1 +Release: 5 License: freeware Group: Applications/Multimedia %if "%{Patchlevel}" != "" @@ -160,7 +160,7 @@ # Keep config rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name}-%{VER}/[a-b,d-z,A-Z]* rm -rf $RPM_BUILD_ROOT%{_libdir}/libltdl.* -rm -f $RPM_BUILD_ROOT%{_libdir}/ImageMagick-*/modules*/*/*.a +rm -f $RPM_BUILD_ROOT%{_libdir}/ImageMagick-*/modules*/*/*.{a,la} rm -f $RPM_BUILD_ROOT%{_libdir}/*.la # link docs @@ -225,6 +225,9 @@ %doc PerlMagick/demo/ PerlMagick/Changelog PerlMagick/README.txt %changelog +* Mon Mar 20 2006 Matthias Clasen - 6.2.5.4-5 +- Don't ship .la files (#185237) + * Mon Feb 13 2006 Jesse Keating - 6.2.5.4-4.2.1 - rebump for build order issues during double-long bump From fedora-cvs-commits at redhat.com Mon Mar 20 14:34:47 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 20 Mar 2006 09:34:47 -0500 Subject: rpms/ImageMagick/FC-5 ImageMagick.spec,1.56,1.57 Message-ID: <200603201434.k2KEYlD7017366@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/ImageMagick/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv17353 Modified Files: ImageMagick.spec Log Message: bump rev Index: ImageMagick.spec =================================================================== RCS file: /cvs/dist/rpms/ImageMagick/FC-5/ImageMagick.spec,v retrieving revision 1.56 retrieving revision 1.57 diff -u -r1.56 -r1.57 --- ImageMagick.spec 20 Mar 2006 14:31:06 -0000 1.56 +++ ImageMagick.spec 20 Mar 2006 14:34:45 -0000 1.57 @@ -9,7 +9,7 @@ %else Version: %{VER} %endif -Release: 5 +Release: 4.2.1.fc5.1 License: freeware Group: Applications/Multimedia %if "%{Patchlevel}" != "" @@ -225,7 +225,7 @@ %doc PerlMagick/demo/ PerlMagick/Changelog PerlMagick/README.txt %changelog -* Mon Mar 20 2006 Matthias Clasen - 6.2.5.4-5 +* Mon Mar 20 2006 Matthias Clasen - 6.2.5.4-4.2.1.fc5.1 - Don't ship .la files (#185237) * Mon Feb 13 2006 Jesse Keating - 6.2.5.4-4.2.1 From fedora-cvs-commits at redhat.com Mon Mar 20 14:41:46 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 20 Mar 2006 09:41:46 -0500 Subject: rpms/ImageMagick/devel ImageMagick.spec,1.55,1.56 Message-ID: <200603201441.k2KEfk2h017486@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/ImageMagick/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv17472 Modified Files: ImageMagick.spec Log Message: Don't ship .la/.a files Index: ImageMagick.spec =================================================================== RCS file: /cvs/dist/rpms/ImageMagick/devel/ImageMagick.spec,v retrieving revision 1.55 retrieving revision 1.56 diff -u -r1.55 -r1.56 --- ImageMagick.spec 13 Feb 2006 18:41:08 -0000 1.55 +++ ImageMagick.spec 20 Mar 2006 14:41:43 -0000 1.56 @@ -9,7 +9,7 @@ %else Version: %{VER} %endif -Release: 4.2.1 +Release: 5 License: freeware Group: Applications/Multimedia %if "%{Patchlevel}" != "" @@ -160,7 +160,7 @@ # Keep config rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name}-%{VER}/[a-b,d-z,A-Z]* rm -rf $RPM_BUILD_ROOT%{_libdir}/libltdl.* -rm -f $RPM_BUILD_ROOT%{_libdir}/ImageMagick-*/modules*/*/*.a +rm -f $RPM_BUILD_ROOT%{_libdir}/ImageMagick-*/modules*/*/*.{a,la} rm -f $RPM_BUILD_ROOT%{_libdir}/*.la # link docs @@ -194,9 +194,7 @@ %defattr(-,root,root) %{_bindir}/Magick-config %{_bindir}/Wand-config -%{_libdir}/libMagick.a %{_libdir}/libMagick.so -%{_libdir}/libWand.a %{_libdir}/libWand.so %{_libdir}/pkgconfig/ImageMagick.pc %{_libdir}/pkgconfig/Wand.pc @@ -214,7 +212,6 @@ %{_bindir}/Magick++-config %{_includedir}/Magick++ %{_includedir}/Magick++.h -%{_libdir}/libMagick++.a %{_libdir}/libMagick++.so %{_libdir}/pkgconfig/ImageMagick++.pc %{_mandir}/man1/Magick++-config.* @@ -225,6 +222,9 @@ %doc PerlMagick/demo/ PerlMagick/Changelog PerlMagick/README.txt %changelog +* Mon Mar 20 2006 Matthias Clasen - 6.2.5.4-5 +- Don't ship .la and .a files (#185237) + * Mon Feb 13 2006 Jesse Keating - 6.2.5.4-4.2.1 - rebump for build order issues during double-long bump From fedora-cvs-commits at redhat.com Mon Mar 20 14:44:06 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 20 Mar 2006 09:44:06 -0500 Subject: rpms/xorg-x11-proto-devel/devel xorg-x11-proto-devel.spec, 1.24, 1.25 Message-ID: <200603201444.k2KEi6Sn017557@cvs.devel.redhat.com> Author: ajackson Update of /cvs/dist/rpms/xorg-x11-proto-devel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv17541 Modified Files: xorg-x11-proto-devel.spec Log Message: * Mon Mar 20 2006 Adam Jackson 7.0-8 - Fix the base URL. Index: xorg-x11-proto-devel.spec =================================================================== RCS file: /cvs/dist/rpms/xorg-x11-proto-devel/devel/xorg-x11-proto-devel.spec,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- xorg-x11-proto-devel.spec 20 Mar 2006 14:22:55 -0000 1.24 +++ xorg-x11-proto-devel.spec 20 Mar 2006 14:44:04 -0000 1.25 @@ -10,11 +10,11 @@ Summary: X.Org X11 Protocol headers Name: xorg-x11-proto-devel Version: 7.0 -Release: 7 +Release: 8 License: The Open Group License Group: Development/System URL: http://www.x.org -%define sourceurl http://xorg.freedesktop.org/releases/X11R7.0/src/everything +%define sourceurl http://xorg.freedesktop.org/releases/individual/proto Source0: %{sourceurl}/bigreqsproto-1.0.2.tar.bz2 Source1: %{sourceurl}/compositeproto-0.3.tar.bz2 Source2: %{sourceurl}/damageproto-1.0.3.tar.bz2 @@ -278,6 +278,9 @@ %{_libdir}/pkgconfig/xproxymngproto.pc %changelog +* Mon Mar 20 2006 Adam Jackson 7.0-8 +- Fix the base URL. + * Wed Mar 15 2006 Adam Jackson 7.0-7 - Update to fixesproto-4.0, compositeproto-0.3, and glproto-1.4.6 From fedora-cvs-commits at redhat.com Mon Mar 20 15:08:37 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 20 Mar 2006 10:08:37 -0500 Subject: rpms/readahead/FC-5 readahead.spec,1.26,1.27 Message-ID: <200603201508.k2KF8bmE030462@cvs.devel.redhat.com> Author: kzak Update of /cvs/dist/rpms/readahead/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv30448 Modified Files: readahead.spec Log Message: cleanup spec file Index: readahead.spec =================================================================== RCS file: /cvs/dist/rpms/readahead/FC-5/readahead.spec,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- readahead.spec 15 Mar 2006 23:55:41 -0000 1.26 +++ readahead.spec 20 Mar 2006 15:08:35 -0000 1.27 @@ -1,7 +1,7 @@ Summary: Read a preset list of files into memory. Name: readahead Version: 1.2 -Release: %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?}) +Release: 2 Epoch: 1 Group: System Environment/Base License: GPL/OSL @@ -45,7 +45,10 @@ install %{SOURCE3} %{buildroot}/etc/rc.d/init.d/readahead_early install readahead.early.files %{buildroot}/etc/readahead.early.files install -m 755 readahead %{buildroot}%{_sbindir} -cp %{SOURCE5} %{SOURCE6} . + +if [ ! -f ./ %{SOURCE6} ]; then + cp %{SOURCE5} %{SOURCE6} . +fi %clean [ "$RPM_BUILD_ROOT" != "/" ] && [ -d $RPM_BUILD_ROOT ] && rm -rf $RPM_BUILD_ROOT; @@ -76,6 +79,10 @@ %changelog +* Mon Mar 20 2006 Karel Zak 1.2-2 +- cleanup release number +- cleanup install section + * Thu Mar 16 2006 Karel Zak - update versions in *.in lists From fedora-cvs-commits at redhat.com Mon Mar 20 15:47:55 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 20 Mar 2006 10:47:55 -0500 Subject: rpms/libgsf/devel .cvsignore, 1.12, 1.13 libgsf.spec, 1.23, 1.24 sources, 1.12, 1.13 Message-ID: <200603201547.k2KFltra024166@cvs.devel.redhat.com> Author: caolanm Update of /cvs/dist/rpms/libgsf/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv24148 Modified Files: .cvsignore libgsf.spec sources Log Message: next version Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/libgsf/devel/.cvsignore,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- .cvsignore 2 Dec 2005 06:47:33 -0000 1.12 +++ .cvsignore 20 Mar 2006 15:47:53 -0000 1.13 @@ -5,3 +5,4 @@ libgsf-1.12.2.tar.bz2 libgsf-1.12.3.tar.bz2 libgsf-1.13.3.tar.bz2 +libgsf-1.14.0.tar.bz2 Index: libgsf.spec =================================================================== RCS file: /cvs/dist/rpms/libgsf/devel/libgsf.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- libgsf.spec 11 Feb 2006 04:05:52 -0000 1.23 +++ libgsf.spec 20 Mar 2006 15:47:53 -0000 1.24 @@ -1,7 +1,7 @@ Summary: GNOME Structured File library Name: libgsf -Version: 1.13.3 -Release: 2.2.1 +Version: 1.14.0 +Release: 1 Group: System Environment/Libraries License: LGPL Source: ftp://ftp.gnome.org/pub/GNOME/sources/%{name}/1.11/%{name}-%{version}.tar.bz2 @@ -69,6 +69,9 @@ rm -r $RPM_BUILD_ROOT %changelog +* Mon Mar 20 2006 Caolan McNamara 1.14.0-1 +- next version + * Fri Feb 10 2006 Jesse Keating - 1.13.3-2.2.1 - bump again for double-long bug on ppc(64) Index: sources =================================================================== RCS file: /cvs/dist/rpms/libgsf/devel/sources,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- sources 2 Dec 2005 06:47:33 -0000 1.12 +++ sources 20 Mar 2006 15:47:53 -0000 1.13 @@ -1 +1 @@ -b35e95f6bd7b8add9981b6cf6336674a libgsf-1.13.3.tar.bz2 +2d3b112a2c6e7e1740306c32b1ebf6e6 libgsf-1.14.0.tar.bz2 From fedora-cvs-commits at redhat.com Mon Mar 20 16:05:36 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 20 Mar 2006 11:05:36 -0500 Subject: rpms/libgsf/devel libgsf.spec,1.24,1.25 Message-ID: <200603201605.k2KG5axg025160@cvs.devel.redhat.com> Author: caolanm Update of /cvs/dist/rpms/libgsf/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv25141 Modified Files: libgsf.spec Log Message: find_lang Index: libgsf.spec =================================================================== RCS file: /cvs/dist/rpms/libgsf/devel/libgsf.spec,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- libgsf.spec 20 Mar 2006 15:47:53 -0000 1.24 +++ libgsf.spec 20 Mar 2006 16:05:02 -0000 1.25 @@ -41,15 +41,14 @@ %install rm -rf $RPM_BUILD_ROOT %makeinstall - -rm -f $RPM_BUILD_ROOT/%{_datadir}/locale/es/LC_MESSAGES/libgsf.mo +%find_lang libgsf rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la %post -p /sbin/ldconfig %postun -p /sbin/ldconfig -%files +%files -f libgsf.lang %defattr(-,root,root) %doc AUTHORS COPYING README %{_libdir}/lib*.so.* From fedora-cvs-commits at redhat.com Mon Mar 20 16:09:52 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 20 Mar 2006 11:09:52 -0500 Subject: rpms/readahead/FC-5 readahead.spec,1.27,1.28 Message-ID: <200603201609.k2KG9qv0025295@cvs.devel.redhat.com> Author: kzak Update of /cvs/dist/rpms/readahead/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv25281 Modified Files: readahead.spec Log Message: fix spec file Index: readahead.spec =================================================================== RCS file: /cvs/dist/rpms/readahead/FC-5/readahead.spec,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- readahead.spec 20 Mar 2006 15:08:35 -0000 1.27 +++ readahead.spec 20 Mar 2006 16:09:50 -0000 1.28 @@ -25,6 +25,7 @@ needed. Its goal is to speed up the boot process. %prep +[ "%{_builddir}" != "%{_sourcedir}" ] && cp %{SOURCE5} %{SOURCE6} . %build rm -rf $RPM_BUILD_ROOT @@ -46,10 +47,6 @@ install readahead.early.files %{buildroot}/etc/readahead.early.files install -m 755 readahead %{buildroot}%{_sbindir} -if [ ! -f ./ %{SOURCE6} ]; then - cp %{SOURCE5} %{SOURCE6} . -fi - %clean [ "$RPM_BUILD_ROOT" != "/" ] && [ -d $RPM_BUILD_ROOT ] && rm -rf $RPM_BUILD_ROOT; @@ -81,7 +78,7 @@ %changelog * Mon Mar 20 2006 Karel Zak 1.2-2 - cleanup release number -- cleanup install section +- cleanup spec file * Thu Mar 16 2006 Karel Zak - update versions in *.in lists From fedora-cvs-commits at redhat.com Mon Mar 20 16:36:35 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 20 Mar 2006 11:36:35 -0500 Subject: rpms/firstboot/devel firstboot.spec,1.69,1.70 Message-ID: <200603201636.k2KGaZ7P005651@cvs.devel.redhat.com> Author: clumens Update of /cvs/dist/rpms/firstboot/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv5622 Modified Files: firstboot.spec Log Message: Sync spec file with what was built. Index: firstboot.spec =================================================================== RCS file: /cvs/dist/rpms/firstboot/devel/firstboot.spec,v retrieving revision 1.69 retrieving revision 1.70 diff -u -r1.69 -r1.70 --- firstboot.spec 20 Mar 2006 10:21:07 -0000 1.69 +++ firstboot.spec 20 Mar 2006 16:36:29 -0000 1.70 @@ -111,6 +111,11 @@ %changelog * Mon Mar 20 2006 Martin Stransky 1.4.7-1 - replaced "Play test button" by "Play" button for s-c-s (#185931) +- Fix soundcard string (#177425). +- Fix label inconsistency on welcome screen (#183899). +- Rework "System User" string (#177940). +- Don't create a user if a homedir with that username already exists + (#143150). * Fri Mar 03 2006 Chris Lumens 1.4.6-1 - Revert UI changes that broke s-c-keyboard (#183718). From fedora-cvs-commits at redhat.com Mon Mar 20 17:36:10 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 20 Mar 2006 12:36:10 -0500 Subject: rpms/initscripts/FC-5 initscripts.spec,1.113,1.114 Message-ID: <200603201736.k2KHaAUx031448@cvs.devel.redhat.com> Author: notting Update of /cvs/dist/rpms/initscripts/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv31434 Modified Files: initscripts.spec Log Message: bump for test Index: initscripts.spec =================================================================== RCS file: /cvs/dist/rpms/initscripts/FC-5/initscripts.spec,v retrieving revision 1.113 retrieving revision 1.114 diff -u -r1.113 -r1.114 --- initscripts.spec 17 Mar 2006 17:06:07 -0000 1.113 +++ initscripts.spec 20 Mar 2006 17:36:07 -0000 1.114 @@ -3,7 +3,7 @@ Version: 8.31.2 License: GPL Group: System Environment/Base -Release: 1 +Release: 1.1 Source: initscripts-%{version}.tar.bz2 URL: http://fedora.redhat.com/projects/additional-projects/initscripts/ Patch0: initscripts-s390.patch From fedora-cvs-commits at redhat.com Mon Mar 20 17:39:29 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 20 Mar 2006 12:39:29 -0500 Subject: rpms/setup/FC-5 setup.spec,1.37,1.38 Message-ID: <200603201739.k2KHdTrn031567@cvs.devel.redhat.com> Author: notting Update of /cvs/dist/rpms/setup/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv31554 Modified Files: setup.spec Log Message: bump for test Index: setup.spec =================================================================== RCS file: /cvs/dist/rpms/setup/FC-5/setup.spec,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- setup.spec 23 Feb 2006 14:29:09 -0000 1.37 +++ setup.spec 20 Mar 2006 17:39:26 -0000 1.38 @@ -1,7 +1,7 @@ Summary: A set of system configuration and setup files. Name: setup Version: 2.5.49 -Release: 1 +Release: 1.1 License: public domain Group: System Environment/Base Source: setup-%{version}.tar.bz2 From fedora-cvs-commits at redhat.com Mon Mar 20 19:04:58 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 20 Mar 2006 14:04:58 -0500 Subject: rpms/anacron/FC-4 anacron-2.3-fdclose.patch, NONE, 1.1 anacron.init, 1.4, 1.5 anacron.spec, 1.13, 1.14 Message-ID: <200603201904.k2KJ4wQE032259@cvs.devel.redhat.com> Author: jvdias Update of /cvs/dist/rpms/anacron/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv32176 Modified Files: anacron.init anacron.spec Added Files: anacron-2.3-fdclose.patch Log Message: fix bug 185973: allow use of sendmail under selinux-policy-strict; Fix initscript so changing runlevel shuts it down correctly anacron-2.3-fdclose.patch: global.h | 1 + runjob.c | 40 ++++++++++++++++++++++++++++++---------- 2 files changed, 31 insertions(+), 10 deletions(-) --- NEW FILE anacron-2.3-fdclose.patch --- diff -uNr anacron-2.3-orig/global.h anacron-2.3/global.h --- anacron-2.3-orig/global.h 2000-06-23 01:00:14.000000000 +0100 +++ anacron-2.3/global.h 2006-03-20 15:31:28.000000000 +0000 @@ -60,6 +60,7 @@ int tab_line; int arg_num; int timestamp_fd; + int input_fd; int output_fd; int mail_header_size; pid_t job_pid; diff -uNr anacron-2.3-orig/runjob.c anacron-2.3/runjob.c --- anacron-2.3-orig/runjob.c 2006-02-21 14:05:08.000000000 +0000 +++ anacron-2.3/runjob.c 2006-03-20 15:32:32.000000000 +0000 @@ -38,12 +38,12 @@ #include static int -temp_file() +temp_file(job_rec *jr) /* Open a temporary file and return its file descriptor */ { const int max_retries = 50; char *name; - int fd, i; + int fdin, fdout, i; i = 0; name = NULL; @@ -53,16 +53,24 @@ free(name); name = tempnam(NULL, NULL); if (name == NULL) die("Can't find a unique temporary filename"); - fd = open(name, O_RDWR | O_CREAT | O_EXCL | O_APPEND, - S_IRUSR | S_IWUSR); + fdout = open(name, O_WRONLY | O_CREAT | O_EXCL | O_APPEND, + S_IRUSR | S_IWUSR); + if ( fdout != -1 ) + fdin = open(name, O_RDONLY, S_IRUSR | S_IWUSR); /* I'm not sure we actually need to be so persistent here */ - } while (fd == -1 && errno == EEXIST && i < max_retries); + } while (fdout == -1 && errno == EEXIST && i < max_retries); - if (fd == -1) die_e("Can't open temporary file"); + if (fdout == -1) die_e("Can't open temporary file for writing"); + if (fdin == -1) die_e("Can't open temporary file for reading"); if (unlink(name)) die_e("Can't unlink temporary file"); free(name); - fcntl(fd, F_SETFD, 1); /* set close-on-exec flag */ - return fd; + fcntl(fdout, F_SETFD, 1); /* set close-on-exec flag */ + fcntl(fdin, F_SETFD, 1); /* set close-on-exec flag */ + + jr->input_fd = fdin; + jr->output_fd = fdout; + + return fdout; } static off_t @@ -170,17 +178,28 @@ pid = xfork(); if (pid == 0) { + long fdflags; + /* child */ in_background = 1; /* set stdin to the job's output */ xclose(0); - if (dup2(jr->output_fd, 0) != 0) die_e("Can't dup2()"); + if (dup2(jr->input_fd, 0) != 0) die_e("Can't dup2()"); if (lseek(0, 0, SEEK_SET) != 0) die_e("Can't lseek()"); umask(old_umask); if (sigprocmask(SIG_SETMASK, &old_sigmask, NULL)) die_e("sigprocmask error"); xcloselog(); + /* Ensure stdout/stderr are sane before exec-ing sendmail */ + xclose(1); xopen(1, "/dev/null", O_WRONLY); + xclose(2); xopen(2, "/dev/null", O_WRONLY); + xclose(jr->output_fd); + + /* Ensure stdin is not appendable ... ? */ + /* fdflags = fcntl(0, F_GETFL); fdflags &= ~O_APPEND; */ + /* fcntl(0, F_SETFL, fdflags ); */ + /* Here, I basically mirrored the way /usr/sbin/sendmail is called * by cron on a Debian system, except for the "-oem" and "-or0s" * options, which don't seem to be appropriate here. @@ -225,7 +244,7 @@ setup_env(jr); /* create temporary file for stdout and stderr of the job */ - fd = jr->output_fd = temp_file(); + temp_file(jr); fd = jr->output_fd; /* write mail header */ xwrite(fd, "From: "); xwrite(fd, username()); @@ -283,6 +302,7 @@ running_jobs--; if (mail_output) launch_mailer(jr); xclose(jr->output_fd); + xclose(jr->input_fd); } void Index: anacron.init =================================================================== RCS file: /cvs/dist/rpms/anacron/FC-4/anacron.init,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- anacron.init 9 Sep 2004 03:00:12 -0000 1.4 +++ anacron.init 20 Mar 2006 19:04:30 -0000 1.5 @@ -10,11 +10,13 @@ [ -f /usr/sbin/anacron ] || exit 0 prog="anacron" +LOCKFILE=/var/lock/subsys/$prog start() { echo -n $"Starting $prog: " daemon +19 anacron -s RETVAL=$? + touch $LOCKFILE echo return $RETVAL } @@ -26,6 +28,7 @@ echo fi RETVAL=$? + rm -f $LOCKFILE return $RETVAL } @@ -46,7 +49,7 @@ start ;; condrestart) - if test "x`pidof anacron`" != x; then + if [ -f $LOCKFILE ]; then stop start fi Index: anacron.spec =================================================================== RCS file: /cvs/dist/rpms/anacron/FC-4/anacron.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- anacron.spec 16 Mar 2005 21:04:41 -0000 1.13 +++ anacron.spec 20 Mar 2006 19:04:30 -0000 1.14 @@ -1,7 +1,7 @@ Summary: A cron-like program that can run jobs lost during downtime. Name: anacron Version: 2.3 -Release: 34 +Release: 36.FC4 License: GPL Group: System Environment/Base Source: ftp://ftp.debian.org/debian/pool/main/a/anacron/%{name}_%{version}.orig.tar.gz @@ -11,6 +11,7 @@ Patch1: anacron-2.3-mail-content-type-77108.patch Patch2: anacron-2.3-noconst.patch Patch3: anacron-2.3-mailto.patch +Patch4: anacron-2.3-fdclose.patch Requires: /bin/sh Requires: crontabs Prereq: /sbin/chkconfig @@ -37,6 +38,7 @@ %patch1 -p1 -b .charset %patch2 -p1 -b .noconst %patch3 -p1 -b .mailto +%patch4 -p1 -b .fdclose %build make CFLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags} @@ -110,6 +112,13 @@ %config /etc/cron.weekly/0anacron %changelog +* Mon Mar 20 2006 Jason Vas Dias 2.3-36 +- fix bug 185973: allow use of sendmail under selinux-policy-strict: + apply patch contributed by Ted Rule + +* Wed Jan 11 2006 Peter Jones 2.3-35 +- Fix initscript so changing runlevel shuts it down correctly + * Wed Mar 16 2005 Jason Vas Dias 2.3-34 - Rebuild with gcc4 in FC4. From fedora-cvs-commits at redhat.com Mon Mar 20 19:15:46 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 20 Mar 2006 14:15:46 -0500 Subject: rpms/kernel/devel kernel-2.6.spec, 1.2065, 1.2066 linux-2.6-x86-apic-off-by-default.patch, 1.8, NONE Message-ID: <200603201915.k2KJFkhe003780@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv2909 Modified Files: kernel-2.6.spec Removed Files: linux-2.6-x86-apic-off-by-default.patch Log Message: dead patch Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.2065 retrieving revision 1.2066 diff -u -r1.2065 -r1.2066 --- kernel-2.6.spec 20 Mar 2006 06:53:48 -0000 1.2065 +++ kernel-2.6.spec 20 Mar 2006 19:15:44 -0000 1.2066 @@ -224,14 +224,13 @@ # 200 - 299 x86(-64) Patch200: linux-2.6-x86-tune-p4.patch -Patch201: linux-2.6-x86-apic-off-by-default.patch -Patch202: linux-2.6-x86-vga-vidfail.patch -Patch203: linux-2.6-intel-cache-build.patch -Patch204: linux-2.6-x86_64-silence-up-apic-errors.patch -Patch205: linux-2.6-edid-check.patch -Patch206: linux-2.6-x86_64-smp-on-uphw-cpucount.patch -Patch207: linux-2.6-x86-hp-reboot.patch -Patch208: linux-2.6-x86-cpu_index-false.patch +Patch201: linux-2.6-x86-vga-vidfail.patch +Patch202: linux-2.6-intel-cache-build.patch +Patch203: linux-2.6-x86_64-silence-up-apic-errors.patch +Patch204: linux-2.6-edid-check.patch +Patch205: linux-2.6-x86_64-smp-on-uphw-cpucount.patch +Patch206: linux-2.6-x86-hp-reboot.patch +Patch207: linux-2.6-x86-cpu_index-false.patch # 300 - 399 ppc(64) Patch301: linux-2.6-cell-numa-init.patch @@ -734,26 +733,24 @@ # # Compile 686 kernels tuned for Pentium4. %patch200 -p1 -# Keep UP APIC off by default. -#%patch201 -p1 # add vidfail capability; # without this patch specifying a framebuffer on the kernel prompt would # make the boot stop if there's no supported framebuffer device; this is bad # for the installer cd that wants to automatically fall back to textmode # in that case -%patch202 -p1 +%patch201 -p1 # exitfunc called from initfunc. -%patch203 -p1 +%patch202 -p1 # Suppress APIC errors on UP x86-64. -%patch204 -p1 +%patch203 -p1 # Reboot thru bios on HP laptops. -%patch205 -p1 +%patch204 -p1 # Workaround BIOSes that don't list CPU0 -%patch206 -p1 +%patch205 -p1 # Reboot through BIOS on HP systems,. -%patch207 -p1 +%patch206 -p1 # cpu_index >= NR_CPUS becomming always false. -%patch208 -p1 +%patch207 -p1 # # ppc64 --- linux-2.6-x86-apic-off-by-default.patch DELETED --- From fedora-cvs-commits at redhat.com Mon Mar 20 19:17:00 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 20 Mar 2006 14:17:00 -0500 Subject: rpms/kernel/FC-5 kernel-2.6.spec, 1.2059, 1.2060 linux-2.6-x86-apic-off-by-default.patch, 1.8, NONE Message-ID: <200603201917.k2KJH0sJ015761@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv12321 Modified Files: kernel-2.6.spec Removed Files: linux-2.6-x86-apic-off-by-default.patch Log Message: dead patch Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-5/kernel-2.6.spec,v retrieving revision 1.2059 retrieving revision 1.2060 diff -u -r1.2059 -r1.2060 --- kernel-2.6.spec 20 Mar 2006 07:00:21 -0000 1.2059 +++ kernel-2.6.spec 20 Mar 2006 19:16:57 -0000 1.2060 @@ -224,14 +224,13 @@ # 200 - 299 x86(-64) Patch200: linux-2.6-x86-tune-p4.patch -Patch201: linux-2.6-x86-apic-off-by-default.patch -Patch202: linux-2.6-x86-vga-vidfail.patch -Patch203: linux-2.6-intel-cache-build.patch -Patch204: linux-2.6-x86_64-silence-up-apic-errors.patch -Patch205: linux-2.6-edid-check.patch -Patch206: linux-2.6-x86_64-smp-on-uphw-cpucount.patch -Patch207: linux-2.6-x86-hp-reboot.patch -Patch208: linux-2.6-x86-cpu_index-false.patch +Patch201: linux-2.6-x86-vga-vidfail.patch +Patch202: linux-2.6-intel-cache-build.patch +Patch203: linux-2.6-x86_64-silence-up-apic-errors.patch +Patch204: linux-2.6-edid-check.patch +Patch205: linux-2.6-x86_64-smp-on-uphw-cpucount.patch +Patch206: linux-2.6-x86-hp-reboot.patch +Patch207: linux-2.6-x86-cpu_index-false.patch # 300 - 399 ppc(64) Patch301: linux-2.6-cell-numa-init.patch @@ -734,26 +733,24 @@ # # Compile 686 kernels tuned for Pentium4. %patch200 -p1 -# Keep UP APIC off by default. -#%patch201 -p1 # add vidfail capability; # without this patch specifying a framebuffer on the kernel prompt would # make the boot stop if there's no supported framebuffer device; this is bad # for the installer cd that wants to automatically fall back to textmode # in that case -%patch202 -p1 +%patch201 -p1 # exitfunc called from initfunc. -%patch203 -p1 +%patch202 -p1 # Suppress APIC errors on UP x86-64. -%patch204 -p1 +%patch203 -p1 # Reboot thru bios on HP laptops. -%patch205 -p1 +%patch204 -p1 # Workaround BIOSes that don't list CPU0 -%patch206 -p1 +%patch205 -p1 # Reboot through BIOS on HP systems,. -%patch207 -p1 +%patch206 -p1 # cpu_index >= NR_CPUS becomming always false. -%patch208 -p1 +%patch207 -p1 # # ppc64 --- linux-2.6-x86-apic-off-by-default.patch DELETED --- From fedora-cvs-commits at redhat.com Mon Mar 20 19:17:45 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 20 Mar 2006 14:17:45 -0500 Subject: rpms/kernel/FC-5 kernel-2.6.spec,1.2060,1.2061 Message-ID: <200603201917.k2KJHjbk016051@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv16003 Modified Files: kernel-2.6.spec Log Message: consistency Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-5/kernel-2.6.spec,v retrieving revision 1.2060 retrieving revision 1.2061 diff -u -r1.2060 -r1.2061 --- kernel-2.6.spec 20 Mar 2006 19:16:57 -0000 1.2060 +++ kernel-2.6.spec 20 Mar 2006 19:17:42 -0000 1.2061 @@ -296,7 +296,7 @@ Patch1011: linux-2.6-debug-slab-backtrace.patch Patch1012: linux-2.6-debug-list_head.patch Patch1013: linux-2.6-debug-taint-vm.patch -PAtch1014: linux-2.6-debug-slab-leaks.patch +Patch1014: linux-2.6-debug-slab-leaks.patch Patch1015: linux-2.6-debug-singlebiterror.patch Patch1016: linux-2.6-debug-spinlock-taint.patch Patch1017: linux-2.6-debug-spinlock-panic.patch From fedora-cvs-commits at redhat.com Mon Mar 20 19:46:40 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 20 Mar 2006 14:46:40 -0500 Subject: rpms/kernel/devel kernel-2.6.spec,1.2066,1.2067 Message-ID: <200603201946.k2KJkedd002078@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv826 Modified Files: kernel-2.6.spec Log Message: really apply sata diffs Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.2066 retrieving revision 1.2067 diff -u -r1.2066 -r1.2067 --- kernel-2.6.spec 20 Mar 2006 19:15:44 -0000 1.2066 +++ kernel-2.6.spec 20 Mar 2006 19:46:37 -0000 1.2067 @@ -296,7 +296,7 @@ Patch1011: linux-2.6-debug-slab-backtrace.patch Patch1012: linux-2.6-debug-list_head.patch Patch1013: linux-2.6-debug-taint-vm.patch -PAtch1014: linux-2.6-debug-slab-leaks.patch +Patch1014: linux-2.6-debug-slab-leaks.patch Patch1015: linux-2.6-debug-singlebiterror.patch Patch1016: linux-2.6-debug-spinlock-taint.patch Patch1017: linux-2.6-debug-spinlock-panic.patch @@ -1040,6 +1040,11 @@ # Increase timeout on firmware loader. %patch2103 -p1 +# Enable PATA ports on Promise SATA. +%patch2200 -p1 +# Silence silly SATA printk. +%patch2201 -p1 + # # Patches 5000 to 6000 are reserved for new drivers that are about to # be merged upstream From fedora-cvs-commits at redhat.com Mon Mar 20 19:49:35 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 20 Mar 2006 14:49:35 -0500 Subject: rpms/kernel/FC-5 kernel-2.6.spec,1.2061,1.2062 Message-ID: <200603201949.k2KJnZMZ006348@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv6274 Modified Files: kernel-2.6.spec Log Message: really apply these patches. Ooops. Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-5/kernel-2.6.spec,v retrieving revision 1.2061 retrieving revision 1.2062 diff -u -r1.2061 -r1.2062 --- kernel-2.6.spec 20 Mar 2006 19:17:42 -0000 1.2061 +++ kernel-2.6.spec 20 Mar 2006 19:49:33 -0000 1.2062 @@ -1040,6 +1040,15 @@ # Increase timeout on firmware loader. %patch2103 -p1 +# Enable PATA ports on Promise SATA. +%patch2200 -p1 +# Silence silly SATA printk. +%patch2201 -p1 + +# Silence more ACPI debug spew from suspend. +%patch2300 -p1 + + # # Patches 5000 to 6000 are reserved for new drivers that are about to # be merged upstream @@ -1655,6 +1664,9 @@ %changelog * Mon Mar 20 2006 Dave Jones - 2.6.16 +- Enable PATA ports on Promise SATA. +- Silence silly SATA printk. +- Silence more ACPI debug spew from suspend. * Sun Mar 19 2006 Dave Jones - 2.6.16rc6-git12 From fedora-cvs-commits at redhat.com Mon Mar 20 19:56:44 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 20 Mar 2006 14:56:44 -0500 Subject: rpms/kernel/FC-5 kernel-2.6.spec,1.2062,1.2063 Message-ID: <200603201956.k2KJuiY3009204@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv9101 Modified Files: kernel-2.6.spec Log Message: bah, was already applied, but in wrong place. Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-5/kernel-2.6.spec,v retrieving revision 1.2062 retrieving revision 1.2063 diff -u -r1.2062 -r1.2063 --- kernel-2.6.spec 20 Mar 2006 19:49:33 -0000 1.2062 +++ kernel-2.6.spec 20 Mar 2006 19:56:39 -0000 1.2063 @@ -861,21 +861,11 @@ # Tux %patch910 -p1 -# SATA Patches -# Enable PATA ports on Promise. -%patch2200 -p1 -# Silence noisy printk -%patch2201 -p1 - -# ACPI patches -%patch2300 -p1 - # # Patches 1000 to 5000 are reserved for bugfixes to drivers and filesystems # - # Various low-impact patches to aid debugging. %patch1011 -p1 %patch1012 -p1 @@ -1664,9 +1654,6 @@ %changelog * Mon Mar 20 2006 Dave Jones - 2.6.16 -- Enable PATA ports on Promise SATA. -- Silence silly SATA printk. -- Silence more ACPI debug spew from suspend. * Sun Mar 19 2006 Dave Jones - 2.6.16rc6-git12 From fedora-cvs-commits at redhat.com Mon Mar 20 19:57:04 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 20 Mar 2006 14:57:04 -0500 Subject: rpms/kernel/devel kernel-2.6.spec,1.2067,1.2068 Message-ID: <200603201957.k2KJv49F009349@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv9252 Modified Files: kernel-2.6.spec Log Message: put things in right places. Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.2067 retrieving revision 1.2068 diff -u -r1.2067 -r1.2068 --- kernel-2.6.spec 20 Mar 2006 19:46:37 -0000 1.2067 +++ kernel-2.6.spec 20 Mar 2006 19:57:02 -0000 1.2068 @@ -861,15 +861,6 @@ # Tux %patch910 -p1 -# SATA Patches -# Enable PATA ports on Promise. -%patch2200 -p1 -# Silence noisy printk -%patch2201 -p1 - -# ACPI patches -%patch2300 -p1 - # # Patches 1000 to 5000 are reserved for bugfixes to drivers and filesystems # @@ -1045,6 +1036,10 @@ # Silence silly SATA printk. %patch2201 -p1 +# ACPI patches +# Silence more ACPI debug spew from suspend. +%patch2300 -p1 + # # Patches 5000 to 6000 are reserved for new drivers that are about to # be merged upstream From fedora-cvs-commits at redhat.com Mon Mar 20 20:08:42 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 20 Mar 2006 15:08:42 -0500 Subject: rpms/kernel/FC-5 xen-9232_fix_vmx.patch, NONE, 1.1 xen-9236_fix_vmx.patch, NONE, 1.1 kernel-2.6.spec, 1.2063, 1.2064 Message-ID: <200603202008.k2KK8gsn011389@cvs.devel.redhat.com> Author: quintela Update of /cvs/dist/rpms/kernel/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv11346 Modified Files: kernel-2.6.spec Added Files: xen-9232_fix_vmx.patch xen-9236_fix_vmx.patch Log Message: added 9232 & 9236 xen HV csets neeeded for VMX x86/x86_64 transitions xen-9232_fix_vmx.patch: shadow.c | 20 ++++++++++++++++---- 1 files changed, 16 insertions(+), 4 deletions(-) --- NEW FILE xen-9232_fix_vmx.patch --- # HG changeset patch # User kaf24 at firebug.cl.cam.ac.uk # Node ID 1f739672ca00d23dd10f110d05a9103918b4ea19 # Parent 1c24ee05f8f3e0180d28ac3922ed984b8e0d0735 Fix a bug which occurs when Xen is compiled with debug=y. Destroying a 32-bit HVM guest on x86/64 will cause a Xen hang. Signed-off-by: Xiaohui Xin diff -r 1c24ee05f8f3 -r 1f739672ca00 xen/arch/x86/shadow.c --- a/xen/arch/x86/shadow.c Tue Mar 14 15:40:44 2006 +0100 +++ b/xen/arch/x86/shadow.c Tue Mar 14 15:43:10 2006 +0100 @@ -202,6 +202,16 @@ shadow_promote(struct domain *d, unsigne * tlbflush_timestamp holds a min & max index of valid page table entries * within the shadow page. */ +static inline void +shadow_page_info_init(struct page_info *page, + unsigned long gmfn, + u32 psh_type) +{ + ASSERT( (gmfn & ~PGT_mfn_mask) == 0 ); + page->u.inuse.type_info = psh_type | gmfn; + page->count_info = 0; + page->tlbflush_timestamp = 0; +} static inline unsigned long alloc_shadow_page(struct domain *d, @@ -249,6 +259,11 @@ alloc_shadow_page(struct domain *d, l1 = map_domain_page(page_to_mfn(page + 1)); memset(l1, 0, PAGE_SIZE); unmap_domain_page(l1); + + /* we'd like to initialize the second continuous page here + * and leave the first page initialization later */ + + shadow_page_info_init(page+1, gmfn, psh_type); #else page = alloc_domheap_page(NULL); if (!page) @@ -294,10 +309,7 @@ alloc_shadow_page(struct domain *d, smfn = page_to_mfn(page); - ASSERT( (gmfn & ~PGT_mfn_mask) == 0 ); - page->u.inuse.type_info = psh_type | gmfn; - page->count_info = 0; - page->tlbflush_timestamp = 0; + shadow_page_info_init(page, gmfn, psh_type); switch ( psh_type ) { xen-9236_fix_vmx.patch: arch/x86/shadow.c | 14 +++++++++++++- include/asm-x86/mm.h | 9 +++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) --- NEW FILE xen-9236_fix_vmx.patch --- # HG changeset patch # User kaf24 at firebug.cl.cam.ac.uk # Node ID f4cef1aa25218c37c1ed94d00acaa2741abd0d1c # Parent de5d2b9a9cfb2a01d6abe22ff51ae8b47c1d8865 Fix ASSERT failure caused by NX support code on x86_64 When turning on debug for x86_64, ASSERT(gpfn =3D=3D (gpfn & = PGT_mfn_mask)) in __shadow_status will fail, this patch makes the NX support code comply with this ASSERT. NB: NX on PAE xen is not supported yet. Signed-off-by: Xin Li Signed-off-by: Jun Nakajima diff -r de5d2b9a9cfb -r f4cef1aa2521 xen/arch/x86/shadow.c --- a/xen/arch/x86/shadow.c Tue Mar 14 16:00:16 2006 +0100 +++ b/xen/arch/x86/shadow.c Tue Mar 14 16:09:34 2006 +0100 @@ -3413,7 +3413,9 @@ static inline int l2e_rw_fault( l1_pgentry_t sl1e; l1_pgentry_t old_sl1e; l2_pgentry_t sl2e; +#ifdef __x86_64__ u64 nx = 0; +#endif int put_ref_check = 0; /* Check if gpfn is 2M aligned */ @@ -3428,7 +3430,9 @@ static inline int l2e_rw_fault( l2e_remove_flags(tmp_l2e, _PAGE_PSE); if (l2e_get_flags(gl2e) & _PAGE_NX) { l2e_remove_flags(tmp_l2e, _PAGE_NX); - nx = 1ULL << 63; +#ifdef __x86_64__ + nx = PGT_high_mfn_nx; +#endif } @@ -3436,7 +3440,11 @@ static inline int l2e_rw_fault( if ( !__shadow_get_l2e(v, va, &sl2e) ) sl2e = l2e_empty(); +#ifdef __x86_64__ l1_mfn = __shadow_status(d, start_gpfn | nx, PGT_fl1_shadow); +#else + l1_mfn = __shadow_status(d, start_gpfn, PGT_fl1_shadow); +#endif /* Check the corresponding l2e */ if (l1_mfn) { @@ -3454,7 +3462,11 @@ static inline int l2e_rw_fault( } else { /* Allocate a new page as shadow page table if need */ gmfn = gmfn_to_mfn(d, start_gpfn); +#ifdef __x86_64__ l1_mfn = alloc_shadow_page(d, start_gpfn | nx, gmfn, PGT_fl1_shadow); +#else + l1_mfn = alloc_shadow_page(d, start_gpfn, gmfn, PGT_fl1_shadow); +#endif if (unlikely(!l1_mfn)) { BUG(); } diff -r de5d2b9a9cfb -r f4cef1aa2521 xen/include/asm-x86/mm.h --- a/xen/include/asm-x86/mm.h Tue Mar 14 16:00:16 2006 +0100 +++ b/xen/include/asm-x86/mm.h Tue Mar 14 16:09:34 2006 +0100 @@ -98,8 +98,17 @@ struct page_info /* 16-bit count of uses of this frame as its current type. */ #define PGT_count_mask ((1U<<16)-1) +#ifdef __x86_64__ +#define PGT_high_mfn_shift 52 +#define PGT_high_mfn_mask (0x7ffUL << PGT_high_mfn_shift) +#define PGT_mfn_mask (((1U<<23)-1) | PGT_high_mfn_mask) +#define PGT_high_mfn_nx (0x800UL << PGT_high_mfn_shift) +#else /* 23-bit mfn mask for shadow types: good for up to 32GB RAM. */ #define PGT_mfn_mask ((1U<<23)-1) + /* NX for PAE xen is not supported yet */ +#define PGT_high_mfn_nx (1ULL << 63) +#endif #define PGT_score_shift 23 #define PGT_score_mask (((1U<<4)-1)< +- fix xen vmx in 64 bits. + * Mon Mar 20 2006 Dave Jones - 2.6.16 From fedora-cvs-commits at redhat.com Mon Mar 20 20:24:59 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 20 Mar 2006 15:24:59 -0500 Subject: rpms/libsepol/devel .cvsignore, 1.88, 1.89 libsepol.spec, 1.116, 1.117 sources, 1.89, 1.90 Message-ID: <200603202024.k2KKOxZm008252@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/libsepol/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv8237 Modified Files: .cvsignore libsepol.spec sources Log Message: * Fri Mar 10 2006 Dan Walsh 1.12.1-1 - Upgrade to latest from NSA * Fixed sepol_module_package_write buffer overflow bug. Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/libsepol/devel/.cvsignore,v retrieving revision 1.88 retrieving revision 1.89 diff -u -r1.88 -r1.89 --- .cvsignore 17 Mar 2006 17:11:39 -0000 1.88 +++ .cvsignore 20 Mar 2006 20:24:57 -0000 1.89 @@ -88,3 +88,4 @@ libsepol-1.11.19.tgz libsepol-1.11.20.tgz libsepol-1.12.tgz +libsepol-1.12.1.tgz Index: libsepol.spec =================================================================== RCS file: /cvs/dist/rpms/libsepol/devel/libsepol.spec,v retrieving revision 1.116 retrieving revision 1.117 diff -u -r1.116 -r1.117 --- libsepol.spec 17 Mar 2006 18:39:47 -0000 1.116 +++ libsepol.spec 20 Mar 2006 20:24:57 -0000 1.117 @@ -1,7 +1,7 @@ Summary: SELinux binary policy manipulation library Name: libsepol -Version: 1.12 -Release: 2 +Version: 1.12.1 +Release: 1 License: GPL Group: System Environment/Libraries Source: http://www.nsa.gov/selinux/archives/libsepol-%{version}.tgz @@ -80,6 +80,10 @@ %{_includedir}/sepol/policydb/*.h %changelog +* Fri Mar 10 2006 Dan Walsh 1.12.1-1 +- Upgrade to latest from NSA + * Fixed sepol_module_package_write buffer overflow bug. + * Fri Mar 10 2006 Dan Walsh 1.12-2 - Upgrade to latest from NSA * Updated version for release. Index: sources =================================================================== RCS file: /cvs/dist/rpms/libsepol/devel/sources,v retrieving revision 1.89 retrieving revision 1.90 diff -u -r1.89 -r1.90 --- sources 17 Mar 2006 17:11:39 -0000 1.89 +++ sources 20 Mar 2006 20:24:57 -0000 1.90 @@ -1 +1 @@ -08db3a3dbcbe6234d842208980cf8f40 libsepol-1.12.tgz +2d99e03cd065f1e846da2e682d4d5366 libsepol-1.12.1.tgz From fedora-cvs-commits at redhat.com Mon Mar 20 20:28:28 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 20 Mar 2006 15:28:28 -0500 Subject: rpms/libsepol/FC-5 libsepol.spec,1.114,1.115 Message-ID: <200603202028.k2KKSSPI008490@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/libsepol/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv8475 Modified Files: libsepol.spec Log Message: * Fri Mar 10 2006 Dan Walsh 1.12.1-1.fc5 - Rebuild for FC5 Index: libsepol.spec =================================================================== RCS file: /cvs/dist/rpms/libsepol/FC-5/libsepol.spec,v retrieving revision 1.114 retrieving revision 1.115 diff -u -r1.114 -r1.115 --- libsepol.spec 21 Feb 2006 03:32:41 -0000 1.114 +++ libsepol.spec 20 Mar 2006 20:28:26 -0000 1.115 @@ -1,7 +1,7 @@ Summary: SELinux binary policy manipulation library Name: libsepol -Version: 1.11.18 -Release: 2 +Version: 1.12.1 +Release: 1.fc5 License: GPL Group: System Environment/Libraries Source: http://www.nsa.gov/selinux/archives/libsepol-%{version}.tgz @@ -80,8 +80,24 @@ %{_includedir}/sepol/policydb/*.h %changelog +* Fri Mar 10 2006 Dan Walsh 1.12.1-1.fc5 +- Rebuild for FC5 + +* Fri Mar 10 2006 Dan Walsh 1.12.1-1 +- Upgrade to latest from NSA + * Fixed sepol_module_package_write buffer overflow bug. + +* Fri Mar 10 2006 Dan Walsh 1.12-2 +- Upgrade to latest from NSA + * Updated version for release. + * Merged cond_evaluate_expr fix from Serge Hallyn (IBM). + * Fixed bug in copy_avrule_list reported by Ivan Gyurdiev. + * Merged sepol_policydb_mls_enabled interface and error handling + changes from Ivan Gyurdiev. + * Mon Feb 20 2006 Dan Walsh 1.11.18-2 - Rebuild for fc5-head + * Fri Feb 17 2006 Dan Walsh 1.11.18-1 - Upgrade to latest from NSA * Merged node_expand_addr bugfix and node_compare* change from From fedora-cvs-commits at redhat.com Mon Mar 20 20:31:04 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 20 Mar 2006 15:31:04 -0500 Subject: rpms/libsepol/FC-5 .cvsignore,1.87,1.88 sources,1.88,1.89 Message-ID: <200603202031.k2KKV4FR008590@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/libsepol/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv8580 Modified Files: .cvsignore sources Log Message: * Fri Mar 10 2006 Dan Walsh 1.12.1-1.fc5 - Rebuild for FC5 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/libsepol/FC-5/.cvsignore,v retrieving revision 1.87 retrieving revision 1.88 diff -u -r1.87 -r1.88 --- .cvsignore 17 Feb 2006 19:47:41 -0000 1.87 +++ .cvsignore 20 Mar 2006 20:30:50 -0000 1.88 @@ -85,3 +85,4 @@ libsepol-1.11.14.tgz libsepol-1.11.17.tgz libsepol-1.11.18.tgz +libsepol-1.12.1.tgz Index: sources =================================================================== RCS file: /cvs/dist/rpms/libsepol/FC-5/sources,v retrieving revision 1.88 retrieving revision 1.89 diff -u -r1.88 -r1.89 --- sources 17 Feb 2006 19:47:41 -0000 1.88 +++ sources 20 Mar 2006 20:30:50 -0000 1.89 @@ -1 +1 @@ -0390cbb550f2c99e179f9f93ac4969df libsepol-1.11.18.tgz +2d99e03cd065f1e846da2e682d4d5366 libsepol-1.12.1.tgz From fedora-cvs-commits at redhat.com Mon Mar 20 20:36:59 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 20 Mar 2006 15:36:59 -0500 Subject: rpms/libselinux/FC-5 .cvsignore, 1.101, 1.102 libselinux.spec, 1.181, 1.182 sources, 1.103, 1.104 Message-ID: <200603202036.k2KKaxnM008730@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/libselinux/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv8716 Modified Files: .cvsignore libselinux.spec sources Log Message: * Mon Mar 18 2006 Dan Walsh 1.30-1.fc5 - rebuild for FC5 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/libselinux/FC-5/.cvsignore,v retrieving revision 1.101 retrieving revision 1.102 diff -u -r1.101 -r1.102 --- .cvsignore 20 Jan 2006 16:17:43 -0000 1.101 +++ .cvsignore 20 Mar 2006 20:36:57 -0000 1.102 @@ -75,3 +75,4 @@ libselinux-1.29.5.tgz libselinux-1.29.6.tgz libselinux-1.29.7.tgz +libselinux-1.30.tgz Index: libselinux.spec =================================================================== RCS file: /cvs/dist/rpms/libselinux/FC-5/libselinux.spec,v retrieving revision 1.181 retrieving revision 1.182 diff -u -r1.181 -r1.182 --- libselinux.spec 11 Feb 2006 04:12:30 -0000 1.181 +++ libselinux.spec 20 Mar 2006 20:36:57 -0000 1.182 @@ -1,12 +1,13 @@ -%define libsepolver 1.11.9-1 -%define libsetransver 0.1.18-1 +%define libsepolver 1.12-1 +%define libsetransver 0.1.20-1 Summary: SELinux library and simple utilities Name: libselinux -Version: 1.29.7 -Release: 1.2 +Version: 1.30 +Release: 1.fc5 License: Public domain (uncopyrighted) Group: System Environment/Libraries Source: http://www.nsa.gov/selinux/archives/%{name}-%{version}.tgz +Patch: libselinux-rhat.patch BuildRequires: libsepol-devel >= %{libsepolver} Requires: libsepol >= %{libsepolver} @@ -33,6 +34,7 @@ Summary: python bindings for libselinux Group: Development/Libraries Requires: libselinux = %{version}-%{release} +BuildRequires: python-devel %description python The libselinux-python package contains the python bindings for developing SELinux @@ -49,6 +51,7 @@ %prep %setup -q +%patch -p1 -b .rhat %build make clean @@ -104,10 +107,20 @@ %files python %defattr(-,root,root,0755) -%{_libdir}/python2.4/site-packages/_selinux.so -%{_libdir}/python2.4/site-packages/selinux.py* +%{_libdir}/python*/site-packages/_selinux.so +%{_libdir}/python*/site-packages/selinux.py* %changelog +* Mon Mar 18 2006 Dan Walsh 1.30-1.fc5 +- rebuild for FC5 + +* Fri Mar 10 2006 Dan Walsh 1.30-1 +- Make some fixes so it will build on RHEL4 +- Upgrade to latest from NSA + * Updated version for release. + * Altered rpm_execcon fallback logic for permissive mode to also + handle case where /selinux/enforce is not available. + * Fri Feb 10 2006 Jesse Keating - 1.29.7-1.2 - bump again for double-long bug on ppc(64) Index: sources =================================================================== RCS file: /cvs/dist/rpms/libselinux/FC-5/sources,v retrieving revision 1.103 retrieving revision 1.104 diff -u -r1.103 -r1.104 --- sources 20 Jan 2006 16:17:43 -0000 1.103 +++ sources 20 Mar 2006 20:36:57 -0000 1.104 @@ -1 +1 @@ -880560e5229cbf090b0f4608a5c3b95e libselinux-1.29.7.tgz +b0834c79eac17c87c690542b0874cc53 libselinux-1.30.tgz From fedora-cvs-commits at redhat.com Mon Mar 20 20:41:23 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 20 Mar 2006 15:41:23 -0500 Subject: rpms/libsemanage/FC-5 .cvsignore, 1.54, 1.55 libsemanage-rhat.patch, 1.10, 1.11 libsemanage.spec, 1.77, 1.78 sources, 1.56, 1.57 Message-ID: <200603202041.k2KKfNvs008829@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/libsemanage/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv8812 Modified Files: .cvsignore libsemanage-rhat.patch libsemanage.spec sources Log Message: * Mon Mar 18 2006 Dan Walsh - 1.6-1.fc5 - Rebuild for FC5 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/libsemanage/FC-5/.cvsignore,v retrieving revision 1.54 retrieving revision 1.55 diff -u -r1.54 -r1.55 --- .cvsignore 17 Feb 2006 20:00:24 -0000 1.54 +++ .cvsignore 20 Mar 2006 20:41:19 -0000 1.55 @@ -57,3 +57,4 @@ libsemanage-1.5.23.tgz libsemanage-1.5.26.tgz libsemanage-1.5.28.tgz +libsemanage-1.6.tgz libsemanage-rhat.patch: Makefile | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) Index: libsemanage-rhat.patch =================================================================== RCS file: /cvs/dist/rpms/libsemanage/FC-5/libsemanage-rhat.patch,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- libsemanage-rhat.patch 10 Feb 2006 16:42:07 -0000 1.10 +++ libsemanage-rhat.patch 20 Mar 2006 20:41:19 -0000 1.11 @@ -1,57 +1,11 @@ -diff -Naurp --exclude-from excludes old/libsemanage/src/direct_api.c new/libsemanage/src/direct_api.c ---- old/libsemanage/src/direct_api.c 2006-02-08 03:20:08.000000000 -0500 -+++ new/libsemanage/src/direct_api.c 2006-02-09 19:14:15.000000000 -0500 -@@ -475,7 +475,7 @@ static int semanage_direct_commit(semana - - /* ==================== File-backed ================== */ - -- /* write the linked file contexts template */ -+ /* File Contexts */ - if ((ofilename = semanage_path(SEMANAGE_TMP, SEMANAGE_FC_TMPL)) == NULL || - write_file(sh, ofilename, sepol_module_package_get_file_contexts(base), - sepol_module_package_get_file_contexts_len(base)) == -1) { -@@ -484,29 +484,36 @@ static int semanage_direct_commit(semana - - if (semanage_split_fc(sh)) - goto cleanup; -- -+ -+ pfcontexts->dtable->drop_cache(pfcontexts->dbase); -+ -+ /* Seusers */ - if (sepol_module_package_get_seusers_len(base)) { - if ((ofilename = semanage_path(SEMANAGE_TMP, SEMANAGE_SEUSERS)) == NULL || - write_file(sh, ofilename, sepol_module_package_get_seusers(base), - sepol_module_package_get_seusers_len(base)) == -1) { - goto cleanup; - } -+ pseusers->dtable->drop_cache(pseusers->dbase); -+ -+ } else { -+ if (pseusers->dtable->clear(sh, pseusers->dbase) < 0) -+ goto cleanup; - } - -+ /* Users_extra */ - if (sepol_module_package_get_user_extra_len(base)) { - if ((ofilename = semanage_path(SEMANAGE_TMP, SEMANAGE_USER_EXTRA)) == NULL || - write_file(sh, ofilename, sepol_module_package_get_user_extra(base), - sepol_module_package_get_user_extra_len(base)) == -1) { - goto cleanup; - } -- } -+ pusers_extra->dtable->drop_cache(pusers_extra->dbase); - -- /* Drop any cached content for file_contexts, seusers, or users_extra, -- * since it is now superceded by the files just written, and needs to be -- * re-cached */ -- pfcontexts->dtable->drop_cache(pfcontexts->dbase); -- pseusers->dtable->drop_cache(pseusers->dbase); -- pusers_extra->dtable->drop_cache(pusers_extra->dbase); -+ } else { -+ if (pusers_extra->dtable->clear(sh, pusers_extra->dbase) < 0) -+ goto cleanup; -+ } - - /* ==================== Policydb-backed ================ */ +--- libsemanage-1.5.28/src/Makefile~ 2006-02-17 14:45:52.000000000 -0500 ++++ libsemanage-1.5.28/src/Makefile 2006-03-17 08:44:29.000000000 -0500 +@@ -3,7 +3,7 @@ + LIBDIR ?= $(PREFIX)/lib + SHLIBDIR ?= $(DESTDIR)/lib + INCLUDEDIR ?= $(PREFIX)/include +-PYLIBVER ?= python2.4 ++PYLIBVER ?= $(shell python -c 'import sys;print "python%d.%d" % sys.version_info[0:2]') + PYINC ?= /usr/include/${PYLIBVER} + PYLIBDIR ?= $(LIBDIR)/${PYLIBVER} Index: libsemanage.spec =================================================================== RCS file: /cvs/dist/rpms/libsemanage/FC-5/libsemanage.spec,v retrieving revision 1.77 retrieving revision 1.78 diff -u -r1.77 -r1.78 --- libsemanage.spec 17 Feb 2006 20:00:24 -0000 1.77 +++ libsemanage.spec 20 Mar 2006 20:41:19 -0000 1.78 @@ -1,12 +1,13 @@ -%define libsepolver 1.11.18-1 -%define libselinuxver 1.29.6-1 +%define libsepolver 1.12-1 +%define libselinuxver 1.30-1 Summary: SELinux binary policy manipulation library Name: libsemanage -Version: 1.5.28 +Version: 1.6 Release: 1 License: GPL Group: System Environment/Libraries Source: http://www.nsa.gov/selinux/archives/libsemanage-%{version}.tgz +Patch: libsemanage-rhat.patch BuildRoot: %{_tmppath}/%{name}-buildroot BuildRequires: libselinux-devel >= %{libselinuxver} @@ -39,6 +40,7 @@ %prep %setup -q +%patch -p1 -b .rhat %build make clean @@ -59,10 +61,7 @@ %config(noreplace) /etc/selinux/semanage.conf /%{_lib}/libsemanage.so.1 %{_libdir}/libsemanage.so -%{_libdir}/python2.4/site-packages/_semanage.so -%{_libdir}/python2.4/site-packages/semanage.py -%{_libdir}/python2.4/site-packages/semanage.pyc -%{_libdir}/python2.4/site-packages/semanage.pyo +%{_libdir}/python*/site-packages/* %post -p /sbin/ldconfig @@ -75,6 +74,17 @@ %{_mandir}/man3/* %changelog +* Mon Mar 18 2006 Dan Walsh - 1.6-1.fc5 +- Rebuild for FC5 + +* Fri Mar 17 2006 Dan Walsh - 1.6-1 +- Make work on RHEL4 +- Upgrade to latest from NSA + * Merged abort early on merge errors patch from Ivan Gyurdiev. + * Cleaned up error handling in semanage_split_fc based on a patch + by Serge Hallyn (IBM) and suggestions by Ivan Gyurdiev. + * Merged MLS handling fixes from Ivan Gyurdiev. + * Fri Feb 17 2006 Dan Walsh - 1.5.28-1 - Upgrade to latest from NSA * Merged bug fix for fcontext validate handler from Ivan Gyurdiev. Index: sources =================================================================== RCS file: /cvs/dist/rpms/libsemanage/FC-5/sources,v retrieving revision 1.56 retrieving revision 1.57 diff -u -r1.56 -r1.57 --- sources 17 Feb 2006 20:00:24 -0000 1.56 +++ sources 20 Mar 2006 20:41:19 -0000 1.57 @@ -1 +1 @@ -42110b5a329e91eb8aff0c2cad7e2b72 libsemanage-1.5.28.tgz +3f547c9b5ca5d300957a2b36230dbb30 libsemanage-1.6.tgz From fedora-cvs-commits at redhat.com Mon Mar 20 21:13:53 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 20 Mar 2006 16:13:53 -0500 Subject: rpms/bind/devel bind.spec,1.94,1.95 Message-ID: <200603202113.k2KLDrec022741@cvs.devel.redhat.com> Author: jvdias Update of /cvs/dist/rpms/bind/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv22728 Modified Files: bind.spec Log Message: fix bug 185969: more .spec file cleanup Index: bind.spec =================================================================== RCS file: /cvs/dist/rpms/bind/devel/bind.spec,v retrieving revision 1.94 retrieving revision 1.95 diff -u -r1.94 -r1.95 --- bind.spec 8 Mar 2006 18:17:55 -0000 1.94 +++ bind.spec 20 Mar 2006 21:13:51 -0000 1.95 @@ -9,6 +9,7 @@ %{?!DEBUGINFO: %define DEBUGINFO 1} %{?!bind_uid: %define bind_uid 25} %{?!bind_gid: %define bind_gid 25} +%{?!selinux: %define selinux 1} %define bind_dir /var/named %define chroot_prefix %{bind_dir}/chroot # @@ -16,7 +17,7 @@ Name: bind License: BSD-like Version: 9.3.2 -Release: 8 +Release: 10 Epoch: 30 Url: http://www.isc.org/products/BIND/ Buildroot: %{_tmppath}/%{name}-root @@ -83,10 +84,13 @@ Patch28: bind-9.3.2rc1-dbus-0.6.patch Patch29: bind-9.3.2-bz177854.patch # -Requires(pre,preun): shadow-utils -Requires(post,preun): chkconfig -Requires(post): textutils, fileutils, sed, grep -Requires: bind-libs = %{epoch}:%{version}-%{release}, glibc >= 2.2, /bin/usleep +Requires: bind-libs = %{epoch}:%{version}-%{release}, glibc >= 2.2 +Requires(post): bash, textutils, fileutils, sed, grep +Requires(pre): shadow-utils +Requires(post,preun): chkconfig >= 1.3.26 +%if %{selinux} +Requires(post): policycoreutils +%endif %if %{SDB} %if %{WITH_DBUS} BuildRequires: openssl-devel gcc dbus-devel glibc-devel >= 2.2.5-26 glibc-kernheaders >= 2.4-7.10 libtool pkgconfig tar openldap-devel postgresql-devel @@ -155,6 +159,10 @@ Obsoletes: caching-nameserver Provides: caching-nameserver Requires: bind = %{epoch}:%{version}-%{release} +Requires(post): bash, textutils, fileutils, sed, grep +%if %{selinux} +Requires(post): coreutils +%endif %description config The bind-config package includes the configuration files which will make @@ -173,6 +181,10 @@ Group: System Environment/Daemons Prefix: %{chroot_prefix} Requires: bind = %{epoch}:%{version}-%{release} +Requires(post): bash, textutils, fileutils, sed, grep +%if %{selinux} +Requires(post): coreutils +%endif %description chroot This package contains a tree of files which can be used as a @@ -200,7 +212,11 @@ %package sdb Summary: The Berkeley Internet Name Domain (BIND) DNS (Domain Name System) server with database backends. Group: System Environment/Daemons -Requires: bind-libs = %{epoch}:%{version}-%{release}, bind-utils = %{epoch}:%{version}-%{release}, glibc >= 2.2, /bin/usleep +Requires: bind-libs = %{epoch}:%{version}-%{release}, bind-utils = %{epoch}:%{version}-%{release}, glibc >= 2.2 +Requires(post): bash, textutils, fileutils, sed, grep, mktemp +%if %{selinux} +Requires(post): coreutils +%endif %description sdb BIND (Berkeley Internet Name Domain) is an implementation of the DNS @@ -616,22 +632,14 @@ %pre if [ "$1" -eq 1 ]; then /usr/sbin/groupadd -g %{bind_gid} -f -r named >/dev/null 2>&1 || :; - if ! /usr/sbin/useradd -u %{bind_uid} -r -n -M -g named -s /sbin/nologin -d /var/named -c Named named >/dev/null 2>&1; then - if ! /usr/bin/id -u named >/dev/null 2>&1; then - echo 'Creation of named userid '%{bind_uid}' failed.' - echo 'The bind package cannot be installed without a named:named userid and group.' - if [ -x /usr/bin/logger ]; then - /usr/bin/logger -p 'user.crit' 'Creation of named userid '%{bind_uid}' failed - the bind package cannot be installed without a named:named userid and group.'; - fi; - exit 1; - fi; - fi; + /usr/sbin/useradd -u %{bind_uid} -r -n -M -g named -s /sbin/nologin -d /var/named -c Named named >/dev/null 2>&1 || :; fi; :; %post +/sbin/ldconfig +/sbin/chkconfig --add named if [ "$1" -eq 1 ]; then - /sbin/chkconfig --add named if [ -f /etc/named.boot -a -x /usr/sbin/named-bootconf -a ! -f /etc/named.conf ]; then # Convert BIND 4 named.bootconf syntax to BIND 9 syntax (should never be used!) cat /etc/named.boot | /usr/sbin/named-bootconf > /etc/named.bootconf-converted.conf @@ -645,25 +653,22 @@ chmod 0640 /etc/rndc.key chown root:named /etc/rndc.key fi - [ -d /selinux ] && [ -x /sbin/restorecon ] && /sbin/restorecon /etc/rndc.conf /etc/named.conf >/dev/null 2>&1 ; - /sbin/ldconfig + [ -e /selinux/enforce ] && [ -x /sbin/restorecon ] && /sbin/restorecon /etc/rndc.* /etc/named.* >/dev/null 2>&1 ; fi :; %preun if [ "$1" = 0 ]; then /etc/rc.d/init.d/named stop >/dev/null 2>&1 || :; - /usr/sbin/userdel named 2>/dev/null || :; - /usr/sbin/groupdel named 2>/dev/null || :; /sbin/chkconfig --del named || :; fi :; %postun +/sbin/ldconfig if [ "$1" -ge 1 ]; then /etc/rc.d/init.d/named condrestart >/dev/null 2>&1 || : fi; -/sbin/ldconfig :; %triggerpostun -- bind < 8.2.2_P5-15 @@ -681,27 +686,7 @@ # These versions ran bind with order 11 in runlevel 2, after syslog # at order 12 . BIND should run after syslog and now has order '- 13 87'. # - rl=() - for l in 0 1 2 3 4 5 6; - do - if chkconfig --level=$l named; then - rl=(${rl[@]} 1) - else - rl=(${rl[@]} 0) - fi - done - chkconfig --del named - chkconfig --add named - let l=0; - for s in ${rl[@]}; - do - if [ "$s" = "1" ]; then - chkconfig --level=$l named on; - else - chkconfig --level=$l named off; - fi; - let l='l+1'; - done; + /sbin/chkconfig named resetpriorities fi :; @@ -722,6 +707,7 @@ %post config if [ "$1" -gt 0 ]; then /usr/bin/chcon system_u:object_r:named_conf_t /etc/named.caching-nameserver.conf >/dev/null 2>&1 || :; + /usr/bin/chcon system_u:object_r:named_conf_t /etc/named.rfc1912.zones >/dev/null 2>&1 || :; fi if [ "$1" -eq 1 ]; then /usr/sbin/bind-chroot-admin --sync; @@ -775,7 +761,7 @@ /usr/bin/tail -n +$n /etc/openldap/slapd.conf >> $tf /bin/mv -f $tf /etc/openldap/slapd.conf; /bin/chmod --reference=/etc/openldap/slapd.conf.rpmsave /etc/openldap/slapd.conf - [ -d /selinux ] && [ -x /sbin/restorecon ] && /sbin/restorecon /etc/openldap/slapd.conf >/dev/null 2>&1 + [ -e /selinux/enforce ] && [ -x /sbin/restorecon ] && /sbin/restorecon /etc/openldap/slapd.conf >/dev/null 2>&1 || :; [ -x /etc/init.d/ldap ] && /etc/init.d/ldap condrestart >/dev/null 2>&1 fi rm -f $tf >/dev/null 2>&1 || :; @@ -791,7 +777,7 @@ /bin/egrep -v '^include.*dnszone\.schema' /etc/openldap/slapd.conf > $tf /bin/mv -f $tf /etc/openldap/slapd.conf; rm -f $tf >/dev/null 2>&1 - [ -d /selinux ] && [ -x /sbin/restorecon ] && /sbin/restorecon /etc/openldap/slapd.conf >/dev/null 2>&1 + [ -e /selinux/enforce ] && [ -x /sbin/restorecon ] && /sbin/restorecon /etc/openldap/slapd.conf >/dev/null 2>&1 || :; [ -x /etc/init.d/ldap ] && /etc/init.d/ldap condrestart >/dev/null 2>&1 || :; fi; fi; @@ -804,6 +790,9 @@ :; %changelog +* Mon Mar 20 2006 Jason Vas Dias - 30.9.3.2-10 +- fix bug 185969: more .spec file cleanup + * Wed Mar 08 2006 Jason Vas Dias - 30.9.3.2-8 - Do not allow package to be installed if named:25 userid creation fails - Give libbind a pkg-config file @@ -815,7 +804,6 @@ * Mon Mar 06 2006 Jason Vas Dias - 30:9.3.2-6 - replace caching-nameserver with bind-config sub-package -- fix bug 181730: fix creation of named user & gid - fix bug 177595: handle case where $ROOTDIR is a link in initscript - fix bug 177001: bind-config creates symlinks OK now - fix bug 176388: named.conf is now never replaced by any RPM From fedora-cvs-commits at redhat.com Mon Mar 20 21:24:20 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 20 Mar 2006 16:24:20 -0500 Subject: rpms/policycoreutils/devel policycoreutils-rhat.patch, 1.172, 1.173 policycoreutils.spec, 1.245, 1.246 Message-ID: <200603202124.k2KLOKah004209@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/policycoreutils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv4188 Modified Files: policycoreutils-rhat.patch policycoreutils.spec Log Message: * Fri Mar 17 2006 Dan Walsh 1.30-3 - Fixes for restorecond attack via symlinks - Fixes for fixfiles policycoreutils-rhat.patch: Makefile | 2 restorecond/Makefile | 29 ++ restorecond/restorecond.8 | 31 +++ restorecond/restorecond.c | 436 +++++++++++++++++++++++++++++++++++++++++++ restorecond/restorecond.conf | 3 restorecond/restorecond.h | 31 +++ restorecond/restorecond.init | 57 +++++ restorecond/stringslist.c | 118 +++++++++++ restorecond/stringslist.h | 37 +++ restorecond/utmpwatcher.c | 105 ++++++++++ restorecond/utmpwatcher.h | 29 ++ scripts/fixfiles | 10 semanage/seobject.py | 8 13 files changed, 890 insertions(+), 6 deletions(-) Index: policycoreutils-rhat.patch =================================================================== RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v retrieving revision 1.172 retrieving revision 1.173 diff -u -r1.172 -r1.173 --- policycoreutils-rhat.patch 18 Mar 2006 04:58:48 -0000 1.172 +++ policycoreutils-rhat.patch 20 Mar 2006 21:24:16 -0000 1.173 @@ -77,8 +77,8 @@ +.BR restorecon (8), diff --exclude-from=exclude -N -u -r nsapolicycoreutils/restorecond/restorecond.c policycoreutils-1.30/restorecond/restorecond.c --- nsapolicycoreutils/restorecond/restorecond.c 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.30/restorecond/restorecond.c 2006-03-17 23:56:29.000000000 -0500 -@@ -0,0 +1,469 @@ ++++ policycoreutils-1.30/restorecond/restorecond.c 2006-03-20 15:57:28.000000000 -0500 +@@ -0,0 +1,436 @@ +/* + * restorecond + * @@ -240,44 +240,11 @@ + + if (lstat(filename, &st)!=0) return; + -+ if (S_ISLNK(st.st_mode)) { -+ char *p = NULL, *file_sep; -+ char *tmp_path = strdupa(filename); -+ size_t len=0; -+ if (!tmp_path) { -+ exitApp("Out of Memory"); -+ } -+ file_sep = strrchr(tmp_path, '/'); -+ if(file_sep) -+ { -+ *file_sep = 0; -+ file_sep++; -+ p = realpath(tmp_path, path); -+ } -+ else { -+ file_sep = tmp_path; -+ p = realpath("./", path); -+ } -+ if(p) -+ len = strlen(p); -+ if (!p || len + strlen(file_sep) + 2 > PATH_MAX) { -+ syslog(LOG_ERR,"realpath(%s) failed %s\n", filename, strerror(errno)); -+ return; -+ } -+ p += len; -+ *p = '/'; -+ p++; -+ strcpy(p, file_sep); -+ filename = path; -+ } else { -+ char *p; -+ p = realpath(filename, path); -+ if (!p) { -+ syslog(LOG_ERR,"realpath(%s) failed %s\n", filename, strerror(errno)); -+ return; -+ } -+ filename = p; ++ if (st.st_nlink > 1) { ++ syslog(LOG_ERR,"Will not restore a file with more than one hard link (%s) %s\n", filename,strerror(errno)); ++ return; + } ++ + if (matchpathcon(filename, st.st_mode, &scontext) < 0) { + if (errno == ENOENT) + return; @@ -958,7 +925,7 @@ +#endif diff --exclude-from=exclude -N -u -r nsapolicycoreutils/scripts/fixfiles policycoreutils-1.30/scripts/fixfiles --- nsapolicycoreutils/scripts/fixfiles 2006-01-04 13:07:46.000000000 -0500 -+++ policycoreutils-1.30/scripts/fixfiles 2006-03-17 23:29:02.000000000 -0500 ++++ policycoreutils-1.30/scripts/fixfiles 2006-03-20 15:50:23.000000000 -0500 @@ -124,7 +124,15 @@ exit $? fi @@ -966,7 +933,7 @@ - ${RESTORECON} ${OUTFILES} ${FORCEFLAG} -R $1 -v $DIRS 2>&1 >> $LOGFILE + if [ -x /usr/bin/find ]; then + for d in ${DIRS} ; do find $d \ -+ ! \( -fstype ext2 -o -fstype ext3 -o -fstype jfs -o -fstype xfs \) -prune -o -print; \ ++ ! \( -fstype ext2 -o -fstype ext3 -o -fstype jfs -o -fstype xfs \) -prune -o -print | \ + ${RESTORECON} ${OUTFILES} ${FORCEFLAG} $1 -v -f - 2>&1 >> $LOGFILE + done + else @@ -979,20 +946,6 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/semanage/seobject.py policycoreutils-1.30/semanage/seobject.py --- nsapolicycoreutils/semanage/seobject.py 2006-03-10 09:48:05.000000000 -0500 +++ policycoreutils-1.30/semanage/seobject.py 2006-03-17 23:29:02.000000000 -0500 -@@ -229,10 +229,9 @@ - if rc < 0: - raise ValueError("Could not set name for %s" % name) - -- if serange != "": -- rc = semanage_seuser_set_mlsrange(self.sh, u, serange) -- if rc < 0: -- raise ValueError("Could not set MLS range for %s" % name) -+ rc = semanage_seuser_set_mlsrange(self.sh, u, serange) -+ if rc < 0: -+ raise ValueError("Could not set MLS range for %s" % name) - - rc = semanage_seuser_set_sename(self.sh, u, sename) - if rc < 0: @@ -549,7 +548,7 @@ raise ValueError("Could not list roles for user %s" % name) Index: policycoreutils.spec =================================================================== RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils.spec,v retrieving revision 1.245 retrieving revision 1.246 diff -u -r1.245 -r1.246 --- policycoreutils.spec 18 Mar 2006 04:58:48 -0000 1.245 +++ policycoreutils.spec 20 Mar 2006 21:24:16 -0000 1.246 @@ -104,6 +104,10 @@ %config(noreplace) /etc/selinux/restorecond.conf %changelog +* Fri Mar 17 2006 Dan Walsh 1.30-3 +- Fixes for restorecond attack via symlinks +- Fixes for fixfiles + * Fri Mar 17 2006 Dan Walsh 1.30-2 - Restorecon has to handle suspend/resume From fedora-cvs-commits at redhat.com Mon Mar 20 21:25:46 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 20 Mar 2006 16:25:46 -0500 Subject: rpms/policycoreutils/devel policycoreutils.spec,1.246,1.247 Message-ID: <200603202125.k2KLPkit004298@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/policycoreutils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv4279 Modified Files: policycoreutils.spec Log Message: * Fri Mar 17 2006 Dan Walsh 1.30-3 - Fixes for restorecond attack via symlinks - Fixes for fixfiles Index: policycoreutils.spec =================================================================== RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils.spec,v retrieving revision 1.246 retrieving revision 1.247 diff -u -r1.246 -r1.247 --- policycoreutils.spec 20 Mar 2006 21:24:16 -0000 1.246 +++ policycoreutils.spec 20 Mar 2006 21:25:44 -0000 1.247 @@ -5,7 +5,7 @@ Summary: SELinux policy core utilities. Name: policycoreutils Version: 1.30 -Release: 2 +Release: 3 License: GPL Group: System Environment/Base Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz From fedora-cvs-commits at redhat.com Mon Mar 20 21:31:42 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 20 Mar 2006 16:31:42 -0500 Subject: rpms/bind/FC-5 bind.spec,1.94,1.95 Message-ID: <200603202131.k2KLVgql004478@cvs.devel.redhat.com> Author: jvdias Update of /cvs/dist/rpms/bind/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv4462 Modified Files: bind.spec Log Message: fix bug 185969: more .spec file cleanup Index: bind.spec =================================================================== RCS file: /cvs/dist/rpms/bind/FC-5/bind.spec,v retrieving revision 1.94 retrieving revision 1.95 diff -u -r1.94 -r1.95 --- bind.spec 8 Mar 2006 18:17:55 -0000 1.94 +++ bind.spec 20 Mar 2006 21:31:39 -0000 1.95 @@ -9,6 +9,7 @@ %{?!DEBUGINFO: %define DEBUGINFO 1} %{?!bind_uid: %define bind_uid 25} %{?!bind_gid: %define bind_gid 25} +%{?!selinux: %define selinux 1} %define bind_dir /var/named %define chroot_prefix %{bind_dir}/chroot # @@ -16,7 +17,7 @@ Name: bind License: BSD-like Version: 9.3.2 -Release: 8 +Release: 10 Epoch: 30 Url: http://www.isc.org/products/BIND/ Buildroot: %{_tmppath}/%{name}-root @@ -83,10 +84,13 @@ Patch28: bind-9.3.2rc1-dbus-0.6.patch Patch29: bind-9.3.2-bz177854.patch # -Requires(pre,preun): shadow-utils -Requires(post,preun): chkconfig -Requires(post): textutils, fileutils, sed, grep -Requires: bind-libs = %{epoch}:%{version}-%{release}, glibc >= 2.2, /bin/usleep +Requires: bind-libs = %{epoch}:%{version}-%{release}, glibc >= 2.2 +Requires(post): bash, textutils, fileutils, sed, grep +Requires(pre): shadow-utils +Requires(post,preun): chkconfig >= 1.3.26 +%if %{selinux} +Requires(post): policycoreutils +%endif %if %{SDB} %if %{WITH_DBUS} BuildRequires: openssl-devel gcc dbus-devel glibc-devel >= 2.2.5-26 glibc-kernheaders >= 2.4-7.10 libtool pkgconfig tar openldap-devel postgresql-devel @@ -155,6 +159,10 @@ Obsoletes: caching-nameserver Provides: caching-nameserver Requires: bind = %{epoch}:%{version}-%{release} +Requires(post): bash, textutils, fileutils, sed, grep +%if %{selinux} +Requires(post): coreutils +%endif %description config The bind-config package includes the configuration files which will make @@ -173,6 +181,10 @@ Group: System Environment/Daemons Prefix: %{chroot_prefix} Requires: bind = %{epoch}:%{version}-%{release} +Requires(post): bash, textutils, fileutils, sed, grep +%if %{selinux} +Requires(post): coreutils +%endif %description chroot This package contains a tree of files which can be used as a @@ -200,7 +212,11 @@ %package sdb Summary: The Berkeley Internet Name Domain (BIND) DNS (Domain Name System) server with database backends. Group: System Environment/Daemons -Requires: bind-libs = %{epoch}:%{version}-%{release}, bind-utils = %{epoch}:%{version}-%{release}, glibc >= 2.2, /bin/usleep +Requires: bind-libs = %{epoch}:%{version}-%{release}, bind-utils = %{epoch}:%{version}-%{release}, glibc >= 2.2 +Requires(post): bash, textutils, fileutils, sed, grep, mktemp +%if %{selinux} +Requires(post): coreutils +%endif %description sdb BIND (Berkeley Internet Name Domain) is an implementation of the DNS @@ -616,22 +632,14 @@ %pre if [ "$1" -eq 1 ]; then /usr/sbin/groupadd -g %{bind_gid} -f -r named >/dev/null 2>&1 || :; - if ! /usr/sbin/useradd -u %{bind_uid} -r -n -M -g named -s /sbin/nologin -d /var/named -c Named named >/dev/null 2>&1; then - if ! /usr/bin/id -u named >/dev/null 2>&1; then - echo 'Creation of named userid '%{bind_uid}' failed.' - echo 'The bind package cannot be installed without a named:named userid and group.' - if [ -x /usr/bin/logger ]; then - /usr/bin/logger -p 'user.crit' 'Creation of named userid '%{bind_uid}' failed - the bind package cannot be installed without a named:named userid and group.'; - fi; - exit 1; - fi; - fi; + /usr/sbin/useradd -u %{bind_uid} -r -n -M -g named -s /sbin/nologin -d /var/named -c Named named >/dev/null 2>&1 || :; fi; :; %post +/sbin/ldconfig +/sbin/chkconfig --add named if [ "$1" -eq 1 ]; then - /sbin/chkconfig --add named if [ -f /etc/named.boot -a -x /usr/sbin/named-bootconf -a ! -f /etc/named.conf ]; then # Convert BIND 4 named.bootconf syntax to BIND 9 syntax (should never be used!) cat /etc/named.boot | /usr/sbin/named-bootconf > /etc/named.bootconf-converted.conf @@ -645,25 +653,22 @@ chmod 0640 /etc/rndc.key chown root:named /etc/rndc.key fi - [ -d /selinux ] && [ -x /sbin/restorecon ] && /sbin/restorecon /etc/rndc.conf /etc/named.conf >/dev/null 2>&1 ; - /sbin/ldconfig + [ -e /selinux/enforce ] && [ -x /sbin/restorecon ] && /sbin/restorecon /etc/rndc.* /etc/named.* >/dev/null 2>&1 ; fi :; %preun if [ "$1" = 0 ]; then /etc/rc.d/init.d/named stop >/dev/null 2>&1 || :; - /usr/sbin/userdel named 2>/dev/null || :; - /usr/sbin/groupdel named 2>/dev/null || :; /sbin/chkconfig --del named || :; fi :; %postun +/sbin/ldconfig if [ "$1" -ge 1 ]; then /etc/rc.d/init.d/named condrestart >/dev/null 2>&1 || : fi; -/sbin/ldconfig :; %triggerpostun -- bind < 8.2.2_P5-15 @@ -681,27 +686,7 @@ # These versions ran bind with order 11 in runlevel 2, after syslog # at order 12 . BIND should run after syslog and now has order '- 13 87'. # - rl=() - for l in 0 1 2 3 4 5 6; - do - if chkconfig --level=$l named; then - rl=(${rl[@]} 1) - else - rl=(${rl[@]} 0) - fi - done - chkconfig --del named - chkconfig --add named - let l=0; - for s in ${rl[@]}; - do - if [ "$s" = "1" ]; then - chkconfig --level=$l named on; - else - chkconfig --level=$l named off; - fi; - let l='l+1'; - done; + /sbin/chkconfig named resetpriorities fi :; @@ -722,6 +707,7 @@ %post config if [ "$1" -gt 0 ]; then /usr/bin/chcon system_u:object_r:named_conf_t /etc/named.caching-nameserver.conf >/dev/null 2>&1 || :; + /usr/bin/chcon system_u:object_r:named_conf_t /etc/named.rfc1912.zones >/dev/null 2>&1 || :; fi if [ "$1" -eq 1 ]; then /usr/sbin/bind-chroot-admin --sync; @@ -775,7 +761,7 @@ /usr/bin/tail -n +$n /etc/openldap/slapd.conf >> $tf /bin/mv -f $tf /etc/openldap/slapd.conf; /bin/chmod --reference=/etc/openldap/slapd.conf.rpmsave /etc/openldap/slapd.conf - [ -d /selinux ] && [ -x /sbin/restorecon ] && /sbin/restorecon /etc/openldap/slapd.conf >/dev/null 2>&1 + [ -e /selinux/enforce ] && [ -x /sbin/restorecon ] && /sbin/restorecon /etc/openldap/slapd.conf >/dev/null 2>&1 || :; [ -x /etc/init.d/ldap ] && /etc/init.d/ldap condrestart >/dev/null 2>&1 fi rm -f $tf >/dev/null 2>&1 || :; @@ -791,7 +777,7 @@ /bin/egrep -v '^include.*dnszone\.schema' /etc/openldap/slapd.conf > $tf /bin/mv -f $tf /etc/openldap/slapd.conf; rm -f $tf >/dev/null 2>&1 - [ -d /selinux ] && [ -x /sbin/restorecon ] && /sbin/restorecon /etc/openldap/slapd.conf >/dev/null 2>&1 + [ -e /selinux/enforce ] && [ -x /sbin/restorecon ] && /sbin/restorecon /etc/openldap/slapd.conf >/dev/null 2>&1 || :; [ -x /etc/init.d/ldap ] && /etc/init.d/ldap condrestart >/dev/null 2>&1 || :; fi; fi; @@ -804,6 +790,9 @@ :; %changelog +* Mon Mar 20 2006 Jason Vas Dias - 30.9.3.2-10 +- fix bug 185969: more .spec file cleanup + * Wed Mar 08 2006 Jason Vas Dias - 30.9.3.2-8 - Do not allow package to be installed if named:25 userid creation fails - Give libbind a pkg-config file @@ -815,7 +804,6 @@ * Mon Mar 06 2006 Jason Vas Dias - 30:9.3.2-6 - replace caching-nameserver with bind-config sub-package -- fix bug 181730: fix creation of named user & gid - fix bug 177595: handle case where $ROOTDIR is a link in initscript - fix bug 177001: bind-config creates symlinks OK now - fix bug 176388: named.conf is now never replaced by any RPM From fedora-cvs-commits at redhat.com Mon Mar 20 21:32:44 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 20 Mar 2006 16:32:44 -0500 Subject: rpms/bind/FC-5 bind.spec,1.95,1.96 Message-ID: <200603202132.k2KLWish004501@cvs.devel.redhat.com> Author: jvdias Update of /cvs/dist/rpms/bind/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv4487 Modified Files: bind.spec Log Message: fix bug 185969: more .spec file cleanup Index: bind.spec =================================================================== RCS file: /cvs/dist/rpms/bind/FC-5/bind.spec,v retrieving revision 1.95 retrieving revision 1.96 diff -u -r1.95 -r1.96 --- bind.spec 20 Mar 2006 21:31:39 -0000 1.95 +++ bind.spec 20 Mar 2006 21:32:41 -0000 1.96 @@ -17,7 +17,7 @@ Name: bind License: BSD-like Version: 9.3.2 -Release: 10 +Release: 10.FC5 Epoch: 30 Url: http://www.isc.org/products/BIND/ Buildroot: %{_tmppath}/%{name}-root From fedora-cvs-commits at redhat.com Mon Mar 20 21:40:45 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 20 Mar 2006 16:40:45 -0500 Subject: rpms/bind/devel bind.spec,1.95,1.96 Message-ID: <200603202140.k2KLejeW004643@cvs.devel.redhat.com> Author: jvdias Update of /cvs/dist/rpms/bind/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv4629 Modified Files: bind.spec Log Message: fix bug 185969: more .spec file cleanup Index: bind.spec =================================================================== RCS file: /cvs/dist/rpms/bind/devel/bind.spec,v retrieving revision 1.95 retrieving revision 1.96 diff -u -r1.95 -r1.96 --- bind.spec 20 Mar 2006 21:13:51 -0000 1.95 +++ bind.spec 20 Mar 2006 21:40:42 -0000 1.96 @@ -17,7 +17,7 @@ Name: bind License: BSD-like Version: 9.3.2 -Release: 10 +Release: 10.FC6 Epoch: 30 Url: http://www.isc.org/products/BIND/ Buildroot: %{_tmppath}/%{name}-root From fedora-cvs-commits at redhat.com Mon Mar 20 21:43:35 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 20 Mar 2006 16:43:35 -0500 Subject: rpms/bind/FC-4 bind.spec,1.68,1.69 Message-ID: <200603202143.k2KLhZfo004712@cvs.devel.redhat.com> Author: jvdias Update of /cvs/dist/rpms/bind/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv4699 Modified Files: bind.spec Log Message: remove fix for bug 181730 Index: bind.spec =================================================================== RCS file: /cvs/dist/rpms/bind/FC-4/bind.spec,v retrieving revision 1.68 retrieving revision 1.69 diff -u -r1.68 -r1.69 --- bind.spec 7 Mar 2006 21:48:18 -0000 1.68 +++ bind.spec 20 Mar 2006 21:43:33 -0000 1.69 @@ -9,7 +9,7 @@ Name: bind License: BSD-like Version: 9.3.1 -Release: 16_FC4 +Release: 16.1_FC4 Epoch: 24 Url: http://www.isc.org/products/BIND/ Buildroot: %{_tmppath}/%{name}-root @@ -364,15 +364,7 @@ # create named group IFF it does not already exist # - use any free ID between 1 and 499 if group 25 exists: /usr/sbin/groupadd -g 25 -f -r named >/dev/null 2>&1 || :; - # if named user does not already exist, create it as system user: - if ! /usr/bin/id -u named > /dev/null 2>&1; then - if ! /bin/egrep -q '^[^:]+:[^:]+:25:' /etc/passwd >/dev/null 2>&1 ; then - /usr/sbin/useradd -u 25 -r -n -M -g named -s /sbin/nologin -d /var/named -c Named named >/dev/null 2>&1 || :; - else - # use any free ID between 1 and 499: - /usr/sbin/useradd -r -n -M -g named -s /sbin/nologin -d /var/named -c Named named >/dev/null 2>&1 || :; - fi; - fi; + /usr/sbin/useradd -u 25 -r -n -M -g named -s /sbin/nologin -d /var/named -c Named named >/dev/null 2>&1 || :; fi; :; @@ -751,7 +743,6 @@ %changelog * Tue Mar 07 2006 Jason Vas Dias - 24:9.3.1-16 -- fix bug 181730: fix creation of named user & gid - fix bug 179816: fix builds for all combinations of WITH_DBUS=0/1 SDB=0/1 LIBBIND=0/1 - fix bug 177595: handle case where $ROOTDIR is a link in initscript - improve method used to mount /proc and /var/run/dbus under chroot in initscript From fedora-cvs-commits at redhat.com Mon Mar 20 21:43:43 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 20 Mar 2006 16:43:43 -0500 Subject: rpms/bind/FC-4 .cvsignore, 1.18, 1.19 Makefile, 1.1, 1.2 README.sdb_pgsql, 1.1, 1.2 bind-9.2.0rc3-varrun.patch, 1.1, 1.2 bind-9.2.1-key.patch, 1.2, 1.3 bind-9.2.2-nsl.patch, 1.1, 1.2 bind-9.2.4-config.patch, 1.3, 1.4 bind-9.2.4-handle_send_errors.patch, 1.1, 1.2 bind-9.2.4rc7-pie.patch, 1.3, 1.4 bind-9.2.4rc8.tar.gz.md5, 1.1, 1.2 bind-9.3.0-handle-send-errors.patch, 1.1, 1.2 bind-9.3.0-missing-dnssec-tools.patch, 1.1, 1.2 bind-9.3.1-dbus_archdep_libdir.patch, 1.2, 1.3 bind-9.3.1-dbus_archdep_libdir_sdb.patch, 1.1, 1.2 bind-9.3.1-fix_dbus.patch, 1.1, 1.2 bind-9.3.1-fix_sdb_ldap.patch, 1.1, 1.2 bind-9.3.1-fix_sdb_pgsql.patch, 1.1, 1.2 bind-9.3.1-next_server_on_referral.patch, 1.1, 1.2 bind-9.3.1-no_servfail_stops.patch, 1.1, 1.2 bind-9.3.1-redhat_doc.patch, 1.1, 1.2 bind-9.3.1-reject_resolv_conf_errors.patch, 1.1, 1.2 bind-9.3.1-sdb_dbus.patch, 1.1, 1.2 bind-9.3.1-t_no_default_lookups.patch, 1.1, 1.2 bind-9.3.1.dbus.patch, 1.1, 1.2 bind-9.3.1beta2-openssl-suffix.patch, 1.3, 1.4 bind-9.3.1rc1-fix_libbind_includedir.pa! tch, 1.1, 1.2 bind-9.3.1rc1-no-libtool-for-PIEs.patch, 1.5, 1.6 bind-9.3.1rc1-sdb.patch, 1.2, 1.3 bind-9.3.1rc1-sdb_tools-Makefile.in, 1.1, 1.2 bind-9.3.1rc1-sdbsrc.patch, 1.2, 1.3 bind-bsdcompat.patch, 1.1, 1.2 bind-nonexec.patch, 1.2, 1.3 bind-posixthreads.patch, 1.1, 1.2 bind.spec, 1.69, 1.70 branch, 1.1, 1.2 dnszone.schema, 1.1, 1.2 filter_requires.sh, 1.1, 1.2 keygen.c, 1.3, 1.4 libbind-9.3.1rc1-fix_h_errno.patch, 1.1, 1.2 named-dbus.conf, 1.1, 1.2 named.init, 1.35, 1.36 named.logrotate, 1.5, 1.6 named.service, 1.1, 1.2 named.sysconfig, 1.3, 1.4 namedGetForwarders, 1.1, 1.2 namedSetForwarders, 1.1, 1.2 rfc1912.txt, 1.1, 1.2 sources, 1.25, 1.26 Message-ID: <200603202143.k2KLhh1J004741@cvs.devel.redhat.com> Author: jvdias Update of /cvs/dist/rpms/bind/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv4721 Modified Files: .cvsignore Makefile README.sdb_pgsql bind-9.2.0rc3-varrun.patch bind-9.2.1-key.patch bind-9.2.2-nsl.patch bind-9.2.4-config.patch bind-9.2.4-handle_send_errors.patch bind-9.2.4rc7-pie.patch bind-9.2.4rc8.tar.gz.md5 bind-9.3.0-handle-send-errors.patch bind-9.3.0-missing-dnssec-tools.patch bind-9.3.1-dbus_archdep_libdir.patch bind-9.3.1-dbus_archdep_libdir_sdb.patch bind-9.3.1-fix_dbus.patch bind-9.3.1-fix_sdb_ldap.patch bind-9.3.1-fix_sdb_pgsql.patch bind-9.3.1-next_server_on_referral.patch bind-9.3.1-no_servfail_stops.patch bind-9.3.1-redhat_doc.patch bind-9.3.1-reject_resolv_conf_errors.patch bind-9.3.1-sdb_dbus.patch bind-9.3.1-t_no_default_lookups.patch bind-9.3.1.dbus.patch bind-9.3.1beta2-openssl-suffix.patch bind-9.3.1rc1-fix_libbind_includedir.patch bind-9.3.1rc1-no-libtool-for-PIEs.patch bind-9.3.1rc1-sdb.patch bind-9.3.1rc1-sdb_tools-Makefile.in bind-9.3.1rc1-sdbsrc.patch bind-bsdcompat.patch bind-nonexec.patch bind-posixthreads.patch bind.spec branch dnszone.schema filter_requires.sh keygen.c libbind-9.3.1rc1-fix_h_errno.patch named-dbus.conf named.init named.logrotate named.service named.sysconfig namedGetForwarders namedSetForwarders rfc1912.txt sources Log Message: remove fix for bug 181730 bind-9.2.0rc3-varrun.patch: 0 files changed bind-9.2.1-key.patch: 0 files changed bind-9.2.2-nsl.patch: 0 files changed bind-9.2.4-config.patch: 0 files changed bind-9.2.4-handle_send_errors.patch: 0 files changed bind-9.2.4rc7-pie.patch: 0 files changed bind-9.3.0-handle-send-errors.patch: 0 files changed bind-9.3.0-missing-dnssec-tools.patch: 0 files changed bind-9.3.1-dbus_archdep_libdir.patch: 0 files changed bind-9.3.1-dbus_archdep_libdir_sdb.patch: 0 files changed bind-9.3.1-fix_dbus.patch: 0 files changed bind-9.3.1-fix_sdb_ldap.patch: 0 files changed bind-9.3.1-fix_sdb_pgsql.patch: 0 files changed bind-9.3.1-next_server_on_referral.patch: 0 files changed bind-9.3.1-no_servfail_stops.patch: 0 files changed bind-9.3.1-redhat_doc.patch: 0 files changed bind-9.3.1-reject_resolv_conf_errors.patch: 0 files changed bind-9.3.1-sdb_dbus.patch: 0 files changed bind-9.3.1-t_no_default_lookups.patch: 0 files changed bind-9.3.1.dbus.patch: 0 files changed bind-9.3.1beta2-openssl-suffix.patch: 0 files changed bind-9.3.1rc1-fix_libbind_includedir.patch: 0 files changed bind-9.3.1rc1-no-libtool-for-PIEs.patch: 0 files changed bind-9.3.1rc1-sdb.patch: 0 files changed bind-9.3.1rc1-sdbsrc.patch: 0 files changed bind-bsdcompat.patch: 0 files changed bind-nonexec.patch: 0 files changed bind-posixthreads.patch: 0 files changed libbind-9.3.1rc1-fix_h_errno.patch: 0 files changed From fedora-cvs-commits at redhat.com Mon Mar 20 21:43:48 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 20 Mar 2006 16:43:48 -0500 Subject: rpms/bind/FC-4 bind.spec,1.70,1.71 Message-ID: <200603202143.k2KLhmAE005024@cvs.devel.redhat.com> Author: jvdias Update of /cvs/dist/rpms/bind/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv5011 Modified Files: bind.spec Log Message: remove fix for bug 181730 From fedora-cvs-commits at redhat.com Mon Mar 20 21:43:52 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 20 Mar 2006 16:43:52 -0500 Subject: rpms/bind/FC-4 bind.spec,1.71,1.72 Message-ID: <200603202143.k2KLhqmD005046@cvs.devel.redhat.com> Author: jvdias Update of /cvs/dist/rpms/bind/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv5033 Modified Files: bind.spec Log Message: remove fix for bug 181730 From fedora-cvs-commits at redhat.com Mon Mar 20 21:52:23 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 20 Mar 2006 16:52:23 -0500 Subject: rpms/bind/FC-4 bind.spec,1.72,1.73 Message-ID: <200603202152.k2KLqNP8018848@cvs.devel.redhat.com> Author: jvdias Update of /cvs/dist/rpms/bind/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv18835 Modified Files: bind.spec Log Message: remove fix for bug 181730 Index: bind.spec =================================================================== RCS file: /cvs/dist/rpms/bind/FC-4/bind.spec,v retrieving revision 1.72 retrieving revision 1.73 diff -u -r1.72 -r1.73 --- bind.spec 20 Mar 2006 21:43:50 -0000 1.72 +++ bind.spec 20 Mar 2006 21:52:21 -0000 1.73 @@ -9,7 +9,7 @@ Name: bind License: BSD-like Version: 9.3.1 -Release: 16.1_FC4 +Release: 18.FC4 Epoch: 24 Url: http://www.isc.org/products/BIND/ Buildroot: %{_tmppath}/%{name}-root From fedora-cvs-commits at redhat.com Mon Mar 20 21:52:28 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 20 Mar 2006 16:52:28 -0500 Subject: rpms/bind/FC-4 bind.spec,1.73,1.74 Message-ID: <200603202152.k2KLqShX018870@cvs.devel.redhat.com> Author: jvdias Update of /cvs/dist/rpms/bind/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv18857 Modified Files: bind.spec Log Message: remove fix for bug 181730 From fedora-cvs-commits at redhat.com Mon Mar 20 22:08:25 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 20 Mar 2006 17:08:25 -0500 Subject: rpms/kernel/devel kernel-2.6.spec, 1.2068, 1.2069 upstream, 1.301, 1.302 linux-2.6-net-ipw2200-hwcrypto.patch, 1.1, NONE linux-2.6-net-wireless-features.patch, 1.2, NONE Message-ID: <200603202208.k2KM8Ptu019126@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv19070 Modified Files: kernel-2.6.spec upstream Removed Files: linux-2.6-net-ipw2200-hwcrypto.patch linux-2.6-net-wireless-features.patch Log Message: git1 - 179 diffs already. (oh yes, there will be blood) Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.2068 retrieving revision 1.2069 diff -u -r1.2068 -r1.2069 --- kernel-2.6.spec 20 Mar 2006 19:57:02 -0000 1.2068 +++ kernel-2.6.spec 20 Mar 2006 22:08:08 -0000 1.2069 @@ -217,6 +217,7 @@ # # Patches 0 through 100 are meant for core subsystem upgrades # +Patch1: patch-2.6.16-git1.bz2 # Patches 100 through 500 are meant for architecture patches Patch100: linux-2.6-bzimage.patch @@ -339,8 +340,6 @@ # NIC driver updates Patch1301: linux-2.6-net-sundance-ip100A.patch -Patch1302: linux-2.6-net-wireless-features.patch -Patch1303: linux-2.6-net-ipw2200-hwcrypto.patch Patch1304: linux-2.6-net-ipw2200-monitor.patch # Squashfs @@ -714,6 +713,7 @@ cd linux-%{kversion}.%{_target_cpu} # Update to latest upstream. +%patch1 -p1 # # Patches 10 through 100 are meant for core subsystem upgrades @@ -938,10 +938,6 @@ # NIC driver fixes. # New PCI ID for sundance driver. %patch1301 -p1 -# Goodies for wireless drivers to make NetworkManager work -%patch1302 -p1 -# ipw2200 hwcrypto=0 by default to avoid firmware restarts -%patch1303 -p1 # add IPW2200_MONITOR config option %patch1304 -p1 @@ -1046,11 +1042,11 @@ # # Import softmac code from wireless-2.6 tree -%patch5000 -p1 +#%patch5000 -p1 # ... and bcm43xx driver too -%patch5001 -p1 +#%patch5001 -p1 # temporarily remove bcm43xx's MODULE_DEVICE_TABLE entry -%patch5002 -p1 +#%patch5002 -p1 # # final stuff @@ -1654,7 +1650,7 @@ %changelog * Mon Mar 20 2006 Dave Jones -- 2.6.16 +- 2.6.16 & 2.6.16-git1 * Sun Mar 19 2006 Dave Jones - 2.6.16rc6-git12 Index: upstream =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/upstream,v retrieving revision 1.301 retrieving revision 1.302 diff -u -r1.301 -r1.302 --- upstream 20 Mar 2006 06:53:48 -0000 1.301 +++ upstream 20 Mar 2006 22:08:10 -0000 1.302 @@ -1 +1,2 @@ linux-2.6.16.tar.bz2 +patch-2.6.16-git1.bz2 --- linux-2.6-net-ipw2200-hwcrypto.patch DELETED --- --- linux-2.6-net-wireless-features.patch DELETED --- From fedora-cvs-commits at redhat.com Mon Mar 20 22:08:25 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 20 Mar 2006 17:08:25 -0500 Subject: rpms/kernel/devel/configs config-x86-generic, 1.40, 1.41 config-x86_64-generic, 1.33, 1.34 Message-ID: <200603202208.k2KM8PN2019123@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel/configs In directory cvs.devel.redhat.com:/tmp/cvs-serv19070/configs Modified Files: config-x86-generic config-x86_64-generic Log Message: git1 - 179 diffs already. (oh yes, there will be blood) Index: config-x86-generic =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/configs/config-x86-generic,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- config-x86-generic 20 Mar 2006 00:23:34 -0000 1.40 +++ config-x86-generic 20 Mar 2006 22:08:11 -0000 1.41 @@ -243,6 +243,7 @@ CONFIG_IPW2100_MONITOR=y CONFIG_IPW2200=m CONFIG_IPW2200_MONITOR=y +CONFIG_IPW_QOS=y CONFIG_BLK_DEV_AMD74XX=y Index: config-x86_64-generic =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/configs/config-x86_64-generic,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- config-x86_64-generic 3 Mar 2006 18:59:15 -0000 1.33 +++ config-x86_64-generic 20 Mar 2006 22:08:11 -0000 1.34 @@ -107,6 +107,7 @@ CONFIG_IPW2100_MONITOR=y CONFIG_IPW2200=m CONFIG_IPW2200_MONITOR=y +CONFIG_IPW_QOS=y CONFIG_PNP=y CONFIG_PNPACPI=y From fedora-cvs-commits at redhat.com Mon Mar 20 22:19:57 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 20 Mar 2006 17:19:57 -0500 Subject: rpms/kernel/devel kernel-2.6.spec, 1.2069, 1.2070 linux-2.6-tux.patch, 1.12, 1.13 Message-ID: <200603202219.k2KMJvlW000530@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv515 Modified Files: kernel-2.6.spec linux-2.6-tux.patch Log Message: Ingo rediffed Tux Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.2069 retrieving revision 1.2070 diff -u -r1.2069 -r1.2070 --- kernel-2.6.spec 20 Mar 2006 22:08:08 -0000 1.2069 +++ kernel-2.6.spec 20 Mar 2006 22:19:53 -0000 1.2070 @@ -1651,6 +1651,7 @@ %changelog * Mon Mar 20 2006 Dave Jones - 2.6.16 & 2.6.16-git1 +- Tux 2.6.16-A0 (Just rediffing) * Sun Mar 19 2006 Dave Jones - 2.6.16rc6-git12 linux-2.6-tux.patch: arch/alpha/kernel/systbls.S | 8 arch/i386/kernel/syscall_table.S | 10 arch/ia64/kernel/entry.S | 8 arch/ia64/kernel/ia64_ksyms.c | 5 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-generic/fcntl.h | 4 include/asm-i386/unistd.h | 5 include/asm-ia64/unistd.h | 2 include/asm-sparc/fcntl.h | 1 include/asm-sparc64/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 | 2 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 | 8 include/net/tcp.h | 3 include/net/tux.h | 804 ++++++++++++++ include/net/tux_u.h | 163 ++ kernel/exit.c | 7 kernel/fork.c | 1 kernel/kmod.c | 28 kernel/signal.c | 1 mm/filemap.c | 19 mm/truncate.c | 2 net/Kconfig | 1 net/Makefile | 1 net/core/sock.c | 5 net/ipv4/tcp.c | 3 net/ipv4/tcp_input.c | 1 net/ipv4/tcp_output.c | 3 net/socket.c | 197 ++- net/tux/Kconfig | 25 net/tux/Makefile | 12 net/tux/abuf.c | 190 +++ net/tux/accept.c | 863 +++++++++++++++ net/tux/cachemiss.c | 265 ++++ net/tux/cgi.c | 171 +++ net/tux/directory.c | 302 +++++ net/tux/extcgi.c | 329 +++++ net/tux/gzip.c | 40 net/tux/input.c | 641 +++++++++++ net/tux/logger.c | 837 ++++++++++++++ net/tux/main.c | 1417 +++++++++++++++++++++++++ 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 | 1555 +++++++++++++++++++++++++++ net/tux/proto_http.c | 2197 +++++++++++++++++++++++++++++++++++++++ net/tux/redirect.c | 172 +++ net/tux/times.c | 392 ++++++ net/tux/times.h | 26 net/tux/userspace.c | 27 72 files changed, 12775 insertions(+), 98 deletions(-) Index: linux-2.6-tux.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-tux.patch,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- linux-2.6-tux.patch 13 Mar 2006 22:17:56 -0000 1.12 +++ linux-2.6-tux.patch 20 Mar 2006 22:19:53 -0000 1.13 @@ -1,8 +1,7 @@ - -Index: linux/arch/alpha/kernel/systbls.S +Index: linux-tux.q/arch/alpha/kernel/systbls.S =================================================================== ---- linux.orig/arch/alpha/kernel/systbls.S -+++ linux/arch/alpha/kernel/systbls.S +--- linux-tux.q.orig/arch/alpha/kernel/systbls.S ++++ linux-tux.q/arch/alpha/kernel/systbls.S @@ -240,7 +240,15 @@ sys_call_table: .quad alpha_ni_syscall .quad alpha_ni_syscall /* 220 */ @@ -19,10 +18,10 @@ .quad alpha_ni_syscall .quad alpha_ni_syscall .quad alpha_ni_syscall /* 225 */ -Index: linux/arch/i386/kernel/syscall_table.S +Index: linux-tux.q/arch/i386/kernel/syscall_table.S =================================================================== ---- linux.orig/arch/i386/kernel/syscall_table.S -+++ linux/arch/i386/kernel/syscall_table.S +--- linux-tux.q.orig/arch/i386/kernel/syscall_table.S ++++ linux-tux.q/arch/i386/kernel/syscall_table.S @@ -221,7 +221,15 @@ ENTRY(sys_call_table) .long sys_madvise .long sys_getdents64 /* 220 */ @@ -40,11 +39,11 @@ .long sys_ni_syscall .long sys_gettid .long sys_readahead /* 225 */ -Index: linux/arch/ia64/kernel/entry.S +Index: linux-tux.q/arch/ia64/kernel/entry.S =================================================================== ---- linux.orig/arch/ia64/kernel/entry.S -+++ linux/arch/ia64/kernel/entry.S -@@ -1440,7 +1440,15 @@ sys_call_table: +--- linux-tux.q.orig/arch/ia64/kernel/entry.S ++++ linux-tux.q/arch/ia64/kernel/entry.S +@@ -1442,7 +1442,15 @@ sys_call_table: data8 sys_syslog data8 sys_setitimer data8 sys_getitimer @@ -60,11 +59,11 @@ data8 sys_ni_syscall /* was: ia64_oldlstat */ data8 sys_ni_syscall /* was: ia64_oldfstat */ data8 sys_vhangup -Index: linux/arch/ia64/kernel/ia64_ksyms.c +Index: linux-tux.q/arch/ia64/kernel/ia64_ksyms.c =================================================================== ---- linux.orig/arch/ia64/kernel/ia64_ksyms.c -+++ linux/arch/ia64/kernel/ia64_ksyms.c -@@ -59,6 +59,11 @@ EXPORT_SYMBOL(__strlen_user); +--- linux-tux.q.orig/arch/ia64/kernel/ia64_ksyms.c ++++ linux-tux.q/arch/ia64/kernel/ia64_ksyms.c +@@ -44,6 +44,11 @@ EXPORT_SYMBOL(__strlen_user); EXPORT_SYMBOL(__strncpy_from_user); EXPORT_SYMBOL(__strnlen_user); @@ -76,11 +75,11 @@ /* from arch/ia64/lib */ extern void __divsi3(void); extern void __udivsi3(void); -Index: linux/arch/x86_64/ia32/ia32entry.S +Index: linux-tux.q/arch/x86_64/ia32/ia32entry.S =================================================================== ---- linux.orig/arch/x86_64/ia32/ia32entry.S -+++ linux/arch/x86_64/ia32/ia32entry.S -@@ -571,7 +571,15 @@ ia32_sys_call_table: +--- linux-tux.q.orig/arch/x86_64/ia32/ia32entry.S ++++ linux-tux.q/arch/x86_64/ia32/ia32entry.S +@@ -599,7 +599,15 @@ ia32_sys_call_table: .quad sys_madvise .quad compat_sys_getdents64 /* 220 getdents64 */ .quad compat_sys_fcntl64 @@ -97,10 +96,10 @@ .quad quiet_ni_syscall /* security */ .quad sys_gettid .quad sys_readahead /* 225 */ -Index: linux/fs/dcache.c +Index: linux-tux.q/fs/dcache.c =================================================================== ---- linux.orig/fs/dcache.c -+++ linux/fs/dcache.c +--- linux-tux.q.orig/fs/dcache.c ++++ linux-tux.q/fs/dcache.c @@ -86,6 +86,10 @@ static void d_free(struct dentry *dentry { if (dentry->d_op && dentry->d_op->d_release) @@ -118,9 +117,9 @@ dentry->d_fsdata = NULL; + dentry->d_extra_attributes = NULL; dentry->d_mounted = 0; + #ifdef CONFIG_PROFILING dentry->d_cookie = NULL; - INIT_HLIST_NODE(&dentry->d_hash); -@@ -1310,6 +1315,16 @@ already_unhashed: +@@ -1317,6 +1322,16 @@ already_unhashed: /* Unhash the target: dput() will then get rid of it */ __d_drop(target); @@ -137,7 +136,7 @@ list_del(&dentry->d_u.d_child); list_del(&target->d_u.d_child); -@@ -1353,7 +1368,7 @@ already_unhashed: +@@ -1360,7 +1375,7 @@ already_unhashed: * * "buflen" should be positive. Caller holds the dcache_lock. */ @@ -146,7 +145,7 @@ struct dentry *root, struct vfsmount *rootmnt, char *buffer, int buflen) { -@@ -1421,6 +1436,8 @@ Elong: +@@ -1428,6 +1443,8 @@ Elong: return ERR_PTR(-ENAMETOOLONG); } @@ -155,7 +154,7 @@ /* write full pathname into buffer and return start of pathname */ char * d_path(struct dentry *dentry, struct vfsmount *vfsmnt, char *buf, int buflen) -@@ -1663,6 +1680,23 @@ static void __init dcache_init_early(voi +@@ -1670,6 +1687,23 @@ static void __init dcache_init_early(voi INIT_HLIST_HEAD(&dentry_hashtable[loop]); } @@ -179,11 +178,11 @@ static void __init dcache_init(unsigned long mempages) { int loop; -Index: linux/fs/exec.c +Index: linux-tux.q/fs/exec.c =================================================================== ---- linux.orig/fs/exec.c -+++ linux/fs/exec.c -@@ -1440,6 +1440,8 @@ int do_coredump(long signr, int exit_cod +--- linux-tux.q.orig/fs/exec.c ++++ linux-tux.q/fs/exec.c +@@ -1446,6 +1446,8 @@ int do_coredump(long signr, int exit_cod binfmt = current->binfmt; if (!binfmt || !binfmt->core_dump) goto fail; @@ -192,11 +191,11 @@ down_write(&mm->mmap_sem); if (!mm->dumpable) { up_write(&mm->mmap_sem); -Index: linux/fs/fcntl.c +Index: linux-tux.q/fs/fcntl.c =================================================================== ---- linux.orig/fs/fcntl.c -+++ linux/fs/fcntl.c -@@ -111,7 +111,7 @@ out: +--- linux-tux.q.orig/fs/fcntl.c ++++ linux-tux.q/fs/fcntl.c +@@ -112,7 +112,7 @@ out: return error; } @@ -205,7 +204,7 @@ { struct files_struct * files = current->files; struct fdtable *fdt; -@@ -134,6 +134,8 @@ static int dupfd(struct file *file, unsi +@@ -135,6 +135,8 @@ static int dupfd(struct file *file, unsi return fd; } @@ -214,11 +213,11 @@ asmlinkage long sys_dup2(unsigned int oldfd, unsigned int newfd) { int err = -EBADF; -Index: linux/fs/namei.c +Index: linux-tux.q/fs/namei.c =================================================================== ---- linux.orig/fs/namei.c -+++ linux/fs/namei.c -@@ -732,7 +732,7 @@ static inline void follow_dotdot(struct +--- linux-tux.q.orig/fs/namei.c ++++ linux-tux.q/fs/namei.c +@@ -735,7 +735,7 @@ static __always_inline void follow_dotdo * It _is_ time-critical. */ static int do_lookup(struct nameidata *nd, struct qstr *name, @@ -227,7 +226,7 @@ { struct vfsmount *mnt = nd->mnt; struct dentry *dentry = __d_lookup(nd->dentry, name); -@@ -748,12 +748,16 @@ done: +@@ -751,12 +751,16 @@ done: return 0; need_lookup: @@ -244,7 +243,7 @@ if (dentry->d_op->d_revalidate(dentry, nd)) goto done; if (d_invalidate(dentry)) -@@ -777,9 +781,11 @@ static fastcall int __link_path_walk(con +@@ -780,9 +784,11 @@ static fastcall int __link_path_walk(con { struct path next; struct inode *inode; @@ -258,7 +257,7 @@ while (*name=='/') name++; if (!*name) -@@ -848,7 +854,7 @@ static fastcall int __link_path_walk(con +@@ -851,7 +857,7 @@ static fastcall int __link_path_walk(con break; } /* This does the actual lookups.. */ @@ -267,7 +266,7 @@ if (err) break; -@@ -902,7 +908,7 @@ last_component: +@@ -906,7 +912,7 @@ last_component: if (err < 0) break; } @@ -276,7 +275,7 @@ if (err) break; inode = next.dentry->d_inode; -@@ -1354,6 +1360,8 @@ static inline int lookup_flags(unsigned +@@ -1406,6 +1412,8 @@ static inline int lookup_flags(unsigned if (f & O_DIRECTORY) retval |= LOOKUP_DIRECTORY; @@ -285,11 +284,11 @@ return retval; } -Index: linux/fs/namespace.c +Index: linux-tux.q/fs/namespace.c =================================================================== ---- linux.orig/fs/namespace.c -+++ linux/fs/namespace.c -@@ -1465,6 +1465,8 @@ void set_fs_root(struct fs_struct *fs, s +--- linux-tux.q.orig/fs/namespace.c ++++ linux-tux.q/fs/namespace.c +@@ -1491,6 +1491,8 @@ void set_fs_root(struct fs_struct *fs, s } } @@ -298,11 +297,11 @@ /* * Replace the fs->{pwdmnt,pwd} with {mnt,dentry}. Put the old values. * It can block. Requires the big lock held. -Index: linux/fs/open.c +Index: linux-tux.q/fs/open.c =================================================================== ---- linux.orig/fs/open.c -+++ linux/fs/open.c -@@ -543,6 +543,8 @@ out: +--- linux-tux.q.orig/fs/open.c ++++ linux-tux.q/fs/open.c +@@ -555,6 +555,8 @@ out: return error; } @@ -311,7 +310,7 @@ asmlinkage long sys_fchdir(unsigned int fd) { struct file *file; -@@ -599,6 +601,8 @@ out: +@@ -611,6 +613,8 @@ out: return error; } @@ -320,10 +319,10 @@ asmlinkage long sys_fchmod(unsigned int fd, mode_t mode) { struct inode * inode; -Index: linux/fs/pipe.c +Index: linux-tux.q/fs/pipe.c =================================================================== ---- linux.orig/fs/pipe.c -+++ linux/fs/pipe.c +--- linux-tux.q.orig/fs/pipe.c ++++ linux-tux.q/fs/pipe.c @@ -798,6 +798,8 @@ no_files: return error; } @@ -333,10 +332,10 @@ /* * pipefs should _never_ be mounted by userland - too much of security hassle, * no real gain from having the whole whorehouse mounted. So we don't need -Index: linux/fs/read_write.c +Index: linux-tux.q/fs/read_write.c =================================================================== ---- linux.orig/fs/read_write.c -+++ linux/fs/read_write.c +--- linux-tux.q.orig/fs/read_write.c ++++ linux-tux.q/fs/read_write.c @@ -374,6 +374,8 @@ asmlinkage ssize_t sys_write(unsigned in return ret; } @@ -346,10 +345,10 @@ asmlinkage ssize_t sys_pread64(unsigned int fd, char __user *buf, size_t count, loff_t pos) { -Index: linux/include/asm-alpha/fcntl.h +Index: linux-tux.q/include/asm-alpha/fcntl.h =================================================================== ---- linux.orig/include/asm-alpha/fcntl.h -+++ linux/include/asm-alpha/fcntl.h +--- linux-tux.q.orig/include/asm-alpha/fcntl.h ++++ linux-tux.q/include/asm-alpha/fcntl.h @@ -14,6 +14,7 @@ #define O_DIRECTORY 0100000 /* must be a directory */ #define O_NOFOLLOW 0200000 /* don't follow links */ @@ -358,10 +357,10 @@ #define O_DIRECT 02000000 /* direct disk access - should check with OSF/1 */ #define O_NOATIME 04000000 -Index: linux/include/asm-generic/fcntl.h +Index: linux-tux.q/include/asm-generic/fcntl.h =================================================================== ---- linux.orig/include/asm-generic/fcntl.h -+++ linux/include/asm-generic/fcntl.h +--- linux-tux.q.orig/include/asm-generic/fcntl.h ++++ linux-tux.q/include/asm-generic/fcntl.h @@ -49,6 +49,10 @@ #ifndef O_NOATIME #define O_NOATIME 01000000 @@ -373,19 +372,19 @@ #ifndef O_NDELAY #define O_NDELAY O_NONBLOCK #endif -Index: linux/include/asm-i386/unistd.h +Index: linux-tux.q/include/asm-i386/unistd.h =================================================================== ---- linux.orig/include/asm-i386/unistd.h -+++ linux/include/asm-i386/unistd.h -@@ -303,6 +303,7 @@ +--- linux-tux.q.orig/include/asm-i386/unistd.h ++++ linux-tux.q/include/asm-i386/unistd.h +@@ -319,6 +319,7 @@ - #define NR_syscalls 295 + #define NR_syscalls 311 +#ifndef __KERNEL_SYSCALLS_NO_ERRNO__ /* * user-visible error numbers are in the range -1 - -128: see * -@@ -316,6 +317,10 @@ do { \ +@@ -332,6 +333,10 @@ do { \ return (type) (res); \ } while (0) @@ -396,10 +395,10 @@ /* XXX - _foo needs to be __foo, while __NR_bar could be _NR_bar. */ #define _syscall0(type,name) \ type name(void) \ -Index: linux/include/asm-ia64/unistd.h +Index: linux-tux.q/include/asm-ia64/unistd.h =================================================================== ---- linux.orig/include/asm-ia64/unistd.h -+++ linux/include/asm-ia64/unistd.h +--- linux-tux.q.orig/include/asm-ia64/unistd.h ++++ linux-tux.q/include/asm-ia64/unistd.h @@ -109,7 +109,7 @@ #define __NR_syslog 1117 #define __NR_setitimer 1118 @@ -409,10 +408,10 @@ /* 1121 was __NR_old_lstat */ /* 1122 was __NR_old_fstat */ #define __NR_vhangup 1123 -Index: linux/include/asm-sparc/fcntl.h +Index: linux-tux.q/include/asm-sparc/fcntl.h =================================================================== ---- linux.orig/include/asm-sparc/fcntl.h -+++ linux/include/asm-sparc/fcntl.h +--- linux-tux.q.orig/include/asm-sparc/fcntl.h ++++ linux-tux.q/include/asm-sparc/fcntl.h @@ -14,6 +14,7 @@ #define O_NDELAY (0x0004 | O_NONBLOCK) #define O_NOCTTY 0x8000 /* not fcntl */ @@ -421,10 +420,10 @@ #define O_DIRECT 0x100000 /* direct disk access hint */ #define O_NOATIME 0x200000 -Index: linux/include/asm-sparc64/fcntl.h +Index: linux-tux.q/include/asm-sparc64/fcntl.h =================================================================== ---- linux.orig/include/asm-sparc64/fcntl.h -+++ linux/include/asm-sparc64/fcntl.h +--- linux-tux.q.orig/include/asm-sparc64/fcntl.h ++++ linux-tux.q/include/asm-sparc64/fcntl.h @@ -14,6 +14,7 @@ #define O_NONBLOCK 0x4000 #define O_NOCTTY 0x8000 /* not fcntl */ @@ -433,10 +432,10 @@ #define O_DIRECT 0x100000 /* direct disk access hint */ #define O_NOATIME 0x200000 -Index: linux/include/asm-x86_64/unistd.h +Index: linux-tux.q/include/asm-x86_64/unistd.h =================================================================== ---- linux.orig/include/asm-x86_64/unistd.h -+++ linux/include/asm-x86_64/unistd.h +--- linux-tux.q.orig/include/asm-x86_64/unistd.h ++++ linux-tux.q/include/asm-x86_64/unistd.h @@ -425,7 +425,15 @@ __SYSCALL(__NR_putpmsg, sys_ni_syscall) __SYSCALL(__NR_afs_syscall, sys_ni_syscall) @@ -454,10 +453,10 @@ #define __NR_security 185 __SYSCALL(__NR_security, sys_ni_syscall) -Index: linux/include/linux/buffer_head.h +Index: linux-tux.q/include/linux/buffer_head.h =================================================================== ---- linux.orig/include/linux/buffer_head.h -+++ linux/include/linux/buffer_head.h +--- linux-tux.q.orig/include/linux/buffer_head.h ++++ linux-tux.q/include/linux/buffer_head.h @@ -201,6 +201,7 @@ int generic_cont_expand(struct inode *in int generic_cont_expand_simple(struct inode *inode, loff_t size); int block_commit_write(struct page *page, unsigned from, unsigned to); @@ -466,10 +465,10 @@ 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 *); -Index: linux/include/linux/dcache.h +Index: linux-tux.q/include/linux/dcache.h =================================================================== ---- linux.orig/include/linux/dcache.h -+++ linux/include/linux/dcache.h +--- linux-tux.q.orig/include/linux/dcache.h ++++ linux-tux.q/include/linux/dcache.h @@ -107,6 +107,7 @@ struct dentry { struct dentry_operations *d_op; struct super_block *d_sb; /* The root of the dentry tree */ @@ -478,7 +477,7 @@ #ifdef CONFIG_PROFILING struct dcookie_struct *d_cookie; /* cookie, if any */ #endif -@@ -216,6 +217,7 @@ extern void shrink_dcache_sb(struct supe +@@ -217,6 +218,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 *); @@ -486,7 +485,7 @@ /* only used at mount-time */ extern struct dentry * d_alloc_root(struct inode *); -@@ -276,8 +278,12 @@ extern struct dentry * __d_lookup(struct +@@ -277,8 +279,12 @@ extern struct dentry * __d_lookup(struct /* validate "insecure" dentry pointer */ extern int d_validate(struct dentry *, struct dentry *); @@ -500,10 +499,10 @@ /* Allocation counts.. */ /** -Index: linux/include/linux/errno.h +Index: linux-tux.q/include/linux/errno.h =================================================================== ---- linux.orig/include/linux/errno.h -+++ linux/include/linux/errno.h +--- linux-tux.q.orig/include/linux/errno.h ++++ linux-tux.q/include/linux/errno.h @@ -24,6 +24,9 @@ #define EIOCBQUEUED 529 /* iocb queued, will get completion event */ #define EIOCBRETRY 530 /* iocb queued, will trigger a retry */ @@ -514,22 +513,22 @@ #endif #endif -Index: linux/include/linux/file.h +Index: linux-tux.q/include/linux/file.h =================================================================== ---- linux.orig/include/linux/file.h -+++ linux/include/linux/file.h -@@ -95,4 +95,6 @@ struct task_struct; +--- linux-tux.q.orig/include/linux/file.h ++++ linux-tux.q/include/linux/file.h +@@ -93,4 +93,6 @@ struct task_struct; struct files_struct *get_files_struct(struct task_struct *); void FASTCALL(put_files_struct(struct files_struct *fs)); +extern int dupfd(struct file *file, unsigned int start); + #endif /* __LINUX_FILE_H */ -Index: linux/include/linux/fs.h +Index: linux-tux.q/include/linux/fs.h =================================================================== ---- linux.orig/include/linux/fs.h -+++ linux/include/linux/fs.h -@@ -1570,7 +1570,7 @@ ssize_t generic_file_write_nolock(struct +--- linux-tux.q.orig/include/linux/fs.h ++++ linux-tux.q/include/linux/fs.h +@@ -1575,7 +1575,7 @@ ssize_t generic_file_write_nolock(struct extern ssize_t generic_file_sendfile(struct file *, loff_t *, size_t, read_actor_t, void *); extern void do_generic_mapping_read(struct address_space *mapping, struct file_ra_state *, struct file *, @@ -538,7 +537,7 @@ extern void file_ra_state_init(struct file_ra_state *ra, struct address_space *mapping); extern ssize_t generic_file_readv(struct file *filp, const struct iovec *iov, -@@ -1602,14 +1602,15 @@ static inline int xip_truncate_page(stru +@@ -1607,14 +1607,15 @@ static inline int xip_truncate_page(stru static inline void do_generic_file_read(struct file * filp, loff_t *ppos, read_descriptor_t * desc, @@ -556,10 +555,10 @@ } ssize_t __blockdev_direct_IO(int rw, struct kiocb *iocb, struct inode *inode, -Index: linux/include/linux/kmod.h +Index: linux-tux.q/include/linux/kmod.h =================================================================== ---- linux.orig/include/linux/kmod.h -+++ linux/include/linux/kmod.h +--- linux-tux.q.orig/include/linux/kmod.h ++++ linux-tux.q/include/linux/kmod.h @@ -47,5 +47,7 @@ call_usermodehelper(char *path, char **a } @@ -568,10 +567,10 @@ + struct key *ring); #endif /* __LINUX_KMOD_H__ */ -Index: linux/include/linux/namei.h +Index: linux-tux.q/include/linux/namei.h =================================================================== ---- linux.orig/include/linux/namei.h -+++ linux/include/linux/namei.h +--- linux-tux.q.orig/include/linux/namei.h ++++ linux-tux.q/include/linux/namei.h @@ -48,6 +48,8 @@ enum {LAST_NORM, LAST_ROOT, LAST_DOT, LA #define LOOKUP_PARENT 16 #define LOOKUP_NOALT 32 @@ -581,10 +580,10 @@ /* * Intent data */ -Index: linux/include/linux/net.h +Index: linux-tux.q/include/linux/net.h =================================================================== ---- linux.orig/include/linux/net.h -+++ linux/include/linux/net.h +--- linux-tux.q.orig/include/linux/net.h ++++ linux-tux.q/include/linux/net.h @@ -183,6 +183,7 @@ extern int sock_create_kern(int fam struct socket **res); extern int sock_create_lite(int family, int type, int proto, @@ -593,11 +592,11 @@ extern void sock_release(struct socket *sock); extern int sock_sendmsg(struct socket *sock, struct msghdr *msg, size_t len); -Index: linux/include/linux/sched.h +Index: linux-tux.q/include/linux/sched.h =================================================================== ---- linux.orig/include/linux/sched.h -+++ linux/include/linux/sched.h -@@ -804,6 +804,11 @@ struct task_struct { +--- linux-tux.q.orig/include/linux/sched.h ++++ linux-tux.q/include/linux/sched.h +@@ -815,6 +815,11 @@ struct task_struct { int (*notifier)(void *priv); void *notifier_data; sigset_t *notifier_mask; @@ -609,10 +608,10 @@ void *security; struct audit_context *audit_context; -Index: linux/include/linux/skbuff.h +Index: linux-tux.q/include/linux/skbuff.h =================================================================== ---- linux.orig/include/linux/skbuff.h -+++ linux/include/linux/skbuff.h +--- linux-tux.q.orig/include/linux/skbuff.h ++++ linux-tux.q/include/linux/skbuff.h @@ -1328,6 +1328,8 @@ static inline unsigned int skb_checksum_ __skb_checksum_complete(skb); } @@ -622,11 +621,11 @@ #ifdef CONFIG_NETFILTER static inline void nf_conntrack_put(struct nf_conntrack *nfct) { -Index: linux/include/linux/socket.h +Index: linux-tux.q/include/linux/socket.h =================================================================== ---- linux.orig/include/linux/socket.h -+++ linux/include/linux/socket.h -@@ -298,6 +298,11 @@ extern int move_addr_to_user(void *kaddr +--- linux-tux.q.orig/include/linux/socket.h ++++ linux-tux.q/include/linux/socket.h +@@ -301,6 +301,11 @@ extern int move_addr_to_user(void *kaddr extern int move_addr_to_kernel(void __user *uaddr, int ulen, void *kaddr); extern int put_cmsg(struct msghdr*, int level, int type, int len, void *data); @@ -638,11 +637,11 @@ #endif #endif /* not kernel and not glibc */ #endif /* _LINUX_SOCKET_H */ -Index: linux/include/linux/sysctl.h +Index: linux-tux.q/include/linux/sysctl.h =================================================================== ---- linux.orig/include/linux/sysctl.h -+++ linux/include/linux/sysctl.h -@@ -207,6 +207,7 @@ enum +--- linux-tux.q.orig/include/linux/sysctl.h ++++ linux-tux.q/include/linux/sysctl.h +@@ -211,6 +211,7 @@ enum NET_SCTP=17, NET_LLC=18, NET_NETFILTER=19, @@ -650,7 +649,7 @@ }; /* /proc/sys/kernel/random */ -@@ -731,6 +732,55 @@ enum { +@@ -735,6 +736,55 @@ enum { NET_BRIDGE_NF_FILTER_VLAN_TAGGED = 4, }; @@ -706,10 +705,10 @@ /* CTL_PROC names: */ /* CTL_FS names: */ -Index: linux/include/net/sock.h +Index: linux-tux.q/include/net/sock.h =================================================================== ---- linux.orig/include/net/sock.h -+++ linux/include/net/sock.h +--- linux-tux.q.orig/include/net/sock.h ++++ linux-tux.q/include/net/sock.h @@ -62,7 +62,7 @@ */ @@ -753,10 +752,10 @@ const gfp_t priority); extern struct sk_buff *sock_wmalloc(struct sock *sk, -Index: linux/include/net/tcp.h +Index: linux-tux.q/include/net/tcp.h =================================================================== ---- linux.orig/include/net/tcp.h -+++ linux/include/net/tcp.h +--- linux-tux.q.orig/include/net/tcp.h ++++ linux-tux.q/include/net/tcp.h @@ -263,6 +263,8 @@ extern void tcp_shutdown (struct sock extern int tcp_v4_rcv(struct sk_buff *skb); @@ -774,10 +773,10 @@ /* tcp_input.c */ extern void tcp_cwnd_application_limited(struct sock *sk); -Index: linux/include/net/tux.h +Index: linux-tux.q/include/net/tux.h =================================================================== --- /dev/null -+++ linux/include/net/tux.h ++++ linux-tux.q/include/net/tux.h @@ -0,0 +1,804 @@ +#ifndef _NET_TUX_H +#define _NET_TUX_H @@ -1583,10 +1582,10 @@ +extern void free_tux_request_slabs(void); + +#endif -Index: linux/include/net/tux_u.h +Index: linux-tux.q/include/net/tux_u.h =================================================================== --- /dev/null -+++ linux/include/net/tux_u.h ++++ linux-tux.q/include/net/tux_u.h @@ -0,0 +1,163 @@ +#ifndef _NET_TUX_U_H +#define _NET_TUX_U_H @@ -1751,12 +1750,12 @@ +} ftp_command_t; + +#endif -Index: linux/kernel/exit.c +Index: linux-tux.q/kernel/exit.c =================================================================== ---- linux.orig/kernel/exit.c -+++ linux/kernel/exit.c -@@ -844,6 +844,13 @@ fastcall NORET_TYPE void do_exit(long co - del_timer_sync(&tsk->signal->real_timer); +--- linux-tux.q.orig/kernel/exit.c ++++ linux-tux.q/kernel/exit.c +@@ -851,6 +851,13 @@ fastcall NORET_TYPE void do_exit(long co + hrtimer_cancel(&tsk->signal->real_timer); exit_itimers(tsk->signal); acct_process(code); + if (current->tux_info) { @@ -1769,11 +1768,11 @@ } exit_mm(tsk); -Index: linux/kernel/fork.c +Index: linux-tux.q/kernel/fork.c =================================================================== ---- linux.orig/kernel/fork.c -+++ linux/kernel/fork.c -@@ -901,6 +901,7 @@ static task_t *copy_process(unsigned lon +--- linux-tux.q.orig/kernel/fork.c ++++ linux-tux.q/kernel/fork.c +@@ -944,6 +944,7 @@ static task_t *copy_process(unsigned lon p = dup_task_struct(current); if (!p) goto fork_out; @@ -1781,10 +1780,10 @@ retval = -EAGAIN; if (atomic_read(&p->user->processes) >= -Index: linux/kernel/kmod.c +Index: linux-tux.q/kernel/kmod.c =================================================================== ---- linux.orig/kernel/kmod.c -+++ linux/kernel/kmod.c +--- linux-tux.q.orig/kernel/kmod.c ++++ linux-tux.q/kernel/kmod.c @@ -128,14 +128,14 @@ struct subprocess_info { /* * This is the task which runs the usermode application @@ -1835,11 +1834,11 @@ /* Exec failed? */ sub_info->retval = retval; -Index: linux/kernel/signal.c +Index: linux-tux.q/kernel/signal.c =================================================================== ---- linux.orig/kernel/signal.c -+++ linux/kernel/signal.c -@@ -440,6 +440,7 @@ flush_signal_handlers(struct task_struct +--- linux-tux.q.orig/kernel/signal.c ++++ linux-tux.q/kernel/signal.c +@@ -441,6 +441,7 @@ flush_signal_handlers(struct task_struct } } @@ -1847,11 +1846,11 @@ /* Notify the system that a driver wants to block all signals for this * process, and wants to be notified if any signals at all were to be -Index: linux/mm/filemap.c +Index: linux-tux.q/mm/filemap.c =================================================================== ---- linux.orig/mm/filemap.c -+++ linux/mm/filemap.c -@@ -733,7 +733,8 @@ void do_generic_mapping_read(struct addr +--- linux-tux.q.orig/mm/filemap.c ++++ linux-tux.q/mm/filemap.c +@@ -735,7 +735,8 @@ void do_generic_mapping_read(struct addr struct file *filp, loff_t *ppos, read_descriptor_t *desc, @@ -1861,7 +1860,7 @@ { struct inode *inode = mapping->host; unsigned long index; -@@ -783,11 +784,21 @@ void do_generic_mapping_read(struct addr +@@ -785,11 +786,21 @@ void do_generic_mapping_read(struct addr find_page: page = find_get_page(mapping, index); if (unlikely(page == NULL)) { @@ -1884,7 +1883,7 @@ page_ok: /* If users can be writing to this page using arbitrary -@@ -1048,7 +1059,7 @@ __generic_file_aio_read(struct kiocb *io +@@ -1050,7 +1061,7 @@ __generic_file_aio_read(struct kiocb *io if (desc.count == 0) continue; desc.error = 0; @@ -1893,7 +1892,7 @@ retval += desc.written; if (desc.error) { retval = retval ?: desc.error; -@@ -1122,7 +1133,7 @@ ssize_t generic_file_sendfile(struct fil +@@ -1124,7 +1135,7 @@ ssize_t generic_file_sendfile(struct fil desc.arg.data = target; desc.error = 0; @@ -1902,10 +1901,10 @@ if (desc.written) return desc.written; return desc.error; -Index: linux/mm/truncate.c +Index: linux-tux.q/mm/truncate.c =================================================================== ---- linux.orig/mm/truncate.c -+++ linux/mm/truncate.c +--- linux-tux.q.orig/mm/truncate.c ++++ linux-tux.q/mm/truncate.c @@ -253,6 +253,8 @@ unlock: return ret; } @@ -1915,11 +1914,11 @@ unsigned long invalidate_inode_pages(struct address_space *mapping) { return invalidate_mapping_pages(mapping, 0, ~0UL); -Index: linux/net/Kconfig +Index: linux-tux.q/net/Kconfig =================================================================== ---- linux.orig/net/Kconfig -+++ linux/net/Kconfig -@@ -215,6 +215,7 @@ source "net/ax25/Kconfig" +--- linux-tux.q.orig/net/Kconfig ++++ linux-tux.q/net/Kconfig +@@ -223,6 +223,7 @@ source "net/ax25/Kconfig" source "net/irda/Kconfig" source "net/bluetooth/Kconfig" source "net/ieee80211/Kconfig" @@ -1927,10 +1926,10 @@ endif # if NET endmenu # Networking -Index: linux/net/Makefile +Index: linux-tux.q/net/Makefile =================================================================== ---- linux.orig/net/Makefile -+++ linux/net/Makefile +--- linux-tux.q.orig/net/Makefile ++++ linux-tux.q/net/Makefile @@ -22,6 +22,7 @@ obj-$(CONFIG_UNIX) += unix/ ifneq ($(CONFIG_IPV6),) obj-y += ipv6/ @@ -1939,11 +1938,11 @@ obj-$(CONFIG_PACKET) += packet/ obj-$(CONFIG_NET_KEY) += key/ obj-$(CONFIG_NET_SCHED) += sched/ -Index: linux/net/core/sock.c +Index: linux-tux.q/net/core/sock.c =================================================================== ---- linux.orig/net/core/sock.c -+++ linux/net/core/sock.c -@@ -704,7 +704,7 @@ void sk_free(struct sock *sk) +--- linux-tux.q.orig/net/core/sock.c ++++ linux-tux.q/net/core/sock.c +@@ -705,7 +705,7 @@ void sk_free(struct sock *sk) module_put(owner); } @@ -1952,7 +1951,7 @@ { struct sock *newsk = sk_alloc(sk->sk_family, priority, sk->sk_prot, 0); -@@ -741,6 +741,9 @@ struct sock *sk_clone(const struct sock +@@ -742,6 +742,9 @@ struct sock *sk_clone(const struct sock if (filter != NULL) sk_filter_charge(newsk, filter); @@ -1962,10 +1961,10 @@ if (unlikely(xfrm_sk_clone_policy(newsk))) { /* It is still raw copy of parent, so invalidate * destructor and make plain sk_free() */ -Index: linux/net/ipv4/tcp.c +Index: linux-tux.q/net/ipv4/tcp.c =================================================================== ---- linux.orig/net/ipv4/tcp.c -+++ linux/net/ipv4/tcp.c +--- linux-tux.q.orig/net/ipv4/tcp.c ++++ linux-tux.q/net/ipv4/tcp.c @@ -936,7 +936,7 @@ static int tcp_recv_urg(struct sock *sk, * calculation of whether or not we must ACK for the sake of * a window update. @@ -1980,11 +1979,11 @@ EXPORT_SYMBOL(tcp_shutdown); EXPORT_SYMBOL(tcp_statistics); +EXPORT_SYMBOL_GPL(cleanup_rbuf); -Index: linux/net/ipv4/tcp_input.c +Index: linux-tux.q/net/ipv4/tcp_input.c =================================================================== ---- linux.orig/net/ipv4/tcp_input.c -+++ linux/net/ipv4/tcp_input.c -@@ -3473,6 +3473,7 @@ static int tcp_prune_queue(struct sock * +--- linux-tux.q.orig/net/ipv4/tcp_input.c ++++ linux-tux.q/net/ipv4/tcp_input.c +@@ -3474,6 +3474,7 @@ static int tcp_prune_queue(struct sock * return -1; } @@ -1992,10 +1991,10 @@ /* RFC2861, slow part. Adjust cwnd, after it was not full during one rto. * As additional protections, we do not touch cwnd in retransmission phases, -Index: linux/net/ipv4/tcp_output.c +Index: linux-tux.q/net/ipv4/tcp_output.c =================================================================== ---- linux.orig/net/ipv4/tcp_output.c -+++ linux/net/ipv4/tcp_output.c +--- linux-tux.q.orig/net/ipv4/tcp_output.c ++++ linux-tux.q/net/ipv4/tcp_output.c @@ -791,6 +791,8 @@ unsigned int tcp_current_mss(struct sock return mss_now; } @@ -2005,7 +2004,7 @@ /* Congestion window validation. (RFC2861) */ static void tcp_cwnd_validate(struct sock *sk, struct tcp_sock *tp) -@@ -1156,6 +1158,7 @@ void __tcp_push_pending_frames(struct so +@@ -1160,6 +1162,7 @@ void __tcp_push_pending_frames(struct so tcp_check_probe_timer(sk, tp); } } @@ -2013,10 +2012,10 @@ /* Send _single_ skb sitting at the send head. This function requires * true push pending frames to setup probe timer etc. -Index: linux/net/socket.c +Index: linux-tux.q/net/socket.c =================================================================== ---- linux.orig/net/socket.c -+++ linux/net/socket.c +--- linux-tux.q.orig/net/socket.c ++++ linux-tux.q/net/socket.c @@ -68,6 +68,7 @@ #include #include @@ -2270,10 +2269,10 @@ #ifdef CONFIG_PROC_FS void socket_seq_show(struct seq_file *seq) { -Index: linux/net/tux/Kconfig +Index: linux-tux.q/net/tux/Kconfig =================================================================== --- /dev/null -+++ linux/net/tux/Kconfig ++++ linux-tux.q/net/tux/Kconfig @@ -0,0 +1,25 @@ + +config TUX @@ -2300,10 +2299,10 @@ + +endmenu + -Index: linux/net/tux/Makefile +Index: linux-tux.q/net/tux/Makefile =================================================================== --- /dev/null -+++ linux/net/tux/Makefile ++++ linux-tux.q/net/tux/Makefile @@ -0,0 +1,12 @@ +# +# Makefile for TUX @@ -2317,10 +2316,10 @@ + +tux-$(subst m,y,$(CONFIG_TUX_EXTCGI)) += cgi.o extcgi.o + -Index: linux/net/tux/abuf.c +Index: linux-tux.q/net/tux/abuf.c =================================================================== --- /dev/null -+++ linux/net/tux/abuf.c ++++ linux-tux.q/net/tux/abuf.c @@ -0,0 +1,190 @@ +/* + * TUX - Integrated Application Protocols Layer and Object Cache @@ -2512,10 +2511,10 @@ + send_abuf(req, size, flags); + add_req_to_workqueue(req); +} -Index: linux/net/tux/accept.c +Index: linux-tux.q/net/tux/accept.c =================================================================== --- /dev/null -+++ linux/net/tux/accept.c ++++ linux-tux.q/net/tux/accept.c @@ -0,0 +1,863 @@ +/* + * TUX - Integrated Application Protocols Layer and Object Cache @@ -3380,10 +3379,10 @@ + goto out; +} + -Index: linux/net/tux/cachemiss.c +Index: linux-tux.q/net/tux/cachemiss.c =================================================================== --- /dev/null -+++ linux/net/tux/cachemiss.c ++++ linux-tux.q/net/tux/cachemiss.c @@ -0,0 +1,265 @@ +/* + * TUX - Integrated Application Protocols Layer and Object Cache @@ -3650,10 +3649,10 @@ + return 0; +} + -Index: linux/net/tux/cgi.c +Index: linux-tux.q/net/tux/cgi.c =================================================================== --- /dev/null -+++ linux/net/tux/cgi.c ++++ linux-tux.q/net/tux/cgi.c @@ -0,0 +1,171 @@ +/* + * TUX - Integrated Application Protocols Layer and Object Cache @@ -3826,10 +3825,10 @@ + } + return pid; +} -Index: linux/net/tux/directory.c +Index: linux-tux.q/net/tux/directory.c =================================================================== --- /dev/null -+++ linux/net/tux/directory.c ++++ linux-tux.q/net/tux/directory.c @@ -0,0 +1,302 @@ +/* + * TUX - Integrated Application Protocols Layer and Object Cache @@ -4133,10 +4132,10 @@ + add_req_to_workqueue(req); +} + -Index: linux/net/tux/extcgi.c +Index: linux-tux.q/net/tux/extcgi.c =================================================================== --- /dev/null -+++ linux/net/tux/extcgi.c ++++ linux-tux.q/net/tux/extcgi.c @@ -0,0 +1,329 @@ +/* + * TUX - Integrated Application Protocols Layer and Object Cache @@ -4467,10 +4466,10 @@ + +#define EXTCGI_INVALID EXTCGI_INVALID_HEADER EXTCGI_INVALID_BODY + -Index: linux/net/tux/gzip.c +Index: linux-tux.q/net/tux/gzip.c =================================================================== --- /dev/null -+++ linux/net/tux/gzip.c ++++ linux-tux.q/net/tux/gzip.c @@ -0,0 +1,40 @@ +/* $Id$ */ + @@ -4512,10 +4511,10 @@ + return left; +} + -Index: linux/net/tux/input.c +Index: linux-tux.q/net/tux/input.c =================================================================== --- /dev/null -+++ linux/net/tux/input.c ++++ linux-tux.q/net/tux/input.c @@ -0,0 +1,641 @@ +/* + * TUX - Integrated Application Protocols Layer and Object Cache @@ -5158,10 +5157,10 @@ + return count; +} + -Index: linux/net/tux/logger.c +Index: linux-tux.q/net/tux/logger.c =================================================================== --- /dev/null -+++ linux/net/tux/logger.c ++++ linux-tux.q/net/tux/logger.c @@ -0,0 +1,837 @@ +/* + * TUX - Integrated Application Protocols Layer and Object Cache @@ -6000,10 +5999,10 @@ + + Dprintk("logger thread stopped!\n"); +} -Index: linux/net/tux/main.c +Index: linux-tux.q/net/tux/main.c =================================================================== --- /dev/null -+++ linux/net/tux/main.c ++++ linux-tux.q/net/tux/main.c @@ -0,0 +1,1417 @@ +/* + * TUX - Integrated Application Protocols Layer and Object Cache @@ -7422,10 +7421,10 @@ + +MODULE_LICENSE("GPL"); + -Index: linux/net/tux/mod.c +Index: linux-tux.q/net/tux/mod.c =================================================================== --- /dev/null -+++ linux/net/tux/mod.c ++++ linux-tux.q/net/tux/mod.c @@ -0,0 +1,262 @@ +/* + * TUX - Integrated Application Protocols Layer and Object Cache @@ -7689,10 +7688,10 @@ + return ret; +} + -Index: linux/net/tux/output.c +Index: linux-tux.q/net/tux/output.c =================================================================== --- /dev/null -+++ linux/net/tux/output.c ++++ linux-tux.q/net/tux/output.c @@ -0,0 +1,352 @@ +/* + * TUX - Integrated Application Protocols Layer and Object Cache @@ -8046,10 +8045,10 @@ + return 0; +} + -Index: linux/net/tux/parser.h +Index: linux-tux.q/net/tux/parser.h =================================================================== --- /dev/null -+++ linux/net/tux/parser.h ++++ linux-tux.q/net/tux/parser.h @@ -0,0 +1,102 @@ +/* + * TUX - Integrated Application Protocols Layer and Object Cache @@ -8153,10 +8152,10 @@ + GOTO_REDIR; \ +} while (0) + -Index: linux/net/tux/postpone.c +Index: linux-tux.q/net/tux/postpone.c =================================================================== --- /dev/null -+++ linux/net/tux/postpone.c ++++ linux-tux.q/net/tux/postpone.c @@ -0,0 +1,77 @@ +/* + * TUX - Integrated Application Protocols Layer and Object Cache @@ -8235,10 +8234,10 @@ + return err; +} + -Index: linux/net/tux/proc.c +Index: linux-tux.q/net/tux/proc.c =================================================================== --- /dev/null -+++ linux/net/tux/proc.c ++++ linux-tux.q/net/tux/proc.c @@ -0,0 +1,1149 @@ +/* + * TUX - Integrated Application Protocols Layer and Object Cache @@ -9389,10 +9388,10 @@ +} + + -Index: linux/net/tux/proto_ftp.c +Index: linux-tux.q/net/tux/proto_ftp.c =================================================================== --- /dev/null -+++ linux/net/tux/proto_ftp.c ++++ linux-tux.q/net/tux/proto_ftp.c @@ -0,0 +1,1555 @@ +/* + * TUX - Integrated Application Protocols Layer and Object Cache @@ -10949,10 +10948,10 @@ + name: "ftp", +}; + -Index: linux/net/tux/proto_http.c +Index: linux-tux.q/net/tux/proto_http.c =================================================================== --- /dev/null -+++ linux/net/tux/proto_http.c ++++ linux-tux.q/net/tux/proto_http.c @@ -0,0 +1,2197 @@ +/* + * TUX - Integrated Application Protocols Layer and Object Cache @@ -13151,10 +13150,10 @@ + name: "http", +}; + -Index: linux/net/tux/redirect.c +Index: linux-tux.q/net/tux/redirect.c =================================================================== --- /dev/null -+++ linux/net/tux/redirect.c ++++ linux-tux.q/net/tux/redirect.c @@ -0,0 +1,172 @@ +/* + * TUX - Integrated Application Protocols Layer and Object Cache @@ -13328,10 +13327,10 @@ +{ + kmem_cache_destroy(tux_req.slab); +} -Index: linux/net/tux/times.c +Index: linux-tux.q/net/tux/times.c =================================================================== --- /dev/null -+++ linux/net/tux/times.c ++++ linux-tux.q/net/tux/times.c @@ -0,0 +1,392 @@ +/* + * TUX - Integrated Application Protocols Layer and Object Cache @@ -13725,10 +13724,10 @@ + + return mktime(year, mon, mday, hour, min, sec); +} -Index: linux/net/tux/times.h +Index: linux-tux.q/net/tux/times.h =================================================================== --- /dev/null -+++ linux/net/tux/times.h ++++ linux-tux.q/net/tux/times.h @@ -0,0 +1,26 @@ +static time_t TimeDays[10][13] = { + { 852073200, 854751600, 857170800, 859849200, 862441200, 865119600, 867711600, 870390000, 873068400, 875660400, 878338800, 880930800, 883609200 } , @@ -13756,10 +13755,10 @@ +}; +#define TUX_YEAROFFSET 1997 +#define TUX_NUMYEARS 10 -Index: linux/net/tux/userspace.c +Index: linux-tux.q/net/tux/userspace.c =================================================================== --- /dev/null -+++ linux/net/tux/userspace.c ++++ linux-tux.q/net/tux/userspace.c @@ -0,0 +1,27 @@ +/* + * TUX - Integrated Application Protocols Layer and Object Cache @@ -13788,4 +13787,3 @@ + * + ****************************************************************/ + - From fedora-cvs-commits at redhat.com Mon Mar 20 22:24:04 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 20 Mar 2006 17:24:04 -0500 Subject: rpms/kernel/devel kernel-2.6.spec, 1.2070, 1.2071 linux-2.6-debug-latency-tracing.patch, 1.10, 1.11 Message-ID: <200603202224.k2KMO4BY000590@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv573 Modified Files: kernel-2.6.spec linux-2.6-debug-latency-tracing.patch Log Message: updated latency tracer Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.2070 retrieving revision 1.2071 diff -u -r1.2070 -r1.2071 --- kernel-2.6.spec 20 Mar 2006 22:19:53 -0000 1.2070 +++ kernel-2.6.spec 20 Mar 2006 22:24:02 -0000 1.2071 @@ -1652,6 +1652,7 @@ * Mon Mar 20 2006 Dave Jones - 2.6.16 & 2.6.16-git1 - Tux 2.6.16-A0 (Just rediffing) +- Update Ingo's latency tracer patch. * Sun Mar 19 2006 Dave Jones - 2.6.16rc6-git12 linux-2.6-debug-latency-tracing.patch: Makefile | 10 arch/arm/boot/compressed/head.S | 13 arch/arm/boot/compressed/misc.c | 1 arch/arm/kernel/entry-common.S | 109 + arch/arm/kernel/fiq.c | 4 arch/arm/kernel/irq.c | 4 arch/arm/kernel/traps.c | 2 arch/arm/mm/copypage-v4mc.c | 4 arch/arm/mm/copypage-xscale.c | 4 arch/arm/mm/fault.c | 14 arch/arm26/boot/compressed/misc.c | 1 arch/i386/Kconfig | 2 arch/i386/boot/compressed/misc.c | 9 arch/i386/kernel/Makefile | 1 arch/i386/kernel/entry.S | 41 arch/i386/kernel/irq.c | 8 arch/i386/kernel/mcount-wrapper.S | 27 arch/i386/kernel/traps.c | 1 arch/i386/mm/fault.c | 1 arch/ppc/boot/Makefile | 9 arch/ppc/boot/lib/Makefile | 48 arch/ppc/kernel/entry.S | 82 + arch/x86_64/boot/compressed/misc.c | 1 arch/x86_64/kernel/entry.S | 48 arch/x86_64/kernel/vsyscall.c | 2 arch/x86_64/mm/fault.c | 1 fs/proc/proc_misc.c | 17 include/asm-arm/pgalloc.h | 4 include/asm-arm/timex.h | 10 include/asm-arm/unistd.h | 4 include/asm-i386/system.h | 8 include/asm-x86_64/system.h | 15 include/asm-x86_64/unistd.h | 2 include/linux/interrupt.h | 10 include/linux/kernel.h | 2 include/linux/latency_hist.h | 32 include/linux/linkage.h | 2 include/linux/preempt.h | 20 include/linux/sched.h | 86 + kernel/Makefile | 3 kernel/latency.c | 2465 +++++++++++++++++++++++++++++++++++++ kernel/latency_hist.c | 267 ++++ kernel/sched.c | 101 + kernel/sysctl.c | 77 + kernel/time.c | 19 lib/Kconfig.debug | 152 ++ lib/inflate.c | 44 lib/zlib_inflate/inftrees.c | 45 48 files changed, 3734 insertions(+), 98 deletions(-) Index: linux-2.6-debug-latency-tracing.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-debug-latency-tracing.patch,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- linux-2.6-debug-latency-tracing.patch 13 Mar 2006 22:17:56 -0000 1.10 +++ linux-2.6-debug-latency-tracing.patch 20 Mar 2006 22:24:02 -0000 1.11 @@ -1,393 +1,8 @@ - -this patch reduces the ~2500+ worst-case stack footprint of zlib to -~500 bytes, by making the largest arrays static and by introducing a -spinlock to protect access to them. - -Signed-off-by: Ingo Molnar - - arch/arm/boot/compressed/misc.c | 1 - arch/arm26/boot/compressed/misc.c | 1 - arch/i386/boot/compressed/misc.c | 1 - arch/x86_64/boot/compressed/misc.c | 1 - lib/inflate.c | 44 +++++++++++++++++++++++++++--------- - lib/zlib_inflate/inftrees.c | 45 ++++++++++++++++++++++++++++--------- - 6 files changed, 72 insertions(+), 21 deletions(-) - -Index: linux/arch/arm/boot/compressed/misc.c -=================================================================== ---- linux.orig/arch/arm/boot/compressed/misc.c -+++ linux/arch/arm/boot/compressed/misc.c -@@ -199,6 +199,7 @@ static ulg free_mem_ptr_end; - - #define HEAP_SIZE 0x2000 - -+#define ZLIB_INFLATE_NO_INFLATE_LOCK - #include "../../../../lib/inflate.c" - - #ifndef STANDALONE_DEBUG -Index: linux/arch/arm26/boot/compressed/misc.c -=================================================================== ---- linux.orig/arch/arm26/boot/compressed/misc.c -+++ linux/arch/arm26/boot/compressed/misc.c -@@ -184,6 +184,7 @@ static ulg free_mem_ptr_end; - - #define HEAP_SIZE 0x2000 - -+#define ZLIB_INFLATE_NO_INFLATE_LOCK - #include "../../../../lib/inflate.c" - - #ifndef STANDALONE_DEBUG -Index: linux/arch/i386/boot/compressed/misc.c -=================================================================== ---- linux.orig/arch/i386/boot/compressed/misc.c -+++ linux/arch/i386/boot/compressed/misc.c -@@ -125,6 +125,7 @@ static int lines, cols; - static void * xquad_portio = NULL; - #endif - -+#define ZLIB_INFLATE_NO_INFLATE_LOCK - #include "../../../../lib/inflate.c" - - static void *malloc(int size) -Index: linux/arch/x86_64/boot/compressed/misc.c -=================================================================== ---- linux.orig/arch/x86_64/boot/compressed/misc.c -+++ linux/arch/x86_64/boot/compressed/misc.c -@@ -114,6 +114,7 @@ static char *vidmem = (char *)0xb8000; - static int vidport; - static int lines, cols; - -+#define ZLIB_INFLATE_NO_INFLATE_LOCK - #include "../../../../lib/inflate.c" - - static void *malloc(int size) -Index: linux/lib/inflate.c -=================================================================== ---- linux.orig/lib/inflate.c -+++ linux/lib/inflate.c -@@ -141,6 +141,25 @@ struct huft { - } v; - }; - -+/* -+ * turn off the inflate_lock for the bootloader code, it is -+ * single-threaded and has no need for (nor access to) the -+ * kernel's locking primitives: -+ */ -+#ifdef ZLIB_INFLATE_NO_INFLATE_LOCK -+# undef DEFINE_SPINLOCK -+# undef spin_lock -+# undef spin_unlock -+# define DEFINE_SPINLOCK(x) int x -+# define spin_lock(x) (void)(x) -+# define spin_unlock(x) (void)(x) -+#endif -+ -+/* -+ * lock protecting static variables of huft_build() and other inflate -+ * functions, to reduce their insane stack footprint. -+ */ -+static DEFINE_SPINLOCK(inflate_lock); - - /* Function prototypes */ - STATIC int INIT huft_build OF((unsigned *, unsigned, unsigned, -@@ -304,7 +323,7 @@ STATIC int INIT huft_build( - register struct huft *q; /* points to current table */ - struct huft r; /* table entry for structure assignment */ - struct huft *u[BMAX]; /* table stack */ -- unsigned v[N_MAX]; /* values in order of bit length */ -+ static unsigned v[N_MAX]; /* values in order of bit length */ - register int w; /* bits before this table == (l * h) */ - unsigned x[BMAX+1]; /* bit offsets, then code stack */ - unsigned *xp; /* pointer into x */ -@@ -705,7 +724,7 @@ STATIC int noinline INIT inflate_fixed(v - struct huft *td; /* distance code table */ - int bl; /* lookup bits for tl */ - int bd; /* lookup bits for td */ -- unsigned l[288]; /* length list for huft_build */ -+ static unsigned l[288]; /* length list for huft_build */ - - DEBG(""); - - /* bad block type */ -- return 2; -+ return ret; - - underrun: - return 4; /* Input underrun */ -Index: linux/lib/zlib_inflate/inftrees.c -=================================================================== ---- linux.orig/lib/zlib_inflate/inftrees.c -+++ linux/lib/zlib_inflate/inftrees.c -@@ -4,11 +4,19 @@ - */ - - #include -+#include - #include "inftrees.h" - #include "infutil.h" - - static const char inflate_copyright[] __attribute_used__ = - " inflate 1.1.3 Copyright 1995-1998 Mark Adler "; -+ -+/* -+ * lock protecting static variables of huft_build() and other inflate -+ * functions, to reduce their insane stack footprint. -+ */ -+static DEFINE_SPINLOCK(inflate_lock); -+ - /* - If you use the zlib library in a product, an acknowledgment is welcome - in the documentation of your product. If for some reason you cannot -@@ -107,7 +115,7 @@ static int huft_build( - { - - uInt a; /* counter for codes of length k */ -- uInt c[BMAX+1]; /* bit length count table */ -+ static uInt c[BMAX+1]; /* bit length count table */ - uInt f; /* i repeats in table every f entries */ - int g; /* maximum code length */ - int h; /* table level */ -@@ -118,10 +126,10 @@ static int huft_build( - uInt mask; /* (1 << w) - 1, to avoid cc -O bug on HP */ - register uInt *p; /* pointer into c[], b[], or v[] */ - inflate_huft *q; /* points to current table */ -- struct inflate_huft_s r; /* table entry for structure assignment */ -- inflate_huft *u[BMAX]; /* table stack */ -+ static struct inflate_huft_s r; /* table entry for structure assignment */ -+ static inflate_huft *u[BMAX]; /* table stack */ - register int w; /* bits before this table == (l * h) */ -- uInt x[BMAX+1]; /* bit offsets, then code stack */ -+ static uInt x[BMAX+1]; /* bit offsets, then code stack */ - uInt *xp; /* pointer into x */ - int y; /* number of dummy codes added */ - uInt z; /* number of entries in current table */ -@@ -300,9 +308,13 @@ int zlib_inflate_trees_bits( - int r; - uInt hn = 0; /* hufts used in space */ - uInt *v; /* work area for huft_build */ -- -+ - v = WS(z)->tree_work_area_1; -+ -+ spin_lock(&inflate_lock); - r = huft_build(c, 19, 19, NULL, NULL, tb, bb, hp, &hn, v); -+ spin_unlock(&inflate_lock); -+ - if (r == Z_DATA_ERROR) - z->msg = (char*)"oversubscribed dynamic bit lengths tree"; - else if (r == Z_BUF_ERROR || *bb == 0) -@@ -333,7 +345,10 @@ int zlib_inflate_trees_dynamic( - v = WS(z)->tree_work_area_2; - - /* build literal/length tree */ -+ spin_lock(&inflate_lock); - r = huft_build(c, nl, 257, cplens, cplext, tl, bl, hp, &hn, v); -+ spin_unlock(&inflate_lock); -+ - if (r != Z_OK || *bl == 0) - { - if (r == Z_DATA_ERROR) -@@ -347,7 +362,10 @@ int zlib_inflate_trees_dynamic( - } - - /* build distance tree */ -+ spin_lock(&inflate_lock); - r = huft_build(c + nl, nd, 0, cpdist, cpdext, td, bd, hp, &hn, v); -+ spin_unlock(&inflate_lock); -+ - if (r != Z_OK || (*bd == 0 && nl > 257)) - { - if (r == Z_DATA_ERROR) -@@ -383,9 +401,11 @@ int zlib_inflate_trees_fixed( - z_streamp z /* for memory allocation */ - ) - { -- int i; /* temporary variable */ -- unsigned l[288]; /* length list for huft_build */ -- uInt *v; /* work area for huft_build */ -+ int i; /* temporary variable */ -+ static unsigned l[288]; /* length list for huft_build */ -+ uInt *v; /* work area for huft_build */ -+ -+ spin_lock(&inflate_lock); - - /* set up literal table */ - for (i = 0; i < 144; i++) -@@ -398,15 +418,20 @@ int zlib_inflate_trees_fixed( - l[i] = 8; - *bl = 9; - v = WS(z)->tree_work_area_1; -- if ((i = huft_build(l, 288, 257, cplens, cplext, tl, bl, hp, &i, v)) != 0) -+ if ((i = huft_build(l, 288, 257, cplens, cplext, tl, bl, hp, &i, v)) != 0) { -+ spin_unlock(&inflate_lock); - return i; -+ } - - /* set up distance table */ - for (i = 0; i < 30; i++) /* make an incomplete code set */ - l[i] = 5; - *bd = 5; -- if ((i = huft_build(l, 30, 0, cpdist, cpdext, td, bd, hp, &i, v)) > 1) -+ if ((i = huft_build(l, 30, 0, cpdist, cpdext, td, bd, hp, &i, v)) > 1) { -+ spin_unlock(&inflate_lock); - return i; -+ } - -+ spin_unlock(&inflate_lock); - return Z_OK; - } - arch/ppc/boot/lib/Makefile | 48 ++++++++++++++++++++++++++++++++++++--------- - 1 files changed, 39 insertions(+), 9 deletions(-) - -Index: linux/arch/ppc/boot/lib/Makefile -=================================================================== ---- linux.orig/arch/ppc/boot/lib/Makefile -+++ linux/arch/ppc/boot/lib/Makefile -@@ -5,19 +5,49 @@ - CFLAGS_kbd.o := -Idrivers/char - CFLAGS_vreset.o := -I$(srctree)/arch/ppc/boot/include - --zlib := infblock.c infcodes.c inffast.c inflate.c inftrees.c infutil.c -- --lib-y += $(zlib:.c=.o) div64.o --lib-$(CONFIG_VGA_CONSOLE) += vreset.o kbd.o -- -+zlib := infblock.c infcodes.c inffast.c inflate.c inftrees.c infutil.c -+zlibheader := infblock.h infcodes.h inffast.h inftrees.h infutil.h -+zliblinuxheader := zlib.h zconf.h zutil.h -+ -+$(addprefix $(obj)/,$(zlib)): $(addprefix $(obj)/,$(zliblinuxheader)) $(addprefix $(obj)/,$(zlibheader)) -+ -+src-boot := div64.S -+src-boot += $(zlib) -+#src-boot := $(addprefix $(obj)/, $(src-boot)) -+obj-boot := $(addsuffix .o, $(basename $(src-boot))) - --# zlib files needs header from their original place --EXTRA_CFLAGS += -Ilib/zlib_inflate -+BOOTCFLAGS += -I$(obj) -I$(srctree)/$(obj) $(CFLAGS) - - quiet_cmd_copy_zlib = COPY $@ -- cmd_copy_zlib = cat $< > $@ -+ cmd_copy_zlib = sed "s at __attribute_used__@@;s at .include.@@;s at .include.@@;s at .*spin.*lock.*@@;s at .*SPINLOCK.*@@;s@]\+\).*@\"\1\"@" $< > $@ -+ -+quiet_cmd_copy_zlibheader = COPY $@ -+ cmd_copy_zlibheader = sed "s@]\+\).*@\"\1\"@" $< > $@ -+# stddef.h for NULL -+quiet_cmd_copy_zliblinuxheader = COPY $@ -+ cmd_copy_zliblinuxheader = sed "s at .include.@@;s at .include.@@;s@@@;s@]\+\).*@\"\1\"@" $< > $@ - - $(addprefix $(obj)/,$(zlib)): $(obj)/%: $(srctree)/lib/zlib_inflate/% - $(call cmd,copy_zlib) - --clean-files := $(zlib) -+$(addprefix $(obj)/,$(zlibheader)): $(obj)/%: $(srctree)/lib/zlib_inflate/% -+ $(call cmd,copy_zlibheader) -+ -+$(addprefix $(obj)/,$(zliblinuxheader)): $(obj)/%: $(srctree)/include/linux/% -+ $(call cmd,copy_zliblinuxheader) -+ -+clean-files := $(zlib) $(zlibheader) $(zliblinuxheader) -+ -+quiet_cmd_bootcc = BOOTCC $@ -+ cmd_bootcc = $(CC) -Wp,-MD,$(depfile) $(BOOTCFLAGS) -c -o $@ $< -+ -+quiet_cmd_bootas = BOOTAS $@ -+ cmd_bootas = $(CC) -Wp,-MD,$(depfile) $(BOOTAFLAGS) -c -o $@ $< -+ -+$(patsubst %.c,%.o, $(filter %.c, $(src-boot))): %.o: %.c -+ $(call if_changed_dep,bootcc) -+$(patsubst %.S,%.o, $(filter %.S, $(src-boot))): %.o: %.S -+ $(call if_changed_dep,bootas) -+ -+lib-y += $(obj-boot) -+lib-$(CONFIG_VGA_CONSOLE) += vreset.o kbd.o - Makefile | 10 - arch/arm/boot/compressed/head.S | 13 - arch/arm/kernel/calls.S | 6 - arch/arm/kernel/entry-common.S | 111 + - arch/arm/kernel/fiq.c | 4 - arch/arm/kernel/irq.c | 4 - arch/arm/kernel/traps.c | 2 - arch/arm/mm/copypage-v4mc.c | 4 - arch/arm/mm/copypage-xscale.c | 4 - arch/arm/mm/fault.c | 14 - arch/i386/Kconfig | 2 - arch/i386/boot/compressed/misc.c | 8 - arch/i386/kernel/Makefile | 1 - arch/i386/kernel/entry.S | 41 - arch/i386/kernel/irq.c | 8 - arch/i386/kernel/mcount-wrapper.S | 27 - arch/ppc/boot/Makefile | 9 - arch/ppc/kernel/entry.S | 82 + - arch/x86_64/kernel/entry.S | 48 - arch/x86_64/kernel/vsyscall.c | 2 - fs/proc/proc_misc.c | 17 - include/asm-arm/pgalloc.h | 4 - include/asm-arm/timex.h | 10 - include/asm-arm/unistd.h | 3 - include/asm-i386/system.h | 8 - include/linux/interrupt.h | 10 - include/linux/latency_hist.h | 32 - include/linux/linkage.h | 2 - include/linux/preempt.h | 20 - include/linux/sched.h | 86 + - kernel/Makefile | 3 - kernel/latency.c | 2390 ++++++++++++++++++++++++++++++++++++++ - kernel/latency_hist.c | 267 ++++ - kernel/sched.c | 103 + - kernel/sysctl.c | 77 + - kernel/time.c | 19 - lib/Kconfig.debug | 149 ++ - 37 files changed, 3530 insertions(+), 70 deletions(-) - Index: linux-latency-tracing.q/Makefile =================================================================== --- linux-latency-tracing.q.orig/Makefile +++ linux-latency-tracing.q/Makefile -@@ -519,10 +519,14 @@ CFLAGS += $(call add-align,CONFIG_CC_AL +@@ -511,10 +511,14 @@ CFLAGS += $(call add-align,CONFIG_CC_AL CFLAGS += $(call add-align,CONFIG_CC_ALIGN_LOOPS,-loops) CFLAGS += $(call add-align,CONFIG_CC_ALIGN_JUMPS,-jumps) @@ -409,7 +24,7 @@ =================================================================== --- linux-latency-tracing.q.orig/arch/arm/boot/compressed/head.S +++ linux-latency-tracing.q/arch/arm/boot/compressed/head.S -@@ -710,6 +710,19 @@ memdump: mov r12, r0 +@@ -714,6 +714,19 @@ memdump: mov r12, r0 mov pc, r10 #endif @@ -429,28 +44,18 @@ reloc_end: .align -Index: linux-latency-tracing.q/arch/arm/kernel/calls.S +Index: linux-latency-tracing.q/arch/arm/boot/compressed/misc.c =================================================================== ---- linux-latency-tracing.q.orig/arch/arm/kernel/calls.S -+++ linux-latency-tracing.q/arch/arm/kernel/calls.S -@@ -7,11 +7,8 @@ - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - * -- * This file is included twice in entry-common.S -+ * NR_syscalls now defined in include/asm-arm/unistd.h - tglx - */ --#ifndef NR_syscalls --#define NR_syscalls 328 --#else - - __syscall_start: - /* 0 */ .long sys_restart_syscall -@@ -341,4 +338,3 @@ __syscall_end: - .rept NR_syscalls - (__syscall_end - __syscall_start) / 4 - .long sys_ni_syscall - .endr --#endif +--- linux-latency-tracing.q.orig/arch/arm/boot/compressed/misc.c ++++ linux-latency-tracing.q/arch/arm/boot/compressed/misc.c +@@ -199,6 +199,7 @@ static ulg free_mem_ptr_end; + + #define HEAP_SIZE 0x2000 + ++#define ZLIB_INFLATE_NO_INFLATE_LOCK + #include "../../../../lib/inflate.c" + + #ifndef STANDALONE_DEBUG Index: linux-latency-tracing.q/arch/arm/kernel/entry-common.S =================================================================== --- linux-latency-tracing.q.orig/arch/arm/kernel/entry-common.S @@ -464,20 +69,10 @@ * 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. -@@ -87,8 +89,6 @@ ENTRY(ret_from_fork) - b ret_slow_syscall - +@@ -389,5 +391,112 @@ ENTRY(sys_oabi_call_table) + #undef ABI + #undef OBSOLETE --#include "calls.S" -- - /*============================================================================= - * SWI handler - *----------------------------------------------------------------------------- -@@ -271,3 +271,110 @@ sys_mmap2: - str r5, [sp, #4] - b do_mmap2 - #endif -+ +#ifdef CONFIG_FRAME_POINTER + +#ifdef CONFIG_MCOUNT @@ -584,6 +179,9 @@ + mov pc, lr + +#endif ++ + #endif + Index: linux-latency-tracing.q/arch/arm/kernel/fiq.c =================================================================== --- linux-latency-tracing.q.orig/arch/arm/kernel/fiq.c @@ -748,11 +346,23 @@ do_PrefetchAbort(unsigned long addr, struct pt_regs *regs) { do_translation_fault(addr, 0, regs); +Index: linux-latency-tracing.q/arch/arm26/boot/compressed/misc.c +=================================================================== +--- linux-latency-tracing.q.orig/arch/arm26/boot/compressed/misc.c ++++ linux-latency-tracing.q/arch/arm26/boot/compressed/misc.c +@@ -184,6 +184,7 @@ static ulg free_mem_ptr_end; + + #define HEAP_SIZE 0x2000 + ++#define ZLIB_INFLATE_NO_INFLATE_LOCK + #include "../../../../lib/inflate.c" + + #ifndef STANDALONE_DEBUG Index: linux-latency-tracing.q/arch/i386/Kconfig =================================================================== --- linux-latency-tracing.q.orig/arch/i386/Kconfig +++ linux-latency-tracing.q/arch/i386/Kconfig -@@ -619,7 +619,7 @@ config BOOT_IOREMAP +@@ -661,7 +661,7 @@ config BOOT_IOREMAP config REGPARM bool "Use register arguments (EXPERIMENTAL)" @@ -787,6 +397,14 @@ static unsigned int low_buffer_end, low_buffer_size; static int high_loaded =0; static uch *high_buffer_start /* = (uch *)(((ulg)&end) + HEAP_SIZE)*/; +@@ -125,6 +131,7 @@ static int lines, cols; + static void * xquad_portio = NULL; + #endif + ++#define ZLIB_INFLATE_NO_INFLATE_LOCK + #include "../../../../lib/inflate.c" + + static void *malloc(int size) Index: linux-latency-tracing.q/arch/i386/kernel/Makefile =================================================================== --- linux-latency-tracing.q.orig/arch/i386/kernel/Makefile @@ -857,7 +475,7 @@ RESTORE_REGS addl $4, %esp 1: iret -@@ -351,6 +377,11 @@ syscall_trace_entry: +@@ -353,6 +379,11 @@ syscall_trace_entry: syscall_exit_work: testb $(_TIF_SYSCALL_TRACE|_TIF_SYSCALL_AUDIT|_TIF_SINGLESTEP), %cl jz work_pending @@ -869,7 +487,7 @@ sti # could let do_syscall_trace() call # schedule() instead movl %esp, %eax -@@ -412,9 +443,16 @@ ENTRY(irq_entries_start) +@@ -414,9 +445,16 @@ ENTRY(irq_entries_start) vector=vector+1 .endr @@ -886,7 +504,7 @@ movl %esp,%eax call do_IRQ jmp ret_from_intr -@@ -423,6 +461,7 @@ common_interrupt: +@@ -425,6 +463,7 @@ common_interrupt: ENTRY(name) \ pushl $nr-256; \ SAVE_ALL \ @@ -894,7 +512,7 @@ movl %esp,%eax; \ call smp_/**/name; \ jmp ret_from_intr; -@@ -552,7 +591,7 @@ nmi_stack_correct: +@@ -554,7 +593,7 @@ nmi_stack_correct: xorl %edx,%edx # zero error code movl %esp,%eax # pt_regs pointer call do_nmi @@ -962,6 +580,30 @@ +out: + ret + +Index: linux-latency-tracing.q/arch/i386/kernel/traps.c +=================================================================== +--- linux-latency-tracing.q.orig/arch/i386/kernel/traps.c ++++ linux-latency-tracing.q/arch/i386/kernel/traps.c +@@ -169,6 +169,7 @@ static void show_trace_log_lvl(struct ta + printk(log_lvl); + printk(" =======================\n"); + } ++ print_traces(task); + } + + void show_trace(struct task_struct *task, unsigned long * stack) +Index: linux-latency-tracing.q/arch/i386/mm/fault.c +=================================================================== +--- linux-latency-tracing.q.orig/arch/i386/mm/fault.c ++++ linux-latency-tracing.q/arch/i386/mm/fault.c +@@ -39,6 +39,7 @@ void bust_spinlocks(int yes) + int loglevel_save = console_loglevel; + + if (yes) { ++ stop_trace(); + oops_in_progress = 1; + return; + } Index: linux-latency-tracing.q/arch/ppc/boot/Makefile =================================================================== --- linux-latency-tracing.q.orig/arch/ppc/boot/Makefile @@ -982,11 +624,74 @@ HOSTCFLAGS += -Iarch/$(ARCH)/boot/include BOOT_TARGETS = zImage zImage.initrd znetboot znetboot.initrd +Index: linux-latency-tracing.q/arch/ppc/boot/lib/Makefile +=================================================================== +--- linux-latency-tracing.q.orig/arch/ppc/boot/lib/Makefile ++++ linux-latency-tracing.q/arch/ppc/boot/lib/Makefile +@@ -5,19 +5,49 @@ + CFLAGS_kbd.o := -Idrivers/char + CFLAGS_vreset.o := -I$(srctree)/arch/ppc/boot/include + +-zlib := infblock.c infcodes.c inffast.c inflate.c inftrees.c infutil.c +- +-lib-y += $(zlib:.c=.o) div64.o +-lib-$(CONFIG_VGA_CONSOLE) += vreset.o kbd.o +- ++zlib := infblock.c infcodes.c inffast.c inflate.c inftrees.c infutil.c ++zlibheader := infblock.h infcodes.h inffast.h inftrees.h infutil.h ++zliblinuxheader := zlib.h zconf.h zutil.h ++ ++$(addprefix $(obj)/,$(zlib)): $(addprefix $(obj)/,$(zliblinuxheader)) $(addprefix $(obj)/,$(zlibheader)) ++ ++src-boot := div64.S ++src-boot += $(zlib) ++#src-boot := $(addprefix $(obj)/, $(src-boot)) ++obj-boot := $(addsuffix .o, $(basename $(src-boot))) + +-# zlib files needs header from their original place +-EXTRA_CFLAGS += -Ilib/zlib_inflate ++BOOTCFLAGS += -I$(obj) -I$(srctree)/$(obj) $(CFLAGS) + + quiet_cmd_copy_zlib = COPY $@ +- cmd_copy_zlib = cat $< > $@ ++ cmd_copy_zlib = sed "s at __attribute_used__@@;s at .include.@@;s at .include.@@;s at .*spin.*lock.*@@;s at .*SPINLOCK.*@@;s@]\+\).*@\"\1\"@" $< > $@ ++ ++quiet_cmd_copy_zlibheader = COPY $@ ++ cmd_copy_zlibheader = sed "s@]\+\).*@\"\1\"@" $< > $@ ++# stddef.h for NULL ++quiet_cmd_copy_zliblinuxheader = COPY $@ ++ cmd_copy_zliblinuxheader = sed "s at .include.@@;s at .include.@@;s@@@;s@]\+\).*@\"\1\"@" $< > $@ + + $(addprefix $(obj)/,$(zlib)): $(obj)/%: $(srctree)/lib/zlib_inflate/% + $(call cmd,copy_zlib) + +-clean-files := $(zlib) ++$(addprefix $(obj)/,$(zlibheader)): $(obj)/%: $(srctree)/lib/zlib_inflate/% ++ $(call cmd,copy_zlibheader) ++ ++$(addprefix $(obj)/,$(zliblinuxheader)): $(obj)/%: $(srctree)/include/linux/% ++ $(call cmd,copy_zliblinuxheader) ++ ++clean-files := $(zlib) $(zlibheader) $(zliblinuxheader) ++ ++quiet_cmd_bootcc = BOOTCC $@ ++ cmd_bootcc = $(CC) -Wp,-MD,$(depfile) $(BOOTCFLAGS) -c -o $@ $< ++ ++quiet_cmd_bootas = BOOTAS $@ ++ cmd_bootas = $(CC) -Wp,-MD,$(depfile) $(BOOTAFLAGS) -c -o $@ $< ++ ++$(patsubst %.c,%.o, $(filter %.c, $(src-boot))): %.o: %.c ++ $(call if_changed_dep,bootcc) ++$(patsubst %.S,%.o, $(filter %.S, $(src-boot))): %.o: %.S ++ $(call if_changed_dep,bootas) ++ ++lib-y += $(obj-boot) ++lib-$(CONFIG_VGA_CONSOLE) += vreset.o kbd.o Index: linux-latency-tracing.q/arch/ppc/kernel/entry.S =================================================================== --- linux-latency-tracing.q.orig/arch/ppc/kernel/entry.S +++ linux-latency-tracing.q/arch/ppc/kernel/entry.S -@@ -1000,3 +1000,85 @@ machine_check_in_rtas: +@@ -978,3 +978,85 @@ machine_check_in_rtas: /* XXX load up BATs and panic */ #endif /* CONFIG_PPC_OF */ @@ -1072,11 +777,23 @@ + bctr + +#endif /* CONFIG_MCOUNT */ +Index: linux-latency-tracing.q/arch/x86_64/boot/compressed/misc.c +=================================================================== +--- linux-latency-tracing.q.orig/arch/x86_64/boot/compressed/misc.c ++++ linux-latency-tracing.q/arch/x86_64/boot/compressed/misc.c +@@ -114,6 +114,7 @@ static char *vidmem = (char *)0xb8000; + static int vidport; + static int lines, cols; + ++#define ZLIB_INFLATE_NO_INFLATE_LOCK + #include "../../../../lib/inflate.c" + + static void *malloc(int size) Index: linux-latency-tracing.q/arch/x86_64/kernel/entry.S =================================================================== --- linux-latency-tracing.q.orig/arch/x86_64/kernel/entry.S +++ linux-latency-tracing.q/arch/x86_64/kernel/entry.S -@@ -48,6 +48,15 @@ +@@ -49,6 +49,15 @@ #define retint_kernel retint_restore_args #endif @@ -1092,7 +809,7 @@ /* * C code is not supposed to know about undefined top of stack. Every time * a C function with an pt_regs argument is called from the SYSCALL based -@@ -593,6 +602,7 @@ retint_kernel: +@@ -600,6 +609,7 @@ retint_kernel: bt $9,EFLAGS-ARGOFFSET(%rsp) /* interrupts off? */ jnc retint_restore_args call preempt_schedule_irq @@ -1100,8 +817,8 @@ jmp exit_intr #endif CFI_ENDPROC -@@ -1041,3 +1051,41 @@ ENTRY(call_softirq) - CFI_ADJUST_CFA_OFFSET -8 +@@ -1059,3 +1069,41 @@ ENTRY(call_softirq) + decl %gs:pda_irqcount ret CFI_ENDPROC + @@ -1152,14 +869,26 @@ -#define __vsyscall(nr) __attribute__ ((unused,__section__(".vsyscall_" #nr))) +#define __vsyscall(nr) __attribute__ ((unused,__section__(".vsyscall_" #nr))) notrace - #define force_inline __attribute__((always_inline)) inline int __sysctl_vsyscall __section_sysctl_vsyscall = 1; + seqlock_t __xtime_lock __section_xtime_lock = SEQLOCK_UNLOCKED; +Index: linux-latency-tracing.q/arch/x86_64/mm/fault.c +=================================================================== +--- linux-latency-tracing.q.orig/arch/x86_64/mm/fault.c ++++ linux-latency-tracing.q/arch/x86_64/mm/fault.c +@@ -45,6 +45,7 @@ void bust_spinlocks(int yes) + { + int loglevel_save = console_loglevel; + if (yes) { ++ stop_trace(); + oops_in_progress = 1; + } else { + #ifdef CONFIG_VT Index: linux-latency-tracing.q/fs/proc/proc_misc.c =================================================================== --- linux-latency-tracing.q.orig/fs/proc/proc_misc.c +++ linux-latency-tracing.q/fs/proc/proc_misc.c -@@ -531,6 +531,20 @@ static int execdomains_read_proc(char *p +@@ -673,6 +673,20 @@ static int execdomains_read_proc(char *p return proc_calc_metrics(page, start, off, count, eof, len); } @@ -1180,7 +909,7 @@ #ifdef CONFIG_MAGIC_SYSRQ /* * writing 'C' to /proc/sysrq-trigger is like sysrq-C -@@ -611,6 +625,9 @@ void __init proc_misc_init(void) +@@ -755,6 +769,9 @@ void __init proc_misc_init(void) #ifdef CONFIG_SCHEDSTATS create_seq_entry("schedstat", 0, &proc_schedstat_operations); #endif @@ -1239,11 +968,12 @@ =================================================================== --- linux-latency-tracing.q.orig/include/asm-arm/unistd.h +++ linux-latency-tracing.q/include/asm-arm/unistd.h -@@ -526,6 +526,9 @@ type name(type1 arg1, type2 arg2, type3 - #define __ARCH_WANT_SYS_SIGPENDING - #define __ARCH_WANT_SYS_SIGPROCMASK - #define __ARCH_WANT_SYS_RT_SIGACTION +@@ -533,6 +533,10 @@ type name(type1 arg1, type2 arg2, type3 + #define __ARCH_WANT_OLD_READDIR + #define __ARCH_WANT_SYS_SOCKETCALL + #endif + ++// FIXME: check this number ... +#define NR_syscalls 328 + #endif @@ -1253,7 +983,7 @@ =================================================================== --- linux-latency-tracing.q.orig/include/asm-i386/system.h +++ linux-latency-tracing.q/include/asm-i386/system.h -@@ -531,13 +531,17 @@ struct alt_instr { +@@ -528,13 +528,17 @@ struct alt_instr { /* used when interrupts are already enabled or to shutdown the processor */ #define halt() __asm__ __volatile__("hlt": : :"memory") @@ -1273,6 +1003,61 @@ /* For spinlocks etc */ #define local_irq_save(x) __asm__ __volatile__("pushfl ; popl %0 ; cli":"=g" (x): /* no input */ :"memory") +Index: linux-latency-tracing.q/include/asm-x86_64/system.h +=================================================================== +--- linux-latency-tracing.q.orig/include/asm-x86_64/system.h ++++ linux-latency-tracing.q/include/asm-x86_64/system.h +@@ -341,10 +341,8 @@ static inline unsigned long __cmpxchg(vo + #define local_irq_disable() do { unsigned long flags; local_save_flags(flags); local_irq_restore((flags & ~(1 << 9)) | (1 << 18)); } while (0) + #define local_irq_enable() do { unsigned long flags; local_save_flags(flags); local_irq_restore((flags | (1 << 9)) & ~(1 << 18)); } while (0) + +-#define irqs_disabled() \ ++#define irqs_disabled_flags(flags) \ + ({ \ +- unsigned long flags; \ +- local_save_flags(flags); \ + (flags & (1<<18)) || !(flags & (1<<9)); \ + }) + +@@ -354,10 +352,8 @@ static inline unsigned long __cmpxchg(vo + #define local_irq_disable() __asm__ __volatile__("cli": : :"memory") + #define local_irq_enable() __asm__ __volatile__("sti": : :"memory") + +-#define irqs_disabled() \ ++#define irqs_disabled_flags(flags) \ + ({ \ +- unsigned long flags; \ +- local_save_flags(flags); \ + !(flags & (1<<9)); \ + }) + +@@ -365,6 +361,13 @@ static inline unsigned long __cmpxchg(vo + #define local_irq_save(x) do { warn_if_not_ulong(x); __asm__ __volatile__("# local_irq_save \n\t pushfq ; popq %0 ; cli":"=g" (x): /* no input */ :"memory"); } while (0) + #endif + ++#define irqs_disabled() \ ++({ \ ++ unsigned long flags; \ ++ local_save_flags(flags); \ ++ irqs_disabled_flags(flags); \ ++}) ++ + /* used in the idle loop; sti takes one instruction cycle to complete */ + #define safe_halt() __asm__ __volatile__("sti; hlt": : :"memory") + /* used when interrupts are already enabled or to shutdown the processor */ +Index: linux-latency-tracing.q/include/asm-x86_64/unistd.h +=================================================================== +--- linux-latency-tracing.q.orig/include/asm-x86_64/unistd.h ++++ linux-latency-tracing.q/include/asm-x86_64/unistd.h +@@ -11,6 +11,8 @@ + * Note: holes are not allowed. + */ + ++#define NR_syscalls (__NR_syscall_max+1) ++ + /* at least 8 syscall per cacheline */ + #define __NR_read 0 + __SYSCALL(__NR_read, sys_read) Index: linux-latency-tracing.q/include/linux/interrupt.h =================================================================== --- linux-latency-tracing.q.orig/include/linux/interrupt.h @@ -1292,6 +1077,19 @@ +#endif + #endif +Index: linux-latency-tracing.q/include/linux/kernel.h +=================================================================== +--- linux-latency-tracing.q.orig/include/linux/kernel.h ++++ linux-latency-tracing.q/include/linux/kernel.h +@@ -132,6 +132,8 @@ asmlinkage int vprintk(const char *fmt, + __attribute__ ((format (printf, 1, 0))); + asmlinkage int printk(const char * fmt, ...) + __attribute__ ((format (printf, 1, 2))); ++extern void early_printk(const char *fmt, ...) ++ __attribute__ ((format (printf, 1, 2))); + #else + static inline int vprintk(const char *s, va_list args) + __attribute__ ((format (printf, 1, 0))); Index: linux-latency-tracing.q/include/linux/latency_hist.h =================================================================== --- /dev/null @@ -1380,7 +1178,7 @@ =================================================================== --- linux-latency-tracing.q.orig/include/linux/sched.h +++ linux-latency-tracing.q/include/linux/sched.h -@@ -39,6 +39,84 @@ +@@ -40,6 +40,84 @@ struct exec_domain; @@ -1419,7 +1217,7 @@ +#ifdef CONFIG_LATENCY_TRACE + extern int mcount_enabled, trace_enabled, trace_user_triggered, + trace_user_trigger_irq, trace_freerunning, trace_verbose, -+ trace_print_at_crash, trace_all_cpus; ++ trace_print_at_crash, trace_all_cpus, print_functions; + extern void notrace trace_special(unsigned long v1, unsigned long v2, unsigned long v3); + extern void notrace trace_special_pid(int pid, unsigned long v1, unsigned long v2); + extern void notrace trace_special_u64(unsigned long long v1, unsigned long v2); @@ -1465,9 +1263,9 @@ /* * cloning flags: */ -@@ -820,6 +898,13 @@ struct task_struct { - /* Protection of proc_dentry: nesting proc_lock, dcache_lock, write_lock_irq(&tasklist_lock); */ - spinlock_t proc_lock; +@@ -833,6 +911,13 @@ struct task_struct { + struct mutex_waiter *blocked_on; + #endif +#define MAX_PREEMPT_TRACE 16 + @@ -1479,7 +1277,7 @@ /* journalling filesystem info */ void *journal_info; -@@ -1349,6 +1434,7 @@ static inline unsigned int task_cpu(cons +@@ -1355,6 +1440,7 @@ static inline unsigned int task_cpu(cons static inline void set_task_cpu(struct task_struct *p, unsigned int cpu) { @@ -1491,25 +1289,25 @@ =================================================================== --- linux-latency-tracing.q.orig/kernel/Makefile +++ linux-latency-tracing.q/kernel/Makefile -@@ -9,6 +9,9 @@ obj-y = sched.o fork.o exec_domain.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 - +@@ -29,6 +29,9 @@ obj-$(CONFIG_STOP_MACHINE) += stop_machi + obj-$(CONFIG_AUDIT) += audit.o + obj-$(CONFIG_AUDITSYSCALL) += auditsc.o + obj-$(CONFIG_KPROBES) += kprobes.o +obj-$(CONFIG_DEBUG_PREEMPT) += latency.o +obj-$(CONFIG_LATENCY_TIMING) += latency.o +obj-$(CONFIG_LATENCY_HIST) += latency_hist.o - obj-$(CONFIG_FUTEX) += futex.o - obj-$(CONFIG_GENERIC_ISA_DMA) += dma.o - obj-$(CONFIG_SMP) += cpu.o spinlock.o + obj-$(CONFIG_SYSFS) += ksysfs.o + obj-$(CONFIG_DETECT_SOFTLOCKUP) += softlockup.o + obj-$(CONFIG_GENERIC_HARDIRQS) += irq/ Index: linux-latency-tracing.q/kernel/latency.c =================================================================== --- /dev/null +++ linux-latency-tracing.q/kernel/latency.c -@@ -0,0 +1,2390 @@ +@@ -0,0 +1,2465 @@ +/* + * kernel/latency.c + * -+ * Copyright (C) 2004, 2005 Ingo Molnar ++ * Copyright (C) 2004-2006 Ingo Molnar + * Copyright (C) 2004 William Lee Irwin III + */ + @@ -1535,6 +1333,7 @@ + +#ifndef CONFIG_PREEMPT_RT +# define DEFINE_RAW_SPINLOCK DEFINE_SPINLOCK ++# define RAW_SPIN_LOCK_UNLOCKED SPIN_LOCK_UNLOCKED +# define raw_spinlock_t spinlock_t +# define raw_irqs_disabled irqs_disabled +# define irqs_off irqs_disabled @@ -1563,11 +1362,7 @@ +} ____cacheline_aligned_in_smp; + +static __cacheline_aligned_in_smp struct sch_struct sch = -+#ifdef CONFIG_PREEMPT_RT + { trace_lock: RAW_SPIN_LOCK_UNLOCKED }; -+#else -+ { trace_lock: SPIN_LOCK_UNLOCKED }; -+#endif + +int wakeup_timing = 1; +#endif @@ -1579,9 +1374,9 @@ + * we clear it after bootup. + */ +#ifdef CONFIG_LATENCY_HIST -+cycles_t preempt_max_latency = (cycles_t)0UL; ++static cycles_t preempt_max_latency = (cycles_t)0UL; +#else -+cycles_t preempt_max_latency = (cycles_t)ULONG_MAX; ++static cycles_t preempt_max_latency = (cycles_t)ULONG_MAX; +#endif + +static cycles_t preempt_thresh; @@ -1772,6 +1567,7 @@ +int trace_print_at_crash = 0; +int trace_verbose = 0; +int trace_all_cpus = 0; ++int print_functions = 0; + +/* + * user-triggered via gettimeofday(0,1)/gettimeofday(0,0) @@ -1934,10 +1730,17 @@ + +static notrace void __print_worst_stack(void) +{ ++ unsigned long fill_ratio; + printk("----------------------------->\n"); -+ printk("| new stack-footprint maximum: %s/%d, %ld bytes (out of %ld bytes).\n", ++ printk("| new stack fill maximum: %s/%d, %ld bytes (out of %ld bytes).\n", + worst_stack_comm, worst_stack_pid, + MAX_STACK-worst_stack_left, (long)MAX_STACK); ++ fill_ratio = (MAX_STACK-worst_stack_left)*100/(long)MAX_STACK; ++ printk("| Stack fill ratio: %02ld%%", fill_ratio); ++ if (fill_ratio >= 90) ++ printk(" - BUG: that's quite high, please report this!\n"); ++ else ++ printk(" - that's still OK, no need to report this.\n"); + printk("------------|\n"); + + show_stackframe(); @@ -2002,10 +1805,76 @@ + print_worst_stack(); + tr->stack_check++; + } -+out: -+ atomic_dec(&tr->disabled); -+} ++out: ++ atomic_dec(&tr->disabled); ++} ++ ++#endif ++ ++#ifdef CONFIG_EARLY_PRINTK ++static void notrace early_printk_name(unsigned long eip) ++{ ++ char namebuf[KSYM_NAME_LEN+1]; ++ unsigned long size, offset; ++ const char *sym_name; ++ char *modname; ++ ++ sym_name = kallsyms_lookup(eip, &size, &offset, &modname, namebuf); ++ if (sym_name) ++ early_printk("%s <%08lx>", sym_name, eip); ++ else ++ early_printk("<%08lx>", eip); ++} ++ ++static DEFINE_RAW_SPINLOCK(early_print_lock); ++ ++static void notrace early_print_entry(struct trace_entry *entry) ++{ ++ int hardirq, softirq; ++ ++ spin_lock(&early_print_lock); ++ early_printk("%-5d ", entry->pid); ++ ++ early_printk("%d%c%c", ++ entry->cpu, ++ (entry->flags & TRACE_FLAG_IRQS_OFF) ? 'd' : ++ (entry->flags & TRACE_FLAG_IRQS_HARD_OFF) ? 'D' : '.', ++ (entry->flags & TRACE_FLAG_NEED_RESCHED) ? 'n' : '.'); ++ ++ hardirq = entry->flags & TRACE_FLAG_HARDIRQ; ++ softirq = entry->flags & TRACE_FLAG_SOFTIRQ; ++ if (hardirq && softirq) ++ early_printk("H"); ++ else { ++ if (hardirq) ++ early_printk("h"); ++ else { ++ if (softirq) ++ early_printk("s"); ++ else ++ early_printk("."); ++ } ++ } + ++ early_printk(":%d: ", entry->preempt_count); ++ ++ if (entry->type == TRACE_FN) { ++ early_printk_name(entry->u.fn.eip); ++ early_printk(" <= ("); ++ early_printk_name(entry->u.fn.parent_eip); ++ early_printk(")\n"); ++ } else { ++ /* special entries: */ ++ early_printk_name(entry->u.special.eip); ++ early_printk(": <%08lx> <%08lx> <%08lx>\n", ++ entry->u.special.v1, ++ entry->u.special.v2, ++ entry->u.special.v3); ++ } ++ spin_unlock(&early_print_lock); ++} ++#else ++# define early_print_entry(x) do { } while(0) +#endif + +static void notrace @@ -2022,7 +1891,7 @@ +#ifdef CONFIG_DEBUG_PREEMPT +// WARN_ON(!atomic_read(&tr->disabled)); +#endif -+ if (!tr->critical_start && !trace_user_triggered && !trace_all_cpus && !trace_print_at_crash) ++ if (!tr->critical_start && !trace_user_triggered && !trace_all_cpus && !trace_print_at_crash && !print_functions) + goto out; + /* + * Allocate the next index. Make sure an NMI (or interrupt) @@ -2035,7 +1904,8 @@ + idx_next = idx + 1; + timestamp = get_cycles(); + -+ if (unlikely(trace_freerunning && (idx_next >= MAX_TRACE))) ++ if (unlikely((trace_freerunning || print_functions) && ++ (idx_next >= MAX_TRACE))) + idx_next = 0; + if (unlikely(idx_next >= MAX_TRACE)) { + atomic_inc(&tr->overrun); @@ -2046,7 +1916,7 @@ + goto again; +#else +# ifdef CONFIG_SMP -+# error CMPXHG missing ++# error CMPXCHG missing +# else + /* No worry, we are protected by the atomic_incr(&tr->disabled) + * in __trace further down @@ -2074,6 +1944,8 @@ + case TRACE_FN: + entry->u.fn.eip = eip; + entry->u.fn.parent_eip = parent_eip; ++ if (unlikely(print_functions && !in_interrupt())) ++ early_print_entry(entry); + break; + case TRACE_SPECIAL: + case TRACE_SPECIAL_PID: @@ -2082,6 +1954,8 @@ + entry->u.special.v1 = v1; + entry->u.special.v2 = v2; + entry->u.special.v3 = v3; ++ if (unlikely(print_functions && !in_interrupt())) ++ early_print_entry(entry); + break; + case TRACE_SYSCALL: + entry->u.syscall.nr = eip; @@ -2125,7 +1999,7 @@ + * is waiting to become runnable: + */ +#ifdef CONFIG_WAKEUP_TIMING -+ if (wakeup_timing && !trace_all_cpus && !trace_print_at_crash) { ++ if (wakeup_timing && !trace_all_cpus && !trace_print_at_crash && !print_functions) { + if (!sch.tr || cpu != sch.cpu) + goto out; + tr = sch.tr; @@ -2159,14 +2033,14 @@ + ___trace(TRACE_SPECIAL, CALLER_ADDR0, 0, v1, v2, v3); +} + -+EXPORT_SYMBOL_GPL(trace_special); ++EXPORT_SYMBOL(trace_special); + +void notrace trace_special_pid(int pid, unsigned long v1, unsigned long v2) +{ + ___trace(TRACE_SPECIAL_PID, CALLER_ADDR0, 0, pid, v1, v2); +} + -+EXPORT_SYMBOL_GPL(trace_special_pid); ++EXPORT_SYMBOL(trace_special_pid); + +void notrace trace_special_u64(unsigned long long v1, unsigned long v2) +{ @@ -2174,7 +2048,7 @@ + (unsigned long) (v1 >> 32), (unsigned long) (v1 & 0xFFFFFFFF), v2); +} + -+EXPORT_SYMBOL_GPL(trace_special_u64); ++EXPORT_SYMBOL(trace_special_u64); + +/* + * Non-inlined function: @@ -2186,7 +2060,7 @@ + +extern void mcount(void); + -+EXPORT_SYMBOL_GPL(mcount); ++EXPORT_SYMBOL(mcount); + +void notrace __mcount(void) +{ @@ -2527,7 +2401,18 @@ + "rt", +#endif + 0, 0, -+ 0, 0); ++#ifdef CONFIG_PREEMPT_SOFTIRQS ++ softirq_preemption ++#else ++ 0 ++#endif ++ , ++#ifdef CONFIG_PREEMPT_HARDIRQS ++ hardirq_preemption ++#else ++ 0 ++#endif ++ ); +#ifdef CONFIG_SMP + seq_printf(m, " #P:%d)\n", num_online_cpus()); +#else @@ -2880,7 +2765,7 @@ + max_tr.cpu = tr->cpu; + save = max_tr.traces + tr->cpu; + -+ if ((wakeup_timing || trace_user_triggered || trace_print_at_crash) && ++ if ((wakeup_timing || trace_user_triggered || trace_print_at_crash || print_functions) && + trace_all_cpus) { + all_cpus = 1; + for_each_online_cpu(cpu) @@ -3077,7 +2962,7 @@ + atomic_dec(&tr->disabled); + } +} -+EXPORT_SYMBOL_GPL(touch_critical_timing); ++EXPORT_SYMBOL(touch_critical_timing); + +void notrace stop_critical_timing(void) +{ @@ -3085,7 +2970,7 @@ + + tr->critical_start = 0; +} -+EXPORT_SYMBOL_GPL(stop_critical_timing); ++EXPORT_SYMBOL(stop_critical_timing); + +static inline void notrace +__start_critical_timing(unsigned long eip, unsigned long parent_eip, int latency_type) @@ -3137,6 +3022,7 @@ + +#ifdef CONFIG_CRITICAL_IRQSOFF_TIMING + ++/* FIXME: do we have to save flags here? */ +void notrace trace_irqs_off_lowlevel(void) +{ + unsigned long flags; @@ -3157,7 +3043,7 @@ + __start_critical_timing(CALLER_ADDR0, CALLER_ADDR1, INTERRUPT_LATENCY); +} + -+EXPORT_SYMBOL_GPL(trace_irqs_off); ++EXPORT_SYMBOL(trace_irqs_off); + +void notrace trace_irqs_on(void) +{ @@ -3167,11 +3053,9 @@ + + if (!irqs_off_preempt_count() && raw_irqs_disabled_flags(flags)) + __stop_critical_timing(CALLER_ADDR0, CALLER_ADDR1); -+ -+ __raw_local_irq_restore(flags); +} + -+EXPORT_SYMBOL_GPL(trace_irqs_on); ++EXPORT_SYMBOL(trace_irqs_on); + +#endif + @@ -3192,7 +3076,7 @@ + return parent_eip; +} + -+void notrace add_preempt_count_ti(struct thread_info *ti, unsigned int val) ++void notrace add_preempt_count(unsigned int val) +{ + unsigned long eip = CALLER_ADDR0; + unsigned long parent_eip = get_parent_eip(); @@ -3201,17 +3085,17 @@ + /* + * Underflow? + */ -+ BUG_ON(((int)ti->preempt_count < 0)); ++ BUG_ON(((int)preempt_count() < 0)); + /* + * Spinlock count overflowing soon? + */ -+ BUG_ON((ti->preempt_count & PREEMPT_MASK) >= PREEMPT_MASK-10); ++ BUG_ON((preempt_count() & PREEMPT_MASK) >= PREEMPT_MASK-10); +#endif + -+ ti->preempt_count += val; ++ preempt_count() += val; +#ifdef CONFIG_PREEMPT_TRACE + if (val <= 10) { -+ unsigned int idx = ti->preempt_count & PREEMPT_MASK; ++ unsigned int idx = preempt_count() & PREEMPT_MASK; + if (idx < MAX_PREEMPT_TRACE) { + current->preempt_trace_eip[idx] = eip; + current->preempt_trace_parent_eip[idx] = parent_eip; @@ -3233,27 +3117,20 @@ +#endif + (void)eip, (void)parent_eip; +} -+EXPORT_SYMBOL_GPL(add_preempt_count_ti); -+ -+void notrace add_preempt_count(unsigned int val) -+{ -+ add_preempt_count_ti(current_thread_info(), val); -+} ++EXPORT_SYMBOL(add_preempt_count); + -+EXPORT_SYMBOL_GPL(add_preempt_count); -+ -+void notrace sub_preempt_count_ti(struct thread_info *ti, unsigned int val) ++void notrace sub_preempt_count(unsigned int val) +{ +#ifdef CONFIG_DEBUG_PREEMPT + /* + * Underflow? + */ -+ BUG_ON(unlikely(val > ti->preempt_count)); ++ BUG_ON(unlikely(val > preempt_count())); + + /* + * Is the spinlock portion underflowing? + */ -+ BUG_ON((val < PREEMPT_MASK) && !(ti->preempt_count & PREEMPT_MASK)); ++ BUG_ON((val < PREEMPT_MASK) && !(preempt_count() & PREEMPT_MASK)); +#endif + +#ifdef CONFIG_CRITICAL_PREEMPT_TIMING @@ -3265,21 +3142,14 @@ + + if (!raw_irqs_disabled_flags(flags)) +#endif -+ if (ti->preempt_count == val) ++ if (preempt_count() == val) + __stop_critical_timing(CALLER_ADDR0, CALLER_ADDR1); + } +#endif -+ ti->preempt_count -= val; -+} -+ -+EXPORT_SYMBOL_GPL(sub_preempt_count_ti); -+ -+void notrace sub_preempt_count(unsigned int val) -+{ -+ sub_preempt_count_ti(current_thread_info(), val); ++ preempt_count() -= val; +} + -+EXPORT_SYMBOL_GPL(sub_preempt_count); ++EXPORT_SYMBOL(sub_preempt_count); + +void notrace mask_preempt_count(unsigned int mask) +{ @@ -3303,7 +3173,7 @@ +#endif + (void) eip, (void) parent_eip; +} -+EXPORT_SYMBOL_GPL(mask_preempt_count); ++EXPORT_SYMBOL(mask_preempt_count); + +void notrace unmask_preempt_count(unsigned int mask) +{ @@ -3322,7 +3192,7 @@ +#endif + preempt_count() &= ~mask; +} -+EXPORT_SYMBOL_GPL(unmask_preempt_count); ++EXPORT_SYMBOL(unmask_preempt_count); + + +#endif @@ -3430,7 +3300,7 @@ + return; + + spin_lock(&sch.trace_lock); -+ if (sch.task && (sch.task->prio >= p->prio)) ++ if (sch.task && (sch.task->prio <= p->prio)) + goto out_unlock; + + /* @@ -3531,7 +3401,7 @@ + unsigned long flags; + int cpu; + -+ if (!trace_user_triggered || trace_print_at_crash) ++ if (!trace_user_triggered || trace_print_at_crash || print_functions) + return -EINVAL; + + /* @@ -3583,8 +3453,7 @@ + struct cpu_trace *tr; + cycles_t delta; + -+ -+ if (!trace_user_triggered || trace_print_at_crash) ++ if (!trace_user_triggered || trace_print_at_crash || print_functions) + return -EINVAL; + + preempt_disable(); @@ -3663,7 +3532,7 @@ + return 0; +} + -+EXPORT_SYMBOL_GPL(user_trace_stop); ++EXPORT_SYMBOL(user_trace_stop); + +void stop_trace(void) +{ @@ -3671,14 +3540,15 @@ + trace_enabled = -1; +} + ++EXPORT_SYMBOL(stop_trace); ++ +static void print_entry(struct trace_entry *entry, struct trace_entry *entry0, + struct trace_entry *next_entry) +{ -+ unsigned long abs_usecs, rel_usecs; ++ unsigned long abs_usecs; + int hardirq, softirq; + + abs_usecs = cycles_to_usecs(entry->timestamp - entry0->timestamp); -+ rel_usecs = cycles_to_usecs(next_entry->timestamp - entry->timestamp); + + printk("%-5d ", entry->pid); + @@ -3820,6 +3690,9 @@ +#if defined(CONFIG_PREEMPT_TRACE) || defined(CONFIG_LATENCY_TRACE) +void print_traces(struct task_struct *task) +{ ++ if (!task) ++ task = current; ++ +#ifdef CONFIG_PREEMPT_TRACE + print_preempt_trace(task); +#endif @@ -4172,9 +4045,9 @@ =================================================================== --- linux-latency-tracing.q.orig/kernel/sched.c +++ linux-latency-tracing.q/kernel/sched.c -@@ -715,11 +715,18 @@ static inline void dec_nr_running(task_t +@@ -661,11 +661,18 @@ static int effective_prio(task_t *p) + return prio; } - #endif +static inline void trace_start_sched_wakeup(task_t *p, runqueue_t *rq) +{ @@ -4189,17 +4062,17 @@ { + trace_special_pid(p->pid, p->prio, rq->nr_running); enqueue_task(p, rq->active); - inc_nr_running(p, rq); + rq->nr_running++; } -@@ -731,6 +738,7 @@ static inline void __activate_idle_task( +@@ -677,6 +684,7 @@ static inline void __activate_idle_task( { enqueue_task_head(p, rq->active); - inc_nr_running(p, rq); + rq->nr_running++; + WARN_ON(rt_task(p)); } static int recalc_task_prio(task_t *p, unsigned long long now) -@@ -1381,8 +1389,10 @@ out_activate: +@@ -1297,8 +1305,10 @@ out_activate: * to be considered on this CPU.) */ if (!sync || cpu != this_cpu) { @@ -4211,7 +4084,7 @@ } success = 1; -@@ -1396,15 +1406,19 @@ out: +@@ -1312,15 +1322,19 @@ out: int fastcall wake_up_process(task_t *p) { @@ -4233,15 +4106,15 @@ } /* -@@ -1512,6 +1526,7 @@ void fastcall wake_up_new_task(task_t *p - inc_nr_running(p, rq); +@@ -1428,6 +1442,7 @@ void fastcall wake_up_new_task(task_t *p + rq->nr_running++; } set_need_resched(); + trace_start_sched_wakeup(p, rq); } else /* Run child last */ __activate_task(p, rq); -@@ -1633,6 +1648,7 @@ static inline void finish_task_switch(ru +@@ -1549,6 +1564,7 @@ static inline void finish_task_switch(ru prev_task_flags = prev->flags; finish_arch_switch(prev); finish_lock_switch(rq, prev); @@ -4249,7 +4122,7 @@ if (mm) mmdrop(mm); if (unlikely(prev_task_flags & PF_DEAD)) -@@ -1679,6 +1695,8 @@ task_t * context_switch(runqueue_t *rq, +@@ -1595,6 +1611,8 @@ task_t * context_switch(runqueue_t *rq, rq->prev_mm = oldmm; } @@ -4258,13 +4131,7 @@ /* Here we just switch the register state and the stack. */ switch_to(prev, next, prev); -@@ -2795,13 +2813,13 @@ static inline unsigned long smt_slice(ta - return p->time_slice * (100 - sd->per_cpu_gain) / 100; - } - --static inline int dependent_sleeper(int this_cpu, runqueue_t *this_rq) -+static int dependent_sleeper(int this_cpu, runqueue_t *this_rq) - { +@@ -2716,8 +2734,8 @@ static int dependent_sleeper(int this_cp struct sched_domain *tmp, *sd = NULL; cpumask_t sibling_map; prio_array_t *array; @@ -4275,7 +4142,7 @@ for_each_domain(this_cpu, tmp) if (tmp->flags & SD_SHARE_CPUPOWER) -@@ -2863,6 +2881,12 @@ static inline int dependent_sleeper(int +@@ -2779,6 +2797,12 @@ static int dependent_sleeper(int this_cp !TASK_PREEMPTS_CURR(p, smt_rq) && smt_slice(smt_curr, sd) > task_timeslice(p)) ret = 1; @@ -4288,7 +4155,7 @@ check_smt_task: if ((!smt_curr->mm && smt_curr != smt_rq->idle) || -@@ -2893,6 +2917,9 @@ check_smt_task: +@@ -2809,6 +2833,9 @@ check_smt_task: out_unlock: for_each_cpu_mask(i, sibling_map) spin_unlock(&cpu_rq(i)->lock); @@ -4298,12 +4165,12 @@ return ret; } #else -@@ -2906,35 +2933,44 @@ static inline int dependent_sleeper(int +@@ -2822,35 +2849,44 @@ static inline int dependent_sleeper(int } #endif -#if defined(CONFIG_PREEMPT) && defined(CONFIG_DEBUG_PREEMPT) -+#if defined(CONFIG_LATENCY_TRACE) && defined(CONFIG_DEBUG_MUTEXES) ++#if defined(CONFIG_LATENCY_TRACE) && defined(CONFIG_DEBUG_RT_MUTEXES) -void fastcall add_preempt_count(int val) +static void trace_array(prio_array_t *array) @@ -4366,15 +4233,15 @@ #endif -@@ -2958,6 +2994,7 @@ asmlinkage void __sched schedule(void) - * Otherwise, whine if we are scheduling when we should not be. +@@ -2875,6 +2911,7 @@ asmlinkage void __sched schedule(void) */ if (likely(!current->exit_state)) { -+ stop_trace(); if (unlikely(in_atomic())) { ++ stop_trace(); printk(KERN_ERR "scheduling while atomic: " "%s/0x%08x/%d\n", -@@ -3097,6 +3134,8 @@ switch_tasks: + current->comm, preempt_count(), current->pid); +@@ -3013,6 +3050,8 @@ switch_tasks: prev->sleep_avg = 0; prev->timestamp = prev->last_ran = now; @@ -4383,7 +4250,7 @@ sched_info_switch(prev, next); if (likely(prev != next)) { next->timestamp = now; -@@ -3107,14 +3146,17 @@ switch_tasks: +@@ -3023,14 +3062,17 @@ switch_tasks: prepare_task_switch(rq, next); prev = context_switch(rq, prev, next); barrier(); @@ -4402,7 +4269,7 @@ prev = current; if (unlikely(reacquire_kernel_lock(prev) < 0)) -@@ -5660,6 +5702,7 @@ void __might_sleep(char *file, int line) +@@ -6075,6 +6117,7 @@ void __might_sleep(char *file, int line) if (time_before(jiffies, prev_jiffy + HZ) && prev_jiffy) return; prev_jiffy = jiffies; @@ -4414,15 +4281,15 @@ =================================================================== --- linux-latency-tracing.q.orig/kernel/sysctl.c +++ linux-latency-tracing.q/kernel/sysctl.c -@@ -42,6 +42,7 @@ +@@ -44,6 +44,7 @@ #include #include #include +#include + #include + #include - #include - #include -@@ -278,6 +279,82 @@ static ctl_table kern_table[] = { +@@ -283,6 +284,82 @@ static ctl_table kern_table[] = { .mode = 0644, .proc_handler = &proc_dointvec, }, @@ -4509,7 +4376,7 @@ =================================================================== --- linux-latency-tracing.q.orig/kernel/time.c +++ linux-latency-tracing.q/kernel/time.c -@@ -97,8 +97,23 @@ asmlinkage long sys_stime(time_t __user +@@ -98,8 +98,23 @@ asmlinkage long sys_stime(time_t __user #endif /* __ARCH_WANT_SYS_TIME */ @@ -4533,7 +4400,7 @@ if (likely(tv != NULL)) { struct timeval ktv; do_gettimeofday(&ktv); -@@ -184,6 +199,10 @@ asmlinkage long sys_settimeofday(struct +@@ -188,6 +203,10 @@ asmlinkage long sys_settimeofday(struct struct timespec new_ts; struct timezone new_tz; @@ -4548,13 +4415,14 @@ =================================================================== --- linux-latency-tracing.q.orig/lib/Kconfig.debug +++ linux-latency-tracing.q/lib/Kconfig.debug -@@ -111,6 +111,146 @@ config DEBUG_SPINLOCK_SLEEP +@@ -119,6 +119,149 @@ config DEBUG_SPINLOCK_SLEEP If you say Y here, various routines which may sleep will become very noisy if they are called with a spinlock held. +config WAKEUP_TIMING + bool "Wakeup latency timing" + default y ++ depends on !X86_32 || X86_GENERIC || X86_TSC + help + This option measures the time spent from a highprio thread being + woken up to it getting scheduled on a CPU, with microsecond @@ -4583,12 +4451,13 @@ +config PREEMPT_TRACE + bool + default y ++ depends on !X86_32 || X86_GENERIC || X86_TSC + depends on DEBUG_PREEMPT + +config CRITICAL_PREEMPT_TIMING + bool "Non-preemptible critical section latency timing" + default n -+ depends on PREEMPT ++ depends on PREEMPT && (!X86_32 || X86_GENERIC || X86_TSC) + help + This option measures the time spent in preempt-off critical + sections, with microsecond accuracy. @@ -4622,6 +4491,7 @@ +config CRITICAL_IRQSOFF_TIMING + bool "Interrupts-off critical section latency timing" + default n ++ depends on !X86_32 || X86_GENERIC || X86_TSC + help + This option measures the time spent in irqs-off critical + sections, with microsecond accuracy. @@ -4675,7 +4545,7 @@ +config LATENCY_TRACE + bool "Latency tracing" + default n -+ depends on LATENCY_TIMING ++ depends on LATENCY_TIMING && (!X86_32 || X86_GENERIC || X86_TSC) + help + This option enables a kernel tracing mechanism that will track + precise function-call granularity kernel execution during @@ -4695,7 +4565,7 @@ config DEBUG_KOBJECT bool "kobject debugging" depends on DEBUG_KERNEL -@@ -176,9 +316,9 @@ config DEBUG_VM +@@ -185,9 +328,9 @@ config DEBUG_VM If unsure, say N. @@ -4707,9 +4577,9 @@ default y if DEBUG_INFO && UML help If you say Y here the resulting kernel image will be slightly larger -@@ -186,6 +326,11 @@ config FRAME_POINTER - some architectures or if you use external debuggers. - If you don't debug the kernel, you can say N. +@@ -209,6 +352,11 @@ config FORCED_INLINING + become the default in the future, until then this option is there to + test gcc for this. +config FRAME_POINTER + bool @@ -4719,72 +4589,220 @@ config RCU_TORTURE_TEST tristate "torture tests for RCU" depends on DEBUG_KERNEL - init/main.c | 9 +++++++++ - 1 files changed, 9 insertions(+) - -Index: linux-latency-tracing.q/init/main.c -=================================================================== ---- linux-latency-tracing.q.orig/init/main.c -+++ linux-latency-tracing.q/init/main.c -@@ -108,6 +108,8 @@ extern void tc_init(void); - enum system_states system_state; - EXPORT_SYMBOL(system_state); +Index: linux-latency-tracing.q/lib/inflate.c +=================================================================== +--- linux-latency-tracing.q.orig/lib/inflate.c ++++ linux-latency-tracing.q/lib/inflate.c +@@ -141,6 +141,25 @@ struct huft { + } v; + }; -+extern cycles_t preempt_max_latency; ++/* ++ * turn off the inflate_lock for the bootloader code, it is ++ * single-threaded and has no need for (nor access to) the ++ * kernel's locking primitives: ++ */ ++#ifdef ZLIB_INFLATE_NO_INFLATE_LOCK ++# undef DEFINE_SPINLOCK ++# undef spin_lock ++# undef spin_unlock ++# define DEFINE_SPINLOCK(x) int x ++# define spin_lock(x) (void)(x) ++# define spin_unlock(x) (void)(x) ++#endif + - /* - * Boot command-line arguments ++/* ++ * lock protecting static variables of huft_build() and other inflate ++ * functions, to reduce their insane stack footprint. ++ */ ++static DEFINE_SPINLOCK(inflate_lock); + + /* Function prototypes */ + STATIC int INIT huft_build OF((unsigned *, unsigned, unsigned, +@@ -304,7 +323,7 @@ STATIC int INIT huft_build( + register struct huft *q; /* points to current table */ + struct huft r; /* table entry for structure assignment */ + struct huft *u[BMAX]; /* table stack */ +- unsigned v[N_MAX]; /* values in order of bit length */ ++ static unsigned v[N_MAX]; /* values in order of bit length */ + register int w; /* bits before this table == (l * h) */ + unsigned x[BMAX+1]; /* bit offsets, then code stack */ + unsigned *xp; /* pointer into x */ +@@ -705,7 +724,7 @@ STATIC int noinline INIT inflate_fixed(v + struct huft *td; /* distance code table */ + int bl; /* lookup bits for tl */ + int bd; /* lookup bits for td */ +- unsigned l[288]; /* length list for huft_build */ ++ static unsigned l[288]; /* length list for huft_build */ + + DEBG(""); + + /* bad block type */ +- return 2; ++ return ret; + + underrun: + return 4; /* Input underrun */ +Index: linux-latency-tracing.q/lib/zlib_inflate/inftrees.c +=================================================================== +--- linux-latency-tracing.q.orig/lib/zlib_inflate/inftrees.c ++++ linux-latency-tracing.q/lib/zlib_inflate/inftrees.c +@@ -4,11 +4,19 @@ */ -@@ -544,6 +546,13 @@ asmlinkage void __init start_kernel(void - acpi_early_init(); /* before LAPIC and SMP init */ + #include ++#include + #include "inftrees.h" + #include "infutil.h" -+#ifdef CONFIG_LATENCY_TIMING -+ /* -+ * Start tracing now - the bootup traces arent too interesting: -+ */ -+ preempt_max_latency = 1000; -+#endif + static const char inflate_copyright[] __attribute_used__ = + " inflate 1.1.3 Copyright 1995-1998 Mark Adler "; + - /* Do the rest non-__init'ed, we're now alive */ - rest_init(); - } - kernel/latency.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -Index: linux-latency-tracing.q/kernel/latency.c -=================================================================== ---- linux-latency-tracing.q.orig/kernel/latency.c -+++ linux-latency-tracing.q/kernel/latency.c -@@ -316,8 +316,8 @@ static void notrace printk_name(unsigned - static unsigned long *worst_stack_bp; - #endif - static DEFINE_RAW_SPINLOCK(worst_stack_lock); --unsigned long worst_stack_left = THREAD_SIZE; --static unsigned long worst_stack_printed = THREAD_SIZE; -+unsigned long worst_stack_left = THREAD_SIZE/2; -+static unsigned long worst_stack_printed = THREAD_SIZE/2; - static char worst_stack_comm[TASK_COMM_LEN+1]; - static int worst_stack_pid; - static unsigned long worst_stack_sp; ---- linux-2.6.14/kernel/latency.c~ 2005-12-29 21:03:11.000000000 -0500 -+++ linux-2.6.14/kernel/latency.c 2005-12-29 21:03:51.000000000 -0500 -@@ -24,6 +24,8 @@ - #include - #include - #include -+#include -+#include ++/* ++ * lock protecting static variables of huft_build() and other inflate ++ * functions, to reduce their insane stack footprint. ++ */ ++static DEFINE_SPINLOCK(inflate_lock); ++ + /* + If you use the zlib library in a product, an acknowledgment is welcome + in the documentation of your product. If for some reason you cannot +@@ -107,7 +115,7 @@ static int huft_build( + { + + uInt a; /* counter for codes of length k */ +- uInt c[BMAX+1]; /* bit length count table */ ++ static uInt c[BMAX+1]; /* bit length count table */ + uInt f; /* i repeats in table every f entries */ + int g; /* maximum code length */ + int h; /* table level */ +@@ -118,10 +126,10 @@ static int huft_build( + uInt mask; /* (1 << w) - 1, to avoid cc -O bug on HP */ + register uInt *p; /* pointer into c[], b[], or v[] */ + inflate_huft *q; /* points to current table */ +- struct inflate_huft_s r; /* table entry for structure assignment */ +- inflate_huft *u[BMAX]; /* table stack */ ++ static struct inflate_huft_s r; /* table entry for structure assignment */ ++ static inflate_huft *u[BMAX]; /* table stack */ + register int w; /* bits before this table == (l * h) */ +- uInt x[BMAX+1]; /* bit offsets, then code stack */ ++ static uInt x[BMAX+1]; /* bit offsets, then code stack */ + uInt *xp; /* pointer into x */ + int y; /* number of dummy codes added */ + uInt z; /* number of entries in current table */ +@@ -300,9 +308,13 @@ int zlib_inflate_trees_bits( + int r; + uInt hn = 0; /* hufts used in space */ + uInt *v; /* work area for huft_build */ +- ++ + v = WS(z)->tree_work_area_1; ++ ++ spin_lock(&inflate_lock); + r = huft_build(c, 19, 19, NULL, NULL, tb, bb, hp, &hn, v); ++ spin_unlock(&inflate_lock); ++ + if (r == Z_DATA_ERROR) + z->msg = (char*)"oversubscribed dynamic bit lengths tree"; + else if (r == Z_BUF_ERROR || *bb == 0) +@@ -333,7 +345,10 @@ int zlib_inflate_trees_dynamic( + v = WS(z)->tree_work_area_2; + + /* build literal/length tree */ ++ spin_lock(&inflate_lock); + r = huft_build(c, nl, 257, cplens, cplext, tl, bl, hp, &hn, v); ++ spin_unlock(&inflate_lock); ++ + if (r != Z_OK || *bl == 0) + { + if (r == Z_DATA_ERROR) +@@ -347,7 +362,10 @@ int zlib_inflate_trees_dynamic( + } + + /* build distance tree */ ++ spin_lock(&inflate_lock); + r = huft_build(c + nl, nd, 0, cpdist, cpdext, td, bd, hp, &hn, v); ++ spin_unlock(&inflate_lock); ++ + if (r != Z_OK || (*bd == 0 && nl > 257)) + { + if (r == Z_DATA_ERROR) +@@ -383,9 +401,11 @@ int zlib_inflate_trees_fixed( + z_streamp z /* for memory allocation */ + ) + { +- int i; /* temporary variable */ +- unsigned l[288]; /* length list for huft_build */ +- uInt *v; /* work area for huft_build */ ++ int i; /* temporary variable */ ++ static unsigned l[288]; /* length list for huft_build */ ++ uInt *v; /* work area for huft_build */ ++ ++ spin_lock(&inflate_lock); + + /* set up literal table */ + for (i = 0; i < 144; i++) +@@ -398,15 +418,20 @@ int zlib_inflate_trees_fixed( + l[i] = 8; + *bl = 9; + v = WS(z)->tree_work_area_1; +- if ((i = huft_build(l, 288, 257, cplens, cplext, tl, bl, hp, &i, v)) != 0) ++ if ((i = huft_build(l, 288, 257, cplens, cplext, tl, bl, hp, &i, v)) != 0) { ++ spin_unlock(&inflate_lock); + return i; ++ } - #ifndef CONFIG_PREEMPT_RT - # define DEFINE_RAW_SPINLOCK DEFINE_SPINLOCK ---- linux-2.6.14/include/asm-x86_64/unistd.h~ 2005-12-29 21:12:32.000000000 -0500 -+++ linux-2.6.14/include/asm-x86_64/unistd.h 2005-12-29 21:13:05.000000000 -0500 -@@ -581,6 +581,7 @@ __SYSCALL(__NR_inotify_add_watch, sys_in - __SYSCALL(__NR_inotify_rm_watch, sys_inotify_rm_watch) - - #define __NR_syscall_max __NR_inotify_rm_watch -+#define NR_syscalls 256 - #ifndef __NO_STUBS + /* set up distance table */ + for (i = 0; i < 30; i++) /* make an incomplete code set */ + l[i] = 5; + *bd = 5; +- if ((i = huft_build(l, 30, 0, cpdist, cpdext, td, bd, hp, &i, v)) > 1) ++ if ((i = huft_build(l, 30, 0, cpdist, cpdext, td, bd, hp, &i, v)) > 1) { ++ spin_unlock(&inflate_lock); + return i; ++ } - /* user-visible error numbers are in the range -1 - -4095 */ ++ spin_unlock(&inflate_lock); + return Z_OK; + } From fedora-cvs-commits at redhat.com Mon Mar 20 22:24:35 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 20 Mar 2006 17:24:35 -0500 Subject: rpms/kernel/devel patch-2.6.16-git1.bz2.sign, NONE, 1.1 .cvsignore, 1.387, 1.388 sources, 1.328, 1.329 Message-ID: <200603202224.k2KMOZwK000623@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv609 Modified Files: .cvsignore sources Added Files: patch-2.6.16-git1.bz2.sign Log Message: whoops, forgot to upload. --- NEW FILE patch-2.6.16-git1.bz2.sign --- -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.2.2 (GNU/Linux) Comment: See http://www.kernel.org/signature.html for info iD8DBQBEHvw1yGugalF9Dw4RArkjAJwIh3bz/hHtQtFRtZIuQqJJ+wlomwCghN4B DzrVVPq1zTNGZJo38v1kQkk= =1sGv -----END PGP SIGNATURE----- Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v retrieving revision 1.387 retrieving revision 1.388 diff -u -r1.387 -r1.388 --- .cvsignore 20 Mar 2006 06:53:48 -0000 1.387 +++ .cvsignore 20 Mar 2006 22:24:33 -0000 1.388 @@ -3,3 +3,4 @@ kernel-2.6.16 xen-20060301.tar.bz2 linux-2.6.16.tar.bz2 +patch-2.6.16-git1.bz2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/sources,v retrieving revision 1.328 retrieving revision 1.329 diff -u -r1.328 -r1.329 --- sources 20 Mar 2006 06:53:48 -0000 1.328 +++ sources 20 Mar 2006 22:24:33 -0000 1.329 @@ -1,2 +1,3 @@ 9a91b2719949ff0856b40bc467fd47be linux-2.6.16.tar.bz2 cdfde609af8adcf58d7ff626599b2d90 xen-20060301.tar.bz2 +81203bd932c96ebdbaba3ada9f3685e2 patch-2.6.16-git1.bz2 From fedora-cvs-commits at redhat.com Mon Mar 20 22:36:09 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 20 Mar 2006 17:36:09 -0500 Subject: rpms/kernel/devel kernel-2.6.spec, 1.2071, 1.2072 linux-2.6-execshield.patch, 1.11, 1.12 linux-2.6-execshield-fixes.patch, 1.6, NONE linux-2.6-execshield-vdso.patch, 1.3, NONE Message-ID: <200603202236.k2KMa9N8000701@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv670 Modified Files: kernel-2.6.spec linux-2.6-execshield.patch Removed Files: linux-2.6-execshield-fixes.patch linux-2.6-execshield-vdso.patch Log Message: - Update exec-shield to Ingo's latest. (Incorporates John Reiser's "map the vDSO intelligently" patch which increases the efficiency of prelinking - #162797). Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.2071 retrieving revision 1.2072 diff -u -r1.2071 -r1.2072 --- kernel-2.6.spec 20 Mar 2006 22:24:02 -0000 1.2071 +++ kernel-2.6.spec 20 Mar 2006 22:36:06 -0000 1.2072 @@ -274,10 +274,8 @@ # Exec-shield. Patch810: linux-2.6-execshield.patch Patch811: linux-2.6-execshield-xen.patch -Patch812: linux-2.6-execshield-vdso.patch -Patch813: linux-2.6-xen-vdso-note.patch -Patch814: linux-2.6-execshield-fixes.patch -Patch815: linux-2.6-vdso-xen.patch +Patch812: linux-2.6-xen-vdso-note.patch +Patch813: linux-2.6-vdso-xen.patch # Module signing infrastructure. Patch900: linux-2.6-modsign-core.patch @@ -841,12 +839,9 @@ %if %{includexen} %patch811 -p1 %patch812 -p1 -%patch813 -p1 -#%patch815 -p1 +#%patch813 -p1 %endif -# Final small execshield fixes. -%patch814 -p1 # # GPG signed kernel modules @@ -1653,6 +1648,9 @@ - 2.6.16 & 2.6.16-git1 - Tux 2.6.16-A0 (Just rediffing) - Update Ingo's latency tracer patch. +- Update exec-shield to Ingo's latest. + (Incorporates John Reiser's "map the vDSO intelligently" patch + which increases the efficiency of prelinking - #162797). * Sun Mar 19 2006 Dave Jones - 2.6.16rc6-git12 linux-2.6-execshield.patch: arch/i386/kernel/asm-offsets.c | 1 arch/i386/kernel/cpu/common.c | 7 + 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 | 81 +++++++++++++++ arch/i386/kernel/traps.c | 93 +++++++++++++++++ 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/powerpc/kernel/vdso.c | 3 arch/x86_64/ia32/ia32_binfmt.c | 6 - arch/x86_64/ia32/syscall32.c | 4 arch/x86_64/kernel/process.c | 6 - arch/x86_64/kernel/setup64.c | 23 ---- arch/x86_64/mm/fault.c | 2 arch/x86_64/mm/mmap.c | 99 ++++++++++++++---- drivers/char/random.c | 7 + fs/binfmt_elf.c | 151 ++++++++++++++++++++++------ fs/proc/array.c | 8 + fs/proc/base.c | 8 - fs/proc/task_mmu.c | 34 +++++- include/asm-i386/a.out.h | 2 include/asm-i386/desc.h | 14 ++ include/asm-i386/elf.h | 50 ++++++--- include/asm-i386/mmu.h | 6 + include/asm-i386/page.h | 5 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-powerpc/pgalloc.h | 5 include/asm-ppc/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/pgtable.h | 2 include/linux/mm.h | 16 ++- include/linux/resource.h | 5 include/linux/sched.h | 9 + include/linux/sysctl.h | 3 kernel/signal.c | 38 +++++++ kernel/sysctl.c | 57 ++++++++++ mm/fremap.c | 16 +-- mm/mmap.c | 183 +++++++++++++++++++++++++++++++++-- mm/mprotect.c | 5 mm/mremap.c | 4 51 files changed, 929 insertions(+), 160 deletions(-) Index: linux-2.6-execshield.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-execshield.patch,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- linux-2.6-execshield.patch 6 Mar 2006 16:31:47 -0000 1.11 +++ linux-2.6-execshield.patch 20 Mar 2006 22:36:06 -0000 1.12 @@ -1,54 +1,3 @@ - arch/i386/kernel/asm-offsets.c | 1 - arch/i386/kernel/cpu/common.c | 7 + - 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 | 56 ++++++++++++++- - arch/i386/kernel/traps.c | 93 ++++++++++++++++++++++++- - 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 | 4 - - arch/x86_64/kernel/process.c | 6 - - arch/x86_64/kernel/setup64.c | 23 ------ - arch/x86_64/mm/Makefile | 2 - arch/x86_64/mm/fault.c | 2 - arch/x86_64/mm/mmap.c | 95 +++++++++++++++++++++++++ - drivers/char/random.c | 7 + - fs/binfmt_elf.c | 130 ++++++++++++++++++++++++++++------- - 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-powerpc/pgalloc.h | 5 + - include/asm-ppc/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/pgtable.h | 2 - include/asm-x86_64/processor.h | 5 + - include/linux/mm.h | 11 ++ - 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 | 16 ++-- - mm/mmap.c | 105 ++++++++++++++++++++++++++-- - mm/mprotect.c | 5 + - mm/mremap.c | 4 - - 49 files changed, 784 insertions(+), 124 deletions(-) - Index: linux/arch/i386/kernel/asm-offsets.c =================================================================== --- linux.orig/arch/i386/kernel/asm-offsets.c @@ -65,7 +14,7 @@ =================================================================== --- linux.orig/arch/i386/kernel/cpu/common.c +++ linux/arch/i386/kernel/cpu/common.c -@@ -392,6 +392,13 @@ void __devinit identify_cpu(struct cpuin +@@ -408,6 +408,13 @@ void __devinit identify_cpu(struct cpuin if (disable_pse) clear_bit(X86_FEATURE_PSE, c->x86_capability); @@ -102,7 +51,7 @@ =================================================================== --- linux.orig/arch/i386/kernel/process.c +++ linux/arch/i386/kernel/process.c -@@ -652,6 +652,8 @@ struct task_struct fastcall * __switch_t +@@ -638,6 +638,8 @@ struct task_struct fastcall * __switch_t /* never put a printk in __switch_to... printk() calls wake_up*() indirectly */ __unlazy_fpu(prev_p); @@ -111,7 +60,7 @@ /* * Reload esp0. -@@ -925,3 +927,60 @@ unsigned long arch_align_stack(unsigned +@@ -911,3 +913,60 @@ unsigned long arch_align_stack(unsigned sp -= get_random_int() % 8192; return sp & ~0xf; } @@ -176,7 +125,7 @@ =================================================================== --- linux.orig/arch/i386/kernel/signal.c +++ linux/arch/i386/kernel/signal.c -@@ -384,7 +384,7 @@ static int setup_frame(int sig, struct k +@@ -350,7 +350,7 @@ static int setup_frame(int sig, struct k goto give_sigsegv; } @@ -185,7 +134,7 @@ if (ka->sa.sa_flags & SA_RESTORER) restorer = ka->sa.sa_restorer; -@@ -480,7 +480,7 @@ static int setup_rt_frame(int sig, struc +@@ -446,7 +446,7 @@ static int setup_rt_frame(int sig, struc goto give_sigsegv; /* Set up to return from userspace. */ @@ -219,97 +168,115 @@ =================================================================== --- linux.orig/arch/i386/kernel/sysenter.c +++ linux/arch/i386/kernel/sysenter.c -@@ -13,6 +13,7 @@ +@@ -13,7 +13,9 @@ #include #include #include +#include ++#include #include #include -@@ -36,8 +37,8 @@ void enable_sep_cpu(void) - wrmsr(MSR_IA32_SYSENTER_CS, __KERNEL_CS, 0); - wrmsr(MSR_IA32_SYSENTER_ESP, tss->esp1, 0); - wrmsr(MSR_IA32_SYSENTER_EIP, (unsigned long) sysenter_entry, 0); -- put_cpu(); -+ put_cpu(); - #endif - } - - /* -@@ -46,11 +47,20 @@ void enable_sep_cpu(void) + #include +@@ -46,11 +48,13 @@ void enable_sep_cpu(void) extern const char vsyscall_int80_start, vsyscall_int80_end; extern const char vsyscall_sysenter_start, vsyscall_sysenter_end; -+struct page *sysenter_page; ++static struct page *sysenter_pages[2]; + 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); ++ sysenter_pages[0] = virt_to_page(page); if (!boot_cpu_has(X86_FEATURE_SEP)) { memcpy(page, -@@ -65,3 +75,45 @@ int __init sysenter_setup(void) +@@ -65,3 +69,78 @@ int __init sysenter_setup(void) return 0; } + +extern void SYSENTER_RETURN_OFFSET; + -+unsigned int vdso_enabled = 0; ++unsigned int vdso_enabled = 1; + -+void map_vsyscall(void) ++/* ++ * This is called from binfmt_elf, we create the special vma for the ++ * vDSO and insert it into the mm struct tree. ++ */ ++int arch_setup_additional_pages(struct linux_binprm *bprm, ++ int executable_stack, unsigned long start_code, ++ unsigned long interp_map_address) +{ + struct thread_info *ti = current_thread_info(); -+ struct vm_area_struct *vma; -+ unsigned long addr; ++ unsigned long addr = 0, len; ++ unsigned flags = MAP_PRIVATE; ++ int err; + -+ if (unlikely(!vdso_enabled)) { + current->mm->context.vdso = NULL; -+ return; -+ } ++ if (unlikely(!vdso_enabled) || unlikely(!sysenter_pages[0])) ++ return 0; + + /* + * 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); ++ len = PAGE_SIZE > ELF_EXEC_PAGESIZE ? PAGE_SIZE : ELF_EXEC_PAGESIZE; ++ if (0==exec_shield) { /* off; %cs limit off */ ++ addr = STACK_TOP; /* minimal interference with anybody */ ++ flags = MAP_PRIVATE | MAP_FIXED; ++ } ++ else if ((3<<2) & exec_shield) { /* vdso just below .text */ ++ addr = (((2<<2) & exec_shield) && interp_map_address) ? ++ interp_map_address : start_code; ++ /* 1MB for vm86; 64K for vm86 himem */ ++ if ((0x110000 + len) <= addr) { ++ addr = (PAGE_MASK & addr) - len; ++ } ++ else { /* start_code is too low */ ++ addr = 0; + } + } ++ addr = get_unmapped_area_prot(NULL, addr, len, 0, ++ flags, PROT_READ | PROT_EXEC); ++ if (unlikely(addr & ~PAGE_MASK)) { ++ up_write(¤t->mm->mmap_sem); ++ return addr; ++ } ++ err = install_special_mapping(current->mm, addr, len, ++ VM_DONTEXPAND | VM_READ | VM_EXEC | ++ VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC, ++ PAGE_READONLY_EXEC, ++ sysenter_pages); ++ if (likely(err == 0)) { ++ current->mm->context.vdso = (void *)addr; ++ ti->sysenter_return = &SYSENTER_RETURN_OFFSET + addr; ++ } + up_write(¤t->mm->mmap_sem); ++ return err; +} + -+static int __init vdso_setup(char *str) ++int in_gate_area_no_task(unsigned long addr) +{ -+ vdso_enabled = simple_strtoul(str, NULL, 0); -+ return 1; ++ return 0; ++} ++ ++int in_gate_area(struct task_struct *task, unsigned long addr) ++{ ++ return 0; +} -+__setup("vdso=", vdso_setup); + ++struct vm_area_struct *get_gate_vma(struct task_struct *tsk) ++{ ++ return NULL; ++} Index: linux/arch/i386/kernel/traps.c =================================================================== --- linux.orig/arch/i386/kernel/traps.c +++ linux/arch/i386/kernel/traps.c -@@ -461,7 +461,82 @@ DO_ERROR(10, SIGSEGV, "invalid TSS", inv +@@ -490,7 +490,82 @@ DO_ERROR(10, SIGSEGV, "invalid TSS", inv DO_ERROR(11, SIGBUS, "segment not present", segment_not_present) DO_ERROR(12, SIGBUS, "stack segment", stack_segment) DO_ERROR_INFO(17, SIGBUS, "alignment check", alignment_check, BUS_ADRALN, 0) @@ -347,7 +314,7 @@ + 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; ++ desc2 = get_cpu_gdt_table(cpu) + GDT_ENTRY_DEFAULT_USER_CS; + + if (desc1->a != desc2->a || desc1->b != desc2->b) { + /* @@ -393,7 +360,7 @@ fastcall void __kprobes do_general_protection(struct pt_regs * regs, long error_code) -@@ -469,6 +544,7 @@ fastcall void __kprobes do_general_prote +@@ -498,6 +573,7 @@ fastcall void __kprobes do_general_prote int cpu = get_cpu(); struct tss_struct *tss = &per_cpu(init_tss, cpu); struct thread_struct *thread = ¤t->thread; @@ -401,7 +368,7 @@ /* * Perform the lazy TSS's I/O bitmap copy. If the TSS has an -@@ -495,7 +571,6 @@ fastcall void __kprobes do_general_prote +@@ -524,7 +600,6 @@ fastcall void __kprobes do_general_prote put_cpu(); return; } @@ -409,7 +376,7 @@ current->thread.error_code = error_code; current->thread.trap_no = 13; -@@ -506,17 +581,31 @@ fastcall void __kprobes do_general_prote +@@ -535,17 +610,31 @@ fastcall void __kprobes do_general_prote if (!user_mode(regs)) goto gp_in_kernel; @@ -445,7 +412,7 @@ =================================================================== --- linux.orig/arch/i386/kernel/vsyscall-sysenter.S +++ linux/arch/i386/kernel/vsyscall-sysenter.S -@@ -24,11 +24,11 @@ __kernel_vsyscall: +@@ -39,11 +39,11 @@ __kernel_vsyscall: /* 7: align return point with nop's to make disassembly easier */ .space 7,0x90 @@ -523,7 +490,7 @@ * bit is set, or if the expected stack growth is unlimited: */ - if (sysctl_legacy_va_layout || -+ if ((exec_shield != 2) && (sysctl_legacy_va_layout || ++ if (!(2 & exec_shield) && (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)) { @@ -551,11 +518,25 @@ { unsigned long pgoff = (eppnt->p_vaddr) & ~IA32_PAGE_MASK; +Index: linux/arch/powerpc/kernel/vdso.c +=================================================================== +--- linux.orig/arch/powerpc/kernel/vdso.c ++++ linux/arch/powerpc/kernel/vdso.c +@@ -218,7 +218,8 @@ static struct vm_operations_struct vdso_ + * vDSO and insert it into the mm struct tree + */ + int arch_setup_additional_pages(struct linux_binprm *bprm, +- int executable_stack) ++ int executable_stack, unsigned long start_code, ++ unsigned long interp_map_address) + { + struct mm_struct *mm = current->mm; + struct vm_area_struct *vma; Index: linux/arch/x86_64/ia32/ia32_binfmt.c =================================================================== --- linux.orig/arch/x86_64/ia32/ia32_binfmt.c +++ linux/arch/x86_64/ia32/ia32_binfmt.c -@@ -248,8 +248,6 @@ elf_core_copy_task_xfpregs(struct task_s +@@ -247,8 +247,6 @@ elf_core_copy_task_xfpregs(struct task_s #define elf_check_arch(x) \ ((x)->e_machine == EM_386) @@ -564,7 +545,7 @@ #define ELF_EXEC_PAGESIZE PAGE_SIZE #define ELF_HWCAP (boot_cpu_data.x86_capability[0]) #define ELF_PLATFORM ("i686") -@@ -263,8 +261,6 @@ do { \ +@@ -262,8 +260,6 @@ do { \ set_thread_flag(TIF_ABI_PENDING); \ else \ clear_thread_flag(TIF_ABI_PENDING); \ @@ -573,11 +554,35 @@ } while (0) /* Override some function names */ +@@ -307,7 +303,7 @@ static void elf32_init(struct pt_regs *) + + #define ARCH_HAS_SETUP_ADDITIONAL_PAGES 1 + #define arch_setup_additional_pages syscall32_setup_pages +-extern int syscall32_setup_pages(struct linux_binprm *, int exstack); ++extern int syscall32_setup_pages(struct linux_binprm *, int exstack, unsigned long start_code, unsigned long interp_map_address); + + #include "../../../fs/binfmt_elf.c" + +Index: linux/arch/x86_64/ia32/syscall32.c +=================================================================== +--- linux.orig/arch/x86_64/ia32/syscall32.c ++++ linux/arch/x86_64/ia32/syscall32.c +@@ -42,7 +42,9 @@ static struct vm_operations_struct sysca + struct linux_binprm; + + /* Setup a VMA at program startup for the vsyscall page */ +-int syscall32_setup_pages(struct linux_binprm *bprm, int exstack) ++int syscall32_setup_pages(struct linux_binprm *bprm, int exstack, ++ unsigned long start_code, ++ unsigned long interp_map_address) + { + int npages = (VSYSCALL32_END - VSYSCALL32_BASE) >> PAGE_SHIFT; + struct vm_area_struct *vma; Index: linux/arch/x86_64/kernel/process.c =================================================================== --- linux.orig/arch/x86_64/kernel/process.c +++ linux/arch/x86_64/kernel/process.c -@@ -631,12 +631,6 @@ void set_personality_64bit(void) +@@ -660,12 +660,6 @@ void set_personality_64bit(void) /* Make sure to be in 64bit mode */ clear_thread_flag(TIF_IA32); @@ -594,7 +599,7 @@ =================================================================== --- linux.orig/arch/x86_64/kernel/setup64.c +++ linux/arch/x86_64/kernel/setup64.c -@@ -45,7 +45,7 @@ Control non executable mappings for 64bi +@@ -46,7 +46,7 @@ Control non executable mappings for 64bi on Enable(default) off Disable */ @@ -603,7 +608,7 @@ { if (!strncmp(str, "on", 2)) { __supported_pte_mask |= _PAGE_NX; -@@ -54,28 +54,7 @@ int __init nonx_setup(char *str) +@@ -55,28 +55,7 @@ int __init nonx_setup(char *str) do_not_nx = 1; __supported_pte_mask &= ~_PAGE_NX; } @@ -636,7 +641,7 @@ =================================================================== --- linux.orig/arch/x86_64/mm/fault.c +++ linux/arch/x86_64/mm/fault.c -@@ -74,7 +74,7 @@ static noinline int is_prefetch(struct p +@@ -80,7 +80,7 @@ static noinline int is_prefetch(struct p instr = (unsigned char *)convert_rip_to_linear(current, regs); max_instr = instr + 15; @@ -645,6 +650,119 @@ return 0; while (scan_more && instr < max_instr) { +Index: linux/arch/x86_64/mm/mmap.c +=================================================================== +--- linux.orig/arch/x86_64/mm/mmap.c ++++ linux/arch/x86_64/mm/mmap.c +@@ -1,30 +1,87 @@ +-/* Copyright 2005 Andi Kleen, SuSE Labs. +- * Licensed under GPL, v.2 ++/* ++ * 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 +-#include + #include +-#include + +-/* Notebook: move the mmap code from sys_x86_64.c over here. */ ++/* ++ * 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) + { +-#ifdef CONFIG_IA32_EMULATION +- if (current_thread_info()->flags & _TIF_IA32) +- return ia32_pick_mmap_layout(mm); +-#endif +- mm->mmap_base = TASK_UNMAPPED_BASE; +- if (current->flags & PF_RANDOMIZE) { +- /* Add 28bit randomness which is about 40bits of address space +- because mmap base has to be page aligned. +- or ~1/128 of the total user VM +- (total user address space is 47bits) */ +- unsigned rnd = get_random_int() & 0xfffffff; +- mm->mmap_base += ((unsigned long)rnd) << PAGE_SHIFT; ++ /* ++ * 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; + } +- mm->get_unmapped_area = arch_get_unmapped_area; +- mm->unmap_area = arch_unmap_area; + } +- Index: linux/drivers/char/random.c =================================================================== --- linux.orig/drivers/char/random.c @@ -682,6 +800,15 @@ extern int dump_fpu (struct pt_regs *, elf_fpregset_t *); #ifndef elf_addr_t +@@ -86,7 +86,7 @@ static struct linux_binfmt elf_format = + .min_coredump = ELF_EXEC_PAGESIZE + }; + +-#define BAD_ADDR(x) ((unsigned long)(x) > TASK_SIZE) ++#define BAD_ADDR(x) ((unsigned long)(x) > PAGE_MASK) + + static int set_brk(unsigned long start, unsigned long end) + { @@ -285,26 +285,65 @@ create_elf_tables(struct linux_binprm *b #ifndef elf_map @@ -763,7 +890,7 @@ 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 *interp_map_addr, + unsigned long no_base) { struct elf_phdr *elf_phdata; @@ -787,7 +914,7 @@ eppnt = elf_phdata; for (i=0; ie_phnum; i++, eppnt++) { if (eppnt->p_type == PT_LOAD) { -@@ -372,8 +417,11 @@ static unsigned long load_elf_interp(str +@@ -372,8 +417,13 @@ 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; @@ -797,10 +924,28 @@ - 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; ++ if (!*interp_map_addr) ++ *interp_map_addr = map_addr; error = map_addr; if (BAD_ADDR(map_addr)) goto out_close; -@@ -533,7 +581,7 @@ static int load_elf_binary(struct linux_ +@@ -435,8 +485,7 @@ static unsigned long load_elf_interp(str + goto out_close; + } + +- *interp_load_addr = load_addr; +- error = ((unsigned long) interp_elf_ex->e_entry) + load_addr; ++ error = load_addr; + + out_close: + kfree(elf_phdata); +@@ -528,12 +577,12 @@ static int load_elf_binary(struct linux_ + int elf_exec_fileno; + int retval, i; + unsigned int size; +- unsigned long elf_entry, interp_load_addr = 0; ++ unsigned long elf_entry, interp_load_addr = 0, interp_map_addr = 0; + unsigned long start_code, end_code, start_data, end_data; unsigned long reloc_func_desc = 0; char passed_fileno[6]; struct files_struct *files; @@ -809,7 +954,7 @@ unsigned long def_flags = 0; struct { struct elfhdr elf_ex; -@@ -689,6 +737,8 @@ static int load_elf_binary(struct linux_ +@@ -689,6 +738,8 @@ static int load_elf_binary(struct linux_ } elf_ppnt = elf_phdata; @@ -818,11 +963,11 @@ 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) -@@ -699,6 +749,11 @@ static int load_elf_binary(struct linux_ +@@ -699,6 +750,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) { ++ if (current->personality == PER_LINUX && (exec_shield & 2)) { + executable_stack = EXSTACK_DISABLE_X; + current->flags |= PF_RANDOMIZE; + } @@ -830,7 +975,7 @@ /* Some simple consistency checks for the interpreter */ if (elf_interpreter) { interpreter_type = INTERPRETER_ELF | INTERPRETER_AOUT; -@@ -752,6 +807,15 @@ static int load_elf_binary(struct linux_ +@@ -752,6 +808,15 @@ static int load_elf_binary(struct linux_ if (retval) goto out_free_dentry; @@ -846,17 +991,17 @@ /* Discard our unneeded old files struct */ if (files) { steal_locks(files); -@@ -770,7 +834,8 @@ static int load_elf_binary(struct linux_ +@@ -770,7 +835,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 && ++ 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) -@@ -790,10 +855,10 @@ static int load_elf_binary(struct linux_ +@@ -790,10 +856,10 @@ static int load_elf_binary(struct linux_ current->mm->start_stack = bprm->p; @@ -870,7 +1015,7 @@ for(i = 0, elf_ppnt = elf_phdata; i < loc->elf_ex.e_phnum; i++, elf_ppnt++) { int elf_prot = 0, elf_flags; -@@ -837,16 +902,16 @@ static int load_elf_binary(struct linux_ +@@ -837,16 +903,16 @@ static int load_elf_binary(struct linux_ elf_flags = MAP_PRIVATE|MAP_DENYWRITE|MAP_EXECUTABLE; vaddr = elf_ppnt->p_vaddr; @@ -894,32 +1039,54 @@ if (BAD_ADDR(error)) { send_sig(SIGKILL, current, 0); goto out_free_dentry; -@@ -923,7 +988,8 @@ static int load_elf_binary(struct linux_ - else +@@ -920,10 +986,17 @@ static int load_elf_binary(struct linux_ + if (interpreter_type == INTERPRETER_AOUT) + elf_entry = load_aout_interp(&loc->interp_ex, + interpreter); +- else ++ else { elf_entry = load_elf_interp(&loc->interp_elf_ex, interpreter, - &interp_load_addr); -+ &interp_load_addr, ++ &interp_map_addr, + load_bias); ++ if (!BAD_ADDR(elf_entry)) { ++ /* load_elf_interp() returns relocation adjustment */ ++ interp_load_addr = elf_entry; ++ elf_entry += loc->interp_elf_ex.e_entry; ++ } ++ } if (BAD_ADDR(elf_entry)) { printk(KERN_ERR "Unable to load interpreter %.128s\n", elf_interpreter); -@@ -955,6 +1021,14 @@ static int load_elf_binary(struct linux_ +@@ -945,21 +1018,22 @@ static int load_elf_binary(struct linux_ + } + } + +- kfree(elf_phdata); +- + if (interpreter_type != INTERPRETER_AOUT) + sys_close(elf_exec_fileno); + + set_binfmt(&elf_format); + + #ifdef ARCH_HAS_SETUP_ADDITIONAL_PAGES +- retval = arch_setup_additional_pages(bprm, executable_stack); ++ retval = arch_setup_additional_pages(bprm, executable_stack, ++ start_code, interp_map_addr); + if (retval < 0) { + send_sig(SIGKILL, current, 0); +- goto out; ++ goto out_free_fh; } #endif /* ARCH_HAS_SETUP_ADDITIONAL_PAGES */ -+ /* -+ * Map the vsyscall trampoline. This address is then passed via -+ * AT_SYSINFO. -+ */ -+#ifdef __HAVE_ARCH_VSYSCALL -+ map_vsyscall(); -+#endif ++ kfree(elf_phdata); + compute_creds(bprm); current->flags &= ~PF_FORKNOEXEC; create_elf_tables(bprm, &loc->elf_ex, (interpreter_type == INTERPRETER_AOUT), -@@ -968,6 +1042,10 @@ static int load_elf_binary(struct linux_ +@@ -973,6 +1047,10 @@ static int load_elf_binary(struct linux_ current->mm->end_data = end_data; current->mm->start_stack = bprm->p; @@ -930,6 +1097,16 @@ 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. +@@ -1158,6 +1236,9 @@ static int maydump(struct vm_area_struct + if (vma->vm_flags & (VM_IO | VM_RESERVED)) + return 0; + ++ if (vma->vm_flags & VM_DONTEXPAND) /* Kludge for vDSO. */ ++ return 1; ++ + /* Dump shared memory only if mapped from an anonymous file. */ + if (vma->vm_flags & VM_SHARED) + return vma->vm_file->f_dentry->d_inode->i_nlink == 0; Index: linux/fs/proc/array.c =================================================================== --- linux.orig/fs/proc/array.c @@ -953,7 +1130,7 @@ =================================================================== --- linux.orig/fs/proc/base.c +++ linux/fs/proc/base.c -@@ -188,7 +188,7 @@ static struct pid_entry tgid_base_stuff[ +@@ -189,7 +189,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), @@ -962,7 +1139,16 @@ #ifdef CONFIG_NUMA E(PROC_TGID_NUMA_MAPS, "numa_maps", S_IFREG|S_IRUGO), #endif -@@ -230,7 +230,7 @@ static struct pid_entry tid_base_stuff[] +@@ -202,7 +202,7 @@ static struct pid_entry tgid_base_stuff[ + E(PROC_TGID_EXE, "exe", S_IFLNK|S_IRWXUGO), + E(PROC_TGID_MOUNTS, "mounts", S_IFREG|S_IRUGO), + #ifdef CONFIG_MMU +- E(PROC_TGID_SMAPS, "smaps", S_IFREG|S_IRUGO), ++ E(PROC_TGID_SMAPS, "smaps", S_IFREG|S_IRUSR), + #endif + #ifdef CONFIG_SECURITY + E(PROC_TGID_ATTR, "attr", S_IFDIR|S_IRUGO|S_IXUGO), +@@ -231,7 +231,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), @@ -971,6 +1157,15 @@ #ifdef CONFIG_NUMA E(PROC_TID_NUMA_MAPS, "numa_maps", S_IFREG|S_IRUGO), #endif +@@ -244,7 +244,7 @@ static struct pid_entry tid_base_stuff[] + E(PROC_TID_EXE, "exe", S_IFLNK|S_IRWXUGO), + E(PROC_TID_MOUNTS, "mounts", S_IFREG|S_IRUGO), + #ifdef CONFIG_MMU +- E(PROC_TID_SMAPS, "smaps", S_IFREG|S_IRUGO), ++ E(PROC_TID_SMAPS, "smaps", S_IFREG|S_IRUSR), + #endif + #ifdef CONFIG_SECURITY + E(PROC_TID_ATTR, "attr", S_IFDIR|S_IRUGO|S_IXUGO), Index: linux/fs/proc/task_mmu.c =================================================================== --- linux.orig/fs/proc/task_mmu.c @@ -1018,7 +1213,7 @@ flags & VM_MAYSHARE ? 's' : 'p', vma->vm_pgoff << PAGE_SHIFT, MAJOR(dev), MINOR(dev), ino, &len); -@@ -154,8 +170,7 @@ static int show_map_internal(struct seq_ +@@ -154,18 +170,22 @@ static int show_map_internal(struct seq_ seq_path(m, file->f_vfsmnt, file->f_dentry, "\n"); } else { if (mm) { @@ -1027,12 +1222,42 @@ + if (vma->vm_end == mm->brk) { pad_len_spaces(m, len); seq_puts(m, "[heap]"); - } else { +- } else { +- if (vma->vm_start <= mm->start_stack && ++ } else if (vma->vm_start <= mm->start_stack && + vma->vm_end >= mm->start_stack) { + + pad_len_spaces(m, len); + seq_puts(m, "[stack]"); + } ++#ifdef __i386__ ++ else if (vma->vm_start == ++ (unsigned long)mm->context.vdso) { ++ pad_len_spaces(m, len); ++ seq_puts(m, "[vdso]"); + } ++#endif + } else { + pad_len_spaces(m, len); + seq_puts(m, "[vdso]"); +Index: linux/include/asm-i386/a.out.h +=================================================================== +--- linux.orig/include/asm-i386/a.out.h ++++ linux/include/asm-i386/a.out.h +@@ -19,7 +19,7 @@ struct exec + + #ifdef __KERNEL__ + +-#define STACK_TOP TASK_SIZE ++#define STACK_TOP (TASK_SIZE - PAGE_SIZE) /* 1 page for vdso */ + + #endif + Index: linux/include/asm-i386/desc.h =================================================================== --- linux.orig/include/asm-i386/desc.h +++ linux/include/asm-i386/desc.h -@@ -160,6 +160,20 @@ static inline unsigned long get_desc_bas +@@ -162,6 +162,20 @@ static inline unsigned long get_desc_bas return base; } @@ -1044,7 +1269,7 @@ +} + +#define load_user_cs_desc(cpu, mm) \ -+ per_cpu(cpu_gdt_table, (cpu))[GDT_ENTRY_DEFAULT_USER_CS] = (mm)->context.user_cs ++ get_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); @@ -1065,7 +1290,7 @@ #include -@@ -129,15 +130,22 @@ extern int dump_task_extended_fpu (struc +@@ -129,17 +130,31 @@ 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) @@ -1094,8 +1319,17 @@ + } \ } while (0) ++#define ARCH_HAS_SETUP_ADDITIONAL_PAGES ++struct linux_binprm; ++extern int arch_setup_additional_pages(struct linux_binprm *bprm, ++ int executable_stack, unsigned long start_code, ++ unsigned long interp_map_address); ++ ++#if 0 /* Disabled for exec-shield, where a normal vma holds the vDSO. */ /* -@@ -148,15 +156,15 @@ do { \ + * These macros parameterize elf_core_dump in fs/binfmt_elf.c to write out + * extra segments containing the vsyscall DSO contents. Dumping its +@@ -148,15 +163,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. */ @@ -1115,7 +1349,7 @@ struct elf_phdr phdr = vsyscall_phdrs[i]; \ if (phdr.p_type == PT_LOAD) { \ BUG_ON(ofs != 0); \ -@@ -174,10 +182,10 @@ do { \ +@@ -174,16 +189,23 @@ do { \ #define ELF_CORE_WRITE_EXTRA_DATA \ do { \ const struct elf_phdr *const vsyscall_phdrs = \ @@ -1129,7 +1363,9 @@ if (vsyscall_phdrs[i].p_type == PT_LOAD) \ DUMP_WRITE((void *) vsyscall_phdrs[i].p_vaddr, \ PAGE_ALIGN(vsyscall_phdrs[i].p_memsz)); \ -@@ -186,4 +194,10 @@ do { \ + } \ + } while (0) ++#endif #endif @@ -1162,6 +1398,22 @@ } mm_context_t; #endif +Index: linux/include/asm-i386/page.h +=================================================================== +--- linux.orig/include/asm-i386/page.h ++++ linux/include/asm-i386/page.h +@@ -118,6 +118,11 @@ extern int page_is_ram(unsigned long pag + #endif + #define __KERNEL_START (__PAGE_OFFSET + __PHYSICAL_START) + ++/* ++ * Under exec-shield we don't use the generic fixmap gate area. ++ * The vDSO ("gate area") has a normal vma found the normal ways. ++ */ ++#define __HAVE_ARCH_GATE_AREA 1 + + #define PAGE_OFFSET ((unsigned long)__PAGE_OFFSET) + #define VMALLOC_RESERVE ((unsigned long)__VMALLOC_RESERVE) Index: linux/include/asm-i386/pgalloc.h =================================================================== --- linux.orig/include/asm-i386/pgalloc.h @@ -1178,7 +1430,7 @@ =================================================================== --- linux.orig/include/asm-i386/processor.h +++ linux/include/asm-i386/processor.h -@@ -319,7 +319,9 @@ extern int bootloader_type; +@@ -323,7 +323,10 @@ extern int bootloader_type; /* This decides where the kernel will search for a free chunk of vm * space during mmap's. */ @@ -1186,10 +1438,11 @@ +#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 -@@ -501,6 +504,9 @@ static inline void load_esp0(struct tss_ +@@ -505,6 +508,9 @@ static inline void load_esp0(struct tss_ regs->xcs = __USER_CS; \ regs->eip = new_eip; \ regs->esp = new_esp; \ @@ -1230,7 +1483,7 @@ =================================================================== --- linux.orig/include/asm-powerpc/pgalloc.h +++ linux/include/asm-powerpc/pgalloc.h -@@ -23,6 +23,11 @@ extern kmem_cache_t *pgtable_cache[]; +@@ -24,6 +24,11 @@ extern kmem_cache_t *pgtable_cache[]; #define PGD_CACHE_NUM 0 #endif @@ -1329,24 +1582,11 @@ extern void paging_init(void); extern void clear_kernel_mapping(unsigned long addr, unsigned long size); -Index: linux/include/asm-x86_64/processor.h -=================================================================== ---- linux.orig/include/asm-x86_64/processor.h -+++ linux/include/asm-x86_64/processor.h -@@ -164,6 +164,8 @@ static inline void clear_in_cr4 (unsigne - */ - #define TASK_SIZE64 (0x800000000000UL - 4096) - -+#define __HAVE_ARCH_ALIGN_STACK -+ - /* This decides where the kernel will search for a free chunk of vm - * space during mmap's. - */ Index: linux/include/linux/mm.h =================================================================== --- linux.orig/include/linux/mm.h +++ linux/include/linux/mm.h -@@ -914,7 +914,14 @@ extern struct vm_area_struct *copy_vma(s +@@ -916,7 +916,19 @@ extern struct vm_area_struct *copy_vma(s extern void exit_mmap(struct mm_struct *); extern int may_expand_vm(struct mm_struct *mm, unsigned long npages); @@ -1359,10 +1599,15 @@ +{ + return get_unmapped_area_prot(file, addr, len, pgoff, flags, 0); +} ++ ++extern int install_special_mapping(struct mm_struct *mm, ++ unsigned long addr, unsigned long len, ++ unsigned long vm_flags, pgprot_t pgprot, ++ struct page **pages); extern unsigned long do_mmap_pgoff(struct file *file, unsigned long addr, unsigned long len, unsigned long prot, -@@ -966,7 +973,7 @@ unsigned long page_cache_readahead(struc +@@ -968,7 +980,7 @@ unsigned long page_cache_readahead(struc struct file *filp, pgoff_t offset, unsigned long size); @@ -1401,7 +1646,7 @@ /* * cloning flags: -@@ -243,6 +245,10 @@ extern int sysctl_max_map_count; +@@ -245,6 +247,10 @@ extern int sysctl_max_map_count; extern unsigned long arch_get_unmapped_area(struct file *, unsigned long, unsigned long, unsigned long, unsigned long); @@ -1412,7 +1657,7 @@ extern unsigned long arch_get_unmapped_area_topdown(struct file *filp, unsigned long addr, unsigned long len, unsigned long pgoff, -@@ -295,6 +301,9 @@ struct mm_struct { +@@ -297,6 +303,9 @@ struct mm_struct { unsigned long (*get_unmapped_area) (struct file *filp, unsigned long addr, unsigned long len, unsigned long pgoff, unsigned long flags); @@ -1420,8 +1665,8 @@ + unsigned long addr, unsigned long len, + unsigned long pgoff, unsigned long flags); void (*unmap_area) (struct mm_struct *mm, unsigned long addr); - unsigned long mmap_base; /* base of mmap area */ - unsigned long cached_hole_size; /* if non-zero, the largest hole below free_area_cache */ + unsigned long mmap_base; /* base of mmap area */ + unsigned long task_size; /* size of task vm space */ Index: linux/include/linux/sysctl.h =================================================================== --- linux.orig/include/linux/sysctl.h @@ -1440,7 +1685,7 @@ =================================================================== --- linux.orig/kernel/signal.c +++ linux/kernel/signal.c -@@ -868,6 +868,37 @@ out_set: +@@ -869,6 +869,37 @@ out_set: #define LEGACY_QUEUE(sigptr, sig) \ (((sig) < SIGRTMIN) && sigismember(&(sigptr)->signal, (sig))) @@ -1478,7 +1723,7 @@ static int specific_send_sig_info(int sig, struct siginfo *info, struct task_struct *t) -@@ -1935,6 +1966,11 @@ relock: +@@ -1936,6 +1967,11 @@ relock: if (!signr) break; /* will return 0 */ @@ -1490,7 +1735,7 @@ if ((current->ptrace & PT_PTRACED) && signr != SIGKILL) { ptrace_signal_deliver(regs, cookie); -@@ -2030,6 +2066,8 @@ relock: +@@ -2031,6 +2067,8 @@ relock: * Anything else is fatal, maybe with a core dump. */ current->flags |= PF_SIGNALED; @@ -1503,13 +1748,23 @@ =================================================================== --- linux.orig/kernel/sysctl.c +++ linux/kernel/sysctl.c -@@ -77,6 +77,19 @@ extern int proc_unknown_nmi_panic(ctl_ta +@@ -79,6 +79,29 @@ extern int proc_unknown_nmi_panic(ctl_ta void __user *, size_t *, loff_t *); #endif -+extern unsigned int vdso_enabled; ++extern unsigned int vdso_enabled, vdso_populate; + -+int exec_shield = 1; ++int exec_shield = (1<<3) | (1<<1) | (1<<0); ++/* exec_shield is a bitmask: ++ 0: off; vdso at STACK_TOP, 1 page below TASK_SIZE ++ (1<<0) 1: on [also on if !=0] ++ (1<<1) 2: noexecstack by default ++ (1<<2) 4: vdso just below .text of main (unless too low) ++ (1<<3) 8: vdso just below .text of PT_INTERP (unless too low) ++Yes, vdso placement is overloaded here; but exec_shield off ++is a strong incentive to place vdso at STACK_TOP, so the bit ++for vdso just below .text comes along for the ride. ++*/ + +static int __init setup_exec_shield(char *str) +{ @@ -1523,7 +1778,7 @@ /* this is needed for the proc_dointvec_minmax for [fs_]overflow UID and GID */ static int maxolduid = 65535; static int minolduid; -@@ -280,6 +293,32 @@ static ctl_table kern_table[] = { +@@ -284,6 +307,40 @@ static ctl_table kern_table[] = { .proc_handler = &proc_dointvec, }, { @@ -1551,6 +1806,14 @@ + .mode = 0644, + .proc_handler = &proc_dointvec, + }, ++ { ++ .ctl_name = KERN_VDSO, ++ .procname = "vdso_populate", ++ .data = &vdso_populate, ++ .maxlen = sizeof(int), ++ .mode = 0644, ++ .proc_handler = &proc_dointvec, ++ }, +#endif + { .ctl_name = KERN_CORE_USES_PID, @@ -1587,7 +1850,7 @@ =================================================================== --- linux.orig/mm/mmap.c +++ linux/mm/mmap.c -@@ -24,6 +24,7 @@ +@@ -25,6 +25,7 @@ #include #include #include @@ -1595,7 +1858,7 @@ #include #include -@@ -341,6 +342,8 @@ static inline void +@@ -342,6 +343,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) { @@ -1604,7 +1867,7 @@ if (prev) { vma->vm_next = prev->vm_next; prev->vm_next = vma; -@@ -445,6 +448,8 @@ __vma_unlink(struct mm_struct *mm, struc +@@ -446,6 +449,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; @@ -1613,7 +1876,7 @@ } /* -@@ -750,6 +755,8 @@ struct vm_area_struct *vma_merge(struct +@@ -751,6 +756,8 @@ struct vm_area_struct *vma_merge(struct } else /* cases 2, 5, 7 */ vma_adjust(prev, prev->vm_start, end, prev->vm_pgoff, NULL); @@ -1622,7 +1885,7 @@ return prev; } -@@ -921,7 +928,7 @@ unsigned long do_mmap_pgoff(struct file +@@ -922,7 +929,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. */ @@ -1631,7 +1894,7 @@ if (addr & ~PAGE_MASK) return addr; -@@ -1327,16 +1334,21 @@ void arch_unmap_area_topdown(struct mm_s +@@ -1328,16 +1335,21 @@ void arch_unmap_area_topdown(struct mm_s mm->free_area_cache = mm->mmap_base; } @@ -1656,7 +1919,7 @@ if (file && file->f_op && file->f_op->get_unmapped_area) get_area = file->f_op->get_unmapped_area; addr = get_area(file, addr, len, pgoff, flags); -@@ -1367,7 +1379,71 @@ get_unmapped_area(struct file *file, uns +@@ -1368,7 +1380,71 @@ get_unmapped_area(struct file *file, uns return addr; } @@ -1729,7 +1992,7 @@ /* 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) -@@ -1442,6 +1518,14 @@ out: +@@ -1443,6 +1519,14 @@ out: return prev ? prev->vm_next : vma; } @@ -1744,7 +2007,7 @@ /* * Verify that the stack growth is acceptable and * update accounting. This is shared with both the -@@ -1457,7 +1541,7 @@ static int acct_stack_growth(struct vm_a +@@ -1458,7 +1542,7 @@ static int acct_stack_growth(struct vm_a return -ENOMEM; /* Stack limit test */ @@ -1753,7 +2016,7 @@ return -ENOMEM; /* mlock limit tests */ -@@ -1737,10 +1821,14 @@ int split_vma(struct mm_struct * mm, str +@@ -1738,10 +1822,14 @@ int split_vma(struct mm_struct * mm, str if (new->vm_ops && new->vm_ops->open) new->vm_ops->open(new); @@ -1770,7 +2033,7 @@ vma_adjust(vma, vma->vm_start, addr, vma->vm_pgoff, new); return 0; -@@ -1945,6 +2033,7 @@ void exit_mmap(struct mm_struct *mm) +@@ -1946,6 +2034,7 @@ void exit_mmap(struct mm_struct *mm) vm_unacct_memory(nr_accounted); free_pgtables(&tlb, vma, FIRST_USER_ADDRESS, 0); tlb_finish_mmu(tlb, 0, end); @@ -1778,6 +2041,88 @@ /* * Walk the list again, actually closing and freeing it, +@@ -2061,3 +2150,81 @@ int may_expand_vm(struct mm_struct *mm, + return 0; + return 1; + } ++ ++ ++static struct page * ++special_mapping_nopage(struct vm_area_struct *vma, ++ unsigned long address, int *type) ++{ ++ struct page **pages; ++ ++ BUG_ON(address < vma->vm_start || address >= vma->vm_end); ++ ++ address -= vma->vm_start; ++ for (pages = vma->vm_private_data; address > 0 && *pages; ++pages) ++ address -= PAGE_SIZE; ++ ++ if (*pages) { ++ get_page(*pages); ++ return *pages; ++ } ++ ++ return NOPAGE_SIGBUS; ++} ++ ++static struct vm_operations_struct special_mapping_vmops = { ++ .nopage = special_mapping_nopage, ++}; ++ ++unsigned int vdso_populate = 1; ++ ++/* ++ * Insert a new vma covering the given region, with the given flags and ++ * protections. Its pages are supplied by the given null-terminated array. ++ * The region past the last page supplied will always produce SIGBUS. ++ * The array pointer and the pages it points to are assumed to stay alive ++ * for as long as this mapping might exist. ++ */ ++int install_special_mapping(struct mm_struct *mm, ++ unsigned long addr, unsigned long len, ++ unsigned long vm_flags, pgprot_t pgprot, ++ struct page **pages) ++{ ++ struct vm_area_struct *vma; ++ int err; ++ ++ vma = kmem_cache_alloc(vm_area_cachep, SLAB_KERNEL); ++ if (unlikely(vma == NULL)) ++ return -ENOMEM; ++ memset(vma, 0, sizeof(*vma)); ++ ++ vma->vm_mm = mm; ++ vma->vm_start = addr; ++ vma->vm_end = addr + len; ++ ++ vma->vm_flags = vm_flags; ++ vma->vm_page_prot = pgprot; ++ ++ vma->vm_ops = &special_mapping_vmops; ++ vma->vm_private_data = pages; ++ ++ insert_vm_struct(mm, vma); ++ mm->total_vm += len >> PAGE_SHIFT; ++ ++ if (!vdso_populate) ++ return 0; ++ ++ err = 0; ++ while (*pages) { ++ struct page *page = *pages++; ++ get_page(page); ++ err = install_page(mm, vma, addr, page, vma->vm_page_prot); ++ if (err) { ++ put_page(page); ++ break; ++ } ++ addr += PAGE_SIZE; ++ } ++ ++ return err; ++} Index: linux/mm/mprotect.c =================================================================== --- linux.orig/mm/mprotect.c @@ -1812,7 +2157,7 @@ =================================================================== --- linux.orig/mm/mremap.c +++ linux/mm/mremap.c -@@ -386,8 +386,8 @@ unsigned long do_mremap(unsigned long ad +@@ -387,8 +387,8 @@ unsigned long do_mremap(unsigned long ad if (vma->vm_flags & VM_MAYSHARE) map_flags |= MAP_SHARED; --- linux-2.6-execshield-fixes.patch DELETED --- --- linux-2.6-execshield-vdso.patch DELETED --- From fedora-cvs-commits at redhat.com Mon Mar 20 22:50:57 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 20 Mar 2006 17:50:57 -0500 Subject: rpms/avahi/devel avahi-0.6.9-bz185972.patch, NONE, 1.1 avahi.spec, 1.49, 1.50 Message-ID: <200603202250.k2KMovAG014602@cvs.devel.redhat.com> Author: jvdias Update of /cvs/dist/rpms/avahi/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv14587 Modified Files: avahi.spec Added Files: avahi-0.6.9-bz185972.patch Log Message: fix bugs 185965, 185972 avahi-0.6.9-bz185972.patch: avahi-daemon.in | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) --- NEW FILE avahi-0.6.9-bz185972.patch --- --- avahi-0.6.9/initscript/fedora/avahi-daemon.in.bz185972 2006-02-09 16:55:06.000000000 -0500 +++ avahi-0.6.9/initscript/fedora/avahi-daemon.in 2006-03-20 17:42:02.000000000 -0500 @@ -28,7 +28,7 @@ base=${0##*/} start() { - echo -n $"Starting Avahi daemon... " + echo -n $"Starting Avahi daemon: " if [ -s /etc/localtime ]; then cp -fp /etc/localtime /etc/avahi/etc >/dev/null 2>&1 fi; @@ -55,7 +55,7 @@ } reload() { - echo -n $"Reloading Avahi daemon... " + echo -n $"Reloading Avahi daemon: " $AVAHI_BIN -r RETVAL=$? [ $RETVAL = 0 ] && success $"$base reload" || failure $"$base reload" Index: avahi.spec =================================================================== RCS file: /cvs/dist/rpms/avahi/devel/avahi.spec,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- avahi.spec 16 Mar 2006 23:30:39 -0000 1.49 +++ avahi.spec 20 Mar 2006 22:50:55 -0000 1.50 @@ -4,7 +4,7 @@ %endif Name: avahi Version: 0.6.9 -Release: 6 +Release: 8.FC6 Summary: Local network service discovery Group: System Environment/Base License: LGPL @@ -31,6 +31,7 @@ Patch10: avahi-0.6.4-bz178784.patch Patch11: avahi-0.6.5-bz179448.patch Patch12: avahi-0.6.7-initscript.patch +Patch13: avahi-0.6.9-bz185972.patch %description Avahi is a system which facilitates service discovery on @@ -139,6 +140,7 @@ #%patch11 -p1 -b .bz179448 #^- this patch now upstream %patch12 -p1 -b .initscript +%patch13 -p1 -b .bz185972 %build # auto* update needed for avahi-0.5.2-fedora.patch @@ -203,12 +205,12 @@ %post /sbin/ldconfig +# Run avahi-daemon by default: +/sbin/chkconfig --add avahi-daemon >/dev/null 2>&1 || :; +# avahi-dnsconfd NOT run by default in any runlevel; add it +# so system-config-services can see it +/sbin/chkconfig --add avahi-dnsconfd >/dev/null 2>&1 || :; if [ "$1" -eq 1 ]; then - # Run avahi-daemon by default: - /sbin/chkconfig --add avahi-daemon >/dev/null 2>&1 || :; - # avahi-dnsconfd NOT run by default in any runlevel; add it - # so system-config-services can see it - /sbin/chkconfig --add avahi-dnsconfd >/dev/null 2>&1 || :; # We should realy make dbus reload the system.d config here. Dunno how though. # kill -HUP `cat /var/run/messagebus.pid` ? if [ -s /etc/localtime ]; then @@ -319,6 +321,10 @@ %endif %changelog +* Mon Mar 20 2006 Jason Vas Dias - 0.6.9-8.FC6 +- fix bug 185972: remove ellipses in initscript +- fix bug 185965: make chkconfigs unconditional + * Thu Mar 16 2006 Jason Vas Dias - 0.6.9-6 - Fix bug 185692: install avahi-sharp into %{_prefix}/lib, not %{_libdir} From fedora-cvs-commits at redhat.com Mon Mar 20 22:52:36 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 20 Mar 2006 17:52:36 -0500 Subject: rpms/kernel/devel linux-2.6-acpi-ecdt-uid-hack.patch, NONE, 1.1 kernel-2.6.spec, 1.2072, 1.2073 Message-ID: <200603202252.k2KMqaT2014676@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv14657 Modified Files: kernel-2.6.spec Added Files: linux-2.6-acpi-ecdt-uid-hack.patch Log Message: ACPI ecdt uid hack. (#185947) linux-2.6-acpi-ecdt-uid-hack.patch: ec.c | 16 ++++++---------- 1 files changed, 6 insertions(+), 10 deletions(-) --- NEW FILE linux-2.6-acpi-ecdt-uid-hack.patch --- acpi-ecdt-uid-hack On some boxes ecdt uid may be equal to 0, so do not test for uids equality, so that fake handler will be unconditionally removed to allow loading the real one. Signed-off-by: Jiri Slaby --- commit ff7e5094ceaf67b950f7684c66c54011fa0e5cd5 tree bde2662da704bea931d88fcc8a5d16d2f8895700 parent 8e07cf694b71c1cddded6f311e15db6e25696157 author Jiri Slaby Mon, 06 Mar 2006 17:40:42 +0059 committer Jiri Slaby Mon, 06 Mar 2006 17:40:42 +0059 drivers/acpi/ec.c | 16 ++++++---------- 1 files changed, 6 insertions(+), 10 deletions(-) diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c index f339bd4..de95a09 100644 --- a/drivers/acpi/ec.c +++ b/drivers/acpi/ec.c @@ -989,7 +989,6 @@ static int acpi_ec_poll_add(struct acpi_ int result = 0; acpi_status status = AE_OK; union acpi_ec *ec = NULL; - unsigned long uid; ACPI_FUNCTION_TRACE("acpi_ec_add"); @@ -1012,10 +1011,9 @@ static int acpi_ec_poll_add(struct acpi_ acpi_evaluate_integer(ec->common.handle, "_GLK", NULL, &ec->common.global_lock); - /* If our UID matches the UID for the ECDT-enumerated EC, - we now have the *real* EC info, so kill the makeshift one. */ - acpi_evaluate_integer(ec->common.handle, "_UID", NULL, &uid); - if (ec_ecdt && ec_ecdt->common.uid == uid) { + /* XXX we doesn't test uids, because on some boxes ecdt uid = 0, see: + http://bugzilla.kernel.org/show_bug.cgi?id=6111 */ + if (ec_ecdt) { acpi_remove_address_space_handler(ACPI_ROOT_OBJECT, ACPI_ADR_SPACE_EC, &acpi_ec_space_handler); @@ -1059,7 +1057,6 @@ static int acpi_ec_intr_add(struct acpi_ int result = 0; acpi_status status = AE_OK; union acpi_ec *ec = NULL; - unsigned long uid; ACPI_FUNCTION_TRACE("acpi_ec_add"); @@ -1085,10 +1082,9 @@ static int acpi_ec_intr_add(struct acpi_ acpi_evaluate_integer(ec->common.handle, "_GLK", NULL, &ec->common.global_lock); - /* If our UID matches the UID for the ECDT-enumerated EC, - we now have the *real* EC info, so kill the makeshift one. */ - acpi_evaluate_integer(ec->common.handle, "_UID", NULL, &uid); - if (ec_ecdt && ec_ecdt->common.uid == uid) { + /* XXX we doesn't test uids, because on some boxes ecdt uid = 0, see: + http://bugzilla.kernel.org/show_bug.cgi?id=6111 */ + if (ec_ecdt) { acpi_remove_address_space_handler(ACPI_ROOT_OBJECT, ACPI_ADR_SPACE_EC, &acpi_ec_space_handler); Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.2072 retrieving revision 1.2073 diff -u -r1.2072 -r1.2073 --- kernel-2.6.spec 20 Mar 2006 22:36:06 -0000 1.2072 +++ kernel-2.6.spec 20 Mar 2006 22:52:34 -0000 1.2073 @@ -400,6 +400,7 @@ # ACPI bits Patch2300: linux-2.6-acpi_os_acquire_object-gfp_kernel-called-with-irqs.patch +Patch2301: linux-2.6-acpi-ecdt-uid-hack.patch # Broadcom wireless driver Patch5000: linux-2.6-softmac-git.patch @@ -1030,6 +1031,8 @@ # ACPI patches # Silence more ACPI debug spew from suspend. %patch2300 -p1 +# acpi-ecdt-uid-hack +%patch2301 -p1 # # Patches 5000 to 6000 are reserved for new drivers that are about to @@ -1651,6 +1654,7 @@ - Update exec-shield to Ingo's latest. (Incorporates John Reiser's "map the vDSO intelligently" patch which increases the efficiency of prelinking - #162797). +- ACPI ecdt uid hack. (#185947) * Sun Mar 19 2006 Dave Jones - 2.6.16rc6-git12 From fedora-cvs-commits at redhat.com Mon Mar 20 22:52:56 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 20 Mar 2006 17:52:56 -0500 Subject: rpms/kernel/FC-5 linux-2.6-acpi-ecdt-uid-hack.patch, NONE, 1.1 kernel-2.6.spec, 1.2064, 1.2065 Message-ID: <200603202252.k2KMqu5k014704@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv14689 Modified Files: kernel-2.6.spec Added Files: linux-2.6-acpi-ecdt-uid-hack.patch Log Message: ACPI ecdt uid hack. (#185947) linux-2.6-acpi-ecdt-uid-hack.patch: ec.c | 16 ++++++---------- 1 files changed, 6 insertions(+), 10 deletions(-) --- NEW FILE linux-2.6-acpi-ecdt-uid-hack.patch --- acpi-ecdt-uid-hack On some boxes ecdt uid may be equal to 0, so do not test for uids equality, so that fake handler will be unconditionally removed to allow loading the real one. Signed-off-by: Jiri Slaby --- commit ff7e5094ceaf67b950f7684c66c54011fa0e5cd5 tree bde2662da704bea931d88fcc8a5d16d2f8895700 parent 8e07cf694b71c1cddded6f311e15db6e25696157 author Jiri Slaby Mon, 06 Mar 2006 17:40:42 +0059 committer Jiri Slaby Mon, 06 Mar 2006 17:40:42 +0059 drivers/acpi/ec.c | 16 ++++++---------- 1 files changed, 6 insertions(+), 10 deletions(-) diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c index f339bd4..de95a09 100644 --- a/drivers/acpi/ec.c +++ b/drivers/acpi/ec.c @@ -989,7 +989,6 @@ static int acpi_ec_poll_add(struct acpi_ int result = 0; acpi_status status = AE_OK; union acpi_ec *ec = NULL; - unsigned long uid; ACPI_FUNCTION_TRACE("acpi_ec_add"); @@ -1012,10 +1011,9 @@ static int acpi_ec_poll_add(struct acpi_ acpi_evaluate_integer(ec->common.handle, "_GLK", NULL, &ec->common.global_lock); - /* If our UID matches the UID for the ECDT-enumerated EC, - we now have the *real* EC info, so kill the makeshift one. */ - acpi_evaluate_integer(ec->common.handle, "_UID", NULL, &uid); - if (ec_ecdt && ec_ecdt->common.uid == uid) { + /* XXX we doesn't test uids, because on some boxes ecdt uid = 0, see: + http://bugzilla.kernel.org/show_bug.cgi?id=6111 */ + if (ec_ecdt) { acpi_remove_address_space_handler(ACPI_ROOT_OBJECT, ACPI_ADR_SPACE_EC, &acpi_ec_space_handler); @@ -1059,7 +1057,6 @@ static int acpi_ec_intr_add(struct acpi_ int result = 0; acpi_status status = AE_OK; union acpi_ec *ec = NULL; - unsigned long uid; ACPI_FUNCTION_TRACE("acpi_ec_add"); @@ -1085,10 +1082,9 @@ static int acpi_ec_intr_add(struct acpi_ acpi_evaluate_integer(ec->common.handle, "_GLK", NULL, &ec->common.global_lock); - /* If our UID matches the UID for the ECDT-enumerated EC, - we now have the *real* EC info, so kill the makeshift one. */ - acpi_evaluate_integer(ec->common.handle, "_UID", NULL, &uid); - if (ec_ecdt && ec_ecdt->common.uid == uid) { + /* XXX we doesn't test uids, because on some boxes ecdt uid = 0, see: + http://bugzilla.kernel.org/show_bug.cgi?id=6111 */ + if (ec_ecdt) { acpi_remove_address_space_handler(ACPI_ROOT_OBJECT, ACPI_ADR_SPACE_EC, &acpi_ec_space_handler); Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-5/kernel-2.6.spec,v retrieving revision 1.2064 retrieving revision 1.2065 diff -u -r1.2064 -r1.2065 --- kernel-2.6.spec 20 Mar 2006 20:08:40 -0000 1.2064 +++ kernel-2.6.spec 20 Mar 2006 22:52:53 -0000 1.2065 @@ -403,6 +403,7 @@ # ACPI bits Patch2300: linux-2.6-acpi_os_acquire_object-gfp_kernel-called-with-irqs.patch +Patch2301: linux-2.6-acpi-ecdt-uid-hack.patch # Broadcom wireless driver Patch5000: linux-2.6-softmac-git.patch @@ -1039,6 +1040,8 @@ # Silence more ACPI debug spew from suspend. %patch2300 -p1 +# acpi-ecdt-uid-hack +%patch2301 -p1 # @@ -1654,6 +1657,9 @@ %endif %changelog +* Mon Mar 20 2006 Dave Jones +- ACPI ecdt uid hack. (#185947) + * Mon Mar 20 2006 Juan Quintela - fix xen vmx in 64 bits. From fedora-cvs-commits at redhat.com Mon Mar 20 22:54:28 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 20 Mar 2006 17:54:28 -0500 Subject: rpms/avahi/FC-5 avahi-0.6.9-bz185972.patch, NONE, 1.1 avahi.spec, 1.46, 1.47 Message-ID: <200603202254.k2KMsSu7014759@cvs.devel.redhat.com> Author: jvdias Update of /cvs/dist/rpms/avahi/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv14744 Modified Files: avahi.spec Added Files: avahi-0.6.9-bz185972.patch Log Message: fix bugs 185965, 185972 avahi-0.6.9-bz185972.patch: avahi-daemon.in | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) --- NEW FILE avahi-0.6.9-bz185972.patch --- --- avahi-0.6.9/initscript/fedora/avahi-daemon.in.bz185972 2006-02-09 16:55:06.000000000 -0500 +++ avahi-0.6.9/initscript/fedora/avahi-daemon.in 2006-03-20 17:42:02.000000000 -0500 @@ -28,7 +28,7 @@ base=${0##*/} start() { - echo -n $"Starting Avahi daemon... " + echo -n $"Starting Avahi daemon: " if [ -s /etc/localtime ]; then cp -fp /etc/localtime /etc/avahi/etc >/dev/null 2>&1 fi; @@ -55,7 +55,7 @@ } reload() { - echo -n $"Reloading Avahi daemon... " + echo -n $"Reloading Avahi daemon: " $AVAHI_BIN -r RETVAL=$? [ $RETVAL = 0 ] && success $"$base reload" || failure $"$base reload" Index: avahi.spec =================================================================== RCS file: /cvs/dist/rpms/avahi/FC-5/avahi.spec,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- avahi.spec 9 Mar 2006 15:38:11 -0000 1.46 +++ avahi.spec 20 Mar 2006 22:54:26 -0000 1.47 @@ -4,7 +4,7 @@ %endif Name: avahi Version: 0.6.9 -Release: 4 +Release: 8.FC5 Summary: Local network service discovery Group: System Environment/Base License: LGPL @@ -31,6 +31,7 @@ Patch10: avahi-0.6.4-bz178784.patch Patch11: avahi-0.6.5-bz179448.patch Patch12: avahi-0.6.7-initscript.patch +Patch13: avahi-0.6.9-bz185972.patch %description Avahi is a system which facilitates service discovery on @@ -139,6 +140,7 @@ #%patch11 -p1 -b .bz179448 #^- this patch now upstream %patch12 -p1 -b .initscript +%patch13 -p1 -b .bz185972 %build # auto* update needed for avahi-0.5.2-fedora.patch @@ -186,6 +188,11 @@ # Make /etc/avahi/etc/localtime owned by avahi: mkdir -p $RPM_BUILD_ROOT/etc/avahi/etc touch $RPM_BUILD_ROOT/etc/avahi/etc/localtime +# +# Fix avahi-sharp default installation into /usr/lib64 on x86_64: +if [ ! -e $RPM_BUILD_ROOT/%{_prefix}/lib/mono ] && [ -e $RPM_BUILD_ROOT/%{_libdir}/mono ]; then + mv -f $RPM_BUILD_ROOT/%{_libdir}/mono $RPM_BUILD_ROOT/%{_prefix}/lib; +fi :; %clean @@ -198,12 +205,12 @@ %post /sbin/ldconfig +# Run avahi-daemon by default: +/sbin/chkconfig --add avahi-daemon >/dev/null 2>&1 || :; +# avahi-dnsconfd NOT run by default in any runlevel; add it +# so system-config-services can see it +/sbin/chkconfig --add avahi-dnsconfd >/dev/null 2>&1 || :; if [ "$1" -eq 1 ]; then - # Run avahi-daemon by default: - /sbin/chkconfig --add avahi-daemon >/dev/null 2>&1 || :; - # avahi-dnsconfd NOT run by default in any runlevel; add it - # so system-config-services can see it - /sbin/chkconfig --add avahi-dnsconfd >/dev/null 2>&1 || :; # We should realy make dbus reload the system.d config here. Dunno how though. # kill -HUP `cat /var/run/messagebus.pid` ? if [ -s /etc/localtime ]; then @@ -308,12 +315,19 @@ %if %{WITH_MONO} %files sharp %defattr(0644, root, root, 0755) -%{_libdir}/mono/avahi-sharp -%{_libdir}/mono/gac/avahi-sharp +%{_prefix}/lib/mono/avahi-sharp +%{_prefix}/lib/mono/gac/avahi-sharp %{_libdir}/pkgconfig/avahi-sharp.pc %endif %changelog +* Mon Mar 20 2006 Jason Vas Dias - 0.6.9-8.FC6 +- fix bug 185972: remove ellipses in initscript +- fix bug 185965: make chkconfigs unconditional + +* Thu Mar 16 2006 Jason Vas Dias - 0.6.9-6 +- Fix bug 185692: install avahi-sharp into %{_prefix}/lib, not %{_libdir} + * Thu Mar 09 2006 Jason Vas Dias - 0.6.9-4 - fix scriptlet error introduced by last fix: if user has disabled avahi-daemon, do not enable it during %post From fedora-cvs-commits at redhat.com Mon Mar 20 23:19:04 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 20 Mar 2006 18:19:04 -0500 Subject: rpms/libmng/devel libmng.spec,1.25,1.26 Message-ID: <200603202319.k2KNJ444028910@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/libmng/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv28897 Modified Files: libmng.spec Log Message: enable lcms support, don't build a -static package Index: libmng.spec =================================================================== RCS file: /cvs/dist/rpms/libmng/devel/libmng.spec,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- libmng.spec 11 Feb 2006 04:09:49 -0000 1.25 +++ libmng.spec 20 Mar 2006 23:19:01 -0000 1.26 @@ -1,6 +1,6 @@ Name: libmng Version: 1.0.9 -Release: 3.2.1 +Release: 4 URL: http://www.libmng.com/ Summary: Library for Multiple-image Network Graphics support License: BSD-like @@ -9,6 +9,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildRequires: zlib-devel BuildRequires: libjpeg-devel +BuildRequires: lcms-devel %package devel Summary: Development files for the Multiple-image Network Graphics library @@ -17,10 +18,6 @@ Requires: zlib-devel Requires: libjpeg-devel -%package static -Summary: Statically linked version of the Multiple-image Network Graphics library -Group: Development/Libraries - %description LibMNG is a library for accessing graphics in MNG (Multi-image Network Graphics) and JNG (JPEG Network Graphics) formats. MNG graphics are @@ -32,13 +29,6 @@ libmng-devel package contains files needed for developing or compiling applications which use MNG graphics. -%description static -LibMNG is a library for accessing MNG and JNG format graphics. The -libmng-static package contains a statically linked version of the -LibMNG library, which you need if you want to develop or compile -applications using MNG graphics without depending upon LibMNG being -installed on the user's system. - %prep %setup -q @@ -47,7 +37,7 @@ chmod 755 autogen.sh [ ! -x ./configure ] && ./autogen.sh --help # generate, but don't run %configure --enable-shared --enable-static --with-zlib --with-jpeg \ - --with-gnu-ld + --with-gnu-ld --with-lcms make %{?_smp_mflags} %install @@ -72,11 +62,11 @@ %{_mandir}/man3/* %{_mandir}/man5/* -%files static -%defattr(-,root,root,0755) -%{_libdir}/*.a - %changelog +* Mon Mar 20 2006 Matthias Clasen - 1.0.9-4 +- enable lcms support (#184526) +- no longer build a libmng-static package + * Fri Feb 10 2006 Jesse Keating - 1.0.9-3.2.1 - bump again for double-long bug on ppc(64) From fedora-cvs-commits at redhat.com Mon Mar 20 23:26:41 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 20 Mar 2006 18:26:41 -0500 Subject: rpms/libmng/devel libmng.spec,1.26,1.27 Message-ID: <200603202326.k2KNQfiY029023@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/libmng/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv29010 Modified Files: libmng.spec Log Message: --disable-static Index: libmng.spec =================================================================== RCS file: /cvs/dist/rpms/libmng/devel/libmng.spec,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- libmng.spec 20 Mar 2006 23:19:01 -0000 1.26 +++ libmng.spec 20 Mar 2006 23:26:39 -0000 1.27 @@ -36,7 +36,7 @@ cat unmaintained/autogen.sh | tr -d \\r > autogen.sh chmod 755 autogen.sh [ ! -x ./configure ] && ./autogen.sh --help # generate, but don't run -%configure --enable-shared --enable-static --with-zlib --with-jpeg \ +%configure --enable-shared --disable-static --with-zlib --with-jpeg \ --with-gnu-ld --with-lcms make %{?_smp_mflags} From fedora-cvs-commits at redhat.com Mon Mar 20 23:45:59 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 20 Mar 2006 18:45:59 -0500 Subject: rpms/ORBit/devel ORBit.spec,1.21,1.22 Message-ID: <200603202345.k2KNjxWj001796@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/ORBit/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv32747 Modified Files: ORBit.spec Log Message: Small fixes Index: ORBit.spec =================================================================== RCS file: /cvs/dist/rpms/ORBit/devel/ORBit.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- ORBit.spec 13 Feb 2006 18:43:13 -0000 1.21 +++ ORBit.spec 20 Mar 2006 23:45:57 -0000 1.22 @@ -1,9 +1,9 @@ Summary: A high-performance CORBA Object Request Broker. Name: ORBit Version: 0.5.17 -Release: 15.2.2 +Release: 16 Epoch: 1 -Source: ftp://ftp.labs.redhat.com/pub/ORBit/%{name}-%{version}.tar.bz2 +Source: http://ftp.acc.umu.se/pub/gnome/sources/ORBit/0.5/ORBit-0.5.17.tar.bz2 Patch0: ORBit-0.5.17-aligned-access.patch Patch1: ORBit-underquoted.patch Group: System Environment/Daemons @@ -58,7 +58,7 @@ # remove unpackaged files rm -f $RPM_BUILD_ROOT/%{_bindir}/ior-decode rm -f $RPM_BUILD_ROOT/%{_bindir}/old-name-server -rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la +rm -f $RPM_BUILD_ROOT/%{_libdir}/*.{a,la} rm -f $RPM_BUILD_ROOT/%{_datadir}/idl/orbit-1.0/* rm -f $RPM_BUILD_ROOT/%{_datadir}/info/dir @@ -97,12 +97,15 @@ %{_includedir}/* %{_infodir}/libIDL.info.gz %{_libdir}/*.sh -%{_libdir}/lib*.a %{_libdir}/lib*.so %{_libdir}/pkgconfig/*.pc %{_datadir}/aclocal/* %changelog +* Mon Mar 20 2006 Matthias Clasen - 1:0.5.17-16 +- Fix source URL +- Don't ship static libraries + * Mon Feb 13 2006 Jesse Keating - 1:0.5.17-15.2.2 - rebump for build order issues during double-long bump From fedora-cvs-commits at redhat.com Tue Mar 21 02:54:24 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 20 Mar 2006 21:54:24 -0500 Subject: rpms/kernel/devel linux-2.6-execshield.patch,1.12,1.13 Message-ID: <200603210254.k2L2sOLt029834@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv29819 Modified Files: linux-2.6-execshield.patch Log Message: buildfix linux-2.6-execshield.patch: linux-2.6.16.noarch/include/asm-powerpc/elf.h | 3 linux/arch/i386/kernel/asm-offsets.c | 1 linux/arch/i386/kernel/cpu/common.c | 7 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 | 81 +++++++++++ linux/arch/i386/kernel/traps.c | 93 ++++++++++++- 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/powerpc/kernel/vdso.c | 3 linux/arch/x86_64/ia32/ia32_binfmt.c | 6 linux/arch/x86_64/ia32/syscall32.c | 4 linux/arch/x86_64/kernel/process.c | 6 linux/arch/x86_64/kernel/setup64.c | 23 --- linux/arch/x86_64/mm/fault.c | 2 linux/arch/x86_64/mm/mmap.c | 99 +++++++++++--- linux/drivers/char/random.c | 7 linux/fs/binfmt_elf.c | 151 ++++++++++++++++----- linux/fs/proc/array.c | 8 - linux/fs/proc/base.c | 8 - linux/fs/proc/task_mmu.c | 34 +++- linux/include/asm-i386/a.out.h | 2 linux/include/asm-i386/desc.h | 14 + linux/include/asm-i386/elf.h | 50 +++++-- linux/include/asm-i386/mmu.h | 6 linux/include/asm-i386/page.h | 5 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-powerpc/pgalloc.h | 5 linux/include/asm-ppc/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/pgtable.h | 2 linux/include/linux/mm.h | 16 +- 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 | 57 ++++++++ linux/mm/fremap.c | 16 +- linux/mm/mmap.c | 183 ++++++++++++++++++++++++-- linux/mm/mprotect.c | 5 linux/mm/mremap.c | 4 52 files changed, 931 insertions(+), 161 deletions(-) Index: linux-2.6-execshield.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-execshield.patch,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- linux-2.6-execshield.patch 20 Mar 2006 22:36:06 -0000 1.12 +++ linux-2.6-execshield.patch 21 Mar 2006 02:54:20 -0000 1.13 @@ -2168,3 +2168,15 @@ ret = new_addr; if (new_addr & ~PAGE_MASK) goto out; +--- linux-2.6.16.noarch/include/asm-powerpc/elf.h~ 2006-03-20 21:52:50.000000000 -0500 ++++ linux-2.6.16.noarch/include/asm-powerpc/elf.h 2006-03-20 21:53:20.000000000 -0500 +@@ -273,7 +273,8 @@ extern int ucache_bsize; + #define ARCH_HAS_SETUP_ADDITIONAL_PAGES + struct linux_binprm; + extern int arch_setup_additional_pages(struct linux_binprm *bprm, +- int executable_stack); ++ int executable_stack, unsigned long start_code, ++ unsigned long interp_map_address); + #define VDSO_AUX_ENT(a,b) NEW_AUX_ENT(a,b); + + /* From fedora-cvs-commits at redhat.com Tue Mar 21 03:26:02 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 20 Mar 2006 22:26:02 -0500 Subject: rpms/kernel/FC-5 kernel-2.6.spec, 1.2065, 1.2066 linux-2.6-crashdump-common.patch, 1.11, 1.12 Message-ID: <200603210326.k2L3Q2tt011288@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv11273 Modified Files: kernel-2.6.spec linux-2.6-crashdump-common.patch Log Message: Fix unresolved symbol in crashdump. Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-5/kernel-2.6.spec,v retrieving revision 1.2065 retrieving revision 1.2066 diff -u -r1.2065 -r1.2066 --- kernel-2.6.spec 20 Mar 2006 22:52:53 -0000 1.2065 +++ kernel-2.6.spec 21 Mar 2006 03:25:59 -0000 1.2066 @@ -1659,6 +1659,7 @@ %changelog * Mon Mar 20 2006 Dave Jones - ACPI ecdt uid hack. (#185947) +- Fix unresolved symbol in crashdump. * Mon Mar 20 2006 Juan Quintela - fix xen vmx in 64 bits. linux-2.6-crashdump-common.patch: linux-2.6.12/Documentation/sysrq.txt | 8 linux-2.6.12/arch/i386/kernel/nmi.c | 1 linux-2.6.12/arch/i386/kernel/traps.c | 3 linux-2.6.12/arch/i386/mm/init.c | 47 +++++ linux-2.6.12/arch/ia64/kernel/process.c | 30 ++- linux-2.6.12/arch/ia64/kernel/traps.c | 6 linux-2.6.12/arch/ia64/mm/contig.c | 3 linux-2.6.12/arch/ia64/mm/discontig.c | 3 linux-2.6.12/arch/ia64/mm/init.c | 90 +++++++++ linux-2.6.12/arch/powerpc/kernel/process.c | 1 linux-2.6.12/arch/powerpc/kernel/traps.c | 3 linux-2.6.12/arch/powerpc/mm/mem.c | 29 +++ linux-2.6.12/arch/s390/kernel/traps.c | 6 linux-2.6.12/arch/x86_64/kernel/process.c | 2 linux-2.6.12/arch/x86_64/kernel/traps.c | 6 linux-2.6.12/arch/x86_64/mm/init.c | 32 +++ linux-2.6.12/drivers/char/sysrq.c | 2 linux-2.6.12/include/asm-generic/crashdump.h | 47 +++++ linux-2.6.12/include/asm-i386/crashdump.h | 123 +++++++++++++ linux-2.6.12/include/asm-i386/kmap_types.h | 4 linux-2.6.12/include/asm-ia64/crashdump.h | 72 +++++++ linux-2.6.12/include/asm-powerpc/crashdump.h | 61 ++++++ linux-2.6.12/include/asm-x86_64/crashdump.h | 86 +++++++++ linux-2.6.12/include/linux/kernel.h | 18 + linux-2.6.12/kernel/Makefile | 2 linux-2.6.12/kernel/dump.c | 246 +++++++++++++++++++++++++++ linux-2.6.12/kernel/panic.c | 4 linux-2.6.12/kernel/printk.c | 20 ++ linux-2.6.12/kernel/sched.c | 2 linux-2.6.13/arch/x86_64/mm/fault.c | 1 linux-2.6.13/drivers/char/sysrq.c | 5 linux-2.6.16/arch/i386/mm/pgtable.c | 3 32 files changed, 952 insertions(+), 14 deletions(-) Index: linux-2.6-crashdump-common.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-5/linux-2.6-crashdump-common.patch,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- linux-2.6-crashdump-common.patch 13 Mar 2006 22:17:56 -0000 1.11 +++ linux-2.6-crashdump-common.patch 21 Mar 2006 03:26:00 -0000 1.12 @@ -887,8 +887,16 @@ /* * devmem_is_allowed() checks to see if /dev/mem access to a certain address is * valid. The argument is a physical page number. ---- linux-2.6.12/arch/i386/mm/pgtable.c.orig 2005-08-18 12:39:56.000000000 -0400 -+++ linux-2.6.12/arch/i386/mm/pgtable.c 2005-08-18 14:23:58.000000000 -0400 +--- linux-2.6.16/arch/i386/mm/pgtable.c~ 2006-03-20 22:19:50.000000000 -0500 ++++ linux-2.6.16/arch/i386/mm/pgtable.c 2006-03-20 22:19:59.000000000 -0500 +@@ -13,6 +13,7 @@ + #include + #include + #include ++#include + + #include + #include @@ -63,6 +64,8 @@ printk(KERN_INFO "%lu pages pagetables\n", ps.nr_page_table_pages); } From fedora-cvs-commits at redhat.com Tue Mar 21 03:26:15 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 20 Mar 2006 22:26:15 -0500 Subject: rpms/kernel/devel linux-2.6-crashdump-common.patch,1.11,1.12 Message-ID: <200603210326.k2L3QFJ1011320@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv11305 Modified Files: linux-2.6-crashdump-common.patch Log Message: unresolved symbol. linux-2.6-crashdump-common.patch: linux-2.6.12/Documentation/sysrq.txt | 8 linux-2.6.12/arch/i386/kernel/nmi.c | 1 linux-2.6.12/arch/i386/kernel/traps.c | 3 linux-2.6.12/arch/i386/mm/init.c | 47 +++++ linux-2.6.12/arch/ia64/kernel/process.c | 30 ++- linux-2.6.12/arch/ia64/kernel/traps.c | 6 linux-2.6.12/arch/ia64/mm/contig.c | 3 linux-2.6.12/arch/ia64/mm/discontig.c | 3 linux-2.6.12/arch/ia64/mm/init.c | 90 +++++++++ linux-2.6.12/arch/powerpc/kernel/process.c | 1 linux-2.6.12/arch/powerpc/kernel/traps.c | 3 linux-2.6.12/arch/powerpc/mm/mem.c | 29 +++ linux-2.6.12/arch/s390/kernel/traps.c | 6 linux-2.6.12/arch/x86_64/kernel/process.c | 2 linux-2.6.12/arch/x86_64/kernel/traps.c | 6 linux-2.6.12/arch/x86_64/mm/init.c | 32 +++ linux-2.6.12/drivers/char/sysrq.c | 2 linux-2.6.12/include/asm-generic/crashdump.h | 47 +++++ linux-2.6.12/include/asm-i386/crashdump.h | 123 +++++++++++++ linux-2.6.12/include/asm-i386/kmap_types.h | 4 linux-2.6.12/include/asm-ia64/crashdump.h | 72 +++++++ linux-2.6.12/include/asm-powerpc/crashdump.h | 61 ++++++ linux-2.6.12/include/asm-x86_64/crashdump.h | 86 +++++++++ linux-2.6.12/include/linux/kernel.h | 18 + linux-2.6.12/kernel/Makefile | 2 linux-2.6.12/kernel/dump.c | 246 +++++++++++++++++++++++++++ linux-2.6.12/kernel/panic.c | 4 linux-2.6.12/kernel/printk.c | 20 ++ linux-2.6.12/kernel/sched.c | 2 linux-2.6.13/arch/x86_64/mm/fault.c | 1 linux-2.6.13/drivers/char/sysrq.c | 5 linux-2.6.16/arch/i386/mm/pgtable.c | 3 32 files changed, 952 insertions(+), 14 deletions(-) Index: linux-2.6-crashdump-common.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-crashdump-common.patch,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- linux-2.6-crashdump-common.patch 13 Mar 2006 22:17:56 -0000 1.11 +++ linux-2.6-crashdump-common.patch 21 Mar 2006 03:26:11 -0000 1.12 @@ -887,8 +887,16 @@ /* * devmem_is_allowed() checks to see if /dev/mem access to a certain address is * valid. The argument is a physical page number. ---- linux-2.6.12/arch/i386/mm/pgtable.c.orig 2005-08-18 12:39:56.000000000 -0400 -+++ linux-2.6.12/arch/i386/mm/pgtable.c 2005-08-18 14:23:58.000000000 -0400 +--- linux-2.6.16/arch/i386/mm/pgtable.c~ 2006-03-20 22:19:50.000000000 -0500 ++++ linux-2.6.16/arch/i386/mm/pgtable.c 2006-03-20 22:19:59.000000000 -0500 +@@ -13,6 +13,7 @@ + #include + #include + #include ++#include + + #include + #include @@ -63,6 +64,8 @@ printk(KERN_INFO "%lu pages pagetables\n", ps.nr_page_table_pages); } From fedora-cvs-commits at redhat.com Tue Mar 21 03:40:17 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 20 Mar 2006 22:40:17 -0500 Subject: rpms/gthumb/FC-5 .cvsignore, 1.19, 1.20 gthumb.spec, 1.38, 1.39 sources, 1.19, 1.20 Message-ID: <200603210340.k2L3eHI5011507@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/gthumb/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv11492 Modified Files: .cvsignore gthumb.spec sources Log Message: 2.7.5 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/gthumb/FC-5/.cvsignore,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- .cvsignore 15 Feb 2006 06:03:08 -0000 1.19 +++ .cvsignore 21 Mar 2006 03:40:15 -0000 1.20 @@ -10,3 +10,4 @@ gthumb-2.7.1.tar.bz2 gthumb-2.7.2.tar.bz2 gthumb-2.7.3.tar.bz2 +gthumb-2.7.5.tar.bz2 Index: gthumb.spec =================================================================== RCS file: /cvs/dist/rpms/gthumb/FC-5/gthumb.spec,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- gthumb.spec 2 Mar 2006 19:22:00 -0000 1.38 +++ gthumb.spec 21 Mar 2006 03:40:15 -0000 1.39 @@ -9,8 +9,8 @@ Summary: Image viewer, editor, organizer Name: gthumb -Version: 2.7.3 -Release: 2 +Version: 2.7.5 +Release: 1 URL: http://gthumb.sourceforge.net Source0: ftp://ftp.gnome.org/pub/GNOME/sources/gthumb/2.4/%{name}-%{version}.tar.bz2 License: GPL @@ -100,6 +100,9 @@ %{_datadir}/pixmaps %changelog +* Mon Mar 20 2006 Matthias Clasen - 2.7.5-1 +- Update to 2.7.5 + * Thu Mar 2 2006 Ray Strode - 2.7.3-2 - Make saving work again (bug 183141) Index: sources =================================================================== RCS file: /cvs/dist/rpms/gthumb/FC-5/sources,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- sources 15 Feb 2006 06:03:22 -0000 1.19 +++ sources 21 Mar 2006 03:40:15 -0000 1.20 @@ -1 +1 @@ -3791412add993ad938f0fe4df021c88b gthumb-2.7.3.tar.bz2 +23a45e1cc1ae9951ac34a3a56da99974 gthumb-2.7.5.tar.bz2 From fedora-cvs-commits at redhat.com Tue Mar 21 04:04:47 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 20 Mar 2006 23:04:47 -0500 Subject: rpms/kernel/FC-5 kernel-2.6.spec, 1.2066, 1.2067 linux-2.6-crashdump-common.patch, 1.12, 1.13 Message-ID: <200603210404.k2L44lYr025380@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv25347 Modified Files: kernel-2.6.spec linux-2.6-crashdump-common.patch Log Message: revert last change, unneeded in xen patched tree. Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-5/kernel-2.6.spec,v retrieving revision 1.2066 retrieving revision 1.2067 diff -u -r1.2066 -r1.2067 --- kernel-2.6.spec 21 Mar 2006 03:25:59 -0000 1.2066 +++ kernel-2.6.spec 21 Mar 2006 04:04:24 -0000 1.2067 @@ -1659,7 +1659,6 @@ %changelog * Mon Mar 20 2006 Dave Jones - ACPI ecdt uid hack. (#185947) -- Fix unresolved symbol in crashdump. * Mon Mar 20 2006 Juan Quintela - fix xen vmx in 64 bits. linux-2.6-crashdump-common.patch: linux-2.6.12/Documentation/sysrq.txt | 8 linux-2.6.12/arch/i386/kernel/nmi.c | 1 linux-2.6.12/arch/i386/kernel/traps.c | 3 linux-2.6.12/arch/i386/mm/init.c | 47 +++++ linux-2.6.12/arch/ia64/kernel/process.c | 30 ++- linux-2.6.12/arch/ia64/kernel/traps.c | 6 linux-2.6.12/arch/ia64/mm/contig.c | 3 linux-2.6.12/arch/ia64/mm/discontig.c | 3 linux-2.6.12/arch/ia64/mm/init.c | 90 +++++++++ linux-2.6.12/arch/powerpc/kernel/process.c | 1 linux-2.6.12/arch/powerpc/kernel/traps.c | 3 linux-2.6.12/arch/powerpc/mm/mem.c | 29 +++ linux-2.6.12/arch/s390/kernel/traps.c | 6 linux-2.6.12/arch/x86_64/kernel/process.c | 2 linux-2.6.12/arch/x86_64/kernel/traps.c | 6 linux-2.6.12/arch/x86_64/mm/init.c | 32 +++ linux-2.6.12/drivers/char/sysrq.c | 2 linux-2.6.12/include/asm-generic/crashdump.h | 47 +++++ linux-2.6.12/include/asm-i386/crashdump.h | 123 +++++++++++++ linux-2.6.12/include/asm-i386/kmap_types.h | 4 linux-2.6.12/include/asm-ia64/crashdump.h | 72 +++++++ linux-2.6.12/include/asm-powerpc/crashdump.h | 61 ++++++ linux-2.6.12/include/asm-x86_64/crashdump.h | 86 +++++++++ linux-2.6.12/include/linux/kernel.h | 18 + linux-2.6.12/kernel/Makefile | 2 linux-2.6.12/kernel/dump.c | 246 +++++++++++++++++++++++++++ linux-2.6.12/kernel/panic.c | 4 linux-2.6.12/kernel/printk.c | 20 ++ linux-2.6.12/kernel/sched.c | 2 linux-2.6.13/arch/x86_64/mm/fault.c | 1 linux-2.6.13/drivers/char/sysrq.c | 5 linux-2.6.16/arch/i386/mm/pgtable.c | 2 32 files changed, 951 insertions(+), 14 deletions(-) Index: linux-2.6-crashdump-common.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-5/linux-2.6-crashdump-common.patch,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- linux-2.6-crashdump-common.patch 21 Mar 2006 03:26:00 -0000 1.12 +++ linux-2.6-crashdump-common.patch 21 Mar 2006 04:04:26 -0000 1.13 @@ -889,14 +889,6 @@ * valid. The argument is a physical page number. --- linux-2.6.16/arch/i386/mm/pgtable.c~ 2006-03-20 22:19:50.000000000 -0500 +++ linux-2.6.16/arch/i386/mm/pgtable.c 2006-03-20 22:19:59.000000000 -0500 -@@ -13,6 +13,7 @@ - #include - #include - #include -+#include - - #include - #include @@ -63,6 +64,8 @@ printk(KERN_INFO "%lu pages pagetables\n", ps.nr_page_table_pages); } From fedora-cvs-commits at redhat.com Tue Mar 21 04:04:27 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 20 Mar 2006 23:04:27 -0500 Subject: rpms/kernel/devel linux-2.6-crashdump-common.patch, 1.12, 1.13 linux-2.6-execshield.patch, 1.13, 1.14 Message-ID: <200603210404.k2L44RTS025361@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv25336 Modified Files: linux-2.6-crashdump-common.patch linux-2.6-execshield.patch Log Message: revert last 'fix'. unneeded in xen patched tree. linux-2.6-crashdump-common.patch: linux-2.6.12/Documentation/sysrq.txt | 8 linux-2.6.12/arch/i386/kernel/nmi.c | 1 linux-2.6.12/arch/i386/kernel/traps.c | 3 linux-2.6.12/arch/i386/mm/init.c | 47 +++++ linux-2.6.12/arch/ia64/kernel/process.c | 30 ++- linux-2.6.12/arch/ia64/kernel/traps.c | 6 linux-2.6.12/arch/ia64/mm/contig.c | 3 linux-2.6.12/arch/ia64/mm/discontig.c | 3 linux-2.6.12/arch/ia64/mm/init.c | 90 +++++++++ linux-2.6.12/arch/powerpc/kernel/process.c | 1 linux-2.6.12/arch/powerpc/kernel/traps.c | 3 linux-2.6.12/arch/powerpc/mm/mem.c | 29 +++ linux-2.6.12/arch/s390/kernel/traps.c | 6 linux-2.6.12/arch/x86_64/kernel/process.c | 2 linux-2.6.12/arch/x86_64/kernel/traps.c | 6 linux-2.6.12/arch/x86_64/mm/init.c | 32 +++ linux-2.6.12/drivers/char/sysrq.c | 2 linux-2.6.12/include/asm-generic/crashdump.h | 47 +++++ linux-2.6.12/include/asm-i386/crashdump.h | 123 +++++++++++++ linux-2.6.12/include/asm-i386/kmap_types.h | 4 linux-2.6.12/include/asm-ia64/crashdump.h | 72 +++++++ linux-2.6.12/include/asm-powerpc/crashdump.h | 61 ++++++ linux-2.6.12/include/asm-x86_64/crashdump.h | 86 +++++++++ linux-2.6.12/include/linux/kernel.h | 18 + linux-2.6.12/kernel/Makefile | 2 linux-2.6.12/kernel/dump.c | 246 +++++++++++++++++++++++++++ linux-2.6.12/kernel/panic.c | 4 linux-2.6.12/kernel/printk.c | 20 ++ linux-2.6.12/kernel/sched.c | 2 linux-2.6.13/arch/x86_64/mm/fault.c | 1 linux-2.6.13/drivers/char/sysrq.c | 5 linux-2.6.16/arch/i386/mm/pgtable.c | 2 32 files changed, 951 insertions(+), 14 deletions(-) Index: linux-2.6-crashdump-common.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-crashdump-common.patch,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- linux-2.6-crashdump-common.patch 21 Mar 2006 03:26:11 -0000 1.12 +++ linux-2.6-crashdump-common.patch 21 Mar 2006 04:03:51 -0000 1.13 @@ -889,14 +889,6 @@ * valid. The argument is a physical page number. --- linux-2.6.16/arch/i386/mm/pgtable.c~ 2006-03-20 22:19:50.000000000 -0500 +++ linux-2.6.16/arch/i386/mm/pgtable.c 2006-03-20 22:19:59.000000000 -0500 -@@ -13,6 +13,7 @@ - #include - #include - #include -+#include - - #include - #include @@ -63,6 +64,8 @@ printk(KERN_INFO "%lu pages pagetables\n", ps.nr_page_table_pages); } linux-2.6-execshield.patch: linux-2.6.16.noarch/include/asm-powerpc/elf.h | 3 linux/arch/i386/kernel/asm-offsets.c | 1 linux/arch/i386/kernel/cpu/common.c | 7 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 | 81 +++++++++++ linux/arch/i386/kernel/traps.c | 93 ++++++++++++- 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/powerpc/kernel/vdso.c | 3 linux/arch/x86_64/ia32/ia32_binfmt.c | 6 linux/arch/x86_64/ia32/syscall32.c | 4 linux/arch/x86_64/kernel/process.c | 6 linux/arch/x86_64/kernel/setup64.c | 23 --- linux/arch/x86_64/mm/fault.c | 2 linux/arch/x86_64/mm/mmap.c | 99 +++++++++++--- linux/drivers/char/random.c | 7 linux/fs/binfmt_elf.c | 151 ++++++++++++++++----- linux/fs/proc/array.c | 8 - linux/fs/proc/base.c | 8 - linux/fs/proc/task_mmu.c | 34 +++- linux/include/asm-i386/a.out.h | 2 linux/include/asm-i386/desc.h | 14 + linux/include/asm-i386/elf.h | 50 +++++-- linux/include/asm-i386/mmu.h | 6 linux/include/asm-i386/page.h | 5 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-powerpc/pgalloc.h | 5 linux/include/asm-ppc/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/pgtable.h | 2 linux/include/linux/mm.h | 16 +- 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 | 57 ++++++++ linux/mm/fremap.c | 16 +- linux/mm/mmap.c | 183 ++++++++++++++++++++++++-- linux/mm/mprotect.c | 5 linux/mm/mremap.c | 4 52 files changed, 931 insertions(+), 161 deletions(-) Index: linux-2.6-execshield.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-execshield.patch,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- linux-2.6-execshield.patch 21 Mar 2006 02:54:20 -0000 1.13 +++ linux-2.6-execshield.patch 21 Mar 2006 04:03:57 -0000 1.14 @@ -215,7 +215,7 @@ + unsigned flags = MAP_PRIVATE; + int err; + -+ current->mm->context.vdso = NULL; ++ current->mm->context.vdso = NULL; + if (unlikely(!vdso_enabled) || unlikely(!sysenter_pages[0])) + return 0; + @@ -244,7 +244,7 @@ + if (unlikely(addr & ~PAGE_MASK)) { + up_write(¤t->mm->mmap_sem); + return addr; -+ } ++ } + err = install_special_mapping(current->mm, addr, len, + VM_DONTEXPAND | VM_READ | VM_EXEC | + VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC, From fedora-cvs-commits at redhat.com Tue Mar 21 04:07:28 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 20 Mar 2006 23:07:28 -0500 Subject: rpms/policycoreutils/devel policycoreutils-rhat.patch, 1.173, 1.174 policycoreutils.spec, 1.247, 1.248 Message-ID: <200603210407.k2L47Sos025430@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/policycoreutils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv25416 Modified Files: policycoreutils-rhat.patch policycoreutils.spec Log Message: * Mon Mar 20 2006 Dan Walsh 1.30-4 - Open file descriptor to make sure file does not change from underneath. policycoreutils-rhat.patch: Makefile | 2 restorecond/Makefile | 29 ++ restorecond/restorecond.8 | 31 ++ restorecond/restorecond.c | 452 +++++++++++++++++++++++++++++++++++++++++++ restorecond/restorecond.conf | 3 restorecond/restorecond.h | 31 ++ restorecond/restorecond.init | 61 +++++ restorecond/stringslist.c | 118 +++++++++++ restorecond/stringslist.h | 37 +++ restorecond/utmpwatcher.c | 105 +++++++++ restorecond/utmpwatcher.h | 29 ++ scripts/fixfiles | 10 semanage/seobject.py | 8 13 files changed, 910 insertions(+), 6 deletions(-) Index: policycoreutils-rhat.patch =================================================================== RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v retrieving revision 1.173 retrieving revision 1.174 diff -u -r1.173 -r1.174 --- policycoreutils-rhat.patch 20 Mar 2006 21:24:16 -0000 1.173 +++ policycoreutils-rhat.patch 21 Mar 2006 04:07:13 -0000 1.174 @@ -1,6 +1,6 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/Makefile policycoreutils-1.30/Makefile --- nsapolicycoreutils/Makefile 2005-11-29 10:55:01.000000000 -0500 -+++ policycoreutils-1.30/Makefile 2006-03-17 23:29:02.000000000 -0500 ++++ policycoreutils-1.30/Makefile 2006-03-20 22:51:07.000000000 -0500 @@ -1,4 +1,4 @@ -SUBDIRS=setfiles semanage load_policy newrole run_init restorecon audit2allow audit2why scripts sestatus semodule_package semodule semodule_link semodule_expand setsebool po +SUBDIRS=setfiles semanage load_policy newrole run_init restorecon restorecond audit2allow audit2why scripts sestatus semodule_package semodule semodule_link semodule_expand setsebool po @@ -9,7 +9,7 @@ @for subdir in $(SUBDIRS); do \ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/restorecond/Makefile policycoreutils-1.30/restorecond/Makefile --- nsapolicycoreutils/restorecond/Makefile 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.30/restorecond/Makefile 2006-03-17 23:29:02.000000000 -0500 ++++ policycoreutils-1.30/restorecond/Makefile 2006-03-20 22:51:07.000000000 -0500 @@ -0,0 +1,29 @@ +# Installation directories. +PREFIX ?= ${DESTDIR}/usr @@ -42,7 +42,7 @@ + diff --exclude-from=exclude -N -u -r nsapolicycoreutils/restorecond/restorecond.8 policycoreutils-1.30/restorecond/restorecond.8 --- nsapolicycoreutils/restorecond/restorecond.8 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.30/restorecond/restorecond.8 2006-03-17 23:29:02.000000000 -0500 ++++ policycoreutils-1.30/restorecond/restorecond.8 2006-03-20 22:51:07.000000000 -0500 @@ -0,0 +1,31 @@ +.TH "restorecond" "8" "2002031409" "" "" +.SH "NAME" @@ -77,8 +77,8 @@ +.BR restorecon (8), diff --exclude-from=exclude -N -u -r nsapolicycoreutils/restorecond/restorecond.c policycoreutils-1.30/restorecond/restorecond.c --- nsapolicycoreutils/restorecond/restorecond.c 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.30/restorecond/restorecond.c 2006-03-20 15:57:28.000000000 -0500 -@@ -0,0 +1,436 @@ ++++ policycoreutils-1.30/restorecond/restorecond.c 2006-03-20 22:51:13.000000000 -0500 +@@ -0,0 +1,452 @@ +/* + * restorecond + * @@ -235,13 +235,26 @@ + security_context_t prev_context=NULL; + struct stat st; + char path[PATH_MAX+1]; ++ int fd=-1; + if (debug_mode) + printf("restore %s\n", filename); + -+ if (lstat(filename, &st)!=0) return; ++ fd = open(filename, O_NOFOLLOW | O_RDONLY ); ++ if ( fd < 0 ) { ++ syslog(LOG_ERR,"Unable to open file (%s) %s\n", filename,strerror(errno)); ++ return; ++ } ++ ++ ++ if (fstat(fd, &st)!=0) { ++ syslog(LOG_ERR,"Unable to stat file (%s) %s\n", filename,strerror(errno)); ++ close(fd); ++ return; ++ } + + if (st.st_nlink > 1) { + syslog(LOG_ERR,"Will not restore a file with more than one hard link (%s) %s\n", filename,strerror(errno)); ++ close(fd); + return; + } + @@ -251,7 +264,7 @@ + syslog(LOG_ERR,"matchpathcon(%s) failed %s\n", filename,strerror(errno)); + return; + } -+ retcontext=lgetfilecon(filename,&prev_context); ++ retcontext=fgetfilecon(fd,&prev_context); + + if (retcontext >= 0 || errno == ENODATA) { + if (retcontext < 0) prev_context=NULL; @@ -261,15 +274,17 @@ + if (only_changed_user(scontext, prev_context) != 0) { + free(scontext); + free(prev_context); ++ close(fd); + return; + } + -+ if (lsetfilecon(filename,scontext) < 0) { ++ if (fsetfilecon(fd,scontext) < 0) { + syslog(LOG_ERR,"set context %s->%s failed:'%s'\n", + filename, scontext, strerror(errno)); + if (retcontext >= 0) + free(prev_context); + free(scontext); ++ close(fd); + return; + } + syslog(LOG_WARNING,"Reset file context %s: %s->%s\n", filename, prev_context, scontext); @@ -282,6 +297,7 @@ + filename, strerror(errno)); + } + free(scontext); ++ close(fd); +} + +static void process_config(int fd, FILE *cfg) { @@ -517,14 +533,14 @@ +} diff --exclude-from=exclude -N -u -r nsapolicycoreutils/restorecond/restorecond.conf policycoreutils-1.30/restorecond/restorecond.conf --- nsapolicycoreutils/restorecond/restorecond.conf 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.30/restorecond/restorecond.conf 2006-03-17 23:29:02.000000000 -0500 ++++ policycoreutils-1.30/restorecond/restorecond.conf 2006-03-20 22:51:07.000000000 -0500 @@ -0,0 +1,3 @@ +/etc/resolv.conf +/etc/mtab +~/public_html diff --exclude-from=exclude -N -u -r nsapolicycoreutils/restorecond/restorecond.h policycoreutils-1.30/restorecond/restorecond.h --- nsapolicycoreutils/restorecond/restorecond.h 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.30/restorecond/restorecond.h 2006-03-17 23:29:02.000000000 -0500 ++++ policycoreutils-1.30/restorecond/restorecond.h 2006-03-20 22:51:07.000000000 -0500 @@ -0,0 +1,31 @@ +/* restorecond.h -- + * Copyright 2006 Red Hat Inc., Durham, North Carolina. @@ -559,8 +575,8 @@ + diff --exclude-from=exclude -N -u -r nsapolicycoreutils/restorecond/restorecond.init policycoreutils-1.30/restorecond/restorecond.init --- nsapolicycoreutils/restorecond/restorecond.init 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.30/restorecond/restorecond.init 2006-03-17 23:29:02.000000000 -0500 -@@ -0,0 +1,57 @@ ++++ policycoreutils-1.30/restorecond/restorecond.init 2006-03-20 23:04:15.000000000 -0500 +@@ -0,0 +1,61 @@ +#!/bin/sh +# +# restorecond: Daemo used to maintain path file context @@ -591,6 +607,11 @@ + rm -f /var/lock/subsys/restorecond + echo +} ++restart() ++{ ++ stop ++ start ++} + +[ -f /usr/sbin/restorecond ] || exit 0 + @@ -606,11 +627,10 @@ + status restorecond + ;; + restart|reload) -+ stop -+ start ++ restart + ;; + condrestart) -+ [ -e /var/lock/subsys/restorecond ] && (stop; start) ++ [ -e /var/lock/subsys/restorecond ] && restart || : + ;; + *) + echo $"Usage: $0 {start|stop|restart|reload|condrestart}" @@ -620,7 +640,7 @@ +exit 0 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/restorecond/stringslist.c policycoreutils-1.30/restorecond/stringslist.c --- nsapolicycoreutils/restorecond/stringslist.c 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.30/restorecond/stringslist.c 2006-03-17 23:29:02.000000000 -0500 ++++ policycoreutils-1.30/restorecond/stringslist.c 2006-03-20 22:51:07.000000000 -0500 @@ -0,0 +1,118 @@ +/* + * Copyright (C) 2006 Red Hat @@ -742,7 +762,7 @@ +#endif diff --exclude-from=exclude -N -u -r nsapolicycoreutils/restorecond/stringslist.h policycoreutils-1.30/restorecond/stringslist.h --- nsapolicycoreutils/restorecond/stringslist.h 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.30/restorecond/stringslist.h 2006-03-17 23:29:02.000000000 -0500 ++++ policycoreutils-1.30/restorecond/stringslist.h 2006-03-20 22:51:07.000000000 -0500 @@ -0,0 +1,37 @@ +/* stringslist.h -- + * Copyright 2006 Red Hat Inc., Durham, North Carolina. @@ -783,7 +803,7 @@ +#endif diff --exclude-from=exclude -N -u -r nsapolicycoreutils/restorecond/utmpwatcher.c policycoreutils-1.30/restorecond/utmpwatcher.c --- nsapolicycoreutils/restorecond/utmpwatcher.c 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.30/restorecond/utmpwatcher.c 2006-03-17 23:29:02.000000000 -0500 ++++ policycoreutils-1.30/restorecond/utmpwatcher.c 2006-03-20 22:51:07.000000000 -0500 @@ -0,0 +1,105 @@ +/* + * utmpwatcher.c @@ -892,7 +912,7 @@ + diff --exclude-from=exclude -N -u -r nsapolicycoreutils/restorecond/utmpwatcher.h policycoreutils-1.30/restorecond/utmpwatcher.h --- nsapolicycoreutils/restorecond/utmpwatcher.h 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.30/restorecond/utmpwatcher.h 2006-03-17 23:29:02.000000000 -0500 ++++ policycoreutils-1.30/restorecond/utmpwatcher.h 2006-03-20 22:51:07.000000000 -0500 @@ -0,0 +1,29 @@ +/* utmpwatcher.h -- + * Copyright 2006 Red Hat Inc., Durham, North Carolina. @@ -925,7 +945,7 @@ +#endif diff --exclude-from=exclude -N -u -r nsapolicycoreutils/scripts/fixfiles policycoreutils-1.30/scripts/fixfiles --- nsapolicycoreutils/scripts/fixfiles 2006-01-04 13:07:46.000000000 -0500 -+++ policycoreutils-1.30/scripts/fixfiles 2006-03-20 15:50:23.000000000 -0500 ++++ policycoreutils-1.30/scripts/fixfiles 2006-03-20 22:51:07.000000000 -0500 @@ -124,7 +124,15 @@ exit $? fi @@ -945,8 +965,8 @@ LogReadOnly diff --exclude-from=exclude -N -u -r nsapolicycoreutils/semanage/seobject.py policycoreutils-1.30/semanage/seobject.py --- nsapolicycoreutils/semanage/seobject.py 2006-03-10 09:48:05.000000000 -0500 -+++ policycoreutils-1.30/semanage/seobject.py 2006-03-17 23:29:02.000000000 -0500 -@@ -549,7 +548,7 @@ ++++ policycoreutils-1.30/semanage/seobject.py 2006-03-20 22:51:07.000000000 -0500 +@@ -549,7 +549,7 @@ raise ValueError("Could not list roles for user %s" % name) roles = string.join(rlist, ' '); @@ -955,7 +975,7 @@ return ddict -@@ -559,10 +558,10 @@ +@@ -559,10 +559,10 @@ keys.sort() if is_mls_enabled == 1: if heading: Index: policycoreutils.spec =================================================================== RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils.spec,v retrieving revision 1.247 retrieving revision 1.248 diff -u -r1.247 -r1.248 --- policycoreutils.spec 20 Mar 2006 21:25:44 -0000 1.247 +++ policycoreutils.spec 21 Mar 2006 04:07:26 -0000 1.248 @@ -5,7 +5,7 @@ Summary: SELinux policy core utilities. Name: policycoreutils Version: 1.30 -Release: 3 +Release: 4 License: GPL Group: System Environment/Base Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz @@ -103,7 +103,13 @@ %attr(755,root,root) /etc/rc.d/init.d/restorecond %config(noreplace) /etc/selinux/restorecond.conf +%post +service restorecond condrestart + %changelog +* Mon Mar 20 2006 Dan Walsh 1.30-4 +- Open file descriptor to make sure file does not change from underneath. + * Fri Mar 17 2006 Dan Walsh 1.30-3 - Fixes for restorecond attack via symlinks - Fixes for fixfiles From fedora-cvs-commits at redhat.com Tue Mar 21 04:44:56 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 20 Mar 2006 23:44:56 -0500 Subject: rpms/kernel/devel kernel-2.6.spec,1.2073,1.2074 Message-ID: <200603210444.k2L4iuXu006947@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv6933 Modified Files: kernel-2.6.spec Log Message: disable xen for now Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.2073 retrieving revision 1.2074 diff -u -r1.2073 -r1.2074 --- kernel-2.6.spec 20 Mar 2006 22:52:34 -0000 1.2073 +++ kernel-2.6.spec 21 Mar 2006 04:44:54 -0000 1.2074 @@ -8,7 +8,7 @@ # Whether to apply the Xen patches, leave this enabled. %define includexen 1 # Whether to build the Xen kernels, disable if you want. -%define buildxen 1 +%define buildxen 0 %define buildxenPAE 0 %define builddoc 0 %define buildkdump 1 From fedora-cvs-commits at redhat.com Tue Mar 21 08:29:06 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 21 Mar 2006 03:29:06 -0500 Subject: rpms/libwpd/devel libwpd.spec,1.22,1.23 Message-ID: <200603210829.k2L8T6mg020813@cvs.devel.redhat.com> Author: caolanm Update of /cvs/dist/rpms/libwpd/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv20800 Modified Files: libwpd.spec Log Message: rebuild Index: libwpd.spec =================================================================== RCS file: /cvs/dist/rpms/libwpd/devel/libwpd.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- libwpd.spec 11 Feb 2006 04:16:37 -0000 1.22 +++ libwpd.spec 21 Mar 2006 08:29:04 -0000 1.23 @@ -1,7 +1,7 @@ Name: libwpd Summary: Library for reading and converting WordPerfect(tm) documents. Version: 0.8.4 -Release: 1.2.1 +Release: 2 Source: %{name}-%{version}.tar.gz Group: System Environment/Libraries URL: http://libwpd.sf.net/ @@ -66,6 +66,9 @@ %{_includedir}/libwpd-0.8/libwpd %changelog +* Tue Mar 21 2006 Caolan McNamara 0.8.4-2 +- rebuild for libgsf + * Fri Feb 10 2006 Jesse Keating - 0.8.4-1.2.1 - bump again for double-long bug on ppc(64) From fedora-cvs-commits at redhat.com Tue Mar 21 08:34:16 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 21 Mar 2006 03:34:16 -0500 Subject: rpms/librsvg2/devel librsvg2.spec,1.43,1.44 Message-ID: <200603210834.k2L8YGC5020917@cvs.devel.redhat.com> Author: caolanm Update of /cvs/dist/rpms/librsvg2/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv20893 Modified Files: librsvg2.spec Log Message: rebuild for new libgsf Index: librsvg2.spec =================================================================== RCS file: /cvs/dist/rpms/librsvg2/devel/librsvg2.spec,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- librsvg2.spec 12 Mar 2006 19:39:44 -0000 1.43 +++ librsvg2.spec 21 Mar 2006 08:33:46 -0000 1.44 @@ -13,7 +13,7 @@ Name: librsvg2 Summary: An SVG library based on cairo. Version: 2.14.2 -Release: 1 +Release: 2 License: LGPL Group: System Environment/Libraries @@ -120,6 +120,9 @@ ##%doc %{_datadir}/gtk-doc/html/rsvg %changelog +* Tue Mar 21 2006 Caolan McNamara 2.14.2-2 +- rebuild against new libgsf + * Sun Mar 12 2006 Ray Strode 2.14.2-1 - Update to 2.14.2 From fedora-cvs-commits at redhat.com Tue Mar 21 08:34:27 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 21 Mar 2006 03:34:27 -0500 Subject: rpms/gsf-sharp/devel gsf-sharp.spec,1.10,1.11 Message-ID: <200603210834.k2L8YRZF020923@cvs.devel.redhat.com> Author: caolanm Update of /cvs/dist/rpms/gsf-sharp/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv20905 Modified Files: gsf-sharp.spec Log Message: rebuild against libgsf Index: gsf-sharp.spec =================================================================== RCS file: /cvs/dist/rpms/gsf-sharp/devel/gsf-sharp.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- gsf-sharp.spec 1 Mar 2006 13:34:07 -0000 1.10 +++ gsf-sharp.spec 21 Mar 2006 08:34:15 -0000 1.11 @@ -1,6 +1,6 @@ Name: gsf-sharp Version: 0.6 -Release: 8 +Release: 9 Summary: Mono bindings for libgsf Group: System Environment/Libraries @@ -50,6 +50,9 @@ %{_prefix}/share/gapi-2.0/gsf-api.xml %changelog +* Tue Mar 21 2006 Caolan McNamara 0.6-9 +- rebuild against new libgsf + * Wed Mar 01 2006 Karsten Hopp 0.6-8 - Buildrequires: gtk-sharp2 From fedora-cvs-commits at redhat.com Tue Mar 21 09:15:53 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 21 Mar 2006 04:15:53 -0500 Subject: rpms/curl/devel .cvsignore, 1.18, 1.19 curl.spec, 1.34, 1.35 sources, 1.19, 1.20 Message-ID: <200603210915.k2L9FruO003072@cvs.devel.redhat.com> Author: varekova Update of /cvs/dist/rpms/curl/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv3058 Modified Files: .cvsignore curl.spec sources Log Message: - fix multilib problem using pkg-config - update to 7.15.3 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/curl/devel/.cvsignore,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- .cvsignore 8 Dec 2005 09:10:33 -0000 1.18 +++ .cvsignore 21 Mar 2006 09:15:50 -0000 1.19 @@ -1 +1 @@ -curl-7.15.1.tar.bz2 +curl-7.15.3.tar.bz2 Index: curl.spec =================================================================== RCS file: /cvs/dist/rpms/curl/devel/curl.spec,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- curl.spec 23 Feb 2006 11:58:07 -0000 1.34 +++ curl.spec 21 Mar 2006 09:15:51 -0000 1.35 @@ -1,12 +1,13 @@ Summary: A utility for getting files from remote servers (FTP, HTTP, and others). Name: curl -Version: 7.15.1 -Release: 2 +Version: 7.15.3 +Release: 1 License: MIT Group: Applications/Internet Source: http://curl.haxx.se/download/%{name}-%{version}.tar.bz2 Patch0: curl-7.14.1-nousr.patch Patch1: curl-7.15.0-curl_config-version.patch +Patch2: curl-7.15.3-multilib.patch URL: http://curl.haxx.se/ BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildRequires: openssl-devel, libtool, pkgconfig, libidn-devel @@ -36,6 +37,7 @@ %setup -q %patch0 -p1 -b .nousr %patch1 -p1 -b .ver +%patch2 -p1 -b .multilib %build aclocal @@ -56,19 +58,6 @@ %makeinstall rm -f ${RPM_BUILD_ROOT}%{_libdir}/libcurl.la -curlcsuffix=`echo %{_libdir} | sed s,/usr/,,` -mv $RPM_BUILD_ROOT%{_bindir}/curl-config $RPM_BUILD_ROOT%{_bindir}/curl-config-$curlcsuffix -cat > $RPM_BUILD_ROOT%{_bindir}/curl-config < - 7.15.3-1 +- fix multilib problem using pkg-config +- update to 7.15.3 + * Thu Feb 23 2006 Ivana Varekova - 7.15.1-2 - fix multilib problem - #181290 - curl-devel.i386 not installable together with curl-devel.x86-64 Index: sources =================================================================== RCS file: /cvs/dist/rpms/curl/devel/sources,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- sources 8 Dec 2005 09:10:34 -0000 1.19 +++ sources 21 Mar 2006 09:15:51 -0000 1.20 @@ -1 +1 @@ -d330d48580bfade58c82d4f295f171f0 curl-7.15.1.tar.bz2 +d71b2ee8febfde2c7dc30a43638ec0d9 curl-7.15.3.tar.bz2 From fedora-cvs-commits at redhat.com Tue Mar 21 09:17:49 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 21 Mar 2006 04:17:49 -0500 Subject: rpms/curl/devel curl-7.15.3-multilib.patch,NONE,1.1 Message-ID: <200603210917.k2L9HnMr016789@cvs.devel.redhat.com> Author: varekova Update of /cvs/dist/rpms/curl/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv14982 Added Files: curl-7.15.3-multilib.patch Log Message: added multilib patch curl-7.15.3-multilib.patch: curl-config.in | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) --- NEW FILE curl-7.15.3-multilib.patch --- --- curl-7.15.1/curl-config.in.pom 2005-09-04 20:15:24.000000000 +0200 +++ curl-7.15.1/curl-config.in 2006-03-20 14:12:04.485640816 +0100 @@ -50,7 +50,7 @@ ;; --cc) - echo "@CC@" + echo "gcc" ;; --prefix) @@ -143,7 +143,7 @@ ;; --libs) - echo -L at libdir@ -lcurl @LDFLAGS@ @LIBS@ + pkg-config libcurl --libs ;; *) From fedora-cvs-commits at redhat.com Tue Mar 21 09:49:35 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 21 Mar 2006 04:49:35 -0500 Subject: rpms/curl/FC-5 curl-7.15.1-cve-2006-1061.patch, NONE, 1.1 curl-7.15.1-multilib.patch, NONE, 1.1 curl.spec, 1.34, 1.35 Message-ID: <200603210949.k2L9nZoF030651@cvs.devel.redhat.com> Author: varekova Update of /cvs/dist/rpms/curl/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv30631 Modified Files: curl.spec Added Files: curl-7.15.1-cve-2006-1061.patch curl-7.15.1-multilib.patch Log Message: - fix multilib problem using pkg-config - fix cve-2006-1061 problem - cURL tftp buffer overflow ---------------------------------------------------------------------- curl-7.15.1-cve-2006-1061.patch: tftp.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletion(-) --- NEW FILE curl-7.15.1-cve-2006-1061.patch --- --- curl-7.15.1/lib/tftp.c.cve-200-1061 2005-12-05 21:10:37.000000000 +0100 +++ curl-7.15.1/lib/tftp.c 2006-03-20 13:44:18.020981952 +0100 @@ -271,7 +271,9 @@ /* If we are downloading, send an RRQ */ state->spacket.event = htons(TFTP_EVENT_RRQ); } - sprintf((char *)state->spacket.u.request.data, "%s%c%s%c", + snprintf((char *)state->spacket.u.request.data, + sizeof(state->spacket.u.request.data), + "%s%c%s%c", filename, '\0', mode, '\0'); sbytes = 4 + (int)strlen(filename) + (int)strlen(mode); sbytes = sendto(state->sockfd, (void *)&state->spacket, curl-7.15.1-multilib.patch: curl-config.in | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) --- NEW FILE curl-7.15.1-multilib.patch --- --- curl-7.15.1/curl-config.in.pom 2005-09-04 20:15:24.000000000 +0200 +++ curl-7.15.1/curl-config.in 2006-03-20 14:12:04.485640816 +0100 @@ -50,7 +50,7 @@ ;; --cc) - echo "@CC@" + echo "gcc" ;; --prefix) @@ -143,7 +143,7 @@ ;; --libs) - echo -L at libdir@ -lcurl @LDFLAGS@ @LIBS@ + pkg-config libcurl --libs ;; *) Index: curl.spec =================================================================== RCS file: /cvs/dist/rpms/curl/FC-5/curl.spec,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- curl.spec 23 Feb 2006 11:58:07 -0000 1.34 +++ curl.spec 21 Mar 2006 09:49:33 -0000 1.35 @@ -1,12 +1,14 @@ Summary: A utility for getting files from remote servers (FTP, HTTP, and others). Name: curl Version: 7.15.1 -Release: 2 +Release: 3 License: MIT Group: Applications/Internet Source: http://curl.haxx.se/download/%{name}-%{version}.tar.bz2 Patch0: curl-7.14.1-nousr.patch Patch1: curl-7.15.0-curl_config-version.patch +Patch2: curl-7.15.1-cve-2006-1061.patch +Patch3: curl-7.15.1-multilib.patch URL: http://curl.haxx.se/ BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildRequires: openssl-devel, libtool, pkgconfig, libidn-devel @@ -36,6 +38,8 @@ %setup -q %patch0 -p1 -b .nousr %patch1 -p1 -b .ver +%patch2 -p1 -b .cve-2006-1061 +%patch3 -p1 -b .pom %build aclocal @@ -56,19 +60,6 @@ %makeinstall rm -f ${RPM_BUILD_ROOT}%{_libdir}/libcurl.la -curlcsuffix=`echo %{_libdir} | sed s,/usr/,,` -mv $RPM_BUILD_ROOT%{_bindir}/curl-config $RPM_BUILD_ROOT%{_bindir}/curl-config-$curlcsuffix -cat > $RPM_BUILD_ROOT%{_bindir}/curl-config < - 7.15.1-3 +- fix multilib problem using pkg-config +- fix cve-2006-1061 problem - cURL tftp buffer overflow + * Thu Feb 23 2006 Ivana Varekova - 7.15.1-2 - fix multilib problem - #181290 - curl-devel.i386 not installable together with curl-devel.x86-64 From fedora-cvs-commits at redhat.com Tue Mar 21 10:44:11 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 21 Mar 2006 05:44:11 -0500 Subject: rpms/openoffice.org/devel openoffice.org.spec, 1.642, 1.643 openoffice.org-2.0.1.gcc25199.bitfieldaccess.patch, 1.1, NONE Message-ID: <200603211044.k2LAiBHu012218@cvs.devel.redhat.com> Author: caolanm Update of /cvs/dist/rpms/openoffice.org/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv12205 Modified Files: openoffice.org.spec Removed Files: openoffice.org-2.0.1.gcc25199.bitfieldaccess.patch Log Message: drop fc4 junk Index: openoffice.org.spec =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v retrieving revision 1.642 retrieving revision 1.643 diff -u -r1.642 -r1.643 --- openoffice.org.spec 16 Mar 2006 13:17:19 -0000 1.642 +++ openoffice.org.spec 21 Mar 2006 10:44:09 -0000 1.643 @@ -1,9 +1,9 @@ %define oootag OOB680 %define ooomilestone 5 -%define rh_rpm_release 3 +%define rh_rpm_release 2cmc -%define build_fc5 1 -%define build_fc4 0 +%define build_fc6 1 +%define build_fc5 0 %define build_rhel4 0 # gcc#19664# @@ -18,24 +18,7 @@ %define internalicu 1 %define internalagg 1 %define internaljavabits 1 -%define includeemailmerge 1 -%define cripplemenus 1 -%define seperatebase 1 %define gnomeprintui 0 -%define fc5langpack 1 -%endif -%if %{build_fc4} -%define forcegcc4 0 -%define rh_rpm_extension 1 -%define internalxmlsec 1 -%define internalicu 1 -%define internalagg 1 -%define internaljavabits 1 -%define includeemailmerge 0 -%define cripplemenus 0 -%define seperatebase 0 -%define gnomeprintui 0 -%define fc5langpack 0 %endif %if %{build_fc5} %define forcegcc4 0 @@ -44,12 +27,18 @@ %define internalicu 0 %define internalagg 0 %define internaljavabits 0 -%define includeemailmerge 1 -%define cripplemenus 1 -%define seperatebase 1 %define gnomeprintui 1 -%define fc5langpack 1 %endif +%if %{build_fc6} +%define forcegcc4 0 +%define rh_rpm_extension 3 +%define internalxmlsec 0 +%define internalicu 0 +%define internalagg 0 +%define internaljavabits 0 +%define gnomeprintui 1 +%endif + %if %{forcegcc4} %define gij gij4 @@ -104,12 +93,7 @@ %endif %if %{langpacks} -%define langpack_core af ar bg bn ca cs cy da de el en-US es et eu fi fr gl gu-IN pa-IN he hi-IN hu hr it ja ko lt ms nb nl nn pl pt pt-BR ru sk sl sv ta-IN th tr zh-CN zh-TW zu -%if %{fc5langpack} -%define langpack_langs %{langpack_core} ga sr-CS -%else -%define langpack_langs %{langpack_core} -%endif +%define langpack_langs af ar bg bn ca cs cy da de el en-US es et eu fi fr ga gl gu-IN pa-IN he hi-IN hu hr it ja ko lt ms nb nl nn pl pt pt-BR ru sk sl sr-CS sv ta-IN th tr zh-CN zh-TW zu %else %define langpack_langs en-US %endif @@ -196,15 +180,14 @@ Patch26: workspace.targetedaot.patch Patch27: openoffice.org-2.0.1.ooo58663.vcl.missingglyph.patch Patch28: openoffice.org-2.0.1.ooo58606.sw.pre-edit.patch -Patch29: openoffice.org-2.0.1.gcc25199.bitfieldaccess.patch -Patch30: openoffice.org-2.0.1-ooo59675.sysui.rtfmimetype.patch -Patch31: openoffice.org-2.0.1-ooo59997.sw.defaultbullets.patch -Patch32: openoffice.org-2.0.1-ooo19976.framework.nofocussteal.patch -Patch33: openoffice.org-2.0.2.ooo61875.sd.compile.patch -Patch34: openoffice.org-2.0.2-ooo61841.vcl.honourfontconfigoverrides.patch -Patch35: openoffice.org-2.0.2.ooo62030.solenv._version.patch -Patch36: openoffice.org-2.0.2.oooXXXXX.config_office.noppds.patch -Patch37: openoffice.org-2.0.2.ooo63155.sfx2.badscript.patch +Patch29: openoffice.org-2.0.1-ooo59675.sysui.rtfmimetype.patch +Patch30: openoffice.org-2.0.1-ooo59997.sw.defaultbullets.patch +Patch31: openoffice.org-2.0.1-ooo19976.framework.nofocussteal.patch +Patch32: openoffice.org-2.0.2.ooo61875.sd.compile.patch +Patch33: openoffice.org-2.0.2-ooo61841.vcl.honourfontconfigoverrides.patch +Patch34: openoffice.org-2.0.2.ooo62030.solenv._version.patch +Patch35: openoffice.org-2.0.2.oooXXXXX.config_office.noppds.patch +Patch36: openoffice.org-2.0.2.ooo63155.sfx2.badscript.patch %define instdir %{_libdir}/openoffice.org2.0 @@ -262,7 +245,6 @@ external to %{name} and within the internal %{name} scripting module to be written in python -%if %{seperatebase} %package base Summary: database frontend for %{name} Group: Development/Libraries @@ -271,7 +253,6 @@ %description base Gui database frontend for %{name}. Allows creation and management of databases through a GUI. -%endif %package writer Summary: writer module for %{name} @@ -283,7 +264,6 @@ %description writer wordprocessor application of %{name} -%if %{includeemailmerge} %package emailmerge Summary: email mail merge component for %{name} Group: Applications/Productivity @@ -293,7 +273,6 @@ %description emailmerge enables %{name} writer module to enable mail merge to email -%endif %package calc Summary: calc module for %{name} @@ -510,7 +489,6 @@ %description langpack-fr Provides additional french translations for %{name} -%if %{fc5langpack} %package langpack-ga_IE Summary: Irish language pack for %{name} Group: Applications/Productivity @@ -518,7 +496,6 @@ %description langpack-ga_IE Provides additional irish translations for %{name} -%endif %package langpack-gl_ES Summary: Galician language pack for %{name} @@ -732,7 +709,6 @@ %description langpack-sl_SI Provides additional slovenian translations for %{name} -%if %{fc5langpack} %package langpack-sr_CS Summary: Serbian language pack for %{name} Group: Applications/Productivity @@ -740,7 +716,6 @@ %description langpack-sr_CS Provides additional serbian translations for %{name} -%endif %package langpack-sv Summary: Swedish language pack for %{name} @@ -823,9 +798,7 @@ %if %{gnomeprintui} %patch5 -p1 -b .rh127576.gnomeprintui.patch %endif -%if %{cripplemenus} %patch6 -p1 -b .rh156677.cripplemenus.sysui.patch -%endif %patch7 -p1 -b .rh171692.jvmfwk.defaulttogcj.patch %patch8 -p1 -b .rhXXXXX.extensions.defaulttoevo2.patch %patch9 -p1 -b .ooo34909.dbaccess.patch @@ -852,17 +825,14 @@ %patch26 -p1 -b .workspace.targetedaot.patch %patch27 -p1 -b .ooo58663.vcl.missingglyph.patch %patch28 -p1 -b .ooo58606.sw.pre-edit.patch -%if %{build_fc4} -%patch29 -p1 -b .gcc25199.bitfieldaccess.patch -%endif -%patch30 -p1 -b .ooo59675.sysui.rtfmimetype.patch -%patch31 -p1 -b .ooo59997.sw.defaultbullets.patch -%patch32 -p1 -b .ooo19976.framework.nofocussteal.patch -%patch33 -p1 -b .ooo61875.sd.compile.patch -%patch34 -p1 -b .ooo61841.vcl.honourfontconfigoverrides.patch -%patch35 -p1 -b .ooo62030.solenv._version.patch -%patch36 -p1 -b .oooXXXXX.config_office.noppds.patch -%patch37 -p1 -b .ooo63155.sfx2.badscript.patch +%patch29 -p1 -b .ooo59675.sysui.rtfmimetype.patch +%patch30 -p1 -b .ooo59997.sw.defaultbullets.patch +%patch31 -p1 -b .ooo19976.framework.nofocussteal.patch +%patch32 -p1 -b .ooo61875.sd.compile.patch +%patch33 -p1 -b .ooo61841.vcl.honourfontconfigoverrides.patch +%patch34 -p1 -b .ooo62030.solenv._version.patch +%patch35 -p1 -b .oooXXXXX.config_office.noppds.patch +%patch36 -p1 -b .ooo63155.sfx2.badscript.patch %if %{includingexternals} #start ludicrous workaround @@ -870,14 +840,14 @@ #libxmlsec/db4 then this needs to be modified/dropped find_provides="%{__find_provides}" echo "#!/bin/sh" > find-provides -echo "$find_provides | grep -v libxmlsec1 | grep -v libdb- | grep -v libicu" >> find-provides +echo "$find_provides | grep -v libxmlsec1 | grep -v libicu" >> find-provides echo "exit 0" >> find-provides chmod +x find-provides %define __find_provides %{_builddir}/%{ooo_base_name}/find-provides find_requires="%{__find_requires}" echo "#!/bin/sh" > find-requires -echo "$find_requires | grep -v libxmlsec1 | grep -v libdb- | grep -v libicu | grep -v \(" >> find-requires +echo "$find_requires | grep -v libxmlsec1 | grep -v libicu | grep -v \(" >> find-requires echo "exit 0" >> find-requires chmod +x find-requires %define __find_requires %{_builddir}/%{ooo_base_name}/find-requires @@ -937,10 +907,6 @@ esac ARCH_FLAGS="$ARCH_FLAGS $i" done -# gcc#25199# -%if %{build_fc4} -ARCH_FLAGS=${ARCH_FLAGS/-mtune=pentium4/-mtune=pentiumpro} -%endif export ARCH_FLAGS @@ -1013,7 +979,7 @@ sed -i -e "s/OBJ/SLO/" makefile.mk dmake cd ../../util -`(cat ../$OUTPATH.pro/misc/soffice.cmd | sed -e "s/obj/slo/g" | sed -e "s/bin\/soffice/lib\/libsoffice.so -shared/" && grep ^lib ../$OUTPATH.pro/misc/pagein-common | cut -c 4- | cut -d "." -f 1 | awk '{ print "-l"$0 }') | xargs | xargs` +`(cat ../$OUTPATH.pro/misc/soffice.cmd | sed -e "s/obj/slo/g" | sed -e "s/bin\/soffice/lib\/libsoffice.so -shared/" && grep ^lib ../$OUTPATH.pro/misc/pagein-common | cut -c 4- | cut -d "." -f 1 | awk '{ print "-l"$0 }') | xargs | xargs` -lgcj $LINK -Wl,-z,combreloc -Wl,-z,defs -Wl,-rpath,'$ORIGIN' -Wl,-export-dynamic -Wl,--noinhibit-exec $SOLARLIB -L../$OUTPATH.pro/lib -lsoffice -o ../$OUTPATH.pro/bin/soffice `( (echo $LINK -Wl,-z,combreloc -Wl,-z,defs -Wl,-rpath,'$ORIGIN' -Wl,-export-dynamic -Wl,--noinhibit-exec $SOLARLIB -L../$OUTPATH.pro/lib -lsoffice -o ../$OUTPATH.pro/bin/swriter) && (grep -h ^lib ../$OUTPATH.pro/misc/pagein-writer | cut -c 4- | cut -d "." -f 1 | awk '{ print "-l"$0 }') | xargs ) | xargs` `( (echo $LINK -Wl,-z,combreloc -Wl,-z,defs -Wl,-rpath,'$ORIGIN' -Wl,-export-dynamic -Wl,--noinhibit-exec $SOLARLIB -L../$OUTPATH.pro/lib -lsoffice -o ../$OUTPATH.pro/bin/scalc) && (grep -h ^lib ../$OUTPATH.pro/misc/pagein-calc| cut -c 4- | cut -d "." -f 1 | awk '{ print "-l"$0 }') | xargs ) | xargs` @@ -1035,9 +1001,6 @@ sed -i -e "s/Thorndale/Thorndale AMT/g" $RPM_BUILD_ROOT/%{instdir}/share/registry/data/org/openoffice/VCL.xcu sed -i -e "s/Albany /Albany AMT/g" $RPM_BUILD_ROOT/%{instdir}/share/registry/data/org/openoffice/VCL.xcu sed -i -e "s/Cumberland/Cumberland AMT/g" $RPM_BUILD_ROOT/%{instdir}/share/registry/data/org/openoffice/VCL.xcu -%if %{build_fc4} -sed -i -e "s/Times New Roman/Times New Roman;Nimbus Roman No9 L/g" $RPM_BUILD_ROOT/%{instdir}/share/registry/data/org/openoffice/VCL.xcu -%endif #rh#158977# clear execstack requirement execstack -c $RPM_BUILD_ROOT/%{instdir}/program/libgcc3_uno.so @@ -1084,12 +1047,6 @@ #remove worthless ldap configuration backend rm -f $RPM_BUILD_ROOT/%{instdir}/program/ldapbe2.uno.so -#remove the email mailmerge impl if packageing without it -%if ! %{includeemailmerge} -rm -rf $RPM_BUILD_ROOT/%{instdir}/program/mailmerge.py* -rm -rf $RPM_BUILD_ROOT/%{instdir}/share/registry/modules/org/openoffice/Office/Writer/Writer-javamail.xcu -%endif - #ensure that no sneaky un-prelinkable, un-fpic or non executable shared libs #have snuck through pic=0 @@ -1181,10 +1138,6 @@ mv $RPM_BUILD_ROOT/%{instdir}/share/xdg/calc.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/openoffice.org-1.9-calc.desktop mv $RPM_BUILD_ROOT/%{instdir}/share/xdg/impress.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/openoffice.org-1.9-impress.desktop mv $RPM_BUILD_ROOT/%{instdir}/share/xdg/writer.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/openoffice.org-1.9-writer.desktop -%if ! %{cripplemenus} -mv $RPM_BUILD_ROOT/%{instdir}/share/xdg/math.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/openoffice.org-1.9-math.desktop -mv $RPM_BUILD_ROOT/%{instdir}/share/xdg/draw.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/openoffice.org-1.9-draw.desktop -%endif rm -rf $RPM_BUILD_ROOT/%{instdir}/share/xdg cp -r sysui/unxlng*/misc/redhat/usr/share/icons $RPM_BUILD_ROOT/%{_datadir} cp -r sysui/unxlng*/misc/redhat/usr/share/mime-info $RPM_BUILD_ROOT/%{_datadir} @@ -1531,7 +1484,6 @@ %dir %{instdir}/share/registry/modules/org/openoffice/Setup %{instdir}/share/registry/modules/org/openoffice/Setup/Langpack-fr.xcu -%if %{fc5langpack} %files langpack-ga_IE %defattr(-,root,root) %dir %{instdir} @@ -1552,7 +1504,6 @@ %dir %{instdir}/share/registry/modules/org/openoffice %dir %{instdir}/share/registry/modules/org/openoffice/Setup %{instdir}/share/registry/modules/org/openoffice/Setup/Langpack-ga.xcu -%endif %files langpack-gl_ES %defattr(-,root,root) @@ -2035,7 +1986,6 @@ %dir %{instdir}/share/registry/modules/org/openoffice/Setup %{instdir}/share/registry/modules/org/openoffice/Setup/Langpack-sl.xcu -%if %{fc5langpack} %files langpack-sr_CS %defattr(-,root,root) %dir %{instdir} @@ -2055,7 +2005,6 @@ %dir %{instdir}/share/registry/modules/org/openoffice %dir %{instdir}/share/registry/modules/org/openoffice/Setup %{instdir}/share/registry/modules/org/openoffice/Setup/Langpack-sr-CS.xcu -%endif %files langpack-sv %defattr(-,root,root) @@ -2849,9 +2798,6 @@ %{_datadir}/icons %dir %{_datadir}/mime-info %{_datadir}/mime-info/* -%if ! %{fc5langpack} -%{instdir}/share/dict/ooo/*ga_IE* -%endif %if %{internalxmlsec} %{instdir}/program/libxmlsec* %else @@ -2872,22 +2818,6 @@ %{instdir}/program/libdb-*.so %{instdir}/program/libdb_*.so %endif -# base files -%if ! %{seperatebase} -%{instdir}/help/en/sdatabase.* -%{instdir}/program/sbase -%{instdir}/share/registry/modules/org/openoffice/Office/Common/Common-base.xcu -%{instdir}/share/registry/modules/org/openoffice/Setup/Setup-base.xcu -%{instdir}/share/registry/modules/org/openoffice/TypeDetection/Filter/fcfg_database_filters.xcu -%{instdir}/share/registry/modules/org/openoffice/TypeDetection/Misc/fcfg_database_others.xcu -%{instdir}/share/registry/modules/org/openoffice/TypeDetection/Types/fcfg_database_types.xcu -%{_bindir}/oobase -%dir %{_datadir}/applications -%{_datadir}/applications/openoffice.org-*-base.desktop -%dir %{_datadir}/mimelnk -%dir %{_datadir}/mimelnk/application -%{_datadir}/mimelnk/application/openoffice.org-*-oasis-database.desktop -%endif %post core update-desktop-database -q %{_datadir}/applications @@ -2915,7 +2845,6 @@ fi done -%if %{seperatebase} %files base %defattr(-,root,root) %{instdir}/help/en/sdatabase.* @@ -2948,7 +2877,6 @@ %postun base update-desktop-database -q %{_datadir}/applications -%endif %files calc %defattr(-,root,root) @@ -3050,9 +2978,6 @@ %dir %{instdir}/share/registry/schema/org/openoffice/Office/UI %{instdir}/share/registry/schema/org/openoffice/Office/UI/DrawWindowState.xcs %dir %{_datadir}/applications -%if ! %{cripplemenus} -%{_datadir}/applications/openoffice.org-*-draw.desktop -%endif %dir %{_datadir}/mimelnk %dir %{_datadir}/mimelnk/application %{_datadir}/mimelnk/application/*drawing* @@ -3064,7 +2989,6 @@ %postun draw update-desktop-database -q %{_datadir}/applications -%if %{includeemailmerge} %files emailmerge %defattr(-,root,root) %dir %{instdir} @@ -3078,7 +3002,6 @@ %dir %{instdir}/share/registry/modules/org/openoffice/Office %dir %{instdir}/share/registry/modules/org/openoffice/Office/Writer %{instdir}/share/registry/modules/org/openoffice/Office/Writer/Writer-javamail.xcu -%endif %files writer %defattr(-,root,root) @@ -3241,9 +3164,6 @@ %dir %{instdir}/share/registry/schema/org/openoffice/Office/UI %{instdir}/share/registry/schema/org/openoffice/Office/UI/MathCommands.xcs %dir %{_datadir}/applications -%if ! %{cripplemenus} -%{_datadir}/applications/openoffice.org-*-math.desktop -%endif %dir %{_datadir}/mimelnk %dir %{_datadir}/mimelnk/application %{_datadir}/mimelnk/application/*formula* @@ -3349,7 +3269,7 @@ %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu %changelog -* Mon Mar 13 2006 Caolan McNamara - 1:2.0.2-5.3 +* Mon Mar 13 2006 Caolan McNamara - 1:2.0.2-5.2cmc - ooo#59997# replacement opens___.ttf updated - drop integrated openoffice.org-2.0.0.ooo56651.sw.rtfcrash.patch - drop integrated openoffice.org-1.9.114.ooo51718.rpath.patch --- openoffice.org-2.0.1.gcc25199.bitfieldaccess.patch DELETED --- From fedora-cvs-commits at redhat.com Tue Mar 21 10:46:58 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 21 Mar 2006 05:46:58 -0500 Subject: rpms/openoffice.org/devel openoffice.org.spec,1.643,1.644 Message-ID: <200603211046.k2LAkwlJ025914@cvs.devel.redhat.com> Author: caolanm Update of /cvs/dist/rpms/openoffice.org/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv25900 Modified Files: openoffice.org.spec Log Message: too deep a cut Index: openoffice.org.spec =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v retrieving revision 1.643 retrieving revision 1.644 diff -u -r1.643 -r1.644 --- openoffice.org.spec 21 Mar 2006 10:44:09 -0000 1.643 +++ openoffice.org.spec 21 Mar 2006 10:46:55 -0000 1.644 @@ -840,14 +840,14 @@ #libxmlsec/db4 then this needs to be modified/dropped find_provides="%{__find_provides}" echo "#!/bin/sh" > find-provides -echo "$find_provides | grep -v libxmlsec1 | grep -v libicu" >> find-provides +echo "$find_provides | grep -v libxmlsec1 | grep -v libdb- | grep -v libicu" >> find-provides echo "exit 0" >> find-provides chmod +x find-provides %define __find_provides %{_builddir}/%{ooo_base_name}/find-provides find_requires="%{__find_requires}" echo "#!/bin/sh" > find-requires -echo "$find_requires | grep -v libxmlsec1 | grep -v libicu | grep -v \(" >> find-requires +echo "$find_requires | grep -v libxmlsec1 | grep -v libdb- | grep -v libicu | grep -v \(" >> find-requires echo "exit 0" >> find-requires chmod +x find-requires %define __find_requires %{_builddir}/%{ooo_base_name}/find-requires From fedora-cvs-commits at redhat.com Tue Mar 21 11:19:42 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 21 Mar 2006 06:19:42 -0500 Subject: rpms/openoffice.org/devel openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch, 1.2, 1.3 openoffice.org.spec, 1.644, 1.645 Message-ID: <200603211119.k2LBJgex007439@cvs.devel.redhat.com> Author: caolanm Update of /cvs/dist/rpms/openoffice.org/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv7422 Modified Files: openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch openoffice.org.spec Log Message: rh#181900# remove bengali langpack openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch: SRC680_m123/desktop/scripts/soffice.sh | 12 ++++-------- osl/unx/signal.c | 0 sal/osl/unx/signal.c | 9 +++++++++ 3 files changed, 13 insertions(+), 8 deletions(-) Index: openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch 3 Nov 2005 11:47:45 -0000 1.2 +++ openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch 21 Mar 2006 11:19:40 -0000 1.3 @@ -1,28 +1,43 @@ --- SRC680_m123/desktop/scripts/soffice.sh.orig 2005-08-15 20:17:35.000000000 +0100 +++ SRC680_m123/desktop/scripts/soffice.sh 2005-08-15 20:19:36.000000000 +0100 -@@ -121,18 +121,22 @@ +@@ -194,23 +194,22 @@ unset XENVIRONMENT + # uncomment line below to disable anti aliasing of fonts + # SAL_ANTIALIAS_DISABLE=true; export SAL_ANTIALIAS_DISABLE + +-# pagein + for sd_arg in ${1+"$@"} ; do case ${sd_arg} in -calc) - sd_pagein_args="${sd_pagein_args:+${sd_pagein_args} }@pagein-calc" +- sd_pagein_args="${sd_pagein_args:+${sd_pagein_args} }@pagein-calc" + sd_binary="scalc.bin" break; ;; -draw) - sd_pagein_args="${sd_pagein_args:+${sd_pagein_args} }@pagein-draw" +- sd_pagein_args="${sd_pagein_args:+${sd_pagein_args} }@pagein-draw" + sd_binary="sdraw.bin" break; ;; -impress) - sd_pagein_args="${sd_pagein_args:+${sd_pagein_args} }@pagein-impress" +- sd_pagein_args="${sd_pagein_args:+${sd_pagein_args} }@pagein-impress" + sd_binary="simpress.bin" break; ;; -writer) - sd_pagein_args="${sd_pagein_args:+${sd_pagein_args} }@pagein-writer" +- sd_pagein_args="${sd_pagein_args:+${sd_pagein_args} }@pagein-writer" + sd_binary="swriter.bin" break; ;; *) +@@ -218,9 +217,6 @@ for sd_arg in ${1+"$@"} ; do + esac + done + +-sd_pagein_args="${sd_pagein_args:+${sd_pagein_args} }@pagein-common" +-"${sd_prog}"/pagein -L"${sd_prog}" ${sd_pagein_args} +- + # set path so that other apps can be started from soffice just by name + if [ $PATH ]; then + PATH="$sd_prog":$PATH Index: osl/unx/signal.c =================================================================== RCS file: /cvs/porting/sal/osl/unx/signal.c,v Index: openoffice.org.spec =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v retrieving revision 1.644 retrieving revision 1.645 diff -u -r1.644 -r1.645 --- openoffice.org.spec 21 Mar 2006 10:46:55 -0000 1.644 +++ openoffice.org.spec 21 Mar 2006 11:19:40 -0000 1.645 @@ -372,6 +372,7 @@ %description langpack-bg_BG Provides additional bulgarian translations for %{name} +%if %{build_fc5} %package langpack-bn_IN Summary: Bengali language pack for %{name} Group: Applications/Productivity @@ -381,6 +382,18 @@ %description langpack-bn_IN Provides additional bengali translations for %{name} +%else +%package langpack-bn +Summary: Bengali language pack for %{name} +Group: Applications/Productivity +Requires: %{name}-core = %{epoch}:%{version}-%{release} +Requires: fonts-bengali +Obsoletes: openoffice.org-i18n +Obsoletes: openoffice.org-langpack-bn_IN + +%description langpack-bn +Provides additional bengali translations for %{name} +%endif %package langpack-ca_ES Summary: Catalan language pack for %{name} @@ -1047,6 +1060,9 @@ #remove worthless ldap configuration backend rm -f $RPM_BUILD_ROOT/%{instdir}/program/ldapbe2.uno.so +#remove pagein stuff +rm -f $RPM_BUILD_ROOT/%{instdir}/program/pagein* + #ensure that no sneaky un-prelinkable, un-fpic or non executable shared libs #have snuck through pic=0 @@ -1219,6 +1235,7 @@ %dir %{instdir}/share/registry/modules/org/openoffice/Setup %{instdir}/share/registry/modules/org/openoffice/Setup/Langpack-bg.xcu +%if %{build_fc5} %files langpack-bn_IN %defattr(-,root,root) %dir %{instdir} @@ -1238,6 +1255,27 @@ %dir %{instdir}/share/registry/modules/org/openoffice %dir %{instdir}/share/registry/modules/org/openoffice/Setup %{instdir}/share/registry/modules/org/openoffice/Setup/Langpack-bn.xcu +%else +%files langpack-bn +%defattr(-,root,root) +%dir %{instdir} +%dir %{instdir}/help +%{instdir}/help/bn +%dir %{instdir}/share +%{instdir}/program/resource/*680bn.res +%{instdir}/share/readme/LICENSE_bn* +%{instdir}/share/readme/README_bn* +%dir %{instdir}/share/registry +%dir %{instdir}/share/registry/res +%{instdir}/share/registry/res/bn +%dir %{instdir}/share/template +%{instdir}/share/template/bn +%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/Setup +%{instdir}/share/registry/modules/org/openoffice/Setup/Langpack-bn.xcu +%endif %files langpack-ca_ES %defattr(-,root,root) @@ -2466,12 +2504,6 @@ %{instdir}/program/nsplugin %{instdir}/program/oo_product.bmp %{instdir}/program/open-url -%{instdir}/program/pagein -%{instdir}/program/pagein-calc -%{instdir}/program/pagein-common -%{instdir}/program/pagein-draw -%{instdir}/program/pagein-impress -%{instdir}/program/pagein-writer %{instdir}/program/passwordcontainer.uno.so %{instdir}/program/pkgchk %{instdir}/program/pkgchk.bin @@ -3274,6 +3306,7 @@ - drop integrated openoffice.org-2.0.0.ooo56651.sw.rtfcrash.patch - drop integrated openoffice.org-1.9.114.ooo51718.rpath.patch - add openoffice.org-2.0.2.ooo63155.sfx2.badscript.patch for rh#185390# +- rh#181900# rename Bengali langpack * Fri Mar 10 2006 Bill Nottingham - 1:2.0.2-5.2 - rebuild for PPC TLS issue (#184446) From fedora-cvs-commits at redhat.com Tue Mar 21 11:22:23 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 21 Mar 2006 06:22:23 -0500 Subject: rpms/openoffice.org/devel openoffice.org.spec,1.645,1.646 Message-ID: <200603211122.k2LBMNXT007477@cvs.devel.redhat.com> Author: caolanm Update of /cvs/dist/rpms/openoffice.org/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv7464 Modified Files: openoffice.org.spec Log Message: *car noises* Index: openoffice.org.spec =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v retrieving revision 1.645 retrieving revision 1.646 diff -u -r1.645 -r1.646 --- openoffice.org.spec 21 Mar 2006 11:19:40 -0000 1.645 +++ openoffice.org.spec 21 Mar 2006 11:22:21 -0000 1.646 @@ -1,6 +1,6 @@ %define oootag OOB680 %define ooomilestone 5 -%define rh_rpm_release 2cmc +%define rh_rpm_release 3 %define build_fc6 1 %define build_fc5 0 @@ -3301,7 +3301,7 @@ %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu %changelog -* Mon Mar 13 2006 Caolan McNamara - 1:2.0.2-5.2cmc +* Mon Mar 13 2006 Caolan McNamara - 1:2.0.2-5.3 - ooo#59997# replacement opens___.ttf updated - drop integrated openoffice.org-2.0.0.ooo56651.sw.rtfcrash.patch - drop integrated openoffice.org-1.9.114.ooo51718.rpath.patch From fedora-cvs-commits at redhat.com Tue Mar 21 12:35:13 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 21 Mar 2006 07:35:13 -0500 Subject: rpms/kernel/devel xen-9232_fix_vmx.patch, NONE, 1.1 xen-9236_fix_vmx.patch, NONE, 1.1 kernel-2.6.spec, 1.2074, 1.2075 Message-ID: <200603211235.k2LCZD94002790@cvs.devel.redhat.com> Author: quintela Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv2773 Modified Files: kernel-2.6.spec Added Files: xen-9232_fix_vmx.patch xen-9236_fix_vmx.patch Log Message: fix vmx in 64/32 bits enviroment xen-9232_fix_vmx.patch: shadow.c | 20 ++++++++++++++++---- 1 files changed, 16 insertions(+), 4 deletions(-) --- NEW FILE xen-9232_fix_vmx.patch --- # HG changeset patch # User kaf24 at firebug.cl.cam.ac.uk # Node ID 1f739672ca00d23dd10f110d05a9103918b4ea19 # Parent 1c24ee05f8f3e0180d28ac3922ed984b8e0d0735 Fix a bug which occurs when Xen is compiled with debug=y. Destroying a 32-bit HVM guest on x86/64 will cause a Xen hang. Signed-off-by: Xiaohui Xin diff -r 1c24ee05f8f3 -r 1f739672ca00 xen/arch/x86/shadow.c --- a/xen/arch/x86/shadow.c Tue Mar 14 15:40:44 2006 +0100 +++ b/xen/arch/x86/shadow.c Tue Mar 14 15:43:10 2006 +0100 @@ -202,6 +202,16 @@ shadow_promote(struct domain *d, unsigne * tlbflush_timestamp holds a min & max index of valid page table entries * within the shadow page. */ +static inline void +shadow_page_info_init(struct page_info *page, + unsigned long gmfn, + u32 psh_type) +{ + ASSERT( (gmfn & ~PGT_mfn_mask) == 0 ); + page->u.inuse.type_info = psh_type | gmfn; + page->count_info = 0; + page->tlbflush_timestamp = 0; +} static inline unsigned long alloc_shadow_page(struct domain *d, @@ -249,6 +259,11 @@ alloc_shadow_page(struct domain *d, l1 = map_domain_page(page_to_mfn(page + 1)); memset(l1, 0, PAGE_SIZE); unmap_domain_page(l1); + + /* we'd like to initialize the second continuous page here + * and leave the first page initialization later */ + + shadow_page_info_init(page+1, gmfn, psh_type); #else page = alloc_domheap_page(NULL); if (!page) @@ -294,10 +309,7 @@ alloc_shadow_page(struct domain *d, smfn = page_to_mfn(page); - ASSERT( (gmfn & ~PGT_mfn_mask) == 0 ); - page->u.inuse.type_info = psh_type | gmfn; - page->count_info = 0; - page->tlbflush_timestamp = 0; + shadow_page_info_init(page, gmfn, psh_type); switch ( psh_type ) { xen-9236_fix_vmx.patch: arch/x86/shadow.c | 14 +++++++++++++- include/asm-x86/mm.h | 9 +++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) --- NEW FILE xen-9236_fix_vmx.patch --- # HG changeset patch # User kaf24 at firebug.cl.cam.ac.uk # Node ID f4cef1aa25218c37c1ed94d00acaa2741abd0d1c # Parent de5d2b9a9cfb2a01d6abe22ff51ae8b47c1d8865 Fix ASSERT failure caused by NX support code on x86_64 When turning on debug for x86_64, ASSERT(gpfn =3D=3D (gpfn & = PGT_mfn_mask)) in __shadow_status will fail, this patch makes the NX support code comply with this ASSERT. NB: NX on PAE xen is not supported yet. Signed-off-by: Xin Li Signed-off-by: Jun Nakajima diff -r de5d2b9a9cfb -r f4cef1aa2521 xen/arch/x86/shadow.c --- a/xen/arch/x86/shadow.c Tue Mar 14 16:00:16 2006 +0100 +++ b/xen/arch/x86/shadow.c Tue Mar 14 16:09:34 2006 +0100 @@ -3413,7 +3413,9 @@ static inline int l2e_rw_fault( l1_pgentry_t sl1e; l1_pgentry_t old_sl1e; l2_pgentry_t sl2e; +#ifdef __x86_64__ u64 nx = 0; +#endif int put_ref_check = 0; /* Check if gpfn is 2M aligned */ @@ -3428,7 +3430,9 @@ static inline int l2e_rw_fault( l2e_remove_flags(tmp_l2e, _PAGE_PSE); if (l2e_get_flags(gl2e) & _PAGE_NX) { l2e_remove_flags(tmp_l2e, _PAGE_NX); - nx = 1ULL << 63; +#ifdef __x86_64__ + nx = PGT_high_mfn_nx; +#endif } @@ -3436,7 +3440,11 @@ static inline int l2e_rw_fault( if ( !__shadow_get_l2e(v, va, &sl2e) ) sl2e = l2e_empty(); +#ifdef __x86_64__ l1_mfn = __shadow_status(d, start_gpfn | nx, PGT_fl1_shadow); +#else + l1_mfn = __shadow_status(d, start_gpfn, PGT_fl1_shadow); +#endif /* Check the corresponding l2e */ if (l1_mfn) { @@ -3454,7 +3462,11 @@ static inline int l2e_rw_fault( } else { /* Allocate a new page as shadow page table if need */ gmfn = gmfn_to_mfn(d, start_gpfn); +#ifdef __x86_64__ l1_mfn = alloc_shadow_page(d, start_gpfn | nx, gmfn, PGT_fl1_shadow); +#else + l1_mfn = alloc_shadow_page(d, start_gpfn, gmfn, PGT_fl1_shadow); +#endif if (unlikely(!l1_mfn)) { BUG(); } diff -r de5d2b9a9cfb -r f4cef1aa2521 xen/include/asm-x86/mm.h --- a/xen/include/asm-x86/mm.h Tue Mar 14 16:00:16 2006 +0100 +++ b/xen/include/asm-x86/mm.h Tue Mar 14 16:09:34 2006 +0100 @@ -98,8 +98,17 @@ struct page_info /* 16-bit count of uses of this frame as its current type. */ #define PGT_count_mask ((1U<<16)-1) +#ifdef __x86_64__ +#define PGT_high_mfn_shift 52 +#define PGT_high_mfn_mask (0x7ffUL << PGT_high_mfn_shift) +#define PGT_mfn_mask (((1U<<23)-1) | PGT_high_mfn_mask) +#define PGT_high_mfn_nx (0x800UL << PGT_high_mfn_shift) +#else /* 23-bit mfn mask for shadow types: good for up to 32GB RAM. */ #define PGT_mfn_mask ((1U<<23)-1) + /* NX for PAE xen is not supported yet */ +#define PGT_high_mfn_nx (1ULL << 63) +#endif #define PGT_score_shift 23 #define PGT_score_mask (((1U<<4)-1)< +- fix xen vmx in 64 bits. + * Mon Mar 20 2006 Dave Jones - 2.6.16 & 2.6.16-git1 - Tux 2.6.16-A0 (Just rediffing) From fedora-cvs-commits at redhat.com Tue Mar 21 12:51:55 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 21 Mar 2006 07:51:55 -0500 Subject: rpms/openoffice.org/devel openoffice.org.spec,1.646,1.647 Message-ID: <200603211251.k2LCptvW016533@cvs.devel.redhat.com> Author: caolanm Update of /cvs/dist/rpms/openoffice.org/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv16520 Modified Files: openoffice.org.spec Log Message: -lgcj wasn't a good idea Index: openoffice.org.spec =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v retrieving revision 1.646 retrieving revision 1.647 diff -u -r1.646 -r1.647 --- openoffice.org.spec 21 Mar 2006 11:22:21 -0000 1.646 +++ openoffice.org.spec 21 Mar 2006 12:51:53 -0000 1.647 @@ -992,7 +992,7 @@ sed -i -e "s/OBJ/SLO/" makefile.mk dmake cd ../../util -`(cat ../$OUTPATH.pro/misc/soffice.cmd | sed -e "s/obj/slo/g" | sed -e "s/bin\/soffice/lib\/libsoffice.so -shared/" && grep ^lib ../$OUTPATH.pro/misc/pagein-common | cut -c 4- | cut -d "." -f 1 | awk '{ print "-l"$0 }') | xargs | xargs` -lgcj +`(cat ../$OUTPATH.pro/misc/soffice.cmd | sed -e "s/obj/slo/g" | sed -e "s/bin\/soffice/lib\/libsoffice.so -shared/" && grep ^lib ../$OUTPATH.pro/misc/pagein-common | cut -c 4- | cut -d "." -f 1 | awk '{ print "-l"$0 }') | xargs | xargs` $LINK -Wl,-z,combreloc -Wl,-z,defs -Wl,-rpath,'$ORIGIN' -Wl,-export-dynamic -Wl,--noinhibit-exec $SOLARLIB -L../$OUTPATH.pro/lib -lsoffice -o ../$OUTPATH.pro/bin/soffice `( (echo $LINK -Wl,-z,combreloc -Wl,-z,defs -Wl,-rpath,'$ORIGIN' -Wl,-export-dynamic -Wl,--noinhibit-exec $SOLARLIB -L../$OUTPATH.pro/lib -lsoffice -o ../$OUTPATH.pro/bin/swriter) && (grep -h ^lib ../$OUTPATH.pro/misc/pagein-writer | cut -c 4- | cut -d "." -f 1 | awk '{ print "-l"$0 }') | xargs ) | xargs` `( (echo $LINK -Wl,-z,combreloc -Wl,-z,defs -Wl,-rpath,'$ORIGIN' -Wl,-export-dynamic -Wl,--noinhibit-exec $SOLARLIB -L../$OUTPATH.pro/lib -lsoffice -o ../$OUTPATH.pro/bin/scalc) && (grep -h ^lib ../$OUTPATH.pro/misc/pagein-calc| cut -c 4- | cut -d "." -f 1 | awk '{ print "-l"$0 }') | xargs ) | xargs` From fedora-cvs-commits at redhat.com Tue Mar 21 13:02:23 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 21 Mar 2006 08:02:23 -0500 Subject: rpms/k3b/FC-5 k3b.spec,1.26,1.27 Message-ID: <200603211302.k2LD2NDw016684@cvs.devel.redhat.com> Author: harald Update of /cvs/dist/rpms/k3b/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv16642 Modified Files: k3b.spec Log Message: version 0:0.12.14-0.FC5.1 Index: k3b.spec =================================================================== RCS file: /cvs/dist/rpms/k3b/FC-5/k3b.spec,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- k3b.spec 11 Feb 2006 03:43:09 -0000 1.26 +++ k3b.spec 21 Mar 2006 13:02:02 -0000 1.27 @@ -2,8 +2,8 @@ %define i18n_version 0.12.10 Name: k3b -Version: 0.12.10 -Release: 2.2 +Version: 0.12.14 +Release: 0.FC5.1 Epoch: 0 Summary: CD/DVD burning application for KDE @@ -171,6 +171,9 @@ %changelog +* Tue Mar 21 2006 Harald Hoyer 0:0.12.14-0.FC5.1 +- version 0.12.14 + * Fri Feb 10 2006 Jesse Keating - 0:0.12.10-2.2 - bump again for double-long bug on ppc(64) From fedora-cvs-commits at redhat.com Tue Mar 21 13:28:07 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 21 Mar 2006 08:28:07 -0500 Subject: rpms/arts/devel .cvsignore, 1.24, 1.25 arts.spec, 1.56, 1.57 sources, 1.26, 1.27 Message-ID: <200603211328.k2LDS759030763@cvs.devel.redhat.com> Author: than Update of /cvs/dist/rpms/arts/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv30746 Modified Files: .cvsignore arts.spec sources Log Message: update to 1.5.2 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/arts/devel/.cvsignore,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- .cvsignore 1 Feb 2006 10:31:17 -0000 1.24 +++ .cvsignore 21 Mar 2006 13:28:04 -0000 1.25 @@ -8,3 +8,4 @@ arts-1.4.92.tar.bz2 arts-1.5.0.tar.bz2 arts-1.5.1.tar.bz2 +arts-1.5.2.tar.bz2 Index: arts.spec =================================================================== RCS file: /cvs/dist/rpms/arts/devel/arts.spec,v retrieving revision 1.56 retrieving revision 1.57 diff -u -r1.56 -r1.57 --- arts.spec 11 Feb 2006 01:38:42 -0000 1.56 +++ arts.spec 21 Mar 2006 13:28:04 -0000 1.57 @@ -9,8 +9,8 @@ %define make_cvs 1 %define disable_gcc_check_and_hidden_visibility 1 -Version: 1.5.1 -Release: 1.2 +Version: 1.5.2 +Release: 1 Summary: aRts (analog realtime synthesizer) - the KDE sound system Name: arts Group: System Environment/Daemons @@ -172,6 +172,9 @@ %{_bindir}/artsc-config %changelog +* Tue Mar 21 2006 Than Ngo 8:1.5.2-1 +- update to 1.5.2 + * Fri Feb 10 2006 Jesse Keating - 8:1.5.1-1.2 - bump again for double-long bug on ppc(64) Index: sources =================================================================== RCS file: /cvs/dist/rpms/arts/devel/sources,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- sources 1 Feb 2006 10:31:17 -0000 1.26 +++ sources 21 Mar 2006 13:28:04 -0000 1.27 @@ -1 +1 @@ -71c4996de36aa7f8726e54bb3d5bf059 arts-1.5.1.tar.bz2 +e1eb7969ea16aab2bdd9d1a9736d6af3 arts-1.5.2.tar.bz2 From fedora-cvs-commits at redhat.com Tue Mar 21 13:38:01 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 21 Mar 2006 08:38:01 -0500 Subject: rpms/rusers/devel netkit-rusers-0.17-return.patch, NONE, 1.1 rusers.spec, 1.20, 1.21 Message-ID: <200603211338.k2LDc124030883@cvs.devel.redhat.com> Author: pknirsch Update of /cvs/dist/rpms/rusers/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv30857 Modified Files: rusers.spec Added Files: netkit-rusers-0.17-return.patch Log Message: - Included fix for correct return values for rup (#177419) netkit-rusers-0.17-return.patch: rup.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) --- NEW FILE netkit-rusers-0.17-return.patch --- --- netkit-rusers-0.17/rup/rup.c.orig 2006-02-07 14:26:47.423011784 +0530 +++ netkit-rusers-0.17/rup/rup.c 2006-02-07 14:41:22.035029176 +0530 @@ -242,7 +242,7 @@ } static -void +int onehost(const char *host) { CLIENT *rstat_clnt; @@ -251,7 +251,7 @@ rstat_clnt = clnt_create(host, RSTATPROG, RSTATVERS_TIME, "udp"); if (rstat_clnt == NULL) { warnx("%s", clnt_spcreateerror(host)); - return; + return 1; } memset(&remote_host_stat, 0, sizeof(remote_host_stat)); @@ -263,7 +263,7 @@ timeout) != RPC_SUCCESS) { warnx("%s", clnt_sperror(rstat_clnt, host)); - return; + return 1; } if (sort_type != SORT_NONE) { @@ -272,19 +272,23 @@ print_rup_data(host, &remote_host_stat); } clnt_destroy(rstat_clnt); + return 0; } static void enumhosts(int argc, char *argv[], int optind) { + int returnval = 0; if (sort_type != SORT_NONE) { printf("collecting responses..."); fflush(stdout); } for (; optind < argc; optind++) - onehost(argv[optind]); + returnval += onehost(argv[optind]); + + if (returnval) exit(1); if (sort_type != SORT_NONE) { int i; Index: rusers.spec =================================================================== RCS file: /cvs/dist/rpms/rusers/devel/rusers.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- rusers.spec 11 Feb 2006 05:37:14 -0000 1.20 +++ rusers.spec 21 Mar 2006 13:37:58 -0000 1.21 @@ -5,7 +5,7 @@ Summary: Displays the users logged into machines on the local network. Name: rusers Version: 0.17 -Release: 45.2.1 +Release: 46 License: BSD Group: System Environment/Daemons Source: ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/netkit-rusers-%{version}.tar.gz @@ -25,6 +25,7 @@ Patch10: netkit-rusers-0.17-procps.patch Patch11: netkit-rusers-0.17-rup-stack.patch Patch12: netkit-rusers-0.17-bigendian.patch +Patch13: netkit-rusers-0.17-return.patch Buildroot: %{_tmppath}/%{name}-root BuildRequires: procps libselinux-devel @@ -68,6 +69,7 @@ %patch10 -p1 -b .procps %patch11 -p1 -b .rup-stack %patch12 -p1 -b .bigendian +%patch13 -p1 -b .return %build cat > MCONFIG < - 0.17-46 +- Included fix for correct return values for rup (#177419) + * Fri Feb 10 2006 Jesse Keating - 0.17-45.2.1 - bump again for double-long bug on ppc(64) From fedora-cvs-commits at redhat.com Tue Mar 21 13:37:58 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 21 Mar 2006 08:37:58 -0500 Subject: rpms/squid/FC-5 squid.spec,1.58,1.59 Message-ID: <200603211337.k2LDbwZb030874@cvs.devel.redhat.com> Author: stransky Update of /cvs/dist/rpms/squid/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv30858 Modified Files: squid.spec Log Message: re-tagging Index: squid.spec =================================================================== RCS file: /cvs/dist/rpms/squid/FC-5/squid.spec,v retrieving revision 1.58 retrieving revision 1.59 diff -u -r1.58 -r1.59 --- squid.spec 13 Mar 2006 09:59:47 -0000 1.58 +++ squid.spec 21 Mar 2006 13:37:55 -0000 1.59 @@ -5,7 +5,7 @@ Summary: The Squid proxy caching server. Name: squid Version: 2.5.STABLE13 -Release: 1 +Release: 1.FC5 Epoch: 7 License: GPL Group: System Environment/Daemons @@ -319,7 +319,7 @@ chgrp squid /var/cache/samba/winbindd_privileged > /dev/null 2>& 1 || true %changelog -* Mon Mar 13 2006 Martin Stransky - 7:2.5.STABLE13-1 +* Mon Mar 21 2006 Martin Stransky - 7:2.5.STABLE13-1.FC5 - update to new upstream * Fri Feb 10 2006 Jesse Keating - 7:2.5.STABLE12-5.1 From fedora-cvs-commits at redhat.com Tue Mar 21 14:11:55 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 21 Mar 2006 09:11:55 -0500 Subject: rpms/authconfig/FC-5 authconfig.spec,1.56,1.57 Message-ID: <200603211411.k2LEBt5h012485@cvs.devel.redhat.com> Author: tmraz Update of /cvs/dist/rpms/authconfig/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv12471 Modified Files: authconfig.spec Log Message: * Tue Mar 21 2006 Tomas Mraz - 5.2.3-1 - make smb.conf and krb5.conf loading more robust (#185766) Index: authconfig.spec =================================================================== RCS file: /cvs/dist/rpms/authconfig/FC-5/authconfig.spec,v retrieving revision 1.56 retrieving revision 1.57 diff -u -r1.56 -r1.57 --- authconfig.spec 27 Feb 2006 14:51:13 -0000 1.56 +++ authconfig.spec 21 Mar 2006 14:11:52 -0000 1.57 @@ -1,6 +1,6 @@ Summary: Text-mode tool for setting up NIS and shadow passwords. Name: authconfig -Version: 5.2.2 +Version: 5.2.3 # Don't change release in elvis CVS, up version after merging all patches # from dist CVS instead. Release: 1 @@ -94,6 +94,9 @@ %{_datadir}/pixmaps/* %changelog +* Tue Mar 21 2006 Tomas Mraz - 5.2.3-1 +- make smb.conf and krb5.conf loading more robust (#185766) + * Mon Feb 27 2006 Tomas Mraz - 5.2.2-1 - add try_first_pass option to pam_unix for better integration with individual service configurations (#182350) From fedora-cvs-commits at redhat.com Tue Mar 21 14:13:51 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 21 Mar 2006 09:13:51 -0500 Subject: rpms/authconfig/FC-5 .cvsignore,1.42,1.43 sources,1.49,1.50 Message-ID: <200603211413.k2LEDpVF012548@cvs.devel.redhat.com> Author: tmraz Update of /cvs/dist/rpms/authconfig/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv12534 Modified Files: .cvsignore sources Log Message: * Tue Mar 21 2006 Tomas Mraz - 5.2.3-1 - make smb.conf and krb5.conf loading more robust (#185766) Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/authconfig/FC-5/.cvsignore,v retrieving revision 1.42 retrieving revision 1.43 diff -u -r1.42 -r1.43 --- .cvsignore 27 Feb 2006 14:51:13 -0000 1.42 +++ .cvsignore 21 Mar 2006 14:13:49 -0000 1.43 @@ -1 +1 @@ -authconfig-5.2.2.tar.bz2 +authconfig-5.2.3.tar.bz2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/authconfig/FC-5/sources,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- sources 27 Feb 2006 14:51:13 -0000 1.49 +++ sources 21 Mar 2006 14:13:49 -0000 1.50 @@ -1 +1 @@ -ff97e6d82b1baa5196efd943c33dc0ab authconfig-5.2.2.tar.bz2 +6ce461130fe886b1ca265024f27c81b3 authconfig-5.2.3.tar.bz2 From fedora-cvs-commits at redhat.com Tue Mar 21 14:19:11 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 21 Mar 2006 09:19:11 -0500 Subject: rpms/policycoreutils/devel policycoreutils-rhat.patch, 1.174, 1.175 policycoreutils.spec, 1.248, 1.249 Message-ID: <200603211419.k2LEJBBv026356@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/policycoreutils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv26340 Modified Files: policycoreutils-rhat.patch policycoreutils.spec Log Message: * Tue Mar 21 2006 Dan Walsh 1.30-5 - Fix audit2allow to retrieve dontaudit rules policycoreutils-rhat.patch: Makefile | 2 audit2allow/audit2allow | 16 - restorecond/Makefile | 29 ++ restorecond/restorecond.8 | 31 ++ restorecond/restorecond.c | 452 +++++++++++++++++++++++++++++++++++++++++++ restorecond/restorecond.conf | 3 restorecond/restorecond.h | 31 ++ restorecond/restorecond.init | 61 +++++ restorecond/stringslist.c | 118 +++++++++++ restorecond/stringslist.h | 37 +++ restorecond/utmpwatcher.c | 105 +++++++++ restorecond/utmpwatcher.h | 29 ++ scripts/fixfiles | 10 semanage/seobject.py | 8 14 files changed, 917 insertions(+), 15 deletions(-) Index: policycoreutils-rhat.patch =================================================================== RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v retrieving revision 1.174 retrieving revision 1.175 diff -u -r1.174 -r1.175 --- policycoreutils-rhat.patch 21 Mar 2006 04:07:13 -0000 1.174 +++ policycoreutils-rhat.patch 21 Mar 2006 14:19:08 -0000 1.175 @@ -1,3 +1,44 @@ +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/audit2allow/audit2allow policycoreutils-1.30/audit2allow/audit2allow +--- nsapolicycoreutils/audit2allow/audit2allow 2006-03-10 09:48:04.000000000 -0500 ++++ policycoreutils-1.30/audit2allow/audit2allow 2006-03-21 09:17:27.000000000 -0500 +@@ -27,15 +27,14 @@ + import commands, sys, os, pwd, string, getopt, re, selinux + + obj="(\{[^\}]*\}|[^ \t:]*)" +-allow_regexp="allow[ \t]+%s[ \t]*%s[ \t]*:[ \t]*%s[ \t]*%s" % (obj, obj, obj, obj) +- ++allow_regexp="(allow|dontaudit)[ \t]+%s[ \t]*%s[ \t]*:[ \t]*%s[ \t]*%s" % (obj, obj, obj, obj) + awk_script='/^[[:blank:]]*interface[[:blank:]]*\(/ {\n\ + IFACEFILE=FILENAME\n\ + IFACENAME = gensub("^[[:blank:]]*interface[[:blank:]]*\\\\(\`?","","g",$0);\n\ + IFACENAME = gensub("\'?,.*$","","g",IFACENAME);\n\ + }\n\ + \n\ +-/^[[:blank:]]*allow[[:blank:]]+.*;[[:blank:]]*$/ {\n\ ++/^[[:blank:]]*(allow|dontaudit)[[:blank:]]+.*;[[:blank:]]*$/ {\n\ + \n\ + if ((length(IFACENAME) > 0) && (IFACEFILE == FILENAME)){\n\ + ALLOW = gensub("^[[:blank:]]*","","g",$0)\n\ +@@ -84,14 +83,13 @@ + m=re.match(regexp,r) + if m==None: + continue +- else: +- val=m.groups() ++ val=m.groups() + file=os.path.basename(val[0]).split(".")[0] + iface=val[1] +- Scon=val[2].split() +- Tcon=val[3].split() +- Class=val[4].split() +- Access=trans.get(val[5].split()) ++ Scon=val[3].split() ++ Tcon=val[4].split() ++ Class=val[5].split() ++ Access=trans.get(val[6].split()) + for s in Scon: + for t in Tcon: + for c in Class: diff --exclude-from=exclude -N -u -r nsapolicycoreutils/Makefile policycoreutils-1.30/Makefile --- nsapolicycoreutils/Makefile 2005-11-29 10:55:01.000000000 -0500 +++ policycoreutils-1.30/Makefile 2006-03-20 22:51:07.000000000 -0500 Index: policycoreutils.spec =================================================================== RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils.spec,v retrieving revision 1.248 retrieving revision 1.249 diff -u -r1.248 -r1.249 --- policycoreutils.spec 21 Mar 2006 04:07:26 -0000 1.248 +++ policycoreutils.spec 21 Mar 2006 14:19:08 -0000 1.249 @@ -5,7 +5,7 @@ Summary: SELinux policy core utilities. Name: policycoreutils Version: 1.30 -Release: 4 +Release: 5 License: GPL Group: System Environment/Base Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz @@ -107,6 +107,9 @@ service restorecond condrestart %changelog +* Tue Mar 21 2006 Dan Walsh 1.30-5 +- Fix audit2allow to retrieve dontaudit rules + * Mon Mar 20 2006 Dan Walsh 1.30-4 - Open file descriptor to make sure file does not change from underneath. From fedora-cvs-commits at redhat.com Tue Mar 21 14:37:17 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 21 Mar 2006 09:37:17 -0500 Subject: rpms/authconfig/devel .cvsignore, 1.42, 1.43 authconfig.spec, 1.56, 1.57 sources, 1.49, 1.50 Message-ID: <200603211437.k2LEbHt5026600@cvs.devel.redhat.com> Author: tmraz Update of /cvs/dist/rpms/authconfig/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv26584 Modified Files: .cvsignore authconfig.spec sources Log Message: * Tue Mar 21 2006 Tomas Mraz - 5.2.3-2 - rebuilt Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/authconfig/devel/.cvsignore,v retrieving revision 1.42 retrieving revision 1.43 diff -u -r1.42 -r1.43 --- .cvsignore 27 Feb 2006 14:51:13 -0000 1.42 +++ .cvsignore 21 Mar 2006 14:37:15 -0000 1.43 @@ -1 +1 @@ -authconfig-5.2.2.tar.bz2 +authconfig-5.2.3.tar.bz2 Index: authconfig.spec =================================================================== RCS file: /cvs/dist/rpms/authconfig/devel/authconfig.spec,v retrieving revision 1.56 retrieving revision 1.57 diff -u -r1.56 -r1.57 --- authconfig.spec 27 Feb 2006 14:51:13 -0000 1.56 +++ authconfig.spec 21 Mar 2006 14:37:15 -0000 1.57 @@ -1,9 +1,9 @@ Summary: Text-mode tool for setting up NIS and shadow passwords. Name: authconfig -Version: 5.2.2 +Version: 5.2.3 # Don't change release in elvis CVS, up version after merging all patches # from dist CVS instead. -Release: 1 +Release: 2 License: GPL ExclusiveOS: Linux Group: System Environment/Base @@ -94,6 +94,12 @@ %{_datadir}/pixmaps/* %changelog +* Tue Mar 21 2006 Tomas Mraz - 5.2.3-2 +- rebuilt + +* Tue Mar 21 2006 Tomas Mraz - 5.2.3-1 +- make smb.conf and krb5.conf loading more robust (#185766) + * Mon Feb 27 2006 Tomas Mraz - 5.2.2-1 - add try_first_pass option to pam_unix for better integration with individual service configurations (#182350) Index: sources =================================================================== RCS file: /cvs/dist/rpms/authconfig/devel/sources,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- sources 27 Feb 2006 14:51:13 -0000 1.49 +++ sources 21 Mar 2006 14:37:15 -0000 1.50 @@ -1 +1 @@ -ff97e6d82b1baa5196efd943c33dc0ab authconfig-5.2.2.tar.bz2 +6ce461130fe886b1ca265024f27c81b3 authconfig-5.2.3.tar.bz2 From fedora-cvs-commits at redhat.com Tue Mar 21 14:40:48 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 21 Mar 2006 09:40:48 -0500 Subject: rpms/beagle/FC-5 beagle-0.2.3-security-fix.patch, NONE, 1.1 beagle.spec, 1.48, 1.49 Message-ID: <200603211440.k2LEemUT026725@cvs.devel.redhat.com> Author: alexl Update of /cvs/dist/rpms/beagle/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv26706 Modified Files: beagle.spec Added Files: beagle-0.2.3-security-fix.patch Log Message: * Tue Mar 21 2006 Alexander Larsson - 0.2.3-4 - Remove more instances of wrapper scripts starting apps in cwd. Fixes bug #185981, and CVE-2006-1296 beagle-0.2.3-security-fix.patch: ImLogViewer/beagle-imlogviewer.in | 7 ------- beagled/beagled-index-helper.in | 33 ++------------------------------- beagled/beagled.in | 32 -------------------------------- beagled/wrapper.in | 17 ----------------- bludgeon/bludgeon.in | 14 -------------- search/beagle-search.in | 6 ------ tools/beagle-index-info | 4 ---- tools/beagle-ping | 4 ---- tools/beagle-status | 4 ---- tools/wrapper.in | 7 ------- 10 files changed, 2 insertions(+), 126 deletions(-) --- NEW FILE beagle-0.2.3-security-fix.patch --- --- beagle-0.2.3/beagled/beagled.in.security-fix 2006-03-03 20:13:30.000000000 +0100 +++ beagle-0.2.3/beagled/beagled.in 2006-03-21 14:40:51.000000000 +0100 @@ -1,36 +1,5 @@ #!@bash@ -if [ -e ./@target@ ] && [ -e ./Makefile.am ] ; then - echo "*** Running uninstalled @target@ ***" - - # When we run uninstalled, run in the foreground by default. - fg_default=1 - - TARGET_EXE="./@target@" - - export _BEAGLED_INDEX_HELPER_PATH="." - - # The stuff in webserver, Tiles and images is only needed when - # web services are enabled. - export MONO_PATH="../Util:../BeagleClient:./webserver:../Tiles:../images:$MONO_PATH" - - export LD_LIBRARY_PATH="../glue/.libs:$LD_LIBRARY_PATH" - - # In BEAGLE_FILTER_PATH, a trailing ':' means "append the default path". - if [ -n "$BEAGLE_FILTER_PATH" ]; then - export BEAGLE_FILTER_PATH="../Filters:$BEAGLE_FILTER_PATH" - else - export BEAGLE_FILTER_PATH="../Filters" - fi - - # Ditto BEAGLE_BACKEND_PATH. - if [ -n "$BEAGLE_BACKEND_PATH" ]; then - export BEAGLE_BACKEND_PATH=".:$BEAGLE_BACKEND_PATH" - else - export BEAGLE_BACKEND_PATH="." - fi -else - # Otherwise default to running in the background fg_default=0 @@ -39,7 +8,6 @@ export _BEAGLED_INDEX_HELPER_PATH="@pkglibdir@" export MONO_PATH="@pkglibdir@:$MONO_PATH" export LD_LIBRARY_PATH="@pkglibdir@:$LD_LIBRARY_PATH" -fi export MONO_GAC_PREFIX="@gacprefix@:$MONO_GAC_PREFIX" --- beagle-0.2.3/beagled/wrapper.in.security-fix 2006-03-21 14:47:37.000000000 +0100 +++ beagle-0.2.3/beagled/wrapper.in 2006-03-21 14:47:47.000000000 +0100 @@ -1,27 +1,10 @@ #!@bash@ -if [ -e ./@target@ ] && [ -e ./Makefile.am ] ; then - echo "*** Running uninstalled @target@ ***" - THIS_PATH="../Util:../BeagleClient:." - THIS_EXE="./@target@" - - export MONO_PATH="../Util:../BeagleClient:$MONO_PATH" - export LD_LIBRARY_PATH="../glue/.libs:$LD_LIBRARY_PATH" - - # In BEAGLE_FILTER_PATH, a trailing ':' means "append the default path". - if [ -n "$BEAGLE_FILTER_PATH" ]; then - export BEAGLE_FILTER_PATH="../Filters:$BEAGLE_FILTER_PATH" - else - export BEAGLE_FILTER_PATH="../Filters" - fi - -else THIS_PATH="@pkglibdir@" THIS_EXE="@pkglibdir@/@target@" export MONO_PATH="@pkglibdir@:$MONO_PATH" export LD_LIBRARY_PATH="@pkglibdir@:$LD_LIBRARY_PATH" -fi MONO_GAC_PREFIX="@gacprefix@:$MONO_GAC_PREFIX" MONO_PATH="$THIS_PATH:$MONO_PATH" exec -a @wrapper@ mono --debug $MONO_EXTRA_ARGS $THIS_EXE "$@" --- beagle-0.2.3/beagled/beagled-index-helper.in.security-fix 2006-03-03 20:13:30.000000000 +0100 +++ beagle-0.2.3/beagled/beagled-index-helper.in 2006-03-21 14:40:51.000000000 +0100 @@ -1,36 +1,7 @@ #!@bash@ -if [ -e ./@target@ ] && [ -e ./Makefile.am ] ; then - echo "*** Running uninstalled @target@ ***" - THIS_PATH="../Util:../BeagleClient:." - THIS_EXE="./@target@" - - export MONO_PATH="../Util:../BeagleClient:$MONO_PATH" - export LD_LIBRARY_PATH="../glue/.libs:$LD_LIBRARY_PATH" - - # In BEAGLE_FILTER_PATH, a trailing ':' means "append the default path". - if [ -n "$BEAGLE_FILTER_PATH" ]; then - export BEAGLE_FILTER_PATH="../Filters:$BEAGLE_FILTER_PATH" - else - export BEAGLE_FILTER_PATH="../Filters" - fi - -else - THIS_PATH="@pkglibdir@" - THIS_EXE="@pkglibdir@/@target@" -fi - -if [ -n "$_GET_ON_THE_HEAP_BUDDY_BANDWAGON" ]; then - n=1 - while [ -e $BEAGLE_HEAP_BUDDY_DIR/outfile.helper.$n ]; do - n=$(($n+1)) - done - MONO_EXTRA_ARGS="--profile=heap-buddy:$BEAGLE_HEAP_BUDDY_DIR/outfile.helper.$n $MONO_EXTRA_ARGS" -fi - -if [ -n "$BEAGLE_DEBUG_FLAG_IS_SET" ]; then - MONO_EXTRA_ARGS="--debug $MONO_EXTRA_ARGS" -fi +THIS_PATH="@pkglibdir@" +THIS_EXE="@pkglibdir@/@target@" export MONO_GAC_PREFIX="@gacprefix@:$MONO_GAC_PREFIX" export MONO_PATH="$THIS_PATH:$MONO_PATH" --- beagle-0.2.3/ImLogViewer/beagle-imlogviewer.in.security-fix 2006-03-21 14:49:53.000000000 +0100 +++ beagle-0.2.3/ImLogViewer/beagle-imlogviewer.in 2006-03-21 14:53:24.000000000 +0100 @@ -1,15 +1,8 @@ #!/bin/sh -if [ -e ./@target@ ] && [ -e ./Makefile.am ] ; then - echo "*** Running uninstalled @target@ ***" - THIS_PATH="../Util:../images:../Lucene.Net" - THIS_EXE="./@target@" - export LD_LIBRARY_PATH="../glue/.libs:$LD_LIBRARY_PATH" -else THIS_PATH="@pkglibdir@" THIS_EXE="@pkglibdir@/@target@" export LD_LIBRARY_PATH="@pkglibdir@:$LD_LIBRARY_PATH" -fi MONO_GAC_PREFIX="@gacprefix@:$MONO_GAC_PREFIX" MONO_PATH="$THIS_PATH:$MONO_PATH" exec -a beagle-imlogviewer mono $MONO_EXTRA_ARGS --debug $THIS_EXE "$@" --- beagle-0.2.3/tools/beagle-index-info.security-fix 2006-03-21 14:56:02.000000000 +0100 +++ beagle-0.2.3/tools/beagle-index-info 2006-03-21 14:56:21.000000000 +0100 @@ -1,9 +1,5 @@ #!/bin/sh -if [ -x "./beagle-info" ]; then - CMD="./beagle-info" -else CMD="beagle-info" -fi exec -a beagle-index-info $CMD --index-info --- beagle-0.2.3/tools/wrapper.in.security-fix 2006-03-21 14:57:44.000000000 +0100 +++ beagle-0.2.3/tools/wrapper.in 2006-03-21 14:57:50.000000000 +0100 @@ -1,14 +1,7 @@ #!@bash@ -if [ -e ./@target@ ] && [ -e ./Makefile.am ] ; then - echo "*** Running uninstalled @target@ ***" - THIS_PATH="../Util:../BeagleClient:../beagled" - THIS_EXE="./@target@" - THIS_FILTERS="../Filters" -else THIS_PATH="@pkglibdir@:@libdir@" THIS_EXE="@pkglibdir@/@target@" -fi if [ -z "$BEAGLE_MONO_RUNTIME" ]; then export BEAGLE_MONO_RUNTIME="mono" --- beagle-0.2.3/tools/beagle-ping.security-fix 2006-03-21 14:56:50.000000000 +0100 +++ beagle-0.2.3/tools/beagle-ping 2006-03-21 14:56:57.000000000 +0100 @@ -1,9 +1,5 @@ #!/bin/sh -if [ -x "./beagle-info" ]; then - CMD="./beagle-info" -else CMD="beagle-info" -fi exec -a beagle-ping $CMD --daemon-version --- beagle-0.2.3/tools/beagle-status.security-fix 2006-03-21 14:57:14.000000000 +0100 +++ beagle-0.2.3/tools/beagle-status 2006-03-21 14:57:23.000000000 +0100 @@ -1,10 +1,6 @@ #!/bin/sh -if [ -x "./beagle-info" ]; then - CMD="./beagle-info" -else CMD="beagle-info" -fi while [ 1 ]; do str=`$CMD --status | head -n 20` --- beagle-0.2.3/bludgeon/bludgeon.in.security-fix 2006-03-21 14:48:42.000000000 +0100 +++ beagle-0.2.3/bludgeon/bludgeon.in 2006-03-21 14:48:54.000000000 +0100 @@ -1,18 +1,5 @@ #!@bash@ -if [ -e ./@target@ ] && [ -e ./Makefile.am ] ; then - echo "*** Running uninstalled @target@ ***" - THIS_PATH="../Util:../BeagleClient:." - THIS_EXE="./@target@" - - export BEAGLED_COMMAND="./beagled.dummy" - - export MONO_PATH="../Util:../BeagleClient:$MONO_PATH" - export LD_LIBRARY_PATH="../glue/.libs:$LD_LIBRARY_PATH" - - export BEAGLE_FILTER_PATH="../Filters" - -else THIS_PATH="@pkglibdir@" THIS_EXE="@pkglibdir@/@target@" @@ -20,7 +7,6 @@ export MONO_PATH="@pkglibdir@:$MONO_PATH" export LD_LIBRARY_PATH="@pkglibdir@:$LD_LIBRARY_PATH" -fi if [ -z "$BEAGLE_MONO_RUNTIME" ]; then BEAGLE_MONO_RUNTIME="mono" --- beagle-0.2.3/search/beagle-search.in.security-fix 2006-03-21 15:25:35.000000000 +0100 +++ beagle-0.2.3/search/beagle-search.in 2006-03-21 15:26:04.000000000 +0100 @@ -1,10 +1,4 @@ #!/bin/sh -if [ -f Search.exe -a -f ../glue/.libs/libbeagleuiglue.so ]; then - export LD_LIBRARY_PATH="../glue/.libs${LD_LIBRARY_PATH+:$LD_LIBRARY_PATH}" - export MONO_PATH="../BeagleClient:../images:../Util${MONO_PATH+:MONO_PATH}" - mono --debug $MONO_EXTRA_ARGS Search.exe "$@" -else export LD_LIBRARY_PATH="@PKGLIBDIR@${LD_LIBRARY_PATH+:$LD_LIBRARY_PATH}" mono --debug $MONO_EXTRA_ARGS @PKGLIBDIR@/Search.exe "$@" -fi Index: beagle.spec =================================================================== RCS file: /cvs/dist/rpms/beagle/FC-5/beagle.spec,v retrieving revision 1.48 retrieving revision 1.49 diff -u -r1.48 -r1.49 --- beagle.spec 17 Mar 2006 21:22:21 -0000 1.48 +++ beagle.spec 21 Mar 2006 14:40:46 -0000 1.49 @@ -1,6 +1,6 @@ Name: beagle Version: 0.2.3 -Release: 3 +Release: 4 Summary: The Beagle Search Infrastructure Group: User Interface/Desktops @@ -24,7 +24,7 @@ BuildRequires: librsvg2-devel >= 2.0 Requires: sqlite >= 3.3.1 Requires: zip unzip sed grep mono-core poppler-utils -Patch0: beagle-0.2.2-security-fix.patch +Patch0: beagle-0.2.3-security-fix.patch Patch2: beagle-0.2.1-crawl.patch Patch3: beagle-0.2.1-spew.patch Patch4: beagle-0.2.2-crawl-system-cron.patch @@ -212,6 +212,10 @@ %{_prefix}/lib/python*/site-packages/beagle.so %changelog +* Tue Mar 21 2006 Alexander Larsson - 0.2.3-4 +- Remove more instances of wrapper scripts starting apps in cwd. + Fixes bug #185981, and CVE-2006-1296 + * Fri Mar 17 2006 Ray Strode - 0.2.3-3 - use /sbin/nologin instead of /bin/nologin for beagle user shell From fedora-cvs-commits at redhat.com Tue Mar 21 15:17:42 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 21 Mar 2006 10:17:42 -0500 Subject: rpms/kernel/FC-5 0001-support-for-context-based-audit-filtering.patch, NONE, 1.1.2.1 0002-support-for-context-based-audit-filtering.patch, NONE, 1.1.2.1 0003-filesystem-location-based-auditing.patch, NONE, 1.1.2.1 kernel-2.6.spec, 1.2032.2.3, 1.2032.2.4 linux-2.6-audit-git.patch, 1.1.14.2, 1.1.14.3 Message-ID: <200603211517.k2LFHgfd022328@cvs.devel.redhat.com> Author: sgrubb Update of /cvs/dist/rpms/kernel/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv20289 Modified Files: Tag: private-lspp-11-branch kernel-2.6.spec linux-2.6-audit-git.patch Added Files: Tag: private-lspp-11-branch 0001-support-for-context-based-audit-filtering.patch 0002-support-for-context-based-audit-filtering.patch 0003-filesystem-location-based-auditing.patch Log Message: * Tue Mar 21 2006 Steve Grubb - lspp.13 0001-support-for-context-based-audit-filtering.patch: include/linux/audit.h | 5 include/linux/selinux.h | 112 +++++++++++++++++++ security/selinux/Makefile | 2 security/selinux/avc.c | 13 +- security/selinux/exports.c | 28 ++++ security/selinux/ss/mls.c | 30 +++++ security/selinux/ss/mls.h | 4 security/selinux/ss/services.c | 235 ++++++++++++++++++++++++++++++++++++++++- 8 files changed, 419 insertions(+), 10 deletions(-) --- NEW FILE 0001-support-for-context-based-audit-filtering.patch --- >From nobody Mon Sep 17 00:00:00 2001 Subject: [PATCH] support for context based audit filtering From: Darrel Goeddel Date: 1140817445 -0600 Stephen Smalley wrote: > On Thu, 2006-02-23 at 11:42 -0600, Darrel Goeddel wrote: > >>diff --git a/security/selinux/ss/mls.c b/security/selinux/ss/mls.c >>index 640d0bf..df358be 100644 >>--- a/security/selinux/ss/mls.c >>+++ b/security/selinux/ss/mls.c >>@@ -385,6 +385,31 @@ out: >> } >> >> /* >>+ * Set the MLS fields in the security context structure >>+ * `context' based on the string representation in >>+ * the string `str'. This function will allocate temporary memory with the >>+ * given constraints of gfp_mask. >>+ */ >>+int mls_from_string(char *str, struct context *context, gfp_t gfp_mask) >>+{ >>+ char *tmpstr, *freestr; >>+ int rc; > > > Likely should be checking selinux_mls_enabled on entry and returning an > error in that case (mls_context_to_sid will just return 0 in that case). > > >>diff --git a/security/selinux/ss/services.c b/security/selinux/ss/services.c >>index d877cd1..a2ad2cd 100644 >>--- a/security/selinux/ss/services.c >>+++ b/security/selinux/ss/services.c > > > Need to #include now to pick up the function > prototypes for the selinux_audit_ functions to ensure that they are > checked against the real functions. > > >>+ default: >>+ /* only the above fileds are valid */ > > > Nit: Typo in comment. > > Otherwise, looks good. Fixed up those two issues. I also fixed a compilation problem when selinux support is not compiled in, and a possible oops when selinux is compiled in but not initialized (including being disabled at runtime). The final version is below. -- The following patch provides selinux interfaces that will allow the audit system to perform filtering based on the process context (user, role, type, sensitivity, and clearance). These interfaces will allow the selinux module to perform efficient matches based on lower level selinux constructs, rather than relying on context retrievals and string comparisons within the audit module. It also allows for dominance checks on the mls portion of the contexts that are impossible with only string comparisons. Signed-off-by: Darrel Goeddel Signed-off-by: Al Viro --- include/linux/audit.h | 5 + include/linux/selinux.h | 112 +++++++++++++++++++ security/selinux/Makefile | 2 security/selinux/avc.c | 13 +- security/selinux/exports.c | 28 +++++ security/selinux/ss/mls.c | 30 +++++ security/selinux/ss/mls.h | 4 + security/selinux/ss/services.c | 235 ++++++++++++++++++++++++++++++++++++++++ 8 files changed, 419 insertions(+), 10 deletions(-) create mode 100644 include/linux/selinux.h create mode 100644 security/selinux/exports.c c938961808975be03ed5473f44301b2400af9a86 diff --git a/include/linux/audit.h b/include/linux/audit.h index 1c47c59..41b0813 100644 --- a/include/linux/audit.h +++ b/include/linux/audit.h @@ -145,6 +145,11 @@ #define AUDIT_PERS 10 #define AUDIT_ARCH 11 #define AUDIT_MSGTYPE 12 +#define AUDIT_SE_USER 13 /* security label user */ +#define AUDIT_SE_ROLE 14 /* security label role */ +#define AUDIT_SE_TYPE 15 /* security label type */ +#define AUDIT_SE_SEN 16 /* security label sensitivity label */ +#define AUDIT_SE_CLR 17 /* security label clearance label */ /* These are ONLY useful when checking * at syscall exit time (AUDIT_AT_EXIT). */ diff --git a/include/linux/selinux.h b/include/linux/selinux.h new file mode 100644 index 0000000..9d684b1 --- /dev/null +++ b/include/linux/selinux.h @@ -0,0 +1,112 @@ +/* + * SELinux services exported to the rest of the kernel. + * + * Author: James Morris + * + * Copyright (C) 2005 Red Hat, Inc., James Morris + * Copyright (C) 2006 Trusted Computer Solutions, Inc. + * + * 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. + */ +#ifndef _LINUX_SELINUX_H +#define _LINUX_SELINUX_H + +struct selinux_audit_rule; +struct audit_context; + +#ifdef CONFIG_SECURITY_SELINUX + +/** + * selinux_audit_rule_init - alloc/init an selinux audit rule structure. + * @field: the field this rule refers to + * @op: the operater the rule uses + * @rulestr: the text "target" of the rule + * @rule: pointer to the new rule structure returned via this + * + * Returns 0 if successful, -errno if not. On success, the rule structure + * will be allocated internally. The caller must free this structure with + * selinux_audit_rule_free() after use. + */ +int selinux_audit_rule_init(u32 field, u32 op, char *rulestr, + struct selinux_audit_rule **rule); + +/** + * selinux_audit_rule_free - free an selinux audit rule structure. + * @rule: pointer to the audit rule to be freed + * + * This will free all memory associated with the given rule. + * If @rule is NULL, no operation is performed. + */ +void selinux_audit_rule_free(struct selinux_audit_rule *rule); + +/** + * selinux_audit_rule_match - determine if a context ID matches a rule. + * @ctxid: the context ID to check + * @field: the field this rule refers to + * @op: the operater the rule uses + * @rule: pointer to the audit rule to check against + * @actx: the audit context (can be NULL) associated with the check + * + * Returns 1 if the context id matches the rule, 0 if it does not, and + * -errno on failure. + */ +int selinux_audit_rule_match(u32 ctxid, u32 field, u32 op, + struct selinux_audit_rule *rule, + struct audit_context *actx); + +/** + * selinux_audit_set_callback - set the callback for policy reloads. + * @callback: the function to call when the policy is reloaded + * + * This sets the function callback function that will update the rules + * upon policy reloads. This callback should rebuild all existing rules + * using selinux_audit_rule_init(). + */ +void selinux_audit_set_callback(int (*callback)(void)); + +/** + * selinux_task_ctxid - determine a context ID for a process. + * @tsk: the task object + * @ctxid: ID value returned via this + * + * On return, ctxid will contain an ID for the context. This value + * should only be used opaquely. + */ +void selinux_task_ctxid(struct task_struct *tsk, u32 *ctxid); + +#else + +static inline int selinux_audit_rule_init(u32 field, u32 op, + char *rulestr, + struct selinux_audit_rule **rule) +{ + return -ENOTSUPP; +} + +static inline void selinux_audit_rule_free(struct selinux_audit_rule *rule) +{ + return; +} + +static inline int selinux_audit_rule_match(u32 ctxid, u32 field, u32 op, + struct selinux_audit_rule *rule, + struct audit_context *actx) +{ + return 0; +} + +static inline void selinux_audit_set_callback(int (*callback)(void)) +{ + return; +} + +static inline void selinux_task_ctxid(struct task_struct *tsk, u32 *ctxid) +{ + *ctxid = 0; +} + +#endif /* CONFIG_SECURITY_SELINUX */ + +#endif /* _LINUX_SELINUX_H */ diff --git a/security/selinux/Makefile b/security/selinux/Makefile index 688c0a2..faf2e02 100644 --- a/security/selinux/Makefile +++ b/security/selinux/Makefile @@ -4,7 +4,7 @@ obj-$(CONFIG_SECURITY_SELINUX) := selinux.o ss/ -selinux-y := avc.o hooks.o selinuxfs.o netlink.o nlmsgtab.o netif.o +selinux-y := avc.o hooks.o selinuxfs.o netlink.o nlmsgtab.o netif.o exports.o selinux-$(CONFIG_SECURITY_NETWORK_XFRM) += xfrm.o diff --git a/security/selinux/avc.c b/security/selinux/avc.c index ac5d69b..a300702 100644 --- a/security/selinux/avc.c +++ b/security/selinux/avc.c @@ -800,7 +800,7 @@ out: int avc_ss_reset(u32 seqno) { struct avc_callback_node *c; - int i, rc = 0; + int i, rc = 0, tmprc; unsigned long flag; struct avc_node *node; @@ -813,15 +813,16 @@ int avc_ss_reset(u32 seqno) for (c = avc_callbacks; c; c = c->next) { if (c->events & AVC_CALLBACK_RESET) { - rc = c->callback(AVC_CALLBACK_RESET, - 0, 0, 0, 0, NULL); - if (rc) - goto out; + tmprc = c->callback(AVC_CALLBACK_RESET, + 0, 0, 0, 0, NULL); + /* save the first error encountered for the return + value and continue processing the callbacks */ + if (!rc) + rc = tmprc; } } avc_latest_notif_update(seqno, 0); -out: return rc; } diff --git a/security/selinux/exports.c b/security/selinux/exports.c new file mode 100644 index 0000000..333c4c7 --- /dev/null +++ b/security/selinux/exports.c @@ -0,0 +1,28 @@ +/* + * SELinux services exported to the rest of the kernel. + * + * Author: James Morris + * + * Copyright (C) 2005 Red Hat, Inc., James Morris + * Copyright (C) 2006 Trusted Computer Solutions, Inc. + * + * 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 "security.h" +#include "objsec.h" + +void selinux_task_ctxid(struct task_struct *tsk, u32 *ctxid) +{ + struct task_security_struct *tsec = tsk->security; + if (selinux_enabled) + *ctxid = tsec->sid; + else + *ctxid = 0; +} diff --git a/security/selinux/ss/mls.c b/security/selinux/ss/mls.c index 640d0bf..fc34f87 100644 --- a/security/selinux/ss/mls.c +++ b/security/selinux/ss/mls.c @@ -8,7 +8,7 @@ * * Support for enhanced MLS infrastructure. * - * Copyright (C) 2004-2005 Trusted Computer Solutions, Inc. + * Copyright (C) 2004-2006 Trusted Computer Solutions, Inc. */ #include @@ -385,6 +385,34 @@ out: } /* + * Set the MLS fields in the security context structure + * `context' based on the string representation in + * the string `str'. This function will allocate temporary memory with the + * given constraints of gfp_mask. + */ +int mls_from_string(char *str, struct context *context, gfp_t gfp_mask) +{ + char *tmpstr, *freestr; + int rc; + + if (!selinux_mls_enabled) + return -EINVAL; + + /* we need freestr because mls_context_to_sid will change + the value of tmpstr */ + tmpstr = freestr = kstrdup(str, gfp_mask); + if (!tmpstr) { + rc = -ENOMEM; + } else { + rc = mls_context_to_sid(':', &tmpstr, context, + NULL, SECSID_NULL); + kfree(freestr); + } + + return rc; +} + +/* * Copies the effective MLS range from `src' into `dst'. */ static inline int mls_scopy_context(struct context *dst, diff --git a/security/selinux/ss/mls.h b/security/selinux/ss/mls.h index 03de697..fbb42f0 100644 --- a/security/selinux/ss/mls.h +++ b/security/selinux/ss/mls.h @@ -8,7 +8,7 @@ * * Support for enhanced MLS infrastructure. * - * Copyright (C) 2004-2005 Trusted Computer Solutions, Inc. + * Copyright (C) 2004-2006 Trusted Computer Solutions, Inc. */ #ifndef _SS_MLS_H_ @@ -27,6 +27,8 @@ int mls_context_to_sid(char oldc, struct sidtab *s, u32 def_sid); +int mls_from_string(char *str, struct context *context, gfp_t gfp_mask); + int mls_convert_context(struct policydb *oldp, struct policydb *newp, struct context *context); diff --git a/security/selinux/ss/services.c b/security/selinux/ss/services.c index d877cd1..ce9378e 100644 --- a/security/selinux/ss/services.c +++ b/security/selinux/ss/services.c @@ -7,12 +7,13 @@ * Updated: Trusted Computer Solutions, Inc. * * Support for enhanced MLS infrastructure. + * Support for context based audit filters. * * Updated: Frank Mayer and Karl MacMillan * * Added conditional policy language extensions * - * Copyright (C) 2004-2005 Trusted Computer Solutions, Inc. + * Copyright (C) 2004-2006 Trusted Computer Solutions, Inc. * Copyright (C) 2003 - 2004 Tresys Technology, LLC * Copyright (C) 2003 Red Hat, Inc., James Morris * This program is free software; you can redistribute it and/or modify @@ -1810,3 +1811,235 @@ out: POLICY_RDUNLOCK; return rc; } + +struct selinux_audit_rule { + u32 au_seqno; + struct context au_ctxt; +}; + +void selinux_audit_rule_free(struct selinux_audit_rule *rule) +{ + if (rule) { + context_destroy(&rule->au_ctxt); + kfree(rule); + } +} + +int selinux_audit_rule_init(u32 field, u32 op, char *rulestr, + struct selinux_audit_rule **rule) +{ + struct selinux_audit_rule *tmprule; + struct role_datum *roledatum; + struct type_datum *typedatum; + struct user_datum *userdatum; + int rc = 0; + + *rule = NULL; + + if (!ss_initialized) + return -ENOTSUPP; + + switch (field) { + case AUDIT_SE_USER: + case AUDIT_SE_ROLE: + case AUDIT_SE_TYPE: + /* only 'equals' and 'not equals' fit user, role, and type */ + if (op != AUDIT_EQUAL && op != AUDIT_NOT_EQUAL) + return -EINVAL; + break; + case AUDIT_SE_SEN: + case AUDIT_SE_CLR: + /* we do not allow a range, indicated by the presense of '-' */ + if (strchr(rulestr, '-')) + return -EINVAL; + break; + default: + /* only the above fields are valid */ + return -EINVAL; + } + + tmprule = kzalloc(sizeof(struct selinux_audit_rule), GFP_KERNEL); + if (!tmprule) + return -ENOMEM; + + context_init(&tmprule->au_ctxt); + + POLICY_RDLOCK; + + tmprule->au_seqno = latest_granting; + + switch (field) { + case AUDIT_SE_USER: + userdatum = hashtab_search(policydb.p_users.table, rulestr); + if (!userdatum) + rc = -EINVAL; + else + tmprule->au_ctxt.user = userdatum->value; + break; + case AUDIT_SE_ROLE: + roledatum = hashtab_search(policydb.p_roles.table, rulestr); + if (!roledatum) + rc = -EINVAL; + else + tmprule->au_ctxt.role = roledatum->value; + break; + case AUDIT_SE_TYPE: + typedatum = hashtab_search(policydb.p_types.table, rulestr); + if (!typedatum) + rc = -EINVAL; + else + tmprule->au_ctxt.type = typedatum->value; + break; + case AUDIT_SE_SEN: + case AUDIT_SE_CLR: + rc = mls_from_string(rulestr, &tmprule->au_ctxt, GFP_ATOMIC); + break; + } + + POLICY_RDUNLOCK; + + if (rc) { + selinux_audit_rule_free(tmprule); + tmprule = NULL; + } + + *rule = tmprule; + + return rc; +} + +int selinux_audit_rule_match(u32 ctxid, u32 field, u32 op, + struct selinux_audit_rule *rule, + struct audit_context *actx) +{ + struct context *ctxt; + struct mls_level *level; + int match = 0; + + if (!rule) { + audit_log(actx, GFP_ATOMIC, AUDIT_SELINUX_ERR, + "selinux_audit_rule_match: missing rule\n"); + return -ENOENT; + } + + POLICY_RDLOCK; + + if (rule->au_seqno < latest_granting) { + audit_log(actx, GFP_ATOMIC, AUDIT_SELINUX_ERR, + "selinux_audit_rule_match: stale rule\n"); + match = -ESTALE; + goto out; + } + + ctxt = sidtab_search(&sidtab, ctxid); + if (!ctxt) { + audit_log(actx, GFP_ATOMIC, AUDIT_SELINUX_ERR, + "selinux_audit_rule_match: unrecognized SID %d\n", + ctxid); + match = -ENOENT; + goto out; + } + + /* a field/op pair that is not caught here will simply fall through + without a match */ + switch (field) { + case AUDIT_SE_USER: + switch (op) { + case AUDIT_EQUAL: + match = (ctxt->user == rule->au_ctxt.user); + break; + case AUDIT_NOT_EQUAL: + match = (ctxt->user != rule->au_ctxt.user); + break; + } + break; + case AUDIT_SE_ROLE: + switch (op) { + case AUDIT_EQUAL: + match = (ctxt->role == rule->au_ctxt.role); + break; + case AUDIT_NOT_EQUAL: + match = (ctxt->role != rule->au_ctxt.role); + break; + } + break; + case AUDIT_SE_TYPE: + switch (op) { + case AUDIT_EQUAL: + match = (ctxt->type == rule->au_ctxt.type); + break; + case AUDIT_NOT_EQUAL: + match = (ctxt->type != rule->au_ctxt.type); + break; + } + break; + case AUDIT_SE_SEN: + case AUDIT_SE_CLR: + level = (op == AUDIT_SE_SEN ? + &ctxt->range.level[0] : &ctxt->range.level[1]); + switch (op) { + case AUDIT_EQUAL: + match = mls_level_eq(&rule->au_ctxt.range.level[0], + level); + break; + case AUDIT_NOT_EQUAL: + match = !mls_level_eq(&rule->au_ctxt.range.level[0], + level); + break; + case AUDIT_LESS_THAN: + match = (mls_level_dom(&rule->au_ctxt.range.level[0], + level) && + !mls_level_eq(&rule->au_ctxt.range.level[0], + level)); + break; + case AUDIT_LESS_THAN_OR_EQUAL: + match = mls_level_dom(&rule->au_ctxt.range.level[0], + level); + break; + case AUDIT_GREATER_THAN: + match = (mls_level_dom(level, + &rule->au_ctxt.range.level[0]) && + !mls_level_eq(level, + &rule->au_ctxt.range.level[0])); + break; + case AUDIT_GREATER_THAN_OR_EQUAL: + match = mls_level_dom(level, + &rule->au_ctxt.range.level[0]); + break; + } + } + +out: + POLICY_RDUNLOCK; + return match; +} + +static int (*aurule_callback)(void) = NULL; + +static int aurule_avc_callback(u32 event, u32 ssid, u32 tsid, + u16 class, u32 perms, u32 *retained) +{ + int err = 0; + + if (event == AVC_CALLBACK_RESET && aurule_callback) + err = aurule_callback(); + return err; +} + +static int __init aurule_init(void) +{ + int err; + + err = avc_add_callback(aurule_avc_callback, AVC_CALLBACK_RESET, + SECSID_NULL, SECSID_NULL, SECCLASS_NULL, 0); + if (err) + panic("avc_add_callback() failed, error %d\n", err); + + return err; +} +__initcall(aurule_init); + +void selinux_audit_set_callback(int (*callback)(void)) +{ + aurule_callback = callback; +} -- 0.99.9.GIT 0002-support-for-context-based-audit-filtering.patch: audit.c | 8 + audit.h | 10 +- auditfilter.c | 245 ++++++++++++++++++++++++++++++++++++++++++++++++++++------ auditsc.c | 20 ++++ 4 files changed, 256 insertions(+), 27 deletions(-) --- NEW FILE 0002-support-for-context-based-audit-filtering.patch --- >From nobody Mon Sep 17 00:00:00 2001 Subject: [PATCH] support for context based audit filtering From: Darrel Goeddel Date: 1142036046 -0600 Darrel Goeddel wrote: > I like 'em. Here is a new patch that incorporates them. It also moves the > initialization call to selinux into the audit_init function as you had > suggested earlier. Look right? > The GFP_ATOMIC allocations are not necessary (noted on IRC). This version switches to GFP_KERNEL and gets rid of the gfp_mask argument to audit_init_entry(). -- Darrel Signed-off-by: Al Viro --- kernel/audit.c | 8 ++ kernel/audit.h | 10 +- kernel/auditfilter.c | 245 +++++++++++++++++++++++++++++++++++++++++++++----- kernel/auditsc.c | 20 ++++ 4 files changed, 256 insertions(+), 27 deletions(-) 1195ec220416c47699a08c8f4b7a464c380b6c00 diff --git a/kernel/audit.c b/kernel/audit.c index 04fe2e3..65e1d03 100644 --- a/kernel/audit.c +++ b/kernel/audit.c @@ -55,6 +55,9 @@ #include #include #include +#include + +#include "audit.h" /* No auditing will take place until audit_initialized != 0. * (Initialization happens after skb_init is called.) */ @@ -564,6 +567,11 @@ static int __init audit_init(void) skb_queue_head_init(&audit_skb_queue); audit_initialized = 1; audit_enabled = audit_default; + + /* Register the callback with selinux. This callback will be invoked + * when a new policy is loaded. */ + selinux_audit_set_callback(&selinux_audit_rule_update); + audit_log(NULL, GFP_KERNEL, AUDIT_KERNEL, "initialized"); return 0; } diff --git a/kernel/audit.h b/kernel/audit.h index bc53920..6f73392 100644 --- a/kernel/audit.h +++ b/kernel/audit.h @@ -54,9 +54,11 @@ enum audit_state { /* Rule lists */ struct audit_field { - u32 type; - u32 val; - u32 op; + u32 type; + u32 val; + u32 op; + char *se_str; + struct selinux_audit_rule *se_rule; }; struct audit_krule { @@ -86,3 +88,5 @@ extern void audit_send_reply(int pi extern void audit_log_lost(const char *message); extern void audit_panic(const char *message); extern struct mutex audit_netlink_mutex; + +extern int selinux_audit_rule_update(void); diff --git a/kernel/auditfilter.c b/kernel/auditfilter.c index d3a8539..4d2023a 100644 --- a/kernel/auditfilter.c +++ b/kernel/auditfilter.c @@ -23,6 +23,7 @@ #include #include #include +#include #include "audit.h" /* There are three lists of rules -- one to search at task creation @@ -42,6 +43,13 @@ struct list_head audit_filter_list[AUDIT static inline void audit_free_rule(struct audit_entry *e) { + int i; + if (e->rule.fields) + for (i = 0; i < e->rule.field_count; i++) { + struct audit_field *f = &e->rule.fields[i]; + kfree(f->se_str); + selinux_audit_rule_free(f->se_rule); + } kfree(e->rule.fields); kfree(e); } @@ -52,9 +60,29 @@ static inline void audit_free_rule_rcu(s audit_free_rule(e); } +/* Initialize an audit filterlist entry. */ +static inline struct audit_entry *audit_init_entry(u32 field_count) +{ + struct audit_entry *entry; + struct audit_field *fields; + + entry = kzalloc(sizeof(*entry), GFP_KERNEL); + if (unlikely(!entry)) + return NULL; + + fields = kzalloc(sizeof(*fields) * field_count, GFP_KERNEL); + if (unlikely(!fields)) { + kfree(entry); + return NULL; + } + entry->rule.fields = fields; + + return entry; +} + /* Unpack a filter field's string representation from user-space * buffer. */ -static __attribute__((unused)) char *audit_unpack_string(void **bufp, size_t *remain, size_t len) +static char *audit_unpack_string(void **bufp, size_t *remain, size_t len) { char *str; @@ -84,7 +112,6 @@ static inline struct audit_entry *audit_ { unsigned listnr; struct audit_entry *entry; - struct audit_field *fields; int i, err; err = -EINVAL; @@ -108,23 +135,14 @@ static inline struct audit_entry *audit_ goto exit_err; err = -ENOMEM; - entry = kmalloc(sizeof(*entry), GFP_KERNEL); - if (unlikely(!entry)) - goto exit_err; - fields = kmalloc(sizeof(*fields) * rule->field_count, GFP_KERNEL); - if (unlikely(!fields)) { - kfree(entry); + entry = audit_init_entry(rule->field_count); + if (!entry) goto exit_err; - } - - memset(&entry->rule, 0, sizeof(struct audit_krule)); - memset(fields, 0, sizeof(struct audit_field)); entry->rule.flags = rule->flags & AUDIT_FILTER_PREPEND; entry->rule.listnr = listnr; entry->rule.action = rule->action; entry->rule.field_count = rule->field_count; - entry->rule.fields = fields; for (i = 0; i < AUDIT_BITMASK_SIZE; i++) entry->rule.mask[i] = rule->mask[i]; @@ -150,15 +168,20 @@ static struct audit_entry *audit_rule_to for (i = 0; i < rule->field_count; i++) { struct audit_field *f = &entry->rule.fields[i]; - if (rule->fields[i] & AUDIT_UNUSED_BITS) { - err = -EINVAL; - goto exit_free; - } - f->op = rule->fields[i] & (AUDIT_NEGATE|AUDIT_OPERATORS); f->type = rule->fields[i] & ~(AUDIT_NEGATE|AUDIT_OPERATORS); f->val = rule->values[i]; + if (f->type & AUDIT_UNUSED_BITS || + f->type == AUDIT_SE_USER || + f->type == AUDIT_SE_ROLE || + f->type == AUDIT_SE_TYPE || + f->type == AUDIT_SE_SEN || + f->type == AUDIT_SE_CLR) { + err = -EINVAL; + goto exit_free; + } + entry->rule.vers_ops = (f->op & AUDIT_OPERATORS) ? 2 : 1; /* Support for legacy operators where @@ -188,8 +211,9 @@ static struct audit_entry *audit_data_to int err = 0; struct audit_entry *entry; void *bufp; - /* size_t remain = datasz - sizeof(struct audit_rule_data); */ + size_t remain = datasz - sizeof(struct audit_rule_data); int i; + char *str; entry = audit_to_entry_common((struct audit_rule *)data); if (IS_ERR(entry)) @@ -207,10 +231,35 @@ static struct audit_entry *audit_data_to f->op = data->fieldflags[i] & AUDIT_OPERATORS; f->type = data->fields[i]; + f->val = data->values[i]; + f->se_str = NULL; + f->se_rule = NULL; switch(f->type) { - /* call type-specific conversion routines here */ - default: - f->val = data->values[i]; + case AUDIT_SE_USER: + case AUDIT_SE_ROLE: + case AUDIT_SE_TYPE: + case AUDIT_SE_SEN: + case AUDIT_SE_CLR: + str = audit_unpack_string(&bufp, &remain, f->val); + if (IS_ERR(str)) + goto exit_free; + entry->rule.buflen += f->val; + + err = selinux_audit_rule_init(f->type, f->op, str, + &f->se_rule); + /* Keep currently invalid fields around in case they + * become valid after a policy reload. */ + if (err == -EINVAL) { + printk(KERN_WARNING "audit rule for selinux " + "\'%s\' is invalid\n", str); + err = 0; + } + if (err) { + kfree(str); + goto exit_free; + } else + f->se_str = str; + break; } } @@ -286,7 +335,14 @@ static struct audit_rule_data *audit_kru data->fields[i] = f->type; data->fieldflags[i] = f->op; switch(f->type) { - /* call type-specific conversion routines here */ + case AUDIT_SE_USER: + case AUDIT_SE_ROLE: + case AUDIT_SE_TYPE: + case AUDIT_SE_SEN: + case AUDIT_SE_CLR: + data->buflen += data->values[i] = + audit_pack_string(&bufp, f->se_str); + break; default: data->values[i] = f->val; } @@ -314,7 +370,14 @@ static int audit_compare_rule(struct aud return 1; switch(a->fields[i].type) { - /* call type-specific comparison routines here */ + case AUDIT_SE_USER: + case AUDIT_SE_ROLE: + case AUDIT_SE_TYPE: + case AUDIT_SE_SEN: + case AUDIT_SE_CLR: + if (strcmp(a->fields[i].se_str, b->fields[i].se_str)) + return 1; + break; default: if (a->fields[i].val != b->fields[i].val) return 1; @@ -328,6 +391,81 @@ static int audit_compare_rule(struct aud return 0; } +/* Duplicate selinux field information. The se_rule is opaque, so must be + * re-initialized. */ +static inline int audit_dupe_selinux_field(struct audit_field *df, + struct audit_field *sf) +{ + int ret = 0; + char *se_str; + + /* our own copy of se_str */ + se_str = kstrdup(sf->se_str, GFP_KERNEL); + if (unlikely(IS_ERR(se_str))) + return -ENOMEM; + df->se_str = se_str; + + /* our own (refreshed) copy of se_rule */ + ret = selinux_audit_rule_init(df->type, df->op, df->se_str, + &df->se_rule); + /* Keep currently invalid fields around in case they + * become valid after a policy reload. */ + if (ret == -EINVAL) { + printk(KERN_WARNING "audit rule for selinux \'%s\' is " + "invalid\n", df->se_str); + ret = 0; + } + + return ret; +} + +/* Duplicate an audit rule. This will be a deep copy with the exception + * of the watch - that pointer is carried over. The selinux specific fields + * will be updated in the copy. The point is to be able to replace the old + * rule with the new rule in the filterlist, then free the old rule. */ +static struct audit_entry *audit_dupe_rule(struct audit_krule *old) +{ + u32 fcount = old->field_count; + struct audit_entry *entry; + struct audit_krule *new; + int i, err = 0; + + entry = audit_init_entry(fcount); + if (unlikely(!entry)) + return ERR_PTR(-ENOMEM); + + new = &entry->rule; + new->vers_ops = old->vers_ops; + new->flags = old->flags; + new->listnr = old->listnr; + new->action = old->action; + for (i = 0; i < AUDIT_BITMASK_SIZE; i++) + new->mask[i] = old->mask[i]; + new->buflen = old->buflen; + new->field_count = old->field_count; + memcpy(new->fields, old->fields, sizeof(struct audit_field) * fcount); + + /* deep copy this information, updating the se_rule fields, because + * the originals will all be freed when the old rule is freed. */ + for (i = 0; i < fcount; i++) { + switch (new->fields[i].type) { + case AUDIT_SE_USER: + case AUDIT_SE_ROLE: + case AUDIT_SE_TYPE: + case AUDIT_SE_SEN: + case AUDIT_SE_CLR: + err = audit_dupe_selinux_field(&new->fields[i], + &old->fields[i]); + } + if (err) { + audit_free_rule(entry); + return ERR_PTR(err); + } + } + + return entry; +} + /* Add rule to given filterlist if not a duplicate. Protected by * audit_netlink_mutex. */ static inline int audit_add_rule(struct audit_entry *entry, @@ -628,3 +766,62 @@ unlock_and_return: rcu_read_unlock(); return result; } + +/* Check to see if the rule contains any selinux fields. Returns 1 if there + are selinux fields specified in the rule, 0 otherwise. */ +static inline int audit_rule_has_selinux(struct audit_krule *rule) +{ + int i; + + for (i = 0; i < rule->field_count; i++) { + struct audit_field *f = &rule->fields[i]; + switch (f->type) { + case AUDIT_SE_USER: + case AUDIT_SE_ROLE: + case AUDIT_SE_TYPE: + case AUDIT_SE_SEN: + case AUDIT_SE_CLR: + return 1; + } + } + + return 0; +} + +/* This function will re-initialize the se_rule field of all applicable rules. + * It will traverse the filter lists serarching for rules that contain selinux + * specific filter fields. When such a rule is found, it is copied, the + * selinux field is re-initialized, and the old rule is replaced with the + * updated rule. */ +int selinux_audit_rule_update(void) +{ + struct audit_entry *entry, *nentry; + int i, err = 0; + + /* audit_netlink_mutex synchronizes the writers */ + mutex_lock(&audit_netlink_mutex); + + for (i = 0; i < AUDIT_NR_FILTERS; i++) { + list_for_each_entry(entry, &audit_filter_list[i], list) { + if (!audit_rule_has_selinux(&entry->rule)) + continue; + + nentry = audit_dupe_rule(&entry->rule); + if (unlikely(IS_ERR(nentry))) { + /* save the first error encountered for the + * return value */ + if (!err) + err = PTR_ERR(nentry); + audit_panic("error updating selinux filters"); + list_del_rcu(&entry->list); + } else { + list_replace_rcu(&entry->list, &nentry->list); + } + call_rcu(&entry->rcu, audit_free_rule_rcu); + } + } + + mutex_unlock(&audit_netlink_mutex); + + return err; +} diff --git a/kernel/auditsc.c b/kernel/auditsc.c index b613ec8..ba9e9a3 100644 --- a/kernel/auditsc.c +++ b/kernel/auditsc.c @@ -58,6 +58,7 @@ #include #include #include +#include #include "audit.h" @@ -168,6 +169,9 @@ static int audit_filter_rules(struct tas enum audit_state *state) { int i, j; + u32 sid; + + selinux_task_ctxid(tsk, &sid); for (i = 0; i < rule->field_count; i++) { struct audit_field *f = &rule->fields[i]; @@ -257,6 +261,22 @@ static int audit_filter_rules(struct tas if (ctx) result = audit_comparator(ctx->loginuid, f->op, f->val); break; + case AUDIT_SE_USER: + case AUDIT_SE_ROLE: + case AUDIT_SE_TYPE: + case AUDIT_SE_SEN: + case AUDIT_SE_CLR: + /* NOTE: this may return negative values indicating + a temporary error. We simply treat this as a + match for now to avoid losing information that + may be wanted. An error message will also be + logged upon error */ + if (f->se_rule) + result = selinux_audit_rule_match(sid, f->type, + f->op, + f->se_rule, + ctx); + break; case AUDIT_ARG0: case AUDIT_ARG1: case AUDIT_ARG2: -- 0.99.9.GIT 0003-filesystem-location-based-auditing.patch: include/linux/audit.h | 1 init/Kconfig | 2 kernel/audit.c | 19 - kernel/audit.h | 32 ++ kernel/auditfilter.c | 671 +++++++++++++++++++++++++++++++++++++++++++++++--- kernel/auditsc.c | 65 ++-- 6 files changed, 713 insertions(+), 77 deletions(-) --- NEW FILE 0003-filesystem-location-based-auditing.patch --- >From nobody Mon Sep 17 00:00:00 2001 Subject: [PATCH] filesystem location based auditing From: Amy Griffis Date: 1142295485 -0500 Here is another iteration based off of audit-current.git plus the following pre-requisites: selinux support for context based audit filtering: https://www.redhat.com/archives/linux-audit/2006-February/msg00160.html context based audit filtering: https://www.redhat.com/archives/linux-audit/2006-March/msg00107.html inotify kernel api: https://www.redhat.com/archives/linux-audit/2006-January/msg00084.html This version fixes the following: - remove extra parent put in audit_inotify_register() - add missing unlock in audit_add_rule() error path - replace per-filterlist spinlocks with use of audit_netlink_mutex (see below) - remove now un-needed GFP_ATOMIC allocations - remove now unused AUDIT_ENTRY_DEL flag - all code paths either avoid stale data by taking the mutex, or don't care - take mutex to update parent data in audit_inotify_register() - kernel enforces 1 watch per rule to avoid potential memleak - add comments describing locking and refcounts - miscellaneous code cleanup The audit_netlink_mutex was previously taken/released in audit_receive() with the following comment: /* The netlink socket is only to be read by 1 CPU, which lets us assume * that list additions and deletions never happen simultaneously in * auditsc.c */ audit_receive() is three calls up the stack from where we need to release the mutex for some operations in audit_add_rule() and audit_del_rule(). However, from what I could see, it didn't seem to be protecting anything specific to the netlink socket itself, but rather the operations on filterlists. For that reason I renamed it to audit_filter_mutex and modified the code to use it explicitly around filterlist manipulations. Please verify my analysis on this matter. If incorrect we will need two mutexes: audit_netlink_mutex and audit_filter_mutex. Thanks, Amy Signed-off-by: Al Viro --- include/linux/audit.h | 1 init/Kconfig | 2 kernel/audit.c | 19 + kernel/audit.h | 32 ++ kernel/auditfilter.c | 671 ++++++++++++++++++++++++++++++++++++++++++++++--- kernel/auditsc.c | 65 +++-- 6 files changed, 713 insertions(+), 77 deletions(-) aa75a8c629a3f13097cf9d128ad72cb3ece43670 diff --git a/include/linux/audit.h b/include/linux/audit.h index 41b0813..8350a55 100644 --- a/include/linux/audit.h +++ b/include/linux/audit.h @@ -158,6 +158,7 @@ #define AUDIT_INODE 102 #define AUDIT_EXIT 103 #define AUDIT_SUCCESS 104 /* exit >= 0; value ignored */ +#define AUDIT_WATCH 105 #define AUDIT_ARG0 200 #define AUDIT_ARG1 (AUDIT_ARG0+1) diff --git a/init/Kconfig b/init/Kconfig index 38416a1..7fc7b20 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -177,7 +177,7 @@ config AUDIT config AUDITSYSCALL bool "Enable system-call auditing support" - depends on AUDIT && (X86 || PPC || PPC64 || S390 || IA64 || UML || SPARC64) + depends on AUDIT && INOTIFY && (X86 || PPC || PPC64 || S390 || IA64 || UML || SPARC64) default y if SECURITY_SELINUX help Enable low-overhead system-call auditing infrastructure that diff --git a/kernel/audit.c b/kernel/audit.c index 65e1d03..6eff223 100644 --- a/kernel/audit.c +++ b/kernel/audit.c @@ -56,6 +56,7 @@ #include #include #include +#include #include "audit.h" @@ -102,6 +103,9 @@ static atomic_t audit_lost = ATOMIC_I /* The netlink socket. */ static struct sock *audit_sock; +/* Inotify device. */ +struct inotify_device *audit_idev; + /* The audit_freelist is a list of pre-allocated audit buffers (if more * than AUDIT_MAXFREE are in use, the audit buffer is freed instead of * being placed on the freelist). */ @@ -114,11 +118,6 @@ static struct task_struct *kauditd_task; static DECLARE_WAIT_QUEUE_HEAD(kauditd_wait); static DECLARE_WAIT_QUEUE_HEAD(audit_backlog_wait); -/* The netlink socket is only to be read by 1 CPU, which lets us assume - * that list additions and deletions never happen simultaneously in - * auditsc.c */ -DEFINE_MUTEX(audit_netlink_mutex); - /* AUDIT_BUFSIZ is the size of the temporary buffer used for formatting * audit records. Since printk uses a 1024 byte buffer, this buffer * should be at least that large. */ @@ -541,14 +540,11 @@ static void audit_receive(struct sock *s struct sk_buff *skb; unsigned int qlen; - mutex_lock(&audit_netlink_mutex); - for (qlen = skb_queue_len(&sk->sk_receive_queue); qlen; qlen--) { skb = skb_dequeue(&sk->sk_receive_queue); audit_receive_skb(skb); kfree_skb(skb); } - mutex_unlock(&audit_netlink_mutex); } @@ -573,6 +569,13 @@ static int __init audit_init(void) selinux_audit_set_callback(&selinux_audit_rule_update); audit_log(NULL, GFP_KERNEL, AUDIT_KERNEL, "initialized"); + +#ifdef CONFIG_AUDITSYSCALL + audit_idev = inotify_init(audit_handle_ievent); + if (IS_ERR(audit_idev)) + audit_panic("cannot initialize inotify device"); +#endif + return 0; } __initcall(audit_init); diff --git a/kernel/audit.h b/kernel/audit.h index 6f73392..423e826 100644 --- a/kernel/audit.h +++ b/kernel/audit.h @@ -19,10 +19,11 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include #include #include +struct inotify_event; + /* 0 = no checking 1 = put_count checking 2 = verbose put_count checking @@ -53,6 +54,27 @@ enum audit_state { }; /* Rule lists */ +struct audit_parent { + atomic_t count; /* reference count */ + unsigned int flags; /* flag in-process removals */ + u32 wd; /* inotify watch descriptor */ + dev_t dev; /* associated superblock device */ + unsigned long ino; /* associated inode number */ + struct list_head mlist; /* entry in master_parents */ + struct list_head ilist; /* entry in inotify registration list*/ + struct list_head watches; /* associated watches */ +}; + +struct audit_watch { + atomic_t count; /* reference count */ + char *path; /* watch insertion path */ + dev_t dev; /* associated superblock device */ + unsigned long ino; /* associated inode number */ + struct audit_parent *parent; /* associated parent */ + struct list_head wlist; /* entry in audit_parent.watches list*/ + struct list_head rules; /* associated rules */ +}; + struct audit_field { u32 type; u32 val; @@ -70,6 +92,8 @@ struct audit_krule { u32 buflen; /* for data alloc on list rules */ u32 field_count; struct audit_field *fields; + struct audit_watch *watch; /* associated watch */ + struct list_head rlist; /* entry in audit_watch.rules list */ }; struct audit_entry { @@ -81,12 +105,14 @@ struct audit_entry { extern int audit_pid; extern int audit_comparator(const u32 left, const u32 op, const u32 right); - +extern int audit_compare_dname_path(const char *dname, const char *path); extern void audit_send_reply(int pid, int seq, int type, int done, int multi, void *payload, int size); extern void audit_log_lost(const char *message); extern void audit_panic(const char *message); -extern struct mutex audit_netlink_mutex; extern int selinux_audit_rule_update(void); +extern void audit_handle_ievent(struct inotify_event *event, + const char *dname, struct inode * inode, + void *ptr); diff --git a/kernel/auditfilter.c b/kernel/auditfilter.c index 4d2023a..3966a49 100644 --- a/kernel/auditfilter.c +++ b/kernel/auditfilter.c @@ -22,13 +22,45 @@ #include #include #include +#include +#include +#include #include +#include #include #include "audit.h" -/* There are three lists of rules -- one to search at task creation - * time, one to search at syscall entry time, and another to search at - * syscall exit time. */ +/* + * Locking model: + * + * audit_filter_mutex: + * Synchronizes writes and blocking reads of audit's filterlist + * data. Rcu is used to traverse the filterlist and access + * contents of structs audit_entry, audit_watch and opaque + * selinux rules during filtering. If modified, these structures + * must be copied and replace their counterparts in the filterlist. + * An audit_parent struct is not accessed during filtering, so may + * be written directly provided audit_filter_mutex is held. + * + * master_parents_lock: (spinlock) + * Protects master_parents list. + */ + +/* + * Reference counting: + * + * audit_parent: lifetime is from audit_init_parent() to audit_remove_parent(). + * Each audit_watch holds a reference to its associated parent. + * + * audit_watch: if added to lists, lifetime is from audit_init_watch() to one + * of: audit_remove_watch() [user removes], audit_update_watch() [kernel + * replaces], or audit_remove_parent_watches() [kernel removes]. + * Additionally, an audit_watch may exist temporarily to assist in + * searching existing filter data. Each audit_krule holds a reference to + * its associated watch. + */ + +/* Audit filter lists, defined in */ struct list_head audit_filter_list[AUDIT_NR_FILTERS] = { LIST_HEAD_INIT(audit_filter_list[0]), LIST_HEAD_INIT(audit_filter_list[1]), @@ -41,9 +73,55 @@ struct list_head audit_filter_list[AUDIT #endif }; +DEFINE_MUTEX(audit_filter_mutex); + +static LIST_HEAD(master_parents); +static DEFINE_SPINLOCK(master_parents_lock); + +/* Inotify device. */ +extern struct inotify_device *audit_idev; + +/* Inotify events we care about. */ +#define AUDIT_IN_WATCH IN_MOVE|IN_CREATE|IN_DELETE|IN_DELETE_SELF|IN_MOVE_SELF +#define AUDIT_IN_SELF IN_DELETE_SELF|IN_MOVE_SELF|IN_UNMOUNT + +static inline void audit_get_parent(struct audit_parent *parent) +{ + atomic_inc(&parent->count); +} + +static inline void audit_put_parent(struct audit_parent *parent) +{ + if (atomic_dec_and_test(&parent->count)) { + WARN_ON(!list_empty(&parent->watches)); + kfree(parent); + } +} + +static inline void audit_get_watch(struct audit_watch *watch) +{ + atomic_inc(&watch->count); +} + +static inline void audit_put_watch(struct audit_watch *watch) +{ + if (atomic_dec_and_test(&watch->count)) { + WARN_ON(!list_empty(&watch->rules)); + /* watches that were never added don't have a parent */ + if (watch->parent) + audit_put_parent(watch->parent); + kfree(watch->path); + kfree(watch); + } +} + static inline void audit_free_rule(struct audit_entry *e) { int i; + + /* some rules don't have associated watches */ + if (e->rule.watch) + audit_put_watch(e->rule.watch); if (e->rule.fields) for (i = 0; i < e->rule.field_count; i++) { struct audit_field *f = &e->rule.fields[i]; @@ -60,6 +138,43 @@ static inline void audit_free_rule_rcu(s audit_free_rule(e); } +/* Initialize a parent watch entry. */ +static inline struct audit_parent *audit_init_parent(void) +{ + struct audit_parent *parent; + + parent = kzalloc(sizeof(*parent), GFP_KERNEL); + if (unlikely(!parent)) + return ERR_PTR(-ENOMEM); + + INIT_LIST_HEAD(&parent->watches); + atomic_set(&parent->count, 1); + + spin_lock(&master_parents_lock); + list_add(&parent->mlist, &master_parents); + spin_unlock(&master_parents_lock); + + return parent; +} + +/* Initialize a watch entry. */ +static inline struct audit_watch *audit_init_watch(char *path) +{ + struct audit_watch *watch; + + watch = kzalloc(sizeof(*watch), GFP_KERNEL); + if (unlikely(!watch)) + return ERR_PTR(-ENOMEM); + + INIT_LIST_HEAD(&watch->rules); + atomic_set(&watch->count, 1); + watch->path = path; + watch->dev = (dev_t)-1; + watch->ino = (unsigned long)-1; + + return watch; +} + /* Initialize an audit filterlist entry. */ static inline struct audit_entry *audit_init_entry(u32 field_count) { @@ -107,6 +222,28 @@ static char *audit_unpack_string(void ** return str; } +/* Translate a watch string to kernel respresentation. */ +static int audit_to_watch(struct audit_krule *krule, char *path, int len, + u32 op) +{ + struct audit_watch *watch; + + if (path[0] != '/' || path[len-1] == '/' || + krule->listnr != AUDIT_FILTER_EXIT || + op & ~AUDIT_EQUAL || + krule->watch) /* allow only 1 watch per rule */ + return -EINVAL; + + watch = audit_init_watch(path); + if (unlikely(IS_ERR(watch))) + return PTR_ERR(watch); + + audit_get_watch(watch); + krule->watch = watch; + + return 0; +} + /* Common user-space to kernel rule translation. */ static inline struct audit_entry *audit_to_entry_common(struct audit_rule *rule) { @@ -177,7 +314,8 @@ static struct audit_entry *audit_rule_to f->type == AUDIT_SE_ROLE || f->type == AUDIT_SE_TYPE || f->type == AUDIT_SE_SEN || - f->type == AUDIT_SE_CLR) { + f->type == AUDIT_SE_CLR || + f->type == AUDIT_WATCH) { err = -EINVAL; goto exit_free; } @@ -260,6 +398,18 @@ static struct audit_entry *audit_data_to } else f->se_str = str; break; + case AUDIT_WATCH: + str = audit_unpack_string(&bufp, &remain, f->val); + if (IS_ERR(str)) + goto exit_free; + entry->rule.buflen += f->val; + + err = audit_to_watch(&entry->rule, str, f->val, f->op); + if (err) { + kfree(str); + goto exit_free; + } + break; } } @@ -343,6 +493,10 @@ static struct audit_rule_data *audit_kru data->buflen += data->values[i] = audit_pack_string(&bufp, f->se_str); break; + case AUDIT_WATCH: + data->buflen += data->values[i] = + audit_pack_string(&bufp, krule->watch->path); + break; default: data->values[i] = f->val; } @@ -378,6 +532,10 @@ static int audit_compare_rule(struct aud if (strcmp(a->fields[i].se_str, b->fields[i].se_str)) return 1; break; + case AUDIT_WATCH: + if (strcmp(a->watch->path, b->watch->path)) + return 1; + break; default: if (a->fields[i].val != b->fields[i].val) return 1; @@ -391,6 +549,31 @@ static int audit_compare_rule(struct aud return 0; } +/* Duplicate the given audit watch. The new watch's rules list is initialized + * to an empty list and wlist is undefined. */ +static inline struct audit_watch *audit_dupe_watch(struct audit_watch *old) +{ + char *path; + struct audit_watch *new; + + path = kstrdup(old->path, GFP_KERNEL); + if (unlikely(!path)) + return ERR_PTR(-ENOMEM); + + new = audit_init_watch(path); + if (unlikely(!new)) { + kfree(path); + return ERR_PTR(-ENOMEM); + } + + new->dev = old->dev; + new->ino = old->ino; + audit_get_parent(old->parent); + new->parent = old->parent; + + return new; +} + /* Duplicate selinux field information. The se_rule is opaque, so must be * re-initialized. */ static inline int audit_dupe_selinux_field(struct audit_field *df, @@ -422,8 +605,11 @@ static inline int audit_dupe_selinux_fie /* Duplicate an audit rule. This will be a deep copy with the exception * of the watch - that pointer is carried over. The selinux specific fields * will be updated in the copy. The point is to be able to replace the old - * rule with the new rule in the filterlist, then free the old rule. */ -static struct audit_entry *audit_dupe_rule(struct audit_krule *old) + * rule with the new rule in the filterlist, then free the old rule. + * The rlist element is undefined; list manipulations are handled apart from + * the initial copy. */ +static struct audit_entry *audit_dupe_rule(struct audit_krule *old, + struct audit_watch *watch) { u32 fcount = old->field_count; struct audit_entry *entry; @@ -442,6 +628,7 @@ static struct audit_entry *audit_dupe_ru for (i = 0; i < AUDIT_BITMASK_SIZE; i++) new->mask[i] = old->mask[i]; new->buflen = old->buflen; + new->watch = NULL; new->field_count = old->field_count; memcpy(new->fields, old->fields, sizeof(struct audit_field) * fcount); @@ -463,48 +650,393 @@ static struct audit_entry *audit_dupe_ru } } + if (watch) { + audit_get_watch(watch); + new->watch = watch; + } + return entry; } -/* Add rule to given filterlist if not a duplicate. Protected by - * audit_netlink_mutex. */ -static inline int audit_add_rule(struct audit_entry *entry, - struct list_head *list) +/* Update inode numbers in audit rules based on filesystem event. */ +static inline void audit_update_watch(struct audit_parent *parent, + const char *dname, dev_t dev, + unsigned long ino) +{ + struct audit_watch *owatch, *nwatch, *nextw; + struct audit_krule *r, *nextr; + struct audit_entry *oentry, *nentry; + struct audit_buffer *ab; + + mutex_lock(&audit_filter_mutex); + list_for_each_entry_safe(owatch, nextw, &parent->watches, wlist) { + if (audit_compare_dname_path(dname, owatch->path)) + continue; + + nwatch = audit_dupe_watch(owatch); + if (unlikely(IS_ERR(nwatch))) { + mutex_unlock(&audit_filter_mutex); + audit_panic("error updating watch, skipping"); + return; + } + nwatch->dev = dev; + nwatch->ino = ino; + + list_for_each_entry_safe(r, nextr, &owatch->rules, rlist) { + oentry = container_of(r, struct audit_entry, rule); + + nentry = audit_dupe_rule(&oentry->rule, nwatch); + if (unlikely(IS_ERR(nentry))) { + audit_panic("error updating watch, removing"); + list_del(&oentry->rule.rlist); + list_del_rcu(&oentry->list); + } else { + list_add(&nentry->rule.rlist, &nwatch->rules); + list_del(&oentry->rule.rlist); + list_replace_rcu(&oentry->list, &nentry->list); + } + call_rcu(&oentry->rcu, audit_free_rule_rcu); + } + + ab = audit_log_start(NULL, GFP_KERNEL, AUDIT_CONFIG_CHANGE); + audit_log_format(ab, "audit updated rules specifying watch="); + audit_log_untrustedstring(ab, owatch->path); + audit_log_format(ab, " with dev=%u ino=%lu\n", dev, ino); + audit_log_end(ab); + + list_del(&owatch->wlist); + audit_put_watch(owatch); /* matches initial get */ + goto add_watch_to_parent; /* event applies to a single watch */ + } + mutex_unlock(&audit_filter_mutex); + return; + +add_watch_to_parent: + list_add(&nwatch->wlist, &parent->watches); + mutex_unlock(&audit_filter_mutex); + return; +} + +/* Remove all watches & rules associated with a parent that is going away. */ +static inline void audit_remove_parent_watches(struct audit_parent *parent) { + struct audit_watch *w, *nextw; + struct audit_krule *r, *nextr; struct audit_entry *e; - /* Do not use the _rcu iterator here, since this is the only - * addition routine. */ + mutex_lock(&audit_filter_mutex); + list_for_each_entry_safe(w, nextw, &parent->watches, wlist) { + list_for_each_entry_safe(r, nextr, &w->rules, rlist) { + e = container_of(r, struct audit_entry, rule); + list_del(&r->rlist); + list_del_rcu(&e->list); + call_rcu(&e->rcu, audit_free_rule_rcu); + + audit_log(NULL, GFP_KERNEL, AUDIT_CONFIG_CHANGE, + "audit implicitly removed rule from list=%d\n", + AUDIT_FILTER_EXIT); + } + list_del(&w->wlist); + audit_put_watch(w); /* matches initial get */ + } + mutex_unlock(&audit_filter_mutex); +} + +/* Actually remove the parent; inotify has acknowleged the removal. */ +static inline void audit_remove_parent(struct audit_parent *parent) +{ + WARN_ON(!list_empty(&parent->watches)); + spin_lock(&master_parents_lock); + list_del(&parent->mlist); + audit_put_parent(parent); + spin_unlock(&master_parents_lock); +} + +/* Register inotify watches for parents on in_list. */ +static int audit_inotify_register(struct nameidata *nd, + struct list_head *in_list) +{ + struct audit_parent *p; + s32 wd; + int ret = 0; + + list_for_each_entry(p, in_list, ilist) { + /* Grab a ref while calling inotify_add_watch(), so parent + * can't be removed until we've updated its data. */ + audit_get_parent(p); + + if (!audit_idev) + wd = -EOPNOTSUPP; + else + wd = inotify_add_watch(audit_idev, nd->dentry->d_inode, + AUDIT_IN_WATCH, p); + if (wd < 0) { + audit_remove_parent_watches(p); + audit_remove_parent(p); + /* save the first error for return value */ + if (!ret) + ret = wd; + } else { + struct inode *inode = nd->dentry->d_inode; + + mutex_lock(&audit_filter_mutex); + p->wd = wd; + p->dev = inode->i_sb->s_dev; + p->ino = inode->i_ino; + mutex_unlock(&audit_filter_mutex); + } + + audit_put_parent(p); + } + + return ret; +} + +/* Unregister inotify watches for parents on in_list. + * Generates an IN_IGNORED event. */ +static void audit_inotify_unregister(struct list_head *in_list) +{ + struct audit_parent *p; + + list_for_each_entry(p, in_list, ilist) { + if (audit_idev) + inotify_ignore(audit_idev, p->wd); + /* matches get in audit_remove_watch() */ + audit_put_parent(p); + } +} + +/* Get path information necessary for adding watches. */ +static int audit_get_nd(char *path, struct nameidata **ndp, + struct nameidata **ndw) +{ + struct nameidata *ndparent, *ndwatch; + int err; + + ndparent = kmalloc(sizeof(*ndparent), GFP_KERNEL); + if (unlikely(!ndparent)) + return -ENOMEM; + + ndwatch = kmalloc(sizeof(*ndwatch), GFP_KERNEL); + if (unlikely(!ndwatch)) { + kfree(ndparent); + return -ENOMEM; + } + + err = path_lookup(path, LOOKUP_PARENT, ndparent); + if (err) { + kfree(ndparent); + kfree(ndwatch); + return err; + } + + err = path_lookup(path, 0, ndwatch); + if (err) { + kfree(ndwatch); + ndwatch = NULL; + } + + *ndp = ndparent; + *ndw = ndwatch; + + return 0; +} + +/* Release resources used for watch path information. */ +static inline void audit_put_nd(struct nameidata *ndp, struct nameidata *ndw) +{ + if (ndp) { + path_release(ndp); + kfree(ndp); + } + if (ndw) { + path_release(ndw); + kfree(ndw); + } +} + +/* Find an existing parent entry for this watch, or create a new one. + * Caller must hold audit_filter_mutex. */ +static inline struct audit_parent *audit_find_parent(struct nameidata *nd, + struct list_head *in_list) +{ + struct audit_parent *p, *parent, *next; + struct inode *inode = nd->dentry->d_inode; + + list_for_each_entry_safe(p, next, &master_parents, mlist) { + if (p->ino != inode->i_ino || + p->dev != inode->i_sb->s_dev) + continue; + + parent = p; + goto out; + } + + parent = audit_init_parent(); + if (IS_ERR(parent)) + goto out; + /* add new parent to inotify registration list */ + list_add(&parent->ilist, in_list); + +out: + return parent; +} + +/* Find a matching watch entry, or add this one. + * Caller must hold audit_filter_mutex. */ +static inline int audit_add_watch(struct audit_krule *krule, + struct nameidata *ndp, struct nameidata *ndw, + struct list_head *list) +{ + struct audit_parent *parent; + struct audit_watch *w, *watch = krule->watch; + + parent = audit_find_parent(ndp, list); + if (IS_ERR(parent)) + return PTR_ERR(parent); + + list_for_each_entry(w, &parent->watches, wlist) { + if (strcmp(watch->path, w->path)) + continue; + + audit_put_watch(watch); /* tmp watch, krule's ref */ + audit_put_watch(watch); /* tmp watch, matches initial get */ + + audit_get_watch(w); + krule->watch = watch = w; + goto add_rule; + } + + audit_get_parent(parent); + watch->parent = parent; + list_add(&watch->wlist, &parent->watches); + +add_rule: + list_add(&krule->rlist, &watch->rules); + + if (ndw) { + watch->dev = ndw->dentry->d_inode->i_sb->s_dev; + watch->ino = ndw->dentry->d_inode->i_ino; + } + + return 0; +} + +/* Add rule to given filterlist if not a duplicate. */ +static inline int audit_add_rule(struct audit_entry *entry, + struct list_head *list) +{ + struct audit_entry *e; + struct audit_watch *watch = entry->rule.watch; + struct nameidata *ndp, *ndw; + LIST_HEAD(inotify_list); + int err; + + /* Taking audit_filter_mutex protects from stale rule data and + * writes to an audit_parent. */ + mutex_lock(&audit_filter_mutex); list_for_each_entry(e, list, list) { - if (!audit_compare_rule(&entry->rule, &e->rule)) - return -EEXIST; + if (!audit_compare_rule(&entry->rule, &e->rule)) { + err = -EEXIST; + mutex_unlock(&audit_filter_mutex); + goto error; + } + } + mutex_unlock(&audit_filter_mutex); + + /* Avoid calling path_lookup under audit_filter_mutex. */ + if (watch) { + err = audit_get_nd(watch->path, &ndp, &ndw); + if (err) + goto error; } + mutex_lock(&audit_filter_mutex); + if (watch) { + err = audit_add_watch(&entry->rule, ndp, ndw, &inotify_list); + if (err) { + mutex_unlock(&audit_filter_mutex); + audit_put_nd(ndp, ndw); + goto error; + } + } if (entry->rule.flags & AUDIT_FILTER_PREPEND) { list_add_rcu(&entry->list, list); } else { list_add_tail_rcu(&entry->list, list); } + mutex_unlock(&audit_filter_mutex); + + if (watch) { + err = audit_inotify_register(ndp, &inotify_list); + if (err) + goto error; + audit_put_nd(ndp, ndw); + } return 0; + +error: + if (watch) + audit_put_watch(watch); /* tmp watch, matches initial get */ + return err; +} + +/* Remove given krule from its associated watch's rules list and clean up any + * last instances of associated watch and parent. + * Caller must hold audit_filter_mutex. */ +static inline void audit_remove_watch(struct audit_krule *krule, + struct list_head *in_list) +{ + struct audit_watch *watch = krule->watch; + struct audit_parent *parent = watch->parent; + + list_del(&krule->rlist); + if (list_empty(&watch->rules)) { + list_del(&watch->wlist); + audit_put_watch(watch); /* matches initial get */ + + if (list_empty(&parent->watches)) { + /* Put parent on the inotify un-registration list. + * Grab a reference before releasing audit_filter_mutex, + * to be released in audit_inotify_unregister(). */ + list_add(&parent->ilist, in_list); + audit_get_parent(parent); + } + } } -/* Remove an existing rule from filterlist. Protected by - * audit_netlink_mutex. */ +/* Remove an existing rule from filterlist. */ static inline int audit_del_rule(struct audit_entry *entry, struct list_head *list) { struct audit_entry *e; + LIST_HEAD(inotify_list); - /* Do not use the _rcu iterator here, since this is the only - * deletion routine. */ + mutex_lock(&audit_filter_mutex); list_for_each_entry(e, list, list) { - if (!audit_compare_rule(&entry->rule, &e->rule)) { - list_del_rcu(&e->list); - call_rcu(&e->rcu, audit_free_rule_rcu); - return 0; + if (audit_compare_rule(&entry->rule, &e->rule)) + continue; + + if (e->rule.watch) { + audit_remove_watch(&e->rule, &inotify_list); + /* match initial get for tmp watch */ + audit_put_watch(entry->rule.watch); } - } + + list_del_rcu(&e->list); + call_rcu(&e->rcu, audit_free_rule_rcu); + mutex_unlock(&audit_filter_mutex); + + if (e->rule.watch) + audit_inotify_unregister(&inotify_list); + + return 0; + } + mutex_unlock(&audit_filter_mutex); + /* match initial get for tmp watch */ + if (entry->rule.watch) + audit_put_watch(entry->rule.watch); return -ENOENT; /* No matching rule */ } @@ -521,10 +1053,10 @@ static int audit_list(void *_dest) seq = dest[1]; kfree(dest); - mutex_lock(&audit_netlink_mutex); + mutex_lock(&audit_filter_mutex); - /* The *_rcu iterators not needed here because we are - always called with audit_netlink_mutex held. */ + /* This is a blocking read, so use audit_filter_mutex instead of rcu + * iterator to sync with list writers. */ for (i=0; ibuflen); kfree(data); } } audit_send_reply(pid, seq, AUDIT_LIST_RULES, 1, 1, NULL, 0); - mutex_unlock(&audit_netlink_mutex); + mutex_unlock(&audit_filter_mutex); return 0; } @@ -662,6 +1194,32 @@ int audit_receive_filter(int type, int p return err; } +/** + * audit_handle_ievent - handler for Inotify events + * @event: information about the event + * @dname: dentry name associated with event + * @inode: inode associated with event + * @ptr: kernel's version of a watch descriptor + */ +void audit_handle_ievent(struct inotify_event *event, const char *dname, + struct inode *inode, void *ptr) +{ + struct audit_parent *parent = (struct audit_parent *)ptr; + + if (event->mask & (IN_CREATE|IN_MOVED_TO) && inode) + audit_update_watch(parent, dname, inode->i_sb->s_dev, + inode->i_ino); + else if (event->mask & (IN_DELETE|IN_MOVED_FROM)) + audit_update_watch(parent, dname, (dev_t)-1, (unsigned long)-1); + /* Note: Inotify doesn't remove the watch for the IN_MOVE_SELF event. + * Work around this by leaving the parent around with an empty + * watchlist. It will be re-used if new watches are added. */ + else if (event->mask & (AUDIT_IN_SELF)) + audit_remove_parent_watches(parent); + else if (event->mask & IN_IGNORED) + audit_remove_parent(parent); +} + int audit_comparator(const u32 left, const u32 op, const u32 right) { switch (op) { @@ -682,7 +1240,39 @@ int audit_comparator(const u32 left, con return 0; } +/* Compare given dentry name with last component in given path, + * return of 0 indicates a match. */ +int audit_compare_dname_path(const char *dname, const char *path) +{ + int dlen, plen; + const char *p; + + if (!dname || !path) + return 1; + + dlen = strlen(dname); + plen = strlen(path); + if (plen < dlen) + return 1; + + /* disregard trailing slashes */ + p = path + plen - 1; + while ((*p == '/') && (p > path)) + p--; + + /* find last path component */ + p = p - dlen + 1; + if (p < path) + return 1; + else if (p > path) { + if (*--p != '/') + return 1; + else + p++; + } + return strncmp(p, dname, dlen); +} static int audit_filter_user_rules(struct netlink_skb_parms *cb, struct audit_krule *rule, @@ -796,32 +1386,41 @@ static inline int audit_rule_has_selinux int selinux_audit_rule_update(void) { struct audit_entry *entry, *nentry; + struct audit_watch *watch; int i, err = 0; - /* audit_netlink_mutex synchronizes the writers */ - mutex_lock(&audit_netlink_mutex); + /* audit_filter_mutex synchronizes the writers */ + mutex_lock(&audit_filter_mutex); for (i = 0; i < AUDIT_NR_FILTERS; i++) { list_for_each_entry(entry, &audit_filter_list[i], list) { if (!audit_rule_has_selinux(&entry->rule)) continue; - nentry = audit_dupe_rule(&entry->rule); + watch = entry->rule.watch; + nentry = audit_dupe_rule(&entry->rule, watch); if (unlikely(IS_ERR(nentry))) { /* save the first error encountered for the * return value */ if (!err) err = PTR_ERR(nentry); audit_panic("error updating selinux filters"); + if (watch) + list_del(&entry->rule.rlist); list_del_rcu(&entry->list); } else { + if (watch) { + list_add(&nentry->rule.rlist, + &watch->rules); + list_del(&entry->rule.rlist); + } list_replace_rcu(&entry->list, &nentry->list); } call_rcu(&entry->rcu, audit_free_rule_rcu); } } - mutex_unlock(&audit_netlink_mutex); + mutex_unlock(&audit_filter_mutex); return err; } diff --git a/kernel/auditsc.c b/kernel/auditsc.c index ba9e9a3..0f56c69 100644 --- a/kernel/auditsc.c +++ b/kernel/auditsc.c @@ -160,6 +160,27 @@ struct audit_context { #endif }; +/* Determine if any context name data matches a rule's watch data */ +static inline int audit_match_watch(struct audit_context *ctx, + struct audit_watch *watch) +{ + int i; + + if (!ctx) + return 0; + + if (watch->ino == (unsigned long)-1) + return 0; + + for (i = 0; i < ctx->name_count; i++) { + if (ctx->names[i].dev == watch->dev && + (ctx->names[i].ino == watch->ino || + ctx->names[i].pino == watch->ino)) + return 1; + } + + return 0; +} /* Compare a task_struct with an audit_rule. Return 1 on match, 0 * otherwise. */ @@ -256,6 +277,9 @@ static int audit_filter_rules(struct tas } } break; + case AUDIT_WATCH: + result = audit_match_watch(ctx, rule->watch); + break; case AUDIT_LOGINUID: result = 0; if (ctx) @@ -1067,37 +1091,20 @@ void __audit_inode_child(const char *dna return; /* determine matching parent */ - if (dname) - for (idx = 0; idx < context->name_count; idx++) - if (context->names[idx].pino == pino) { - const char *n; - const char *name = context->names[idx].name; - int dlen = strlen(dname); - int nlen = name ? strlen(name) : 0; - - if (nlen < dlen) - continue; - - /* disregard trailing slashes */ - n = name + nlen - 1; - while ((*n == '/') && (n > name)) - n--; - - /* find last path component */ - n = n - dlen + 1; - if (n < name) - continue; - else if (n > name) { - if (*--n != '/') - continue; - else - n++; - } + if (!dname) + goto no_match; + for (idx = 0; idx < context->name_count; idx++) + if (context->names[idx].pino == pino) { + const char *name = context->names[idx].name; - if (strncmp(n, dname, dlen) == 0) - goto update_context; - } + if (!name) + continue; + + if (audit_compare_dname_path(dname, name) == 0) + goto update_context; + } +no_match: /* catch-all in case match not found */ idx = context->name_count++; context->names[idx].name = NULL; -- 0.99.9.GIT Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-5/kernel-2.6.spec,v retrieving revision 1.2032.2.3 retrieving revision 1.2032.2.4 diff -u -r1.2032.2.3 -r1.2032.2.4 --- kernel-2.6.spec 10 Mar 2006 20:19:37 -0000 1.2032.2.3 +++ kernel-2.6.spec 21 Mar 2006 15:17:39 -0000 1.2032.2.4 @@ -24,7 +24,7 @@ %define sublevel 15 %define kversion 2.6.%{sublevel} %define rpmversion 2.6.%{sublevel} -%define rhbsys .lspp.12 +%define rhbsys .lspp.13 %define release %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})_FC5%{rhbsys} %define signmodules 0 %define make_target bzImage @@ -425,6 +425,9 @@ # Audit & lspp patches Patch20100: linux-2.6-audit-git.patch Patch20101: linux-2.6-audit-slab-leak-tracking.patch +Patch20102: 0001-support-for-context-based-audit-filtering.patch +Patch20103: 0002-support-for-context-based-audit-filtering.patch +Patch20104: 0003-filesystem-location-based-auditing.patch # END OF PATCH DEFINITIONS @@ -1070,6 +1073,9 @@ # Audit patches %patch20100 -p1 %patch20101 -p1 +%patch20102 -p1 +%patch20103 -p1 +%patch20104 -p1 # END OF PATCH APPLICATIONS @@ -1662,6 +1668,9 @@ %endif %changelog +* Tue Mar 21 2006 Steve Grubb +- lspp.13 + * Fri Mar 10 2006 Steve Grubb - lspp.12 linux-2.6-audit-git.patch: arch/i386/kernel/vm86.c | 12 arch/ia64/kernel/ptrace.c | 10 fs/namei.c | 11 fs/open.c | 8 fs/xattr.c | 11 include/linux/audit.h | 130 +++++- include/linux/fsnotify.h | 14 include/linux/security.h | 33 + ipc/msg.c | 5 ipc/sem.c | 5 ipc/shm.c | 4 kernel/Makefile | 2 kernel/audit.c | 175 ++++++-- kernel/audit.h | 88 ++++ kernel/auditfilter.c | 630 +++++++++++++++++++++++++++++++ kernel/auditsc.c | 832 +++++++++++++++++++++-------------------- net/core/dev.c | 7 security/dummy.c | 14 security/selinux/hooks.c | 98 ++-- security/selinux/nlmsgtab.c | 9 security/selinux/selinuxfs.c | 11 security/selinux/ss/services.c | 15 22 files changed, 1579 insertions(+), 545 deletions(-) Index: linux-2.6-audit-git.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-5/Attic/linux-2.6-audit-git.patch,v retrieving revision 1.1.14.2 retrieving revision 1.1.14.3 diff -u -r1.1.14.2 -r1.1.14.3 --- linux-2.6-audit-git.patch 10 Mar 2006 20:19:38 -0000 1.1.14.2 +++ linux-2.6-audit-git.patch 21 Mar 2006 15:17:39 -0000 1.1.14.3 @@ -1,40 +1,3 @@ -diff --git a/arch/i386/kernel/ptrace.c b/arch/i386/kernel/ptrace.c -index 5c1fb6a..4caeee9 100644 ---- a/arch/i386/kernel/ptrace.c -+++ b/arch/i386/kernel/ptrace.c -@@ -670,9 +670,11 @@ int do_syscall_trace(struct pt_regs *reg - secure_computing(regs->orig_eax); - - if (unlikely(current->audit_context)) { -- if (entryexit) -- audit_syscall_exit(current, AUDITSC_RESULT(regs->eax), -- regs->eax); -+ if (entryexit) { -+ if (audit_invoke_exit()) -+ audit_syscall_exit(current, AUDITSC_RESULT(regs->eax), -+ regs->eax); -+ } - /* Debug traps, when using PTRACE_SINGLESTEP, must be sent only - * on the syscall exit path. Normally, when TIF_SYSCALL_AUDIT is - * not used, entry.S will call us only on syscall exit, not -@@ -719,14 +721,14 @@ int do_syscall_trace(struct pt_regs *reg - } - ret = is_sysemu; - out: -- if (unlikely(current->audit_context) && !entryexit) -+ if (audit_invoke_entry() && !entryexit) - audit_syscall_entry(current, AUDIT_ARCH_I386, regs->orig_eax, -- regs->ebx, regs->ecx, regs->edx, regs->esi); -+ regs->ebx, regs->ecx, regs->edx, regs->esi); - if (ret == 0) - return 0; - - regs->orig_eax = -1; /* force skip of syscall restarting */ -- if (unlikely(current->audit_context)) -+ if (audit_invoke_exit()) - audit_syscall_exit(current, AUDITSC_RESULT(regs->eax), - regs->eax); - return 1; diff --git a/arch/i386/kernel/vm86.c b/arch/i386/kernel/vm86.c index f51c894..aee14fa 100644 --- a/arch/i386/kernel/vm86.c @@ -78,25 +41,16 @@ } diff --git a/arch/ia64/kernel/ptrace.c b/arch/ia64/kernel/ptrace.c -index eaed14a..bc3fdc0 100644 +index eaed14a..9887c87 100644 --- a/arch/ia64/kernel/ptrace.c +++ b/arch/ia64/kernel/ptrace.c -@@ -1632,7 +1632,7 @@ syscall_trace_enter (long arg0, long arg - && (current->ptrace & PT_PTRACED)) - syscall_trace(); - -- if (unlikely(current->audit_context)) { -+ if (audit_invoke_entry()) { - long syscall; - int arch; - @@ -1656,8 +1656,14 @@ syscall_trace_leave (long arg0, long arg long arg4, long arg5, long arg6, long arg7, struct pt_regs regs) { - if (unlikely(current->audit_context)) - audit_syscall_exit(current, AUDITSC_RESULT(regs.r10), regs.r8); -+ if (audit_invoke_exit()) { ++ if (unlikely(current->audit_context)) { + int success = AUDITSC_RESULT(regs.r10); + long result = regs.r8; + @@ -107,188 +61,8 @@ if (test_thread_flag(TIF_SYSCALL_TRACE) && (current->ptrace & PT_PTRACED)) -diff --git a/arch/mips/kernel/ptrace.c b/arch/mips/kernel/ptrace.c -index f838b36..f3da86d 100644 ---- a/arch/mips/kernel/ptrace.c -+++ b/arch/mips/kernel/ptrace.c -@@ -468,7 +468,7 @@ static inline int audit_arch(void) - */ - asmlinkage void do_syscall_trace(struct pt_regs *regs, int entryexit) - { -- if (unlikely(current->audit_context) && entryexit) -+ if (audit_invoke_exit() && entryexit) - audit_syscall_exit(current, AUDITSC_RESULT(regs->regs[2]), - regs->regs[2]); - -@@ -492,7 +492,7 @@ asmlinkage void do_syscall_trace(struct - current->exit_code = 0; - } - out: -- if (unlikely(current->audit_context) && !entryexit) -+ if (audit_invoke_entry() && !entryexit) - audit_syscall_entry(current, audit_arch(), regs->regs[2], - regs->regs[4], regs->regs[5], - regs->regs[6], regs->regs[7]); -diff --git a/arch/powerpc/kernel/ptrace.c b/arch/powerpc/kernel/ptrace.c -index bcb8357..0ca4ce5 100644 ---- a/arch/powerpc/kernel/ptrace.c -+++ b/arch/powerpc/kernel/ptrace.c -@@ -537,16 +537,16 @@ void do_syscall_trace_enter(struct pt_re - && (current->ptrace & PT_PTRACED)) - do_syscall_trace(); - -- if (unlikely(current->audit_context)) -+ if (audit_invoke_entry()) - audit_syscall_entry(current, - #ifdef CONFIG_PPC32 -- AUDIT_ARCH_PPC, -+ AUDIT_ARCH_PPC, - #else -- test_thread_flag(TIF_32BIT)?AUDIT_ARCH_PPC:AUDIT_ARCH_PPC64, -+ test_thread_flag(TIF_32BIT)?AUDIT_ARCH_PPC:AUDIT_ARCH_PPC64, - #endif -- regs->gpr[0], -- regs->gpr[3], regs->gpr[4], -- regs->gpr[5], regs->gpr[6]); -+ regs->gpr[0], -+ regs->gpr[3], regs->gpr[4], -+ regs->gpr[5], regs->gpr[6]); - } - - void do_syscall_trace_leave(struct pt_regs *regs) -@@ -555,10 +555,10 @@ void do_syscall_trace_leave(struct pt_re - secure_computing(regs->gpr[0]); - #endif - -- if (unlikely(current->audit_context)) -+ if (audit_invoke_exit()) - audit_syscall_exit(current, -- (regs->ccr&0x1000)?AUDITSC_FAILURE:AUDITSC_SUCCESS, -- regs->result); -+ (regs->ccr&0x1000)?AUDITSC_FAILURE:AUDITSC_SUCCESS, -+ regs->result); - - if ((test_thread_flag(TIF_SYSCALL_TRACE) - || test_thread_flag(TIF_SINGLESTEP)) -diff --git a/arch/s390/kernel/ptrace.c b/arch/s390/kernel/ptrace.c -index 37dfe33..a7e94f4 100644 ---- a/arch/s390/kernel/ptrace.c -+++ b/arch/s390/kernel/ptrace.c -@@ -733,7 +733,7 @@ out: - asmlinkage void - syscall_trace(struct pt_regs *regs, int entryexit) - { -- if (unlikely(current->audit_context) && entryexit) -+ if (audit_invoke_exit() && entryexit) - audit_syscall_exit(current, AUDITSC_RESULT(regs->gprs[2]), regs->gprs[2]); - - if (!test_thread_flag(TIF_SYSCALL_TRACE)) -@@ -760,7 +760,7 @@ syscall_trace(struct pt_regs *regs, int - current->exit_code = 0; - } - out: -- if (unlikely(current->audit_context) && !entryexit) -+ if (audit_invoke_entry() && !entryexit) - audit_syscall_entry(current, - test_thread_flag(TIF_31BIT)?AUDIT_ARCH_S390:AUDIT_ARCH_S390X, - regs->gprs[2], regs->orig_gpr2, regs->gprs[3], -diff --git a/arch/sparc64/kernel/ptrace.c b/arch/sparc64/kernel/ptrace.c -index 3f9746f..5516f2c 100644 ---- a/arch/sparc64/kernel/ptrace.c -+++ b/arch/sparc64/kernel/ptrace.c -@@ -620,7 +620,7 @@ asmlinkage void syscall_trace(struct pt_ - /* do the secure computing check first */ - secure_computing(regs->u_regs[UREG_G1]); - -- if (unlikely(current->audit_context) && syscall_exit_p) { -+ if (audit_invoke_exit() && syscall_exit_p) { - unsigned long tstate = regs->tstate; - int result = AUDITSC_SUCCESS; - -@@ -650,7 +650,7 @@ asmlinkage void syscall_trace(struct pt_ - } - - out: -- if (unlikely(current->audit_context) && !syscall_exit_p) -+ if (audit_invoke_entry() && !syscall_exit_p) - audit_syscall_entry(current, - (test_thread_flag(TIF_32BIT) ? - AUDIT_ARCH_SPARC : -diff --git a/arch/um/kernel/ptrace.c b/arch/um/kernel/ptrace.c -index 98e0939..26dde51 100644 ---- a/arch/um/kernel/ptrace.c -+++ b/arch/um/kernel/ptrace.c -@@ -267,19 +267,19 @@ void syscall_trace(union uml_pt_regs *re - int is_singlestep = (current->ptrace & PT_DTRACE) && entryexit; - int tracesysgood; - -- if (unlikely(current->audit_context)) { -- if (!entryexit) -+ if (!entryexit) -+ if(audit_invoke_entry()) - audit_syscall_entry(current, -- HOST_AUDIT_ARCH, -- UPT_SYSCALL_NR(regs), -- UPT_SYSCALL_ARG1(regs), -- UPT_SYSCALL_ARG2(regs), -- UPT_SYSCALL_ARG3(regs), -- UPT_SYSCALL_ARG4(regs)); -- else audit_syscall_exit(current, -- AUDITSC_RESULT(UPT_SYSCALL_RET(regs)), -- UPT_SYSCALL_RET(regs)); -- } -+ HOST_AUDIT_ARCH, -+ UPT_SYSCALL_NR(regs), -+ UPT_SYSCALL_ARG1(regs), -+ UPT_SYSCALL_ARG2(regs), -+ UPT_SYSCALL_ARG3(regs), -+ UPT_SYSCALL_ARG4(regs)); -+ else if (audit_invoke_exit()) -+ audit_syscall_exit(current, -+ AUDITSC_RESULT(UPT_SYSCALL_RET(regs)), -+ UPT_SYSCALL_RET(regs)); - - /* Fake a debug trap */ - if (is_singlestep) -diff --git a/arch/x86_64/kernel/ptrace.c b/arch/x86_64/kernel/ptrace.c -index 5320562..c669c78 100644 ---- a/arch/x86_64/kernel/ptrace.c -+++ b/arch/x86_64/kernel/ptrace.c -@@ -603,24 +603,24 @@ asmlinkage void syscall_trace_enter(stru - && (current->ptrace & PT_PTRACED)) - syscall_trace(regs); - -- if (unlikely(current->audit_context)) { -+ if (audit_invoke_entry()) { - if (test_thread_flag(TIF_IA32)) { - audit_syscall_entry(current, AUDIT_ARCH_I386, -- regs->orig_rax, -- regs->rbx, regs->rcx, -- regs->rdx, regs->rsi); -+ regs->orig_rax, -+ regs->rbx, regs->rcx, -+ regs->rdx, regs->rsi); - } else { - audit_syscall_entry(current, AUDIT_ARCH_X86_64, -- regs->orig_rax, -- regs->rdi, regs->rsi, -- regs->rdx, regs->r10); -+ regs->orig_rax, -+ regs->rdi, regs->rsi, -+ regs->rdx, regs->r10); - } - } - } - - asmlinkage void syscall_trace_leave(struct pt_regs *regs) - { -- if (unlikely(current->audit_context)) -+ if (audit_invoke_exit()) - audit_syscall_exit(current, AUDITSC_RESULT(regs->rax), regs->rax); - - if ((test_thread_flag(TIF_SYSCALL_TRACE) diff --git a/fs/namei.c b/fs/namei.c -index 557dcf3..012ba5d 100644 +index 8dc2b03..51cfc9c 100644 --- a/fs/namei.c +++ b/fs/namei.c @@ -1353,6 +1353,7 @@ static int may_delete(struct inode *dir, @@ -424,7 +198,7 @@ return error; } diff --git a/include/linux/audit.h b/include/linux/audit.h -index da3c019..5443dbb 100644 +index da3c019..1c47c59 100644 --- a/include/linux/audit.h +++ b/include/linux/audit.h @@ -33,27 +33,42 @@ @@ -477,12 +251,7 @@ #define AUDIT_DAEMON_START 1200 /* Daemon startup record */ #define AUDIT_DAEMON_END 1201 /* Daemon normal stop record */ -@@ -68,10 +83,18 @@ - #define AUDIT_CONFIG_CHANGE 1305 /* Audit system configuration change */ - #define AUDIT_SOCKADDR 1306 /* sockaddr copied as syscall arg */ - #define AUDIT_CWD 1307 /* Current working directory */ -+#define AUDIT_SYSCALL_PARTIAL 1310 /* Partial syscall event */ - +@@ -72,6 +87,13 @@ #define AUDIT_AVC 1400 /* SE Linux avc denial or grant */ #define AUDIT_SELINUX_ERR 1401 /* Internal SE Linux Errors */ #define AUDIT_AVC_PATH 1402 /* dentry, vfsmount pair from avc */ @@ -496,7 +265,7 @@ #define AUDIT_KERNEL 2000 /* Asynchronous audit record. NOT A REQUEST. */ -@@ -81,8 +104,9 @@ +@@ -81,8 +103,9 @@ #define AUDIT_FILTER_ENTRY 0x02 /* Apply rule at syscall entry */ #define AUDIT_FILTER_WATCH 0x03 /* Apply rule to file system watches */ #define AUDIT_FILTER_EXIT 0x04 /* Apply rule at syscall exit */ @@ -507,7 +276,7 @@ #define AUDIT_FILTER_PREPEND 0x10 /* Prepend to front of list */ -@@ -98,6 +122,13 @@ +@@ -98,6 +121,13 @@ #define AUDIT_WORD(nr) ((__u32)((nr)/32)) #define AUDIT_BIT(nr) (1 << ((nr) - AUDIT_WORD(nr)*32)) @@ -521,7 +290,7 @@ /* Rule fields */ /* These are useful when checking the * task structure at task creation time -@@ -114,6 +145,7 @@ +@@ -114,6 +144,7 @@ #define AUDIT_LOGINUID 9 #define AUDIT_PERS 10 #define AUDIT_ARCH 11 @@ -529,7 +298,7 @@ /* These are ONLY useful when checking * at syscall exit time (AUDIT_AT_EXIT). */ -@@ -128,8 +160,28 @@ +@@ -128,8 +159,28 @@ #define AUDIT_ARG2 (AUDIT_ARG0+2) #define AUDIT_ARG3 (AUDIT_ARG0+3) @@ -559,7 +328,7 @@ /* Status symbols */ /* Mask values */ -@@ -186,6 +238,26 @@ struct audit_status { +@@ -186,6 +237,26 @@ struct audit_status { __u32 backlog; /* messages waiting in queue */ }; @@ -586,7 +355,7 @@ struct audit_rule { /* for AUDIT_LIST, AUDIT_ADD, and AUDIT_DEL */ __u32 flags; /* AUDIT_PER_{TASK,CALL}, AUDIT_PREPEND */ __u32 action; /* AUDIT_NEVER, AUDIT_POSSIBLE, AUDIT_ALWAYS */ -@@ -222,22 +294,47 @@ extern void audit_syscall_entry(struct t +@@ -222,22 +293,33 @@ extern void audit_syscall_entry(struct t extern void audit_syscall_exit(struct task_struct *task, int failed, long return_code); extern void audit_getname(const char *name); extern void audit_putname(const char *name); @@ -622,24 +391,10 @@ extern void audit_signal_info(int sig, struct task_struct *t); -extern int audit_filter_user(struct netlink_skb_parms *cb, int type); +extern int audit_set_macxattr(const char *name); -+extern int audit_n_rules; -+static inline int audit_invoke_entry(void) -+{ -+ if (likely(!current->audit_context)) -+ return 0; -+ return (*((int *)current->audit_context) = audit_n_rules); -+} -+ -+static inline int audit_invoke_exit(void) -+{ -+ if (likely(!current->audit_context)) -+ return 0; -+ return (*(int *)current->audit_context); -+} #else #define audit_alloc(t) ({ 0; }) #define audit_free(t) do { ; } while (0) -@@ -245,16 +342,21 @@ extern int audit_filter_user(struct netl +@@ -245,16 +327,18 @@ extern int audit_filter_user(struct netl #define audit_syscall_exit(t,f,r) do { ; } while (0) #define audit_getname(n) do { ; } while (0) #define audit_putname(n) do { ; } while (0) @@ -658,13 +413,10 @@ #define audit_signal_info(s,t) do { ; } while (0) -#define audit_filter_user(cb,t) ({ 1; }) +#define audit_set_macxattr(n) do { ; } while (0) -+#define audit_n_rules 0 -+#define audit_invoke_entry() ({ 0; }) -+#define audit_invoke_exit() ({ 0; }) #endif #ifdef CONFIG_AUDIT -@@ -278,12 +380,11 @@ extern void audit_log_d_path(struct +@@ -278,12 +362,11 @@ extern void audit_log_d_path(struct const char *prefix, struct dentry *dentry, struct vfsmount *vfsmnt); @@ -682,7 +434,7 @@ #else #define audit_log(c,g,t,f,...) do { ; } while (0) #define audit_log_start(c,g,t) ({ NULL; }) -@@ -293,6 +394,7 @@ extern struct semaphore audit_netlink_se +@@ -293,6 +376,7 @@ extern struct semaphore audit_netlink_se #define audit_log_hex(a,b,l) do { ; } while (0) #define audit_log_untrustedstring(a,s) do { ; } while (0) #define audit_log_d_path(b,p,d,v) do { ; } while (0) @@ -1405,10 +1157,10 @@ +extern struct mutex audit_netlink_mutex; diff --git a/kernel/auditfilter.c b/kernel/auditfilter.c new file mode 100644 -index 0000000..45f3001 +index 0000000..d3a8539 --- /dev/null +++ b/kernel/auditfilter.c -@@ -0,0 +1,651 @@ +@@ -0,0 +1,630 @@ +/* auditfilter.c -- filtering of audit events + * + * Copyright 2003-2004 Red Hat, Inc. @@ -1745,9 +1497,6 @@ + struct list_head *list) +{ + struct audit_entry *e; -+#ifdef CONFIG_AUDITSYSCALL -+ int dont_count = 0; -+#endif + + /* Do not use the _rcu iterator here, since this is the only + * addition routine. */ @@ -1756,21 +1505,11 @@ + return -EEXIST; + } + -+ /* If either of these, don't count towards total */ -+#ifdef CONFIG_AUDITSYSCALL -+ if (entry->rule.listnr == AUDIT_FILTER_USER || -+ entry->rule.listnr == AUDIT_FILTER_TYPE) -+ dont_count = 1; -+#endif + if (entry->rule.flags & AUDIT_FILTER_PREPEND) { + list_add_rcu(&entry->list, list); + } else { + list_add_tail_rcu(&entry->list, list); + } -+#ifdef CONFIG_AUDITSYSCALL -+ if (!dont_count) -+ audit_n_rules++; -+#endif + + return 0; +} @@ -1787,15 +1526,7 @@ + list_for_each_entry(e, list, list) { + if (!audit_compare_rule(&entry->rule, &e->rule)) { + list_del_rcu(&e->list); -+#ifdef CONFIG_AUDITSYSCALL -+ if (entry->rule.listnr == AUDIT_FILTER_USER || -+ entry->rule.listnr == AUDIT_FILTER_TYPE) -+ audit_n_rules++; -+#endif + call_rcu(&e->rcu, audit_free_rule_rcu); -+#ifdef CONFIG_AUDITSYSCALL -+ audit_n_rules--; -+#endif + return 0; + } + } @@ -2061,7 +1792,7 @@ + return result; +} diff --git a/kernel/auditsc.c b/kernel/auditsc.c -index d7e7e63..6297d96 100644 +index d7e7e63..b613ec8 100644 --- a/kernel/auditsc.c +++ b/kernel/auditsc.c @@ -2,6 +2,8 @@ @@ -2119,7 +1850,7 @@ /* No syscall auditing will take place unless audit_enabled != 0. */ extern int audit_enabled; -@@ -62,28 +75,8 @@ extern int audit_enabled; +@@ -62,29 +75,6 @@ extern int audit_enabled; * path_lookup. */ #define AUDIT_NAMES_RESERVED 7 @@ -2145,12 +1876,11 @@ - * time, and always write out the audit - * record at syscall exit time. */ -}; -+/* number of audit rules */ -+int audit_n_rules; - +- /* When fs/namei.c:getname() is called, we store the pointer in name and * we don't let putname() free it (instead we free all of the saved -@@ -93,12 +86,13 @@ enum audit_state { + * pointers at syscall exit time). +@@ -93,12 +83,13 @@ enum audit_state { struct audit_names { const char *name; unsigned long ino; @@ -2165,7 +1895,7 @@ }; struct audit_aux_data { -@@ -115,6 +109,7 @@ struct audit_aux_data_ipcctl { +@@ -115,6 +106,7 @@ struct audit_aux_data_ipcctl { uid_t uid; gid_t gid; mode_t mode; @@ -2173,17 +1903,7 @@ }; struct audit_aux_data_socketcall { -@@ -137,6 +132,9 @@ struct audit_aux_data_path { - - /* The per-task audit context. */ - struct audit_context { -+ int invoke_audit; /* 1 if we should do syscall auditing, important: -+ implementation relies on this item being the -+ first one in the data structure */ - int in_syscall; /* 1 if task is in a syscall */ - enum audit_state state; - unsigned int serial; /* serial number for record */ -@@ -167,290 +165,72 @@ struct audit_context { +@@ -167,290 +159,72 @@ struct audit_context { #endif }; @@ -2494,7 +2214,7 @@ ++result; break; } -@@ -460,7 +240,7 @@ static int audit_filter_rules(struct tas +@@ -460,7 +234,7 @@ static int audit_filter_rules(struct tas case AUDIT_DEVMINOR: if (ctx) { for (j = 0; j < ctx->name_count; j++) { @@ -2503,7 +2223,7 @@ ++result; break; } -@@ -470,7 +250,8 @@ static int audit_filter_rules(struct tas +@@ -470,7 +244,8 @@ static int audit_filter_rules(struct tas case AUDIT_INODE: if (ctx) { for (j = 0; j < ctx->name_count; j++) { @@ -2513,7 +2233,7 @@ ++result; break; } -@@ -480,19 +261,17 @@ static int audit_filter_rules(struct tas +@@ -480,19 +255,17 @@ static int audit_filter_rules(struct tas case AUDIT_LOGINUID: result = 0; if (ctx) @@ -2535,7 +2255,7 @@ if (!result) return 0; } -@@ -527,7 +306,7 @@ static enum audit_state audit_filter_tas +@@ -527,7 +300,7 @@ static enum audit_state audit_filter_tas /* At syscall entry and exit time, this filter is called if the * audit_state is not low enough that auditing cannot take place, but is * also not high enough that we already know we have to write an audit @@ -2544,7 +2264,7 @@ */ static enum audit_state audit_filter_syscall(struct task_struct *tsk, struct audit_context *ctx, -@@ -541,77 +320,19 @@ static enum audit_state audit_filter_sys +@@ -541,77 +314,19 @@ static enum audit_state audit_filter_sys rcu_read_lock(); if (!list_empty(list)) { @@ -2562,9 +2282,7 @@ - rcu_read_unlock(); - return AUDIT_BUILD_CONTEXT; -} -+ int word = AUDIT_WORD(ctx->major); -+ int bit = AUDIT_BIT(ctx->major); - +- -static int audit_filter_user_rules(struct netlink_skb_parms *cb, - struct audit_rule *rule, - enum audit_state *state) @@ -2590,7 +2308,9 @@ - result = (cb->loginuid == value); - break; - } -- ++ int word = AUDIT_WORD(ctx->major); ++ int bit = AUDIT_BIT(ctx->major); + - if (rule->fields[i] & AUDIT_NEGATE) - result = !result; - if (!result) @@ -2631,7 +2351,7 @@ } /* This should be called with task_lock() held. */ -@@ -654,17 +375,18 @@ static inline void audit_free_names(stru +@@ -654,17 +369,18 @@ static inline void audit_free_names(stru #if AUDIT_DEBUG == 2 if (context->auditable ||context->put_count + context->ino_count != context->name_count) { @@ -2654,7 +2374,7 @@ dump_stack(); return; } -@@ -674,9 +396,13 @@ static inline void audit_free_names(stru +@@ -674,9 +390,13 @@ static inline void audit_free_names(stru context->ino_count = 0; #endif @@ -2669,7 +2389,7 @@ context->name_count = 0; if (context->pwd) dput(context->pwd); -@@ -696,6 +422,12 @@ static inline void audit_free_aux(struct +@@ -696,6 +416,12 @@ static inline void audit_free_aux(struct dput(axi->dentry); mntput(axi->mnt); } @@ -2682,7 +2402,7 @@ context->aux = aux->next; kfree(aux); } -@@ -721,10 +453,15 @@ static inline struct audit_context *audi +@@ -721,10 +447,15 @@ static inline struct audit_context *audi return context; } @@ -2700,7 +2420,7 @@ int audit_alloc(struct task_struct *tsk) { struct audit_context *context; -@@ -775,7 +512,37 @@ static inline void audit_free_context(st +@@ -775,7 +506,37 @@ static inline void audit_free_context(st printk(KERN_ERR "audit: freed %d contexts\n", count); } @@ -2739,7 +2459,7 @@ { char name[sizeof(current->comm)]; struct mm_struct *mm = current->mm; -@@ -788,6 +555,10 @@ static void audit_log_task_info(struct a +@@ -788,6 +549,10 @@ static void audit_log_task_info(struct a if (!mm) return; @@ -2750,7 +2470,7 @@ down_read(&mm->mmap_sem); vma = mm->mmap; while (vma) { -@@ -801,6 +572,7 @@ static void audit_log_task_info(struct a +@@ -801,6 +566,7 @@ static void audit_log_task_info(struct a vma = vma->vm_next; } up_read(&mm->mmap_sem); @@ -2758,87 +2478,43 @@ } static void audit_log_exit(struct audit_context *context, gfp_t gfp_mask) -@@ -808,35 +580,59 @@ static void audit_log_exit(struct audit_ +@@ -808,6 +574,7 @@ static void audit_log_exit(struct audit_ int i; struct audit_buffer *ab; struct audit_aux_data *aux; + const char *tty; -- ab = audit_log_start(context, gfp_mask, AUDIT_SYSCALL); -+ ab = audit_log_start(context, gfp_mask, -+ context->in_syscall ? AUDIT_SYSCALL: AUDIT_SYSCALL_PARTIAL); + ab = audit_log_start(context, gfp_mask, AUDIT_SYSCALL); if (!ab) - return; /* audit_panic has been called */ -- audit_log_format(ab, "arch=%x syscall=%d", -- context->arch, context->major); -+ if (context->in_syscall) { -+ audit_log_format(ab, "arch=%x syscall=%d", -+ context->arch, context->major); -+ } - if (context->personality != PER_LINUX) - audit_log_format(ab, " per=%lx", context->personality); - if (context->return_valid) +@@ -820,11 +587,15 @@ static void audit_log_exit(struct audit_ audit_log_format(ab, " success=%s exit=%ld", (context->return_valid==AUDITSC_SUCCESS)?"yes":"no", context->return_code); -- audit_log_format(ab, -- " a0=%lx a1=%lx a2=%lx a3=%lx items=%d" -- " pid=%d auid=%u uid=%u gid=%u" -- " euid=%u suid=%u fsuid=%u" -- " egid=%u sgid=%u fsgid=%u", -- context->argv[0], -- context->argv[1], -- context->argv[2], -- context->argv[3], -- context->name_count, -- context->pid, -- context->loginuid, -- context->uid, -- context->gid, -- context->euid, context->suid, context->fsuid, -- context->egid, context->sgid, context->fsgid); -- audit_log_task_info(ab); + if (current->signal->tty && current->signal->tty->name) + tty = current->signal->tty->name; + else + tty = "(none)"; -+ if (context->in_syscall) { -+ audit_log_format(ab, -+ " a0=%lx a1=%lx a2=%lx a3=%lx items=%d" -+ " pid=%d auid=%u uid=%u gid=%u" -+ " euid=%u suid=%u fsuid=%u" -+ " egid=%u sgid=%u fsgid=%u tty=%s", -+ context->argv[0], -+ context->argv[1], -+ context->argv[2], -+ context->argv[3], -+ context->name_count, -+ context->pid, -+ context->loginuid, -+ context->uid, -+ context->gid, -+ context->euid, context->suid, context->fsuid, -+ context->egid, context->sgid, context->fsgid, tty); -+ } else { -+ audit_log_format(ab, -+ " items=%d" -+ " pid=%d auid=%u uid=%u gid=%u" -+ " euid=%u suid=%u fsuid=%u" -+ " egid=%u sgid=%u fsgid=%u tty=%s", -+ context->name_count, -+ context->pid, -+ context->loginuid, -+ context->uid, -+ context->gid, -+ context->euid, context->suid, context->fsuid, -+ context->egid, context->sgid, context->fsgid, tty); -+ } -+ + audit_log_format(ab, + " a0=%lx a1=%lx a2=%lx a3=%lx items=%d" + " pid=%d auid=%u uid=%u gid=%u" + " euid=%u suid=%u fsuid=%u" +- " egid=%u sgid=%u fsgid=%u", ++ " egid=%u sgid=%u fsgid=%u tty=%s", + context->argv[0], + context->argv[1], + context->argv[2], +@@ -835,8 +606,8 @@ static void audit_log_exit(struct audit_ + context->uid, + context->gid, + context->euid, context->suid, context->fsuid, +- context->egid, context->sgid, context->fsgid); +- audit_log_task_info(ab); ++ context->egid, context->sgid, context->fsgid, tty); + audit_log_task_info(ab, gfp_mask); audit_log_end(ab); for (aux = context->aux; aux; aux = aux->next) { -@@ -849,8 +645,8 @@ static void audit_log_exit(struct audit_ +@@ -849,8 +620,8 @@ static void audit_log_exit(struct audit_ case AUDIT_IPC: { struct audit_aux_data_ipcctl *axi = (void *)aux; audit_log_format(ab, @@ -2849,7 +2525,7 @@ break; } case AUDIT_SOCKETCALL: { -@@ -885,42 +681,62 @@ static void audit_log_exit(struct audit_ +@@ -885,42 +656,62 @@ static void audit_log_exit(struct audit_ } } for (i = 0; i < context->name_count; i++) { @@ -2932,7 +2608,7 @@ if (likely(!context)) return; -@@ -934,13 +750,24 @@ void audit_free(struct task_struct *tsk) +@@ -934,13 +725,24 @@ void audit_free(struct task_struct *tsk) audit_free_context(context); } @@ -2959,7 +2635,7 @@ void audit_syscall_entry(struct task_struct *tsk, int arch, int major, unsigned long a1, unsigned long a2, unsigned long a3, unsigned long a4) -@@ -950,7 +777,8 @@ void audit_syscall_entry(struct task_str +@@ -950,7 +752,8 @@ void audit_syscall_entry(struct task_str BUG_ON(!context); @@ -2969,7 +2645,7 @@ * calls in kernel_thread via the entry.S interface, instead of * with direct calls. (If you are porting to a new * architecture, hitting this condition can indicate that you -@@ -966,11 +794,6 @@ void audit_syscall_entry(struct task_str +@@ -966,11 +769,6 @@ void audit_syscall_entry(struct task_str if (context->in_syscall) { struct audit_context *newctx; @@ -2981,7 +2657,7 @@ #if AUDIT_DEBUG printk(KERN_ERR "audit(:%d) pid=%d in syscall=%d;" -@@ -1014,11 +837,18 @@ void audit_syscall_entry(struct task_str +@@ -1014,11 +812,18 @@ void audit_syscall_entry(struct task_str context->auditable = !!(state == AUDIT_RECORD_CONTEXT); } @@ -3002,16 +2678,7 @@ void audit_syscall_exit(struct task_struct *tsk, int valid, long return_code) { struct audit_context *context; -@@ -1033,7 +863,7 @@ void audit_syscall_exit(struct task_stru - if (likely(!context)) - goto out; - -- if (context->in_syscall && context->auditable) -+ if (context->auditable) - audit_log_exit(context, GFP_KERNEL); - - context->in_syscall = 0; -@@ -1053,7 +883,13 @@ void audit_syscall_exit(struct task_stru +@@ -1053,7 +858,13 @@ void audit_syscall_exit(struct task_stru put_task_struct(tsk); } @@ -3026,7 +2693,7 @@ void audit_getname(const char *name) { struct audit_context *context = current->audit_context; -@@ -1082,10 +918,13 @@ void audit_getname(const char *name) +@@ -1082,10 +893,13 @@ void audit_getname(const char *name) } @@ -3044,7 +2711,7 @@ void audit_putname(const char *name) { struct audit_context *context = current->audit_context; -@@ -1100,7 +939,7 @@ void audit_putname(const char *name) +@@ -1100,7 +914,7 @@ void audit_putname(const char *name) for (i = 0; i < context->name_count; i++) printk(KERN_ERR "name[%d] = %p = %s\n", i, context->names[i].name, @@ -3053,7 +2720,7 @@ } #endif __putname(name); -@@ -1122,9 +961,52 @@ void audit_putname(const char *name) +@@ -1122,9 +936,52 @@ void audit_putname(const char *name) #endif } @@ -3109,7 +2776,7 @@ { int idx; struct audit_context *context = current->audit_context; -@@ -1150,15 +1032,105 @@ void audit_inode(const char *name, const +@@ -1150,15 +1007,105 @@ void audit_inode(const char *name, const ++context->ino_count; #endif } @@ -3129,8 +2796,8 @@ + context->names[idx].ino = inode->i_ino; + context->names[idx].pino = (unsigned long)-1; + } -+} -+ + } + +/** + * audit_inode_child - collect inode info for created/removed objects + * @dname: inode's dentry name @@ -3204,8 +2871,8 @@ + context->names[idx].rdev = inode->i_rdev; + audit_inode_context(idx, inode); + } - } - ++} ++ +/** + * auditsc_get_stamp - get local copies of audit_context values + * @ctx: audit_context for the task @@ -3217,11 +2884,8 @@ void auditsc_get_stamp(struct audit_context *ctx, struct timespec *t, unsigned int *serial) { -@@ -1168,8 +1140,18 @@ void auditsc_get_stamp(struct audit_cont - t->tv_nsec = ctx->ctime.tv_nsec; - *serial = ctx->serial; +@@ -1170,6 +1117,15 @@ void auditsc_get_stamp(struct audit_cont ctx->auditable = 1; -+ ctx->invoke_audit = 1; } +/** @@ -3236,7 +2900,7 @@ int audit_set_loginuid(struct task_struct *task, uid_t loginuid) { if (task->audit_context) { -@@ -1188,12 +1170,59 @@ int audit_set_loginuid(struct task_struc +@@ -1188,12 +1144,59 @@ int audit_set_loginuid(struct task_struc return 0; } @@ -3297,7 +2961,7 @@ { struct audit_aux_data_ipcctl *ax; struct audit_context *context = current->audit_context; -@@ -1201,7 +1230,7 @@ int audit_ipc_perms(unsigned long qbytes +@@ -1201,7 +1204,7 @@ int audit_ipc_perms(unsigned long qbytes if (likely(!context)) return 0; @@ -3306,7 +2970,7 @@ if (!ax) return -ENOMEM; -@@ -1209,6 +1238,7 @@ int audit_ipc_perms(unsigned long qbytes +@@ -1209,6 +1212,7 @@ int audit_ipc_perms(unsigned long qbytes ax->uid = uid; ax->gid = gid; ax->mode = mode; @@ -3314,7 +2978,7 @@ ax->d.type = AUDIT_IPC; ax->d.next = context->aux; -@@ -1216,6 +1246,13 @@ int audit_ipc_perms(unsigned long qbytes +@@ -1216,6 +1220,13 @@ int audit_ipc_perms(unsigned long qbytes return 0; } @@ -3328,7 +2992,7 @@ int audit_socketcall(int nargs, unsigned long *args) { struct audit_aux_data_socketcall *ax; -@@ -1237,6 +1274,13 @@ int audit_socketcall(int nargs, unsigned +@@ -1237,6 +1248,13 @@ int audit_socketcall(int nargs, unsigned return 0; } @@ -3342,7 +3006,7 @@ int audit_sockaddr(int len, void *a) { struct audit_aux_data_sockaddr *ax; -@@ -1258,6 +1302,15 @@ int audit_sockaddr(int len, void *a) +@@ -1258,6 +1276,15 @@ int audit_sockaddr(int len, void *a) return 0; } @@ -3358,7 +3022,7 @@ int audit_avc_path(struct dentry *dentry, struct vfsmount *mnt) { struct audit_aux_data_path *ax; -@@ -1279,6 +1332,14 @@ int audit_avc_path(struct dentry *dentry +@@ -1279,6 +1306,14 @@ int audit_avc_path(struct dentry *dentry return 0; } @@ -3373,7 +3037,7 @@ void audit_signal_info(int sig, struct task_struct *t) { extern pid_t audit_sig_pid; -@@ -1295,4 +1356,3 @@ void audit_signal_info(int sig, struct t +@@ -1295,4 +1330,3 @@ void audit_signal_info(int sig, struct t } } } @@ -3457,7 +3121,7 @@ set_to_dummy_if_null(ops, msg_msg_free_security); set_to_dummy_if_null(ops, msg_queue_alloc_security); diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c -index b7773bf..0c7fdbf 100644 +index b65c201..81b726b 100644 --- a/security/selinux/hooks.c +++ b/security/selinux/hooks.c @@ -117,6 +117,32 @@ static struct security_operations *secon From fedora-cvs-commits at redhat.com Tue Mar 21 15:37:06 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 21 Mar 2006 10:37:06 -0500 Subject: rpms/beagle/devel beagle-0.2.3-security-fix.patch, NONE, 1.1 beagle.spec, 1.45, 1.46 sources, 1.9, 1.10 Message-ID: <200603211537.k2LFb6RN022726@cvs.devel.redhat.com> Author: alexl Update of /cvs/dist/rpms/beagle/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv22684 Modified Files: beagle.spec sources Added Files: beagle-0.2.3-security-fix.patch Log Message: Update from fc5 beagle-0.2.3-security-fix.patch: ImLogViewer/beagle-imlogviewer.in | 7 ------- beagled/beagled-index-helper.in | 33 ++------------------------------- beagled/beagled.in | 32 -------------------------------- beagled/wrapper.in | 17 ----------------- bludgeon/bludgeon.in | 14 -------------- search/beagle-search.in | 6 ------ tools/beagle-index-info | 4 ---- tools/beagle-ping | 4 ---- tools/beagle-status | 4 ---- tools/wrapper.in | 7 ------- 10 files changed, 2 insertions(+), 126 deletions(-) --- NEW FILE beagle-0.2.3-security-fix.patch --- --- beagle-0.2.3/beagled/beagled.in.security-fix 2006-03-03 20:13:30.000000000 +0100 +++ beagle-0.2.3/beagled/beagled.in 2006-03-21 14:40:51.000000000 +0100 @@ -1,36 +1,5 @@ #!@bash@ -if [ -e ./@target@ ] && [ -e ./Makefile.am ] ; then - echo "*** Running uninstalled @target@ ***" - - # When we run uninstalled, run in the foreground by default. - fg_default=1 - - TARGET_EXE="./@target@" - - export _BEAGLED_INDEX_HELPER_PATH="." - - # The stuff in webserver, Tiles and images is only needed when - # web services are enabled. - export MONO_PATH="../Util:../BeagleClient:./webserver:../Tiles:../images:$MONO_PATH" - - export LD_LIBRARY_PATH="../glue/.libs:$LD_LIBRARY_PATH" - - # In BEAGLE_FILTER_PATH, a trailing ':' means "append the default path". - if [ -n "$BEAGLE_FILTER_PATH" ]; then - export BEAGLE_FILTER_PATH="../Filters:$BEAGLE_FILTER_PATH" - else - export BEAGLE_FILTER_PATH="../Filters" - fi - - # Ditto BEAGLE_BACKEND_PATH. - if [ -n "$BEAGLE_BACKEND_PATH" ]; then - export BEAGLE_BACKEND_PATH=".:$BEAGLE_BACKEND_PATH" - else - export BEAGLE_BACKEND_PATH="." - fi -else - # Otherwise default to running in the background fg_default=0 @@ -39,7 +8,6 @@ export _BEAGLED_INDEX_HELPER_PATH="@pkglibdir@" export MONO_PATH="@pkglibdir@:$MONO_PATH" export LD_LIBRARY_PATH="@pkglibdir@:$LD_LIBRARY_PATH" -fi export MONO_GAC_PREFIX="@gacprefix@:$MONO_GAC_PREFIX" --- beagle-0.2.3/beagled/wrapper.in.security-fix 2006-03-21 14:47:37.000000000 +0100 +++ beagle-0.2.3/beagled/wrapper.in 2006-03-21 14:47:47.000000000 +0100 @@ -1,27 +1,10 @@ #!@bash@ -if [ -e ./@target@ ] && [ -e ./Makefile.am ] ; then - echo "*** Running uninstalled @target@ ***" - THIS_PATH="../Util:../BeagleClient:." - THIS_EXE="./@target@" - - export MONO_PATH="../Util:../BeagleClient:$MONO_PATH" - export LD_LIBRARY_PATH="../glue/.libs:$LD_LIBRARY_PATH" - - # In BEAGLE_FILTER_PATH, a trailing ':' means "append the default path". - if [ -n "$BEAGLE_FILTER_PATH" ]; then - export BEAGLE_FILTER_PATH="../Filters:$BEAGLE_FILTER_PATH" - else - export BEAGLE_FILTER_PATH="../Filters" - fi - -else THIS_PATH="@pkglibdir@" THIS_EXE="@pkglibdir@/@target@" export MONO_PATH="@pkglibdir@:$MONO_PATH" export LD_LIBRARY_PATH="@pkglibdir@:$LD_LIBRARY_PATH" -fi MONO_GAC_PREFIX="@gacprefix@:$MONO_GAC_PREFIX" MONO_PATH="$THIS_PATH:$MONO_PATH" exec -a @wrapper@ mono --debug $MONO_EXTRA_ARGS $THIS_EXE "$@" --- beagle-0.2.3/beagled/beagled-index-helper.in.security-fix 2006-03-03 20:13:30.000000000 +0100 +++ beagle-0.2.3/beagled/beagled-index-helper.in 2006-03-21 14:40:51.000000000 +0100 @@ -1,36 +1,7 @@ #!@bash@ -if [ -e ./@target@ ] && [ -e ./Makefile.am ] ; then - echo "*** Running uninstalled @target@ ***" - THIS_PATH="../Util:../BeagleClient:." - THIS_EXE="./@target@" - - export MONO_PATH="../Util:../BeagleClient:$MONO_PATH" - export LD_LIBRARY_PATH="../glue/.libs:$LD_LIBRARY_PATH" - - # In BEAGLE_FILTER_PATH, a trailing ':' means "append the default path". - if [ -n "$BEAGLE_FILTER_PATH" ]; then - export BEAGLE_FILTER_PATH="../Filters:$BEAGLE_FILTER_PATH" - else - export BEAGLE_FILTER_PATH="../Filters" - fi - -else - THIS_PATH="@pkglibdir@" - THIS_EXE="@pkglibdir@/@target@" -fi - -if [ -n "$_GET_ON_THE_HEAP_BUDDY_BANDWAGON" ]; then - n=1 - while [ -e $BEAGLE_HEAP_BUDDY_DIR/outfile.helper.$n ]; do - n=$(($n+1)) - done - MONO_EXTRA_ARGS="--profile=heap-buddy:$BEAGLE_HEAP_BUDDY_DIR/outfile.helper.$n $MONO_EXTRA_ARGS" -fi - -if [ -n "$BEAGLE_DEBUG_FLAG_IS_SET" ]; then - MONO_EXTRA_ARGS="--debug $MONO_EXTRA_ARGS" -fi +THIS_PATH="@pkglibdir@" +THIS_EXE="@pkglibdir@/@target@" export MONO_GAC_PREFIX="@gacprefix@:$MONO_GAC_PREFIX" export MONO_PATH="$THIS_PATH:$MONO_PATH" --- beagle-0.2.3/ImLogViewer/beagle-imlogviewer.in.security-fix 2006-03-21 14:49:53.000000000 +0100 +++ beagle-0.2.3/ImLogViewer/beagle-imlogviewer.in 2006-03-21 14:53:24.000000000 +0100 @@ -1,15 +1,8 @@ #!/bin/sh -if [ -e ./@target@ ] && [ -e ./Makefile.am ] ; then - echo "*** Running uninstalled @target@ ***" - THIS_PATH="../Util:../images:../Lucene.Net" - THIS_EXE="./@target@" - export LD_LIBRARY_PATH="../glue/.libs:$LD_LIBRARY_PATH" -else THIS_PATH="@pkglibdir@" THIS_EXE="@pkglibdir@/@target@" export LD_LIBRARY_PATH="@pkglibdir@:$LD_LIBRARY_PATH" -fi MONO_GAC_PREFIX="@gacprefix@:$MONO_GAC_PREFIX" MONO_PATH="$THIS_PATH:$MONO_PATH" exec -a beagle-imlogviewer mono $MONO_EXTRA_ARGS --debug $THIS_EXE "$@" --- beagle-0.2.3/tools/beagle-index-info.security-fix 2006-03-21 14:56:02.000000000 +0100 +++ beagle-0.2.3/tools/beagle-index-info 2006-03-21 14:56:21.000000000 +0100 @@ -1,9 +1,5 @@ #!/bin/sh -if [ -x "./beagle-info" ]; then - CMD="./beagle-info" -else CMD="beagle-info" -fi exec -a beagle-index-info $CMD --index-info --- beagle-0.2.3/tools/wrapper.in.security-fix 2006-03-21 14:57:44.000000000 +0100 +++ beagle-0.2.3/tools/wrapper.in 2006-03-21 14:57:50.000000000 +0100 @@ -1,14 +1,7 @@ #!@bash@ -if [ -e ./@target@ ] && [ -e ./Makefile.am ] ; then - echo "*** Running uninstalled @target@ ***" - THIS_PATH="../Util:../BeagleClient:../beagled" - THIS_EXE="./@target@" - THIS_FILTERS="../Filters" -else THIS_PATH="@pkglibdir@:@libdir@" THIS_EXE="@pkglibdir@/@target@" -fi if [ -z "$BEAGLE_MONO_RUNTIME" ]; then export BEAGLE_MONO_RUNTIME="mono" --- beagle-0.2.3/tools/beagle-ping.security-fix 2006-03-21 14:56:50.000000000 +0100 +++ beagle-0.2.3/tools/beagle-ping 2006-03-21 14:56:57.000000000 +0100 @@ -1,9 +1,5 @@ #!/bin/sh -if [ -x "./beagle-info" ]; then - CMD="./beagle-info" -else CMD="beagle-info" -fi exec -a beagle-ping $CMD --daemon-version --- beagle-0.2.3/tools/beagle-status.security-fix 2006-03-21 14:57:14.000000000 +0100 +++ beagle-0.2.3/tools/beagle-status 2006-03-21 14:57:23.000000000 +0100 @@ -1,10 +1,6 @@ #!/bin/sh -if [ -x "./beagle-info" ]; then - CMD="./beagle-info" -else CMD="beagle-info" -fi while [ 1 ]; do str=`$CMD --status | head -n 20` --- beagle-0.2.3/bludgeon/bludgeon.in.security-fix 2006-03-21 14:48:42.000000000 +0100 +++ beagle-0.2.3/bludgeon/bludgeon.in 2006-03-21 14:48:54.000000000 +0100 @@ -1,18 +1,5 @@ #!@bash@ -if [ -e ./@target@ ] && [ -e ./Makefile.am ] ; then - echo "*** Running uninstalled @target@ ***" - THIS_PATH="../Util:../BeagleClient:." - THIS_EXE="./@target@" - - export BEAGLED_COMMAND="./beagled.dummy" - - export MONO_PATH="../Util:../BeagleClient:$MONO_PATH" - export LD_LIBRARY_PATH="../glue/.libs:$LD_LIBRARY_PATH" - - export BEAGLE_FILTER_PATH="../Filters" - -else THIS_PATH="@pkglibdir@" THIS_EXE="@pkglibdir@/@target@" @@ -20,7 +7,6 @@ export MONO_PATH="@pkglibdir@:$MONO_PATH" export LD_LIBRARY_PATH="@pkglibdir@:$LD_LIBRARY_PATH" -fi if [ -z "$BEAGLE_MONO_RUNTIME" ]; then BEAGLE_MONO_RUNTIME="mono" --- beagle-0.2.3/search/beagle-search.in.security-fix 2006-03-21 15:25:35.000000000 +0100 +++ beagle-0.2.3/search/beagle-search.in 2006-03-21 15:26:04.000000000 +0100 @@ -1,10 +1,4 @@ #!/bin/sh -if [ -f Search.exe -a -f ../glue/.libs/libbeagleuiglue.so ]; then - export LD_LIBRARY_PATH="../glue/.libs${LD_LIBRARY_PATH+:$LD_LIBRARY_PATH}" - export MONO_PATH="../BeagleClient:../images:../Util${MONO_PATH+:MONO_PATH}" - mono --debug $MONO_EXTRA_ARGS Search.exe "$@" -else export LD_LIBRARY_PATH="@PKGLIBDIR@${LD_LIBRARY_PATH+:$LD_LIBRARY_PATH}" mono --debug $MONO_EXTRA_ARGS @PKGLIBDIR@/Search.exe "$@" -fi Index: beagle.spec =================================================================== RCS file: /cvs/dist/rpms/beagle/devel/beagle.spec,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- beagle.spec 8 Mar 2006 15:23:21 -0000 1.45 +++ beagle.spec 21 Mar 2006 15:37:04 -0000 1.46 @@ -1,6 +1,6 @@ Name: beagle -Version: 0.2.2 -Release: 3 +Version: 0.2.3 +Release: 5 Summary: The Beagle Search Infrastructure Group: User Interface/Desktops @@ -24,8 +24,7 @@ BuildRequires: librsvg2-devel >= 2.0 Requires: sqlite >= 3.3.1 Requires: zip unzip sed grep mono-core poppler-utils -Patch0: beagle-0.2.2-security-fix.patch -Patch1: beagle-0.2.2-textcache-crash.patch +Patch0: beagle-0.2.3-security-fix.patch Patch2: beagle-0.2.1-crawl.patch Patch3: beagle-0.2.1-spew.patch Patch4: beagle-0.2.2-crawl-system-cron.patch @@ -63,7 +62,6 @@ %prep %setup -q %patch0 -p1 -b .security-fix -%patch1 -p1 -b .textcache-crash %patch2 -p1 -b .crawl %patch3 -p1 -b .spew %patch4 -p1 -b .crawl-system-cron @@ -140,7 +138,7 @@ %define beagle_user_uid 58 /usr/sbin/groupadd -g %{beagle_user_uid} -r beagleindex 2> /dev/null || : -/usr/sbin/useradd -r -u %{beagle_user_uid} -s /bin/false -c "User for Beagle indexing" -d /var/cache/beagle -g beagleindex beagleindex 2> /dev/null || : +/usr/sbin/useradd -r -u %{beagle_user_uid} -s /sbin/nologin -c "User for Beagle indexing" -d /var/cache/beagle -g beagleindex beagleindex 2> /dev/null || : %post if rpm -q firefox > /dev/null; then @@ -214,6 +212,24 @@ %{_prefix}/lib/python*/site-packages/beagle.so %changelog +* Tue Mar 21 2006 Alexander Larsson 0.2.3-5 +- Rebuild fc5 update in rawhide + +* Tue Mar 21 2006 Alexander Larsson - 0.2.3-4 +- Remove more instances of wrapper scripts starting apps in cwd. + Fixes bug #185981, and CVE-2006-1296 + +* Fri Mar 17 2006 Ray Strode - 0.2.3-3 +- use /sbin/nologin instead of /bin/nologin for beagle user + shell + +* Fri Mar 17 2006 Ray Strode - 0.2.3-2 +- use /bin/nologin instead of /bin/false for beagle user + shell + +* Fri Mar 17 2006 Ray Strode - 0.2.3-1 +- Update to 0.2.3 + * Wed Mar 8 2006 Ray Strode - 0.2.2-3 - turn off beagle by default to limit the severity of bug 183898 Index: sources =================================================================== RCS file: /cvs/dist/rpms/beagle/devel/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 7 Mar 2006 15:54:55 -0000 1.9 +++ sources 21 Mar 2006 15:37:04 -0000 1.10 @@ -1,3 +1,3 @@ 6f0f121a9269662071eb5c260b54f86f beagle.desktop 777250265dc910964f5acd9da29cc64c beagle-crawl-system.cron -d8c4765a30b9bf989a769f4337f35b3f beagle-0.2.2.tar.bz2 +4519156a909e8371c59454cab882c616 beagle-0.2.3.tar.bz2 From fedora-cvs-commits at redhat.com Tue Mar 21 15:42:42 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 21 Mar 2006 10:42:42 -0500 Subject: rpms/selinux-policy/devel policy-20060207.patch, 1.52, 1.53 selinux-policy.spec, 1.155, 1.156 Message-ID: <200603211542.k2LFggRA022963@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/selinux-policy/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv22945 Modified Files: policy-20060207.patch selinux-policy.spec Log Message: * Wed Mar 17 2006 Dan Walsh 2.2.24-1 - Update to upstream policy-20060207.patch: Rules.modular | 2 policy/mcs | 4 policy/modules/admin/bootloader.te | 2 policy/modules/admin/dmidecode.te | 2 policy/modules/admin/readahead.te | 2 policy/modules/admin/rpm.fc | 2 policy/modules/admin/rpm.if | 3 policy/modules/admin/rpm.te | 1 policy/modules/admin/su.fc | 1 policy/modules/admin/su.if | 6 policy/modules/admin/updfstab.te | 4 policy/modules/admin/vbetool.te | 9 + policy/modules/kernel/corenetwork.te.in | 5 policy/modules/kernel/devices.fc | 1 policy/modules/kernel/devices.if | 21 ++- policy/modules/kernel/files.fc | 8 - policy/modules/kernel/files.if | 21 ++- policy/modules/kernel/filesystem.te | 1 policy/modules/kernel/kernel.if | 102 ++++++++++++++ policy/modules/kernel/kernel.te | 3 policy/modules/kernel/terminal.if | 2 policy/modules/services/apache.fc | 2 policy/modules/services/apache.if | 5 policy/modules/services/apm.fc | 2 policy/modules/services/apm.te | 4 policy/modules/services/bluetooth.te | 38 ++--- policy/modules/services/cron.te | 3 policy/modules/services/cups.fc | 2 policy/modules/services/cups.if | 22 +++ policy/modules/services/cups.te | 7 - policy/modules/services/cvs.te | 2 policy/modules/services/hal.if | 41 +++++ policy/modules/services/hal.te | 17 ++ policy/modules/services/ktalk.fc | 1 policy/modules/services/ktalk.te | 6 policy/modules/services/mailman.if | 25 +++ policy/modules/services/nis.fc | 1 policy/modules/services/nis.if | 25 +++ policy/modules/services/nis.te | 28 ++++ policy/modules/services/nscd.if | 2 policy/modules/services/pegasus.te | 1 policy/modules/services/postfix.te | 4 policy/modules/services/samba.te | 2 policy/modules/services/sendmail.te | 1 policy/modules/services/xserver.if | 20 ++ policy/modules/system/fstools.if | 18 ++ policy/modules/system/fstools.te | 7 + policy/modules/system/init.te | 5 policy/modules/system/libraries.fc | 2 policy/modules/system/locallogin.te | 1 policy/modules/system/lvm.fc | 1 policy/modules/system/lvm.te | 3 policy/modules/system/mount.te | 3 policy/modules/system/selinuxutil.fc | 6 policy/modules/system/selinuxutil.if | 23 ++- policy/modules/system/selinuxutil.te | 16 ++ policy/modules/system/sysnetwork.te | 7 + policy/modules/system/udev.te | 2 policy/modules/system/unconfined.te | 8 - policy/modules/system/userdomain.te | 1 policy/modules/system/xend.fc | 23 +++ policy/modules/system/xend.if | 71 ++++++++++ policy/modules/system/xend.te | 219 ++++++++++++++++++++++++++++++++ 63 files changed, 813 insertions(+), 66 deletions(-) Index: policy-20060207.patch =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20060207.patch,v retrieving revision 1.52 retrieving revision 1.53 diff -u -r1.52 -r1.53 --- policy-20060207.patch 18 Mar 2006 04:09:10 -0000 1.52 +++ policy-20060207.patch 21 Mar 2006 15:42:38 -0000 1.53 @@ -1,6 +1,6 @@ -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/mcs serefpolicy-2.2.23/policy/mcs +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/mcs serefpolicy-2.2.24/policy/mcs --- nsaserefpolicy/policy/mcs 2006-02-16 14:46:56.000000000 -0500 -+++ serefpolicy-2.2.23/policy/mcs 2006-03-09 10:26:36.000000000 -0500 ++++ serefpolicy-2.2.24/policy/mcs 2006-03-17 14:30:03.000000000 -0500 @@ -141,9 +141,7 @@ mlsconstrain file { create relabelto } ((h1 dom h2) and (l2 eq h2)); @@ -12,9 +12,9 @@ # new file labels must be dominated by the relabeling subject clearance mlsconstrain { dir lnk_file chr_file blk_file sock_file fifo_file } { relabelfrom } -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/bootloader.te serefpolicy-2.2.23/policy/modules/admin/bootloader.te ---- nsaserefpolicy/policy/modules/admin/bootloader.te 2006-03-02 18:45:54.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/admin/bootloader.te 2006-03-13 12:23:12.000000000 -0500 +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/bootloader.te serefpolicy-2.2.24/policy/modules/admin/bootloader.te +--- nsaserefpolicy/policy/modules/admin/bootloader.te 2006-03-17 13:51:46.000000000 -0500 ++++ serefpolicy-2.2.24/policy/modules/admin/bootloader.te 2006-03-17 14:30:03.000000000 -0500 @@ -103,7 +103,7 @@ files_manage_boot_symlinks(bootloader_t) files_read_etc_files(bootloader_t) @@ -24,9 +24,9 @@ files_read_usr_src_files(bootloader_t) files_read_usr_files(bootloader_t) files_read_var_files(bootloader_t) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/dmidecode.te serefpolicy-2.2.23/policy/modules/admin/dmidecode.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/dmidecode.te serefpolicy-2.2.24/policy/modules/admin/dmidecode.te --- nsaserefpolicy/policy/modules/admin/dmidecode.te 2006-03-04 00:06:33.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/admin/dmidecode.te 2006-03-13 12:26:24.000000000 -0500 ++++ serefpolicy-2.2.24/policy/modules/admin/dmidecode.te 2006-03-17 14:30:03.000000000 -0500 @@ -32,6 +32,8 @@ locallogin_use_fds(dmidecode_t) @@ -36,9 +36,9 @@ ifdef(`targeted_policy',` term_use_generic_ptys(dmidecode_t) term_use_unallocated_ttys(dmidecode_t) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/readahead.te serefpolicy-2.2.23/policy/modules/admin/readahead.te ---- nsaserefpolicy/policy/modules/admin/readahead.te 2006-03-04 00:06:33.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/admin/readahead.te 2006-03-07 13:42:37.000000000 -0500 +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/readahead.te serefpolicy-2.2.24/policy/modules/admin/readahead.te +--- nsaserefpolicy/policy/modules/admin/readahead.te 2006-03-17 13:51:47.000000000 -0500 ++++ serefpolicy-2.2.24/policy/modules/admin/readahead.te 2006-03-17 14:30:03.000000000 -0500 @@ -18,7 +18,7 @@ # Local policy # @@ -48,10 +48,10 @@ allow readahead_t self:process signal_perms; allow readahead_t readahead_var_run_t:file create_file_perms; -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.fc serefpolicy-2.2.23/policy/modules/admin/rpm.fc ---- nsaserefpolicy/policy/modules/admin/rpm.fc 2006-01-27 21:35:04.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/admin/rpm.fc 2006-03-07 15:39:28.000000000 -0500 -@@ -25,7 +25,7 @@ +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.fc serefpolicy-2.2.24/policy/modules/admin/rpm.fc +--- nsaserefpolicy/policy/modules/admin/rpm.fc 2006-03-17 13:51:47.000000000 -0500 ++++ serefpolicy-2.2.24/policy/modules/admin/rpm.fc 2006-03-17 14:30:03.000000000 -0500 +@@ -22,7 +22,7 @@ /var/lib/rpm(/.*)? gen_context(system_u:object_r:rpm_var_lib_t,s0) /var/log/rpmpkgs.* -- gen_context(system_u:object_r:rpm_log_t,s0) @@ -60,9 +60,9 @@ # SuSE ifdef(`distro_suse', ` -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.if serefpolicy-2.2.23/policy/modules/admin/rpm.if +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.if serefpolicy-2.2.24/policy/modules/admin/rpm.if --- nsaserefpolicy/policy/modules/admin/rpm.if 2006-03-04 00:06:33.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/admin/rpm.if 2006-03-14 17:08:39.000000000 -0500 ++++ serefpolicy-2.2.24/policy/modules/admin/rpm.if 2006-03-17 14:30:03.000000000 -0500 @@ -78,6 +78,9 @@ role $2 types rpm_t; role $2 types rpm_script_t; @@ -73,9 +73,9 @@ allow rpm_t $3:chr_file rw_term_perms; ') -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.te serefpolicy-2.2.23/policy/modules/admin/rpm.te ---- nsaserefpolicy/policy/modules/admin/rpm.te 2006-03-04 00:06:33.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/admin/rpm.te 2006-03-15 09:22:44.000000000 -0500 +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.te serefpolicy-2.2.24/policy/modules/admin/rpm.te +--- nsaserefpolicy/policy/modules/admin/rpm.te 2006-03-17 13:51:47.000000000 -0500 ++++ serefpolicy-2.2.24/policy/modules/admin/rpm.te 2006-03-17 14:30:03.000000000 -0500 @@ -326,6 +326,7 @@ seutil_domtrans_loadpolicy(rpm_script_t) @@ -84,17 +84,17 @@ userdom_use_all_users_fds(rpm_script_t) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/su.fc serefpolicy-2.2.23/policy/modules/admin/su.fc +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/su.fc serefpolicy-2.2.24/policy/modules/admin/su.fc --- nsaserefpolicy/policy/modules/admin/su.fc 2005-11-14 18:24:06.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/admin/su.fc 2006-03-07 13:42:37.000000000 -0500 ++++ serefpolicy-2.2.24/policy/modules/admin/su.fc 2006-03-17 14:30:03.000000000 -0500 @@ -2,3 +2,4 @@ /bin/su -- gen_context(system_u:object_r:su_exec_t,s0) /usr(/local)?/bin/ksu -- gen_context(system_u:object_r:su_exec_t,s0) +/usr/bin/kdesu -- gen_context(system_u:object_r:su_exec_t,s0) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/su.if serefpolicy-2.2.23/policy/modules/admin/su.if +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/su.if serefpolicy-2.2.24/policy/modules/admin/su.if --- nsaserefpolicy/policy/modules/admin/su.if 2006-03-04 00:06:33.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/admin/su.if 2006-03-07 13:42:37.000000000 -0500 ++++ serefpolicy-2.2.24/policy/modules/admin/su.if 2006-03-17 14:30:03.000000000 -0500 @@ -141,10 +141,10 @@ # By default, revert to the calling domain when a shell is executed. @@ -109,9 +109,9 @@ kernel_read_system_state($1_su_t) kernel_read_kernel_sysctls($1_su_t) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/updfstab.te serefpolicy-2.2.23/policy/modules/admin/updfstab.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/updfstab.te serefpolicy-2.2.24/policy/modules/admin/updfstab.te --- nsaserefpolicy/policy/modules/admin/updfstab.te 2006-03-04 00:06:33.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/admin/updfstab.te 2006-03-14 11:34:03.000000000 -0500 ++++ serefpolicy-2.2.24/policy/modules/admin/updfstab.te 2006-03-17 14:30:03.000000000 -0500 @@ -125,6 +125,6 @@ udev_read_db(updfstab_t) ') @@ -121,9 +121,9 @@ +optional_policy(`fstools',` + fstools_getattr_swap_files(updfstab_t) ') -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/vbetool.te serefpolicy-2.2.23/policy/modules/admin/vbetool.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/vbetool.te serefpolicy-2.2.24/policy/modules/admin/vbetool.te --- nsaserefpolicy/policy/modules/admin/vbetool.te 2006-02-01 08:23:27.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/admin/vbetool.te 2006-03-09 16:31:49.000000000 -0500 ++++ serefpolicy-2.2.24/policy/modules/admin/vbetool.te 2006-03-17 14:30:03.000000000 -0500 @@ -15,6 +15,7 @@ # Local policy # @@ -144,20 +144,31 @@ +optional_policy(`hal',` + hal_rw_var_run(vbetool_t) +') -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corenetwork.te.in serefpolicy-2.2.23/policy/modules/kernel/corenetwork.te.in ---- nsaserefpolicy/policy/modules/kernel/corenetwork.te.in 2006-02-20 14:07:36.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/kernel/corenetwork.te.in 2006-03-07 13:42:37.000000000 -0500 -@@ -126,6 +126,7 @@ +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corenetwork.te.in serefpolicy-2.2.24/policy/modules/kernel/corenetwork.te.in +--- nsaserefpolicy/policy/modules/kernel/corenetwork.te.in 2006-03-17 13:51:48.000000000 -0500 ++++ serefpolicy-2.2.24/policy/modules/kernel/corenetwork.te.in 2006-03-21 08:10:24.000000000 -0500 +@@ -66,7 +66,7 @@ + network_port(giftd, tcp,1213,s0) + network_port(gopher, tcp,70,s0, udp,70,s0) + network_port(http_cache, tcp,3128,s0, udp,3130,s0, tcp,8080,s0, tcp,8118,s0) # 8118 is for privoxy +-network_port(http, tcp,80,s0, tcp,443,s0, tcp,488,s0, tcp,8008,s0) ++network_port(http, tcp,80,s0, tcp,443,s0, tcp,488,s0, tcp,8008,s0, tcp, 9050, s0) # 9050 is for Tor + network_port(howl, tcp,5335,s0, udp,5353,s0) + network_port(hplip, tcp,50000,s0, tcp,50002,s0) + network_port(i18n_input, tcp,9010,s0) +@@ -126,7 +126,8 @@ + type utcpserver_port_t, port_type; dnl network_port(utcpserver) # no defined portcon network_port(uucpd, tcp,540,s0) network_port(vnc, tcp,5900,s0) - network_port(xserver, tcp,6001,s0, tcp,6002,s0, tcp,6003,s0, tcp,6004,s0, tcp,6005,s0, tcp,6006,s0, tcp,6007,s0, tcp,6008,s0, tcp,6009,s0, tcp,6010,s0, tcp,6011,s0, tcp,6012,s0, tcp,6013,s0, tcp,6014,s0, tcp,6015,s0, tcp,6016,s0, tcp,6017,s0, tcp,6018,s0, tcp,6019,s0) +-network_port(xserver, tcp,6001,s0, tcp,6002,s0, tcp,6003,s0, tcp,6004,s0, tcp,6005,s0, tcp,6006,s0, tcp,6007,s0, tcp,6008,s0, tcp,6009,s0, tcp,6010,s0, tcp,6011,s0, tcp,6012,s0, tcp,6013,s0, tcp,6014,s0, tcp,6015,s0, tcp,6016,s0, tcp,6017,s0, tcp,6018,s0, tcp,6019,s0) ++network_port(xserver, tcp, 6000, s0, tcp,6001,s0, tcp,6002,s0, tcp,6003,s0, tcp,6004,s0, tcp,6005,s0, tcp,6006,s0, tcp,6007,s0, tcp,6008,s0, tcp,6009,s0, tcp,6010,s0, tcp,6011,s0, tcp,6012,s0, tcp,6013,s0, tcp,6014,s0, tcp,6015,s0, tcp,6016,s0, tcp,6017,s0, tcp,6018,s0, tcp,6019,s0) +network_port(xen, tcp,8002,s0) network_port(zebra, tcp,2601,s0) network_port(zope, tcp,8021,s0) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.fc serefpolicy-2.2.23/policy/modules/kernel/devices.fc +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.fc serefpolicy-2.2.24/policy/modules/kernel/devices.fc --- nsaserefpolicy/policy/modules/kernel/devices.fc 2006-02-27 17:17:23.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/kernel/devices.fc 2006-03-08 17:34:22.000000000 -0500 ++++ serefpolicy-2.2.24/policy/modules/kernel/devices.fc 2006-03-17 14:30:03.000000000 -0500 @@ -33,6 +33,7 @@ /dev/par.* -c gen_context(system_u:object_r:printer_device_t,s0) /dev/patmgr[01] -c gen_context(system_u:object_r:sound_device_t,s0) @@ -166,10 +177,10 @@ /dev/port -c gen_context(system_u:object_r:memory_device_t,s15:c0.c255) /dev/(misc/)?psaux -c gen_context(system_u:object_r:mouse_device_t,s0) /dev/rmidi.* -c gen_context(system_u:object_r:sound_device_t,s0) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.if serefpolicy-2.2.23/policy/modules/kernel/devices.if ---- nsaserefpolicy/policy/modules/kernel/devices.if 2006-02-23 09:25:08.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/kernel/devices.if 2006-03-09 16:17:57.000000000 -0500 -@@ -2384,7 +2384,7 @@ +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.if serefpolicy-2.2.24/policy/modules/kernel/devices.if +--- nsaserefpolicy/policy/modules/kernel/devices.if 2006-03-17 13:51:48.000000000 -0500 ++++ serefpolicy-2.2.24/policy/modules/kernel/devices.if 2006-03-17 14:30:03.000000000 -0500 +@@ -2382,7 +2382,7 @@ ') allow $1 device_t:dir r_dir_perms; @@ -178,7 +189,7 @@ ') ######################################## -@@ -2732,3 +2732,22 @@ +@@ -2769,3 +2769,22 @@ typeattribute $1 memory_raw_write, memory_raw_read; ') @@ -201,9 +212,9 @@ + dontaudit $1 device_node:dir_file_class_set getattr; +') + -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.fc serefpolicy-2.2.23/policy/modules/kernel/files.fc +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.fc serefpolicy-2.2.24/policy/modules/kernel/files.fc --- nsaserefpolicy/policy/modules/kernel/files.fc 2006-03-04 00:06:34.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/kernel/files.fc 2006-03-08 16:26:29.000000000 -0500 ++++ serefpolicy-2.2.24/policy/modules/kernel/files.fc 2006-03-17 14:30:03.000000000 -0500 @@ -45,7 +45,7 @@ /etc(/.*)? gen_context(system_u:object_r:etc_t,s0) /etc/\.fstab\.hal\..+ -- gen_context(system_u:object_r:etc_runtime_t,s0) @@ -240,9 +251,9 @@ HOME_ROOT/\.journal <> HOME_ROOT/lost\+found -d gen_context(system_u:object_r:lost_found_t,s15:c0.c255) HOME_ROOT/lost\+found/.* <> -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.if serefpolicy-2.2.23/policy/modules/kernel/files.if ---- nsaserefpolicy/policy/modules/kernel/files.if 2006-03-04 00:06:34.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/kernel/files.if 2006-03-09 11:17:00.000000000 -0500 +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.if serefpolicy-2.2.24/policy/modules/kernel/files.if +--- nsaserefpolicy/policy/modules/kernel/files.if 2006-03-17 13:51:48.000000000 -0500 ++++ serefpolicy-2.2.24/policy/modules/kernel/files.if 2006-03-17 14:30:03.000000000 -0500 @@ -1648,6 +1648,21 @@ ') @@ -273,7 +284,7 @@ allow $1 etc_runtime_t:file create_file_perms; type_transition $1 etc_t:file etc_runtime_t; ') -@@ -3789,12 +3805,13 @@ +@@ -3808,12 +3824,13 @@ # Need to give permission to create directories where applicable allow $1 self:process setfscreate; @@ -289,17 +300,17 @@ ') ######################################## -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/filesystem.te serefpolicy-2.2.23/policy/modules/kernel/filesystem.te ---- nsaserefpolicy/policy/modules/kernel/filesystem.te 2006-02-14 07:20:25.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/kernel/filesystem.te 2006-03-08 11:55:28.000000000 -0500 +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/filesystem.te serefpolicy-2.2.24/policy/modules/kernel/filesystem.te +--- nsaserefpolicy/policy/modules/kernel/filesystem.te 2006-03-17 13:51:48.000000000 -0500 ++++ serefpolicy-2.2.24/policy/modules/kernel/filesystem.te 2006-03-17 14:30:03.000000000 -0500 @@ -167,3 +167,4 @@ genfscon nfs / gen_context(system_u:object_r:nfs_t,s0) genfscon nfs4 / gen_context(system_u:object_r:nfs_t,s0) genfscon afs / gen_context(system_u:object_r:nfs_t,s0) +genfscon hfsplus / gen_context(system_u:object_r:nfs_t,s0) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel.if serefpolicy-2.2.23/policy/modules/kernel/kernel.if +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel.if serefpolicy-2.2.24/policy/modules/kernel/kernel.if --- nsaserefpolicy/policy/modules/kernel/kernel.if 2006-03-04 00:06:34.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/kernel/kernel.if 2006-03-07 14:00:35.000000000 -0500 ++++ serefpolicy-2.2.24/policy/modules/kernel/kernel.if 2006-03-17 14:30:03.000000000 -0500 @@ -1044,6 +1044,7 @@ allow $1 proc_t:dir search; @@ -420,9 +431,9 @@ + allow $1 proc_xen_t:dir r_dir_perms; + allow $1 proc_xen_t:file write; +') -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel.te serefpolicy-2.2.23/policy/modules/kernel/kernel.te ---- nsaserefpolicy/policy/modules/kernel/kernel.te 2006-02-07 10:43:26.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/kernel/kernel.te 2006-03-07 13:42:37.000000000 -0500 +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel.te serefpolicy-2.2.24/policy/modules/kernel/kernel.te +--- nsaserefpolicy/policy/modules/kernel/kernel.te 2006-03-17 13:51:48.000000000 -0500 ++++ serefpolicy-2.2.24/policy/modules/kernel/kernel.te 2006-03-17 14:30:03.000000000 -0500 @@ -75,6 +75,9 @@ type proc_net_t, proc_type; genfscon proc /net gen_context(system_u:object_r:proc_net_t,s0) @@ -433,9 +444,22 @@ # # Sysctl types # -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.fc serefpolicy-2.2.23/policy/modules/services/apache.fc +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/terminal.if serefpolicy-2.2.24/policy/modules/kernel/terminal.if +--- nsaserefpolicy/policy/modules/kernel/terminal.if 2006-02-14 07:20:25.000000000 -0500 ++++ serefpolicy-2.2.24/policy/modules/kernel/terminal.if 2006-03-17 14:30:03.000000000 -0500 +@@ -588,8 +588,8 @@ + type devpts_t; + ') + +- dev_list_all_dev_nodes($1) + allow $1 devpts_t:dir r_dir_perms; ++ dev_list_all_dev_nodes($1) + allow $1 ptynode:chr_file { rw_term_perms lock append }; + ') + +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.fc serefpolicy-2.2.24/policy/modules/services/apache.fc --- nsaserefpolicy/policy/modules/services/apache.fc 2006-02-27 17:17:23.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/services/apache.fc 2006-03-07 13:42:37.000000000 -0500 ++++ serefpolicy-2.2.24/policy/modules/services/apache.fc 2006-03-17 14:30:03.000000000 -0500 @@ -15,6 +15,7 @@ /etc/vhosts -- gen_context(system_u:object_r:httpd_config_t,s0) @@ -449,9 +473,9 @@ /var/www/icons(/.*)? gen_context(system_u:object_r:httpd_sys_content_t,s0) /var/www/perl(/.*)? gen_context(system_u:object_r:httpd_sys_script_exec_t,s0) +/usr/share/selinux-policy([^/]*)?/html(/.*)? gen_context(system_u:object_r:httpd_sys_content_t,s0) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.if serefpolicy-2.2.23/policy/modules/services/apache.if ---- nsaserefpolicy/policy/modules/services/apache.if 2006-03-04 00:06:35.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/services/apache.if 2006-03-07 13:42:37.000000000 -0500 +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.if serefpolicy-2.2.24/policy/modules/services/apache.if +--- nsaserefpolicy/policy/modules/services/apache.if 2006-03-17 13:51:48.000000000 -0500 ++++ serefpolicy-2.2.24/policy/modules/services/apache.if 2006-03-17 14:30:03.000000000 -0500 @@ -12,6 +12,11 @@ ## # @@ -464,9 +488,9 @@ # allow write access to public file transfer # services files. gen_tunable(allow_httpd_$1_script_anon_write,false) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apm.fc serefpolicy-2.2.23/policy/modules/services/apm.fc +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apm.fc serefpolicy-2.2.24/policy/modules/services/apm.fc --- nsaserefpolicy/policy/modules/services/apm.fc 2005-11-14 18:24:08.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/services/apm.fc 2006-03-07 15:38:20.000000000 -0500 ++++ serefpolicy-2.2.24/policy/modules/services/apm.fc 2006-03-17 14:30:03.000000000 -0500 @@ -11,7 +11,7 @@ # # /var @@ -476,9 +500,9 @@ /var/run/\.?acpid\.socket -s gen_context(system_u:object_r:apmd_var_run_t,s0) /var/run/apmd\.pid -- gen_context(system_u:object_r:apmd_var_run_t,s0) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apm.te serefpolicy-2.2.23/policy/modules/services/apm.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apm.te serefpolicy-2.2.24/policy/modules/services/apm.te --- nsaserefpolicy/policy/modules/services/apm.te 2006-03-04 00:06:35.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/services/apm.te 2006-03-08 13:36:37.000000000 -0500 ++++ serefpolicy-2.2.24/policy/modules/services/apm.te 2006-03-17 14:30:03.000000000 -0500 @@ -225,6 +225,10 @@ pcmcia_domtrans_cardctl(apmd_t) ') @@ -490,9 +514,9 @@ optional_policy(`selinuxutil',` seutil_sigchld_newrole(apmd_t) ') -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bluetooth.te serefpolicy-2.2.23/policy/modules/services/bluetooth.te ---- nsaserefpolicy/policy/modules/services/bluetooth.te 2006-03-04 00:06:35.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/services/bluetooth.te 2006-03-16 09:30:42.000000000 -0500 +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bluetooth.te serefpolicy-2.2.24/policy/modules/services/bluetooth.te +--- nsaserefpolicy/policy/modules/services/bluetooth.te 2006-03-17 13:51:48.000000000 -0500 ++++ serefpolicy-2.2.24/policy/modules/services/bluetooth.te 2006-03-21 08:22:49.000000000 -0500 @@ -115,6 +115,7 @@ corecmd_exec_shell(bluetooth_t) @@ -521,42 +545,62 @@ allow bluetooth_helper_t bluetooth_t:socket { read write }; -@@ -202,20 +208,17 @@ +@@ -182,8 +188,6 @@ + + dev_read_urand(bluetooth_helper_t) + +-term_dontaudit_use_all_user_ttys(bluetooth_helper_t) +- + corecmd_exec_bin(bluetooth_helper_t) + corecmd_exec_shell(bluetooth_helper_t) + +@@ -202,29 +206,27 @@ miscfiles_read_localization(bluetooth_helper_t) miscfiles_read_fonts(bluetooth_helper_t) -userdom_search_all_users_home_content(bluetooth_helper_t) -- ++sysnet_read_config(bluetooth_helper_t) ++ ++term_dontaudit_use_all_user_ttys(bluetooth_helper_t) + optional_policy(`nscd',` nscd_socket_use(bluetooth_helper_t) ') -+optional_policy(`xserver', ` -+ xserver_stream_connect_xdm(bluetooth_helper_t) -+'); -+ - ifdef(`TODO',` - allow bluetooth_helper_t tmp_t:dir search; - +-ifdef(`TODO',` +-allow bluetooth_helper_t tmp_t:dir search; +- -ifdef(`xserver.te', ` - allow bluetooth_helper_t xserver_log_t:dir search; - allow bluetooth_helper_t xserver_log_t:file { getattr read }; -') - - ifdef(`strict_policy',` - ifdef(`xdm.te',` - allow bluetooth_helper_t xdm_xserver_tmp_t:sock_file { read write }; -@@ -227,4 +230,7 @@ - files_rw_generic_tmp_sockets(bluetooth_helper_t) - allow bluetooth_helper_t tmpfs_t:file { read write }; - allow bluetooth_helper_t unconfined_t:unix_stream_socket connectto; -+ userdom_read_all_users_home_content_files(bluetooth_helper_t) +-ifdef(`strict_policy',` +- ifdef(`xdm.te',` +- allow bluetooth_helper_t xdm_xserver_tmp_t:sock_file { read write }; +- ') +-') +-') dnl end TODO ++optional_policy(`locallogin', ` ++ locallogin_dontaudit_use_fds(bluetooth_helper_t) ++'); + ++optional_policy(`xserver', ` ++ xserver_rw_xdm_sockets(bluetooth_helper_t) + xserver_stream_connect_xdm(bluetooth_helper_t) ++'); + + ifdef(`targeted_policy',` ++ userdom_read_all_users_home_content_files(bluetooth_helper_t) ++# Not sure we need the following anymore ???? + files_rw_generic_tmp_sockets(bluetooth_helper_t) +- allow bluetooth_helper_t tmpfs_t:file { read write }; + allow bluetooth_helper_t unconfined_t:unix_stream_socket connectto; ++ allow bluetooth_helper_t tmpfs_t:file { read write }; ') -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.te serefpolicy-2.2.23/policy/modules/services/cron.te ---- nsaserefpolicy/policy/modules/services/cron.te 2006-03-04 00:06:35.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/services/cron.te 2006-03-07 13:42:37.000000000 -0500 +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.te serefpolicy-2.2.24/policy/modules/services/cron.te +--- nsaserefpolicy/policy/modules/services/cron.te 2006-03-17 13:51:48.000000000 -0500 ++++ serefpolicy-2.2.24/policy/modules/services/cron.te 2006-03-17 14:30:03.000000000 -0500 @@ -166,6 +166,9 @@ allow crond_t unconfined_t:dbus send_msg; @@ -567,9 +611,9 @@ ',` allow crond_t crond_tmp_t:dir create_dir_perms; allow crond_t crond_tmp_t:file create_file_perms; -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.fc serefpolicy-2.2.23/policy/modules/services/cups.fc +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.fc serefpolicy-2.2.24/policy/modules/services/cups.fc --- nsaserefpolicy/policy/modules/services/cups.fc 2005-11-14 18:24:08.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/services/cups.fc 2006-03-07 13:42:37.000000000 -0500 ++++ serefpolicy-2.2.24/policy/modules/services/cups.fc 2006-03-17 14:30:03.000000000 -0500 @@ -43,7 +43,7 @@ /var/log/cups(/.*)? gen_context(system_u:object_r:cupsd_log_t,s0) /var/log/turboprint_cups\.log.* -- gen_context(system_u:object_r:cupsd_log_t,s0) @@ -579,9 +623,9 @@ /var/run/hp.*\.pid -- gen_context(system_u:object_r:hplip_var_run_t,s0) /var/run/hp.*\.port -- gen_context(system_u:object_r:hplip_var_run_t,s0) /var/run/ptal-printd(/.*)? gen_context(system_u:object_r:ptal_var_run_t,s0) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.if serefpolicy-2.2.23/policy/modules/services/cups.if +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.if serefpolicy-2.2.24/policy/modules/services/cups.if --- nsaserefpolicy/policy/modules/services/cups.if 2006-02-23 09:25:09.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/services/cups.if 2006-03-07 13:42:37.000000000 -0500 ++++ serefpolicy-2.2.24/policy/modules/services/cups.if 2006-03-17 14:30:03.000000000 -0500 @@ -226,3 +226,25 @@ allow cupsd_t $1:tcp_socket { acceptfrom recvfrom }; kernel_tcp_recvfrom($1) @@ -608,9 +652,9 @@ + allow $1 cupsd_t:unix_stream_socket connectto; +') + -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.te serefpolicy-2.2.23/policy/modules/services/cups.te ---- nsaserefpolicy/policy/modules/services/cups.te 2006-03-04 00:06:35.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/services/cups.te 2006-03-07 13:42:37.000000000 -0500 +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.te serefpolicy-2.2.24/policy/modules/services/cups.te +--- nsaserefpolicy/policy/modules/services/cups.te 2006-03-17 13:51:48.000000000 -0500 ++++ serefpolicy-2.2.24/policy/modules/services/cups.te 2006-03-17 14:30:03.000000000 -0500 @@ -77,7 +77,7 @@ dontaudit cupsd_t self:capability { sys_tty_config net_admin }; allow cupsd_t self:process { setsched signal_perms }; @@ -653,9 +697,9 @@ ') ######################################## -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cvs.te serefpolicy-2.2.23/policy/modules/services/cvs.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cvs.te serefpolicy-2.2.24/policy/modules/services/cvs.te --- nsaserefpolicy/policy/modules/services/cvs.te 2006-03-04 00:06:35.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/services/cvs.te 2006-03-07 13:42:37.000000000 -0500 ++++ serefpolicy-2.2.24/policy/modules/services/cvs.te 2006-03-17 14:30:03.000000000 -0500 @@ -11,7 +11,7 @@ inetd_tcp_service_domain(cvs_t,cvs_exec_t) role system_r types cvs_t; @@ -665,9 +709,9 @@ files_type(cvs_data_t) type cvs_tmp_t; -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.if serefpolicy-2.2.23/policy/modules/services/hal.if +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.if serefpolicy-2.2.24/policy/modules/services/hal.if --- nsaserefpolicy/policy/modules/services/hal.if 2006-03-04 00:06:36.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/services/hal.if 2006-03-07 13:42:37.000000000 -0500 ++++ serefpolicy-2.2.24/policy/modules/services/hal.if 2006-03-17 14:30:03.000000000 -0500 @@ -100,3 +100,44 @@ allow $1 hald_t:dbus send_msg; allow hald_t $1:dbus send_msg; @@ -713,9 +757,9 @@ + allow $1 hald_var_run_t:file rw_file_perms; +') + -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.te serefpolicy-2.2.23/policy/modules/services/hal.te ---- nsaserefpolicy/policy/modules/services/hal.te 2006-03-04 00:06:36.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/services/hal.te 2006-03-09 16:33:41.000000000 -0500 +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.te serefpolicy-2.2.24/policy/modules/services/hal.te +--- nsaserefpolicy/policy/modules/services/hal.te 2006-03-17 13:51:48.000000000 -0500 ++++ serefpolicy-2.2.24/policy/modules/services/hal.te 2006-03-21 08:06:25.000000000 -0500 @@ -22,7 +22,7 @@ # @@ -772,17 +816,28 @@ optional_policy(`mount',` mount_domtrans(hald_t) ') -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ktalk.fc serefpolicy-2.2.23/policy/modules/services/ktalk.fc +@@ -203,6 +210,10 @@ + nis_use_ypbind(hald_t) + ') + ++optional_policy(`hal', ` ++ hal_domtrans(ntpd_t) ++'); ++ + optional_policy(`nscd',` + nscd_socket_use(hald_t) + ') +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ktalk.fc serefpolicy-2.2.24/policy/modules/services/ktalk.fc --- nsaserefpolicy/policy/modules/services/ktalk.fc 2006-02-20 14:07:37.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/services/ktalk.fc 2006-03-07 13:42:37.000000000 -0500 ++++ serefpolicy-2.2.24/policy/modules/services/ktalk.fc 2006-03-17 14:30:03.000000000 -0500 @@ -1,3 +1,4 @@ /usr/bin/in.talkd -- gen_context(system_u:object_r:ktalkd_exec_t,s0) /usr/bin/ktalkd -- gen_context(system_u:object_r:ktalkd_exec_t,s0) +/var/log/talkd.* -- gen_context(system_u:object_r:ktalkd_log_t,s0) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ktalk.te serefpolicy-2.2.23/policy/modules/services/ktalk.te ---- nsaserefpolicy/policy/modules/services/ktalk.te 2006-03-04 00:06:36.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/services/ktalk.te 2006-03-07 13:42:37.000000000 -0500 +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ktalk.te serefpolicy-2.2.24/policy/modules/services/ktalk.te +--- nsaserefpolicy/policy/modules/services/ktalk.te 2006-03-17 13:51:48.000000000 -0500 ++++ serefpolicy-2.2.24/policy/modules/services/ktalk.te 2006-03-17 14:30:03.000000000 -0500 @@ -14,6 +14,9 @@ type ktalkd_tmp_t; files_tmp_file(ktalkd_tmp_t) @@ -806,9 +861,9 @@ miscfiles_read_localization(ktalkd_t) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mailman.if serefpolicy-2.2.23/policy/modules/services/mailman.if +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mailman.if serefpolicy-2.2.24/policy/modules/services/mailman.if --- nsaserefpolicy/policy/modules/services/mailman.if 2006-03-04 00:06:36.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/services/mailman.if 2006-03-08 16:59:01.000000000 -0500 ++++ serefpolicy-2.2.24/policy/modules/services/mailman.if 2006-03-17 14:30:03.000000000 -0500 @@ -275,3 +275,28 @@ allow $1 mailman_archive_t:file r_file_perms; allow $1 mailman_archive_t:lnk_file { getattr read }; @@ -838,17 +893,17 @@ + allow mailman_queue_t $1:process sigchld; +') + -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nis.fc serefpolicy-2.2.23/policy/modules/services/nis.fc +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nis.fc serefpolicy-2.2.24/policy/modules/services/nis.fc --- nsaserefpolicy/policy/modules/services/nis.fc 2005-11-28 21:48:04.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/services/nis.fc 2006-03-10 16:47:00.000000000 -0500 ++++ serefpolicy-2.2.24/policy/modules/services/nis.fc 2006-03-17 14:30:03.000000000 -0500 @@ -7,3 +7,4 @@ /usr/sbin/ypserv -- gen_context(system_u:object_r:ypserv_exec_t,s0) /var/yp(/.*)? gen_context(system_u:object_r:var_yp_t,s0) +/usr/sbin/rpc.ypxfr -- gen_context(system_u:object_r:ypxfr_exec_t,s0) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nis.if serefpolicy-2.2.23/policy/modules/services/nis.if +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nis.if serefpolicy-2.2.24/policy/modules/services/nis.if --- nsaserefpolicy/policy/modules/services/nis.if 2006-02-10 21:34:14.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/services/nis.if 2006-03-10 16:45:39.000000000 -0500 ++++ serefpolicy-2.2.24/policy/modules/services/nis.if 2006-03-17 14:30:03.000000000 -0500 @@ -277,3 +277,28 @@ files_search_etc($1) allow $1 ypserv_conf_t:file { getattr read }; @@ -878,9 +933,9 @@ + allow ypxfr_t $1:fifo_file rw_file_perms; + allow ypxfr_t $1:process sigchld; +') -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nis.te serefpolicy-2.2.23/policy/modules/services/nis.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nis.te serefpolicy-2.2.24/policy/modules/services/nis.te --- nsaserefpolicy/policy/modules/services/nis.te 2006-03-04 00:06:36.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/services/nis.te 2006-03-13 13:32:08.000000000 -0500 ++++ serefpolicy-2.2.24/policy/modules/services/nis.te 2006-03-17 14:30:03.000000000 -0500 @@ -31,6 +31,10 @@ type ypserv_exec_t; init_daemon_domain(ypserv_t,ypserv_exec_t) @@ -934,9 +989,9 @@ + +allow ypxfr_t etc_t:file { getattr read }; +files_read_etc_files(ypxfr_t) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nscd.if serefpolicy-2.2.23/policy/modules/services/nscd.if +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nscd.if serefpolicy-2.2.24/policy/modules/services/nscd.if --- nsaserefpolicy/policy/modules/services/nscd.if 2006-02-10 21:34:14.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/services/nscd.if 2006-03-07 13:42:37.000000000 -0500 ++++ serefpolicy-2.2.24/policy/modules/services/nscd.if 2006-03-17 14:30:03.000000000 -0500 @@ -49,8 +49,8 @@ dontaudit $1 nscd_t:nscd { shmempwd shmemgrp shmemhost }; @@ -947,9 +1002,20 @@ dontaudit $1 nscd_var_run_t:file { getattr read }; ') -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postfix.te serefpolicy-2.2.23/policy/modules/services/postfix.te ---- nsaserefpolicy/policy/modules/services/postfix.te 2006-03-04 00:06:36.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/services/postfix.te 2006-03-08 16:58:41.000000000 -0500 +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pegasus.te serefpolicy-2.2.24/policy/modules/services/pegasus.te +--- nsaserefpolicy/policy/modules/services/pegasus.te 2006-03-04 00:06:36.000000000 -0500 ++++ serefpolicy-2.2.24/policy/modules/services/pegasus.te 2006-03-21 10:39:08.000000000 -0500 +@@ -77,6 +77,7 @@ + corenet_tcp_bind_pegasus_https_port(pegasus_t) + corenet_tcp_connect_pegasus_http_port(pegasus_t) + corenet_tcp_connect_pegasus_https_port(pegasus_t) ++corenet_tcp_connect_generic_port(pegasus_t) + + dev_read_sysfs(pegasus_t) + dev_read_urand(pegasus_t) +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postfix.te serefpolicy-2.2.24/policy/modules/services/postfix.te +--- nsaserefpolicy/policy/modules/services/postfix.te 2006-03-17 13:51:49.000000000 -0500 ++++ serefpolicy-2.2.24/policy/modules/services/postfix.te 2006-03-17 14:30:03.000000000 -0500 @@ -406,6 +406,10 @@ procmail_domtrans(postfix_pipe_t) ') @@ -961,9 +1027,9 @@ ######################################## # # Postfix postdrop local policy -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/samba.te serefpolicy-2.2.23/policy/modules/services/samba.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/samba.te serefpolicy-2.2.24/policy/modules/services/samba.te --- nsaserefpolicy/policy/modules/services/samba.te 2006-03-04 00:06:36.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/services/samba.te 2006-03-07 13:42:37.000000000 -0500 ++++ serefpolicy-2.2.24/policy/modules/services/samba.te 2006-03-17 14:30:03.000000000 -0500 @@ -32,7 +32,7 @@ type samba_secrets_t; files_type(samba_secrets_t) @@ -973,9 +1039,9 @@ files_config_file(samba_share_t) type samba_var_t; -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/sendmail.te serefpolicy-2.2.23/policy/modules/services/sendmail.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/sendmail.te serefpolicy-2.2.24/policy/modules/services/sendmail.te --- nsaserefpolicy/policy/modules/services/sendmail.te 2006-03-04 00:06:36.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/services/sendmail.te 2006-03-14 15:56:20.000000000 -0500 ++++ serefpolicy-2.2.24/policy/modules/services/sendmail.te 2006-03-17 14:30:03.000000000 -0500 @@ -125,6 +125,7 @@ ') @@ -984,9 +1050,36 @@ postfix_read_config(sendmail_t) postfix_search_spool(sendmail_t) ') -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/fstools.if serefpolicy-2.2.23/policy/modules/system/fstools.if +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.if serefpolicy-2.2.24/policy/modules/services/xserver.if +--- nsaserefpolicy/policy/modules/services/xserver.if 2006-03-17 13:51:50.000000000 -0500 ++++ serefpolicy-2.2.24/policy/modules/services/xserver.if 2006-03-21 08:19:11.000000000 -0500 +@@ -904,3 +904,23 @@ + + dontaudit $1 xdm_xserver_t:tcp_socket { read write }; + ') ++ ++######################################## ++## ++## Do not audit attempts to read and write to ++## a XDM X server socket. ++## ++## ++## ++## Domain to not audit ++## ++## ++# ++interface(`xserver_rw_xdm_sockets',` ++ gen_require(` ++ type xdm_xserver_tmp_t; ++ ') ++ ++ allow $1 xdm_xserver_tmp_t:dir search; ++ allow $1 xdm_xserver_tmp_t:sock_file { read write }; ++') +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/fstools.if serefpolicy-2.2.24/policy/modules/system/fstools.if --- nsaserefpolicy/policy/modules/system/fstools.if 2006-02-10 21:34:15.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/system/fstools.if 2006-03-14 11:33:20.000000000 -0500 ++++ serefpolicy-2.2.24/policy/modules/system/fstools.if 2006-03-17 14:30:03.000000000 -0500 @@ -110,3 +110,21 @@ allow $1 fsadm_exec_t:file create_file_perms; @@ -1009,9 +1102,9 @@ + + allow $1 swapfile_t:file getattr; +') -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/fstools.te serefpolicy-2.2.23/policy/modules/system/fstools.te ---- nsaserefpolicy/policy/modules/system/fstools.te 2006-03-04 00:06:37.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/system/fstools.te 2006-03-14 11:32:08.000000000 -0500 +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/fstools.te serefpolicy-2.2.24/policy/modules/system/fstools.te +--- nsaserefpolicy/policy/modules/system/fstools.te 2006-03-17 13:51:50.000000000 -0500 ++++ serefpolicy-2.2.24/policy/modules/system/fstools.te 2006-03-20 23:51:17.000000000 -0500 @@ -53,6 +53,7 @@ kernel_change_ring_buffer_level(fsadm_t) # mkreiserfs needs this @@ -1020,7 +1113,18 @@ # Access to /initrd devices kernel_rw_unlabeled_dirs(fsadm_t) kernel_rw_unlabeled_blk_files(fsadm_t) -@@ -73,6 +74,7 @@ +@@ -65,6 +66,10 @@ + dev_read_urand(fsadm_t) + # Recreate /dev/cdrom. + dev_manage_generic_symlinks(fsadm_t) ++ ++# fdisk needs this for early boot ++dev_manage_generic_blk_files(fsadm_t) ++ + # Access to /initrd devices + dev_search_usbfs(fsadm_t) + # for swapon +@@ -73,6 +78,7 @@ dev_getattr_usbfs_dirs(fsadm_t) # Access to /dev/mapper/control dev_rw_lvm_control(fsadm_t) @@ -1028,7 +1132,7 @@ fs_search_auto_mountpoints(fsadm_t) fs_getattr_xattr_fs(fsadm_t) -@@ -127,6 +129,7 @@ +@@ -127,6 +133,7 @@ init_use_fds(fsadm_t) init_use_script_ptys(fsadm_t) @@ -1036,9 +1140,9 @@ libs_use_ld_so(fsadm_t) libs_use_shared_libs(fsadm_t) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.te serefpolicy-2.2.23/policy/modules/system/init.te ---- nsaserefpolicy/policy/modules/system/init.te 2006-03-04 00:06:37.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/system/init.te 2006-03-15 09:44:32.000000000 -0500 +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.te serefpolicy-2.2.24/policy/modules/system/init.te +--- nsaserefpolicy/policy/modules/system/init.te 2006-03-17 13:51:50.000000000 -0500 ++++ serefpolicy-2.2.24/policy/modules/system/init.te 2006-03-17 14:30:03.000000000 -0500 @@ -349,6 +349,7 @@ files_mounton_isid_type_dirs(initrc_t) files_list_default(initrc_t) @@ -1058,9 +1162,9 @@ ',` # cjp: require doesnt work in optionals :\ # this also would result in a type transition -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.fc serefpolicy-2.2.23/policy/modules/system/libraries.fc +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.fc serefpolicy-2.2.24/policy/modules/system/libraries.fc --- nsaserefpolicy/policy/modules/system/libraries.fc 2006-02-20 14:07:38.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/system/libraries.fc 2006-03-07 13:42:37.000000000 -0500 ++++ serefpolicy-2.2.24/policy/modules/system/libraries.fc 2006-03-17 14:30:03.000000000 -0500 @@ -65,6 +65,7 @@ /usr/lib(64)?/(nvidia/)?libGL(core)?\.so(\.[^/]*)* -- gen_context(system_u:object_r:textrel_shlib_t,s0) /usr/lib(64)?/libGLU\.so(\.[^/]*)* -- gen_context(system_u:object_r:textrel_shlib_t,s0) @@ -1077,9 +1181,9 @@ ifdef(`distro_redhat',` /usr/lib(64)?/.*/program/.*\.so.* gen_context(system_u:object_r:shlib_t,s0) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/locallogin.te serefpolicy-2.2.23/policy/modules/system/locallogin.te ---- nsaserefpolicy/policy/modules/system/locallogin.te 2006-03-04 00:06:37.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/system/locallogin.te 2006-03-07 13:42:37.000000000 -0500 +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/locallogin.te serefpolicy-2.2.24/policy/modules/system/locallogin.te +--- nsaserefpolicy/policy/modules/system/locallogin.te 2006-03-17 13:51:50.000000000 -0500 ++++ serefpolicy-2.2.24/policy/modules/system/locallogin.te 2006-03-17 14:30:03.000000000 -0500 @@ -20,6 +20,7 @@ type local_login_tmp_t; @@ -1088,9 +1192,9 @@ type sulogin_t; type sulogin_exec_t; -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/lvm.fc serefpolicy-2.2.23/policy/modules/system/lvm.fc +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/lvm.fc serefpolicy-2.2.24/policy/modules/system/lvm.fc --- nsaserefpolicy/policy/modules/system/lvm.fc 2005-11-14 18:24:06.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/system/lvm.fc 2006-03-07 13:42:37.000000000 -0500 ++++ serefpolicy-2.2.24/policy/modules/system/lvm.fc 2006-03-17 14:30:03.000000000 -0500 @@ -25,6 +25,7 @@ # /sbin # @@ -1099,9 +1203,9 @@ /sbin/dmsetup -- gen_context(system_u:object_r:lvm_exec_t,s0) /sbin/dmsetup\.static -- gen_context(system_u:object_r:lvm_exec_t,s0) /sbin/e2fsadm -- gen_context(system_u:object_r:lvm_exec_t,s0) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/lvm.te serefpolicy-2.2.23/policy/modules/system/lvm.te ---- nsaserefpolicy/policy/modules/system/lvm.te 2006-03-04 00:06:37.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/system/lvm.te 2006-03-08 10:58:24.000000000 -0500 +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/lvm.te serefpolicy-2.2.24/policy/modules/system/lvm.te +--- nsaserefpolicy/policy/modules/system/lvm.te 2006-03-17 13:51:50.000000000 -0500 ++++ serefpolicy-2.2.24/policy/modules/system/lvm.te 2006-03-17 14:30:03.000000000 -0500 @@ -129,6 +129,8 @@ # DAC overrides and mknod for modifying /dev entries (vgmknodes) @@ -1119,9 +1223,9 @@ fs_getattr_xattr_fs(lvm_t) fs_search_auto_mountpoints(lvm_t) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.te serefpolicy-2.2.23/policy/modules/system/mount.te ---- nsaserefpolicy/policy/modules/system/mount.te 2006-03-04 00:06:37.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/system/mount.te 2006-03-14 14:40:50.000000000 -0500 +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.te serefpolicy-2.2.24/policy/modules/system/mount.te +--- nsaserefpolicy/policy/modules/system/mount.te 2006-03-17 13:51:50.000000000 -0500 ++++ serefpolicy-2.2.24/policy/modules/system/mount.te 2006-03-17 14:30:03.000000000 -0500 @@ -26,6 +26,7 @@ files_tmp_filetrans(mount_t,mount_tmp_t,{ file dir }) @@ -1146,9 +1250,9 @@ libs_use_ld_so(mount_t) libs_use_shared_libs(mount_t) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.fc serefpolicy-2.2.23/policy/modules/system/selinuxutil.fc +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.fc serefpolicy-2.2.24/policy/modules/system/selinuxutil.fc --- nsaserefpolicy/policy/modules/system/selinuxutil.fc 2006-02-23 09:25:09.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/system/selinuxutil.fc 2006-03-15 16:33:44.000000000 -0500 ++++ serefpolicy-2.2.24/policy/modules/system/selinuxutil.fc 2006-03-17 14:30:03.000000000 -0500 @@ -8,9 +8,9 @@ /etc/selinux/([^/]*/)?contexts/files(/.*)? gen_context(system_u:object_r:file_context_t,s0) /etc/selinux/([^/]*/)?policy(/.*)? gen_context(system_u:object_r:policy_config_t,s15:c0.c255) @@ -1162,9 +1266,9 @@ /etc/selinux/([^/]*/)?users(/.*)? -- gen_context(system_u:object_r:selinux_config_t,s15:c0.c255) # -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.if serefpolicy-2.2.23/policy/modules/system/selinuxutil.if +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.if serefpolicy-2.2.24/policy/modules/system/selinuxutil.if --- nsaserefpolicy/policy/modules/system/selinuxutil.if 2006-02-23 09:25:09.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/system/selinuxutil.if 2006-03-14 17:32:57.000000000 -0500 ++++ serefpolicy-2.2.24/policy/modules/system/selinuxutil.if 2006-03-17 14:30:03.000000000 -0500 @@ -675,8 +675,8 @@ files_search_etc($1) @@ -1206,9 +1310,9 @@ + allow $1 selinux_config_t:lnk_file { getattr read }; +') + -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.te serefpolicy-2.2.23/policy/modules/system/selinuxutil.te ---- nsaserefpolicy/policy/modules/system/selinuxutil.te 2006-03-04 00:06:37.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/system/selinuxutil.te 2006-03-15 09:23:03.000000000 -0500 +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.te serefpolicy-2.2.24/policy/modules/system/selinuxutil.te +--- nsaserefpolicy/policy/modules/system/selinuxutil.te 2006-03-17 13:51:50.000000000 -0500 ++++ serefpolicy-2.2.24/policy/modules/system/selinuxutil.te 2006-03-17 14:30:03.000000000 -0500 @@ -192,6 +192,9 @@ selinux_load_policy(load_policy_t) selinux_set_boolean(load_policy_t) @@ -1274,9 +1378,9 @@ userdom_use_all_users_fds(setfiles_t) # for config files in a home directory -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/sysnetwork.te serefpolicy-2.2.23/policy/modules/system/sysnetwork.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/sysnetwork.te serefpolicy-2.2.24/policy/modules/system/sysnetwork.te --- nsaserefpolicy/policy/modules/system/sysnetwork.te 2006-03-04 00:06:37.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/system/sysnetwork.te 2006-03-09 11:15:56.000000000 -0500 ++++ serefpolicy-2.2.24/policy/modules/system/sysnetwork.te 2006-03-17 14:30:03.000000000 -0500 @@ -161,6 +161,10 @@ consoletype_domtrans(dhcpc_t) ') @@ -1298,9 +1402,9 @@ ifdef(`targeted_policy',` term_use_generic_ptys(ifconfig_t) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.te serefpolicy-2.2.23/policy/modules/system/udev.te ---- nsaserefpolicy/policy/modules/system/udev.te 2006-03-04 00:06:37.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/system/udev.te 2006-03-13 12:21:29.000000000 -0500 +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.te serefpolicy-2.2.24/policy/modules/system/udev.te +--- nsaserefpolicy/policy/modules/system/udev.te 2006-03-17 13:51:50.000000000 -0500 ++++ serefpolicy-2.2.24/policy/modules/system/udev.te 2006-03-17 14:30:03.000000000 -0500 @@ -39,7 +39,7 @@ # Local policy # @@ -1310,9 +1414,9 @@ dontaudit udev_t self:capability sys_tty_config; allow udev_t self:process ~{ ptrace setcurrent setexec setfscreate setrlimit execmem execstack execheap }; allow udev_t self:process { execmem setfscreate }; -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.te serefpolicy-2.2.23/policy/modules/system/unconfined.te ---- nsaserefpolicy/policy/modules/system/unconfined.te 2006-02-20 14:07:38.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/system/unconfined.te 2006-03-08 12:35:43.000000000 -0500 +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.te serefpolicy-2.2.24/policy/modules/system/unconfined.te +--- nsaserefpolicy/policy/modules/system/unconfined.te 2006-03-17 13:51:50.000000000 -0500 ++++ serefpolicy-2.2.24/policy/modules/system/unconfined.te 2006-03-17 14:30:03.000000000 -0500 @@ -89,10 +89,6 @@ firstboot_domtrans(unconfined_t) ') @@ -1335,10 +1439,10 @@ optional_policy(`netutils',` netutils_domtrans_ping(unconfined_t) ') -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-2.2.23/policy/modules/system/userdomain.te ---- nsaserefpolicy/policy/modules/system/userdomain.te 2006-03-04 00:06:37.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/system/userdomain.te 2006-03-14 15:57:25.000000000 -0500 -@@ -179,6 +179,7 @@ +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-2.2.24/policy/modules/system/userdomain.te +--- nsaserefpolicy/policy/modules/system/userdomain.te 2006-03-17 13:51:50.000000000 -0500 ++++ serefpolicy-2.2.24/policy/modules/system/userdomain.te 2006-03-17 14:30:03.000000000 -0500 +@@ -180,6 +180,7 @@ logging_read_audit_log(secadm_t) logging_domtrans_auditctl(secadm_t) userdom_dontaudit_append_staff_home_content_files(secadm_t) @@ -1346,9 +1450,9 @@ ', ` logging_domtrans_auditctl(sysadm_t) logging_read_audit_log(sysadm_t) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xend.fc serefpolicy-2.2.23/policy/modules/system/xend.fc +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xend.fc serefpolicy-2.2.24/policy/modules/system/xend.fc --- nsaserefpolicy/policy/modules/system/xend.fc 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/system/xend.fc 2006-03-10 16:48:34.000000000 -0500 ++++ serefpolicy-2.2.24/policy/modules/system/xend.fc 2006-03-17 14:30:03.000000000 -0500 @@ -0,0 +1,23 @@ +# xend executable will have: +# label: system_u:object_r:xend_exec_t @@ -1373,9 +1477,9 @@ +/dev/xen/evtchn -c system_u:object_r:xend_device_t:s0 +/usr/lib/xen/bin(/.*)? system_u:object_r:bin_t:s0 + -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xend.if serefpolicy-2.2.23/policy/modules/system/xend.if +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xend.if serefpolicy-2.2.24/policy/modules/system/xend.if --- nsaserefpolicy/policy/modules/system/xend.if 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/system/xend.if 2006-03-07 15:47:54.000000000 -0500 ++++ serefpolicy-2.2.24/policy/modules/system/xend.if 2006-03-17 14:30:03.000000000 -0500 @@ -0,0 +1,71 @@ +## policy for xen + @@ -1448,9 +1552,9 @@ + allow $1 xenstored_t:unix_stream_socket connectto; +') + -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xend.te serefpolicy-2.2.23/policy/modules/system/xend.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xend.te serefpolicy-2.2.24/policy/modules/system/xend.te --- nsaserefpolicy/policy/modules/system/xend.te 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/system/xend.te 2006-03-13 16:17:27.000000000 -0500 ++++ serefpolicy-2.2.24/policy/modules/system/xend.te 2006-03-17 14:30:03.000000000 -0500 @@ -0,0 +1,219 @@ +policy_module(xend,1.0.0) + @@ -1671,9 +1775,9 @@ + +xend_append_log(xenstored_t) + -diff --exclude-from=exclude -N -u -r nsaserefpolicy/Rules.modular serefpolicy-2.2.23/Rules.modular +diff --exclude-from=exclude -N -u -r nsaserefpolicy/Rules.modular serefpolicy-2.2.24/Rules.modular --- nsaserefpolicy/Rules.modular 2006-02-17 14:46:10.000000000 -0500 -+++ serefpolicy-2.2.23/Rules.modular 2006-03-07 13:42:37.000000000 -0500 ++++ serefpolicy-2.2.24/Rules.modular 2006-03-17 14:30:03.000000000 -0500 @@ -204,7 +204,7 @@ # $(APPDIR)/customizable_types: $(BASE_CONF) Index: selinux-policy.spec =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v retrieving revision 1.155 retrieving revision 1.156 diff -u -r1.155 -r1.156 --- selinux-policy.spec 18 Mar 2006 04:09:10 -0000 1.155 +++ selinux-policy.spec 21 Mar 2006 15:42:38 -0000 1.156 @@ -10,7 +10,7 @@ Summary: SELinux policy configuration Name: selinux-policy Version: 2.2.24 -Release: 1 +Release: 2 License: GPL Group: System Environment/Base Source: serefpolicy-%{version}.tgz @@ -133,7 +133,7 @@ . %{_sysconfdir}/selinux/config; \ FILE_CONTEXT=%{_sysconfdir}/selinux/%1/contexts/files/file_contexts; \ if [ "${SELINUXTYPE}" == %1 -a -f ${FILE_CONTEXT}.pre ]; then \ - /usr/sbin/fixfiles -C ${FILE_CONTEXT}.pre restore; \ + fixfiles -C ${FILE_CONTEXT}.pre restore; \ rm -f ${FILE_CONTEXT}.pre; \ fi; From fedora-cvs-commits at redhat.com Tue Mar 21 15:45:47 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 21 Mar 2006 10:45:47 -0500 Subject: rpms/libsemanage/devel .cvsignore, 1.55, 1.56 libsemanage.spec, 1.78, 1.79 sources, 1.57, 1.58 Message-ID: <200603211545.k2LFjl2G025604@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/libsemanage/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv25091 Modified Files: .cvsignore libsemanage.spec sources Log Message: * Tue Mar 21 2006 Dan Walsh - 1.6.2 - Upgrade to latest from NSA * Merged Makefile PYLIBVER definition patch from Dan Walsh. * Merged man page reorganization from Ivan Gyurdiev. Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/libsemanage/devel/.cvsignore,v retrieving revision 1.55 retrieving revision 1.56 diff -u -r1.55 -r1.56 --- .cvsignore 17 Mar 2006 20:25:31 -0000 1.55 +++ .cvsignore 21 Mar 2006 15:45:45 -0000 1.56 @@ -60,3 +60,4 @@ libsemanage-1.5.29.tgz libsemanage-1.5.31.tgz libsemanage-1.6.tgz +libsemanage-1.6.2.tgz Index: libsemanage.spec =================================================================== RCS file: /cvs/dist/rpms/libsemanage/devel/libsemanage.spec,v retrieving revision 1.78 retrieving revision 1.79 diff -u -r1.78 -r1.79 --- libsemanage.spec 17 Mar 2006 20:25:31 -0000 1.78 +++ libsemanage.spec 21 Mar 2006 15:45:45 -0000 1.79 @@ -2,7 +2,7 @@ %define libselinuxver 1.30-1 Summary: SELinux binary policy manipulation library Name: libsemanage -Version: 1.6 +Version: 1.6.2 Release: 1 License: GPL Group: System Environment/Libraries @@ -74,6 +74,11 @@ %{_mandir}/man3/* %changelog +* Tue Mar 21 2006 Dan Walsh - 1.6.2 +- Upgrade to latest from NSA + * Merged Makefile PYLIBVER definition patch from Dan Walsh. + * Merged man page reorganization from Ivan Gyurdiev. + * Fri Mar 17 2006 Dan Walsh - 1.6 - Make work on RHEL4 - Upgrade to latest from NSA Index: sources =================================================================== RCS file: /cvs/dist/rpms/libsemanage/devel/sources,v retrieving revision 1.57 retrieving revision 1.58 diff -u -r1.57 -r1.58 --- sources 17 Mar 2006 20:25:31 -0000 1.57 +++ sources 21 Mar 2006 15:45:45 -0000 1.58 @@ -1 +1 @@ -3f547c9b5ca5d300957a2b36230dbb30 libsemanage-1.6.tgz +187deb14a3577967b5ddac2013cd641c libsemanage-1.6.2.tgz From fedora-cvs-commits at redhat.com Tue Mar 21 15:46:00 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 21 Mar 2006 10:46:00 -0500 Subject: rpms/libsemanage/devel libsemanage.spec,1.79,1.80 Message-ID: <200603211546.k2LFk0Fa028061@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/libsemanage/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv27616 Modified Files: libsemanage.spec Log Message: * Tue Mar 21 2006 Dan Walsh - 1.6.2 - Upgrade to latest from NSA * Merged Makefile PYLIBVER definition patch from Dan Walsh. * Merged man page reorganization from Ivan Gyurdiev. Index: libsemanage.spec =================================================================== RCS file: /cvs/dist/rpms/libsemanage/devel/libsemanage.spec,v retrieving revision 1.79 retrieving revision 1.80 diff -u -r1.79 -r1.80 --- libsemanage.spec 21 Mar 2006 15:45:45 -0000 1.79 +++ libsemanage.spec 21 Mar 2006 15:45:58 -0000 1.80 @@ -7,7 +7,6 @@ License: GPL Group: System Environment/Libraries Source: http://www.nsa.gov/selinux/archives/libsemanage-%{version}.tgz -Patch: libsemanage-rhat.patch BuildRoot: %{_tmppath}/%{name}-buildroot BuildRequires: libselinux-devel >= %{libselinuxver} @@ -40,7 +39,6 @@ %prep %setup -q -%patch -p1 -b .rhat %build make clean From fedora-cvs-commits at redhat.com Tue Mar 21 15:49:22 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 21 Mar 2006 10:49:22 -0500 Subject: rpms/policycoreutils/devel .cvsignore, 1.104, 1.105 policycoreutils-rhat.patch, 1.175, 1.176 policycoreutils.spec, 1.249, 1.250 sources, 1.108, 1.109 Message-ID: <200603211549.k2LFnMqT004438@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/policycoreutils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv4421 Modified Files: .cvsignore policycoreutils-rhat.patch policycoreutils.spec sources Log Message: * Tue Mar 21 2006 Dan Walsh 1.30.1-1 - Make audit2allow translate dontaudit as well as allow rules - Update from upstream * Merged semanage labeling prefix patch from Ivan Gyurdiev. Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/policycoreutils/devel/.cvsignore,v retrieving revision 1.104 retrieving revision 1.105 diff -u -r1.104 -r1.105 --- .cvsignore 17 Mar 2006 20:29:37 -0000 1.104 +++ .cvsignore 21 Mar 2006 15:49:19 -0000 1.105 @@ -94,3 +94,4 @@ policycoreutils-1.29.26.tgz policycoreutils-1.29.27.tgz policycoreutils-1.30.tgz +policycoreutils-1.30.1.tgz policycoreutils-rhat.patch: Makefile | 2 audit2allow/audit2allow | 16 - restorecond/Makefile | 29 ++ restorecond/restorecond.8 | 31 ++ restorecond/restorecond.c | 452 +++++++++++++++++++++++++++++++++++++++++++ restorecond/restorecond.conf | 3 restorecond/restorecond.h | 31 ++ restorecond/restorecond.init | 61 +++++ restorecond/stringslist.c | 118 +++++++++++ restorecond/stringslist.h | 37 +++ restorecond/utmpwatcher.c | 105 +++++++++ restorecond/utmpwatcher.h | 29 ++ scripts/fixfiles | 10 13 files changed, 913 insertions(+), 11 deletions(-) Index: policycoreutils-rhat.patch =================================================================== RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v retrieving revision 1.175 retrieving revision 1.176 diff -u -r1.175 -r1.176 --- policycoreutils-rhat.patch 21 Mar 2006 14:19:08 -0000 1.175 +++ policycoreutils-rhat.patch 21 Mar 2006 15:49:19 -0000 1.176 @@ -1004,29 +1004,3 @@ exit $? fi LogReadOnly -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/semanage/seobject.py policycoreutils-1.30/semanage/seobject.py ---- nsapolicycoreutils/semanage/seobject.py 2006-03-10 09:48:05.000000000 -0500 -+++ policycoreutils-1.30/semanage/seobject.py 2006-03-20 22:51:07.000000000 -0500 -@@ -549,7 +549,7 @@ - raise ValueError("Could not list roles for user %s" % name) - - roles = string.join(rlist, ' '); -- ddict[semanage_user_get_name(u)] = (semanage_user_get_mlslevel(u), semanage_user_get_mlsrange(u), roles) -+ ddict[semanage_user_get_name(u)] = (semanage_user_get_prefix(u), semanage_user_get_mlslevel(u), semanage_user_get_mlsrange(u), roles) - - return ddict - -@@ -559,10 +559,10 @@ - keys.sort() - if is_mls_enabled == 1: - if heading: -- print "\n%-15s %-10s %-30s" % ("", "MLS/", "MLS/") -- print "%-15s %-10s %-30s %s\n" % ("SELinux User", "MCS Level", "MCS Range", "SELinux Roles") -+ print "\n%-15s %-10s %-10s %-30s" % ("", "Labeling", "MLS/", "MLS/") -+ print "%-15s %-10s %-10s %-30s %s\n" % ("SELinux User", "Prefix", "MCS Level", "MCS Range", "SELinux Roles") - for k in keys: -- print "%-15s %-10s %-30s %s" % (k, translate(ddict[k][0]), translate(ddict[k][1]), ddict[k][2]) -+ print "%-15s %-10s %-10s %-30s %s" % (k, ddict[k][0], translate(ddict[k][1]), translate(ddict[k][2]), ddict[k][3]) - else: - if heading: - print "%-15s %s\n" % ("SELinux User", "SELinux Roles") Index: policycoreutils.spec =================================================================== RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils.spec,v retrieving revision 1.249 retrieving revision 1.250 diff -u -r1.249 -r1.250 --- policycoreutils.spec 21 Mar 2006 14:19:08 -0000 1.249 +++ policycoreutils.spec 21 Mar 2006 15:49:19 -0000 1.250 @@ -4,8 +4,8 @@ %define libselinuxver 1.30-1 Summary: SELinux policy core utilities. Name: policycoreutils -Version: 1.30 -Release: 5 +Version: 1.30.1 +Release: 1 License: GPL Group: System Environment/Base Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz @@ -107,6 +107,11 @@ service restorecond condrestart %changelog +* Tue Mar 21 2006 Dan Walsh 1.30.1-1 +- Make audit2allow translate dontaudit as well as allow rules +- Update from upstream + * Merged semanage labeling prefix patch from Ivan Gyurdiev. + * Tue Mar 21 2006 Dan Walsh 1.30-5 - Fix audit2allow to retrieve dontaudit rules Index: sources =================================================================== RCS file: /cvs/dist/rpms/policycoreutils/devel/sources,v retrieving revision 1.108 retrieving revision 1.109 diff -u -r1.108 -r1.109 --- sources 17 Mar 2006 20:29:37 -0000 1.108 +++ sources 21 Mar 2006 15:49:19 -0000 1.109 @@ -1 +1 @@ -e017bfddf27e124cef2743496dcfcc49 policycoreutils-1.30.tgz +a1f4732b7c4d047a437d489b620a2895 policycoreutils-1.30.1.tgz From fedora-cvs-commits at redhat.com Tue Mar 21 16:04:47 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 21 Mar 2006 11:04:47 -0500 Subject: rpms/k3b/FC-5 .cvsignore, 1.10, 1.11 k3b.spec, 1.27, 1.28 sources, 1.11, 1.12 Message-ID: <200603211604.k2LG4lKQ004645@cvs.devel.redhat.com> Author: harald Update of /cvs/dist/rpms/k3b/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv4627 Modified Files: .cvsignore k3b.spec sources Log Message: now with the real source Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/k3b/FC-5/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 6 Dec 2005 12:17:53 -0000 1.10 +++ .cvsignore 21 Mar 2006 16:04:45 -0000 1.11 @@ -1,2 +1,2 @@ -k3b-i18n-0.12.8.tar.bz2 -k3b-0.12.8.tar.bz2 +k3b-0.12.14.tar.bz2 +k3b-i18n-0.12.10.tar.bz2 Index: k3b.spec =================================================================== RCS file: /cvs/dist/rpms/k3b/FC-5/k3b.spec,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- k3b.spec 21 Mar 2006 13:02:02 -0000 1.27 +++ k3b.spec 21 Mar 2006 16:04:45 -0000 1.28 @@ -1,9 +1,9 @@ -%define tar_version 0.12.10 +%define tar_version 0.12.14 %define i18n_version 0.12.10 Name: k3b Version: 0.12.14 -Release: 0.FC5.1 +Release: 0.FC5.2 Epoch: 0 Summary: CD/DVD burning application for KDE @@ -171,7 +171,7 @@ %changelog -* Tue Mar 21 2006 Harald Hoyer 0:0.12.14-0.FC5.1 +* Tue Mar 21 2006 Harald Hoyer 0:0.12.14-0.FC5.2 - version 0.12.14 * Fri Feb 10 2006 Jesse Keating - 0:0.12.10-2.2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/k3b/FC-5/sources,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- sources 20 Dec 2005 15:54:06 -0000 1.11 +++ sources 21 Mar 2006 16:04:45 -0000 1.12 @@ -1,2 +1,2 @@ +51ef4fdf98365a285489dc1e11a07a3c k3b-0.12.14.tar.bz2 db3bc6d94da5b63f22bd04e981486974 k3b-i18n-0.12.10.tar.bz2 -f685230ef445b36ccba42fc80b922dfa k3b-0.12.10.tar.bz2 From fedora-cvs-commits at redhat.com Tue Mar 21 16:17:24 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 21 Mar 2006 11:17:24 -0500 Subject: rpms/policycoreutils/devel policycoreutils-rhat.patch, 1.176, 1.177 policycoreutils.spec, 1.250, 1.251 Message-ID: <200603211617.k2LGHO1i018520@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/policycoreutils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv18505 Modified Files: policycoreutils-rhat.patch policycoreutils.spec Log Message: * Tue Mar 21 2006 Dan Walsh 1.30.1-2 - make restorecond only ignore non directories with lnk > 1 policycoreutils-rhat.patch: Makefile | 2 audit2allow/audit2allow | 16 - restorecond/Makefile | 29 ++ restorecond/restorecond.8 | 31 ++ restorecond/restorecond.c | 451 +++++++++++++++++++++++++++++++++++++++++++ restorecond/restorecond.conf | 4 restorecond/restorecond.h | 31 ++ restorecond/restorecond.init | 61 +++++ restorecond/stringslist.c | 118 +++++++++++ restorecond/stringslist.h | 37 +++ restorecond/utmpwatcher.c | 105 ++++++++++ restorecond/utmpwatcher.h | 29 ++ scripts/fixfiles | 10 13 files changed, 913 insertions(+), 11 deletions(-) Index: policycoreutils-rhat.patch =================================================================== RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v retrieving revision 1.176 retrieving revision 1.177 diff -u -r1.176 -r1.177 --- policycoreutils-rhat.patch 21 Mar 2006 15:49:19 -0000 1.176 +++ policycoreutils-rhat.patch 21 Mar 2006 16:17:21 -0000 1.177 @@ -1,6 +1,6 @@ -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/audit2allow/audit2allow policycoreutils-1.30/audit2allow/audit2allow +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/audit2allow/audit2allow policycoreutils-1.30.1/audit2allow/audit2allow --- nsapolicycoreutils/audit2allow/audit2allow 2006-03-10 09:48:04.000000000 -0500 -+++ policycoreutils-1.30/audit2allow/audit2allow 2006-03-21 09:17:27.000000000 -0500 ++++ policycoreutils-1.30.1/audit2allow/audit2allow 2006-03-21 11:13:31.000000000 -0500 @@ -27,15 +27,14 @@ import commands, sys, os, pwd, string, getopt, re, selinux @@ -39,18 +39,18 @@ for s in Scon: for t in Tcon: for c in Class: -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/Makefile policycoreutils-1.30/Makefile +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/Makefile policycoreutils-1.30.1/Makefile --- nsapolicycoreutils/Makefile 2005-11-29 10:55:01.000000000 -0500 -+++ policycoreutils-1.30/Makefile 2006-03-20 22:51:07.000000000 -0500 ++++ policycoreutils-1.30.1/Makefile 2006-03-21 11:13:31.000000000 -0500 @@ -1,4 +1,4 @@ -SUBDIRS=setfiles semanage load_policy newrole run_init restorecon audit2allow audit2why scripts sestatus semodule_package semodule semodule_link semodule_expand setsebool po +SUBDIRS=setfiles semanage load_policy newrole run_init restorecon restorecond audit2allow audit2why scripts sestatus semodule_package semodule semodule_link semodule_expand setsebool po all install relabel clean: @for subdir in $(SUBDIRS); do \ -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/restorecond/Makefile policycoreutils-1.30/restorecond/Makefile +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/restorecond/Makefile policycoreutils-1.30.1/restorecond/Makefile --- nsapolicycoreutils/restorecond/Makefile 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.30/restorecond/Makefile 2006-03-20 22:51:07.000000000 -0500 ++++ policycoreutils-1.30.1/restorecond/Makefile 2006-03-21 11:13:31.000000000 -0500 @@ -0,0 +1,29 @@ +# Installation directories. +PREFIX ?= ${DESTDIR}/usr @@ -81,9 +81,9 @@ +clean: + -rm -f restorecond *.o *~ + -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/restorecond/restorecond.8 policycoreutils-1.30/restorecond/restorecond.8 +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/restorecond/restorecond.8 policycoreutils-1.30.1/restorecond/restorecond.8 --- nsapolicycoreutils/restorecond/restorecond.8 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.30/restorecond/restorecond.8 2006-03-20 22:51:07.000000000 -0500 ++++ policycoreutils-1.30.1/restorecond/restorecond.8 2006-03-21 11:13:31.000000000 -0500 @@ -0,0 +1,31 @@ +.TH "restorecond" "8" "2002031409" "" "" +.SH "NAME" @@ -116,10 +116,10 @@ + +.SH "SEE ALSO" +.BR restorecon (8), -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/restorecond/restorecond.c policycoreutils-1.30/restorecond/restorecond.c +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/restorecond/restorecond.c policycoreutils-1.30.1/restorecond/restorecond.c --- nsapolicycoreutils/restorecond/restorecond.c 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.30/restorecond/restorecond.c 2006-03-20 22:51:13.000000000 -0500 -@@ -0,0 +1,452 @@ ++++ policycoreutils-1.30.1/restorecond/restorecond.c 2006-03-21 11:13:31.000000000 -0500 +@@ -0,0 +1,451 @@ +/* + * restorecond + * @@ -275,7 +275,6 @@ + security_context_t scontext=NULL; + security_context_t prev_context=NULL; + struct stat st; -+ char path[PATH_MAX+1]; + int fd=-1; + if (debug_mode) + printf("restore %s\n", filename); @@ -293,7 +292,7 @@ + return; + } + -+ if (st.st_nlink > 1) { ++ if (! (st.st_mode & S_IFDIR) && st.st_nlink > 1) { + syslog(LOG_ERR,"Will not restore a file with more than one hard link (%s) %s\n", filename,strerror(errno)); + close(fd); + return; @@ -572,16 +571,17 @@ + + return 0; +} -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/restorecond/restorecond.conf policycoreutils-1.30/restorecond/restorecond.conf +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/restorecond/restorecond.conf policycoreutils-1.30.1/restorecond/restorecond.conf --- nsapolicycoreutils/restorecond/restorecond.conf 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.30/restorecond/restorecond.conf 2006-03-20 22:51:07.000000000 -0500 -@@ -0,0 +1,3 @@ ++++ policycoreutils-1.30.1/restorecond/restorecond.conf 2006-03-21 11:14:22.000000000 -0500 +@@ -0,0 +1,4 @@ +/etc/resolv.conf +/etc/mtab ++/var/run/utmp +~/public_html -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/restorecond/restorecond.h policycoreutils-1.30/restorecond/restorecond.h +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/restorecond/restorecond.h policycoreutils-1.30.1/restorecond/restorecond.h --- nsapolicycoreutils/restorecond/restorecond.h 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.30/restorecond/restorecond.h 2006-03-20 22:51:07.000000000 -0500 ++++ policycoreutils-1.30.1/restorecond/restorecond.h 2006-03-21 11:13:31.000000000 -0500 @@ -0,0 +1,31 @@ +/* restorecond.h -- + * Copyright 2006 Red Hat Inc., Durham, North Carolina. @@ -614,9 +614,9 @@ + +#endif + -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/restorecond/restorecond.init policycoreutils-1.30/restorecond/restorecond.init +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/restorecond/restorecond.init policycoreutils-1.30.1/restorecond/restorecond.init --- nsapolicycoreutils/restorecond/restorecond.init 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.30/restorecond/restorecond.init 2006-03-20 23:04:15.000000000 -0500 ++++ policycoreutils-1.30.1/restorecond/restorecond.init 2006-03-21 11:13:31.000000000 -0500 @@ -0,0 +1,61 @@ +#!/bin/sh +# @@ -679,9 +679,9 @@ +esac + +exit 0 -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/restorecond/stringslist.c policycoreutils-1.30/restorecond/stringslist.c +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/restorecond/stringslist.c policycoreutils-1.30.1/restorecond/stringslist.c --- nsapolicycoreutils/restorecond/stringslist.c 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.30/restorecond/stringslist.c 2006-03-20 22:51:07.000000000 -0500 ++++ policycoreutils-1.30.1/restorecond/stringslist.c 2006-03-21 11:13:31.000000000 -0500 @@ -0,0 +1,118 @@ +/* + * Copyright (C) 2006 Red Hat @@ -801,9 +801,9 @@ + strings_list_free(list1); +} +#endif -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/restorecond/stringslist.h policycoreutils-1.30/restorecond/stringslist.h +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/restorecond/stringslist.h policycoreutils-1.30.1/restorecond/stringslist.h --- nsapolicycoreutils/restorecond/stringslist.h 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.30/restorecond/stringslist.h 2006-03-20 22:51:07.000000000 -0500 ++++ policycoreutils-1.30.1/restorecond/stringslist.h 2006-03-21 11:13:31.000000000 -0500 @@ -0,0 +1,37 @@ +/* stringslist.h -- + * Copyright 2006 Red Hat Inc., Durham, North Carolina. @@ -842,9 +842,9 @@ +int strings_list_diff(struct stringsList *from, struct stringsList *to); + +#endif -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/restorecond/utmpwatcher.c policycoreutils-1.30/restorecond/utmpwatcher.c +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/restorecond/utmpwatcher.c policycoreutils-1.30.1/restorecond/utmpwatcher.c --- nsapolicycoreutils/restorecond/utmpwatcher.c 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.30/restorecond/utmpwatcher.c 2006-03-20 22:51:07.000000000 -0500 ++++ policycoreutils-1.30.1/restorecond/utmpwatcher.c 2006-03-21 11:13:31.000000000 -0500 @@ -0,0 +1,105 @@ +/* + * utmpwatcher.c @@ -951,9 +951,9 @@ +#endif + + -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/restorecond/utmpwatcher.h policycoreutils-1.30/restorecond/utmpwatcher.h +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/restorecond/utmpwatcher.h policycoreutils-1.30.1/restorecond/utmpwatcher.h --- nsapolicycoreutils/restorecond/utmpwatcher.h 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.30/restorecond/utmpwatcher.h 2006-03-20 22:51:07.000000000 -0500 ++++ policycoreutils-1.30.1/restorecond/utmpwatcher.h 2006-03-21 11:13:31.000000000 -0500 @@ -0,0 +1,29 @@ +/* utmpwatcher.h -- + * Copyright 2006 Red Hat Inc., Durham, North Carolina. @@ -984,9 +984,9 @@ +void utmpwatcher_add(int inotify_fd, const char *path); + +#endif -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/scripts/fixfiles policycoreutils-1.30/scripts/fixfiles +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/scripts/fixfiles policycoreutils-1.30.1/scripts/fixfiles --- nsapolicycoreutils/scripts/fixfiles 2006-01-04 13:07:46.000000000 -0500 -+++ policycoreutils-1.30/scripts/fixfiles 2006-03-20 22:51:07.000000000 -0500 ++++ policycoreutils-1.30.1/scripts/fixfiles 2006-03-21 11:13:31.000000000 -0500 @@ -124,7 +124,15 @@ exit $? fi Index: policycoreutils.spec =================================================================== RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils.spec,v retrieving revision 1.250 retrieving revision 1.251 diff -u -r1.250 -r1.251 --- policycoreutils.spec 21 Mar 2006 15:49:19 -0000 1.250 +++ policycoreutils.spec 21 Mar 2006 16:17:21 -0000 1.251 @@ -5,7 +5,7 @@ Summary: SELinux policy core utilities. Name: policycoreutils Version: 1.30.1 -Release: 1 +Release: 2 License: GPL Group: System Environment/Base Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz @@ -107,6 +107,9 @@ service restorecond condrestart %changelog +* Tue Mar 21 2006 Dan Walsh 1.30.1-2 +- make restorecond only ignore non directories with lnk > 1 + * Tue Mar 21 2006 Dan Walsh 1.30.1-1 - Make audit2allow translate dontaudit as well as allow rules - Update from upstream From fedora-cvs-commits at redhat.com Tue Mar 21 16:18:25 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 21 Mar 2006 11:18:25 -0500 Subject: rpms/kernel/FC-5 0003-Inotify-kernel-API.patch, NONE, 1.1.2.1 0004-filesystem-location-based-auditing.patch, NONE, 1.1.2.1 kernel-2.6.spec, 1.2032.2.4, 1.2032.2.5 0003-filesystem-location-based-auditing.patch, 1.1.2.1, NONE Message-ID: <200603211618.k2LGIP4k018633@cvs.devel.redhat.com> Author: sgrubb Update of /cvs/dist/rpms/kernel/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv18593 Modified Files: Tag: private-lspp-11-branch kernel-2.6.spec Added Files: Tag: private-lspp-11-branch 0003-Inotify-kernel-API.patch 0004-filesystem-location-based-auditing.patch Removed Files: Tag: private-lspp-11-branch 0003-filesystem-location-based-auditing.patch Log Message: Make some updates for fs auditing 0003-Inotify-kernel-API.patch: fs/inotify.c | 395 +++++++++++++++++++++++++++++------------------ include/linux/fsnotify.h | 29 +-- include/linux/inotify.h | 22 ++ 3 files changed, 281 insertions(+), 165 deletions(-) --- NEW FILE 0003-Inotify-kernel-API.patch --- Subject: [PATCH] Inotify kernel API From: Amy Griffis Date: 1137855413 -0500 This is the first of two patches, which when complete should be the last patches for the baseline filesystem audit functionality. This patch provides a kernel api for inotify. It was first posted as an RFC last year: https://www.redhat.com/archives/linux-audit/2005-August/msg00055.html I have made some minor changes to address feedback I received and to provide a little more information in the kernel's event callback. I found that adding or removing inotify watches from an event callback is unnecessary for audit's purposes, so I did not make that change. I also received some feedback regarding making a cleaner separation between the core inotify code and a kernel and userspace api. I haven't addressed this yet as it would make for a much larger patch against inotify, and I would like to discuss it with the inotify dev before making a lot of changes. I believe this patch represents the functionality audit requires in terms of an inotify kernel api. Please have a look and let me know what you think. [AV: rediffed] [folded akpm's fix for CONFIG_INOTIFY=n build] Signed-off-by: Al Viro --- fs/inotify.c | 395 +++++++++++++++++++++++++++++----------------- include/linux/fsnotify.h | 29 ++- include/linux/inotify.h | 22 ++- 3 files changed, 281 insertions(+), 165 deletions(-) 059170e790375f168bab670c2f9e0e04332430f4 diff --git a/fs/inotify.c b/fs/inotify.c index 3041503..ab57df6 100644 --- a/fs/inotify.c +++ b/fs/inotify.c @@ -85,14 +85,18 @@ struct inotify_device { wait_queue_head_t wq; /* wait queue for i/o */ struct idr idr; /* idr mapping wd -> watch */ struct semaphore sem; /* protects this bad boy */ - struct list_head events; /* list of queued events */ struct list_head watches; /* list of watches */ atomic_t count; /* reference count */ + u32 last_wd; /* the last wd allocated */ + /* userland consumer API */ + struct list_head events; /* list of queued events */ struct user_struct *user; /* user who opened this dev */ unsigned int queue_size; /* size of the queue (bytes) */ unsigned int event_count; /* number of pending events */ unsigned int max_events; /* maximum number of events */ - u32 last_wd; /* the last wd allocated */ + /* kernel consumer API */ + void (*callback)(struct inotify_event *, const char *, struct inode *, + void *); /* event callback */ }; /* @@ -124,6 +128,7 @@ struct inotify_watch { struct inode *inode; /* associated inode */ s32 wd; /* watch descriptor */ u32 mask; /* event mask for this watch */ + void *callback_arg; /* callback argument - kernel API */ }; #ifdef CONFIG_SYSCTL @@ -175,8 +180,10 @@ static inline void get_inotify_dev(struc static inline void put_inotify_dev(struct inotify_device *dev) { if (atomic_dec_and_test(&dev->count)) { - atomic_dec(&dev->user->inotify_devs); - free_uid(dev->user); + if (dev->user) { + atomic_dec(&dev->user->inotify_devs); + free_uid(dev->user); + } idr_destroy(&dev->idr); kfree(dev); } @@ -344,6 +351,24 @@ static void inotify_dev_event_dequeue(st } /* + * inotify_callback_event - notify kernel consumers of events + */ +static void inotify_callback_event(struct inotify_device *dev, + struct inotify_watch *watch, + u32 mask, u32 cookie, const char *name, + struct inode *inode) +{ + struct inotify_event event; + + event.wd = watch->wd; + event.mask = mask; + event.cookie = cookie; + event.len = 0; /* kernel consumers don't need length */ + + dev->callback(&event, name, inode, watch->callback_arg); +} + +/* * inotify_dev_get_wd - returns the next WD for use by the given dev * * Callers must hold dev->sem. This function can sleep. @@ -387,12 +412,13 @@ static int find_inode(const char __user * Both 'dev' and 'inode' (by way of nameidata) need to be pinned. */ static struct inotify_watch *create_watch(struct inotify_device *dev, - u32 mask, struct inode *inode) + u32 mask, struct inode *inode, + void *callback_arg) { struct inotify_watch *watch; int ret; - if (atomic_read(&dev->user->inotify_watches) >= + if (dev->user && atomic_read(&dev->user->inotify_watches) >= inotify_max_user_watches) return ERR_PTR(-ENOSPC); @@ -408,6 +434,7 @@ static struct inotify_watch *create_watc dev->last_wd = watch->wd; watch->mask = mask; + watch->callback_arg = callback_arg; atomic_set(&watch->count, 0); INIT_LIST_HEAD(&watch->d_list); INIT_LIST_HEAD(&watch->i_list); @@ -425,7 +452,8 @@ static struct inotify_watch *create_watc /* bump our own count, corresponding to our entry in dev->watches */ get_inotify_watch(watch); - atomic_inc(&dev->user->inotify_watches); + if (dev->user) + atomic_inc(&dev->user->inotify_watches); atomic_inc(&inotify_watches); return watch; @@ -458,7 +486,8 @@ static void remove_watch_no_event(struct list_del(&watch->i_list); list_del(&watch->d_list); - atomic_dec(&dev->user->inotify_watches); + if (dev->user) + atomic_dec(&dev->user->inotify_watches); atomic_dec(&inotify_watches); idr_remove(&dev->idr, watch->wd); put_inotify_watch(watch); @@ -477,7 +506,10 @@ static void remove_watch_no_event(struct */ static void remove_watch(struct inotify_watch *watch,struct inotify_device *dev) { - inotify_dev_queue_event(dev, watch, IN_IGNORED, 0, NULL); + if (dev->callback) + inotify_callback_event(dev, watch, IN_IGNORED, 0, NULL, NULL); + else + inotify_dev_queue_event(dev, watch, IN_IGNORED, 0, NULL); remove_watch_no_event(watch, dev); } @@ -490,7 +522,190 @@ static inline int inotify_inode_watched( return !list_empty(&inode->inotify_watches); } -/* Kernel API */ +/* Kernel consumer API */ + +/** + * inotify_init - allocates and initializes an inotify device + * @callback: kernel consumer's event callback + */ +struct inotify_device *inotify_init(void (*callback)(struct inotify_event *, + const char *, + struct inode *, void *)) +{ + struct inotify_device *dev; + + dev = kmalloc(sizeof(struct inotify_device), GFP_KERNEL); + if (unlikely(!dev)) + return NULL; + + idr_init(&dev->idr); + INIT_LIST_HEAD(&dev->events); + INIT_LIST_HEAD(&dev->watches); + init_waitqueue_head(&dev->wq); + sema_init(&dev->sem, 1); + dev->event_count = 0; + dev->queue_size = 0; + dev->max_events = inotify_max_queued_events; + dev->user = NULL; /* set in sys_inotify_init */ + dev->last_wd = 0; + dev->callback = callback; + atomic_set(&dev->count, 0); + get_inotify_dev(dev); + + return dev; +} +EXPORT_SYMBOL_GPL(inotify_init); + +/** + * inotify_free - clean up and free an inotify device + * @dev: inotify device to free + */ +int inotify_free(struct inotify_device *dev) +{ + /* + * Destroy all of the watches on this device. Unfortunately, not very + * pretty. We cannot do a simple iteration over the list, because we + * do not know the inode until we iterate to the watch. But we need to + * hold inode->inotify_sem before dev->sem. The following works. + */ + while (1) { + struct inotify_watch *watch; + struct list_head *watches; + struct inode *inode; + + down(&dev->sem); + watches = &dev->watches; + if (list_empty(watches)) { + up(&dev->sem); + break; + } + watch = list_entry(watches->next, struct inotify_watch, d_list); + get_inotify_watch(watch); + up(&dev->sem); + + inode = watch->inode; + down(&inode->inotify_sem); + down(&dev->sem); + remove_watch_no_event(watch, dev); + up(&dev->sem); + up(&inode->inotify_sem); + put_inotify_watch(watch); + } + + /* destroy all of the events on this device */ + down(&dev->sem); + while (!list_empty(&dev->events)) + inotify_dev_event_dequeue(dev); + up(&dev->sem); + + /* free this device: the put matching the get in inotify_init() */ + put_inotify_dev(dev); + + return 0; +} +EXPORT_SYMBOL_GPL(inotify_free); + +/** + * inotify_inotify_add_watch - add a watch to this inotify device + * @dev: inotify device + * @inode: inode to watch for events + * @mask: filesystem event mask + * @callback_arg - ptr to data that kernel consumer associates with this watch + * + * Caller must pin the inode in question, e.g. by calling path_lookup. + */ +s32 inotify_add_watch(struct inotify_device *dev, struct inode *inode, + u32 mask, void *callback_arg) +{ + int mask_add = 0; + struct inotify_watch *watch, *old; + int ret; + + down(&inode->inotify_sem); + down(&dev->sem); + + if (mask & IN_MASK_ADD) + mask_add = 1; + + /* don't let user-space set invalid bits: we don't want flags set */ + mask &= IN_ALL_EVENTS | IN_ONESHOT; + if (unlikely(!mask)) { + ret = -EINVAL; + goto out; + } + + /* + * Handle the case of re-adding a watch on an (inode,dev) pair that we + * are already watching. We just update the mask and callback_arg and + * return its wd. + */ + old = inode_find_dev(inode, dev); + if (unlikely(old)) { + if (mask_add) + old->mask |= mask; + else + old->mask = mask; + old->callback_arg = callback_arg; + ret = old->wd; + goto out; + } + + watch = create_watch(dev, mask, inode, callback_arg); + if (unlikely(IS_ERR(watch))) { + ret = PTR_ERR(watch); + goto out; + } + + /* Add the watch to the device's and the inode's list */ + list_add(&watch->d_list, &dev->watches); + list_add(&watch->i_list, &inode->inotify_watches); + ret = watch->wd; + +out: + up(&dev->sem); + up(&inode->inotify_sem); + return ret; +} +EXPORT_SYMBOL_GPL(inotify_add_watch); + +/** + * inotify_ignore - remove a given wd from this inotify device + * @dev: inotify device + * @wd: watch descriptor to remove + */ +int inotify_ignore(struct inotify_device *dev, s32 wd) +{ + struct inotify_watch *watch; + struct inode *inode; + + down(&dev->sem); + watch = idr_find(&dev->idr, wd); + if (unlikely(!watch)) { + up(&dev->sem); + return -EINVAL; + } + get_inotify_watch(watch); + inode = watch->inode; + up(&dev->sem); + + down(&inode->inotify_sem); + down(&dev->sem); + + /* make sure that we did not race */ + watch = idr_find(&dev->idr, wd); + if (likely(watch)) + remove_watch(watch, dev); + + up(&dev->sem); + up(&inode->inotify_sem); + put_inotify_watch(watch); + + return 0; + +} +EXPORT_SYMBOL_GPL(inotify_ignore); + +/* Kernel producer API */ /** * inotify_inode_queue_event - queue an event to all watches on this inode @@ -498,9 +713,10 @@ static inline int inotify_inode_watched( * @mask: event mask describing this event * @cookie: cookie for synchronization, or zero * @name: filename, if any + * @cinode: child inode, used for events on directories */ void inotify_inode_queue_event(struct inode *inode, u32 mask, u32 cookie, - const char *name) + const char *name, struct inode *cinode) { struct inotify_watch *watch, *next; @@ -514,7 +730,12 @@ void inotify_inode_queue_event(struct in struct inotify_device *dev = watch->dev; get_inotify_watch(watch); down(&dev->sem); - inotify_dev_queue_event(dev, watch, mask, cookie, name); + if (dev->callback) + inotify_callback_event(dev, watch, mask, + cookie, name, cinode); + else + inotify_dev_queue_event(dev, watch, mask, + cookie, name); if (watch_mask & IN_ONESHOT) remove_watch_no_event(watch, dev); up(&dev->sem); @@ -548,7 +769,8 @@ void inotify_dentry_parent_queue_event(s if (inotify_inode_watched(inode)) { dget(parent); spin_unlock(&dentry->d_lock); - inotify_inode_queue_event(inode, mask, cookie, name); + inotify_inode_queue_event(inode, mask, cookie, name, + dentry->d_inode); dput(parent); } else spin_unlock(&dentry->d_lock); @@ -631,7 +853,12 @@ void inotify_unmount_inodes(struct list_ list_for_each_entry_safe(watch, next_w, watches, i_list) { struct inotify_device *dev = watch->dev; down(&dev->sem); - inotify_dev_queue_event(dev, watch, IN_UNMOUNT,0,NULL); + if (dev->callback) + inotify_callback_event(dev, watch, IN_UNMOUNT, + 0, NULL, NULL); + else + inotify_dev_queue_event(dev, watch, IN_UNMOUNT, + 0, NULL); remove_watch(watch, dev); up(&dev->sem); } @@ -757,83 +984,7 @@ static ssize_t inotify_read(struct file static int inotify_release(struct inode *ignored, struct file *file) { - struct inotify_device *dev = file->private_data; - - /* - * Destroy all of the watches on this device. Unfortunately, not very - * pretty. We cannot do a simple iteration over the list, because we - * do not know the inode until we iterate to the watch. But we need to - * hold inode->inotify_sem before dev->sem. The following works. - */ - while (1) { - struct inotify_watch *watch; - struct list_head *watches; - struct inode *inode; - - down(&dev->sem); - watches = &dev->watches; - if (list_empty(watches)) { - up(&dev->sem); - break; - } - watch = list_entry(watches->next, struct inotify_watch, d_list); - get_inotify_watch(watch); - up(&dev->sem); - - inode = watch->inode; - down(&inode->inotify_sem); - down(&dev->sem); - remove_watch_no_event(watch, dev); - up(&dev->sem); - up(&inode->inotify_sem); - put_inotify_watch(watch); - } - - /* destroy all of the events on this device */ - down(&dev->sem); - while (!list_empty(&dev->events)) - inotify_dev_event_dequeue(dev); - up(&dev->sem); - - /* free this device: the put matching the get in inotify_init() */ - put_inotify_dev(dev); - - return 0; -} - -/* - * inotify_ignore - remove a given wd from this inotify instance. - * - * Can sleep. - */ -static int inotify_ignore(struct inotify_device *dev, s32 wd) -{ - struct inotify_watch *watch; - struct inode *inode; - - down(&dev->sem); - watch = idr_find(&dev->idr, wd); - if (unlikely(!watch)) { - up(&dev->sem); - return -EINVAL; - } - get_inotify_watch(watch); - inode = watch->inode; - up(&dev->sem); - - down(&inode->inotify_sem); - down(&dev->sem); - - /* make sure that we did not race */ - watch = idr_find(&dev->idr, wd); - if (likely(watch)) - remove_watch(watch, dev); - - up(&dev->sem); - up(&inode->inotify_sem); - put_inotify_watch(watch); - - return 0; + return inotify_free(file->private_data); } static long inotify_ioctl(struct file *file, unsigned int cmd, @@ -887,12 +1038,15 @@ asmlinkage long sys_inotify_init(void) goto out_free_uid; } - dev = kmalloc(sizeof(struct inotify_device), GFP_KERNEL); + dev = inotify_init(NULL); if (unlikely(!dev)) { ret = -ENOMEM; goto out_free_uid; } + dev->user = user; + atomic_inc(&user->inotify_devs); + filp->f_op = &inotify_fops; filp->f_vfsmnt = mntget(inotify_mnt); filp->f_dentry = dget(inotify_mnt->mnt_root); @@ -901,20 +1055,6 @@ asmlinkage long sys_inotify_init(void) filp->f_flags = O_RDONLY; filp->private_data = dev; - idr_init(&dev->idr); - INIT_LIST_HEAD(&dev->events); - INIT_LIST_HEAD(&dev->watches); - init_waitqueue_head(&dev->wq); - sema_init(&dev->sem, 1); - dev->event_count = 0; - dev->queue_size = 0; - dev->max_events = inotify_max_queued_events; - dev->user = user; - dev->last_wd = 0; - atomic_set(&dev->count, 0); - - get_inotify_dev(dev); - atomic_inc(&user->inotify_devs); fd_install(fd, filp); return fd; @@ -928,13 +1068,11 @@ out_put_fd: asmlinkage long sys_inotify_add_watch(int fd, const char __user *path, u32 mask) { - struct inotify_watch *watch, *old; struct inode *inode; struct inotify_device *dev; struct nameidata nd; struct file *filp; int ret, fput_needed; - int mask_add = 0; unsigned flags = 0; filp = fget_light(fd, &fput_needed); @@ -960,46 +1098,7 @@ asmlinkage long sys_inotify_add_watch(in inode = nd.dentry->d_inode; dev = filp->private_data; - down(&inode->inotify_sem); - down(&dev->sem); - - if (mask & IN_MASK_ADD) - mask_add = 1; - - /* don't let user-space set invalid bits: we don't want flags set */ - mask &= IN_ALL_EVENTS | IN_ONESHOT; - if (unlikely(!mask)) { - ret = -EINVAL; - goto out; - } - - /* - * Handle the case of re-adding a watch on an (inode,dev) pair that we - * are already watching. We just update the mask and return its wd. - */ - old = inode_find_dev(inode, dev); - if (unlikely(old)) { - if (mask_add) - old->mask |= mask; - else - old->mask = mask; - ret = old->wd; - goto out; - } - - watch = create_watch(dev, mask, inode); - if (unlikely(IS_ERR(watch))) { - ret = PTR_ERR(watch); - goto out; - } - - /* Add the watch to the device's and the inode's list */ - list_add(&watch->d_list, &dev->watches); - list_add(&watch->i_list, &inode->inotify_watches); - ret = watch->wd; -out: - up(&dev->sem); - up(&inode->inotify_sem); + ret = inotify_add_watch(dev, inode, mask, NULL); path_release(&nd); fput_and_out: fput_light(filp, fput_needed); diff --git a/include/linux/fsnotify.h b/include/linux/fsnotify.h index 94919c3..606b875 100644 --- a/include/linux/fsnotify.h +++ b/include/linux/fsnotify.h @@ -35,16 +35,18 @@ static inline void fsnotify_move(struct if (isdir) isdir = IN_ISDIR; - inotify_inode_queue_event(old_dir, IN_MOVED_FROM|isdir,cookie,old_name); - inotify_inode_queue_event(new_dir, IN_MOVED_TO|isdir, cookie, new_name); + inotify_inode_queue_event(old_dir, IN_MOVED_FROM|isdir, cookie, + old_name, NULL); + inotify_inode_queue_event(new_dir, IN_MOVED_TO|isdir, cookie, + new_name, source); if (target) { - inotify_inode_queue_event(target, IN_DELETE_SELF, 0, NULL); + inotify_inode_queue_event(target, IN_DELETE_SELF, 0, NULL,NULL); inotify_inode_is_dead(target); } if (source) { - inotify_inode_queue_event(source, IN_MOVE_SELF, 0, NULL); + inotify_inode_queue_event(source, IN_MOVE_SELF, 0, NULL, NULL); } audit_inode_child(old_name, source, old_dir->i_ino); audit_inode_child(new_name, target, new_dir->i_ino); @@ -66,7 +68,7 @@ static inline void fsnotify_nameremove(s */ static inline void fsnotify_inoderemove(struct inode *inode) { - inotify_inode_queue_event(inode, IN_DELETE_SELF, 0, NULL); + inotify_inode_queue_event(inode, IN_DELETE_SELF, 0, NULL, NULL); inotify_inode_is_dead(inode); } @@ -76,7 +78,8 @@ static inline void fsnotify_inoderemove( static inline void fsnotify_create(struct inode *inode, struct dentry *dentry) { inode_dir_notify(inode, DN_CREATE); - inotify_inode_queue_event(inode, IN_CREATE, 0, dentry->d_name.name); + inotify_inode_queue_event(inode, IN_CREATE, 0, dentry->d_name.name, + dentry->d_inode); audit_inode_child(dentry->d_name.name, dentry->d_inode, inode->i_ino); } @@ -87,7 +90,7 @@ static inline void fsnotify_mkdir(struct { inode_dir_notify(inode, DN_CREATE); inotify_inode_queue_event(inode, IN_CREATE | IN_ISDIR, 0, - dentry->d_name.name); + dentry->d_name.name, dentry->d_inode); audit_inode_child(dentry->d_name.name, dentry->d_inode, inode->i_ino); } @@ -104,7 +107,7 @@ static inline void fsnotify_access(struc dnotify_parent(dentry, DN_ACCESS); inotify_dentry_parent_queue_event(dentry, mask, 0, dentry->d_name.name); - inotify_inode_queue_event(inode, mask, 0, NULL); + inotify_inode_queue_event(inode, mask, 0, NULL, NULL); } /* @@ -120,7 +123,7 @@ static inline void fsnotify_modify(struc dnotify_parent(dentry, DN_MODIFY); inotify_dentry_parent_queue_event(dentry, mask, 0, dentry->d_name.name); - inotify_inode_queue_event(inode, mask, 0, NULL); + inotify_inode_queue_event(inode, mask, 0, NULL, NULL); } /* @@ -135,7 +138,7 @@ static inline void fsnotify_open(struct mask |= IN_ISDIR; inotify_dentry_parent_queue_event(dentry, mask, 0, dentry->d_name.name); - inotify_inode_queue_event(inode, mask, 0, NULL); + inotify_inode_queue_event(inode, mask, 0, NULL, NULL); } /* @@ -153,7 +156,7 @@ static inline void fsnotify_close(struct mask |= IN_ISDIR; inotify_dentry_parent_queue_event(dentry, mask, 0, name); - inotify_inode_queue_event(inode, mask, 0, NULL); + inotify_inode_queue_event(inode, mask, 0, NULL, NULL); } /* @@ -168,7 +171,7 @@ static inline void fsnotify_xattr(struct mask |= IN_ISDIR; inotify_dentry_parent_queue_event(dentry, mask, 0, dentry->d_name.name); - inotify_inode_queue_event(inode, mask, 0, NULL); + inotify_inode_queue_event(inode, mask, 0, NULL, NULL); } /* @@ -215,7 +218,7 @@ static inline void fsnotify_change(struc if (in_mask) { if (S_ISDIR(inode->i_mode)) in_mask |= IN_ISDIR; - inotify_inode_queue_event(inode, in_mask, 0, NULL); + inotify_inode_queue_event(inode, in_mask, 0, NULL, NULL); inotify_dentry_parent_queue_event(dentry, in_mask, 0, dentry->d_name.name); } diff --git a/include/linux/inotify.h b/include/linux/inotify.h index 267c88b..f32c70e 100644 --- a/include/linux/inotify.h +++ b/include/linux/inotify.h @@ -14,6 +14,9 @@ * * When you are watching a directory, you will receive the filename for events * such as IN_CREATE, IN_DELETE, IN_OPEN, IN_CLOSE, ..., relative to the wd. + * + * When using inotify from the kernel, len will always be zero. Instead you + * should check the path for non-NULL in your callback. */ struct inotify_event { __s32 wd; /* watch descriptor */ @@ -71,8 +74,19 @@ struct inotify_event { #ifdef CONFIG_INOTIFY +/* Kernel consumer API */ + +extern struct inotify_device *inotify_init(void (*)(struct inotify_event *, + const char *, + struct inode *, void *)); +extern int inotify_free(struct inotify_device *); +extern __s32 inotify_add_watch(struct inotify_device *, struct inode *, __u32, + void *); +extern int inotify_ignore(struct inotify_device *, __s32); + +/* Kernel producer API */ extern void inotify_inode_queue_event(struct inode *, __u32, __u32, - const char *); + const char *, struct inode *); extern void inotify_dentry_parent_queue_event(struct dentry *, __u32, __u32, const char *); extern void inotify_unmount_inodes(struct list_head *); @@ -81,9 +95,9 @@ extern u32 inotify_get_cookie(void); #else -static inline void inotify_inode_queue_event(struct inode *inode, - __u32 mask, __u32 cookie, - const char *filename) +/* Kernel producer API stubs */ +static inline void inotify_inode_queue_event(struct inode *inode, u32 mask, + u32 cookie, const char *name, struct inode *cinode) { } -- 0.99.9.GIT 0004-filesystem-location-based-auditing.patch: include/linux/audit.h | 1 init/Kconfig | 2 kernel/audit.c | 19 - kernel/audit.h | 32 ++ kernel/auditfilter.c | 671 +++++++++++++++++++++++++++++++++++++++++++++++--- kernel/auditsc.c | 65 ++-- 6 files changed, 713 insertions(+), 77 deletions(-) --- NEW FILE 0004-filesystem-location-based-auditing.patch --- Subject: [PATCH] filesystem location based auditing From: Amy Griffis Date: 1142295485 -0500 Here is another iteration based off of audit-current.git plus the following pre-requisites: selinux support for context based audit filtering: https://www.redhat.com/archives/linux-audit/2006-February/msg00160.html context based audit filtering: https://www.redhat.com/archives/linux-audit/2006-March/msg00107.html inotify kernel api: https://www.redhat.com/archives/linux-audit/2006-January/msg00084.html This version fixes the following: - remove extra parent put in audit_inotify_register() - add missing unlock in audit_add_rule() error path - replace per-filterlist spinlocks with use of audit_netlink_mutex (see below) - remove now un-needed GFP_ATOMIC allocations - remove now unused AUDIT_ENTRY_DEL flag - all code paths either avoid stale data by taking the mutex, or don't care - take mutex to update parent data in audit_inotify_register() - kernel enforces 1 watch per rule to avoid potential memleak - add comments describing locking and refcounts - miscellaneous code cleanup The audit_netlink_mutex was previously taken/released in audit_receive() with the following comment: /* The netlink socket is only to be read by 1 CPU, which lets us assume * that list additions and deletions never happen simultaneously in * auditsc.c */ audit_receive() is three calls up the stack from where we need to release the mutex for some operations in audit_add_rule() and audit_del_rule(). However, from what I could see, it didn't seem to be protecting anything specific to the netlink socket itself, but rather the operations on filterlists. For that reason I renamed it to audit_filter_mutex and modified the code to use it explicitly around filterlist manipulations. Please verify my analysis on this matter. If incorrect we will need two mutexes: audit_netlink_mutex and audit_filter_mutex. Thanks, Amy Signed-off-by: Al Viro --- include/linux/audit.h | 1 init/Kconfig | 2 kernel/audit.c | 19 + kernel/audit.h | 32 ++ kernel/auditfilter.c | 671 ++++++++++++++++++++++++++++++++++++++++++++++--- kernel/auditsc.c | 65 +++-- 6 files changed, 713 insertions(+), 77 deletions(-) 6ba23ad7c06151e53ec55c32e9f842c19ef08f5a diff --git a/include/linux/audit.h b/include/linux/audit.h index 41b0813..8350a55 100644 --- a/include/linux/audit.h +++ b/include/linux/audit.h @@ -158,6 +158,7 @@ #define AUDIT_INODE 102 #define AUDIT_EXIT 103 #define AUDIT_SUCCESS 104 /* exit >= 0; value ignored */ +#define AUDIT_WATCH 105 #define AUDIT_ARG0 200 #define AUDIT_ARG1 (AUDIT_ARG0+1) diff --git a/init/Kconfig b/init/Kconfig index 38416a1..7fc7b20 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -177,7 +177,7 @@ config AUDIT config AUDITSYSCALL bool "Enable system-call auditing support" - depends on AUDIT && (X86 || PPC || PPC64 || S390 || IA64 || UML || SPARC64) + depends on AUDIT && INOTIFY && (X86 || PPC || PPC64 || S390 || IA64 || UML || SPARC64) default y if SECURITY_SELINUX help Enable low-overhead system-call auditing infrastructure that diff --git a/kernel/audit.c b/kernel/audit.c index 65e1d03..6eff223 100644 --- a/kernel/audit.c +++ b/kernel/audit.c @@ -56,6 +56,7 @@ #include #include #include +#include #include "audit.h" @@ -102,6 +103,9 @@ static atomic_t audit_lost = ATOMIC_I /* The netlink socket. */ static struct sock *audit_sock; +/* Inotify device. */ +struct inotify_device *audit_idev; + /* The audit_freelist is a list of pre-allocated audit buffers (if more * than AUDIT_MAXFREE are in use, the audit buffer is freed instead of * being placed on the freelist). */ @@ -114,11 +118,6 @@ static struct task_struct *kauditd_task; static DECLARE_WAIT_QUEUE_HEAD(kauditd_wait); static DECLARE_WAIT_QUEUE_HEAD(audit_backlog_wait); -/* The netlink socket is only to be read by 1 CPU, which lets us assume - * that list additions and deletions never happen simultaneously in - * auditsc.c */ -DEFINE_MUTEX(audit_netlink_mutex); - /* AUDIT_BUFSIZ is the size of the temporary buffer used for formatting * audit records. Since printk uses a 1024 byte buffer, this buffer * should be at least that large. */ @@ -541,14 +540,11 @@ static void audit_receive(struct sock *s struct sk_buff *skb; unsigned int qlen; - mutex_lock(&audit_netlink_mutex); - for (qlen = skb_queue_len(&sk->sk_receive_queue); qlen; qlen--) { skb = skb_dequeue(&sk->sk_receive_queue); audit_receive_skb(skb); kfree_skb(skb); } - mutex_unlock(&audit_netlink_mutex); } @@ -573,6 +569,13 @@ static int __init audit_init(void) selinux_audit_set_callback(&selinux_audit_rule_update); audit_log(NULL, GFP_KERNEL, AUDIT_KERNEL, "initialized"); + +#ifdef CONFIG_AUDITSYSCALL + audit_idev = inotify_init(audit_handle_ievent); + if (IS_ERR(audit_idev)) + audit_panic("cannot initialize inotify device"); +#endif + return 0; } __initcall(audit_init); diff --git a/kernel/audit.h b/kernel/audit.h index 6f73392..423e826 100644 --- a/kernel/audit.h +++ b/kernel/audit.h @@ -19,10 +19,11 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include #include #include +struct inotify_event; + /* 0 = no checking 1 = put_count checking 2 = verbose put_count checking @@ -53,6 +54,27 @@ enum audit_state { }; /* Rule lists */ +struct audit_parent { + atomic_t count; /* reference count */ + unsigned int flags; /* flag in-process removals */ + u32 wd; /* inotify watch descriptor */ + dev_t dev; /* associated superblock device */ + unsigned long ino; /* associated inode number */ + struct list_head mlist; /* entry in master_parents */ + struct list_head ilist; /* entry in inotify registration list*/ + struct list_head watches; /* associated watches */ +}; + +struct audit_watch { + atomic_t count; /* reference count */ + char *path; /* watch insertion path */ + dev_t dev; /* associated superblock device */ + unsigned long ino; /* associated inode number */ + struct audit_parent *parent; /* associated parent */ + struct list_head wlist; /* entry in audit_parent.watches list*/ + struct list_head rules; /* associated rules */ +}; + struct audit_field { u32 type; u32 val; @@ -70,6 +92,8 @@ struct audit_krule { u32 buflen; /* for data alloc on list rules */ u32 field_count; struct audit_field *fields; + struct audit_watch *watch; /* associated watch */ + struct list_head rlist; /* entry in audit_watch.rules list */ }; struct audit_entry { @@ -81,12 +105,14 @@ struct audit_entry { extern int audit_pid; extern int audit_comparator(const u32 left, const u32 op, const u32 right); - +extern int audit_compare_dname_path(const char *dname, const char *path); extern void audit_send_reply(int pid, int seq, int type, int done, int multi, void *payload, int size); extern void audit_log_lost(const char *message); extern void audit_panic(const char *message); -extern struct mutex audit_netlink_mutex; extern int selinux_audit_rule_update(void); +extern void audit_handle_ievent(struct inotify_event *event, + const char *dname, struct inode * inode, + void *ptr); diff --git a/kernel/auditfilter.c b/kernel/auditfilter.c index 4d2023a..3966a49 100644 --- a/kernel/auditfilter.c +++ b/kernel/auditfilter.c @@ -22,13 +22,45 @@ #include #include #include +#include +#include +#include #include +#include #include #include "audit.h" -/* There are three lists of rules -- one to search at task creation - * time, one to search at syscall entry time, and another to search at - * syscall exit time. */ +/* + * Locking model: + * + * audit_filter_mutex: + * Synchronizes writes and blocking reads of audit's filterlist + * data. Rcu is used to traverse the filterlist and access + * contents of structs audit_entry, audit_watch and opaque + * selinux rules during filtering. If modified, these structures + * must be copied and replace their counterparts in the filterlist. + * An audit_parent struct is not accessed during filtering, so may + * be written directly provided audit_filter_mutex is held. + * + * master_parents_lock: (spinlock) + * Protects master_parents list. + */ + +/* + * Reference counting: + * + * audit_parent: lifetime is from audit_init_parent() to audit_remove_parent(). + * Each audit_watch holds a reference to its associated parent. + * + * audit_watch: if added to lists, lifetime is from audit_init_watch() to one + * of: audit_remove_watch() [user removes], audit_update_watch() [kernel + * replaces], or audit_remove_parent_watches() [kernel removes]. + * Additionally, an audit_watch may exist temporarily to assist in + * searching existing filter data. Each audit_krule holds a reference to + * its associated watch. + */ + +/* Audit filter lists, defined in */ struct list_head audit_filter_list[AUDIT_NR_FILTERS] = { LIST_HEAD_INIT(audit_filter_list[0]), LIST_HEAD_INIT(audit_filter_list[1]), @@ -41,9 +73,55 @@ struct list_head audit_filter_list[AUDIT #endif }; +DEFINE_MUTEX(audit_filter_mutex); + +static LIST_HEAD(master_parents); +static DEFINE_SPINLOCK(master_parents_lock); + +/* Inotify device. */ +extern struct inotify_device *audit_idev; + +/* Inotify events we care about. */ +#define AUDIT_IN_WATCH IN_MOVE|IN_CREATE|IN_DELETE|IN_DELETE_SELF|IN_MOVE_SELF +#define AUDIT_IN_SELF IN_DELETE_SELF|IN_MOVE_SELF|IN_UNMOUNT + +static inline void audit_get_parent(struct audit_parent *parent) +{ + atomic_inc(&parent->count); +} + +static inline void audit_put_parent(struct audit_parent *parent) +{ + if (atomic_dec_and_test(&parent->count)) { + WARN_ON(!list_empty(&parent->watches)); + kfree(parent); + } +} + +static inline void audit_get_watch(struct audit_watch *watch) +{ + atomic_inc(&watch->count); +} + +static inline void audit_put_watch(struct audit_watch *watch) +{ + if (atomic_dec_and_test(&watch->count)) { + WARN_ON(!list_empty(&watch->rules)); + /* watches that were never added don't have a parent */ + if (watch->parent) + audit_put_parent(watch->parent); + kfree(watch->path); + kfree(watch); + } +} + static inline void audit_free_rule(struct audit_entry *e) { int i; + + /* some rules don't have associated watches */ + if (e->rule.watch) + audit_put_watch(e->rule.watch); if (e->rule.fields) for (i = 0; i < e->rule.field_count; i++) { struct audit_field *f = &e->rule.fields[i]; @@ -60,6 +138,43 @@ static inline void audit_free_rule_rcu(s audit_free_rule(e); } +/* Initialize a parent watch entry. */ +static inline struct audit_parent *audit_init_parent(void) +{ + struct audit_parent *parent; + + parent = kzalloc(sizeof(*parent), GFP_KERNEL); + if (unlikely(!parent)) + return ERR_PTR(-ENOMEM); + + INIT_LIST_HEAD(&parent->watches); + atomic_set(&parent->count, 1); + + spin_lock(&master_parents_lock); + list_add(&parent->mlist, &master_parents); + spin_unlock(&master_parents_lock); + + return parent; +} + +/* Initialize a watch entry. */ +static inline struct audit_watch *audit_init_watch(char *path) +{ + struct audit_watch *watch; + + watch = kzalloc(sizeof(*watch), GFP_KERNEL); + if (unlikely(!watch)) + return ERR_PTR(-ENOMEM); + + INIT_LIST_HEAD(&watch->rules); + atomic_set(&watch->count, 1); + watch->path = path; + watch->dev = (dev_t)-1; + watch->ino = (unsigned long)-1; + + return watch; +} + /* Initialize an audit filterlist entry. */ static inline struct audit_entry *audit_init_entry(u32 field_count) { @@ -107,6 +222,28 @@ static char *audit_unpack_string(void ** return str; } +/* Translate a watch string to kernel respresentation. */ +static int audit_to_watch(struct audit_krule *krule, char *path, int len, + u32 op) +{ + struct audit_watch *watch; + + if (path[0] != '/' || path[len-1] == '/' || + krule->listnr != AUDIT_FILTER_EXIT || + op & ~AUDIT_EQUAL || + krule->watch) /* allow only 1 watch per rule */ + return -EINVAL; + + watch = audit_init_watch(path); + if (unlikely(IS_ERR(watch))) + return PTR_ERR(watch); + + audit_get_watch(watch); + krule->watch = watch; + + return 0; +} + /* Common user-space to kernel rule translation. */ static inline struct audit_entry *audit_to_entry_common(struct audit_rule *rule) { @@ -177,7 +314,8 @@ static struct audit_entry *audit_rule_to f->type == AUDIT_SE_ROLE || f->type == AUDIT_SE_TYPE || f->type == AUDIT_SE_SEN || - f->type == AUDIT_SE_CLR) { + f->type == AUDIT_SE_CLR || + f->type == AUDIT_WATCH) { err = -EINVAL; goto exit_free; } @@ -260,6 +398,18 @@ static struct audit_entry *audit_data_to } else f->se_str = str; break; + case AUDIT_WATCH: + str = audit_unpack_string(&bufp, &remain, f->val); + if (IS_ERR(str)) + goto exit_free; + entry->rule.buflen += f->val; + + err = audit_to_watch(&entry->rule, str, f->val, f->op); + if (err) { + kfree(str); + goto exit_free; + } + break; } } @@ -343,6 +493,10 @@ static struct audit_rule_data *audit_kru data->buflen += data->values[i] = audit_pack_string(&bufp, f->se_str); break; + case AUDIT_WATCH: + data->buflen += data->values[i] = + audit_pack_string(&bufp, krule->watch->path); + break; default: data->values[i] = f->val; } @@ -378,6 +532,10 @@ static int audit_compare_rule(struct aud if (strcmp(a->fields[i].se_str, b->fields[i].se_str)) return 1; break; + case AUDIT_WATCH: + if (strcmp(a->watch->path, b->watch->path)) + return 1; + break; default: if (a->fields[i].val != b->fields[i].val) return 1; @@ -391,6 +549,31 @@ static int audit_compare_rule(struct aud return 0; } +/* Duplicate the given audit watch. The new watch's rules list is initialized + * to an empty list and wlist is undefined. */ +static inline struct audit_watch *audit_dupe_watch(struct audit_watch *old) +{ + char *path; + struct audit_watch *new; + + path = kstrdup(old->path, GFP_KERNEL); + if (unlikely(!path)) + return ERR_PTR(-ENOMEM); + + new = audit_init_watch(path); + if (unlikely(!new)) { + kfree(path); + return ERR_PTR(-ENOMEM); + } + + new->dev = old->dev; + new->ino = old->ino; + audit_get_parent(old->parent); + new->parent = old->parent; + + return new; +} + /* Duplicate selinux field information. The se_rule is opaque, so must be * re-initialized. */ static inline int audit_dupe_selinux_field(struct audit_field *df, @@ -422,8 +605,11 @@ static inline int audit_dupe_selinux_fie /* Duplicate an audit rule. This will be a deep copy with the exception * of the watch - that pointer is carried over. The selinux specific fields * will be updated in the copy. The point is to be able to replace the old - * rule with the new rule in the filterlist, then free the old rule. */ -static struct audit_entry *audit_dupe_rule(struct audit_krule *old) + * rule with the new rule in the filterlist, then free the old rule. + * The rlist element is undefined; list manipulations are handled apart from + * the initial copy. */ +static struct audit_entry *audit_dupe_rule(struct audit_krule *old, + struct audit_watch *watch) { u32 fcount = old->field_count; struct audit_entry *entry; @@ -442,6 +628,7 @@ static struct audit_entry *audit_dupe_ru for (i = 0; i < AUDIT_BITMASK_SIZE; i++) new->mask[i] = old->mask[i]; new->buflen = old->buflen; + new->watch = NULL; new->field_count = old->field_count; memcpy(new->fields, old->fields, sizeof(struct audit_field) * fcount); @@ -463,48 +650,393 @@ static struct audit_entry *audit_dupe_ru } } + if (watch) { + audit_get_watch(watch); + new->watch = watch; + } + return entry; } -/* Add rule to given filterlist if not a duplicate. Protected by - * audit_netlink_mutex. */ -static inline int audit_add_rule(struct audit_entry *entry, - struct list_head *list) +/* Update inode numbers in audit rules based on filesystem event. */ +static inline void audit_update_watch(struct audit_parent *parent, + const char *dname, dev_t dev, + unsigned long ino) +{ + struct audit_watch *owatch, *nwatch, *nextw; + struct audit_krule *r, *nextr; + struct audit_entry *oentry, *nentry; + struct audit_buffer *ab; + + mutex_lock(&audit_filter_mutex); + list_for_each_entry_safe(owatch, nextw, &parent->watches, wlist) { + if (audit_compare_dname_path(dname, owatch->path)) + continue; + + nwatch = audit_dupe_watch(owatch); + if (unlikely(IS_ERR(nwatch))) { + mutex_unlock(&audit_filter_mutex); + audit_panic("error updating watch, skipping"); + return; + } + nwatch->dev = dev; + nwatch->ino = ino; + + list_for_each_entry_safe(r, nextr, &owatch->rules, rlist) { + oentry = container_of(r, struct audit_entry, rule); + + nentry = audit_dupe_rule(&oentry->rule, nwatch); + if (unlikely(IS_ERR(nentry))) { + audit_panic("error updating watch, removing"); + list_del(&oentry->rule.rlist); + list_del_rcu(&oentry->list); + } else { + list_add(&nentry->rule.rlist, &nwatch->rules); + list_del(&oentry->rule.rlist); + list_replace_rcu(&oentry->list, &nentry->list); + } + call_rcu(&oentry->rcu, audit_free_rule_rcu); + } + + ab = audit_log_start(NULL, GFP_KERNEL, AUDIT_CONFIG_CHANGE); + audit_log_format(ab, "audit updated rules specifying watch="); + audit_log_untrustedstring(ab, owatch->path); + audit_log_format(ab, " with dev=%u ino=%lu\n", dev, ino); + audit_log_end(ab); + + list_del(&owatch->wlist); + audit_put_watch(owatch); /* matches initial get */ + goto add_watch_to_parent; /* event applies to a single watch */ + } + mutex_unlock(&audit_filter_mutex); + return; + +add_watch_to_parent: + list_add(&nwatch->wlist, &parent->watches); + mutex_unlock(&audit_filter_mutex); + return; +} + +/* Remove all watches & rules associated with a parent that is going away. */ +static inline void audit_remove_parent_watches(struct audit_parent *parent) { + struct audit_watch *w, *nextw; + struct audit_krule *r, *nextr; struct audit_entry *e; - /* Do not use the _rcu iterator here, since this is the only - * addition routine. */ + mutex_lock(&audit_filter_mutex); + list_for_each_entry_safe(w, nextw, &parent->watches, wlist) { + list_for_each_entry_safe(r, nextr, &w->rules, rlist) { + e = container_of(r, struct audit_entry, rule); + list_del(&r->rlist); + list_del_rcu(&e->list); + call_rcu(&e->rcu, audit_free_rule_rcu); + + audit_log(NULL, GFP_KERNEL, AUDIT_CONFIG_CHANGE, + "audit implicitly removed rule from list=%d\n", + AUDIT_FILTER_EXIT); + } + list_del(&w->wlist); + audit_put_watch(w); /* matches initial get */ + } + mutex_unlock(&audit_filter_mutex); +} + +/* Actually remove the parent; inotify has acknowleged the removal. */ +static inline void audit_remove_parent(struct audit_parent *parent) +{ + WARN_ON(!list_empty(&parent->watches)); + spin_lock(&master_parents_lock); + list_del(&parent->mlist); + audit_put_parent(parent); + spin_unlock(&master_parents_lock); +} + +/* Register inotify watches for parents on in_list. */ +static int audit_inotify_register(struct nameidata *nd, + struct list_head *in_list) +{ + struct audit_parent *p; + s32 wd; + int ret = 0; + + list_for_each_entry(p, in_list, ilist) { + /* Grab a ref while calling inotify_add_watch(), so parent + * can't be removed until we've updated its data. */ + audit_get_parent(p); + + if (!audit_idev) + wd = -EOPNOTSUPP; + else + wd = inotify_add_watch(audit_idev, nd->dentry->d_inode, + AUDIT_IN_WATCH, p); + if (wd < 0) { + audit_remove_parent_watches(p); + audit_remove_parent(p); + /* save the first error for return value */ + if (!ret) + ret = wd; + } else { + struct inode *inode = nd->dentry->d_inode; + + mutex_lock(&audit_filter_mutex); + p->wd = wd; + p->dev = inode->i_sb->s_dev; + p->ino = inode->i_ino; + mutex_unlock(&audit_filter_mutex); + } + + audit_put_parent(p); + } + + return ret; +} + +/* Unregister inotify watches for parents on in_list. + * Generates an IN_IGNORED event. */ +static void audit_inotify_unregister(struct list_head *in_list) +{ + struct audit_parent *p; + + list_for_each_entry(p, in_list, ilist) { + if (audit_idev) + inotify_ignore(audit_idev, p->wd); + /* matches get in audit_remove_watch() */ + audit_put_parent(p); + } +} + +/* Get path information necessary for adding watches. */ +static int audit_get_nd(char *path, struct nameidata **ndp, + struct nameidata **ndw) +{ + struct nameidata *ndparent, *ndwatch; + int err; + + ndparent = kmalloc(sizeof(*ndparent), GFP_KERNEL); + if (unlikely(!ndparent)) + return -ENOMEM; + + ndwatch = kmalloc(sizeof(*ndwatch), GFP_KERNEL); + if (unlikely(!ndwatch)) { + kfree(ndparent); + return -ENOMEM; + } + + err = path_lookup(path, LOOKUP_PARENT, ndparent); + if (err) { + kfree(ndparent); + kfree(ndwatch); + return err; + } + + err = path_lookup(path, 0, ndwatch); + if (err) { + kfree(ndwatch); + ndwatch = NULL; + } + + *ndp = ndparent; + *ndw = ndwatch; + + return 0; +} + +/* Release resources used for watch path information. */ +static inline void audit_put_nd(struct nameidata *ndp, struct nameidata *ndw) +{ + if (ndp) { + path_release(ndp); + kfree(ndp); + } + if (ndw) { + path_release(ndw); + kfree(ndw); + } +} + +/* Find an existing parent entry for this watch, or create a new one. + * Caller must hold audit_filter_mutex. */ +static inline struct audit_parent *audit_find_parent(struct nameidata *nd, + struct list_head *in_list) +{ + struct audit_parent *p, *parent, *next; + struct inode *inode = nd->dentry->d_inode; + + list_for_each_entry_safe(p, next, &master_parents, mlist) { + if (p->ino != inode->i_ino || + p->dev != inode->i_sb->s_dev) + continue; + + parent = p; + goto out; + } + + parent = audit_init_parent(); + if (IS_ERR(parent)) + goto out; + /* add new parent to inotify registration list */ + list_add(&parent->ilist, in_list); + +out: + return parent; +} + +/* Find a matching watch entry, or add this one. + * Caller must hold audit_filter_mutex. */ +static inline int audit_add_watch(struct audit_krule *krule, + struct nameidata *ndp, struct nameidata *ndw, + struct list_head *list) +{ + struct audit_parent *parent; + struct audit_watch *w, *watch = krule->watch; + + parent = audit_find_parent(ndp, list); + if (IS_ERR(parent)) + return PTR_ERR(parent); + + list_for_each_entry(w, &parent->watches, wlist) { + if (strcmp(watch->path, w->path)) + continue; + + audit_put_watch(watch); /* tmp watch, krule's ref */ + audit_put_watch(watch); /* tmp watch, matches initial get */ + + audit_get_watch(w); + krule->watch = watch = w; + goto add_rule; + } + + audit_get_parent(parent); + watch->parent = parent; + list_add(&watch->wlist, &parent->watches); + +add_rule: + list_add(&krule->rlist, &watch->rules); + + if (ndw) { + watch->dev = ndw->dentry->d_inode->i_sb->s_dev; + watch->ino = ndw->dentry->d_inode->i_ino; + } + + return 0; +} + +/* Add rule to given filterlist if not a duplicate. */ +static inline int audit_add_rule(struct audit_entry *entry, + struct list_head *list) +{ + struct audit_entry *e; + struct audit_watch *watch = entry->rule.watch; + struct nameidata *ndp, *ndw; + LIST_HEAD(inotify_list); + int err; + + /* Taking audit_filter_mutex protects from stale rule data and + * writes to an audit_parent. */ + mutex_lock(&audit_filter_mutex); list_for_each_entry(e, list, list) { - if (!audit_compare_rule(&entry->rule, &e->rule)) - return -EEXIST; + if (!audit_compare_rule(&entry->rule, &e->rule)) { + err = -EEXIST; + mutex_unlock(&audit_filter_mutex); + goto error; + } + } + mutex_unlock(&audit_filter_mutex); + + /* Avoid calling path_lookup under audit_filter_mutex. */ + if (watch) { + err = audit_get_nd(watch->path, &ndp, &ndw); + if (err) + goto error; } + mutex_lock(&audit_filter_mutex); + if (watch) { + err = audit_add_watch(&entry->rule, ndp, ndw, &inotify_list); + if (err) { + mutex_unlock(&audit_filter_mutex); + audit_put_nd(ndp, ndw); + goto error; + } + } if (entry->rule.flags & AUDIT_FILTER_PREPEND) { list_add_rcu(&entry->list, list); } else { list_add_tail_rcu(&entry->list, list); } + mutex_unlock(&audit_filter_mutex); + + if (watch) { + err = audit_inotify_register(ndp, &inotify_list); + if (err) + goto error; + audit_put_nd(ndp, ndw); + } return 0; + +error: + if (watch) + audit_put_watch(watch); /* tmp watch, matches initial get */ + return err; +} + +/* Remove given krule from its associated watch's rules list and clean up any + * last instances of associated watch and parent. + * Caller must hold audit_filter_mutex. */ +static inline void audit_remove_watch(struct audit_krule *krule, + struct list_head *in_list) +{ + struct audit_watch *watch = krule->watch; + struct audit_parent *parent = watch->parent; + + list_del(&krule->rlist); + if (list_empty(&watch->rules)) { + list_del(&watch->wlist); + audit_put_watch(watch); /* matches initial get */ + + if (list_empty(&parent->watches)) { + /* Put parent on the inotify un-registration list. + * Grab a reference before releasing audit_filter_mutex, + * to be released in audit_inotify_unregister(). */ + list_add(&parent->ilist, in_list); + audit_get_parent(parent); + } + } } -/* Remove an existing rule from filterlist. Protected by - * audit_netlink_mutex. */ +/* Remove an existing rule from filterlist. */ static inline int audit_del_rule(struct audit_entry *entry, struct list_head *list) { struct audit_entry *e; + LIST_HEAD(inotify_list); - /* Do not use the _rcu iterator here, since this is the only - * deletion routine. */ + mutex_lock(&audit_filter_mutex); list_for_each_entry(e, list, list) { - if (!audit_compare_rule(&entry->rule, &e->rule)) { - list_del_rcu(&e->list); - call_rcu(&e->rcu, audit_free_rule_rcu); - return 0; + if (audit_compare_rule(&entry->rule, &e->rule)) + continue; + + if (e->rule.watch) { + audit_remove_watch(&e->rule, &inotify_list); + /* match initial get for tmp watch */ + audit_put_watch(entry->rule.watch); } - } + + list_del_rcu(&e->list); + call_rcu(&e->rcu, audit_free_rule_rcu); + mutex_unlock(&audit_filter_mutex); + + if (e->rule.watch) + audit_inotify_unregister(&inotify_list); + + return 0; + } + mutex_unlock(&audit_filter_mutex); + /* match initial get for tmp watch */ + if (entry->rule.watch) + audit_put_watch(entry->rule.watch); return -ENOENT; /* No matching rule */ } @@ -521,10 +1053,10 @@ static int audit_list(void *_dest) seq = dest[1]; kfree(dest); - mutex_lock(&audit_netlink_mutex); + mutex_lock(&audit_filter_mutex); - /* The *_rcu iterators not needed here because we are - always called with audit_netlink_mutex held. */ + /* This is a blocking read, so use audit_filter_mutex instead of rcu + * iterator to sync with list writers. */ for (i=0; ibuflen); kfree(data); } } audit_send_reply(pid, seq, AUDIT_LIST_RULES, 1, 1, NULL, 0); - mutex_unlock(&audit_netlink_mutex); + mutex_unlock(&audit_filter_mutex); return 0; } @@ -662,6 +1194,32 @@ int audit_receive_filter(int type, int p return err; } +/** + * audit_handle_ievent - handler for Inotify events + * @event: information about the event + * @dname: dentry name associated with event + * @inode: inode associated with event + * @ptr: kernel's version of a watch descriptor + */ +void audit_handle_ievent(struct inotify_event *event, const char *dname, + struct inode *inode, void *ptr) +{ + struct audit_parent *parent = (struct audit_parent *)ptr; + + if (event->mask & (IN_CREATE|IN_MOVED_TO) && inode) + audit_update_watch(parent, dname, inode->i_sb->s_dev, + inode->i_ino); + else if (event->mask & (IN_DELETE|IN_MOVED_FROM)) + audit_update_watch(parent, dname, (dev_t)-1, (unsigned long)-1); + /* Note: Inotify doesn't remove the watch for the IN_MOVE_SELF event. + * Work around this by leaving the parent around with an empty + * watchlist. It will be re-used if new watches are added. */ + else if (event->mask & (AUDIT_IN_SELF)) + audit_remove_parent_watches(parent); + else if (event->mask & IN_IGNORED) + audit_remove_parent(parent); +} + int audit_comparator(const u32 left, const u32 op, const u32 right) { switch (op) { @@ -682,7 +1240,39 @@ int audit_comparator(const u32 left, con return 0; } +/* Compare given dentry name with last component in given path, + * return of 0 indicates a match. */ +int audit_compare_dname_path(const char *dname, const char *path) +{ + int dlen, plen; + const char *p; + + if (!dname || !path) + return 1; + + dlen = strlen(dname); + plen = strlen(path); + if (plen < dlen) + return 1; + + /* disregard trailing slashes */ + p = path + plen - 1; + while ((*p == '/') && (p > path)) + p--; + + /* find last path component */ + p = p - dlen + 1; + if (p < path) + return 1; + else if (p > path) { + if (*--p != '/') + return 1; + else + p++; + } + return strncmp(p, dname, dlen); +} static int audit_filter_user_rules(struct netlink_skb_parms *cb, struct audit_krule *rule, @@ -796,32 +1386,41 @@ static inline int audit_rule_has_selinux int selinux_audit_rule_update(void) { struct audit_entry *entry, *nentry; + struct audit_watch *watch; int i, err = 0; - /* audit_netlink_mutex synchronizes the writers */ - mutex_lock(&audit_netlink_mutex); + /* audit_filter_mutex synchronizes the writers */ + mutex_lock(&audit_filter_mutex); for (i = 0; i < AUDIT_NR_FILTERS; i++) { list_for_each_entry(entry, &audit_filter_list[i], list) { if (!audit_rule_has_selinux(&entry->rule)) continue; - nentry = audit_dupe_rule(&entry->rule); + watch = entry->rule.watch; + nentry = audit_dupe_rule(&entry->rule, watch); if (unlikely(IS_ERR(nentry))) { /* save the first error encountered for the * return value */ if (!err) err = PTR_ERR(nentry); audit_panic("error updating selinux filters"); + if (watch) + list_del(&entry->rule.rlist); list_del_rcu(&entry->list); } else { + if (watch) { + list_add(&nentry->rule.rlist, + &watch->rules); + list_del(&entry->rule.rlist); + } list_replace_rcu(&entry->list, &nentry->list); } call_rcu(&entry->rcu, audit_free_rule_rcu); } } - mutex_unlock(&audit_netlink_mutex); + mutex_unlock(&audit_filter_mutex); return err; } diff --git a/kernel/auditsc.c b/kernel/auditsc.c index ba9e9a3..0f56c69 100644 --- a/kernel/auditsc.c +++ b/kernel/auditsc.c @@ -160,6 +160,27 @@ struct audit_context { #endif }; +/* Determine if any context name data matches a rule's watch data */ +static inline int audit_match_watch(struct audit_context *ctx, + struct audit_watch *watch) +{ + int i; + + if (!ctx) + return 0; + + if (watch->ino == (unsigned long)-1) + return 0; + + for (i = 0; i < ctx->name_count; i++) { + if (ctx->names[i].dev == watch->dev && + (ctx->names[i].ino == watch->ino || + ctx->names[i].pino == watch->ino)) + return 1; + } + + return 0; +} /* Compare a task_struct with an audit_rule. Return 1 on match, 0 * otherwise. */ @@ -256,6 +277,9 @@ static int audit_filter_rules(struct tas } } break; + case AUDIT_WATCH: + result = audit_match_watch(ctx, rule->watch); + break; case AUDIT_LOGINUID: result = 0; if (ctx) @@ -1067,37 +1091,20 @@ void __audit_inode_child(const char *dna return; /* determine matching parent */ - if (dname) - for (idx = 0; idx < context->name_count; idx++) - if (context->names[idx].pino == pino) { - const char *n; - const char *name = context->names[idx].name; - int dlen = strlen(dname); - int nlen = name ? strlen(name) : 0; - - if (nlen < dlen) - continue; - - /* disregard trailing slashes */ - n = name + nlen - 1; - while ((*n == '/') && (n > name)) - n--; - - /* find last path component */ - n = n - dlen + 1; - if (n < name) - continue; - else if (n > name) { - if (*--n != '/') - continue; - else - n++; - } + if (!dname) + goto no_match; + for (idx = 0; idx < context->name_count; idx++) + if (context->names[idx].pino == pino) { + const char *name = context->names[idx].name; - if (strncmp(n, dname, dlen) == 0) - goto update_context; - } + if (!name) + continue; + + if (audit_compare_dname_path(dname, name) == 0) + goto update_context; + } +no_match: /* catch-all in case match not found */ idx = context->name_count++; context->names[idx].name = NULL; -- 0.99.9.GIT Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-5/kernel-2.6.spec,v retrieving revision 1.2032.2.4 retrieving revision 1.2032.2.5 diff -u -r1.2032.2.4 -r1.2032.2.5 --- kernel-2.6.spec 21 Mar 2006 15:17:39 -0000 1.2032.2.4 +++ kernel-2.6.spec 21 Mar 2006 16:18:22 -0000 1.2032.2.5 @@ -427,7 +427,8 @@ Patch20101: linux-2.6-audit-slab-leak-tracking.patch Patch20102: 0001-support-for-context-based-audit-filtering.patch Patch20103: 0002-support-for-context-based-audit-filtering.patch -Patch20104: 0003-filesystem-location-based-auditing.patch +Patch20104: 0003-Inotify-kernel-API.patch +Patch20105: 0004-filesystem-location-based-auditing.patch # END OF PATCH DEFINITIONS @@ -1076,6 +1077,7 @@ %patch20102 -p1 %patch20103 -p1 %patch20104 -p1 +%patch20105 -p1 # END OF PATCH APPLICATIONS --- 0003-filesystem-location-based-auditing.patch DELETED --- From fedora-cvs-commits at redhat.com Tue Mar 21 16:21:17 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 21 Mar 2006 11:21:17 -0500 Subject: rpms/k3b/FC-4 .cvsignore, 1.8, 1.9 k3b.spec, 1.15, 1.16 sources, 1.8, 1.9 Message-ID: <200603211621.k2LGLHIs018837@cvs.devel.redhat.com> Author: harald Update of /cvs/dist/rpms/k3b/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv18814 Modified Files: .cvsignore k3b.spec sources Log Message: version 0:0.12.14-0.FC4.1 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/k3b/FC-4/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 20 Dec 2005 15:02:36 -0000 1.8 +++ .cvsignore 21 Mar 2006 16:21:14 -0000 1.9 @@ -1,2 +1,2 @@ +k3b-0.12.14.tar.bz2 k3b-i18n-0.12.10.tar.bz2 -k3b-0.12.10.tar.bz2 Index: k3b.spec =================================================================== RCS file: /cvs/dist/rpms/k3b/FC-4/k3b.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- k3b.spec 20 Dec 2005 15:02:51 -0000 1.15 +++ k3b.spec 21 Mar 2006 16:21:14 -0000 1.16 @@ -1,9 +1,9 @@ -%define tar_version 0.12.10 +%define tar_version 0.12.14 %define i18n_version 0.12.10 Name: k3b -Version: 0.12.10 -Release: 0.fc4.1 +Version: 0.12.14 +Release: 0.FC5.2 Epoch: 0 Summary: CD/DVD burning application for KDE @@ -106,6 +106,9 @@ # Empty directories. rm -rf $RPM_BUILD_ROOT%{_datadir}/applnk +# remove the .la files +rm -f $RPM_BUILD_ROOT%{_libdir}/libk3b*.la + # GNOME desktop beautification (requires "Icon=name.png" fix in setup section). mkdir $RPM_BUILD_ROOT%{_datadir}/pixmaps ln -s ../icons/crystalsvg/48x48/apps/k3b.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/k3b.png @@ -138,7 +141,6 @@ %{_libdir}/libk3b*.so.* %{_libdir}/libk3b*.so -%{_libdir}/libk3b*.la %{_libdir}/kde3/libk3b*.la %{_libdir}/kde3/libk3b*.so @@ -169,6 +171,9 @@ %changelog +* Tue Mar 21 2006 Harald Hoyer 0:0.12.14-0.FC4.1 +- version 0.12.14 + * Tue Dec 20 2005 Harald Hoyer 0:0.12.10-1 - version 0.12.10 Index: sources =================================================================== RCS file: /cvs/dist/rpms/k3b/FC-4/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 20 Dec 2005 15:02:51 -0000 1.8 +++ sources 21 Mar 2006 16:21:14 -0000 1.9 @@ -1,2 +1,2 @@ +51ef4fdf98365a285489dc1e11a07a3c k3b-0.12.14.tar.bz2 db3bc6d94da5b63f22bd04e981486974 k3b-i18n-0.12.10.tar.bz2 -f685230ef445b36ccba42fc80b922dfa k3b-0.12.10.tar.bz2 From fedora-cvs-commits at redhat.com Tue Mar 21 16:21:45 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 21 Mar 2006 11:21:45 -0500 Subject: rpms/k3b/FC-4 k3b.spec,1.16,1.17 Message-ID: <200603211621.k2LGLjx4018891@cvs.devel.redhat.com> Author: harald Update of /cvs/dist/rpms/k3b/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv18878 Modified Files: k3b.spec Log Message: version 0:0.12.14-0.FC4.1 Index: k3b.spec =================================================================== RCS file: /cvs/dist/rpms/k3b/FC-4/k3b.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- k3b.spec 21 Mar 2006 16:21:14 -0000 1.16 +++ k3b.spec 21 Mar 2006 16:21:43 -0000 1.17 @@ -3,7 +3,7 @@ Name: k3b Version: 0.12.14 -Release: 0.FC5.2 +Release: 0.FC4.1 Epoch: 0 Summary: CD/DVD burning application for KDE From fedora-cvs-commits at redhat.com Tue Mar 21 16:57:42 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 21 Mar 2006 11:57:42 -0500 Subject: rpms/kernel/devel kernel-2.6.spec, 1.2075, 1.2076 linux-2.6-execshield-xen.patch, 1.3, 1.4 Message-ID: <200603211657.k2LGvgaL000650@cvs.devel.redhat.com> Author: quintela Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv635 Modified Files: kernel-2.6.spec linux-2.6-execshield-xen.patch Log Message: fix xen execshield Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.2075 retrieving revision 1.2076 diff -u -r1.2075 -r1.2076 --- kernel-2.6.spec 21 Mar 2006 12:35:11 -0000 1.2075 +++ kernel-2.6.spec 21 Mar 2006 16:57:38 -0000 1.2076 @@ -8,7 +8,7 @@ # Whether to apply the Xen patches, leave this enabled. %define includexen 1 # Whether to build the Xen kernels, disable if you want. -%define buildxen 0 +%define buildxen 1 %define buildxenPAE 0 %define builddoc 0 %define buildkdump 1 @@ -1649,6 +1649,9 @@ %endif %changelog +* Tue Mar 21 2006 Juan Quintela +- buildxen again. + * Mon Mar 20 2006 Juan Quintela - fix xen vmx in 64 bits. linux-2.6-execshield-xen.patch: arch/i386/kernel/entry-xen.S | 8 - arch/i386/kernel/process-xen.c | 58 +++++++ arch/i386/kernel/smp-xen.c | 2 arch/i386/kernel/traps-xen.c | 92 +++++++++++- arch/i386/mm/init-xen.c | 11 + linux-2.6.15.i686/include/asm-x86_64/mach-xen/asm/pgtable.h | 2 linux-2.6.15.noarch/arch/x86_64/kernel/setup64-xen.c | 23 --- linux-2.6.16.i686/arch/i386/kernel/sysenter.c | 2 8 files changed, 168 insertions(+), 30 deletions(-) Index: linux-2.6-execshield-xen.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-execshield-xen.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- linux-2.6-execshield-xen.patch 6 Mar 2006 16:31:47 -0000 1.3 +++ linux-2.6-execshield-xen.patch 21 Mar 2006 16:57:38 -0000 1.4 @@ -320,3 +320,19 @@ extern void paging_init(void); extern void clear_kernel_mapping(unsigned long addr, unsigned long size); +diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff linux-2.6.16.noarch/arch/i386/kernel/sysenter.c linux-2.6.16.i686/arch/i386/kernel/sysenter.c +--- linux-2.6.16.noarch/arch/i386/kernel/sysenter.c 2006-03-21 13:36:40.000000000 +0100 ++++ linux-2.6.16.i686/arch/i386/kernel/sysenter.c 2006-03-21 13:40:17.000000000 +0100 +@@ -134,6 +134,7 @@ int arch_setup_additional_pages(struct l + return err; + } + ++#ifndef CONFIG_XEN + int in_gate_area_no_task(unsigned long addr) + { + return 0; +@@ -148,3 +149,4 @@ struct vm_area_struct *get_gate_vma(stru + { + return NULL; + } ++#endif From fedora-cvs-commits at redhat.com Tue Mar 21 17:29:42 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 21 Mar 2006 12:29:42 -0500 Subject: rpms/bind/devel bind.spec,1.96,1.97 Message-ID: <200603211729.k2LHTgAU014770@cvs.devel.redhat.com> Author: jvdias Update of /cvs/dist/rpms/bind/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv14755 Modified Files: bind.spec Log Message: Index: bind.spec =================================================================== RCS file: /cvs/dist/rpms/bind/devel/bind.spec,v retrieving revision 1.96 retrieving revision 1.97 diff -u -r1.96 -r1.97 --- bind.spec 20 Mar 2006 21:40:42 -0000 1.96 +++ bind.spec 21 Mar 2006 17:29:38 -0000 1.97 @@ -161,7 +161,7 @@ Requires: bind = %{epoch}:%{version}-%{release} Requires(post): bash, textutils, fileutils, sed, grep %if %{selinux} -Requires(post): coreutils +Requires(post): policycoreutils %endif %description config @@ -183,7 +183,7 @@ Requires: bind = %{epoch}:%{version}-%{release} Requires(post): bash, textutils, fileutils, sed, grep %if %{selinux} -Requires(post): coreutils +Requires(post): policycoreutils %endif %description chroot @@ -215,7 +215,7 @@ Requires: bind-libs = %{epoch}:%{version}-%{release}, bind-utils = %{epoch}:%{version}-%{release}, glibc >= 2.2 Requires(post): bash, textutils, fileutils, sed, grep, mktemp %if %{selinux} -Requires(post): coreutils +Requires(post): policycoreutils %endif %description sdb From fedora-cvs-commits at redhat.com Tue Mar 21 18:40:59 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 21 Mar 2006 13:40:59 -0500 Subject: rpms/setools/devel apol.desktop, 1.3, 1.4 seaudit.desktop, 1.3, 1.4 sediffx.desktop, 1.2, 1.3 setools-rhat.patch, 1.20, 1.21 setools.spec, 1.51, 1.52 sepcut.console, 1.1, NONE sepcut.desktop, 1.2, NONE seuserx.console, 1.1, NONE seuserx.desktop, 1.3, NONE Message-ID: <200603211840.k2LIexgO010754@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/setools/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv10731 Modified Files: apol.desktop seaudit.desktop sediffx.desktop setools-rhat.patch setools.spec Removed Files: sepcut.console sepcut.desktop seuserx.console seuserx.desktop Log Message: * Tue Mar 21 2006 Dan Walsh 2.3-2 - Remove console apps for sediff, sediffx and apol Index: apol.desktop =================================================================== RCS file: /cvs/dist/rpms/setools/devel/apol.desktop,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- apol.desktop 14 Dec 2005 14:47:13 -0000 1.3 +++ apol.desktop 21 Mar 2006 18:40:55 -0000 1.4 @@ -1,5 +1,5 @@ [Desktop Entry] -Name=APOL +Name=SELinux Policy Analysis GenericName=SELinux Policy Analysis Tool Comment=This tool can examine, search, and relate policy components and policy rules #Icon=/usr/share/pixmaps/apol.xpm Index: seaudit.desktop =================================================================== RCS file: /cvs/dist/rpms/setools/devel/seaudit.desktop,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- seaudit.desktop 14 Dec 2005 14:47:13 -0000 1.3 +++ seaudit.desktop 21 Mar 2006 18:40:55 -0000 1.4 @@ -1,5 +1,5 @@ [Desktop Entry] -Name=seaudit +Name=SELinux Audit Log Analysis GenericName=SELinux Audit Log Analysis Tool Comment=The tool parses syslog files and extracts all policy , AVC and change of boolean messages. #Icon=/usr/share/pixmaps/seaudit.xpm Index: sediffx.desktop =================================================================== RCS file: /cvs/dist/rpms/setools/devel/sediffx.desktop,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sediffx.desktop 14 Dec 2005 14:47:13 -0000 1.2 +++ sediffx.desktop 21 Mar 2006 18:40:55 -0000 1.3 @@ -1,6 +1,6 @@ [Desktop Entry] -Name=sediffx -GenericName=SELinux Policy Difference too +Name=SELinux Policy Difference +GenericName=SELinux Policy Difference tool Comment=This tool allows you to compare two policy files Exec=/usr/bin/sediffx Type=Application setools-rhat.patch: Makefile | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) Index: setools-rhat.patch =================================================================== RCS file: /cvs/dist/rpms/setools/devel/setools-rhat.patch,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- setools-rhat.patch 31 Jan 2006 21:25:24 -0000 1.20 +++ setools-rhat.patch 21 Mar 2006 18:40:55 -0000 1.21 @@ -1,14 +1,3 @@ ---- setools-2.3/apol/Makefile.rhat 2006-01-23 10:58:42.000000000 -0500 -+++ setools-2.3/apol/Makefile 2006-01-31 16:15:53.000000000 -0500 -@@ -85,7 +85,7 @@ - $(MAKE) -C .. libsefs - - install: apol apol.tcl -- install -m 755 apol $(BINDIR) -+ install -m 755 apol $(SBINDIR) - @if [ -n $(INSTALL_LIBDIR) ]; then \ - for file in $(TCL-FILES); do \ - if [ -f $(INSTALL_LIBDIR)/$$file ]; then \ --- setools-2.3/Makefile.rhat 2006-01-23 10:58:42.000000000 -0500 +++ setools-2.3/Makefile 2006-01-31 16:18:43.000000000 -0500 @@ -12,7 +12,7 @@ @@ -29,15 +18,3 @@ # all apps that have a te/fc file need to be listed here POLICYINSTALLDIRS = # Help files here ---- setools-2.3/sediff/Makefile.rhat 2006-01-23 10:58:42.000000000 -0500 -+++ setools-2.3/sediff/Makefile 2006-01-31 16:15:53.000000000 -0500 -@@ -22,7 +22,8 @@ - install -m 644 ../man/sediff.1 $(MANDIR)/man1 - - install: all -- install -m 755 sediff sediffx $(BINDIR); -+ install -m 755 sediff $(BINDIR); -+ install -m 755 sediffx $(SBINDIR); - install -m 644 $(GLADE_FILES) $(INSTALL_LIBDIR) - install -m 644 sediff_help.txt $(INSTALL_HELPDIR) - Index: setools.spec =================================================================== RCS file: /cvs/dist/rpms/setools/devel/setools.spec,v retrieving revision 1.51 retrieving revision 1.52 diff -u -r1.51 -r1.52 --- setools.spec 11 Feb 2006 05:41:11 -0000 1.51 +++ setools.spec 21 Mar 2006 18:40:55 -0000 1.52 @@ -1,17 +1,15 @@ Summary: SELinux tools for managing policy Name: setools Version: 2.3 -Release: 1.2 +Release: 2 License: GPL Group: System Environment/Base URL: http://www.tresys.com/ Source: http://www.tresys.com/Downloads/selinux-tools/setools-%{version}.tar.bz2 Source1: setools.pam -Source2: apol.console Source4: seaudit.console Source5: apol.desktop Source7: seaudit.desktop -Source8: sediffx.console Source9: sediffx.desktop Prefix: %{_prefix} @@ -105,21 +103,15 @@ rm -f ${RPM_BUILD_ROOT}/usr/share/man/man1/replcon.1 rm -f ${RPM_BUILD_ROOT}/usr/share/man/man1/findcon.1 install -d -m 755 ${RPM_BUILD_ROOT}%{_sysconfdir}/pam.d -install -m 644 %{SOURCE1} ${RPM_BUILD_ROOT}%{_sysconfdir}/pam.d/apol install -m 644 %{SOURCE1} ${RPM_BUILD_ROOT}%{_sysconfdir}/pam.d/seaudit -install -m 644 %{SOURCE1} ${RPM_BUILD_ROOT}%{_sysconfdir}/pam.d/sediffx install -d -m 755 ${RPM_BUILD_ROOT}%{_sysconfdir}/security/console.apps -install -m 644 %{SOURCE2} ${RPM_BUILD_ROOT}%{_sysconfdir}/security/console.apps/apol install -m 644 %{SOURCE4} ${RPM_BUILD_ROOT}%{_sysconfdir}/security/console.apps/seaudit -install -m 644 %{SOURCE8} ${RPM_BUILD_ROOT}%{_sysconfdir}/security/console.apps/sediffx install -d -m 755 ${RPM_BUILD_ROOT}%{_datadir}/applications install -m 664 %{SOURCE5} ${RPM_BUILD_ROOT}%{_datadir}/applications/apol.desktop install -m 664 %{SOURCE7} ${RPM_BUILD_ROOT}%{_datadir}/applications/seaudit.desktop install -m 664 %{SOURCE9} ${RPM_BUILD_ROOT}%{_datadir}/applications/sediffx.desktop cd $RPM_BUILD_ROOT/%{_bindir}/ -ln -sf consolehelper apol ln -sf consolehelper seaudit -ln -sf consolehelper sediffx %clean rm -rf ${RPM_BUILD_ROOT} @@ -129,9 +121,7 @@ %dir /usr/share/tcl8.4/BWidget-1.7.0 /usr/share/tcl8.4/BWidget-1.7.0/* %{_bindir}/apol -%{_sbindir}/apol %{_bindir}/sediffx -%{_sbindir}/sediffx %{_bindir}/awish %{_bindir}/seaudit %{_sbindir}/seaudit @@ -139,12 +129,8 @@ %{_datadir}/applications/apol.desktop %{_datadir}/applications/seaudit.desktop %{_datadir}/applications/sediffx.desktop -%config(noreplace) %{_sysconfdir}/pam.d/apol %config(noreplace) %{_sysconfdir}/pam.d/seaudit -%config(noreplace) %{_sysconfdir}/pam.d/sediffx -%config(noreplace) %{_sysconfdir}/security/console.apps/apol %config(noreplace) %{_sysconfdir}/security/console.apps/seaudit -%config(noreplace) %{_sysconfdir}/security/console.apps/sediffx /usr/share/doc/setools-%{version}/apol* /usr/share/doc/setools-%{version}/seaudit_help.txt /usr/share/doc/setools-%{version}/types_relation_help.txt @@ -234,6 +220,9 @@ %{_libdir}/libsefs.so.1.2.1 %changelog +* Tue Mar 21 2006 Dan Walsh 2.3-2 +- Remove console apps for sediff, sediffx and apol + * Fri Feb 10 2006 Jesse Keating - 2.3-1.2 - bump again for double-long bug on ppc(64) --- sepcut.console DELETED --- --- sepcut.desktop DELETED --- --- seuserx.console DELETED --- --- seuserx.desktop DELETED --- From fedora-cvs-commits at redhat.com Tue Mar 21 18:43:47 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 21 Mar 2006 13:43:47 -0500 Subject: rpms/kernel/devel .cvsignore, 1.388, 1.389 kernel-2.6.spec, 1.2076, 1.2077 linux-2.6-xen.patch, 1.4, 1.5 sources, 1.329, 1.330 Message-ID: <200603211843.k2LIhlsV010869@cvs.devel.redhat.com> Author: quintela Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv10855 Modified Files: .cvsignore kernel-2.6.spec linux-2.6-xen.patch sources Log Message: rebase with xen-unstable 9334 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v retrieving revision 1.388 retrieving revision 1.389 diff -u -r1.388 -r1.389 --- .cvsignore 20 Mar 2006 22:24:33 -0000 1.388 +++ .cvsignore 21 Mar 2006 18:43:44 -0000 1.389 @@ -4,3 +4,4 @@ xen-20060301.tar.bz2 linux-2.6.16.tar.bz2 patch-2.6.16-git1.bz2 +xen-20060320.tar.bz2 Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.2076 retrieving revision 1.2077 diff -u -r1.2076 -r1.2077 --- kernel-2.6.spec 21 Mar 2006 16:57:38 -0000 1.2076 +++ kernel-2.6.spec 21 Mar 2006 18:43:44 -0000 1.2077 @@ -185,7 +185,7 @@ Source0: ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-%{kversion}.tar.bz2 -Source1: xen-20060301.tar.bz2 +Source1: xen-20060320.tar.bz2 Source2: Config.mk Source10: COPYING.modules @@ -260,9 +260,6 @@ Patch704: linux-2.6-xen-vsyscall_base.patch Patch706: linux-2.6-xen_remap_vma_flags.patch Patch709: linux-2.6-percpu-NR_CPUS-hotplug-fix.patch -Patch710: linux-2.6-xen-kva-mmap.patch -Patch711: linux-2.6-xen-disable_ati_timer_quirk.patch -Patch712: linux-2.6-xen-time-went-backwards.patch # # Patches 800 through 899 are reserved for bugfixes to the core system @@ -816,9 +813,6 @@ %patch704 -p1 %patch706 -p1 %patch709 -p1 -%patch710 -p2 -%patch711 -p1 -%patch712 -p1 %endif @@ -1649,6 +1643,9 @@ %endif %changelog +* Mon Mar 21 2006 Juan Quintela +- rebase to xen unstable cset 9334. + * Tue Mar 21 2006 Juan Quintela - buildxen again. linux-2.6-xen.patch: arch/i386/Kconfig | 98 arch/i386/Kconfig.cpu | 2 arch/i386/Makefile | 18 arch/i386/boot-xen/Makefile | 21 arch/i386/kernel/Makefile | 33 arch/i386/kernel/acpi/Makefile | 4 arch/i386/kernel/acpi/boot-xen.c | 1161 ++++++++ arch/i386/kernel/apic-xen.c | 140 + arch/i386/kernel/asm-offsets.c | 5 arch/i386/kernel/cpu/Makefile | 5 arch/i386/kernel/cpu/common-xen.c | 719 +++++ arch/i386/kernel/cpu/mtrr/Makefile | 7 arch/i386/kernel/cpu/mtrr/main-xen.c | 196 + arch/i386/kernel/early_printk-xen.c | 2 arch/i386/kernel/entry-xen.S | 861 ++++++ arch/i386/kernel/fixup.c | 95 arch/i386/kernel/head-xen.S | 171 + arch/i386/kernel/init_task-xen.c | 51 arch/i386/kernel/io_apic-xen.c | 2747 ++++++++++++++++++++ arch/i386/kernel/ioport-xen.c | 122 arch/i386/kernel/irq-xen.c | 306 ++ arch/i386/kernel/ldt-xen.c | 269 + arch/i386/kernel/microcode-xen.c | 165 + arch/i386/kernel/mpparse-xen.c | 1188 ++++++++ arch/i386/kernel/pci-dma-xen.c | 344 ++ arch/i386/kernel/process-xen.c | 833 ++++++ arch/i386/kernel/quirks-xen.c | 48 arch/i386/kernel/setup-xen.c | 1892 +++++++++++++ arch/i386/kernel/smp-xen.c | 617 ++++ arch/i386/kernel/swiotlb.c | 674 ++++ arch/i386/kernel/sysenter.c | 90 arch/i386/kernel/time-xen.c | 1097 +++++++ arch/i386/kernel/traps-xen.c | 1094 +++++++ arch/i386/kernel/vm86.c | 8 arch/i386/kernel/vmlinux.lds.S | 4 arch/i386/kernel/vsyscall-note-xen.S | 32 arch/i386/kernel/vsyscall.S | 2 arch/i386/mach-xen/Makefile | 5 arch/i386/mach-xen/setup.c | 37 arch/i386/mm/Makefile | 8 arch/i386/mm/fault-xen.c | 617 ++++ arch/i386/mm/highmem-xen.c | 123 arch/i386/mm/hypervisor.c | 421 +++ arch/i386/mm/init-xen.c | 851 ++++++ arch/i386/mm/ioremap-xen.c | 462 +++ arch/i386/mm/pgtable-xen.c | 652 ++++ arch/i386/mm/pgtable.c | 63 arch/i386/pci/Makefile | 9 arch/i386/pci/irq-xen.c | 1202 ++++++++ arch/i386/pci/pcifront.c | 55 arch/i386/power/Makefile | 4 arch/ia64/Kconfig | 47 arch/ia64/Makefile | 10 arch/ia64/hp/sim/Makefile | 2 arch/ia64/kernel/entry.S | 32 arch/ia64/kernel/head.S | 6 arch/ia64/kernel/pal.S | 5 arch/ia64/kernel/sal.c | 3 arch/ia64/kernel/setup.c | 16 arch/ia64/xen-mkbuildtree-post | 2 arch/ia64/xen-mkbuildtree-pre | 50 arch/ia64/xen/Makefile | 5 arch/ia64/xen/drivers/Makefile | 20 arch/ia64/xen/drivers/README | 2 arch/ia64/xen/drivers/coreMakefile | 24 arch/ia64/xen/drivers/evtchn_ia64.c | 273 + arch/ia64/xen/drivers/patches/blkback.c.patch | 33 arch/ia64/xen/drivers/patches/console.c.patch | 11 arch/ia64/xen/drivers/patches/devmem.c.patch | 2 arch/ia64/xen/drivers/patches/gnttab.c.patch | 33 arch/ia64/xen/drivers/patches/privcmd.c.patch | 30 arch/ia64/xen/drivers/xenia64_init.c | 55 arch/ia64/xen/hypercall.S | 365 ++ arch/ia64/xen/xen_ksyms.c | 12 arch/ia64/xen/xenconsole.c | 19 arch/ia64/xen/xenentry.S | 850 ++++++ arch/ia64/xen/xenhpski.c | 19 arch/ia64/xen/xenivt.S | 2032 ++++++++++++++ arch/ia64/xen/xenminstate.h | 367 ++ arch/ia64/xen/xenpal.S | 73 arch/ia64/xen/xensetup.S | 35 arch/um/kernel/physmem.c | 4 arch/x86_64/Kconfig | 60 arch/x86_64/Makefile | 16 arch/x86_64/ia32/Makefile | 20 arch/x86_64/ia32/ia32entry-xen.S | 721 +++++ arch/x86_64/ia32/syscall32-xen.c | 128 arch/x86_64/ia32/syscall32_syscall-xen.S | 28 arch/x86_64/ia32/vsyscall-int80.S | 58 arch/x86_64/ia32/vsyscall-sigreturn.S | 2 arch/x86_64/kernel/Makefile | 18 arch/x86_64/kernel/acpi/Makefile | 1 arch/x86_64/kernel/apic-xen.c | 200 + arch/x86_64/kernel/asm-offsets.c | 2 arch/x86_64/kernel/e820-xen.c | 744 +++++ arch/x86_64/kernel/early_printk-xen.c | 306 ++ arch/x86_64/kernel/entry-xen.S | 1141 ++++++++ arch/x86_64/kernel/genapic-xen.c | 144 + arch/x86_64/kernel/genapic_xen.c | 162 + arch/x86_64/kernel/head-xen.S | 156 + arch/x86_64/kernel/head64-xen.c | 140 + arch/x86_64/kernel/init_task.c | 3 arch/x86_64/kernel/io_apic-xen.c | 2231 ++++++++++++++++ arch/x86_64/kernel/ioport-xen.c | 58 arch/x86_64/kernel/irq-xen.c | 168 + arch/x86_64/kernel/ldt-xen.c | 282 ++ arch/x86_64/kernel/mpparse-xen.c | 1005 +++++++ arch/x86_64/kernel/pci-swiotlb-xen.c | 54 arch/x86_64/kernel/process-xen.c | 810 +++++ arch/x86_64/kernel/setup-xen.c | 1646 +++++++++++ arch/x86_64/kernel/setup64-xen.c | 360 ++ arch/x86_64/kernel/smp-xen.c | 596 ++++ arch/x86_64/kernel/traps-xen.c | 1023 +++++++ arch/x86_64/kernel/vsyscall-xen.c | 239 + arch/x86_64/kernel/x8664_ksyms-xen.c | 163 + arch/x86_64/kernel/xen_entry.S | 41 arch/x86_64/mm/Makefile | 10 arch/x86_64/mm/fault-xen.c | 595 ++++ arch/x86_64/mm/init-xen.c | 1101 ++++++++ arch/x86_64/mm/pageattr-xen.c | 401 ++ arch/x86_64/pci/Makefile | 12 drivers/Makefile | 1 drivers/acpi/Kconfig | 3 drivers/acpi/tables.c | 7 drivers/char/mem.c | 6 drivers/char/tpm/Kconfig | 14 drivers/char/tpm/Makefile | 1 drivers/char/tpm/tpm.c | 44 drivers/char/tpm/tpm.h | 7 drivers/char/tpm/tpm_xen.c | 536 +++ drivers/char/tty_io.c | 7 drivers/firmware/Kconfig | 2 drivers/pci/Kconfig | 1 drivers/serial/Kconfig | 1 drivers/video/Kconfig | 2 drivers/xen/Kconfig | 202 + drivers/xen/Makefile | 22 drivers/xen/balloon/Makefile | 2 drivers/xen/balloon/balloon.c | 587 ++++ drivers/xen/blkback/Makefile | 3 drivers/xen/blkback/blkback.c | 596 ++++ drivers/xen/blkback/common.h | 123 drivers/xen/blkback/interface.c | 164 + drivers/xen/blkback/vbd.c | 102 drivers/xen/blkback/xenbus.c | 419 +++ drivers/xen/blkfront/Makefile | 5 drivers/xen/blkfront/blkfront.c | 822 +++++ drivers/xen/blkfront/block.h | 162 + drivers/xen/blkfront/vbd.c | 324 ++ drivers/xen/blktap/Makefile | 3 drivers/xen/blktap/blktap.c | 910 ++++++ drivers/xen/blktap/common.h | 110 drivers/xen/blktap/interface.c | 146 + drivers/xen/blktap/xenbus.c | 233 + drivers/xen/char/Makefile | 2 drivers/xen/char/mem.c | 192 + drivers/xen/console/Makefile | 2 drivers/xen/console/console.c | 643 ++++ drivers/xen/console/xencons_ring.c | 125 drivers/xen/core/Makefile | 9 drivers/xen/core/evtchn.c | 822 +++++ drivers/xen/core/features.c | 29 drivers/xen/core/gnttab.c | 455 +++ drivers/xen/core/reboot.c | 441 +++ drivers/xen/core/skbuff.c | 144 + drivers/xen/core/smpboot.c | 464 +++ drivers/xen/core/xen_proc.c | 29 drivers/xen/evtchn/Makefile | 2 drivers/xen/evtchn/evtchn.c | 459 +++ drivers/xen/net_driver_util.c | 67 drivers/xen/netback/Makefile | 5 drivers/xen/netback/common.h | 110 drivers/xen/netback/interface.c | 320 ++ drivers/xen/netback/loopback.c | 231 + drivers/xen/netback/netback.c | 835 ++++++ drivers/xen/netback/xenbus.c | 326 ++ drivers/xen/netfront/Makefile | 4 drivers/xen/netfront/netfront.c | 1500 ++++++++++ drivers/xen/pciback/Makefile | 10 drivers/xen/pciback/conf_space.c | 342 ++ drivers/xen/pciback/conf_space.h | 97 drivers/xen/pciback/conf_space_header.c | 267 + drivers/xen/pciback/passthrough.c | 116 drivers/xen/pciback/pci_stub.c | 407 ++ drivers/xen/pciback/pciback.h | 74 drivers/xen/pciback/pciback_ops.c | 75 drivers/xen/pciback/vpci.c | 163 + drivers/xen/pciback/xenbus.c | 436 +++ drivers/xen/pcifront/Makefile | 7 drivers/xen/pcifront/pci.c | 46 drivers/xen/pcifront/pci_op.c | 259 + drivers/xen/pcifront/pcifront.h | 40 drivers/xen/pcifront/xenbus.c | 295 ++ drivers/xen/privcmd/Makefile | 2 drivers/xen/privcmd/privcmd.c | 302 ++ drivers/xen/tpmback/Makefile | 4 drivers/xen/tpmback/common.h | 91 drivers/xen/tpmback/interface.c | 194 + drivers/xen/tpmback/tpmback.c | 1060 +++++++ drivers/xen/tpmback/xenbus.c | 331 ++ drivers/xen/tpmfront/Makefile | 2 drivers/xen/tpmfront/tpmfront.c | 729 +++++ drivers/xen/tpmfront/tpmfront.h | 40 drivers/xen/util.c | 80 drivers/xen/xenbus/Makefile | 8 drivers/xen/xenbus/xenbus_client.c | 405 ++ drivers/xen/xenbus/xenbus_comms.c | 215 + drivers/xen/xenbus/xenbus_comms.h | 50 drivers/xen/xenbus/xenbus_dev.c | 249 + drivers/xen/xenbus/xenbus_probe.c | 1079 +++++++ drivers/xen/xenbus/xenbus_xs.c | 837 ++++++ fs/Kconfig | 1 include/asm-i386/a.out.h | 2 include/asm-i386/apic.h | 2 include/asm-i386/elf.h | 7 include/asm-i386/fixmap.h | 13 include/asm-i386/mach-xen/asm/agp.h | 37 include/asm-i386/mach-xen/asm/desc.h | 164 + include/asm-i386/mach-xen/asm/dma-mapping.h | 156 + include/asm-i386/mach-xen/asm/fixmap.h | 156 + include/asm-i386/mach-xen/asm/floppy.h | 147 + include/asm-i386/mach-xen/asm/highmem.h | 81 include/asm-i386/mach-xen/asm/hw_irq.h | 73 include/asm-i386/mach-xen/asm/hypercall.h | 348 ++ include/asm-i386/mach-xen/asm/hypervisor.h | 160 + include/asm-i386/mach-xen/asm/io.h | 401 ++ include/asm-i386/mach-xen/asm/kmap_types.h | 32 include/asm-i386/mach-xen/asm/mmu.h | 21 include/asm-i386/mach-xen/asm/mmu_context.h | 105 include/asm-i386/mach-xen/asm/page.h | 327 ++ include/asm-i386/mach-xen/asm/param.h | 24 include/asm-i386/mach-xen/asm/pci.h | 154 + include/asm-i386/mach-xen/asm/pgalloc.h | 64 include/asm-i386/mach-xen/asm/pgtable-2level-defs.h | 21 include/asm-i386/mach-xen/asm/pgtable-2level.h | 83 include/asm-i386/mach-xen/asm/pgtable-3level-defs.h | 25 include/asm-i386/mach-xen/asm/pgtable-3level.h | 181 + include/asm-i386/mach-xen/asm/pgtable.h | 521 +++ include/asm-i386/mach-xen/asm/processor.h | 762 +++++ include/asm-i386/mach-xen/asm/ptrace.h | 90 include/asm-i386/mach-xen/asm/scatterlist.h | 22 include/asm-i386/mach-xen/asm/segment.h | 117 include/asm-i386/mach-xen/asm/setup.h | 66 include/asm-i386/mach-xen/asm/smp.h | 103 include/asm-i386/mach-xen/asm/spinlock.h | 217 + include/asm-i386/mach-xen/asm/swiotlb.h | 43 include/asm-i386/mach-xen/asm/synch_bitops.h | 141 + include/asm-i386/mach-xen/asm/system.h | 679 ++++ include/asm-i386/mach-xen/asm/tlbflush.h | 102 include/asm-i386/mach-xen/asm/vga.h | 20 include/asm-i386/mach-xen/irq_vectors.h | 125 include/asm-i386/mach-xen/mach_traps.h | 33 include/asm-i386/mach-xen/setup_arch_post.h | 59 include/asm-i386/mach-xen/setup_arch_pre.h | 5 include/asm-i386/page.h | 4 include/asm-i386/spinlock.h | 6 include/asm-i386/system.h | 2 include/asm-ia64/fixmap.h | 2 include/asm-ia64/gcc_intrin.h | 60 include/asm-ia64/hypercall.h | 280 ++ include/asm-ia64/hypervisor.h | 75 include/asm-ia64/intel_intrin.h | 68 include/asm-ia64/meminit.h | 5 include/asm-ia64/pal.h | 1 include/asm-ia64/privop.h | 59 include/asm-ia64/processor.h | 1 include/asm-ia64/synch_bitops.h | 61 include/asm-ia64/system.h | 4 include/asm-ia64/xen/privop.h | 277 ++ include/asm-um/page.h | 2 include/asm-x86_64/apic.h | 2 include/asm-x86_64/mach-xen/asm/arch_hooks.h | 27 include/asm-x86_64/mach-xen/asm/bootsetup.h | 42 include/asm-x86_64/mach-xen/asm/desc.h | 263 + include/asm-x86_64/mach-xen/asm/dma-mapping.h | 191 + include/asm-x86_64/mach-xen/asm/fixmap.h | 109 include/asm-x86_64/mach-xen/asm/floppy.h | 206 + include/asm-x86_64/mach-xen/asm/hw_irq.h | 141 + include/asm-x86_64/mach-xen/asm/hypercall.h | 349 ++ include/asm-x86_64/mach-xen/asm/hypervisor.h | 2 include/asm-x86_64/mach-xen/asm/io.h | 359 ++ include/asm-x86_64/mach-xen/asm/irq.h | 39 include/asm-x86_64/mach-xen/asm/mmu.h | 33 include/asm-x86_64/mach-xen/asm/mmu_context.h | 134 include/asm-x86_64/mach-xen/asm/nmi.h | 75 include/asm-x86_64/mach-xen/asm/page.h | 318 ++ include/asm-x86_64/mach-xen/asm/pci.h | 174 + include/asm-x86_64/mach-xen/asm/pgalloc.h | 198 + include/asm-x86_64/mach-xen/asm/pgtable.h | 560 ++++ include/asm-x86_64/mach-xen/asm/processor.h | 503 +++ include/asm-x86_64/mach-xen/asm/ptrace.h | 125 include/asm-x86_64/mach-xen/asm/smp.h | 152 + include/asm-x86_64/mach-xen/asm/synch_bitops.h | 2 include/asm-x86_64/mach-xen/asm/system.h | 434 +++ include/asm-x86_64/mach-xen/asm/timer.h | 67 include/asm-x86_64/mach-xen/asm/tlbflush.h | 104 include/asm-x86_64/mach-xen/asm/vga.h | 20 include/asm-x86_64/mach-xen/asm/xor.h | 328 ++ include/asm-x86_64/mach-xen/irq_vectors.h | 123 include/asm-x86_64/mach-xen/mach_time.h | 122 include/asm-x86_64/mach-xen/mach_timer.h | 48 include/asm-x86_64/mach-xen/setup_arch_post.h | 41 include/asm-x86_64/mach-xen/setup_arch_pre.h | 5 include/linux/gfp.h | 6 include/linux/highmem.h | 6 include/linux/irq.h | 3 include/linux/mm.h | 13 include/linux/skbuff.h | 13 include/xen/balloon.h | 70 include/xen/driver_util.h | 26 include/xen/evtchn.h | 123 include/xen/features.h | 20 include/xen/foreign_page.h | 40 include/xen/gnttab.h | 120 include/xen/interface/COPYING | 28 include/xen/interface/acm.h | 181 + include/xen/interface/acm_ops.h | 98 include/xen/interface/arch-ia64.h | 337 ++ include/xen/interface/arch-x86_32.h | 183 + include/xen/interface/arch-x86_64.h | 259 + include/xen/interface/dom0_ops.h | 530 +++ include/xen/interface/event_channel.h | 205 + include/xen/interface/features.h | 53 include/xen/interface/grant_table.h | 311 ++ include/xen/interface/hvm/hvm_info_table.h | 24 include/xen/interface/hvm/ioreq.h | 93 include/xen/interface/hvm/vmx_assist.h | 97 include/xen/interface/io/blkif.h | 85 include/xen/interface/io/console.h | 33 include/xen/interface/io/netif.h | 76 include/xen/interface/io/pciif.h | 55 include/xen/interface/io/ring.h | 265 + include/xen/interface/io/tpmif.h | 56 include/xen/interface/io/xenbus.h | 42 include/xen/interface/io/xs_wire.h | 97 include/xen/interface/memory.h | 155 + include/xen/interface/nmi.h | 59 include/xen/interface/physdev.h | 71 include/xen/interface/sched.h | 87 include/xen/interface/sched_ctl.h | 64 include/xen/interface/trace.h | 90 include/xen/interface/vcpu.h | 119 include/xen/interface/version.h | 64 include/xen/interface/xen.h | 449 +++ include/xen/net_driver_util.h | 56 include/xen/pcifront.h | 39 include/xen/public/evtchn.h | 98 include/xen/public/privcmd.h | 91 include/xen/tpmfe.h | 40 include/xen/xen_proc.h | 23 include/xen/xenbus.h | 298 ++ include/xen/xencons.h | 14 kernel/Kconfig.preempt | 1 kernel/irq/manage.c | 84 lib/Kconfig.debug | 2 lib/Makefile | 3 mm/Kconfig | 3 mm/highmem.c | 11 mm/memory.c | 112 mm/mmap.c | 4 mm/page_alloc.c | 6 net/core/dev.c | 50 net/core/skbuff.c | 41 scripts/Makefile.xen | 14 364 files changed, 77553 insertions(+), 243 deletions(-) View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.4 -r 1.5 linux-2.6-xen.patch Index: linux-2.6-xen.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-xen.patch,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- linux-2.6-xen.patch 6 Mar 2006 16:31:49 -0000 1.4 +++ linux-2.6-xen.patch 21 Mar 2006 18:43:44 -0000 1.5 @@ -1,6 +1,6 @@ -diff -Nru -p --exclude='.*' ref-linux-2.6.16-rc5/arch/i386/boot-xen/Makefile linux-2.6.16-rc5-xen0/arch/i386/boot-xen/Makefile ---- ref-linux-2.6.16-rc5/arch/i386/boot-xen/Makefile 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.16-rc5-xen0/arch/i386/boot-xen/Makefile 2006-03-01 11:09:36.000000000 -0500 +diff -Nru -p --exclude='.*' ref-linux-2.6.16-rc6/arch/i386/boot-xen/Makefile linux-2.6.16-rc6-xen0/arch/i386/boot-xen/Makefile +--- ref-linux-2.6.16-rc6/arch/i386/boot-xen/Makefile 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.16-rc6-xen0/arch/i386/boot-xen/Makefile 2006-03-20 22:06:19.000000000 +0100 @@ -0,0 +1,21 @@ + +OBJCOPYFLAGS := -g --strip-unneeded @@ -23,9 +23,9 @@ + install -m0664 .config $(INSTALL_ROOT)/boot/config-$(XINSTALL_NAME)$(INSTALL_SUFFIX) + install -m0664 System.map $(INSTALL_ROOT)/boot/System.map-$(XINSTALL_NAME)$(INSTALL_SUFFIX) + ln -f -s vmlinuz-$(XINSTALL_NAME)$(INSTALL_SUFFIX) $(INSTALL_ROOT)/boot/vmlinuz-$(VERSION).$(PATCHLEVEL)$(XENGUEST)$(INSTALL_SUFFIX) -diff -Nru -p --exclude='.*' ref-linux-2.6.16-rc5/arch/i386/Kconfig linux-2.6.16-rc5-xen0/arch/i386/Kconfig ---- ref-linux-2.6.16-rc5/arch/i386/Kconfig 2006-03-01 11:12:36.000000000 -0500 -+++ linux-2.6.16-rc5-xen0/arch/i386/Kconfig 2006-03-01 11:09:36.000000000 -0500 +diff -Nru -p --exclude='.*' ref-linux-2.6.16-rc6/arch/i386/Kconfig linux-2.6.16-rc6-xen0/arch/i386/Kconfig +--- ref-linux-2.6.16-rc6/arch/i386/Kconfig 2006-03-20 22:09:16.000000000 +0100 ++++ linux-2.6.16-rc6-xen0/arch/i386/Kconfig 2006-03-20 22:06:19.000000000 +0100 @@ -58,6 +58,15 @@ config X86_PC help Choose this option if your computer is a standard PC or compatible. @@ -329,9 +329,9 @@ config KTIME_SCALAR bool default y -diff -Nru -p --exclude='.*' ref-linux-2.6.16-rc5/arch/i386/Kconfig.cpu linux-2.6.16-rc5-xen0/arch/i386/Kconfig.cpu ---- ref-linux-2.6.16-rc5/arch/i386/Kconfig.cpu 2006-03-01 11:12:26.000000000 -0500 -+++ linux-2.6.16-rc5-xen0/arch/i386/Kconfig.cpu 2006-03-01 11:09:36.000000000 -0500 +diff -Nru -p --exclude='.*' ref-linux-2.6.16-rc6/arch/i386/Kconfig.cpu linux-2.6.16-rc6-xen0/arch/i386/Kconfig.cpu +--- ref-linux-2.6.16-rc6/arch/i386/Kconfig.cpu 2006-03-20 22:08:15.000000000 +0100 ++++ linux-2.6.16-rc6-xen0/arch/i386/Kconfig.cpu 2006-03-20 22:06:19.000000000 +0100 @@ -251,7 +251,7 @@ config X86_PPRO_FENCE config X86_F00F_BUG @@ -341,9 +341,9 @@ default y config X86_WP_WORKS_OK -diff -Nru -p --exclude='.*' ref-linux-2.6.16-rc5/arch/i386/kernel/acpi/boot-xen.c linux-2.6.16-rc5-xen0/arch/i386/kernel/acpi/boot-xen.c ---- ref-linux-2.6.16-rc5/arch/i386/kernel/acpi/boot-xen.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.16-rc5-xen0/arch/i386/kernel/acpi/boot-xen.c 2006-03-01 11:09:36.000000000 -0500 +diff -Nru -p --exclude='.*' ref-linux-2.6.16-rc6/arch/i386/kernel/acpi/boot-xen.c linux-2.6.16-rc6-xen0/arch/i386/kernel/acpi/boot-xen.c +--- ref-linux-2.6.16-rc6/arch/i386/kernel/acpi/boot-xen.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.16-rc6-xen0/arch/i386/kernel/acpi/boot-xen.c 2006-03-20 22:06:19.000000000 +0100 @@ -0,0 +1,1161 @@ +/* + * boot.c - Architecture-Specific Low-Level ACPI Boot Support @@ -391,6 +391,9 @@ +extern int gsi_irq_sharing(int gsi); +#include + ++static inline int acpi_madt_oem_check(char *oem_id, char *oem_table_id) { return 0; } ++ ++ +#else /* X86 */ + +#ifdef CONFIG_X86_LOCAL_APIC @@ -1458,9 +1461,6 @@ + disable_acpi(); + return error; + } -+#ifdef __i386__ -+ check_acpi_pci(); -+#endif + + acpi_table_parse(ACPI_BOOT, acpi_parse_sbf); + @@ -1506,9 +1506,9 @@ + + return 0; +} -diff -Nru -p --exclude='.*' ref-linux-2.6.16-rc5/arch/i386/kernel/acpi/Makefile linux-2.6.16-rc5-xen0/arch/i386/kernel/acpi/Makefile ---- ref-linux-2.6.16-rc5/arch/i386/kernel/acpi/Makefile 2006-03-01 11:12:26.000000000 -0500 -+++ linux-2.6.16-rc5-xen0/arch/i386/kernel/acpi/Makefile 2006-03-01 11:09:36.000000000 -0500 +diff -Nru -p --exclude='.*' ref-linux-2.6.16-rc6/arch/i386/kernel/acpi/Makefile linux-2.6.16-rc6-xen0/arch/i386/kernel/acpi/Makefile +--- ref-linux-2.6.16-rc6/arch/i386/kernel/acpi/Makefile 2006-03-20 22:08:15.000000000 +0100 ++++ linux-2.6.16-rc6-xen0/arch/i386/kernel/acpi/Makefile 2006-03-20 22:06:19.000000000 +0100 @@ -6,3 +6,7 @@ ifneq ($(CONFIG_ACPI_PROCESSOR),) obj-y += cstate.o processor.o endif @@ -1517,9 +1517,9 @@ +include $(srctree)/scripts/Makefile.xen +obj-y := $(call cherrypickxen, $(obj-y), $(src)) +endif -diff -Nru -p --exclude='.*' ref-linux-2.6.16-rc5/arch/i386/kernel/apic-xen.c linux-2.6.16-rc5-xen0/arch/i386/kernel/apic-xen.c ---- ref-linux-2.6.16-rc5/arch/i386/kernel/apic-xen.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.16-rc5-xen0/arch/i386/kernel/apic-xen.c 2006-03-01 11:09:36.000000000 -0500 +diff -Nru -p --exclude='.*' ref-linux-2.6.16-rc6/arch/i386/kernel/apic-xen.c linux-2.6.16-rc6-xen0/arch/i386/kernel/apic-xen.c +--- ref-linux-2.6.16-rc6/arch/i386/kernel/apic-xen.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.16-rc6-xen0/arch/i386/kernel/apic-xen.c 2006-03-20 22:06:19.000000000 +0100 @@ -0,0 +1,140 @@ +/* + * Local APIC handling, local APIC timers @@ -1661,9 +1661,9 @@ + + return 0; +} -diff -Nru -p --exclude='.*' ref-linux-2.6.16-rc5/arch/i386/kernel/asm-offsets.c linux-2.6.16-rc5-xen0/arch/i386/kernel/asm-offsets.c ---- ref-linux-2.6.16-rc5/arch/i386/kernel/asm-offsets.c 2006-01-02 22:21:10.000000000 -0500 -+++ linux-2.6.16-rc5-xen0/arch/i386/kernel/asm-offsets.c 2006-03-01 11:09:36.000000000 -0500 +diff -Nru -p --exclude='.*' ref-linux-2.6.16-rc6/arch/i386/kernel/asm-offsets.c linux-2.6.16-rc6-xen0/arch/i386/kernel/asm-offsets.c +--- ref-linux-2.6.16-rc6/arch/i386/kernel/asm-offsets.c 2006-01-03 04:21:10.000000000 +0100 ++++ linux-2.6.16-rc6-xen0/arch/i386/kernel/asm-offsets.c 2006-03-20 22:06:19.000000000 +0100 @@ -13,6 +13,7 @@ #include #include @@ -1686,9 +1686,9 @@ - DEFINE(VSYSCALL_BASE, __fix_to_virt(FIX_VSYSCALL)); + DEFINE(VSYSCALL_BASE, VSYSCALL_BASE); } -diff -Nru -p --exclude='.*' ref-linux-2.6.16-rc5/arch/i386/kernel/cpu/common-xen.c linux-2.6.16-rc5-xen0/arch/i386/kernel/cpu/common-xen.c ---- ref-linux-2.6.16-rc5/arch/i386/kernel/cpu/common-xen.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.16-rc5-xen0/arch/i386/kernel/cpu/common-xen.c 2006-03-01 11:09:36.000000000 -0500 +diff -Nru -p --exclude='.*' ref-linux-2.6.16-rc6/arch/i386/kernel/cpu/common-xen.c linux-2.6.16-rc6-xen0/arch/i386/kernel/cpu/common-xen.c +--- ref-linux-2.6.16-rc6/arch/i386/kernel/cpu/common-xen.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.16-rc6-xen0/arch/i386/kernel/cpu/common-xen.c 2006-03-20 22:06:19.000000000 +0100 @@ -0,0 +1,719 @@ +#include +#include @@ -1975,10 +1975,10 @@ + c->x86_capability[4] = excap; + c->x86 = (tfms >> 8) & 15; + c->x86_model = (tfms >> 4) & 15; -+ if (c->x86 == 0xf) { ++ if (c->x86 == 0xf) + c->x86 += (tfms >> 20) & 0xff; ++ if (c->x86 >= 0x6) + c->x86_model += ((tfms >> 16) & 0xF) << 4; -+ } + c->x86_mask = tfms & 15; + } else { + /* Have CPUID level 0 only - unheard of */ @@ -2409,9 +2409,9 @@ + per_cpu(cpu_tlbstate, cpu).active_mm = &init_mm; +} +#endif -diff -Nru -p --exclude='.*' ref-linux-2.6.16-rc5/arch/i386/kernel/cpu/Makefile linux-2.6.16-rc5-xen0/arch/i386/kernel/cpu/Makefile ---- ref-linux-2.6.16-rc5/arch/i386/kernel/cpu/Makefile 2006-01-02 22:21:10.000000000 -0500 -+++ linux-2.6.16-rc5-xen0/arch/i386/kernel/cpu/Makefile 2006-03-01 11:09:36.000000000 -0500 +diff -Nru -p --exclude='.*' ref-linux-2.6.16-rc6/arch/i386/kernel/cpu/Makefile linux-2.6.16-rc6-xen0/arch/i386/kernel/cpu/Makefile +--- ref-linux-2.6.16-rc6/arch/i386/kernel/cpu/Makefile 2006-01-03 04:21:10.000000000 +0100 ++++ linux-2.6.16-rc6-xen0/arch/i386/kernel/cpu/Makefile 2006-03-20 22:06:19.000000000 +0100 @@ -17,3 +17,8 @@ obj-$(CONFIG_X86_MCE) += mcheck/ obj-$(CONFIG_MTRR) += mtrr/ @@ -2421,10 +2421,10 @@ +include $(srctree)/scripts/Makefile.xen +obj-y := $(call cherrypickxen, $(obj-y), $(src)) +endif -diff -Nru -p --exclude='.*' ref-linux-2.6.16-rc5/arch/i386/kernel/cpu/mtrr/main-xen.c linux-2.6.16-rc5-xen0/arch/i386/kernel/cpu/mtrr/main-xen.c ---- ref-linux-2.6.16-rc5/arch/i386/kernel/cpu/mtrr/main-xen.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.16-rc5-xen0/arch/i386/kernel/cpu/mtrr/main-xen.c 2006-03-01 11:09:36.000000000 -0500 -@@ -0,0 +1,187 @@ +diff -Nru -p --exclude='.*' ref-linux-2.6.16-rc6/arch/i386/kernel/cpu/mtrr/main-xen.c linux-2.6.16-rc6-xen0/arch/i386/kernel/cpu/mtrr/main-xen.c +--- ref-linux-2.6.16-rc6/arch/i386/kernel/cpu/mtrr/main-xen.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.16-rc6-xen0/arch/i386/kernel/cpu/mtrr/main-xen.c 2006-03-20 22:06:19.000000000 +0100 +@@ -0,0 +1,196 @@ +#include +#include +#include @@ -2435,6 +2435,8 @@ +#include +#include "mtrr.h" + ++static DECLARE_MUTEX(mtrr_sem); ++ +void generic_get_mtrr(unsigned int reg, unsigned long *base, + unsigned int *size, mtrr_type * type) +{ @@ -2490,12 +2492,15 @@ + int error; + dom0_op_t op; + ++ down(&mtrr_sem); ++ + op.cmd = DOM0_ADD_MEMTYPE; + op.u.add_memtype.mfn = base; + op.u.add_memtype.nr_mfns = size; + op.u.add_memtype.type = type; + error = HYPERVISOR_dom0_op(&op); + if (error) { ++ up(&mtrr_sem); + BUG_ON(error > 0); + return error; + } @@ -2503,6 +2508,8 @@ + if (increment) + ++usage_table[op.u.add_memtype.reg]; + ++ up(&mtrr_sem); [...11434 lines suppressed...] @@ -80172,7 +80293,7 @@ + ...); + + -+#endif /* _ASM_XEN_XENBUS_H */ ++#endif /* _XEN_XENBUS_H */ + +/* + * Local variables: @@ -80183,9 +80304,9 @@ + * tab-width: 8 + * End: + */ -diff -Nru -p --exclude='.*' ref-linux-2.6.16-rc5/include/xen/xencons.h linux-2.6.16-rc5-xen0/include/xen/xencons.h ---- ref-linux-2.6.16-rc5/include/xen/xencons.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.16-rc5-xen0/include/xen/xencons.h 2006-03-01 11:09:38.000000000 -0500 +diff -Nru -p --exclude='.*' ref-linux-2.6.16-rc6/include/xen/xencons.h linux-2.6.16-rc6-xen0/include/xen/xencons.h +--- ref-linux-2.6.16-rc6/include/xen/xencons.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.16-rc6-xen0/include/xen/xencons.h 2006-03-20 22:06:21.000000000 +0100 @@ -0,0 +1,14 @@ +#ifndef __ASM_XENCONS_H__ +#define __ASM_XENCONS_H__ @@ -80201,9 +80322,9 @@ +int xencons_ring_send(const char *data, unsigned len); + +#endif /* __ASM_XENCONS_H__ */ -diff -Nru -p --exclude='.*' ref-linux-2.6.16-rc5/include/xen/xen_proc.h linux-2.6.16-rc5-xen0/include/xen/xen_proc.h ---- ref-linux-2.6.16-rc5/include/xen/xen_proc.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.16-rc5-xen0/include/xen/xen_proc.h 2006-03-01 11:09:38.000000000 -0500 +diff -Nru -p --exclude='.*' ref-linux-2.6.16-rc6/include/xen/xen_proc.h linux-2.6.16-rc6-xen0/include/xen/xen_proc.h +--- ref-linux-2.6.16-rc6/include/xen/xen_proc.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.16-rc6-xen0/include/xen/xen_proc.h 2006-03-20 22:06:21.000000000 +0100 @@ -0,0 +1,23 @@ + +#ifndef __ASM_XEN_PROC_H__ @@ -80228,9 +80349,9 @@ + * tab-width: 8 + * End: + */ -diff -Nru -p --exclude='.*' ref-linux-2.6.16-rc5/kernel/irq/manage.c linux-2.6.16-rc5-xen0/kernel/irq/manage.c ---- ref-linux-2.6.16-rc5/kernel/irq/manage.c 2006-03-01 11:12:31.000000000 -0500 -+++ linux-2.6.16-rc5-xen0/kernel/irq/manage.c 2006-03-01 11:09:38.000000000 -0500 +diff -Nru -p --exclude='.*' ref-linux-2.6.16-rc6/kernel/irq/manage.c linux-2.6.16-rc6-xen0/kernel/irq/manage.c +--- ref-linux-2.6.16-rc6/kernel/irq/manage.c 2006-03-20 22:09:05.000000000 +0100 ++++ linux-2.6.16-rc6-xen0/kernel/irq/manage.c 2006-03-20 22:06:21.000000000 +0100 @@ -164,9 +164,14 @@ int can_request_irq(unsigned int irq, un return !action; } @@ -80357,9 +80478,9 @@ } EXPORT_SYMBOL(free_irq); -diff -Nru -p --exclude='.*' ref-linux-2.6.16-rc5/kernel/Kconfig.preempt linux-2.6.16-rc5-xen0/kernel/Kconfig.preempt ---- ref-linux-2.6.16-rc5/kernel/Kconfig.preempt 2006-01-02 22:21:10.000000000 -0500 -+++ linux-2.6.16-rc5-xen0/kernel/Kconfig.preempt 2006-03-01 11:09:38.000000000 -0500 +diff -Nru -p --exclude='.*' ref-linux-2.6.16-rc6/kernel/Kconfig.preempt linux-2.6.16-rc6-xen0/kernel/Kconfig.preempt +--- ref-linux-2.6.16-rc6/kernel/Kconfig.preempt 2006-01-03 04:21:10.000000000 +0100 ++++ linux-2.6.16-rc6-xen0/kernel/Kconfig.preempt 2006-03-20 22:06:21.000000000 +0100 @@ -35,6 +35,7 @@ config PREEMPT_VOLUNTARY config PREEMPT @@ -80368,9 +80489,9 @@ help This option reduces the latency of the kernel by making all kernel code (that is not executing in a critical section) -diff -Nru -p --exclude='.*' ref-linux-2.6.16-rc5/lib/Kconfig.debug linux-2.6.16-rc5-xen0/lib/Kconfig.debug ---- ref-linux-2.6.16-rc5/lib/Kconfig.debug 2006-03-01 11:12:31.000000000 -0500 -+++ linux-2.6.16-rc5-xen0/lib/Kconfig.debug 2006-03-01 11:09:38.000000000 -0500 +diff -Nru -p --exclude='.*' ref-linux-2.6.16-rc6/lib/Kconfig.debug linux-2.6.16-rc6-xen0/lib/Kconfig.debug +--- ref-linux-2.6.16-rc6/lib/Kconfig.debug 2006-03-20 22:09:05.000000000 +0100 ++++ linux-2.6.16-rc6-xen0/lib/Kconfig.debug 2006-03-20 22:06:21.000000000 +0100 @@ -145,7 +145,7 @@ config DEBUG_BUGVERBOSE config DEBUG_INFO @@ -80380,9 +80501,9 @@ help If you say Y here the resulting kernel image will include debugging info resulting in a larger kernel image. -diff -Nru -p --exclude='.*' ref-linux-2.6.16-rc5/lib/Makefile linux-2.6.16-rc5-xen0/lib/Makefile ---- ref-linux-2.6.16-rc5/lib/Makefile 2006-03-01 11:12:31.000000000 -0500 -+++ linux-2.6.16-rc5-xen0/lib/Makefile 2006-03-01 11:09:38.000000000 -0500 +diff -Nru -p --exclude='.*' ref-linux-2.6.16-rc6/lib/Makefile linux-2.6.16-rc6-xen0/lib/Makefile +--- ref-linux-2.6.16-rc6/lib/Makefile 2006-03-20 22:09:05.000000000 +0100 ++++ linux-2.6.16-rc6-xen0/lib/Makefile 2006-03-20 22:06:21.000000000 +0100 @@ -45,6 +45,9 @@ obj-$(CONFIG_TEXTSEARCH_BM) += ts_bm.o obj-$(CONFIG_TEXTSEARCH_FSM) += ts_fsm.o @@ -80393,9 +80514,9 @@ hostprogs-y := gen_crc32table clean-files := crc32table.h -diff -Nru -p --exclude='.*' ref-linux-2.6.16-rc5/mm/highmem.c linux-2.6.16-rc5-xen0/mm/highmem.c ---- ref-linux-2.6.16-rc5/mm/highmem.c 2006-01-02 22:21:10.000000000 -0500 -+++ linux-2.6.16-rc5-xen0/mm/highmem.c 2006-03-01 11:09:38.000000000 -0500 +diff -Nru -p --exclude='.*' ref-linux-2.6.16-rc6/mm/highmem.c linux-2.6.16-rc6-xen0/mm/highmem.c +--- ref-linux-2.6.16-rc6/mm/highmem.c 2006-01-03 04:21:10.000000000 +0100 ++++ linux-2.6.16-rc6-xen0/mm/highmem.c 2006-03-20 22:06:21.000000000 +0100 @@ -152,6 +152,17 @@ start: return vaddr; } @@ -80414,9 +80535,9 @@ void fastcall *kmap_high(struct page *page) { unsigned long vaddr; -diff -Nru -p --exclude='.*' ref-linux-2.6.16-rc5/mm/Kconfig linux-2.6.16-rc5-xen0/mm/Kconfig ---- ref-linux-2.6.16-rc5/mm/Kconfig 2006-03-01 11:12:31.000000000 -0500 -+++ linux-2.6.16-rc5-xen0/mm/Kconfig 2006-03-01 11:09:38.000000000 -0500 +diff -Nru -p --exclude='.*' ref-linux-2.6.16-rc6/mm/Kconfig linux-2.6.16-rc6-xen0/mm/Kconfig +--- ref-linux-2.6.16-rc6/mm/Kconfig 2006-03-20 22:09:05.000000000 +0100 ++++ linux-2.6.16-rc6-xen0/mm/Kconfig 2006-03-20 22:06:21.000000000 +0100 @@ -126,11 +126,14 @@ comment "Memory hotplug is currently inc # Default to 4 for wider testing, though 8 might be more appropriate. # ARM's adjust_pte (unused if VIPT) depends on mm-wide page_table_lock. @@ -80432,9 +80553,9 @@ default "4" # -diff -Nru -p --exclude='.*' ref-linux-2.6.16-rc5/mm/memory.c linux-2.6.16-rc5-xen0/mm/memory.c ---- ref-linux-2.6.16-rc5/mm/memory.c 2006-03-01 11:12:31.000000000 -0500 -+++ linux-2.6.16-rc5-xen0/mm/memory.c 2006-03-01 11:09:38.000000000 -0500 +diff -Nru -p --exclude='.*' ref-linux-2.6.16-rc6/mm/memory.c linux-2.6.16-rc6-xen0/mm/memory.c +--- ref-linux-2.6.16-rc6/mm/memory.c 2006-03-20 22:09:06.000000000 +0100 ++++ linux-2.6.16-rc6-xen0/mm/memory.c 2006-03-20 22:06:21.000000000 +0100 @@ -405,7 +405,8 @@ struct page *vm_normal_page(struct vm_ar * Remove this test eventually! */ @@ -80568,9 +80689,9 @@ /* * handle_pte_fault chooses page fault handler according to an entry * which was read non-atomically. Before making any commitment, on -diff -Nru -p --exclude='.*' ref-linux-2.6.16-rc5/mm/mmap.c linux-2.6.16-rc5-xen0/mm/mmap.c ---- ref-linux-2.6.16-rc5/mm/mmap.c 2006-03-01 11:12:31.000000000 -0500 -+++ linux-2.6.16-rc5-xen0/mm/mmap.c 2006-03-01 11:09:38.000000000 -0500 +diff -Nru -p --exclude='.*' ref-linux-2.6.16-rc6/mm/mmap.c linux-2.6.16-rc6-xen0/mm/mmap.c +--- ref-linux-2.6.16-rc6/mm/mmap.c 2006-03-20 22:09:06.000000000 +0100 ++++ linux-2.6.16-rc6-xen0/mm/mmap.c 2006-03-20 22:06:21.000000000 +0100 @@ -1937,6 +1937,10 @@ void exit_mmap(struct mm_struct *mm) unsigned long nr_accounted = 0; unsigned long end; @@ -80582,9 +80703,9 @@ lru_add_drain(); flush_cache_mm(mm); tlb = tlb_gather_mmu(mm, 1); -diff -Nru -p --exclude='.*' ref-linux-2.6.16-rc5/mm/page_alloc.c linux-2.6.16-rc5-xen0/mm/page_alloc.c ---- ref-linux-2.6.16-rc5/mm/page_alloc.c 2006-03-01 11:12:31.000000000 -0500 -+++ linux-2.6.16-rc5-xen0/mm/page_alloc.c 2006-03-01 11:09:38.000000000 -0500 +diff -Nru -p --exclude='.*' ref-linux-2.6.16-rc6/mm/page_alloc.c linux-2.6.16-rc6-xen0/mm/page_alloc.c +--- ref-linux-2.6.16-rc6/mm/page_alloc.c 2006-03-20 22:09:06.000000000 +0100 ++++ linux-2.6.16-rc6-xen0/mm/page_alloc.c 2006-03-20 22:06:21.000000000 +0100 @@ -418,7 +418,8 @@ static void __free_pages_ok(struct page int i; int reserved = 0; @@ -80595,7 +80716,7 @@ if (!PageHighMem(page)) mutex_debug_check_no_locks_freed(page_address(page), PAGE_SIZE<mapping = NULL; -diff -Nru -p --exclude='.*' ref-linux-2.6.16-rc5/net/core/dev.c linux-2.6.16-rc5-xen0/net/core/dev.c ---- ref-linux-2.6.16-rc5/net/core/dev.c 2006-03-01 11:12:32.000000000 -0500 -+++ linux-2.6.16-rc5-xen0/net/core/dev.c 2006-03-01 11:09:38.000000000 -0500 +diff -Nru -p --exclude='.*' ref-linux-2.6.16-rc6/net/core/dev.c linux-2.6.16-rc6-xen0/net/core/dev.c +--- ref-linux-2.6.16-rc6/net/core/dev.c 2006-03-20 22:09:06.000000000 +0100 ++++ linux-2.6.16-rc6-xen0/net/core/dev.c 2006-03-20 22:06:21.000000000 +0100 @@ -116,6 +116,12 @@ #endif /* CONFIG_NET_RADIO */ #include @@ -80679,9 +80800,9 @@ list_for_each_entry_rcu(ptype, &ptype_all, list) { if (!ptype->dev || ptype->dev == skb->dev) { if (pt_prev) -diff -Nru -p --exclude='.*' ref-linux-2.6.16-rc5/net/core/skbuff.c linux-2.6.16-rc5-xen0/net/core/skbuff.c ---- ref-linux-2.6.16-rc5/net/core/skbuff.c 2006-03-01 11:12:32.000000000 -0500 -+++ linux-2.6.16-rc5-xen0/net/core/skbuff.c 2006-03-01 11:09:39.000000000 -0500 +diff -Nru -p --exclude='.*' ref-linux-2.6.16-rc6/net/core/skbuff.c linux-2.6.16-rc6-xen0/net/core/skbuff.c +--- ref-linux-2.6.16-rc6/net/core/skbuff.c 2006-03-20 22:09:06.000000000 +0100 ++++ linux-2.6.16-rc6-xen0/net/core/skbuff.c 2006-03-20 22:06:21.000000000 +0100 @@ -132,6 +132,7 @@ void skb_under_panic(struct sk_buff *skb * Buffers may only be allocated from interrupts using a @gfp_mask of * %GFP_ATOMIC. @@ -80767,9 +80888,9 @@ C(pkt_type); C(ip_summed); C(priority); -diff -Nru -p --exclude='.*' ref-linux-2.6.16-rc5/scripts/Makefile.xen linux-2.6.16-rc5-xen0/scripts/Makefile.xen ---- ref-linux-2.6.16-rc5/scripts/Makefile.xen 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.16-rc5-xen0/scripts/Makefile.xen 2006-03-01 11:09:39.000000000 -0500 +diff -Nru -p --exclude='.*' ref-linux-2.6.16-rc6/scripts/Makefile.xen linux-2.6.16-rc6-xen0/scripts/Makefile.xen +--- ref-linux-2.6.16-rc6/scripts/Makefile.xen 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.16-rc6-xen0/scripts/Makefile.xen 2006-03-20 22:06:21.000000000 +0100 @@ -0,0 +1,14 @@ + +# cherrypickxen($1 = allobj) Index: sources =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/sources,v retrieving revision 1.329 retrieving revision 1.330 diff -u -r1.329 -r1.330 --- sources 20 Mar 2006 22:24:33 -0000 1.329 +++ sources 21 Mar 2006 18:43:44 -0000 1.330 @@ -1,3 +1,4 @@ 9a91b2719949ff0856b40bc467fd47be linux-2.6.16.tar.bz2 cdfde609af8adcf58d7ff626599b2d90 xen-20060301.tar.bz2 81203bd932c96ebdbaba3ada9f3685e2 patch-2.6.16-git1.bz2 +8c70806f9075ebc0087f7ce1b8911700 xen-20060320.tar.bz2 From fedora-cvs-commits at redhat.com Tue Mar 21 18:45:10 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 21 Mar 2006 13:45:10 -0500 Subject: rpms/kernel/devel kernel-2.6.spec, 1.2077, 1.2078 xen-9232_fix_vmx.patch, 1.1, NONE xen-9236_fix_vmx.patch, 1.1, NONE Message-ID: <200603211845.k2LIjAD5010913@cvs.devel.redhat.com> Author: quintela Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv10899 Modified Files: kernel-2.6.spec Removed Files: xen-9232_fix_vmx.patch xen-9236_fix_vmx.patch Log Message: remove xen HV patches already merged upstream Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.2077 retrieving revision 1.2078 diff -u -r1.2077 -r1.2078 --- kernel-2.6.spec 21 Mar 2006 18:43:44 -0000 1.2077 +++ kernel-2.6.spec 21 Mar 2006 18:45:08 -0000 1.2078 @@ -418,8 +418,6 @@ # Xen hypervisor patches Patch20000: xen-sched-sedf.patch -Patch20001: xen-9232_fix_vmx.patch -Patch20002: xen-9236_fix_vmx.patch # END OF PATCH DEFINITIONS @@ -705,8 +703,6 @@ # Any necessary hypervisor patches go here %patch20000 -p1 -%patch20001 -p1 -%patch20002 -p1 cd linux-%{kversion}.%{_target_cpu} --- xen-9232_fix_vmx.patch DELETED --- --- xen-9236_fix_vmx.patch DELETED --- From fedora-cvs-commits at redhat.com Tue Mar 21 19:46:13 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 21 Mar 2006 14:46:13 -0500 Subject: rpms/selinux-policy/devel .cvsignore, 1.48, 1.49 policy-20060207.patch, 1.53, 1.54 policygentool, 1.4, 1.5 selinux-policy.spec, 1.156, 1.157 sources, 1.52, 1.53 Message-ID: <200603211946.k2LJkD84012054@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/selinux-policy/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv11429 Modified Files: .cvsignore policy-20060207.patch policygentool selinux-policy.spec sources Log Message: * Wed Mar 17 2006 Dan Walsh 2.2.24-1 - Update to upstream Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/.cvsignore,v retrieving revision 1.48 retrieving revision 1.49 diff -u -r1.48 -r1.49 --- .cvsignore 18 Mar 2006 04:09:10 -0000 1.48 +++ .cvsignore 21 Mar 2006 19:46:10 -0000 1.49 @@ -49,3 +49,4 @@ serefpolicy-2.2.22.tgz serefpolicy-2.2.23.tgz serefpolicy-2.2.24.tgz +serefpolicy-2.2.25.tgz policy-20060207.patch: Rules.modular | 2 policy/mcs | 4 policy/modules/admin/bootloader.te | 2 policy/modules/admin/dmidecode.te | 2 policy/modules/admin/readahead.te | 2 policy/modules/admin/rpm.fc | 3 policy/modules/admin/rpm.if | 3 policy/modules/admin/rpm.te | 1 policy/modules/admin/su.fc | 1 policy/modules/admin/su.if | 6 policy/modules/admin/updfstab.te | 4 policy/modules/admin/vbetool.te | 9 + policy/modules/kernel/corenetwork.te.in | 3 policy/modules/kernel/devices.fc | 1 policy/modules/kernel/devices.if | 21 ++- policy/modules/kernel/files.fc | 8 - policy/modules/kernel/files.if | 21 ++- policy/modules/kernel/filesystem.te | 1 policy/modules/kernel/kernel.if | 102 ++++++++++++++ policy/modules/kernel/kernel.te | 3 policy/modules/services/apache.fc | 2 policy/modules/services/apache.if | 5 policy/modules/services/apm.fc | 2 policy/modules/services/apm.te | 4 policy/modules/services/bluetooth.te | 38 ++--- policy/modules/services/cron.te | 3 policy/modules/services/cups.fc | 2 policy/modules/services/cups.if | 22 +++ policy/modules/services/cups.te | 7 - policy/modules/services/cvs.te | 2 policy/modules/services/hal.if | 41 +++++ policy/modules/services/hal.te | 17 ++ policy/modules/services/ktalk.fc | 1 policy/modules/services/ktalk.te | 6 policy/modules/services/mailman.if | 25 +++ policy/modules/services/nis.fc | 1 policy/modules/services/nis.if | 25 +++ policy/modules/services/nis.te | 28 ++++ policy/modules/services/nscd.if | 2 policy/modules/services/pegasus.te | 1 policy/modules/services/postfix.te | 4 policy/modules/services/privoxy.te | 5 policy/modules/services/samba.te | 2 policy/modules/services/sendmail.te | 1 policy/modules/services/xserver.if | 20 ++ policy/modules/system/fstools.if | 18 ++ policy/modules/system/fstools.te | 7 + policy/modules/system/init.te | 5 policy/modules/system/libraries.fc | 2 policy/modules/system/locallogin.te | 1 policy/modules/system/lvm.fc | 1 policy/modules/system/lvm.te | 3 policy/modules/system/mount.te | 3 policy/modules/system/selinuxutil.fc | 6 policy/modules/system/selinuxutil.if | 23 ++- policy/modules/system/selinuxutil.te | 16 ++ policy/modules/system/sysnetwork.te | 7 + policy/modules/system/udev.te | 2 policy/modules/system/unconfined.te | 8 - policy/modules/system/userdomain.te | 1 policy/modules/system/xend.fc | 23 +++ policy/modules/system/xend.if | 71 ++++++++++ policy/modules/system/xend.te | 219 ++++++++++++++++++++++++++++++++ 63 files changed, 817 insertions(+), 64 deletions(-) Index: policy-20060207.patch =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20060207.patch,v retrieving revision 1.53 retrieving revision 1.54 diff -u -r1.53 -r1.54 --- policy-20060207.patch 21 Mar 2006 15:42:38 -0000 1.53 +++ policy-20060207.patch 21 Mar 2006 19:46:10 -0000 1.54 @@ -1,6 +1,6 @@ -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/mcs serefpolicy-2.2.24/policy/mcs +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/mcs serefpolicy-2.2.25/policy/mcs --- nsaserefpolicy/policy/mcs 2006-02-16 14:46:56.000000000 -0500 -+++ serefpolicy-2.2.24/policy/mcs 2006-03-17 14:30:03.000000000 -0500 ++++ serefpolicy-2.2.25/policy/mcs 2006-03-21 11:57:52.000000000 -0500 @@ -141,9 +141,7 @@ mlsconstrain file { create relabelto } ((h1 dom h2) and (l2 eq h2)); @@ -12,9 +12,9 @@ # new file labels must be dominated by the relabeling subject clearance mlsconstrain { dir lnk_file chr_file blk_file sock_file fifo_file } { relabelfrom } -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/bootloader.te serefpolicy-2.2.24/policy/modules/admin/bootloader.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/bootloader.te serefpolicy-2.2.25/policy/modules/admin/bootloader.te --- nsaserefpolicy/policy/modules/admin/bootloader.te 2006-03-17 13:51:46.000000000 -0500 -+++ serefpolicy-2.2.24/policy/modules/admin/bootloader.te 2006-03-17 14:30:03.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/admin/bootloader.te 2006-03-21 11:57:52.000000000 -0500 @@ -103,7 +103,7 @@ files_manage_boot_symlinks(bootloader_t) files_read_etc_files(bootloader_t) @@ -24,9 +24,9 @@ files_read_usr_src_files(bootloader_t) files_read_usr_files(bootloader_t) files_read_var_files(bootloader_t) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/dmidecode.te serefpolicy-2.2.24/policy/modules/admin/dmidecode.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/dmidecode.te serefpolicy-2.2.25/policy/modules/admin/dmidecode.te --- nsaserefpolicy/policy/modules/admin/dmidecode.te 2006-03-04 00:06:33.000000000 -0500 -+++ serefpolicy-2.2.24/policy/modules/admin/dmidecode.te 2006-03-17 14:30:03.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/admin/dmidecode.te 2006-03-21 11:57:52.000000000 -0500 @@ -32,6 +32,8 @@ locallogin_use_fds(dmidecode_t) @@ -36,9 +36,9 @@ ifdef(`targeted_policy',` term_use_generic_ptys(dmidecode_t) term_use_unallocated_ttys(dmidecode_t) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/readahead.te serefpolicy-2.2.24/policy/modules/admin/readahead.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/readahead.te serefpolicy-2.2.25/policy/modules/admin/readahead.te --- nsaserefpolicy/policy/modules/admin/readahead.te 2006-03-17 13:51:47.000000000 -0500 -+++ serefpolicy-2.2.24/policy/modules/admin/readahead.te 2006-03-17 14:30:03.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/admin/readahead.te 2006-03-21 11:57:52.000000000 -0500 @@ -18,7 +18,7 @@ # Local policy # @@ -48,10 +48,18 @@ allow readahead_t self:process signal_perms; allow readahead_t readahead_var_run_t:file create_file_perms; -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.fc serefpolicy-2.2.24/policy/modules/admin/rpm.fc +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.fc serefpolicy-2.2.25/policy/modules/admin/rpm.fc --- nsaserefpolicy/policy/modules/admin/rpm.fc 2006-03-17 13:51:47.000000000 -0500 -+++ serefpolicy-2.2.24/policy/modules/admin/rpm.fc 2006-03-17 14:30:03.000000000 -0500 -@@ -22,7 +22,7 @@ ++++ serefpolicy-2.2.25/policy/modules/admin/rpm.fc 2006-03-21 14:31:30.000000000 -0500 +@@ -3,6 +3,7 @@ + /usr/bin/smart -- gen_context(system_u:object_r:rpm_exec_t,s0) + + /usr/bin/yum -- gen_context(system_u:object_r:rpm_exec_t,s0) ++/usr/share/yumex/yumex -- gen_context(system_u:object_r:rpm_exec_t,s0) + + /usr/lib(64)?/rpm/rpmd -- gen_context(system_u:object_r:bin_t,s0) + /usr/lib(64)?/rpm/rpmq -- gen_context(system_u:object_r:bin_t,s0) +@@ -22,7 +23,7 @@ /var/lib/rpm(/.*)? gen_context(system_u:object_r:rpm_var_lib_t,s0) /var/log/rpmpkgs.* -- gen_context(system_u:object_r:rpm_log_t,s0) @@ -60,9 +68,9 @@ # SuSE ifdef(`distro_suse', ` -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.if serefpolicy-2.2.24/policy/modules/admin/rpm.if +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.if serefpolicy-2.2.25/policy/modules/admin/rpm.if --- nsaserefpolicy/policy/modules/admin/rpm.if 2006-03-04 00:06:33.000000000 -0500 -+++ serefpolicy-2.2.24/policy/modules/admin/rpm.if 2006-03-17 14:30:03.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/admin/rpm.if 2006-03-21 11:57:52.000000000 -0500 @@ -78,6 +78,9 @@ role $2 types rpm_t; role $2 types rpm_script_t; @@ -73,9 +81,9 @@ allow rpm_t $3:chr_file rw_term_perms; ') -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.te serefpolicy-2.2.24/policy/modules/admin/rpm.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.te serefpolicy-2.2.25/policy/modules/admin/rpm.te --- nsaserefpolicy/policy/modules/admin/rpm.te 2006-03-17 13:51:47.000000000 -0500 -+++ serefpolicy-2.2.24/policy/modules/admin/rpm.te 2006-03-17 14:30:03.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/admin/rpm.te 2006-03-21 11:57:52.000000000 -0500 @@ -326,6 +326,7 @@ seutil_domtrans_loadpolicy(rpm_script_t) @@ -84,17 +92,17 @@ userdom_use_all_users_fds(rpm_script_t) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/su.fc serefpolicy-2.2.24/policy/modules/admin/su.fc +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/su.fc serefpolicy-2.2.25/policy/modules/admin/su.fc --- nsaserefpolicy/policy/modules/admin/su.fc 2005-11-14 18:24:06.000000000 -0500 -+++ serefpolicy-2.2.24/policy/modules/admin/su.fc 2006-03-17 14:30:03.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/admin/su.fc 2006-03-21 11:57:52.000000000 -0500 @@ -2,3 +2,4 @@ /bin/su -- gen_context(system_u:object_r:su_exec_t,s0) /usr(/local)?/bin/ksu -- gen_context(system_u:object_r:su_exec_t,s0) +/usr/bin/kdesu -- gen_context(system_u:object_r:su_exec_t,s0) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/su.if serefpolicy-2.2.24/policy/modules/admin/su.if +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/su.if serefpolicy-2.2.25/policy/modules/admin/su.if --- nsaserefpolicy/policy/modules/admin/su.if 2006-03-04 00:06:33.000000000 -0500 -+++ serefpolicy-2.2.24/policy/modules/admin/su.if 2006-03-17 14:30:03.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/admin/su.if 2006-03-21 11:57:52.000000000 -0500 @@ -141,10 +141,10 @@ # By default, revert to the calling domain when a shell is executed. @@ -109,9 +117,9 @@ kernel_read_system_state($1_su_t) kernel_read_kernel_sysctls($1_su_t) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/updfstab.te serefpolicy-2.2.24/policy/modules/admin/updfstab.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/updfstab.te serefpolicy-2.2.25/policy/modules/admin/updfstab.te --- nsaserefpolicy/policy/modules/admin/updfstab.te 2006-03-04 00:06:33.000000000 -0500 -+++ serefpolicy-2.2.24/policy/modules/admin/updfstab.te 2006-03-17 14:30:03.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/admin/updfstab.te 2006-03-21 11:57:52.000000000 -0500 @@ -125,6 +125,6 @@ udev_read_db(updfstab_t) ') @@ -121,9 +129,9 @@ +optional_policy(`fstools',` + fstools_getattr_swap_files(updfstab_t) ') -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/vbetool.te serefpolicy-2.2.24/policy/modules/admin/vbetool.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/vbetool.te serefpolicy-2.2.25/policy/modules/admin/vbetool.te --- nsaserefpolicy/policy/modules/admin/vbetool.te 2006-02-01 08:23:27.000000000 -0500 -+++ serefpolicy-2.2.24/policy/modules/admin/vbetool.te 2006-03-17 14:30:03.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/admin/vbetool.te 2006-03-21 11:57:52.000000000 -0500 @@ -15,6 +15,7 @@ # Local policy # @@ -144,18 +152,9 @@ +optional_policy(`hal',` + hal_rw_var_run(vbetool_t) +') -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corenetwork.te.in serefpolicy-2.2.24/policy/modules/kernel/corenetwork.te.in ---- nsaserefpolicy/policy/modules/kernel/corenetwork.te.in 2006-03-17 13:51:48.000000000 -0500 -+++ serefpolicy-2.2.24/policy/modules/kernel/corenetwork.te.in 2006-03-21 08:10:24.000000000 -0500 -@@ -66,7 +66,7 @@ - network_port(giftd, tcp,1213,s0) - network_port(gopher, tcp,70,s0, udp,70,s0) - network_port(http_cache, tcp,3128,s0, udp,3130,s0, tcp,8080,s0, tcp,8118,s0) # 8118 is for privoxy --network_port(http, tcp,80,s0, tcp,443,s0, tcp,488,s0, tcp,8008,s0) -+network_port(http, tcp,80,s0, tcp,443,s0, tcp,488,s0, tcp,8008,s0, tcp, 9050, s0) # 9050 is for Tor - network_port(howl, tcp,5335,s0, udp,5353,s0) - network_port(hplip, tcp,50000,s0, tcp,50002,s0) - network_port(i18n_input, tcp,9010,s0) +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corenetwork.te.in serefpolicy-2.2.25/policy/modules/kernel/corenetwork.te.in +--- nsaserefpolicy/policy/modules/kernel/corenetwork.te.in 2006-03-21 11:38:20.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/kernel/corenetwork.te.in 2006-03-21 11:57:52.000000000 -0500 @@ -126,7 +126,8 @@ type utcpserver_port_t, port_type; dnl network_port(utcpserver) # no defined portcon network_port(uucpd, tcp,540,s0) @@ -166,10 +165,10 @@ network_port(zebra, tcp,2601,s0) network_port(zope, tcp,8021,s0) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.fc serefpolicy-2.2.24/policy/modules/kernel/devices.fc ---- nsaserefpolicy/policy/modules/kernel/devices.fc 2006-02-27 17:17:23.000000000 -0500 -+++ serefpolicy-2.2.24/policy/modules/kernel/devices.fc 2006-03-17 14:30:03.000000000 -0500 -@@ -33,6 +33,7 @@ +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.fc serefpolicy-2.2.25/policy/modules/kernel/devices.fc +--- nsaserefpolicy/policy/modules/kernel/devices.fc 2006-03-21 11:38:20.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/kernel/devices.fc 2006-03-21 11:57:52.000000000 -0500 +@@ -37,6 +37,7 @@ /dev/par.* -c gen_context(system_u:object_r:printer_device_t,s0) /dev/patmgr[01] -c gen_context(system_u:object_r:sound_device_t,s0) /dev/pmu -c gen_context(system_u:object_r:power_device_t,s0) @@ -177,9 +176,9 @@ /dev/port -c gen_context(system_u:object_r:memory_device_t,s15:c0.c255) /dev/(misc/)?psaux -c gen_context(system_u:object_r:mouse_device_t,s0) /dev/rmidi.* -c gen_context(system_u:object_r:sound_device_t,s0) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.if serefpolicy-2.2.24/policy/modules/kernel/devices.if +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.if serefpolicy-2.2.25/policy/modules/kernel/devices.if --- nsaserefpolicy/policy/modules/kernel/devices.if 2006-03-17 13:51:48.000000000 -0500 -+++ serefpolicy-2.2.24/policy/modules/kernel/devices.if 2006-03-17 14:30:03.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/kernel/devices.if 2006-03-21 11:57:52.000000000 -0500 @@ -2382,7 +2382,7 @@ ') @@ -212,9 +211,9 @@ + dontaudit $1 device_node:dir_file_class_set getattr; +') + -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.fc serefpolicy-2.2.24/policy/modules/kernel/files.fc +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.fc serefpolicy-2.2.25/policy/modules/kernel/files.fc --- nsaserefpolicy/policy/modules/kernel/files.fc 2006-03-04 00:06:34.000000000 -0500 -+++ serefpolicy-2.2.24/policy/modules/kernel/files.fc 2006-03-17 14:30:03.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/kernel/files.fc 2006-03-21 11:57:52.000000000 -0500 @@ -45,7 +45,7 @@ /etc(/.*)? gen_context(system_u:object_r:etc_t,s0) /etc/\.fstab\.hal\..+ -- gen_context(system_u:object_r:etc_runtime_t,s0) @@ -251,9 +250,9 @@ HOME_ROOT/\.journal <> HOME_ROOT/lost\+found -d gen_context(system_u:object_r:lost_found_t,s15:c0.c255) HOME_ROOT/lost\+found/.* <> -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.if serefpolicy-2.2.24/policy/modules/kernel/files.if +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.if serefpolicy-2.2.25/policy/modules/kernel/files.if --- nsaserefpolicy/policy/modules/kernel/files.if 2006-03-17 13:51:48.000000000 -0500 -+++ serefpolicy-2.2.24/policy/modules/kernel/files.if 2006-03-17 14:30:03.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/kernel/files.if 2006-03-21 11:57:52.000000000 -0500 @@ -1648,6 +1648,21 @@ ') @@ -300,17 +299,17 @@ ') ######################################## -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/filesystem.te serefpolicy-2.2.24/policy/modules/kernel/filesystem.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/filesystem.te serefpolicy-2.2.25/policy/modules/kernel/filesystem.te --- nsaserefpolicy/policy/modules/kernel/filesystem.te 2006-03-17 13:51:48.000000000 -0500 -+++ serefpolicy-2.2.24/policy/modules/kernel/filesystem.te 2006-03-17 14:30:03.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/kernel/filesystem.te 2006-03-21 11:57:52.000000000 -0500 @@ -167,3 +167,4 @@ genfscon nfs / gen_context(system_u:object_r:nfs_t,s0) genfscon nfs4 / gen_context(system_u:object_r:nfs_t,s0) genfscon afs / gen_context(system_u:object_r:nfs_t,s0) +genfscon hfsplus / gen_context(system_u:object_r:nfs_t,s0) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel.if serefpolicy-2.2.24/policy/modules/kernel/kernel.if +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel.if serefpolicy-2.2.25/policy/modules/kernel/kernel.if --- nsaserefpolicy/policy/modules/kernel/kernel.if 2006-03-04 00:06:34.000000000 -0500 -+++ serefpolicy-2.2.24/policy/modules/kernel/kernel.if 2006-03-17 14:30:03.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/kernel/kernel.if 2006-03-21 11:57:52.000000000 -0500 @@ -1044,6 +1044,7 @@ allow $1 proc_t:dir search; @@ -431,9 +430,9 @@ + allow $1 proc_xen_t:dir r_dir_perms; + allow $1 proc_xen_t:file write; +') -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel.te serefpolicy-2.2.24/policy/modules/kernel/kernel.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel.te serefpolicy-2.2.25/policy/modules/kernel/kernel.te --- nsaserefpolicy/policy/modules/kernel/kernel.te 2006-03-17 13:51:48.000000000 -0500 -+++ serefpolicy-2.2.24/policy/modules/kernel/kernel.te 2006-03-17 14:30:03.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/kernel/kernel.te 2006-03-21 11:57:52.000000000 -0500 @@ -75,6 +75,9 @@ type proc_net_t, proc_type; genfscon proc /net gen_context(system_u:object_r:proc_net_t,s0) @@ -444,22 +443,9 @@ # # Sysctl types # -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/terminal.if serefpolicy-2.2.24/policy/modules/kernel/terminal.if ---- nsaserefpolicy/policy/modules/kernel/terminal.if 2006-02-14 07:20:25.000000000 -0500 -+++ serefpolicy-2.2.24/policy/modules/kernel/terminal.if 2006-03-17 14:30:03.000000000 -0500 -@@ -588,8 +588,8 @@ - type devpts_t; - ') - -- dev_list_all_dev_nodes($1) - allow $1 devpts_t:dir r_dir_perms; -+ dev_list_all_dev_nodes($1) - allow $1 ptynode:chr_file { rw_term_perms lock append }; - ') - -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.fc serefpolicy-2.2.24/policy/modules/services/apache.fc +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.fc serefpolicy-2.2.25/policy/modules/services/apache.fc --- nsaserefpolicy/policy/modules/services/apache.fc 2006-02-27 17:17:23.000000000 -0500 -+++ serefpolicy-2.2.24/policy/modules/services/apache.fc 2006-03-17 14:30:03.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/services/apache.fc 2006-03-21 11:57:52.000000000 -0500 @@ -15,6 +15,7 @@ /etc/vhosts -- gen_context(system_u:object_r:httpd_config_t,s0) @@ -473,9 +459,9 @@ /var/www/icons(/.*)? gen_context(system_u:object_r:httpd_sys_content_t,s0) /var/www/perl(/.*)? gen_context(system_u:object_r:httpd_sys_script_exec_t,s0) +/usr/share/selinux-policy([^/]*)?/html(/.*)? gen_context(system_u:object_r:httpd_sys_content_t,s0) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.if serefpolicy-2.2.24/policy/modules/services/apache.if +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.if serefpolicy-2.2.25/policy/modules/services/apache.if --- nsaserefpolicy/policy/modules/services/apache.if 2006-03-17 13:51:48.000000000 -0500 -+++ serefpolicy-2.2.24/policy/modules/services/apache.if 2006-03-17 14:30:03.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/services/apache.if 2006-03-21 11:57:52.000000000 -0500 @@ -12,6 +12,11 @@ ## # @@ -488,9 +474,9 @@ # allow write access to public file transfer # services files. gen_tunable(allow_httpd_$1_script_anon_write,false) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apm.fc serefpolicy-2.2.24/policy/modules/services/apm.fc +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apm.fc serefpolicy-2.2.25/policy/modules/services/apm.fc --- nsaserefpolicy/policy/modules/services/apm.fc 2005-11-14 18:24:08.000000000 -0500 -+++ serefpolicy-2.2.24/policy/modules/services/apm.fc 2006-03-17 14:30:03.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/services/apm.fc 2006-03-21 11:57:52.000000000 -0500 @@ -11,7 +11,7 @@ # # /var @@ -500,9 +486,9 @@ /var/run/\.?acpid\.socket -s gen_context(system_u:object_r:apmd_var_run_t,s0) /var/run/apmd\.pid -- gen_context(system_u:object_r:apmd_var_run_t,s0) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apm.te serefpolicy-2.2.24/policy/modules/services/apm.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apm.te serefpolicy-2.2.25/policy/modules/services/apm.te --- nsaserefpolicy/policy/modules/services/apm.te 2006-03-04 00:06:35.000000000 -0500 -+++ serefpolicy-2.2.24/policy/modules/services/apm.te 2006-03-17 14:30:03.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/services/apm.te 2006-03-21 11:57:52.000000000 -0500 @@ -225,6 +225,10 @@ pcmcia_domtrans_cardctl(apmd_t) ') @@ -514,9 +500,9 @@ optional_policy(`selinuxutil',` seutil_sigchld_newrole(apmd_t) ') -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bluetooth.te serefpolicy-2.2.24/policy/modules/services/bluetooth.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bluetooth.te serefpolicy-2.2.25/policy/modules/services/bluetooth.te --- nsaserefpolicy/policy/modules/services/bluetooth.te 2006-03-17 13:51:48.000000000 -0500 -+++ serefpolicy-2.2.24/policy/modules/services/bluetooth.te 2006-03-21 08:22:49.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/services/bluetooth.te 2006-03-21 11:57:52.000000000 -0500 @@ -115,6 +115,7 @@ corecmd_exec_shell(bluetooth_t) @@ -598,9 +584,9 @@ allow bluetooth_helper_t unconfined_t:unix_stream_socket connectto; + allow bluetooth_helper_t tmpfs_t:file { read write }; ') -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.te serefpolicy-2.2.24/policy/modules/services/cron.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.te serefpolicy-2.2.25/policy/modules/services/cron.te --- nsaserefpolicy/policy/modules/services/cron.te 2006-03-17 13:51:48.000000000 -0500 -+++ serefpolicy-2.2.24/policy/modules/services/cron.te 2006-03-17 14:30:03.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/services/cron.te 2006-03-21 11:57:52.000000000 -0500 @@ -166,6 +166,9 @@ allow crond_t unconfined_t:dbus send_msg; @@ -611,9 +597,9 @@ ',` allow crond_t crond_tmp_t:dir create_dir_perms; allow crond_t crond_tmp_t:file create_file_perms; -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.fc serefpolicy-2.2.24/policy/modules/services/cups.fc +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.fc serefpolicy-2.2.25/policy/modules/services/cups.fc --- nsaserefpolicy/policy/modules/services/cups.fc 2005-11-14 18:24:08.000000000 -0500 -+++ serefpolicy-2.2.24/policy/modules/services/cups.fc 2006-03-17 14:30:03.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/services/cups.fc 2006-03-21 11:57:52.000000000 -0500 @@ -43,7 +43,7 @@ /var/log/cups(/.*)? gen_context(system_u:object_r:cupsd_log_t,s0) /var/log/turboprint_cups\.log.* -- gen_context(system_u:object_r:cupsd_log_t,s0) @@ -623,9 +609,9 @@ /var/run/hp.*\.pid -- gen_context(system_u:object_r:hplip_var_run_t,s0) /var/run/hp.*\.port -- gen_context(system_u:object_r:hplip_var_run_t,s0) /var/run/ptal-printd(/.*)? gen_context(system_u:object_r:ptal_var_run_t,s0) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.if serefpolicy-2.2.24/policy/modules/services/cups.if +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.if serefpolicy-2.2.25/policy/modules/services/cups.if --- nsaserefpolicy/policy/modules/services/cups.if 2006-02-23 09:25:09.000000000 -0500 -+++ serefpolicy-2.2.24/policy/modules/services/cups.if 2006-03-17 14:30:03.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/services/cups.if 2006-03-21 11:57:52.000000000 -0500 @@ -226,3 +226,25 @@ allow cupsd_t $1:tcp_socket { acceptfrom recvfrom }; kernel_tcp_recvfrom($1) @@ -652,9 +638,9 @@ + allow $1 cupsd_t:unix_stream_socket connectto; +') + -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.te serefpolicy-2.2.24/policy/modules/services/cups.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.te serefpolicy-2.2.25/policy/modules/services/cups.te --- nsaserefpolicy/policy/modules/services/cups.te 2006-03-17 13:51:48.000000000 -0500 -+++ serefpolicy-2.2.24/policy/modules/services/cups.te 2006-03-17 14:30:03.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/services/cups.te 2006-03-21 11:57:52.000000000 -0500 @@ -77,7 +77,7 @@ dontaudit cupsd_t self:capability { sys_tty_config net_admin }; allow cupsd_t self:process { setsched signal_perms }; @@ -697,9 +683,9 @@ ') ######################################## -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cvs.te serefpolicy-2.2.24/policy/modules/services/cvs.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cvs.te serefpolicy-2.2.25/policy/modules/services/cvs.te --- nsaserefpolicy/policy/modules/services/cvs.te 2006-03-04 00:06:35.000000000 -0500 -+++ serefpolicy-2.2.24/policy/modules/services/cvs.te 2006-03-17 14:30:03.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/services/cvs.te 2006-03-21 11:57:52.000000000 -0500 @@ -11,7 +11,7 @@ inetd_tcp_service_domain(cvs_t,cvs_exec_t) role system_r types cvs_t; @@ -709,9 +695,9 @@ files_type(cvs_data_t) type cvs_tmp_t; -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.if serefpolicy-2.2.24/policy/modules/services/hal.if +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.if serefpolicy-2.2.25/policy/modules/services/hal.if --- nsaserefpolicy/policy/modules/services/hal.if 2006-03-04 00:06:36.000000000 -0500 -+++ serefpolicy-2.2.24/policy/modules/services/hal.if 2006-03-17 14:30:03.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/services/hal.if 2006-03-21 11:57:52.000000000 -0500 @@ -100,3 +100,44 @@ allow $1 hald_t:dbus send_msg; allow hald_t $1:dbus send_msg; @@ -757,9 +743,9 @@ + allow $1 hald_var_run_t:file rw_file_perms; +') + -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.te serefpolicy-2.2.24/policy/modules/services/hal.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.te serefpolicy-2.2.25/policy/modules/services/hal.te --- nsaserefpolicy/policy/modules/services/hal.te 2006-03-17 13:51:48.000000000 -0500 -+++ serefpolicy-2.2.24/policy/modules/services/hal.te 2006-03-21 08:06:25.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/services/hal.te 2006-03-21 11:57:52.000000000 -0500 @@ -22,7 +22,7 @@ # @@ -820,24 +806,24 @@ nis_use_ypbind(hald_t) ') -+optional_policy(`hal', ` -+ hal_domtrans(ntpd_t) -+'); ++optional_policy(`ntp', ` ++ ntp_domtrans(hald_t) ++') + optional_policy(`nscd',` nscd_socket_use(hald_t) ') -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ktalk.fc serefpolicy-2.2.24/policy/modules/services/ktalk.fc +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ktalk.fc serefpolicy-2.2.25/policy/modules/services/ktalk.fc --- nsaserefpolicy/policy/modules/services/ktalk.fc 2006-02-20 14:07:37.000000000 -0500 -+++ serefpolicy-2.2.24/policy/modules/services/ktalk.fc 2006-03-17 14:30:03.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/services/ktalk.fc 2006-03-21 11:57:52.000000000 -0500 @@ -1,3 +1,4 @@ /usr/bin/in.talkd -- gen_context(system_u:object_r:ktalkd_exec_t,s0) /usr/bin/ktalkd -- gen_context(system_u:object_r:ktalkd_exec_t,s0) +/var/log/talkd.* -- gen_context(system_u:object_r:ktalkd_log_t,s0) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ktalk.te serefpolicy-2.2.24/policy/modules/services/ktalk.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ktalk.te serefpolicy-2.2.25/policy/modules/services/ktalk.te --- nsaserefpolicy/policy/modules/services/ktalk.te 2006-03-17 13:51:48.000000000 -0500 -+++ serefpolicy-2.2.24/policy/modules/services/ktalk.te 2006-03-17 14:30:03.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/services/ktalk.te 2006-03-21 11:57:52.000000000 -0500 @@ -14,6 +14,9 @@ type ktalkd_tmp_t; files_tmp_file(ktalkd_tmp_t) @@ -861,9 +847,9 @@ miscfiles_read_localization(ktalkd_t) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mailman.if serefpolicy-2.2.24/policy/modules/services/mailman.if +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mailman.if serefpolicy-2.2.25/policy/modules/services/mailman.if --- nsaserefpolicy/policy/modules/services/mailman.if 2006-03-04 00:06:36.000000000 -0500 -+++ serefpolicy-2.2.24/policy/modules/services/mailman.if 2006-03-17 14:30:03.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/services/mailman.if 2006-03-21 11:57:52.000000000 -0500 @@ -275,3 +275,28 @@ allow $1 mailman_archive_t:file r_file_perms; allow $1 mailman_archive_t:lnk_file { getattr read }; @@ -893,17 +879,17 @@ + allow mailman_queue_t $1:process sigchld; +') + -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nis.fc serefpolicy-2.2.24/policy/modules/services/nis.fc +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nis.fc serefpolicy-2.2.25/policy/modules/services/nis.fc --- nsaserefpolicy/policy/modules/services/nis.fc 2005-11-28 21:48:04.000000000 -0500 -+++ serefpolicy-2.2.24/policy/modules/services/nis.fc 2006-03-17 14:30:03.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/services/nis.fc 2006-03-21 11:57:52.000000000 -0500 @@ -7,3 +7,4 @@ /usr/sbin/ypserv -- gen_context(system_u:object_r:ypserv_exec_t,s0) /var/yp(/.*)? gen_context(system_u:object_r:var_yp_t,s0) +/usr/sbin/rpc.ypxfr -- gen_context(system_u:object_r:ypxfr_exec_t,s0) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nis.if serefpolicy-2.2.24/policy/modules/services/nis.if +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nis.if serefpolicy-2.2.25/policy/modules/services/nis.if --- nsaserefpolicy/policy/modules/services/nis.if 2006-02-10 21:34:14.000000000 -0500 -+++ serefpolicy-2.2.24/policy/modules/services/nis.if 2006-03-17 14:30:03.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/services/nis.if 2006-03-21 11:57:52.000000000 -0500 @@ -277,3 +277,28 @@ files_search_etc($1) allow $1 ypserv_conf_t:file { getattr read }; @@ -933,9 +919,9 @@ + allow ypxfr_t $1:fifo_file rw_file_perms; + allow ypxfr_t $1:process sigchld; +') -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nis.te serefpolicy-2.2.24/policy/modules/services/nis.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nis.te serefpolicy-2.2.25/policy/modules/services/nis.te --- nsaserefpolicy/policy/modules/services/nis.te 2006-03-04 00:06:36.000000000 -0500 -+++ serefpolicy-2.2.24/policy/modules/services/nis.te 2006-03-17 14:30:03.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/services/nis.te 2006-03-21 11:57:52.000000000 -0500 @@ -31,6 +31,10 @@ type ypserv_exec_t; init_daemon_domain(ypserv_t,ypserv_exec_t) @@ -989,9 +975,9 @@ + +allow ypxfr_t etc_t:file { getattr read }; +files_read_etc_files(ypxfr_t) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nscd.if serefpolicy-2.2.24/policy/modules/services/nscd.if +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nscd.if serefpolicy-2.2.25/policy/modules/services/nscd.if --- nsaserefpolicy/policy/modules/services/nscd.if 2006-02-10 21:34:14.000000000 -0500 -+++ serefpolicy-2.2.24/policy/modules/services/nscd.if 2006-03-17 14:30:03.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/services/nscd.if 2006-03-21 11:57:52.000000000 -0500 @@ -49,8 +49,8 @@ dontaudit $1 nscd_t:nscd { shmempwd shmemgrp shmemhost }; @@ -1002,9 +988,9 @@ dontaudit $1 nscd_var_run_t:file { getattr read }; ') -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pegasus.te serefpolicy-2.2.24/policy/modules/services/pegasus.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pegasus.te serefpolicy-2.2.25/policy/modules/services/pegasus.te --- nsaserefpolicy/policy/modules/services/pegasus.te 2006-03-04 00:06:36.000000000 -0500 -+++ serefpolicy-2.2.24/policy/modules/services/pegasus.te 2006-03-21 10:39:08.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/services/pegasus.te 2006-03-21 11:57:52.000000000 -0500 @@ -77,6 +77,7 @@ corenet_tcp_bind_pegasus_https_port(pegasus_t) corenet_tcp_connect_pegasus_http_port(pegasus_t) @@ -1013,9 +999,9 @@ dev_read_sysfs(pegasus_t) dev_read_urand(pegasus_t) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postfix.te serefpolicy-2.2.24/policy/modules/services/postfix.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postfix.te serefpolicy-2.2.25/policy/modules/services/postfix.te --- nsaserefpolicy/policy/modules/services/postfix.te 2006-03-17 13:51:49.000000000 -0500 -+++ serefpolicy-2.2.24/policy/modules/services/postfix.te 2006-03-17 14:30:03.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/services/postfix.te 2006-03-21 11:57:52.000000000 -0500 @@ -406,6 +406,10 @@ procmail_domtrans(postfix_pipe_t) ') @@ -1027,9 +1013,31 @@ ######################################## # # Postfix postdrop local policy -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/samba.te serefpolicy-2.2.24/policy/modules/services/samba.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/privoxy.te serefpolicy-2.2.25/policy/modules/services/privoxy.te +--- nsaserefpolicy/policy/modules/services/privoxy.te 2006-03-04 00:06:36.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/services/privoxy.te 2006-03-21 11:57:52.000000000 -0500 +@@ -51,6 +51,7 @@ + corenet_tcp_bind_http_cache_port(privoxy_t) + corenet_tcp_connect_http_port(privoxy_t) + corenet_tcp_connect_ftp_port(privoxy_t) ++corenet_tcp_connect_tor_port(privoxy_t) + + dev_read_sysfs(privoxy_t) + +@@ -94,6 +95,10 @@ + nis_use_ypbind(privoxy_t) + ') + ++optional_policy(`nscd',` ++ nscd_socket_use(privoxy_t) ++') ++ + optional_policy(`selinuxutil',` + seutil_sigchld_newrole(privoxy_t) + ') +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/samba.te serefpolicy-2.2.25/policy/modules/services/samba.te --- nsaserefpolicy/policy/modules/services/samba.te 2006-03-04 00:06:36.000000000 -0500 -+++ serefpolicy-2.2.24/policy/modules/services/samba.te 2006-03-17 14:30:03.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/services/samba.te 2006-03-21 11:57:52.000000000 -0500 @@ -32,7 +32,7 @@ type samba_secrets_t; files_type(samba_secrets_t) @@ -1039,9 +1047,9 @@ files_config_file(samba_share_t) type samba_var_t; -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/sendmail.te serefpolicy-2.2.24/policy/modules/services/sendmail.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/sendmail.te serefpolicy-2.2.25/policy/modules/services/sendmail.te --- nsaserefpolicy/policy/modules/services/sendmail.te 2006-03-04 00:06:36.000000000 -0500 -+++ serefpolicy-2.2.24/policy/modules/services/sendmail.te 2006-03-17 14:30:03.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/services/sendmail.te 2006-03-21 11:57:52.000000000 -0500 @@ -125,6 +125,7 @@ ') @@ -1050,22 +1058,22 @@ postfix_read_config(sendmail_t) postfix_search_spool(sendmail_t) ') -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.if serefpolicy-2.2.24/policy/modules/services/xserver.if ---- nsaserefpolicy/policy/modules/services/xserver.if 2006-03-17 13:51:50.000000000 -0500 -+++ serefpolicy-2.2.24/policy/modules/services/xserver.if 2006-03-21 08:19:11.000000000 -0500 -@@ -904,3 +904,23 @@ +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.if serefpolicy-2.2.25/policy/modules/services/xserver.if +--- nsaserefpolicy/policy/modules/services/xserver.if 2006-03-21 14:33:33.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/services/xserver.if 2006-03-21 11:57:52.000000000 -0500 +@@ -922,3 +904,23 @@ dontaudit $1 xdm_xserver_t:tcp_socket { read write }; ') + +######################################## +## -+## Do not audit attempts to read and write to ++## Allow read and write to +## a XDM X server socket. +## +## +## -+## Domain to not audit ++## Domain to allow +## +## +# @@ -1077,9 +1085,9 @@ + allow $1 xdm_xserver_tmp_t:dir search; + allow $1 xdm_xserver_tmp_t:sock_file { read write }; +') -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/fstools.if serefpolicy-2.2.24/policy/modules/system/fstools.if +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/fstools.if serefpolicy-2.2.25/policy/modules/system/fstools.if --- nsaserefpolicy/policy/modules/system/fstools.if 2006-02-10 21:34:15.000000000 -0500 -+++ serefpolicy-2.2.24/policy/modules/system/fstools.if 2006-03-17 14:30:03.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/system/fstools.if 2006-03-21 11:57:52.000000000 -0500 @@ -110,3 +110,21 @@ allow $1 fsadm_exec_t:file create_file_perms; @@ -1102,9 +1110,9 @@ + + allow $1 swapfile_t:file getattr; +') -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/fstools.te serefpolicy-2.2.24/policy/modules/system/fstools.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/fstools.te serefpolicy-2.2.25/policy/modules/system/fstools.te --- nsaserefpolicy/policy/modules/system/fstools.te 2006-03-17 13:51:50.000000000 -0500 -+++ serefpolicy-2.2.24/policy/modules/system/fstools.te 2006-03-20 23:51:17.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/system/fstools.te 2006-03-21 11:57:52.000000000 -0500 @@ -53,6 +53,7 @@ kernel_change_ring_buffer_level(fsadm_t) # mkreiserfs needs this @@ -1140,9 +1148,9 @@ libs_use_ld_so(fsadm_t) libs_use_shared_libs(fsadm_t) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.te serefpolicy-2.2.24/policy/modules/system/init.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.te serefpolicy-2.2.25/policy/modules/system/init.te --- nsaserefpolicy/policy/modules/system/init.te 2006-03-17 13:51:50.000000000 -0500 -+++ serefpolicy-2.2.24/policy/modules/system/init.te 2006-03-17 14:30:03.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/system/init.te 2006-03-21 11:57:52.000000000 -0500 @@ -349,6 +349,7 @@ files_mounton_isid_type_dirs(initrc_t) files_list_default(initrc_t) @@ -1162,9 +1170,9 @@ ',` # cjp: require doesnt work in optionals :\ # this also would result in a type transition -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.fc serefpolicy-2.2.24/policy/modules/system/libraries.fc +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.fc serefpolicy-2.2.25/policy/modules/system/libraries.fc --- nsaserefpolicy/policy/modules/system/libraries.fc 2006-02-20 14:07:38.000000000 -0500 -+++ serefpolicy-2.2.24/policy/modules/system/libraries.fc 2006-03-17 14:30:03.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/system/libraries.fc 2006-03-21 11:57:52.000000000 -0500 @@ -65,6 +65,7 @@ /usr/lib(64)?/(nvidia/)?libGL(core)?\.so(\.[^/]*)* -- gen_context(system_u:object_r:textrel_shlib_t,s0) /usr/lib(64)?/libGLU\.so(\.[^/]*)* -- gen_context(system_u:object_r:textrel_shlib_t,s0) @@ -1181,9 +1189,9 @@ ifdef(`distro_redhat',` /usr/lib(64)?/.*/program/.*\.so.* gen_context(system_u:object_r:shlib_t,s0) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/locallogin.te serefpolicy-2.2.24/policy/modules/system/locallogin.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/locallogin.te serefpolicy-2.2.25/policy/modules/system/locallogin.te --- nsaserefpolicy/policy/modules/system/locallogin.te 2006-03-17 13:51:50.000000000 -0500 -+++ serefpolicy-2.2.24/policy/modules/system/locallogin.te 2006-03-17 14:30:03.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/system/locallogin.te 2006-03-21 11:57:52.000000000 -0500 @@ -20,6 +20,7 @@ type local_login_tmp_t; @@ -1192,9 +1200,9 @@ type sulogin_t; type sulogin_exec_t; -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/lvm.fc serefpolicy-2.2.24/policy/modules/system/lvm.fc +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/lvm.fc serefpolicy-2.2.25/policy/modules/system/lvm.fc --- nsaserefpolicy/policy/modules/system/lvm.fc 2005-11-14 18:24:06.000000000 -0500 -+++ serefpolicy-2.2.24/policy/modules/system/lvm.fc 2006-03-17 14:30:03.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/system/lvm.fc 2006-03-21 11:57:52.000000000 -0500 @@ -25,6 +25,7 @@ # /sbin # @@ -1203,9 +1211,9 @@ /sbin/dmsetup -- gen_context(system_u:object_r:lvm_exec_t,s0) /sbin/dmsetup\.static -- gen_context(system_u:object_r:lvm_exec_t,s0) /sbin/e2fsadm -- gen_context(system_u:object_r:lvm_exec_t,s0) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/lvm.te serefpolicy-2.2.24/policy/modules/system/lvm.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/lvm.te serefpolicy-2.2.25/policy/modules/system/lvm.te --- nsaserefpolicy/policy/modules/system/lvm.te 2006-03-17 13:51:50.000000000 -0500 -+++ serefpolicy-2.2.24/policy/modules/system/lvm.te 2006-03-17 14:30:03.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/system/lvm.te 2006-03-21 11:57:52.000000000 -0500 @@ -129,6 +129,8 @@ # DAC overrides and mknod for modifying /dev entries (vgmknodes) @@ -1223,9 +1231,9 @@ fs_getattr_xattr_fs(lvm_t) fs_search_auto_mountpoints(lvm_t) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.te serefpolicy-2.2.24/policy/modules/system/mount.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.te serefpolicy-2.2.25/policy/modules/system/mount.te --- nsaserefpolicy/policy/modules/system/mount.te 2006-03-17 13:51:50.000000000 -0500 -+++ serefpolicy-2.2.24/policy/modules/system/mount.te 2006-03-17 14:30:03.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/system/mount.te 2006-03-21 11:57:52.000000000 -0500 @@ -26,6 +26,7 @@ files_tmp_filetrans(mount_t,mount_tmp_t,{ file dir }) @@ -1250,9 +1258,9 @@ libs_use_ld_so(mount_t) libs_use_shared_libs(mount_t) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.fc serefpolicy-2.2.24/policy/modules/system/selinuxutil.fc +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.fc serefpolicy-2.2.25/policy/modules/system/selinuxutil.fc --- nsaserefpolicy/policy/modules/system/selinuxutil.fc 2006-02-23 09:25:09.000000000 -0500 -+++ serefpolicy-2.2.24/policy/modules/system/selinuxutil.fc 2006-03-17 14:30:03.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/system/selinuxutil.fc 2006-03-21 11:57:52.000000000 -0500 @@ -8,9 +8,9 @@ /etc/selinux/([^/]*/)?contexts/files(/.*)? gen_context(system_u:object_r:file_context_t,s0) /etc/selinux/([^/]*/)?policy(/.*)? gen_context(system_u:object_r:policy_config_t,s15:c0.c255) @@ -1266,9 +1274,9 @@ /etc/selinux/([^/]*/)?users(/.*)? -- gen_context(system_u:object_r:selinux_config_t,s15:c0.c255) # -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.if serefpolicy-2.2.24/policy/modules/system/selinuxutil.if +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.if serefpolicy-2.2.25/policy/modules/system/selinuxutil.if --- nsaserefpolicy/policy/modules/system/selinuxutil.if 2006-02-23 09:25:09.000000000 -0500 -+++ serefpolicy-2.2.24/policy/modules/system/selinuxutil.if 2006-03-17 14:30:03.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/system/selinuxutil.if 2006-03-21 11:57:52.000000000 -0500 @@ -675,8 +675,8 @@ files_search_etc($1) @@ -1310,9 +1318,9 @@ + allow $1 selinux_config_t:lnk_file { getattr read }; +') + -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.te serefpolicy-2.2.24/policy/modules/system/selinuxutil.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.te serefpolicy-2.2.25/policy/modules/system/selinuxutil.te --- nsaserefpolicy/policy/modules/system/selinuxutil.te 2006-03-17 13:51:50.000000000 -0500 -+++ serefpolicy-2.2.24/policy/modules/system/selinuxutil.te 2006-03-17 14:30:03.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/system/selinuxutil.te 2006-03-21 11:57:52.000000000 -0500 @@ -192,6 +192,9 @@ selinux_load_policy(load_policy_t) selinux_set_boolean(load_policy_t) @@ -1378,9 +1386,9 @@ userdom_use_all_users_fds(setfiles_t) # for config files in a home directory -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/sysnetwork.te serefpolicy-2.2.24/policy/modules/system/sysnetwork.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/sysnetwork.te serefpolicy-2.2.25/policy/modules/system/sysnetwork.te --- nsaserefpolicy/policy/modules/system/sysnetwork.te 2006-03-04 00:06:37.000000000 -0500 -+++ serefpolicy-2.2.24/policy/modules/system/sysnetwork.te 2006-03-17 14:30:03.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/system/sysnetwork.te 2006-03-21 11:57:52.000000000 -0500 @@ -161,6 +161,10 @@ consoletype_domtrans(dhcpc_t) ') @@ -1402,9 +1410,9 @@ ifdef(`targeted_policy',` term_use_generic_ptys(ifconfig_t) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.te serefpolicy-2.2.24/policy/modules/system/udev.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.te serefpolicy-2.2.25/policy/modules/system/udev.te --- nsaserefpolicy/policy/modules/system/udev.te 2006-03-17 13:51:50.000000000 -0500 -+++ serefpolicy-2.2.24/policy/modules/system/udev.te 2006-03-17 14:30:03.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/system/udev.te 2006-03-21 11:57:52.000000000 -0500 @@ -39,7 +39,7 @@ # Local policy # @@ -1414,9 +1422,9 @@ dontaudit udev_t self:capability sys_tty_config; allow udev_t self:process ~{ ptrace setcurrent setexec setfscreate setrlimit execmem execstack execheap }; allow udev_t self:process { execmem setfscreate }; -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.te serefpolicy-2.2.24/policy/modules/system/unconfined.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.te serefpolicy-2.2.25/policy/modules/system/unconfined.te --- nsaserefpolicy/policy/modules/system/unconfined.te 2006-03-17 13:51:50.000000000 -0500 -+++ serefpolicy-2.2.24/policy/modules/system/unconfined.te 2006-03-17 14:30:03.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/system/unconfined.te 2006-03-21 11:57:52.000000000 -0500 @@ -89,10 +89,6 @@ firstboot_domtrans(unconfined_t) ') @@ -1439,9 +1447,9 @@ optional_policy(`netutils',` netutils_domtrans_ping(unconfined_t) ') -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-2.2.24/policy/modules/system/userdomain.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-2.2.25/policy/modules/system/userdomain.te --- nsaserefpolicy/policy/modules/system/userdomain.te 2006-03-17 13:51:50.000000000 -0500 -+++ serefpolicy-2.2.24/policy/modules/system/userdomain.te 2006-03-17 14:30:03.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/system/userdomain.te 2006-03-21 11:57:52.000000000 -0500 @@ -180,6 +180,7 @@ logging_read_audit_log(secadm_t) logging_domtrans_auditctl(secadm_t) @@ -1450,9 +1458,9 @@ ', ` logging_domtrans_auditctl(sysadm_t) logging_read_audit_log(sysadm_t) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xend.fc serefpolicy-2.2.24/policy/modules/system/xend.fc +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xend.fc serefpolicy-2.2.25/policy/modules/system/xend.fc --- nsaserefpolicy/policy/modules/system/xend.fc 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-2.2.24/policy/modules/system/xend.fc 2006-03-17 14:30:03.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/system/xend.fc 2006-03-21 11:57:52.000000000 -0500 @@ -0,0 +1,23 @@ +# xend executable will have: +# label: system_u:object_r:xend_exec_t @@ -1477,9 +1485,9 @@ +/dev/xen/evtchn -c system_u:object_r:xend_device_t:s0 +/usr/lib/xen/bin(/.*)? system_u:object_r:bin_t:s0 + -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xend.if serefpolicy-2.2.24/policy/modules/system/xend.if +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xend.if serefpolicy-2.2.25/policy/modules/system/xend.if --- nsaserefpolicy/policy/modules/system/xend.if 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-2.2.24/policy/modules/system/xend.if 2006-03-17 14:30:03.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/system/xend.if 2006-03-21 11:57:52.000000000 -0500 @@ -0,0 +1,71 @@ +## policy for xen + @@ -1552,9 +1560,9 @@ + allow $1 xenstored_t:unix_stream_socket connectto; +') + -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xend.te serefpolicy-2.2.24/policy/modules/system/xend.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xend.te serefpolicy-2.2.25/policy/modules/system/xend.te --- nsaserefpolicy/policy/modules/system/xend.te 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-2.2.24/policy/modules/system/xend.te 2006-03-17 14:30:03.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/system/xend.te 2006-03-21 11:57:52.000000000 -0500 @@ -0,0 +1,219 @@ +policy_module(xend,1.0.0) + @@ -1775,15 +1783,15 @@ + +xend_append_log(xenstored_t) + -diff --exclude-from=exclude -N -u -r nsaserefpolicy/Rules.modular serefpolicy-2.2.24/Rules.modular ---- nsaserefpolicy/Rules.modular 2006-02-17 14:46:10.000000000 -0500 -+++ serefpolicy-2.2.24/Rules.modular 2006-03-17 14:30:03.000000000 -0500 -@@ -204,7 +204,7 @@ +diff --exclude-from=exclude -N -u -r nsaserefpolicy/Rules.modular serefpolicy-2.2.25/Rules.modular +--- nsaserefpolicy/Rules.modular 2006-03-21 14:33:29.000000000 -0500 ++++ serefpolicy-2.2.25/Rules.modular 2006-03-21 11:57:52.000000000 -0500 +@@ -208,7 +208,7 @@ # $(APPDIR)/customizable_types: $(BASE_CONF) @mkdir -p $(APPDIR) -- $(verbose) grep "^type .*customizable" $< | cut -d',' -f1 | cut -d' ' -f2 > $(TMPDIR)/customizable_types -+ $(verbose) grep '^[^[:print:]]*type .*customizable' $< | cut -d',' -f1 | cut -d' ' -f2 | sort -u > $(TMPDIR)/customizable_types +- $(verbose) $(GREP) "^type .*customizable" $< | cut -d',' -f1 | cut -d' ' -f2 > $(TMPDIR)/customizable_types ++ $(verbose) $(GREP) '^[^[:print:]]*type .*customizable' $< | cut -d',' -f1 | cut -d' ' -f2 | sort -u > $(TMPDIR)/customizable_types $(verbose) install -m 644 $(TMPDIR)/customizable_types $@ ######################################## Index: policygentool =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/policygentool,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- policygentool 27 Feb 2006 23:00:40 -0000 1.4 +++ policygentool 21 Mar 2006 19:46:10 -0000 1.5 @@ -132,7 +132,7 @@ """ te_initsc2=""" # Init script handling -init_use_fd(TEMPLATETYPE_t) +init_use_fds(TEMPLATETYPE_t) init_use_script_ptys(TEMPLATETYPE_t) domain_use_interactive_fds(TEMPLATETYPE_t) """ Index: selinux-policy.spec =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v retrieving revision 1.156 retrieving revision 1.157 diff -u -r1.156 -r1.157 --- selinux-policy.spec 21 Mar 2006 15:42:38 -0000 1.156 +++ selinux-policy.spec 21 Mar 2006 19:46:10 -0000 1.157 @@ -9,8 +9,8 @@ %define CHECKPOLICYVER 1.30-1 Summary: SELinux policy configuration Name: selinux-policy -Version: 2.2.24 -Release: 2 +Version: 2.2.25 +Release: 1 License: GPL Group: System Environment/Base Source: serefpolicy-%{version}.tgz Index: sources =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/sources,v retrieving revision 1.52 retrieving revision 1.53 diff -u -r1.52 -r1.53 --- sources 18 Mar 2006 04:09:10 -0000 1.52 +++ sources 21 Mar 2006 19:46:10 -0000 1.53 @@ -1 +1 @@ -de72e7453c9213a41bb2ec0c14ef11c3 serefpolicy-2.2.24.tgz +efdb10103ce8e6d7c86d1b3153a6f04a serefpolicy-2.2.25.tgz From fedora-cvs-commits at redhat.com Tue Mar 21 20:56:21 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 21 Mar 2006 15:56:21 -0500 Subject: rpms/kernel/devel/configs config-generic,1.161,1.162 Message-ID: <200603212056.k2LKuLhV016451@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel/configs In directory cvs.devel.redhat.com:/tmp/cvs-serv16416/configs Modified Files: config-generic Log Message: git3 Index: config-generic =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/configs/config-generic,v retrieving revision 1.161 retrieving revision 1.162 diff -u -r1.161 -r1.162 --- config-generic 20 Mar 2006 00:05:25 -0000 1.161 +++ config-generic 21 Mar 2006 20:56:19 -0000 1.162 @@ -621,6 +621,8 @@ CONFIG_IPV6=m CONFIG_IPV6_PRIVACY=y +CONFIG_IPV6_ROUTER_PREF=y +CONFIG_IPV6_ROUTE_INFO=y CONFIG_INET6_AH=m CONFIG_INET6_ESP=m CONFIG_INET6_IPCOMP=m @@ -649,6 +651,7 @@ CONFIG_NETFILTER_XT_MATCH_MARK=m CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m +CONFIG_NETFILTER_XT_MATCH_POLICY=m CONFIG_NETFILTER_XT_MATCH_REALM=m CONFIG_NETFILTER_XT_MATCH_SCTP=m CONFIG_NETFILTER_XT_MATCH_STATE=m @@ -713,6 +716,7 @@ CONFIG_IP_NF_FILTER=m CONFIG_IP_NF_NETBIOS_NS=m CONFIG_IP_NF_PPTP=m +CONFIG_IP_NF_H323=m # # IPv6: Netfilter Configuration @@ -788,6 +792,7 @@ # CONFIG_ECONET is not set CONFIG_WAN_ROUTER=m CONFIG_IP_DCCP=m +CONFIG_IP_DCCP_CCID2=m CONFIG_IP_DCCP_CCID3=m # CONFIG_IP_DCCP_DEBUG is not set CONFIG_IP_DCCP_UNLOAD_HACK=y @@ -1136,6 +1141,7 @@ CONFIG_ESI_DONGLE=m CONFIG_ACTISYS_DONGLE=m CONFIG_TEKRAM_DONGLE=m +CONFIG_TOIM3232_DONGLE=m CONFIG_IRPORT_SIR=m # CONFIG_DONGLE_OLD is not set CONFIG_LITELINK_DONGLE=m @@ -1653,7 +1659,10 @@ CONFIG_VIDEO_CPIA=m CONFIG_VIDEO_CPIA_PP=m CONFIG_VIDEO_CPIA_USB=m +CONFIG_VIDEO_CPIA2=m CONFIG_VIDEO_CQCAM=m +CONFIG_VIDEO_CS53L32A=m +CONFIG_VIDEO_CX25840=m CONFIG_VIDEO_CX88=m CONFIG_VIDEO_CX88_DVB=m CONFIG_VIDEO_CX88_DVB_ALL_FRONTENDS=y @@ -1669,6 +1678,7 @@ CONFIG_VIDEO_SAA5246A=m CONFIG_VIDEO_SAA5249=m CONFIG_VIDEO_SAA6588=m +CONFIG_VIDEO_SAA7127=m CONFIG_VIDEO_SAA7134=m CONFIG_VIDEO_SAA7134_ALSA=m CONFIG_VIDEO_SAA7134_DVB=m @@ -1681,6 +1691,7 @@ CONFIG_VIDEO_ZORAN_LML33=m CONFIG_VIDEO_ZORAN_LML33R10=m CONFIG_VIDEO_W9966=m +CONFIG_VIDEO_WM8775=m CONFIG_TUNER_3036=m # @@ -2126,6 +2137,7 @@ CONFIG_USB_SERIAL_KLSI=m CONFIG_USB_SERIAL_KOBIL_SCT=m CONFIG_USB_SERIAL_MCT_U232=m +CONFIG_USB_SERIAL_NAVMAN=m CONFIG_USB_SERIAL_OPTION=y CONFIG_USB_SERIAL_OMNINET=m CONFIG_USB_SERIAL_PL2303=m @@ -2157,6 +2169,7 @@ CONFIG_USB_ETH=m # CONFIG_USB_GADGETFS is not set CONFIG_USB_W9968CF=m +CONFIG_USB_ZC0301=m CONFIG_USB_PWC=m CONFIG_USB_LEGOTOWER=m CONFIG_USB_FILE_STORAGE=m From fedora-cvs-commits at redhat.com Tue Mar 21 20:56:22 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 21 Mar 2006 15:56:22 -0500 Subject: rpms/kernel/devel patch-2.6.16-git3.bz2.sign, NONE, 1.1 .cvsignore, 1.389, 1.390 kernel-2.6.spec, 1.2078, 1.2079 linux-2.6-tux.patch, 1.13, 1.14 sources, 1.330, 1.331 upstream, 1.302, 1.303 linux-2.6-defaults-enable-sata-atapi.patch, 1.1, NONE patch-2.6.16-git1.bz2.sign, 1.1, NONE Message-ID: <200603212056.k2LKuMed016439@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv16416 Modified Files: .cvsignore kernel-2.6.spec linux-2.6-tux.patch sources upstream Added Files: patch-2.6.16-git3.bz2.sign Removed Files: linux-2.6-defaults-enable-sata-atapi.patch patch-2.6.16-git1.bz2.sign Log Message: git3 --- NEW FILE patch-2.6.16-git3.bz2.sign --- -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.2.2 (GNU/Linux) Comment: See http://www.kernel.org/signature.html for info iD8DBQBEIE3qyGugalF9Dw4RAoVMAKCUr7i5ER85UABBn4KPiVuz0wBgOwCcD/EK mH5pgfcdPoCR5YlGzNumQAo= =HzDp -----END PGP SIGNATURE----- Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v retrieving revision 1.389 retrieving revision 1.390 diff -u -r1.389 -r1.390 --- .cvsignore 21 Mar 2006 18:43:44 -0000 1.389 +++ .cvsignore 21 Mar 2006 20:56:18 -0000 1.390 @@ -1,7 +1,6 @@ kernel-2.6.*.config temp-* kernel-2.6.16 -xen-20060301.tar.bz2 linux-2.6.16.tar.bz2 -patch-2.6.16-git1.bz2 xen-20060320.tar.bz2 +patch-2.6.16-git3.bz2 Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.2078 retrieving revision 1.2079 diff -u -r1.2078 -r1.2079 --- kernel-2.6.spec 21 Mar 2006 18:45:08 -0000 1.2078 +++ kernel-2.6.spec 21 Mar 2006 20:56:18 -0000 1.2079 @@ -217,7 +217,7 @@ # # Patches 0 through 100 are meant for core subsystem upgrades # -Patch1: patch-2.6.16-git1.bz2 +Patch1: patch-2.6.16-git3.bz2 # Patches 100 through 500 are meant for architecture patches Patch100: linux-2.6-bzimage.patch @@ -388,8 +388,7 @@ # Tweak some defaults. Patch2100: linux-2.6-defaults-max-symlinks.patch Patch2101: linux-2.6-defaults-fat-utf8.patch -Patch2102: linux-2.6-defaults-enable-sata-atapi.patch -Patch2103: linux-2.6-defaults-firmware-loader-timeout.patch +Patch2102: linux-2.6-defaults-firmware-loader-timeout.patch # SATA Bits Patch2200: linux-2.6-sata-promise-pata-ports.patch @@ -1010,13 +1009,11 @@ %patch2100 -p1 # Use UTF-8 by default on VFAT. %patch2101 -p1 -# Enable SATA ATAPI by default. -%patch2102 -p1 # Increase timeout on firmware loader. -%patch2103 -p1 +%patch2102 -p1 # Enable PATA ports on Promise SATA. -%patch2200 -p1 +#%patch2200 -p1 # Silence silly SATA printk. %patch2201 -p1 @@ -1639,7 +1636,10 @@ %endif %changelog -* Mon Mar 21 2006 Juan Quintela +* Tue Mar 21 2006 Dave Jones +- 2.6.16-git3 + +* Tue Mar 21 2006 Juan Quintela - rebase to xen unstable cset 9334. * Tue Mar 21 2006 Juan Quintela linux-2.6-tux.patch: linux-2.6.16.noarch/include/linux/sysctl.h | 50 linux-2.6.16.noarch/net/socket.c | 131 + linux-tux.q/arch/alpha/kernel/systbls.S | 8 linux-tux.q/arch/i386/kernel/syscall_table.S | 10 linux-tux.q/arch/ia64/kernel/entry.S | 8 linux-tux.q/arch/ia64/kernel/ia64_ksyms.c | 5 linux-tux.q/arch/x86_64/ia32/ia32entry.S | 10 linux-tux.q/fs/dcache.c | 36 linux-tux.q/fs/exec.c | 2 linux-tux.q/fs/fcntl.c | 4 linux-tux.q/fs/namei.c | 18 linux-tux.q/fs/namespace.c | 2 linux-tux.q/fs/open.c | 4 linux-tux.q/fs/pipe.c | 2 linux-tux.q/fs/read_write.c | 2 linux-tux.q/include/asm-alpha/fcntl.h | 1 linux-tux.q/include/asm-generic/fcntl.h | 4 linux-tux.q/include/asm-i386/unistd.h | 5 linux-tux.q/include/asm-ia64/unistd.h | 2 linux-tux.q/include/asm-sparc/fcntl.h | 1 linux-tux.q/include/asm-sparc64/fcntl.h | 1 linux-tux.q/include/asm-x86_64/unistd.h | 10 linux-tux.q/include/linux/buffer_head.h | 1 linux-tux.q/include/linux/dcache.h | 8 linux-tux.q/include/linux/errno.h | 3 linux-tux.q/include/linux/file.h | 2 linux-tux.q/include/linux/fs.h | 7 linux-tux.q/include/linux/kmod.h | 2 linux-tux.q/include/linux/namei.h | 2 linux-tux.q/include/linux/net.h | 1 linux-tux.q/include/linux/sched.h | 5 linux-tux.q/include/linux/skbuff.h | 2 linux-tux.q/include/linux/socket.h | 5 linux-tux.q/include/net/sock.h | 8 linux-tux.q/include/net/tcp.h | 3 linux-tux.q/include/net/tux.h | 804 +++++++++ linux-tux.q/include/net/tux_u.h | 163 ++ linux-tux.q/kernel/exit.c | 7 linux-tux.q/kernel/fork.c | 1 linux-tux.q/kernel/kmod.c | 28 linux-tux.q/kernel/signal.c | 1 linux-tux.q/mm/filemap.c | 19 linux-tux.q/mm/truncate.c | 2 linux-tux.q/net/Kconfig | 1 linux-tux.q/net/Makefile | 1 linux-tux.q/net/core/sock.c | 5 linux-tux.q/net/ipv4/tcp.c | 3 linux-tux.q/net/ipv4/tcp_input.c | 1 linux-tux.q/net/ipv4/tcp_output.c | 3 linux-tux.q/net/tux/Kconfig | 25 linux-tux.q/net/tux/Makefile | 12 linux-tux.q/net/tux/abuf.c | 190 ++ linux-tux.q/net/tux/accept.c | 863 ++++++++++ linux-tux.q/net/tux/cachemiss.c | 265 +++ linux-tux.q/net/tux/cgi.c | 171 ++ linux-tux.q/net/tux/directory.c | 302 +++ linux-tux.q/net/tux/extcgi.c | 329 ++++ linux-tux.q/net/tux/gzip.c | 40 linux-tux.q/net/tux/input.c | 641 +++++++ linux-tux.q/net/tux/logger.c | 837 ++++++++++ linux-tux.q/net/tux/main.c | 1417 +++++++++++++++++ linux-tux.q/net/tux/mod.c | 262 +++ linux-tux.q/net/tux/output.c | 352 ++++ linux-tux.q/net/tux/parser.h | 102 + linux-tux.q/net/tux/postpone.c | 77 linux-tux.q/net/tux/proc.c | 1149 ++++++++++++++ linux-tux.q/net/tux/proto_ftp.c | 1555 +++++++++++++++++++ linux-tux.q/net/tux/proto_http.c | 2197 +++++++++++++++++++++++++++ linux-tux.q/net/tux/redirect.c | 172 ++ linux-tux.q/net/tux/times.c | 392 ++++ linux-tux.q/net/tux/times.h | 26 linux-tux.q/net/tux/userspace.c | 27 72 files changed, 12775 insertions(+), 32 deletions(-) Index: linux-2.6-tux.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-tux.patch,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- linux-2.6-tux.patch 20 Mar 2006 22:19:53 -0000 1.13 +++ linux-2.6-tux.patch 21 Mar 2006 20:56:19 -0000 1.14 @@ -637,15 +637,13 @@ #endif #endif /* not kernel and not glibc */ #endif /* _LINUX_SOCKET_H */ -Index: linux-tux.q/include/linux/sysctl.h -=================================================================== ---- linux-tux.q.orig/include/linux/sysctl.h -+++ linux-tux.q/include/linux/sysctl.h -@@ -211,6 +211,7 @@ enum - NET_SCTP=17, +--- linux-2.6.16.noarch/include/linux/sysctl.h~ 2006-03-21 15:04:07.000000000 -0500 ++++ linux-2.6.16.noarch/include/linux/sysctl.h 2006-03-21 15:04:27.000000000 -0500 +@@ -215,6 +215,7 @@ enum NET_LLC=18, NET_NETFILTER=19, -+ NET_TUX=20, + NET_DCCP=20, ++ NET_TUX=21, }; /* /proc/sys/kernel/random */ @@ -2012,18 +2010,16 @@ /* Send _single_ skb sitting at the send head. This function requires * true push pending frames to setup probe timer etc. -Index: linux-tux.q/net/socket.c -=================================================================== ---- linux-tux.q.orig/net/socket.c -+++ linux-tux.q/net/socket.c +--- linux-2.6.16.noarch/net/socket.c~ 2006-03-21 15:05:05.000000000 -0500 ++++ linux-2.6.16.noarch/net/socket.c 2006-03-21 15:05:17.000000000 -0500 @@ -68,6 +68,7 @@ #include #include #include +#include + #include #include #include - #include @@ -123,7 +124,7 @@ static ssize_t sock_sendpage(struct file * in the operation structures but are done directly via the socketcall() multiplexor. */ @@ -2033,79 +2029,6 @@ .owner = THIS_MODULE, .llseek = no_llseek, .aio_read = sock_aio_read, -@@ -348,72 +349,6 @@ static struct dentry_operations sockfs_d - .d_delete = sockfs_delete_dentry, - }; - --/* -- * Obtains the first available file descriptor and sets it up for use. -- * -- * This function creates file structure and maps it to fd space -- * of current process. On success it returns file descriptor -- * and file struct implicitly stored in sock->file. -- * Note that another thread may close file descriptor before we return -- * from this function. We use the fact that now we do not refer -- * to socket after mapping. If one day we will need it, this -- * function will increment ref. count on file by 1. -- * -- * In any case returned fd MAY BE not valid! -- * This race condition is unavoidable -- * with shared fd spaces, we cannot solve it inside kernel, -- * but we take care of internal coherence yet. -- */ -- --int sock_map_fd(struct socket *sock) --{ -- int fd; -- struct qstr this; -- char name[32]; -- -- /* -- * Find a file descriptor suitable for return to the user. -- */ -- -- fd = get_unused_fd(); -- if (fd >= 0) { -- struct file *file = get_empty_filp(); -- -- if (!file) { -- put_unused_fd(fd); -- fd = -ENFILE; -- goto out; -- } -- -- this.len = sprintf(name, "[%lu]", SOCK_INODE(sock)->i_ino); -- this.name = name; -- this.hash = SOCK_INODE(sock)->i_ino; -- -- file->f_dentry = d_alloc(sock_mnt->mnt_sb->s_root, &this); -- if (!file->f_dentry) { -- put_filp(file); -- put_unused_fd(fd); -- fd = -ENOMEM; -- goto out; -- } -- file->f_dentry->d_op = &sockfs_dentry_operations; -- d_add(file->f_dentry, SOCK_INODE(sock)); -- file->f_vfsmnt = mntget(sock_mnt); -- file->f_mapping = file->f_dentry->d_inode->i_mapping; -- -- sock->file = file; -- file->f_op = SOCK_INODE(sock)->i_fop = &socket_file_ops; -- file->f_mode = FMODE_READ | FMODE_WRITE; -- file->f_flags = O_RDWR; -- file->f_pos = 0; -- file->private_data = sock; -- fd_install(fd, file); -- } -- --out: -- return fd; --} -- - /** - * sockfd_lookup - Go from a file number to its socket slot - * @fd: file handle @@ -457,6 +392,83 @@ struct socket *sockfd_lookup(int fd, int return sock; } Index: sources =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/sources,v retrieving revision 1.330 retrieving revision 1.331 diff -u -r1.330 -r1.331 --- sources 21 Mar 2006 18:43:44 -0000 1.330 +++ sources 21 Mar 2006 20:56:19 -0000 1.331 @@ -1,4 +1,3 @@ 9a91b2719949ff0856b40bc467fd47be linux-2.6.16.tar.bz2 -cdfde609af8adcf58d7ff626599b2d90 xen-20060301.tar.bz2 -81203bd932c96ebdbaba3ada9f3685e2 patch-2.6.16-git1.bz2 8c70806f9075ebc0087f7ce1b8911700 xen-20060320.tar.bz2 +491d4fb38ab77cead5b482f7a63452c8 patch-2.6.16-git3.bz2 Index: upstream =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/upstream,v retrieving revision 1.302 retrieving revision 1.303 diff -u -r1.302 -r1.303 --- upstream 20 Mar 2006 22:08:10 -0000 1.302 +++ upstream 21 Mar 2006 20:56:19 -0000 1.303 @@ -1,2 +1,2 @@ linux-2.6.16.tar.bz2 -patch-2.6.16-git1.bz2 +patch-2.6.16-git3.bz2 --- linux-2.6-defaults-enable-sata-atapi.patch DELETED --- --- patch-2.6.16-git1.bz2.sign DELETED --- From fedora-cvs-commits at redhat.com Tue Mar 21 21:09:33 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 21 Mar 2006 16:09:33 -0500 Subject: rpms/kernel/FC-5 linux-2.6-optimise-spinlock-debug.patch, NONE, 1.1 kernel-2.6.spec, 1.2067, 1.2068 Message-ID: <200603212109.k2LL9XmV016679@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv16661 Modified Files: kernel-2.6.spec Added Files: linux-2.6-optimise-spinlock-debug.patch Log Message: Improve spinlock scalability on big machines. linux-2.6-optimise-spinlock-debug.patch: spinlock_debug.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) --- NEW FILE linux-2.6-optimise-spinlock-debug.patch --- --- linux-2.6.16/lib/spinlock_debug.c~ 2006-03-20 16:31:13.000000000 -0500 +++ linux-2.6.16/lib/spinlock_debug.c 2006-03-20 16:31:24.000000000 -0500 @@ -9,8 +9,8 @@ #include #include #include -#include #include +#include int nopanic; static int __init nopanic_setup(char *str) --- linux-2.6.16/lib/spinlock_debug.c~ 2006-03-20 16:29:56.000000000 -0500 +++ linux-2.6.16/lib/spinlock_debug.c 2006-03-20 16:30:52.000000000 -0500 @@ -88,7 +88,7 @@ static void __spin_lock_debug(spinlock_t for (i = 0; i < loops_per_jiffy * HZ; i++) { if (__raw_spin_trylock(&lock->raw_lock)) return; - __delay(1); + cpu_relax(); } /* lockup suspected: */ if (print_once) { @@ -160,7 +160,7 @@ static void __read_lock_debug(rwlock_t * for (i = 0; i < loops_per_jiffy * HZ; i++) { if (__raw_read_trylock(&lock->raw_lock)) return; - __delay(1); + cpu_relax(); } /* lockup suspected: */ if (print_once) { @@ -233,7 +233,7 @@ static void __write_lock_debug(rwlock_t for (i = 0; i < loops_per_jiffy * HZ; i++) { if (__raw_write_trylock(&lock->raw_lock)) return; - __delay(1); + cpu_relax(); } /* lockup suspected: */ if (print_once) { Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-5/kernel-2.6.spec,v retrieving revision 1.2067 retrieving revision 1.2068 diff -u -r1.2067 -r1.2068 --- kernel-2.6.spec 21 Mar 2006 04:04:24 -0000 1.2067 +++ kernel-2.6.spec 21 Mar 2006 21:09:30 -0000 1.2068 @@ -372,6 +372,7 @@ Patch1740: linux-2.6-softlockup-disable.patch Patch1750: linux-2.6-drm-cripple-r300.patch Patch1760: linux-2.6-suspend-slab-warnings.patch +Patch1770: linux-2.6-optimise-spinlock-debug.patch # SELinux/audit patches. Patch1800: linux-2.6-selinux-hush.patch @@ -997,6 +998,8 @@ %patch1750 -p1 # Fix up kmalloc whilst atomic warning during resume. %patch1760 -p1 +# Speed up spinlock debug. +%patch1770 -p1 # Silence some selinux messages. %patch1800 -p1 @@ -1657,6 +1660,9 @@ %endif %changelog +* Tue Mar 21 2006 Dave Jones +- Improve spinlock scalability on big machines. + * Mon Mar 20 2006 Dave Jones - ACPI ecdt uid hack. (#185947) From fedora-cvs-commits at redhat.com Tue Mar 21 21:12:04 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 21 Mar 2006 16:12:04 -0500 Subject: rpms/kernel/devel linux-2.6-optimise-spinlock-debug.patch, NONE, 1.1 kernel-2.6.spec, 1.2079, 1.2080 Message-ID: <200603212112.k2LLC4uY016760@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv16744 Modified Files: kernel-2.6.spec Added Files: linux-2.6-optimise-spinlock-debug.patch Log Message: Improve spinlock scalability on big machines. linux-2.6-optimise-spinlock-debug.patch: spinlock_debug.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) --- NEW FILE linux-2.6-optimise-spinlock-debug.patch --- --- linux-2.6.16/lib/spinlock_debug.c~ 2006-03-20 16:31:13.000000000 -0500 +++ linux-2.6.16/lib/spinlock_debug.c 2006-03-20 16:31:24.000000000 -0500 @@ -9,8 +9,8 @@ #include #include #include -#include #include +#include int nopanic; static int __init nopanic_setup(char *str) --- linux-2.6.16/lib/spinlock_debug.c~ 2006-03-20 16:29:56.000000000 -0500 +++ linux-2.6.16/lib/spinlock_debug.c 2006-03-20 16:30:52.000000000 -0500 @@ -88,7 +88,7 @@ static void __spin_lock_debug(spinlock_t for (i = 0; i < loops_per_jiffy * HZ; i++) { if (__raw_spin_trylock(&lock->raw_lock)) return; - __delay(1); + cpu_relax(); } /* lockup suspected: */ if (print_once) { @@ -160,7 +160,7 @@ static void __read_lock_debug(rwlock_t * for (i = 0; i < loops_per_jiffy * HZ; i++) { if (__raw_read_trylock(&lock->raw_lock)) return; - __delay(1); + cpu_relax(); } /* lockup suspected: */ if (print_once) { @@ -233,7 +233,7 @@ static void __write_lock_debug(rwlock_t for (i = 0; i < loops_per_jiffy * HZ; i++) { if (__raw_write_trylock(&lock->raw_lock)) return; - __delay(1); + cpu_relax(); } /* lockup suspected: */ if (print_once) { Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.2079 retrieving revision 1.2080 diff -u -r1.2079 -r1.2080 --- kernel-2.6.spec 21 Mar 2006 20:56:18 -0000 1.2079 +++ kernel-2.6.spec 21 Mar 2006 21:12:02 -0000 1.2080 @@ -366,6 +366,7 @@ Patch1740: linux-2.6-softlockup-disable.patch Patch1750: linux-2.6-drm-cripple-r300.patch Patch1760: linux-2.6-suspend-slab-warnings.patch +Patch1770: linux-2.6-optimise-spinlock-debug.patch # SELinux/audit patches. Patch1800: linux-2.6-selinux-hush.patch @@ -978,6 +979,8 @@ %patch1750 -p1 # Fix up kmalloc whilst atomic warning during resume. %patch1760 -p1 +# Speed up spinlock debug. +%patch1770 -p1 # Silence some selinux messages. %patch1800 -p1 @@ -1638,6 +1641,7 @@ %changelog * Tue Mar 21 2006 Dave Jones - 2.6.16-git3 +- Improve spinlock scalability on big machines. * Tue Mar 21 2006 Juan Quintela - rebase to xen unstable cset 9334. From fedora-cvs-commits at redhat.com Tue Mar 21 21:49:07 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 21 Mar 2006 16:49:07 -0500 Subject: rpms/kernel/FC-5 kernel-2.6.spec, 1.2068, 1.2069 linux-2.6-execshield-xen.patch, 1.3, 1.4 linux-2.6-execshield.patch, 1.11, 1.12 linux-2.6-execshield-fixes.patch, 1.6, NONE linux-2.6-execshield-vdso.patch, 1.3, NONE Message-ID: <200603212149.k2LLn71K012033@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv12017 Modified Files: kernel-2.6.spec linux-2.6-execshield-xen.patch linux-2.6-execshield.patch Removed Files: linux-2.6-execshield-fixes.patch linux-2.6-execshield-vdso.patch Log Message: - Update exec-shield to Ingo's latest. (Incorporates John Reiser's "map the vDSO intelligently" patch which increases the efficiency of prelinking - #162797). Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-5/kernel-2.6.spec,v retrieving revision 1.2068 retrieving revision 1.2069 diff -u -r1.2068 -r1.2069 --- kernel-2.6.spec 21 Mar 2006 21:09:30 -0000 1.2068 +++ kernel-2.6.spec 21 Mar 2006 21:49:03 -0000 1.2069 @@ -273,10 +273,8 @@ # Exec-shield. Patch810: linux-2.6-execshield.patch Patch811: linux-2.6-execshield-xen.patch -Patch812: linux-2.6-execshield-vdso.patch -Patch813: linux-2.6-xen-vdso-note.patch -Patch814: linux-2.6-execshield-fixes.patch -Patch815: linux-2.6-vdso-xen.patch +Patch812: linux-2.6-xen-vdso-note.patch +Patch813: linux-2.6-vdso-xen.patch # Module signing infrastructure. Patch900: linux-2.6-modsign-core.patch @@ -845,13 +843,9 @@ %if %{includexen} %patch811 -p1 %patch812 -p1 -%patch813 -p1 -#%patch815 -p1 +#%patch813 -p1 %endif -# Final small execshield fixes. -%patch814 -p1 - # # GPG signed kernel modules # @@ -1662,6 +1656,9 @@ %changelog * Tue Mar 21 2006 Dave Jones - Improve spinlock scalability on big machines. +- Update exec-shield to Ingo's latest. + (Incorporates John Reiser's "map the vDSO intelligently" patch + which increases the efficiency of prelinking - #162797). * Mon Mar 20 2006 Dave Jones - ACPI ecdt uid hack. (#185947) linux-2.6-execshield-xen.patch: arch/i386/kernel/entry-xen.S | 8 - arch/i386/kernel/process-xen.c | 58 +++++++ arch/i386/kernel/smp-xen.c | 2 arch/i386/kernel/traps-xen.c | 92 +++++++++++- arch/i386/mm/init-xen.c | 11 + linux-2.6.15.i686/include/asm-x86_64/mach-xen/asm/pgtable.h | 2 linux-2.6.15.noarch/arch/x86_64/kernel/setup64-xen.c | 23 --- linux-2.6.16.i686/arch/i386/kernel/sysenter.c | 2 8 files changed, 168 insertions(+), 30 deletions(-) Index: linux-2.6-execshield-xen.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-5/linux-2.6-execshield-xen.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- linux-2.6-execshield-xen.patch 6 Mar 2006 16:31:47 -0000 1.3 +++ linux-2.6-execshield-xen.patch 21 Mar 2006 21:49:03 -0000 1.4 @@ -320,3 +320,19 @@ extern void paging_init(void); extern void clear_kernel_mapping(unsigned long addr, unsigned long size); +diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff linux-2.6.16.noarch/arch/i386/kernel/sysenter.c linux-2.6.16.i686/arch/i386/kernel/sysenter.c +--- linux-2.6.16.noarch/arch/i386/kernel/sysenter.c 2006-03-21 13:36:40.000000000 +0100 ++++ linux-2.6.16.i686/arch/i386/kernel/sysenter.c 2006-03-21 13:40:17.000000000 +0100 +@@ -134,6 +134,7 @@ int arch_setup_additional_pages(struct l + return err; + } + ++#ifndef CONFIG_XEN + int in_gate_area_no_task(unsigned long addr) + { + return 0; +@@ -148,3 +149,4 @@ struct vm_area_struct *get_gate_vma(stru + { + return NULL; + } ++#endif linux-2.6-execshield.patch: linux-2.6.16.noarch/include/asm-powerpc/elf.h | 3 linux/arch/i386/kernel/asm-offsets.c | 1 linux/arch/i386/kernel/cpu/common.c | 7 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 | 81 +++++++++++ linux/arch/i386/kernel/traps.c | 93 ++++++++++++- 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/powerpc/kernel/vdso.c | 3 linux/arch/x86_64/ia32/ia32_binfmt.c | 6 linux/arch/x86_64/ia32/syscall32.c | 4 linux/arch/x86_64/kernel/process.c | 6 linux/arch/x86_64/kernel/setup64.c | 23 --- linux/arch/x86_64/mm/fault.c | 2 linux/arch/x86_64/mm/mmap.c | 99 +++++++++++--- linux/drivers/char/random.c | 7 linux/fs/binfmt_elf.c | 151 ++++++++++++++++----- linux/fs/proc/array.c | 8 - linux/fs/proc/base.c | 8 - linux/fs/proc/task_mmu.c | 34 +++- linux/include/asm-i386/a.out.h | 2 linux/include/asm-i386/desc.h | 14 + linux/include/asm-i386/elf.h | 50 +++++-- linux/include/asm-i386/mmu.h | 6 linux/include/asm-i386/page.h | 5 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-powerpc/pgalloc.h | 5 linux/include/asm-ppc/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/pgtable.h | 2 linux/include/linux/mm.h | 16 +- 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 | 57 ++++++++ linux/mm/fremap.c | 16 +- linux/mm/mmap.c | 183 ++++++++++++++++++++++++-- linux/mm/mprotect.c | 5 linux/mm/mremap.c | 4 52 files changed, 931 insertions(+), 161 deletions(-) Index: linux-2.6-execshield.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-5/linux-2.6-execshield.patch,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- linux-2.6-execshield.patch 6 Mar 2006 16:31:47 -0000 1.11 +++ linux-2.6-execshield.patch 21 Mar 2006 21:49:03 -0000 1.12 @@ -1,54 +1,3 @@ - arch/i386/kernel/asm-offsets.c | 1 - arch/i386/kernel/cpu/common.c | 7 + - 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 | 56 ++++++++++++++- - arch/i386/kernel/traps.c | 93 ++++++++++++++++++++++++- - 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 | 4 - - arch/x86_64/kernel/process.c | 6 - - arch/x86_64/kernel/setup64.c | 23 ------ - arch/x86_64/mm/Makefile | 2 - arch/x86_64/mm/fault.c | 2 - arch/x86_64/mm/mmap.c | 95 +++++++++++++++++++++++++ - drivers/char/random.c | 7 + - fs/binfmt_elf.c | 130 ++++++++++++++++++++++++++++------- - 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-powerpc/pgalloc.h | 5 + - include/asm-ppc/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/pgtable.h | 2 - include/asm-x86_64/processor.h | 5 + - include/linux/mm.h | 11 ++ - 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 | 16 ++-- - mm/mmap.c | 105 ++++++++++++++++++++++++++-- - mm/mprotect.c | 5 + - mm/mremap.c | 4 - - 49 files changed, 784 insertions(+), 124 deletions(-) - Index: linux/arch/i386/kernel/asm-offsets.c =================================================================== --- linux.orig/arch/i386/kernel/asm-offsets.c @@ -65,7 +14,7 @@ =================================================================== --- linux.orig/arch/i386/kernel/cpu/common.c +++ linux/arch/i386/kernel/cpu/common.c -@@ -392,6 +392,13 @@ void __devinit identify_cpu(struct cpuin +@@ -408,6 +408,13 @@ void __devinit identify_cpu(struct cpuin if (disable_pse) clear_bit(X86_FEATURE_PSE, c->x86_capability); @@ -102,7 +51,7 @@ =================================================================== --- linux.orig/arch/i386/kernel/process.c +++ linux/arch/i386/kernel/process.c -@@ -652,6 +652,8 @@ struct task_struct fastcall * __switch_t +@@ -638,6 +638,8 @@ struct task_struct fastcall * __switch_t /* never put a printk in __switch_to... printk() calls wake_up*() indirectly */ __unlazy_fpu(prev_p); @@ -111,7 +60,7 @@ /* * Reload esp0. -@@ -925,3 +927,60 @@ unsigned long arch_align_stack(unsigned +@@ -911,3 +913,60 @@ unsigned long arch_align_stack(unsigned sp -= get_random_int() % 8192; return sp & ~0xf; } @@ -176,7 +125,7 @@ =================================================================== --- linux.orig/arch/i386/kernel/signal.c +++ linux/arch/i386/kernel/signal.c -@@ -384,7 +384,7 @@ static int setup_frame(int sig, struct k +@@ -350,7 +350,7 @@ static int setup_frame(int sig, struct k goto give_sigsegv; } @@ -185,7 +134,7 @@ if (ka->sa.sa_flags & SA_RESTORER) restorer = ka->sa.sa_restorer; -@@ -480,7 +480,7 @@ static int setup_rt_frame(int sig, struc +@@ -446,7 +446,7 @@ static int setup_rt_frame(int sig, struc goto give_sigsegv; /* Set up to return from userspace. */ @@ -219,97 +168,115 @@ =================================================================== --- linux.orig/arch/i386/kernel/sysenter.c +++ linux/arch/i386/kernel/sysenter.c -@@ -13,6 +13,7 @@ +@@ -13,7 +13,9 @@ #include #include #include +#include ++#include #include #include -@@ -36,8 +37,8 @@ void enable_sep_cpu(void) - wrmsr(MSR_IA32_SYSENTER_CS, __KERNEL_CS, 0); - wrmsr(MSR_IA32_SYSENTER_ESP, tss->esp1, 0); - wrmsr(MSR_IA32_SYSENTER_EIP, (unsigned long) sysenter_entry, 0); -- put_cpu(); -+ put_cpu(); - #endif - } - - /* -@@ -46,11 +47,20 @@ void enable_sep_cpu(void) + #include +@@ -46,11 +48,13 @@ void enable_sep_cpu(void) extern const char vsyscall_int80_start, vsyscall_int80_end; extern const char vsyscall_sysenter_start, vsyscall_sysenter_end; -+struct page *sysenter_page; ++static struct page *sysenter_pages[2]; + 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); ++ sysenter_pages[0] = virt_to_page(page); if (!boot_cpu_has(X86_FEATURE_SEP)) { memcpy(page, -@@ -65,3 +75,45 @@ int __init sysenter_setup(void) +@@ -65,3 +69,78 @@ int __init sysenter_setup(void) return 0; } + +extern void SYSENTER_RETURN_OFFSET; + -+unsigned int vdso_enabled = 0; ++unsigned int vdso_enabled = 1; + -+void map_vsyscall(void) ++/* ++ * This is called from binfmt_elf, we create the special vma for the ++ * vDSO and insert it into the mm struct tree. ++ */ ++int arch_setup_additional_pages(struct linux_binprm *bprm, ++ int executable_stack, unsigned long start_code, ++ unsigned long interp_map_address) +{ + struct thread_info *ti = current_thread_info(); -+ struct vm_area_struct *vma; -+ unsigned long addr; ++ unsigned long addr = 0, len; ++ unsigned flags = MAP_PRIVATE; ++ int err; + -+ if (unlikely(!vdso_enabled)) { -+ current->mm->context.vdso = NULL; -+ return; -+ } ++ current->mm->context.vdso = NULL; ++ if (unlikely(!vdso_enabled) || unlikely(!sysenter_pages[0])) ++ return 0; + + /* + * 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); ++ len = PAGE_SIZE > ELF_EXEC_PAGESIZE ? PAGE_SIZE : ELF_EXEC_PAGESIZE; ++ if (0==exec_shield) { /* off; %cs limit off */ ++ addr = STACK_TOP; /* minimal interference with anybody */ ++ flags = MAP_PRIVATE | MAP_FIXED; ++ } ++ else if ((3<<2) & exec_shield) { /* vdso just below .text */ ++ addr = (((2<<2) & exec_shield) && interp_map_address) ? ++ interp_map_address : start_code; ++ /* 1MB for vm86; 64K for vm86 himem */ ++ if ((0x110000 + len) <= addr) { ++ addr = (PAGE_MASK & addr) - len; + } ++ else { /* start_code is too low */ ++ addr = 0; ++ } ++ } ++ addr = get_unmapped_area_prot(NULL, addr, len, 0, ++ flags, PROT_READ | PROT_EXEC); ++ if (unlikely(addr & ~PAGE_MASK)) { ++ up_write(¤t->mm->mmap_sem); ++ return addr; ++ } ++ err = install_special_mapping(current->mm, addr, len, ++ VM_DONTEXPAND | VM_READ | VM_EXEC | ++ VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC, ++ PAGE_READONLY_EXEC, ++ sysenter_pages); ++ if (likely(err == 0)) { ++ current->mm->context.vdso = (void *)addr; ++ ti->sysenter_return = &SYSENTER_RETURN_OFFSET + addr; + } + up_write(¤t->mm->mmap_sem); ++ return err; +} + -+static int __init vdso_setup(char *str) ++int in_gate_area_no_task(unsigned long addr) +{ -+ vdso_enabled = simple_strtoul(str, NULL, 0); -+ return 1; ++ return 0; ++} ++ ++int in_gate_area(struct task_struct *task, unsigned long addr) ++{ ++ return 0; +} -+__setup("vdso=", vdso_setup); + ++struct vm_area_struct *get_gate_vma(struct task_struct *tsk) ++{ ++ return NULL; ++} Index: linux/arch/i386/kernel/traps.c =================================================================== --- linux.orig/arch/i386/kernel/traps.c +++ linux/arch/i386/kernel/traps.c -@@ -461,7 +461,82 @@ DO_ERROR(10, SIGSEGV, "invalid TSS", inv +@@ -490,7 +490,82 @@ DO_ERROR(10, SIGSEGV, "invalid TSS", inv DO_ERROR(11, SIGBUS, "segment not present", segment_not_present) DO_ERROR(12, SIGBUS, "stack segment", stack_segment) DO_ERROR_INFO(17, SIGBUS, "alignment check", alignment_check, BUS_ADRALN, 0) @@ -347,7 +314,7 @@ + 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; ++ desc2 = get_cpu_gdt_table(cpu) + GDT_ENTRY_DEFAULT_USER_CS; + + if (desc1->a != desc2->a || desc1->b != desc2->b) { + /* @@ -393,7 +360,7 @@ fastcall void __kprobes do_general_protection(struct pt_regs * regs, long error_code) -@@ -469,6 +544,7 @@ fastcall void __kprobes do_general_prote +@@ -498,6 +573,7 @@ fastcall void __kprobes do_general_prote int cpu = get_cpu(); struct tss_struct *tss = &per_cpu(init_tss, cpu); struct thread_struct *thread = ¤t->thread; @@ -401,7 +368,7 @@ /* * Perform the lazy TSS's I/O bitmap copy. If the TSS has an -@@ -495,7 +571,6 @@ fastcall void __kprobes do_general_prote +@@ -524,7 +600,6 @@ fastcall void __kprobes do_general_prote put_cpu(); return; } @@ -409,7 +376,7 @@ current->thread.error_code = error_code; current->thread.trap_no = 13; -@@ -506,17 +581,31 @@ fastcall void __kprobes do_general_prote +@@ -535,17 +610,31 @@ fastcall void __kprobes do_general_prote if (!user_mode(regs)) goto gp_in_kernel; @@ -445,7 +412,7 @@ =================================================================== --- linux.orig/arch/i386/kernel/vsyscall-sysenter.S +++ linux/arch/i386/kernel/vsyscall-sysenter.S -@@ -24,11 +24,11 @@ __kernel_vsyscall: +@@ -39,11 +39,11 @@ __kernel_vsyscall: /* 7: align return point with nop's to make disassembly easier */ .space 7,0x90 @@ -523,7 +490,7 @@ * bit is set, or if the expected stack growth is unlimited: */ - if (sysctl_legacy_va_layout || -+ if ((exec_shield != 2) && (sysctl_legacy_va_layout || ++ if (!(2 & exec_shield) && (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)) { @@ -551,11 +518,25 @@ { unsigned long pgoff = (eppnt->p_vaddr) & ~IA32_PAGE_MASK; +Index: linux/arch/powerpc/kernel/vdso.c +=================================================================== +--- linux.orig/arch/powerpc/kernel/vdso.c ++++ linux/arch/powerpc/kernel/vdso.c +@@ -218,7 +218,8 @@ static struct vm_operations_struct vdso_ + * vDSO and insert it into the mm struct tree + */ + int arch_setup_additional_pages(struct linux_binprm *bprm, +- int executable_stack) ++ int executable_stack, unsigned long start_code, ++ unsigned long interp_map_address) + { + struct mm_struct *mm = current->mm; + struct vm_area_struct *vma; Index: linux/arch/x86_64/ia32/ia32_binfmt.c =================================================================== --- linux.orig/arch/x86_64/ia32/ia32_binfmt.c +++ linux/arch/x86_64/ia32/ia32_binfmt.c -@@ -248,8 +248,6 @@ elf_core_copy_task_xfpregs(struct task_s +@@ -247,8 +247,6 @@ elf_core_copy_task_xfpregs(struct task_s #define elf_check_arch(x) \ ((x)->e_machine == EM_386) @@ -564,7 +545,7 @@ #define ELF_EXEC_PAGESIZE PAGE_SIZE #define ELF_HWCAP (boot_cpu_data.x86_capability[0]) #define ELF_PLATFORM ("i686") -@@ -263,8 +261,6 @@ do { \ +@@ -262,8 +260,6 @@ do { \ set_thread_flag(TIF_ABI_PENDING); \ else \ clear_thread_flag(TIF_ABI_PENDING); \ @@ -573,11 +554,35 @@ } while (0) /* Override some function names */ +@@ -307,7 +303,7 @@ static void elf32_init(struct pt_regs *) + + #define ARCH_HAS_SETUP_ADDITIONAL_PAGES 1 + #define arch_setup_additional_pages syscall32_setup_pages +-extern int syscall32_setup_pages(struct linux_binprm *, int exstack); ++extern int syscall32_setup_pages(struct linux_binprm *, int exstack, unsigned long start_code, unsigned long interp_map_address); + + #include "../../../fs/binfmt_elf.c" + +Index: linux/arch/x86_64/ia32/syscall32.c +=================================================================== +--- linux.orig/arch/x86_64/ia32/syscall32.c ++++ linux/arch/x86_64/ia32/syscall32.c +@@ -42,7 +42,9 @@ static struct vm_operations_struct sysca + struct linux_binprm; + + /* Setup a VMA at program startup for the vsyscall page */ +-int syscall32_setup_pages(struct linux_binprm *bprm, int exstack) ++int syscall32_setup_pages(struct linux_binprm *bprm, int exstack, ++ unsigned long start_code, ++ unsigned long interp_map_address) + { + int npages = (VSYSCALL32_END - VSYSCALL32_BASE) >> PAGE_SHIFT; + struct vm_area_struct *vma; Index: linux/arch/x86_64/kernel/process.c =================================================================== --- linux.orig/arch/x86_64/kernel/process.c +++ linux/arch/x86_64/kernel/process.c -@@ -631,12 +631,6 @@ void set_personality_64bit(void) +@@ -660,12 +660,6 @@ void set_personality_64bit(void) /* Make sure to be in 64bit mode */ clear_thread_flag(TIF_IA32); @@ -594,7 +599,7 @@ =================================================================== --- linux.orig/arch/x86_64/kernel/setup64.c +++ linux/arch/x86_64/kernel/setup64.c -@@ -45,7 +45,7 @@ Control non executable mappings for 64bi +@@ -46,7 +46,7 @@ Control non executable mappings for 64bi on Enable(default) off Disable */ @@ -603,7 +608,7 @@ { if (!strncmp(str, "on", 2)) { __supported_pte_mask |= _PAGE_NX; -@@ -54,28 +54,7 @@ int __init nonx_setup(char *str) +@@ -55,28 +55,7 @@ int __init nonx_setup(char *str) do_not_nx = 1; __supported_pte_mask &= ~_PAGE_NX; } @@ -636,7 +641,7 @@ =================================================================== --- linux.orig/arch/x86_64/mm/fault.c +++ linux/arch/x86_64/mm/fault.c -@@ -74,7 +74,7 @@ static noinline int is_prefetch(struct p +@@ -80,7 +80,7 @@ static noinline int is_prefetch(struct p instr = (unsigned char *)convert_rip_to_linear(current, regs); max_instr = instr + 15; @@ -645,6 +650,119 @@ return 0; while (scan_more && instr < max_instr) { +Index: linux/arch/x86_64/mm/mmap.c +=================================================================== +--- linux.orig/arch/x86_64/mm/mmap.c ++++ linux/arch/x86_64/mm/mmap.c +@@ -1,30 +1,87 @@ +-/* Copyright 2005 Andi Kleen, SuSE Labs. +- * Licensed under GPL, v.2 ++/* ++ * 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 +-#include + #include +-#include + +-/* Notebook: move the mmap code from sys_x86_64.c over here. */ ++/* ++ * 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) + { +-#ifdef CONFIG_IA32_EMULATION +- if (current_thread_info()->flags & _TIF_IA32) +- return ia32_pick_mmap_layout(mm); +-#endif +- mm->mmap_base = TASK_UNMAPPED_BASE; +- if (current->flags & PF_RANDOMIZE) { +- /* Add 28bit randomness which is about 40bits of address space +- because mmap base has to be page aligned. +- or ~1/128 of the total user VM +- (total user address space is 47bits) */ +- unsigned rnd = get_random_int() & 0xfffffff; +- mm->mmap_base += ((unsigned long)rnd) << PAGE_SHIFT; ++ /* ++ * 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; + } +- mm->get_unmapped_area = arch_get_unmapped_area; +- mm->unmap_area = arch_unmap_area; + } +- Index: linux/drivers/char/random.c =================================================================== --- linux.orig/drivers/char/random.c @@ -682,6 +800,15 @@ extern int dump_fpu (struct pt_regs *, elf_fpregset_t *); #ifndef elf_addr_t +@@ -86,7 +86,7 @@ static struct linux_binfmt elf_format = + .min_coredump = ELF_EXEC_PAGESIZE + }; + +-#define BAD_ADDR(x) ((unsigned long)(x) > TASK_SIZE) ++#define BAD_ADDR(x) ((unsigned long)(x) > PAGE_MASK) + + static int set_brk(unsigned long start, unsigned long end) + { @@ -285,26 +285,65 @@ create_elf_tables(struct linux_binprm *b #ifndef elf_map @@ -763,7 +890,7 @@ 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 *interp_map_addr, + unsigned long no_base) { struct elf_phdr *elf_phdata; @@ -787,7 +914,7 @@ eppnt = elf_phdata; for (i=0; ie_phnum; i++, eppnt++) { if (eppnt->p_type == PT_LOAD) { -@@ -372,8 +417,11 @@ static unsigned long load_elf_interp(str +@@ -372,8 +417,13 @@ 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; @@ -797,10 +924,28 @@ - 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; ++ if (!*interp_map_addr) ++ *interp_map_addr = map_addr; error = map_addr; if (BAD_ADDR(map_addr)) goto out_close; -@@ -533,7 +581,7 @@ static int load_elf_binary(struct linux_ +@@ -435,8 +485,7 @@ static unsigned long load_elf_interp(str + goto out_close; + } + +- *interp_load_addr = load_addr; +- error = ((unsigned long) interp_elf_ex->e_entry) + load_addr; ++ error = load_addr; + + out_close: + kfree(elf_phdata); +@@ -528,12 +577,12 @@ static int load_elf_binary(struct linux_ + int elf_exec_fileno; + int retval, i; + unsigned int size; +- unsigned long elf_entry, interp_load_addr = 0; ++ unsigned long elf_entry, interp_load_addr = 0, interp_map_addr = 0; + unsigned long start_code, end_code, start_data, end_data; unsigned long reloc_func_desc = 0; char passed_fileno[6]; struct files_struct *files; @@ -809,7 +954,7 @@ unsigned long def_flags = 0; struct { struct elfhdr elf_ex; -@@ -689,6 +737,8 @@ static int load_elf_binary(struct linux_ +@@ -689,6 +738,8 @@ static int load_elf_binary(struct linux_ } elf_ppnt = elf_phdata; @@ -818,11 +963,11 @@ 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) -@@ -699,6 +749,11 @@ static int load_elf_binary(struct linux_ +@@ -699,6 +750,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) { ++ if (current->personality == PER_LINUX && (exec_shield & 2)) { + executable_stack = EXSTACK_DISABLE_X; + current->flags |= PF_RANDOMIZE; + } @@ -830,7 +975,7 @@ /* Some simple consistency checks for the interpreter */ if (elf_interpreter) { interpreter_type = INTERPRETER_ELF | INTERPRETER_AOUT; -@@ -752,6 +807,15 @@ static int load_elf_binary(struct linux_ +@@ -752,6 +808,15 @@ static int load_elf_binary(struct linux_ if (retval) goto out_free_dentry; @@ -846,17 +991,17 @@ /* Discard our unneeded old files struct */ if (files) { steal_locks(files); -@@ -770,7 +834,8 @@ static int load_elf_binary(struct linux_ +@@ -770,7 +835,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 && ++ 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) -@@ -790,10 +855,10 @@ static int load_elf_binary(struct linux_ +@@ -790,10 +856,10 @@ static int load_elf_binary(struct linux_ current->mm->start_stack = bprm->p; @@ -870,7 +1015,7 @@ for(i = 0, elf_ppnt = elf_phdata; i < loc->elf_ex.e_phnum; i++, elf_ppnt++) { int elf_prot = 0, elf_flags; -@@ -837,16 +902,16 @@ static int load_elf_binary(struct linux_ +@@ -837,16 +903,16 @@ static int load_elf_binary(struct linux_ elf_flags = MAP_PRIVATE|MAP_DENYWRITE|MAP_EXECUTABLE; vaddr = elf_ppnt->p_vaddr; @@ -894,32 +1039,54 @@ if (BAD_ADDR(error)) { send_sig(SIGKILL, current, 0); goto out_free_dentry; -@@ -923,7 +988,8 @@ static int load_elf_binary(struct linux_ - else +@@ -920,10 +986,17 @@ static int load_elf_binary(struct linux_ + if (interpreter_type == INTERPRETER_AOUT) + elf_entry = load_aout_interp(&loc->interp_ex, + interpreter); +- else ++ else { elf_entry = load_elf_interp(&loc->interp_elf_ex, interpreter, - &interp_load_addr); -+ &interp_load_addr, ++ &interp_map_addr, + load_bias); ++ if (!BAD_ADDR(elf_entry)) { ++ /* load_elf_interp() returns relocation adjustment */ ++ interp_load_addr = elf_entry; ++ elf_entry += loc->interp_elf_ex.e_entry; ++ } ++ } if (BAD_ADDR(elf_entry)) { printk(KERN_ERR "Unable to load interpreter %.128s\n", elf_interpreter); -@@ -955,6 +1021,14 @@ static int load_elf_binary(struct linux_ +@@ -945,21 +1018,22 @@ static int load_elf_binary(struct linux_ + } + } + +- kfree(elf_phdata); +- + if (interpreter_type != INTERPRETER_AOUT) + sys_close(elf_exec_fileno); + + set_binfmt(&elf_format); + + #ifdef ARCH_HAS_SETUP_ADDITIONAL_PAGES +- retval = arch_setup_additional_pages(bprm, executable_stack); ++ retval = arch_setup_additional_pages(bprm, executable_stack, ++ start_code, interp_map_addr); + if (retval < 0) { + send_sig(SIGKILL, current, 0); +- goto out; ++ goto out_free_fh; } #endif /* ARCH_HAS_SETUP_ADDITIONAL_PAGES */ -+ /* -+ * Map the vsyscall trampoline. This address is then passed via -+ * AT_SYSINFO. -+ */ -+#ifdef __HAVE_ARCH_VSYSCALL -+ map_vsyscall(); -+#endif ++ kfree(elf_phdata); + compute_creds(bprm); current->flags &= ~PF_FORKNOEXEC; create_elf_tables(bprm, &loc->elf_ex, (interpreter_type == INTERPRETER_AOUT), -@@ -968,6 +1042,10 @@ static int load_elf_binary(struct linux_ +@@ -973,6 +1047,10 @@ static int load_elf_binary(struct linux_ current->mm->end_data = end_data; current->mm->start_stack = bprm->p; @@ -930,6 +1097,16 @@ 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. +@@ -1158,6 +1236,9 @@ static int maydump(struct vm_area_struct + if (vma->vm_flags & (VM_IO | VM_RESERVED)) + return 0; + ++ if (vma->vm_flags & VM_DONTEXPAND) /* Kludge for vDSO. */ ++ return 1; ++ + /* Dump shared memory only if mapped from an anonymous file. */ + if (vma->vm_flags & VM_SHARED) + return vma->vm_file->f_dentry->d_inode->i_nlink == 0; Index: linux/fs/proc/array.c =================================================================== --- linux.orig/fs/proc/array.c @@ -953,7 +1130,7 @@ =================================================================== --- linux.orig/fs/proc/base.c +++ linux/fs/proc/base.c -@@ -188,7 +188,7 @@ static struct pid_entry tgid_base_stuff[ +@@ -189,7 +189,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), @@ -962,7 +1139,16 @@ #ifdef CONFIG_NUMA E(PROC_TGID_NUMA_MAPS, "numa_maps", S_IFREG|S_IRUGO), #endif -@@ -230,7 +230,7 @@ static struct pid_entry tid_base_stuff[] +@@ -202,7 +202,7 @@ static struct pid_entry tgid_base_stuff[ + E(PROC_TGID_EXE, "exe", S_IFLNK|S_IRWXUGO), + E(PROC_TGID_MOUNTS, "mounts", S_IFREG|S_IRUGO), + #ifdef CONFIG_MMU +- E(PROC_TGID_SMAPS, "smaps", S_IFREG|S_IRUGO), ++ E(PROC_TGID_SMAPS, "smaps", S_IFREG|S_IRUSR), + #endif + #ifdef CONFIG_SECURITY + E(PROC_TGID_ATTR, "attr", S_IFDIR|S_IRUGO|S_IXUGO), +@@ -231,7 +231,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), @@ -971,6 +1157,15 @@ #ifdef CONFIG_NUMA E(PROC_TID_NUMA_MAPS, "numa_maps", S_IFREG|S_IRUGO), #endif +@@ -244,7 +244,7 @@ static struct pid_entry tid_base_stuff[] + E(PROC_TID_EXE, "exe", S_IFLNK|S_IRWXUGO), + E(PROC_TID_MOUNTS, "mounts", S_IFREG|S_IRUGO), + #ifdef CONFIG_MMU +- E(PROC_TID_SMAPS, "smaps", S_IFREG|S_IRUGO), ++ E(PROC_TID_SMAPS, "smaps", S_IFREG|S_IRUSR), + #endif + #ifdef CONFIG_SECURITY + E(PROC_TID_ATTR, "attr", S_IFDIR|S_IRUGO|S_IXUGO), Index: linux/fs/proc/task_mmu.c =================================================================== --- linux.orig/fs/proc/task_mmu.c @@ -1018,7 +1213,7 @@ flags & VM_MAYSHARE ? 's' : 'p', vma->vm_pgoff << PAGE_SHIFT, MAJOR(dev), MINOR(dev), ino, &len); -@@ -154,8 +170,7 @@ static int show_map_internal(struct seq_ +@@ -154,18 +170,22 @@ static int show_map_internal(struct seq_ seq_path(m, file->f_vfsmnt, file->f_dentry, "\n"); } else { if (mm) { @@ -1027,12 +1222,42 @@ + if (vma->vm_end == mm->brk) { pad_len_spaces(m, len); seq_puts(m, "[heap]"); - } else { +- } else { +- if (vma->vm_start <= mm->start_stack && ++ } else if (vma->vm_start <= mm->start_stack && + vma->vm_end >= mm->start_stack) { + + pad_len_spaces(m, len); + seq_puts(m, "[stack]"); + } ++#ifdef __i386__ ++ else if (vma->vm_start == ++ (unsigned long)mm->context.vdso) { ++ pad_len_spaces(m, len); ++ seq_puts(m, "[vdso]"); + } ++#endif + } else { + pad_len_spaces(m, len); + seq_puts(m, "[vdso]"); +Index: linux/include/asm-i386/a.out.h +=================================================================== +--- linux.orig/include/asm-i386/a.out.h ++++ linux/include/asm-i386/a.out.h +@@ -19,7 +19,7 @@ struct exec + + #ifdef __KERNEL__ + +-#define STACK_TOP TASK_SIZE ++#define STACK_TOP (TASK_SIZE - PAGE_SIZE) /* 1 page for vdso */ + + #endif + Index: linux/include/asm-i386/desc.h =================================================================== --- linux.orig/include/asm-i386/desc.h +++ linux/include/asm-i386/desc.h -@@ -160,6 +160,20 @@ static inline unsigned long get_desc_bas +@@ -162,6 +162,20 @@ static inline unsigned long get_desc_bas return base; } @@ -1044,7 +1269,7 @@ +} + +#define load_user_cs_desc(cpu, mm) \ -+ per_cpu(cpu_gdt_table, (cpu))[GDT_ENTRY_DEFAULT_USER_CS] = (mm)->context.user_cs ++ get_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); @@ -1065,7 +1290,7 @@ #include -@@ -129,15 +130,22 @@ extern int dump_task_extended_fpu (struc +@@ -129,17 +130,31 @@ 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) @@ -1094,8 +1319,17 @@ + } \ } while (0) ++#define ARCH_HAS_SETUP_ADDITIONAL_PAGES ++struct linux_binprm; ++extern int arch_setup_additional_pages(struct linux_binprm *bprm, ++ int executable_stack, unsigned long start_code, ++ unsigned long interp_map_address); ++ ++#if 0 /* Disabled for exec-shield, where a normal vma holds the vDSO. */ /* -@@ -148,15 +156,15 @@ do { \ + * These macros parameterize elf_core_dump in fs/binfmt_elf.c to write out + * extra segments containing the vsyscall DSO contents. Dumping its +@@ -148,15 +163,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. */ @@ -1115,7 +1349,7 @@ struct elf_phdr phdr = vsyscall_phdrs[i]; \ if (phdr.p_type == PT_LOAD) { \ BUG_ON(ofs != 0); \ -@@ -174,10 +182,10 @@ do { \ +@@ -174,16 +189,23 @@ do { \ #define ELF_CORE_WRITE_EXTRA_DATA \ do { \ const struct elf_phdr *const vsyscall_phdrs = \ @@ -1129,7 +1363,9 @@ if (vsyscall_phdrs[i].p_type == PT_LOAD) \ DUMP_WRITE((void *) vsyscall_phdrs[i].p_vaddr, \ PAGE_ALIGN(vsyscall_phdrs[i].p_memsz)); \ -@@ -186,4 +194,10 @@ do { \ + } \ + } while (0) ++#endif #endif @@ -1162,6 +1398,22 @@ } mm_context_t; #endif +Index: linux/include/asm-i386/page.h +=================================================================== +--- linux.orig/include/asm-i386/page.h ++++ linux/include/asm-i386/page.h +@@ -118,6 +118,11 @@ extern int page_is_ram(unsigned long pag + #endif + #define __KERNEL_START (__PAGE_OFFSET + __PHYSICAL_START) + ++/* ++ * Under exec-shield we don't use the generic fixmap gate area. ++ * The vDSO ("gate area") has a normal vma found the normal ways. ++ */ ++#define __HAVE_ARCH_GATE_AREA 1 + + #define PAGE_OFFSET ((unsigned long)__PAGE_OFFSET) + #define VMALLOC_RESERVE ((unsigned long)__VMALLOC_RESERVE) Index: linux/include/asm-i386/pgalloc.h =================================================================== --- linux.orig/include/asm-i386/pgalloc.h @@ -1178,7 +1430,7 @@ =================================================================== --- linux.orig/include/asm-i386/processor.h +++ linux/include/asm-i386/processor.h -@@ -319,7 +319,9 @@ extern int bootloader_type; +@@ -323,7 +323,10 @@ extern int bootloader_type; /* This decides where the kernel will search for a free chunk of vm * space during mmap's. */ @@ -1186,10 +1438,11 @@ +#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 -@@ -501,6 +504,9 @@ static inline void load_esp0(struct tss_ +@@ -505,6 +508,9 @@ static inline void load_esp0(struct tss_ regs->xcs = __USER_CS; \ regs->eip = new_eip; \ regs->esp = new_esp; \ @@ -1230,7 +1483,7 @@ =================================================================== --- linux.orig/include/asm-powerpc/pgalloc.h +++ linux/include/asm-powerpc/pgalloc.h -@@ -23,6 +23,11 @@ extern kmem_cache_t *pgtable_cache[]; +@@ -24,6 +24,11 @@ extern kmem_cache_t *pgtable_cache[]; #define PGD_CACHE_NUM 0 #endif @@ -1329,24 +1582,11 @@ extern void paging_init(void); extern void clear_kernel_mapping(unsigned long addr, unsigned long size); -Index: linux/include/asm-x86_64/processor.h -=================================================================== ---- linux.orig/include/asm-x86_64/processor.h -+++ linux/include/asm-x86_64/processor.h -@@ -164,6 +164,8 @@ static inline void clear_in_cr4 (unsigne - */ - #define TASK_SIZE64 (0x800000000000UL - 4096) - -+#define __HAVE_ARCH_ALIGN_STACK -+ - /* This decides where the kernel will search for a free chunk of vm - * space during mmap's. - */ Index: linux/include/linux/mm.h =================================================================== --- linux.orig/include/linux/mm.h +++ linux/include/linux/mm.h -@@ -914,7 +914,14 @@ extern struct vm_area_struct *copy_vma(s +@@ -916,7 +916,19 @@ extern struct vm_area_struct *copy_vma(s extern void exit_mmap(struct mm_struct *); extern int may_expand_vm(struct mm_struct *mm, unsigned long npages); @@ -1359,10 +1599,15 @@ +{ + return get_unmapped_area_prot(file, addr, len, pgoff, flags, 0); +} ++ ++extern int install_special_mapping(struct mm_struct *mm, ++ unsigned long addr, unsigned long len, ++ unsigned long vm_flags, pgprot_t pgprot, ++ struct page **pages); extern unsigned long do_mmap_pgoff(struct file *file, unsigned long addr, unsigned long len, unsigned long prot, -@@ -966,7 +973,7 @@ unsigned long page_cache_readahead(struc +@@ -968,7 +980,7 @@ unsigned long page_cache_readahead(struc struct file *filp, pgoff_t offset, unsigned long size); @@ -1401,7 +1646,7 @@ /* * cloning flags: -@@ -243,6 +245,10 @@ extern int sysctl_max_map_count; +@@ -245,6 +247,10 @@ extern int sysctl_max_map_count; extern unsigned long arch_get_unmapped_area(struct file *, unsigned long, unsigned long, unsigned long, unsigned long); @@ -1412,7 +1657,7 @@ extern unsigned long arch_get_unmapped_area_topdown(struct file *filp, unsigned long addr, unsigned long len, unsigned long pgoff, -@@ -295,6 +301,9 @@ struct mm_struct { +@@ -297,6 +303,9 @@ struct mm_struct { unsigned long (*get_unmapped_area) (struct file *filp, unsigned long addr, unsigned long len, unsigned long pgoff, unsigned long flags); @@ -1420,8 +1665,8 @@ + unsigned long addr, unsigned long len, + unsigned long pgoff, unsigned long flags); void (*unmap_area) (struct mm_struct *mm, unsigned long addr); - unsigned long mmap_base; /* base of mmap area */ - unsigned long cached_hole_size; /* if non-zero, the largest hole below free_area_cache */ + unsigned long mmap_base; /* base of mmap area */ + unsigned long task_size; /* size of task vm space */ Index: linux/include/linux/sysctl.h =================================================================== --- linux.orig/include/linux/sysctl.h @@ -1440,7 +1685,7 @@ =================================================================== --- linux.orig/kernel/signal.c +++ linux/kernel/signal.c -@@ -868,6 +868,37 @@ out_set: +@@ -869,6 +869,37 @@ out_set: #define LEGACY_QUEUE(sigptr, sig) \ (((sig) < SIGRTMIN) && sigismember(&(sigptr)->signal, (sig))) @@ -1478,7 +1723,7 @@ static int specific_send_sig_info(int sig, struct siginfo *info, struct task_struct *t) -@@ -1935,6 +1966,11 @@ relock: +@@ -1936,6 +1967,11 @@ relock: if (!signr) break; /* will return 0 */ @@ -1490,7 +1735,7 @@ if ((current->ptrace & PT_PTRACED) && signr != SIGKILL) { ptrace_signal_deliver(regs, cookie); -@@ -2030,6 +2066,8 @@ relock: +@@ -2031,6 +2067,8 @@ relock: * Anything else is fatal, maybe with a core dump. */ current->flags |= PF_SIGNALED; @@ -1503,13 +1748,23 @@ =================================================================== --- linux.orig/kernel/sysctl.c +++ linux/kernel/sysctl.c -@@ -77,6 +77,19 @@ extern int proc_unknown_nmi_panic(ctl_ta +@@ -79,6 +79,29 @@ extern int proc_unknown_nmi_panic(ctl_ta void __user *, size_t *, loff_t *); #endif -+extern unsigned int vdso_enabled; ++extern unsigned int vdso_enabled, vdso_populate; + -+int exec_shield = 1; ++int exec_shield = (1<<3) | (1<<1) | (1<<0); ++/* exec_shield is a bitmask: ++ 0: off; vdso at STACK_TOP, 1 page below TASK_SIZE ++ (1<<0) 1: on [also on if !=0] ++ (1<<1) 2: noexecstack by default ++ (1<<2) 4: vdso just below .text of main (unless too low) ++ (1<<3) 8: vdso just below .text of PT_INTERP (unless too low) ++Yes, vdso placement is overloaded here; but exec_shield off ++is a strong incentive to place vdso at STACK_TOP, so the bit ++for vdso just below .text comes along for the ride. ++*/ + +static int __init setup_exec_shield(char *str) +{ @@ -1523,7 +1778,7 @@ /* this is needed for the proc_dointvec_minmax for [fs_]overflow UID and GID */ static int maxolduid = 65535; static int minolduid; -@@ -280,6 +293,32 @@ static ctl_table kern_table[] = { +@@ -284,6 +307,40 @@ static ctl_table kern_table[] = { .proc_handler = &proc_dointvec, }, { @@ -1551,6 +1806,14 @@ + .mode = 0644, + .proc_handler = &proc_dointvec, + }, ++ { ++ .ctl_name = KERN_VDSO, ++ .procname = "vdso_populate", ++ .data = &vdso_populate, ++ .maxlen = sizeof(int), ++ .mode = 0644, ++ .proc_handler = &proc_dointvec, ++ }, +#endif + { .ctl_name = KERN_CORE_USES_PID, @@ -1587,7 +1850,7 @@ =================================================================== --- linux.orig/mm/mmap.c +++ linux/mm/mmap.c -@@ -24,6 +24,7 @@ +@@ -25,6 +25,7 @@ #include #include #include @@ -1595,7 +1858,7 @@ #include #include -@@ -341,6 +342,8 @@ static inline void +@@ -342,6 +343,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) { @@ -1604,7 +1867,7 @@ if (prev) { vma->vm_next = prev->vm_next; prev->vm_next = vma; -@@ -445,6 +448,8 @@ __vma_unlink(struct mm_struct *mm, struc +@@ -446,6 +449,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; @@ -1613,7 +1876,7 @@ } /* -@@ -750,6 +755,8 @@ struct vm_area_struct *vma_merge(struct +@@ -751,6 +756,8 @@ struct vm_area_struct *vma_merge(struct } else /* cases 2, 5, 7 */ vma_adjust(prev, prev->vm_start, end, prev->vm_pgoff, NULL); @@ -1622,7 +1885,7 @@ return prev; } -@@ -921,7 +928,7 @@ unsigned long do_mmap_pgoff(struct file +@@ -922,7 +929,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. */ @@ -1631,7 +1894,7 @@ if (addr & ~PAGE_MASK) return addr; -@@ -1327,16 +1334,21 @@ void arch_unmap_area_topdown(struct mm_s +@@ -1328,16 +1335,21 @@ void arch_unmap_area_topdown(struct mm_s mm->free_area_cache = mm->mmap_base; } @@ -1656,7 +1919,7 @@ if (file && file->f_op && file->f_op->get_unmapped_area) get_area = file->f_op->get_unmapped_area; addr = get_area(file, addr, len, pgoff, flags); -@@ -1367,7 +1379,71 @@ get_unmapped_area(struct file *file, uns +@@ -1368,7 +1380,71 @@ get_unmapped_area(struct file *file, uns return addr; } @@ -1729,7 +1992,7 @@ /* 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) -@@ -1442,6 +1518,14 @@ out: +@@ -1443,6 +1519,14 @@ out: return prev ? prev->vm_next : vma; } @@ -1744,7 +2007,7 @@ /* * Verify that the stack growth is acceptable and * update accounting. This is shared with both the -@@ -1457,7 +1541,7 @@ static int acct_stack_growth(struct vm_a +@@ -1458,7 +1542,7 @@ static int acct_stack_growth(struct vm_a return -ENOMEM; /* Stack limit test */ @@ -1753,7 +2016,7 @@ return -ENOMEM; /* mlock limit tests */ -@@ -1737,10 +1821,14 @@ int split_vma(struct mm_struct * mm, str +@@ -1738,10 +1822,14 @@ int split_vma(struct mm_struct * mm, str if (new->vm_ops && new->vm_ops->open) new->vm_ops->open(new); @@ -1770,7 +2033,7 @@ vma_adjust(vma, vma->vm_start, addr, vma->vm_pgoff, new); return 0; -@@ -1945,6 +2033,7 @@ void exit_mmap(struct mm_struct *mm) +@@ -1946,6 +2034,7 @@ void exit_mmap(struct mm_struct *mm) vm_unacct_memory(nr_accounted); free_pgtables(&tlb, vma, FIRST_USER_ADDRESS, 0); tlb_finish_mmu(tlb, 0, end); @@ -1778,6 +2041,88 @@ /* * Walk the list again, actually closing and freeing it, +@@ -2061,3 +2150,81 @@ int may_expand_vm(struct mm_struct *mm, + return 0; + return 1; + } ++ ++ ++static struct page * ++special_mapping_nopage(struct vm_area_struct *vma, ++ unsigned long address, int *type) ++{ ++ struct page **pages; ++ ++ BUG_ON(address < vma->vm_start || address >= vma->vm_end); ++ ++ address -= vma->vm_start; ++ for (pages = vma->vm_private_data; address > 0 && *pages; ++pages) ++ address -= PAGE_SIZE; ++ ++ if (*pages) { ++ get_page(*pages); ++ return *pages; ++ } ++ ++ return NOPAGE_SIGBUS; ++} ++ ++static struct vm_operations_struct special_mapping_vmops = { ++ .nopage = special_mapping_nopage, ++}; ++ ++unsigned int vdso_populate = 1; ++ ++/* ++ * Insert a new vma covering the given region, with the given flags and ++ * protections. Its pages are supplied by the given null-terminated array. ++ * The region past the last page supplied will always produce SIGBUS. ++ * The array pointer and the pages it points to are assumed to stay alive ++ * for as long as this mapping might exist. ++ */ ++int install_special_mapping(struct mm_struct *mm, ++ unsigned long addr, unsigned long len, ++ unsigned long vm_flags, pgprot_t pgprot, ++ struct page **pages) ++{ ++ struct vm_area_struct *vma; ++ int err; ++ ++ vma = kmem_cache_alloc(vm_area_cachep, SLAB_KERNEL); ++ if (unlikely(vma == NULL)) ++ return -ENOMEM; ++ memset(vma, 0, sizeof(*vma)); ++ ++ vma->vm_mm = mm; ++ vma->vm_start = addr; ++ vma->vm_end = addr + len; ++ ++ vma->vm_flags = vm_flags; ++ vma->vm_page_prot = pgprot; ++ ++ vma->vm_ops = &special_mapping_vmops; ++ vma->vm_private_data = pages; ++ ++ insert_vm_struct(mm, vma); ++ mm->total_vm += len >> PAGE_SHIFT; ++ ++ if (!vdso_populate) ++ return 0; ++ ++ err = 0; ++ while (*pages) { ++ struct page *page = *pages++; ++ get_page(page); ++ err = install_page(mm, vma, addr, page, vma->vm_page_prot); ++ if (err) { ++ put_page(page); ++ break; ++ } ++ addr += PAGE_SIZE; ++ } ++ ++ return err; ++} Index: linux/mm/mprotect.c =================================================================== --- linux.orig/mm/mprotect.c @@ -1812,7 +2157,7 @@ =================================================================== --- linux.orig/mm/mremap.c +++ linux/mm/mremap.c -@@ -386,8 +386,8 @@ unsigned long do_mremap(unsigned long ad +@@ -387,8 +387,8 @@ unsigned long do_mremap(unsigned long ad if (vma->vm_flags & VM_MAYSHARE) map_flags |= MAP_SHARED; @@ -1823,3 +2168,15 @@ ret = new_addr; if (new_addr & ~PAGE_MASK) goto out; +--- linux-2.6.16.noarch/include/asm-powerpc/elf.h~ 2006-03-20 21:52:50.000000000 -0500 ++++ linux-2.6.16.noarch/include/asm-powerpc/elf.h 2006-03-20 21:53:20.000000000 -0500 +@@ -273,7 +273,8 @@ extern int ucache_bsize; + #define ARCH_HAS_SETUP_ADDITIONAL_PAGES + struct linux_binprm; + extern int arch_setup_additional_pages(struct linux_binprm *bprm, +- int executable_stack); ++ int executable_stack, unsigned long start_code, ++ unsigned long interp_map_address); + #define VDSO_AUX_ENT(a,b) NEW_AUX_ENT(a,b); + + /* --- linux-2.6-execshield-fixes.patch DELETED --- --- linux-2.6-execshield-vdso.patch DELETED --- From fedora-cvs-commits at redhat.com Tue Mar 21 21:57:48 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 21 Mar 2006 16:57:48 -0500 Subject: rpms/e2fsprogs/FC-5 e2fsprogs-1.38-blkid-devmapper.patch, 1.1, 1.2 e2fsprogs.spec, 1.53, 1.54 Message-ID: <200603212157.k2LLvm4a012672@cvs.devel.redhat.com> Author: kzak Update of /cvs/dist/rpms/e2fsprogs/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv12658 Modified Files: e2fsprogs-1.38-blkid-devmapper.patch e2fsprogs.spec Log Message: Prevent error messages to stderr caused by libblkid calling libdevmapper e2fsprogs-1.38-blkid-devmapper.patch: MCONFIG.in | 3 configure.in | 30 ++++++++ e2fsck/Makefile.in | 2 lib/blkid/Makefile.in | 4 - lib/blkid/blkid.pc.in | 2 lib/blkid/blkidP.h | 1 lib/blkid/devname.c | 176 ++++++++++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 214 insertions(+), 4 deletions(-) Index: e2fsprogs-1.38-blkid-devmapper.patch =================================================================== RCS file: /cvs/dist/rpms/e2fsprogs/FC-5/e2fsprogs-1.38-blkid-devmapper.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- e2fsprogs-1.38-blkid-devmapper.patch 11 Jan 2006 15:41:36 -0000 1.1 +++ e2fsprogs-1.38-blkid-devmapper.patch 21 Mar 2006 21:57:44 -0000 1.2 @@ -1,5 +1,5 @@ --- e2fsprogs-1.38/configure.in.dm 2005-04-06 20:44:15.000000000 +0200 -+++ e2fsprogs-1.38/configure.in 2006-01-11 14:50:39.000000000 +0100 ++++ e2fsprogs-1.38/configure.in 2006-03-21 22:39:36.000000000 +0100 @@ -480,6 +480,36 @@ ) AC_SUBST(E2INITRD_PROG) @@ -37,8 +37,8 @@ dnl dnl MAKEFILE_LIBRARY=$srcdir/lib/Makefile.library ---- e2fsprogs-1.38/MCONFIG.in.dm 2006-01-11 14:02:41.000000000 +0100 -+++ e2fsprogs-1.38/MCONFIG.in 2006-01-11 14:03:18.000000000 +0100 +--- e2fsprogs-1.38/MCONFIG.in.dm 2005-02-04 16:43:57.000000000 +0100 ++++ e2fsprogs-1.38/MCONFIG.in 2006-03-21 22:39:36.000000000 +0100 @@ -74,6 +74,9 @@ LIBINTL = @LIBINTL@ DEPLIBUUID = $(LIB)/libuuid at LIB_EXT@ @@ -49,8 +49,8 @@ STATIC_LIBSS = $(LIB)/libss at STATIC_LIB_EXT@ STATIC_LIBCOM_ERR = $(LIB)/libcom_err at STATIC_LIB_EXT@ STATIC_LIBE2P = $(LIB)/libe2p at STATIC_LIB_EXT@ ---- e2fsprogs-1.38/lib/blkid/blkid.pc.in.dm 2006-01-11 13:25:32.000000000 +0100 -+++ e2fsprogs-1.38/lib/blkid/blkid.pc.in 2006-01-11 14:48:57.000000000 +0100 +--- e2fsprogs-1.38/lib/blkid/blkid.pc.in.dm 2005-01-26 18:13:25.000000000 +0100 ++++ e2fsprogs-1.38/lib/blkid/blkid.pc.in 2006-03-21 22:39:36.000000000 +0100 @@ -6,6 +6,6 @@ Name: blkid Description: Block device id library @@ -60,7 +60,7 @@ Cflags: -I${includedir} Libs: -L${libdir} -lblkid --- e2fsprogs-1.38/lib/blkid/Makefile.in.dm 2005-06-29 19:39:54.000000000 +0200 -+++ e2fsprogs-1.38/lib/blkid/Makefile.in 2006-01-11 14:10:44.000000000 +0100 ++++ e2fsprogs-1.38/lib/blkid/Makefile.in 2006-03-21 22:39:36.000000000 +0100 @@ -37,7 +37,7 @@ ELF_IMAGE = libblkid ELF_MYDIR = blkid @@ -80,7 +80,7 @@ .c.o: --- e2fsprogs-1.38/lib/blkid/devname.c.dm 2005-05-07 21:26:03.000000000 +0200 -+++ e2fsprogs-1.38/lib/blkid/devname.c 2006-01-11 14:29:47.000000000 +0100 ++++ e2fsprogs-1.38/lib/blkid/devname.c 2006-03-21 22:45:17.000000000 +0100 @@ -11,6 +11,8 @@ * %End-Header% */ @@ -123,11 +123,17 @@ if (tmp->bid_devno == devno) { if (only_if_new) return; -@@ -137,6 +151,155 @@ +@@ -137,6 +151,165 @@ return; } +#ifdef HAVE_DEVMAPPER ++static void dm_quiet_log(int level, const char *file, int line, ++ const char *f, ...) ++{ ++ return; ++} ++ +/* + * device-mapper support + */ @@ -177,9 +183,11 @@ + unsigned int next = 0; + int n, ret = 1; + ++ dm_log_init(dm_quiet_log); + task = dm_task_create(DM_DEVICE_LIST); + if (!task) + return 1; ++ dm_log_init(0); + + dm_task_run(task); + names = dm_task_get_names(task); @@ -236,9 +244,11 @@ + unsigned int next = 0; + int n; + ++ dm_log_init(dm_quiet_log); + task = dm_task_create(DM_DEVICE_LIST); + if (!task) + return; ++ dm_log_init(0); + + dm_task_run(task); + names = dm_task_get_names(task); @@ -279,7 +289,7 @@ #define PROC_PARTITIONS "/proc/partitions" #define VG_DIR "/proc/lvm/VGs" -@@ -290,6 +453,9 @@ +@@ -290,6 +463,9 @@ return 0; blkid_read_cache(cache); @@ -290,7 +300,7 @@ #ifdef VG_DIR lvm_probe_all(cache, only_if_new); --- e2fsprogs-1.38/lib/blkid/blkidP.h.dm 2005-05-07 20:16:09.000000000 +0200 -+++ e2fsprogs-1.38/lib/blkid/blkidP.h 2006-01-11 13:24:54.000000000 +0100 ++++ e2fsprogs-1.38/lib/blkid/blkidP.h 2006-03-21 22:39:36.000000000 +0100 @@ -118,6 +118,7 @@ /* * Priority settings for different types of devices @@ -300,7 +310,7 @@ #define BLKID_PRI_LVM 20 #define BLKID_PRI_MD 10 --- e2fsprogs-1.38/e2fsck/Makefile.in.dm 2005-06-29 19:42:20.000000000 +0200 -+++ e2fsprogs-1.38/e2fsck/Makefile.in 2006-01-11 14:04:35.000000000 +0100 ++++ e2fsprogs-1.38/e2fsck/Makefile.in 2006-03-21 22:39:36.000000000 +0100 @@ -20,7 +20,7 @@ DEPLIBS= $(LIBEXT2FS) $(LIBCOM_ERR) $(LIBBLKID) $(DEPLIBUUID) Index: e2fsprogs.spec =================================================================== RCS file: /cvs/dist/rpms/e2fsprogs/FC-5/e2fsprogs.spec,v retrieving revision 1.53 retrieving revision 1.54 diff -u -r1.53 -r1.54 --- e2fsprogs.spec 13 Mar 2006 12:53:54 -0000 1.53 +++ e2fsprogs.spec 21 Mar 2006 21:57:44 -0000 1.54 @@ -4,7 +4,7 @@ Summary: Utilities for managing the second extended (ext2) filesystem. Name: e2fsprogs Version: 1.38 -Release: 13 +Release: 13.1 License: GPL Group: System Environment/Base Source: ftp://download.sourceforge.net/pub/sourceforge/e2fsprogs/e2fsprogs-%{version}.tar.gz @@ -310,7 +310,10 @@ %{_mandir}/man3/uuid_unparse.3* %changelog -* Mon Mar 13 2006 Karel Zak - 1.38-13 +* Tue Mar 21 2006 Karel Zak - 1.38-13.1 +- prevent error messages to stderr caused by libblkid calling libdevmapper + +* Mon Mar 13 2006 Karel Zak - 1.38-13 - used upstream version of the blkid-epoch patch (by Theodore Tso, #182188) * Wed Mar 8 2006 Peter Jones - 1.38-12 From fedora-cvs-commits at redhat.com Tue Mar 21 22:01:58 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 21 Mar 2006 17:01:58 -0500 Subject: rpms/e2fsprogs/devel e2fsprogs-1.38-blkid-devmapper.patch, 1.1, 1.2 e2fsprogs.spec, 1.53, 1.54 Message-ID: <200603212201.k2LM1wnP012893@cvs.devel.redhat.com> Author: kzak Update of /cvs/dist/rpms/e2fsprogs/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv12838 Modified Files: e2fsprogs-1.38-blkid-devmapper.patch e2fsprogs.spec Log Message: Prevent error messages to stderr caused by libblkid calling libdevmapper e2fsprogs-1.38-blkid-devmapper.patch: MCONFIG.in | 3 configure.in | 30 ++++++++ e2fsck/Makefile.in | 2 lib/blkid/Makefile.in | 4 - lib/blkid/blkid.pc.in | 2 lib/blkid/blkidP.h | 1 lib/blkid/devname.c | 176 ++++++++++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 214 insertions(+), 4 deletions(-) Index: e2fsprogs-1.38-blkid-devmapper.patch =================================================================== RCS file: /cvs/dist/rpms/e2fsprogs/devel/e2fsprogs-1.38-blkid-devmapper.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- e2fsprogs-1.38-blkid-devmapper.patch 11 Jan 2006 15:41:36 -0000 1.1 +++ e2fsprogs-1.38-blkid-devmapper.patch 21 Mar 2006 22:01:01 -0000 1.2 @@ -1,5 +1,5 @@ --- e2fsprogs-1.38/configure.in.dm 2005-04-06 20:44:15.000000000 +0200 -+++ e2fsprogs-1.38/configure.in 2006-01-11 14:50:39.000000000 +0100 ++++ e2fsprogs-1.38/configure.in 2006-03-21 22:39:36.000000000 +0100 @@ -480,6 +480,36 @@ ) AC_SUBST(E2INITRD_PROG) @@ -37,8 +37,8 @@ dnl dnl MAKEFILE_LIBRARY=$srcdir/lib/Makefile.library ---- e2fsprogs-1.38/MCONFIG.in.dm 2006-01-11 14:02:41.000000000 +0100 -+++ e2fsprogs-1.38/MCONFIG.in 2006-01-11 14:03:18.000000000 +0100 +--- e2fsprogs-1.38/MCONFIG.in.dm 2005-02-04 16:43:57.000000000 +0100 ++++ e2fsprogs-1.38/MCONFIG.in 2006-03-21 22:39:36.000000000 +0100 @@ -74,6 +74,9 @@ LIBINTL = @LIBINTL@ DEPLIBUUID = $(LIB)/libuuid at LIB_EXT@ @@ -49,8 +49,8 @@ STATIC_LIBSS = $(LIB)/libss at STATIC_LIB_EXT@ STATIC_LIBCOM_ERR = $(LIB)/libcom_err at STATIC_LIB_EXT@ STATIC_LIBE2P = $(LIB)/libe2p at STATIC_LIB_EXT@ ---- e2fsprogs-1.38/lib/blkid/blkid.pc.in.dm 2006-01-11 13:25:32.000000000 +0100 -+++ e2fsprogs-1.38/lib/blkid/blkid.pc.in 2006-01-11 14:48:57.000000000 +0100 +--- e2fsprogs-1.38/lib/blkid/blkid.pc.in.dm 2005-01-26 18:13:25.000000000 +0100 ++++ e2fsprogs-1.38/lib/blkid/blkid.pc.in 2006-03-21 22:39:36.000000000 +0100 @@ -6,6 +6,6 @@ Name: blkid Description: Block device id library @@ -60,7 +60,7 @@ Cflags: -I${includedir} Libs: -L${libdir} -lblkid --- e2fsprogs-1.38/lib/blkid/Makefile.in.dm 2005-06-29 19:39:54.000000000 +0200 -+++ e2fsprogs-1.38/lib/blkid/Makefile.in 2006-01-11 14:10:44.000000000 +0100 ++++ e2fsprogs-1.38/lib/blkid/Makefile.in 2006-03-21 22:39:36.000000000 +0100 @@ -37,7 +37,7 @@ ELF_IMAGE = libblkid ELF_MYDIR = blkid @@ -80,7 +80,7 @@ .c.o: --- e2fsprogs-1.38/lib/blkid/devname.c.dm 2005-05-07 21:26:03.000000000 +0200 -+++ e2fsprogs-1.38/lib/blkid/devname.c 2006-01-11 14:29:47.000000000 +0100 ++++ e2fsprogs-1.38/lib/blkid/devname.c 2006-03-21 22:45:17.000000000 +0100 @@ -11,6 +11,8 @@ * %End-Header% */ @@ -123,11 +123,17 @@ if (tmp->bid_devno == devno) { if (only_if_new) return; -@@ -137,6 +151,155 @@ +@@ -137,6 +151,165 @@ return; } +#ifdef HAVE_DEVMAPPER ++static void dm_quiet_log(int level, const char *file, int line, ++ const char *f, ...) ++{ ++ return; ++} ++ +/* + * device-mapper support + */ @@ -177,9 +183,11 @@ + unsigned int next = 0; + int n, ret = 1; + ++ dm_log_init(dm_quiet_log); + task = dm_task_create(DM_DEVICE_LIST); + if (!task) + return 1; ++ dm_log_init(0); + + dm_task_run(task); + names = dm_task_get_names(task); @@ -236,9 +244,11 @@ + unsigned int next = 0; + int n; + ++ dm_log_init(dm_quiet_log); + task = dm_task_create(DM_DEVICE_LIST); + if (!task) + return; ++ dm_log_init(0); + + dm_task_run(task); + names = dm_task_get_names(task); @@ -279,7 +289,7 @@ #define PROC_PARTITIONS "/proc/partitions" #define VG_DIR "/proc/lvm/VGs" -@@ -290,6 +453,9 @@ +@@ -290,6 +463,9 @@ return 0; blkid_read_cache(cache); @@ -290,7 +300,7 @@ #ifdef VG_DIR lvm_probe_all(cache, only_if_new); --- e2fsprogs-1.38/lib/blkid/blkidP.h.dm 2005-05-07 20:16:09.000000000 +0200 -+++ e2fsprogs-1.38/lib/blkid/blkidP.h 2006-01-11 13:24:54.000000000 +0100 ++++ e2fsprogs-1.38/lib/blkid/blkidP.h 2006-03-21 22:39:36.000000000 +0100 @@ -118,6 +118,7 @@ /* * Priority settings for different types of devices @@ -300,7 +310,7 @@ #define BLKID_PRI_LVM 20 #define BLKID_PRI_MD 10 --- e2fsprogs-1.38/e2fsck/Makefile.in.dm 2005-06-29 19:42:20.000000000 +0200 -+++ e2fsprogs-1.38/e2fsck/Makefile.in 2006-01-11 14:04:35.000000000 +0100 ++++ e2fsprogs-1.38/e2fsck/Makefile.in 2006-03-21 22:39:36.000000000 +0100 @@ -20,7 +20,7 @@ DEPLIBS= $(LIBEXT2FS) $(LIBCOM_ERR) $(LIBBLKID) $(DEPLIBUUID) Index: e2fsprogs.spec =================================================================== RCS file: /cvs/dist/rpms/e2fsprogs/devel/e2fsprogs.spec,v retrieving revision 1.53 retrieving revision 1.54 diff -u -r1.53 -r1.54 --- e2fsprogs.spec 13 Mar 2006 12:53:54 -0000 1.53 +++ e2fsprogs.spec 21 Mar 2006 22:01:02 -0000 1.54 @@ -4,7 +4,7 @@ Summary: Utilities for managing the second extended (ext2) filesystem. Name: e2fsprogs Version: 1.38 -Release: 13 +Release: 14 License: GPL Group: System Environment/Base Source: ftp://download.sourceforge.net/pub/sourceforge/e2fsprogs/e2fsprogs-%{version}.tar.gz @@ -310,6 +310,9 @@ %{_mandir}/man3/uuid_unparse.3* %changelog +* Tue Mar 21 2006 Karel Zak - 1.38-14 +- prevent error messages to stderr caused by libblkid calling libdevmapper + * Mon Mar 13 2006 Karel Zak - 1.38-13 - used upstream version of the blkid-epoch patch (by Theodore Tso, #182188) From fedora-cvs-commits at redhat.com Tue Mar 21 22:04:10 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 21 Mar 2006 17:04:10 -0500 Subject: rpms/kernel/FC-5 linux-2.6-optimise-spinlock-debug.patch,1.1,1.2 Message-ID: <200603212204.k2LM4Am7012950@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv12920/FC-5 Modified Files: linux-2.6-optimise-spinlock-debug.patch Log Message: build fix. linux-2.6-optimise-spinlock-debug.patch: spinlock_debug.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) Index: linux-2.6-optimise-spinlock-debug.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-5/linux-2.6-optimise-spinlock-debug.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- linux-2.6-optimise-spinlock-debug.patch 21 Mar 2006 21:09:30 -0000 1.1 +++ linux-2.6-optimise-spinlock-debug.patch 21 Mar 2006 22:03:57 -0000 1.2 @@ -1,11 +1,11 @@ --- linux-2.6.16/lib/spinlock_debug.c~ 2006-03-20 16:31:13.000000000 -0500 +++ linux-2.6.16/lib/spinlock_debug.c 2006-03-20 16:31:24.000000000 -0500 -@@ -9,8 +9,8 @@ +@@ -9,8 +9,9 @@ #include #include #include --#include + #include #include +#include From fedora-cvs-commits at redhat.com Tue Mar 21 22:04:26 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 21 Mar 2006 17:04:26 -0500 Subject: rpms/kernel/devel linux-2.6-optimise-spinlock-debug.patch,1.1,1.2 Message-ID: <200603212204.k2LM4QOS012974@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv12920/devel Modified Files: linux-2.6-optimise-spinlock-debug.patch Log Message: build fix. linux-2.6-optimise-spinlock-debug.patch: spinlock_debug.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) Index: linux-2.6-optimise-spinlock-debug.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-optimise-spinlock-debug.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- linux-2.6-optimise-spinlock-debug.patch 21 Mar 2006 21:12:02 -0000 1.1 +++ linux-2.6-optimise-spinlock-debug.patch 21 Mar 2006 22:03:59 -0000 1.2 @@ -1,11 +1,11 @@ --- linux-2.6.16/lib/spinlock_debug.c~ 2006-03-20 16:31:13.000000000 -0500 +++ linux-2.6.16/lib/spinlock_debug.c 2006-03-20 16:31:24.000000000 -0500 -@@ -9,8 +9,8 @@ +@@ -9,8 +9,9 @@ #include #include #include --#include + #include #include +#include From fedora-cvs-commits at redhat.com Tue Mar 21 22:49:58 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 21 Mar 2006 17:49:58 -0500 Subject: rpms/xterm/devel xterm-211-bz186094.patch, NONE, 1.1 .cvsignore, 1.11, 1.12 sources, 1.11, 1.12 xterm.spec, 1.39, 1.40 Message-ID: <200603212249.k2LMnwDW008417@cvs.devel.redhat.com> Author: jvdias Update of /cvs/dist/rpms/xterm/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv8400 Modified Files: .cvsignore sources xterm.spec Added Files: xterm-211-bz186094.patch Log Message: upgrade to upstream version 211 - fixes bug 186094 xterm-211-bz186094.patch: XTerm.ad | 1 + 1 files changed, 1 insertion(+) --- NEW FILE xterm-211-bz186094.patch --- --- xterm-211/XTerm.ad.bz186094 2006-03-21 17:24:07.000000000 -0500 +++ xterm-211/XTerm.ad 2006-03-21 17:42:55.000000000 -0500 @@ -191,3 +191,4 @@ *VT100*eightBitInput: 0 *VT100*backarrowKey: 0 *VT100*scrollBar: 1 +*VT100*utf8Title: 1 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/xterm/devel/.cvsignore,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- .cvsignore 13 Feb 2006 17:11:25 -0000 1.11 +++ .cvsignore 21 Mar 2006 22:49:56 -0000 1.12 @@ -9,3 +9,4 @@ 16colors.txt xterm-208.tgz xterm-209.tgz +xterm-211.tgz Index: sources =================================================================== RCS file: /cvs/dist/rpms/xterm/devel/sources,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- sources 13 Feb 2006 17:11:26 -0000 1.11 +++ sources 21 Mar 2006 22:49:56 -0000 1.12 @@ -1,4 +1,4 @@ -c75cdbf9395bbc2cd69863fbe7c2e019 xterm-209.tgz 0048925cb45d60429bc2f7665d563680 ctlseqs.txt.gz 92826989d4f4aa610cf6222359f3f83a UnicodeData-Latest.txt.gz 6093439b8d79089f4ff1cdfed358b401 16colors.txt +babb9a02ba7ebb7770f48e3257b2884e xterm-211.tgz Index: xterm.spec =================================================================== RCS file: /cvs/dist/rpms/xterm/devel/xterm.spec,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- xterm.spec 7 Mar 2006 22:25:17 -0000 1.39 +++ xterm.spec 21 Mar 2006 22:49:56 -0000 1.40 @@ -1,7 +1,7 @@ Summary: xterm terminal emulator for the X Window System Name: xterm -Version: 209 -Release: 4 +Version: 211 +Release: 1.FC6 URL: http://dickey.his.com/xterm License: MIT Group: User Interface/X @@ -21,6 +21,8 @@ Patch8: xterm-208-root-grab-console.patch Patch9: xterm-209-bz182382.patch Patch10: xterm-209-bz183993.patch +Patch11: xterm-211-bz186094.patch + BuildRequires: libXft-devel BuildRequires: freetype-devel BuildRequires: libXrender-devel @@ -39,6 +41,11 @@ BuildRequires: libtermcap-devel BuildRequires: utempter +%{?!DEBUGINFO: %define DEBUGINFO 1} +%if !%{DEBUGINFO} +%define debug_package %{nil} +%endif + %define x11_app_defaults_dir %{_datadir}/X11/app-defaults %{?!_with_256_color: %define _with_256_color 1} %{?!_with_tek4014: %define _with_tek4014 1} @@ -62,8 +69,11 @@ #%patch6 -p1 -b .eightBitInput_false %patch7 -p1 -b .redhat-resources %patch8 -p1 -b .root-grab-console -%patch9 -p1 -b .bz182382 -%patch10 -p1 -b .bz183993 +#%patch9 -p1 -b .bz182382 +# ^- patch now upstream +#%patch10 -p1 -b .bz183993 +# ^- patch now upstream +%patch11 -p1 -b .bz186094 %build RPM_OPT_FLAGS="$RPM_OPT_FLAGS -DPROJECTROOT='\"/usr\"'" @@ -92,6 +102,10 @@ gunzip < %SOURCE1 > ctlseqs.txt gunzip < %SOURCE2 > UnicodeData.txt cp -fp %SOURCE3 16colors.txt +%if !%{DEBUGINFO} +/usr/lib/rpm/brp-compress +exit 0 +%endif %clean #rm -rf $RPM_BUILD_ROOT @@ -109,6 +123,10 @@ %doc xterm.log.html ctlseqs.ms ctlseqs.txt UnicodeData.txt 16colors.txt README.i18n %changelog +* Tue Mar 21 2006 Jason Vas Dias - 211-1 +- Upgrade to upstream version 211 (fixes bug 186094). +- Enable new 'utf8Title' resource by default + * Tue Mar 07 2006 Jason Vas Dias - 209-4 - fix bug 183993: call set_cursor_gcs in ReverseVideo From fedora-cvs-commits at redhat.com Tue Mar 21 22:55:20 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 21 Mar 2006 17:55:20 -0500 Subject: rpms/xterm/FC-5 .cvsignore, 1.11, 1.12 sources, 1.11, 1.12 xterm.spec, 1.39, 1.40 Message-ID: <200603212255.k2LMtKsh008493@cvs.devel.redhat.com> Author: jvdias Update of /cvs/dist/rpms/xterm/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv8478 Modified Files: .cvsignore sources xterm.spec Log Message: upgrade to upstream version 211 - fixes bug 186094 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/xterm/FC-5/.cvsignore,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- .cvsignore 13 Feb 2006 17:11:25 -0000 1.11 +++ .cvsignore 21 Mar 2006 22:55:18 -0000 1.12 @@ -9,3 +9,4 @@ 16colors.txt xterm-208.tgz xterm-209.tgz +xterm-211.tgz Index: sources =================================================================== RCS file: /cvs/dist/rpms/xterm/FC-5/sources,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- sources 13 Feb 2006 17:11:26 -0000 1.11 +++ sources 21 Mar 2006 22:55:18 -0000 1.12 @@ -1,4 +1,4 @@ -c75cdbf9395bbc2cd69863fbe7c2e019 xterm-209.tgz 0048925cb45d60429bc2f7665d563680 ctlseqs.txt.gz 92826989d4f4aa610cf6222359f3f83a UnicodeData-Latest.txt.gz 6093439b8d79089f4ff1cdfed358b401 16colors.txt +babb9a02ba7ebb7770f48e3257b2884e xterm-211.tgz Index: xterm.spec =================================================================== RCS file: /cvs/dist/rpms/xterm/FC-5/xterm.spec,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- xterm.spec 7 Mar 2006 22:25:17 -0000 1.39 +++ xterm.spec 21 Mar 2006 22:55:18 -0000 1.40 @@ -1,7 +1,7 @@ Summary: xterm terminal emulator for the X Window System Name: xterm -Version: 209 -Release: 4 +Version: 211 +Release: 1.FC5 URL: http://dickey.his.com/xterm License: MIT Group: User Interface/X @@ -21,6 +21,8 @@ Patch8: xterm-208-root-grab-console.patch Patch9: xterm-209-bz182382.patch Patch10: xterm-209-bz183993.patch +Patch11: xterm-211-bz186094.patch + BuildRequires: libXft-devel BuildRequires: freetype-devel BuildRequires: libXrender-devel @@ -39,6 +41,11 @@ BuildRequires: libtermcap-devel BuildRequires: utempter +%{?!DEBUGINFO: %define DEBUGINFO 1} +%if !%{DEBUGINFO} +%define debug_package %{nil} +%endif + %define x11_app_defaults_dir %{_datadir}/X11/app-defaults %{?!_with_256_color: %define _with_256_color 1} %{?!_with_tek4014: %define _with_tek4014 1} @@ -62,8 +69,11 @@ #%patch6 -p1 -b .eightBitInput_false %patch7 -p1 -b .redhat-resources %patch8 -p1 -b .root-grab-console -%patch9 -p1 -b .bz182382 -%patch10 -p1 -b .bz183993 +#%patch9 -p1 -b .bz182382 +# ^- patch now upstream +#%patch10 -p1 -b .bz183993 +# ^- patch now upstream +%patch11 -p1 -b .bz186094 %build RPM_OPT_FLAGS="$RPM_OPT_FLAGS -DPROJECTROOT='\"/usr\"'" @@ -92,6 +102,10 @@ gunzip < %SOURCE1 > ctlseqs.txt gunzip < %SOURCE2 > UnicodeData.txt cp -fp %SOURCE3 16colors.txt +%if !%{DEBUGINFO} +/usr/lib/rpm/brp-compress +exit 0 +%endif %clean #rm -rf $RPM_BUILD_ROOT @@ -109,6 +123,10 @@ %doc xterm.log.html ctlseqs.ms ctlseqs.txt UnicodeData.txt 16colors.txt README.i18n %changelog +* Tue Mar 21 2006 Jason Vas Dias - 211-1 +- Upgrade to upstream version 211 (fixes bug 186094). +- Enable new 'utf8Title' resource by default + * Tue Mar 07 2006 Jason Vas Dias - 209-4 - fix bug 183993: call set_cursor_gcs in ReverseVideo From fedora-cvs-commits at redhat.com Tue Mar 21 22:55:45 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 21 Mar 2006 17:55:45 -0500 Subject: rpms/xterm/FC-5 xterm-211-bz186094.patch,NONE,1.1 Message-ID: <200603212255.k2LMtjZZ008520@cvs.devel.redhat.com> Author: jvdias Update of /cvs/dist/rpms/xterm/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv8506 Added Files: xterm-211-bz186094.patch Log Message: upgrade to upstream version 211 - fixes bug 186094 xterm-211-bz186094.patch: XTerm.ad | 1 + 1 files changed, 1 insertion(+) --- NEW FILE xterm-211-bz186094.patch --- --- xterm-211/XTerm.ad.bz186094 2006-03-21 17:24:07.000000000 -0500 +++ xterm-211/XTerm.ad 2006-03-21 17:42:55.000000000 -0500 @@ -191,3 +191,4 @@ *VT100*eightBitInput: 0 *VT100*backarrowKey: 0 *VT100*scrollBar: 1 +*VT100*utf8Title: 1 From fedora-cvs-commits at redhat.com Tue Mar 21 23:11:00 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 21 Mar 2006 18:11:00 -0500 Subject: rpms/anaconda/devel .cvsignore, 1.239, 1.240 anaconda.spec, 1.360, 1.361 sources, 1.359, 1.360 Message-ID: <200603212311.k2LNB0Nd008740@cvs.devel.redhat.com> Author: katzj Update of /cvs/dist/rpms/anaconda/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv8717/devel Modified Files: .cvsignore anaconda.spec sources Log Message: auto-import anaconda-11.1.0.0-1 on branch devel from anaconda-11.1.0.0-1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/anaconda/devel/.cvsignore,v retrieving revision 1.239 retrieving revision 1.240 diff -u -r1.239 -r1.240 --- .cvsignore 14 Mar 2006 23:11:52 -0000 1.239 +++ .cvsignore 21 Mar 2006 23:10:58 -0000 1.240 @@ -1 +1 @@ -anaconda-11.0.5.tar.bz2 +anaconda-11.1.0.0.tar.bz2 Index: anaconda.spec =================================================================== RCS file: /cvs/dist/rpms/anaconda/devel/anaconda.spec,v retrieving revision 1.360 retrieving revision 1.361 diff -u -r1.360 -r1.361 --- anaconda.spec 14 Mar 2006 23:11:52 -0000 1.360 +++ anaconda.spec 21 Mar 2006 23:10:58 -0000 1.361 @@ -1,5 +1,5 @@ Name: anaconda -Version: 11.0.5 +Version: 11.1.0.0 Release: 1 License: GPL Summary: Graphical system installer @@ -79,38 +79,29 @@ /sbin/chkconfig --del reconfig >/dev/null 2>&1 || : %changelog -* Tue Mar 14 2006 Paul Nasrat 11.0.5-1 -- Fix import for rescue mode - -* Tue Mar 14 2006 Chris Lumens 11.0.4-1 -- Remove Amharic and Thai from lang-table - -* Mon Mar 13 2006 Jeremy Katz - 11.0.3-1 -- Check for none in size test (clumens, #185172) -- Fix hard drive install (clumens) -- Don't clobber network on upgrade (pnasrat, #183203) -- Fix some simple syntax errors (#185275) -- Allow 128M PE sizes (#185272) - -* Thu Mar 9 2006 Jeremy Katz - 11.0.2-1 -- adjust blkid location -- don't try to download packages being erased (clumens, #184531) -- don't show group selection on upgrade (pnasrat, #184528) -- don't make file conflicts kill upgrades (pnasrat, #184461) - -* Wed Mar 8 2006 Jeremy Katz - 11.0.2-1 -- error handling on fs label reading (#184412) -- add sis190 driver -- remove no-longer shipped lvm2-cluster on upgrade (pjones) - -* Tue Mar 7 2006 Jeremy Katz - 11.0.1-1 -- Fix text display for rescue CD isolinux -- Fix usb-storage not showing up by default (#181739) - -* Tue Mar 7 2006 Jeremy Katz - 11.0.0-1 -- Really fix the file contexts on the directories (#182252) -- More fixing for Xen kernel naming -- Branched, turn off betanag +* Tue Mar 21 2006 Jeremy Katz - 11.1.0.0-1 +- Fix text for rescue images +- Fix some file contexts (#182252) +- Update for new xen kernel names +- Don't try to download package being erased (clumens, #184531) +- Don't show group selection on ks upgrade (pnasrat, #184528) +- Ignore conflicts on upgrade (pnasrat, #184461) +- Don't traceback trying to mount auto fs's (clumens, #182730) +- String fixes (clumens, #181916) +- rootpath fix (clumens, #185172) +- Prompt for missing images on hd installs (clumens, #185274) +- Don't clobber network on upgrades (pnasrat, (#183203) +- Fix some syntax errors (#185275) +- Cap pe size at 128M (#185272) +- Conditionalize selinux (msw) +- Remove some obsolete code (msw, katzj) +- Ensure we don't ask for no longer needed cds if packages are + deselected (pnasrat, #185437) +- Remove amharic and thai since we don't have fonts (clumens) +- Let's try not doing traceonly and see the size difference for minstg2.img +- Fix i5 (pnasrat, #186070) +- Misc cleanups to iutil (clumens) +- Use system-config-date for text-mode timezone too (clumens) * Mon Mar 6 2006 Jeremy Katz - 10.92.17-1 - fix traceback in size check Index: sources =================================================================== RCS file: /cvs/dist/rpms/anaconda/devel/sources,v retrieving revision 1.359 retrieving revision 1.360 diff -u -r1.359 -r1.360 --- sources 14 Mar 2006 23:11:52 -0000 1.359 +++ sources 21 Mar 2006 23:10:58 -0000 1.360 @@ -1 +1 @@ -f814e7d0011dd44c3c3cf12b6ddb5b40 anaconda-11.0.5.tar.bz2 +c7c7642859d23336176364ae7a86a81c anaconda-11.1.0.0.tar.bz2 From fedora-cvs-commits at redhat.com Wed Mar 22 01:56:42 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 21 Mar 2006 20:56:42 -0500 Subject: rpms/xorg-x11-server/devel .cvsignore, 1.9, 1.10 sources, 1.7, 1.8 xorg-x11-server.spec, 1.45, 1.46 Message-ID: <200603220156.k2M1ugSl027024@cvs.devel.redhat.com> Author: krh Update of /cvs/dist/rpms/xorg-x11-server/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv27007 Modified Files: .cvsignore sources xorg-x11-server.spec Log Message: - Update to 1.0.99.1 snapshot. Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/xorg-x11-server/devel/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 6 Feb 2006 22:20:05 -0000 1.9 +++ .cvsignore 22 Mar 2006 01:56:39 -0000 1.10 @@ -1,3 +1,4 @@ -*.tar.bz2 -*.tar.gz -clog +xorg-server-1.0.99.1 +MesaLib-6.5.tar.bz2 +xorg-server-1.0.99.1.tar.bz2 +MesaLib-6.5-cvs20060321.tar.bz2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/xorg-x11-server/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 30 Jan 2006 02:03:29 -0000 1.7 +++ sources 22 Mar 2006 01:56:39 -0000 1.8 @@ -1 +1,2 @@ -aa0ccb851ec5f7f9b132581d9a5827e4 xorg-server-1.0.1.tar.bz2 +660b1c6a0910d92190a6a7f0427a576d xorg-server-1.0.99.1.tar.bz2 +0fd3d0b3f8970dbc9ab2083a611c887a MesaLib-6.5-cvs20060321.tar.bz2 Index: xorg-x11-server.spec =================================================================== RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- xorg-x11-server.spec 6 Mar 2006 20:38:28 -0000 1.45 +++ xorg-x11-server.spec 22 Mar 2006 01:56:39 -0000 1.46 @@ -1,16 +1,18 @@ %define pkgname xorg-server -%define cvsdate xxxxxxxxxxx +%define cvsdate cvs20060321 +%define mesalib MesaLib-6.5-cvs20060321.tar.bz2 Summary: X.Org X11 X server Name: xorg-x11-server -Version: 1.0.1 -Release: 8 +Version: 1.0.99.1 +Release: 1 URL: http://www.x.org License: MIT/X11 Group: User Interface/X BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/%{pkgname}-%{version}.tar.bz2 +Source1: %{mesalib} Source100: comment-header-modefiles.txt Patch0: xorg-x11-server-0.99.3-init-origins-fix.patch @@ -26,10 +28,6 @@ # https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=181292. hacky patch Patch7: xorg-x11-server-1.0.1-fpic-libxf86config.patch -# Patches taken from xserver/xorg CVS HEAD, post-1.0.1 -Patch100: xorg-x11-server-1.0.1-fbpict-fix-rounding.patch -Patch101: xorg-x11-server-1.0.1-SEGV-on-null-interface.patch - Patch1000: xorg-redhat-die-ugly-pattern-die-die-die.patch Patch1001: xorg-x11-server-1.0.1-Red-Hat-extramodes.patch @@ -99,7 +97,7 @@ %if %{with_dri} BuildRequires: mesa-libGL-devel >= 6.4.1-1 # "mesa-libGL-source >= 6.4.2-2" required for the solution for bug #176976 -BuildRequires: mesa-source >= 6.4.2-2 +# BuildRequires: mesa-source >= 6.4.2-2 BuildRequires: libdrm-devel >= 2.0-1 %endif %description @@ -244,19 +242,18 @@ %patch6 -p1 -b .randrsdk %patch7 -p1 -b .xf86configfpic -%patch100 -p2 -b .fbpict-fix-rounding -%patch101 -p2 -b .SEGV-on-null-interface - %patch1000 -p0 -b .redhat-die-ugly-pattern-die-die-die %patch1001 -p1 -b .Red-Hat-extramodes +tar xfj %{_sourcedir}/%{mesalib} + %build #FONTDIR="${datadir}/X11/fonts" #DEFAULT_FONT_PATH="${FONTDIR}/misc:unscaled,${FONTDIR}/TTF/,${FONTDIR}/OTF,${FONTDIR}/Type1/,${FONTDIR}/CID/,${FONTDIR}/100dpi:unscaled,${FONTDIR}/75dpi:unscaled" # --disable-dependency-tracking \ -automake-1.7 ; autoconf +automake; autoconf %configure %{xservers} \ --disable-xprint \ --disable-static \ @@ -267,7 +264,7 @@ --enable-lbx \ %if %{with_dri} --enable-dri \ - --with-mesa-source=%{_datadir}/mesa/source \ + --with-mesa-source=%{_builddir}/%{pkgname}-%{version}/Mesa-6.5 \ %endif --with-module-dir=%{moduledir} \ --with-os-name="Fedora Core 5" \ @@ -319,6 +316,7 @@ rm -f $RPM_BUILD_ROOT%{_bindir}/outl rm -f $RPM_BUILD_ROOT%{_bindir}/outw rm -f $RPM_BUILD_ROOT%{_bindir}/pcitweak + rm -f $RPM_BUILD_ROOT%{_bindir}/cvt %endif } @@ -393,6 +391,7 @@ %{_bindir}/outl %{_bindir}/outw %{_bindir}/pcitweak +%{_bindir}/cvt %endif %{_bindir}/scanpci %dir %{_datadir}/xorg @@ -428,14 +427,12 @@ %{_libdir}/xorg/modules/libafb.so %{_libdir}/xorg/modules/libcfb.so %{_libdir}/xorg/modules/libcfb16.so -%{_libdir}/xorg/modules/libcfb24.so %{_libdir}/xorg/modules/libcfb32.so %{_libdir}/xorg/modules/libddc.so %{_libdir}/xorg/modules/libexa.so %{_libdir}/xorg/modules/libfb.so %{_libdir}/xorg/modules/libi2c.so %{_libdir}/xorg/modules/libint10.so -%{_libdir}/xorg/modules/liblayer.so %{_libdir}/xorg/modules/libmfb.so %{_libdir}/xorg/modules/libpcidata.so %{_libdir}/xorg/modules/librac.so @@ -450,7 +447,6 @@ %{_libdir}/xorg/modules/libxf4bpp.so %{_libdir}/xorg/modules/libxf8_16bpp.so %{_libdir}/xorg/modules/libxf8_32bpp.so -%{_libdir}/xorg/modules/libxf8_32wid.so %dir %{_libdir}/xserver %{_libdir}/xserver/SecurityPolicy #%dir %{_mandir}/man1x @@ -460,6 +456,7 @@ %{_mandir}/man1/scanpci.1x* %{_mandir}/man1/Xorg.1x* %{_mandir}/man1/Xserver.1x* +%{_mandir}/man1/cvt.1* #%dir %{_mandir}/man4x #%{_mandir}/man4/fbdevhw.4x* %{_mandir}/man4/fbdevhw.4* @@ -522,6 +519,9 @@ # ------------------------------------------------------------------- %changelog +* Tue Mar 21 2006 Kristian H??gsberg 1.0.99.1-1 +- Update to 1.0.99.1 snapshot. + * Mon Mar 6 2006 Jeremy Katz - 1.0.1-8 - build libxf86config with -fPIC (#181292) - fix sgi 1600sw extra mode (#182430) From fedora-cvs-commits at redhat.com Wed Mar 22 02:48:55 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 21 Mar 2006 21:48:55 -0500 Subject: rpms/m17n-db/devel .cvsignore, 1.8, 1.9 m17n-db.spec, 1.10, 1.11 sources, 1.8, 1.9 Message-ID: <200603220248.k2M2mtcT022982@cvs.devel.redhat.com> Author: petersen Update of /cvs/dist/rpms/m17n-db/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv9278 Modified Files: .cvsignore m17n-db.spec sources Log Message: - Indic header language name fixes from Naoto Takahashi - add make-dist script Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/m17n-db/devel/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 9 Mar 2006 11:43:12 -0000 1.8 +++ .cvsignore 22 Mar 2006 02:48:53 -0000 1.9 @@ -1,2 +1,2 @@ m17n-db-1.3.3.tar.gz -m17n-db-indic-0.3.1.tar.gz +m17n-db-indic-0.3.2.tar.gz Index: m17n-db.spec =================================================================== RCS file: /cvs/dist/rpms/m17n-db/devel/m17n-db.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- m17n-db.spec 9 Mar 2006 11:43:12 -0000 1.10 +++ m17n-db.spec 22 Mar 2006 02:48:53 -0000 1.11 @@ -1,3 +1,5 @@ +%define indic_ver 0.3.2 + Name: m17n-db Summary: Multilingualization datafiles for m17n-lib Version: 1.3.3 @@ -6,7 +8,7 @@ License: LGPL URL: http://www.m17n.org/m17n-lib/index.html Source0: %{name}-%{version}.tar.gz -Source1: %{name}-indic-0.3.1.tar.gz +Source1: %{name}-indic-%{indic_ver}.tar.gz BuildArch: noarch Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Patch1: bn-itrans-t-182227.patch @@ -361,8 +363,8 @@ %makeinstall # add new Indic maps -cp -p %{name}-indic/*.mim $RPM_BUILD_ROOT%{_datadir}/m17n -cp -p %{name}-indic/*.png $RPM_BUILD_ROOT%{_datadir}/m17n/icons +cp -p %{name}-indic-%{indic_ver}/*.mim $RPM_BUILD_ROOT%{_datadir}/m17n +cp -p %{name}-indic-%{indic_ver}/*.png $RPM_BUILD_ROOT%{_datadir}/m17n/icons # don't need ispell or anthy rm $RPM_BUILD_ROOT%{_datadir}/m17n/{ispell.mim,icons/en-ispell.png} @@ -678,6 +680,10 @@ %changelog +* Wed Mar 22 2006 Jens Petersen +- fix language names in Indic .mim file headers (Naoto Takahashi) +- add make-dist script to m17n-db-indic + * Thu Mar 9 2006 Jens Petersen - 1.3.3-2 - Bengali input maps fixes (runab) - map Probhat '*' key to an alternate sequence since glyph missing (#179821) Index: sources =================================================================== RCS file: /cvs/dist/rpms/m17n-db/devel/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 9 Mar 2006 11:43:12 -0000 1.8 +++ sources 22 Mar 2006 02:48:53 -0000 1.9 @@ -1,2 +1,2 @@ a2aec22334c108565cc466d80a66292c m17n-db-1.3.3.tar.gz -2af3a9684965617273c5d9c2162acc4e m17n-db-indic-0.3.1.tar.gz +4ee13dd9ec893c710eeb1d99494171ba m17n-db-indic-0.3.2.tar.gz From fedora-cvs-commits at redhat.com Wed Mar 22 04:25:17 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 21 Mar 2006 23:25:17 -0500 Subject: rpms/anthy/FC-5 anthy-2832.patch, NONE, 1.1 anthy-2834.patch, NONE, 1.1 anthy-gcanna-nakaguro.patch, NONE, 1.1 anthy.spec, 1.18, 1.19 Message-ID: <200603220425.k2M4PH2g031923@cvs.devel.redhat.com> Author: tagoh Update of /cvs/dist/rpms/anthy/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv31905 Modified Files: anthy.spec Added Files: anthy-2832.patch anthy-2834.patch anthy-gcanna-nakaguro.patch Log Message: * Fri Mar 17 2006 Akira TAGOH 7500-1 - New upstream release. - larning words works now. (#178764) - anthy-2832.patch: patch from upstream that fixes wrong order of candidate list. - anthy-2834.patch: patch from upstream that fixes unexpected word segment. - anthy-gcanna-nakaguro.patch: added a word to dictionary to convert nakaguro to slash. anthy-2832.patch: dic_ent.h | 1 + ext_ent.c | 8 ++++++++ word_dic.c | 12 +++++++++--- 3 files changed, 18 insertions(+), 3 deletions(-) --- NEW FILE anthy-2832.patch --- diff -ur anthy-7500/src-worddic/dic_ent.h anthy-7500b/src-worddic/dic_ent.h --- anthy-7500/src-worddic/dic_ent.h 2006-03-04 18:28:22.000000000 +0900 +++ anthy-7500b/src-worddic/dic_ent.h 2006-03-12 20:12:32.000000000 +0900 @@ -65,6 +65,7 @@ int anthy_get_nr_dic_ents_of_ext_ent(struct seq_ent *se,xstr *xs); int anthy_get_nth_dic_ent_str_of_ext_ent(seq_ent_t ,xstr *,int ,xstr *); int anthy_get_nth_dic_ent_wtype_of_ext_ent(xstr *,int ,wtype_t *); +int anthy_get_nth_dic_ent_freq_of_ext_ent(struct seq_ent *se, int nth); int anthy_get_ext_seq_ent_wtype(struct seq_ent *, wtype_t ); seq_ent_t anthy_get_ext_seq_ent_from_xstr(xstr *x, int is_reverse); int anthy_get_ext_seq_ent_pos(struct seq_ent *, int); diff -ur anthy-7500/src-worddic/ext_ent.c anthy-7500b/src-worddic/ext_ent.c --- anthy-7500/src-worddic/ext_ent.c 2006-03-04 18:28:22.000000000 +0900 +++ anthy-7500b/src-worddic/ext_ent.c 2006-03-12 20:13:24.000000000 +0900 @@ -513,6 +513,14 @@ } int +anthy_get_nth_dic_ent_freq_of_ext_ent(struct seq_ent *se, int nth) +{ + (void)se; + (void)nth; + return 100; +} + +int anthy_get_ext_seq_ent_wtype(struct seq_ent *se, wtype_t w) { if (se == &num_ent) { diff -ur anthy-7500/src-worddic/word_dic.c anthy-7500b/src-worddic/word_dic.c --- anthy-7500/src-worddic/word_dic.c 2006-03-04 18:28:22.000000000 +0900 +++ anthy-7500b/src-worddic/word_dic.c 2006-03-12 20:11:39.000000000 +0900 @@ -247,13 +247,19 @@ } int -anthy_get_nth_dic_ent_freq(seq_ent_t se, int n) +anthy_get_nth_dic_ent_freq(seq_ent_t se, int nth) { struct seq_ent *s = se; - if (!s || s->nr_dic_ents <= n) { + if (!s) { return 0; } - return s->dic_ents[n]->freq; + if (!s->dic_ents) { + return anthy_get_nth_dic_ent_freq_of_ext_ent(se, nth); + } + if (s->nr_dic_ents <= nth) { + return anthy_get_nth_dic_ent_freq_of_ext_ent(se, nth - se->nr_dic_ents); + } + return s->dic_ents[nth]->freq; } int anthy-2834.patch: noun.depword | 1 + 1 files changed, 1 insertion(+) --- NEW FILE anthy-2834.patch --- diff -cr anthy-7500/depgraph/noun.depword anthy-7500b/depgraph/noun.depword *** anthy-7500/depgraph/noun.depword Sat Mar 4 18:28:22 2006 --- anthy-7500b/depgraph/noun.depword Tue Mar 14 22:37:45 2006 *************** *** 91,96 **** --- 91,97 ---- #@?????????? "" Hv@???? @?????????? "" @?????????????? @?????????? "" :Sr@ + @?????????? "" .@?????????????? .@?????? .@???????? .@??(??????) # @?????????????? "" @?? @??(??????) @?? @?? @???? @?????????????? "" @???? @??(??????) @?? @?? @?? @?? anthy-gcanna-nakaguro.patch: gcanna.ctd | 1 + 1 files changed, 1 insertion(+) --- NEW FILE anthy-gcanna-nakaguro.patch --- diff -ruN anthy-7500.orig/anthy_gcanna_ut-20051002/gcanna.ctd anthy-7500/anthy_gcanna_ut-20051002/gcanna.ctd --- anthy-7500.orig/anthy_gcanna_ut-20051002/gcanna.ctd 2005-10-02 17:56:27.000000000 +0900 +++ anthy-7500/anthy_gcanna_ut-20051002/gcanna.ctd 2006-03-17 22:19:17.000000000 +0900 @@ -1,5 +1,6 @@ ?? #KJ ?? ?? ?? #KJ / ?? ?? +?? #KJ ?? / ?? #KJ*40 ?? #KJ*4 ?? #KJ ?? ?? ?? ???? #KJ*40 ???? #KJ*38 ???? #KJ*26 ???? #KJ*12 ???? ???? ?? #KJ*40 ?? #KJ*4 ?? #KJ ?? ?? ?? Index: anthy.spec =================================================================== RCS file: /cvs/dist/rpms/anthy/FC-5/anthy.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- anthy.spec 11 Feb 2006 01:36:52 -0000 1.18 +++ anthy.spec 22 Mar 2006 04:25:12 -0000 1.19 @@ -1,10 +1,10 @@ -%define version 7100b +%define version 7500 %define gcanna_ver 20051002 %{expand: %%define build_with_xemacs %{?_with_xemacs:1}%{!?_with_xemacs:0}} Name: anthy Version: %{version} -Release: 2.2.1 +Release: 1.fc5 License: GPL URL: http://sourceforge.jp/projects/anthy/ Buildroot: %{_tmppath}/%{name}-%{version}-buildroot @@ -14,6 +14,9 @@ Source0: http://prdownloads.sourceforge.jp/anthy/9723/anthy-%{version}.tar.gz Source1: anthy-init.el Source2: http://www.geocities.jp/ep3797/snapshot/tmp/anthy_gcanna_ut-%{gcanna_ver}.tar.bz2 +Patch0: anthy-2832.patch +Patch1: anthy-2834.patch +Patch2: anthy-gcanna-nakaguro.patch Summary: Japanese character set input library Group: System Environment/Libraries @@ -55,6 +58,9 @@ %prep %setup -q -a 2 +%patch0 -p1 +%patch1 -p1 +%patch2 -p1 %build %configure @@ -117,6 +123,13 @@ %endif %changelog +* Fri Mar 17 2006 Akira TAGOH 7500-1 +- New upstream release. + - larning words works now. (#178764) +- anthy-2832.patch: patch from upstream that fixes wrong order of candidate list. +- anthy-2834.patch: patch from upstream that fixes unexpected word segment. +- anthy-gcanna-nakaguro.patch: added a word to dictionary to convert nakaguro to slash. + * Fri Feb 10 2006 Jesse Keating - 7100b-2.2.1 - bump again for double-long bug on ppc(64) From fedora-cvs-commits at redhat.com Wed Mar 22 04:28:02 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 21 Mar 2006 23:28:02 -0500 Subject: rpms/anthy/FC-5 .cvsignore,1.10,1.11 sources,1.10,1.11 Message-ID: <200603220428.k2M4S2Bl031994@cvs.devel.redhat.com> Author: tagoh Update of /cvs/dist/rpms/anthy/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv31981 Modified Files: .cvsignore sources Log Message: Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/anthy/FC-5/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 4 Nov 2005 20:12:50 -0000 1.10 +++ .cvsignore 22 Mar 2006 04:28:00 -0000 1.11 @@ -13,3 +13,4 @@ anthy-7015.tar.gz anthy-7029.tar.gz anthy-7100b.tar.gz +anthy-7500.tar.gz Index: sources =================================================================== RCS file: /cvs/dist/rpms/anthy/FC-5/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 4 Nov 2005 20:12:50 -0000 1.10 +++ sources 22 Mar 2006 04:28:00 -0000 1.11 @@ -1,2 +1,2 @@ d0f6128b6e000e85764abbc030399db7 anthy_gcanna_ut-20051002.tar.bz2 -099514a261b1c3757f95de034a4fbc0d anthy-7100b.tar.gz +c086a19b7590caa2a08406459eb577f8 anthy-7500.tar.gz From fedora-cvs-commits at redhat.com Wed Mar 22 08:16:20 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 22 Mar 2006 03:16:20 -0500 Subject: rpms/scim-anthy/FC-5 scim-anthy-symbol-style.patch, NONE, 1.1 scim-anthy.spec, 1.25, 1.26 Message-ID: <200603220816.k2M8GKoM001588@cvs.devel.redhat.com> Author: tagoh Update of /cvs/dist/rpms/scim-anthy/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv32400 Modified Files: scim-anthy.spec Added Files: scim-anthy-symbol-style.patch Log Message: * Wed Mar 22 2006 Akira TAGOH - 0.9.0-3 * scim-anthy-symbol-style.patch: applied a backport patch from upstream CVS to add an UI for the symbol style. (#178400) scim-anthy-symbol-style.patch: data/atok.sty | 6 - data/canna.sty | 8 +- data/msime.sty | 6 - data/vje-delta.sty | 4 - data/wnn.sty | 6 - src/scim_anthy_conversion.cpp | 2 src/scim_anthy_default_tables.cpp | 52 +++++++++++++ src/scim_anthy_default_tables.h | 14 +++ src/scim_anthy_factory.cpp | 14 +++ src/scim_anthy_factory.h | 2 src/scim_anthy_imengine.cpp | 145 ++++++++++++++++++++++++++++++++++++++ src/scim_anthy_imengine.h | 2 src/scim_anthy_key2kana_table.cpp | 86 ++++++++++++++++++++++ src/scim_anthy_key2kana_table.h | 18 ++++ src/scim_anthy_preedit.cpp | 24 ++++++ src/scim_anthy_preedit.h | 4 + src/scim_anthy_prefs.cpp | 20 +++++ src/scim_anthy_prefs.h | 4 + src/scim_anthy_reading.cpp | 24 ++++++ src/scim_anthy_reading.h | 4 + src/scim_anthy_setup.cpp | 95 ++++++++++++++++++++++-- 21 files changed, 512 insertions(+), 28 deletions(-) --- NEW FILE scim-anthy-symbol-style.patch --- 2006-02-28 Takuro Ashie * src/scim_anthy_conversion.cpp: Strange bihavior of resizing segment after partial commit has been fixed. 2006-02-14 Takuro Ashie * src/scim_anthy_setup.cpp: Modify order of symbol style. 2006-02-14 Takuro Ashie * src/scim_anthy_imengine.cpp: Install symbol style properties. * src/scim_anthy_setup.cpp: Show check box for symbol style label. 2006-02-13 Takuro Ashie * data/atok.sty, data/canna.sty, data/msime.sty, data/vje-delta.sty, data/wnn.sty: "/", "[", "]" entries in romaji table aren't needed anymore. 2006-02-13 Takuro Ashie * src/scim_anthy_factory.{cpp,h}, src/scim_anthy_imengine.cpp, src/scim_anthy_prefs.{cpp,h}, src/scim_anthy_setup.cpp: Add a preference to show or hide symbol style label on toolbar. But label itself is not added yet. 2006-02-13 Takuro Ashie * src/scim_anthy_setup.cpp: Split symbol related preferences from "Common" page. Change order of candidates in some combos. 2006-02-13 Takuro Ashie * src/scim_anthy_factory.cpp: Fix credit. 2006-02-08 Takuro Ashie * src/scim_anthy_setup.cpp: Add version information. 2006-02-08 Akira TAGOH * src/scim_anthy_default_tables.{cpp,h}, src/scim_anthy_factory.{cpp,h}, src/scim_anthy_imengine.{cpp,h}, src/scim_anthy_key2kana_table.{cpp,h}, src/scim_anthy_preedit.{cpp,h}, src/scim_anthy_prefs.{cpp,h}, src/scim_anthy_reading.{cpp,h}, src/scim_anthy_setup.cpp: Add symbol style preference. Index: data/atok.sty =================================================================== RCS file: /cvsroot/scim-imengine/scim-anthy/data/atok.sty,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- data/atok.sty 29 Nov 2005 14:31:28 -0000 1.22 +++ data/atok.sty 13 Feb 2006 10:49:00 -0000 1.23 @@ -85,9 +85,9 @@ # Override fundamental table [RomajiTable/FundamentalTable] - = ?? -/ = ?? -[ = ?? -] = ?? +#/ = ?? +#[ = ?? +#] = ?? a = ?? ba = ?? be = ?? Index: data/canna.sty =================================================================== RCS file: /cvsroot/scim-imengine/scim-anthy/data/canna.sty,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- data/canna.sty 5 Nov 2005 14:17:36 -0000 1.11 +++ data/canna.sty 13 Feb 2006 10:49:00 -0000 1.12 @@ -307,10 +307,10 @@ n' = ?? @@ = ?? - = ?? -[ = ?? -] = ?? -, = ?? -. = ?? +#[ = ?? +#] = ?? +#, = ?? +#. = ?? @( = ?? @) = ?? @{ = ?? Index: data/msime.sty =================================================================== RCS file: /cvsroot/scim-imengine/scim-anthy/data/msime.sty,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- data/msime.sty 11 Nov 2005 17:58:20 -0000 1.24 +++ data/msime.sty 13 Feb 2006 10:49:00 -0000 1.25 @@ -85,9 +85,9 @@ # Override fundamental table [RomajiTable/FundamentalTable] - = ?? -/ = ?? -[ = ?? -] = ?? +#/ = ?? +#[ = ?? +#] = ?? la = ?? xa = ?? a = ?? Index: data/vje-delta.sty =================================================================== RCS file: /cvsroot/scim-imengine/scim-anthy/data/vje-delta.sty,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- data/vje-delta.sty 5 Nov 2005 14:17:36 -0000 1.5 +++ data/vje-delta.sty 13 Feb 2006 10:49:00 -0000 1.6 @@ -85,8 +85,8 @@ # Override fundamental table [RomajiTable/FundamentalTable] - = ?? -[ = ?? -] = ?? +#[ = ?? +#] = ?? a = ?? i = ?? u = ?? Index: data/wnn.sty =================================================================== RCS file: /cvsroot/scim-imengine/scim-anthy/data/wnn.sty,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- data/wnn.sty 26 Dec 2005 02:47:20 -0000 1.6 +++ data/wnn.sty 13 Feb 2006 10:49:00 -0000 1.7 @@ -83,9 +83,9 @@ # Override fundamental table [RomajiTable/FundamentalTable] - = ?? -/ = ?? -[ = ?? -] = ?? +#/ = ?? +#[ = ?? +#] = ?? z. = ?? z- = ?? a = ?? Index: src/scim_anthy_conversion.cpp =================================================================== RCS file: /cvsroot/scim-imengine/scim-anthy/src/scim_anthy_conversion.cpp,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- src/scim_anthy_conversion.cpp 19 Nov 2005 06:57:53 -0000 1.35 +++ src/scim_anthy_conversion.cpp 28 Feb 2006 06:10:37 -0000 1.36 @@ -487,7 +487,7 @@ struct anthy_segment_stat seg_stat; anthy_get_segment_stat (m_anthy_context, i, &seg_stat); m_segments.push_back ( - ConversionSegment (get_segment_string (i, 0), 0, + ConversionSegment (get_segment_string (i - m_start_id, 0), 0, seg_stat.seg_len)); } } Index: src/scim_anthy_default_tables.cpp =================================================================== RCS file: /cvsroot/scim-imengine/scim-anthy/src/scim_anthy_default_tables.cpp,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- src/scim_anthy_default_tables.cpp 15 Dec 2005 10:26:01 -0000 1.20 +++ src/scim_anthy_default_tables.cpp 13 Feb 2006 08:06:25 -0000 1.21 @@ -26,8 +26,10 @@ /* from Suikyo */ ConvRule scim_anthy_romaji_typing_rule[] = { {"-", "???", ""}, +#if 0 {"[", "???", ""}, {"]", "???", ""}, +#endif {"a", "???", ""}, {"i", "???", ""}, {"u", "???", ""}, @@ -456,7 +458,9 @@ {"O", "???", ""}, {"P", "", "???"}, {"`", "???", ""}, +#if 0 {"{", "???", ""}, +#endif {"A", "", "???"}, {"S", "", "???"}, @@ -469,7 +473,9 @@ {"L", "???", ""}, {"+", "???", ""}, {"*", "???", ""}, +#if 0 {"}", "???", ""}, +#endif {"Z", "???", ""}, {"X", "", "???"}, @@ -478,7 +484,9 @@ {"B", "", "???"}, {"M", "???", ""}, {"N", "???", ""}, +#if 0 {"?", "???", ""}, +#endif {"_", "???", ""}, {NULL, NULL, NULL}, }; @@ -592,6 +600,50 @@ {NULL, NULL, NULL}, }; +ConvRule scim_anthy_romaji_ja_bracket_rule[] = { +{"[", "???", ""}, +{"]", "???", ""}, +{NULL, NULL, NULL}, +}; + +ConvRule scim_anthy_romaji_wide_bracket_rule[] = { +{"[", "???", ""}, +{"]", "???", ""}, +{NULL, NULL, NULL}, +}; + +ConvRule scim_anthy_kana_ja_bracket_rule[] = { +{"{", "???", ""}, +{"}", "???", ""}, +{NULL, NULL, NULL}, +}; + +ConvRule scim_anthy_kana_wide_bracket_rule[] = { +{"{", "???", ""}, +{"}", "???", ""}, +{NULL, NULL, NULL}, +}; + +ConvRule scim_anthy_romaji_ja_slash_rule[] = { +{"/", "???", ""}, +{NULL, NULL, NULL}, +}; + +ConvRule scim_anthy_romaji_wide_slash_rule[] = { +{"/", "???", ""}, +{NULL, NULL, NULL}, +}; + +ConvRule scim_anthy_kana_ja_slash_rule[] = { +{"?", "???", ""}, +{NULL, NULL, NULL}, +}; + +ConvRule scim_anthy_kana_wide_slash_rule[] = { +{"?", "???", ""}, +{NULL, NULL, NULL}, +}; + HiraganaKatakanaRule scim_anthy_hiragana_katakana_table[] = { {"???", "???", "???"}, {"???", "???", "???"}, Index: src/scim_anthy_default_tables.h =================================================================== RCS file: /cvsroot/scim-imengine/scim-anthy/src/scim_anthy_default_tables.h,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- src/scim_anthy_default_tables.h 26 Jul 2005 09:16:42 -0000 1.8 +++ src/scim_anthy_default_tables.h 13 Feb 2006 08:06:25 -0000 1.9 @@ -91,6 +91,20 @@ extern ConvRule scim_anthy_kana_wide_comma_rule[]; extern ConvRule scim_anthy_kana_half_comma_rule[]; +// bracket table +extern ConvRule scim_anthy_romaji_ja_bracket_rule[]; +extern ConvRule scim_anthy_romaji_wide_bracket_rule[]; + +extern ConvRule scim_anthy_kana_ja_bracket_rule[]; +extern ConvRule scim_anthy_kana_wide_bracket_rule[]; + +// slash table +extern ConvRule scim_anthy_romaji_ja_slash_rule[]; +extern ConvRule scim_anthy_romaji_wide_slash_rule[]; + +extern ConvRule scim_anthy_kana_ja_slash_rule[]; +extern ConvRule scim_anthy_kana_wide_slash_rule[]; + // misc extern HiraganaKatakanaRule scim_anthy_hiragana_katakana_table[]; extern WideRule scim_anthy_wide_table[]; Index: src/scim_anthy_factory.cpp =================================================================== RCS file: /cvsroot/scim-imengine/scim-anthy/src/scim_anthy_factory.cpp,v retrieving revision 1.40 retrieving revision 1.43 diff -u -r1.40 -r1.43 --- src/scim_anthy_factory.cpp 8 Dec 2005 03:25:52 -0000 1.40 +++ src/scim_anthy_factory.cpp 13 Feb 2006 10:24:36 -0000 1.43 @@ -108,6 +108,7 @@ m_typing_method (SCIM_ANTHY_CONFIG_TYPING_METHOD_DEFAULT), m_conversion_mode (SCIM_ANTHY_CONFIG_CONVERSION_MODE_DEFAULT), m_period_style (SCIM_ANTHY_CONFIG_PERIOD_STYLE_DEFAULT), + m_symbol_style (SCIM_ANTHY_CONFIG_SYMBOL_STYLE_DEFAULT), m_space_type (SCIM_ANTHY_CONFIG_SPACE_TYPE_DEFAULT), m_ten_key_type (SCIM_ANTHY_CONFIG_TEN_KEY_TYPE_DEFAULT), m_behavior_on_period (SCIM_ANTHY_CONFIG_BEHAVIOR_ON_PERIOD_DEFAULT), @@ -129,6 +130,7 @@ m_show_conv_mode_label (SCIM_ANTHY_CONFIG_SHOW_INPUT_MODE_LABEL_DEFAULT), m_show_typing_method_label (SCIM_ANTHY_CONFIG_SHOW_TYPING_METHOD_LABEL_DEFAULT), m_show_period_style_label (SCIM_ANTHY_CONFIG_SHOW_PERIOD_STYLE_LABEL_DEFAULT), + m_show_symbol_style_label (SCIM_ANTHY_CONFIG_SHOW_SYMBOL_STYLE_LABEL_DEFAULT), m_show_dict_label (SCIM_ANTHY_CONFIG_SHOW_DICT_LABEL_DEFAULT), m_show_dict_admin_label (SCIM_ANTHY_CONFIG_SHOW_DICT_ADMIN_LABEL_DEFAULT), m_show_add_word_label (SCIM_ANTHY_CONFIG_SHOW_ADD_WORD_LABEL_DEFAULT), @@ -200,7 +202,9 @@ AnthyFactory::get_credits () const { return utf8_mbstowcs ( - _("Special thanks:\n" + _("Art work:\n" + " SHIMODA Hiroshi \n" + "Special thanks:\n" " UTUMI Hirosi \n" " Yukiko Bando \n" " Mike Fabian \n" @@ -434,6 +438,10 @@ = config->read (String (SCIM_ANTHY_CONFIG_PERIOD_STYLE), String (SCIM_ANTHY_CONFIG_PERIOD_STYLE_DEFAULT)); + m_symbol_style + = config->read (String (SCIM_ANTHY_CONFIG_SYMBOL_STYLE), + String (SCIM_ANTHY_CONFIG_SYMBOL_STYLE_DEFAULT)); + m_space_type = config->read (String (SCIM_ANTHY_CONFIG_SPACE_TYPE), String (SCIM_ANTHY_CONFIG_SPACE_TYPE_DEFAULT)); @@ -526,6 +534,10 @@ = config->read (String (SCIM_ANTHY_CONFIG_SHOW_PERIOD_STYLE_LABEL), SCIM_ANTHY_CONFIG_SHOW_PERIOD_STYLE_LABEL_DEFAULT); + m_show_symbol_style_label + = config->read (String (SCIM_ANTHY_CONFIG_SHOW_SYMBOL_STYLE_LABEL), + SCIM_ANTHY_CONFIG_SHOW_SYMBOL_STYLE_LABEL_DEFAULT); + m_show_dict_label = config->read (String (SCIM_ANTHY_CONFIG_SHOW_DICT_LABEL), SCIM_ANTHY_CONFIG_SHOW_DICT_LABEL_DEFAULT); Index: src/scim_anthy_factory.h =================================================================== RCS file: /cvsroot/scim-imengine/scim-anthy/src/scim_anthy_factory.h,v retrieving revision 1.19 retrieving revision 1.21 diff -u -r1.19 -r1.21 --- src/scim_anthy_factory.h 15 Nov 2005 09:31:26 -0000 1.19 +++ src/scim_anthy_factory.h 13 Feb 2006 10:24:36 -0000 1.21 @@ -75,6 +75,7 @@ String m_typing_method; String m_conversion_mode; String m_period_style; + String m_symbol_style; String m_space_type; String m_ten_key_type; String m_behavior_on_period; @@ -104,6 +105,7 @@ bool m_show_conv_mode_label; bool m_show_typing_method_label; bool m_show_period_style_label; + bool m_show_symbol_style_label; bool m_show_dict_label; bool m_show_dict_admin_label; bool m_show_add_word_label; Index: src/scim_anthy_imengine.cpp =================================================================== RCS file: /cvsroot/scim-imengine/scim-anthy/src/scim_anthy_imengine.cpp,v retrieving revision 1.134 retrieving revision 1.138 diff -u -r1.134 -r1.138 --- src/scim_anthy_imengine.cpp 21 Jan 2006 05:21:40 -0000 1.134 +++ src/scim_anthy_imengine.cpp 14 Feb 2006 02:59:57 -0000 1.138 @@ -70,10 +70,25 @@ #define SCIM_PROP_PERIOD_STYLE_WIDE_LATIN_JAPANESE \ "/IMEngine/Anthy/PeriodType/WideRatin_Japanese" +#define SCIM_PROP_SYMBOL_STYLE "/IMEngine/Anthy/SymbolType" +#define SCIM_PROP_SYMBOL_STYLE_JAPANESE "/IMEngine/Anthy/SymbolType/Japanese" +#define SCIM_PROP_SYMBOL_STYLE_BRACKET_SLASH "/IMEngine/Anthy/SymbolType/WideBracket_WideSlash" +#define SCIM_PROP_SYMBOL_STYLE_CORNER_BRACKET_SLASH \ + "/IMEngine/Anthy/SymbolType/CornerBracket_WideSlash" +#define SCIM_PROP_SYMBOL_STYLE_BRACKET_MIDDLE_DOT \ + "/IMEngine/Anthy/SymbolType/WideBracket_MiddleDot" + #define SCIM_PROP_DICT "/IMEngine/Anthy/Dictionary" #define SCIM_PROP_DICT_ADD_WORD "/IMEngine/Anthy/Dictionary/AddWord" #define SCIM_PROP_DICT_LAUNCH_ADMIN_TOOL "/IMEngine/Anthy/Dictionary/LaunchAdminTool" +#define UTF8_BRACKET_CORNER_BEGIN "\xE3\x80\x8C" +#define UTF8_BRACKET_CORNER_END "\xE3\x80\x8D" +#define UTF8_BRACKET_WIDE_BEGIN "\xEF\xBC\xBB" +#define UTF8_BRACKET_WIDE_END "\xEF\xBC\xBD" +#define UTF8_MIDDLE_DOT "\xE3\x83\xBB" +#define UTF8_SLASH_WIDE "\xEF\xBC\x8F" + AnthyInstance::AnthyInstance (AnthyFactory *factory, const String &encoding, int id) @@ -611,6 +626,56 @@ m_properties.push_back (prop); } + if (m_factory->m_show_symbol_style_label) { + prop = Property (SCIM_PROP_SYMBOL_STYLE, + UTF8_BRACKET_CORNER_BEGIN + UTF8_BRACKET_CORNER_END + UTF8_MIDDLE_DOT, + String (""), + _("Symbol style")); + m_properties.push_back (prop); + + prop = Property (SCIM_PROP_SYMBOL_STYLE_JAPANESE, + UTF8_BRACKET_CORNER_BEGIN + UTF8_BRACKET_CORNER_END + UTF8_MIDDLE_DOT, + String (""), + UTF8_BRACKET_CORNER_BEGIN + UTF8_BRACKET_CORNER_END + UTF8_MIDDLE_DOT); + m_properties.push_back (prop); + + prop = Property (SCIM_PROP_SYMBOL_STYLE_CORNER_BRACKET_SLASH, + UTF8_BRACKET_CORNER_BEGIN + UTF8_BRACKET_CORNER_END + UTF8_SLASH_WIDE, + String (""), + UTF8_BRACKET_CORNER_BEGIN + UTF8_BRACKET_CORNER_END + UTF8_SLASH_WIDE); + m_properties.push_back (prop); + + prop = Property (SCIM_PROP_SYMBOL_STYLE_BRACKET_MIDDLE_DOT, + UTF8_BRACKET_WIDE_BEGIN + UTF8_BRACKET_WIDE_END + UTF8_MIDDLE_DOT, + String (""), + UTF8_BRACKET_WIDE_BEGIN + UTF8_BRACKET_WIDE_END + UTF8_MIDDLE_DOT); + m_properties.push_back (prop); + + prop = Property (SCIM_PROP_SYMBOL_STYLE_BRACKET_SLASH, + UTF8_BRACKET_WIDE_BEGIN + UTF8_BRACKET_WIDE_END + UTF8_SLASH_WIDE, + String (""), + UTF8_BRACKET_WIDE_BEGIN + UTF8_BRACKET_WIDE_END + UTF8_SLASH_WIDE); + m_properties.push_back (prop); + } + if (m_factory->m_show_dict_label) { prop = Property (SCIM_PROP_DICT, String(""), //_("Dictionary"), @@ -641,6 +706,8 @@ set_typing_method (get_typing_method ()); set_period_style (m_preedit.get_period_style (), m_preedit.get_comma_style ()); + set_symbol_style (m_preedit.get_bracket_style (), + m_preedit.get_slash_style ()); register_properties (m_properties); } @@ -810,6 +877,50 @@ m_preedit.set_comma_style (comma); } +void +AnthyInstance::set_symbol_style (BracketStyle bracket, + SlashStyle slash) +{ + String label; + + switch (bracket) { + case SCIM_ANTHY_BRACKET_JAPANESE: + label = UTF8_BRACKET_CORNER_BEGIN UTF8_BRACKET_CORNER_END; + break; + case SCIM_ANTHY_BRACKET_WIDE: + label = UTF8_BRACKET_WIDE_BEGIN UTF8_BRACKET_WIDE_END; + break; + default: + break; + } + + switch (slash) { + case SCIM_ANTHY_SLASH_JAPANESE: + label += UTF8_MIDDLE_DOT; + break; + case SCIM_ANTHY_SLASH_WIDE: + label += UTF8_SLASH_WIDE; + break; + default: + break; + } + + if (label.length () > 0) { + PropertyList::iterator it = std::find (m_properties.begin (), + m_properties.end (), + SCIM_PROP_SYMBOL_STYLE); + if (it != m_properties.end ()) { + it->set_label (label.c_str ()); + update_property (*it); + } + } + + if (bracket != m_preedit.get_bracket_style ()) + m_preedit.set_bracket_style (bracket); + if (slash != m_preedit.get_slash_style ()) + m_preedit.set_slash_style (slash); +} + bool AnthyInstance::is_selecting_candidates (void) { @@ -1959,6 +2070,20 @@ set_period_style (SCIM_ANTHY_PERIOD_HALF, SCIM_ANTHY_COMMA_HALF); + // symbol type + } else if (property == SCIM_PROP_SYMBOL_STYLE_JAPANESE) { + set_symbol_style (SCIM_ANTHY_BRACKET_JAPANESE, + SCIM_ANTHY_SLASH_JAPANESE); + } else if (property == SCIM_PROP_SYMBOL_STYLE_CORNER_BRACKET_SLASH) { + set_symbol_style (SCIM_ANTHY_BRACKET_JAPANESE, + SCIM_ANTHY_SLASH_WIDE); + } else if (property == SCIM_PROP_SYMBOL_STYLE_BRACKET_MIDDLE_DOT) { + set_symbol_style (SCIM_ANTHY_BRACKET_WIDE, + SCIM_ANTHY_SLASH_JAPANESE); + } else if (property == SCIM_PROP_SYMBOL_STYLE_BRACKET_SLASH) { + set_symbol_style (SCIM_ANTHY_BRACKET_WIDE, + SCIM_ANTHY_SLASH_WIDE); + // dictionary } else if (property == SCIM_PROP_DICT_ADD_WORD) { action_add_word (); @@ -2090,6 +2215,26 @@ } } + // set symbol style + if (m_on_init || !m_factory->m_show_symbol_style_label) { + if (m_factory->m_symbol_style == "Japanese") { + m_preedit.set_bracket_style (SCIM_ANTHY_BRACKET_JAPANESE); + m_preedit.set_slash_style (SCIM_ANTHY_SLASH_JAPANESE); + } else if (m_factory->m_symbol_style == "WideBracket_WideSlash") { + m_preedit.set_bracket_style (SCIM_ANTHY_BRACKET_WIDE); + m_preedit.set_slash_style (SCIM_ANTHY_SLASH_WIDE); + } else if (m_factory->m_symbol_style == "CornerBracket_WideSlash") { + m_preedit.set_bracket_style (SCIM_ANTHY_BRACKET_JAPANESE); + m_preedit.set_slash_style (SCIM_ANTHY_SLASH_WIDE); + } else if (m_factory->m_symbol_style == "WideBracket_MiddleDot") { + m_preedit.set_bracket_style (SCIM_ANTHY_BRACKET_WIDE); + m_preedit.set_slash_style (SCIM_ANTHY_SLASH_JAPANESE); + } else { + m_preedit.set_bracket_style (SCIM_ANTHY_BRACKET_JAPANESE); + m_preedit.set_slash_style (SCIM_ANTHY_SLASH_JAPANESE); + } + } + // set lookup table if (m_factory->m_cand_win_page_size > 0) m_lookup_table.set_page_size (m_factory->m_cand_win_page_size); Index: src/scim_anthy_imengine.h =================================================================== RCS file: /cvsroot/scim-imengine/scim-anthy/src/scim_anthy_imengine.h,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- src/scim_anthy_imengine.h 7 Dec 2005 02:17:12 -0000 1.46 +++ src/scim_anthy_imengine.h 13 Feb 2006 08:06:25 -0000 1.47 @@ -221,6 +221,8 @@ void set_typing_method (TypingMethod method); void set_period_style (PeriodStyle period, CommaStyle comma); + void set_symbol_style (BracketStyle bracket, + SlashStyle slash); bool is_selecting_candidates (void); void select_candidate_no_direct (unsigned int item); bool convert_kana (CandidateType type); Index: src/scim_anthy_key2kana_table.cpp =================================================================== RCS file: /cvsroot/scim-imengine/scim-anthy/src/scim_anthy_key2kana_table.cpp,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- src/scim_anthy_key2kana_table.cpp 19 Nov 2005 07:14:17 -0000 1.19 +++ src/scim_anthy_key2kana_table.cpp 13 Feb 2006 08:06:25 -0000 1.20 @@ -96,6 +96,36 @@ utf8_mbstowcs ("DefaultKanaHalfCommaTable"), scim_anthy_kana_half_comma_rule); +// bracket +static Key2KanaTable romaji_ja_bracket_table ( + utf8_mbstowcs ("DefaultRomajiJaBracketTable"), + scim_anthy_romaji_ja_bracket_rule); +static Key2KanaTable romaji_wide_bracket_table ( + utf8_mbstowcs ("DefaultRomajiWideBracketTable"), + scim_anthy_romaji_wide_bracket_rule); + +static Key2KanaTable kana_ja_bracket_table ( + utf8_mbstowcs ("DefaultKanaJaBracketTable"), + scim_anthy_kana_ja_bracket_rule); +static Key2KanaTable kana_wide_bracket_table ( + utf8_mbstowcs ("DefaultRomajiWideBracketTable"), + scim_anthy_kana_wide_bracket_rule); + +// slash +static Key2KanaTable romaji_ja_slash_table ( + utf8_mbstowcs ("DefaultRomajiJaSlashTable"), + scim_anthy_romaji_ja_slash_rule); +static Key2KanaTable romaji_wide_slash_table ( + utf8_mbstowcs ("DefaultRomajiWideSlashTable"), + scim_anthy_romaji_wide_slash_rule); + +static Key2KanaTable kana_ja_slash_table ( + utf8_mbstowcs ("DefaultKanaJaSlashTable"), + scim_anthy_kana_ja_slash_rule); +static Key2KanaTable kana_wide_slash_table ( + utf8_mbstowcs ("DefaultRomajiWideSlashTable"), + scim_anthy_kana_wide_slash_rule); + Key2KanaRule::Key2KanaRule () { @@ -229,6 +259,8 @@ m_typing_method (SCIM_ANTHY_TYPING_METHOD_ROMAJI), m_period_style (SCIM_ANTHY_PERIOD_JAPANESE), m_comma_style (SCIM_ANTHY_COMMA_JAPANESE), + m_bracket_style (SCIM_ANTHY_BRACKET_JAPANESE), + m_slash_style (SCIM_ANTHY_SLASH_JAPANESE), m_use_half_symbol (false), m_use_half_number (false) { @@ -276,6 +308,20 @@ reset_tables (); } +void +Key2KanaTableSet::set_bracket_style (BracketStyle style) +{ + m_bracket_style = style; + reset_tables (); +} + +void +Key2KanaTableSet::set_slash_style (SlashStyle style) +{ + m_slash_style = style; + reset_tables (); +} + static void create_voiced_consonant_table (Key2KanaTable &table, Key2KanaTable &fund_table) { @@ -397,6 +443,46 @@ } } + if (is_romaji || is_kana) + { + switch (m_bracket_style) { + case SCIM_ANTHY_BRACKET_JAPANESE: + if (is_romaji) + m_all_tables.push_back (&romaji_ja_bracket_table); + else + m_all_tables.push_back (&kana_ja_bracket_table); + break; + case SCIM_ANTHY_BRACKET_WIDE: + if (is_romaji) + m_all_tables.push_back (&romaji_wide_bracket_table); + else + m_all_tables.push_back (&kana_wide_bracket_table); + break; + default: + break; + } + } + + if (is_romaji || is_kana) + { + switch (m_slash_style) { + case SCIM_ANTHY_SLASH_JAPANESE: + if (is_romaji) + m_all_tables.push_back (&romaji_ja_slash_table); + else + m_all_tables.push_back (&kana_ja_slash_table); + break; + case SCIM_ANTHY_SLASH_WIDE: + if (is_romaji) + m_all_tables.push_back (&romaji_wide_slash_table); + else + m_all_tables.push_back (&kana_wide_slash_table); + break; + default: + break; + } + } + if (!m_fundamental_table) { if (is_romaji) { m_all_tables.push_back (&romaji_double_consonant_table); Index: src/scim_anthy_key2kana_table.h =================================================================== RCS file: /cvsroot/scim-imengine/scim-anthy/src/scim_anthy_key2kana_table.h,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- src/scim_anthy_key2kana_table.h 27 Dec 2005 01:51:02 -0000 1.10 +++ src/scim_anthy_key2kana_table.h 13 Feb 2006 08:06:25 -0000 1.11 @@ -41,6 +41,16 @@ } CommaStyle; typedef enum { + SCIM_ANTHY_BRACKET_JAPANESE, + SCIM_ANTHY_BRACKET_WIDE, +} BracketStyle; + +typedef enum { + SCIM_ANTHY_SLASH_JAPANESE, + SCIM_ANTHY_SLASH_WIDE, +} SlashStyle; + +typedef enum { SCIM_ANTHY_TYPING_METHOD_ROMAJI, SCIM_ANTHY_TYPING_METHOD_KANA, SCIM_ANTHY_TYPING_METHOD_NICOLA, @@ -120,6 +130,8 @@ void set_number_width (bool half); void set_period_style (PeriodStyle style); void set_comma_style (CommaStyle style); + void set_bracket_style (BracketStyle style); + void set_slash_style (SlashStyle style); TypingMethod get_typing_method (void) { return m_typing_method; } @@ -129,6 +141,10 @@ get_period_style (void) { return m_period_style; } CommaStyle get_comma_style (void) { return m_comma_style; } + BracketStyle + get_bracket_style (void) { return m_bracket_style; } + SlashStyle + get_slash_style (void) { return m_slash_style; } #if 0 void set_use_consonant_table (bool use); @@ -160,6 +176,8 @@ TypingMethod m_typing_method; PeriodStyle m_period_style; CommaStyle m_comma_style; + BracketStyle m_bracket_style; + SlashStyle m_slash_style; bool m_use_half_symbol; bool m_use_half_number; }; Index: src/scim_anthy_preedit.cpp =================================================================== RCS file: /cvsroot/scim-imengine/scim-anthy/src/scim_anthy_preedit.cpp,v retrieving revision 1.63 retrieving revision 1.64 diff -u -r1.63 -r1.64 --- src/scim_anthy_preedit.cpp 19 Nov 2005 05:10:43 -0000 1.63 +++ src/scim_anthy_preedit.cpp 13 Feb 2006 08:06:25 -0000 1.64 @@ -429,6 +429,30 @@ } void +Preedit::set_bracket_style (BracketStyle style) +{ + m_reading.set_bracket_style (style); +} + +BracketStyle +Preedit::get_bracket_style (void) +{ + return m_reading.get_bracket_style (); +} + +void +Preedit::set_slash_style (SlashStyle style) +{ + m_reading.set_slash_style (style); +} + +SlashStyle +Preedit::get_slash_style (void) +{ + return m_reading.get_slash_style (); +} + +void Preedit::set_symbol_width (bool half) { m_reading.set_symbol_width (half); Index: src/scim_anthy_preedit.h =================================================================== RCS file: /cvsroot/scim-imengine/scim-anthy/src/scim_anthy_preedit.h,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- src/scim_anthy_preedit.h 19 Nov 2005 06:57:53 -0000 1.41 +++ src/scim_anthy_preedit.h 13 Feb 2006 08:06:25 -0000 1.42 @@ -113,6 +113,10 @@ virtual PeriodStyle get_period_style (void); virtual void set_comma_style (CommaStyle style); virtual CommaStyle get_comma_style (void); + virtual void set_bracket_style (BracketStyle style); + virtual BracketStyle get_bracket_style (void); + virtual void set_slash_style (SlashStyle style); + virtual SlashStyle get_slash_style (void); virtual void set_symbol_width (bool half); virtual bool get_symbol_width (void); virtual void set_number_width (bool half); Index: src/scim_anthy_prefs.cpp =================================================================== RCS file: /cvsroot/scim-imengine/scim-anthy/src/scim_anthy_prefs.cpp,v retrieving revision 1.30 retrieving revision 1.32 diff -u -r1.30 -r1.32 --- src/scim_anthy_prefs.cpp 27 Dec 2005 07:10:51 -0000 1.30 +++ src/scim_anthy_prefs.cpp 13 Feb 2006 10:24:36 -0000 1.32 @@ -155,6 +155,16 @@ false, }, { + SCIM_ANTHY_CONFIG_SHOW_SYMBOL_STYLE_LABEL, + SCIM_ANTHY_CONFIG_SHOW_SYMBOL_STYLE_LABEL_DEFAULT, + SCIM_ANTHY_CONFIG_SHOW_SYMBOL_STYLE_LABEL_DEFAULT, + N_("Show _symbol style label"), + NULL, + NULL, + NULL, + false, + }, + { SCIM_ANTHY_CONFIG_SHOW_DICT_LABEL, SCIM_ANTHY_CONFIG_SHOW_DICT_LABEL_DEFAULT, SCIM_ANTHY_CONFIG_SHOW_DICT_LABEL_DEFAULT, @@ -291,6 +301,16 @@ false, }, { + SCIM_ANTHY_CONFIG_SYMBOL_STYLE, + SCIM_ANTHY_CONFIG_SYMBOL_STYLE_DEFAULT, + SCIM_ANTHY_CONFIG_SYMBOL_STYLE_DEFAULT, + N_("Symb_ol input style: "), + NULL, + NULL, + NULL, + false, + }, + { SCIM_ANTHY_CONFIG_SPACE_TYPE, SCIM_ANTHY_CONFIG_SPACE_TYPE_DEFAULT, SCIM_ANTHY_CONFIG_SPACE_TYPE_DEFAULT, Index: src/scim_anthy_prefs.h =================================================================== RCS file: /cvsroot/scim-imengine/scim-anthy/src/scim_anthy_prefs.h,v retrieving revision 1.67 retrieving revision 1.69 diff -u -r1.67 -r1.69 --- src/scim_anthy_prefs.h 27 Dec 2005 07:10:51 -0000 1.67 +++ src/scim_anthy_prefs.h 13 Feb 2006 10:24:36 -0000 1.69 @@ -26,6 +26,7 @@ #define SCIM_ANTHY_CONFIG_TYPING_METHOD "/IMEngine/Anthy/TypingMethod" #define SCIM_ANTHY_CONFIG_CONVERSION_MODE "/IMEngine/Anthy/ConversionMode" #define SCIM_ANTHY_CONFIG_PERIOD_STYLE "/IMEngine/Anthy/PeriodStyle" +#define SCIM_ANTHY_CONFIG_SYMBOL_STYLE "/IMEngine/Anthy/SymbolStyle" #define SCIM_ANTHY_CONFIG_SPACE_TYPE "/IMEngine/Anthy/SpaceType" #define SCIM_ANTHY_CONFIG_TEN_KEY_TYPE "/IMEngine/Anthy/TenKeyType" #define SCIM_ANTHY_CONFIG_BEHAVIOR_ON_PERIOD "/IMEngine/Anthy/BehaviorOnPeriod" @@ -62,6 +63,7 @@ #define SCIM_ANTHY_CONFIG_SHOW_TYPING_METHOD_LABEL "/IMEngine/Anthy/ShowTypingMethodLabel" #define SCIM_ANTHY_CONFIG_SHOW_CONVERSION_MODE_LABEL "/IMEngine/Anthy/ShowConversionModeLabel" #define SCIM_ANTHY_CONFIG_SHOW_PERIOD_STYLE_LABEL "/IMEngine/Anthy/ShowPeriodStyleLabel" +#define SCIM_ANTHY_CONFIG_SHOW_SYMBOL_STYLE_LABEL "/IMEngine/Anthy/ShowSymbolStyleLabel" #define SCIM_ANTHY_CONFIG_SHOW_DICT_LABEL "/IMEngine/Anthy/ShowDictLabel" #define SCIM_ANTHY_CONFIG_SHOW_DICT_ADMIN_LABEL "/IMEngine/Anthy/ShowDictAdminLabel" #define SCIM_ANTHY_CONFIG_SHOW_ADD_WORD_LABEL "/IMEngine/Anthy/ShowAddWordLabel" @@ -156,6 +158,7 @@ #define SCIM_ANTHY_CONFIG_TYPING_METHOD_DEFAULT "Romaji" #define SCIM_ANTHY_CONFIG_CONVERSION_MODE_DEFAULT "MultiSeg" #define SCIM_ANTHY_CONFIG_PERIOD_STYLE_DEFAULT "Japanese" +#define SCIM_ANTHY_CONFIG_SYMBOL_STYLE_DEFAULT "Japanese" #define SCIM_ANTHY_CONFIG_SPACE_TYPE_DEFAULT "FollowMode" #define SCIM_ANTHY_CONFIG_TEN_KEY_TYPE_DEFAULT "FollowMode" #define SCIM_ANTHY_CONFIG_BEHAVIOR_ON_PERIOD_DEFAULT "None" @@ -192,6 +195,7 @@ #define SCIM_ANTHY_CONFIG_SHOW_TYPING_METHOD_LABEL_DEFAULT false #define SCIM_ANTHY_CONFIG_SHOW_CONVERSION_MODE_LABEL_DEFAULT true #define SCIM_ANTHY_CONFIG_SHOW_PERIOD_STYLE_LABEL_DEFAULT false +#define SCIM_ANTHY_CONFIG_SHOW_SYMBOL_STYLE_LABEL_DEFAULT false #define SCIM_ANTHY_CONFIG_SHOW_DICT_LABEL_DEFAULT true #define SCIM_ANTHY_CONFIG_SHOW_DICT_ADMIN_LABEL_DEFAULT true #define SCIM_ANTHY_CONFIG_SHOW_ADD_WORD_LABEL_DEFAULT true Index: src/scim_anthy_reading.cpp =================================================================== RCS file: /cvsroot/scim-imengine/scim-anthy/src/scim_anthy_reading.cpp,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- src/scim_anthy_reading.cpp 25 Nov 2005 04:28:50 -0000 1.35 +++ src/scim_anthy_reading.cpp 13 Feb 2006 08:06:25 -0000 1.36 @@ -604,6 +604,30 @@ } void +Reading::set_bracket_style (BracketStyle style) +{ + m_key2kana_tables.set_bracket_style (style); +} + +BracketStyle +Reading::get_bracket_style (void) +{ + return m_key2kana_tables.get_bracket_style (); +} + +void +Reading::set_slash_style (SlashStyle style) +{ + m_key2kana_tables.set_slash_style (style); +} + +SlashStyle +Reading::get_slash_style (void) +{ + return m_key2kana_tables.get_slash_style (); +} + +void Reading::set_symbol_width (bool half) { m_key2kana_tables.set_symbol_width (half); Index: src/scim_anthy_reading.h =================================================================== RCS file: /cvsroot/scim-imengine/scim-anthy/src/scim_anthy_reading.h,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- src/scim_anthy_reading.h 19 Nov 2005 05:28:59 -0000 1.23 +++ src/scim_anthy_reading.h 13 Feb 2006 08:06:25 -0000 1.24 @@ -96,6 +96,10 @@ PeriodStyle get_period_style (void); void set_comma_style (CommaStyle style); CommaStyle get_comma_style (void); + void set_bracket_style (BracketStyle style); + BracketStyle get_bracket_style (void); + void set_slash_style (SlashStyle style); + SlashStyle get_slash_style (void); void set_symbol_width (bool half); bool get_symbol_width (void); void set_number_width (bool half); Index: src/scim_anthy_setup.cpp =================================================================== RCS file: /cvsroot/scim-imengine/scim-anthy/src/scim_anthy_setup.cpp,v retrieving revision 1.58 retrieving revision 1.63 diff -u -r1.58 -r1.63 --- src/scim_anthy_setup.cpp 15 Nov 2005 09:31:26 -0000 1.58 +++ src/scim_anthy_setup.cpp 14 Feb 2006 04:04:12 -0000 1.63 @@ -233,19 +233,28 @@ {NULL, NULL}, }; +static ComboConfigCandidate symbol_styles[] = +{ + {"\xE3\x80\x8C\xE3\x80\x8D\xE3\x83\xBB", "Japanese"}, + {"\xE3\x80\x8C\xE3\x80\x8D\xEF\xBC\x8F", "CornerBracket_WideSlash"}, + {"\xEF\xBC\xBB\xEF\xBC\xBD\xE3\x83\xBB", "WideBracket_MiddleDot"}, + {"\xEF\xBC\xBB\xEF\xBC\xBD\xEF\xBC\x8F", "WideBracket_WideSlash"}, + {NULL, NULL}, +}; + static ComboConfigCandidate space_types[] = { + {N_("Follow input mode"), "FollowMode"}, {N_("Wide"), "Wide"}, {N_("Half"), "Half"}, - {N_("Follow input mode"), "FollowMode"}, {NULL, NULL}, }; static ComboConfigCandidate ten_key_types[] = { + {N_("Follow input mode"), "FollowMode"}, {N_("Wide"), "Wide"}, {N_("Half"), "Half"}, - {N_("Follow input mode"), "FollowMode"}, {NULL, NULL}, }; @@ -756,7 +765,7 @@ vbox = gtk_vbox_new (FALSE, 0); gtk_widget_show (vbox); - table = gtk_table_new (6, 2, FALSE); + table = gtk_table_new (7, 2, FALSE); gtk_box_pack_start (GTK_BOX (vbox), table, FALSE, FALSE, 0); gtk_widget_show (table); @@ -775,25 +784,45 @@ (gpointer) &conversion_modes, GTK_TABLE (table), 2); + return vbox; +} + +static GtkWidget * +create_symbols_page (void) +{ + GtkWidget *vbox, *table, *widget; + + vbox = gtk_vbox_new (FALSE, 0); + gtk_widget_show (vbox); + + table = gtk_table_new (7, 2, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), table, FALSE, FALSE, 0); + gtk_widget_show (table); + /* period style */ widget = create_combo (SCIM_ANTHY_CONFIG_PERIOD_STYLE, (gpointer) &period_styles, GTK_TABLE (table), 3); + /* symbol style */ + widget = create_combo (SCIM_ANTHY_CONFIG_SYMBOL_STYLE, + (gpointer) &symbol_styles, + GTK_TABLE (table), 4); + /* space_style */ widget = create_combo (SCIM_ANTHY_CONFIG_SPACE_TYPE, (gpointer) &space_types, - GTK_TABLE (table), 4); + GTK_TABLE (table), 5); /* ten key_style */ widget = create_combo (SCIM_ANTHY_CONFIG_TEN_KEY_TYPE, (gpointer) &ten_key_types, - GTK_TABLE (table), 5); + GTK_TABLE (table), 6); /* behavior on period */ widget = create_combo (SCIM_ANTHY_CONFIG_BEHAVIOR_ON_PERIOD, (gpointer) &behavior_on_period, - GTK_TABLE (table), 6); + GTK_TABLE (table), 7); return vbox; } @@ -1136,6 +1165,9 @@ widget = create_check_button (SCIM_ANTHY_CONFIG_SHOW_PERIOD_STYLE_LABEL); gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE, FALSE, 2); + widget = create_check_button (SCIM_ANTHY_CONFIG_SHOW_SYMBOL_STYLE_LABEL); + gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE, FALSE, 2); + /* dictionary menu */ widget = create_check_button (SCIM_ANTHY_CONFIG_SHOW_DICT_LABEL); g_signal_connect ((gpointer) widget, "toggled", @@ -1148,15 +1180,11 @@ gtk_widget_show (hbox); label = gtk_label_new (" "); gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0); + gtk_widget_show (label); widget = create_check_button (SCIM_ANTHY_CONFIG_SHOW_DICT_ADMIN_LABEL); gtk_box_pack_start (GTK_BOX (hbox), widget, FALSE, FALSE, 0); - hbox = gtk_hbox_new (FALSE, 0); - gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 2); - gtk_widget_show (hbox); - label = gtk_label_new (" "); - gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0); gtk_widget_show (label); widget = create_check_button (SCIM_ANTHY_CONFIG_SHOW_ADD_WORD_LABEL); gtk_box_pack_start (GTK_BOX (hbox), widget, FALSE, FALSE, 0); @@ -1234,6 +1262,39 @@ } static GtkWidget * +create_about_page () +{ + GtkWidget *vbox, *label; + gchar str[256]; + + vbox = gtk_vbox_new (FALSE, 0); + gtk_widget_show (vbox); + + g_snprintf ( + str, 256, + _("" + "%s-%s" + "\n\n" + + "" + "A Japanese input method module\nfor SCIM using Anthy" + "\n\n\n\n" + + "" + "Copyright 2005-2006, Takuro Ashie <ashie at homa.ne.jp>" + ""), + PACKAGE, PACKAGE_VERSION); + + label = gtk_label_new (NULL); + gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_CENTER); + gtk_label_set_markup (GTK_LABEL (label), str); + gtk_box_pack_start (GTK_BOX (vbox), label, TRUE, TRUE, 0); + gtk_widget_show (label); + + return vbox; +} + +static GtkWidget * create_setup_window (void) { static GtkWidget *window = NULL; @@ -1251,6 +1312,12 @@ gtk_widget_show (label); gtk_notebook_append_page (GTK_NOTEBOOK (notebook), page, label); + // Create the symbols page. + page = create_symbols_page (); + label = gtk_label_new (_("Symbols")); + gtk_widget_show (label); + gtk_notebook_append_page (GTK_NOTEBOOK (notebook), page, label); + // Create the key bind page. page = create_keyboard_page (); label = gtk_label_new (_("Key bindings")); @@ -1305,6 +1372,12 @@ gtk_widget_show (label); gtk_notebook_append_page (GTK_NOTEBOOK (notebook), page, label); + // Create the appearance page. + page = create_about_page (); + label = gtk_label_new (_("About")); + gtk_widget_show (label); + gtk_notebook_append_page (GTK_NOTEBOOK (notebook), page, label); + // for preventing enabling left arrow. gtk_notebook_set_current_page (GTK_NOTEBOOK (notebook), 1); gtk_notebook_set_current_page (GTK_NOTEBOOK (notebook), 0); Index: scim-anthy.spec =================================================================== RCS file: /cvs/dist/rpms/scim-anthy/FC-5/scim-anthy.spec,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- scim-anthy.spec 11 Feb 2006 05:39:04 -0000 1.25 +++ scim-anthy.spec 22 Mar 2006 08:16:15 -0000 1.26 @@ -2,7 +2,7 @@ Name: scim-anthy Version: 0.9.0 -Release: 2.fc5.1 +Release: 3.fc5 License: GPL URL: http://scim-imengine.sourceforge.jp/ @@ -13,6 +13,7 @@ %if %{with_libstdc_preview} Buildrequires: libstdc++so7-devel %endif +Patch0: scim-anthy-symbol-style.patch Patch1: scim-anthy-helper-moduledir.patch Summary: SCIM IMEngine for anthy for Japanese input @@ -25,6 +26,7 @@ %prep %setup -q +%patch0 -p0 -b .symbol-style %patch1 -p1 -b .1-moduledir # patch1 touches src/Makefile.am automake @@ -68,6 +70,10 @@ %changelog +* Wed Mar 22 2006 Akira TAGOH - 0.9.0-3 +* scim-anthy-symbol-style.patch: applied a backport patch from upstream CVS to + add an UI for the symbol style. (#178400) + * Fri Feb 10 2006 Jesse Keating - 0.9.0-2.fc5.1 - bump again for double-long bug on ppc(64) From fedora-cvs-commits at redhat.com Wed Mar 22 08:27:12 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 22 Mar 2006 03:27:12 -0500 Subject: rpms/tzdata/FC-4 tzdata2006b-srilanka.patch, NONE, 1.1 .cvsignore, 1.15, 1.16 sources, 1.16, 1.17 tzdata.spec, 1.18, 1.19 Message-ID: <200603220827.k2M8RC0u013799@cvs.devel.redhat.com> Author: pmachata Update of /cvs/dist/rpms/tzdata/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv13783 Modified Files: .cvsignore sources tzdata.spec Added Files: tzdata2006b-srilanka.patch Log Message: - Patch for Sri Lanka time zone change (#184514) - Upstream 2006b: - using tz64code version, as 32 is legacy according to tzdata ML - new manual pages for ctime, strftime, tzset - some source code reorganizations - no timezone/dst rule updates - Small changes in tst-timezone.c - Upstream 2006a: - private.h(scheck): changing char* to char const* - Rule changes for Palestine, zone changes for Indiana/US, both changes for Canada. - Many related doc changes. tzdata2006b-srilanka.patch: asia | 3 ++- 1 files changed, 2 insertions(+), 1 deletion(-) --- NEW FILE tzdata2006b-srilanka.patch --- diff -Bburp tzdata/tzdata2006b/asia tzdata-srilanka/tzdata2006b/asia --- tzdata/tzdata2006b/asia 2006-02-20 16:08:17.000000000 +0100 +++ tzdata-srilanka/tzdata2006b/asia 2006-03-16 10:20:00.000000000 +0100 @@ -1541,7 +1541,8 @@ Zone Asia/Colombo 5:19:24 - LMT 1880 5:30 1:00 IST 1945 Oct 16 2:00 5:30 - IST 1996 May 25 0:00 6:30 - LKT 1996 Oct 26 0:30 - 6:00 - LKT + 6:00 - LKT 2006 Apr 14 0:00 + 5:30 - IST # Syria # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/tzdata/FC-4/.cvsignore,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- .cvsignore 9 Jan 2006 09:34:23 -0000 1.15 +++ .cvsignore 22 Mar 2006 08:27:10 -0000 1.16 @@ -1,3 +1,3 @@ -tzdata2005r-base.tar.bz2 -tzdata2005r.tar.gz -tzcode2005r.tar.gz +tzdata-base-0.tar.bz2 +tz64code2006b.tar.gz +tzdata2006b.tar.gz Index: sources =================================================================== RCS file: /cvs/dist/rpms/tzdata/FC-4/sources,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- sources 9 Jan 2006 09:34:23 -0000 1.16 +++ sources 22 Mar 2006 08:27:10 -0000 1.17 @@ -1,3 +1,3 @@ -cff383e96d64b7f5d207596827e7cab1 tzdata2005r-base.tar.bz2 -b692c04a6a41080e214add0d3f58c700 tzdata2005r.tar.gz -063ea36d9257eb6779b1df847b04d8ab tzcode2005r.tar.gz +906a4c98cc5240f416524a256b039c42 tzdata-base-0.tar.bz2 +37524ee1c072a51511a6c220f8faf95f tz64code2006b.tar.gz +244523d10f93f392d96da4ef11b6cdd7 tzdata2006b.tar.gz Index: tzdata.spec =================================================================== RCS file: /cvs/dist/rpms/tzdata/FC-4/tzdata.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- tzdata.spec 9 Jan 2006 09:34:23 -0000 1.18 +++ tzdata.spec 22 Mar 2006 08:27:10 -0000 1.19 @@ -1,16 +1,17 @@ Summary: Timezone data Name: tzdata -Version: 2005r -Release: 3.fc4 +Version: 2006b +Release: 2.fc4 License: GPL Group: System Environment/Base -Source0: %{name}%{version}-base.tar.bz2 -Source1: ftp://elsie.nci.nih.gov/pub/%{name}%{version}.tar.gz -Source2: ftp://elsie.nci.nih.gov/pub/tzcode%{version}.tar.gz -Buildroot: /var/tmp/tzdata-root +Source0: tzdata-base-0.tar.bz2 +Source1: ftp://elsie.nci.nih.gov/pub/tzdata%{version}.tar.gz +Source2: ftp://elsie.nci.nih.gov/pub/tz64code%{version}.tar.gz +Patch0: tzdata2006b-srilanka.patch BuildRequires: gawk, glibc, glibc-common, perl Conflicts: glibc-common <= 2.3.2-63 BuildArchitectures: noarch +Buildroot: %{_tmppath}/%{name}-root %description This package contains data files with rules for various timezones around @@ -22,17 +23,20 @@ tar xzf %{SOURCE1} -C %{name}%{version} mkdir tzcode%{version} tar xzf %{SOURCE2} -C tzcode%{version} - -%build sed -e 's|@objpfx@|'`pwd`'/obj/|' \ -e 's|@datadir@|%{_datadir}|' \ -e 's|@install_root@|%{buildroot}|' \ Makeconfig.in > Makeconfig +%patch0 -p1 + +%build make grep -v tz-art.htm tzcode%{version}/tz-link.htm > tzcode%{version}/tz-link.html %install make install + +%check echo ====================TESTING========================= make check echo ====================TESTING END===================== @@ -46,6 +50,20 @@ %doc tzcode%{version}/README tzcode%{version}/Theory tzcode%{version}/tz-link.html %changelog +* Wed Mar 22 2006 Petr Machata - 2006a-2.fc4 +- Patch for Sri Lanka time zone change (#184514) +- Upstream 2006b: + - using tz64code version, as 32 is legacy according to tzdata ML + - new manual pages for ctime, strftime, tzset + - some source code reorganizations + - no timezone/dst rule updates +- Small changes in tst-timezone.c +- Upstream 2006a: + - private.h(scheck): changing char* to char const* + - Rule changes for Palestine, zone changes for Indiana/US, both + changes for Canada. + - Many related doc changes. + * Mon Jan 9 2006 Petr Machata 2005r-3.fc4 - 2005r-2 - Meta changes. Renaming tzdata.tar.bz2 file to tzdata$ver-base, From fedora-cvs-commits at redhat.com Wed Mar 22 08:56:48 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 22 Mar 2006 03:56:48 -0500 Subject: rpms/openoffice.org/devel openoffice.org.spec,1.647,1.648 Message-ID: <200603220856.k2M8umOs027605@cvs.devel.redhat.com> Author: caolanm Update of /cvs/dist/rpms/openoffice.org/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv27592 Modified Files: openoffice.org.spec Log Message: fix langpacks Index: openoffice.org.spec =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v retrieving revision 1.647 retrieving revision 1.648 diff -u -r1.647 -r1.648 --- openoffice.org.spec 21 Mar 2006 12:51:53 -0000 1.647 +++ openoffice.org.spec 22 Mar 2006 08:56:44 -0000 1.648 @@ -1,6 +1,6 @@ %define oootag OOB680 %define ooomilestone 5 -%define rh_rpm_release 3 +%define rh_rpm_release 4 %define build_fc6 1 %define build_fc5 0 @@ -3301,12 +3301,13 @@ %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu %changelog -* Mon Mar 13 2006 Caolan McNamara - 1:2.0.2-5.3 +* Mon Mar 13 2006 Caolan McNamara - 1:2.0.2-5.4 - ooo#59997# replacement opens___.ttf updated - drop integrated openoffice.org-2.0.0.ooo56651.sw.rtfcrash.patch - drop integrated openoffice.org-1.9.114.ooo51718.rpath.patch - add openoffice.org-2.0.2.ooo63155.sfx2.badscript.patch for rh#185390# - rh#181900# rename Bengali langpack +- drop pagein swappiness foo * Fri Mar 10 2006 Bill Nottingham - 1:2.0.2-5.2 - rebuild for PPC TLS issue (#184446) From fedora-cvs-commits at redhat.com Wed Mar 22 09:03:05 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 22 Mar 2006 04:03:05 -0500 Subject: rpms/php-pear/FC-5 .cvsignore, 1.4, 1.5 php-pear.spec, 1.9, 1.10 sources, 1.4, 1.5 Message-ID: <200603220903.k2M935CG027822@cvs.devel.redhat.com> Author: jorton Update of /cvs/dist/rpms/php-pear/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv27801 Modified Files: .cvsignore php-pear.spec sources Log Message: * Wed Mar 22 2006 Joe Orton 1:1.4.6-2.1 - update to XML_RPC 1.4.5 (#186140) Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/php-pear/FC-5/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 13 Jan 2006 11:26:55 -0000 1.4 +++ .cvsignore 22 Mar 2006 09:03:01 -0000 1.5 @@ -1,3 +1,4 @@ XML_RPC-1.4.4.tgz install-pear-nozlib-1.4.5.phar install-pear-nozlib-1.4.6.phar +XML_RPC-1.4.5.tgz Index: php-pear.spec =================================================================== RCS file: /cvs/dist/rpms/php-pear/FC-5/php-pear.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- php-pear.spec 28 Feb 2006 13:46:12 -0000 1.9 +++ php-pear.spec 22 Mar 2006 09:03:01 -0000 1.10 @@ -1,12 +1,12 @@ %define peardir %{_datadir}/pear -%define xmlrpcver 1.4.4 +%define xmlrpcver 1.4.5 Summary: PHP Extension and Application Repository framework Name: php-pear Version: 1.4.6 -Release: 2 +Release: 2.1 Epoch: 1 License: PHP Group: System @@ -17,7 +17,7 @@ Source10: pear.sh Source11: pecl.sh Source12: peardev.sh -Source20: XML_RPC-%{xmlrpcver}.tgz +Source20: http://pear.php.net/get/XML_RPC-%{xmlrpcver}.tgz Patch0: php-pear-1.4.5-template-fixes.patch Patch1: php-pear-1.4.5-template-postun.patch Patch2: php-pear-1.4.5-makerpm-cleanup.patch @@ -99,6 +99,9 @@ %dir %{_localstatedir}/cache/php-pear %changelog +* Wed Mar 22 2006 Joe Orton 1:1.4.6-2.1 +- update to XML_RPC 1.4.5 (#186140) + * Tue Feb 28 2006 Joe Orton 1:1.4.6-2 - set cache_dir directory, own /var/cache/php-pear Index: sources =================================================================== RCS file: /cvs/dist/rpms/php-pear/FC-5/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 30 Jan 2006 15:47:59 -0000 1.4 +++ sources 22 Mar 2006 09:03:01 -0000 1.5 @@ -1,2 +1,2 @@ -48a9334065e24afdf7a623046eae9d78 XML_RPC-1.4.4.tgz 2d10cdab58239fd738cb1b1d5a5047df install-pear-nozlib-1.4.6.phar +e526da7331b818e70ade5f006a4e7a9d XML_RPC-1.4.5.tgz From fedora-cvs-commits at redhat.com Wed Mar 22 09:45:53 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 22 Mar 2006 04:45:53 -0500 Subject: rpms/tzdata/devel tzdata2006b-srilanka.patch, NONE, 1.1 .cvsignore, 1.21, 1.22 sources, 1.23, 1.24 tzdata.spec, 1.27, 1.28 Message-ID: <200603220945.k2M9jrCk009783@cvs.devel.redhat.com> Author: pmachata Update of /cvs/dist/rpms/tzdata/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv9770 Modified Files: .cvsignore sources tzdata.spec Added Files: tzdata2006b-srilanka.patch Log Message: - Patch for Sri Lanka time zone change (#184514) - Few changes in package organization tzdata2006b-srilanka.patch: asia | 3 ++- asia~ |only 2 files changed, 2 insertions(+), 1 deletion(-) --- NEW FILE tzdata2006b-srilanka.patch --- diff -Bburp tzdata/tzdata2006b/asia tzdata-srilanka/tzdata2006b/asia --- tzdata/tzdata2006b/asia 2006-02-20 16:08:17.000000000 +0100 +++ tzdata-srilanka/tzdata2006b/asia 2006-03-16 10:20:00.000000000 +0100 @@ -1541,7 +1541,8 @@ Zone Asia/Colombo 5:19:24 - LMT 1880 5:30 1:00 IST 1945 Oct 16 2:00 5:30 - IST 1996 May 25 0:00 6:30 - LKT 1996 Oct 26 0:30 - 6:00 - LKT + 6:00 - LKT 2006 Apr 14 0:00 + 5:30 - IST # Syria # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S Only in tzdata-srilanka/tzdata2006b: asia~ Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/tzdata/devel/.cvsignore,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- .cvsignore 22 Feb 2006 14:29:38 -0000 1.21 +++ .cvsignore 22 Mar 2006 09:45:45 -0000 1.22 @@ -1,3 +1,3 @@ -tzdata2006b-1-base.tar.bz2 -tzdata2006b.tar.gz +tzdata-base-0.tar.bz2 tz64code2006b.tar.gz +tzdata2006b.tar.gz Index: sources =================================================================== RCS file: /cvs/dist/rpms/tzdata/devel/sources,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- sources 22 Feb 2006 14:29:41 -0000 1.23 +++ sources 22 Mar 2006 09:45:45 -0000 1.24 @@ -1,3 +1,3 @@ -906a4c98cc5240f416524a256b039c42 tzdata2006b-1-base.tar.bz2 -244523d10f93f392d96da4ef11b6cdd7 tzdata2006b.tar.gz +906a4c98cc5240f416524a256b039c42 tzdata-base-0.tar.bz2 37524ee1c072a51511a6c220f8faf95f tz64code2006b.tar.gz +244523d10f93f392d96da4ef11b6cdd7 tzdata2006b.tar.gz Index: tzdata.spec =================================================================== RCS file: /cvs/dist/rpms/tzdata/devel/tzdata.spec,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- tzdata.spec 22 Feb 2006 14:29:41 -0000 1.27 +++ tzdata.spec 22 Mar 2006 09:45:45 -0000 1.28 @@ -1,12 +1,13 @@ Summary: Timezone data Name: tzdata Version: 2006b -Release: 1 +Release: 2 License: GPL Group: System Environment/Base -Source0: tzdata%{version}-%{release}-base.tar.bz2 +Source0: tzdata-base-0.tar.bz2 Source1: ftp://elsie.nci.nih.gov/pub/tzdata%{version}.tar.gz Source2: ftp://elsie.nci.nih.gov/pub/tz64code%{version}.tar.gz +Patch0: tzdata2006b-srilanka.patch BuildRequires: gawk, glibc, glibc-common, perl Conflicts: glibc-common <= 2.3.2-63 BuildArchitectures: noarch @@ -26,6 +27,7 @@ -e 's|@datadir@|%{_datadir}|' \ -e 's|@install_root@|%{buildroot}|' \ Makeconfig.in > Makeconfig +%patch0 -p1 %build make @@ -33,6 +35,8 @@ %install make install + +%check echo ====================TESTING========================= make check echo ====================TESTING END===================== @@ -46,6 +50,9 @@ %doc tzcode%{version}/README tzcode%{version}/Theory tzcode%{version}/tz-link.html %changelog +* Thu Mar 16 2006 Petr Machata - 2006b-2 +- Patch for Sri Lanka time zone change (#184514) + * Thu Feb 22 2006 Petr Machata 2006b-1 - Upstream 2006b: - using tz64code version, as 32 is legacy according to tzdata ML From fedora-cvs-commits at redhat.com Wed Mar 22 10:16:25 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 22 Mar 2006 05:16:25 -0500 Subject: rpms/openoffice.org/devel openoffice.org.spec,1.648,1.649 Message-ID: <200603221016.k2MAGPhG024193@cvs.devel.redhat.com> Author: caolanm Update of /cvs/dist/rpms/openoffice.org/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv23673 Modified Files: openoffice.org.spec Log Message: drop afms and ppds Index: openoffice.org.spec =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v retrieving revision 1.648 retrieving revision 1.649 diff -u -r1.648 -r1.649 --- openoffice.org.spec 22 Mar 2006 08:56:44 -0000 1.648 +++ openoffice.org.spec 22 Mar 2006 10:16:23 -0000 1.649 @@ -3,7 +3,6 @@ %define rh_rpm_release 4 %define build_fc6 1 -%define build_fc5 0 %define build_rhel4 0 # gcc#19664# @@ -20,15 +19,6 @@ %define internaljavabits 1 %define gnomeprintui 0 %endif -%if %{build_fc5} -%define forcegcc4 0 -%define rh_rpm_extension 2 -%define internalxmlsec 0 -%define internalicu 0 -%define internalagg 0 -%define internaljavabits 0 -%define gnomeprintui 1 -%endif %if %{build_fc6} %define forcegcc4 0 %define rh_rpm_extension 3 @@ -39,7 +29,6 @@ %define gnomeprintui 1 %endif - %if %{forcegcc4} %define gij gij4 %define libgcj libgcj4 @@ -372,17 +361,6 @@ %description langpack-bg_BG Provides additional bulgarian translations for %{name} -%if %{build_fc5} -%package langpack-bn_IN -Summary: Bengali language pack for %{name} -Group: Applications/Productivity -Requires: %{name}-core = %{epoch}:%{version}-%{release} -Requires: fonts-bengali -Obsoletes: openoffice.org-i18n - -%description langpack-bn_IN -Provides additional bengali translations for %{name} -%else %package langpack-bn Summary: Bengali language pack for %{name} Group: Applications/Productivity @@ -393,7 +371,6 @@ %description langpack-bn Provides additional bengali translations for %{name} -%endif %package langpack-ca_ES Summary: Catalan language pack for %{name} @@ -887,7 +864,7 @@ export CC=gcc4 export CXX=g++4 %endif -%configure --with-java=%{gij} --disable-crashdump --disable-epm --disable-qadevooo --disable-odk --disable-fontooo --disable-mathmldtd --disable-pasf --enable-symbols --enable-openldap --enable-evolution2 --enable-xsltproc --with-system-libs --with-system-python --with-system-mozilla --with-system-boost --with-system-odbc-headers --with-system-sane-header --with-system-xrender-headers --with-system-libxslt --without-system-mspack --without-fonts --without-nas --without-gpc --enable-atkbridge --with-images=industrial %{extraflags} %{withlang} +%configure --with-java=%{gij} --disable-crashdump --disable-epm --disable-qadevooo --disable-odk --disable-fontooo --disable-mathmldtd --disable-pasf --enable-symbols --enable-openldap --enable-evolution2 --enable-xsltproc --with-system-libs --with-system-python --with-system-mozilla --with-system-boost --with-system-odbc-headers --with-system-sane-header --with-system-xrender-headers --with-system-libxslt --without-system-mspack --without-fonts --without-nas --without-gpc --without-ppds --without-afms --enable-atkbridge --with-images=industrial %{extraflags} %{withlang} cd .. ./bootstrap source Linux*Env.Set.sh @@ -1163,6 +1140,9 @@ rm -rf $RPM_BUILD_ROOT/%{instdir}/readmes rm -rf $RPM_BUILD_ROOT/%{instdir}/licenses +mkdir -p $RPM_BUILD_ROOT/%{instdir}/share/psprint/driver +cp -r psprint_config/configuration/ppds/SGENPRT.PS $RPM_BUILD_ROOT/%{instdir}/share/psprint/driver/SGENPRT.PS + %clean rm -rf $RPM_BUILD_ROOT @@ -1235,27 +1215,6 @@ %dir %{instdir}/share/registry/modules/org/openoffice/Setup %{instdir}/share/registry/modules/org/openoffice/Setup/Langpack-bg.xcu -%if %{build_fc5} -%files langpack-bn_IN -%defattr(-,root,root) -%dir %{instdir} -%dir %{instdir}/help -%{instdir}/help/bn -%dir %{instdir}/share -%{instdir}/program/resource/*680bn.res -%{instdir}/share/readme/LICENSE_bn* -%{instdir}/share/readme/README_bn* -%dir %{instdir}/share/registry -%dir %{instdir}/share/registry/res -%{instdir}/share/registry/res/bn -%dir %{instdir}/share/template -%{instdir}/share/template/bn -%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/Setup -%{instdir}/share/registry/modules/org/openoffice/Setup/Langpack-bn.xcu -%else %files langpack-bn %defattr(-,root,root) %dir %{instdir} @@ -1275,7 +1234,6 @@ %dir %{instdir}/share/registry/modules/org/openoffice %dir %{instdir}/share/registry/modules/org/openoffice/Setup %{instdir}/share/registry/modules/org/openoffice/Setup/Langpack-bn.xcu -%endif %files langpack-ca_ES %defattr(-,root,root) @@ -3308,6 +3266,7 @@ - add openoffice.org-2.0.2.ooo63155.sfx2.badscript.patch for rh#185390# - rh#181900# rename Bengali langpack - drop pagein swappiness foo +- drop nearly 9 megs of afms and ppds * Fri Mar 10 2006 Bill Nottingham - 1:2.0.2-5.2 - rebuild for PPC TLS issue (#184446) From fedora-cvs-commits at redhat.com Wed Mar 22 10:26:21 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 22 Mar 2006 05:26:21 -0500 Subject: rpms/psmisc/FC-5 psmisc.spec,1.26,1.27 Message-ID: <200603221026.k2MAQLtU004960@cvs.devel.redhat.com> Author: kzak Update of /cvs/dist/rpms/psmisc/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv4947 Modified Files: psmisc.spec Log Message: rebuild Index: psmisc.spec =================================================================== RCS file: /cvs/dist/rpms/psmisc/FC-5/psmisc.spec,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- psmisc.spec 7 Mar 2006 21:53:59 -0000 1.26 +++ psmisc.spec 22 Mar 2006 10:26:19 -0000 1.27 @@ -1,7 +1,7 @@ Summary: Utilities for managing processes on your system. Name: psmisc Version: 22.1.03072006cvs -Release: 1 +Release: 1.1 License: BSD/GPL Group: Applications/System Source: ftp://ftp.sf.net/pub/sourceforge/psmisc/psmisc-%{version}.tar.gz @@ -56,6 +56,9 @@ %{_mandir}/man1/pstree.1* %changelog +* Wed Mar 22 2006 Karel Zak 22.1.03072006cvs-1.1 +- rebuild + * Tue Mar 7 2006 Karel Zak 22.1.03072006cvs-1 - update to new upstream CVS version - enable new fuser version From fedora-cvs-commits at redhat.com Wed Mar 22 10:43:06 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 22 Mar 2006 05:43:06 -0500 Subject: rpms/cpio/FC-5 cpio.spec,1.36,1.37 Message-ID: <200603221043.k2MAh6LA005070@cvs.devel.redhat.com> Author: pvrabec Update of /cvs/dist/rpms/cpio/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv5057 Modified Files: cpio.spec Log Message: FC5 update Index: cpio.spec =================================================================== RCS file: /cvs/dist/rpms/cpio/FC-5/cpio.spec,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- cpio.spec 15 Mar 2006 16:23:55 -0000 1.36 +++ cpio.spec 22 Mar 2006 10:43:04 -0000 1.37 @@ -6,7 +6,7 @@ Summary: A GNU archiving program. Name: cpio Version: 2.6 -Release: 13 +Release: 14.FC5 License: GPL Group: Applications/Archiving URL: http://www.gnu.org/software/cpio/ @@ -103,6 +103,9 @@ %{_infodir}/*.info* %changelog +* Wed Mar 22 2006 Peter Vrabec 2.6-14.FC5 +- FC5 update + * Wed Mar 15 2006 Peter Vrabec 2.6-13 - merge toAsciiError.patch with writeOutHeaderBufferOverflow.patch - merge largeFileGrew.patch with lfs.patch From fedora-cvs-commits at redhat.com Wed Mar 22 10:48:28 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 22 Mar 2006 05:48:28 -0500 Subject: rpms/openoffice.org/FC-5 openoffice.org.spec, 1.642, 1.643 workspace.atkbridge.patch, 1.7, 1.8 Message-ID: <200603221048.k2MAmSnu018816@cvs.devel.redhat.com> Author: caolanm Update of /cvs/dist/rpms/openoffice.org/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv18802 Modified Files: openoffice.org.spec workspace.atkbridge.patch Log Message: accessibility detection missing Index: openoffice.org.spec =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/FC-5/openoffice.org.spec,v retrieving revision 1.642 retrieving revision 1.643 diff -u -r1.642 -r1.643 --- openoffice.org.spec 16 Mar 2006 13:17:19 -0000 1.642 +++ openoffice.org.spec 22 Mar 2006 10:48:25 -0000 1.643 @@ -3354,6 +3354,7 @@ - drop integrated openoffice.org-2.0.0.ooo56651.sw.rtfcrash.patch - drop integrated openoffice.org-1.9.114.ooo51718.rpath.patch - add openoffice.org-2.0.2.ooo63155.sfx2.badscript.patch for rh#185390# +- accessibility detection missing * Fri Mar 10 2006 Bill Nottingham - 1:2.0.2-5.2 - rebuild for PPC TLS issue (#184446) workspace.atkbridge.patch: SRC680_m130/desktop/scripts/soffice.sh | 4 comphelper/source/misc/accessiblewrapper.cxx | 6 config_office/configure.in | 18 config_office/set_soenv.in | 4 fpicker/source/unx/gnome/FPentry.cxx | 3 svtools/source/Accessibility/accessibleiconchoicectrlentry.cxx | 1 svtools/source/Accessibility/accessiblelistboxentry.cxx | 1 svtools/source/Accessibility/accessibletabbar.cxx | 9 svtools/source/Accessibility/accessibletabbarpage.cxx | 21 svtools/source/Accessibility/accessibletabbarpagelist.cxx | 31 svtools/source/brwbox/brwbox3.cxx | 3 svtools/source/contnr/svtabbx.cxx | 3 svtools/source/control/valueacc.cxx | 2 svtools/source/edit/textwindowaccessibility.cxx | 2 svx/source/accessibility/AccessibleContextBase.cxx | 1 svx/source/accessibility/AccessibleControlShape.cxx | 1 svx/source/accessibility/AccessibleEditableTextPara.cxx | 1 svx/source/accessibility/AccessibleFrameSelector.cxx | 3 svx/source/accessibility/AccessibleImageBullet.cxx | 1 svx/source/accessibility/GraphCtlAccessibleContext.cxx | 1 svx/source/accessibility/charmapacc.cxx | 8 svx/source/accessibility/svxrectctaccessiblecontext.cxx | 2 toolkit/source/awt/accessiblemenubasecomponent.cxx | 15 toolkit/source/awt/accessiblemenucomponent.cxx | 3 toolkit/source/awt/accessiblemenuitemcomponent.cxx | 3 toolkit/source/awt/vclxaccessiblecomponent.cxx | 10 toolkit/source/awt/vclxaccessiblelistitem.cxx | 1 toolkit/source/awt/vclxaccessiblemenuitem.cxx | 8 toolkit/source/awt/vclxaccessiblestatusbaritem.cxx | 1 toolkit/source/awt/vclxaccessibletabpage.cxx | 1 toolkit/source/awt/vclxaccessibletoolboxitem.cxx | 19 vcl/inc/menu.hxx | 3 vcl/inc/svapp.hxx | 2 vcl/prj/build.lst | 3 vcl/source/app/makefile.mk | 4 vcl/source/app/svapp.cxx | 17 vcl/source/window/menu.cxx | 35 vcl/unx/gtk/a11y/TODO | 49 vcl/unx/gtk/a11y/atkaction.cxx | 287 +++ vcl/unx/gtk/a11y/atkbridge.cxx | 56 vcl/unx/gtk/a11y/atkcomponent.cxx | 362 ++++ vcl/unx/gtk/a11y/atkeditabletext.cxx | 207 ++ vcl/unx/gtk/a11y/atkfactory.cxx | 166 ++ vcl/unx/gtk/a11y/atkfactory.hxx | 49 vcl/unx/gtk/a11y/atkhypertext.cxx | 295 +++ vcl/unx/gtk/a11y/atkimage.cxx | 144 + vcl/unx/gtk/a11y/atklistener.cxx | 470 +++++ vcl/unx/gtk/a11y/atklistener.hxx | 92 + vcl/unx/gtk/a11y/atkselection.cxx | 200 ++ vcl/unx/gtk/a11y/atktable.cxx | 594 +++++++ vcl/unx/gtk/a11y/atktext.cxx | 547 ++++++ vcl/unx/gtk/a11y/atktextattributes.cxx | 572 +++++++ vcl/unx/gtk/a11y/atktextattributes.hxx | 60 vcl/unx/gtk/a11y/atkutil.cxx | 580 +++++++ vcl/unx/gtk/a11y/atkutil.hxx | 45 vcl/unx/gtk/a11y/atkvalue.cxx | 152 + vcl/unx/gtk/a11y/atkwindow.cxx | 112 + vcl/unx/gtk/a11y/atkwindow.hxx | 45 vcl/unx/gtk/a11y/atkwrapper.cxx | 809 ++++++++++ vcl/unx/gtk/a11y/atkwrapper.hxx | 125 + vcl/unx/gtk/a11y/makefile.mk | 101 + vcl/unx/gtk/app/gtkinst.cxx | 26 vcl/unx/gtk/app/makefile.mk | 4 vcl/unx/gtk/window/gtkframe.cxx | 133 + vcl/unx/gtk/window/makefile.mk | 4 vcl/unx/inc/plugins/gtk/atkbridge.hxx | 45 vcl/unx/inc/plugins/gtk/gtkframe.hxx | 24 vcl/util/makefile.mk | 5 68 files changed, 6554 insertions(+), 57 deletions(-) Index: workspace.atkbridge.patch =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/FC-5/workspace.atkbridge.patch,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- workspace.atkbridge.patch 20 Feb 2006 11:43:44 -0000 1.7 +++ workspace.atkbridge.patch 22 Mar 2006 10:48:25 -0000 1.8 @@ -7370,3 +7370,16 @@ SHL4TARGET=vclplug_gtk$(UPD)$(DLLPOSTFIX) SHL4IMPLIB=igtk_plug_ SHL4LIBS=$(LIB4TARGET) +--- SRC680_m130/desktop/scripts/soffice.gail.sh 2005-09-30 15:34:21.000000000 +0100 ++++ SRC680_m130/desktop/scripts/soffice.sh 2005-09-30 15:34:56.000000000 +0100 +@@ -35,6 +35,10 @@ + #************************************************************************* + + if [ -z $SAL_USE_VCLPLUGIN ]; then export SAL_USE_VCLPLUGIN=gtk; fi ++if [ true == `gconftool-2 -g "/desktop/gnome/interface/accessibility"` ]; then ++export GTK_MODULES="gail:atk-bridge $GTK_MODULES" ++fi ++export SAL_IGNOREXERRORS=true + export SAL_ENABLE_NATIVE_XFONTS=0 + # + # STAR_PROFILE_LOCKING_DISABLED=1 From fedora-cvs-commits at redhat.com Wed Mar 22 10:56:31 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 22 Mar 2006 05:56:31 -0500 Subject: rpms/shadow-utils/FC-5 shadow-utils.spec,1.70,1.71 Message-ID: <200603221056.k2MAuV1F018854@cvs.devel.redhat.com> Author: pvrabec Update of /cvs/dist/rpms/shadow-utils/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv18841 Modified Files: shadow-utils.spec Log Message: FC5 update Index: shadow-utils.spec =================================================================== RCS file: /cvs/dist/rpms/shadow-utils/FC-5/shadow-utils.spec,v retrieving revision 1.70 retrieving revision 1.71 diff -u -r1.70 -r1.71 --- shadow-utils.spec 10 Mar 2006 14:02:43 -0000 1.70 +++ shadow-utils.spec 22 Mar 2006 10:56:29 -0000 1.71 @@ -5,7 +5,7 @@ Summary: Utilities for managing accounts and shadow password files. Name: shadow-utils Version: 4.0.14 -Release: 4 +Release: 5.FC5 Epoch: 2 URL: http://shadow.pld.org.pl/ Source0: ftp://ftp.pld.org.pl/software/shadow/shadow-%{version}.tar.bz2 @@ -200,6 +200,9 @@ %{_mandir}/*/man8/faillog.8* %changelog +* Wed Mar 22 2006 Peter Vrabec 2:4.0.14-5.FC5 +* FC5 update + * Fri Mar 10 2006 Peter Vrabec 2:4.0.14-4 - fix lrename() function to handle relative symlinks too From fedora-cvs-commits at redhat.com Wed Mar 22 11:04:04 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 22 Mar 2006 06:04:04 -0500 Subject: rpms/tftp/devel tftp-hpa-0.42-sigjmp.patch, NONE, 1.1 tftp.spec, 1.30, 1.31 Message-ID: <200603221104.k2MB44SW019033@cvs.devel.redhat.com> Author: rvokal Update of /cvs/dist/rpms/tftp/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv19022 Modified Files: tftp.spec Added Files: tftp-hpa-0.42-sigjmp.patch Log Message: - fix double free error when hitting ^C (#186201) tftp-hpa-0.42-sigjmp.patch: main.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) --- NEW FILE tftp-hpa-0.42-sigjmp.patch --- --- tftp-hpa-0.42/tftp/main.c.old 2006-02-16 18:45:22.000000000 +0100 +++ tftp-hpa-0.42/tftp/main.c 2006-03-22 11:52:10.000000000 +0100 @@ -304,9 +305,11 @@ (*c->handler)(pargc, pargv); exit(0); } - if (sigsetjmp(toplevel,1) != 0) + /* + if (sigsetjmp(toplevel,1) != 0) { (void)putchar('\n'); - + } + */ #ifdef WITH_READLINE #ifdef HAVE_READLINE_HISTORY_H using_history(); Index: tftp.spec =================================================================== RCS file: /cvs/dist/rpms/tftp/devel/tftp.spec,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- tftp.spec 22 Feb 2006 15:42:59 -0000 1.30 +++ tftp.spec 22 Mar 2006 11:04:02 -0000 1.31 @@ -3,11 +3,12 @@ Summary: The client for the Trivial File Transfer Protocol (TFTP). Name: tftp Version: %{tftp_hpa_version} -Release: 1 +Release: 2 License: BSD Group: Applications/Internet Source0: http://www.kernel.org/pub/software/network/tftp/tftp-hpa-%{tftp_hpa_version}.tar.gz Patch0: tftp-0.40-remap.patch +Patch1: tftp-hpa-0.42-sigjmp.patch BuildPreReq: tcp_wrappers BuildRoot: %{_tmppath}/%{name}-root @@ -34,6 +35,7 @@ %prep %setup -q -n tftp-hpa-%{version} %patch0 -p1 -b .zero +%patch1 -p1 -b .sigjmp %build @@ -76,6 +78,9 @@ %{_mandir}/man8/* %changelog +* Wed Mar 22 2006 Radek Vok??l 0.42-2 +- fix double free error when hitting ^C (#186201) + * Wed Feb 22 2006 Radek Vok??l 0.42-1 - upgrade to 0.42 From fedora-cvs-commits at redhat.com Wed Mar 22 11:04:49 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 22 Mar 2006 06:04:49 -0500 Subject: rpms/openoffice.org/FC-5 workspace.atkbridge.patch,1.8,1.9 Message-ID: <200603221104.k2MB4nLY019063@cvs.devel.redhat.com> Author: caolanm Update of /cvs/dist/rpms/openoffice.org/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv19048 Modified Files: workspace.atkbridge.patch Log Message: upgrade atkbridge workspace.atkbridge.patch: SRC680_m130/desktop/scripts/soffice.sh | 4 graphics/svx/source/accessibility/AccessibleContextBase.cxx | 1 graphics/svx/source/accessibility/AccessibleControlShape.cxx | 1 graphics/svx/source/accessibility/AccessibleEditableTextPara.cxx | 1 graphics/svx/source/accessibility/AccessibleFrameSelector.cxx | 3 graphics/svx/source/accessibility/AccessibleImageBullet.cxx | 1 graphics/svx/source/accessibility/GraphCtlAccessibleContext.cxx | 1 graphics/svx/source/accessibility/charmapacc.cxx | 8 graphics/svx/source/accessibility/svxrectctaccessiblecontext.cxx | 2 gsl/fpicker/source/unx/gnome/FPentry.cxx | 3 gsl/toolkit/source/awt/accessiblemenubasecomponent.cxx | 15 gsl/toolkit/source/awt/accessiblemenucomponent.cxx | 3 gsl/toolkit/source/awt/accessiblemenuitemcomponent.cxx | 3 gsl/toolkit/source/awt/vclxaccessiblecomponent.cxx | 10 gsl/toolkit/source/awt/vclxaccessiblelistitem.cxx | 1 gsl/toolkit/source/awt/vclxaccessiblemenuitem.cxx | 8 gsl/toolkit/source/awt/vclxaccessiblestatusbaritem.cxx | 1 gsl/toolkit/source/awt/vclxaccessibletabpage.cxx | 1 gsl/toolkit/source/awt/vclxaccessibletoolboxitem.cxx | 19 gsl/toolkit/source/awt/vclxwindow.cxx | 80 gsl/vcl/inc/menu.hxx | 3 gsl/vcl/inc/svapp.hxx | 2 gsl/vcl/prj/build.lst | 3 gsl/vcl/source/app/svapp.cxx | 14 gsl/vcl/source/window/menu.cxx | 35 gsl/vcl/unx/gtk/a11y/TODO | 49 gsl/vcl/unx/gtk/a11y/atkaction.cxx | 287 +++ gsl/vcl/unx/gtk/a11y/atkbridge.cxx | 56 gsl/vcl/unx/gtk/a11y/atkcomponent.cxx | 397 ++++ gsl/vcl/unx/gtk/a11y/atkeditabletext.cxx | 207 ++ gsl/vcl/unx/gtk/a11y/atkfactory.cxx | 166 ++ gsl/vcl/unx/gtk/a11y/atkfactory.hxx | 49 gsl/vcl/unx/gtk/a11y/atkhypertext.cxx | 295 +++ gsl/vcl/unx/gtk/a11y/atkimage.cxx | 144 + gsl/vcl/unx/gtk/a11y/atklistener.cxx | 474 +++++ gsl/vcl/unx/gtk/a11y/atklistener.hxx | 92 + gsl/vcl/unx/gtk/a11y/atkselection.cxx | 200 ++ gsl/vcl/unx/gtk/a11y/atktable.cxx | 737 ++++++++ gsl/vcl/unx/gtk/a11y/atktext.cxx | 547 ++++++ gsl/vcl/unx/gtk/a11y/atktextattributes.cxx | 572 ++++++ gsl/vcl/unx/gtk/a11y/atktextattributes.hxx | 60 gsl/vcl/unx/gtk/a11y/atkutil.cxx | 625 +++++++ gsl/vcl/unx/gtk/a11y/atkutil.hxx | 45 gsl/vcl/unx/gtk/a11y/atkvalue.cxx | 152 + gsl/vcl/unx/gtk/a11y/atkwindow.cxx | 138 + gsl/vcl/unx/gtk/a11y/atkwindow.hxx | 45 gsl/vcl/unx/gtk/a11y/atkwrapper.cxx | 819 ++++++++++ gsl/vcl/unx/gtk/a11y/atkwrapper.hxx | 125 + gsl/vcl/unx/gtk/a11y/makefile.mk | 96 + gsl/vcl/unx/gtk/app/gtkinst.cxx | 42 gsl/vcl/unx/gtk/window/gtkframe.cxx | 142 + gsl/vcl/unx/inc/plugins/gtk/atkbridge.hxx | 45 gsl/vcl/unx/inc/plugins/gtk/gtkframe.hxx | 16 gsl/vcl/util/makefile.mk | 2 util/comphelper/source/misc/accessiblewrapper.cxx | 6 util/svtools/source/Accessibility/accessibleiconchoicectrlentry.cxx | 1 util/svtools/source/Accessibility/accessiblelistboxentry.cxx | 1 util/svtools/source/Accessibility/accessibletabbar.cxx | 9 util/svtools/source/Accessibility/accessibletabbarpage.cxx | 21 util/svtools/source/Accessibility/accessibletabbarpagelist.cxx | 31 util/svtools/source/Accessibility/accessibletablistboxtable.cxx | 19 util/svtools/source/brwbox/brwbox3.cxx | 3 util/svtools/source/contnr/svtabbx.cxx | 3 util/svtools/source/control/valueacc.cxx | 2 util/svtools/source/edit/textwindowaccessibility.cxx | 2 65 files changed, 6828 insertions(+), 117 deletions(-) View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.8 -r 1.9 workspace.atkbridge.patch Index: workspace.atkbridge.patch =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/FC-5/workspace.atkbridge.patch,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- workspace.atkbridge.patch 22 Mar 2006 10:48:25 -0000 1.8 +++ workspace.atkbridge.patch 22 Mar 2006 11:04:34 -0000 1.9 @@ -1,71 +1,24 @@ -diff -Nur m154/comphelper/source/misc/accessiblewrapper.cxx atkbridge/comphelper/source/misc/accessiblewrapper.cxx ---- comphelper/source/misc/accessiblewrapper.cxx 2005-09-08 04:48:04.000000000 +0200 -+++ comphelper/source/misc/accessiblewrapper.cxx 2005-09-21 07:53:29.000000000 +0200 +Index: util/comphelper/source/misc/accessiblewrapper.cxx +diff -u util/comphelper/source/misc/accessiblewrapper.cxx:1.9 util/comphelper/source/misc/accessiblewrapper.cxx:1.8.156.3 +--- util/comphelper/source/misc/accessiblewrapper.cxx:1.9 Wed Sep 7 19:48:04 2005 ++++ util/comphelper/source/misc/accessiblewrapper.cxx Wed Mar 1 04:12:20 2006 @@ -151,6 +151,12 @@ { Reference< XAccessible > xValue; + if( !_rxKey.is() ) + { -+// fprintf( stderr, "It was this path that was crashing stuff\n" ); ++ // fprintf( stderr, "It was this path that was crashing stuff\n" ); + return xValue; + } + // do we have this child in the cahce? AccessibleMap::const_iterator aPos = m_aChildrenMap.find( _rxKey ); if ( m_aChildrenMap.end() != aPos ) -diff -Nur m154/config_office/configure.in atkbridge/config_office/configure.in ---- config_office/configure.in 2006-01-20 14:28:25.000000000 +0100 -+++ config_office/configure.in 2006-01-30 16:07:32.000000000 +0100 -@@ -142,6 +142,11 @@ - [ --enable-vctk Tell configure to check for the MS VC Toolkit 2003. - ( This is experimental! ) - ],,) -+AC_ARG_ENABLE(atkbridge, -+[ --enable-atkbridge Enable support for direct ATK accessibility bridge -+ under UNIX, instead of via the existing Java bridge -+ ( This is experimental! ) -+],,) - AC_ARG_ENABLE(gtk, - [ --disable-gtk Determines whether to use Gtk+ vclplug on platforms - where Gtk+ is available. -@@ -3847,6 +3852,19 @@ - AC_MSG_RESULT([$R]) - fi - -+AC_MSG_CHECKING([Whether ATK bridge can be built]) -+EXPERIMENTAL_ATKBRIDGE= -+if test "x$enable_atkbridge" = "xyes"; then -+ if test "x$ENABLE_GTK" != "xTRUE"; then -+ AC_MSG_ERROR([ATK bridge requires gtk+]) -+ else -+ AC_MSG_RESULT([yes]) -+ fi -+ -+ EXPERIMENTAL_ATKBRIDGE=TRUE -+fi -+AC_SUBST(EXPERIMENTAL_ATKBRIDGE) -+ - dnl =================================================================== - dnl Gnome VFS check - dnl =================================================================== -diff -Nur m154/config_office/set_soenv.in atkbridge/config_office/set_soenv.in ---- config_office/set_soenv.in 2006-01-13 17:37:16.000000000 +0100 -+++ config_office/set_soenv.in 2006-01-30 16:07:51.000000000 +0100 -@@ -1519,6 +1519,10 @@ - ToFile( "ENABLE_KAB", "@ENABLE_KAB@", "e" ); - ToFile( "MOC", "@MOC@", "e" ); - ToFile( "PSPRINT", "TRUE", "e" ); -+ -+# Experimental pieces -+ToFile( "EXPERIMENTAL_ATKBRIDGE", "@EXPERIMENTAL_ATKBRIDGE@", "e" ); -+ - # [ed] 5/14/02 If we're building Aqua graphics, insert a C macro to indicate this. - # There may be a better way to do this, like splitting unxmacxp into two, but - # hopefully this hack will work for now... -diff -Nur m154/fpicker/source/unx/gnome/FPentry.cxx atkbridge/fpicker/source/unx/gnome/FPentry.cxx ---- fpicker/source/unx/gnome/FPentry.cxx 2005-09-09 01:34:31.000000000 +0200 -+++ fpicker/source/unx/gnome/FPentry.cxx 2005-12-07 15:37:07.000000000 +0100 +Index: gsl/fpicker/source/unx/gnome/FPentry.cxx +diff -u gsl/fpicker/source/unx/gnome/FPentry.cxx:1.4 gsl/fpicker/source/unx/gnome/FPentry.cxx:1.4.26.1 +--- gsl/fpicker/source/unx/gnome/FPentry.cxx:1.4 Thu Sep 8 16:34:31 2005 ++++ gsl/fpicker/source/unx/gnome/FPentry.cxx Wed Dec 7 06:37:07 2005 @@ -158,8 +158,7 @@ { if ( @@ -76,701 +29,244 @@ ) { return 0; -diff -Nur m154/svtools/source/Accessibility/accessibleiconchoicectrlentry.cxx atkbridge/svtools/source/Accessibility/accessibleiconchoicectrlentry.cxx ---- svtools/source/Accessibility/accessibleiconchoicectrlentry.cxx 2005-09-08 16:25:23.000000000 +0200 -+++ svtools/source/Accessibility/accessibleiconchoicectrlentry.cxx 2005-12-06 09:41:55.000000000 +0100 -@@ -441,6 +441,7 @@ - pStateSetHelper->AddState( AccessibleStateType::TRANSIENT ); - pStateSetHelper->AddState( AccessibleStateType::SELECTABLE ); - pStateSetHelper->AddState( AccessibleStateType::ENABLED ); -+ pStateSetHelper->AddState( AccessibleStateType::SENSITIVE ); - if ( IsShowing_Impl() ) - { - pStateSetHelper->AddState( AccessibleStateType::SHOWING ); -diff -Nur m154/svtools/source/Accessibility/accessiblelistboxentry.cxx atkbridge/svtools/source/Accessibility/accessiblelistboxentry.cxx ---- svtools/source/Accessibility/accessiblelistboxentry.cxx 2005-09-08 16:25:58.000000000 +0200 -+++ svtools/source/Accessibility/accessiblelistboxentry.cxx 2005-12-06 09:41:55.000000000 +0100 -@@ -503,6 +503,7 @@ - pStateSetHelper->AddState( AccessibleStateType::TRANSIENT ); - pStateSetHelper->AddState( AccessibleStateType::SELECTABLE ); - pStateSetHelper->AddState( AccessibleStateType::ENABLED ); -+ pStateSetHelper->AddState( AccessibleStateType::SENSITIVE ); - if ( getListBox()->IsInplaceEditingEnabled() ) - pStateSetHelper->AddState( AccessibleStateType::EDITABLE ); - if ( IsShowing_Impl() ) -diff -Nur m154/svtools/source/Accessibility/accessibletabbar.cxx atkbridge/svtools/source/Accessibility/accessibletabbar.cxx ---- svtools/source/Accessibility/accessibletabbar.cxx 2005-09-27 14:54:20.000000000 +0200 -+++ svtools/source/Accessibility/accessibletabbar.cxx 2005-12-06 09:41:56.000000000 +0100 -@@ -148,6 +148,8 @@ - { - case VCLEVENT_WINDOW_ENABLED: - { -+ aNewValue <<= AccessibleStateType::SENSITIVE; -+ NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, aOldValue, aNewValue ); - aNewValue <<= AccessibleStateType::ENABLED; - NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, aOldValue, aNewValue ); - } -@@ -156,6 +158,8 @@ - { - aOldValue <<= AccessibleStateType::ENABLED; - NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, aOldValue, aNewValue ); -+ aOldValue <<= AccessibleStateType::SENSITIVE; -+ NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, aOldValue, aNewValue ); - } - break; - case VCLEVENT_WINDOW_GETFOCUS: -@@ -205,7 +209,10 @@ - if ( m_pTabBar ) - { - if ( m_pTabBar->IsEnabled() ) -- rStateSet.AddState( AccessibleStateType::ENABLED ); -+ { -+ rStateSet.AddState( AccessibleStateType::ENABLED ); -+ rStateSet.AddState( AccessibleStateType::SENSITIVE ); -+ } - - rStateSet.AddState( AccessibleStateType::FOCUSABLE ); - -diff -Nur m154/svtools/source/Accessibility/accessibletabbarpage.cxx atkbridge/svtools/source/Accessibility/accessibletabbarpage.cxx ---- svtools/source/Accessibility/accessibletabbarpage.cxx 2005-09-08 16:26:46.000000000 +0200 -+++ svtools/source/Accessibility/accessibletabbarpage.cxx 2005-12-06 09:41:56.000000000 +0100 -@@ -150,13 +150,21 @@ - { - if ( m_bEnabled != bEnabled ) - { -- Any aOldValue, aNewValue; -+ Any aOldValue[2], aNewValue[2]; - if ( m_bEnabled ) -- aOldValue <<= AccessibleStateType::ENABLED; -- else -- aNewValue <<= AccessibleStateType::ENABLED; -+ { -+ aOldValue[0] <<= AccessibleStateType::SENSITIVE; -+ aOldValue[1] <<= AccessibleStateType::ENABLED; -+ } -+ else -+ { -+ -+ aNewValue[0] <<= AccessibleStateType::ENABLED; -+ aNewValue[1] <<= AccessibleStateType::SENSITIVE; -+ } - m_bEnabled = bEnabled; -- NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, aOldValue, aNewValue ); -+ NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, aOldValue[0], aNewValue[0] ); -+ NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, aOldValue[1], aNewValue[1] ); - } - } +Index: gsl/vcl/inc/menu.hxx +diff -u gsl/vcl/inc/menu.hxx:1.35 gsl/vcl/inc/menu.hxx:1.35.12.1 +--- gsl/vcl/inc/menu.hxx:1.35 Fri Sep 9 04:09:19 2005 ++++ gsl/vcl/inc/menu.hxx Wed Nov 16 07:57:55 2005 +@@ -379,6 +379,9 @@ -@@ -211,7 +219,10 @@ - void AccessibleTabBarPage::FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet ) - { - if ( IsEnabled() ) -+ { - rStateSet.AddState( AccessibleStateType::ENABLED ); -+ rStateSet.AddState( AccessibleStateType::SENSITIVE ); -+ } + void SetAccessibleDescription( USHORT nItemId, const XubString& rStr ); + XubString GetAccessibleDescription( USHORT nItemId ) const; ++ ++ // returns whether the item a position nItemPos is highlighted or not. ++ bool IsHighlighted( USHORT nItemPos ) const; + }; - rStateSet.AddState( AccessibleStateType::VISIBLE ); + // ----------- [...7185 lines suppressed...] ++ rStateSet.AddState( AccessibleStateType::SENSITIVE ); ++ } + + rStateSet.AddState( AccessibleStateType::FOCUSABLE ); + +Index: util/svtools/source/Accessibility/accessibletabbarpage.cxx +diff -u util/svtools/source/Accessibility/accessibletabbarpage.cxx:1.11 util/svtools/source/Accessibility/accessibletabbarpage.cxx:1.10.106.2 +--- util/svtools/source/Accessibility/accessibletabbarpage.cxx:1.11 Tue Jan 31 10:30:28 2006 ++++ util/svtools/source/Accessibility/accessibletabbarpage.cxx Mon Feb 6 02:26:47 2006 +@@ -142,13 +142,21 @@ + { + if ( m_bEnabled != bEnabled ) + { +- Any aOldValue, aNewValue; ++ Any aOldValue[2], aNewValue[2]; + if ( m_bEnabled ) +- aOldValue <<= AccessibleStateType::ENABLED; +- else +- aNewValue <<= AccessibleStateType::ENABLED; ++ { ++ aOldValue[0] <<= AccessibleStateType::SENSITIVE; ++ aOldValue[1] <<= AccessibleStateType::ENABLED; ++ } ++ else ++ { ++ ++ aNewValue[0] <<= AccessibleStateType::ENABLED; ++ aNewValue[1] <<= AccessibleStateType::SENSITIVE; ++ } + m_bEnabled = bEnabled; +- NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, aOldValue, aNewValue ); ++ NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, aOldValue[0], aNewValue[0] ); ++ NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, aOldValue[1], aNewValue[1] ); + } + } + +@@ -203,7 +211,10 @@ + void AccessibleTabBarPage::FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet ) + { + if ( IsEnabled() ) ++ { + rStateSet.AddState( AccessibleStateType::ENABLED ); ++ rStateSet.AddState( AccessibleStateType::SENSITIVE ); ++ } + + rStateSet.AddState( AccessibleStateType::VISIBLE ); + +Index: util/svtools/source/Accessibility/accessibletabbarpagelist.cxx +diff -u util/svtools/source/Accessibility/accessibletabbarpagelist.cxx:1.17 util/svtools/source/Accessibility/accessibletabbarpagelist.cxx:1.16.72.2 +--- util/svtools/source/Accessibility/accessibletabbarpagelist.cxx:1.17 Tue Jan 31 10:30:44 2006 ++++ util/svtools/source/Accessibility/accessibletabbarpagelist.cxx Mon Feb 6 02:26:54 2006 +@@ -251,19 +251,21 @@ + + switch ( rVclWindowEvent.GetId() ) + { +- case VCLEVENT_WINDOW_ENABLED: ++ case VCLEVENT_WINDOW_ENABLED: + { +- Any aOldValue, aNewValue; +- aNewValue <<= AccessibleStateType::ENABLED; +- NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, aOldValue, aNewValue ); +- } +- break; +- case VCLEVENT_WINDOW_DISABLED: +- { +- Any aOldValue, aNewValue; +- aOldValue <<= AccessibleStateType::ENABLED; +- NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, aOldValue, aNewValue ); +- } ++ aNewValue <<= AccessibleStateType::SENSITIVE; ++ NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, aOldValue, aNewValue ); ++ aNewValue <<= AccessibleStateType::ENABLED; ++ NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, aOldValue, aNewValue ); ++ } ++ break; ++ case VCLEVENT_WINDOW_DISABLED: ++ { ++ aOldValue <<= AccessibleStateType::ENABLED; ++ NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, aOldValue, aNewValue ); ++ aOldValue <<= AccessibleStateType::SENSITIVE; ++ NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, aOldValue, aNewValue ); ++ } + break; + case VCLEVENT_WINDOW_SHOW: + { +@@ -395,7 +397,10 @@ + if ( m_pTabBar ) + { + if ( m_pTabBar->IsEnabled() ) +- rStateSet.AddState( AccessibleStateType::ENABLED ); ++ { ++ rStateSet.AddState( AccessibleStateType::ENABLED ); ++ rStateSet.AddState( AccessibleStateType::SENSITIVE ); ++ } + + rStateSet.AddState( AccessibleStateType::VISIBLE ); + +Index: util/svtools/source/Accessibility/accessibletablistboxtable.cxx +diff -u util/svtools/source/Accessibility/accessibletablistboxtable.cxx:1.8 util/svtools/source/Accessibility/accessibletablistboxtable.cxx:1.8.14.1 +--- util/svtools/source/Accessibility/accessibletablistboxtable.cxx:1.8 Mon Feb 6 04:56:48 2006 ++++ util/svtools/source/Accessibility/accessibletablistboxtable.cxx Thu Mar 9 04:01:53 2006 +@@ -106,8 +106,9 @@ + { + if ( isAlive() ) + { +- switch ( rVclWindowEvent.GetId() ) +- { ++ ULONG nEventId = rVclWindowEvent.GetId(); ++ switch ( nEventId ) ++ { + case VCLEVENT_OBJECT_DYING : + { + m_pTabListBox->RemoveEventListener( LINK( this, AccessibleTabListBoxTable, WindowEventListener ) ); +@@ -115,7 +116,19 @@ + break; + } + +- case VCLEVENT_LISTBOX_SELECT : ++ case VCLEVENT_CONTROL_GETFOCUS : ++ case VCLEVENT_CONTROL_LOSEFOCUS : ++ { ++ uno::Any aOldValue, aNewValue; ++ if ( VCLEVENT_CONTROL_GETFOCUS == nEventId ) ++ aNewValue <<= AccessibleStateType::FOCUSED; ++ else ++ aOldValue <<= AccessibleStateType::FOCUSED; ++ commitEvent( AccessibleEventId::STATE_CHANGED, aNewValue, aOldValue ); ++ break; ++ } ++ ++ case VCLEVENT_LISTBOX_SELECT : + { + // First send an event that tells the listeners of a + // modified selection. The active descendant event is +Index: util/svtools/source/brwbox/brwbox3.cxx +diff -u util/svtools/source/brwbox/brwbox3.cxx:1.16 util/svtools/source/brwbox/brwbox3.cxx:1.16.106.1 +--- util/svtools/source/brwbox/brwbox3.cxx:1.16 Thu Sep 8 07:29:19 2005 ++++ util/svtools/source/brwbox/brwbox3.cxx Tue Dec 6 03:50:53 2005 +@@ -357,7 +357,10 @@ + if ( GetUpdateMode() ) + rStateSet.AddState( AccessibleStateType::EDITABLE ); + if ( IsEnabled() ) ++ { + rStateSet.AddState( AccessibleStateType::ENABLED ); ++ rStateSet.AddState( AccessibleStateType::SENSITIVE ); ++ } + if ( IsReallyVisible() ) + rStateSet.AddState( AccessibleStateType::VISIBLE ); + if ( eObjType == ::svt::BBTYPE_TABLE ) +Index: util/svtools/source/contnr/svtabbx.cxx +diff -u util/svtools/source/contnr/svtabbx.cxx:1.18 util/svtools/source/contnr/svtabbx.cxx:1.16.106.3 +--- util/svtools/source/contnr/svtabbx.cxx:1.18 Mon Feb 6 05:37:19 2006 ++++ util/svtools/source/contnr/svtabbx.cxx Thu Feb 16 05:38:08 2006 +@@ -1206,7 +1206,10 @@ + if ( IsActive() ) + _rStateSet.AddState( AccessibleStateType::ACTIVE ); + if ( IsEnabled() ) ++ { + _rStateSet.AddState( AccessibleStateType::ENABLED ); ++ _rStateSet.AddState( AccessibleStateType::SENSITIVE ); ++ } + if ( IsReallyVisible() ) + _rStateSet.AddState( AccessibleStateType::VISIBLE ); + if ( _eType == ::svt::BBTYPE_TABLE ) +Index: util/svtools/source/control/valueacc.cxx +diff -u util/svtools/source/control/valueacc.cxx:1.17 util/svtools/source/control/valueacc.cxx:1.17.108.1 +--- util/svtools/source/control/valueacc.cxx:1.17 Thu Sep 8 08:08:48 2005 ++++ util/svtools/source/control/valueacc.cxx Tue Dec 6 03:50:54 2005 +@@ -319,6 +319,7 @@ + + // Set some states. + pStateSet->AddState (accessibility::AccessibleStateType::ENABLED); ++ pStateSet->AddState (accessibility::AccessibleStateType::SENSITIVE); + pStateSet->AddState (accessibility::AccessibleStateType::SHOWING); + pStateSet->AddState (accessibility::AccessibleStateType::VISIBLE); + pStateSet->AddState (accessibility::AccessibleStateType::MANAGES_DESCENDANTS); +@@ -991,6 +992,7 @@ + if( mpParent ) + { + pStateSet->AddState (accessibility::AccessibleStateType::ENABLED); ++ pStateSet->AddState (accessibility::AccessibleStateType::SENSITIVE); + pStateSet->AddState (accessibility::AccessibleStateType::SHOWING); + pStateSet->AddState (accessibility::AccessibleStateType::VISIBLE); + pStateSet->AddState (accessibility::AccessibleStateType::TRANSIENT); +Index: util/svtools/source/edit/textwindowaccessibility.cxx +diff -u util/svtools/source/edit/textwindowaccessibility.cxx:1.26 util/svtools/source/edit/textwindowaccessibility.cxx:1.24.104.3 +--- util/svtools/source/edit/textwindowaccessibility.cxx:1.26 Wed Feb 1 06:40:09 2006 ++++ util/svtools/source/edit/textwindowaccessibility.cxx Mon Feb 6 02:27:37 2006 +@@ -1421,6 +1421,8 @@ + = (static_cast< ::sal_Int64 >(1) + << ::css::accessibility::AccessibleStateType::ENABLED) + | (static_cast< ::sal_Int64 >(1) ++ << ::css::accessibility::AccessibleStateType::SENSITIVE) ++ | (static_cast< ::sal_Int64 >(1) + << ::css::accessibility::AccessibleStateType::FOCUSABLE) + | (static_cast< ::sal_Int64 >(1) + << ::css::accessibility::AccessibleStateType::MULTI_LINE); --- SRC680_m130/desktop/scripts/soffice.gail.sh 2005-09-30 15:34:21.000000000 +0100 +++ SRC680_m130/desktop/scripts/soffice.sh 2005-09-30 15:34:56.000000000 +0100 @@ -35,6 +35,10 @@ From fedora-cvs-commits at redhat.com Wed Mar 22 11:13:20 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 22 Mar 2006 06:13:20 -0500 Subject: rpms/openoffice.org/FC-5 openoffice.org.spec, 1.643, 1.644 openoffice.org-2.0.1.gcc25199.bitfieldaccess.patch, 1.1, NONE Message-ID: <200603221113.k2MBDKg7019188@cvs.devel.redhat.com> Author: caolanm Update of /cvs/dist/rpms/openoffice.org/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv19175 Modified Files: openoffice.org.spec Removed Files: openoffice.org-2.0.1.gcc25199.bitfieldaccess.patch Log Message: test build Index: openoffice.org.spec =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/FC-5/openoffice.org.spec,v retrieving revision 1.643 retrieving revision 1.644 diff -u -r1.643 -r1.644 --- openoffice.org.spec 22 Mar 2006 10:48:25 -0000 1.643 +++ openoffice.org.spec 22 Mar 2006 11:13:18 -0000 1.644 @@ -1,67 +1,27 @@ %define oootag OOB680 %define ooomilestone 5 -%define rh_rpm_release 3 +%define rh_rpm_release 2.testing %define build_fc5 1 -%define build_fc4 0 -%define build_rhel4 0 # gcc#19664# %define stlvisibilityfcked 1 # undef to get english only and no-langpacks for a quick smoketest build %define langpacks 1 -%if %{build_rhel4} -%define forcegcc4 1 -%define rh_rpm_extension 0 -%define internalxmlsec 1 -%define internalicu 1 -%define internalagg 1 -%define internaljavabits 1 -%define includeemailmerge 1 -%define cripplemenus 1 -%define seperatebase 1 -%define gnomeprintui 0 -%define fc5langpack 1 -%endif -%if %{build_fc4} -%define forcegcc4 0 -%define rh_rpm_extension 1 -%define internalxmlsec 1 -%define internalicu 1 -%define internalagg 1 -%define internaljavabits 1 -%define includeemailmerge 0 -%define cripplemenus 0 -%define seperatebase 0 -%define gnomeprintui 0 -%define fc5langpack 0 -%endif %if %{build_fc5} -%define forcegcc4 0 %define rh_rpm_extension 2 %define internalxmlsec 0 %define internalicu 0 %define internalagg 0 %define internaljavabits 0 -%define includeemailmerge 1 -%define cripplemenus 1 -%define seperatebase 1 %define gnomeprintui 1 -%define fc5langpack 1 %endif -%if %{forcegcc4} -%define gij gij4 -%define libgcj libgcj4 -%define libgcjdevel libgcj4-devel -%define gccjava gcc4-java -%else %define gij gij %define libgcj libgcj %define libgcjdevel libgcj-devel %define gccjava gcc-java -%endif %define includingexternals 0 @@ -104,12 +64,7 @@ %endif %if %{langpacks} -%define langpack_core af ar bg bn ca cs cy da de el en-US es et eu fi fr gl gu-IN pa-IN he hi-IN hu hr it ja ko lt ms nb nl nn pl pt pt-BR ru sk sl sv ta-IN th tr zh-CN zh-TW zu -%if %{fc5langpack} -%define langpack_langs %{langpack_core} ga sr-CS -%else -%define langpack_langs %{langpack_core} -%endif +%define langpack_langs af ar bg bn ca cs cy da de el en-US es et eu fi fr ga gl gu-IN pa-IN he hi-IN hu hr it ja ko lt ms nb nl nn pl pt pt-BR ru sk sl sr-CS sv ta-IN th tr zh-CN zh-TW zu %else %define langpack_langs en-US %endif @@ -196,15 +151,14 @@ Patch26: workspace.targetedaot.patch Patch27: openoffice.org-2.0.1.ooo58663.vcl.missingglyph.patch Patch28: openoffice.org-2.0.1.ooo58606.sw.pre-edit.patch -Patch29: openoffice.org-2.0.1.gcc25199.bitfieldaccess.patch -Patch30: openoffice.org-2.0.1-ooo59675.sysui.rtfmimetype.patch -Patch31: openoffice.org-2.0.1-ooo59997.sw.defaultbullets.patch -Patch32: openoffice.org-2.0.1-ooo19976.framework.nofocussteal.patch -Patch33: openoffice.org-2.0.2.ooo61875.sd.compile.patch -Patch34: openoffice.org-2.0.2-ooo61841.vcl.honourfontconfigoverrides.patch -Patch35: openoffice.org-2.0.2.ooo62030.solenv._version.patch -Patch36: openoffice.org-2.0.2.oooXXXXX.config_office.noppds.patch -Patch37: openoffice.org-2.0.2.ooo63155.sfx2.badscript.patch +Patch29: openoffice.org-2.0.1-ooo59675.sysui.rtfmimetype.patch +Patch30: openoffice.org-2.0.1-ooo59997.sw.defaultbullets.patch +Patch31: openoffice.org-2.0.1-ooo19976.framework.nofocussteal.patch +Patch32: openoffice.org-2.0.2.ooo61875.sd.compile.patch +Patch33: openoffice.org-2.0.2-ooo61841.vcl.honourfontconfigoverrides.patch +Patch34: openoffice.org-2.0.2.ooo62030.solenv._version.patch +Patch35: openoffice.org-2.0.2.oooXXXXX.config_office.noppds.patch +Patch36: openoffice.org-2.0.2.ooo63155.sfx2.badscript.patch %define instdir %{_libdir}/openoffice.org2.0 @@ -262,7 +216,6 @@ external to %{name} and within the internal %{name} scripting module to be written in python -%if %{seperatebase} %package base Summary: database frontend for %{name} Group: Development/Libraries @@ -271,7 +224,6 @@ %description base Gui database frontend for %{name}. Allows creation and management of databases through a GUI. -%endif %package writer Summary: writer module for %{name} @@ -283,7 +235,6 @@ %description writer wordprocessor application of %{name} -%if %{includeemailmerge} %package emailmerge Summary: email mail merge component for %{name} Group: Applications/Productivity @@ -293,7 +244,6 @@ %description emailmerge enables %{name} writer module to enable mail merge to email -%endif %package calc Summary: calc module for %{name} @@ -510,7 +460,6 @@ %description langpack-fr Provides additional french translations for %{name} -%if %{fc5langpack} %package langpack-ga_IE Summary: Irish language pack for %{name} Group: Applications/Productivity @@ -518,7 +467,6 @@ %description langpack-ga_IE Provides additional irish translations for %{name} -%endif %package langpack-gl_ES Summary: Galician language pack for %{name} @@ -732,7 +680,6 @@ %description langpack-sl_SI Provides additional slovenian translations for %{name} -%if %{fc5langpack} %package langpack-sr_CS Summary: Serbian language pack for %{name} Group: Applications/Productivity @@ -740,7 +687,6 @@ %description langpack-sr_CS Provides additional serbian translations for %{name} -%endif %package langpack-sv Summary: Swedish language pack for %{name} @@ -823,9 +769,7 @@ %if %{gnomeprintui} %patch5 -p1 -b .rh127576.gnomeprintui.patch %endif -%if %{cripplemenus} %patch6 -p1 -b .rh156677.cripplemenus.sysui.patch -%endif %patch7 -p1 -b .rh171692.jvmfwk.defaulttogcj.patch %patch8 -p1 -b .rhXXXXX.extensions.defaulttoevo2.patch %patch9 -p1 -b .ooo34909.dbaccess.patch @@ -852,17 +796,14 @@ %patch26 -p1 -b .workspace.targetedaot.patch %patch27 -p1 -b .ooo58663.vcl.missingglyph.patch %patch28 -p1 -b .ooo58606.sw.pre-edit.patch -%if %{build_fc4} -%patch29 -p1 -b .gcc25199.bitfieldaccess.patch -%endif -%patch30 -p1 -b .ooo59675.sysui.rtfmimetype.patch -%patch31 -p1 -b .ooo59997.sw.defaultbullets.patch -%patch32 -p1 -b .ooo19976.framework.nofocussteal.patch -%patch33 -p1 -b .ooo61875.sd.compile.patch -%patch34 -p1 -b .ooo61841.vcl.honourfontconfigoverrides.patch -%patch35 -p1 -b .ooo62030.solenv._version.patch -%patch36 -p1 -b .oooXXXXX.config_office.noppds.patch -%patch37 -p1 -b .ooo63155.sfx2.badscript.patch +%patch29 -p1 -b .ooo59675.sysui.rtfmimetype.patch +%patch30 -p1 -b .ooo59997.sw.defaultbullets.patch +%patch31 -p1 -b .ooo19976.framework.nofocussteal.patch +%patch32 -p1 -b .ooo61875.sd.compile.patch +%patch33 -p1 -b .ooo61841.vcl.honourfontconfigoverrides.patch +%patch34 -p1 -b .ooo62030.solenv._version.patch +%patch35 -p1 -b .oooXXXXX.config_office.noppds.patch +%patch36 -p1 -b .ooo63155.sfx2.badscript.patch %if %{includingexternals} #start ludicrous workaround @@ -900,10 +841,6 @@ fi cd config_office autoconf -%if %{forcegcc4} -export CC=gcc4 -export CXX=g++4 -%endif %configure --with-java=%{gij} --disable-crashdump --disable-epm --disable-qadevooo --disable-odk --disable-fontooo --disable-mathmldtd --disable-pasf --enable-symbols --enable-openldap --enable-evolution2 --enable-xsltproc --with-system-libs --with-system-python --with-system-mozilla --with-system-boost --with-system-odbc-headers --with-system-sane-header --with-system-xrender-headers --with-system-libxslt --without-system-mspack --without-fonts --without-nas --without-gpc --enable-atkbridge --with-images=industrial %{extraflags} %{withlang} cd .. ./bootstrap @@ -937,10 +874,6 @@ esac ARCH_FLAGS="$ARCH_FLAGS $i" done -# gcc#25199# -%if %{build_fc4} -ARCH_FLAGS=${ARCH_FLAGS/-mtune=pentium4/-mtune=pentiumpro} -%endif export ARCH_FLAGS @@ -1035,9 +968,6 @@ sed -i -e "s/Thorndale/Thorndale AMT/g" $RPM_BUILD_ROOT/%{instdir}/share/registry/data/org/openoffice/VCL.xcu sed -i -e "s/Albany /Albany AMT/g" $RPM_BUILD_ROOT/%{instdir}/share/registry/data/org/openoffice/VCL.xcu sed -i -e "s/Cumberland/Cumberland AMT/g" $RPM_BUILD_ROOT/%{instdir}/share/registry/data/org/openoffice/VCL.xcu -%if %{build_fc4} -sed -i -e "s/Times New Roman/Times New Roman;Nimbus Roman No9 L/g" $RPM_BUILD_ROOT/%{instdir}/share/registry/data/org/openoffice/VCL.xcu -%endif #rh#158977# clear execstack requirement execstack -c $RPM_BUILD_ROOT/%{instdir}/program/libgcc3_uno.so @@ -1084,12 +1014,6 @@ #remove worthless ldap configuration backend rm -f $RPM_BUILD_ROOT/%{instdir}/program/ldapbe2.uno.so -#remove the email mailmerge impl if packageing without it -%if ! %{includeemailmerge} -rm -rf $RPM_BUILD_ROOT/%{instdir}/program/mailmerge.py* -rm -rf $RPM_BUILD_ROOT/%{instdir}/share/registry/modules/org/openoffice/Office/Writer/Writer-javamail.xcu -%endif - #ensure that no sneaky un-prelinkable, un-fpic or non executable shared libs #have snuck through pic=0 @@ -1181,10 +1105,6 @@ mv $RPM_BUILD_ROOT/%{instdir}/share/xdg/calc.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/openoffice.org-1.9-calc.desktop mv $RPM_BUILD_ROOT/%{instdir}/share/xdg/impress.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/openoffice.org-1.9-impress.desktop mv $RPM_BUILD_ROOT/%{instdir}/share/xdg/writer.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/openoffice.org-1.9-writer.desktop -%if ! %{cripplemenus} -mv $RPM_BUILD_ROOT/%{instdir}/share/xdg/math.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/openoffice.org-1.9-math.desktop -mv $RPM_BUILD_ROOT/%{instdir}/share/xdg/draw.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/openoffice.org-1.9-draw.desktop -%endif rm -rf $RPM_BUILD_ROOT/%{instdir}/share/xdg cp -r sysui/unxlng*/misc/redhat/usr/share/icons $RPM_BUILD_ROOT/%{_datadir} cp -r sysui/unxlng*/misc/redhat/usr/share/mime-info $RPM_BUILD_ROOT/%{_datadir} @@ -1531,7 +1451,6 @@ %dir %{instdir}/share/registry/modules/org/openoffice/Setup %{instdir}/share/registry/modules/org/openoffice/Setup/Langpack-fr.xcu -%if %{fc5langpack} %files langpack-ga_IE %defattr(-,root,root) %dir %{instdir} @@ -1552,7 +1471,6 @@ %dir %{instdir}/share/registry/modules/org/openoffice %dir %{instdir}/share/registry/modules/org/openoffice/Setup %{instdir}/share/registry/modules/org/openoffice/Setup/Langpack-ga.xcu -%endif %files langpack-gl_ES %defattr(-,root,root) @@ -2035,7 +1953,6 @@ %dir %{instdir}/share/registry/modules/org/openoffice/Setup %{instdir}/share/registry/modules/org/openoffice/Setup/Langpack-sl.xcu -%if %{fc5langpack} %files langpack-sr_CS %defattr(-,root,root) %dir %{instdir} @@ -2055,7 +1972,6 @@ %dir %{instdir}/share/registry/modules/org/openoffice %dir %{instdir}/share/registry/modules/org/openoffice/Setup %{instdir}/share/registry/modules/org/openoffice/Setup/Langpack-sr-CS.xcu -%endif %files langpack-sv %defattr(-,root,root) @@ -2849,9 +2765,6 @@ %{_datadir}/icons %dir %{_datadir}/mime-info %{_datadir}/mime-info/* -%if ! %{fc5langpack} -%{instdir}/share/dict/ooo/*ga_IE* -%endif %if %{internalxmlsec} %{instdir}/program/libxmlsec* %else @@ -2872,22 +2785,6 @@ %{instdir}/program/libdb-*.so %{instdir}/program/libdb_*.so %endif -# base files -%if ! %{seperatebase} -%{instdir}/help/en/sdatabase.* -%{instdir}/program/sbase -%{instdir}/share/registry/modules/org/openoffice/Office/Common/Common-base.xcu -%{instdir}/share/registry/modules/org/openoffice/Setup/Setup-base.xcu -%{instdir}/share/registry/modules/org/openoffice/TypeDetection/Filter/fcfg_database_filters.xcu -%{instdir}/share/registry/modules/org/openoffice/TypeDetection/Misc/fcfg_database_others.xcu -%{instdir}/share/registry/modules/org/openoffice/TypeDetection/Types/fcfg_database_types.xcu -%{_bindir}/oobase -%dir %{_datadir}/applications -%{_datadir}/applications/openoffice.org-*-base.desktop -%dir %{_datadir}/mimelnk -%dir %{_datadir}/mimelnk/application -%{_datadir}/mimelnk/application/openoffice.org-*-oasis-database.desktop -%endif %post core update-desktop-database -q %{_datadir}/applications @@ -2915,7 +2812,6 @@ fi done -%if %{seperatebase} %files base %defattr(-,root,root) %{instdir}/help/en/sdatabase.* @@ -2948,7 +2844,6 @@ %postun base update-desktop-database -q %{_datadir}/applications -%endif %files calc %defattr(-,root,root) @@ -3050,9 +2945,6 @@ %dir %{instdir}/share/registry/schema/org/openoffice/Office/UI %{instdir}/share/registry/schema/org/openoffice/Office/UI/DrawWindowState.xcs %dir %{_datadir}/applications -%if ! %{cripplemenus} -%{_datadir}/applications/openoffice.org-*-draw.desktop -%endif %dir %{_datadir}/mimelnk %dir %{_datadir}/mimelnk/application %{_datadir}/mimelnk/application/*drawing* @@ -3064,7 +2956,6 @@ %postun draw update-desktop-database -q %{_datadir}/applications -%if %{includeemailmerge} %files emailmerge %defattr(-,root,root) %dir %{instdir} @@ -3078,7 +2969,6 @@ %dir %{instdir}/share/registry/modules/org/openoffice/Office %dir %{instdir}/share/registry/modules/org/openoffice/Office/Writer %{instdir}/share/registry/modules/org/openoffice/Office/Writer/Writer-javamail.xcu -%endif %files writer %defattr(-,root,root) @@ -3241,9 +3131,6 @@ %dir %{instdir}/share/registry/schema/org/openoffice/Office/UI %{instdir}/share/registry/schema/org/openoffice/Office/UI/MathCommands.xcs %dir %{_datadir}/applications -%if ! %{cripplemenus} -%{_datadir}/applications/openoffice.org-*-math.desktop -%endif %dir %{_datadir}/mimelnk %dir %{_datadir}/mimelnk/application %{_datadir}/mimelnk/application/*formula* --- openoffice.org-2.0.1.gcc25199.bitfieldaccess.patch DELETED --- From fedora-cvs-commits at redhat.com Wed Mar 22 11:14:22 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 22 Mar 2006 06:14:22 -0500 Subject: rpms/star/devel .cvsignore, 1.13, 1.14 sources, 1.13, 1.14 star.spec, 1.24, 1.25 Message-ID: <200603221114.k2MBEMeF019254@cvs.devel.redhat.com> Author: pvrabec Update of /cvs/dist/rpms/star/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv19239 Modified Files: .cvsignore sources star.spec Log Message: upgrade Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/star/devel/.cvsignore,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- .cvsignore 1 Mar 2006 15:15:34 -0000 1.13 +++ .cvsignore 22 Mar 2006 11:14:20 -0000 1.14 @@ -1 +1 @@ -star-1.5a72.tar.bz2 +star-1.5a73.tar.bz2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/star/devel/sources,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- sources 1 Mar 2006 15:15:34 -0000 1.13 +++ sources 22 Mar 2006 11:14:20 -0000 1.14 @@ -1 +1 @@ -405ac8b06de049c440a4ebc316472d1f star-1.5a72.tar.bz2 +ad8c110aa016670d8f55fd7f13cb7114 star-1.5a73.tar.bz2 Index: star.spec =================================================================== RCS file: /cvs/dist/rpms/star/devel/star.spec,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- star.spec 1 Mar 2006 15:15:34 -0000 1.24 +++ star.spec 22 Mar 2006 11:14:20 -0000 1.25 @@ -3,7 +3,7 @@ %endif Summary: An archiving tool with ACL support Name: star -Version: 1.5a72 +Version: 1.5a73 Release: 1 URL: http://cdrecord.berlios.de/old/private/star.html Source: ftp://ftp.berlios.de/pub/star/alpha/%{name}-%{version}.tar.bz2 @@ -97,6 +97,9 @@ %{_mandir}/man1/spax.1* %changelog +* Wed Mar 22 2006 Peter Vrabec 1.5a73-1 +- upgrade + * Wed Mar 01 2006 Peter Vrabec 1.5a72-1 - upgrade From fedora-cvs-commits at redhat.com Wed Mar 22 11:22:43 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 22 Mar 2006 06:22:43 -0500 Subject: rpms/openoffice.org/FC-5 openoffice.org.spec,1.644,1.645 Message-ID: <200603221122.k2MBMhF7000574@cvs.devel.redhat.com> Author: caolanm Update of /cvs/dist/rpms/openoffice.org/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv561 Modified Files: openoffice.org.spec Log Message: damn nvr Index: openoffice.org.spec =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/FC-5/openoffice.org.spec,v retrieving revision 1.644 retrieving revision 1.645 diff -u -r1.644 -r1.645 --- openoffice.org.spec 22 Mar 2006 11:13:18 -0000 1.644 +++ openoffice.org.spec 22 Mar 2006 11:22:41 -0000 1.645 @@ -1,6 +1,6 @@ %define oootag OOB680 %define ooomilestone 5 -%define rh_rpm_release 2.testing +%define rh_rpm_release 4.testing %define build_fc5 1 @@ -3236,7 +3236,7 @@ %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu %changelog -* Mon Mar 13 2006 Caolan McNamara - 1:2.0.2-5.3 +* Mon Mar 13 2006 Caolan McNamara - 1:2.0.2-5.4 - ooo#59997# replacement opens___.ttf updated - drop integrated openoffice.org-2.0.0.ooo56651.sw.rtfcrash.patch - drop integrated openoffice.org-1.9.114.ooo51718.rpath.patch From fedora-cvs-commits at redhat.com Wed Mar 22 11:32:25 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 22 Mar 2006 06:32:25 -0500 Subject: rpms/openoffice.org/FC-5 workspace.atkbridge.patch,1.9,1.10 Message-ID: <200603221132.k2MBWPhj000688@cvs.devel.redhat.com> Author: caolanm Update of /cvs/dist/rpms/openoffice.org/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv677 Modified Files: workspace.atkbridge.patch Log Message: twiddle workspace.atkbridge.patch: desktop/scripts/soffice.sh | 4 graphics/svx/source/accessibility/AccessibleContextBase.cxx | 1 graphics/svx/source/accessibility/AccessibleControlShape.cxx | 1 graphics/svx/source/accessibility/AccessibleEditableTextPara.cxx | 1 graphics/svx/source/accessibility/AccessibleFrameSelector.cxx | 3 graphics/svx/source/accessibility/AccessibleImageBullet.cxx | 1 graphics/svx/source/accessibility/GraphCtlAccessibleContext.cxx | 1 graphics/svx/source/accessibility/charmapacc.cxx | 8 graphics/svx/source/accessibility/svxrectctaccessiblecontext.cxx | 2 gsl/fpicker/source/unx/gnome/FPentry.cxx | 3 gsl/toolkit/source/awt/accessiblemenubasecomponent.cxx | 15 gsl/toolkit/source/awt/accessiblemenucomponent.cxx | 3 gsl/toolkit/source/awt/accessiblemenuitemcomponent.cxx | 3 gsl/toolkit/source/awt/vclxaccessiblecomponent.cxx | 10 gsl/toolkit/source/awt/vclxaccessiblelistitem.cxx | 1 gsl/toolkit/source/awt/vclxaccessiblemenuitem.cxx | 8 gsl/toolkit/source/awt/vclxaccessiblestatusbaritem.cxx | 1 gsl/toolkit/source/awt/vclxaccessibletabpage.cxx | 1 gsl/toolkit/source/awt/vclxaccessibletoolboxitem.cxx | 19 gsl/toolkit/source/awt/vclxwindow.cxx | 80 gsl/vcl/inc/menu.hxx | 3 gsl/vcl/inc/svapp.hxx | 2 gsl/vcl/prj/build.lst | 3 gsl/vcl/source/app/svapp.cxx | 14 gsl/vcl/source/window/menu.cxx | 35 gsl/vcl/unx/gtk/a11y/TODO | 49 gsl/vcl/unx/gtk/a11y/atkaction.cxx | 287 +++ gsl/vcl/unx/gtk/a11y/atkbridge.cxx | 56 gsl/vcl/unx/gtk/a11y/atkcomponent.cxx | 397 ++++ gsl/vcl/unx/gtk/a11y/atkeditabletext.cxx | 207 ++ gsl/vcl/unx/gtk/a11y/atkfactory.cxx | 166 ++ gsl/vcl/unx/gtk/a11y/atkfactory.hxx | 49 gsl/vcl/unx/gtk/a11y/atkhypertext.cxx | 295 +++ gsl/vcl/unx/gtk/a11y/atkimage.cxx | 144 + gsl/vcl/unx/gtk/a11y/atklistener.cxx | 474 +++++ gsl/vcl/unx/gtk/a11y/atklistener.hxx | 92 + gsl/vcl/unx/gtk/a11y/atkselection.cxx | 200 ++ gsl/vcl/unx/gtk/a11y/atktable.cxx | 737 ++++++++ gsl/vcl/unx/gtk/a11y/atktext.cxx | 547 ++++++ gsl/vcl/unx/gtk/a11y/atktextattributes.cxx | 572 ++++++ gsl/vcl/unx/gtk/a11y/atktextattributes.hxx | 60 gsl/vcl/unx/gtk/a11y/atkutil.cxx | 625 +++++++ gsl/vcl/unx/gtk/a11y/atkutil.hxx | 45 gsl/vcl/unx/gtk/a11y/atkvalue.cxx | 152 + gsl/vcl/unx/gtk/a11y/atkwindow.cxx | 138 + gsl/vcl/unx/gtk/a11y/atkwindow.hxx | 45 gsl/vcl/unx/gtk/a11y/atkwrapper.cxx | 819 ++++++++++ gsl/vcl/unx/gtk/a11y/atkwrapper.hxx | 125 + gsl/vcl/unx/gtk/a11y/makefile.mk | 96 + gsl/vcl/unx/gtk/app/gtkinst.cxx | 42 gsl/vcl/unx/gtk/window/gtkframe.cxx | 142 + gsl/vcl/unx/inc/plugins/gtk/atkbridge.hxx | 45 gsl/vcl/unx/inc/plugins/gtk/gtkframe.hxx | 16 gsl/vcl/util/makefile.mk | 2 util/comphelper/source/misc/accessiblewrapper.cxx | 6 util/svtools/source/Accessibility/accessibleiconchoicectrlentry.cxx | 1 util/svtools/source/Accessibility/accessiblelistboxentry.cxx | 1 util/svtools/source/Accessibility/accessibletabbar.cxx | 9 util/svtools/source/Accessibility/accessibletabbarpage.cxx | 21 util/svtools/source/Accessibility/accessibletabbarpagelist.cxx | 31 util/svtools/source/Accessibility/accessibletablistboxtable.cxx | 19 util/svtools/source/brwbox/brwbox3.cxx | 3 util/svtools/source/contnr/svtabbx.cxx | 3 util/svtools/source/control/valueacc.cxx | 2 util/svtools/source/edit/textwindowaccessibility.cxx | 2 65 files changed, 6828 insertions(+), 117 deletions(-) Index: workspace.atkbridge.patch =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/FC-5/workspace.atkbridge.patch,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- workspace.atkbridge.patch 22 Mar 2006 11:04:34 -0000 1.9 +++ workspace.atkbridge.patch 22 Mar 2006 11:31:36 -0000 1.10 @@ -7753,7 +7753,7 @@ << ::css::accessibility::AccessibleStateType::FOCUSABLE) | (static_cast< ::sal_Int64 >(1) << ::css::accessibility::AccessibleStateType::MULTI_LINE); ---- SRC680_m130/desktop/scripts/soffice.gail.sh 2005-09-30 15:34:21.000000000 +0100 +--- SRC680_m130.orig/desktop/scripts/soffice.sh 2005-09-30 15:34:21.000000000 +0100 +++ SRC680_m130/desktop/scripts/soffice.sh 2005-09-30 15:34:56.000000000 +0100 @@ -35,6 +35,10 @@ #************************************************************************* From fedora-cvs-commits at redhat.com Wed Mar 22 11:40:40 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 22 Mar 2006 06:40:40 -0500 Subject: rpms/openoffice.org/FC-5 openoffice.org.spec,1.645,1.646 Message-ID: <200603221140.k2MBeevL000784@cvs.devel.redhat.com> Author: caolanm Update of /cvs/dist/rpms/openoffice.org/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv771 Modified Files: openoffice.org.spec Log Message: wrong -p Index: openoffice.org.spec =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/FC-5/openoffice.org.spec,v retrieving revision 1.645 retrieving revision 1.646 diff -u -r1.645 -r1.646 --- openoffice.org.spec 22 Mar 2006 11:22:41 -0000 1.645 +++ openoffice.org.spec 22 Mar 2006 11:40:38 -0000 1.646 @@ -790,7 +790,7 @@ %patch21 -p1 -b .ooo54479.systemicu.patch %endif %patch22 -p1 -b .ooo54959.negativeindent.sw.patch -%patch23 -p0 -b .workspace.atkbridge.patch +%patch23 -p1 -b .workspace.atkbridge.patch %patch24 -p0 -b .workspace.jaxpapi.patch %patch25 -p1 -b .workspace.systemjava.patch %patch26 -p1 -b .workspace.targetedaot.patch From fedora-cvs-commits at redhat.com Wed Mar 22 11:53:41 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 22 Mar 2006 06:53:41 -0500 Subject: rpms/openoffice.org/devel .cvsignore, 1.100, 1.101 openoffice.org.spec, 1.649, 1.650 workspace.atkbridge.patch, 1.7, 1.8 Message-ID: <200603221153.k2MBrfKt014605@cvs.devel.redhat.com> Author: caolanm Update of /cvs/dist/rpms/openoffice.org/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv14591 Modified Files: .cvsignore openoffice.org.spec workspace.atkbridge.patch Log Message: update atkbridge Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/devel/.cvsignore,v retrieving revision 1.100 retrieving revision 1.101 diff -u -r1.100 -r1.101 --- .cvsignore 25 Feb 2006 13:49:16 -0000 1.100 +++ .cvsignore 22 Mar 2006 11:53:38 -0000 1.101 @@ -161,3 +161,4 @@ OOB680_m3.tar.bz2 OOB680_m4.tar.bz2 OOB680_m5.tar.bz2 +openoffice.org-dict-cs_CZ.tar.gz Index: openoffice.org.spec =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v retrieving revision 1.649 retrieving revision 1.650 diff -u -r1.649 -r1.650 --- openoffice.org.spec 22 Mar 2006 10:16:23 -0000 1.649 +++ openoffice.org.spec 22 Mar 2006 11:53:38 -0000 1.650 @@ -809,7 +809,7 @@ %patch21 -p1 -b .ooo54479.systemicu.patch %endif %patch22 -p1 -b .ooo54959.negativeindent.sw.patch -%patch23 -p0 -b .workspace.atkbridge.patch +%patch23 -p1 -b .workspace.atkbridge.patch %patch24 -p0 -b .workspace.jaxpapi.patch %patch25 -p1 -b .workspace.systemjava.patch %patch26 -p1 -b .workspace.targetedaot.patch workspace.atkbridge.patch: desktop/scripts/soffice.sh | 4 graphics/svx/source/accessibility/AccessibleContextBase.cxx | 1 graphics/svx/source/accessibility/AccessibleControlShape.cxx | 1 graphics/svx/source/accessibility/AccessibleEditableTextPara.cxx | 1 graphics/svx/source/accessibility/AccessibleFrameSelector.cxx | 3 graphics/svx/source/accessibility/AccessibleImageBullet.cxx | 1 graphics/svx/source/accessibility/GraphCtlAccessibleContext.cxx | 1 graphics/svx/source/accessibility/charmapacc.cxx | 8 graphics/svx/source/accessibility/svxrectctaccessiblecontext.cxx | 2 gsl/fpicker/source/unx/gnome/FPentry.cxx | 3 gsl/toolkit/source/awt/accessiblemenubasecomponent.cxx | 15 gsl/toolkit/source/awt/accessiblemenucomponent.cxx | 3 gsl/toolkit/source/awt/accessiblemenuitemcomponent.cxx | 3 gsl/toolkit/source/awt/vclxaccessiblecomponent.cxx | 10 gsl/toolkit/source/awt/vclxaccessiblelistitem.cxx | 1 gsl/toolkit/source/awt/vclxaccessiblemenuitem.cxx | 8 gsl/toolkit/source/awt/vclxaccessiblestatusbaritem.cxx | 1 gsl/toolkit/source/awt/vclxaccessibletabpage.cxx | 1 gsl/toolkit/source/awt/vclxaccessibletoolboxitem.cxx | 19 gsl/toolkit/source/awt/vclxwindow.cxx | 80 gsl/vcl/inc/menu.hxx | 3 gsl/vcl/inc/svapp.hxx | 2 gsl/vcl/prj/build.lst | 3 gsl/vcl/source/app/svapp.cxx | 14 gsl/vcl/source/window/menu.cxx | 35 gsl/vcl/unx/gtk/a11y/TODO | 49 gsl/vcl/unx/gtk/a11y/atkaction.cxx | 287 +++ gsl/vcl/unx/gtk/a11y/atkbridge.cxx | 56 gsl/vcl/unx/gtk/a11y/atkcomponent.cxx | 397 ++++ gsl/vcl/unx/gtk/a11y/atkeditabletext.cxx | 207 ++ gsl/vcl/unx/gtk/a11y/atkfactory.cxx | 166 ++ gsl/vcl/unx/gtk/a11y/atkfactory.hxx | 49 gsl/vcl/unx/gtk/a11y/atkhypertext.cxx | 295 +++ gsl/vcl/unx/gtk/a11y/atkimage.cxx | 144 + gsl/vcl/unx/gtk/a11y/atklistener.cxx | 474 +++++ gsl/vcl/unx/gtk/a11y/atklistener.hxx | 92 + gsl/vcl/unx/gtk/a11y/atkselection.cxx | 200 ++ gsl/vcl/unx/gtk/a11y/atktable.cxx | 737 ++++++++ gsl/vcl/unx/gtk/a11y/atktext.cxx | 547 ++++++ gsl/vcl/unx/gtk/a11y/atktextattributes.cxx | 572 ++++++ gsl/vcl/unx/gtk/a11y/atktextattributes.hxx | 60 gsl/vcl/unx/gtk/a11y/atkutil.cxx | 625 +++++++ gsl/vcl/unx/gtk/a11y/atkutil.hxx | 45 gsl/vcl/unx/gtk/a11y/atkvalue.cxx | 152 + gsl/vcl/unx/gtk/a11y/atkwindow.cxx | 138 + gsl/vcl/unx/gtk/a11y/atkwindow.hxx | 45 gsl/vcl/unx/gtk/a11y/atkwrapper.cxx | 819 ++++++++++ gsl/vcl/unx/gtk/a11y/atkwrapper.hxx | 125 + gsl/vcl/unx/gtk/a11y/makefile.mk | 96 + gsl/vcl/unx/gtk/app/gtkinst.cxx | 42 gsl/vcl/unx/gtk/window/gtkframe.cxx | 142 + gsl/vcl/unx/inc/plugins/gtk/atkbridge.hxx | 45 gsl/vcl/unx/inc/plugins/gtk/gtkframe.hxx | 16 gsl/vcl/util/makefile.mk | 2 util/comphelper/source/misc/accessiblewrapper.cxx | 6 util/svtools/source/Accessibility/accessibleiconchoicectrlentry.cxx | 1 util/svtools/source/Accessibility/accessiblelistboxentry.cxx | 1 util/svtools/source/Accessibility/accessibletabbar.cxx | 9 util/svtools/source/Accessibility/accessibletabbarpage.cxx | 21 util/svtools/source/Accessibility/accessibletabbarpagelist.cxx | 31 util/svtools/source/Accessibility/accessibletablistboxtable.cxx | 19 util/svtools/source/brwbox/brwbox3.cxx | 3 util/svtools/source/contnr/svtabbx.cxx | 3 util/svtools/source/control/valueacc.cxx | 2 util/svtools/source/edit/textwindowaccessibility.cxx | 2 65 files changed, 6828 insertions(+), 117 deletions(-) View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.7 -r 1.8 workspace.atkbridge.patch Index: workspace.atkbridge.patch =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/devel/workspace.atkbridge.patch,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- workspace.atkbridge.patch 20 Feb 2006 11:43:44 -0000 1.7 +++ workspace.atkbridge.patch 22 Mar 2006 11:53:38 -0000 1.8 @@ -1,71 +1,24 @@ -diff -Nur m154/comphelper/source/misc/accessiblewrapper.cxx atkbridge/comphelper/source/misc/accessiblewrapper.cxx ---- comphelper/source/misc/accessiblewrapper.cxx 2005-09-08 04:48:04.000000000 +0200 -+++ comphelper/source/misc/accessiblewrapper.cxx 2005-09-21 07:53:29.000000000 +0200 +Index: util/comphelper/source/misc/accessiblewrapper.cxx +diff -u util/comphelper/source/misc/accessiblewrapper.cxx:1.9 util/comphelper/source/misc/accessiblewrapper.cxx:1.8.156.3 +--- util/comphelper/source/misc/accessiblewrapper.cxx:1.9 Wed Sep 7 19:48:04 2005 ++++ util/comphelper/source/misc/accessiblewrapper.cxx Wed Mar 1 04:12:20 2006 @@ -151,6 +151,12 @@ { Reference< XAccessible > xValue; + if( !_rxKey.is() ) + { -+// fprintf( stderr, "It was this path that was crashing stuff\n" ); ++ // fprintf( stderr, "It was this path that was crashing stuff\n" ); + return xValue; + } + // do we have this child in the cahce? AccessibleMap::const_iterator aPos = m_aChildrenMap.find( _rxKey ); if ( m_aChildrenMap.end() != aPos ) -diff -Nur m154/config_office/configure.in atkbridge/config_office/configure.in ---- config_office/configure.in 2006-01-20 14:28:25.000000000 +0100 -+++ config_office/configure.in 2006-01-30 16:07:32.000000000 +0100 -@@ -142,6 +142,11 @@ - [ --enable-vctk Tell configure to check for the MS VC Toolkit 2003. - ( This is experimental! ) - ],,) -+AC_ARG_ENABLE(atkbridge, -+[ --enable-atkbridge Enable support for direct ATK accessibility bridge -+ under UNIX, instead of via the existing Java bridge -+ ( This is experimental! ) -+],,) - AC_ARG_ENABLE(gtk, - [ --disable-gtk Determines whether to use Gtk+ vclplug on platforms - where Gtk+ is available. -@@ -3847,6 +3852,19 @@ - AC_MSG_RESULT([$R]) - fi - -+AC_MSG_CHECKING([Whether ATK bridge can be built]) -+EXPERIMENTAL_ATKBRIDGE= -+if test "x$enable_atkbridge" = "xyes"; then -+ if test "x$ENABLE_GTK" != "xTRUE"; then -+ AC_MSG_ERROR([ATK bridge requires gtk+]) -+ else -+ AC_MSG_RESULT([yes]) -+ fi -+ -+ EXPERIMENTAL_ATKBRIDGE=TRUE -+fi -+AC_SUBST(EXPERIMENTAL_ATKBRIDGE) -+ - dnl =================================================================== - dnl Gnome VFS check - dnl =================================================================== -diff -Nur m154/config_office/set_soenv.in atkbridge/config_office/set_soenv.in ---- config_office/set_soenv.in 2006-01-13 17:37:16.000000000 +0100 -+++ config_office/set_soenv.in 2006-01-30 16:07:51.000000000 +0100 -@@ -1519,6 +1519,10 @@ - ToFile( "ENABLE_KAB", "@ENABLE_KAB@", "e" ); - ToFile( "MOC", "@MOC@", "e" ); - ToFile( "PSPRINT", "TRUE", "e" ); -+ -+# Experimental pieces -+ToFile( "EXPERIMENTAL_ATKBRIDGE", "@EXPERIMENTAL_ATKBRIDGE@", "e" ); -+ - # [ed] 5/14/02 If we're building Aqua graphics, insert a C macro to indicate this. - # There may be a better way to do this, like splitting unxmacxp into two, but - # hopefully this hack will work for now... -diff -Nur m154/fpicker/source/unx/gnome/FPentry.cxx atkbridge/fpicker/source/unx/gnome/FPentry.cxx ---- fpicker/source/unx/gnome/FPentry.cxx 2005-09-09 01:34:31.000000000 +0200 -+++ fpicker/source/unx/gnome/FPentry.cxx 2005-12-07 15:37:07.000000000 +0100 +Index: gsl/fpicker/source/unx/gnome/FPentry.cxx +diff -u gsl/fpicker/source/unx/gnome/FPentry.cxx:1.4 gsl/fpicker/source/unx/gnome/FPentry.cxx:1.4.26.1 +--- gsl/fpicker/source/unx/gnome/FPentry.cxx:1.4 Thu Sep 8 16:34:31 2005 ++++ gsl/fpicker/source/unx/gnome/FPentry.cxx Wed Dec 7 06:37:07 2005 @@ -158,8 +158,7 @@ { if ( @@ -76,701 +29,244 @@ ) { return 0; -diff -Nur m154/svtools/source/Accessibility/accessibleiconchoicectrlentry.cxx atkbridge/svtools/source/Accessibility/accessibleiconchoicectrlentry.cxx ---- svtools/source/Accessibility/accessibleiconchoicectrlentry.cxx 2005-09-08 16:25:23.000000000 +0200 -+++ svtools/source/Accessibility/accessibleiconchoicectrlentry.cxx 2005-12-06 09:41:55.000000000 +0100 -@@ -441,6 +441,7 @@ - pStateSetHelper->AddState( AccessibleStateType::TRANSIENT ); - pStateSetHelper->AddState( AccessibleStateType::SELECTABLE ); - pStateSetHelper->AddState( AccessibleStateType::ENABLED ); -+ pStateSetHelper->AddState( AccessibleStateType::SENSITIVE ); - if ( IsShowing_Impl() ) - { - pStateSetHelper->AddState( AccessibleStateType::SHOWING ); -diff -Nur m154/svtools/source/Accessibility/accessiblelistboxentry.cxx atkbridge/svtools/source/Accessibility/accessiblelistboxentry.cxx ---- svtools/source/Accessibility/accessiblelistboxentry.cxx 2005-09-08 16:25:58.000000000 +0200 -+++ svtools/source/Accessibility/accessiblelistboxentry.cxx 2005-12-06 09:41:55.000000000 +0100 -@@ -503,6 +503,7 @@ - pStateSetHelper->AddState( AccessibleStateType::TRANSIENT ); - pStateSetHelper->AddState( AccessibleStateType::SELECTABLE ); - pStateSetHelper->AddState( AccessibleStateType::ENABLED ); -+ pStateSetHelper->AddState( AccessibleStateType::SENSITIVE ); - if ( getListBox()->IsInplaceEditingEnabled() ) - pStateSetHelper->AddState( AccessibleStateType::EDITABLE ); - if ( IsShowing_Impl() ) -diff -Nur m154/svtools/source/Accessibility/accessibletabbar.cxx atkbridge/svtools/source/Accessibility/accessibletabbar.cxx ---- svtools/source/Accessibility/accessibletabbar.cxx 2005-09-27 14:54:20.000000000 +0200 -+++ svtools/source/Accessibility/accessibletabbar.cxx 2005-12-06 09:41:56.000000000 +0100 -@@ -148,6 +148,8 @@ - { - case VCLEVENT_WINDOW_ENABLED: - { -+ aNewValue <<= AccessibleStateType::SENSITIVE; -+ NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, aOldValue, aNewValue ); - aNewValue <<= AccessibleStateType::ENABLED; - NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, aOldValue, aNewValue ); - } -@@ -156,6 +158,8 @@ - { - aOldValue <<= AccessibleStateType::ENABLED; - NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, aOldValue, aNewValue ); -+ aOldValue <<= AccessibleStateType::SENSITIVE; -+ NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, aOldValue, aNewValue ); - } - break; - case VCLEVENT_WINDOW_GETFOCUS: -@@ -205,7 +209,10 @@ - if ( m_pTabBar ) - { - if ( m_pTabBar->IsEnabled() ) -- rStateSet.AddState( AccessibleStateType::ENABLED ); -+ { -+ rStateSet.AddState( AccessibleStateType::ENABLED ); -+ rStateSet.AddState( AccessibleStateType::SENSITIVE ); -+ } - - rStateSet.AddState( AccessibleStateType::FOCUSABLE ); - -diff -Nur m154/svtools/source/Accessibility/accessibletabbarpage.cxx atkbridge/svtools/source/Accessibility/accessibletabbarpage.cxx ---- svtools/source/Accessibility/accessibletabbarpage.cxx 2005-09-08 16:26:46.000000000 +0200 -+++ svtools/source/Accessibility/accessibletabbarpage.cxx 2005-12-06 09:41:56.000000000 +0100 -@@ -150,13 +150,21 @@ - { - if ( m_bEnabled != bEnabled ) - { -- Any aOldValue, aNewValue; -+ Any aOldValue[2], aNewValue[2]; - if ( m_bEnabled ) -- aOldValue <<= AccessibleStateType::ENABLED; -- else -- aNewValue <<= AccessibleStateType::ENABLED; -+ { -+ aOldValue[0] <<= AccessibleStateType::SENSITIVE; -+ aOldValue[1] <<= AccessibleStateType::ENABLED; -+ } -+ else -+ { -+ -+ aNewValue[0] <<= AccessibleStateType::ENABLED; -+ aNewValue[1] <<= AccessibleStateType::SENSITIVE; -+ } - m_bEnabled = bEnabled; -- NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, aOldValue, aNewValue ); -+ NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, aOldValue[0], aNewValue[0] ); -+ NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, aOldValue[1], aNewValue[1] ); - } - } +Index: gsl/vcl/inc/menu.hxx +diff -u gsl/vcl/inc/menu.hxx:1.35 gsl/vcl/inc/menu.hxx:1.35.12.1 +--- gsl/vcl/inc/menu.hxx:1.35 Fri Sep 9 04:09:19 2005 ++++ gsl/vcl/inc/menu.hxx Wed Nov 16 07:57:55 2005 +@@ -379,6 +379,9 @@ -@@ -211,7 +219,10 @@ - void AccessibleTabBarPage::FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet ) - { - if ( IsEnabled() ) -+ { - rStateSet.AddState( AccessibleStateType::ENABLED ); -+ rStateSet.AddState( AccessibleStateType::SENSITIVE ); -+ } + void SetAccessibleDescription( USHORT nItemId, const XubString& rStr ); + XubString GetAccessibleDescription( USHORT nItemId ) const; ++ ++ // returns whether the item a position nItemPos is highlighted or not. ++ bool IsHighlighted( USHORT nItemPos ) const; + }; - rStateSet.AddState( AccessibleStateType::VISIBLE ); + // ----------- [...7195 lines suppressed...] + { + if ( m_bEnabled != bEnabled ) + { +- Any aOldValue, aNewValue; ++ Any aOldValue[2], aNewValue[2]; + if ( m_bEnabled ) +- aOldValue <<= AccessibleStateType::ENABLED; +- else +- aNewValue <<= AccessibleStateType::ENABLED; ++ { ++ aOldValue[0] <<= AccessibleStateType::SENSITIVE; ++ aOldValue[1] <<= AccessibleStateType::ENABLED; ++ } ++ else ++ { ++ ++ aNewValue[0] <<= AccessibleStateType::ENABLED; ++ aNewValue[1] <<= AccessibleStateType::SENSITIVE; ++ } + m_bEnabled = bEnabled; +- NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, aOldValue, aNewValue ); ++ NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, aOldValue[0], aNewValue[0] ); ++ NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, aOldValue[1], aNewValue[1] ); + } + } + +@@ -203,7 +211,10 @@ + void AccessibleTabBarPage::FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet ) + { + if ( IsEnabled() ) ++ { + rStateSet.AddState( AccessibleStateType::ENABLED ); ++ rStateSet.AddState( AccessibleStateType::SENSITIVE ); ++ } + + rStateSet.AddState( AccessibleStateType::VISIBLE ); + +Index: util/svtools/source/Accessibility/accessibletabbarpagelist.cxx +diff -u util/svtools/source/Accessibility/accessibletabbarpagelist.cxx:1.17 util/svtools/source/Accessibility/accessibletabbarpagelist.cxx:1.16.72.2 +--- util/svtools/source/Accessibility/accessibletabbarpagelist.cxx:1.17 Tue Jan 31 10:30:44 2006 ++++ util/svtools/source/Accessibility/accessibletabbarpagelist.cxx Mon Feb 6 02:26:54 2006 +@@ -251,19 +251,21 @@ + + switch ( rVclWindowEvent.GetId() ) + { +- case VCLEVENT_WINDOW_ENABLED: ++ case VCLEVENT_WINDOW_ENABLED: + { +- Any aOldValue, aNewValue; +- aNewValue <<= AccessibleStateType::ENABLED; +- NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, aOldValue, aNewValue ); +- } +- break; +- case VCLEVENT_WINDOW_DISABLED: +- { +- Any aOldValue, aNewValue; +- aOldValue <<= AccessibleStateType::ENABLED; +- NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, aOldValue, aNewValue ); +- } ++ aNewValue <<= AccessibleStateType::SENSITIVE; ++ NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, aOldValue, aNewValue ); ++ aNewValue <<= AccessibleStateType::ENABLED; ++ NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, aOldValue, aNewValue ); ++ } ++ break; ++ case VCLEVENT_WINDOW_DISABLED: ++ { ++ aOldValue <<= AccessibleStateType::ENABLED; ++ NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, aOldValue, aNewValue ); ++ aOldValue <<= AccessibleStateType::SENSITIVE; ++ NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, aOldValue, aNewValue ); ++ } + break; + case VCLEVENT_WINDOW_SHOW: + { +@@ -395,7 +397,10 @@ + if ( m_pTabBar ) + { + if ( m_pTabBar->IsEnabled() ) +- rStateSet.AddState( AccessibleStateType::ENABLED ); ++ { ++ rStateSet.AddState( AccessibleStateType::ENABLED ); ++ rStateSet.AddState( AccessibleStateType::SENSITIVE ); ++ } + + rStateSet.AddState( AccessibleStateType::VISIBLE ); + +Index: util/svtools/source/Accessibility/accessibletablistboxtable.cxx +diff -u util/svtools/source/Accessibility/accessibletablistboxtable.cxx:1.8 util/svtools/source/Accessibility/accessibletablistboxtable.cxx:1.8.14.1 +--- util/svtools/source/Accessibility/accessibletablistboxtable.cxx:1.8 Mon Feb 6 04:56:48 2006 ++++ util/svtools/source/Accessibility/accessibletablistboxtable.cxx Thu Mar 9 04:01:53 2006 +@@ -106,8 +106,9 @@ + { + if ( isAlive() ) + { +- switch ( rVclWindowEvent.GetId() ) +- { ++ ULONG nEventId = rVclWindowEvent.GetId(); ++ switch ( nEventId ) ++ { + case VCLEVENT_OBJECT_DYING : + { + m_pTabListBox->RemoveEventListener( LINK( this, AccessibleTabListBoxTable, WindowEventListener ) ); +@@ -115,7 +116,19 @@ + break; + } + +- case VCLEVENT_LISTBOX_SELECT : ++ case VCLEVENT_CONTROL_GETFOCUS : ++ case VCLEVENT_CONTROL_LOSEFOCUS : ++ { ++ uno::Any aOldValue, aNewValue; ++ if ( VCLEVENT_CONTROL_GETFOCUS == nEventId ) ++ aNewValue <<= AccessibleStateType::FOCUSED; ++ else ++ aOldValue <<= AccessibleStateType::FOCUSED; ++ commitEvent( AccessibleEventId::STATE_CHANGED, aNewValue, aOldValue ); ++ break; ++ } ++ ++ case VCLEVENT_LISTBOX_SELECT : + { + // First send an event that tells the listeners of a + // modified selection. The active descendant event is +Index: util/svtools/source/brwbox/brwbox3.cxx +diff -u util/svtools/source/brwbox/brwbox3.cxx:1.16 util/svtools/source/brwbox/brwbox3.cxx:1.16.106.1 +--- util/svtools/source/brwbox/brwbox3.cxx:1.16 Thu Sep 8 07:29:19 2005 ++++ util/svtools/source/brwbox/brwbox3.cxx Tue Dec 6 03:50:53 2005 +@@ -357,7 +357,10 @@ + if ( GetUpdateMode() ) + rStateSet.AddState( AccessibleStateType::EDITABLE ); + if ( IsEnabled() ) ++ { + rStateSet.AddState( AccessibleStateType::ENABLED ); ++ rStateSet.AddState( AccessibleStateType::SENSITIVE ); ++ } + if ( IsReallyVisible() ) + rStateSet.AddState( AccessibleStateType::VISIBLE ); + if ( eObjType == ::svt::BBTYPE_TABLE ) +Index: util/svtools/source/contnr/svtabbx.cxx +diff -u util/svtools/source/contnr/svtabbx.cxx:1.18 util/svtools/source/contnr/svtabbx.cxx:1.16.106.3 +--- util/svtools/source/contnr/svtabbx.cxx:1.18 Mon Feb 6 05:37:19 2006 ++++ util/svtools/source/contnr/svtabbx.cxx Thu Feb 16 05:38:08 2006 +@@ -1206,7 +1206,10 @@ + if ( IsActive() ) + _rStateSet.AddState( AccessibleStateType::ACTIVE ); + if ( IsEnabled() ) ++ { + _rStateSet.AddState( AccessibleStateType::ENABLED ); ++ _rStateSet.AddState( AccessibleStateType::SENSITIVE ); ++ } + if ( IsReallyVisible() ) + _rStateSet.AddState( AccessibleStateType::VISIBLE ); + if ( _eType == ::svt::BBTYPE_TABLE ) +Index: util/svtools/source/control/valueacc.cxx +diff -u util/svtools/source/control/valueacc.cxx:1.17 util/svtools/source/control/valueacc.cxx:1.17.108.1 +--- util/svtools/source/control/valueacc.cxx:1.17 Thu Sep 8 08:08:48 2005 ++++ util/svtools/source/control/valueacc.cxx Tue Dec 6 03:50:54 2005 +@@ -319,6 +319,7 @@ + + // Set some states. + pStateSet->AddState (accessibility::AccessibleStateType::ENABLED); ++ pStateSet->AddState (accessibility::AccessibleStateType::SENSITIVE); + pStateSet->AddState (accessibility::AccessibleStateType::SHOWING); + pStateSet->AddState (accessibility::AccessibleStateType::VISIBLE); + pStateSet->AddState (accessibility::AccessibleStateType::MANAGES_DESCENDANTS); +@@ -991,6 +992,7 @@ + if( mpParent ) + { + pStateSet->AddState (accessibility::AccessibleStateType::ENABLED); ++ pStateSet->AddState (accessibility::AccessibleStateType::SENSITIVE); + pStateSet->AddState (accessibility::AccessibleStateType::SHOWING); + pStateSet->AddState (accessibility::AccessibleStateType::VISIBLE); + pStateSet->AddState (accessibility::AccessibleStateType::TRANSIENT); +Index: util/svtools/source/edit/textwindowaccessibility.cxx +diff -u util/svtools/source/edit/textwindowaccessibility.cxx:1.26 util/svtools/source/edit/textwindowaccessibility.cxx:1.24.104.3 +--- util/svtools/source/edit/textwindowaccessibility.cxx:1.26 Wed Feb 1 06:40:09 2006 ++++ util/svtools/source/edit/textwindowaccessibility.cxx Mon Feb 6 02:27:37 2006 +@@ -1421,6 +1421,8 @@ + = (static_cast< ::sal_Int64 >(1) + << ::css::accessibility::AccessibleStateType::ENABLED) + | (static_cast< ::sal_Int64 >(1) ++ << ::css::accessibility::AccessibleStateType::SENSITIVE) ++ | (static_cast< ::sal_Int64 >(1) + << ::css::accessibility::AccessibleStateType::FOCUSABLE) + | (static_cast< ::sal_Int64 >(1) + << ::css::accessibility::AccessibleStateType::MULTI_LINE); +--- SRC680_m130.orig/desktop/scripts/soffice.sh 2005-09-30 15:34:21.000000000 +0100 ++++ SRC680_m130/desktop/scripts/soffice.sh 2005-09-30 15:34:56.000000000 +0100 +@@ -35,6 +35,10 @@ + #************************************************************************* + + if [ -z $SAL_USE_VCLPLUGIN ]; then export SAL_USE_VCLPLUGIN=gtk; fi ++if [ true == `gconftool-2 -g "/desktop/gnome/interface/accessibility"` ]; then ++export GTK_MODULES="gail:atk-bridge $GTK_MODULES" ++fi ++export SAL_IGNOREXERRORS=true + export SAL_ENABLE_NATIVE_XFONTS=0 + # + # STAR_PROFILE_LOCKING_DISABLED=1 From fedora-cvs-commits at redhat.com Wed Mar 22 12:36:23 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 22 Mar 2006 07:36:23 -0500 Subject: rpms/logwatch/FC-4 logwatch-7.2.1-audit.patch, NONE, 1.1 logwatch-7.2.1-http.patch, NONE, 1.1 logwatch-7.2.1-mountd.patch, NONE, 1.1 logwatch-7.2.1-named.patch, NONE, 1.1 logwatch-7.2.1-nosegfault.patch, NONE, 1.1 logwatch-7.2.1-pam_unix.patch, NONE, 1.1 logwatch-7.2.1-secure.patch, NONE, 1.1 logwatch-7.2.1-smart.patch, NONE, 1.1 logwatch-7.2.1-sshd.patch, NONE, 1.1 .cvsignore, 1.11, 1.12 logwatch.spec, 1.21, 1.22 sources, 1.11, 1.12 logwatch-4.3.2-nounicode.patch, 1.1, NONE logwatch-6.1.2-audit2.patch, 1.1, NONE logwatch-7.0-man_page.patch, 1.1, NONE logwatch-7.0-named.patch, 1.1, NONE logwatch-7.0-nosegfault.patch, 1.1, NONE logwatch-7.0-secure.patch, 1.1, NONE logwatch-7.0-smartd.patch, 1.1, NONE logwatch-7.0-smartd2.patch, 1.1, NONE logwatch-7.0-zz-disk_space.patch, 1.1, NONE Message-ID: <200603221236.k2MCaNSq028511@cvs.devel.redhat.com> Author: varekova Update of /cvs/dist/rpms/logwatch/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv28470 Modified Files: .cvsignore logwatch.spec sources Added Files: logwatch-7.2.1-audit.patch logwatch-7.2.1-http.patch logwatch-7.2.1-mountd.patch logwatch-7.2.1-named.patch logwatch-7.2.1-nosegfault.patch logwatch-7.2.1-pam_unix.patch logwatch-7.2.1-secure.patch logwatch-7.2.1-smart.patch logwatch-7.2.1-sshd.patch Removed Files: logwatch-4.3.2-nounicode.patch logwatch-6.1.2-audit2.patch logwatch-7.0-man_page.patch logwatch-7.0-named.patch logwatch-7.0-nosegfault.patch logwatch-7.0-secure.patch logwatch-7.0-smartd.patch logwatch-7.0-smartd2.patch logwatch-7.0-zz-disk_space.patch Log Message: - update to 7.2.1 (#185758) - add/update pam_unix, http, sshd, smart, named, audit, secure and mountd patches logwatch-7.2.1-audit.patch: audit | 3 ++- 1 files changed, 2 insertions(+), 1 deletion(-) --- NEW FILE logwatch-7.2.1-audit.patch --- --- logwatch-7.2.1/scripts/services/audit.pom 2005-12-06 03:36:35.000000000 +0100 +++ logwatch-7.2.1/scripts/services/audit 2006-03-16 13:48:35.655605784 +0100 @@ -63,7 +63,8 @@ ( $ThisLine =~ /audit_backlog_limit=[0-9]* old=[0-9]*(?: by auid=[0-9]*)?/) or ( $ThisLine =~ /SELinux: unrecognized netlink message type=[0-9]+ for sclass=[0-9]+/) or ( $ThisLine =~ /audit\([0-9.]+:[0-9]+\): saddr=[0-9]+/) or - ( $ThisLine =~ /nargs=[0-9]+ a0=[0-9a-f]+ a1=[0-9a-f]+ a2=[0-9a-f]+ a3=[0-9a-f]+ a4=[0-9a-f]+ a5=[0-9a-f]+/) + ( $ThisLine =~ /nargs=[0-9]+ a0=[0-9a-f]+ a1=[0-9a-f]+ a2=[0-9a-f]+ a3=[0-9a-f]+ a4=[0-9a-f]+ a5=[0-9a-f]+/) or + ( $ThisLine =~ /^audit\([0-9.]+:[0-9]+\): ( ?(path|cwd|item|name|flags)=["\/A-Za-z0-9]*)*$/) ) { # Ignore these entries } elsif ( $ThisLine =~ /audit\([0-9]{10}.[0-9]{3}:[0-9]\): initialized$/) { logwatch-7.2.1-http.patch: http | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE logwatch-7.2.1-http.patch --- --- logwatch-7.2.1/scripts/services/http.pom 2006-01-04 22:26:08.000000000 +0100 +++ logwatch-7.2.1/scripts/services/http 2006-03-15 13:27:31.935011448 +0100 @@ -266,7 +266,7 @@ # what to look for as an attack USE LOWER CASE!!!!!! # my @exploits = ( - 'null', + '^null$', '/\.\./\.\./\.\./', '\.\./\.\./config\.sys', '/\.\./\.\./\.\./autoexec\.bat', logwatch-7.2.1-mountd.patch: mountd | 10 ++++++++++ 1 files changed, 10 insertions(+) --- NEW FILE logwatch-7.2.1-mountd.patch --- --- logwatch-7.2.1/scripts/services/mountd.pom 2005-02-24 18:08:04.000000000 +0100 +++ logwatch-7.2.1/scripts/services/mountd 2006-03-16 13:54:42.943769496 +0100 @@ -47,6 +47,9 @@ $Mount = " " . $Mount; $Mounted{$Name}{$Mount}++; } + elsif ( ($Number) = ($ThisLine =~ /Caught signal ([0-9]*), un-registering and exiting/) ) { + $SignalExit{$Number}++; + } else { # Report any unmatched entries... push @OtherList,$ThisLine; @@ -70,6 +73,13 @@ } } +if (keys %SignalExit) { + printf "\nExit after catching signal:\n"; + foreach $Number (keys %SignalExit) { + print " Signal " . $Number. ": " . $SignalExit{$Number} . " Time(s)\n"; + } +} + if (($Detail >= 5) and (keys %Mounted)) { print "\nSuccessful NFS mounts:\n"; foreach $ThisOne (keys %Mounted) { logwatch-7.2.1-named.patch: named | 3 ++- 1 files changed, 2 insertions(+), 1 deletion(-) --- NEW FILE logwatch-7.2.1-named.patch --- --- logwatch-7.2.1/scripts/services/named.pom 2005-11-30 06:01:44.000000000 +0100 +++ logwatch-7.2.1/scripts/services/named 2006-03-16 13:51:39.351679736 +0100 @@ -130,7 +130,8 @@ ($ThisLine =~ /sending notifies/) or # file syntax error get reported twice and are already caught below ($ThisLine =~ /loading master file/) or - ($ThisLine =~ /^ succeeded$/) + ($ThisLine =~ /^ succeeded$/) or + ($ThisLine =~ /\*\*\* POKED TIMER \*\*\*/) ) { # Don't care about these... } elsif ( logwatch-7.2.1-nosegfault.patch: kernel.conf | 3 +++ 1 files changed, 3 insertions(+) --- NEW FILE logwatch-7.2.1-nosegfault.patch --- --- logwatch-7.2.1/conf/services/kernel.conf.pom 2006-01-04 22:06:53.000000000 +0100 +++ logwatch-7.2.1/conf/services/kernel.conf 2006-03-14 14:01:29.290219488 +0100 @@ -20,6 +20,9 @@ # Only give lines pertaining to the kernel service... *OnlyService = (kernel|SUNW,[-\w]+?) *RemoveHeaders +*Remove = segfault +*Remove = locate module + ######################################################## # This was written and is maintained by: logwatch-7.2.1-pam_unix.patch: pam_unix | 7 +++++-- secure | 1 + sshd | 1 + 3 files changed, 7 insertions(+), 2 deletions(-) --- NEW FILE logwatch-7.2.1-pam_unix.patch --- --- logwatch-7.2.1/scripts/services/sshd.pom 2005-12-01 05:13:47.000000000 +0100 +++ logwatch-7.2.1/scripts/services/sshd 2006-03-16 13:42:52.220815808 +0100 @@ -191,6 +191,7 @@ ($ThisLine =~ m/^pam_ldap: error trying to bind as user "[^"]+" \(Invalid credentials\)/) or ($ThisLine =~ m/^pam_ldap: ldap_starttls_s: Can't contact LDAP server/) or ($ThisLine =~ m/^\(pam_unix\) .*/) or + ($ThisLine =~ m/^pam_unix\(.*:.*\)/) or # We won't count the following two because they're always followed by a # failed login entry... ($ThisLine =~ /^input_userauth_request: (illegal|invalid) user (.*)$/ ) or --- logwatch-7.2.1/scripts/services/pam_unix.pom 2005-12-01 05:15:04.000000000 +0100 +++ logwatch-7.2.1/scripts/services/pam_unix 2006-03-16 13:42:52.221815656 +0100 @@ -99,12 +99,15 @@ } elsif ( $line =~ s/^... .. ..:..:.. .+ [^\s:\[\]]+: [0-9:\[\]\.]+ \(pam_unix\) //) { $service =~ s/^... .. ..:..:.. .+ ([^\s:\[\]]+): [0-9:\[\]\.]+ \(pam_unix\) .*$/$1/; #for debian woody - } elsif ( ( $line =~ s/^... .. ..:..:.. .+ PAM_unix\[\d+\]: \((.*?)\) // )) { + } elsif ( $line =~ s/^... .. ..:..:.. .+ PAM_unix\[\d+\]: \((.*?)\) // ) { $service =~ s/^... .. ..:..:.. .+ PAM_unix\[\d+\]: \(([^ ]*)\) .*/$1/; + } elsif ( $line =~ s/^... .. ..:..:.. .+ pam_unix(.+:.+): // ) { + $service =~ s/^... .. ..:..:.. .+ pam_unix\((.+):.+\): .*$/$1/; + #new version } else { next; } - #lowercase the service + #lowercase the service $service = lc($service); if (($service eq 'sshd') or ($service eq 'login') or ($service eq 'ftp') or ($service eq 'rsh')) { if ($line =~ s/^session opened for user (.+) by \(uid=\d+\)/$1/) { --- logwatch-7.2.1/scripts/services/secure.pom 2005-12-06 03:37:34.000000000 +0100 +++ logwatch-7.2.1/scripts/services/secure 2006-03-16 13:42:52.222815504 +0100 @@ -114,6 +114,7 @@ ( $ThisLine =~ /pam_succeed_if: requirement "uid < 100" (was|not) met by user /) or ( $ThisLine =~ /pam_rhosts_auth\[\d+\]: allowed to [^ ]+ as \w+/) or ( $ThisLine =~ /^(.*)\(pam_unix\)/) or + ( $ThisLine =~ /pam_unix\(.*:.*\)/) or ( $ThisLine =~ m/^[^ ]+\[\d+\]: connect from localhost$/ ) or ( $ThisLine =~ /^\/usr\/bin\/sudo:/) or ( $ThisLine =~ /^halt:/) or logwatch-7.2.1-secure.patch: secure | 15 ++++++++++++++- 1 files changed, 14 insertions(+), 1 deletion(-) --- NEW FILE logwatch-7.2.1-secure.patch --- --- logwatch-7.2.1/scripts/services/secure.pom 2006-03-16 13:40:03.105525240 +0100 +++ logwatch-7.2.1/scripts/services/secure 2006-03-16 13:39:03.000000000 +0100 @@ -133,7 +133,9 @@ ( $ThisLine =~ /^ipop3d\[\d+\]:/) or ( $ThisLine =~ /pam_timestamp: updated timestamp file/) or ( $ThisLine =~ /pam_timestamp: timestamp file `([^ ]+)' is only \d+ seconds old, allowing access to ([^ ]+) for user ([^ ]+)/) or - ( $ThisLine =~ /pam_timestamp: timestamp file `([^ ]+)' has unacceptable age \(\d+ seconds\), disallowing access to ([^ ]+) for user ([^ ]+)/) + ( $ThisLine =~ /pam_timestamp: timestamp file `([^ ]+)' has unacceptable age \(\d+ seconds\), disallowing access to ([^ ]+) for user ([^ ]+)/) or + ( $ThisLine =~ /userhelper\[\d+\]: running '([^ ]+)' with [^ ]+ context/) or + ( $ThisLine =~ /pam_timestamp\(.*:session\): updated timestamp file `\/var\/run\/sudo.*'/) ) { # Ignore these entries } elsif ($ThisLine =~ /^spop3d/ || $ThisLine =~ /^pop\(\w+\)\[\d+\]:/) { @@ -319,6 +321,8 @@ $PwdChange{"$User"}++; } elsif ( ($User) = ($ThisLine =~ /^cvs: password mismatch for ([^']+): ([^']+) vs. ([^']+)/) ){ $cvs_passwd_mismatch{$User}++; + } elsif ( ($User,$From,$To) = ($ThisLine =~ /usermod\[[0-9]*\]: change user `([^ ]*)' shell from `([^ ]*)' to `([^ ]*)'/) ) { + $ChangedShell{"$User,$From,$To"}++; } else { # Unmatched entries... push @OtherList, "$ThisLine\n"; @@ -592,6 +596,15 @@ } } +if (keys %ChangedShell) { + print "\nChanged users default login shell: \n"; + foreach (keys %ChangedShell) { + ($User,$From,$To) = split ","; + print " User " . $User . " change shell from " . $From . " to " . $To . ": " . $ChangedShell{"$User,$From,$To"} . " Time(s)\n"; + } + +} + if (keys %cvs_passwd_mismatch) { print "\n cvs:"; print "\n Authentication Failures:\n"; logwatch-7.2.1-smart.patch: smartd | 29 ++++++++++++++++++++++++++++- 1 files changed, 28 insertions(+), 1 deletion(-) --- NEW FILE logwatch-7.2.1-smart.patch --- --- logwatch-7.2.1/scripts/services/smartd.pom 2005-12-02 17:41:12.000000000 +0100 +++ logwatch-7.2.1/scripts/services/smartd 2006-03-16 14:37:37.034448232 +0100 @@ -13,7 +13,10 @@ my %Offsectors = (); my %NumOffsectors = (); my %Warnings = (); +my %UnableToReg = (); my @OtherList = (); +my $ShutdownFailed = 0; +my $StartupFailed = 0; my $Detail = $ENV{'LOGWATCH_DETAIL_LEVEL'} || 0; my $IgnoreUnmatched = $ENV{'smartd_ignore_unmatched'} || 0; @@ -60,7 +63,10 @@ || ($ThisLine =~ /smartd received signal 15: Terminated/) || ($ThisLine =~ /smartd is exiting \(exit status 0\)/) || ($ThisLine =~ /smartd has fork/) - || ($ThisLine =~ /smartd startup succeeded/) ) { + || ($ThisLine =~ /smartd startup succeeded/) + || ($ThisLine =~ /Unable to register device (.*) \(no Directive -d removable\). Exiting/) + || ($ThisLine =~ /Device (.*), SATA disks accessed via libata are not currently supported by smartmontools./) ) + { # ignore # } elsif ( ($Device,$Msg) = ($ThisLine =~ /^Device: ([^,]+), (.*)$/)) { @@ -80,6 +86,12 @@ $NumOffsectors{$Device} = $Num; } elsif ( ( $ThisLine =~ /warning/i ) ) { $Warnings{$ThisLine}++; + } elsif ( ($ThisLine =~ /smartd startup failed/ ) ) { + $StartupFailed++; + } elsif ( ($ThisLine =~ /smartd shutdown failed/ ) ) { + $ShutdownFailed++; + } elsif ( my ($Device) = ($ThisLine =~ /Unable to register SCSI device (.*) at line 1 of file \/etc\/smartd.conf/) ) { + $UnableToReg{$Device}++ } else { # Report any unmatched entries... push @OtherList,"$ThisLine\n"; @@ -156,6 +168,21 @@ } } +if ($StartupFailed) { + print "\n Smartd startup failed: " . $StartupFailed . " Time(s)\n"; +} + +if ($ShutdownFailed) { + print "\n Smartd shutdown failed: " . $ShutdownFailed . " Time(s)\n"; +} + +if ( (keys %UnableToReg) ) { + print "\n Wrong configuration for devices:\n"; + foreach my $Device (sort keys %UnableToReg) { + print " " . $Device .": ". $UnableToReg{$Device} . " Time(s)\n"; + } +} + if (($#OtherList >= 0) and (not $IgnoreUnmatched)){ print "\n**Unmatched Entries**\n"; print @OtherList; logwatch-7.2.1-sshd.patch: sshd | 39 ++++++++++++++++++++++++++++++++++++++- 1 files changed, 38 insertions(+), 1 deletion(-) --- NEW FILE logwatch-7.2.1-sshd.patch --- --- logwatch-7.2.1/scripts/services/sshd.pom 2006-03-16 14:17:12.221648080 +0100 +++ logwatch-7.2.1/scripts/services/sshd 2006-03-16 14:20:13.607073304 +0100 @@ -140,6 +140,9 @@ my %NoShellUsers = (); my %DeprecatedOption = (); my %MisMatch = (); +my %KrbAutFail = (); +my %KrbAutErr = (); +my %KrbErr = (); my @BadRSA = (); my @Scanned = (); my %OtherList = (); @@ -195,7 +198,8 @@ # We won't count the following two because they're always followed by a # failed login entry... ($ThisLine =~ /^input_userauth_request: (illegal|invalid) user (.*)$/ ) or - ($ThisLine =~ m/^(Illegal|Invalid) user (.*) from ([^ ]+)/ ) + ($ThisLine =~ m/^(Illegal|Invalid) user (.*) from ([^ ]+)/ ) or + ($ThisLine =~ /pam_krb5: authentication succeeds for `([^ ]*)'/) ) { # Ignore these } elsif ( my ($Method,$User,$Host,$Port) = ($ThisLine =~ /^Accepted (\S+) for (\S+) from ([\d\.:a-f]+) port (\d+)/) ) { @@ -311,6 +315,16 @@ push @Scanned, $IP; } elsif ( my ($Line,$Option) = ($ThisLine =~ /^rexec line (\d+): Deprecated option (.*)$/)) { $DeprecatedOption{"$Option - line $Line"}++; + } elsif ( my ($Pom1,$Pom2,$User) = ($ThisLine =~ /pam_krb5(\[\d*\])?: authentication fails for (`|')([^ ]*)'/)) { + $KrbAutFail{$User}++; + } elsif ( my ($Error) = ($ThisLine =~ /pam_krb5: authenticate error: (.*)$/)) { + $KrbAutErr{$Error}++; + } elsif ( ($ThisLine =~ /pam_krb5: unable to determine uid\/gid for user$/)) { + $KrbAutErr{"unable to determine uid/gid for user"}++; + } elsif ( my ($Error) = ($ThisLine =~ /pam_krb5: error removing file (.*)$/)) { + $KrbErr{"error removing file " . $Error}++; + } elsif ( my ($Pom,$Error) = ($ThisLine =~ /pam_krb5(\[\d*\]): error resolving user name '[^ ]*' to uid\/gid pai/)) { + $KrbErr{"error resolving user name '$Error' to uid\/gid pai"}++; } else { # Report any unmatched entries... unless ($ThisLine =~ /fwd X11 connect/) { @@ -499,6 +513,29 @@ } } +if (keys %KrbAutFail) { + print "\n\Failed pam_krb5 authentication:\n"; + foreach my $User (sort keys %KrbAutFail) { + print " $User: " . $KrbAutFail{$User} . " Time(s)\n"; + } +} + +if (keys %KrbAutErr) { + print "\n\pam_krb5 authentication errors:\n"; + foreach my $Error (sort keys %KrbAutErr) { + print " $Error: " . $KrbAutErr{$Error} . " Time(s)\n"; + } +} + + +if (keys %KrbErr) { + print "\n pam_krb5 errors:\n"; + foreach my $Error (sort keys %KrbErr) { + print " $Error: " . $KrbErr{$Error} . " Time(s)\n"; + } +} + + if (keys %DisconnectReceived) { print "\n\nReceived disconnect:\n"; foreach my $Reason (sort {$a cmp $b} keys %DisconnectReceived) { Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/logwatch/FC-4/.cvsignore,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- .cvsignore 24 Oct 2005 09:58:29 -0000 1.11 +++ .cvsignore 22 Mar 2006 12:36:20 -0000 1.12 @@ -1 +1 @@ -logwatch-7.0.tar.gz +logwatch-7.2.1.tar.gz Index: logwatch.spec =================================================================== RCS file: /cvs/dist/rpms/logwatch/FC-4/logwatch.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- logwatch.spec 20 Jan 2006 09:56:30 -0000 1.21 +++ logwatch.spec 22 Mar 2006 12:36:20 -0000 1.22 @@ -1,20 +1,21 @@ Summary: A log file analysis program. Name: logwatch -Version: 7.0 -Release: 2.fc4 +Version: 7.2.1 +Release: 1.fc4 License: MIT Group: Applications/System URL: http://www.logwatch.org/ Source: ftp://ftp.kaybee.org/pub/linux/logwatch-%{version}.tar.gz -Patch1: logwatch-4.3.2-nounicode.patch -Patch2: logwatch-7.0-nosegfault.patch -Patch3: logwatch-6.1.2-audit2.patch -Patch4: logwatch-7.0-smartd.patch -Patch5: logwatch-7.0-zz-disk_space.patch -Patch6: logwatch-7.0-secure.patch -Patch7: logwatch-7.0-man_page.patch -Patch8: logwatch-7.0-named.patch -Patch9: logwatch-7.0-smartd2.patch +Patch2: logwatch-7.2.1-nosegfault.patch +Patch10: logwatch-7.2.1-pam_unix.patch +Patch11: logwatch-7.2.1-http.patch +Patch12: logwatch-7.2.1-sshd.patch +Patch13: logwatch-7.2.1-smart.patch +Patch14: logwatch-7.2.1-named.patch +Patch15: logwatch-7.2.1-audit.patch +Patch16: logwatch-7.2.1-secure.patch +Patch17: logwatch-7.2.1-mountd.patch + Requires: textutils sh-utils grep mailx BuildRoot: %{_tmppath}/logwatch-build BuildArchitectures: noarch @@ -29,15 +30,15 @@ %prep %setup -q -%patch1 -p1 %patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 -%patch6 -p1 -%patch7 -p1 -%patch8 -p1 -%patch9 -p1 +%patch10 -p1 +%patch11 -p1 +%patch12 -p1 +%patch13 -p1 +%patch14 -p1 +%patch15 -p1 +%patch16 -p1 +%patch17 -p1 %install @@ -98,7 +99,7 @@ %files %defattr(-,root,root) -%doc README HOWTO-Make-Filter HOWTO-Customize-Configuration +%doc README HOWTO-Customize-LogWatch %dir %{_var}/cache/logwatch %dir %{_sysconfdir}/logwatch %dir %{_sysconfdir}/logwatch/conf @@ -136,6 +137,11 @@ %doc License project/CHANGES project/TODO %changelog +* Wed Mar 22 2006 Ivana Varekova 7.2.1-1.fc4 +- update to 7.2.1 (#185758) +- add/update pam_unix, http, sshd, smart, named, audit, secure + and mountd patches + * Fri Jan 20 2006 Ivana Varekova 7.0-2.fc4 - fix bug 172073 (man page problem) - fix bug 171631 (named service problem) Index: sources =================================================================== RCS file: /cvs/dist/rpms/logwatch/FC-4/sources,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- sources 24 Oct 2005 09:58:29 -0000 1.11 +++ sources 22 Mar 2006 12:36:20 -0000 1.12 @@ -1 +1 @@ -58fc1ea61df69e0e0839e70a289f5b3e logwatch-7.0.tar.gz +a3b6f24d8976bbcf9e6e956891560635 logwatch-7.2.1.tar.gz --- logwatch-4.3.2-nounicode.patch DELETED --- --- logwatch-6.1.2-audit2.patch DELETED --- --- logwatch-7.0-man_page.patch DELETED --- --- logwatch-7.0-named.patch DELETED --- --- logwatch-7.0-nosegfault.patch DELETED --- --- logwatch-7.0-secure.patch DELETED --- --- logwatch-7.0-smartd.patch DELETED --- --- logwatch-7.0-smartd2.patch DELETED --- --- logwatch-7.0-zz-disk_space.patch DELETED --- From fedora-cvs-commits at redhat.com Wed Mar 22 13:19:15 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 22 Mar 2006 08:19:15 -0500 Subject: rpms/tar/devel tar-1.15.1-hugeSparse.patch, NONE, 1.1 tar.spec, 1.32, 1.33 Message-ID: <200603221319.k2MDJFbW023682@cvs.devel.redhat.com> Author: pvrabec Update of /cvs/dist/rpms/tar/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv23667 Modified Files: tar.spec Added Files: tar-1.15.1-hugeSparse.patch Log Message: fix problems with extracting large sparse archive members (#185460) tar-1.15.1-hugeSparse.patch: sparse.c | 144 +++++++++++++++++++++++++-------------------------------------- 1 files changed, 59 insertions(+), 85 deletions(-) --- NEW FILE tar-1.15.1-hugeSparse.patch --- --- tar-1.15.1/src/sparse.c.hugeSparse 2006-03-22 13:18:53.000000000 -0500 +++ tar-1.15.1/src/sparse.c 2006-03-22 13:24:54.000000000 -0500 @@ -47,9 +47,9 @@ { int fd; /* File descriptor */ bool seekable; /* Is fd seekable? */ - size_t offset; /* Current offset in fd if seekable==false. + off_t offset; /* Current offset in fd if seekable==false. Otherwise unused */ - size_t dumped_size; /* Number of bytes actually written + off_t dumped_size; /* Number of bytes actually written to the archive */ struct tar_stat_info *stat_info; /* Information about the file */ struct tar_sparse_optab *optab; @@ -59,35 +59,34 @@ /* Dump zeros to file->fd until offset is reached. It is used instead of lseek if the output file is not seekable */ -static long +static bool dump_zeros (struct tar_sparse_file *file, off_t offset) { - char buf[BLOCKSIZE]; - - if (offset - file->offset < 0) + static char const zero_buf[BLOCKSIZE]; + + if (offset < file->offset) { errno = EINVAL; - return -1; + return false; } - memset (buf, 0, sizeof buf); while (file->offset < offset) { - size_t size = offset - file->offset; - size_t wrbytes; - - if (size > sizeof buf) - size = sizeof buf; - wrbytes = write (file->fd, buf, size); + size_t size = (BLOCKSIZE < offset - file->offset + ? BLOCKSIZE + : offset - file->offset); + ssize_t wrbytes; + + wrbytes = write (file->fd, zero_buf, size); if (wrbytes <= 0) { if (wrbytes == 0) errno = EINVAL; - return -1; + return false; } file->offset += wrbytes; } - return file->offset; + return true; } static bool @@ -168,14 +167,9 @@ static bool lseek_or_error (struct tar_sparse_file *file, off_t offset) { - off_t off; - - if (file->seekable) - off = lseek (file->fd, offset, SEEK_SET); - else - off = dump_zeros (file, offset); - - if (off < 0) + if (file->seekable + ? lseek (file->fd, offset, SEEK_SET) < 0 + : ! dump_zeros (file, offset)) { seek_diag_details (file->stat_info->orig_file_name, offset); return false; @@ -187,7 +181,7 @@ it's made *entirely* of zeros, returning a 0 the instant it finds something that is a nonzero, i.e., useful data. */ static bool -zero_block_p (char *buffer, size_t size) +zero_block_p (char const *buffer, size_t size) { while (size--) if (*buffer++) @@ -195,50 +189,36 @@ return true; } -#define clear_block(p) memset (p, 0, BLOCKSIZE); - -#define SPARSES_INIT_COUNT SPARSES_IN_SPARSE_HEADER - static void -sparse_add_map (struct tar_sparse_file *file, struct sp_array *sp) +sparse_add_map (struct tar_stat_info *st, struct sp_array const *sp) { - if (file->stat_info->sparse_map == NULL) - { - file->stat_info->sparse_map = - xmalloc (SPARSES_INIT_COUNT * sizeof file->stat_info->sparse_map[0]); - file->stat_info->sparse_map_size = SPARSES_INIT_COUNT; - } - else if (file->stat_info->sparse_map_avail == file->stat_info->sparse_map_size) - { - file->stat_info->sparse_map_size *= 2; - file->stat_info->sparse_map = - xrealloc (file->stat_info->sparse_map, - file->stat_info->sparse_map_size - * sizeof file->stat_info->sparse_map[0]); - } - file->stat_info->sparse_map[file->stat_info->sparse_map_avail++] = *sp; + struct sp_array *sparse_map = st->sparse_map; + size_t avail = st->sparse_map_avail; + if (avail == st->sparse_map_size) + st->sparse_map = sparse_map = + x2nrealloc (sparse_map, &st->sparse_map_size, sizeof *sparse_map); + sparse_map[avail] = *sp; + st->sparse_map_avail = avail + 1; } /* Scan the sparse file and create its map */ static bool sparse_scan_file (struct tar_sparse_file *file) { - static char buffer[BLOCKSIZE]; + struct tar_stat_info *st = file->stat_info; + int fd = file->fd; + char buffer[BLOCKSIZE]; size_t count; off_t offset = 0; struct sp_array sp = {0, 0}; if (!lseek_or_error (file, 0)) return false; - clear_block (buffer); - - file->stat_info->sparse_map_avail = 0; - file->stat_info->archive_file_size = 0; if (!tar_sparse_scan (file, scan_begin, NULL)) return false; - while ((count = safe_read (file->fd, buffer, sizeof buffer)) != 0 + while ((count = safe_read (fd, buffer, sizeof buffer)) != 0 && count != SAFE_READ_ERROR) { /* Analize the block */ @@ -246,7 +226,7 @@ { if (sp.numbytes) { - sparse_add_map (file, &sp); + sparse_add_map (st, &sp); sp.numbytes = 0; if (!tar_sparse_scan (file, scan_block, NULL)) return false; @@ -257,26 +237,25 @@ if (sp.numbytes == 0) sp.offset = offset; sp.numbytes += count; - file->stat_info->archive_file_size += count; + st->archive_file_size += count; if (!tar_sparse_scan (file, scan_block, buffer)) return false; } offset += count; - clear_block (buffer); } if (sp.numbytes == 0) sp.offset = offset; - sparse_add_map (file, &sp); - file->stat_info->archive_file_size += count; + sparse_add_map (st, &sp); + st->archive_file_size += count; return tar_sparse_scan (file, scan_end, NULL); } -static struct tar_sparse_optab oldgnu_optab; -static struct tar_sparse_optab star_optab; -static struct tar_sparse_optab pax_optab; +static struct tar_sparse_optab const oldgnu_optab; +static struct tar_sparse_optab const star_optab; +static struct tar_sparse_optab const pax_optab; static bool sparse_select_optab (struct tar_sparse_file *file) @@ -321,18 +300,18 @@ size_t bytes_read; blk = find_next_block (); - memset (blk->buffer, 0, BLOCKSIZE); bytes_read = safe_read (file->fd, blk->buffer, bufsize); if (bytes_read == SAFE_READ_ERROR) { read_diag_details (file->stat_info->orig_file_name, - file->stat_info->sparse_map[i].offset - + file->stat_info->sparse_map[i].numbytes - - bytes_left, - bufsize); + (file->stat_info->sparse_map[i].offset + + file->stat_info->sparse_map[i].numbytes + - bytes_left), + bufsize); return false; } + memset (blk->buffer + bytes_read, 0, BLOCKSIZE - bytes_read); bytes_left -= bytes_read; file->dumped_size += bytes_read; set_next_block_after (blk); @@ -389,12 +368,11 @@ sparse_dump_file (int fd, struct tar_stat_info *st) { bool rc; - struct tar_sparse_file file; + struct tar_sparse_file file = { 0, }; file.stat_info = st; file.fd = fd; file.seekable = true; /* File *must* be seekable for dump to work */ - file.offset = 0; if (!sparse_select_optab (&file) || !tar_sparse_init (&file)) @@ -456,15 +434,14 @@ struct tar_sparse_file file; size_t i; + if (!tar_sparse_init (&file)) + return dump_status_not_implemented; + file.stat_info = st; file.fd = fd; file.seekable = lseek (fd, 0, SEEK_SET) == 0; file.offset = 0; - if (!sparse_select_optab (&file) - || !tar_sparse_init (&file)) - return dump_status_not_implemented; - rc = tar_sparse_decode_header (&file); for (i = 0; rc && i < file.stat_info->sparse_map_avail; i++) rc = tar_sparse_extract_region (&file, i); @@ -491,8 +468,6 @@ } -static char diff_buffer[BLOCKSIZE]; - static bool check_sparse_region (struct tar_sparse_file *file, off_t beg, off_t end) { @@ -502,11 +477,9 @@ while (beg < end) { size_t bytes_read; - size_t rdsize = end - beg; + size_t rdsize = BLOCKSIZE < end - beg ? BLOCKSIZE : end - beg; + char diff_buffer[BLOCKSIZE]; - if (rdsize > BLOCKSIZE) - rdsize = BLOCKSIZE; - clear_block (diff_buffer); bytes_read = safe_read (file->fd, diff_buffer, rdsize); if (bytes_read == SAFE_READ_ERROR) { @@ -539,6 +512,7 @@ { size_t bytes_read; size_t rdsize = (size_left > BLOCKSIZE) ? BLOCKSIZE : size_left; + char diff_buffer[BLOCKSIZE]; union block *blk = find_next_block (); if (!blk) @@ -551,9 +525,9 @@ if (bytes_read == SAFE_READ_ERROR) { read_diag_details (file->stat_info->orig_file_name, - file->stat_info->sparse_map[i].offset - + file->stat_info->sparse_map[i].numbytes - - size_left, + (file->stat_info->sparse_map[i].offset + + file->stat_info->sparse_map[i].numbytes + - size_left), rdsize); return false; } @@ -647,7 +621,7 @@ || file->stat_info->archive_file_size < 0) return add_fail; - sparse_add_map (file, &sp); + sparse_add_map (file->stat_info, &sp); return add_ok; } @@ -669,7 +643,7 @@ size_t i; union block *h = current_header; int ext_p; - static enum oldgnu_add_status rc; + enum oldgnu_add_status rc; file->stat_info->sparse_map_avail = 0; for (i = 0; i < SPARSES_IN_OLDGNU_HEADER; i++) @@ -756,7 +730,7 @@ return true; } -static struct tar_sparse_optab oldgnu_optab = { +static struct tar_sparse_optab const oldgnu_optab = { NULL, /* No init function */ NULL, /* No done function */ oldgnu_sparse_member_p, @@ -795,7 +769,7 @@ size_t i; union block *h = current_header; int ext_p; - static enum oldgnu_add_status rc; + enum oldgnu_add_status rc; file->stat_info->sparse_map_avail = 0; @@ -837,7 +811,7 @@ } -static struct tar_sparse_optab star_optab = { +static struct tar_sparse_optab const star_optab = { NULL, /* No init function */ NULL, /* No done function */ star_sparse_member_p, @@ -890,7 +864,7 @@ return true; } -static struct tar_sparse_optab pax_optab = { +static struct tar_sparse_optab const pax_optab = { NULL, /* No init function */ NULL, /* No done function */ pax_sparse_member_p, Index: tar.spec =================================================================== RCS file: /cvs/dist/rpms/tar/devel/tar.spec,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- tar.spec 17 Feb 2006 10:52:23 -0000 1.32 +++ tar.spec 22 Mar 2006 13:19:13 -0000 1.33 @@ -1,7 +1,7 @@ Summary: A GNU file archiving program. Name: tar Version: 1.15.1 -Release: 13 +Release: 14 License: GPL Group: Applications/Archiving URL: http://www.gnu.org/software/tar/ @@ -18,6 +18,7 @@ Patch14: tar-1.15.1-padCorrectly.patch Patch15: tar-1.15.1-vfatTruncate.patch Patch16: tar-1.15.1-heapOverflow.patch +Patch17: tar-1.15.1-hugeSparse.patch Prereq: info BuildRequires: autoconf automake gzip @@ -47,6 +48,7 @@ %patch14 -p1 -b .padCorrectly %patch15 -p1 -b .vfatTruncate %patch16 -p0 -b .heapOverflow +%patch17 -p1 -b .hugeSparse %build @@ -117,6 +119,9 @@ %{_infodir}/tar.info* %changelog +* Wed Mar 22 2006 Peter Vrabec 1.15.1-14 +- fix problems with extracting large sparse archive members (#185460) + * Fri Feb 17 2006 Peter Vrabec 1.15.1-13 - fix heap overlfow bug CVE-2006-0300 (#181773) From fedora-cvs-commits at redhat.com Wed Mar 22 13:38:24 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 22 Mar 2006 08:38:24 -0500 Subject: rpms/liboil/FC-5 .cvsignore, 1.2, 1.3 liboil.spec, 1.5, 1.6 sources, 1.2, 1.3 Message-ID: <200603221338.k2MDcOGp023939@cvs.devel.redhat.com> Author: wtogami Update of /cvs/dist/rpms/liboil/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv23921 Modified Files: .cvsignore liboil.spec sources Log Message: - merge Extras with Core spec - remove .a files too - Update to today's CVS code which should fix the PPC build issue. - Include new oil-bugreport tool in the devel package. Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/liboil/FC-5/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 19 Dec 2005 19:28:00 -0000 1.2 +++ .cvsignore 22 Mar 2006 13:38:22 -0000 1.3 @@ -1 +1 @@ -liboil-0.3.6.tar.gz +liboil-0.3.7.1.tar.gz Index: liboil.spec =================================================================== RCS file: /cvs/dist/rpms/liboil/FC-5/liboil.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- liboil.spec 11 Feb 2006 04:10:55 -0000 1.5 +++ liboil.spec 22 Mar 2006 13:38:22 -0000 1.6 @@ -1,13 +1,12 @@ Summary: Library of Optimized Inner Loops, CPU optimized functions Name: liboil -Version: 0.3.6 -Release: 3.fc5.2 +Version: 0.3.7.1 +Release: 2.fc5 License: LGPL Group: System Environment/Libraries URL: http://liboil.freedesktop.org/ Source: http://liboil.freedesktop.org/download/liboil-%{version}.tar.gz Patch0: liboil-0.3.3-gccoptfixes.patch -Patch1: liboil-0.3.6-s390.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: glib2-devel, gcc-c++ @@ -37,11 +36,10 @@ %prep %setup -q %patch0 -p1 -b .gccoptfixes -%patch1 -p0 -b .s390 %build -%configure --disable-static +%configure # multi-jobbed make makes the build fail: # ./build_prototypes_doc >liboilfuncs-doc.h # /bin/sh: ./build_prototypes_doc: No such file or directory @@ -52,6 +50,7 @@ %{__rm} -rf %{buildroot} %makeinstall rm -f $RPM_BUILD_ROOT%{_libdir}/*.la +rm -f $RPM_BUILD_ROOT%{_libdir}/*.a %clean @@ -70,6 +69,7 @@ %files devel %defattr(-, root, root, 0755) +%{_bindir}/oil-bugreport %{_includedir}/* %{_libdir}/*.so %{_libdir}/pkgconfig/*.pc @@ -77,17 +77,22 @@ %changelog -* Fri Feb 10 2006 Jesse Keating - 0.3.6-3.fc5.2 -- bump again for double-long bug on ppc(64) +* Wed Mar 22 2006 Warren Togami 0.3.7.1-2 +- merge Extras with Core spec +- remove .a files too + +* Tue Mar 21 2006 Matthias Saou 0.3.7.1-1 +- Update to today's CVS code which should fix the PPC build issue. +- Include new oil-bugreport tool in the devel package. -* Tue Feb 07 2006 Jesse Keating - 0.3.6-3.fc5.1 -- rebuilt for new gcc4.1 snapshot and glibc changes +* Mon Mar 6 2006 Matthias Saou 0.3.7-3 +- FC5 rebuild (well, try at least since PPC fixes are required). -* Thu Dec 22 2005 Warren Togami 0.3.6-3 -- s390 build patch +* Thu Feb 9 2006 Matthias Saou 0.3.7-2 +- Rebuild for new gcc/glibc. -* Mon Dec 19 2005 Warren Togami 0.3.6-2 -- cleanup spec, remove static, and import into FC5 for gstreamer-0.10 +* Fri Feb 3 2006 Matthias Saou 0.3.7-1 +- Update to 0.3.7. * Wed Dec 14 2005 Matthias Saou 0.3.6-1 - Update to 0.3.6. Index: sources =================================================================== RCS file: /cvs/dist/rpms/liboil/FC-5/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 19 Dec 2005 19:28:00 -0000 1.2 +++ sources 22 Mar 2006 13:38:22 -0000 1.3 @@ -1 +1 @@ -a36b2d9cc71d75d814d7bdca2263290f liboil-0.3.6.tar.gz +e6c5aee5a2f69e6ddce48a5ac74ee5bb liboil-0.3.7.1.tar.gz From fedora-cvs-commits at redhat.com Wed Mar 22 14:21:11 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 22 Mar 2006 09:21:11 -0500 Subject: rpms/kernel/FC-5 linux-2.6-bcm43xx-assoc-on-startup.patch, NONE, 1.1 linux-2.6-softmac-default-rate.patch, NONE, 1.1 linux-2.6-softmac-scan-channel.patch, NONE, 1.1 linux-2.6-softmac-scan-dwell-time.patch, NONE, 1.1 kernel-2.6.spec, 1.2069, 1.2070 Message-ID: <200603221421.k2MELB9D019190@cvs.devel.redhat.com> Author: dwmw2 Update of /cvs/dist/rpms/kernel/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv19170 Modified Files: kernel-2.6.spec Added Files: linux-2.6-bcm43xx-assoc-on-startup.patch linux-2.6-softmac-default-rate.patch linux-2.6-softmac-scan-channel.patch linux-2.6-softmac-scan-dwell-time.patch Log Message: Fix bcm43xx driver up so that it's suitable for newbies linux-2.6-bcm43xx-assoc-on-startup.patch: bcm43xx_main.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) --- NEW FILE linux-2.6-bcm43xx-assoc-on-startup.patch --- --- linux-2.6.16.ppc/drivers/net/wireless/bcm43xx/bcm43xx_main.c~ 2006-03-21 23:50:00.000000000 +0000 +++ linux-2.6.16.ppc/drivers/net/wireless/bcm43xx/bcm43xx_main.c 2006-03-22 10:32:11.000000000 +0000 @@ -3429,6 +3429,9 @@ static int bcm43xx_init_board(struct bcm } bcm43xx_periodic_tasks_setup(bcm); + /*FIXME: This should be handled by softmac instead. */ + schedule_work(&bcm->softmac->associnfo.work); + assert(err == 0); out: return err; @@ -4326,9 +4329,6 @@ static int bcm43xx_resume(struct pci_dev netif_device_attach(net_dev); - /*FIXME: This should be handled by softmac instead. */ - schedule_work(&bcm->softmac->associnfo.work); - dprintk(KERN_INFO PFX "Device resumed.\n"); return 0; linux-2.6-softmac-default-rate.patch: ieee80211softmac_module.c | 5 ++++- ieee80211softmac_wx.c | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) --- NEW FILE linux-2.6-softmac-default-rate.patch --- --- linux-2.6.16.ppc/net/ieee80211/softmac/ieee80211softmac_module.c~ 2006-03-21 23:50:00.000000000 +0000 +++ linux-2.6.16.ppc/net/ieee80211/softmac/ieee80211softmac_module.c 2006-03-22 11:00:57.000000000 +0000 @@ -183,7 +183,10 @@ void ieee80211softmac_start(struct net_d */ if (mac->txrates_change) oldrates = mac->txrates; - if (ieee->modulation & IEEE80211_OFDM_MODULATION) { + /* FIXME: We don't correctly handle backing down to lower rates, + so start off at 11M for now. People can manually change it if + they really need to, but 11M is more reliable. */ + if (0 && ieee->modulation & IEEE80211_OFDM_MODULATION) { mac->txrates.default_rate = IEEE80211_OFDM_RATE_54MB; change |= IEEE80211SOFTMAC_TXRATECHG_DEFAULT; mac->txrates.default_fallback = IEEE80211_OFDM_RATE_24MB; --- linux-2.6.16.ppc/net/ieee80211/softmac/ieee80211softmac_wx.c~ 2006-03-21 23:50:00.000000000 +0000 +++ linux-2.6.16.ppc/net/ieee80211/softmac/ieee80211softmac_wx.c 2006-03-22 12:11:58.000000000 +0000 @@ -136,7 +136,7 @@ ieee80211softmac_wx_set_rate(struct net_ if (in_rate == -1) { /* automatic detect */ - if (ieee->modulation & IEEE80211_OFDM_MODULATION) + if (0 && ieee->modulation & IEEE80211_OFDM_MODULATION) in_rate = 54000000; else in_rate = 11000000; linux-2.6-softmac-scan-channel.patch: ieee80211softmac_scan.c | 7 +++++++ 1 files changed, 7 insertions(+) --- NEW FILE linux-2.6-softmac-scan-channel.patch --- --- linux-2.6.16.ppc/net/ieee80211/softmac/ieee80211softmac_scan.c~ 2006-03-21 23:50:00.000000000 +0000 +++ linux-2.6.16.ppc/net/ieee80211/softmac/ieee80211softmac_scan.c 2006-03-22 00:31:31.000000000 +0000 @@ -232,6 +232,13 @@ void ieee80211softmac_scan_finished(stru sm->scanning = 0; spin_unlock_irqrestore(&sm->lock, flags); + if (sm->associnfo.bssvalid) { + struct ieee80211softmac_network *net; + + net = ieee80211softmac_get_network_by_bssid(sm, sm->associnfo.bssid); + if (net) + sm->set_channel(sm->dev, net->channel); + } ieee80211softmac_call_events(sm, IEEE80211SOFTMAC_EVENT_SCAN_FINISHED, NULL); } EXPORT_SYMBOL_GPL(ieee80211softmac_scan_finished); linux-2.6-softmac-scan-dwell-time.patch: ieee80211softmac_priv.h | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE linux-2.6-softmac-scan-dwell-time.patch --- --- linux-2.6.16.ppc/net/ieee80211/softmac/ieee80211softmac_priv.h~ 2006-03-21 23:50:00.000000000 +0000 +++ linux-2.6.16.ppc/net/ieee80211/softmac/ieee80211softmac_priv.h 2006-03-22 11:20:26.000000000 +0000 @@ -176,7 +176,7 @@ static inline int ieee80211softmac_scan_ ) || ieee80211softmac_scan_handlers_check_self(sm); } -#define IEEE80211SOFTMAC_PROBE_DELAY HZ/2 +#define IEEE80211SOFTMAC_PROBE_DELAY HZ/50 #define IEEE80211SOFTMAC_WORKQUEUE_NAME_LEN (17 + IFNAMSIZ) struct ieee80211softmac_network { Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-5/kernel-2.6.spec,v retrieving revision 1.2069 retrieving revision 1.2070 diff -u -r1.2069 -r1.2070 --- kernel-2.6.spec 21 Mar 2006 21:49:03 -0000 1.2069 +++ kernel-2.6.spec 22 Mar 2006 14:21:08 -0000 1.2070 @@ -408,6 +408,10 @@ Patch5000: linux-2.6-softmac-git.patch Patch5001: linux-2.6-bcm43xx-git.patch Patch5002: linux-2.6-bcm43xx-neuter.patch +Patch5003: linux-2.6-softmac-scan-channel.patch +Patch5004: linux-2.6-softmac-scan-dwell-time.patch +Patch5005: linux-2.6-bcm43xx-assoc-on-startup.patch +Patch5006: linux-2.6-softmac-default-rate.patch # # 10000 to 20000 is for stuff that has to come last due to the @@ -1052,6 +1056,14 @@ %patch5001 -p1 # temporarily remove bcm43xx's MODULE_DEVICE_TABLE entry %patch5002 -p1 +# Go back to the original channel when we finish scanning. +%patch5003 -p1 +# When scanning, spend only 20ms on each channel not 500ms. +%patch5004 -p1 +# Attempt to associate when the link is brought up +%patch5005 -p1 +# Default to 11Mbps not 54Mbps, since we don't back down automatically yet. +%patch5006 -p1 # # final stuff @@ -1654,6 +1666,10 @@ %endif %changelog +* Wed Mar 22 2006 David Woodhouse +- Update the bcm43xx driver to make it work nicely with initscripts + and NetworkManager without user intervention. + * Tue Mar 21 2006 Dave Jones - Improve spinlock scalability on big machines. - Update exec-shield to Ingo's latest. From fedora-cvs-commits at redhat.com Wed Mar 22 14:25:33 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 22 Mar 2006 09:25:33 -0500 Subject: rpms/aspell/devel aspell.spec,1.30,1.31 Message-ID: <200603221425.k2MEPXHV019249@cvs.devel.redhat.com> Author: varekova Update of /cvs/dist/rpms/aspell/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv19236 Modified Files: aspell.spec Log Message: - remove .la files (bug 184184) Index: aspell.spec =================================================================== RCS file: /cvs/dist/rpms/aspell/devel/aspell.spec,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- aspell.spec 2 Mar 2006 13:58:36 -0000 1.30 +++ aspell.spec 22 Mar 2006 14:25:31 -0000 1.31 @@ -1,7 +1,7 @@ Summary: A spelling checker. Name: aspell Version: 0.60.3 -Release: 5 +Release: 6 Epoch: 12 License: LGPL Group: Applications/Text @@ -65,6 +65,7 @@ rm -f ${RPM_BUILD_ROOT}%{_libdir}/libaspell.la rm -f ${RPM_BUILD_ROOT}%{_libdir}/libpspell.la +rm -f ${RPM_BUILD_ROOT}%{_libdir}/aspell-0.60/*-filter.la #rm -f $RPM_BUILD_ROOT/usr/share/doc/aspell/manual.aux #mv $RPM_BUILD_ROOT/usr/share/doc/aspell $RPM_BUILD_ROOT/usr/share/doc/aspell-%{version} @@ -123,6 +124,9 @@ %{_mandir}/man1/pspell-config.1* %changelog +* Wed Mar 22 2006 Ivana Varekova - 12:0.60.3-6 +- remove .la files (bug 184184) + * Thu Mar 2 2006 Ivana Varekova - 12:0.60.3-5 - update aspell man page (bug 183205) From fedora-cvs-commits at redhat.com Wed Mar 22 14:33:03 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 22 Mar 2006 09:33:03 -0500 Subject: rpms/kernel/devel linux-2.6-bcm43xx-assoc-on-startup.patch, NONE, 1.1 linux-2.6-softmac-default-rate.patch, NONE, 1.1 linux-2.6-softmac-scan-channel.patch, NONE, 1.1 linux-2.6-softmac-scan-dwell-time.patch, NONE, 1.1 kernel-2.6.spec, 1.2080, 1.2081 linux-2.6-softmac-git.patch, 1.8, 1.9 Message-ID: <200603221433.k2MEX3aG019426@cvs.devel.redhat.com> Author: dwmw2 Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv19404 Modified Files: kernel-2.6.spec linux-2.6-softmac-git.patch Added Files: linux-2.6-bcm43xx-assoc-on-startup.patch linux-2.6-softmac-default-rate.patch linux-2.6-softmac-scan-channel.patch linux-2.6-softmac-scan-dwell-time.patch Log Message: Re-enable and fix up bcm43xx driver linux-2.6-bcm43xx-assoc-on-startup.patch: bcm43xx_main.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) --- NEW FILE linux-2.6-bcm43xx-assoc-on-startup.patch --- --- linux-2.6.16.ppc/drivers/net/wireless/bcm43xx/bcm43xx_main.c~ 2006-03-21 23:50:00.000000000 +0000 +++ linux-2.6.16.ppc/drivers/net/wireless/bcm43xx/bcm43xx_main.c 2006-03-22 10:32:11.000000000 +0000 @@ -3429,6 +3429,9 @@ static int bcm43xx_init_board(struct bcm } bcm43xx_periodic_tasks_setup(bcm); + /*FIXME: This should be handled by softmac instead. */ + schedule_work(&bcm->softmac->associnfo.work); + assert(err == 0); out: return err; @@ -4326,9 +4329,6 @@ static int bcm43xx_resume(struct pci_dev netif_device_attach(net_dev); - /*FIXME: This should be handled by softmac instead. */ - schedule_work(&bcm->softmac->associnfo.work); - dprintk(KERN_INFO PFX "Device resumed.\n"); return 0; linux-2.6-softmac-default-rate.patch: ieee80211softmac_module.c | 5 ++++- ieee80211softmac_wx.c | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) --- NEW FILE linux-2.6-softmac-default-rate.patch --- --- linux-2.6.16.ppc/net/ieee80211/softmac/ieee80211softmac_module.c~ 2006-03-21 23:50:00.000000000 +0000 +++ linux-2.6.16.ppc/net/ieee80211/softmac/ieee80211softmac_module.c 2006-03-22 11:00:57.000000000 +0000 @@ -183,7 +183,10 @@ void ieee80211softmac_start(struct net_d */ if (mac->txrates_change) oldrates = mac->txrates; - if (ieee->modulation & IEEE80211_OFDM_MODULATION) { + /* FIXME: We don't correctly handle backing down to lower rates, + so start off at 11M for now. People can manually change it if + they really need to, but 11M is more reliable. */ + if (0 && ieee->modulation & IEEE80211_OFDM_MODULATION) { mac->txrates.default_rate = IEEE80211_OFDM_RATE_54MB; change |= IEEE80211SOFTMAC_TXRATECHG_DEFAULT; mac->txrates.default_fallback = IEEE80211_OFDM_RATE_24MB; --- linux-2.6.16.ppc/net/ieee80211/softmac/ieee80211softmac_wx.c~ 2006-03-21 23:50:00.000000000 +0000 +++ linux-2.6.16.ppc/net/ieee80211/softmac/ieee80211softmac_wx.c 2006-03-22 12:11:58.000000000 +0000 @@ -136,7 +136,7 @@ ieee80211softmac_wx_set_rate(struct net_ if (in_rate == -1) { /* automatic detect */ - if (ieee->modulation & IEEE80211_OFDM_MODULATION) + if (0 && ieee->modulation & IEEE80211_OFDM_MODULATION) in_rate = 54000000; else in_rate = 11000000; linux-2.6-softmac-scan-channel.patch: ieee80211softmac_scan.c | 7 +++++++ 1 files changed, 7 insertions(+) --- NEW FILE linux-2.6-softmac-scan-channel.patch --- --- linux-2.6.16.ppc/net/ieee80211/softmac/ieee80211softmac_scan.c~ 2006-03-21 23:50:00.000000000 +0000 +++ linux-2.6.16.ppc/net/ieee80211/softmac/ieee80211softmac_scan.c 2006-03-22 00:31:31.000000000 +0000 @@ -232,6 +232,13 @@ void ieee80211softmac_scan_finished(stru sm->scanning = 0; spin_unlock_irqrestore(&sm->lock, flags); + if (sm->associnfo.bssvalid) { + struct ieee80211softmac_network *net; + + net = ieee80211softmac_get_network_by_bssid(sm, sm->associnfo.bssid); + if (net) + sm->set_channel(sm->dev, net->channel); + } ieee80211softmac_call_events(sm, IEEE80211SOFTMAC_EVENT_SCAN_FINISHED, NULL); } EXPORT_SYMBOL_GPL(ieee80211softmac_scan_finished); linux-2.6-softmac-scan-dwell-time.patch: ieee80211softmac_priv.h | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE linux-2.6-softmac-scan-dwell-time.patch --- --- linux-2.6.16.ppc/net/ieee80211/softmac/ieee80211softmac_priv.h~ 2006-03-21 23:50:00.000000000 +0000 +++ linux-2.6.16.ppc/net/ieee80211/softmac/ieee80211softmac_priv.h 2006-03-22 11:20:26.000000000 +0000 @@ -176,7 +176,7 @@ static inline int ieee80211softmac_scan_ ) || ieee80211softmac_scan_handlers_check_self(sm); } -#define IEEE80211SOFTMAC_PROBE_DELAY HZ/2 +#define IEEE80211SOFTMAC_PROBE_DELAY HZ/50 #define IEEE80211SOFTMAC_WORKQUEUE_NAME_LEN (17 + IFNAMSIZ) struct ieee80211softmac_network { Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.2080 retrieving revision 1.2081 diff -u -r1.2080 -r1.2081 --- kernel-2.6.spec 21 Mar 2006 21:12:02 -0000 1.2080 +++ kernel-2.6.spec 22 Mar 2006 14:32:58 -0000 1.2081 @@ -403,6 +403,10 @@ Patch5000: linux-2.6-softmac-git.patch Patch5001: linux-2.6-bcm43xx-git.patch Patch5002: linux-2.6-bcm43xx-neuter.patch +Patch5003: linux-2.6-softmac-scan-channel.patch +Patch5004: linux-2.6-softmac-scan-dwell-time.patch +Patch5005: linux-2.6-bcm43xx-assoc-on-startup.patch +Patch5006: linux-2.6-softmac-default-rate.patch # # 10000 to 20000 is for stuff that has to come last due to the @@ -1032,12 +1036,19 @@ # # Import softmac code from wireless-2.6 tree -#%patch5000 -p1 +%patch5000 -p1 # ... and bcm43xx driver too -#%patch5001 -p1 +%patch5001 -p1 # temporarily remove bcm43xx's MODULE_DEVICE_TABLE entry #%patch5002 -p1 - +# Go back to the original channel when we finish scanning. +%patch5003 -p1 +# When scanning, spend only 20ms on each channel not 500ms. +%patch5004 -p1 +# Attempt to associate when the link is brought up +%patch5005 -p1 +# Default to 11Mbps not 54Mbps, since we don't back down automatically yet. +%patch5006 -p1 # # final stuff # @@ -1639,6 +1650,10 @@ %endif %changelog +* Wed Mar 22 2006 David Woodhouse +- Update the bcm43xx driver to make it work nicely with initscripts + and NetworkManager without user intervention. + * Tue Mar 21 2006 Dave Jones - 2.6.16-git3 - Improve spinlock scalability on big machines. linux-2.6-softmac-git.patch: include/net/ieee80211softmac.h | 292 ++++++++++++++ include/net/ieee80211softmac_wx.h | 94 ++++ net/ieee80211/Kconfig | 1 net/ieee80211/Makefile | 1 net/ieee80211/softmac/Kconfig | 10 net/ieee80211/softmac/Makefile | 9 net/ieee80211/softmac/ieee80211softmac_assoc.c | 403 ++++++++++++++++++++ net/ieee80211/softmac/ieee80211softmac_auth.c | 376 +++++++++++++++++++ net/ieee80211/softmac/ieee80211softmac_event.c | 159 ++++++++ net/ieee80211/softmac/ieee80211softmac_io.c | 474 ++++++++++++++++++++++++ net/ieee80211/softmac/ieee80211softmac_module.c | 457 +++++++++++++++++++++++ net/ieee80211/softmac/ieee80211softmac_priv.h | 239 ++++++++++++ net/ieee80211/softmac/ieee80211softmac_scan.c | 237 ++++++++++++ net/ieee80211/softmac/ieee80211softmac_wx.c | 412 ++++++++++++++++++++ 14 files changed, 3164 insertions(+) Index: linux-2.6-softmac-git.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-softmac-git.patch,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- linux-2.6-softmac-git.patch 1 Mar 2006 16:54:12 -0000 1.8 +++ linux-2.6-softmac-git.patch 22 Mar 2006 14:32:59 -0000 1.9 @@ -95,23 +95,6 @@ + union iwreq_data *wrqu, + char *extra); +#endif /* _IEEE80211SOFTMAC_WX */ ---- linux-2.6.15.noarch/include/net/ieee80211.h.orig 2006-02-15 09:58:15.000000000 -0500 -+++ linux-2.6.15.noarch/include/net/ieee80211.h 2006-02-15 09:58:21.000000000 -0500 -@@ -1122,6 +1122,14 @@ extern int ieee80211_wx_set_encodeext(st - extern int ieee80211_wx_get_encodeext(struct ieee80211_device *ieee, - struct iw_request_info *info, - union iwreq_data *wrqu, char *extra); -+extern int ieee80211_wx_set_auth(struct net_device *dev, -+ struct iw_request_info *info, -+ union iwreq_data *wrqu, -+ char *extra); -+extern int ieee80211_wx_get_auth(struct net_device *dev, -+ struct iw_request_info *info, -+ union iwreq_data *wrqu, -+ char *extra); - - static inline void ieee80211_increment_scans(struct ieee80211_device *ieee) - { --- /dev/null 2006-02-15 08:17:09.135048168 -0500 +++ linux-2.6.15.noarch/include/net/ieee80211softmac.h 2006-02-15 10:04:26.000000000 -0500 @@ -0,0 +1,292 @@ @@ -407,17 +390,6 @@ +ieee80211softmac_clear_pending_work(struct ieee80211softmac_device *sm); + +#endif /* IEEE80211SOFTMAC_H_ */ ---- linux-2.6.15.noarch/net/ieee80211/ieee80211_module.c.orig 2006-02-15 09:58:15.000000000 -0500 -+++ linux-2.6.15.noarch/net/ieee80211/ieee80211_module.c 2006-02-15 09:58:21.000000000 -0500 -@@ -195,7 +195,7 @@ void free_ieee80211(struct net_device *d - - static int debug = 0; - u32 ieee80211_debug_level = 0; --struct proc_dir_entry *ieee80211_proc = NULL; -+static struct proc_dir_entry *ieee80211_proc = NULL; - - static int show_debug_level(char *page, char **start, off_t offset, - int count, int *eof, void *data) --- /dev/null 2006-02-15 08:17:09.135048168 -0500 +++ linux-2.6.15.noarch/net/ieee80211/softmac/ieee80211softmac_auth.c 2006-02-15 10:34:17.000000000 -0500 @@ -0,0 +1,376 @@ @@ -3231,107 +3203,6 @@ ieee80211_geo.o +obj-$(CONFIG_IEEE80211_SOFTMAC) += softmac/ ---- linux-2.6.15.noarch/net/ieee80211/ieee80211_wx.c.orig 2006-02-15 09:58:15.000000000 -0500 -+++ linux-2.6.15.noarch/net/ieee80211/ieee80211_wx.c 2006-02-15 09:58:21.000000000 -0500 -@@ -734,9 +734,98 @@ int ieee80211_wx_get_encodeext(struct ie - return 0; - } - -+int ieee80211_wx_set_auth(struct net_device *dev, -+ struct iw_request_info *info, -+ union iwreq_data *wrqu, -+ char *extra) -+{ -+ struct ieee80211_device *ieee = netdev_priv(dev); -+ unsigned long flags; -+ int err = 0; -+ -+ spin_lock_irqsave(&ieee->lock, flags); -+ -+ switch (wrqu->param.flags & IW_AUTH_INDEX) { -+ case IW_AUTH_WPA_VERSION: -+ case IW_AUTH_CIPHER_PAIRWISE: -+ case IW_AUTH_CIPHER_GROUP: -+ case IW_AUTH_KEY_MGMT: -+ /* -+ * Host AP driver does not use these parameters and allows -+ * wpa_supplicant to control them internally. -+ */ -+ break; -+ case IW_AUTH_TKIP_COUNTERMEASURES: -+ break; /* FIXME */ -+ case IW_AUTH_DROP_UNENCRYPTED: -+ ieee->drop_unencrypted = !!wrqu->param.value; -+ break; -+ case IW_AUTH_80211_AUTH_ALG: -+ break; /* FIXME */ -+ case IW_AUTH_WPA_ENABLED: -+ ieee->privacy_invoked = ieee->wpa_enabled = !!wrqu->param.value; -+ break; -+ case IW_AUTH_RX_UNENCRYPTED_EAPOL: -+ ieee->ieee802_1x = !!wrqu->param.value; -+ break; -+ case IW_AUTH_PRIVACY_INVOKED: -+ ieee->privacy_invoked = !!wrqu->param.value; -+ break; -+ default: -+ err = -EOPNOTSUPP; -+ break; -+ } -+ spin_unlock_irqrestore(&ieee->lock, flags); -+ return err; -+} -+ -+int ieee80211_wx_get_auth(struct net_device *dev, -+ struct iw_request_info *info, -+ union iwreq_data *wrqu, -+ char *extra) -+{ -+ struct ieee80211_device *ieee = netdev_priv(dev); -+ unsigned long flags; -+ int err = 0; -+ -+ spin_lock_irqsave(&ieee->lock, flags); -+ -+ switch (wrqu->param.flags & IW_AUTH_INDEX) { -+ case IW_AUTH_WPA_VERSION: -+ case IW_AUTH_CIPHER_PAIRWISE: -+ case IW_AUTH_CIPHER_GROUP: -+ case IW_AUTH_KEY_MGMT: -+ case IW_AUTH_TKIP_COUNTERMEASURES: /* FIXME */ -+ case IW_AUTH_80211_AUTH_ALG: /* FIXME */ -+ /* -+ * Host AP driver does not use these parameters and allows -+ * wpa_supplicant to control them internally. -+ */ -+ err = -EOPNOTSUPP; -+ break; -+ case IW_AUTH_DROP_UNENCRYPTED: -+ wrqu->param.value = ieee->drop_unencrypted; -+ break; -+ case IW_AUTH_WPA_ENABLED: -+ wrqu->param.value = ieee->wpa_enabled; -+ break; -+ case IW_AUTH_RX_UNENCRYPTED_EAPOL: -+ wrqu->param.value = ieee->ieee802_1x; -+ break; -+ default: -+ err = -EOPNOTSUPP; -+ break; -+ } -+ spin_unlock_irqrestore(&ieee->lock, flags); -+ return err; -+} -+ - EXPORT_SYMBOL(ieee80211_wx_set_encodeext); - EXPORT_SYMBOL(ieee80211_wx_get_encodeext); - - EXPORT_SYMBOL(ieee80211_wx_get_scan); - EXPORT_SYMBOL(ieee80211_wx_set_encode); - EXPORT_SYMBOL(ieee80211_wx_get_encode); -+ -+EXPORT_SYMBOL_GPL(ieee80211_wx_set_auth); -+EXPORT_SYMBOL_GPL(ieee80211_wx_get_auth); --- linux-2.6.15.noarch/net/ieee80211/Kconfig.orig 2006-02-15 09:58:15.000000000 -0500 +++ linux-2.6.15.noarch/net/ieee80211/Kconfig 2006-02-15 09:58:21.000000000 -0500 @@ -66,3 +66,4 @@ config IEEE80211_CRYPT_TKIP From fedora-cvs-commits at redhat.com Wed Mar 22 15:56:11 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 22 Mar 2006 10:56:11 -0500 Subject: rpms/selinux-policy/devel policy-20060207.patch, 1.54, 1.55 selinux-policy.spec, 1.157, 1.158 Message-ID: <200603221556.k2MFuBea029024@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/selinux-policy/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv29008 Modified Files: policy-20060207.patch selinux-policy.spec Log Message: * Wed Mar 22 2006 Dan Walsh 2.2.25-2 - Fix pam_console handling of usb_device - dontaudit logwatch reading /mnt dir policy-20060207.patch: Rules.modular | 2 policy/mcs | 4 policy/modules/admin/bootloader.te | 2 policy/modules/admin/dmidecode.te | 2 policy/modules/admin/logwatch.te | 1 policy/modules/admin/readahead.te | 2 policy/modules/admin/rpm.fc | 3 policy/modules/admin/rpm.if | 3 policy/modules/admin/rpm.te | 1 policy/modules/admin/su.fc | 1 policy/modules/admin/su.if | 6 policy/modules/admin/updfstab.te | 4 policy/modules/admin/vbetool.te | 9 + policy/modules/kernel/corenetwork.te.in | 3 policy/modules/kernel/devices.fc | 1 policy/modules/kernel/devices.if | 59 ++++++++ policy/modules/kernel/files.fc | 8 - policy/modules/kernel/files.if | 33 ++++ policy/modules/kernel/filesystem.te | 1 policy/modules/kernel/kernel.if | 102 ++++++++++++++ policy/modules/kernel/kernel.te | 3 policy/modules/services/apache.fc | 2 policy/modules/services/apache.if | 5 policy/modules/services/apm.fc | 2 policy/modules/services/apm.te | 4 policy/modules/services/bluetooth.te | 38 ++--- policy/modules/services/cron.te | 3 policy/modules/services/cups.fc | 2 policy/modules/services/cups.if | 22 +++ policy/modules/services/cups.te | 7 - policy/modules/services/cvs.te | 2 policy/modules/services/hal.if | 41 +++++ policy/modules/services/hal.te | 17 ++ policy/modules/services/ktalk.fc | 1 policy/modules/services/ktalk.te | 6 policy/modules/services/mailman.if | 25 +++ policy/modules/services/nis.fc | 1 policy/modules/services/nis.if | 25 +++ policy/modules/services/nis.te | 28 ++++ policy/modules/services/nscd.if | 2 policy/modules/services/pegasus.te | 1 policy/modules/services/postfix.te | 4 policy/modules/services/privoxy.te | 5 policy/modules/services/samba.te | 2 policy/modules/services/sendmail.te | 1 policy/modules/services/xserver.if | 20 ++ policy/modules/system/authlogin.te | 2 policy/modules/system/fstools.if | 18 ++ policy/modules/system/fstools.te | 7 + policy/modules/system/init.te | 5 policy/modules/system/libraries.fc | 2 policy/modules/system/locallogin.te | 1 policy/modules/system/lvm.fc | 1 policy/modules/system/lvm.te | 3 policy/modules/system/mount.te | 3 policy/modules/system/selinuxutil.fc | 6 policy/modules/system/selinuxutil.if | 23 ++- policy/modules/system/selinuxutil.te | 16 ++ policy/modules/system/sysnetwork.te | 7 + policy/modules/system/udev.te | 2 policy/modules/system/unconfined.te | 8 - policy/modules/system/userdomain.te | 1 policy/modules/system/xend.fc | 23 +++ policy/modules/system/xend.if | 71 ++++++++++ policy/modules/system/xend.te | 219 ++++++++++++++++++++++++++++++++ 65 files changed, 870 insertions(+), 64 deletions(-) Index: policy-20060207.patch =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20060207.patch,v retrieving revision 1.54 retrieving revision 1.55 diff -u -r1.54 -r1.55 --- policy-20060207.patch 21 Mar 2006 19:46:10 -0000 1.54 +++ policy-20060207.patch 22 Mar 2006 15:56:09 -0000 1.55 @@ -1,6 +1,6 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/mcs serefpolicy-2.2.25/policy/mcs --- nsaserefpolicy/policy/mcs 2006-02-16 14:46:56.000000000 -0500 -+++ serefpolicy-2.2.25/policy/mcs 2006-03-21 11:57:52.000000000 -0500 ++++ serefpolicy-2.2.25/policy/mcs 2006-03-21 14:39:07.000000000 -0500 @@ -141,9 +141,7 @@ mlsconstrain file { create relabelto } ((h1 dom h2) and (l2 eq h2)); @@ -14,7 +14,7 @@ mlsconstrain { dir lnk_file chr_file blk_file sock_file fifo_file } { relabelfrom } diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/bootloader.te serefpolicy-2.2.25/policy/modules/admin/bootloader.te --- nsaserefpolicy/policy/modules/admin/bootloader.te 2006-03-17 13:51:46.000000000 -0500 -+++ serefpolicy-2.2.25/policy/modules/admin/bootloader.te 2006-03-21 11:57:52.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/admin/bootloader.te 2006-03-21 14:39:07.000000000 -0500 @@ -103,7 +103,7 @@ files_manage_boot_symlinks(bootloader_t) files_read_etc_files(bootloader_t) @@ -26,7 +26,7 @@ files_read_var_files(bootloader_t) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/dmidecode.te serefpolicy-2.2.25/policy/modules/admin/dmidecode.te --- nsaserefpolicy/policy/modules/admin/dmidecode.te 2006-03-04 00:06:33.000000000 -0500 -+++ serefpolicy-2.2.25/policy/modules/admin/dmidecode.te 2006-03-21 11:57:52.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/admin/dmidecode.te 2006-03-21 14:39:07.000000000 -0500 @@ -32,6 +32,8 @@ locallogin_use_fds(dmidecode_t) @@ -36,9 +36,20 @@ ifdef(`targeted_policy',` term_use_generic_ptys(dmidecode_t) term_use_unallocated_ttys(dmidecode_t) +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/logwatch.te serefpolicy-2.2.25/policy/modules/admin/logwatch.te +--- nsaserefpolicy/policy/modules/admin/logwatch.te 2006-03-17 13:51:46.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/admin/logwatch.te 2006-03-22 10:16:38.000000000 -0500 +@@ -53,6 +53,7 @@ + files_read_usr_files(logwatch_t) + files_search_spool(logwatch_t) + files_dontaudit_search_home(logwatch_t) ++files_dontaudit_search_mnt(logwatch_t) + + fs_getattr_all_fs(logwatch_t) + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/readahead.te serefpolicy-2.2.25/policy/modules/admin/readahead.te --- nsaserefpolicy/policy/modules/admin/readahead.te 2006-03-17 13:51:47.000000000 -0500 -+++ serefpolicy-2.2.25/policy/modules/admin/readahead.te 2006-03-21 11:57:52.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/admin/readahead.te 2006-03-21 14:39:07.000000000 -0500 @@ -18,7 +18,7 @@ # Local policy # @@ -50,7 +61,7 @@ allow readahead_t readahead_var_run_t:file create_file_perms; diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.fc serefpolicy-2.2.25/policy/modules/admin/rpm.fc --- nsaserefpolicy/policy/modules/admin/rpm.fc 2006-03-17 13:51:47.000000000 -0500 -+++ serefpolicy-2.2.25/policy/modules/admin/rpm.fc 2006-03-21 14:31:30.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/admin/rpm.fc 2006-03-21 14:39:07.000000000 -0500 @@ -3,6 +3,7 @@ /usr/bin/smart -- gen_context(system_u:object_r:rpm_exec_t,s0) @@ -70,7 +81,7 @@ ifdef(`distro_suse', ` diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.if serefpolicy-2.2.25/policy/modules/admin/rpm.if --- nsaserefpolicy/policy/modules/admin/rpm.if 2006-03-04 00:06:33.000000000 -0500 -+++ serefpolicy-2.2.25/policy/modules/admin/rpm.if 2006-03-21 11:57:52.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/admin/rpm.if 2006-03-21 14:39:07.000000000 -0500 @@ -78,6 +78,9 @@ role $2 types rpm_t; role $2 types rpm_script_t; @@ -83,7 +94,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.te serefpolicy-2.2.25/policy/modules/admin/rpm.te --- nsaserefpolicy/policy/modules/admin/rpm.te 2006-03-17 13:51:47.000000000 -0500 -+++ serefpolicy-2.2.25/policy/modules/admin/rpm.te 2006-03-21 11:57:52.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/admin/rpm.te 2006-03-21 14:39:07.000000000 -0500 @@ -326,6 +326,7 @@ seutil_domtrans_loadpolicy(rpm_script_t) @@ -94,7 +105,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/su.fc serefpolicy-2.2.25/policy/modules/admin/su.fc --- nsaserefpolicy/policy/modules/admin/su.fc 2005-11-14 18:24:06.000000000 -0500 -+++ serefpolicy-2.2.25/policy/modules/admin/su.fc 2006-03-21 11:57:52.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/admin/su.fc 2006-03-21 14:39:07.000000000 -0500 @@ -2,3 +2,4 @@ /bin/su -- gen_context(system_u:object_r:su_exec_t,s0) @@ -102,7 +113,7 @@ +/usr/bin/kdesu -- gen_context(system_u:object_r:su_exec_t,s0) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/su.if serefpolicy-2.2.25/policy/modules/admin/su.if --- nsaserefpolicy/policy/modules/admin/su.if 2006-03-04 00:06:33.000000000 -0500 -+++ serefpolicy-2.2.25/policy/modules/admin/su.if 2006-03-21 11:57:52.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/admin/su.if 2006-03-21 14:39:07.000000000 -0500 @@ -141,10 +141,10 @@ # By default, revert to the calling domain when a shell is executed. @@ -119,7 +130,7 @@ kernel_read_kernel_sysctls($1_su_t) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/updfstab.te serefpolicy-2.2.25/policy/modules/admin/updfstab.te --- nsaserefpolicy/policy/modules/admin/updfstab.te 2006-03-04 00:06:33.000000000 -0500 -+++ serefpolicy-2.2.25/policy/modules/admin/updfstab.te 2006-03-21 11:57:52.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/admin/updfstab.te 2006-03-21 14:39:07.000000000 -0500 @@ -125,6 +125,6 @@ udev_read_db(updfstab_t) ') @@ -131,7 +142,7 @@ ') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/vbetool.te serefpolicy-2.2.25/policy/modules/admin/vbetool.te --- nsaserefpolicy/policy/modules/admin/vbetool.te 2006-02-01 08:23:27.000000000 -0500 -+++ serefpolicy-2.2.25/policy/modules/admin/vbetool.te 2006-03-21 11:57:52.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/admin/vbetool.te 2006-03-21 14:39:07.000000000 -0500 @@ -15,6 +15,7 @@ # Local policy # @@ -154,7 +165,7 @@ +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corenetwork.te.in serefpolicy-2.2.25/policy/modules/kernel/corenetwork.te.in --- nsaserefpolicy/policy/modules/kernel/corenetwork.te.in 2006-03-21 11:38:20.000000000 -0500 -+++ serefpolicy-2.2.25/policy/modules/kernel/corenetwork.te.in 2006-03-21 11:57:52.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/kernel/corenetwork.te.in 2006-03-21 14:39:07.000000000 -0500 @@ -126,7 +126,8 @@ type utcpserver_port_t, port_type; dnl network_port(utcpserver) # no defined portcon network_port(uucpd, tcp,540,s0) @@ -167,7 +178,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.fc serefpolicy-2.2.25/policy/modules/kernel/devices.fc --- nsaserefpolicy/policy/modules/kernel/devices.fc 2006-03-21 11:38:20.000000000 -0500 -+++ serefpolicy-2.2.25/policy/modules/kernel/devices.fc 2006-03-21 11:57:52.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/kernel/devices.fc 2006-03-21 14:39:07.000000000 -0500 @@ -37,6 +37,7 @@ /dev/par.* -c gen_context(system_u:object_r:printer_device_t,s0) /dev/patmgr[01] -c gen_context(system_u:object_r:sound_device_t,s0) @@ -178,17 +189,55 @@ /dev/rmidi.* -c gen_context(system_u:object_r:sound_device_t,s0) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.if serefpolicy-2.2.25/policy/modules/kernel/devices.if --- nsaserefpolicy/policy/modules/kernel/devices.if 2006-03-17 13:51:48.000000000 -0500 -+++ serefpolicy-2.2.25/policy/modules/kernel/devices.if 2006-03-21 11:57:52.000000000 -0500 -@@ -2382,7 +2382,7 @@ ++++ serefpolicy-2.2.25/policy/modules/kernel/devices.if 2006-03-22 10:19:58.000000000 -0500 +@@ -2382,7 +2382,45 @@ ') allow $1 device_t:dir r_dir_perms; - allow $1 usb_device_t:chr_file { read write }; + allow $1 usb_device_t:chr_file rw_file_perms; ++') ++ ++######################################## ++## ++## Getattr generic the USB devices. ++## ++## ++## ++## Domain allowed access. ++## ++## ++# ++interface(`dev_getattr_generic_usb_dev',` ++ gen_require(` ++ type usb_device_t; ++ ') ++ ++ allow $1 device_t:dir r_dir_perms; ++ allow $1 usb_device_t:chr_file getattr; ++') ++ ++######################################## ++## ++## Setattr generic the USB devices. ++## ++## ++## ++## Domain allowed access. ++## ++## ++# ++interface(`dev_setattr_generic_usb_dev',` ++ gen_require(` ++ type usb_device_t; ++ ') ++ ++ allow $1 device_t:dir r_dir_perms; ++ allow $1 usb_device_t:chr_file setattr; ') ######################################## -@@ -2769,3 +2769,22 @@ +@@ -2769,3 +2807,22 @@ typeattribute $1 memory_raw_write, memory_raw_read; ') @@ -213,7 +262,7 @@ + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.fc serefpolicy-2.2.25/policy/modules/kernel/files.fc --- nsaserefpolicy/policy/modules/kernel/files.fc 2006-03-04 00:06:34.000000000 -0500 -+++ serefpolicy-2.2.25/policy/modules/kernel/files.fc 2006-03-21 11:57:52.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/kernel/files.fc 2006-03-21 14:39:07.000000000 -0500 @@ -45,7 +45,7 @@ /etc(/.*)? gen_context(system_u:object_r:etc_t,s0) /etc/\.fstab\.hal\..+ -- gen_context(system_u:object_r:etc_runtime_t,s0) @@ -252,7 +301,7 @@ HOME_ROOT/lost\+found/.* <> diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.if serefpolicy-2.2.25/policy/modules/kernel/files.if --- nsaserefpolicy/policy/modules/kernel/files.if 2006-03-17 13:51:48.000000000 -0500 -+++ serefpolicy-2.2.25/policy/modules/kernel/files.if 2006-03-21 11:57:52.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/kernel/files.if 2006-03-22 10:16:33.000000000 -0500 @@ -1648,6 +1648,21 @@ ') @@ -283,7 +332,26 @@ allow $1 etc_runtime_t:file create_file_perms; type_transition $1 etc_t:file etc_runtime_t; ') -@@ -3808,12 +3824,13 @@ +@@ -2156,6 +2172,18 @@ + + ######################################## + # ++# files_dontaudit_search_mnt(domain) ++# ++interface(`files_dontaudit_search_mnt',` ++ gen_require(` ++ type mnt_t; ++ ') ++ ++ dontaudit $1 mnt_t:dir search_dir_perms; ++') ++ ++######################################## ++# + # files_list_mnt(domain) + # + interface(`files_list_mnt',` +@@ -3808,12 +3836,13 @@ # Need to give permission to create directories where applicable allow $1 self:process setfscreate; @@ -301,7 +369,7 @@ ######################################## diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/filesystem.te serefpolicy-2.2.25/policy/modules/kernel/filesystem.te --- nsaserefpolicy/policy/modules/kernel/filesystem.te 2006-03-17 13:51:48.000000000 -0500 -+++ serefpolicy-2.2.25/policy/modules/kernel/filesystem.te 2006-03-21 11:57:52.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/kernel/filesystem.te 2006-03-21 14:39:07.000000000 -0500 @@ -167,3 +167,4 @@ genfscon nfs / gen_context(system_u:object_r:nfs_t,s0) genfscon nfs4 / gen_context(system_u:object_r:nfs_t,s0) @@ -309,7 +377,7 @@ +genfscon hfsplus / gen_context(system_u:object_r:nfs_t,s0) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel.if serefpolicy-2.2.25/policy/modules/kernel/kernel.if --- nsaserefpolicy/policy/modules/kernel/kernel.if 2006-03-04 00:06:34.000000000 -0500 -+++ serefpolicy-2.2.25/policy/modules/kernel/kernel.if 2006-03-21 11:57:52.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/kernel/kernel.if 2006-03-21 14:39:07.000000000 -0500 @@ -1044,6 +1044,7 @@ allow $1 proc_t:dir search; @@ -432,7 +500,7 @@ +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel.te serefpolicy-2.2.25/policy/modules/kernel/kernel.te --- nsaserefpolicy/policy/modules/kernel/kernel.te 2006-03-17 13:51:48.000000000 -0500 -+++ serefpolicy-2.2.25/policy/modules/kernel/kernel.te 2006-03-21 11:57:52.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/kernel/kernel.te 2006-03-21 14:39:07.000000000 -0500 @@ -75,6 +75,9 @@ type proc_net_t, proc_type; genfscon proc /net gen_context(system_u:object_r:proc_net_t,s0) @@ -445,7 +513,7 @@ # diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.fc serefpolicy-2.2.25/policy/modules/services/apache.fc --- nsaserefpolicy/policy/modules/services/apache.fc 2006-02-27 17:17:23.000000000 -0500 -+++ serefpolicy-2.2.25/policy/modules/services/apache.fc 2006-03-21 11:57:52.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/services/apache.fc 2006-03-21 14:39:07.000000000 -0500 @@ -15,6 +15,7 @@ /etc/vhosts -- gen_context(system_u:object_r:httpd_config_t,s0) @@ -461,7 +529,7 @@ +/usr/share/selinux-policy([^/]*)?/html(/.*)? gen_context(system_u:object_r:httpd_sys_content_t,s0) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.if serefpolicy-2.2.25/policy/modules/services/apache.if --- nsaserefpolicy/policy/modules/services/apache.if 2006-03-17 13:51:48.000000000 -0500 -+++ serefpolicy-2.2.25/policy/modules/services/apache.if 2006-03-21 11:57:52.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/services/apache.if 2006-03-21 14:39:07.000000000 -0500 @@ -12,6 +12,11 @@ ## # @@ -476,7 +544,7 @@ gen_tunable(allow_httpd_$1_script_anon_write,false) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apm.fc serefpolicy-2.2.25/policy/modules/services/apm.fc --- nsaserefpolicy/policy/modules/services/apm.fc 2005-11-14 18:24:08.000000000 -0500 -+++ serefpolicy-2.2.25/policy/modules/services/apm.fc 2006-03-21 11:57:52.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/services/apm.fc 2006-03-21 14:39:07.000000000 -0500 @@ -11,7 +11,7 @@ # # /var @@ -488,7 +556,7 @@ /var/run/apmd\.pid -- gen_context(system_u:object_r:apmd_var_run_t,s0) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apm.te serefpolicy-2.2.25/policy/modules/services/apm.te --- nsaserefpolicy/policy/modules/services/apm.te 2006-03-04 00:06:35.000000000 -0500 -+++ serefpolicy-2.2.25/policy/modules/services/apm.te 2006-03-21 11:57:52.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/services/apm.te 2006-03-21 14:39:07.000000000 -0500 @@ -225,6 +225,10 @@ pcmcia_domtrans_cardctl(apmd_t) ') @@ -502,7 +570,7 @@ ') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bluetooth.te serefpolicy-2.2.25/policy/modules/services/bluetooth.te --- nsaserefpolicy/policy/modules/services/bluetooth.te 2006-03-17 13:51:48.000000000 -0500 -+++ serefpolicy-2.2.25/policy/modules/services/bluetooth.te 2006-03-21 11:57:52.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/services/bluetooth.te 2006-03-21 14:39:07.000000000 -0500 @@ -115,6 +115,7 @@ corecmd_exec_shell(bluetooth_t) @@ -586,7 +654,7 @@ ') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.te serefpolicy-2.2.25/policy/modules/services/cron.te --- nsaserefpolicy/policy/modules/services/cron.te 2006-03-17 13:51:48.000000000 -0500 -+++ serefpolicy-2.2.25/policy/modules/services/cron.te 2006-03-21 11:57:52.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/services/cron.te 2006-03-21 14:39:07.000000000 -0500 @@ -166,6 +166,9 @@ allow crond_t unconfined_t:dbus send_msg; @@ -599,7 +667,7 @@ allow crond_t crond_tmp_t:file create_file_perms; diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.fc serefpolicy-2.2.25/policy/modules/services/cups.fc --- nsaserefpolicy/policy/modules/services/cups.fc 2005-11-14 18:24:08.000000000 -0500 -+++ serefpolicy-2.2.25/policy/modules/services/cups.fc 2006-03-21 11:57:52.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/services/cups.fc 2006-03-21 14:39:07.000000000 -0500 @@ -43,7 +43,7 @@ /var/log/cups(/.*)? gen_context(system_u:object_r:cupsd_log_t,s0) /var/log/turboprint_cups\.log.* -- gen_context(system_u:object_r:cupsd_log_t,s0) @@ -611,7 +679,7 @@ /var/run/ptal-printd(/.*)? gen_context(system_u:object_r:ptal_var_run_t,s0) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.if serefpolicy-2.2.25/policy/modules/services/cups.if --- nsaserefpolicy/policy/modules/services/cups.if 2006-02-23 09:25:09.000000000 -0500 -+++ serefpolicy-2.2.25/policy/modules/services/cups.if 2006-03-21 11:57:52.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/services/cups.if 2006-03-21 14:39:07.000000000 -0500 @@ -226,3 +226,25 @@ allow cupsd_t $1:tcp_socket { acceptfrom recvfrom }; kernel_tcp_recvfrom($1) @@ -640,7 +708,7 @@ + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.te serefpolicy-2.2.25/policy/modules/services/cups.te --- nsaserefpolicy/policy/modules/services/cups.te 2006-03-17 13:51:48.000000000 -0500 -+++ serefpolicy-2.2.25/policy/modules/services/cups.te 2006-03-21 11:57:52.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/services/cups.te 2006-03-21 14:39:07.000000000 -0500 @@ -77,7 +77,7 @@ dontaudit cupsd_t self:capability { sys_tty_config net_admin }; allow cupsd_t self:process { setsched signal_perms }; @@ -685,7 +753,7 @@ ######################################## diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cvs.te serefpolicy-2.2.25/policy/modules/services/cvs.te --- nsaserefpolicy/policy/modules/services/cvs.te 2006-03-04 00:06:35.000000000 -0500 -+++ serefpolicy-2.2.25/policy/modules/services/cvs.te 2006-03-21 11:57:52.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/services/cvs.te 2006-03-21 14:39:07.000000000 -0500 @@ -11,7 +11,7 @@ inetd_tcp_service_domain(cvs_t,cvs_exec_t) role system_r types cvs_t; @@ -697,7 +765,7 @@ type cvs_tmp_t; diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.if serefpolicy-2.2.25/policy/modules/services/hal.if --- nsaserefpolicy/policy/modules/services/hal.if 2006-03-04 00:06:36.000000000 -0500 -+++ serefpolicy-2.2.25/policy/modules/services/hal.if 2006-03-21 11:57:52.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/services/hal.if 2006-03-21 14:39:07.000000000 -0500 @@ -100,3 +100,44 @@ allow $1 hald_t:dbus send_msg; allow hald_t $1:dbus send_msg; @@ -745,7 +813,7 @@ + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.te serefpolicy-2.2.25/policy/modules/services/hal.te --- nsaserefpolicy/policy/modules/services/hal.te 2006-03-17 13:51:48.000000000 -0500 -+++ serefpolicy-2.2.25/policy/modules/services/hal.te 2006-03-21 11:57:52.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/services/hal.te 2006-03-21 14:39:07.000000000 -0500 @@ -22,7 +22,7 @@ # @@ -815,7 +883,7 @@ ') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ktalk.fc serefpolicy-2.2.25/policy/modules/services/ktalk.fc --- nsaserefpolicy/policy/modules/services/ktalk.fc 2006-02-20 14:07:37.000000000 -0500 -+++ serefpolicy-2.2.25/policy/modules/services/ktalk.fc 2006-03-21 11:57:52.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/services/ktalk.fc 2006-03-21 14:39:07.000000000 -0500 @@ -1,3 +1,4 @@ /usr/bin/in.talkd -- gen_context(system_u:object_r:ktalkd_exec_t,s0) @@ -823,7 +891,7 @@ +/var/log/talkd.* -- gen_context(system_u:object_r:ktalkd_log_t,s0) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ktalk.te serefpolicy-2.2.25/policy/modules/services/ktalk.te --- nsaserefpolicy/policy/modules/services/ktalk.te 2006-03-17 13:51:48.000000000 -0500 -+++ serefpolicy-2.2.25/policy/modules/services/ktalk.te 2006-03-21 11:57:52.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/services/ktalk.te 2006-03-21 14:39:07.000000000 -0500 @@ -14,6 +14,9 @@ type ktalkd_tmp_t; files_tmp_file(ktalkd_tmp_t) @@ -849,7 +917,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mailman.if serefpolicy-2.2.25/policy/modules/services/mailman.if --- nsaserefpolicy/policy/modules/services/mailman.if 2006-03-04 00:06:36.000000000 -0500 -+++ serefpolicy-2.2.25/policy/modules/services/mailman.if 2006-03-21 11:57:52.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/services/mailman.if 2006-03-21 14:39:07.000000000 -0500 @@ -275,3 +275,28 @@ allow $1 mailman_archive_t:file r_file_perms; allow $1 mailman_archive_t:lnk_file { getattr read }; @@ -881,7 +949,7 @@ + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nis.fc serefpolicy-2.2.25/policy/modules/services/nis.fc --- nsaserefpolicy/policy/modules/services/nis.fc 2005-11-28 21:48:04.000000000 -0500 -+++ serefpolicy-2.2.25/policy/modules/services/nis.fc 2006-03-21 11:57:52.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/services/nis.fc 2006-03-21 14:39:07.000000000 -0500 @@ -7,3 +7,4 @@ /usr/sbin/ypserv -- gen_context(system_u:object_r:ypserv_exec_t,s0) @@ -889,7 +957,7 @@ +/usr/sbin/rpc.ypxfr -- gen_context(system_u:object_r:ypxfr_exec_t,s0) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nis.if serefpolicy-2.2.25/policy/modules/services/nis.if --- nsaserefpolicy/policy/modules/services/nis.if 2006-02-10 21:34:14.000000000 -0500 -+++ serefpolicy-2.2.25/policy/modules/services/nis.if 2006-03-21 11:57:52.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/services/nis.if 2006-03-21 14:39:07.000000000 -0500 @@ -277,3 +277,28 @@ files_search_etc($1) allow $1 ypserv_conf_t:file { getattr read }; @@ -921,7 +989,7 @@ +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nis.te serefpolicy-2.2.25/policy/modules/services/nis.te --- nsaserefpolicy/policy/modules/services/nis.te 2006-03-04 00:06:36.000000000 -0500 -+++ serefpolicy-2.2.25/policy/modules/services/nis.te 2006-03-21 11:57:52.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/services/nis.te 2006-03-21 14:39:07.000000000 -0500 @@ -31,6 +31,10 @@ type ypserv_exec_t; init_daemon_domain(ypserv_t,ypserv_exec_t) @@ -977,7 +1045,7 @@ +files_read_etc_files(ypxfr_t) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nscd.if serefpolicy-2.2.25/policy/modules/services/nscd.if --- nsaserefpolicy/policy/modules/services/nscd.if 2006-02-10 21:34:14.000000000 -0500 -+++ serefpolicy-2.2.25/policy/modules/services/nscd.if 2006-03-21 11:57:52.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/services/nscd.if 2006-03-21 14:39:07.000000000 -0500 @@ -49,8 +49,8 @@ dontaudit $1 nscd_t:nscd { shmempwd shmemgrp shmemhost }; @@ -990,7 +1058,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pegasus.te serefpolicy-2.2.25/policy/modules/services/pegasus.te --- nsaserefpolicy/policy/modules/services/pegasus.te 2006-03-04 00:06:36.000000000 -0500 -+++ serefpolicy-2.2.25/policy/modules/services/pegasus.te 2006-03-21 11:57:52.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/services/pegasus.te 2006-03-21 14:39:07.000000000 -0500 @@ -77,6 +77,7 @@ corenet_tcp_bind_pegasus_https_port(pegasus_t) corenet_tcp_connect_pegasus_http_port(pegasus_t) @@ -1001,7 +1069,7 @@ dev_read_urand(pegasus_t) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postfix.te serefpolicy-2.2.25/policy/modules/services/postfix.te --- nsaserefpolicy/policy/modules/services/postfix.te 2006-03-17 13:51:49.000000000 -0500 -+++ serefpolicy-2.2.25/policy/modules/services/postfix.te 2006-03-21 11:57:52.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/services/postfix.te 2006-03-21 14:39:07.000000000 -0500 @@ -406,6 +406,10 @@ procmail_domtrans(postfix_pipe_t) ') @@ -1015,7 +1083,7 @@ # Postfix postdrop local policy diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/privoxy.te serefpolicy-2.2.25/policy/modules/services/privoxy.te --- nsaserefpolicy/policy/modules/services/privoxy.te 2006-03-04 00:06:36.000000000 -0500 -+++ serefpolicy-2.2.25/policy/modules/services/privoxy.te 2006-03-21 11:57:52.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/services/privoxy.te 2006-03-21 14:39:07.000000000 -0500 @@ -51,6 +51,7 @@ corenet_tcp_bind_http_cache_port(privoxy_t) corenet_tcp_connect_http_port(privoxy_t) @@ -1037,7 +1105,7 @@ ') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/samba.te serefpolicy-2.2.25/policy/modules/services/samba.te --- nsaserefpolicy/policy/modules/services/samba.te 2006-03-04 00:06:36.000000000 -0500 -+++ serefpolicy-2.2.25/policy/modules/services/samba.te 2006-03-21 11:57:52.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/services/samba.te 2006-03-21 14:39:07.000000000 -0500 @@ -32,7 +32,7 @@ type samba_secrets_t; files_type(samba_secrets_t) @@ -1049,7 +1117,7 @@ type samba_var_t; diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/sendmail.te serefpolicy-2.2.25/policy/modules/services/sendmail.te --- nsaserefpolicy/policy/modules/services/sendmail.te 2006-03-04 00:06:36.000000000 -0500 -+++ serefpolicy-2.2.25/policy/modules/services/sendmail.te 2006-03-21 11:57:52.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/services/sendmail.te 2006-03-21 14:39:07.000000000 -0500 @@ -125,6 +125,7 @@ ') @@ -1060,8 +1128,8 @@ ') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.if serefpolicy-2.2.25/policy/modules/services/xserver.if --- nsaserefpolicy/policy/modules/services/xserver.if 2006-03-21 14:33:33.000000000 -0500 -+++ serefpolicy-2.2.25/policy/modules/services/xserver.if 2006-03-21 11:57:52.000000000 -0500 -@@ -922,3 +904,23 @@ ++++ serefpolicy-2.2.25/policy/modules/services/xserver.if 2006-03-21 14:39:07.000000000 -0500 +@@ -922,3 +922,23 @@ dontaudit $1 xdm_xserver_t:tcp_socket { read write }; ') @@ -1085,9 +1153,21 @@ + allow $1 xdm_xserver_tmp_t:dir search; + allow $1 xdm_xserver_tmp_t:sock_file { read write }; +') +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlogin.te serefpolicy-2.2.25/policy/modules/system/authlogin.te +--- nsaserefpolicy/policy/modules/system/authlogin.te 2006-03-17 13:51:50.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/system/authlogin.te 2006-03-22 10:19:37.000000000 -0500 +@@ -171,6 +171,8 @@ + dev_setattr_video_dev(pam_console_t) + dev_getattr_xserver_misc_dev(pam_console_t) + dev_setattr_xserver_misc_dev(pam_console_t) ++dev_getattr_generic_usb_dev(pam_console_t) ++dev_setattr_generic_usb_dev(pam_console_t) + + fs_search_auto_mountpoints(pam_console_t) + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/fstools.if serefpolicy-2.2.25/policy/modules/system/fstools.if --- nsaserefpolicy/policy/modules/system/fstools.if 2006-02-10 21:34:15.000000000 -0500 -+++ serefpolicy-2.2.25/policy/modules/system/fstools.if 2006-03-21 11:57:52.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/system/fstools.if 2006-03-21 14:39:07.000000000 -0500 @@ -110,3 +110,21 @@ allow $1 fsadm_exec_t:file create_file_perms; @@ -1112,7 +1192,7 @@ +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/fstools.te serefpolicy-2.2.25/policy/modules/system/fstools.te --- nsaserefpolicy/policy/modules/system/fstools.te 2006-03-17 13:51:50.000000000 -0500 -+++ serefpolicy-2.2.25/policy/modules/system/fstools.te 2006-03-21 11:57:52.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/system/fstools.te 2006-03-21 14:39:07.000000000 -0500 @@ -53,6 +53,7 @@ kernel_change_ring_buffer_level(fsadm_t) # mkreiserfs needs this @@ -1150,7 +1230,7 @@ libs_use_shared_libs(fsadm_t) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.te serefpolicy-2.2.25/policy/modules/system/init.te --- nsaserefpolicy/policy/modules/system/init.te 2006-03-17 13:51:50.000000000 -0500 -+++ serefpolicy-2.2.25/policy/modules/system/init.te 2006-03-21 11:57:52.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/system/init.te 2006-03-21 14:39:07.000000000 -0500 @@ -349,6 +349,7 @@ files_mounton_isid_type_dirs(initrc_t) files_list_default(initrc_t) @@ -1172,7 +1252,7 @@ # this also would result in a type transition diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.fc serefpolicy-2.2.25/policy/modules/system/libraries.fc --- nsaserefpolicy/policy/modules/system/libraries.fc 2006-02-20 14:07:38.000000000 -0500 -+++ serefpolicy-2.2.25/policy/modules/system/libraries.fc 2006-03-21 11:57:52.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/system/libraries.fc 2006-03-21 14:39:07.000000000 -0500 @@ -65,6 +65,7 @@ /usr/lib(64)?/(nvidia/)?libGL(core)?\.so(\.[^/]*)* -- gen_context(system_u:object_r:textrel_shlib_t,s0) /usr/lib(64)?/libGLU\.so(\.[^/]*)* -- gen_context(system_u:object_r:textrel_shlib_t,s0) @@ -1191,7 +1271,7 @@ /usr/lib(64)?/.*/program/.*\.so.* gen_context(system_u:object_r:shlib_t,s0) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/locallogin.te serefpolicy-2.2.25/policy/modules/system/locallogin.te --- nsaserefpolicy/policy/modules/system/locallogin.te 2006-03-17 13:51:50.000000000 -0500 -+++ serefpolicy-2.2.25/policy/modules/system/locallogin.te 2006-03-21 11:57:52.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/system/locallogin.te 2006-03-21 14:39:07.000000000 -0500 @@ -20,6 +20,7 @@ type local_login_tmp_t; @@ -1202,7 +1282,7 @@ type sulogin_exec_t; diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/lvm.fc serefpolicy-2.2.25/policy/modules/system/lvm.fc --- nsaserefpolicy/policy/modules/system/lvm.fc 2005-11-14 18:24:06.000000000 -0500 -+++ serefpolicy-2.2.25/policy/modules/system/lvm.fc 2006-03-21 11:57:52.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/system/lvm.fc 2006-03-21 14:39:07.000000000 -0500 @@ -25,6 +25,7 @@ # /sbin # @@ -1213,7 +1293,7 @@ /sbin/e2fsadm -- gen_context(system_u:object_r:lvm_exec_t,s0) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/lvm.te serefpolicy-2.2.25/policy/modules/system/lvm.te --- nsaserefpolicy/policy/modules/system/lvm.te 2006-03-17 13:51:50.000000000 -0500 -+++ serefpolicy-2.2.25/policy/modules/system/lvm.te 2006-03-21 11:57:52.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/system/lvm.te 2006-03-21 14:39:07.000000000 -0500 @@ -129,6 +129,8 @@ # DAC overrides and mknod for modifying /dev entries (vgmknodes) @@ -1233,7 +1313,7 @@ fs_search_auto_mountpoints(lvm_t) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.te serefpolicy-2.2.25/policy/modules/system/mount.te --- nsaserefpolicy/policy/modules/system/mount.te 2006-03-17 13:51:50.000000000 -0500 -+++ serefpolicy-2.2.25/policy/modules/system/mount.te 2006-03-21 11:57:52.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/system/mount.te 2006-03-21 14:39:07.000000000 -0500 @@ -26,6 +26,7 @@ files_tmp_filetrans(mount_t,mount_tmp_t,{ file dir }) @@ -1260,7 +1340,7 @@ libs_use_shared_libs(mount_t) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.fc serefpolicy-2.2.25/policy/modules/system/selinuxutil.fc --- nsaserefpolicy/policy/modules/system/selinuxutil.fc 2006-02-23 09:25:09.000000000 -0500 -+++ serefpolicy-2.2.25/policy/modules/system/selinuxutil.fc 2006-03-21 11:57:52.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/system/selinuxutil.fc 2006-03-21 14:39:07.000000000 -0500 @@ -8,9 +8,9 @@ /etc/selinux/([^/]*/)?contexts/files(/.*)? gen_context(system_u:object_r:file_context_t,s0) /etc/selinux/([^/]*/)?policy(/.*)? gen_context(system_u:object_r:policy_config_t,s15:c0.c255) @@ -1276,7 +1356,7 @@ # diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.if serefpolicy-2.2.25/policy/modules/system/selinuxutil.if --- nsaserefpolicy/policy/modules/system/selinuxutil.if 2006-02-23 09:25:09.000000000 -0500 -+++ serefpolicy-2.2.25/policy/modules/system/selinuxutil.if 2006-03-21 11:57:52.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/system/selinuxutil.if 2006-03-21 14:39:07.000000000 -0500 @@ -675,8 +675,8 @@ files_search_etc($1) @@ -1320,7 +1400,7 @@ + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.te serefpolicy-2.2.25/policy/modules/system/selinuxutil.te --- nsaserefpolicy/policy/modules/system/selinuxutil.te 2006-03-17 13:51:50.000000000 -0500 -+++ serefpolicy-2.2.25/policy/modules/system/selinuxutil.te 2006-03-21 11:57:52.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/system/selinuxutil.te 2006-03-21 14:39:07.000000000 -0500 @@ -192,6 +192,9 @@ selinux_load_policy(load_policy_t) selinux_set_boolean(load_policy_t) @@ -1388,7 +1468,7 @@ # for config files in a home directory diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/sysnetwork.te serefpolicy-2.2.25/policy/modules/system/sysnetwork.te --- nsaserefpolicy/policy/modules/system/sysnetwork.te 2006-03-04 00:06:37.000000000 -0500 -+++ serefpolicy-2.2.25/policy/modules/system/sysnetwork.te 2006-03-21 11:57:52.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/system/sysnetwork.te 2006-03-21 14:39:07.000000000 -0500 @@ -161,6 +161,10 @@ consoletype_domtrans(dhcpc_t) ') @@ -1412,7 +1492,7 @@ term_use_generic_ptys(ifconfig_t) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.te serefpolicy-2.2.25/policy/modules/system/udev.te --- nsaserefpolicy/policy/modules/system/udev.te 2006-03-17 13:51:50.000000000 -0500 -+++ serefpolicy-2.2.25/policy/modules/system/udev.te 2006-03-21 11:57:52.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/system/udev.te 2006-03-21 14:39:07.000000000 -0500 @@ -39,7 +39,7 @@ # Local policy # @@ -1424,7 +1504,7 @@ allow udev_t self:process { execmem setfscreate }; diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.te serefpolicy-2.2.25/policy/modules/system/unconfined.te --- nsaserefpolicy/policy/modules/system/unconfined.te 2006-03-17 13:51:50.000000000 -0500 -+++ serefpolicy-2.2.25/policy/modules/system/unconfined.te 2006-03-21 11:57:52.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/system/unconfined.te 2006-03-21 14:39:07.000000000 -0500 @@ -89,10 +89,6 @@ firstboot_domtrans(unconfined_t) ') @@ -1449,7 +1529,7 @@ ') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-2.2.25/policy/modules/system/userdomain.te --- nsaserefpolicy/policy/modules/system/userdomain.te 2006-03-17 13:51:50.000000000 -0500 -+++ serefpolicy-2.2.25/policy/modules/system/userdomain.te 2006-03-21 11:57:52.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/system/userdomain.te 2006-03-21 14:39:07.000000000 -0500 @@ -180,6 +180,7 @@ logging_read_audit_log(secadm_t) logging_domtrans_auditctl(secadm_t) @@ -1460,7 +1540,7 @@ logging_read_audit_log(sysadm_t) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xend.fc serefpolicy-2.2.25/policy/modules/system/xend.fc --- nsaserefpolicy/policy/modules/system/xend.fc 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-2.2.25/policy/modules/system/xend.fc 2006-03-21 11:57:52.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/system/xend.fc 2006-03-21 14:39:07.000000000 -0500 @@ -0,0 +1,23 @@ +# xend executable will have: +# label: system_u:object_r:xend_exec_t @@ -1487,7 +1567,7 @@ + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xend.if serefpolicy-2.2.25/policy/modules/system/xend.if --- nsaserefpolicy/policy/modules/system/xend.if 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-2.2.25/policy/modules/system/xend.if 2006-03-21 11:57:52.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/system/xend.if 2006-03-21 14:39:07.000000000 -0500 @@ -0,0 +1,71 @@ +## policy for xen + @@ -1562,7 +1642,7 @@ + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xend.te serefpolicy-2.2.25/policy/modules/system/xend.te --- nsaserefpolicy/policy/modules/system/xend.te 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-2.2.25/policy/modules/system/xend.te 2006-03-21 11:57:52.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/system/xend.te 2006-03-21 14:39:07.000000000 -0500 @@ -0,0 +1,219 @@ +policy_module(xend,1.0.0) + @@ -1785,7 +1865,7 @@ + diff --exclude-from=exclude -N -u -r nsaserefpolicy/Rules.modular serefpolicy-2.2.25/Rules.modular --- nsaserefpolicy/Rules.modular 2006-03-21 14:33:29.000000000 -0500 -+++ serefpolicy-2.2.25/Rules.modular 2006-03-21 11:57:52.000000000 -0500 ++++ serefpolicy-2.2.25/Rules.modular 2006-03-21 14:39:07.000000000 -0500 @@ -208,7 +208,7 @@ # $(APPDIR)/customizable_types: $(BASE_CONF) Index: selinux-policy.spec =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v retrieving revision 1.157 retrieving revision 1.158 diff -u -r1.157 -r1.158 --- selinux-policy.spec 21 Mar 2006 19:46:10 -0000 1.157 +++ selinux-policy.spec 22 Mar 2006 15:56:09 -0000 1.158 @@ -10,7 +10,7 @@ Summary: SELinux policy configuration Name: selinux-policy Version: 2.2.25 -Release: 1 +Release: 2 License: GPL Group: System Environment/Base Source: serefpolicy-%{version}.tgz @@ -298,7 +298,11 @@ %fileList strict %changelog -* Wed Mar 17 2006 Dan Walsh 2.2.24-1 +* Wed Mar 22 2006 Dan Walsh 2.2.25-2 +- Fix pam_console handling of usb_device +- dontaudit logwatch reading /mnt dir + +* Fri Mar 17 2006 Dan Walsh 2.2.24-1 - Update to upstream * Wed Mar 15 2006 Dan Walsh 2.2.23-19 From fedora-cvs-commits at redhat.com Wed Mar 22 15:56:33 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 22 Mar 2006 10:56:33 -0500 Subject: rpms/kernel/devel linux-2.6-tux.patch,1.14,1.15 Message-ID: <200603221556.k2MFuXHt029085@cvs.devel.redhat.com> Author: dwmw2 Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv29031 Modified Files: linux-2.6-tux.patch Log Message: sock_map_fd got implemented upstream linux-2.6-tux.patch: linux-2.6.16.noarch/include/linux/sysctl.h | 50 linux-2.6.16.noarch/net/socket.c | 54 linux-tux.q/arch/alpha/kernel/systbls.S | 8 linux-tux.q/arch/i386/kernel/syscall_table.S | 10 linux-tux.q/arch/ia64/kernel/entry.S | 8 linux-tux.q/arch/ia64/kernel/ia64_ksyms.c | 5 linux-tux.q/arch/x86_64/ia32/ia32entry.S | 10 linux-tux.q/fs/dcache.c | 36 linux-tux.q/fs/exec.c | 2 linux-tux.q/fs/fcntl.c | 4 linux-tux.q/fs/namei.c | 18 linux-tux.q/fs/namespace.c | 2 linux-tux.q/fs/open.c | 4 linux-tux.q/fs/pipe.c | 2 linux-tux.q/fs/read_write.c | 2 linux-tux.q/include/asm-alpha/fcntl.h | 1 linux-tux.q/include/asm-generic/fcntl.h | 4 linux-tux.q/include/asm-i386/unistd.h | 5 linux-tux.q/include/asm-ia64/unistd.h | 2 linux-tux.q/include/asm-sparc/fcntl.h | 1 linux-tux.q/include/asm-sparc64/fcntl.h | 1 linux-tux.q/include/asm-x86_64/unistd.h | 10 linux-tux.q/include/linux/buffer_head.h | 1 linux-tux.q/include/linux/dcache.h | 8 linux-tux.q/include/linux/errno.h | 3 linux-tux.q/include/linux/file.h | 2 linux-tux.q/include/linux/fs.h | 7 linux-tux.q/include/linux/kmod.h | 2 linux-tux.q/include/linux/namei.h | 2 linux-tux.q/include/linux/net.h | 1 linux-tux.q/include/linux/sched.h | 5 linux-tux.q/include/linux/skbuff.h | 2 linux-tux.q/include/linux/socket.h | 4 linux-tux.q/include/net/sock.h | 8 linux-tux.q/include/net/tcp.h | 3 linux-tux.q/include/net/tux.h | 804 +++++++++ linux-tux.q/include/net/tux_u.h | 163 ++ linux-tux.q/kernel/exit.c | 7 linux-tux.q/kernel/fork.c | 1 linux-tux.q/kernel/kmod.c | 28 linux-tux.q/kernel/signal.c | 1 linux-tux.q/mm/filemap.c | 19 linux-tux.q/mm/truncate.c | 2 linux-tux.q/net/Kconfig | 1 linux-tux.q/net/Makefile | 1 linux-tux.q/net/core/sock.c | 5 linux-tux.q/net/ipv4/tcp.c | 3 linux-tux.q/net/ipv4/tcp_input.c | 1 linux-tux.q/net/ipv4/tcp_output.c | 3 linux-tux.q/net/tux/Kconfig | 25 linux-tux.q/net/tux/Makefile | 12 linux-tux.q/net/tux/abuf.c | 190 ++ linux-tux.q/net/tux/accept.c | 863 ++++++++++ linux-tux.q/net/tux/cachemiss.c | 265 +++ linux-tux.q/net/tux/cgi.c | 171 ++ linux-tux.q/net/tux/directory.c | 302 +++ linux-tux.q/net/tux/extcgi.c | 329 ++++ linux-tux.q/net/tux/gzip.c | 40 linux-tux.q/net/tux/input.c | 641 +++++++ linux-tux.q/net/tux/logger.c | 837 ++++++++++ linux-tux.q/net/tux/main.c | 1417 +++++++++++++++++ linux-tux.q/net/tux/mod.c | 262 +++ linux-tux.q/net/tux/output.c | 352 ++++ linux-tux.q/net/tux/parser.h | 102 + linux-tux.q/net/tux/postpone.c | 77 linux-tux.q/net/tux/proc.c | 1149 ++++++++++++++ linux-tux.q/net/tux/proto_ftp.c | 1555 +++++++++++++++++++ linux-tux.q/net/tux/proto_http.c | 2197 +++++++++++++++++++++++++++ linux-tux.q/net/tux/redirect.c | 172 ++ linux-tux.q/net/tux/times.c | 392 ++++ linux-tux.q/net/tux/times.h | 26 linux-tux.q/net/tux/userspace.c | 27 72 files changed, 12697 insertions(+), 32 deletions(-) Index: linux-2.6-tux.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-tux.patch,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- linux-2.6-tux.patch 21 Mar 2006 20:56:19 -0000 1.14 +++ linux-2.6-tux.patch 22 Mar 2006 15:56:30 -0000 1.15 @@ -625,12 +625,11 @@ =================================================================== --- linux-tux.q.orig/include/linux/socket.h +++ linux-tux.q/include/linux/socket.h -@@ -301,6 +301,11 @@ extern int move_addr_to_user(void *kaddr +@@ -301,6 +301,10 @@ extern int move_addr_to_user(void *kaddr extern int move_addr_to_kernel(void __user *uaddr, int ulen, void *kaddr); extern int put_cmsg(struct msghdr*, int level, int type, int len, void *data); +struct socket; -+struct file * sock_map_file(struct socket *sock); +extern int sock_map_fd(struct socket *sock); +extern struct socket *sockfd_lookup(int fd, int *err); + @@ -2029,90 +2028,6 @@ .owner = THIS_MODULE, .llseek = no_llseek, .aio_read = sock_aio_read, -@@ -457,6 +392,83 @@ struct socket *sockfd_lookup(int fd, int - return sock; - } - -+struct file * sock_map_file(struct socket *sock) -+{ -+ struct file *file; -+ struct qstr this; -+ char name[32]; -+ -+ file = get_empty_filp(); -+ -+ if (!file) -+ return ERR_PTR(-ENFILE); -+ -+ this.len = sprintf(name, "[%lu]", SOCK_INODE(sock)->i_ino); -+ this.name = name; -+ this.hash = SOCK_INODE(sock)->i_ino; -+ -+ file->f_dentry = d_alloc(sock_mnt->mnt_sb->s_root, &this); -+ if (!file->f_dentry) { -+ put_filp(file); -+ return ERR_PTR(-ENOMEM); -+ } -+ file->f_dentry->d_op = &sockfs_dentry_operations; -+ d_add(file->f_dentry, SOCK_INODE(sock)); -+ file->f_vfsmnt = mntget(sock_mnt); -+ file->f_mapping = file->f_dentry->d_inode->i_mapping; -+ -+ if (sock->file) -+ BUG(); -+ sock->file = file; -+ file->f_op = SOCK_INODE(sock)->i_fop = &socket_file_ops; -+ file->f_mode = FMODE_READ | FMODE_WRITE; -+ file->f_flags = O_RDWR; -+ file->f_pos = 0; -+ file->private_data = sock; -+ -+ return file; -+} -+ -+/* -+ * Obtains the first available file descriptor and sets it up for use. -+ * -+ * This function creates file structure and maps it to fd space -+ * of current process. On success it returns file descriptor -+ * and file struct implicitly stored in sock->file. -+ * Note that another thread may close file descriptor before we return -+ * from this function. We use the fact that now we do not refer -+ * to socket after mapping. If one day we will need it, this -+ * function will increment ref. count on file by 1. -+ * -+ * In any case returned fd MAY BE not valid! -+ * This race condition is unavoidable -+ * with shared fd spaces, we cannot solve it inside kernel, -+ * but we take care of internal coherence yet. -+ */ -+ -+int sock_map_fd(struct socket *sock) -+{ -+ int fd; -+ struct file *file; -+ -+ /* -+ * Find a file descriptor suitable for return to the user. -+ */ -+ -+ fd = get_unused_fd(); -+ if (fd < 0) -+ return fd; -+ -+ file = sock_map_file(sock); -+ if (IS_ERR(file)) { -+ put_unused_fd(fd); -+ return PTR_ERR(file); -+ } -+ fd_install(fd, file); -+ -+ return fd; -+} -+ - /** - * sock_alloc - allocate a socket - * @@ -465,7 +477,7 @@ struct socket *sockfd_lookup(int fd, int * NULL is returned. */ From fedora-cvs-commits at redhat.com Wed Mar 22 16:14:10 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 22 Mar 2006 11:14:10 -0500 Subject: rpms/smartmontools/devel smartmontools.sysconf, NONE, 1.1 smartd-conf.py, 1.5, 1.6 smartmontools.spec, 1.15, 1.16 Message-ID: <200603221614.k2MGEAZm029312@cvs.devel.redhat.com> Author: tmraz Update of /cvs/dist/rpms/smartmontools/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv29298 Modified Files: smartd-conf.py smartmontools.spec Added Files: smartmontools.sysconf Log Message: * Wed Mar 22 2006 Tomas Mraz - 1:5.33-5 - add default /etc/sysconfig/smartmontools file - ignore errors on startup (#186130) - test drive for SMART support before adding it to smartd.conf --- NEW FILE smartmontools.sysconf --- # command line options for smartd smartd_opts=-q never Index: smartd-conf.py =================================================================== RCS file: /cvs/dist/rpms/smartmontools/devel/smartd-conf.py,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- smartd-conf.py 16 Dec 2005 22:17:09 -0000 1.5 +++ smartd-conf.py 22 Mar 2006 16:14:08 -0000 1.6 @@ -2,6 +2,7 @@ # Copyright 2004 Red Hat, Inc. Distributed under the GPL. # Author: Will Woods import kudzu +import os drives=kudzu.probe(kudzu.CLASS_HD,kudzu.BUS_IDE|kudzu.BUS_SCSI,kudzu.PROBE_ALL) print """# /etc/smartd.conf @@ -50,7 +51,11 @@ if getfile("/sys/block/%s/device/vendor" % drive.device) == 'ATA': driver = '-d ata ' if float(getfile("/sys/module/libata/version")) < 1.20: - comment = "# not yet supported in this kernel version " + comment = "# not yet supported in this kernel version\n# " + if not comment: + status = os.system("/usr/sbin/smartctl -i /dev/%s 2>&1 >/dev/null" % drive.device) + if not os.WIFEXITED(status) or os.WEXITSTATUS(status) != 0: + comment = "# smartctl -i returns error for this drive\n# " print "%s/dev/%s %s-H -m root" % (comment, drive.device, driver) print """ Index: smartmontools.spec =================================================================== RCS file: /cvs/dist/rpms/smartmontools/devel/smartmontools.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- smartmontools.spec 11 Feb 2006 05:42:29 -0000 1.15 +++ smartmontools.spec 22 Mar 2006 16:14:08 -0000 1.16 @@ -1,7 +1,7 @@ Summary: Tools for monitoring SMART capable hard disks Name: smartmontools Version: 5.33 -Release: 4.2 +Release: 5 Epoch: 1 Group: System Environment/Base License: GPL @@ -9,6 +9,7 @@ Source0: http://dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.gz Source1: smartd.initd Source2: smartd-conf.py +Source3: smartmontools.sysconf BuildRoot: %{_tmppath}/%{name}-%{version}-root PreReq: /sbin/chkconfig /sbin/service Requires: fileutils kudzu @@ -39,6 +40,7 @@ rm -f examplescripts/Makefile* install -D -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/smartd install -D -m 755 %{SOURCE2} $RPM_BUILD_ROOT%{_sbindir}/smartd-conf.py +install -D -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/smartmontools %clean rm -rf $RPM_BUILD_ROOT @@ -53,6 +55,7 @@ %{_sysconfdir}/rc.d/init.d/smartd %{_mandir}/man?/smart*.* %ghost %verify(not md5 size mtime) %config(noreplace,missingok) %{_sysconfdir}/smartd.conf +%config(noreplace) %{_sysconfdir}/sysconfig/smartmontools %preun if [ "$1" = "0" ] ; then @@ -69,6 +72,11 @@ %changelog +* Wed Mar 22 2006 Tomas Mraz - 1:5.33-5 +- add default /etc/sysconfig/smartmontools file +- ignore errors on startup (#186130) +- test drive for SMART support before adding it to smartd.conf + * Fri Feb 10 2006 Jesse Keating - 1:5.33-4.2 - bump again for double-long bug on ppc(64) From fedora-cvs-commits at redhat.com Wed Mar 22 16:21:46 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 22 Mar 2006 11:21:46 -0500 Subject: rpms/postgresql-odbc/devel postgresql-odbc.spec,1.13,1.14 Message-ID: <200603221621.k2MGLkHV010710@cvs.devel.redhat.com> Author: tgl Update of /cvs/dist/rpms/postgresql-odbc/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv10696 Modified Files: postgresql-odbc.spec Log Message: Revert library name back to psqlodbc.so; add missing documentation. Index: postgresql-odbc.spec =================================================================== RCS file: /cvs/dist/rpms/postgresql-odbc/devel/postgresql-odbc.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- postgresql-odbc.spec 11 Feb 2006 05:14:08 -0000 1.13 +++ postgresql-odbc.spec 22 Mar 2006 16:21:44 -0000 1.14 @@ -1,7 +1,7 @@ Name: postgresql-odbc Summary: PostgreSQL ODBC driver. Version: 08.01.0200 -Release: 1.2 +Release: 2 License: LGPL Group: Applications/Databases Url: http://gborg.postgresql.org/project/psqlodbc @@ -38,9 +38,11 @@ %build -# Note: the package's build infrastructure does not seem to provide a sane -# way to build or install both the ANSI and Unicode versions of the driver. -# Ideally we should install both, but for now, Unicode only. +# Note: we choose to build only the Unicode version of the driver, which +# we then install under the old library name "psqlodbc.so". We are not +# adopting the "psqlodbcw.so" naming convention because current upstream +# plans are to revert back to the old name in the next release. We can +# always track the name change later if they change their minds ... %configure --with-unixodbc --with-odbcinst=%{_sysconfdir} make @@ -50,8 +52,11 @@ %makeinstall -# Create a symlink to avoid breaking existing odbcinst.ini scripts. -ln -s psqlodbcw.so ${RPM_BUILD_ROOT}%{_libdir}/psqlodbc.so +# rename as per above note, and remove the rather useless .la file +pushd ${RPM_BUILD_ROOT}%{_libdir} + mv psqlodbcw.so psqlodbc.so + rm psqlodbcw.la +popd %clean rm -rf $RPM_BUILD_ROOT @@ -61,11 +66,15 @@ %files %defattr(-,root,root) -%attr(755,root,root) %{_libdir}/psqlodbcw.so -%{_libdir}/psqlodbcw.la -%{_libdir}/psqlodbc.so +%attr(755,root,root) %{_libdir}/psqlodbc.so +%doc license.txt readme.txt docs/* %changelog +* Wed Mar 22 2006 Tom Lane 08.01.0200-2 +- Change library name back to psqlodbc.so, because it appears that upstream + will revert to that name in next release; no point in thrashing the name. +- Include documentation files unaccountably omitted before (bug #184158) + * Fri Feb 10 2006 Jesse Keating - 08.01.0200-1.2 - bump again for double-long bug on ppc(64) From fedora-cvs-commits at redhat.com Wed Mar 22 16:30:57 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 22 Mar 2006 11:30:57 -0500 Subject: rpms/libselinux/FC-5 libselinux.spec,1.182,1.183 Message-ID: <200603221630.k2MGUvQN010976@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/libselinux/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv10961 Modified Files: libselinux.spec Log Message: * Mon Mar 18 2006 Dan Walsh 1.30-1.fc5 - rebuild for FC5 Index: libselinux.spec =================================================================== RCS file: /cvs/dist/rpms/libselinux/FC-5/libselinux.spec,v retrieving revision 1.182 retrieving revision 1.183 diff -u -r1.182 -r1.183 --- libselinux.spec 20 Mar 2006 20:36:57 -0000 1.182 +++ libselinux.spec 22 Mar 2006 16:30:41 -0000 1.183 @@ -7,7 +7,6 @@ License: Public domain (uncopyrighted) Group: System Environment/Libraries Source: http://www.nsa.gov/selinux/archives/%{name}-%{version}.tgz -Patch: libselinux-rhat.patch BuildRequires: libsepol-devel >= %{libsepolver} Requires: libsepol >= %{libsepolver} @@ -51,7 +50,6 @@ %prep %setup -q -%patch -p1 -b .rhat %build make clean From fedora-cvs-commits at redhat.com Wed Mar 22 16:44:13 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 22 Mar 2006 11:44:13 -0500 Subject: rpms/policycoreutils/FC-5 .cvsignore, 1.103, 1.104 policycoreutils-rhat.patch, 1.167, 1.168 policycoreutils.spec, 1.241, 1.242 sources, 1.107, 1.108 Message-ID: <200603221644.k2MGiDtc011132@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/policycoreutils/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv11115 Modified Files: .cvsignore policycoreutils-rhat.patch policycoreutils.spec sources Log Message: * Wed Mar 21 2006 Dan Walsh 1.30.1-2.fc5 - Bump to build in FC5 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/policycoreutils/FC-5/.cvsignore,v retrieving revision 1.103 retrieving revision 1.104 diff -u -r1.103 -r1.104 --- .cvsignore 21 Feb 2006 19:09:17 -0000 1.103 +++ .cvsignore 22 Mar 2006 16:44:10 -0000 1.104 @@ -92,3 +92,4 @@ policycoreutils-1.29.20.tgz policycoreutils-1.29.23.tgz policycoreutils-1.29.26.tgz +policycoreutils-1.30.1.tgz policycoreutils-rhat.patch: Makefile | 2 audit2allow/audit2allow | 16 - restorecond/Makefile | 29 ++ restorecond/restorecond.8 | 31 ++ restorecond/restorecond.c | 451 +++++++++++++++++++++++++++++++++++++++++++ restorecond/restorecond.conf | 4 restorecond/restorecond.h | 31 ++ restorecond/restorecond.init | 61 +++++ restorecond/stringslist.c | 118 +++++++++++ restorecond/stringslist.h | 37 +++ restorecond/utmpwatcher.c | 105 ++++++++++ restorecond/utmpwatcher.h | 29 ++ scripts/fixfiles | 10 13 files changed, 913 insertions(+), 11 deletions(-) View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.167 -r 1.168 policycoreutils-rhat.patch Index: policycoreutils-rhat.patch =================================================================== RCS file: /cvs/dist/rpms/policycoreutils/FC-5/policycoreutils-rhat.patch,v retrieving revision 1.167 retrieving revision 1.168 diff -u -r1.167 -r1.168 --- policycoreutils-rhat.patch 6 Mar 2006 14:45:58 -0000 1.167 +++ policycoreutils-rhat.patch 22 Mar 2006 16:44:10 -0000 1.168 @@ -1,1086 +1,1006 @@ -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/audit2allow/audit2allow policycoreutils-1.29.26/audit2allow/audit2allow ---- nsapolicycoreutils/audit2allow/audit2allow 2005-12-08 12:52:44.000000000 -0500 -+++ policycoreutils-1.29.26/audit2allow/audit2allow 2006-03-06 09:44:31.000000000 -0500 -@@ -25,6 +25,118 @@ - # - # +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/audit2allow/audit2allow policycoreutils-1.30.1/audit2allow/audit2allow +--- nsapolicycoreutils/audit2allow/audit2allow 2006-03-10 09:48:04.000000000 -0500 ++++ policycoreutils-1.30.1/audit2allow/audit2allow 2006-03-21 11:13:31.000000000 -0500 +@@ -27,15 +27,14 @@ import commands, sys, os, pwd, string, getopt, re, selinux -+ -+obj="(\{[^\}]*\}|[^ \t:]*)" -+allow_regexp="allow[ \t]+%s[ \t]*%s[ \t]*:[ \t]*%s[ \t]*%s" % (obj, obj, obj, obj) -+ -+awk_script='/^[[:blank:]]*interface[[:blank:]]*\(/ {\n\ -+ IFACEFILE=FILENAME\n\ -+ IFACENAME = gensub("^[[:blank:]]*interface[[:blank:]]*\\\\(\`?","","g",$0);\n\ -+ IFACENAME = gensub("\'?,.*$","","g",IFACENAME);\n\ -+}\n\ -+\n\ -+/^[[:blank:]]*allow[[:blank:]]+.*;[[:blank:]]*$/ {\n\ -+\n\ -+ if ((length(IFACENAME) > 0) && (IFACEFILE == FILENAME)){\n\ -+ ALLOW = gensub("^[[:blank:]]*","","g",$0)\n\ -+ ALLOW = gensub(";[[:blank:]]*$","","g",$0)\n\ -+ print FILENAME "\\t" IFACENAME "\\t" ALLOW;\n\ -+ }\n\ -+}\ -+' -+ -+class accessTrans: -+ def __init__(self): -+ self.dict={} -+ try: -+ fd=open("/usr/share/selinux/devel/include/support/obj_perm_sets.spt") -+ except IOError, error: -+ raise IOError("Reference policy generation requires the policy development package.\n%s" % error) -+ records=fd.read().split("\n") -+ regexp="^define *\(`([^']*)' *, *` *\{([^}]*)}'" -+ for r in records: -+ m=re.match(regexp,r) -+ if m!=None: -+ self.dict[m.groups()[0]] = m.groups()[1].split() -+ fd.close() -+ def get(self, var): -+ l=[] -+ for v in var: -+ if v in self.dict.keys(): -+ l += self.dict[v] -+ else: -+ if v not in ("{", "}"): -+ l.append(v) -+ return l -+ -+class interfaces: -+ def __init__(self): -+ self.dict={} -+ trans=accessTrans() -+ (input, output) = os.popen2("awk -f - /usr/share/selinux/devel/include/*/*.if 2> /dev/null") -+ input.write(awk_script) -+ input.close() -+ records=output.read().split("\n") -+ input.close() -+ if len(records) > 0: -+ regexp="([^ \t]*)[ \t]+([^ \t]*)[ \t]+%s" % allow_regexp -+ for r in records: -+ m=re.match(regexp,r) -+ if m==None: -+ continue -+ else: -+ val=m.groups() -+ file=os.path.basename(val[0]).split(".")[0] -+ iface=val[1] -+ Scon=val[2].split() -+ Tcon=val[3].split() -+ Class=val[4].split() -+ Access=trans.get(val[5].split()) -+ for s in Scon: -+ for t in Tcon: -+ for c in Class: -+ if (s, t, c) not in self.dict.keys(): -+ self.dict[(s, t, c)]=[] -+ self.dict[(s, t, c)].append((Access, file, iface)) -+ def out(self): -+ keys=self.dict.keys() -+ keys.sort() -+ for k in keys: -+ print k -+ for i in self.dict[k]: -+ print "\t", i -+ -+ def match(self, Scon, Tcon, Class, Access): -+ keys=self.dict.keys() -+ ret=[] -+ if (Scon, Tcon, Class) in keys: -+ for i in self.dict[(Scon, Tcon, Class)]: -+ if Access in i[0]: -+ if i[2].find(Access) >= 0: -+ ret.insert(0, i) -+ else: -+ ret.append(i) -+ return ret -+ if ("$1", Tcon, Class) in keys: -+ for i in self.dict[("$1", Tcon, Class)]: -+ if Access in i[0]: -+ if i[2].find(Access) >= 0: -+ ret.insert(0, i) -+ else: -+ ret.append(i) -+ return ret -+ if (Scon, "$1", Class) in keys: -+ for i in self.dict[(Scon, "$1", Class)]: -+ if Access in i[0]: -+ if i[2].find(Access) >= 0: -+ ret.insert(0, i) -+ else: -+ ret.append(i) -+ return ret -+ else: -+ return ret -+ -+ - class serule: - def __init__(self, type, source, target, seclass): - self.type=type -@@ -32,6 +144,8 @@ - self.target=target - self.seclass=seclass - self.avcinfo={} -+ self.iface=None -+ - def add(self, avc): - for a in avc[0]: - if a not in self.avcinfo.keys(): -@@ -67,6 +181,33 @@ - ret=ret + " : " + i - return ret - -+ def gen_reference_policy(self, iface): -+ ret="" -+ Scon=self.source -+ Tcon=self.gettarget() -+ Class=self.seclass -+ Access=self.getAccess() -+ m=iface.match(Scon,Tcon,Class,Access) -+ if len(m)==0: -+ return self.out() -+ else: -+ file=m[0][1] -+ ret="\n#%s\n"% self.out() -+ ret += "optional_policy(`%s', `\n" % m[0][1] -+ first=True -+ for i in m: -+ if file != i[1]: -+ ret += "')\ngen_require(`%s', `\n" % i[1] -+ file = i[1] -+ first=True -+ if first: -+ ret += "\t%s(%s)\n" % (i[2], Scon) -+ first=False -+ else: -+ ret += "#\t%s(%s)\n" % (i[2], Scon) -+ ret += "');" -+ return ret -+ - def gettarget(self): - if self.source == self.target: - return "self" -@@ -81,7 +222,12 @@ - self.types=[] - self.roles=[] - self.load(input, te_ind) -- -+ self.gen_ref_policy = False -+ -+ def gen_reference_policy(self): -+ self.gen_ref_policy = True -+ self.iface=interfaces() -+ - def warning(self, error): - sys.stderr.write("%s: " % sys.argv[0]) - sys.stderr.write("%s\n" % error) -@@ -104,7 +250,8 @@ - while line: - rec=line.split() - for i in rec: -- if i=="avc:" or i=="message=avc:": -+ if i=="avc:" or i=="message=avc:" or i=="msg='avc:": -+ - found=1 [...1689 lines suppressed...] -- if rc < 0: -- raise ValueError("Could not start semanage transaction") -+ if serange != "": -+ semanage_user_set_mlsrange(self.sh, u, untranslate(serange)) -+ if selevel != "": -+ semanage_user_set_mlslevel(self.sh, u, untranslate(selevel)) -+ -+ if len(roles) != 0: -+ for r in roles: -+ semanage_user_add_role(self.sh, u, r) - -- rc = semanage_user_modify_local(self.sh, k, u) -- if rc < 0: -- raise ValueError("Could not modify SELinux user %s" % name) -+ rc = semanage_begin_transaction(self.sh) -+ if rc < 0: -+ raise ValueError("Could not start semanage transaction") - -- rc = semanage_commit(self.sh) -- if rc < 0: -- raise ValueError("Could not modify SELinux user %s" % name) -+ rc = semanage_user_modify_local(self.sh, k, u) -+ if rc < 0: -+ raise ValueError("Could not modify SELinux user %s" % name) -+ -+ rc = semanage_commit(self.sh) -+ if rc < 0: -+ raise ValueError("Could not modify SELinux user %s" % name) -+ -+ except ValueError, error: -+ mylog.log(0,"modify SELinux user record", name, seuser, seroles, serange, oldseuser, oldseroles, olrserange) -+ raise error - -+ mylog.log(1,"modify SELinux user record", name, seuser, seroles, serange, oldseuser, oldseroles, olrserange) - semanage_user_key_free(k) - semanage_user_free(u) - - def delete(self, name): -- (rc,k) = semanage_user_key_create(self.sh, name) -- if rc < 0: -- raise ValueError("Could not create a key for %s" % name) -- -- (rc,exists) = semanage_user_exists(self.sh, k) -- if rc < 0: -- raise ValueError("Could not check if SELinux user %s is defined" % name) -- if not exists: -- raise ValueError("SELinux user %s is not defined" % name) -+ try: -+ (rc,k) = semanage_user_key_create(self.sh, name) -+ if rc < 0: -+ raise ValueError("Could not create a key for %s" % name) -+ -+ (rc,exists) = semanage_user_exists(self.sh, k) -+ if rc < 0: -+ raise ValueError("Could not check if SELinux user %s is defined" % name) -+ if not exists: -+ raise ValueError("SELinux user %s is not defined" % name) - -- (rc,exists) = semanage_user_exists_local(self.sh, k) -- if rc < 0: -- raise ValueError("Could not check if SELinux user %s is defined" % name) -- if not exists: -- raise ValueError("SELinux user %s is defined in policy, cannot be deleted" % name) -+ (rc,exists) = semanage_user_exists_local(self.sh, k) -+ if rc < 0: -+ raise ValueError("Could not check if SELinux user %s is defined" % name) -+ if not exists: -+ raise ValueError("SELinux user %s is defined in policy, cannot be deleted" % name) - -- rc = semanage_begin_transaction(self.sh) -- if rc < 0: -- raise ValueError("Could not start semanage transaction") -+ rc = semanage_begin_transaction(self.sh) -+ if rc < 0: -+ raise ValueError("Could not start semanage transaction") - -- rc = semanage_user_del_local(self.sh, k) -- if rc < 0: -- raise ValueError("Could not delete SELinux user %s" % name) -+ rc = semanage_user_del_local(self.sh, k) -+ if rc < 0: -+ raise ValueError("Could not delete SELinux user %s" % name) - -- rc = semanage_commit(self.sh) -- if rc < 0: -- raise ValueError("Could not delete SELinux user %s" % name) -+ rc = semanage_commit(self.sh) -+ if rc < 0: -+ raise ValueError("Could not delete SELinux user %s" % name) -+ except ValueError, error: -+ mylog.log(0,"delete SELinux user record", name) -+ raise error - -+ mylog.log(1,"delete SELinux user record", name) - semanage_user_key_free(k) - - def get_all(self): -@@ -462,14 +553,20 @@ - return ddict - - def list(self, heading=1): -- if heading: -- print "\n%-15s %-10s %-30s" % ("", "MLS/", "MLS/") -- print "%-15s %-10s %-30s %s\n" % ("SELinux User", "MCS Level", "MCS Range", "SELinux Roles") - ddict=self.get_all() - keys=ddict.keys() - keys.sort() -- for k in keys: -- print "%-15s %-10s %-30s %s" % (k, translate(ddict[k][0]), translate(ddict[k][1]), ddict[k][2]) -+ if is_mls_enabled == 1: -+ if heading: -+ print "\n%-15s %-10s %-30s" % ("", "MLS/", "MLS/") -+ print "%-15s %-10s %-30s %s\n" % ("SELinux User", "MCS Level", "MCS Range", "SELinux Roles") -+ for k in keys: -+ print "%-15s %-10s %-30s %s" % (k, translate(ddict[k][0]), translate(ddict[k][1]), ddict[k][2]) -+ else: -+ if heading: -+ print "%-15s %s\n" % ("SELinux User", "SELinux Roles") -+ for k in keys: -+ print "%-15s %s" % (k, ddict[k][2]) - - class portRecords(semanageRecords): - def __init__(self): -@@ -500,10 +597,11 @@ - return ( k, proto_d, low, high ) - - def add(self, port, proto, serange, type): -- if serange == "": -- serange="s0" -- else: -- serange=untranslate(serange) -+ if is_mls_enabled == 1: -+ if serange == "": -+ serange="s0" -+ else: -+ serange=untranslate(serange) - - if type == "": - raise ValueError("Type is required") -@@ -564,7 +662,10 @@ - - def modify(self, port, proto, serange, setype): - if serange == "" and setype == "": -- raise ValueError("Requires setype or serange") -+ if is_mls_enabled == 1: -+ raise ValueError("Requires setype or serange") -+ else: -+ raise ValueError("Requires setype") - - ( k, proto_d, low, high ) = self.__genkey(port, proto) - -@@ -688,10 +789,11 @@ - semanageRecords.__init__(self) - - def add(self, interface, serange, ctype): -- if serange == "": -- serange="s0" -- else: -- serange=untranslate(serange) -+ if is_mls_enabled == 1: -+ if serange == "": -+ serange="s0" -+ else: -+ serange=untranslate(serange) - - if ctype == "": - raise ValueError("SELinux Type is required") -@@ -869,14 +971,14 @@ - self.file_types["named pipe"] = SEMANAGE_FCONTEXT_PIPE; - - -- def add(self, target, type, ftype="", serange="s0", seuser="system_u"): -+ def add(self, target, type, ftype="", serange="", seuser="system_u"): - if seuser == "": - seuser="system_u" -- -- if serange == "": -- serange="s0" -- else: -- serange=untranslate(serange) -+ if is_mls_enabled == 1: -+ if serange == "": -+ serange="s0" -+ else: -+ serange=untranslate(serange) - - if type == "": - raise ValueError("SELinux Type is required") -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/setsebool/Makefile policycoreutils-1.29.26/setsebool/Makefile ---- nsapolicycoreutils/setsebool/Makefile 2005-11-04 15:37:49.000000000 -0500 -+++ policycoreutils-1.29.26/setsebool/Makefile 2006-02-25 06:56:54.000000000 -0500 -@@ -17,6 +17,8 @@ - install: all - -mkdir -p $(SBINDIR) - install -m 755 setsebool $(SBINDIR) -+ -mkdir -p $(MANDIR)/man8 -+ install -m 644 setsebool.8 $(MANDIR)/man8/ - - relabel: - Index: policycoreutils.spec =================================================================== RCS file: /cvs/dist/rpms/policycoreutils/FC-5/policycoreutils.spec,v retrieving revision 1.241 retrieving revision 1.242 diff -u -r1.241 -r1.242 --- policycoreutils.spec 10 Mar 2006 19:19:11 -0000 1.241 +++ policycoreutils.spec 22 Mar 2006 16:44:10 -0000 1.242 @@ -1,11 +1,11 @@ %define libauditver 1.1.4-3 -%define libsepolver 1.11.18-1 -%define libsemanagever 1.5.28-1 -%define libselinuxver 1.29.7-1 +%define libsepolver 1.12-1 +%define libsemanagever 1.6-1 +%define libselinuxver 1.30-1 Summary: SELinux policy core utilities. Name: policycoreutils -Version: 1.29.26 -Release: 6 +Version: 1.30.1 +Release: 2.fc5 License: GPL Group: System Environment/Base Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz @@ -42,6 +42,7 @@ %install rm -rf ${RPM_BUILD_ROOT} +mkdir -p $RPM_BUILD_ROOT/etc/rc.d/init.d mkdir -p ${RPM_BUILD_ROOT}%{_bindir} mkdir -p ${RPM_BUILD_ROOT}%{_sbindir} mkdir -p ${RPM_BUILD_ROOT}/sbin @@ -57,8 +58,9 @@ %files -f %{name}.lang %defattr(-,root,root) -/sbin/fixfiles /sbin/restorecon +/sbin/fixfiles +%{_sbindir}/restorecond %{_sbindir}/setfiles %{_sbindir}/setsebool %{_sbindir}/semodule @@ -76,6 +78,7 @@ %{_bindir}/semodule_link %{_bindir}/semodule_package %{_mandir}/man8/chcat.8.gz +%{_mandir}/man8/restorecond.8.gz %{_mandir}/man8/restorecon.8.gz %{_mandir}/man8/sestatus.8.gz %{_mandir}/man8/semanage.8.gz @@ -97,8 +100,43 @@ %config %{_sysconfdir}/pam.d/run_init %config(noreplace) %{_sysconfdir}/sestatus.conf %{_libdir}/python2.4/site-packages/seobject.py* +%attr(755,root,root) /etc/rc.d/init.d/restorecond +%config(noreplace) /etc/selinux/restorecond.conf + +%post +service restorecond condrestart %changelog +* Wed Mar 21 2006 Dan Walsh 1.30.1-2.fc5 +- Bump to build in FC5 + +* Tue Mar 21 2006 Dan Walsh 1.30.1-2 +- make restorecond only ignore non directories with lnk > 1 + +* Tue Mar 21 2006 Dan Walsh 1.30.1-1 +- Make audit2allow translate dontaudit as well as allow rules +- Update from upstream + * Merged semanage labeling prefix patch from Ivan Gyurdiev. + +* Tue Mar 21 2006 Dan Walsh 1.30-5 +- Fix audit2allow to retrieve dontaudit rules + +* Mon Mar 20 2006 Dan Walsh 1.30-4 +- Open file descriptor to make sure file does not change from underneath. + +* Fri Mar 17 2006 Dan Walsh 1.30-3 +- Fixes for restorecond attack via symlinks +- Fixes for fixfiles + +* Fri Mar 17 2006 Dan Walsh 1.30-2 +- Restorecon has to handle suspend/resume + +* Fri Mar 17 2006 Dan Walsh 1.30-1 +- Update to upstream + +* Fri Mar 10 2006 Dan Walsh 1.29.27-1 +- Add restorecond + * Fri Mar 10 2006 Dan Walsh 1.29.26-6 - Remove prereq Index: sources =================================================================== RCS file: /cvs/dist/rpms/policycoreutils/FC-5/sources,v retrieving revision 1.107 retrieving revision 1.108 diff -u -r1.107 -r1.108 --- sources 21 Feb 2006 19:09:17 -0000 1.107 +++ sources 22 Mar 2006 16:44:10 -0000 1.108 @@ -1 +1 @@ -58fe44013f3515957fc626d0c11baf7c policycoreutils-1.29.26.tgz +a1f4732b7c4d047a437d489b620a2895 policycoreutils-1.30.1.tgz From fedora-cvs-commits at redhat.com Wed Mar 22 16:45:47 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 22 Mar 2006 11:45:47 -0500 Subject: rpms/jakarta-commons-lang/devel jakarta-commons-lang.spec, 1.11, 1.12 Message-ID: <200603221645.k2MGjlMY013630@cvs.devel.redhat.com> Author: rafaels Update of /cvs/dist/rpms/jakarta-commons-lang/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv13150 Modified Files: jakarta-commons-lang.spec Log Message: Fixed broken URL and nativized. Index: jakarta-commons-lang.spec =================================================================== RCS file: /cvs/dist/rpms/jakarta-commons-lang/devel/jakarta-commons-lang.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- jakarta-commons-lang.spec 6 Mar 2006 23:06:16 -0000 1.11 +++ jakarta-commons-lang.spec 22 Mar 2006 16:45:44 -0000 1.12 @@ -5,19 +5,21 @@ Name: %{name} Version: 2.0 -Release: 2jpp_4fc +Release: 2jpp_5fc Epoch: 0 Summary: Jakarta Commons Lang Package License: Apache Software License Group: Development/Libraries/Java -URL: http://jakarta.apache.org/commons/lang.html +URL: http://jakarta.apache.org/commons/lang/ Source0: commons-lang-2.0-src-RHCLEAN.tar.bz2 Patch0: %{name}-crosslink.patch Patch1: %{name}-notarget.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot -BuildArch: noarch BuildRequires: ant, junit, jpackage-utils >= 0:1.5 +BuildRequires: java-gcj-compat-devel >= 1.0.31 +Requires(post): java-gcj-compat >= 1.0.31 +Requires(postun): java-gcj-compat >= 1.0.31 %description The standard Java libraries fail to provide enough methods for @@ -70,20 +72,24 @@ cp -pr dist/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink +aot-compile-rpm %clean rm -rf $RPM_BUILD_ROOT - %post javadoc rm -f %{_javadocdir}/%{name} ln -s %{name}-%{version} %{_javadocdir}/%{name} +%{_bindir}/rebuild-gcj-db +%postun +%{_bindir}/rebuild-gcj-db %files %defattr(0644,root,root,0755) %doc PROPOSAL.html STATUS.html LICENSE.txt RELEASE-NOTES.txt %{_javadir}/* +%attr(-,root,root) %{_libdir}/gcj/%{name} %files javadoc %defattr(0644,root,root,0755) @@ -92,6 +98,9 @@ %changelog +* Wed Mar 22 2006 Rafael Schloming - 0:2.0-2jpp_5fc +- Fixed broken URL and nativized. + * Mon Mar 6 2006 Jeremy Katz - 0:2.0-2jpp_4fc - stop scriptlet spew From fedora-cvs-commits at redhat.com Wed Mar 22 16:49:18 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 22 Mar 2006 11:49:18 -0500 Subject: rpms/checkpolicy/FC-5 checkpolicy.spec,1.94,1.95 Message-ID: <200603221649.k2MGnIsX024979@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/checkpolicy/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv24965 Modified Files: checkpolicy.spec Log Message: * Wed Mar 22 2006 Dan Walsh - 1.30-1.fc5 - Bump for FC5 Index: checkpolicy.spec =================================================================== RCS file: /cvs/dist/rpms/checkpolicy/FC-5/checkpolicy.spec,v retrieving revision 1.94 retrieving revision 1.95 diff -u -r1.94 -r1.95 --- checkpolicy.spec 17 Feb 2006 20:00:08 -0000 1.94 +++ checkpolicy.spec 22 Mar 2006 16:49:15 -0000 1.95 @@ -1,8 +1,8 @@ -%define libsepolver 1.11.18-1 +%define libsepolver 1.12-1 Summary: SELinux policy compiler Name: checkpolicy -Version: 1.29.4 -Release: 1 +Version: 1.30 +Release: 1.fc5 License: GPL Group: Development/System Source: http://www.nsa.gov/selinux/archives/%{name}-%{version}.tgz @@ -47,7 +47,15 @@ %{_mandir}/man8/checkmodule.8.gz %changelog -* Fri Feb 16 2006 Dan Walsh - 1.29.4-1 +* Wed Mar 22 2006 Dan Walsh - 1.30-1.fc5 +- Bump for FC5 + +* Fri Mar 17 2006 Dan Walsh - 1.30-1 +- Latest upgrade from NSA + * Updated version for release. + * Fixed bug in role dominance (define_role_dom). + +* Fri Feb 17 2006 Dan Walsh - 1.29.4-1 - Latest upgrade from NSA * Added a check for failure to declare each sensitivity in a level definition. From fedora-cvs-commits at redhat.com Wed Mar 22 16:50:57 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 22 Mar 2006 11:50:57 -0500 Subject: rpms/libsemanage/FC-5 libsemanage.spec,1.78,1.79 Message-ID: <200603221650.k2MGovAT025139@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/libsemanage/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv25125 Modified Files: libsemanage.spec Log Message: * Mon Mar 18 2006 Dan Walsh - 1.6-1.fc5 - Rebuild for FC5 Index: libsemanage.spec =================================================================== RCS file: /cvs/dist/rpms/libsemanage/FC-5/libsemanage.spec,v retrieving revision 1.78 retrieving revision 1.79 diff -u -r1.78 -r1.79 --- libsemanage.spec 20 Mar 2006 20:41:19 -0000 1.78 +++ libsemanage.spec 22 Mar 2006 16:50:55 -0000 1.79 @@ -3,7 +3,7 @@ Summary: SELinux binary policy manipulation library Name: libsemanage Version: 1.6 -Release: 1 +Release: 1.fc5 License: GPL Group: System Environment/Libraries Source: http://www.nsa.gov/selinux/archives/libsemanage-%{version}.tgz From fedora-cvs-commits at redhat.com Wed Mar 22 16:51:17 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 22 Mar 2006 11:51:17 -0500 Subject: rpms/checkpolicy/FC-5 .cvsignore,1.57,1.58 sources,1.58,1.59 Message-ID: <200603221651.k2MGpH9g025189@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/checkpolicy/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv25175 Modified Files: .cvsignore sources Log Message: * Wed Mar 22 2006 Dan Walsh - 1.30-1.fc5 - Bump for FC5 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/checkpolicy/FC-5/.cvsignore,v retrieving revision 1.57 retrieving revision 1.58 diff -u -r1.57 -r1.58 --- .cvsignore 16 Feb 2006 18:44:15 -0000 1.57 +++ .cvsignore 22 Mar 2006 16:51:15 -0000 1.58 @@ -40,3 +40,4 @@ checkpolicy-1.29.1.tgz checkpolicy-1.29.2.tgz checkpolicy-1.29.4.tgz +checkpolicy-1.30.tgz Index: sources =================================================================== RCS file: /cvs/dist/rpms/checkpolicy/FC-5/sources,v retrieving revision 1.58 retrieving revision 1.59 diff -u -r1.58 -r1.59 --- sources 16 Feb 2006 18:44:15 -0000 1.58 +++ sources 22 Mar 2006 16:51:15 -0000 1.59 @@ -1 +1 @@ -ccc15309265965702935f2a2f5107389 checkpolicy-1.29.4.tgz +20f388415dbdd002f0cb3bf726df0536 checkpolicy-1.30.tgz From fedora-cvs-commits at redhat.com Wed Mar 22 17:34:56 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 22 Mar 2006 12:34:56 -0500 Subject: rpms/sendmail/devel sendmail-8.13.6-dynamic.patch, NONE, 1.1 .cvsignore, 1.16, 1.17 sendmail.spec, 1.65, 1.66 sources, 1.16, 1.17 Message-ID: <200603221734.k2MHYucU007040@cvs.devel.redhat.com> Author: twoerner Update of /cvs/dist/rpms/sendmail/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv7015 Modified Files: .cvsignore sendmail.spec sources Added Files: sendmail-8.13.6-dynamic.patch Log Message: [tw] - new version 8.13.6 (fixes VU#834865) - dropped libmilter-sigwait patch (fixed in 8.13.6) sendmail-8.13.6-dynamic.patch: devtools/OS/Linux | 10 +++++----- libsm/Makefile.m4 | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) --- NEW FILE sendmail-8.13.6-dynamic.patch --- --- sendmail-8.13.6/libsm/Makefile.m4.dynamic 2005-12-22 19:31:11.000000000 +0100 +++ sendmail-8.13.6/libsm/Makefile.m4 2006-03-22 18:23:34.000000000 +0100 @@ -5,7 +5,7 @@ define(`confREQUIRE_LIBSM', `true') PREPENDDEF(`confENVDEF', `confMAPDEF') bldPRODUCT_START(`library', `libsm') -define(`bldSOURCES', ` assert.c debug.c errstring.c exc.c heap.c match.c rpool.c strdup.c strerror.c strl.c clrerr.c fclose.c feof.c ferror.c fflush.c fget.c fpos.c findfp.c flags.c fopen.c fprintf.c fpurge.c fput.c fread.c fscanf.c fseek.c fvwrite.c fwalk.c fwrite.c get.c makebuf.c put.c refill.c rewind.c setvbuf.c smstdio.c snprintf.c sscanf.c stdio.c strio.c ungetc.c vasprintf.c vfprintf.c vfscanf.c vprintf.c vsnprintf.c wbuf.c wsetup.c string.c stringf.c xtrap.c strto.c test.c path.c strcasecmp.c strrevcmp.c signal.c clock.c config.c shm.c sem.c mbdb.c strexit.c cf.c ldap.c niprop.c mpeix.c memstat.c ') +define(`bldSOURCES', ` assert.c debug.c errstring.c exc.c heap.c match.c rpool.c strdup.c strl.c clrerr.c fclose.c feof.c ferror.c fflush.c fget.c fpos.c findfp.c flags.c fopen.c fprintf.c fpurge.c fput.c fread.c fscanf.c fseek.c fvwrite.c fwalk.c fwrite.c get.c makebuf.c put.c refill.c rewind.c setvbuf.c smstdio.c snprintf.c sscanf.c stdio.c strio.c ungetc.c vasprintf.c vfprintf.c vfscanf.c vprintf.c vsnprintf.c wbuf.c wsetup.c string.c stringf.c xtrap.c strto.c test.c path.c strcasecmp.c strrevcmp.c signal.c clock.c config.c shm.c sem.c mbdb.c strexit.c cf.c ldap.c niprop.c mpeix.c memstat.c ') bldPRODUCT_END dnl msg.c dnl syslogio.c --- sendmail-8.13.6/devtools/OS/Linux.dynamic 2006-03-22 18:17:08.000000000 +0100 +++ sendmail-8.13.6/devtools/OS/Linux 2006-03-22 18:17:09.000000000 +0100 @@ -6,7 +6,7 @@ define(`confDEPEND_TYPE', `CC-M') define(`confSM_OS_HEADER', `sm_os_linux') define(`confMANROOT', `/usr/share/man/man') -define(`confLIBS', `-ldl') +define(`confLIBS', `-pie -ldl') define(`confEBINDIR', `/usr/sbin') APPENDDEF(`confLIBSEARCH', `crypt nsl') @@ -21,19 +21,19 @@ ifelse(confBLDVARIANT, `DEBUG', dnl Debug build ` - define(`confOPTIMIZE',`-g -Wall') + define(`confOPTIMIZE',`-g -Wall -fpie') ', dnl Optimized build confBLDVARIANT, `OPTIMIZED', ` - define(`confOPTIMIZE',`-O2') + define(`confOPTIMIZE',`-O2 -fpie') ', dnl Purify build confBLDVARIANT, `PURIFY', ` - define(`confOPTIMIZE',`-g') + define(`confOPTIMIZE',`-g -fpie') ', dnl default ` - define(`confOPTIMIZE',`-O2') + define(`confOPTIMIZE',`-O2 -fpie') ') Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/sendmail/devel/.cvsignore,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- .cvsignore 19 Sep 2005 11:02:38 -0000 1.16 +++ .cvsignore 22 Mar 2006 17:34:16 -0000 1.17 @@ -3,3 +3,4 @@ sendmail.8.13.3.tar.gz sendmail.8.13.4.tar.gz sendmail.8.13.5.tar.gz +sendmail.8.13.6.tar.gz Index: sendmail.spec =================================================================== RCS file: /cvs/dist/rpms/sendmail/devel/sendmail.spec,v retrieving revision 1.65 retrieving revision 1.66 diff -u -r1.65 -r1.66 --- sendmail.spec 17 Feb 2006 16:57:15 -0000 1.65 +++ sendmail.spec 22 Mar 2006 17:34:35 -0000 1.66 @@ -17,8 +17,8 @@ Summary: A widely used Mail Transport Agent (MTA). Name: sendmail -Version: 8.13.5 -Release: 3 +Version: 8.13.6 +Release: 1 License: Sendmail Group: System Environment/Daemons Provides: smtpdaemon @@ -40,9 +40,8 @@ Patch7: sendmail-8.13.0-pid.patch Patch9: sendmail-8.12.7-hesiod.patch Patch10: sendmail-8.12.7-manpage.patch -Patch11: sendmail-8.13.4-dynamic.patch +Patch11: sendmail-8.13.6-dynamic.patch Patch12: sendmail-8.13.0-cyrus.patch -Patch13: sendmail-8.13.4-libmilter-sigwait.patch Buildroot: %{_tmppath}/%{name}-root BuildRequires: tcp_wrappers BuildRequires: db4-devel @@ -137,7 +136,6 @@ %patch10 -p1 -b .manpage %patch11 -p1 -b .dynamic %patch12 -p1 -b .cyrus -%patch13 -p0 -b .libmilter-sigwait %build # generate redhat config file @@ -579,6 +577,10 @@ %{_docdir}/sendmail %changelog +* Wed Mar 22 2006 Thomas Woerner 8.13.6.1 +- new version 8.13.6 (fixes VU#834865) +- dropped libmilter-sigwait patch (fixed in 8.13.6) + * Fri Feb 17 2006 Thomas Woerner 8.13.5-3 - fixed selinuxenabled path in initscript - fixed error handling with sigwait (#137709) Index: sources =================================================================== RCS file: /cvs/dist/rpms/sendmail/devel/sources,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- sources 19 Sep 2005 11:02:38 -0000 1.16 +++ sources 22 Mar 2006 17:34:35 -0000 1.17 @@ -1 +1,2 @@ f4550d8dcc55771f4a81e999c7d6df20 sendmail.8.13.5.tar.gz +484cca51f74b5e562b3cf119ceb2f900 sendmail.8.13.6.tar.gz From fedora-cvs-commits at redhat.com Wed Mar 22 17:37:40 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 22 Mar 2006 12:37:40 -0500 Subject: rpms/sendmail/devel sendmail.spec,1.66,1.67 Message-ID: <200603221737.k2MHbeoj007104@cvs.devel.redhat.com> Author: twoerner Update of /cvs/dist/rpms/sendmail/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv7088 Modified Files: sendmail.spec Log Message: [tw] - fixed typo in changelog Index: sendmail.spec =================================================================== RCS file: /cvs/dist/rpms/sendmail/devel/sendmail.spec,v retrieving revision 1.66 retrieving revision 1.67 diff -u -r1.66 -r1.67 --- sendmail.spec 22 Mar 2006 17:34:35 -0000 1.66 +++ sendmail.spec 22 Mar 2006 17:37:38 -0000 1.67 @@ -577,7 +577,7 @@ %{_docdir}/sendmail %changelog -* Wed Mar 22 2006 Thomas Woerner 8.13.6.1 +* Wed Mar 22 2006 Thomas Woerner 8.13.6-1 - new version 8.13.6 (fixes VU#834865) - dropped libmilter-sigwait patch (fixed in 8.13.6) From fedora-cvs-commits at redhat.com Wed Mar 22 17:43:14 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 22 Mar 2006 12:43:14 -0500 Subject: rpms/sendmail/FC-5 sendmail-8.13.6-dynamic.patch, NONE, 1.1 .cvsignore, 1.16, 1.17 sendmail.spec, 1.65, 1.66 sources, 1.16, 1.17 Message-ID: <200603221743.k2MHhEHK007205@cvs.devel.redhat.com> Author: twoerner Update of /cvs/dist/rpms/sendmail/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv7189 Modified Files: .cvsignore sendmail.spec sources Added Files: sendmail-8.13.6-dynamic.patch Log Message: [tw] - new version 8.13.6 (fixes VU#834865) - dropped libmilter-sigwait patch (fixed in 8.13.6) sendmail-8.13.6-dynamic.patch: devtools/OS/Linux | 10 +++++----- libsm/Makefile.m4 | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) --- NEW FILE sendmail-8.13.6-dynamic.patch --- --- sendmail-8.13.6/libsm/Makefile.m4.dynamic 2005-12-22 19:31:11.000000000 +0100 +++ sendmail-8.13.6/libsm/Makefile.m4 2006-03-22 18:23:34.000000000 +0100 @@ -5,7 +5,7 @@ define(`confREQUIRE_LIBSM', `true') PREPENDDEF(`confENVDEF', `confMAPDEF') bldPRODUCT_START(`library', `libsm') -define(`bldSOURCES', ` assert.c debug.c errstring.c exc.c heap.c match.c rpool.c strdup.c strerror.c strl.c clrerr.c fclose.c feof.c ferror.c fflush.c fget.c fpos.c findfp.c flags.c fopen.c fprintf.c fpurge.c fput.c fread.c fscanf.c fseek.c fvwrite.c fwalk.c fwrite.c get.c makebuf.c put.c refill.c rewind.c setvbuf.c smstdio.c snprintf.c sscanf.c stdio.c strio.c ungetc.c vasprintf.c vfprintf.c vfscanf.c vprintf.c vsnprintf.c wbuf.c wsetup.c string.c stringf.c xtrap.c strto.c test.c path.c strcasecmp.c strrevcmp.c signal.c clock.c config.c shm.c sem.c mbdb.c strexit.c cf.c ldap.c niprop.c mpeix.c memstat.c ') +define(`bldSOURCES', ` assert.c debug.c errstring.c exc.c heap.c match.c rpool.c strdup.c strl.c clrerr.c fclose.c feof.c ferror.c fflush.c fget.c fpos.c findfp.c flags.c fopen.c fprintf.c fpurge.c fput.c fread.c fscanf.c fseek.c fvwrite.c fwalk.c fwrite.c get.c makebuf.c put.c refill.c rewind.c setvbuf.c smstdio.c snprintf.c sscanf.c stdio.c strio.c ungetc.c vasprintf.c vfprintf.c vfscanf.c vprintf.c vsnprintf.c wbuf.c wsetup.c string.c stringf.c xtrap.c strto.c test.c path.c strcasecmp.c strrevcmp.c signal.c clock.c config.c shm.c sem.c mbdb.c strexit.c cf.c ldap.c niprop.c mpeix.c memstat.c ') bldPRODUCT_END dnl msg.c dnl syslogio.c --- sendmail-8.13.6/devtools/OS/Linux.dynamic 2006-03-22 18:17:08.000000000 +0100 +++ sendmail-8.13.6/devtools/OS/Linux 2006-03-22 18:17:09.000000000 +0100 @@ -6,7 +6,7 @@ define(`confDEPEND_TYPE', `CC-M') define(`confSM_OS_HEADER', `sm_os_linux') define(`confMANROOT', `/usr/share/man/man') -define(`confLIBS', `-ldl') +define(`confLIBS', `-pie -ldl') define(`confEBINDIR', `/usr/sbin') APPENDDEF(`confLIBSEARCH', `crypt nsl') @@ -21,19 +21,19 @@ ifelse(confBLDVARIANT, `DEBUG', dnl Debug build ` - define(`confOPTIMIZE',`-g -Wall') + define(`confOPTIMIZE',`-g -Wall -fpie') ', dnl Optimized build confBLDVARIANT, `OPTIMIZED', ` - define(`confOPTIMIZE',`-O2') + define(`confOPTIMIZE',`-O2 -fpie') ', dnl Purify build confBLDVARIANT, `PURIFY', ` - define(`confOPTIMIZE',`-g') + define(`confOPTIMIZE',`-g -fpie') ', dnl default ` - define(`confOPTIMIZE',`-O2') + define(`confOPTIMIZE',`-O2 -fpie') ') Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/sendmail/FC-5/.cvsignore,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- .cvsignore 19 Sep 2005 11:02:38 -0000 1.16 +++ .cvsignore 22 Mar 2006 17:43:12 -0000 1.17 @@ -3,3 +3,4 @@ sendmail.8.13.3.tar.gz sendmail.8.13.4.tar.gz sendmail.8.13.5.tar.gz +sendmail.8.13.6.tar.gz Index: sendmail.spec =================================================================== RCS file: /cvs/dist/rpms/sendmail/FC-5/sendmail.spec,v retrieving revision 1.65 retrieving revision 1.66 diff -u -r1.65 -r1.66 --- sendmail.spec 17 Feb 2006 16:57:15 -0000 1.65 +++ sendmail.spec 22 Mar 2006 17:43:12 -0000 1.66 @@ -17,8 +17,8 @@ Summary: A widely used Mail Transport Agent (MTA). Name: sendmail -Version: 8.13.5 -Release: 3 +Version: 8.13.6 +Release: 0.FC5.1 License: Sendmail Group: System Environment/Daemons Provides: smtpdaemon @@ -40,9 +40,8 @@ Patch7: sendmail-8.13.0-pid.patch Patch9: sendmail-8.12.7-hesiod.patch Patch10: sendmail-8.12.7-manpage.patch -Patch11: sendmail-8.13.4-dynamic.patch +Patch11: sendmail-8.13.6-dynamic.patch Patch12: sendmail-8.13.0-cyrus.patch -Patch13: sendmail-8.13.4-libmilter-sigwait.patch Buildroot: %{_tmppath}/%{name}-root BuildRequires: tcp_wrappers BuildRequires: db4-devel @@ -137,7 +136,6 @@ %patch10 -p1 -b .manpage %patch11 -p1 -b .dynamic %patch12 -p1 -b .cyrus -%patch13 -p0 -b .libmilter-sigwait %build # generate redhat config file @@ -579,6 +577,10 @@ %{_docdir}/sendmail %changelog +* Wed Mar 22 2006 Thomas Woerner 8.13.6-0.FC5.1 +- new version 8.13.6 (fixes VU#834865) +- dropped libmilter-sigwait patch (fixed in 8.13.6) + * Fri Feb 17 2006 Thomas Woerner 8.13.5-3 - fixed selinuxenabled path in initscript - fixed error handling with sigwait (#137709) Index: sources =================================================================== RCS file: /cvs/dist/rpms/sendmail/FC-5/sources,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- sources 19 Sep 2005 11:02:38 -0000 1.16 +++ sources 22 Mar 2006 17:43:12 -0000 1.17 @@ -1 +1 @@ -f4550d8dcc55771f4a81e999c7d6df20 sendmail.8.13.5.tar.gz +484cca51f74b5e562b3cf119ceb2f900 sendmail.8.13.6.tar.gz From fedora-cvs-commits at redhat.com Wed Mar 22 17:49:48 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 22 Mar 2006 12:49:48 -0500 Subject: rpms/sendmail/FC-4 sendmail-8.13.6-dynamic.patch, NONE, 1.1 .cvsignore, 1.15, 1.16 sendmail-redhat.mc, 1.13, 1.14 sendmail.init, 1.13, 1.14 sendmail.spec, 1.57, 1.58 sources, 1.15, 1.16 Message-ID: <200603221749.k2MHnmVL021143@cvs.devel.redhat.com> Author: twoerner Update of /cvs/dist/rpms/sendmail/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv21125 Modified Files: .cvsignore sendmail-redhat.mc sendmail.init sendmail.spec sources Added Files: sendmail-8.13.6-dynamic.patch Log Message: [tw] - new version 8.13.6 (fixes VU#834865) - dropped libmilter-sigwait patch (fixed in 8.13.6) - fixed selinuxenabled path in initscript - appended 'dnl' to cert tags in sendmail.mc - fixed email address in changelog sendmail-8.13.6-dynamic.patch: devtools/OS/Linux | 10 +++++----- libsm/Makefile.m4 | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) --- NEW FILE sendmail-8.13.6-dynamic.patch --- --- sendmail-8.13.6/libsm/Makefile.m4.dynamic 2005-12-22 19:31:11.000000000 +0100 +++ sendmail-8.13.6/libsm/Makefile.m4 2006-03-22 18:23:34.000000000 +0100 @@ -5,7 +5,7 @@ define(`confREQUIRE_LIBSM', `true') PREPENDDEF(`confENVDEF', `confMAPDEF') bldPRODUCT_START(`library', `libsm') -define(`bldSOURCES', ` assert.c debug.c errstring.c exc.c heap.c match.c rpool.c strdup.c strerror.c strl.c clrerr.c fclose.c feof.c ferror.c fflush.c fget.c fpos.c findfp.c flags.c fopen.c fprintf.c fpurge.c fput.c fread.c fscanf.c fseek.c fvwrite.c fwalk.c fwrite.c get.c makebuf.c put.c refill.c rewind.c setvbuf.c smstdio.c snprintf.c sscanf.c stdio.c strio.c ungetc.c vasprintf.c vfprintf.c vfscanf.c vprintf.c vsnprintf.c wbuf.c wsetup.c string.c stringf.c xtrap.c strto.c test.c path.c strcasecmp.c strrevcmp.c signal.c clock.c config.c shm.c sem.c mbdb.c strexit.c cf.c ldap.c niprop.c mpeix.c memstat.c ') +define(`bldSOURCES', ` assert.c debug.c errstring.c exc.c heap.c match.c rpool.c strdup.c strl.c clrerr.c fclose.c feof.c ferror.c fflush.c fget.c fpos.c findfp.c flags.c fopen.c fprintf.c fpurge.c fput.c fread.c fscanf.c fseek.c fvwrite.c fwalk.c fwrite.c get.c makebuf.c put.c refill.c rewind.c setvbuf.c smstdio.c snprintf.c sscanf.c stdio.c strio.c ungetc.c vasprintf.c vfprintf.c vfscanf.c vprintf.c vsnprintf.c wbuf.c wsetup.c string.c stringf.c xtrap.c strto.c test.c path.c strcasecmp.c strrevcmp.c signal.c clock.c config.c shm.c sem.c mbdb.c strexit.c cf.c ldap.c niprop.c mpeix.c memstat.c ') bldPRODUCT_END dnl msg.c dnl syslogio.c --- sendmail-8.13.6/devtools/OS/Linux.dynamic 2006-03-22 18:17:08.000000000 +0100 +++ sendmail-8.13.6/devtools/OS/Linux 2006-03-22 18:17:09.000000000 +0100 @@ -6,7 +6,7 @@ define(`confDEPEND_TYPE', `CC-M') define(`confSM_OS_HEADER', `sm_os_linux') define(`confMANROOT', `/usr/share/man/man') -define(`confLIBS', `-ldl') +define(`confLIBS', `-pie -ldl') define(`confEBINDIR', `/usr/sbin') APPENDDEF(`confLIBSEARCH', `crypt nsl') @@ -21,19 +21,19 @@ ifelse(confBLDVARIANT, `DEBUG', dnl Debug build ` - define(`confOPTIMIZE',`-g -Wall') + define(`confOPTIMIZE',`-g -Wall -fpie') ', dnl Optimized build confBLDVARIANT, `OPTIMIZED', ` - define(`confOPTIMIZE',`-O2') + define(`confOPTIMIZE',`-O2 -fpie') ', dnl Purify build confBLDVARIANT, `PURIFY', ` - define(`confOPTIMIZE',`-g') + define(`confOPTIMIZE',`-g -fpie') ', dnl default ` - define(`confOPTIMIZE',`-O2') + define(`confOPTIMIZE',`-O2 -fpie') ') Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/sendmail/FC-4/.cvsignore,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- .cvsignore 12 Apr 2005 10:00:26 -0000 1.15 +++ .cvsignore 22 Mar 2006 17:49:46 -0000 1.16 @@ -2,3 +2,4 @@ sendmail.8.13.2.tar.gz sendmail.8.13.3.tar.gz sendmail.8.13.4.tar.gz +sendmail.8.13.6.tar.gz Index: sendmail-redhat.mc =================================================================== RCS file: /cvs/dist/rpms/sendmail/FC-4/sendmail-redhat.mc,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- sendmail-redhat.mc 6 May 2005 12:29:19 -0000 1.13 +++ sendmail-redhat.mc 22 Mar 2006 17:49:46 -0000 1.14 @@ -53,10 +53,10 @@ dnl # Complete usage: dnl # make -C /usr/share/ssl/certs usage dnl # -dnl define(`confCACERT_PATH',`/etc/pki/tls/certs') -dnl define(`confCACERT',`/etc/pki/tls/certs/ca-bundle.crt') -dnl define(`confSERVER_CERT',`/etc/pki/tls/certs/sendmail.pem') -dnl define(`confSERVER_KEY',`/etc/pki/tls/certs/sendmail.pem') +dnl define(`confCACERT_PATH',`/etc/pki/tls/certs')dnl +dnl define(`confCACERT',`/etc/pki/tls/certs/ca-bundle.crt')dnl +dnl define(`confSERVER_CERT',`/etc/pki/tls/certs/sendmail.pem')dnl +dnl define(`confSERVER_KEY',`/etc/pki/tls/certs/sendmail.pem')dnl dnl # dnl # This allows sendmail to use a keyfile that is shared with OpenLDAP's dnl # slapd, which requires the file to be readble by group ldap Index: sendmail.init =================================================================== RCS file: /cvs/dist/rpms/sendmail/FC-4/sendmail.init,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- sendmail.init 9 Sep 2004 12:27:14 -0000 1.13 +++ sendmail.init 22 Mar 2006 17:49:46 -0000 1.14 @@ -58,7 +58,7 @@ echo -n $"Starting sm-client: " touch /var/run/sm-client.pid chown smmsp:smmsp /var/run/sm-client.pid - if [ -x /usr/bin/selinuxenabled ] && /usr/bin/selinuxenabled; then + if [ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled; then /sbin/restorecon /var/run/sm-client.pid fi daemon --check sm-client /usr/sbin/sendmail -L sm-msp-queue -Ac \ Index: sendmail.spec =================================================================== RCS file: /cvs/dist/rpms/sendmail/FC-4/sendmail.spec,v retrieving revision 1.57 retrieving revision 1.58 diff -u -r1.57 -r1.58 --- sendmail.spec 6 May 2005 12:29:19 -0000 1.57 +++ sendmail.spec 22 Mar 2006 17:49:46 -0000 1.58 @@ -17,8 +17,8 @@ Summary: A widely used Mail Transport Agent (MTA). Name: sendmail -Version: 8.13.4 -Release: 2 +Version: 8.13.6 +Release: 0.FC4.1 License: Sendmail Group: System Environment/Daemons Provides: smtpdaemon @@ -40,7 +40,7 @@ Patch7: sendmail-8.13.0-pid.patch Patch9: sendmail-8.12.7-hesiod.patch Patch10: sendmail-8.12.7-manpage.patch -Patch11: sendmail-8.13.4-dynamic.patch +Patch11: sendmail-8.13.6-dynamic.patch Patch12: sendmail-8.13.0-cyrus.patch Buildroot: %{_tmppath}/%{name}-root BuildRequires: tcp_wrappers @@ -572,20 +572,27 @@ %{_docdir}/sendmail %changelog -* Fri May 6 2005 Thomas Woerner 8.13.4-2 +* Wed Mar 22 2006 Thomas Woerner 8.13.6-0.FC4.1 +- new version 8.13.6 (fixes VU#834865) +- dropped libmilter-sigwait patch (fixed in 8.13.6) +- fixed selinuxenabled path in initscript +- appended 'dnl' to cert tags in sendmail.mc +- fixed email address in changelog + +* Fri May 6 2005 Thomas Woerner 8.13.4-2 - using new certificates directory /etc/pki/tls/certs -* Wed Apr 27 2005 Thomas Woerner 8.13.4-1.1 +* Wed Apr 27 2005 Thomas Woerner 8.13.4-1.1 - added configuration example for Cyrus-IMAPd to sendmail.mc (#142001) Thanks to Alexander Dalloz -* Tue Apr 12 2005 Thomas Woerner 8.13.4-1 +* Tue Apr 12 2005 Thomas Woerner 8.13.4-1 - new version 8.13.4 - added requires for the sendmail base package in sendmail-cf, sendmail-devel and sendmail-doc - dropped upstream close_wait.p2 patch -* Thu Mar 17 2005 Thomas Woerner 8.13.3-2 +* Thu Mar 17 2005 Thomas Woerner 8.13.3-2 - dropped direct support for bind: no bind in confLIBSEARCH anymore, using libresolv again Index: sources =================================================================== RCS file: /cvs/dist/rpms/sendmail/FC-4/sources,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- sources 12 Apr 2005 10:00:26 -0000 1.15 +++ sources 22 Mar 2006 17:49:46 -0000 1.16 @@ -1,3 +1 @@ -0331828b9dcf7aa20e02992502c6f41f sendmail.8.13.2.tar.gz -2809fbf9c8b067947b650d0128928d05 sendmail.8.13.3.tar.gz -61e336750b48b01abaa69b4d7c9473b5 sendmail.8.13.4.tar.gz +484cca51f74b5e562b3cf119ceb2f900 sendmail.8.13.6.tar.gz From fedora-cvs-commits at redhat.com Wed Mar 22 17:55:18 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 22 Mar 2006 12:55:18 -0500 Subject: rpms/bind/devel named.init,1.41,1.42 Message-ID: <200603221755.k2MHtIuU021230@cvs.devel.redhat.com> Author: jvdias Update of /cvs/dist/rpms/bind/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv21217 Modified Files: named.init Log Message: missing / ! Index: named.init =================================================================== RCS file: /cvs/dist/rpms/bind/devel/named.init,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- named.init 7 Mar 2006 04:25:38 -0000 1.41 +++ named.init 22 Mar 2006 17:55:16 -0000 1.42 @@ -50,9 +50,9 @@ } named_c_option=`nmdcOption $OPTIONS`; -named_conf=${named_c_option:-etc/named.conf}; +named_conf=${named_c_option:-/etc/named.conf}; -if [ ! -r ${named_conf} ] ; then +if [ ! -r ${ROOTDIR}${named_conf} ] ; then if [ -z "$named_c_option" ] && [ -r ${ROOTDIR}/etc/named.caching-nameserver.conf ]; then named_conf='/etc/named.caching-nameserver.conf'; OPTIONS="$OPTIONS -c ${named_conf}"; From fedora-cvs-commits at redhat.com Wed Mar 22 18:03:11 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 22 Mar 2006 13:03:11 -0500 Subject: rpms/bind/devel bind.spec,1.97,1.98 Message-ID: <200603221803.k2MI39hL021391@cvs.devel.redhat.com> Author: jvdias Update of /cvs/dist/rpms/bind/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv21366 Modified Files: bind.spec Log Message: fix typo in initscript; fix Requires(post): policycoreutils in sub-packages Index: bind.spec =================================================================== RCS file: /cvs/dist/rpms/bind/devel/bind.spec,v retrieving revision 1.97 retrieving revision 1.98 diff -u -r1.97 -r1.98 --- bind.spec 21 Mar 2006 17:29:38 -0000 1.97 +++ bind.spec 22 Mar 2006 18:02:50 -0000 1.98 @@ -17,7 +17,7 @@ Name: bind License: BSD-like Version: 9.3.2 -Release: 10.FC6 +Release: 12.FC6 Epoch: 30 Url: http://www.isc.org/products/BIND/ Buildroot: %{_tmppath}/%{name}-root @@ -790,6 +790,10 @@ :; %changelog +* Wed Mar 22 2006 Jason Vas Dias - 30:9.3.2-12 +- fix typo in initscript +- fix Requires(post): policycoreutils in sub-packages + * Mon Mar 20 2006 Jason Vas Dias - 30.9.3.2-10 - fix bug 185969: more .spec file cleanup From fedora-cvs-commits at redhat.com Wed Mar 22 18:08:04 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 22 Mar 2006 13:08:04 -0500 Subject: rpms/bind/FC-5 named.init,1.41,1.42 Message-ID: <200603221808.k2MI84Jp021565@cvs.devel.redhat.com> Author: jvdias Update of /cvs/dist/rpms/bind/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv21551 Modified Files: named.init Log Message: fix typo: :-etc -> :-/etc! Index: named.init =================================================================== RCS file: /cvs/dist/rpms/bind/FC-5/named.init,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- named.init 7 Mar 2006 04:25:38 -0000 1.41 +++ named.init 22 Mar 2006 18:07:49 -0000 1.42 @@ -50,9 +50,9 @@ } named_c_option=`nmdcOption $OPTIONS`; -named_conf=${named_c_option:-etc/named.conf}; +named_conf=${named_c_option:-/etc/named.conf}; -if [ ! -r ${named_conf} ] ; then +if [ ! -r ${ROOTDIR}${named_conf} ] ; then if [ -z "$named_c_option" ] && [ -r ${ROOTDIR}/etc/named.caching-nameserver.conf ]; then named_conf='/etc/named.caching-nameserver.conf'; OPTIONS="$OPTIONS -c ${named_conf}"; From fedora-cvs-commits at redhat.com Wed Mar 22 18:10:33 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 22 Mar 2006 13:10:33 -0500 Subject: rpms/bind/FC-5 bind.spec,1.96,1.97 Message-ID: <200603221810.k2MIAXNI021681@cvs.devel.redhat.com> Author: jvdias Update of /cvs/dist/rpms/bind/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv21668 Modified Files: bind.spec Log Message: fix typo in initscript; fix Requires(post): policycoreutils in sub-packages Index: bind.spec =================================================================== RCS file: /cvs/dist/rpms/bind/FC-5/bind.spec,v retrieving revision 1.96 retrieving revision 1.97 diff -u -r1.96 -r1.97 --- bind.spec 20 Mar 2006 21:32:41 -0000 1.96 +++ bind.spec 22 Mar 2006 18:10:31 -0000 1.97 @@ -17,7 +17,7 @@ Name: bind License: BSD-like Version: 9.3.2 -Release: 10.FC5 +Release: 12.FC5 Epoch: 30 Url: http://www.isc.org/products/BIND/ Buildroot: %{_tmppath}/%{name}-root @@ -161,7 +161,7 @@ Requires: bind = %{epoch}:%{version}-%{release} Requires(post): bash, textutils, fileutils, sed, grep %if %{selinux} -Requires(post): coreutils +Requires(post): policycoreutils %endif %description config @@ -183,7 +183,7 @@ Requires: bind = %{epoch}:%{version}-%{release} Requires(post): bash, textutils, fileutils, sed, grep %if %{selinux} -Requires(post): coreutils +Requires(post): policycoreutils %endif %description chroot @@ -215,7 +215,7 @@ Requires: bind-libs = %{epoch}:%{version}-%{release}, bind-utils = %{epoch}:%{version}-%{release}, glibc >= 2.2 Requires(post): bash, textutils, fileutils, sed, grep, mktemp %if %{selinux} -Requires(post): coreutils +Requires(post): policycoreutils %endif %description sdb @@ -790,10 +790,14 @@ :; %changelog -* Mon Mar 20 2006 Jason Vas Dias - 30.9.3.2-10 +* Wed Mar 22 2006 Jason Vas Dias - 30:9.3.2-12 +- fix typo in initscript +- fix Requires(post): policycoreutils in sub-packages + +* Mon Mar 20 2006 Jason Vas Dias - 30:9.3.2-10 - fix bug 185969: more .spec file cleanup -* Wed Mar 08 2006 Jason Vas Dias - 30.9.3.2-8 +* Wed Mar 08 2006 Jason Vas Dias - 30:9.3.2-8 - Do not allow package to be installed if named:25 userid creation fails - Give libbind a pkg-config file - remove restorecon from bind-chroot-admin (not required). From fedora-cvs-commits at redhat.com Wed Mar 22 18:10:58 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 22 Mar 2006 13:10:58 -0500 Subject: rpms/bind/FC-5 bind.spec,1.97,1.98 Message-ID: <200603221810.k2MIAw6D021708@cvs.devel.redhat.com> Author: jvdias Update of /cvs/dist/rpms/bind/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv21694 Modified Files: bind.spec Log Message: fix typo in initscript; fix Requires(post): policycoreutils in sub-packages From fedora-cvs-commits at redhat.com Wed Mar 22 18:24:04 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 22 Mar 2006 13:24:04 -0500 Subject: rpms/expect/devel expect-5.43.0-log_file.patch, NONE, 1.1 expect.spec, 1.13, 1.14 Message-ID: <200603221824.k2MIO43o003085@cvs.devel.redhat.com> Author: dcantrel Update of /cvs/dist/rpms/expect/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv3067 Modified Files: expect.spec Added Files: expect-5.43.0-log_file.patch Log Message: Patch expLogChannelOpen() to create files with 0666 permissions (#182724). expect-5.43.0-log_file.patch: exp_log.c | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE expect-5.43.0-log_file.patch --- --- expect-5.43/exp_log.c.log_file 2004-08-18 16:54:35.000000000 -0400 +++ expect-5.43/exp_log.c 2006-02-24 12:39:58.000000000 -0500 @@ -471,7 +471,7 @@ Tcl_DStringAppend(&tsdPtr->logFilename,filename,-1); } - tsdPtr->logChannel = Tcl_OpenFileChannel(interp,newfilename,mode,0777); + tsdPtr->logChannel = Tcl_OpenFileChannel(interp,newfilename,mode,0666); if (!tsdPtr->logChannel) { Tcl_DStringFree(&tsdPtr->logFilename); return TCL_ERROR; Index: expect.spec =================================================================== RCS file: /cvs/dist/rpms/expect/devel/expect.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- expect.spec 11 Feb 2006 02:42:08 -0000 1.13 +++ expect.spec 22 Mar 2006 18:24:01 -0000 1.14 @@ -3,7 +3,7 @@ Summary: A program-script interaction and testing utility Name: expect Version: %{majorver}.0 -Release: 3.1 +Release: 4 License: Public Domain Group: Development/Languages URL: http://expect.nist.gov/ @@ -11,12 +11,12 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root Buildrequires: tcl-devel tk-devel autoconf automake -# submitted to author Patch6: expect-5.38.0-spawn-43310.patch -# submitted to author Patch8: expect-5.43.0-cfg-setpgrp.patch Patch10: expect-5.38.0-lib-spec.patch Patch11: expect-5.39.0-libdir.patch +Patch12: expect-5.43.0-log_file.patch + # examples patches Patch100: expect-5.32.2-random.patch Patch101: expect-5.32.2-fixcat.patch @@ -62,6 +62,7 @@ %patch8 -p1 -b .8-pgrp %patch10 -p1 -b .10-libspec %patch11 -p1 -b .11-libdir +%patch12 -p1 -b .12-log_file # examples fixes %patch100 -p1 -b .100 %patch101 -p1 -b .101 @@ -152,6 +153,9 @@ %{_mandir}/man1/tknewsbiff.1* %changelog +* Fri Feb 24 2006 David Cantrell - 5.43.0-4 +- Patch expLogChannelOpen() to create files with 0666 permissions (#182724) + * Fri Feb 10 2006 Jesse Keating - 5.43.0-3.1 - bump again for double-long bug on ppc(64) From fedora-cvs-commits at redhat.com Wed Mar 22 18:44:21 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 22 Mar 2006 13:44:21 -0500 Subject: rpms/selinux-policy/FC-5 .cvsignore, 1.47, 1.48 policy-20060207.patch, 1.51, 1.52 selinux-policy.spec, 1.154, 1.155 sources, 1.51, 1.52 Message-ID: <200603221844.k2MIiLFY003325@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/selinux-policy/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv3315 Modified Files: .cvsignore policy-20060207.patch selinux-policy.spec sources Log Message: * Wed Mar 22 2006 Dan Walsh 2.2.25-2.fc5 - Rebuild for FC5 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/FC-5/.cvsignore,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- .cvsignore 4 Mar 2006 14:49:35 -0000 1.47 +++ .cvsignore 22 Mar 2006 18:44:17 -0000 1.48 @@ -48,3 +48,4 @@ serefpolicy-2.2.21.tgz serefpolicy-2.2.22.tgz serefpolicy-2.2.23.tgz +serefpolicy-2.2.25.tgz policy-20060207.patch: Rules.modular | 2 policy/mcs | 4 policy/modules/admin/bootloader.te | 2 policy/modules/admin/dmidecode.te | 2 policy/modules/admin/logwatch.te | 1 policy/modules/admin/readahead.te | 2 policy/modules/admin/rpm.fc | 3 policy/modules/admin/rpm.if | 3 policy/modules/admin/rpm.te | 1 policy/modules/admin/su.fc | 1 policy/modules/admin/su.if | 6 policy/modules/admin/updfstab.te | 4 policy/modules/admin/vbetool.te | 9 + policy/modules/kernel/corenetwork.te.in | 3 policy/modules/kernel/devices.fc | 1 policy/modules/kernel/devices.if | 59 ++++++++ policy/modules/kernel/files.fc | 8 - policy/modules/kernel/files.if | 33 ++++ policy/modules/kernel/filesystem.te | 1 policy/modules/kernel/kernel.if | 102 ++++++++++++++ policy/modules/kernel/kernel.te | 3 policy/modules/services/apache.fc | 2 policy/modules/services/apache.if | 5 policy/modules/services/apm.fc | 2 policy/modules/services/apm.te | 4 policy/modules/services/bluetooth.te | 38 ++--- policy/modules/services/cron.te | 3 policy/modules/services/cups.fc | 2 policy/modules/services/cups.if | 22 +++ policy/modules/services/cups.te | 7 - policy/modules/services/cvs.te | 2 policy/modules/services/hal.if | 41 +++++ policy/modules/services/hal.te | 17 ++ policy/modules/services/ktalk.fc | 1 policy/modules/services/ktalk.te | 6 policy/modules/services/mailman.if | 25 +++ policy/modules/services/nis.fc | 1 policy/modules/services/nis.if | 25 +++ policy/modules/services/nis.te | 28 ++++ policy/modules/services/nscd.if | 2 policy/modules/services/pegasus.te | 1 policy/modules/services/postfix.te | 4 policy/modules/services/privoxy.te | 5 policy/modules/services/samba.te | 2 policy/modules/services/sendmail.te | 1 policy/modules/services/xserver.if | 20 ++ policy/modules/system/authlogin.te | 2 policy/modules/system/fstools.if | 18 ++ policy/modules/system/fstools.te | 7 + policy/modules/system/init.te | 5 policy/modules/system/libraries.fc | 2 policy/modules/system/locallogin.te | 1 policy/modules/system/lvm.fc | 1 policy/modules/system/lvm.te | 3 policy/modules/system/mount.te | 3 policy/modules/system/selinuxutil.fc | 6 policy/modules/system/selinuxutil.if | 23 ++- policy/modules/system/selinuxutil.te | 16 ++ policy/modules/system/sysnetwork.te | 7 + policy/modules/system/udev.te | 2 policy/modules/system/unconfined.te | 8 - policy/modules/system/userdomain.te | 1 policy/modules/system/xend.fc | 23 +++ policy/modules/system/xend.if | 71 ++++++++++ policy/modules/system/xend.te | 219 ++++++++++++++++++++++++++++++++ 65 files changed, 870 insertions(+), 64 deletions(-) Index: policy-20060207.patch =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/FC-5/policy-20060207.patch,v retrieving revision 1.51 retrieving revision 1.52 diff -u -r1.51 -r1.52 --- policy-20060207.patch 16 Mar 2006 14:41:17 -0000 1.51 +++ policy-20060207.patch 22 Mar 2006 18:44:17 -0000 1.52 @@ -1,6 +1,6 @@ -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/mcs serefpolicy-2.2.23/policy/mcs +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/mcs serefpolicy-2.2.25/policy/mcs --- nsaserefpolicy/policy/mcs 2006-02-16 14:46:56.000000000 -0500 -+++ serefpolicy-2.2.23/policy/mcs 2006-03-09 10:26:36.000000000 -0500 ++++ serefpolicy-2.2.25/policy/mcs 2006-03-21 14:39:07.000000000 -0500 @@ -141,9 +141,7 @@ mlsconstrain file { create relabelto } ((h1 dom h2) and (l2 eq h2)); @@ -12,9 +12,9 @@ # new file labels must be dominated by the relabeling subject clearance mlsconstrain { dir lnk_file chr_file blk_file sock_file fifo_file } { relabelfrom } -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/bootloader.te serefpolicy-2.2.23/policy/modules/admin/bootloader.te ---- nsaserefpolicy/policy/modules/admin/bootloader.te 2006-03-02 18:45:54.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/admin/bootloader.te 2006-03-13 12:23:12.000000000 -0500 +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/bootloader.te serefpolicy-2.2.25/policy/modules/admin/bootloader.te +--- nsaserefpolicy/policy/modules/admin/bootloader.te 2006-03-17 13:51:46.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/admin/bootloader.te 2006-03-21 14:39:07.000000000 -0500 @@ -103,7 +103,7 @@ files_manage_boot_symlinks(bootloader_t) files_read_etc_files(bootloader_t) @@ -24,9 +24,9 @@ files_read_usr_src_files(bootloader_t) files_read_usr_files(bootloader_t) files_read_var_files(bootloader_t) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/dmidecode.te serefpolicy-2.2.23/policy/modules/admin/dmidecode.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/dmidecode.te serefpolicy-2.2.25/policy/modules/admin/dmidecode.te --- nsaserefpolicy/policy/modules/admin/dmidecode.te 2006-03-04 00:06:33.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/admin/dmidecode.te 2006-03-13 12:26:24.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/admin/dmidecode.te 2006-03-21 14:39:07.000000000 -0500 @@ -32,6 +32,8 @@ locallogin_use_fds(dmidecode_t) @@ -36,9 +36,20 @@ ifdef(`targeted_policy',` term_use_generic_ptys(dmidecode_t) term_use_unallocated_ttys(dmidecode_t) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/readahead.te serefpolicy-2.2.23/policy/modules/admin/readahead.te ---- nsaserefpolicy/policy/modules/admin/readahead.te 2006-03-04 00:06:33.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/admin/readahead.te 2006-03-07 13:42:37.000000000 -0500 +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/logwatch.te serefpolicy-2.2.25/policy/modules/admin/logwatch.te +--- nsaserefpolicy/policy/modules/admin/logwatch.te 2006-03-17 13:51:46.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/admin/logwatch.te 2006-03-22 10:16:38.000000000 -0500 +@@ -53,6 +53,7 @@ + files_read_usr_files(logwatch_t) + files_search_spool(logwatch_t) + files_dontaudit_search_home(logwatch_t) ++files_dontaudit_search_mnt(logwatch_t) + + fs_getattr_all_fs(logwatch_t) + +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/readahead.te serefpolicy-2.2.25/policy/modules/admin/readahead.te +--- nsaserefpolicy/policy/modules/admin/readahead.te 2006-03-17 13:51:47.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/admin/readahead.te 2006-03-21 14:39:07.000000000 -0500 @@ -18,7 +18,7 @@ # Local policy # @@ -48,10 +59,18 @@ allow readahead_t self:process signal_perms; allow readahead_t readahead_var_run_t:file create_file_perms; -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.fc serefpolicy-2.2.23/policy/modules/admin/rpm.fc ---- nsaserefpolicy/policy/modules/admin/rpm.fc 2006-01-27 21:35:04.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/admin/rpm.fc 2006-03-07 15:39:28.000000000 -0500 -@@ -25,7 +25,7 @@ +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.fc serefpolicy-2.2.25/policy/modules/admin/rpm.fc +--- nsaserefpolicy/policy/modules/admin/rpm.fc 2006-03-17 13:51:47.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/admin/rpm.fc 2006-03-21 14:39:07.000000000 -0500 +@@ -3,6 +3,7 @@ + /usr/bin/smart -- gen_context(system_u:object_r:rpm_exec_t,s0) + + /usr/bin/yum -- gen_context(system_u:object_r:rpm_exec_t,s0) ++/usr/share/yumex/yumex -- gen_context(system_u:object_r:rpm_exec_t,s0) + + /usr/lib(64)?/rpm/rpmd -- gen_context(system_u:object_r:bin_t,s0) + /usr/lib(64)?/rpm/rpmq -- gen_context(system_u:object_r:bin_t,s0) +@@ -22,7 +23,7 @@ /var/lib/rpm(/.*)? gen_context(system_u:object_r:rpm_var_lib_t,s0) /var/log/rpmpkgs.* -- gen_context(system_u:object_r:rpm_log_t,s0) @@ -60,9 +79,9 @@ # SuSE ifdef(`distro_suse', ` -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.if serefpolicy-2.2.23/policy/modules/admin/rpm.if +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.if serefpolicy-2.2.25/policy/modules/admin/rpm.if --- nsaserefpolicy/policy/modules/admin/rpm.if 2006-03-04 00:06:33.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/admin/rpm.if 2006-03-14 17:08:39.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/admin/rpm.if 2006-03-21 14:39:07.000000000 -0500 @@ -78,6 +78,9 @@ role $2 types rpm_t; role $2 types rpm_script_t; @@ -73,9 +92,9 @@ allow rpm_t $3:chr_file rw_term_perms; ') -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.te serefpolicy-2.2.23/policy/modules/admin/rpm.te ---- nsaserefpolicy/policy/modules/admin/rpm.te 2006-03-04 00:06:33.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/admin/rpm.te 2006-03-15 09:22:44.000000000 -0500 +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.te serefpolicy-2.2.25/policy/modules/admin/rpm.te +--- nsaserefpolicy/policy/modules/admin/rpm.te 2006-03-17 13:51:47.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/admin/rpm.te 2006-03-21 14:39:07.000000000 -0500 @@ -326,6 +326,7 @@ seutil_domtrans_loadpolicy(rpm_script_t) @@ -84,17 +103,17 @@ userdom_use_all_users_fds(rpm_script_t) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/su.fc serefpolicy-2.2.23/policy/modules/admin/su.fc +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/su.fc serefpolicy-2.2.25/policy/modules/admin/su.fc --- nsaserefpolicy/policy/modules/admin/su.fc 2005-11-14 18:24:06.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/admin/su.fc 2006-03-07 13:42:37.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/admin/su.fc 2006-03-21 14:39:07.000000000 -0500 @@ -2,3 +2,4 @@ /bin/su -- gen_context(system_u:object_r:su_exec_t,s0) /usr(/local)?/bin/ksu -- gen_context(system_u:object_r:su_exec_t,s0) +/usr/bin/kdesu -- gen_context(system_u:object_r:su_exec_t,s0) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/su.if serefpolicy-2.2.23/policy/modules/admin/su.if +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/su.if serefpolicy-2.2.25/policy/modules/admin/su.if --- nsaserefpolicy/policy/modules/admin/su.if 2006-03-04 00:06:33.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/admin/su.if 2006-03-07 13:42:37.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/admin/su.if 2006-03-21 14:39:07.000000000 -0500 @@ -141,10 +141,10 @@ # By default, revert to the calling domain when a shell is executed. @@ -109,9 +128,9 @@ kernel_read_system_state($1_su_t) kernel_read_kernel_sysctls($1_su_t) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/updfstab.te serefpolicy-2.2.23/policy/modules/admin/updfstab.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/updfstab.te serefpolicy-2.2.25/policy/modules/admin/updfstab.te --- nsaserefpolicy/policy/modules/admin/updfstab.te 2006-03-04 00:06:33.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/admin/updfstab.te 2006-03-14 11:34:03.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/admin/updfstab.te 2006-03-21 14:39:07.000000000 -0500 @@ -125,6 +125,6 @@ udev_read_db(updfstab_t) ') @@ -121,9 +140,9 @@ +optional_policy(`fstools',` + fstools_getattr_swap_files(updfstab_t) ') -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/vbetool.te serefpolicy-2.2.23/policy/modules/admin/vbetool.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/vbetool.te serefpolicy-2.2.25/policy/modules/admin/vbetool.te --- nsaserefpolicy/policy/modules/admin/vbetool.te 2006-02-01 08:23:27.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/admin/vbetool.te 2006-03-09 16:31:49.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/admin/vbetool.te 2006-03-21 14:39:07.000000000 -0500 @@ -15,6 +15,7 @@ # Local policy # @@ -144,30 +163,23 @@ +optional_policy(`hal',` + hal_rw_var_run(vbetool_t) +') -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corenetwork.te.in serefpolicy-2.2.23/policy/modules/kernel/corenetwork.te.in ---- nsaserefpolicy/policy/modules/kernel/corenetwork.te.in 2006-02-20 14:07:36.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/kernel/corenetwork.te.in 2006-03-07 13:42:37.000000000 -0500 -@@ -66,7 +66,7 @@ - network_port(giftd, tcp,1213,s0) - network_port(gopher, tcp,70,s0, udp,70,s0) - network_port(http_cache, tcp,3128,s0, udp,3130,s0, tcp,8080,s0, tcp,8118,s0) # 8118 is for privoxy --network_port(http, tcp,80,s0, tcp,443,s0, tcp,488,s0, tcp,8008,s0) -+network_port(http, tcp,80,s0, tcp,443,s0, tcp,488,s0, tcp,8008,s0, tcp, 9050, s0) # 9050 is for Tor - network_port(howl, tcp,5335,s0, udp,5353,s0) - network_port(hplip, tcp,50000,s0, tcp,50002,s0) - network_port(i18n_input, tcp,9010,s0) -@@ -126,6 +126,7 @@ +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corenetwork.te.in serefpolicy-2.2.25/policy/modules/kernel/corenetwork.te.in +--- nsaserefpolicy/policy/modules/kernel/corenetwork.te.in 2006-03-21 11:38:20.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/kernel/corenetwork.te.in 2006-03-21 14:39:07.000000000 -0500 +@@ -126,7 +126,8 @@ + type utcpserver_port_t, port_type; dnl network_port(utcpserver) # no defined portcon network_port(uucpd, tcp,540,s0) network_port(vnc, tcp,5900,s0) - network_port(xserver, tcp,6001,s0, tcp,6002,s0, tcp,6003,s0, tcp,6004,s0, tcp,6005,s0, tcp,6006,s0, tcp,6007,s0, tcp,6008,s0, tcp,6009,s0, tcp,6010,s0, tcp,6011,s0, tcp,6012,s0, tcp,6013,s0, tcp,6014,s0, tcp,6015,s0, tcp,6016,s0, tcp,6017,s0, tcp,6018,s0, tcp,6019,s0) +-network_port(xserver, tcp,6001,s0, tcp,6002,s0, tcp,6003,s0, tcp,6004,s0, tcp,6005,s0, tcp,6006,s0, tcp,6007,s0, tcp,6008,s0, tcp,6009,s0, tcp,6010,s0, tcp,6011,s0, tcp,6012,s0, tcp,6013,s0, tcp,6014,s0, tcp,6015,s0, tcp,6016,s0, tcp,6017,s0, tcp,6018,s0, tcp,6019,s0) ++network_port(xserver, tcp, 6000, s0, tcp,6001,s0, tcp,6002,s0, tcp,6003,s0, tcp,6004,s0, tcp,6005,s0, tcp,6006,s0, tcp,6007,s0, tcp,6008,s0, tcp,6009,s0, tcp,6010,s0, tcp,6011,s0, tcp,6012,s0, tcp,6013,s0, tcp,6014,s0, tcp,6015,s0, tcp,6016,s0, tcp,6017,s0, tcp,6018,s0, tcp,6019,s0) +network_port(xen, tcp,8002,s0) network_port(zebra, tcp,2601,s0) network_port(zope, tcp,8021,s0) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.fc serefpolicy-2.2.23/policy/modules/kernel/devices.fc ---- nsaserefpolicy/policy/modules/kernel/devices.fc 2006-02-27 17:17:23.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/kernel/devices.fc 2006-03-08 17:34:22.000000000 -0500 -@@ -33,6 +33,7 @@ +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.fc serefpolicy-2.2.25/policy/modules/kernel/devices.fc +--- nsaserefpolicy/policy/modules/kernel/devices.fc 2006-03-21 11:38:20.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/kernel/devices.fc 2006-03-21 14:39:07.000000000 -0500 +@@ -37,6 +37,7 @@ /dev/par.* -c gen_context(system_u:object_r:printer_device_t,s0) /dev/patmgr[01] -c gen_context(system_u:object_r:sound_device_t,s0) /dev/pmu -c gen_context(system_u:object_r:power_device_t,s0) @@ -175,19 +187,57 @@ /dev/port -c gen_context(system_u:object_r:memory_device_t,s15:c0.c255) /dev/(misc/)?psaux -c gen_context(system_u:object_r:mouse_device_t,s0) /dev/rmidi.* -c gen_context(system_u:object_r:sound_device_t,s0) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.if serefpolicy-2.2.23/policy/modules/kernel/devices.if ---- nsaserefpolicy/policy/modules/kernel/devices.if 2006-02-23 09:25:08.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/kernel/devices.if 2006-03-09 16:17:57.000000000 -0500 -@@ -2384,7 +2384,7 @@ +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.if serefpolicy-2.2.25/policy/modules/kernel/devices.if +--- nsaserefpolicy/policy/modules/kernel/devices.if 2006-03-17 13:51:48.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/kernel/devices.if 2006-03-22 10:19:58.000000000 -0500 +@@ -2382,7 +2382,45 @@ ') allow $1 device_t:dir r_dir_perms; - allow $1 usb_device_t:chr_file { read write }; + allow $1 usb_device_t:chr_file rw_file_perms; ++') ++ ++######################################## ++## ++## Getattr generic the USB devices. ++## ++## ++## ++## Domain allowed access. ++## ++## ++# ++interface(`dev_getattr_generic_usb_dev',` ++ gen_require(` ++ type usb_device_t; ++ ') ++ ++ allow $1 device_t:dir r_dir_perms; ++ allow $1 usb_device_t:chr_file getattr; ++') ++ ++######################################## ++## ++## Setattr generic the USB devices. ++## ++## ++## ++## Domain allowed access. ++## ++## ++# ++interface(`dev_setattr_generic_usb_dev',` ++ gen_require(` ++ type usb_device_t; ++ ') ++ ++ allow $1 device_t:dir r_dir_perms; ++ allow $1 usb_device_t:chr_file setattr; ') ######################################## -@@ -2732,3 +2732,22 @@ +@@ -2769,3 +2807,22 @@ typeattribute $1 memory_raw_write, memory_raw_read; ') @@ -210,9 +260,9 @@ + dontaudit $1 device_node:dir_file_class_set getattr; +') + -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.fc serefpolicy-2.2.23/policy/modules/kernel/files.fc +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.fc serefpolicy-2.2.25/policy/modules/kernel/files.fc --- nsaserefpolicy/policy/modules/kernel/files.fc 2006-03-04 00:06:34.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/kernel/files.fc 2006-03-08 16:26:29.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/kernel/files.fc 2006-03-21 14:39:07.000000000 -0500 @@ -45,7 +45,7 @@ /etc(/.*)? gen_context(system_u:object_r:etc_t,s0) /etc/\.fstab\.hal\..+ -- gen_context(system_u:object_r:etc_runtime_t,s0) @@ -249,9 +299,9 @@ HOME_ROOT/\.journal <> HOME_ROOT/lost\+found -d gen_context(system_u:object_r:lost_found_t,s15:c0.c255) HOME_ROOT/lost\+found/.* <> -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.if serefpolicy-2.2.23/policy/modules/kernel/files.if ---- nsaserefpolicy/policy/modules/kernel/files.if 2006-03-04 00:06:34.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/kernel/files.if 2006-03-09 11:17:00.000000000 -0500 +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.if serefpolicy-2.2.25/policy/modules/kernel/files.if +--- nsaserefpolicy/policy/modules/kernel/files.if 2006-03-17 13:51:48.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/kernel/files.if 2006-03-22 10:16:33.000000000 -0500 @@ -1648,6 +1648,21 @@ ') @@ -282,7 +332,26 @@ allow $1 etc_runtime_t:file create_file_perms; type_transition $1 etc_t:file etc_runtime_t; ') -@@ -3789,12 +3805,13 @@ +@@ -2156,6 +2172,18 @@ + + ######################################## + # ++# files_dontaudit_search_mnt(domain) ++# ++interface(`files_dontaudit_search_mnt',` ++ gen_require(` ++ type mnt_t; ++ ') ++ ++ dontaudit $1 mnt_t:dir search_dir_perms; ++') ++ ++######################################## ++# + # files_list_mnt(domain) + # + interface(`files_list_mnt',` +@@ -3808,12 +3836,13 @@ # Need to give permission to create directories where applicable allow $1 self:process setfscreate; @@ -298,17 +367,17 @@ ') ######################################## -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/filesystem.te serefpolicy-2.2.23/policy/modules/kernel/filesystem.te ---- nsaserefpolicy/policy/modules/kernel/filesystem.te 2006-02-14 07:20:25.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/kernel/filesystem.te 2006-03-08 11:55:28.000000000 -0500 +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/filesystem.te serefpolicy-2.2.25/policy/modules/kernel/filesystem.te +--- nsaserefpolicy/policy/modules/kernel/filesystem.te 2006-03-17 13:51:48.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/kernel/filesystem.te 2006-03-21 14:39:07.000000000 -0500 @@ -167,3 +167,4 @@ genfscon nfs / gen_context(system_u:object_r:nfs_t,s0) genfscon nfs4 / gen_context(system_u:object_r:nfs_t,s0) genfscon afs / gen_context(system_u:object_r:nfs_t,s0) +genfscon hfsplus / gen_context(system_u:object_r:nfs_t,s0) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel.if serefpolicy-2.2.23/policy/modules/kernel/kernel.if +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel.if serefpolicy-2.2.25/policy/modules/kernel/kernel.if --- nsaserefpolicy/policy/modules/kernel/kernel.if 2006-03-04 00:06:34.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/kernel/kernel.if 2006-03-07 14:00:35.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/kernel/kernel.if 2006-03-21 14:39:07.000000000 -0500 @@ -1044,6 +1044,7 @@ allow $1 proc_t:dir search; @@ -429,9 +498,9 @@ + allow $1 proc_xen_t:dir r_dir_perms; + allow $1 proc_xen_t:file write; +') -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel.te serefpolicy-2.2.23/policy/modules/kernel/kernel.te ---- nsaserefpolicy/policy/modules/kernel/kernel.te 2006-02-07 10:43:26.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/kernel/kernel.te 2006-03-07 13:42:37.000000000 -0500 +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel.te serefpolicy-2.2.25/policy/modules/kernel/kernel.te +--- nsaserefpolicy/policy/modules/kernel/kernel.te 2006-03-17 13:51:48.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/kernel/kernel.te 2006-03-21 14:39:07.000000000 -0500 @@ -75,6 +75,9 @@ type proc_net_t, proc_type; genfscon proc /net gen_context(system_u:object_r:proc_net_t,s0) @@ -442,22 +511,9 @@ # # Sysctl types # -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/terminal.if serefpolicy-2.2.23/policy/modules/kernel/terminal.if ---- nsaserefpolicy/policy/modules/kernel/terminal.if 2006-02-14 07:20:25.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/kernel/terminal.if 2006-03-13 15:57:21.000000000 -0500 -@@ -588,8 +588,8 @@ - type devpts_t; - ') - -- dev_list_all_dev_nodes($1) - allow $1 devpts_t:dir r_dir_perms; -+ dev_list_all_dev_nodes($1) - allow $1 ptynode:chr_file { rw_term_perms lock append }; - ') - -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.fc serefpolicy-2.2.23/policy/modules/services/apache.fc +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.fc serefpolicy-2.2.25/policy/modules/services/apache.fc --- nsaserefpolicy/policy/modules/services/apache.fc 2006-02-27 17:17:23.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/services/apache.fc 2006-03-07 13:42:37.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/services/apache.fc 2006-03-21 14:39:07.000000000 -0500 @@ -15,6 +15,7 @@ /etc/vhosts -- gen_context(system_u:object_r:httpd_config_t,s0) @@ -471,9 +527,9 @@ /var/www/icons(/.*)? gen_context(system_u:object_r:httpd_sys_content_t,s0) /var/www/perl(/.*)? gen_context(system_u:object_r:httpd_sys_script_exec_t,s0) +/usr/share/selinux-policy([^/]*)?/html(/.*)? gen_context(system_u:object_r:httpd_sys_content_t,s0) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.if serefpolicy-2.2.23/policy/modules/services/apache.if ---- nsaserefpolicy/policy/modules/services/apache.if 2006-03-04 00:06:35.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/services/apache.if 2006-03-07 13:42:37.000000000 -0500 +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.if serefpolicy-2.2.25/policy/modules/services/apache.if +--- nsaserefpolicy/policy/modules/services/apache.if 2006-03-17 13:51:48.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/services/apache.if 2006-03-21 14:39:07.000000000 -0500 @@ -12,6 +12,11 @@ ## # @@ -486,9 +542,9 @@ # allow write access to public file transfer # services files. gen_tunable(allow_httpd_$1_script_anon_write,false) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apm.fc serefpolicy-2.2.23/policy/modules/services/apm.fc +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apm.fc serefpolicy-2.2.25/policy/modules/services/apm.fc --- nsaserefpolicy/policy/modules/services/apm.fc 2005-11-14 18:24:08.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/services/apm.fc 2006-03-07 15:38:20.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/services/apm.fc 2006-03-21 14:39:07.000000000 -0500 @@ -11,7 +11,7 @@ # # /var @@ -498,9 +554,9 @@ /var/run/\.?acpid\.socket -s gen_context(system_u:object_r:apmd_var_run_t,s0) /var/run/apmd\.pid -- gen_context(system_u:object_r:apmd_var_run_t,s0) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apm.te serefpolicy-2.2.23/policy/modules/services/apm.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apm.te serefpolicy-2.2.25/policy/modules/services/apm.te --- nsaserefpolicy/policy/modules/services/apm.te 2006-03-04 00:06:35.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/services/apm.te 2006-03-08 13:36:37.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/services/apm.te 2006-03-21 14:39:07.000000000 -0500 @@ -225,6 +225,10 @@ pcmcia_domtrans_cardctl(apmd_t) ') @@ -512,9 +568,9 @@ optional_policy(`selinuxutil',` seutil_sigchld_newrole(apmd_t) ') -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bluetooth.te serefpolicy-2.2.23/policy/modules/services/bluetooth.te ---- nsaserefpolicy/policy/modules/services/bluetooth.te 2006-03-04 00:06:35.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/services/bluetooth.te 2006-03-16 09:30:42.000000000 -0500 +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bluetooth.te serefpolicy-2.2.25/policy/modules/services/bluetooth.te +--- nsaserefpolicy/policy/modules/services/bluetooth.te 2006-03-17 13:51:48.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/services/bluetooth.te 2006-03-21 14:39:07.000000000 -0500 @@ -115,6 +115,7 @@ corecmd_exec_shell(bluetooth_t) @@ -543,42 +599,62 @@ allow bluetooth_helper_t bluetooth_t:socket { read write }; -@@ -202,20 +208,17 @@ +@@ -182,8 +188,6 @@ + + dev_read_urand(bluetooth_helper_t) + +-term_dontaudit_use_all_user_ttys(bluetooth_helper_t) +- + corecmd_exec_bin(bluetooth_helper_t) + corecmd_exec_shell(bluetooth_helper_t) + +@@ -202,29 +206,27 @@ miscfiles_read_localization(bluetooth_helper_t) miscfiles_read_fonts(bluetooth_helper_t) -userdom_search_all_users_home_content(bluetooth_helper_t) -- ++sysnet_read_config(bluetooth_helper_t) ++ ++term_dontaudit_use_all_user_ttys(bluetooth_helper_t) + optional_policy(`nscd',` nscd_socket_use(bluetooth_helper_t) ') -+optional_policy(`xserver', ` -+ xserver_stream_connect_xdm(bluetooth_helper_t) -+'); -+ - ifdef(`TODO',` - allow bluetooth_helper_t tmp_t:dir search; - +-ifdef(`TODO',` +-allow bluetooth_helper_t tmp_t:dir search; +- -ifdef(`xserver.te', ` - allow bluetooth_helper_t xserver_log_t:dir search; - allow bluetooth_helper_t xserver_log_t:file { getattr read }; -') - - ifdef(`strict_policy',` - ifdef(`xdm.te',` - allow bluetooth_helper_t xdm_xserver_tmp_t:sock_file { read write }; -@@ -227,4 +230,7 @@ - files_rw_generic_tmp_sockets(bluetooth_helper_t) - allow bluetooth_helper_t tmpfs_t:file { read write }; - allow bluetooth_helper_t unconfined_t:unix_stream_socket connectto; -+ userdom_read_all_users_home_content_files(bluetooth_helper_t) +-ifdef(`strict_policy',` +- ifdef(`xdm.te',` +- allow bluetooth_helper_t xdm_xserver_tmp_t:sock_file { read write }; +- ') +-') +-') dnl end TODO ++optional_policy(`locallogin', ` ++ locallogin_dontaudit_use_fds(bluetooth_helper_t) ++'); + ++optional_policy(`xserver', ` ++ xserver_rw_xdm_sockets(bluetooth_helper_t) + xserver_stream_connect_xdm(bluetooth_helper_t) ++'); + + ifdef(`targeted_policy',` ++ userdom_read_all_users_home_content_files(bluetooth_helper_t) ++# Not sure we need the following anymore ???? + files_rw_generic_tmp_sockets(bluetooth_helper_t) +- allow bluetooth_helper_t tmpfs_t:file { read write }; + allow bluetooth_helper_t unconfined_t:unix_stream_socket connectto; ++ allow bluetooth_helper_t tmpfs_t:file { read write }; ') -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.te serefpolicy-2.2.23/policy/modules/services/cron.te ---- nsaserefpolicy/policy/modules/services/cron.te 2006-03-04 00:06:35.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/services/cron.te 2006-03-07 13:42:37.000000000 -0500 +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.te serefpolicy-2.2.25/policy/modules/services/cron.te +--- nsaserefpolicy/policy/modules/services/cron.te 2006-03-17 13:51:48.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/services/cron.te 2006-03-21 14:39:07.000000000 -0500 @@ -166,6 +166,9 @@ allow crond_t unconfined_t:dbus send_msg; @@ -589,9 +665,9 @@ ',` allow crond_t crond_tmp_t:dir create_dir_perms; allow crond_t crond_tmp_t:file create_file_perms; -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.fc serefpolicy-2.2.23/policy/modules/services/cups.fc +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.fc serefpolicy-2.2.25/policy/modules/services/cups.fc --- nsaserefpolicy/policy/modules/services/cups.fc 2005-11-14 18:24:08.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/services/cups.fc 2006-03-07 13:42:37.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/services/cups.fc 2006-03-21 14:39:07.000000000 -0500 @@ -43,7 +43,7 @@ /var/log/cups(/.*)? gen_context(system_u:object_r:cupsd_log_t,s0) /var/log/turboprint_cups\.log.* -- gen_context(system_u:object_r:cupsd_log_t,s0) @@ -601,9 +677,9 @@ /var/run/hp.*\.pid -- gen_context(system_u:object_r:hplip_var_run_t,s0) /var/run/hp.*\.port -- gen_context(system_u:object_r:hplip_var_run_t,s0) /var/run/ptal-printd(/.*)? gen_context(system_u:object_r:ptal_var_run_t,s0) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.if serefpolicy-2.2.23/policy/modules/services/cups.if +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.if serefpolicy-2.2.25/policy/modules/services/cups.if --- nsaserefpolicy/policy/modules/services/cups.if 2006-02-23 09:25:09.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/services/cups.if 2006-03-07 13:42:37.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/services/cups.if 2006-03-21 14:39:07.000000000 -0500 @@ -226,3 +226,25 @@ allow cupsd_t $1:tcp_socket { acceptfrom recvfrom }; kernel_tcp_recvfrom($1) @@ -630,9 +706,9 @@ + allow $1 cupsd_t:unix_stream_socket connectto; +') + -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.te serefpolicy-2.2.23/policy/modules/services/cups.te ---- nsaserefpolicy/policy/modules/services/cups.te 2006-03-04 00:06:35.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/services/cups.te 2006-03-07 13:42:37.000000000 -0500 +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.te serefpolicy-2.2.25/policy/modules/services/cups.te +--- nsaserefpolicy/policy/modules/services/cups.te 2006-03-17 13:51:48.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/services/cups.te 2006-03-21 14:39:07.000000000 -0500 @@ -77,7 +77,7 @@ dontaudit cupsd_t self:capability { sys_tty_config net_admin }; allow cupsd_t self:process { setsched signal_perms }; @@ -675,9 +751,9 @@ ') ######################################## -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cvs.te serefpolicy-2.2.23/policy/modules/services/cvs.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cvs.te serefpolicy-2.2.25/policy/modules/services/cvs.te --- nsaserefpolicy/policy/modules/services/cvs.te 2006-03-04 00:06:35.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/services/cvs.te 2006-03-07 13:42:37.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/services/cvs.te 2006-03-21 14:39:07.000000000 -0500 @@ -11,7 +11,7 @@ inetd_tcp_service_domain(cvs_t,cvs_exec_t) role system_r types cvs_t; @@ -687,9 +763,9 @@ files_type(cvs_data_t) type cvs_tmp_t; -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.if serefpolicy-2.2.23/policy/modules/services/hal.if +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.if serefpolicy-2.2.25/policy/modules/services/hal.if --- nsaserefpolicy/policy/modules/services/hal.if 2006-03-04 00:06:36.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/services/hal.if 2006-03-07 13:42:37.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/services/hal.if 2006-03-21 14:39:07.000000000 -0500 @@ -100,3 +100,44 @@ allow $1 hald_t:dbus send_msg; allow hald_t $1:dbus send_msg; @@ -735,9 +811,9 @@ + allow $1 hald_var_run_t:file rw_file_perms; +') + -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.te serefpolicy-2.2.23/policy/modules/services/hal.te ---- nsaserefpolicy/policy/modules/services/hal.te 2006-03-04 00:06:36.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/services/hal.te 2006-03-09 16:33:41.000000000 -0500 +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.te serefpolicy-2.2.25/policy/modules/services/hal.te +--- nsaserefpolicy/policy/modules/services/hal.te 2006-03-17 13:51:48.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/services/hal.te 2006-03-21 14:39:07.000000000 -0500 @@ -22,7 +22,7 @@ # @@ -794,17 +870,28 @@ optional_policy(`mount',` mount_domtrans(hald_t) ') -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ktalk.fc serefpolicy-2.2.23/policy/modules/services/ktalk.fc +@@ -203,6 +210,10 @@ + nis_use_ypbind(hald_t) + ') + ++optional_policy(`ntp', ` ++ ntp_domtrans(hald_t) ++') ++ + optional_policy(`nscd',` + nscd_socket_use(hald_t) + ') +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ktalk.fc serefpolicy-2.2.25/policy/modules/services/ktalk.fc --- nsaserefpolicy/policy/modules/services/ktalk.fc 2006-02-20 14:07:37.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/services/ktalk.fc 2006-03-07 13:42:37.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/services/ktalk.fc 2006-03-21 14:39:07.000000000 -0500 @@ -1,3 +1,4 @@ /usr/bin/in.talkd -- gen_context(system_u:object_r:ktalkd_exec_t,s0) /usr/bin/ktalkd -- gen_context(system_u:object_r:ktalkd_exec_t,s0) +/var/log/talkd.* -- gen_context(system_u:object_r:ktalkd_log_t,s0) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ktalk.te serefpolicy-2.2.23/policy/modules/services/ktalk.te ---- nsaserefpolicy/policy/modules/services/ktalk.te 2006-03-04 00:06:36.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/services/ktalk.te 2006-03-07 13:42:37.000000000 -0500 +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ktalk.te serefpolicy-2.2.25/policy/modules/services/ktalk.te +--- nsaserefpolicy/policy/modules/services/ktalk.te 2006-03-17 13:51:48.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/services/ktalk.te 2006-03-21 14:39:07.000000000 -0500 @@ -14,6 +14,9 @@ type ktalkd_tmp_t; files_tmp_file(ktalkd_tmp_t) @@ -828,9 +915,9 @@ miscfiles_read_localization(ktalkd_t) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mailman.if serefpolicy-2.2.23/policy/modules/services/mailman.if +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mailman.if serefpolicy-2.2.25/policy/modules/services/mailman.if --- nsaserefpolicy/policy/modules/services/mailman.if 2006-03-04 00:06:36.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/services/mailman.if 2006-03-08 16:59:01.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/services/mailman.if 2006-03-21 14:39:07.000000000 -0500 @@ -275,3 +275,28 @@ allow $1 mailman_archive_t:file r_file_perms; allow $1 mailman_archive_t:lnk_file { getattr read }; @@ -860,17 +947,17 @@ + allow mailman_queue_t $1:process sigchld; +') + -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nis.fc serefpolicy-2.2.23/policy/modules/services/nis.fc +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nis.fc serefpolicy-2.2.25/policy/modules/services/nis.fc --- nsaserefpolicy/policy/modules/services/nis.fc 2005-11-28 21:48:04.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/services/nis.fc 2006-03-10 16:47:00.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/services/nis.fc 2006-03-21 14:39:07.000000000 -0500 @@ -7,3 +7,4 @@ /usr/sbin/ypserv -- gen_context(system_u:object_r:ypserv_exec_t,s0) /var/yp(/.*)? gen_context(system_u:object_r:var_yp_t,s0) +/usr/sbin/rpc.ypxfr -- gen_context(system_u:object_r:ypxfr_exec_t,s0) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nis.if serefpolicy-2.2.23/policy/modules/services/nis.if +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nis.if serefpolicy-2.2.25/policy/modules/services/nis.if --- nsaserefpolicy/policy/modules/services/nis.if 2006-02-10 21:34:14.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/services/nis.if 2006-03-10 16:45:39.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/services/nis.if 2006-03-21 14:39:07.000000000 -0500 @@ -277,3 +277,28 @@ files_search_etc($1) allow $1 ypserv_conf_t:file { getattr read }; @@ -900,9 +987,9 @@ + allow ypxfr_t $1:fifo_file rw_file_perms; + allow ypxfr_t $1:process sigchld; +') -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nis.te serefpolicy-2.2.23/policy/modules/services/nis.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nis.te serefpolicy-2.2.25/policy/modules/services/nis.te --- nsaserefpolicy/policy/modules/services/nis.te 2006-03-04 00:06:36.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/services/nis.te 2006-03-13 13:32:08.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/services/nis.te 2006-03-21 14:39:07.000000000 -0500 @@ -31,6 +31,10 @@ type ypserv_exec_t; init_daemon_domain(ypserv_t,ypserv_exec_t) @@ -956,9 +1043,9 @@ + +allow ypxfr_t etc_t:file { getattr read }; +files_read_etc_files(ypxfr_t) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nscd.if serefpolicy-2.2.23/policy/modules/services/nscd.if +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nscd.if serefpolicy-2.2.25/policy/modules/services/nscd.if --- nsaserefpolicy/policy/modules/services/nscd.if 2006-02-10 21:34:14.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/services/nscd.if 2006-03-07 13:42:37.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/services/nscd.if 2006-03-21 14:39:07.000000000 -0500 @@ -49,8 +49,8 @@ dontaudit $1 nscd_t:nscd { shmempwd shmemgrp shmemhost }; @@ -969,9 +1056,20 @@ dontaudit $1 nscd_var_run_t:file { getattr read }; ') -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postfix.te serefpolicy-2.2.23/policy/modules/services/postfix.te ---- nsaserefpolicy/policy/modules/services/postfix.te 2006-03-04 00:06:36.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/services/postfix.te 2006-03-08 16:58:41.000000000 -0500 +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pegasus.te serefpolicy-2.2.25/policy/modules/services/pegasus.te +--- nsaserefpolicy/policy/modules/services/pegasus.te 2006-03-04 00:06:36.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/services/pegasus.te 2006-03-21 14:39:07.000000000 -0500 +@@ -77,6 +77,7 @@ + corenet_tcp_bind_pegasus_https_port(pegasus_t) + corenet_tcp_connect_pegasus_http_port(pegasus_t) + corenet_tcp_connect_pegasus_https_port(pegasus_t) ++corenet_tcp_connect_generic_port(pegasus_t) + + dev_read_sysfs(pegasus_t) + dev_read_urand(pegasus_t) +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postfix.te serefpolicy-2.2.25/policy/modules/services/postfix.te +--- nsaserefpolicy/policy/modules/services/postfix.te 2006-03-17 13:51:49.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/services/postfix.te 2006-03-21 14:39:07.000000000 -0500 @@ -406,6 +406,10 @@ procmail_domtrans(postfix_pipe_t) ') @@ -983,9 +1081,31 @@ ######################################## # # Postfix postdrop local policy -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/samba.te serefpolicy-2.2.23/policy/modules/services/samba.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/privoxy.te serefpolicy-2.2.25/policy/modules/services/privoxy.te +--- nsaserefpolicy/policy/modules/services/privoxy.te 2006-03-04 00:06:36.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/services/privoxy.te 2006-03-21 14:39:07.000000000 -0500 +@@ -51,6 +51,7 @@ + corenet_tcp_bind_http_cache_port(privoxy_t) + corenet_tcp_connect_http_port(privoxy_t) + corenet_tcp_connect_ftp_port(privoxy_t) ++corenet_tcp_connect_tor_port(privoxy_t) + + dev_read_sysfs(privoxy_t) + +@@ -94,6 +95,10 @@ + nis_use_ypbind(privoxy_t) + ') + ++optional_policy(`nscd',` ++ nscd_socket_use(privoxy_t) ++') ++ + optional_policy(`selinuxutil',` + seutil_sigchld_newrole(privoxy_t) + ') +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/samba.te serefpolicy-2.2.25/policy/modules/services/samba.te --- nsaserefpolicy/policy/modules/services/samba.te 2006-03-04 00:06:36.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/services/samba.te 2006-03-07 13:42:37.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/services/samba.te 2006-03-21 14:39:07.000000000 -0500 @@ -32,7 +32,7 @@ type samba_secrets_t; files_type(samba_secrets_t) @@ -995,9 +1115,9 @@ files_config_file(samba_share_t) type samba_var_t; -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/sendmail.te serefpolicy-2.2.23/policy/modules/services/sendmail.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/sendmail.te serefpolicy-2.2.25/policy/modules/services/sendmail.te --- nsaserefpolicy/policy/modules/services/sendmail.te 2006-03-04 00:06:36.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/services/sendmail.te 2006-03-14 15:56:20.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/services/sendmail.te 2006-03-21 14:39:07.000000000 -0500 @@ -125,6 +125,7 @@ ') @@ -1006,9 +1126,48 @@ postfix_read_config(sendmail_t) postfix_search_spool(sendmail_t) ') -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/fstools.if serefpolicy-2.2.23/policy/modules/system/fstools.if +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.if serefpolicy-2.2.25/policy/modules/services/xserver.if +--- nsaserefpolicy/policy/modules/services/xserver.if 2006-03-21 14:33:33.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/services/xserver.if 2006-03-21 14:39:07.000000000 -0500 +@@ -922,3 +922,23 @@ + + dontaudit $1 xdm_xserver_t:tcp_socket { read write }; + ') ++ ++######################################## ++## ++## Allow read and write to ++## a XDM X server socket. ++## ++## ++## ++## Domain to allow ++## ++## ++# ++interface(`xserver_rw_xdm_sockets',` ++ gen_require(` ++ type xdm_xserver_tmp_t; ++ ') ++ ++ allow $1 xdm_xserver_tmp_t:dir search; ++ allow $1 xdm_xserver_tmp_t:sock_file { read write }; ++') +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlogin.te serefpolicy-2.2.25/policy/modules/system/authlogin.te +--- nsaserefpolicy/policy/modules/system/authlogin.te 2006-03-17 13:51:50.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/system/authlogin.te 2006-03-22 10:19:37.000000000 -0500 +@@ -171,6 +171,8 @@ + dev_setattr_video_dev(pam_console_t) + dev_getattr_xserver_misc_dev(pam_console_t) + dev_setattr_xserver_misc_dev(pam_console_t) ++dev_getattr_generic_usb_dev(pam_console_t) ++dev_setattr_generic_usb_dev(pam_console_t) + + fs_search_auto_mountpoints(pam_console_t) + +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/fstools.if serefpolicy-2.2.25/policy/modules/system/fstools.if --- nsaserefpolicy/policy/modules/system/fstools.if 2006-02-10 21:34:15.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/system/fstools.if 2006-03-14 11:33:20.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/system/fstools.if 2006-03-21 14:39:07.000000000 -0500 @@ -110,3 +110,21 @@ allow $1 fsadm_exec_t:file create_file_perms; @@ -1031,9 +1190,9 @@ + + allow $1 swapfile_t:file getattr; +') -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/fstools.te serefpolicy-2.2.23/policy/modules/system/fstools.te ---- nsaserefpolicy/policy/modules/system/fstools.te 2006-03-04 00:06:37.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/system/fstools.te 2006-03-14 11:32:08.000000000 -0500 +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/fstools.te serefpolicy-2.2.25/policy/modules/system/fstools.te +--- nsaserefpolicy/policy/modules/system/fstools.te 2006-03-17 13:51:50.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/system/fstools.te 2006-03-21 14:39:07.000000000 -0500 @@ -53,6 +53,7 @@ kernel_change_ring_buffer_level(fsadm_t) # mkreiserfs needs this @@ -1042,7 +1201,18 @@ # Access to /initrd devices kernel_rw_unlabeled_dirs(fsadm_t) kernel_rw_unlabeled_blk_files(fsadm_t) -@@ -73,6 +74,7 @@ +@@ -65,6 +66,10 @@ + dev_read_urand(fsadm_t) + # Recreate /dev/cdrom. + dev_manage_generic_symlinks(fsadm_t) ++ ++# fdisk needs this for early boot ++dev_manage_generic_blk_files(fsadm_t) ++ + # Access to /initrd devices + dev_search_usbfs(fsadm_t) + # for swapon +@@ -73,6 +78,7 @@ dev_getattr_usbfs_dirs(fsadm_t) # Access to /dev/mapper/control dev_rw_lvm_control(fsadm_t) @@ -1050,7 +1220,7 @@ fs_search_auto_mountpoints(fsadm_t) fs_getattr_xattr_fs(fsadm_t) -@@ -127,6 +129,7 @@ +@@ -127,6 +133,7 @@ init_use_fds(fsadm_t) init_use_script_ptys(fsadm_t) @@ -1058,9 +1228,9 @@ libs_use_ld_so(fsadm_t) libs_use_shared_libs(fsadm_t) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.te serefpolicy-2.2.23/policy/modules/system/init.te ---- nsaserefpolicy/policy/modules/system/init.te 2006-03-04 00:06:37.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/system/init.te 2006-03-15 09:44:32.000000000 -0500 +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.te serefpolicy-2.2.25/policy/modules/system/init.te +--- nsaserefpolicy/policy/modules/system/init.te 2006-03-17 13:51:50.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/system/init.te 2006-03-21 14:39:07.000000000 -0500 @@ -349,6 +349,7 @@ files_mounton_isid_type_dirs(initrc_t) files_list_default(initrc_t) @@ -1080,9 +1250,9 @@ ',` # cjp: require doesnt work in optionals :\ # this also would result in a type transition -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.fc serefpolicy-2.2.23/policy/modules/system/libraries.fc +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.fc serefpolicy-2.2.25/policy/modules/system/libraries.fc --- nsaserefpolicy/policy/modules/system/libraries.fc 2006-02-20 14:07:38.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/system/libraries.fc 2006-03-07 13:42:37.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/system/libraries.fc 2006-03-21 14:39:07.000000000 -0500 @@ -65,6 +65,7 @@ /usr/lib(64)?/(nvidia/)?libGL(core)?\.so(\.[^/]*)* -- gen_context(system_u:object_r:textrel_shlib_t,s0) /usr/lib(64)?/libGLU\.so(\.[^/]*)* -- gen_context(system_u:object_r:textrel_shlib_t,s0) @@ -1099,9 +1269,9 @@ ifdef(`distro_redhat',` /usr/lib(64)?/.*/program/.*\.so.* gen_context(system_u:object_r:shlib_t,s0) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/locallogin.te serefpolicy-2.2.23/policy/modules/system/locallogin.te ---- nsaserefpolicy/policy/modules/system/locallogin.te 2006-03-04 00:06:37.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/system/locallogin.te 2006-03-07 13:42:37.000000000 -0500 +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/locallogin.te serefpolicy-2.2.25/policy/modules/system/locallogin.te +--- nsaserefpolicy/policy/modules/system/locallogin.te 2006-03-17 13:51:50.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/system/locallogin.te 2006-03-21 14:39:07.000000000 -0500 @@ -20,6 +20,7 @@ type local_login_tmp_t; @@ -1110,9 +1280,9 @@ type sulogin_t; type sulogin_exec_t; -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/lvm.fc serefpolicy-2.2.23/policy/modules/system/lvm.fc +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/lvm.fc serefpolicy-2.2.25/policy/modules/system/lvm.fc --- nsaserefpolicy/policy/modules/system/lvm.fc 2005-11-14 18:24:06.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/system/lvm.fc 2006-03-07 13:42:37.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/system/lvm.fc 2006-03-21 14:39:07.000000000 -0500 @@ -25,6 +25,7 @@ # /sbin # @@ -1121,9 +1291,9 @@ /sbin/dmsetup -- gen_context(system_u:object_r:lvm_exec_t,s0) /sbin/dmsetup\.static -- gen_context(system_u:object_r:lvm_exec_t,s0) /sbin/e2fsadm -- gen_context(system_u:object_r:lvm_exec_t,s0) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/lvm.te serefpolicy-2.2.23/policy/modules/system/lvm.te ---- nsaserefpolicy/policy/modules/system/lvm.te 2006-03-04 00:06:37.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/system/lvm.te 2006-03-08 10:58:24.000000000 -0500 +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/lvm.te serefpolicy-2.2.25/policy/modules/system/lvm.te +--- nsaserefpolicy/policy/modules/system/lvm.te 2006-03-17 13:51:50.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/system/lvm.te 2006-03-21 14:39:07.000000000 -0500 @@ -129,6 +129,8 @@ # DAC overrides and mknod for modifying /dev entries (vgmknodes) @@ -1141,9 +1311,9 @@ fs_getattr_xattr_fs(lvm_t) fs_search_auto_mountpoints(lvm_t) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.te serefpolicy-2.2.23/policy/modules/system/mount.te ---- nsaserefpolicy/policy/modules/system/mount.te 2006-03-04 00:06:37.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/system/mount.te 2006-03-14 14:40:50.000000000 -0500 +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.te serefpolicy-2.2.25/policy/modules/system/mount.te +--- nsaserefpolicy/policy/modules/system/mount.te 2006-03-17 13:51:50.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/system/mount.te 2006-03-21 14:39:07.000000000 -0500 @@ -26,6 +26,7 @@ files_tmp_filetrans(mount_t,mount_tmp_t,{ file dir }) @@ -1168,9 +1338,9 @@ libs_use_ld_so(mount_t) libs_use_shared_libs(mount_t) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.fc serefpolicy-2.2.23/policy/modules/system/selinuxutil.fc +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.fc serefpolicy-2.2.25/policy/modules/system/selinuxutil.fc --- nsaserefpolicy/policy/modules/system/selinuxutil.fc 2006-02-23 09:25:09.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/system/selinuxutil.fc 2006-03-15 16:33:44.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/system/selinuxutil.fc 2006-03-21 14:39:07.000000000 -0500 @@ -8,9 +8,9 @@ /etc/selinux/([^/]*/)?contexts/files(/.*)? gen_context(system_u:object_r:file_context_t,s0) /etc/selinux/([^/]*/)?policy(/.*)? gen_context(system_u:object_r:policy_config_t,s15:c0.c255) @@ -1184,9 +1354,9 @@ /etc/selinux/([^/]*/)?users(/.*)? -- gen_context(system_u:object_r:selinux_config_t,s15:c0.c255) # -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.if serefpolicy-2.2.23/policy/modules/system/selinuxutil.if +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.if serefpolicy-2.2.25/policy/modules/system/selinuxutil.if --- nsaserefpolicy/policy/modules/system/selinuxutil.if 2006-02-23 09:25:09.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/system/selinuxutil.if 2006-03-14 17:32:57.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/system/selinuxutil.if 2006-03-21 14:39:07.000000000 -0500 @@ -675,8 +675,8 @@ files_search_etc($1) @@ -1228,9 +1398,9 @@ + allow $1 selinux_config_t:lnk_file { getattr read }; +') + -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.te serefpolicy-2.2.23/policy/modules/system/selinuxutil.te ---- nsaserefpolicy/policy/modules/system/selinuxutil.te 2006-03-04 00:06:37.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/system/selinuxutil.te 2006-03-15 09:23:03.000000000 -0500 +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.te serefpolicy-2.2.25/policy/modules/system/selinuxutil.te +--- nsaserefpolicy/policy/modules/system/selinuxutil.te 2006-03-17 13:51:50.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/system/selinuxutil.te 2006-03-21 14:39:07.000000000 -0500 @@ -192,6 +192,9 @@ selinux_load_policy(load_policy_t) selinux_set_boolean(load_policy_t) @@ -1296,9 +1466,9 @@ userdom_use_all_users_fds(setfiles_t) # for config files in a home directory -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/sysnetwork.te serefpolicy-2.2.23/policy/modules/system/sysnetwork.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/sysnetwork.te serefpolicy-2.2.25/policy/modules/system/sysnetwork.te --- nsaserefpolicy/policy/modules/system/sysnetwork.te 2006-03-04 00:06:37.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/system/sysnetwork.te 2006-03-09 11:15:56.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/system/sysnetwork.te 2006-03-21 14:39:07.000000000 -0500 @@ -161,6 +161,10 @@ consoletype_domtrans(dhcpc_t) ') @@ -1320,9 +1490,9 @@ ifdef(`targeted_policy',` term_use_generic_ptys(ifconfig_t) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.te serefpolicy-2.2.23/policy/modules/system/udev.te ---- nsaserefpolicy/policy/modules/system/udev.te 2006-03-04 00:06:37.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/system/udev.te 2006-03-13 12:21:29.000000000 -0500 +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.te serefpolicy-2.2.25/policy/modules/system/udev.te +--- nsaserefpolicy/policy/modules/system/udev.te 2006-03-17 13:51:50.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/system/udev.te 2006-03-21 14:39:07.000000000 -0500 @@ -39,7 +39,7 @@ # Local policy # @@ -1332,9 +1502,9 @@ dontaudit udev_t self:capability sys_tty_config; allow udev_t self:process ~{ ptrace setcurrent setexec setfscreate setrlimit execmem execstack execheap }; allow udev_t self:process { execmem setfscreate }; -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.te serefpolicy-2.2.23/policy/modules/system/unconfined.te ---- nsaserefpolicy/policy/modules/system/unconfined.te 2006-02-20 14:07:38.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/system/unconfined.te 2006-03-08 12:35:43.000000000 -0500 +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.te serefpolicy-2.2.25/policy/modules/system/unconfined.te +--- nsaserefpolicy/policy/modules/system/unconfined.te 2006-03-17 13:51:50.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/system/unconfined.te 2006-03-21 14:39:07.000000000 -0500 @@ -89,10 +89,6 @@ firstboot_domtrans(unconfined_t) ') @@ -1357,10 +1527,10 @@ optional_policy(`netutils',` netutils_domtrans_ping(unconfined_t) ') -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-2.2.23/policy/modules/system/userdomain.te ---- nsaserefpolicy/policy/modules/system/userdomain.te 2006-03-04 00:06:37.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/system/userdomain.te 2006-03-14 15:57:25.000000000 -0500 -@@ -179,6 +179,7 @@ +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-2.2.25/policy/modules/system/userdomain.te +--- nsaserefpolicy/policy/modules/system/userdomain.te 2006-03-17 13:51:50.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/system/userdomain.te 2006-03-21 14:39:07.000000000 -0500 +@@ -180,6 +180,7 @@ logging_read_audit_log(secadm_t) logging_domtrans_auditctl(secadm_t) userdom_dontaudit_append_staff_home_content_files(secadm_t) @@ -1368,9 +1538,9 @@ ', ` logging_domtrans_auditctl(sysadm_t) logging_read_audit_log(sysadm_t) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xend.fc serefpolicy-2.2.23/policy/modules/system/xend.fc +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xend.fc serefpolicy-2.2.25/policy/modules/system/xend.fc --- nsaserefpolicy/policy/modules/system/xend.fc 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/system/xend.fc 2006-03-10 16:48:34.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/system/xend.fc 2006-03-21 14:39:07.000000000 -0500 @@ -0,0 +1,23 @@ +# xend executable will have: +# label: system_u:object_r:xend_exec_t @@ -1395,9 +1565,9 @@ +/dev/xen/evtchn -c system_u:object_r:xend_device_t:s0 +/usr/lib/xen/bin(/.*)? system_u:object_r:bin_t:s0 + -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xend.if serefpolicy-2.2.23/policy/modules/system/xend.if +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xend.if serefpolicy-2.2.25/policy/modules/system/xend.if --- nsaserefpolicy/policy/modules/system/xend.if 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/system/xend.if 2006-03-07 15:47:54.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/system/xend.if 2006-03-21 14:39:07.000000000 -0500 @@ -0,0 +1,71 @@ +## policy for xen + @@ -1470,9 +1640,9 @@ + allow $1 xenstored_t:unix_stream_socket connectto; +') + -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xend.te serefpolicy-2.2.23/policy/modules/system/xend.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xend.te serefpolicy-2.2.25/policy/modules/system/xend.te --- nsaserefpolicy/policy/modules/system/xend.te 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-2.2.23/policy/modules/system/xend.te 2006-03-13 16:17:27.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/system/xend.te 2006-03-21 14:39:07.000000000 -0500 @@ -0,0 +1,219 @@ +policy_module(xend,1.0.0) + @@ -1693,30 +1863,15 @@ + +xend_append_log(xenstored_t) + -diff --exclude-from=exclude -N -u -r nsaserefpolicy/Rules.modular serefpolicy-2.2.23/Rules.modular ---- nsaserefpolicy/Rules.modular 2006-02-17 14:46:10.000000000 -0500 -+++ serefpolicy-2.2.23/Rules.modular 2006-03-07 13:42:37.000000000 -0500 -@@ -204,7 +204,7 @@ +diff --exclude-from=exclude -N -u -r nsaserefpolicy/Rules.modular serefpolicy-2.2.25/Rules.modular +--- nsaserefpolicy/Rules.modular 2006-03-21 14:33:29.000000000 -0500 ++++ serefpolicy-2.2.25/Rules.modular 2006-03-21 14:39:07.000000000 -0500 +@@ -208,7 +208,7 @@ # $(APPDIR)/customizable_types: $(BASE_CONF) @mkdir -p $(APPDIR) -- $(verbose) grep "^type .*customizable" $< | cut -d',' -f1 | cut -d' ' -f2 > $(TMPDIR)/customizable_types -+ $(verbose) grep '^[^[:print:]]*type .*customizable' $< | cut -d',' -f1 | cut -d' ' -f2 | sort -u > $(TMPDIR)/customizable_types +- $(verbose) $(GREP) "^type .*customizable" $< | cut -d',' -f1 | cut -d' ' -f2 > $(TMPDIR)/customizable_types ++ $(verbose) $(GREP) '^[^[:print:]]*type .*customizable' $< | cut -d',' -f1 | cut -d' ' -f2 | sort -u > $(TMPDIR)/customizable_types $(verbose) install -m 644 $(TMPDIR)/customizable_types $@ ######################################## -diff --exclude-from=exclude -N -u -r nsaserefpolicy/support/Makefile.devel serefpolicy-2.2.23/support/Makefile.devel ---- nsaserefpolicy/support/Makefile.devel 2006-02-22 14:09:04.000000000 -0500 -+++ serefpolicy-2.2.23/support/Makefile.devel 2006-03-07 13:42:37.000000000 -0500 -@@ -6,10 +6,7 @@ - SED ?= sed - EINFO ?= echo - PYTHON ?= python -- --NAME ?= $(shell $(AWK) -F= '/^SELINUXTYPE/{ print $$2 }' /etc/selinux/config) --SHAREDIR ?= /usr/share/selinux --HEADERDIR ?= $(SHAREDIR)/$(NAME)/include -+HEADERDIR ?= . - - include $(HEADERDIR)/build.conf - Index: selinux-policy.spec =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/FC-5/selinux-policy.spec,v retrieving revision 1.154 retrieving revision 1.155 diff -u -r1.154 -r1.155 --- selinux-policy.spec 16 Mar 2006 14:41:17 -0000 1.154 +++ selinux-policy.spec 22 Mar 2006 18:44:17 -0000 1.155 @@ -5,12 +5,12 @@ %define BUILD_TARGETED 0 %define BUILD_MLS 1 %define POLICYVER 20 -%define POLICYCOREUTILSVER 1.29.26-1 -%define CHECKPOLICYVER 1.29.4-1 +%define POLICYCOREUTILSVER 1.30-1 +%define CHECKPOLICYVER 1.30-1 Summary: SELinux policy configuration Name: selinux-policy -Version: 2.2.23 -Release: 19 +Version: 2.2.25 +Release: 2.fc5 License: GPL Group: System Environment/Base Source: serefpolicy-%{version}.tgz @@ -163,8 +163,7 @@ install -m 755 ${RPM_SOURCE_DIR}/policygentool ${RPM_BUILD_ROOT}%{_usr}/share/selinux/devel/ install -m 644 ${RPM_SOURCE_DIR}/Makefile.devel ${RPM_BUILD_ROOT}%{_usr}/share/selinux/devel/Makefile install -m 644 doc/example.* ${RPM_BUILD_ROOT}%{_usr}/share/selinux/devel/ -echo "htmlview file:///usr/share/doc/selinux-policy-%{version}/html/index.html" -> ${RPM_BUILD_ROOT}%{_usr}/share/selinux/devel/policyhelp +echo "htmlview file:///usr/share/doc/selinux-policy-%{version}/html/index.html > ${RPM_BUILD_ROOT}%{_usr}/share/selinux/devel/policyhelp chmod +x ${RPM_BUILD_ROOT}%{_usr}/share/selinux/devel/policyhelp # Build targeted policy @@ -298,6 +297,16 @@ %fileList strict %changelog +* Wed Mar 22 2006 Dan Walsh 2.2.25-2.fc5 +- Rebuild for FC5 + +* Wed Mar 22 2006 Dan Walsh 2.2.25-2 +- Fix pam_console handling of usb_device +- dontaudit logwatch reading /mnt dir + +* Fri Mar 17 2006 Dan Walsh 2.2.24-1 +- Update to upstream + * Wed Mar 15 2006 Dan Walsh 2.2.23-19 - Get transition rules to create policy.20 at SystemHigh Index: sources =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/FC-5/sources,v retrieving revision 1.51 retrieving revision 1.52 diff -u -r1.51 -r1.52 --- sources 4 Mar 2006 14:49:35 -0000 1.51 +++ sources 22 Mar 2006 18:44:17 -0000 1.52 @@ -1 +1 @@ -bf76b7f77de4a36a1842db5cb0a98fa7 serefpolicy-2.2.23.tgz +efdb10103ce8e6d7c86d1b3153a6f04a serefpolicy-2.2.25.tgz From fedora-cvs-commits at redhat.com Wed Mar 22 18:53:09 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 22 Mar 2006 13:53:09 -0500 Subject: rpms/selinux-policy/FC-5 selinux-policy.spec,1.155,1.156 Message-ID: <200603221853.k2MIr9Ct017289@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/selinux-policy/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv17276 Modified Files: selinux-policy.spec Log Message: * Wed Mar 22 2006 Dan Walsh 2.2.25-2.fc5 - Rebuild for FC5 Index: selinux-policy.spec =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/FC-5/selinux-policy.spec,v retrieving revision 1.155 retrieving revision 1.156 diff -u -r1.155 -r1.156 --- selinux-policy.spec 22 Mar 2006 18:44:17 -0000 1.155 +++ selinux-policy.spec 22 Mar 2006 18:53:07 -0000 1.156 @@ -163,11 +163,14 @@ install -m 755 ${RPM_SOURCE_DIR}/policygentool ${RPM_BUILD_ROOT}%{_usr}/share/selinux/devel/ install -m 644 ${RPM_SOURCE_DIR}/Makefile.devel ${RPM_BUILD_ROOT}%{_usr}/share/selinux/devel/Makefile install -m 644 doc/example.* ${RPM_BUILD_ROOT}%{_usr}/share/selinux/devel/ -echo "htmlview file:///usr/share/doc/selinux-policy-%{version}/html/index.html > ${RPM_BUILD_ROOT}%{_usr}/share/selinux/devel/policyhelp +echo "htmlview file:///usr/share/doc/selinux-policy-%{version}/html/index.html" > ${RPM_BUILD_ROOT}%{_usr}/share/selinux/devel/policyhelp chmod +x ${RPM_BUILD_ROOT}%{_usr}/share/selinux/devel/policyhelp # Build targeted policy # Commented out because only targeted ref policy currently builds + + + %setupCmds targeted targeted-mcs y n %installCmds targeted targeted-mcs y n From fedora-cvs-commits at redhat.com Wed Mar 22 19:04:43 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 22 Mar 2006 14:04:43 -0500 Subject: rpms/gnome-icon-theme/FC-5 .cvsignore, 1.27, 1.28 gnome-icon-theme.spec, 1.41, 1.42 sources, 1.29, 1.30 Message-ID: <200603221904.k2MJ4hn1017627@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/gnome-icon-theme/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv17613 Modified Files: .cvsignore gnome-icon-theme.spec sources Log Message: 2.14.2 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/gnome-icon-theme/FC-5/.cvsignore,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- .cvsignore 26 Feb 2006 02:22:54 -0000 1.27 +++ .cvsignore 22 Mar 2006 19:04:40 -0000 1.28 @@ -1,3 +1,4 @@ gnome-icon-theme-2.14.0.tar.bz2 web-browser.png gnome-icon-theme-2.14.1.tar.bz2 +gnome-icon-theme-2.14.2.tar.bz2 Index: gnome-icon-theme.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-icon-theme/FC-5/gnome-icon-theme.spec,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- gnome-icon-theme.spec 26 Feb 2006 02:22:54 -0000 1.41 +++ gnome-icon-theme.spec 22 Mar 2006 19:04:40 -0000 1.42 @@ -1,7 +1,7 @@ Summary: Base gnome icons Name: gnome-icon-theme -Version: 2.14.1 -Release: 1 +Version: 2.14.2 +Release: 1.fc5.1 Source0: %{name}-%{version}.tar.bz2 # missing 24x24 version of epiphany icon Source1: web-browser.png @@ -51,6 +51,11 @@ ln -s ../../../gnome/$i/apps/gnome-system.png redhat-system_tools.png done +for i in 48x48 16x16; do +cd $RPM_BUILD_ROOT%{_datadir}/icons/gnome/$i/mimetypes +ln -s gnome-mime-text-xml.png gnome-mime-application-xml.png +done + %clean rm -rf $RPM_BUILD_ROOT @@ -70,6 +75,10 @@ %{_datadir}/pkgconfig/gnome-icon-theme.pc %changelog +* Wed Mar 22 2006 Matthias Clasen 2.14.2-1 +- Update to 2.14.2 +- Add symlinks to make application/xml work + * Sat Feb 25 2006 Matthias Clasen 2.14.1-1 - Update to 2.14.1 Index: sources =================================================================== RCS file: /cvs/dist/rpms/gnome-icon-theme/FC-5/sources,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- sources 26 Feb 2006 02:22:54 -0000 1.29 +++ sources 22 Mar 2006 19:04:40 -0000 1.30 @@ -1,2 +1,2 @@ 88a5d07c629eaaa366d2a19ec07df4d4 web-browser.png -a1ca3a558f2da862dcb8c23237986c94 gnome-icon-theme-2.14.1.tar.bz2 +6f1d33a297bd27e0e9f4c1a5fa956166 gnome-icon-theme-2.14.2.tar.bz2 From fedora-cvs-commits at redhat.com Wed Mar 22 19:09:54 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 22 Mar 2006 14:09:54 -0500 Subject: rpms/gnome-icon-theme/devel gnome-icon-theme.spec, 1.41, 1.42 sources, 1.29, 1.30 Message-ID: <200603221909.k2MJ9svD017786@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/gnome-icon-theme/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv17772 Modified Files: gnome-icon-theme.spec sources Log Message: 2.14.2 Index: gnome-icon-theme.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-icon-theme/devel/gnome-icon-theme.spec,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- gnome-icon-theme.spec 26 Feb 2006 02:22:54 -0000 1.41 +++ gnome-icon-theme.spec 22 Mar 2006 19:09:52 -0000 1.42 @@ -1,7 +1,7 @@ Summary: Base gnome icons Name: gnome-icon-theme -Version: 2.14.1 -Release: 1 +Version: 2.14.2 +Release: 2 Source0: %{name}-%{version}.tar.bz2 # missing 24x24 version of epiphany icon Source1: web-browser.png @@ -51,6 +51,11 @@ ln -s ../../../gnome/$i/apps/gnome-system.png redhat-system_tools.png done +for i in 48x48 16x16; do +cd $RPM_BUILD_ROOT%{_datadir}/icons/gnome/$i/mimetypes +ln -s gnome-mime-text-xml.png gnome-mime-application-xml.png +done + %clean rm -rf $RPM_BUILD_ROOT @@ -70,6 +75,10 @@ %{_datadir}/pkgconfig/gnome-icon-theme.pc %changelog +* Wed Mar 22 2006 Matthias Clasen 2.14.2-2 +- Update to 2.14.2 +- Add symlinks to make application/xml work + * Sat Feb 25 2006 Matthias Clasen 2.14.1-1 - Update to 2.14.1 Index: sources =================================================================== RCS file: /cvs/dist/rpms/gnome-icon-theme/devel/sources,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- sources 26 Feb 2006 02:22:54 -0000 1.29 +++ sources 22 Mar 2006 19:09:52 -0000 1.30 @@ -1,2 +1,2 @@ 88a5d07c629eaaa366d2a19ec07df4d4 web-browser.png -a1ca3a558f2da862dcb8c23237986c94 gnome-icon-theme-2.14.1.tar.bz2 +6f1d33a297bd27e0e9f4c1a5fa956166 gnome-icon-theme-2.14.2.tar.bz2 From fedora-cvs-commits at redhat.com Wed Mar 22 19:23:42 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 22 Mar 2006 14:23:42 -0500 Subject: rpms/shared-mime-info/devel shared-mime-info-0.17-postscript.patch, NONE, 1.1 shared-mime-info.spec, 1.38, 1.39 Message-ID: <200603221923.k2MJNgai011831@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/shared-mime-info/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv11747 Modified Files: shared-mime-info.spec Added Files: shared-mime-info-0.17-postscript.patch Log Message: fix postscript vs matlab confusion shared-mime-info-0.17-postscript.patch: freedesktop.org.xml.in | 1 + 1 files changed, 1 insertion(+) --- NEW FILE shared-mime-info-0.17-postscript.patch --- --- shared-mime-info-0.17/freedesktop.org.xml.in.postscript 2006-03-22 14:17:55.000000000 -0500 +++ shared-mime-info-0.17/freedesktop.org.xml.in 2006-03-22 14:18:10.000000000 -0500 @@ -144,6 +144,7 @@ + <_comment>PS document PostScript PostScript Index: shared-mime-info.spec =================================================================== RCS file: /cvs/dist/rpms/shared-mime-info/devel/shared-mime-info.spec,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- shared-mime-info.spec 16 Mar 2006 21:11:06 -0000 1.38 +++ shared-mime-info.spec 22 Mar 2006 19:23:40 -0000 1.39 @@ -1,7 +1,7 @@ Summary: Shared MIME information database Name: shared-mime-info Version: 0.17 -Release: 1 +Release: 2 License: GPL Group: System Environment/Libraries URL: http://freedesktop.org/Software/shared-mime-info @@ -10,6 +10,8 @@ Patch0: shared-mime-info-0.16-cisco-vpn.patch # https://bugs.freedesktop.org/show_bug.cgi?id=4675 Patch1: shared-mime-info-0.16-fonts.patch +# fixed in upstream cvs +Patch2: shared-mime-info-0.17-postscript.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot BuildRequires: libxml2-devel BuildRequires: glib2-devel @@ -29,6 +31,7 @@ %setup -q %patch0 -p0 -b .cisco-vpn %patch1 -p1 -b .fonts +%patch2 -p1 -b .postscript %build @@ -62,7 +65,10 @@ %{_mandir}/man*/* %changelog -* Thu Mar 16 2006 Matthiass Clasen - 0.17-1 +* Wed Mar 22 2006 Matthias Clasen - 0.17-2 +- Backport upstream change to fix postscript vs. matlab confusion + +* Thu Mar 16 2006 Matthias Clasen - 0.17-1 - Update to 0.17 * Mon Feb 13 2006 Ray Strode - 0.16.cvs20060212-3 From fedora-cvs-commits at redhat.com Wed Mar 22 19:21:24 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 22 Mar 2006 14:21:24 -0500 Subject: rpms/shared-mime-info/FC-5 shared-mime-info-0.17-postscript.patch, NONE, 1.1 shared-mime-info.spec, 1.38, 1.39 Message-ID: <200603221921.k2MJLOZf010864@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/shared-mime-info/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv10746 Modified Files: shared-mime-info.spec Added Files: shared-mime-info-0.17-postscript.patch Log Message: fix postscript vs matlab confusion shared-mime-info-0.17-postscript.patch: freedesktop.org.xml.in | 1 + 1 files changed, 1 insertion(+) --- NEW FILE shared-mime-info-0.17-postscript.patch --- --- shared-mime-info-0.17/freedesktop.org.xml.in.postscript 2006-03-22 14:17:55.000000000 -0500 +++ shared-mime-info-0.17/freedesktop.org.xml.in 2006-03-22 14:18:10.000000000 -0500 @@ -144,6 +144,7 @@ + <_comment>PS document PostScript PostScript Index: shared-mime-info.spec =================================================================== RCS file: /cvs/dist/rpms/shared-mime-info/FC-5/shared-mime-info.spec,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- shared-mime-info.spec 16 Mar 2006 21:11:06 -0000 1.38 +++ shared-mime-info.spec 22 Mar 2006 19:21:21 -0000 1.39 @@ -1,7 +1,7 @@ Summary: Shared MIME information database Name: shared-mime-info Version: 0.17 -Release: 1 +Release: 1.fc5.1 License: GPL Group: System Environment/Libraries URL: http://freedesktop.org/Software/shared-mime-info @@ -10,6 +10,8 @@ Patch0: shared-mime-info-0.16-cisco-vpn.patch # https://bugs.freedesktop.org/show_bug.cgi?id=4675 Patch1: shared-mime-info-0.16-fonts.patch +# fixed in upstream cvs +Patch2: shared-mime-info-0.17-postscript.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot BuildRequires: libxml2-devel BuildRequires: glib2-devel @@ -29,6 +31,7 @@ %setup -q %patch0 -p0 -b .cisco-vpn %patch1 -p1 -b .fonts +%patch2 -p1 -b .postscript %build @@ -62,7 +65,10 @@ %{_mandir}/man*/* %changelog -* Thu Mar 16 2006 Matthiass Clasen - 0.17-1 +* Wed Mar 22 2006 Matthias Clasen - 0.17-1.fc5.1 +- Backport upstream change to fix postscript vs. matlab confusion + +* Thu Mar 16 2006 Matthias Clasen - 0.17-1 - Update to 0.17 * Mon Feb 13 2006 Ray Strode - 0.16.cvs20060212-3 From fedora-cvs-commits at redhat.com Wed Mar 22 21:06:22 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 22 Mar 2006 16:06:22 -0500 Subject: rpms/perl-DBD-Pg/devel .cvsignore, 1.13, 1.14 perl-DBD-Pg.spec, 1.28, 1.29 sources, 1.13, 1.14 Message-ID: <200603222106.k2ML6MtM016973@cvs.devel.redhat.com> Author: jvdias Update of /cvs/dist/rpms/perl-DBD-Pg/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv16951 Modified Files: .cvsignore perl-DBD-Pg.spec sources Log Message: upgrade to upstream version 1.47 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/perl-DBD-Pg/devel/.cvsignore,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- .cvsignore 8 Mar 2006 23:08:35 -0000 1.13 +++ .cvsignore 22 Mar 2006 21:06:08 -0000 1.14 @@ -1,2 +1,3 @@ DBD-Pg-1.43.tar.gz DBD-Pg-1.45.tar.gz +DBD-Pg-1.47.tar.gz Index: perl-DBD-Pg.spec =================================================================== RCS file: /cvs/dist/rpms/perl-DBD-Pg/devel/perl-DBD-Pg.spec,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- perl-DBD-Pg.spec 8 Mar 2006 23:09:06 -0000 1.28 +++ perl-DBD-Pg.spec 22 Mar 2006 21:06:08 -0000 1.29 @@ -1,5 +1,5 @@ Name: perl-DBD-Pg -Version: 1.45 +Version: 1.47 Release: 1 Summary: A PostgresSQL interface for perl @@ -55,6 +55,9 @@ %changelog +* Wed Mar 22 2006 Jason Vas Dias - 1.47-1 +- Upgrade to upstream version 1.47 + * Wed Mar 08 2006 Jason Vas Dias - 1.45-1 - Upgrade to upstream version 1.45 Index: sources =================================================================== RCS file: /cvs/dist/rpms/perl-DBD-Pg/devel/sources,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- sources 8 Mar 2006 23:08:35 -0000 1.13 +++ sources 22 Mar 2006 21:06:08 -0000 1.14 @@ -1 +1 @@ -321a8e0487b436d0643348919959a0e3 DBD-Pg-1.45.tar.gz +b469ce382b9f36acd7fe94a216d4dbc7 DBD-Pg-1.47.tar.gz From fedora-cvs-commits at redhat.com Wed Mar 22 21:21:18 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 22 Mar 2006 16:21:18 -0500 Subject: rpms/perl-HTML-Parser/devel .cvsignore, 1.8, 1.9 perl-HTML-Parser.spec, 1.19, 1.20 sources, 1.9, 1.10 Message-ID: <200603222121.k2MLLI1p002489@cvs.devel.redhat.com> Author: jvdias Update of /cvs/dist/rpms/perl-HTML-Parser/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv2454 Modified Files: .cvsignore perl-HTML-Parser.spec sources Log Message: upgrade to 3.51 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/perl-HTML-Parser/devel/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 20 Feb 2006 20:31:24 -0000 1.8 +++ .cvsignore 22 Mar 2006 21:21:15 -0000 1.9 @@ -3,3 +3,4 @@ HTML-Parser-3.46.tar.gz HTML-Parser-3.48.tar.gz HTML-Parser-3.50.tar.gz +HTML-Parser-3.51.tar.gz Index: perl-HTML-Parser.spec =================================================================== RCS file: /cvs/dist/rpms/perl-HTML-Parser/devel/perl-HTML-Parser.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- perl-HTML-Parser.spec 20 Feb 2006 20:31:38 -0000 1.19 +++ perl-HTML-Parser.spec 22 Mar 2006 21:21:15 -0000 1.20 @@ -4,7 +4,7 @@ Summary: Perl module for parsing HTML Name: perl-%{real_name} -Version: 3.50 +Version: 3.51 Release: 1 License: GPL or Artistic Group: System Environment/Libraries @@ -53,6 +53,9 @@ %{_mandir}/man3/* %changelog +* Mon Mar 22 2006 Jason Vas Dias - 3.51-1 +- upgrade to 3.51 + * Mon Feb 20 2006 Jason Vas Dias - 3.50-1 - upgrade to 3.50 Index: sources =================================================================== RCS file: /cvs/dist/rpms/perl-HTML-Parser/devel/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 20 Feb 2006 20:33:23 -0000 1.9 +++ sources 22 Mar 2006 21:21:15 -0000 1.10 @@ -1 +1 @@ -4848c5eaac5576d1412578f480fdf22d HTML-Parser-3.50.tar.gz +4189959d60549afa9a7636f5efafbe20 HTML-Parser-3.51.tar.gz From fedora-cvs-commits at redhat.com Wed Mar 22 21:22:00 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 22 Mar 2006 16:22:00 -0500 Subject: rpms/perl-HTML-Parser/devel perl-HTML-Parser.spec,1.20,1.21 Message-ID: <200603222122.k2MLM056002806@cvs.devel.redhat.com> Author: jvdias Update of /cvs/dist/rpms/perl-HTML-Parser/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv2777 Modified Files: perl-HTML-Parser.spec Log Message: upgrade to 3.51 Index: perl-HTML-Parser.spec =================================================================== RCS file: /cvs/dist/rpms/perl-HTML-Parser/devel/perl-HTML-Parser.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- perl-HTML-Parser.spec 22 Mar 2006 21:21:15 -0000 1.20 +++ perl-HTML-Parser.spec 22 Mar 2006 21:21:57 -0000 1.21 @@ -5,7 +5,7 @@ Summary: Perl module for parsing HTML Name: perl-%{real_name} Version: 3.51 -Release: 1 +Release: 1.FC6 License: GPL or Artistic Group: System Environment/Libraries Source: http://search.cpan.org/CPAN/authors/id/G/GA/GAAS/%{real_name}-%{version}.tar.gz From fedora-cvs-commits at redhat.com Wed Mar 22 21:24:15 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 22 Mar 2006 16:24:15 -0500 Subject: rpms/perl-DBD-Pg/FC-5 .cvsignore, 1.13, 1.14 perl-DBD-Pg.spec, 1.28, 1.29 sources, 1.13, 1.14 Message-ID: <200603222124.k2MLOFBH003766@cvs.devel.redhat.com> Author: jvdias Update of /cvs/dist/rpms/perl-DBD-Pg/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv3727 Modified Files: .cvsignore perl-DBD-Pg.spec sources Log Message: upgrade to upstream version 1.47 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/perl-DBD-Pg/FC-5/.cvsignore,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- .cvsignore 8 Mar 2006 23:08:35 -0000 1.13 +++ .cvsignore 22 Mar 2006 21:24:13 -0000 1.14 @@ -1,2 +1,3 @@ DBD-Pg-1.43.tar.gz DBD-Pg-1.45.tar.gz +DBD-Pg-1.47.tar.gz Index: perl-DBD-Pg.spec =================================================================== RCS file: /cvs/dist/rpms/perl-DBD-Pg/FC-5/perl-DBD-Pg.spec,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- perl-DBD-Pg.spec 8 Mar 2006 23:09:06 -0000 1.28 +++ perl-DBD-Pg.spec 22 Mar 2006 21:24:13 -0000 1.29 @@ -1,6 +1,6 @@ Name: perl-DBD-Pg -Version: 1.45 -Release: 1 +Version: 1.47 +Release: 0.1.FC5 Summary: A PostgresSQL interface for perl Group: Development/Libraries @@ -55,6 +55,9 @@ %changelog +* Wed Mar 22 2006 Jason Vas Dias - 1.47-1 +- Upgrade to upstream version 1.47 + * Wed Mar 08 2006 Jason Vas Dias - 1.45-1 - Upgrade to upstream version 1.45 Index: sources =================================================================== RCS file: /cvs/dist/rpms/perl-DBD-Pg/FC-5/sources,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- sources 8 Mar 2006 23:08:35 -0000 1.13 +++ sources 22 Mar 2006 21:24:13 -0000 1.14 @@ -1 +1 @@ -321a8e0487b436d0643348919959a0e3 DBD-Pg-1.45.tar.gz +b469ce382b9f36acd7fe94a216d4dbc7 DBD-Pg-1.47.tar.gz From fedora-cvs-commits at redhat.com Wed Mar 22 21:38:33 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 22 Mar 2006 16:38:33 -0500 Subject: rpms/perl-HTML-Parser/FC-5 .cvsignore, 1.8, 1.9 perl-HTML-Parser.spec, 1.19, 1.20 sources, 1.9, 1.10 Message-ID: <200603222138.k2MLcX87006965@cvs.devel.redhat.com> Author: jvdias Update of /cvs/dist/rpms/perl-HTML-Parser/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv6941 Modified Files: .cvsignore perl-HTML-Parser.spec sources Log Message: upgrade to 3.51 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/perl-HTML-Parser/FC-5/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 20 Feb 2006 20:31:24 -0000 1.8 +++ .cvsignore 22 Mar 2006 21:38:31 -0000 1.9 @@ -3,3 +3,4 @@ HTML-Parser-3.46.tar.gz HTML-Parser-3.48.tar.gz HTML-Parser-3.50.tar.gz +HTML-Parser-3.51.tar.gz Index: perl-HTML-Parser.spec =================================================================== RCS file: /cvs/dist/rpms/perl-HTML-Parser/FC-5/perl-HTML-Parser.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- perl-HTML-Parser.spec 20 Feb 2006 20:31:38 -0000 1.19 +++ perl-HTML-Parser.spec 22 Mar 2006 21:38:31 -0000 1.20 @@ -4,8 +4,8 @@ Summary: Perl module for parsing HTML Name: perl-%{real_name} -Version: 3.50 -Release: 1 +Version: 3.51 +Release: 1.FC5 License: GPL or Artistic Group: System Environment/Libraries Source: http://search.cpan.org/CPAN/authors/id/G/GA/GAAS/%{real_name}-%{version}.tar.gz @@ -53,6 +53,9 @@ %{_mandir}/man3/* %changelog +* Mon Mar 22 2006 Jason Vas Dias - 3.51-1 +- upgrade to 3.51 + * Mon Feb 20 2006 Jason Vas Dias - 3.50-1 - upgrade to 3.50 Index: sources =================================================================== RCS file: /cvs/dist/rpms/perl-HTML-Parser/FC-5/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 20 Feb 2006 20:33:23 -0000 1.9 +++ sources 22 Mar 2006 21:38:31 -0000 1.10 @@ -1 +1 @@ -4848c5eaac5576d1412578f480fdf22d HTML-Parser-3.50.tar.gz +4189959d60549afa9a7636f5efafbe20 HTML-Parser-3.51.tar.gz From fedora-cvs-commits at redhat.com Wed Mar 22 22:26:57 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 22 Mar 2006 17:26:57 -0500 Subject: rpms/xorg-x11-server/devel xorg-server-1.0.99-composite-visibility.patch, NONE, 1.1 xorg-x11-server.spec, 1.46, 1.47 Message-ID: <200603222226.k2MMQvoQ013639@cvs.devel.redhat.com> Author: sandmann Update of /cvs/dist/rpms/xorg-x11-server/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv13612 Modified Files: xorg-x11-server.spec Added Files: xorg-server-1.0.99-composite-visibility.patch Log Message: * Wed Mar 22 2006 Soren Sandmann 1.0.99.1-2 - Add xorg-server-1.0.99-composite-visibility.patch to get rid of flashing titlebars in compositing metacity. xorg-server-1.0.99-composite-visibility.patch: mivaltree.c | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) --- NEW FILE xorg-server-1.0.99-composite-visibility.patch --- --- /mi/mivaltree.c.orig 2006-03-22 17:08:44.000000000 -0500 +++ /mi/mivaltree.c 2006-03-22 17:09:40.000000000 -0500 @@ -240,6 +240,18 @@ dy = 32767; borderSize.y2 = dy; +#ifdef COMPOSITE + /* + * In redirected drawing case, reset universe to borderSize + */ + if (pParent->redirectDraw) + { + if (miSetRedirectBorderClipProc) + (*miSetRedirectBorderClipProc) (pParent, universe); + REGION_COPY(pScreen, universe, &pParent->borderSize); + } +#endif + oldVis = pParent->visibility; switch (RECT_IN_REGION( pScreen, universe, &borderSize)) { @@ -279,18 +291,6 @@ ((pParent->eventMask | wOtherEventMasks(pParent)) & VisibilityChangeMask)) SendVisibilityNotify(pParent); -#ifdef COMPOSITE - /* - * In redirected drawing case, reset universe to borderSize - */ - if (pParent->redirectDraw) - { - if (miSetRedirectBorderClipProc) - (*miSetRedirectBorderClipProc) (pParent, universe); - REGION_COPY(pScreen, universe, &pParent->borderSize); - } -#endif - dx = pParent->drawable.x - pParent->valdata->before.oldAbsCorner.x; dy = pParent->drawable.y - pParent->valdata->before.oldAbsCorner.y; Index: xorg-x11-server.spec =================================================================== RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- xorg-x11-server.spec 22 Mar 2006 01:56:39 -0000 1.46 +++ xorg-x11-server.spec 22 Mar 2006 22:26:55 -0000 1.47 @@ -5,7 +5,7 @@ Summary: X.Org X11 X server Name: xorg-x11-server Version: 1.0.99.1 -Release: 1 +Release: 2 URL: http://www.x.org License: MIT/X11 Group: User Interface/X @@ -27,6 +27,7 @@ Patch6: xserver-1.0.1-randr-sdk.patch # https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=181292. hacky patch Patch7: xorg-x11-server-1.0.1-fpic-libxf86config.patch +Patch8: xorg-server-1.0.99-composite-visibility.patch Patch1000: xorg-redhat-die-ugly-pattern-die-die-die.patch Patch1001: xorg-x11-server-1.0.1-Red-Hat-extramodes.patch @@ -241,6 +242,7 @@ %patch5 -p0 -b .backtrace %patch6 -p1 -b .randrsdk %patch7 -p1 -b .xf86configfpic +%patch8 -p1 -b .composite-visibility %patch1000 -p0 -b .redhat-die-ugly-pattern-die-die-die %patch1001 -p1 -b .Red-Hat-extramodes @@ -519,6 +521,10 @@ # ------------------------------------------------------------------- %changelog +* Wed Mar 22 2006 Soren Sandmann 1.0.99.1-2 +- Add xorg-server-1.0.99-composite-visibility.patch to get rid of flashing + titlebars in compositing metacity. + * Tue Mar 21 2006 Kristian H??gsberg 1.0.99.1-1 - Update to 1.0.99.1 snapshot. From fedora-cvs-commits at redhat.com Wed Mar 22 23:45:13 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 22 Mar 2006 18:45:13 -0500 Subject: rpms/xorg-x11-drv-ati/devel .cvsignore, 1.6, 1.7 sources, 1.6, 1.7 xorg-x11-drv-ati.spec, 1.13, 1.14 Message-ID: <200603222345.k2MNjDTx009575@cvs.devel.redhat.com> Author: krh Update of /cvs/dist/rpms/xorg-x11-drv-ati/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv9553 Modified Files: .cvsignore sources xorg-x11-drv-ati.spec Log Message: * Wed Mar 22 2006 Kristian H??gsberg 6.5.7.3-4.cvs20060322 - Update to CVS snapshot of 20060322. - Drop xorg-x11-drv-ati-6.5.7.3-radeon-metamodes-SEGV-fix.patch. Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/xorg-x11-drv-ati/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 3 Feb 2006 13:28:51 -0000 1.6 +++ .cvsignore 22 Mar 2006 23:45:11 -0000 1.7 @@ -1 +1 @@ -xf86-video-ati-6.5.7.3.tar.bz2 +xf86-video-ati-cvs20060322.tar.bz2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/xorg-x11-drv-ati/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 3 Feb 2006 13:28:51 -0000 1.6 +++ sources 22 Mar 2006 23:45:11 -0000 1.7 @@ -1 +1 @@ -a87420414681c53681a330b55ffb04ea xf86-video-ati-6.5.7.3.tar.bz2 +ae8dc70c96175f5b39e27aef80f32e6c xf86-video-ati-cvs20060322.tar.bz2 Index: xorg-x11-drv-ati.spec =================================================================== RCS file: /cvs/dist/rpms/xorg-x11-drv-ati/devel/xorg-x11-drv-ati.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- xorg-x11-drv-ati.spec 21 Feb 2006 13:27:46 -0000 1.13 +++ xorg-x11-drv-ati.spec 22 Mar 2006 23:45:11 -0000 1.14 @@ -1,8 +1,8 @@ -%define tarball xf86-video-ati +%define tarball xf86-video-ati-%{cvsdate} %define moduledir %(pkg-config xorg-server --variable=moduledir ) %define driverdir %{moduledir}/drivers -%define cvsdate xxxxxxx +%define cvsdate cvs20060322 %ifarch %{ix86} x86_64 ia64 ppc alpha %define with_dri 1 @@ -13,22 +13,21 @@ Summary: Xorg X11 ati video driver Name: xorg-x11-drv-ati Version: 6.5.7.3 -Release: 4 +Release: 4.%{cvsdate} URL: http://www.x.org License: MIT/X11 Group: User Interface/X Hardware Support BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Source0: http://xorg.freedesktop.org/X11R7.0/src/driver/%{tarball}-%{version}.tar.bz2 +Source0: http://xorg.freedesktop.org/X11R7.0/src/driver/%{tarball}.tar.bz2 Source1: ati.xinf Source2: r128.xinf Source3: radeon.xinf -Patch0: xorg-x11-drv-ati-6.5.7.3-radeon-metamodes-SEGV-fix.patch ExclusiveArch: %{ix86} x86_64 ia64 ppc alpha sparc sparc64 BuildRequires: pkgconfig -BuildRequires: xorg-x11-server-sdk +BuildRequires: xorg-x11-server-sdk >= 1.0.99.1 %if %{with_dri} BuildRequires: mesa-libGL-devel >= 6.4-4 BuildRequires: libdrm-devel >= 2.0-1 @@ -40,8 +39,7 @@ X.Org X11 ati video driver. %prep -%setup -q -n %{tarball}-%{version} -%patch0 -p2 -b .radeon-metamodes-SEGV-fix +%setup -q -n %{tarball} %build %configure --disable-static @@ -85,6 +83,10 @@ %{_mandir}/man4/radeon.4* %changelog +* Wed Mar 22 2006 Kristian H??gsberg 6.5.7.3-4.cvs20060322 +- Update to CVS snapshot of 20060322. +- Drop xorg-x11-drv-ati-6.5.7.3-radeon-metamodes-SEGV-fix.patch. + * Tue Feb 21 2006 Mike A. Harris 6.5.7.3-4 - Added xorg-x11-drv-ati-6.5.7.3-radeon-metamodes-SEGV-fix.patch from CVS HEAD. From fedora-cvs-commits at redhat.com Wed Mar 22 23:50:31 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 22 Mar 2006 18:50:31 -0500 Subject: rpms/kernel/devel/configs config-generic, 1.162, 1.163 config-ia64-generic, 1.21, 1.22 Message-ID: <200603222350.k2MNoVas023367@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel/configs In directory cvs.devel.redhat.com:/tmp/cvs-serv23332/configs Modified Files: config-generic config-ia64-generic Log Message: git5 Index: config-generic =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/configs/config-generic,v retrieving revision 1.162 retrieving revision 1.163 diff -u -r1.162 -r1.163 --- config-generic 21 Mar 2006 20:56:19 -0000 1.162 +++ config-generic 22 Mar 2006 23:50:27 -0000 1.163 @@ -2675,3 +2675,4 @@ # CONFIG_FORCED_INLINING is not set +CONFIG_MIGRATION=y Index: config-ia64-generic =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/configs/config-ia64-generic,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- config-ia64-generic 28 Feb 2006 20:16:29 -0000 1.21 +++ config-ia64-generic 22 Mar 2006 23:50:27 -0000 1.22 @@ -167,4 +167,6 @@ CONFIG_SERIAL_SGI_IOC3=m CONFIG_SGI_IOC3=m +# CONFIG_PERMIT_BSP_REMOVE is not set +# CONFIG_FORCE_CPEI_RETARGET is not set From fedora-cvs-commits at redhat.com Wed Mar 22 23:50:29 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 22 Mar 2006 18:50:29 -0500 Subject: rpms/kernel/devel patch-2.6.16-git5.bz2.sign, NONE, 1.1 .cvsignore, 1.390, 1.391 kernel-2.6.spec, 1.2081, 1.2082 linux-2.6-debug-periodic-slab-check.patch, 1.3, 1.4 linux-2.6-debug-singlebiterror.patch, 1.7, 1.8 linux-2.6-debug-taint-vm.patch, 1.7, 1.8 linux-2.6-dump_smp_call_function.patch, 1.6, 1.7 linux-2.6-execshield.patch, 1.14, 1.15 linux-2.6-xen.patch, 1.5, 1.6 sources, 1.331, 1.332 upstream, 1.303, 1.304 linux-2.6-selinux-disable-attributes-no-policy.patch, 1.1, NONE linux-2.6-selinux-selinuxfs-hard-link-count.patch, 1.2, NONE patch-2.6.16-git3.bz2.sign, 1.1, NONE Message-ID: <200603222350.k2MNoTkZ023356@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv23332 Modified Files: .cvsignore kernel-2.6.spec linux-2.6-debug-periodic-slab-check.patch linux-2.6-debug-singlebiterror.patch linux-2.6-debug-taint-vm.patch linux-2.6-dump_smp_call_function.patch linux-2.6-execshield.patch linux-2.6-xen.patch sources upstream Added Files: patch-2.6.16-git5.bz2.sign Removed Files: linux-2.6-selinux-disable-attributes-no-policy.patch linux-2.6-selinux-selinuxfs-hard-link-count.patch patch-2.6.16-git3.bz2.sign Log Message: git5 --- NEW FILE patch-2.6.16-git5.bz2.sign --- -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.2.2 (GNU/Linux) Comment: See http://www.kernel.org/signature.html for info iD8DBQBEIZ9pyGugalF9Dw4RAnA6AJsHlHWJnF47z6LlIpXTirM86hV3/wCeOAQg D2wbzccZVVCWuYCe06D58iY= =vbmH -----END PGP SIGNATURE----- Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v retrieving revision 1.390 retrieving revision 1.391 diff -u -r1.390 -r1.391 --- .cvsignore 21 Mar 2006 20:56:18 -0000 1.390 +++ .cvsignore 22 Mar 2006 23:50:26 -0000 1.391 @@ -3,4 +3,4 @@ kernel-2.6.16 linux-2.6.16.tar.bz2 xen-20060320.tar.bz2 -patch-2.6.16-git3.bz2 +patch-2.6.16-git5.bz2 Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.2081 retrieving revision 1.2082 diff -u -r1.2081 -r1.2082 --- kernel-2.6.spec 22 Mar 2006 14:32:58 -0000 1.2081 +++ kernel-2.6.spec 22 Mar 2006 23:50:26 -0000 1.2082 @@ -217,7 +217,7 @@ # # Patches 0 through 100 are meant for core subsystem upgrades # -Patch1: patch-2.6.16-git3.bz2 +Patch1: patch-2.6.16-git5.bz2 # Patches 100 through 500 are meant for architecture patches Patch100: linux-2.6-bzimage.patch @@ -371,9 +371,7 @@ # SELinux/audit patches. Patch1800: linux-2.6-selinux-hush.patch Patch1801: linux-2.6-selinux-mprotect-checks.patch -Patch1802: linux-2.6-selinux-disable-attributes-no-policy.patch -Patch1803: linux-2.6-selinux-selinuxfs-hard-link-count.patch -Patch1804: linux-2.6-audit-new-msg-types.patch +Patch1802: linux-2.6-audit-new-msg-types.patch # Warn about usage of various obsolete functionality that may go away. Patch1900: linux-2.6-obsolete-idescsi-warning.patch @@ -990,12 +988,8 @@ %patch1800 -p1 # Fix the SELinux mprotect checks on executable mappings %patch1801 -p1 -# Disable setting of security attributes on new inodes when no policy is loaded -%patch1802 -p1 -# Fix incorrect hardlink count in selinuxfs -%patch1803 -p1 # Add some more audit message types. -%patch1804 -p1 +%patch1802 -p1 # Warn about obsolete functionality usage. %patch1900 -p1 @@ -1650,6 +1644,9 @@ %endif %changelog +* Wed Mar 22 2006 Dave Jones +- 2.6.16-git5 + * Wed Mar 22 2006 David Woodhouse - Update the bcm43xx driver to make it work nicely with initscripts and NetworkManager without user intervention. linux-2.6-debug-periodic-slab-check.patch: slab.c | 134 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 131 insertions(+), 3 deletions(-) Index: linux-2.6-debug-periodic-slab-check.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-debug-periodic-slab-check.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- linux-2.6-debug-periodic-slab-check.patch 2 Feb 2006 23:36:23 -0000 1.3 +++ linux-2.6-debug-periodic-slab-check.patch 22 Mar 2006 23:50:26 -0000 1.4 @@ -182,9 +182,9 @@ struct ccupdate_struct { struct kmem_cache *cachep; struct array_cache *new[NR_CPUS]; -@@ -3446,6 +3567,13 @@ static void cache_reap(void *unused) - drain_array_locked(searchp, cpu_cache_get(searchp), 0, - numa_node_id()); +@@ -3739,6 +3739,13 @@ static void cache_reap(void *unused) + + drain_array(searchp, l3, cpu_cache_get(searchp), 0, node); +#if DEBUG + if (time_before(searchp->next_verify, jiffies)) { @@ -193,7 +193,6 @@ + } +#endif + - if (time_after(l3->next_reap, jiffies)) - goto next_unlock; - - + /* + * These are racy checks but it does not matter + * if we skip one check or scan twice. linux-2.6-debug-singlebiterror.patch: slab.c | 25 ++++++++++++++++++++++++- 1 files changed, 24 insertions(+), 1 deletion(-) Index: linux-2.6-debug-singlebiterror.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-debug-singlebiterror.patch,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- linux-2.6-debug-singlebiterror.patch 3 Feb 2006 18:42:24 -0000 1.7 +++ linux-2.6-debug-singlebiterror.patch 22 Mar 2006 23:50:26 -0000 1.8 @@ -13,25 +13,22 @@ Signed-off-by: Dave Jones ---- linux-2.6.15/mm/slab.c~ 2006-01-09 13:25:17.000000000 -0500 -+++ linux-2.6.15/mm/slab.c 2006-01-09 13:26:01.000000000 -0500 -@@ -1313,8 +1313,13 @@ static void poison_obj(kmem_cache_t *cac +--- linux-2.6.16.noarch/mm/slab.c~ 2006-03-22 18:29:27.000000000 -0500 ++++ linux-2.6.16.noarch/mm/slab.c 2006-03-22 18:30:58.000000000 -0500 +@@ -1516,10 +1516,33 @@ static void poison_obj(struct kmem_cache static void dump_line(char *data, int offset, int limit) { int i; + unsigned char total=0, bad_count=0; printk(KERN_ERR "%03x:", offset); - for (i = 0; i < limit; i++) { +- for (i = 0; i < limit; i++) ++ for (i = 0; i < limit; i++) { + if (data[offset+i] != POISON_FREE) { + total += data[offset+i]; + ++bad_count; + } printk(" %02x", (unsigned char)data[offset + i]); - } - printk("\n"); -@@ -1019,6 +1023,23 @@ static void dump_line(char *data, int of - } - } ++ } printk("\n"); + if (bad_count == 1) { + switch (total) { linux-2.6-debug-taint-vm.patch: linux-2.6.11/include/asm-generic/bug.h | 8 ++++++-- linux-2.6.15/mm/page_alloc.c | 4 ++-- linux-2.6.16.noarch/mm/slab.c | 4 ++-- linux-2000/kernel/panic.c | 1 + 4 files changed, 11 insertions(+), 6 deletions(-) Index: linux-2.6-debug-taint-vm.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-debug-taint-vm.patch,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- linux-2.6-debug-taint-vm.patch 15 Mar 2006 22:25:23 -0000 1.7 +++ linux-2.6-debug-taint-vm.patch 22 Mar 2006 23:50:26 -0000 1.8 @@ -53,16 +53,16 @@ dump_stack(); page->flags &= ~(1 << PG_lru | 1 << PG_private | ---- linux-2.6.15/mm/slab.c~ 2006-01-09 13:19:33.000000000 -0500 -+++ linux-2.6.15/mm/slab.c 2006-01-09 13:19:55.000000000 -0500 -@@ -1371,8 +1371,8 @@ static void check_poison_obj(kmem_cache_ +--- linux-2.6.16.noarch/mm/slab.c~ 2006-03-22 18:25:29.000000000 -0500 ++++ linux-2.6.16.noarch/mm/slab.c 2006-03-22 18:25:53.000000000 -0500 +@@ -1573,8 +1573,8 @@ static void check_poison_obj(struct kmem /* Print header */ if (lines == 0) { printk(KERN_ERR -- "Slab corruption: start=%p, len=%d\n", -- realobj, size); -+ "Slab corruption: (%s) start=%p, len=%d\n", -+ print_tainted(), realobj, size); +- "Slab corruption: start=%p, len=%d\n", +- realobj, size); ++ "Slab corruption: (%s) start=%p, len=%d\n", ++ print_tainted(), realobj, size); print_objinfo(cachep, objp, 0); dump_stack(); } linux-2.6-dump_smp_call_function.patch: linux-2.6.12/arch/i386/kernel/smp.c | 47 +++++++++++++++++++++++++++++++- linux-2.6.12/arch/ia64/kernel/smp.c | 44 +++++++++++++++++++++++++++++ linux-2.6.12/arch/powerpc/kernel/smp.c | 45 +++++++++++++++++++++++++++++- linux-2.6.12/arch/x86_64/kernel/smp.c | 45 ++++++++++++++++++++++++++++++ linux-2.6.12/drivers/block/diskdump.c | 2 - linux-2.6.12/drivers/net/netdump.c | 2 - linux-2.6.16.noarch/include/linux/smp.h | 2 + 7 files changed, 183 insertions(+), 4 deletions(-) Index: linux-2.6-dump_smp_call_function.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-dump_smp_call_function.patch,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- linux-2.6-dump_smp_call_function.patch 13 Mar 2006 22:17:56 -0000 1.6 +++ linux-2.6-dump_smp_call_function.patch 22 Mar 2006 23:50:26 -0000 1.7 @@ -141,12 +141,13 @@ struct call_data_struct { void (*func) (void *info); -@@ -509,6 +510,49 @@ void unlock_ipi_call_lock(void) +@@ -508,8 +508,52 @@ void unlock_ipi_call_lock(void) + spin_unlock_irq(&call_lock); } - static struct call_data_struct * call_data; +-static struct call_data_struct *call_data; +static struct call_data_struct * saved_call_data; -+ + +/* + * dump version of smp_call_function to avoid deadlock in call_lock + */ @@ -188,9 +189,12 @@ +} + +EXPORT_SYMBOL_GPL(dump_smp_call_function); - - /* - * this function sends a 'generic call function' IPI to all other CPUs ++ ++ /* ++ * this function sends a 'generic call function' IPI to all other CPUs + /** + * smp_call_function(): Run a function on all other CPUs. + * @func: The function to run. This must be fast and non-blocking. --- linux-2.6.12/arch/x86_64/kernel/smp.c.orig 2005-08-23 10:49:53.421211215 -0400 +++ linux-2.6.12/arch/x86_64/kernel/smp.c 2005-08-23 10:51:04.771473316 -0400 @@ -20,6 +20,7 @@ @@ -281,21 +285,21 @@ netdump_mdelay(3000); for (i = 0; i < NR_CPUS; i++) { if (cpus_frozen[i]) ---- linux-2.6.12/include/linux/smp.h.orig 2005-08-23 10:50:08.023809136 -0400 -+++ linux-2.6.12/include/linux/smp.h 2005-08-23 10:51:04.775472658 -0400 -@@ -55,6 +55,7 @@ extern void smp_cpus_done(unsigned int m +--- linux-2.6.16.noarch/include/linux/smp.h~ 2006-03-22 18:38:22.000000000 -0500 ++++ linux-2.6.16.noarch/include/linux/smp.h 2006-03-22 18:39:23.000000000 -0500 +@@ -53,6 +53,7 @@ extern void smp_cpus_done(unsigned int m + * Call a function on all other processors */ - extern int smp_call_function (void (*func) (void *info), void *info, - int retry, int wait); -+extern void dump_smp_call_function (void (*func) (void *info), void *info); + int smp_call_function(void(*func)(void *info), void *info, int retry, int wait); ++int dump_smp_call_function(void(*func)(void *info), void *info, int retry, int wait); /* * Call a function on all processors -@@ -95,6 +96,7 @@ void smp_prepare_boot_cpu(void); +@@ -83,6 +84,7 @@ void smp_prepare_boot_cpu(void); #define raw_smp_processor_id() 0 #define hard_smp_processor_id() 0 #define smp_call_function(func,info,retry,wait) ({ 0; }) -+static inline void dump_smp_call_function(void (*func) (void *info), void *info) { } - #define on_each_cpu(func,info,retry,wait) ({ func(info); 0; }) - static inline void smp_send_reschedule(int cpu) { } - #define num_booting_cpus() 1 ++#define dump_smp_call_function(func,info,retry,wait) ({ 0; }) + #define on_each_cpu(func,info,retry,wait) \ + ({ \ + local_irq_disable(); \ linux-2.6-execshield.patch: linux-2.6.16.noarch/include/asm-powerpc/elf.h | 3 linux/arch/i386/kernel/asm-offsets.c | 1 linux/arch/i386/kernel/cpu/common.c | 7 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 | 81 +++++++++++ linux/arch/i386/kernel/traps.c | 93 ++++++++++++- 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/powerpc/kernel/vdso.c | 3 linux/arch/x86_64/ia32/ia32_binfmt.c | 6 linux/arch/x86_64/ia32/syscall32.c | 4 linux/arch/x86_64/kernel/process.c | 6 linux/arch/x86_64/kernel/setup64.c | 23 --- linux/arch/x86_64/mm/fault.c | 2 linux/arch/x86_64/mm/mmap.c | 99 +++++++++++--- linux/drivers/char/random.c | 7 linux/fs/binfmt_elf.c | 151 ++++++++++++++++----- linux/fs/proc/array.c | 8 - linux/fs/proc/base.c | 8 - linux/fs/proc/task_mmu.c | 34 +++- linux/include/asm-i386/a.out.h | 2 linux/include/asm-i386/desc.h | 14 + linux/include/asm-i386/elf.h | 50 +++++-- linux/include/asm-i386/mmu.h | 6 linux/include/asm-i386/page.h | 5 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-powerpc/pgalloc.h | 5 linux/include/asm-ppc/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/pgtable.h | 2 linux/include/linux/mm.h | 16 +- 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 | 57 ++++++++ linux/mm/fremap.c | 16 +- linux/mm/mmap.c | 183 ++++++++++++++++++++++++-- linux/mm/mprotect.c | 5 linux/mm/mremap.c | 4 52 files changed, 931 insertions(+), 161 deletions(-) Index: linux-2.6-execshield.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-execshield.patch,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- linux-2.6-execshield.patch 21 Mar 2006 04:03:57 -0000 1.14 +++ linux-2.6-execshield.patch 22 Mar 2006 23:50:26 -0000 1.15 @@ -2144,15 +2144,15 @@ pgprot_t newprot; pgoff_t pgoff; int error; -@@ -166,6 +167,8 @@ success: +@@ -167,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); + if (is_vm_hugetlb_page(vma)) + hugetlb_change_protection(vma, start, end, newprot); + else Index: linux/mm/mremap.c =================================================================== --- linux.orig/mm/mremap.c linux-2.6-xen.patch: arch/i386/Kconfig | 98 arch/i386/Kconfig.cpu | 2 arch/i386/Makefile | 18 arch/i386/boot-xen/Makefile | 21 arch/i386/kernel/Makefile | 33 arch/i386/kernel/acpi/Makefile | 4 arch/i386/kernel/acpi/boot-xen.c | 1161 ++++++++ arch/i386/kernel/apic-xen.c | 140 + arch/i386/kernel/asm-offsets.c | 5 arch/i386/kernel/cpu/Makefile | 5 arch/i386/kernel/cpu/common-xen.c | 719 +++++ arch/i386/kernel/cpu/mtrr/Makefile | 7 arch/i386/kernel/cpu/mtrr/main-xen.c | 196 + arch/i386/kernel/early_printk-xen.c | 2 arch/i386/kernel/entry-xen.S | 861 ++++++ arch/i386/kernel/fixup.c | 95 arch/i386/kernel/head-xen.S | 171 + arch/i386/kernel/init_task-xen.c | 51 arch/i386/kernel/io_apic-xen.c | 2747 ++++++++++++++++++++ arch/i386/kernel/ioport-xen.c | 122 arch/i386/kernel/irq-xen.c | 306 ++ arch/i386/kernel/ldt-xen.c | 269 + arch/i386/kernel/microcode-xen.c | 165 + arch/i386/kernel/mpparse-xen.c | 1188 ++++++++ arch/i386/kernel/pci-dma-xen.c | 344 ++ arch/i386/kernel/process-xen.c | 833 ++++++ arch/i386/kernel/quirks-xen.c | 48 arch/i386/kernel/setup-xen.c | 1892 +++++++++++++ arch/i386/kernel/smp-xen.c | 617 ++++ arch/i386/kernel/swiotlb.c | 674 ++++ arch/i386/kernel/sysenter.c | 90 arch/i386/kernel/time-xen.c | 1097 +++++++ arch/i386/kernel/traps-xen.c | 1094 +++++++ arch/i386/kernel/vm86.c | 8 arch/i386/kernel/vmlinux.lds.S | 4 arch/i386/kernel/vsyscall-note-xen.S | 32 arch/i386/kernel/vsyscall.S | 2 arch/i386/mach-xen/Makefile | 5 arch/i386/mach-xen/setup.c | 37 arch/i386/mm/Makefile | 8 arch/i386/mm/fault-xen.c | 617 ++++ arch/i386/mm/highmem-xen.c | 123 arch/i386/mm/hypervisor.c | 421 +++ arch/i386/mm/init-xen.c | 851 ++++++ arch/i386/mm/ioremap-xen.c | 462 +++ arch/i386/mm/pgtable-xen.c | 652 ++++ arch/i386/mm/pgtable.c | 63 arch/i386/pci/Makefile | 9 arch/i386/pci/irq-xen.c | 1202 ++++++++ arch/i386/pci/pcifront.c | 55 arch/i386/power/Makefile | 4 arch/ia64/Kconfig | 47 arch/ia64/Makefile | 10 arch/ia64/hp/sim/Makefile | 2 arch/ia64/kernel/entry.S | 32 arch/ia64/kernel/head.S | 6 arch/ia64/kernel/pal.S | 5 arch/ia64/kernel/sal.c | 3 arch/ia64/kernel/setup.c | 16 arch/ia64/xen-mkbuildtree-post | 2 arch/ia64/xen-mkbuildtree-pre | 50 arch/ia64/xen/Makefile | 5 arch/ia64/xen/drivers/Makefile | 20 arch/ia64/xen/drivers/README | 2 arch/ia64/xen/drivers/coreMakefile | 24 arch/ia64/xen/drivers/evtchn_ia64.c | 273 + arch/ia64/xen/drivers/patches/blkback.c.patch | 33 arch/ia64/xen/drivers/patches/console.c.patch | 11 arch/ia64/xen/drivers/patches/devmem.c.patch | 2 arch/ia64/xen/drivers/patches/gnttab.c.patch | 33 arch/ia64/xen/drivers/patches/privcmd.c.patch | 30 arch/ia64/xen/drivers/xenia64_init.c | 55 arch/ia64/xen/hypercall.S | 365 ++ arch/ia64/xen/xen_ksyms.c | 12 arch/ia64/xen/xenconsole.c | 19 arch/ia64/xen/xenentry.S | 850 ++++++ arch/ia64/xen/xenhpski.c | 19 arch/ia64/xen/xenivt.S | 2032 ++++++++++++++ arch/ia64/xen/xenminstate.h | 367 ++ arch/ia64/xen/xenpal.S | 73 arch/ia64/xen/xensetup.S | 35 arch/um/kernel/physmem.c | 4 arch/x86_64/Kconfig | 60 arch/x86_64/Makefile | 16 arch/x86_64/ia32/Makefile | 20 arch/x86_64/ia32/ia32entry-xen.S | 721 +++++ arch/x86_64/ia32/syscall32-xen.c | 128 arch/x86_64/ia32/syscall32_syscall-xen.S | 28 arch/x86_64/ia32/vsyscall-int80.S | 58 arch/x86_64/ia32/vsyscall-sigreturn.S | 2 arch/x86_64/kernel/Makefile | 18 arch/x86_64/kernel/acpi/Makefile | 1 arch/x86_64/kernel/apic-xen.c | 200 + arch/x86_64/kernel/asm-offsets.c | 2 arch/x86_64/kernel/e820-xen.c | 744 +++++ arch/x86_64/kernel/early_printk-xen.c | 306 ++ arch/x86_64/kernel/entry-xen.S | 1141 ++++++++ arch/x86_64/kernel/genapic-xen.c | 144 + arch/x86_64/kernel/genapic_xen.c | 162 + arch/x86_64/kernel/head-xen.S | 156 + arch/x86_64/kernel/head64-xen.c | 140 + arch/x86_64/kernel/init_task.c | 3 arch/x86_64/kernel/io_apic-xen.c | 2231 ++++++++++++++++ arch/x86_64/kernel/ioport-xen.c | 58 arch/x86_64/kernel/irq-xen.c | 168 + arch/x86_64/kernel/ldt-xen.c | 282 ++ arch/x86_64/kernel/mpparse-xen.c | 1005 +++++++ arch/x86_64/kernel/pci-swiotlb-xen.c | 54 arch/x86_64/kernel/process-xen.c | 810 +++++ arch/x86_64/kernel/setup-xen.c | 1646 +++++++++++ arch/x86_64/kernel/setup64-xen.c | 360 ++ arch/x86_64/kernel/smp-xen.c | 596 ++++ arch/x86_64/kernel/traps-xen.c | 1023 +++++++ arch/x86_64/kernel/vsyscall-xen.c | 239 + arch/x86_64/kernel/x8664_ksyms-xen.c | 163 + arch/x86_64/kernel/xen_entry.S | 41 arch/x86_64/mm/Makefile | 10 arch/x86_64/mm/fault-xen.c | 595 ++++ arch/x86_64/mm/init-xen.c | 1101 ++++++++ arch/x86_64/mm/pageattr-xen.c | 401 ++ arch/x86_64/pci/Makefile | 12 drivers/Makefile | 1 drivers/acpi/Kconfig | 3 drivers/acpi/tables.c | 7 drivers/char/mem.c | 6 drivers/char/tpm/Kconfig | 14 drivers/char/tpm/Makefile | 1 drivers/char/tpm/tpm.c | 44 drivers/char/tpm/tpm.h | 7 drivers/char/tpm/tpm_xen.c | 536 +++ drivers/char/tty_io.c | 7 drivers/firmware/Kconfig | 2 drivers/pci/Kconfig | 1 drivers/serial/Kconfig | 1 drivers/video/Kconfig | 2 drivers/xen/Kconfig | 202 + drivers/xen/Makefile | 22 drivers/xen/balloon/Makefile | 2 drivers/xen/balloon/balloon.c | 587 ++++ drivers/xen/blkback/Makefile | 3 drivers/xen/blkback/blkback.c | 596 ++++ drivers/xen/blkback/common.h | 123 drivers/xen/blkback/interface.c | 164 + drivers/xen/blkback/vbd.c | 102 drivers/xen/blkback/xenbus.c | 419 +++ drivers/xen/blkfront/Makefile | 5 drivers/xen/blkfront/blkfront.c | 822 +++++ drivers/xen/blkfront/block.h | 162 + drivers/xen/blkfront/vbd.c | 324 ++ drivers/xen/blktap/Makefile | 3 drivers/xen/blktap/blktap.c | 910 ++++++ drivers/xen/blktap/common.h | 110 drivers/xen/blktap/interface.c | 146 + drivers/xen/blktap/xenbus.c | 233 + drivers/xen/char/Makefile | 2 drivers/xen/char/mem.c | 192 + drivers/xen/console/Makefile | 2 drivers/xen/console/console.c | 643 ++++ drivers/xen/console/xencons_ring.c | 125 drivers/xen/core/Makefile | 9 drivers/xen/core/evtchn.c | 822 +++++ drivers/xen/core/features.c | 29 drivers/xen/core/gnttab.c | 455 +++ drivers/xen/core/reboot.c | 441 +++ drivers/xen/core/skbuff.c | 144 + drivers/xen/core/smpboot.c | 464 +++ drivers/xen/core/xen_proc.c | 29 drivers/xen/evtchn/Makefile | 2 drivers/xen/evtchn/evtchn.c | 459 +++ drivers/xen/net_driver_util.c | 67 drivers/xen/netback/Makefile | 5 drivers/xen/netback/common.h | 110 drivers/xen/netback/interface.c | 320 ++ drivers/xen/netback/loopback.c | 231 + drivers/xen/netback/netback.c | 835 ++++++ drivers/xen/netback/xenbus.c | 326 ++ drivers/xen/netfront/Makefile | 4 drivers/xen/netfront/netfront.c | 1500 ++++++++++ drivers/xen/pciback/Makefile | 10 drivers/xen/pciback/conf_space.c | 342 ++ drivers/xen/pciback/conf_space.h | 97 drivers/xen/pciback/conf_space_header.c | 267 + drivers/xen/pciback/passthrough.c | 116 drivers/xen/pciback/pci_stub.c | 407 ++ drivers/xen/pciback/pciback.h | 74 drivers/xen/pciback/pciback_ops.c | 75 drivers/xen/pciback/vpci.c | 163 + drivers/xen/pciback/xenbus.c | 436 +++ drivers/xen/pcifront/Makefile | 7 drivers/xen/pcifront/pci.c | 46 drivers/xen/pcifront/pci_op.c | 259 + drivers/xen/pcifront/pcifront.h | 40 drivers/xen/pcifront/xenbus.c | 295 ++ drivers/xen/privcmd/Makefile | 2 drivers/xen/privcmd/privcmd.c | 302 ++ drivers/xen/tpmback/Makefile | 4 drivers/xen/tpmback/common.h | 91 drivers/xen/tpmback/interface.c | 194 + drivers/xen/tpmback/tpmback.c | 1060 +++++++ drivers/xen/tpmback/xenbus.c | 331 ++ drivers/xen/tpmfront/Makefile | 2 drivers/xen/tpmfront/tpmfront.c | 729 +++++ drivers/xen/tpmfront/tpmfront.h | 40 drivers/xen/util.c | 80 drivers/xen/xenbus/Makefile | 8 drivers/xen/xenbus/xenbus_client.c | 405 ++ drivers/xen/xenbus/xenbus_comms.c | 215 + drivers/xen/xenbus/xenbus_comms.h | 50 drivers/xen/xenbus/xenbus_dev.c | 249 + drivers/xen/xenbus/xenbus_probe.c | 1079 +++++++ drivers/xen/xenbus/xenbus_xs.c | 837 ++++++ fs/Kconfig | 1 include/asm-i386/a.out.h | 2 include/asm-i386/apic.h | 2 include/asm-i386/elf.h | 7 include/asm-i386/fixmap.h | 13 include/asm-i386/mach-xen/asm/agp.h | 37 include/asm-i386/mach-xen/asm/desc.h | 164 + include/asm-i386/mach-xen/asm/dma-mapping.h | 156 + include/asm-i386/mach-xen/asm/fixmap.h | 156 + include/asm-i386/mach-xen/asm/floppy.h | 147 + include/asm-i386/mach-xen/asm/highmem.h | 81 include/asm-i386/mach-xen/asm/hw_irq.h | 73 include/asm-i386/mach-xen/asm/hypercall.h | 348 ++ include/asm-i386/mach-xen/asm/hypervisor.h | 160 + include/asm-i386/mach-xen/asm/io.h | 401 ++ include/asm-i386/mach-xen/asm/kmap_types.h | 32 include/asm-i386/mach-xen/asm/mmu.h | 21 include/asm-i386/mach-xen/asm/mmu_context.h | 105 include/asm-i386/mach-xen/asm/page.h | 327 ++ include/asm-i386/mach-xen/asm/param.h | 24 include/asm-i386/mach-xen/asm/pci.h | 154 + include/asm-i386/mach-xen/asm/pgalloc.h | 64 include/asm-i386/mach-xen/asm/pgtable-2level-defs.h | 21 include/asm-i386/mach-xen/asm/pgtable-2level.h | 83 include/asm-i386/mach-xen/asm/pgtable-3level-defs.h | 25 include/asm-i386/mach-xen/asm/pgtable-3level.h | 181 + include/asm-i386/mach-xen/asm/pgtable.h | 521 +++ include/asm-i386/mach-xen/asm/processor.h | 762 +++++ include/asm-i386/mach-xen/asm/ptrace.h | 90 include/asm-i386/mach-xen/asm/scatterlist.h | 22 include/asm-i386/mach-xen/asm/segment.h | 117 include/asm-i386/mach-xen/asm/setup.h | 66 include/asm-i386/mach-xen/asm/smp.h | 103 include/asm-i386/mach-xen/asm/spinlock.h | 217 + include/asm-i386/mach-xen/asm/swiotlb.h | 43 include/asm-i386/mach-xen/asm/synch_bitops.h | 141 + include/asm-i386/mach-xen/asm/system.h | 679 ++++ include/asm-i386/mach-xen/asm/tlbflush.h | 102 include/asm-i386/mach-xen/asm/vga.h | 20 include/asm-i386/mach-xen/irq_vectors.h | 125 include/asm-i386/mach-xen/mach_traps.h | 33 include/asm-i386/mach-xen/setup_arch_post.h | 59 include/asm-i386/mach-xen/setup_arch_pre.h | 5 include/asm-i386/page.h | 4 include/asm-i386/spinlock.h | 6 include/asm-i386/system.h | 2 include/asm-ia64/fixmap.h | 2 include/asm-ia64/gcc_intrin.h | 60 include/asm-ia64/hypercall.h | 280 ++ include/asm-ia64/hypervisor.h | 75 include/asm-ia64/intel_intrin.h | 68 include/asm-ia64/meminit.h | 5 include/asm-ia64/pal.h | 1 include/asm-ia64/privop.h | 59 include/asm-ia64/processor.h | 1 include/asm-ia64/synch_bitops.h | 61 include/asm-ia64/system.h | 4 include/asm-ia64/xen/privop.h | 277 ++ include/asm-um/page.h | 2 include/asm-x86_64/apic.h | 2 include/asm-x86_64/mach-xen/asm/arch_hooks.h | 27 include/asm-x86_64/mach-xen/asm/bootsetup.h | 42 include/asm-x86_64/mach-xen/asm/desc.h | 263 + include/asm-x86_64/mach-xen/asm/dma-mapping.h | 191 + include/asm-x86_64/mach-xen/asm/fixmap.h | 109 include/asm-x86_64/mach-xen/asm/floppy.h | 206 + include/asm-x86_64/mach-xen/asm/hw_irq.h | 141 + include/asm-x86_64/mach-xen/asm/hypercall.h | 349 ++ include/asm-x86_64/mach-xen/asm/hypervisor.h | 2 include/asm-x86_64/mach-xen/asm/io.h | 359 ++ include/asm-x86_64/mach-xen/asm/irq.h | 39 include/asm-x86_64/mach-xen/asm/mmu.h | 33 include/asm-x86_64/mach-xen/asm/mmu_context.h | 134 include/asm-x86_64/mach-xen/asm/nmi.h | 75 include/asm-x86_64/mach-xen/asm/page.h | 318 ++ include/asm-x86_64/mach-xen/asm/pci.h | 174 + include/asm-x86_64/mach-xen/asm/pgalloc.h | 198 + include/asm-x86_64/mach-xen/asm/pgtable.h | 560 ++++ include/asm-x86_64/mach-xen/asm/processor.h | 503 +++ include/asm-x86_64/mach-xen/asm/ptrace.h | 125 include/asm-x86_64/mach-xen/asm/smp.h | 152 + include/asm-x86_64/mach-xen/asm/synch_bitops.h | 2 include/asm-x86_64/mach-xen/asm/system.h | 434 +++ include/asm-x86_64/mach-xen/asm/timer.h | 67 include/asm-x86_64/mach-xen/asm/tlbflush.h | 104 include/asm-x86_64/mach-xen/asm/vga.h | 20 include/asm-x86_64/mach-xen/asm/xor.h | 328 ++ include/asm-x86_64/mach-xen/irq_vectors.h | 123 include/asm-x86_64/mach-xen/mach_time.h | 122 include/asm-x86_64/mach-xen/mach_timer.h | 48 include/asm-x86_64/mach-xen/setup_arch_post.h | 41 include/asm-x86_64/mach-xen/setup_arch_pre.h | 5 include/linux/gfp.h | 6 include/linux/highmem.h | 6 include/linux/irq.h | 3 include/linux/mm.h | 13 include/linux/skbuff.h | 13 include/xen/balloon.h | 70 include/xen/driver_util.h | 26 include/xen/evtchn.h | 123 include/xen/features.h | 20 include/xen/foreign_page.h | 40 include/xen/gnttab.h | 120 include/xen/interface/COPYING | 28 include/xen/interface/acm.h | 181 + include/xen/interface/acm_ops.h | 98 include/xen/interface/arch-ia64.h | 337 ++ include/xen/interface/arch-x86_32.h | 183 + include/xen/interface/arch-x86_64.h | 259 + include/xen/interface/dom0_ops.h | 530 +++ include/xen/interface/event_channel.h | 205 + include/xen/interface/features.h | 53 include/xen/interface/grant_table.h | 311 ++ include/xen/interface/hvm/hvm_info_table.h | 24 include/xen/interface/hvm/ioreq.h | 93 include/xen/interface/hvm/vmx_assist.h | 97 include/xen/interface/io/blkif.h | 85 include/xen/interface/io/console.h | 33 include/xen/interface/io/netif.h | 76 include/xen/interface/io/pciif.h | 55 include/xen/interface/io/ring.h | 265 + include/xen/interface/io/tpmif.h | 56 include/xen/interface/io/xenbus.h | 42 include/xen/interface/io/xs_wire.h | 97 include/xen/interface/memory.h | 155 + include/xen/interface/nmi.h | 59 include/xen/interface/physdev.h | 71 include/xen/interface/sched.h | 87 include/xen/interface/sched_ctl.h | 64 include/xen/interface/trace.h | 90 include/xen/interface/vcpu.h | 119 include/xen/interface/version.h | 64 include/xen/interface/xen.h | 449 +++ include/xen/net_driver_util.h | 56 include/xen/pcifront.h | 39 include/xen/public/evtchn.h | 98 include/xen/public/privcmd.h | 91 include/xen/tpmfe.h | 40 include/xen/xen_proc.h | 23 include/xen/xenbus.h | 298 ++ include/xen/xencons.h | 14 kernel/Kconfig.preempt | 1 kernel/irq/manage.c | 84 lib/Kconfig.debug | 2 lib/Makefile | 3 mm/Kconfig | 3 mm/highmem.c | 11 mm/memory.c | 112 mm/mmap.c | 4 mm/page_alloc.c | 6 net/core/dev.c | 50 net/core/skbuff.c | 41 scripts/Makefile.xen | 14 364 files changed, 77553 insertions(+), 243 deletions(-) Index: linux-2.6-xen.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-xen.patch,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- linux-2.6-xen.patch 21 Mar 2006 18:43:44 -0000 1.5 +++ linux-2.6-xen.patch 22 Mar 2006 23:50:26 -0000 1.6 @@ -68674,7 +68674,7 @@ diff -Nru -p --exclude='.*' ref-linux-2.6.16-rc6/include/asm-ia64/intel_intrin.h linux-2.6.16-rc6-xen0/include/asm-ia64/intel_intrin.h --- ref-linux-2.6.16-rc6/include/asm-ia64/intel_intrin.h 2006-01-03 04:21:10.000000000 +0100 +++ linux-2.6.16-rc6-xen0/include/asm-ia64/intel_intrin.h 2006-03-20 22:06:21.000000000 +0100 -@@ -119,10 +119,10 @@ __s64 _m64_popcnt(__s64 a); +@@ -16,10 +16,10 @@ * intrinsic */ @@ -68683,12 +68683,12 @@ +#define __ia64_getreg __getReg +#define __ia64_setreg __setReg --#define ia64_hint(x) -+#define __ia64_hint(x) +-#define ia64_hint __hint ++#define __ia64_hint __hint + #define ia64_hint_pause __hint_pause - #define ia64_mux1_brcst 0 - #define ia64_mux1_mix 8 -@@ -135,16 +135,16 @@ __s64 _m64_popcnt(__s64 a); + #define ia64_mux1_brcst _m64_mux1_brcst +@@ -33,16 +33,16 @@ #define ia64_getf_exp __getf_exp #define ia64_shrp _m64_shrp @@ -68709,7 +68709,7 @@ #define ia64_ldfs __ldfs #define ia64_ldfd __ldfd -@@ -182,24 +182,24 @@ __s64 _m64_popcnt(__s64 a); +@@ -80,24 +80,24 @@ #define __ia64_set_dbr(index, val) \ __setIndReg(_IA64_REG_INDR_DBR, index, val) @@ -68745,7 +68745,7 @@ #define ia64_srlz_d __dsrlz #define ia64_srlz_i __isrlz -@@ -218,18 +218,18 @@ __s64 _m64_popcnt(__s64 a); +@@ -116,18 +116,18 @@ #define ia64_ld8_acq __ld8_acq #define ia64_sync_i __synci @@ -68776,7 +68776,7 @@ #define ia64_dep_mi _m64_dep_mi /* Values for lfhint in __lfetch and __lfetch_fault */ -@@ -244,14 +244,16 @@ __s64 _m64_popcnt(__s64 a); +@@ -142,16 +142,18 @@ #define ia64_lfetch_fault __lfetch_fault #define ia64_lfetch_fault_excl __lfetch_fault_excl @@ -68795,6 +68795,8 @@ +#define __ia64_get_psr_i() (__ia64_getreg(_IA64_REG_PSR) & 0x4000UL) + + #define __builtin_trap() __break(0); + #endif /* _ASM_IA64_INTEL_INTRIN_H */ diff -Nru -p --exclude='.*' ref-linux-2.6.16-rc6/include/asm-ia64/meminit.h linux-2.6.16-rc6-xen0/include/asm-ia64/meminit.h --- ref-linux-2.6.16-rc6/include/asm-ia64/meminit.h 2006-01-03 04:21:10.000000000 +0100 Index: sources =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/sources,v retrieving revision 1.331 retrieving revision 1.332 diff -u -r1.331 -r1.332 --- sources 21 Mar 2006 20:56:19 -0000 1.331 +++ sources 22 Mar 2006 23:50:27 -0000 1.332 @@ -1,3 +1,3 @@ 9a91b2719949ff0856b40bc467fd47be linux-2.6.16.tar.bz2 8c70806f9075ebc0087f7ce1b8911700 xen-20060320.tar.bz2 -491d4fb38ab77cead5b482f7a63452c8 patch-2.6.16-git3.bz2 +46eeda95bd8e4e99ce5d577dfbb79ac0 patch-2.6.16-git5.bz2 Index: upstream =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/upstream,v retrieving revision 1.303 retrieving revision 1.304 diff -u -r1.303 -r1.304 --- upstream 21 Mar 2006 20:56:19 -0000 1.303 +++ upstream 22 Mar 2006 23:50:27 -0000 1.304 @@ -1,2 +1,2 @@ linux-2.6.16.tar.bz2 -patch-2.6.16-git3.bz2 +patch-2.6.16-git5.bz2 --- linux-2.6-selinux-disable-attributes-no-policy.patch DELETED --- --- linux-2.6-selinux-selinuxfs-hard-link-count.patch DELETED --- --- patch-2.6.16-git3.bz2.sign DELETED --- From fedora-cvs-commits at redhat.com Thu Mar 23 00:00:03 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 22 Mar 2006 19:00:03 -0500 Subject: rpms/kernel/devel linux-2.6-debug-periodic-slab-check.patch, 1.4, 1.5 Message-ID: <200603230000.k2N003cv023542@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv23517 Modified Files: linux-2.6-debug-periodic-slab-check.patch Log Message: spinlock removed. linux-2.6-debug-periodic-slab-check.patch: slab.c | 132 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 129 insertions(+), 3 deletions(-) Index: linux-2.6-debug-periodic-slab-check.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-debug-periodic-slab-check.patch,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- linux-2.6-debug-periodic-slab-check.patch 22 Mar 2006 23:50:26 -0000 1.4 +++ linux-2.6-debug-periodic-slab-check.patch 22 Mar 2006 23:59:59 -0000 1.5 @@ -65,7 +65,7 @@ printk(KERN_ERR "slab: double free detected in cache " "'%s', objp %p\n", cachep->name, objp); BUG(); -@@ -3266,6 +3277,116 @@ static int alloc_kmemlist(struct kmem_ca +@@ -3266,6 +3277,114 @@ static int alloc_kmemlist(struct kmem_ca return err; } @@ -166,8 +166,6 @@ +{ + int node; + -+ check_spinlock_acquired(cache); -+ + for_each_online_node(node) { + struct kmem_list3 *lists = cache->nodelists[node]; + From fedora-cvs-commits at redhat.com Thu Mar 23 00:11:27 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 22 Mar 2006 19:11:27 -0500 Subject: rpms/kernel/devel linux-2.6-dump_smp_call_function.patch,1.7,1.8 Message-ID: <200603230011.k2N0BRN1023743@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv23728 Modified Files: linux-2.6-dump_smp_call_function.patch Log Message: typo linux-2.6-dump_smp_call_function.patch: linux-2.6.12/arch/i386/kernel/smp.c | 47 +++++++++++++++++++++++++++++++- linux-2.6.12/arch/ia64/kernel/smp.c | 44 +++++++++++++++++++++++++++++ linux-2.6.12/arch/powerpc/kernel/smp.c | 45 +++++++++++++++++++++++++++++- linux-2.6.12/arch/x86_64/kernel/smp.c | 45 ++++++++++++++++++++++++++++++ linux-2.6.12/drivers/block/diskdump.c | 2 - linux-2.6.12/drivers/net/netdump.c | 2 - linux-2.6.16.noarch/include/linux/smp.h | 2 + 7 files changed, 183 insertions(+), 4 deletions(-) Index: linux-2.6-dump_smp_call_function.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-dump_smp_call_function.patch,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- linux-2.6-dump_smp_call_function.patch 22 Mar 2006 23:50:26 -0000 1.7 +++ linux-2.6-dump_smp_call_function.patch 23 Mar 2006 00:11:22 -0000 1.8 @@ -291,7 +291,7 @@ * Call a function on all other processors */ int smp_call_function(void(*func)(void *info), void *info, int retry, int wait); -+int dump_smp_call_function(void(*func)(void *info), void *info, int retry, int wait); ++void dump_smp_call_function(void(*func)(void *info), void *info, int retry, int wait); /* * Call a function on all processors From fedora-cvs-commits at redhat.com Thu Mar 23 00:13:48 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 22 Mar 2006 19:13:48 -0500 Subject: rpms/xorg-x11-drv-ati/devel .cvsignore, 1.7, 1.8 sources, 1.7, 1.8 xorg-x11-drv-ati.spec, 1.14, 1.15 Message-ID: <200603230013.k2N0Dm7j023852@cvs.devel.redhat.com> Author: krh Update of /cvs/dist/rpms/xorg-x11-drv-ati/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv23838 Modified Files: .cvsignore sources xorg-x11-drv-ati.spec Log Message: Update to cvs snapshot that distchecks. Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/xorg-x11-drv-ati/devel/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 22 Mar 2006 23:45:11 -0000 1.7 +++ .cvsignore 23 Mar 2006 00:13:44 -0000 1.8 @@ -1 +1 @@ -xf86-video-ati-cvs20060322.tar.bz2 +xf86-video-ati-cvs20060322-1.tar.bz2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/xorg-x11-drv-ati/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 22 Mar 2006 23:45:11 -0000 1.7 +++ sources 23 Mar 2006 00:13:44 -0000 1.8 @@ -1 +1 @@ -ae8dc70c96175f5b39e27aef80f32e6c xf86-video-ati-cvs20060322.tar.bz2 +a07332c51b319b99b676c52b43bc19b1 xf86-video-ati-cvs20060322-1.tar.bz2 Index: xorg-x11-drv-ati.spec =================================================================== RCS file: /cvs/dist/rpms/xorg-x11-drv-ati/devel/xorg-x11-drv-ati.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- xorg-x11-drv-ati.spec 22 Mar 2006 23:45:11 -0000 1.14 +++ xorg-x11-drv-ati.spec 23 Mar 2006 00:13:44 -0000 1.15 @@ -1,4 +1,4 @@ -%define tarball xf86-video-ati-%{cvsdate} +%define tarball xf86-video-ati-%{cvsdate}-1 %define moduledir %(pkg-config xorg-server --variable=moduledir ) %define driverdir %{moduledir}/drivers From fedora-cvs-commits at redhat.com Thu Mar 23 00:19:48 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 22 Mar 2006 19:19:48 -0500 Subject: rpms/kernel/devel linux-2.6-dump_smp_call_function.patch,1.8,1.9 Message-ID: <200603230019.k2N0JmgS005149@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv5134 Modified Files: linux-2.6-dump_smp_call_function.patch Log Message: bah linux-2.6-dump_smp_call_function.patch: linux-2.6.12/arch/i386/kernel/smp.c | 47 +++++++++++++++++++++++++++++++- linux-2.6.12/arch/ia64/kernel/smp.c | 44 +++++++++++++++++++++++++++++ linux-2.6.12/arch/powerpc/kernel/smp.c | 45 +++++++++++++++++++++++++++++- linux-2.6.12/arch/x86_64/kernel/smp.c | 45 ++++++++++++++++++++++++++++++ linux-2.6.12/drivers/block/diskdump.c | 2 - linux-2.6.12/drivers/net/netdump.c | 2 - linux-2.6.16.noarch/include/linux/smp.h | 2 + 7 files changed, 183 insertions(+), 4 deletions(-) Index: linux-2.6-dump_smp_call_function.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-dump_smp_call_function.patch,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- linux-2.6-dump_smp_call_function.patch 23 Mar 2006 00:11:22 -0000 1.8 +++ linux-2.6-dump_smp_call_function.patch 23 Mar 2006 00:19:45 -0000 1.9 @@ -291,7 +291,7 @@ * Call a function on all other processors */ int smp_call_function(void(*func)(void *info), void *info, int retry, int wait); -+void dump_smp_call_function(void(*func)(void *info), void *info, int retry, int wait); ++void dump_smp_call_function (void (*func) (void *info), void *info); /* * Call a function on all processors From fedora-cvs-commits at redhat.com Thu Mar 23 00:24:01 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 22 Mar 2006 19:24:01 -0500 Subject: rpms/xorg-x11-drv-i810/devel .cvsignore, 1.6, 1.7 sources, 1.6, 1.7 xorg-x11-drv-i810.spec, 1.10, 1.11 Message-ID: <200603230024.k2N0O1ES005309@cvs.devel.redhat.com> Author: krh Update of /cvs/dist/rpms/xorg-x11-drv-i810/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv5293 Modified Files: .cvsignore sources xorg-x11-drv-i810.spec Log Message: Update to CVS snapshot of 20060322. Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/xorg-x11-drv-i810/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 3 Feb 2006 13:34:13 -0000 1.6 +++ .cvsignore 23 Mar 2006 00:23:58 -0000 1.7 @@ -1 +1 @@ -xf86-video-i810-1.4.1.3.tar.bz2 +xf86-video-i810-cvs20060322.tar.bz2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/xorg-x11-drv-i810/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 3 Feb 2006 13:34:14 -0000 1.6 +++ sources 23 Mar 2006 00:23:58 -0000 1.7 @@ -1 +1 @@ -aebee9cc7608b02962e01d12ffd764e2 xf86-video-i810-1.4.1.3.tar.bz2 +66c0253452e4925720b68ea2d5d6f02e xf86-video-i810-cvs20060322.tar.bz2 Index: xorg-x11-drv-i810.spec =================================================================== RCS file: /cvs/dist/rpms/xorg-x11-drv-i810/devel/xorg-x11-drv-i810.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- xorg-x11-drv-i810.spec 7 Feb 2006 14:26:49 -0000 1.10 +++ xorg-x11-drv-i810.spec 23 Mar 2006 00:23:58 -0000 1.11 @@ -1,15 +1,15 @@ -%define tarball xf86-video-i810 +%define tarball xf86-video-i810-%{cvsdate} %define moduledir %(pkg-config xorg-server --variable=moduledir ) %define driverdir %{moduledir}/drivers -%define cvsdate xxxxxxx +%define cvsdate cvs20060322 Summary: Xorg X11 i810 video driver Name: xorg-x11-drv-i810 Version: 1.4.1.3 -Release: 3.1 +Release: 4.%{cvsdate} URL: http://www.x.org -Source0: http://xorg.freedesktop.org/X11R7.0/src/driver/%{tarball}-%{version}.tar.bz2 +Source0: http://xorg.freedesktop.org/X11R7.0/src/driver/%{tarball}.tar.bz2 Source1: i810.xinf License: MIT/X11 Group: User Interface/X Hardware Support @@ -35,7 +35,7 @@ X.Org X11 i810 video driver XvMC development package. %prep -%setup -q -n %{tarball}-%{version} +%setup -q -n %{tarball} %build %configure --disable-static @@ -74,6 +74,9 @@ %{_libdir}/libI810XvMC.so %changelog +* Wed Mar 22 2006 Kristian H??gsberg 1.4.1.3-4.cvs20060322 +- Update to CVS snapshot of 20060322. + * Tue Feb 07 2006 Jesse Keating - 1.4.1.3-3.1 - rebuilt for new gcc4.1 snapshot and glibc changes From fedora-cvs-commits at redhat.com Thu Mar 23 00:25:35 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 22 Mar 2006 19:25:35 -0500 Subject: rpms/kernel/devel linux-2.6-debug-slab-leaks.patch,1.2,1.3 Message-ID: <200603230025.k2N0PZ8g005403@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv5388 Modified Files: linux-2.6-debug-slab-leaks.patch Log Message: no more lock linux-2.6-debug-slab-leaks.patch: fs/proc/proc_misc.c | 37 +++++++++++ include/linux/slab.h | 6 + lib/Kconfig.debug | 4 + mm/slab.c | 164 +++++++++++++++++++++++++++++++++++++++++++++++++-- mm/util.c | 4 - net/core/skbuff.c | 2 6 files changed, 208 insertions(+), 9 deletions(-) Index: linux-2.6-debug-slab-leaks.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-debug-slab-leaks.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- linux-2.6-debug-slab-leaks.patch 10 Mar 2006 15:37:53 -0000 1.2 +++ linux-2.6-debug-slab-leaks.patch 23 Mar 2006 00:25:32 -0000 1.3 @@ -127,7 +127,7 @@ #endif #ifdef CONFIG_SMP -@@ -3778,6 +3779,163 @@ ssize_t slabinfo_write(struct file *file +@@ -3778,6 +3779,161 @@ ssize_t slabinfo_write(struct file *file res = count; return res; } @@ -235,7 +235,6 @@ + + n[1] = 0; + -+ spin_lock(&cachep->spinlock); + for_each_online_node(node) { + l3 = cachep->nodelists[node]; + if (!l3) @@ -255,7 +254,6 @@ + spin_unlock_irq(&l3->list_lock); + } + name = cachep->name; -+ spin_unlock(&cachep->spinlock); + if (n[0] == n[1]) { + /* Increase the buffer size */ + mutex_unlock(&cache_chain_mutex); From fedora-cvs-commits at redhat.com Thu Mar 23 00:45:11 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 22 Mar 2006 19:45:11 -0500 Subject: rpms/kernel/devel linux-2.6-dump_smp_call_function.patch,1.9,1.10 Message-ID: <200603230045.k2N0jBCO005580@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv5565 Modified Files: linux-2.6-dump_smp_call_function.patch Log Message: gar linux-2.6-dump_smp_call_function.patch: linux-2.6.12/arch/i386/kernel/smp.c | 47 +++++++++++++++++++++++++++++++- linux-2.6.12/arch/ia64/kernel/smp.c | 44 +++++++++++++++++++++++++++++ linux-2.6.12/arch/powerpc/kernel/smp.c | 45 +++++++++++++++++++++++++++++- linux-2.6.12/arch/x86_64/kernel/smp.c | 45 ++++++++++++++++++++++++++++++ linux-2.6.12/drivers/block/diskdump.c | 2 - linux-2.6.12/drivers/net/netdump.c | 2 - linux-2.6.16.noarch/include/linux/smp.h | 2 + 7 files changed, 183 insertions(+), 4 deletions(-) Index: linux-2.6-dump_smp_call_function.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-dump_smp_call_function.patch,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- linux-2.6-dump_smp_call_function.patch 23 Mar 2006 00:19:45 -0000 1.9 +++ linux-2.6-dump_smp_call_function.patch 23 Mar 2006 00:45:08 -0000 1.10 @@ -299,7 +299,7 @@ #define raw_smp_processor_id() 0 #define hard_smp_processor_id() 0 #define smp_call_function(func,info,retry,wait) ({ 0; }) -+#define dump_smp_call_function(func,info,retry,wait) ({ 0; }) ++#define dump_smp_call_function(func,info) ({ 0; }) #define on_each_cpu(func,info,retry,wait) \ ({ \ local_irq_disable(); \ From fedora-cvs-commits at redhat.com Thu Mar 23 01:11:49 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 22 Mar 2006 20:11:49 -0500 Subject: rpms/kernel/devel linux-2.6-dump_smp_call_function.patch,1.10,1.11 Message-ID: <200603230111.k2N1Bn7B019483@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv19470 Modified Files: linux-2.6-dump_smp_call_function.patch Log Message: merge error linux-2.6-dump_smp_call_function.patch: linux-2.6.12/arch/i386/kernel/smp.c | 46 ++++++++++++++++++++++++++++++++ linux-2.6.12/arch/ia64/kernel/smp.c | 44 ++++++++++++++++++++++++++++++ linux-2.6.12/arch/powerpc/kernel/smp.c | 45 ++++++++++++++++++++++++++++++- linux-2.6.12/arch/x86_64/kernel/smp.c | 45 +++++++++++++++++++++++++++++++ linux-2.6.12/drivers/block/diskdump.c | 2 - linux-2.6.12/drivers/net/netdump.c | 2 - linux-2.6.16.noarch/include/linux/smp.h | 2 + 7 files changed, 183 insertions(+), 3 deletions(-) Index: linux-2.6-dump_smp_call_function.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-dump_smp_call_function.patch,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- linux-2.6-dump_smp_call_function.patch 23 Mar 2006 00:45:08 -0000 1.10 +++ linux-2.6-dump_smp_call_function.patch 23 Mar 2006 01:11:45 -0000 1.11 @@ -141,11 +141,11 @@ struct call_data_struct { void (*func) (void *info); -@@ -508,8 +508,52 @@ void unlock_ipi_call_lock(void) +@@ -508,8 +508,53 @@ void unlock_ipi_call_lock(void) spin_unlock_irq(&call_lock); } --static struct call_data_struct *call_data; + static struct call_data_struct *call_data; +static struct call_data_struct * saved_call_data; +/* From fedora-cvs-commits at redhat.com Thu Mar 23 02:09:11 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 22 Mar 2006 21:09:11 -0500 Subject: rpms/tcsh/devel tcsh-6.14.00-colors.patch, NONE, 1.1 tcsh.spec, 1.37, 1.38 Message-ID: <200603230209.k2N29BPD014697@cvs.devel.redhat.com> Author: mitr Update of /cvs/dist/rpms/tcsh/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv14682 Modified Files: tcsh.spec Added Files: tcsh-6.14.00-colors.patch Log Message: * Thu Mar 23 2006 Miloslav Trmac - 6.14-8 - Backport a patch to ignore LS_COLOR codes introduced in newer coreutils (#186037) tcsh-6.14.00-colors.patch: tw.color.c | 5 +++++ 1 files changed, 5 insertions(+) --- NEW FILE tcsh-6.14.00-colors.patch --- --- tcsh-6.14.00/tw.color.c.colors 2006-03-23 02:59:40.000000000 +0100 +++ tcsh-6.14.00/tw.color.c 2006-03-23 03:00:44.000000000 +0100 @@ -80,6 +80,11 @@ #endif VAR(NOS, "rc", "m"), /* Right code */ VAR(NOS, "ec", ""), /* End code (replaces lc+no+rc) */ + VAR(NOS, "su", ""), /* Setuid file (u+s) */ + VAR(NOS, "sg", ""), /* Setgid file (g+s) */ + VAR(NOS, "tw", ""), /* Sticky and other writable dir (+t,o+w) */ + VAR(NOS, "ow", ""), /* Other writable dir (o+w) but not sticky */ + VAR(NOS, "st", ""), /* Sticky dir (+t) but not other writable */ }; enum FileType { Index: tcsh.spec =================================================================== RCS file: /cvs/dist/rpms/tcsh/devel/tcsh.spec,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- tcsh.spec 18 Mar 2006 03:19:31 -0000 1.37 +++ tcsh.spec 23 Mar 2006 02:09:08 -0000 1.38 @@ -3,7 +3,7 @@ Summary: An enhanced version of csh, the C shell. Name: tcsh Version: 6.14 -Release: 7 +Release: 8 License: distributable Group: System Environment/Shells Source: ftp://ftp.astron.com/pub/tcsh/tcsh-%{version}.00.tar.gz @@ -15,6 +15,7 @@ Patch5: tcsh-6.14.00-read.patch Patch6: tcsh-6.14.00-sigint.patch Patch7: tcsh-6.14.00-wide-crash.patch +Patch8: tcsh-6.14.00-colors.patch Provides: csh = %{version} Prereq: fileutils, grep URL: http://www.tcsh.org/ @@ -39,6 +40,7 @@ %patch5 -p1 -b .read %patch6 -p1 -b .sigint %patch7 -p1 -b .wide-crash +%patch8 -p1 -b .colors nroff -me eight-bit.me > eight-bit.txt @@ -106,6 +108,10 @@ %{_mandir}/*/* %changelog +* Thu Mar 23 2006 Miloslav Trmac - 6.14-8 +- Backport a patch to ignore LS_COLOR codes introduced in newer coreutils + (#186037) + * Sat Mar 18 2006 Miloslav Trmac - 6.14-7 - Fix a crash when reading scripts with multibyte characters (#183267) - Block SIGINT while waiting for children (#177366) From fedora-cvs-commits at redhat.com Thu Mar 23 02:22:48 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 22 Mar 2006 21:22:48 -0500 Subject: rpms/kernel/devel kernel-2.6.spec,1.2082,1.2083 Message-ID: <200603230222.k2N2Mmfo028733@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv28715 Modified Files: kernel-2.6.spec Log Message: xen broke again Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.2082 retrieving revision 1.2083 diff -u -r1.2082 -r1.2083 --- kernel-2.6.spec 22 Mar 2006 23:50:26 -0000 1.2082 +++ kernel-2.6.spec 23 Mar 2006 02:22:46 -0000 1.2083 @@ -8,7 +8,7 @@ # Whether to apply the Xen patches, leave this enabled. %define includexen 1 # Whether to build the Xen kernels, disable if you want. -%define buildxen 1 +%define buildxen 0 %define buildxenPAE 0 %define builddoc 0 %define buildkdump 1 From fedora-cvs-commits at redhat.com Thu Mar 23 09:13:58 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 23 Mar 2006 04:13:58 -0500 Subject: rpms/kernel/devel patch-2.6.16-git6.bz2.sign, NONE, 1.1 .cvsignore, 1.391, 1.392 kernel-2.6.spec, 1.2083, 1.2084 sources, 1.332, 1.333 upstream, 1.304, 1.305 patch-2.6.16-git5.bz2.sign, 1.1, NONE Message-ID: <200603230913.k2N9DwEh016022@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv15999 Modified Files: .cvsignore kernel-2.6.spec sources upstream Added Files: patch-2.6.16-git6.bz2.sign Removed Files: patch-2.6.16-git5.bz2.sign Log Message: git6 --- NEW FILE patch-2.6.16-git6.bz2.sign --- -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.2.2 (GNU/Linux) Comment: See http://www.kernel.org/signature.html for info iD8DBQBEIknByGugalF9Dw4RAjM+AJ4/Jpce6nxtcV0rM6JnzgQ5rW0O9QCdEtll ghE91rMdelqyrKL95Ml+gAQ= =AKF5 -----END PGP SIGNATURE----- Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v retrieving revision 1.391 retrieving revision 1.392 diff -u -r1.391 -r1.392 --- .cvsignore 22 Mar 2006 23:50:26 -0000 1.391 +++ .cvsignore 23 Mar 2006 09:13:55 -0000 1.392 @@ -3,4 +3,4 @@ kernel-2.6.16 linux-2.6.16.tar.bz2 xen-20060320.tar.bz2 -patch-2.6.16-git5.bz2 +patch-2.6.16-git6.bz2 Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.2083 retrieving revision 1.2084 diff -u -r1.2083 -r1.2084 --- kernel-2.6.spec 23 Mar 2006 02:22:46 -0000 1.2083 +++ kernel-2.6.spec 23 Mar 2006 09:13:55 -0000 1.2084 @@ -217,7 +217,7 @@ # # Patches 0 through 100 are meant for core subsystem upgrades # -Patch1: patch-2.6.16-git5.bz2 +Patch1: patch-2.6.16-git6.bz2 # Patches 100 through 500 are meant for architecture patches Patch100: linux-2.6-bzimage.patch @@ -1644,6 +1644,9 @@ %endif %changelog +* Thu Mar 23 2006 Dave Jones +- 2.6.16-git6 + * Wed Mar 22 2006 Dave Jones - 2.6.16-git5 Index: sources =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/sources,v retrieving revision 1.332 retrieving revision 1.333 diff -u -r1.332 -r1.333 --- sources 22 Mar 2006 23:50:27 -0000 1.332 +++ sources 23 Mar 2006 09:13:55 -0000 1.333 @@ -1,3 +1,3 @@ 9a91b2719949ff0856b40bc467fd47be linux-2.6.16.tar.bz2 8c70806f9075ebc0087f7ce1b8911700 xen-20060320.tar.bz2 -46eeda95bd8e4e99ce5d577dfbb79ac0 patch-2.6.16-git5.bz2 +6871a3f3c4a8d29247ac81a0cdb2da99 patch-2.6.16-git6.bz2 Index: upstream =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/upstream,v retrieving revision 1.304 retrieving revision 1.305 diff -u -r1.304 -r1.305 --- upstream 22 Mar 2006 23:50:27 -0000 1.304 +++ upstream 23 Mar 2006 09:13:55 -0000 1.305 @@ -1,2 +1,2 @@ linux-2.6.16.tar.bz2 -patch-2.6.16-git5.bz2 +patch-2.6.16-git6.bz2 --- patch-2.6.16-git5.bz2.sign DELETED --- From fedora-cvs-commits at redhat.com Thu Mar 23 09:13:58 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 23 Mar 2006 04:13:58 -0500 Subject: rpms/kernel/devel/configs config-generic, 1.163, 1.164 config-powerpc64-generic, 1.3, 1.4 Message-ID: <200603230913.k2N9DwQQ016035@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel/configs In directory cvs.devel.redhat.com:/tmp/cvs-serv15999/configs Modified Files: config-generic config-powerpc64-generic Log Message: git6 Index: config-generic =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/configs/config-generic,v retrieving revision 1.163 retrieving revision 1.164 diff -u -r1.163 -r1.164 --- config-generic 22 Mar 2006 23:50:27 -0000 1.163 +++ config-generic 23 Mar 2006 09:13:56 -0000 1.164 @@ -1871,6 +1871,7 @@ # Advanced Linux Sound Architecture # CONFIG_SND=m +CONFIG_SND_VERBOSE_PROCFS=y CONFIG_SND_SEQUENCER=m CONFIG_SND_SEQ_DUMMY=m CONFIG_SND_SEQUENCER_OSS=y @@ -1878,6 +1879,7 @@ CONFIG_SND_OSSEMUL=y CONFIG_SND_MIXER_OSS=m CONFIG_SND_PCM_OSS=m +CONFIG_SND_PCM_OSS_PLUGINS=y CONFIG_SND_RTCTIMER=m # CONFIG_SND_VERBOSE_PRINTK is not set # CONFIG_SND_DEBUG is not set Index: config-powerpc64-generic =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/configs/config-powerpc64-generic,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- config-powerpc64-generic 21 Nov 2005 15:40:53 -0000 1.3 +++ config-powerpc64-generic 23 Mar 2006 09:13:56 -0000 1.4 @@ -1,4 +1,5 @@ CONFIG_PPC64=y +CONFIG_VIRT_CPU_ACCOUNTING=y CONFIG_NR_CPUS=128 CONFIG_BLK_DEV_SL82C105=y # CONFIG_FB_PLATINUM is not set From fedora-cvs-commits at redhat.com Thu Mar 23 09:19:14 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 23 Mar 2006 04:19:14 -0500 Subject: rpms/authconfig/FC-4 authconfig-4.6.10-libdir.patch, NONE, 1.1 authconfig-4.6.10-multiple-nisserver.patch, NONE, 1.1 authconfig.spec, 1.40, 1.41 Message-ID: <200603230919.k2N9JEUS029795@cvs.devel.redhat.com> Author: tmraz Update of /cvs/dist/rpms/authconfig/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv29779 Modified Files: authconfig.spec Added Files: authconfig-4.6.10-libdir.patch authconfig-4.6.10-multiple-nisserver.patch Log Message: * Thu Mar 23 2006 Tomas Mraz - 4.6.12-2 - set domain and ypserver option correctly when multiple servers specified in kickstart (#159214) - improve libdir detection (#178899) authconfig-4.6.10-libdir.patch: authconfig-gtk.py | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) --- NEW FILE authconfig-4.6.10-libdir.patch --- --- authconfig-4.6.10/authconfig-gtk.py.libdir 2005-01-25 18:00:53.000000000 +0100 +++ authconfig-4.6.10/authconfig-gtk.py 2006-03-22 19:51:43.000000000 +0100 @@ -43,10 +43,8 @@ self.moduleName = "Authentication" self.moduleClass = "reconfig" self.lib = "/lib" - for item in sys.path: - for element in item.split("/"): - if element.startswith("lib"): - self.lib = "/" + element + if "lib64" in str(globals()["authconfig"]): + self.lib = "/lib64" # "checkbox/button name": authInfo field, file, generic name, # package, names of widgets to disable if checkbox not active self.main_map = { authconfig-4.6.10-multiple-nisserver.patch: authinfo.c | 45 ++++++++++++++++++++++++++++++++++++--------- 1 files changed, 36 insertions(+), 9 deletions(-) --- NEW FILE authconfig-4.6.10-multiple-nisserver.patch --- --- authconfig-4.6.10/authinfo.c.multiple-nis 2005-02-10 17:26:38.000000000 +0100 +++ authconfig-4.6.10/authinfo.c 2005-08-04 12:03:22.000000000 +0200 @@ -1610,6 +1610,14 @@ l = strlen(" domain ") + strlen(" broadcast "); l += info->nisDomain ? strlen(info->nisDomain) : 0; l += info->nisServer ? strlen(info->nisServer) : 0; + /* we need space for all the NIS servers */ + if (non_empty(info->nisServer)) { + p = info->nisServer; + while ((p=strchr(p, ',')) != NULL) { + l += strlen("ypserver ") + 1; + p++; + } + } obuf = g_malloc0(st.st_size + 1 + l); p = ibuf; @@ -1689,22 +1697,39 @@ /* If we haven't encountered a domain line yet... */ if (!written) { + p = info->nisServer; if (non_empty(info->nisDomain)) { strcat(obuf, "domain "); strcat(obuf, info->nisDomain); - if (non_empty(info->nisServer)) { + if (non_empty(p)) { strcat(obuf, " server "); - strcat(obuf, info->nisServer); + if (strchr(p, ',')) { + char *q; + q = strchr(p, ','); + strncat(obuf, p, q - p); + p = q + 1; + } else { + strcat(obuf, p); + p = NULL; + } } else { strcat(obuf, " broadcast"); } strcat(obuf, "\n"); - } else { - if (non_empty(info->nisServer)) { + } + + if (non_empty(p)) { + while (strchr(p, ',')) { + char *q; + q = strchr(p, ','); strcat(obuf, "ypserver "); - strcat(obuf, info->nisServer); + strncat(obuf, p, q - p); strcat(obuf, "\n"); + p = q + 1; } + strcat(obuf, "ypserver "); + strcat(obuf, p); + strcat(obuf, "\n"); } } @@ -2520,10 +2545,12 @@ p = strchr(p, ',') + 1; } } - strcat(obuf, info->kerberosRealm ?: ""); - strcat(obuf, "\t"); - strcat(obuf, p); - strcat(obuf, "\n"); + if (non_empty(p)) { + strcat(obuf, info->kerberosRealm ?: ""); + strcat(obuf, "\t"); + strcat(obuf, p); + strcat(obuf, "\n"); + } p = info->kerberosAdminServer; if (non_empty(p)) { Index: authconfig.spec =================================================================== RCS file: /cvs/dist/rpms/authconfig/FC-4/authconfig.spec,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- authconfig.spec 12 Apr 2005 13:51:15 -0000 1.40 +++ authconfig.spec 23 Mar 2006 09:19:11 -0000 1.41 @@ -3,7 +3,7 @@ Version: 4.6.12 # Don't change release in elvis CVS, up version after merging all patches # from dist CVS instead. -Release: 1 +Release: 2 License: GPL ExclusiveOS: Linux Group: System Environment/Base @@ -14,6 +14,8 @@ Conflicts: pam_krb5 < 1.49, samba-common < 3.0, samba-client < 3.0 BuildPrereq: pam-devel >= 0.77, newt-devel, glib2-devel, python, python-devel BuildPrereq: desktop-file-utils, intltool, gettext, perl-XML-Parser +Patch2: authconfig-4.6.10-multiple-nisserver.patch +Patch3: authconfig-4.6.10-libdir.patch %description Authconfig is a terminal mode program which can configure a workstation @@ -38,6 +40,8 @@ %prep %setup -q -n %{name}-%{version} +%patch2 -p1 -b .multiple-nis +%patch3 -p1 -b .libdir %build CFLAGS="$RPM_OPT_FLAGS -fPIC"; export CFLAGS @@ -81,6 +85,11 @@ %{_datadir}/pixmaps/* %changelog +* Thu Mar 23 2006 Tomas Mraz - 4.6.12-2 +- set domain and ypserver option correctly when multiple servers + specified in kickstart (#159214) +- improve libdir detection (#178899) + * Tue Apr 12 2005 Tomas Mraz - 4.6.12-1 - replaced deprecated gtk.TRUE/FALSE (#153034) - updated translations From fedora-cvs-commits at redhat.com Thu Mar 23 09:25:57 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 23 Mar 2006 04:25:57 -0500 Subject: rpms/file/FC-5 file.spec,1.48,1.49 Message-ID: <200603230925.k2N9Pvih029842@cvs.devel.redhat.com> Author: rvokal Update of /cvs/dist/rpms/file/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv29829 Modified Files: file.spec Log Message: - fc5 update Index: file.spec =================================================================== RCS file: /cvs/dist/rpms/file/FC-5/file.spec,v retrieving revision 1.48 retrieving revision 1.49 diff -u -r1.48 -r1.49 --- file.spec 14 Mar 2006 08:39:51 -0000 1.48 +++ file.spec 23 Mar 2006 09:25:55 -0000 1.49 @@ -3,7 +3,7 @@ Summary: A utility for determining file types. Name: file Version: 4.17 -Release: 2 +Release: 2.fc5 License: distributable Group: Applications/File Source0: ftp://ftp.astron.com/pub/file/file-%{version}.tar.gz @@ -87,6 +87,9 @@ %{_libdir}/libmagic.* %changelog +* Thu Mar 23 2006 Radek Vok??l 4.17-2.fc5 +- fc5 update + * Tue Mar 14 2006 Radek Vok??l 4.17-2 - fix segfault when compiling magic - add check for wctype.h From fedora-cvs-commits at redhat.com Thu Mar 23 09:56:53 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 23 Mar 2006 04:56:53 -0500 Subject: rpms/bash/devel bash.spec,1.112,1.113 bash31-010,1.1,1.2 Message-ID: <200603230956.k2N9urI9011298@cvs.devel.redhat.com> Author: twaugh Update of /cvs/dist/rpms/bash/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv11284 Modified Files: bash.spec bash31-010 Log Message: * Thu Mar 23 2006 Tim Waugh - Patchlevel 14. Index: bash.spec =================================================================== RCS file: /cvs/dist/rpms/bash/devel/bash.spec,v retrieving revision 1.112 retrieving revision 1.113 diff -u -r1.112 -r1.113 --- bash.spec 2 Mar 2006 09:18:55 -0000 1.112 +++ bash.spec 23 Mar 2006 09:56:51 -0000 1.113 @@ -21,6 +21,10 @@ Patch8: ftp://ftp.gnu.org/gnu/bash/bash-3.1-patches/bash31-008 Patch9: ftp://ftp.gnu.org/gnu/bash/bash-3.1-patches/bash31-009 Patch10: ftp://ftp.gnu.org/gnu/bash/bash-3.1-patches/bash31-010 +Patch11: ftp://ftp.gnu.org/gnu/bash/bash-3.1-patches/bash31-011 +Patch12: ftp://ftp.gnu.org/gnu/bash/bash-3.1-patches/bash31-012 +Patch13: ftp://ftp.gnu.org/gnu/bash/bash-3.1-patches/bash31-013 +Patch14: ftp://ftp.gnu.org/gnu/bash/bash-3.1-patches/bash31-014 # Other patches Patch100: bash-2.03-paths.patch Patch101: bash-2.02-security.patch @@ -69,6 +73,10 @@ %patch8 -p0 -b .008 %patch9 -p0 -b .009 %patch10 -p0 -b .010 +%patch11 -p0 -b .011 +%patch12 -p0 -b .012 +%patch13 -p0 -b .013 +%patch14 -p0 -b .014 # Other patches %patch100 -p1 -b .paths @@ -220,6 +228,9 @@ %doc doc/*.ps doc/*.0 doc/*.html doc/article.txt %changelog +* Thu Mar 23 2006 Tim Waugh +- Patchlevel 14. + * Thu Mar 2 2006 Tim Waugh 3.1-9 - Fixed duplicate documentation of ulimit '-x' option introduced by ulimit patch (bug #183596). Index: bash31-010 =================================================================== RCS file: /cvs/dist/rpms/bash/devel/bash31-010,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- bash31-010 21 Feb 2006 10:36:42 -0000 1.1 +++ bash31-010 23 Mar 2006 09:56:51 -0000 1.2 @@ -16,27 +16,137 @@ processed. This patch restores a measure of backwards compatibility while the question of POSIX conformance and ultimately correct behavior is discussed. +THIS IS AN UPDATED PATCH. USE THIS COMMAND TO REVERSE THE EFFECTS OF +THE ORIGINAL PATCH. THE CURRENT DIRECTORY MUST BE THE BASH-3.1 SOURCE +DIRECTORY. + +patch -p0 -R < bash31-010.orig + +Then apply this patch as usual. + Patch: *** ../bash-3.1/parse.y Fri Nov 11 23:14:18 2005 ---- parse.y Wed Jan 25 14:55:18 2006 +--- parse.y Thu Feb 23 08:21:12 2006 +*************** +*** 2716,2721 **** +--- 2723,2729 ---- + #define P_ALLOWESC 0x02 + #define P_DQUOTE 0x04 + #define P_COMMAND 0x08 /* parsing a command, so look for comments */ ++ #define P_BACKQUOTE 0x10 /* parsing a backquoted command substitution */ + + static char matched_pair_error; + static char * +*************** +*** 2725,2736 **** + int *lenp, flags; + { + int count, ch, was_dollar, in_comment, check_comment; +! int pass_next_character, nestlen, ttranslen, start_lineno; + char *ret, *nestret, *ttrans; + int retind, retsize, rflags; + + count = 1; +! pass_next_character = was_dollar = in_comment = 0; + check_comment = (flags & P_COMMAND) && qc != '\'' && qc != '"' && (flags & P_DQUOTE) == 0; + + /* RFLAGS is the set of flags we want to pass to recursive calls. */ +--- 2733,2744 ---- + int *lenp, flags; + { + int count, ch, was_dollar, in_comment, check_comment; +! int pass_next_character, backq_backslash, nestlen, ttranslen, start_lineno; + char *ret, *nestret, *ttrans; + int retind, retsize, rflags; + + count = 1; +! pass_next_character = backq_backslash = was_dollar = in_comment = 0; + check_comment = (flags & P_COMMAND) && qc != '\'' && qc != '"' && (flags & P_DQUOTE) == 0; + + /* RFLAGS is the set of flags we want to pass to recursive calls. */ +*************** +*** 2742,2752 **** + start_lineno = line_number; + while (count) + { +! #if 0 +! ch = shell_getc ((qc != '\'' || (flags & P_ALLOWESC)) && pass_next_character == 0); +! #else +! ch = shell_getc (qc != '\'' && pass_next_character == 0); +! #endif + if (ch == EOF) + { + free (ret); +--- 2750,2757 ---- + start_lineno = line_number; + while (count) + { +! ch = shell_getc (qc != '\'' && pass_next_character == 0 && backq_backslash == 0); +! + if (ch == EOF) + { + free (ret); *************** -*** 2899,2903 **** +*** 2771,2779 **** + continue; + } + /* Not exactly right yet */ +! else if (check_comment && in_comment == 0 && ch == '#' && (retind == 0 || ret[retind-1] == '\n' || whitespace (ret[retind -1]))) + in_comment = 1; + + if (pass_next_character) /* last char was backslash */ + { + pass_next_character = 0; +--- 2776,2791 ---- + continue; + } + /* Not exactly right yet */ +! else if MBTEST(check_comment && in_comment == 0 && ch == '#' && (retind == 0 || ret[retind-1] == '\n' || whitespace (ret[retind - 1]))) + in_comment = 1; + ++ /* last char was backslash inside backquoted command substitution */ ++ if (backq_backslash) ++ { ++ backq_backslash = 0; ++ /* Placeholder for adding special characters */ ++ } ++ + if (pass_next_character) /* last char was backslash */ + { + pass_next_character = 0; +*************** +*** 2814,2819 **** +--- 2824,2831 ---- + { + if MBTEST((flags & P_ALLOWESC) && ch == '\\') + pass_next_character++; ++ else if MBTEST((flags & P_BACKQUOTE) && ch == '\\') ++ backq_backslash++; + continue; + } + +*************** +*** 2898,2904 **** + } else if MBTEST(qc == '`' && (ch == '"' || ch == '\'') && in_comment == 0) { ! nestret = parse_matched_pair (0, ch, ch, &nestlen, rflags); goto add_nestret; } ---- 2901,2909 ---- + else if MBTEST(was_dollar && (ch == '(' || ch == '{' || ch == '[')) /* ) } ] */ +--- 2910,2920 ---- + } else if MBTEST(qc == '`' && (ch == '"' || ch == '\'') && in_comment == 0) { -! /* Add P_ALLOWESC so backslash quotes the next character and +! /* Add P_BACKQUOTE so backslash quotes the next character and ! shell_getc does the right thing with \. We do this for ! a measure of backwards compatibility -- it's not strictly the ! right POSIX thing. */ -! nestret = parse_matched_pair (0, ch, ch, &nestlen, rflags|P_ALLOWESC); +! nestret = parse_matched_pair (0, ch, ch, &nestlen, rflags|P_BACKQUOTE); goto add_nestret; } + else if MBTEST(was_dollar && (ch == '(' || ch == '{' || ch == '[')) /* ) } ] */ *** ../bash-3.1/patchlevel.h Wed Jul 20 13:58:20 2005 --- patchlevel.h Wed Dec 7 13:48:42 2005 *************** From fedora-cvs-commits at redhat.com Thu Mar 23 10:02:04 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 23 Mar 2006 05:02:04 -0500 Subject: rpms/bash/devel bash.spec,1.113,1.114 Message-ID: <200603231002.k2NA24R7011397@cvs.devel.redhat.com> Author: twaugh Update of /cvs/dist/rpms/bash/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv11385 Modified Files: bash.spec Log Message: 3.1-10 Index: bash.spec =================================================================== RCS file: /cvs/dist/rpms/bash/devel/bash.spec,v retrieving revision 1.113 retrieving revision 1.114 diff -u -r1.113 -r1.114 --- bash.spec 23 Mar 2006 09:56:51 -0000 1.113 +++ bash.spec 23 Mar 2006 10:01:51 -0000 1.114 @@ -1,7 +1,7 @@ Version: 3.1 Name: bash Summary: The GNU Bourne Again shell (bash) version %{version}. -Release: 9 +Release: 10 Group: System Environment/Shells License: GPL Url: http://www.gnu.org/software/bash @@ -228,7 +228,7 @@ %doc doc/*.ps doc/*.0 doc/*.html doc/article.txt %changelog -* Thu Mar 23 2006 Tim Waugh +* Thu Mar 23 2006 Tim Waugh 3.1-10 - Patchlevel 14. * Thu Mar 2 2006 Tim Waugh 3.1-9 From fedora-cvs-commits at redhat.com Thu Mar 23 10:11:42 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 23 Mar 2006 05:11:42 -0500 Subject: rpms/cpio/devel cpio-2.6-initHeaderStruct.patch, NONE, 1.1 cpio.spec, 1.36, 1.37 Message-ID: <200603231011.k2NABg79011493@cvs.devel.redhat.com> Author: pvrabec Update of /cvs/dist/rpms/cpio/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv11477 Modified Files: cpio.spec Added Files: cpio-2.6-initHeaderStruct.patch Log Message: init struct file_hdr fix (#186339) cpio-2.6-initHeaderStruct.patch: copyin.c | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE cpio-2.6-initHeaderStruct.patch --- --- cpio-2.6/src/copyin.c.initHeaderStruct 2006-03-23 10:59:31.000000000 +0100 +++ cpio-2.6/src/copyin.c 2006-03-23 10:59:55.000000000 +0100 @@ -1407,7 +1407,7 @@ FILE *tty_out = NULL; /* Interactive file for rename option. */ FILE *rename_in = NULL; /* Batch file for rename option. */ struct stat file_stat; /* Output file stat record. */ - struct new_cpio_header file_hdr; /* Output header information. */ + struct new_cpio_header file_hdr = {0}; /* Output header information. */ int in_file_des; /* Input file descriptor. */ char skip_file; /* Flag for use with patterns. */ int i; /* Loop index variable. */ Index: cpio.spec =================================================================== RCS file: /cvs/dist/rpms/cpio/devel/cpio.spec,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- cpio.spec 15 Mar 2006 16:23:55 -0000 1.36 +++ cpio.spec 23 Mar 2006 10:11:39 -0000 1.37 @@ -6,7 +6,7 @@ Summary: A GNU archiving program. Name: cpio Version: 2.6 -Release: 13 +Release: 14 License: GPL Group: Applications/Archiving URL: http://www.gnu.org/software/cpio/ @@ -21,6 +21,8 @@ Patch20: cpio-2.6-warnings.patch Patch21: cpio-2.6-checksum.patch Patch22: cpio-2.6-writeOutHeaderBufferOverflow.patch +Patch23: cpio-2.6-initHeaderStruct.patch + %ifnos linux Prereq: /sbin/rmt %endif @@ -54,6 +56,7 @@ %patch20 -p1 -b .warnings %patch21 -p1 -b .checksum %patch22 -p1 -b .bufferOverflow +%patch23 -p1 -b .initHeaderStruct autoheader %build @@ -103,6 +106,9 @@ %{_infodir}/*.info* %changelog +* Thu Mar 23 2006 Peter Vrabec 2.6-14 +- init struct file_hdr (#186339) + * Wed Mar 15 2006 Peter Vrabec 2.6-13 - merge toAsciiError.patch with writeOutHeaderBufferOverflow.patch - merge largeFileGrew.patch with lfs.patch From fedora-cvs-commits at redhat.com Thu Mar 23 10:13:09 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 23 Mar 2006 05:13:09 -0500 Subject: rpms/bash/devel bash31-011, NONE, 1.1 bash31-012, NONE, 1.1 bash31-013, NONE, 1.1 bash31-014, NONE, 1.1 Message-ID: <200603231013.k2NAD9S5011560@cvs.devel.redhat.com> Author: twaugh Update of /cvs/dist/rpms/bash/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv11550 Added Files: bash31-011 bash31-012 bash31-013 bash31-014 Log Message: Add the patches. --- NEW FILE bash31-011 --- BASH PATCH REPORT ================= Bash-Release: 3.1 Patch-ID: bash31-011 Bug-Reported-by: Mike Stroyan Bug-Reference-ID: Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2006-01/msg00033.html Bug-Description: A change in bash-3.1 caused the single quotes to be stripped from ANSI-C quoting inside double-quoted command substitutions. Patch: *** ../bash-3.1/parse.y Fri Nov 11 23:14:18 2005 --- parse.y Wed Jan 25 14:55:18 2006 *************** *** 2908,2912 **** count--; if (ch == '(') /* ) */ ! nestret = parse_matched_pair (0, '(', ')', &nestlen, rflags); else if (ch == '{') /* } */ nestret = parse_matched_pair (0, '{', '}', &nestlen, P_FIRSTCLOSE|rflags); --- 2914,2918 ---- count--; if (ch == '(') /* ) */ ! nestret = parse_matched_pair (0, '(', ')', &nestlen, rflags & ~P_DQUOTE); else if (ch == '{') /* } */ nestret = parse_matched_pair (0, '{', '}', &nestlen, P_FIRSTCLOSE|rflags); *** ../bash-3.1/patchlevel.h Wed Jul 20 13:58:20 2005 --- patchlevel.h Wed Dec 7 13:48:42 2005 *************** *** 26,30 **** looks for to find the patch level (for the sccs version string). */ ! #define PATCHLEVEL 10 #endif /* _PATCHLEVEL_H_ */ --- 26,30 ---- looks for to find the patch level (for the sccs version string). */ ! #define PATCHLEVEL 11 #endif /* _PATCHLEVEL_H_ */ --- NEW FILE bash31-012 --- BASH PATCH REPORT ================= Bash-Release: 3.1 Patch-ID: bash31-012 Bug-Reported-by: Alexander Kshevetskiy Bug-Reference-ID: <308374997.20060124175849 at dgap.mipt.ru> Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2006-01/msg00097.html Bug-Description: There is a parsing problem involving parentheses in assignment statements that causes words to be terminated prematurely. Patch: *** ../bash-3.1/parse.y Fri Nov 11 23:14:18 2005 --- parse.y Wed Jan 25 14:55:18 2006 *************** *** 3579,3583 **** all_digit_token = 0; compound_assignment = 1; ! #if 0 goto next_character; #else --- 3584,3588 ---- all_digit_token = 0; compound_assignment = 1; ! #if 1 goto next_character; #else *** ../bash-3.1/patchlevel.h Wed Jul 20 13:58:20 2005 --- patchlevel.h Wed Dec 7 13:48:42 2005 *************** *** 26,30 **** looks for to find the patch level (for the sccs version string). */ ! #define PATCHLEVEL 11 #endif /* _PATCHLEVEL_H_ */ --- 26,30 ---- looks for to find the patch level (for the sccs version string). */ ! #define PATCHLEVEL 12 #endif /* _PATCHLEVEL_H_ */ --- NEW FILE bash31-013 --- BASH PATCH REPORT ================= Bash-Release: 3.1 Patch-ID: bash31-013 Bug-Reported-by: Bob Rossi Bug-Reference-ID: <43F60606.80708 at case.edu> Bug-Reference-URL: Bug-Description: In some cases, readline will reference freed memory when attempting to display a portion of the prompt. Patch: *** ../bash-3.1-patched/lib/readline/readline.c Mon Jul 4 22:29:35 2005 --- lib/readline/readline.c Fri Feb 17 22:54:22 2006 *************** *** 282,287 **** --- 282,288 ---- { FREE (rl_prompt); rl_prompt = prompt ? savestring (prompt) : (char *)NULL; + rl_display_prompt = rl_prompt ? rl_prompt : ""; rl_visible_prompt_length = rl_expand_prompt (rl_prompt); return 0; *** ../bash-3.1/patchlevel.h Wed Jul 20 13:58:20 2005 --- patchlevel.h Wed Dec 7 13:48:42 2005 *************** *** 26,30 **** looks for to find the patch level (for the sccs version string). */ ! #define PATCHLEVEL 12 #endif /* _PATCHLEVEL_H_ */ --- 26,30 ---- looks for to find the patch level (for the sccs version string). */ ! #define PATCHLEVEL 13 #endif /* _PATCHLEVEL_H_ */ --- NEW FILE bash31-014 --- BASH PATCH REPORT ================= Bash-Release: 3.1 Patch-ID: bash31-014 Bug-Reported-by: Mike Stroyan Bug-Reference-ID: <20060203191607.GC27614 at localhost> Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2006-02/msg00004.html Bug-Description: The displayed search prompt is corrupted when using non-incremental searches in vi and emacs mode if the prompt contains non-printing characters or spans multiple lines. The prompt is expanded more than once; the second time without the escape sequences that protect non- printing characters from the length calculations. Patch: *** ../bash-3.1-patched/lib/readline/display.c Wed Nov 30 14:05:02 2005 --- lib/readline/display.c Sat Feb 18 12:14:58 2006 *************** *** 1983,1993 **** int pchar; { int len; ! char *pmt; rl_save_prompt (); ! if (saved_local_prompt == 0) { len = (rl_prompt && *rl_prompt) ? strlen (rl_prompt) : 0; pmt = (char *)xmalloc (len + 2); --- 1998,2012 ---- int pchar; { int len; ! char *pmt, *p; rl_save_prompt (); ! /* We've saved the prompt, and can do anything with the various prompt ! strings we need before they're restored. We want the unexpanded ! portion of the prompt string after any final newline. */ ! p = rl_prompt ? strrchr (rl_prompt, '\n') : 0; ! if (p == 0) { len = (rl_prompt && *rl_prompt) ? strlen (rl_prompt) : 0; pmt = (char *)xmalloc (len + 2); *************** *** 1998,2016 **** } else { ! len = *saved_local_prompt ? strlen (saved_local_prompt) : 0; pmt = (char *)xmalloc (len + 2); if (len) ! strcpy (pmt, saved_local_prompt); pmt[len] = pchar; pmt[len+1] = '\0'; ! local_prompt = savestring (pmt); ! prompt_last_invisible = saved_last_invisible; ! prompt_visible_length = saved_visible_length + 1; ! } prompt_physical_chars = saved_physical_chars + 1; - return pmt; } --- 2017,2033 ---- } else { ! p++; ! len = strlen (p); pmt = (char *)xmalloc (len + 2); if (len) ! strcpy (pmt, p); pmt[len] = pchar; pmt[len+1] = '\0'; ! } + /* will be overwritten by expand_prompt, called from rl_message */ prompt_physical_chars = saved_physical_chars + 1; return pmt; } *** ../bash-3.1/patchlevel.h Wed Jul 20 13:58:20 2005 --- patchlevel.h Wed Dec 7 13:48:42 2005 *************** *** 26,30 **** looks for to find the patch level (for the sccs version string). */ ! #define PATCHLEVEL 13 #endif /* _PATCHLEVEL_H_ */ --- 26,30 ---- looks for to find the patch level (for the sccs version string). */ ! #define PATCHLEVEL 14 #endif /* _PATCHLEVEL_H_ */ From fedora-cvs-commits at redhat.com Thu Mar 23 10:15:44 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 23 Mar 2006 05:15:44 -0500 Subject: rpms/cpio/FC-5 cpio-2.6-initHeaderStruct.patch, NONE, 1.1 cpio.spec, 1.37, 1.38 Message-ID: <200603231015.k2NAFiRt011652@cvs.devel.redhat.com> Author: pvrabec Update of /cvs/dist/rpms/cpio/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv11637 Modified Files: cpio.spec Added Files: cpio-2.6-initHeaderStruct.patch Log Message: init struct file_hdr (#186339) cpio-2.6-initHeaderStruct.patch: copyin.c | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE cpio-2.6-initHeaderStruct.patch --- --- cpio-2.6/src/copyin.c.initHeaderStruct 2006-03-23 10:59:31.000000000 +0100 +++ cpio-2.6/src/copyin.c 2006-03-23 10:59:55.000000000 +0100 @@ -1407,7 +1407,7 @@ FILE *tty_out = NULL; /* Interactive file for rename option. */ FILE *rename_in = NULL; /* Batch file for rename option. */ struct stat file_stat; /* Output file stat record. */ - struct new_cpio_header file_hdr; /* Output header information. */ + struct new_cpio_header file_hdr = {0}; /* Output header information. */ int in_file_des; /* Input file descriptor. */ char skip_file; /* Flag for use with patterns. */ int i; /* Loop index variable. */ Index: cpio.spec =================================================================== RCS file: /cvs/dist/rpms/cpio/FC-5/cpio.spec,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- cpio.spec 22 Mar 2006 10:43:04 -0000 1.37 +++ cpio.spec 23 Mar 2006 10:15:42 -0000 1.38 @@ -6,7 +6,7 @@ Summary: A GNU archiving program. Name: cpio Version: 2.6 -Release: 14.FC5 +Release: 15.FC5 License: GPL Group: Applications/Archiving URL: http://www.gnu.org/software/cpio/ @@ -21,6 +21,8 @@ Patch20: cpio-2.6-warnings.patch Patch21: cpio-2.6-checksum.patch Patch22: cpio-2.6-writeOutHeaderBufferOverflow.patch +Patch23: cpio-2.6-initHeaderStruct.patch + %ifnos linux Prereq: /sbin/rmt %endif @@ -54,6 +56,7 @@ %patch20 -p1 -b .warnings %patch21 -p1 -b .checksum %patch22 -p1 -b .bufferOverflow +%patch23 -p1 -b .initHeaderStruct autoheader %build @@ -103,6 +106,9 @@ %{_infodir}/*.info* %changelog +* Wed Mar 23 2006 Peter Vrabec 2.6-15.FC5 +- init struct file_hdr (#186339) + * Wed Mar 22 2006 Peter Vrabec 2.6-14.FC5 - FC5 update From fedora-cvs-commits at redhat.com Thu Mar 23 10:18:30 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 23 Mar 2006 05:18:30 -0500 Subject: rpms/man-pages-fr/devel man-pages-fr.spec,1.14,1.15 Message-ID: <200603231018.k2NAIUk9025399@cvs.devel.redhat.com> Author: karsten Update of /cvs/dist/rpms/man-pages-fr/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv25386 Modified Files: man-pages-fr.spec Log Message: - remove pages that conflict with vim Index: man-pages-fr.spec =================================================================== RCS file: /cvs/dist/rpms/man-pages-fr/devel/man-pages-fr.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- man-pages-fr.spec 3 Feb 2006 09:07:15 -0000 1.14 +++ man-pages-fr.spec 23 Mar 2006 10:18:28 -0000 1.15 @@ -1,7 +1,7 @@ Summary: French man pages from the Linux Documentation Project. Name: man-pages-fr Version: 0.9.7 -Release: 13 +Release: 14 License: Distributable Group: Documentation Source: ftp://ftp.lip6.fr/pub/linux/french/docs/man-fr-0.9.tar.gz @@ -52,8 +52,8 @@ install -m 644 $i/* $RPM_BUILD_ROOT%{_mandir}/fr/$i; done -# remove these since they conflict with cups and shadow-utils packages -rm -f $RPM_BUILD_ROOT%{_mandir}/fr/man1/{backend.1,filter.1,lp.1,lpoptions.1,lppasswd.1,lpstat.1,chage.1,gpasswd.1,xawtv.1,lpq.1,lpr.1,lprm.1,apropos.1,man.1,whatis.1,newgrp.1,sg.1}* +# remove these since they conflict with cups, vim and shadow-utils packages +rm -f $RPM_BUILD_ROOT%{_mandir}/fr/man1/{backend.1,filter.1,lp.1,lpoptions.1,lppasswd.1,lpstat.1,chage.1,gpasswd.1,xawtv.1,lpq.1,lpr.1,lprm.1,apropos.1,man.1,whatis.1,newgrp.1,sg.1,view.1,rview.1,vim.1,vimdiff.1,vimtutor.1}* rm -f $RPM_BUILD_ROOT%{_mandir}/fr/man3/{cups-config.3,getspnam.3,shadow.3}* rm -f $RPM_BUILD_ROOT%{_mandir}/fr/man5/{classes.conf.5,cupsd.conf.5,mime.convs.5,mime.types.5,printers.conf.5,faillog.5,shadow.5,man.config.5,gshadow.5,login.defs.5}* rm -f $RPM_BUILD_ROOT%{_mandir}/fr/man8/{accept.8,cups-lpd.8,cups-polld.8,cupsaddsmb.8,cupsd.8,enable.8,lpadmin.8,lpc.8,lpinfo.8,lpmove.8,reject.8,adduser.8,chpasswd.8,useradd.8,userdel.8,usermod.8,faillog.8,groupadd.8,groupdel.8,groupmod.8,grpck.8,grpconv.8,grpunconv.8,lastlog.8,newusers.8,pwck.8,pwconv.8,pwunconv.8}* @@ -68,6 +68,9 @@ %{_mandir}/fr/* %changelog +* Thu Mar 23 2006 Karsten Hopp 0.9.7-14 +- remove pages that conflict with vim + * Fri Feb 03 2006 Peter Vrabec - rebuilt From fedora-cvs-commits at redhat.com Thu Mar 23 10:29:43 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 23 Mar 2006 05:29:43 -0500 Subject: rpms/man-pages-it/devel man-pages-it.spec,1.10,1.11 Message-ID: <200603231029.k2NATh9R025535@cvs.devel.redhat.com> Author: karsten Update of /cvs/dist/rpms/man-pages-it/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv25522 Modified Files: man-pages-it.spec Log Message: - remove vim.1, provided by the vim-common package Index: man-pages-it.spec =================================================================== RCS file: /cvs/dist/rpms/man-pages-it/devel/man-pages-it.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- man-pages-it.spec 9 Dec 2005 22:41:56 -0000 1.10 +++ man-pages-it.spec 23 Mar 2006 10:29:41 -0000 1.11 @@ -1,7 +1,7 @@ Summary: Italian man (manual) pages from the Linux Documentation Project Name: man-pages-it Version: 0.3.0 -Release: 16.1 +Release: 17 License: Distributable Group: Documentation URL: http://www.pluto.linux.it/ildp/man/ @@ -42,6 +42,7 @@ rm -f $RPM_BUILD_ROOT%{_mandir}/it/man1/newgrp.1* rm -f $RPM_BUILD_ROOT%{_mandir}/it/man1/{apropos.1,man.1,whatis.1}* +rm -f $RPM_BUILD_ROOT%{_mandir}/it/man1/vim.1* rm -f $RPM_BUILD_ROOT%{_mandir}/it/man5/man.config.5* rm -f $RPM_BUILD_ROOT%{_mandir}/it/man8/makewhatis.8* @@ -55,6 +56,9 @@ %changelog +* Thu Mar 23 2006 Karsten Hopp 0.3.0-17 +- remove vim.1, provided by the vim-common package + * Fri Dec 09 2005 Jesse Keating - rebuilt From fedora-cvs-commits at redhat.com Thu Mar 23 12:33:44 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 23 Mar 2006 07:33:44 -0500 Subject: rpms/cups/devel cups-1.1.15-initscript.patch, 1.4, 1.5 cups-link.patch, 1.2, 1.3 cups.spec, 1.135, 1.136 cups-policy.patch, 1.1, NONE cups-users.patch, 1.1, NONE Message-ID: <200603231233.k2NCXixK016134@cvs.devel.redhat.com> Author: twaugh Update of /cvs/dist/rpms/cups/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv16117 Modified Files: cups-1.1.15-initscript.patch cups-link.patch cups.spec Removed Files: cups-policy.patch cups-users.patch Log Message: * Thu Mar 23 2006 Tim Waugh 1:1.2-0.1.b2.3 - Update to svn snapshot. No longer need users or policy patches. cups-1.1.15-initscript.patch: Makefile | 26 -------------------------- 1 files changed, 26 deletions(-) Index: cups-1.1.15-initscript.patch =================================================================== RCS file: /cvs/dist/rpms/cups/devel/cups-1.1.15-initscript.patch,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- cups-1.1.15-initscript.patch 17 Mar 2006 12:10:57 -0000 1.4 +++ cups-1.1.15-initscript.patch 23 Mar 2006 12:33:24 -0000 1.5 @@ -1,17 +1,11 @@ ---- cups-1.2svn-r5238/Makefile.noinit 2006-03-07 09:37:02.000000000 +0000 -+++ cups-1.2svn-r5238/Makefile 2006-03-07 09:42:51.000000000 +0000 -@@ -1,4 +1,4 @@ --# -+ - # "$Id$" - # - # Top-level Makefile for the Common UNIX Printing System (CUPS). +--- cups-1.2b2/Makefile.noinit 2006-03-23 11:39:33.000000000 +0000 ++++ cups-1.2b2/Makefile 2006-03-23 11:40:22.000000000 +0000 @@ -80,32 +80,6 @@ echo Installing cups-config script... $(INSTALL_DIR) -m 755 $(BINDIR) $(INSTALL_SCRIPT) cups-config $(BINDIR)/cups-config - echo Installing startup script... -- if test "x$(INITDIR)" != "x"; then \ +- if test "x$(INITDIR)" != x; then \ - $(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/init.d; \ - $(INSTALL_SCRIPT) init/cups.sh $(BUILDROOT)$(INITDIR)/init.d/cups; \ - $(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/rc0.d; \ @@ -23,7 +17,7 @@ - $(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/rc5.d; \ - $(INSTALL_SCRIPT) init/cups.sh $(BUILDROOT)$(INITDIR)/rc5.d/S99cups; \ - fi -- if test "x$(INITDIR)" = "x" -a "x$(INITDDIR)" != "x"; then \ +- if test "x$(INITDIR)" = x -a "x$(INITDDIR)" != x; then \ - $(INSTALL_DIR) $(BUILDROOT)$(INITDDIR); \ - if test "$(INITDDIR)" = "/System/Library/StartupItems/PrintingServices"; then \ - $(INSTALL_SCRIPT) init/PrintingServices $(BUILDROOT)$(INITDDIR)/PrintingServices; \ @@ -36,6 +30,6 @@ - $(INSTALL_SCRIPT) init/cups.sh $(BUILDROOT)$(INITDDIR)/cups; \ - fi \ - fi - if test "x$(DBUSDIR)" != "x"; then \ + if test "x$(DBUSDIR)" != x; then \ echo Installing cups.conf in $(DBUSDIR)...;\ $(INSTALL_DIR) -m 755 $(BUILDROOT)$(DBUSDIR); \ cups-link.patch: Makefile | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) Index: cups-link.patch =================================================================== RCS file: /cvs/dist/rpms/cups/devel/cups-link.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- cups-link.patch 25 Jan 2006 17:09:53 -0000 1.2 +++ cups-link.patch 23 Mar 2006 12:33:25 -0000 1.3 @@ -1,11 +1,11 @@ ---- cups-1.1.23/filter/Makefile.lr 2005-10-15 22:58:47.000000000 +0200 -+++ cups-1.1.23/filter/Makefile 2005-10-15 22:59:43.000000000 +0200 -@@ -142,7 +142,7 @@ +--- cups-1.2b2/filter/Makefile.link 2006-03-23 11:42:25.000000000 +0000 ++++ cups-1.2b2/filter/Makefile 2006-03-23 11:43:19.000000000 +0000 +@@ -218,7 +218,7 @@ - libcupsimage.so.2 libcupsimage.sl.2: $(IMAGEOBJS) ../Makedefs + libcupsimage.so.2 libcupsimage.sl.2: $(IMAGEOBJS) echo Linking $@... -- $(DSO) $(DSOFLAGS) -o $@ $(IMAGEOBJS) $(DSOLIBS) -lm -+ $(DSO) $(DSOFLAGS) -o $@ $(IMAGEOBJS) $(DSOLIBS) -lm -L../cups -lcups +- $(DSO) $(ARCHFLAGS) $(DSOFLAGS) -o $@ $(IMAGEOBJS) $(DSOLIBS) -lm ++ $(DSO) $(ARCHFLAGS) $(DSOFLAGS) -o $@ $(IMAGEOBJS) $(DSOLIBS) -lm -L../cups -lcups $(RM) `basename $@ .2` $(LN) $@ `basename $@ .2` Index: cups.spec =================================================================== RCS file: /cvs/dist/rpms/cups/devel/cups.spec,v retrieving revision 1.135 retrieving revision 1.136 diff -u -r1.135 -r1.136 --- cups.spec 17 Mar 2006 12:10:57 -0000 1.135 +++ cups.spec 23 Mar 2006 12:33:25 -0000 1.136 @@ -7,7 +7,7 @@ Summary: Common Unix Printing System Name: cups Version: 1.2 -Release: 0.1.%{beta}.2 +Release: 0.1.%{beta}.3 License: GPL Group: System Environment/Daemons Source: ftp://ftp.easysw.com/pub/cups/test/cups-1.2%{beta}-source.tar.bz2 @@ -21,16 +21,15 @@ Source10: ncp.backend Source11: cups.conf Source12: cups.cron -Patch0: cups-1.1.15-initscript.patch -Patch1: cups-no-gzip-man.patch -Patch2: cups-1.1.16-system-auth.patch -Patch3: cups-1.1.17-backend.patch -Patch4: cups-ext.patch -Patch5: cups-policy.patch -Patch6: cups-users.patch -Patch7: cups-logfileperm.patch -Patch8: cups-1.1.17-rcp.patch -Patch9: cups-1.1.17-ppdsdat.patch +Patch0: cups-1.2svn5322.patch +Patch1: cups-1.1.15-initscript.patch +Patch2: cups-no-gzip-man.patch +Patch3: cups-1.1.16-system-auth.patch +Patch4: cups-1.1.17-backend.patch +Patch5: cups-ext.patch +Patch8: cups-logfileperm.patch +Patch9: cups-1.1.17-rcp.patch +Patch10: cups-1.1.17-ppdsdat.patch Patch12: cups-locale.patch Patch13: cups-CAN-2005-0064.patch Patch16: cups-pie.patch @@ -108,16 +107,15 @@ %prep %setup -q -n %{name}-%{version}%{beta} -%patch0 -p1 -b .noinit -%patch1 -p1 -b .no-gzip-man -%patch2 -p1 -b .system-auth -%patch3 -p1 -b .backend -%patch4 -p1 -b .ext -%patch5 -p1 -b .policy -%patch6 -p1 -b .users -%patch7 -p1 -b .logfileperm -%patch8 -p1 -b .rcp -%patch9 -p1 -b .ppdsdat +%patch0 -p1 -b .svn5322 +%patch1 -p1 -b .noinit +%patch2 -p1 -b .no-gzip-man +%patch3 -p1 -b .system-auth +%patch4 -p1 -b .backend +%patch5 -p1 -b .ext +%patch8 -p1 -b .logfileperm +%patch9 -p1 -b .rcp +%patch10 -p1 -b .ppdsdat %patch12 -p1 -b .locale %patch13 -p1 -b .CAN-2005-0064 %if %build_as_pie @@ -228,6 +226,7 @@ # Remove unshipped files. rm -rf $RPM_BUILD_ROOT%{_mandir}/cat? $RPM_BUILD_ROOT%{_mandir}/*/cat? +rm -f /usr/share/applications/cups.desktop %post @@ -305,6 +304,7 @@ %{_docdir}/cups-%{version}/favicon.ico %{_docdir}/cups-%{version}/images %{_docdir}/cups-%{version}/ja +%{_docdir}/cups-%{version}/es %{_docdir}/cups-%{version}/*.css %{_docdir}/cups-%{version}/admin %{_docdir}/cups-%{version}/classes @@ -315,6 +315,7 @@ %doc %{_docdir}/cups-%{version}/robots.txt %config(noreplace) %{initdir}/cups %{_bindir}/cupstestppd +%{_bindir}/cupstestdsc %{_bindir}/cancel* %{_bindir}/lp* %dir %{cups_serverbin} @@ -368,6 +369,9 @@ %{cups_serverbin}/daemon/cups-lpd %changelog +* Thu Mar 23 2006 Tim Waugh 1:1.2-0.1.b2.3 +- Update to svn snapshot. No longer need users or policy patches. + * Fri Mar 17 2006 Tim Waugh 1:1.2-0.1.b2.2 - Rebuilt. --- cups-policy.patch DELETED --- --- cups-users.patch DELETED --- From fedora-cvs-commits at redhat.com Thu Mar 23 12:34:44 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 23 Mar 2006 07:34:44 -0500 Subject: rpms/selinux-policy-targeted/FC-4 selinux-policy-targeted.spec, 1.363, 1.364 Message-ID: <200603231234.k2NCYiwE016202@cvs.devel.redhat.com> Author: rcoker Update of /cvs/dist/rpms/selinux-policy-targeted/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv16158/selinux-policy-targeted/FC-4 Modified Files: selinux-policy-targeted.spec Log Message: - Allowed amanda_t to access inetd_t TCP sockets and allowed amanda_recover_t to bind to reserved ports. #149030 - Added boolean samba_share_nfs to allow smbd_t full access to NFS mounts. #169947 Index: selinux-policy-targeted.spec =================================================================== RCS file: /cvs/dist/rpms/selinux-policy-targeted/FC-4/selinux-policy-targeted.spec,v retrieving revision 1.363 retrieving revision 1.364 diff -u -r1.363 -r1.364 --- selinux-policy-targeted.spec 14 Mar 2006 18:54:19 -0000 1.363 +++ selinux-policy-targeted.spec 23 Mar 2006 12:34:40 -0000 1.364 @@ -16,6 +16,7 @@ Source1: booleans BuildRoot: %{_tmppath}/%{name}-buildroot Patch1: policy-20050916.patch +Patch2: policy-2006-03.patch BuildArch: noarch BuildRequires: checkpolicy >= %{CHECKPOLICYVER} m4 policycoreutils @@ -41,6 +42,7 @@ %prep %setup -q -n policy-%{version} %patch1 -p1 +%patch2 -p1 %build mv domains/misc/*.te domains/misc/unused @@ -234,6 +236,12 @@ exit 0 %changelog +* Thu Mar 23 2006 Russell Coker 1.27.1-2.28 +- Allowed amanda_t to access inetd_t TCP sockets and allowed amanda_recover_t + to bind to reserved ports. #149030 +- Added boolean samba_share_nfs to allow smbd_t full access to NFS mounts. + #169947 + * Tue Mar 14 2006 Dan Walsh 1.27.1-2.27 - Allow updfstab to getattr on swapfile - Allow ypserv to communicate with ypxfr_t From fedora-cvs-commits at redhat.com Thu Mar 23 12:37:29 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 23 Mar 2006 07:37:29 -0500 Subject: rpms/cups/devel cups-1.2svn5322.patch,NONE,1.1 Message-ID: <200603231237.k2NCbTv8016257@cvs.devel.redhat.com> Author: twaugh Update of /cvs/dist/rpms/cups/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv16225 Added Files: cups-1.2svn5322.patch Log Message: Add the patch. cups-1.2svn5322.patch: CHANGES.txt | 40 CREDITS.txt | 62 Makedefs.in | 39 Makefile | 42 cgi-bin/admin.c | 8 config-scripts/cups-common.m4 | 10 config-scripts/cups-compiler.m4 | 260 ++- config-scripts/cups-defaults.m4 | 6 config-scripts/cups-directories.m4 | 15 config-scripts/cups-image.m4 | 24 configure.in | 23 cups/Dependencies | 189 +- cups/Makefile | 16 cups/adminutil.c | 6 cups/config-scripts/cups-pdf.m4 | 43 cups/desktop/cups-128.png |binary cups/desktop/cups-16.png |binary cups/desktop/cups-32.png |binary cups/desktop/cups-64.png |binary cups/desktop/cups.desktop | 19 cups/doc/es/index.html.in | 146 + cups/file.c | 200 ++ cups/file.h | 9 cups/globals.c | 12 cups/globals.h | 19 cups/http.c | 5 cups/http.h | 6 cups/i18n.h | 39 cups/init/cups-lpd.in | 11 cups/libcups_s.exp | 9 cups/man/cupstestdsc.man | 59 cups/ppd.c | 101 - cups/string.c | 10 cups/systemv/cupstestdsc.c | 447 +++++ cups/templates/es/header.tmpl.in | 63 cups/testi18n.c | 907 +++------- cups/transcode.c | 2013 ++++++++++------------- cups/transcode.h | 127 - data/Makefile | 14 doc/Makefile | 4 doc/help/network.html | 2 doc/help/security.html | 7 filter/Makefile | 20 filter/pstops.c | 3202 ++++++++++++++++++++++--------------- filter/rastertolabel.c | 54 locale/Makefile | 10 locale/cups.pot | 128 - locale/cups_ja.po | 252 +- man/Makefile | 5 man/backend.man | 8 man/cancel.man | 4 man/cups-lpd.man.in | 14 man/lpoptions.man.in | 8 man/lppasswd.man | 8 man/mime.convs.man | 8 packaging/cups.list.in | 51 packaging/cups.spec.in | 47 ppd/zebracpl.ppd | 16 scheduler/auth.c | 138 - scheduler/auth.h | 6 scheduler/banners.c | 141 - scheduler/banners.h | 6 scheduler/cert.c | 7 scheduler/client.c | 864 +++++---- scheduler/client.h | 10 scheduler/conf.c | 6 scheduler/cups-polld.c | 11 scheduler/cupsd.h | 7 scheduler/dirsvc.c | 988 +++++------ scheduler/dirsvc.h | 9 scheduler/env.c | 39 scheduler/ipp.c | 30 scheduler/job.c | 1985 +++++++++++----------- scheduler/job.h | 6 scheduler/main.c | 95 - scheduler/printers.c | 147 - scheduler/printers.h | 7 scheduler/quotas.c | 127 - scheduler/server.c | 5 scheduler/subscriptions.c | 212 +- scheduler/subscriptions.h | 7 scheduler/sysman.c | 36 scheduler/testdirsvc.c | 6 scheduler/testspeed.c | 20 scheduler/util.c | 6 systemv/Dependencies | 27 systemv/Makefile | 23 templates/Makefile | 5 templates/choose-uri.tmpl | 4 templates/ja/admin.tmpl | 7 templates/ja/choose-uri.tmpl | 4 91 files changed, 7694 insertions(+), 6144 deletions(-) --- NEW FILE cups-1.2svn5322.patch --- --- cups-1.2b2/cgi-bin/admin.c 2006-03-08 18:34:07.000000000 +0000 +++ cups/cgi-bin/admin.c 2006-03-22 16:50:34.000000000 +0000 @@ -1,5 +1,5 @@ /* - * "$Id: admin.c 5251 2006-03-08 18:34:07Z mike $" + * "$Id: admin.c 5290 2006-03-14 21:43:57Z mike $" * * Administration CGI for the Common UNIX Printing System (CUPS). * @@ -2624,11 +2624,11 @@ NULL, uri); if (num_users == 0) - ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME, + ippAddString(request, IPP_TAG_PRINTER, IPP_TAG_NAME, "requesting-user-name-allowed", NULL, "all"); else { - attr = ippAddStrings(request, IPP_TAG_OPERATION, IPP_TAG_NAME, + attr = ippAddStrings(request, IPP_TAG_PRINTER, IPP_TAG_NAME, type, num_users, NULL, NULL); for (i = 0, ptr = (char *)users; *ptr; i ++) @@ -2859,5 +2859,5 @@ /* - * End of "$Id: admin.c 5251 2006-03-08 18:34:07Z mike $". + * End of "$Id: admin.c 5290 2006-03-14 21:43:57Z mike $". */ --- cups-1.2b2/CHANGES.txt 2006-03-10 20:18:44.000000000 +0000 +++ cups/CHANGES.txt 2006-03-22 16:50:39.000000000 +0000 @@ -1,6 +1,44 @@ -CHANGES.txt - 2006-03-10 +CHANGES.txt - 2006-03-21 ------------------------ +CHANGES IN CUPS V1.2rc1 + + - Documentation updates (STR #1497) + - Added cupsFileGetLine(), cupsFileStderr(), + cupsFileStdin(), and cupsFileStdout() functions to the + CUPS library. + - Added a new cupstestdsc program to test the DSC + conformance of PostScript files. + - Added KDE/GNOME icons and a Manage Printers menu item. + - Added --enable-image and --enable-pdftops configure + options to control whether the image and PDF filters + are built and installed (default = yes for all + platforms but MacOS X) + - Fixed a minor memory leak in the PPD API. + - Fixed transcoding issues (STR #1493) + - The scheduler now enforces a minimum job cost of 100 + when doing FilterLimit checks. + - The scheduler would leak file descriptors when printing + to raw queues (STR #1491) + - The IPv6 support did not compile on Tru64 UNIX (STR + #1488) + - ppdOpen2() now converts the NickName and all UI text to + UTF-8 (STR #1475) + - The Set Allows Users web page did not work (STR #1486) + - When the default policy was not set or set to a non- + existing policy, the scheduler did not set the default + policy name to "default" (STR #1484) + - The Zebra CPCL driver did not use the correct righthand + margin for the 4" wide label sizes. + - Fixed a problem with the parsing of fractional real + numbers in PPD files. + - Added Spanish localization files (STR #1480) + - Fixed localization of a few scheduler messages (STR + #1478) + - Fixed support for HEAD requests in the scheduler (STR + #1481) + + CHANGES IN CUPS V1.2b2 - Updated the CUPS design description. --- cups-1.2b2/config-scripts/cups-common.m4 2006-03-10 21:18:04.000000000 +0000 +++ cups/config-scripts/cups-common.m4 2006-03-22 16:48:03.000000000 +0000 @@ -1,5 +1,5 @@ dnl -dnl "$Id: cups-common.m4 5229 2006-03-05 16:48:12Z mike $" +dnl "$Id: cups-common.m4 5288 2006-03-14 02:38:07Z mike $" dnl dnl Common configuration stuff for the Common UNIX Printing System (CUPS). dnl @@ -29,8 +29,8 @@ AC_CONFIG_HEADER(config.h) dnl Versio number information... -CUPS_VERSION=1.2b2 -CUPS_REVISION= +CUPS_VERSION="1.2svn" +CUPS_REVISION="" if test -z "$CUPS_REVISION" -a -d .svn; then CUPS_REVISION="-r`svnversion . | awk -F: '{print $NF}' | sed -e '1,$s/[[a-zA-Z]]*//g'`" fi @@ -63,7 +63,7 @@ AC_PATH_PROG(LN,ln) AC_PATH_PROG(MV,mv) AC_PATH_PROG(RM,rm) -AC_PATH_PROG(RM,rmdir) +AC_PATH_PROG(RMDIR,rmdir) AC_PATH_PROG(SED,sed) AC_PATH_PROG(STRIP,strip) @@ -264,5 +264,5 @@ AC_DEFINE_UNQUOTED(CUPS_DEFAULT_IPP_PORT,$DEFAULT_IPP_PORT) dnl -dnl End of "$Id: cups-common.m4 5229 2006-03-05 16:48:12Z mike $". +dnl End of "$Id: cups-common.m4 5288 2006-03-14 02:38:07Z mike $". dnl --- cups-1.2b2/config-scripts/cups-compiler.m4 2006-03-10 20:57:09.000000000 +0000 +++ cups/config-scripts/cups-compiler.m4 2006-03-22 16:48:03.000000000 +0000 @@ -1,5 +1,5 @@ dnl -dnl "$Id: cups-compiler.m4 5274 2006-03-10 20:57:09Z mike $" +dnl "$Id: cups-compiler.m4 5288 2006-03-14 02:38:07Z mike $" dnl dnl Compiler stuff for the Common UNIX Printing System (CUPS). dnl @@ -24,10 +24,13 @@ dnl Clear the debugging and non-shared library options unless the user asks dnl for them... +ARCHFLAGS="" OPTIM="" +AC_SUBST(ARCHFLAGS) AC_SUBST(OPTIM) AC_ARG_WITH(optim, [ --with-optim="flags" set optimization flags ]) +AC_ARG_WITH(archflags, [ --with-arch="flags" set default architecture flags ]) AC_ARG_ENABLE(debug, [ --enable-debug turn on debugging, default=no], [if test x$enable_debug = xyes; then @@ -36,15 +39,16 @@ dnl Setup support for separate 32/64-bit library generation... AC_ARG_ENABLE(32bit, [ --enable-32bit generate 32-bit libraries on 32/64-bit systems, default=no]) +AC_ARG_WITH(arch32flags, [ --with-arch32="flags" specifies 32-bit architecture flags]) -C32FLAGS="" +ARCH32FLAGS="" INSTALL32="" LIB32CUPS="" LIB32CUPSIMAGE="" LIB32DIR="" UNINSTALL32="" -AC_SUBST(C32FLAGS) +AC_SUBST(ARCH32FLAGS) AC_SUBST(INSTALL32) AC_SUBST(LIB32CUPS) AC_SUBST(LIB32CUPSIMAGE) @@ -52,15 +56,16 @@ AC_SUBST(UNINSTALL32) AC_ARG_ENABLE(64bit, [ --enable-64bit generate 64-bit libraries on 32/64-bit systems, default=no]) +AC_ARG_WITH(arch64flags, [ --with-arch64="flags" specifies 64-bit architecture flags]) -C64FLAGS="" +ARCH64FLAGS="" INSTALL64="" LIB64CUPS="" LIB64CUPSIMAGE="" LIB64DIR="" UNINSTALL64="" -AC_SUBST(C64FLAGS) +AC_SUBST(ARCH64FLAGS) AC_SUBST(INSTALL64) AC_SUBST(LIB64CUPS) AC_SUBST(LIB64CUPSIMAGE) @@ -89,16 +94,6 @@ fi case $uname in - Darwin*) - if test "x$with_optim" = x; then - if test "x`uname -m`" = xi386; then - # Build universal binaries for OSX on Intel... - OPTIM="-arch i386 -arch ppc $OPTIM" - DSOFLAGS="-arch i386 -arch ppc $DSOFLAGS" - fi - fi - ;; - Linux*) if test x$enable_pie = xyes; then OPTIM="$OPTIM -fpie" @@ -115,35 +110,75 @@ fi case "$uname" in + Darwin*) + if test -z "$with_archflags"; then + if test "x`uname -m`" = xi386; then [...18872 lines suppressed...] + else if (!strncmp(line, "%%BoundingBox:", 14)) + { + if (strstr(line, "(atend)")) + saw_bounding_box = -1; + else if (sscanf(line + 14, "%d%d%d%d", lbrt + 0, lbrt + 1, lbrt + 2, + lbrt + 3) != 4) + { + if (!status) + _cupsLangPuts(stdout, _("FAIL\n")); + + status ++; + _cupsLangPrintf(stdout, _(" Bad %%%%BoundingBox: on line %d!\n" + " REF: Page 39, %%%%BoundingBox:\n"), + linenum); + } + else + saw_bounding_box = 1; + } + } + else if (saw_begin_prolog && !saw_end_prolog) + { + if (!strncmp(line, "%%EndProlog", 11)) + saw_end_prolog = 1; + } + else if (saw_begin_setup && !saw_end_setup) + { + if (!strncmp(line, "%%EndSetup", 10)) + saw_end_setup = 1; + } + else if (saw_end_comments) + { + if (!strncmp(line, "%%Page:", 7)) + { + if (sscanf(line + 7, "%255s%d", page_label, &page_number) != 2) + { + if (!status) + _cupsLangPuts(stdout, _("FAIL\n")); + + status ++; + _cupsLangPrintf(stdout, _(" Bad %%%%Page: on line %d!\n" + " REF: Page 53, %%%%Page:\n"), + linenum); + } + else + saw_page = 1; + } + else if (!strncmp(line, "%%BeginProlog", 13)) + saw_begin_prolog = 1; + else if (!strncmp(line, "%%BeginSetup", 12)) + saw_begin_setup = 1; + else if (!strncmp(line, "%%BeginDocument:", 16)) + level ++; + else if (!strncmp(line, "%%EndDocument", 13)) + level --; + else if (!strncmp(line, "%%Trailer", 9)) + saw_trailer = 1; + } + + for (i = 0; !binary && i < bytes; i ++) + { + ch = line[i]; + + if ((ch < ' ' || (ch & 0x80)) && ch != '\n' && ch != '\r' && ch != '\t') + binary = 1; + } + } + + if (saw_bounding_box <= 0) + { + if (!status) + _cupsLangPuts(stdout, _("FAIL\n")); + + status ++; + _cupsLangPuts(stdout, _(" Missing or bad %%BoundingBox: comment!\n" + " REF: Page 39, %%BoundingBox:\n")); + } + + if (saw_pages <= 0) + { + if (!status) + _cupsLangPuts(stdout, _("FAIL\n")); + + status ++; + _cupsLangPuts(stdout, _(" Missing or bad %%Pages: comment!\n" + " REF: Page 43, %%Pages:\n")); + } + + if (!saw_end_comments) + { + if (!status) + _cupsLangPuts(stdout, _("FAIL\n")); + + status ++; + _cupsLangPuts(stdout, _(" Missing %%EndComments comment!\n" + " REF: Page 41, %%EndComments\n")); + } + + if (!saw_page) + { + if (!status) + _cupsLangPuts(stdout, _("FAIL\n")); + + status ++; + _cupsLangPuts(stdout, _(" Missing or bad %%Page: comments!\n" + " REF: Page 53, %%Page:\n")); + } + + if (level < 0) + { + if (!status) + _cupsLangPuts(stdout, _("FAIL\n")); + + status ++; + _cupsLangPuts(stdout, _(" Too many %%EndDocument comments!\n")); + } + else if (level > 0) + { + if (!status) + _cupsLangPuts(stdout, _("FAIL\n")); + + status ++; + _cupsLangPuts(stdout, _(" Too many %%BeginDocument comments!\n")); + } + + if (saw_long_line > 1) + _cupsLangPrintf(stderr, + _(" Saw %d lines that exceeded 255 characters!\n"), + saw_long_line); + + if (!status) + _cupsLangPuts(stdout, _("PASS\n")); + + if (binary) + _cupsLangPuts(stdout, _(" Warning: file contains binary data!\n")); + + if (version < 3.0f) + _cupsLangPrintf(stdout, + _(" Warning: obsolete DSC version %.1f in file!\n"), + version); + + if (saw_end_comments < 0) + _cupsLangPuts(stdout, _(" Warning: no %%EndComments comment in file!\n")); + + cupsFileClose(fp); + + return (status); +} + + +/* + * 'usage()' - Show program usage. + */ + +static void +usage(void) +{ + _cupsLangPuts(stdout, + _("Usage: cupstestdsc [options] filename.ps [... filename.ps]\n" + " cupstestdsc [options] -\n" + "\n" + "Options:\n" + "\n" + " -h Show program usage\n" + "\n" + " Note: this program only validates the DSC comments, " + "not the PostScript itself.\n")); + + exit(1); +} + + +/* + * End of "$Id: cupstestdsc.c 5320 2006-03-21 19:03:25Z mike $". + */ --- /dev/null 2006-03-23 09:05:59.575719000 +0000 +++ cups/desktop/cups.desktop 2006-03-22 16:48:17.000000000 +0000 @@ -0,0 +1,19 @@ +[Desktop Entry] +Categories=Application;System;X-Red-Hat-Base; +Comment=CUPS Web Interface +Comment[en_US]=CUPS Web Interface +Encoding=UTF-8 +Exec=htmlview http://localhost:631/ +GenericName= +GenericName[en_US]= +Icon=cups +MimeType= +Name=Manage Printing +Path= +StartupNotify=false +Terminal=false +TerminalOptions= +Type=Application +X-DCOP-ServiceType= +X-KDE-SubstituteUID=false +X-KDE-Username= Binary files /dev/null and cups/desktop/cups-16.png differ Binary files /dev/null and cups/desktop/cups-32.png differ Binary files /dev/null and cups/desktop/cups-64.png differ Binary files /dev/null and cups/desktop/cups-128.png differ From fedora-cvs-commits at redhat.com Thu Mar 23 12:37:54 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 23 Mar 2006 07:37:54 -0500 Subject: rpms/cups/devel cups.spec,1.136,1.137 Message-ID: <200603231237.k2NCbshR016311@cvs.devel.redhat.com> Author: twaugh Update of /cvs/dist/rpms/cups/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv16298 Modified Files: cups.spec Log Message: Fixed typo. Index: cups.spec =================================================================== RCS file: /cvs/dist/rpms/cups/devel/cups.spec,v retrieving revision 1.136 retrieving revision 1.137 diff -u -r1.136 -r1.137 --- cups.spec 23 Mar 2006 12:33:25 -0000 1.136 +++ cups.spec 23 Mar 2006 12:37:52 -0000 1.137 @@ -226,7 +226,7 @@ # Remove unshipped files. rm -rf $RPM_BUILD_ROOT%{_mandir}/cat? $RPM_BUILD_ROOT%{_mandir}/*/cat? -rm -f /usr/share/applications/cups.desktop +rm -f $RPM_BUILD_ROOT%{_datadir}/applications/cups.desktop %post From fedora-cvs-commits at redhat.com Thu Mar 23 12:39:47 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 23 Mar 2006 07:39:47 -0500 Subject: rpms/selinux-policy-targeted/FC-4 policy-2006-03.patch,NONE,1.1 Message-ID: <200603231239.k2NCdloB016403@cvs.devel.redhat.com> Author: rcoker Update of /cvs/dist/rpms/selinux-policy-targeted/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv16389 Added Files: policy-2006-03.patch Log Message: - Allowed amanda_t to access inetd_t TCP sockets and allowed amanda_recover_t to bind to reserved ports. #149030 - Added boolean samba_share_nfs to allow smbd_t full access to NFS mounts. #169947 policy-2006-03.patch: amanda.te | 2 ++ samba.te | 6 ++++++ 2 files changed, 8 insertions(+) --- NEW FILE policy-2006-03.patch --- diff -ru policy-1.27.1.last/domains/program/unused/amanda.te policy-1.27.1/domains/program/unused/amanda.te --- policy-1.27.1.last/domains/program/unused/amanda.te 2006-03-23 20:39:22.000000000 +1100 +++ policy-1.27.1/domains/program/unused/amanda.te 2006-03-23 20:41:13.000000000 +1100 @@ -76,6 +76,7 @@ #################### domain_auto_trans(inetd_t, amanda_inetd_exec_t, amanda_t) +allow amanda_t inetd_t:tcp_socket rw_socket_perms; ################## @@ -211,6 +212,7 @@ ############################################# can_network(amanda_recover_t); +allow amanda_recover_t reserved_port_t:tcp_socket name_bind; allow amanda_recover_t amanda_port_t:tcp_socket name_connect; can_ypbind(amanda_recover_t); read_locale(amanda_recover_t); diff -ru policy-1.27.1.last/domains/program/unused/samba.te policy-1.27.1/domains/program/unused/samba.te --- policy-1.27.1.last/domains/program/unused/samba.te 2006-03-23 20:39:22.000000000 +1100 +++ policy-1.27.1/domains/program/unused/samba.te 2006-03-23 20:50:37.000000000 +1100 @@ -135,6 +135,12 @@ # Support Samba sharing of home directories bool samba_enable_home_dirs false; +# Support Samba sharing of NFS mount points +bool samba_share_nfs false; +if (samba_share_nfs) { +create_dir_file(smbd_t, nfs_t) +} + ifdef(`mount.te', ` # # Domain for running smbmount From fedora-cvs-commits at redhat.com Thu Mar 23 13:07:06 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 23 Mar 2006 08:07:06 -0500 Subject: rpms/vim/devel vim-7.0-crv.patch, NONE, 1.1 vim-7.0-fixkeys.patch, NONE, 1.1 vim-7.0-fstabsyntax.patch, NONE, 1.1 vim-7.0-rclocation.patch, NONE, 1.1 vim-7.0-syntax.patch, NONE, 1.1 .cvsignore, 1.11, 1.12 sources, 1.11, 1.12 vim.spec, 1.100, 1.101 Message-ID: <200603231307.k2ND762C030358@cvs.devel.redhat.com> Author: karsten Update of /cvs/dist/rpms/vim/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv30321 Modified Files: .cvsignore sources vim.spec Added Files: vim-7.0-crv.patch vim-7.0-fixkeys.patch vim-7.0-fstabsyntax.patch vim-7.0-rclocation.patch vim-7.0-syntax.patch Log Message: - Rawhide prerelease build as vim, opposed to vim7 prerelease which could coexist with vim-6 - conflict with older man-pages-{it,fr} packages - cleanup lang stuff vim-7.0-crv.patch: term.c | 1 - 1 files changed, 1 deletion(-) --- NEW FILE vim-7.0-crv.patch --- --- vim70aa/src/term.c.orig 2006-03-14 15:40:15.000000000 +0100 +++ vim70aa/src/term.c 2006-03-14 15:43:54.000000000 +0100 @@ -1284,7 +1284,6 @@ {(int)KS_CWS, "[%dCWS%d]"}, {(int)KS_CWP, "[%dCWP%d]"}, # endif - {(int)KS_CRV, "[CRV]"}, {K_UP, "[KU]"}, {K_DOWN, "[KD]"}, {K_LEFT, "[KL]"}, vim-7.0-fixkeys.patch: term.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) --- NEW FILE vim-7.0-fixkeys.patch --- --- vim70aa/src/term.c.orig 2006-03-01 23:07:55.000000000 +0100 +++ vim70aa/src/term.c 2006-03-14 15:39:12.000000000 +0100 @@ -1008,14 +1008,14 @@ {K_XRIGHT, IF_EB("\033[1;*C", ESC_STR "[1;*C")}, {K_XLEFT, IF_EB("\033[1;*D", ESC_STR "[1;*D")}, /* An extra set of function keys for vt100 mode */ - {K_XF1, IF_EB("\033O*P", ESC_STR "O*P")}, - {K_XF2, IF_EB("\033O*Q", ESC_STR "O*Q")}, - {K_XF3, IF_EB("\033O*R", ESC_STR "O*R")}, - {K_XF4, IF_EB("\033O*S", ESC_STR "O*S")}, - {K_F1, IF_EB("\033[11;*~", ESC_STR "[11;*~")}, - {K_F2, IF_EB("\033[12;*~", ESC_STR "[12;*~")}, - {K_F3, IF_EB("\033[13;*~", ESC_STR "[13;*~")}, - {K_F4, IF_EB("\033[14;*~", ESC_STR "[14;*~")}, + {K_XF1, IF_EB("\033[11~", ESC_STR "[11~")}, + {K_XF2, IF_EB("\033[12~", ESC_STR "[12~")}, + {K_XF3, IF_EB("\033[13~", ESC_STR "[13~")}, + {K_XF4, IF_EB("\033[14~", ESC_STR "[14~")}, + {K_F1, IF_EB("\033OP", ESC_STR "OP")}, + {K_F2, IF_EB("\033OQ", ESC_STR "OQ")}, + {K_F3, IF_EB("\033OR", ESC_STR "OR")}, + {K_F4, IF_EB("\033OS", ESC_STR "OS")}, {K_F5, IF_EB("\033[15;*~", ESC_STR "[15;*~")}, {K_F6, IF_EB("\033[17;*~", ESC_STR "[17;*~")}, {K_F7, IF_EB("\033[18;*~", ESC_STR "[18;*~")}, vim-7.0-fstabsyntax.patch: fstab.vim | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) --- NEW FILE vim-7.0-fstabsyntax.patch --- --- vim70aa/runtime/syntax/fstab.vim.orig 2006-03-14 15:57:25.000000000 +0100 +++ vim70aa/runtime/syntax/fstab.vim 2006-03-14 16:01:05.000000000 +0100 @@ -32,7 +32,7 @@ " Type syn cluster fsTypeCluster contains=fsTypeKeyword,fsTypeError syn match fsTypeError /\s\+\zs\w\+/ contained -syn keyword fsTypeKeyword contained adfs affs auto autofs cd9660 coda cramfs devfs devpts efs ext2 ext3 fdesc hfs hpfs iso9660 kernfs linprocfs mfs minix msdos ncpfs nfs ntfs nwfs null portal proc procfs qnx4 reiserfs romfs smbfs std sysv swap tmpfs udf ufs umap umsdos union usbfs vfat xfs +syn keyword fsTypeKeyword contained adfs affs auto autofs cd9660 coda cramfs devfs devpts efs ext2 ext3 fdesc hfs hpfs iso9660 kernfs linprocfs mfs minix msdos ncpfs nfs ntfs nwfs null portal proc procfs qnx4 reiserfs romfs smbfs std sysfs sysv swap tmpfs udf ufs umap umsdos union usbfs vfat xfs " Options " ------- @@ -44,7 +44,7 @@ syn keyword fsOptionsYesNo yes no syn cluster fsOptionsCheckCluster contains=fsOptionsExt2Check,fsOptionsFatCheck syn keyword fsOptionsSize 512 1024 2048 -syn keyword fsOptionsGeneral async atime auto current defaults dev exec force fstab noatime noauto noclusterr noclusterw nodev noexec nosuid nosymfollow nouser owner ro rdonly rw rq sw xx suid suiddir sync kudzu union update user supermount users loop +syn keyword fsOptionsGeneral async atime auto current defaults dev exec force fstab managed noatime noauto noclusterr noclusterw nodev noexec nosuid nosymfollow nouser owner pamconsole ro rdonly rw rq sw xx suid suiddir sync kudzu union update user supermount users loop syn match fsOptionsGeneral /_netdev/ " Options: adfs vim-7.0-rclocation.patch: os_unix.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) --- NEW FILE vim-7.0-rclocation.patch --- --- vim62/src/os_unix.h.rcloc 2003-08-04 15:38:05.000000000 +0200 +++ vim62/src/os_unix.h 2003-08-04 15:39:25.000000000 +0200 @@ -230,10 +230,10 @@ * Unix system-dependent file names */ #ifndef SYS_VIMRC_FILE -# define SYS_VIMRC_FILE "$VIM/vimrc" +# define SYS_VIMRC_FILE "/etc/vim7rc" #endif #ifndef SYS_GVIMRC_FILE -# define SYS_GVIMRC_FILE "$VIM/gvimrc" +# define SYS_GVIMRC_FILE "/etc/gvim7rc" #endif #ifndef DFLT_HELPFILE # define DFLT_HELPFILE "$VIMRUNTIME/doc/help.txt" vim-7.0-syntax.patch: filetype.vim | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE vim-7.0-syntax.patch --- --- vim70aa/runtime/filetype.vim.orig 2006-03-13 23:15:53.000000000 +0100 +++ vim70aa/runtime/filetype.vim 2006-03-14 15:56:13.000000000 +0100 @@ -103,7 +103,7 @@ " Apache config file au BufNewFile,BufRead .htaccess setf apache -au BufNewFile,BufRead httpd.conf*,srm.conf*,access.conf*,apache.conf*,apache2.conf*,/etc/apache2/*.conf* call s:StarSetf('apache') +au BufNewFile,BufRead httpd.conf*,srm.conf*,access.conf*,apache.conf*,apache2.conf*,/etc/apache2/*.conf* auth_mysql.conf*,auth_pgsql.conf*,ssl.conf*,perl.conf*,php.conf*,python.conf*,squirrelmail.conf* call s:StarSetf('apache') " XA65 MOS6510 cross assembler au BufNewFile,BufRead *.a65 setf a65 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/vim/devel/.cvsignore,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- .cvsignore 17 Oct 2005 13:16:30 -0000 1.11 +++ .cvsignore 23 Mar 2006 13:07:01 -0000 1.12 @@ -1,4 +1,4 @@ +vim-7.0aa-extra.tar.gz +vim-7.0aa-lang.tar.gz +vim-7.0aa.tar.bz2 cvim.zip -vim-6.4-extra.tar.gz -vim-6.4-lang.tar.gz -vim-6.4.tar.bz2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/vim/devel/sources,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- sources 17 Oct 2005 13:15:30 -0000 1.11 +++ sources 23 Mar 2006 13:07:01 -0000 1.12 @@ -1,4 +1,4 @@ +67ac6821f0f61e8dc8384a2c4eaae5d2 vim-7.0aa-extra.tar.gz +1e59128c0c39e2d48c90bb0f7bd76e00 vim-7.0aa-lang.tar.gz +e3466da8a1025093cb93735486d66f8b vim-7.0aa.tar.bz2 1f17af2008ae94359a48be7e865b084f cvim.zip -5f4489776cafcb3588223f79eb26e287 vim-6.4-extra.tar.gz -3cca6128fe5439e89d3828b5e708bddb vim-6.4-lang.tar.gz -774c14d93ce58674b3b2c880edd12d77 vim-6.4.tar.bz2 Index: vim.spec =================================================================== RCS file: /cvs/dist/rpms/vim/devel/vim.spec,v retrieving revision 1.100 retrieving revision 1.101 diff -u -r1.100 -r1.101 --- vim.spec 9 Mar 2006 14:38:51 -0000 1.100 +++ vim.spec 23 Mar 2006 13:07:01 -0000 1.101 @@ -12,20 +12,20 @@ %define withruby 0 %else %define withruby 0 -%define withnetbeans 0 +%define withnetbeans 1 %endif -%define withcvim 1 +%define withcvim 0 -%define baseversion 6.4 -%define vimdir vim64 -%define patchlevel 007 +%define baseversion 7.0aa +%define vimdir vim70aa +%define patchlevel 000 Summary: The VIM editor. Name: vim Version: %{baseversion}.%{patchlevel} -Release: 4 +Release: 3 License: freeware Group: Applications/Editors Source0: ftp://ftp.vim.org/pub/vim/unix/vim-%{baseversion}.tar.bz2 @@ -33,7 +33,7 @@ Source2: ftp://ftp.vim.org/pub/vim/extra/vim-%{baseversion}-extra.tar.gz Source3: gvim.desktop Source4: vimrc -Source5: ftp://ftp.vim.org/pub/vim/patches/README.patches +#Source5: ftp://ftp.vim.org/pub/vim/patches/README.patches Source6: spec.vim Source7: gvim16.png Source8: gvim32.png @@ -41,36 +41,26 @@ Source10: gvim64.png Source11: Changelog.rpm # Source at http://www.vim.org/scripts/script.php?script_id=213 : -Source12: cvim.zip -Patch2000: vim-4.2-speed_t.patch -Patch2001: vim-5.6a-paths.patch -Patch2002: vim-6.0-fixkeys.patch +#Source12: cvim.zip +Patch2002: vim-7.0-fixkeys.patch Patch2003: vim-6.2-specsyntax.patch -Patch2004: vim-6.0r-crv.patch -Patch2005: vim-6.4-tmpfile.patch +Patch2004: vim-7.0-crv.patch Patch2010: xxd-locale.patch # Patches 001 < 999 are patches from the base maintainer. # If you're as lazy as me, generate the list using # for i in `seq 1 14`; do printf "Patch%03d: ftp://ftp.vim.org/pub/vim/patches/6.4/6.4.%03d\n" $i $i; done -#Patch001: ftp://ftp.vim.org/pub/vim/patches/6.4/6.4.001 -Patch002: ftp://ftp.vim.org/pub/vim/patches/6.4/6.4.002 -Patch003: ftp://ftp.vim.org/pub/vim/patches/6.4/6.4.003 -Patch004: ftp://ftp.vim.org/pub/vim/patches/6.4/6.4.004 -Patch005: ftp://ftp.vim.org/pub/vim/patches/6.4/6.4.005 -Patch006: ftp://ftp.vim.org/pub/vim/patches/6.4/6.4.006 -Patch007: ftp://ftp.vim.org/pub/vim/patches/6.4/6.4.007 -Patch3000: vim-6.1-syntax.patch +Patch3000: vim-7.0-syntax.patch Patch3001: vim-6.2-rh1.patch Patch3002: vim-6.1-rh2.patch Patch3003: vim-6.1-rh3.patch -Patch3004: vim-6.2-rclocation.patch +Patch3004: vim-7.0-rclocation.patch Patch3005: vim-6.2-rh4.patch Patch3006: vim-6.2-rh5.patch Patch3007: vim-6.3-dnssyntax.patch -Patch3008: vim-6.4-cvim.patch +#Patch3008: vim-6.4-cvim.patch Patch3009: vim-6.4-checkhl.patch -Patch3010: vim-6.4-fstabsyntax.patch +Patch3010: vim-7.0-fstabsyntax.patch Patch3011: vim-6.4-lib64.patch Patch3100: vim-selinux.patch @@ -99,6 +89,9 @@ %package common Summary: The common files needed by any version of the VIM editor. Group: Applications/Editors +Obsoletes: vim7-common +Conflicts: man-pages-fr < 0.9.7-14 +Conflicts: man-pages-it < 0.3.0-17 %description common VIM (VIsual editor iMproved) is an updated and improved version of the @@ -114,7 +107,8 @@ %package minimal Summary: A minimal version of the VIM editor. Group: Applications/Editors -Obsoletes: vim +Obsoletes: vim +Obsoletes: vim7-minimal %description minimal VIM (VIsual editor iMproved) is an updated and improved version of the @@ -130,10 +124,8 @@ Summary: A version of the VIM editor which includes recent enhancements. Group: Applications/Editors Requires: vim-common = %{epoch}:%{version}-%{release} -#Requires: %(perl -le 'printf("perl >= %vd\n",$^V);') -#Requires: perl >= %(rpm -q --qf "%%{epoch}:%%{version}\n" perl) -Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) Obsoletes: vim-color +Obsoletes: vim7-enhanced %description enhanced VIM (VIsual editor iMproved) is an updated and improved version of the @@ -154,6 +146,7 @@ Requires: vim-common = %{epoch}:%{version}-%{release} libattr BuildRequires: gtk2-devel libSM-devel libXt-devel Prereq: gtk2 >= 2.6 +Obsoletes: vim7-X11 %description X11 VIM (VIsual editor iMproved) is an updated and improved version of the @@ -171,26 +164,16 @@ %prep %setup -q -b 1 -n %{vimdir} cp -f %{SOURCE6} runtime/ftplugin/spec.vim -%patch2000 -p1 # fix rogue dependencies from sample code chmod -x runtime/tools/mve.awk -%patch2001 -p1 %patch2002 -p1 %patch2003 -p1 %patch2004 -p1 -%patch2005 -p1 %patch2010 -p1 perl -pi -e "s,bin/nawk,bin/awk,g" runtime/tools/mve.awk # Base patches... # for i in `seq 1 14`; do printf "%%patch%03d -p0 \n" $i; done -#%patch001 -p0 -%patch002 -p0 -%patch003 -p0 -%patch004 -p0 -%patch005 -p0 -%patch006 -p0 -%patch007 -p0 %patch3000 -p1 @@ -278,7 +261,7 @@ rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT/bin mkdir -p $RPM_BUILD_ROOT/usr/{bin,share/vim} -cp -f %{SOURCE5} . +#cp -f %{SOURCE5} . %if "%{withcvim}" == "1" # cvim plugin stuff: @@ -301,10 +284,10 @@ cd src %makeinstall BINDIR=/bin DESTDIR=$RPM_BUILD_ROOT -mv $RPM_BUILD_ROOT/bin/xxd $RPM_BUILD_ROOT/usr/bin +mv $RPM_BUILD_ROOT/bin/xxd $RPM_BUILD_ROOT/usr/bin/xxd make installmacros DESTDIR=$RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/{16x16,32x32,48x48,64x64}/apps -install -m755 gvim $RPM_BUILD_ROOT/usr/bin +install -m755 gvim $RPM_BUILD_ROOT/usr/bin/gvim install -m644 %{SOURCE7} \ $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps/gvim.png install -m644 %{SOURCE8} \ @@ -316,13 +299,13 @@ install -m755 enhanced-vim $RPM_BUILD_ROOT/usr/bin/vim ( cd $RPM_BUILD_ROOT - mv ./bin/vimtutor ./usr/bin + mv ./bin/vimtutor ./usr/bin/vimtutor mv ./bin/vim ./bin/vi rm -f ./bin/rvim - ln -sf vi ./bin/view ln -sf vi ./bin/ex ln -sf vi ./bin/rvi ln -sf vi ./bin/rview + ln -sf vi ./bin/view ln -sf vim ./usr/bin/ex ln -sf vim ./usr/bin/rvim ln -sf vim ./usr/bin/vimdiff @@ -402,10 +385,7 @@ (cd $RPM_BUILD_ROOT/usr/share/vim/%{vimdir}/doc; gzip -9 *.txt; gzip -d help.txt.gz cat tags | sed -e 's/\t\(.*.txt\)\t/\t\1.gz\t/;s/\thelp.txt.gz\t/\thelp.txt\t/' > tags.new; mv -f tags.new tags) -(cd ../runtime; rm -rf doc; ln -svf ../../vim/%{vimdir}/doc docs; - mv -f macros/README.txt ../README.macros; - mv -f tools/README.txt ../README.tools; -) +(cd ../runtime; rm -rf doc; ln -svf ../../vim/%{vimdir}/doc docs;) %post X11 touch --no-create %{_datadir}/icons/hicolor @@ -428,21 +408,47 @@ %doc README* %doc runtime/docs %doc $RPM_SOURCE_DIR/Changelog.rpm -/usr/share/vim +%dir /usr/share/vim +%dir /usr/share/vim/%{vimdir} +/usr/share/vim/%{vimdir}/autoload +/usr/share/vim/%{vimdir}/colors +/usr/share/vim/%{vimdir}/compiler +/usr/share/vim/%{vimdir}/doc +/usr/share/vim/%{vimdir}/*.vim +/usr/share/vim/%{vimdir}/ftplugin +/usr/share/vim/%{vimdir}/indent +/usr/share/vim/%{vimdir}/keymap +/usr/share/vim/%{vimdir}/lang/*.vim +/usr/share/vim/%{vimdir}/lang/*.txt +/usr/share/vim/%{vimdir}/macros +/usr/share/vim/%{vimdir}/plugin +/usr/share/vim/%{vimdir}/print +/usr/share/vim/%{vimdir}/spell +/usr/share/vim/%{vimdir}/syntax +/usr/share/vim/%{vimdir}/tools +/usr/share/vim/%{vimdir}/tutor %lang(af) /usr/share/vim/%{vimdir}/lang/af/* +%lang(ca) /usr/share/vim/%{vimdir}/lang/ca/* %lang(cs) /usr/share/vim/%{vimdir}/lang/cs/* %lang(de) /usr/share/vim/%{vimdir}/lang/de/* +%lang(en_GB) /usr/share/vim/%{vimdir}/lang/en_GB/* %lang(es) /usr/share/vim/%{vimdir}/lang/es/* %lang(fr) /usr/share/vim/%{vimdir}/lang/fr/* +%lang(ga) /usr/share/vim/%{vimdir}/lang/ga/* %lang(it) /usr/share/vim/%{vimdir}/lang/it/* %lang(ja) /usr/share/vim/%{vimdir}/lang/ja/* %lang(ko) /usr/share/vim/%{vimdir}/lang/ko/* +%lang(no) /usr/share/vim/%{vimdir}/lang/no/* %lang(pl) /usr/share/vim/%{vimdir}/lang/pl/* +%lang(ru) /usr/share/vim/%{vimdir}/lang/ru/* %lang(sk) /usr/share/vim/%{vimdir}/lang/sk/* +%lang(sv) /usr/share/vim/%{vimdir}/lang/sv/* %lang(uk) /usr/share/vim/%{vimdir}/lang/uk/* +%lang(vi) /usr/share/vim/%{vimdir}/lang/vi/* %lang(zh_CN) /usr/share/vim/%{vimdir}/lang/zh_CN/* -%lang(zh_CN.UTF-8) /usr/share/vim/%{vimdir}/lang/zh_CN.UTF-8/* %lang(zh_TW) /usr/share/vim/%{vimdir}/lang/zh_TW/* +%lang(zh_CN.UTF-8) /usr/share/vim/%{vimdir}/lang/zh_CN.UTF-8/* +%lang(zh_TW.UTF-8) /usr/share/vim/%{vimdir}/lang/zh_TW.UTF-8/* /usr/bin/xxd %{_mandir}/man1/vim.* %{_mandir}/man1/ex.* @@ -451,6 +457,9 @@ %{_mandir}/man1/rvi.* %{_mandir}/man1/rview.* %{_mandir}/man1/xxd.* +%lang(fr) %{_mandir}/fr*/* +%lang(it) %{_mandir}/it*/* +%lang(ru) %{_mandir}/ru*/* %files minimal %defattr(-,root,root) @@ -491,6 +500,18 @@ %{_datadir}/icons/hicolor/*/apps/* %changelog +* Wed Mar 22 2006 Karsten Hopp 7.0aa.000-3 +- Rawhide build as vim, opposed to vim7 (prerelease) +- conflict with older man-pages-{it,fr} packages +- cleanup lang stuff + +* Thu Mar 16 2006 Karsten Hopp 7.0aa.000-2 +- make it coexist with vim-6 (temporarily) +- new CVS snapshot + +* Tue Mar 14 2006 Karsten Hopp 7.0aa.000-1 +- vim7 pre Release + * Thu Mar 09 2006 Karsten Hopp 6.4.007-4 - fix configure check for python (#184478) From fedora-cvs-commits at redhat.com Thu Mar 23 13:14:18 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 23 Mar 2006 08:14:18 -0500 Subject: rpms/smartmontools/devel smartd-conf.py, 1.6, 1.7 smartmontools.spec, 1.16, 1.17 Message-ID: <200603231314.k2NDEIf1030499@cvs.devel.redhat.com> Author: tmraz Update of /cvs/dist/rpms/smartmontools/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv30485 Modified Files: smartd-conf.py smartmontools.spec Log Message: * Wed Mar 22 2006 Tomas Mraz - 1:5.33-6 - test SATA drives correctly Index: smartd-conf.py =================================================================== RCS file: /cvs/dist/rpms/smartmontools/devel/smartd-conf.py,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- smartd-conf.py 22 Mar 2006 16:14:08 -0000 1.6 +++ smartd-conf.py 23 Mar 2006 13:14:16 -0000 1.7 @@ -53,7 +53,8 @@ if float(getfile("/sys/module/libata/version")) < 1.20: comment = "# not yet supported in this kernel version\n# " if not comment: - status = os.system("/usr/sbin/smartctl -i /dev/%s 2>&1 >/dev/null" % drive.device) + status = os.system("/usr/sbin/smartctl -i %s/dev/%s 2>&1 >/dev/null" % + (driver, drive.device)) if not os.WIFEXITED(status) or os.WEXITSTATUS(status) != 0: comment = "# smartctl -i returns error for this drive\n# " print "%s/dev/%s %s-H -m root" % (comment, drive.device, driver) Index: smartmontools.spec =================================================================== RCS file: /cvs/dist/rpms/smartmontools/devel/smartmontools.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- smartmontools.spec 22 Mar 2006 16:14:08 -0000 1.16 +++ smartmontools.spec 23 Mar 2006 13:14:16 -0000 1.17 @@ -1,7 +1,7 @@ Summary: Tools for monitoring SMART capable hard disks Name: smartmontools Version: 5.33 -Release: 5 +Release: 6 Epoch: 1 Group: System Environment/Base License: GPL @@ -72,6 +72,9 @@ %changelog +* Wed Mar 22 2006 Tomas Mraz - 1:5.33-6 +- test SATA drives correctly + * Wed Mar 22 2006 Tomas Mraz - 1:5.33-5 - add default /etc/sysconfig/smartmontools file - ignore errors on startup (#186130) From fedora-cvs-commits at redhat.com Thu Mar 23 13:55:18 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 23 Mar 2006 08:55:18 -0500 Subject: rpms/gnome-applet-vm/FC-5 gnome-applet-vm.spec,1.8,1.9 Message-ID: <200603231355.k2NDtIEO025777@cvs.devel.redhat.com> Author: kzak Update of /cvs/dist/rpms/gnome-applet-vm/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv25763 Modified Files: gnome-applet-vm.spec Log Message: fix specfile Index: gnome-applet-vm.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-applet-vm/FC-5/gnome-applet-vm.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- gnome-applet-vm.spec 20 Mar 2006 11:45:00 -0000 1.8 +++ gnome-applet-vm.spec 23 Mar 2006 13:55:16 -0000 1.9 @@ -1,7 +1,7 @@ Summary: Simple virtual domains monitor which embed themselves in the GNOME panel Name: gnome-applet-vm Version: 0.0.7 -Release: 1 +Release: 2 License: GPL Group: User Interface/Desktops Source: gnome-applet-vm-%{version}.tar.bz2 @@ -29,6 +29,7 @@ Requires: xen Requires: libvirt Requires: gnome-panel >= %{gnome_panel_version} +Requires: usermode %description The gnome-applet-vm package provides Panel applet which monitor @@ -83,6 +84,9 @@ %config %{_sysconfdir}/security/console.apps/vm_applet_wrapper %changelog +* Thu Mar 23 2006 Karel Zak 0.0.7-2 +- add dependence on usermode + * Mon Mar 20 2006 Karel Zak 0.0.7-1 - new upstream version From fedora-cvs-commits at redhat.com Thu Mar 23 14:20:06 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 23 Mar 2006 09:20:06 -0500 Subject: rpms/libsetrans/FC-5 libsetrans.spec,1.31,1.32 Message-ID: <200603231420.k2NEK67U007350@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/libsetrans/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv7332 Modified Files: libsetrans.spec Log Message: * Thu Mar 23 2006 Dan Walsh 0.1.20-1.fc5 - Bump for FC5 Index: libsetrans.spec =================================================================== RCS file: /cvs/dist/rpms/libsetrans/FC-5/libsetrans.spec,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- libsetrans.spec 14 Mar 2006 20:14:12 -0000 1.31 +++ libsetrans.spec 23 Mar 2006 14:20:01 -0000 1.32 @@ -1,7 +1,7 @@ Summary: SELinux Translation library Name: libsetrans Version: 0.1.20 -Release: 1 +Release: 1.fc5 License: LGPL Group: System Environment/Libraries Source: %{name}-%{version}.tgz @@ -51,6 +51,9 @@ %{_mandir}/man8/mcs.8.gz %changelog +* Thu Mar 23 2006 Dan Walsh 0.1.20-1.fc5 +- Bump for FC5 + * Mon Mar 13 2006 Dan Walsh 0.1.20-1 - Fix handling of untranslated sensitivities From fedora-cvs-commits at redhat.com Thu Mar 23 14:20:43 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 23 Mar 2006 09:20:43 -0500 Subject: rpms/libglade2/FC-5 libglade-2.5.1-invisible-char.patch, NONE, 1.1 libglade2.spec, 1.21, 1.22 Message-ID: <200603231420.k2NEKhDd007405@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/libglade2/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv7330 Modified Files: libglade2.spec Added Files: libglade-2.5.1-invisible-char.patch Log Message: Fix non-ASCII invisible chars libglade-2.5.1-invisible-char.patch: glade-gtk.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletion(-) --- NEW FILE libglade-2.5.1-invisible-char.patch --- --- libglade-2.5.1/glade/glade-gtk.c.invisible-char 2006-03-23 09:15:52.000000000 -0500 +++ libglade-2.5.1/glade/glade-gtk.c 2006-03-23 09:16:21.000000000 -0500 @@ -421,7 +421,11 @@ entry_set_invisible_char (GladeXML *xml, GtkWidget *w, const gchar *name, const gchar *value) { - gtk_entry_set_invisible_char (GTK_ENTRY (w), value [0]); + gunichar c; + + c = g_utf8_get_char_validated (value, strlen (value)); + if (c > 0) + gtk_entry_set_invisible_char (GTK_ENTRY (w), c); } static void Index: libglade2.spec =================================================================== RCS file: /cvs/dist/rpms/libglade2/FC-5/libglade2.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- libglade2.spec 11 Feb 2006 03:57:11 -0000 1.21 +++ libglade2.spec 23 Mar 2006 14:20:41 -0000 1.22 @@ -5,7 +5,7 @@ Summary: The libglade library for loading user interfaces. Name: libglade2 Version: 2.5.1 -Release: 3.2.1 +Release: 4.fc5.1 License: LGPL Group: System Environment/Libraries Source: libglade-%{version}.tar.bz2 @@ -21,6 +21,8 @@ # http://bugzilla.gnome.org/show_bug.cgi?id=121025 Patch1: libglade-2.0.1-nowarning.patch +# fixed in upstream cvs +Patch2: libglade-2.5.1-invisible-char.patch %description Libglade is a small library that allows a program to load its user @@ -50,6 +52,7 @@ %setup -q -n libglade-%{version} %patch1 -p1 -b .nowarning +%patch2 -p1 -b .invisible-char %build %configure --disable-gtk-doc @@ -85,6 +88,9 @@ %{_datadir}/gtk-doc %changelog +* Thu Mar 23 2006 Matthias Clasen - 2.5.1-4.fc.1 +- Make non-ASCII invisible characters work + * Fri Feb 10 2006 Jesse Keating - 2.5.1-3.2.1 - bump again for double-long bug on ppc(64) From fedora-cvs-commits at redhat.com Thu Mar 23 14:23:24 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 23 Mar 2006 09:23:24 -0500 Subject: rpms/libglade2/devel libglade-2.5.1-invisible-char.patch, NONE, 1.1 libglade2.spec, 1.21, 1.22 Message-ID: <200603231423.k2NENOOY007546@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/libglade2/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv7527 Modified Files: libglade2.spec Added Files: libglade-2.5.1-invisible-char.patch Log Message: Fix non-ASCII invisible chars libglade-2.5.1-invisible-char.patch: glade-gtk.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletion(-) --- NEW FILE libglade-2.5.1-invisible-char.patch --- --- libglade-2.5.1/glade/glade-gtk.c.invisible-char 2006-03-23 09:15:52.000000000 -0500 +++ libglade-2.5.1/glade/glade-gtk.c 2006-03-23 09:16:21.000000000 -0500 @@ -421,7 +421,11 @@ entry_set_invisible_char (GladeXML *xml, GtkWidget *w, const gchar *name, const gchar *value) { - gtk_entry_set_invisible_char (GTK_ENTRY (w), value [0]); + gunichar c; + + c = g_utf8_get_char_validated (value, strlen (value)); + if (c > 0) + gtk_entry_set_invisible_char (GTK_ENTRY (w), c); } static void Index: libglade2.spec =================================================================== RCS file: /cvs/dist/rpms/libglade2/devel/libglade2.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- libglade2.spec 11 Feb 2006 03:57:11 -0000 1.21 +++ libglade2.spec 23 Mar 2006 14:23:22 -0000 1.22 @@ -5,7 +5,7 @@ Summary: The libglade library for loading user interfaces. Name: libglade2 Version: 2.5.1 -Release: 3.2.1 +Release: 5 License: LGPL Group: System Environment/Libraries Source: libglade-%{version}.tar.bz2 @@ -21,6 +21,8 @@ # http://bugzilla.gnome.org/show_bug.cgi?id=121025 Patch1: libglade-2.0.1-nowarning.patch +# fixed in upstream cvs +Patch2: libglade-2.5.1-invisible-char.patch %description Libglade is a small library that allows a program to load its user @@ -50,6 +52,7 @@ %setup -q -n libglade-%{version} %patch1 -p1 -b .nowarning +%patch2 -p1 -b .invisible-char %build %configure --disable-gtk-doc @@ -85,6 +88,9 @@ %{_datadir}/gtk-doc %changelog +* Thu Mar 23 2006 Matthias Clasen - 2.5.1-5 +- Make non-ASCII invisible characters work + * Fri Feb 10 2006 Jesse Keating - 2.5.1-3.2.1 - bump again for double-long bug on ppc(64) From fedora-cvs-commits at redhat.com Thu Mar 23 14:55:01 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 23 Mar 2006 09:55:01 -0500 Subject: rpms/squid/devel squid.spec,1.58,1.59 Message-ID: <200603231455.k2NEt1Kq021531@cvs.devel.redhat.com> Author: stransky Update of /cvs/dist/rpms/squid/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv21517 Modified Files: squid.spec Log Message: removed --with-large-files on 64bit arches Index: squid.spec =================================================================== RCS file: /cvs/dist/rpms/squid/devel/squid.spec,v retrieving revision 1.58 retrieving revision 1.59 diff -u -r1.58 -r1.59 --- squid.spec 13 Mar 2006 09:59:47 -0000 1.58 +++ squid.spec 23 Mar 2006 14:54:58 -0000 1.59 @@ -5,7 +5,7 @@ Summary: The Squid proxy caching server. Name: squid Version: 2.5.STABLE13 -Release: 1 +Release: 2 Epoch: 7 License: GPL Group: System Environment/Daemons @@ -102,7 +102,9 @@ --enable-basic-auth-helpers="LDAP,MSNT,NCSA,PAM,SMB,YP,getpwnam,multi-domain-NTLM,SASL,winbind" \ --enable-cache-digests \ --enable-ident-lookups \ + %ifnarch ppc64 ia64 x86_64 s390x --with-large-files \ + %endif --enable-fd-config \ --enable-follow-x-forwarded-for \ @@ -319,6 +321,9 @@ chgrp squid /var/cache/samba/winbindd_privileged > /dev/null 2>& 1 || true %changelog +* Thu Mar 23 2006 Martin Stransky - 7:2.5.STABLE13-2 +- removed "--with-large-files" on 64bit arches + * Mon Mar 13 2006 Martin Stransky - 7:2.5.STABLE13-1 - update to new upstream From fedora-cvs-commits at redhat.com Thu Mar 23 14:56:56 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 23 Mar 2006 09:56:56 -0500 Subject: rpms/pcmciautils/FC-5 pcmciautils-fedora.patch, 1.3, 1.4 pcmciautils.spec, 1.15, 1.16 Message-ID: <200603231456.k2NEuucQ021596@cvs.devel.redhat.com> Author: harald Update of /cvs/dist/rpms/pcmciautils/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv21580 Modified Files: pcmciautils-fedora.patch pcmciautils.spec Log Message: - version 012 fixes #186164 pcmciautils-fedora.patch: Makefile | 24 +++++++----------------- udev/rules-base | 4 ++-- udev/rules-modprobe | 4 +--- 3 files changed, 10 insertions(+), 22 deletions(-) Index: pcmciautils-fedora.patch =================================================================== RCS file: /cvs/dist/rpms/pcmciautils/FC-5/pcmciautils-fedora.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- pcmciautils-fedora.patch 13 Dec 2005 21:05:17 -0000 1.3 +++ pcmciautils-fedora.patch 23 Mar 2006 14:56:54 -0000 1.4 @@ -1,18 +1,43 @@ ---- pcmciautils-005/Makefile.foo 2005-07-08 22:03:40.000000000 -0400 -+++ pcmciautils-005/Makefile 2005-07-08 22:05:02.000000000 -0400 -@@ -96,8 +96,7 @@ - GCC_LIB := $(shell $(CC) -print-libgcc-file-name ) - - # use '-Os' optimization if available, else use -O2 --OPTIMIZATION := ${shell if $(CC) -Os -S -o /dev/null -xc /dev/null >/dev/null 2>&1; \ -- then echo "-Os"; else echo "-O2" ; fi} -+OPTIMIZATION := $(RPM_OPT_FLAGS) - - # check if compiler option is supported - cc-supports = ${shell if $(CC) ${1} -S -o /dev/null -xc /dev/null > /dev/null 2>&1; then echo "$(1)"; fi;} -@@ -134,24 +133,12 @@ - LIB_PCI_OBJS = -lc -lpci - #LDFLAGS = +--- pcmciautils-012/udev/rules-modprobe.fedora 2006-03-23 15:53:00.000000000 +0100 ++++ pcmciautils-012/udev/rules-modprobe 2006-03-23 15:54:14.000000000 +0100 +@@ -1,3 +1 @@ +-# modprobe $modalias loads all possibly appropriate modules +-ACTION=="add", SUBSYSTEM=="pcmcia", MODALIAS=="?*", \ +- RUN+="/sbin/modprobe $modalias" ++# modprobe done by general rule in 50-udev.rules +--- pcmciautils-012/udev/rules-base.fedora 2006-03-23 15:53:00.000000000 +0100 ++++ pcmciautils-012/udev/rules-base 2006-03-23 15:53:23.000000000 +0100 +@@ -3,12 +3,12 @@ + # are so broken that we need to read out random bytes of it + # instead of the manufactor, card or product ID. Then the + # matching is done in userspace. +-ACTION=="add", SUBSYSTEM=="pcmcia", MODALIAS=="?*", \ ++ACTION=="add", SUBSYSTEM=="pcmcia", ENV{MODALIAS}=="?*", \ + RUN+="/sbin/pcmcia-check-broken-cis" + + # However, the "weak" matching by func_id is only allowed _after_ modprobe + # returns, so that "strong" matches have a higher priority. +-ACTION=="add", SUBSYSTEM=="pcmcia", MODALIAS=="?*", \ ++ACTION=="add", SUBSYSTEM=="pcmcia", ENV{MODALIAS}=="?*", \ + RUN+="/bin/sh -c 'echo 1 > /sys/$devpath/allow_func_id_match'" + + # PCMCIA sockets: +--- pcmciautils-012/Makefile.fedora 2005-12-18 15:20:06.000000000 +0100 ++++ pcmciautils-012/Makefile 2006-03-23 15:51:11.000000000 +0100 +@@ -143,8 +143,8 @@ + + CFLAGS += $(WARNINGS) -I$(GCCINCDIR) + +-LIB_OBJS = -lc -lsysfs +-LIB_PCI_OBJS = -lc -lpci ++LIB_OBJS = -Wl,-Bstatic -lsysfs -Wl,-Bdynamic ++LIB_PCI_OBJS = -lpci + + ifeq ($(strip $(STATIC)),true) + LIB_OBJS = -lsysfs +@@ -154,22 +154,12 @@ + LDFLAGS += -Wl,-warn-common + endif -ifeq ($(strip $(V)),false) - QUIET=@$(PWD)/build/ccdv @@ -27,38 +52,14 @@ -# if DEBUG is enabled, then we do not strip or optimize -ifeq ($(strip $(DEBUG)),true) - CFLAGS += -O1 -g -DDEBUG -D_GNU_SOURCE -- LDFLAGS += -Wl,-warn-common - STRIPCMD = /bin/true -Since_we_are_debugging -else - CFLAGS += $(OPTIMIZATION) -fomit-frame-pointer -D_GNU_SOURCE -- LDFLAGS += -s -Wl,-warn-common - STRIPCMD = $(STRIP) -s --remove-section=.note --remove-section=.comment -endif +CFLAGS += $(OPTIMIZATION) -D_GNU_SOURCE +LDFLAGS += -Wl,-warn-common +STRIPCMD = /bin/true - # if STARTUP is disabled, we can skip a few things - ifeq ($(strip $(STARTUP)),false) -@@ -165,7 +152,7 @@ - endif - - --all: ccdv $(PCCARDCTL) $(PCMCIA_CHECK_BROKEN_CIS) $(PCMCIA_SOCKET_STARTUP_BUILD) udevrules -+all: $(PCCARDCTL) $(PCMCIA_CHECK_BROKEN_CIS) $(PCMCIA_SOCKET_STARTUP_BUILD) udevrules - - ccdv: - @echo "Building ccdv" ---- pcmciautils-006/Makefile.foo 2005-07-20 17:25:13.000000000 -0400 -+++ pcmciautils-006/Makefile 2005-07-20 17:28:02.000000000 -0400 -@@ -129,8 +129,8 @@ - - #LIBC = - CFLAGS += $(WARNINGS) -I$(GCCINCDIR) --LIB_OBJS = -lc -lsysfs --LIB_PCI_OBJS = -lc -lpci -+LIB_OBJS = -Wl,-Bstatic -lsysfs -Wl,-Bdynamic -+LIB_PCI_OBJS = -lpci - #LDFLAGS = - - QUIET= + # HOTPLUG or UDEV? + ifeq ($(strip $(UDEV)),false) Index: pcmciautils.spec =================================================================== RCS file: /cvs/dist/rpms/pcmciautils/FC-5/pcmciautils.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- pcmciautils.spec 11 Feb 2006 04:57:29 -0000 1.15 +++ pcmciautils.spec 23 Mar 2006 14:56:54 -0000 1.16 @@ -1,8 +1,8 @@ Name: pcmciautils Summary: PCMCIA utilities and initialization programs License: GPL -Version: 011 -Release: 1.2 +Version: 012 +Release: 0.FC5.1 Group: System Environment/Base ExclusiveArch: i386 x86_64 ia64 ppc ppc64 Source: http://www.kernel.org/pub/linux/utils/kernel/pcmcia/pcmciautils-%{version}.tar.bz2 @@ -20,7 +20,7 @@ %prep %setup -q # Fix build peculiarities -%patch1 -p1 +%patch1 -p1 -b .fedora %build make @@ -40,6 +40,9 @@ %{_mandir}/man*/* %changelog +* Thu Mar 23 2006 Harald Hoyer 012-1 +- version 012 fixes #186164 + * Fri Feb 10 2006 Jesse Keating - 011-1.2 - bump again for double-long bug on ppc(64) @@ -65,4 +68,4 @@ - link libsysfs statically * Fri Jul 08 2005 Bill Nottingham 005-1 -- initial packaging \ No newline at end of file +- initial packaging From fedora-cvs-commits at redhat.com Thu Mar 23 14:57:37 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 23 Mar 2006 09:57:37 -0500 Subject: rpms/pcmciautils/FC-5 .cvsignore,1.5,1.6 sources,1.5,1.6 Message-ID: <200603231457.k2NEvbDd021632@cvs.devel.redhat.com> Author: harald Update of /cvs/dist/rpms/pcmciautils/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv21618 Modified Files: .cvsignore sources Log Message: - version 012 fixes #186164 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/pcmciautils/FC-5/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 13 Dec 2005 21:05:17 -0000 1.5 +++ .cvsignore 23 Mar 2006 14:57:34 -0000 1.6 @@ -1 +1 @@ -pcmciautils-011.tar.bz2 +pcmciautils-012.tar.bz2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/pcmciautils/FC-5/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 13 Dec 2005 21:05:17 -0000 1.5 +++ sources 23 Mar 2006 14:57:34 -0000 1.6 @@ -1 +1 @@ -8a7a014ea8177cf4514032722b695a9e pcmciautils-011.tar.bz2 +1a5cc640c389660cb23ed4aaf306cf82 pcmciautils-012.tar.bz2 From fedora-cvs-commits at redhat.com Thu Mar 23 15:06:43 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 23 Mar 2006 10:06:43 -0500 Subject: rpms/openoffice.org/devel workspace.atkbridge.patch,1.8,1.9 Message-ID: <200603231506.k2NF6hXU021812@cvs.devel.redhat.com> Author: caolanm Update of /cvs/dist/rpms/openoffice.org/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv21794 Modified Files: workspace.atkbridge.patch Log Message: update atkbridge workspace.atkbridge.patch: desktop/scripts/soffice.sh | 4 graphics/svx/source/accessibility/AccessibleContextBase.cxx | 1 graphics/svx/source/accessibility/AccessibleControlShape.cxx | 1 graphics/svx/source/accessibility/AccessibleEditableTextPara.cxx | 1 graphics/svx/source/accessibility/AccessibleFrameSelector.cxx | 3 graphics/svx/source/accessibility/AccessibleImageBullet.cxx | 1 graphics/svx/source/accessibility/GraphCtlAccessibleContext.cxx | 1 graphics/svx/source/accessibility/charmapacc.cxx | 8 graphics/svx/source/accessibility/svxrectctaccessiblecontext.cxx | 2 gsl/fpicker/source/unx/gnome/FPentry.cxx | 3 gsl/toolkit/source/awt/accessiblemenubasecomponent.cxx | 15 gsl/toolkit/source/awt/accessiblemenucomponent.cxx | 3 gsl/toolkit/source/awt/accessiblemenuitemcomponent.cxx | 3 gsl/toolkit/source/awt/vclxaccessiblecomponent.cxx | 10 gsl/toolkit/source/awt/vclxaccessiblelistitem.cxx | 1 gsl/toolkit/source/awt/vclxaccessiblemenuitem.cxx | 8 gsl/toolkit/source/awt/vclxaccessiblestatusbaritem.cxx | 1 gsl/toolkit/source/awt/vclxaccessibletabpage.cxx | 1 gsl/toolkit/source/awt/vclxaccessibletoolboxitem.cxx | 19 gsl/toolkit/source/awt/vclxwindow.cxx | 80 gsl/vcl/inc/menu.hxx | 3 gsl/vcl/inc/svapp.hxx | 2 gsl/vcl/prj/build.lst | 3 gsl/vcl/source/app/svapp.cxx | 14 gsl/vcl/source/window/menu.cxx | 35 gsl/vcl/unx/gtk/a11y/TODO | 49 gsl/vcl/unx/gtk/a11y/atkaction.cxx | 287 +++ gsl/vcl/unx/gtk/a11y/atkbridge.cxx | 56 gsl/vcl/unx/gtk/a11y/atkcomponent.cxx | 397 ++++ gsl/vcl/unx/gtk/a11y/atkeditabletext.cxx | 207 ++ gsl/vcl/unx/gtk/a11y/atkfactory.cxx | 168 ++ gsl/vcl/unx/gtk/a11y/atkfactory.hxx | 49 gsl/vcl/unx/gtk/a11y/atkhypertext.cxx | 295 +++ gsl/vcl/unx/gtk/a11y/atkimage.cxx | 144 + gsl/vcl/unx/gtk/a11y/atklistener.cxx | 474 +++++ gsl/vcl/unx/gtk/a11y/atklistener.hxx | 92 + gsl/vcl/unx/gtk/a11y/atkselection.cxx | 200 ++ gsl/vcl/unx/gtk/a11y/atktable.cxx | 737 ++++++++ gsl/vcl/unx/gtk/a11y/atktext.cxx | 547 ++++++ gsl/vcl/unx/gtk/a11y/atktextattributes.cxx | 572 ++++++ gsl/vcl/unx/gtk/a11y/atktextattributes.hxx | 60 gsl/vcl/unx/gtk/a11y/atkutil.cxx | 625 +++++++ gsl/vcl/unx/gtk/a11y/atkutil.hxx | 45 gsl/vcl/unx/gtk/a11y/atkvalue.cxx | 152 + gsl/vcl/unx/gtk/a11y/atkwindow.cxx | 145 + gsl/vcl/unx/gtk/a11y/atkwindow.hxx | 45 gsl/vcl/unx/gtk/a11y/atkwrapper.cxx | 819 ++++++++++ gsl/vcl/unx/gtk/a11y/atkwrapper.hxx | 125 + gsl/vcl/unx/gtk/a11y/makefile.mk | 96 + gsl/vcl/unx/gtk/app/gtkinst.cxx | 42 gsl/vcl/unx/gtk/window/gtkframe.cxx | 142 + gsl/vcl/unx/inc/plugins/gtk/atkbridge.hxx | 45 gsl/vcl/unx/inc/plugins/gtk/gtkframe.hxx | 16 gsl/vcl/util/makefile.mk | 2 util/comphelper/source/misc/accessiblewrapper.cxx | 6 util/svtools/source/Accessibility/accessibleiconchoicectrlentry.cxx | 1 util/svtools/source/Accessibility/accessiblelistboxentry.cxx | 1 util/svtools/source/Accessibility/accessibletabbar.cxx | 9 util/svtools/source/Accessibility/accessibletabbarpage.cxx | 21 util/svtools/source/Accessibility/accessibletabbarpagelist.cxx | 31 util/svtools/source/Accessibility/accessibletablistboxtable.cxx | 19 util/svtools/source/brwbox/brwbox3.cxx | 3 util/svtools/source/contnr/svtabbx.cxx | 3 util/svtools/source/control/valueacc.cxx | 2 util/svtools/source/edit/textwindowaccessibility.cxx | 2 65 files changed, 6837 insertions(+), 117 deletions(-) Index: workspace.atkbridge.patch =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/devel/workspace.atkbridge.patch,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- workspace.atkbridge.patch 22 Mar 2006 11:53:38 -0000 1.8 +++ workspace.atkbridge.patch 23 Mar 2006 15:06:09 -0000 1.9 @@ -211,7 +211,7 @@ MenuBarWindow::MenuBarWindow( Window* pParent ) : Index: gsl/vcl/unx/gtk/a11y/TODO diff -u /dev/null gsl/vcl/unx/gtk/a11y/TODO:1.1.2.6 ---- /dev/null Wed Mar 22 02:53:44 2006 +--- /dev/null Thu Mar 23 06:49:08 2006 +++ gsl/vcl/unx/gtk/a11y/TODO Tue May 31 07:08:21 2005 @@ -0,0 +1,49 @@ +cws 'atkbridge' @@ -265,7 +265,7 @@ + + tooltips create new toplevels with broken roles. Index: gsl/vcl/unx/gtk/a11y/atkaction.cxx diff -u /dev/null gsl/vcl/unx/gtk/a11y/atkaction.cxx:1.1.2.7 ---- /dev/null Wed Mar 22 02:53:44 2006 +--- /dev/null Thu Mar 23 06:49:08 2006 +++ gsl/vcl/unx/gtk/a11y/atkaction.cxx Wed Feb 15 02:59:20 2006 @@ -0,0 +1,287 @@ +/************************************************************************* @@ -557,7 +557,7 @@ +} Index: gsl/vcl/unx/gtk/a11y/atkbridge.cxx diff -u /dev/null gsl/vcl/unx/gtk/a11y/atkbridge.cxx:1.1.2.2 ---- /dev/null Wed Mar 22 02:53:44 2006 +--- /dev/null Thu Mar 23 06:49:08 2006 +++ gsl/vcl/unx/gtk/a11y/atkbridge.cxx Wed Feb 15 02:59:21 2006 @@ -0,0 +1,56 @@ +/************************************************************************* @@ -618,7 +618,7 @@ + Index: gsl/vcl/unx/gtk/a11y/atkcomponent.cxx diff -u /dev/null gsl/vcl/unx/gtk/a11y/atkcomponent.cxx:1.1.2.8 ---- /dev/null Wed Mar 22 02:53:44 2006 +--- /dev/null Thu Mar 23 06:49:08 2006 +++ gsl/vcl/unx/gtk/a11y/atkcomponent.cxx Wed Feb 15 02:58:57 2006 @@ -0,0 +1,397 @@ +/************************************************************************* @@ -1020,7 +1020,7 @@ +} Index: gsl/vcl/unx/gtk/a11y/atkeditabletext.cxx diff -u /dev/null gsl/vcl/unx/gtk/a11y/atkeditabletext.cxx:1.1.2.7 ---- /dev/null Wed Mar 22 02:53:44 2006 +--- /dev/null Thu Mar 23 06:49:08 2006 +++ gsl/vcl/unx/gtk/a11y/atkeditabletext.cxx Wed Feb 15 02:59:21 2006 @@ -0,0 +1,207 @@ +/************************************************************************* @@ -1231,10 +1231,10 @@ + iface->set_run_attributes = editable_text_wrapper_set_run_attributes; +} Index: gsl/vcl/unx/gtk/a11y/atkfactory.cxx -diff -u /dev/null gsl/vcl/unx/gtk/a11y/atkfactory.cxx:1.1.2.9 ---- /dev/null Wed Mar 22 02:53:44 2006 -+++ gsl/vcl/unx/gtk/a11y/atkfactory.cxx Wed Feb 15 02:59:22 2006 -@@ -0,0 +1,166 @@ +diff -u /dev/null gsl/vcl/unx/gtk/a11y/atkfactory.cxx:1.1.2.10 +--- /dev/null Thu Mar 23 06:49:08 2006 ++++ gsl/vcl/unx/gtk/a11y/atkfactory.cxx Thu Mar 23 06:45:26 2006 +@@ -0,0 +1,168 @@ +/************************************************************************* + * + * OpenOffice.org - a multi-platform office productivity suite @@ -1361,7 +1361,9 @@ + GtkSalFrame* pFrame = GtkSalFrame::getFromWindow( GTK_WINDOW( parent_widget ) ); + g_return_val_if_fail( pFrame != NULL, NULL ); + -+ AtkObject* parent_accessible = gtk_widget_get_accessible(parent_widget); ++ AtkObject* parent_accessible = (AtkObject *) g_object_get_data(G_OBJECT( parent_widget ), "Accessible"); ++ if( ! parent_accessible ) ++ parent_accessible = gtk_widget_get_accessible(parent_widget); + + uno::Reference< accessibility::XAccessible > xAccessible(pFrame->getAccessible( true )); + @@ -1403,7 +1405,7 @@ + Index: gsl/vcl/unx/gtk/a11y/atkfactory.hxx diff -u /dev/null gsl/vcl/unx/gtk/a11y/atkfactory.hxx:1.1.2.1 ---- /dev/null Wed Mar 22 02:53:44 2006 +--- /dev/null Thu Mar 23 06:49:08 2006 +++ gsl/vcl/unx/gtk/a11y/atkfactory.hxx Thu Jan 5 06:06:31 2006 @@ -0,0 +1,49 @@ +/************************************************************************* @@ -1457,7 +1459,7 @@ +#endif Index: gsl/vcl/unx/gtk/a11y/atkhypertext.cxx diff -u /dev/null gsl/vcl/unx/gtk/a11y/atkhypertext.cxx:1.1.2.9 ---- /dev/null Wed Mar 22 02:53:44 2006 +--- /dev/null Thu Mar 23 06:49:08 2006 +++ gsl/vcl/unx/gtk/a11y/atkhypertext.cxx Tue Mar 7 00:49:02 2006 @@ -0,0 +1,295 @@ +/************************************************************************* @@ -1757,7 +1759,7 @@ +} Index: gsl/vcl/unx/gtk/a11y/atkimage.cxx diff -u /dev/null gsl/vcl/unx/gtk/a11y/atkimage.cxx:1.1.2.4 ---- /dev/null Wed Mar 22 02:53:44 2006 +--- /dev/null Thu Mar 23 06:49:08 2006 +++ gsl/vcl/unx/gtk/a11y/atkimage.cxx Wed Feb 15 02:59:23 2006 @@ -0,0 +1,144 @@ +/************************************************************************* @@ -1906,7 +1908,7 @@ +} Index: gsl/vcl/unx/gtk/a11y/atklistener.cxx diff -u /dev/null gsl/vcl/unx/gtk/a11y/atklistener.cxx:1.1.2.17 ---- /dev/null Wed Mar 22 02:53:44 2006 +--- /dev/null Thu Mar 23 06:49:08 2006 +++ gsl/vcl/unx/gtk/a11y/atklistener.cxx Wed Mar 1 04:00:16 2006 @@ -0,0 +1,474 @@ +/************************************************************************* @@ -2385,7 +2387,7 @@ +} Index: gsl/vcl/unx/gtk/a11y/atklistener.hxx diff -u /dev/null gsl/vcl/unx/gtk/a11y/atklistener.hxx:1.1.2.7 ---- /dev/null Wed Mar 22 02:53:44 2006 +--- /dev/null Thu Mar 23 06:49:08 2006 +++ gsl/vcl/unx/gtk/a11y/atklistener.hxx Wed Feb 15 02:59:24 2006 @@ -0,0 +1,92 @@ +/************************************************************************* @@ -2482,7 +2484,7 @@ + Index: gsl/vcl/unx/gtk/a11y/atkselection.cxx diff -u /dev/null gsl/vcl/unx/gtk/a11y/atkselection.cxx:1.1.2.6 ---- /dev/null Wed Mar 22 02:53:44 2006 +--- /dev/null Thu Mar 23 06:49:08 2006 +++ gsl/vcl/unx/gtk/a11y/atkselection.cxx Wed Feb 15 02:59:24 2006 @@ -0,0 +1,200 @@ +/************************************************************************* @@ -2687,7 +2689,7 @@ +} Index: gsl/vcl/unx/gtk/a11y/atktable.cxx diff -u /dev/null gsl/vcl/unx/gtk/a11y/atktable.cxx:1.1.2.7 ---- /dev/null Wed Mar 22 02:53:44 2006 +--- /dev/null Thu Mar 23 06:49:08 2006 +++ gsl/vcl/unx/gtk/a11y/atktable.cxx Wed Feb 15 02:58:28 2006 @@ -0,0 +1,737 @@ +/************************************************************************* @@ -3429,7 +3431,7 @@ +} Index: gsl/vcl/unx/gtk/a11y/atktext.cxx diff -u /dev/null gsl/vcl/unx/gtk/a11y/atktext.cxx:1.1.2.12 ---- /dev/null Wed Mar 22 02:53:44 2006 +--- /dev/null Thu Mar 23 06:49:08 2006 +++ gsl/vcl/unx/gtk/a11y/atktext.cxx Wed Feb 15 02:59:25 2006 @@ -0,0 +1,547 @@ +/************************************************************************* @@ -3981,7 +3983,7 @@ +} Index: gsl/vcl/unx/gtk/a11y/atktextattributes.cxx diff -u /dev/null gsl/vcl/unx/gtk/a11y/atktextattributes.cxx:1.1.2.2 ---- /dev/null Wed Mar 22 02:53:44 2006 +--- /dev/null Thu Mar 23 06:49:08 2006 +++ gsl/vcl/unx/gtk/a11y/atktextattributes.cxx Tue Feb 14 04:42:40 2006 @@ -0,0 +1,572 @@ +/************************************************************************* @@ -4558,7 +4560,7 @@ + Index: gsl/vcl/unx/gtk/a11y/atktextattributes.hxx diff -u /dev/null gsl/vcl/unx/gtk/a11y/atktextattributes.hxx:1.1.2.1 ---- /dev/null Wed Mar 22 02:53:44 2006 +--- /dev/null Thu Mar 23 06:49:08 2006 +++ gsl/vcl/unx/gtk/a11y/atktextattributes.hxx Thu Dec 22 00:24:30 2005 @@ -0,0 +1,60 @@ +/************************************************************************* @@ -4623,7 +4625,7 @@ +#endif Index: gsl/vcl/unx/gtk/a11y/atkutil.cxx diff -u /dev/null gsl/vcl/unx/gtk/a11y/atkutil.cxx:1.1.2.14 ---- /dev/null Wed Mar 22 02:53:44 2006 +--- /dev/null Thu Mar 23 06:49:08 2006 +++ gsl/vcl/unx/gtk/a11y/atkutil.cxx Fri Mar 3 03:07:09 2006 @@ -0,0 +1,625 @@ +/************************************************************************* @@ -5253,7 +5255,7 @@ + Index: gsl/vcl/unx/gtk/a11y/atkutil.hxx diff -u /dev/null gsl/vcl/unx/gtk/a11y/atkutil.hxx:1.1.2.4 ---- /dev/null Wed Mar 22 02:53:44 2006 +--- /dev/null Thu Mar 23 06:49:08 2006 +++ gsl/vcl/unx/gtk/a11y/atkutil.hxx Thu Jan 5 06:06:32 2006 @@ -0,0 +1,45 @@ +/************************************************************************* @@ -5303,7 +5305,7 @@ +#endif Index: gsl/vcl/unx/gtk/a11y/atkvalue.cxx diff -u /dev/null gsl/vcl/unx/gtk/a11y/atkvalue.cxx:1.1.2.4 ---- /dev/null Wed Mar 22 02:53:44 2006 +--- /dev/null Thu Mar 23 06:49:08 2006 +++ gsl/vcl/unx/gtk/a11y/atkvalue.cxx Wed Feb 15 02:59:25 2006 @@ -0,0 +1,152 @@ +/************************************************************************* @@ -5459,10 +5461,10 @@ + iface->set_current_value = value_wrapper_set_current_value; +} Index: gsl/vcl/unx/gtk/a11y/atkwindow.cxx -diff -u /dev/null gsl/vcl/unx/gtk/a11y/atkwindow.cxx:1.1.2.3 ---- /dev/null Wed Mar 22 02:53:44 2006 -+++ gsl/vcl/unx/gtk/a11y/atkwindow.cxx Fri Feb 17 03:10:56 2006 -@@ -0,0 +1,138 @@ +diff -u /dev/null gsl/vcl/unx/gtk/a11y/atkwindow.cxx:1.1.2.4 +--- /dev/null Thu Mar 23 06:49:08 2006 ++++ gsl/vcl/unx/gtk/a11y/atkwindow.cxx Thu Mar 23 06:45:26 2006 +@@ -0,0 +1,145 @@ +/************************************************************************* + * + * OpenOffice.org - a multi-platform office productivity suite @@ -5514,6 +5516,13 @@ +{ + window_real_initialize(obj, data); + obj->role = GtkSalFrame::GetAtkRole( GTK_WINDOW( data ) ); ++ ++ if( obj->role == ATK_ROLE_TOOL_TIP ) ++ { ++ // Avoid endless loop when get_name this is called from ++ // gail_window_new () context ++ g_object_set_data( G_OBJECT( data ), "Accessible", obj ); ++ } +} + +/*****************************************************************************/ @@ -5603,7 +5612,7 @@ +} Index: gsl/vcl/unx/gtk/a11y/atkwindow.hxx diff -u /dev/null gsl/vcl/unx/gtk/a11y/atkwindow.hxx:1.1.2.1 ---- /dev/null Wed Mar 22 02:53:44 2006 +--- /dev/null Thu Mar 23 06:49:08 2006 +++ gsl/vcl/unx/gtk/a11y/atkwindow.hxx Thu Jan 5 06:06:34 2006 @@ -0,0 +1,45 @@ +/************************************************************************* @@ -5653,7 +5662,7 @@ +#endif Index: gsl/vcl/unx/gtk/a11y/atkwrapper.cxx diff -u /dev/null gsl/vcl/unx/gtk/a11y/atkwrapper.cxx:1.1.2.21 ---- /dev/null Wed Mar 22 02:53:44 2006 +--- /dev/null Thu Mar 23 06:49:08 2006 +++ gsl/vcl/unx/gtk/a11y/atkwrapper.cxx Wed Feb 15 02:58:57 2006 @@ -0,0 +1,819 @@ +/************************************************************************* @@ -6477,7 +6486,7 @@ +} Index: gsl/vcl/unx/gtk/a11y/atkwrapper.hxx diff -u /dev/null gsl/vcl/unx/gtk/a11y/atkwrapper.hxx:1.1.2.8 ---- /dev/null Wed Mar 22 02:53:44 2006 +--- /dev/null Thu Mar 23 06:49:08 2006 +++ gsl/vcl/unx/gtk/a11y/atkwrapper.hxx Wed Feb 15 02:59:26 2006 @@ -0,0 +1,125 @@ +/************************************************************************* @@ -6607,7 +6616,7 @@ +#endif /* __ATK_WRAPPER_HXX__ */ Index: gsl/vcl/unx/gtk/a11y/makefile.mk diff -u /dev/null gsl/vcl/unx/gtk/a11y/makefile.mk:1.1.2.12 ---- /dev/null Wed Mar 22 02:53:44 2006 +--- /dev/null Thu Mar 23 06:49:08 2006 +++ gsl/vcl/unx/gtk/a11y/makefile.mk Thu Feb 16 22:09:46 2006 @@ -0,0 +1,96 @@ +#************************************************************************* @@ -6977,7 +6986,7 @@ m_aForeignParentWindow = None; Index: gsl/vcl/unx/inc/plugins/gtk/atkbridge.hxx diff -u /dev/null gsl/vcl/unx/inc/plugins/gtk/atkbridge.hxx:1.1.2.3 ---- /dev/null Wed Mar 22 02:53:45 2006 +--- /dev/null Thu Mar 23 06:49:08 2006 +++ gsl/vcl/unx/inc/plugins/gtk/atkbridge.hxx Thu Jan 12 05:57:32 2006 @@ -0,0 +1,45 @@ +/************************************************************************* From fedora-cvs-commits at redhat.com Thu Mar 23 15:07:13 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 23 Mar 2006 10:07:13 -0500 Subject: rpms/openoffice.org/FC-5 workspace.atkbridge.patch,1.10,1.11 Message-ID: <200603231507.k2NF7Dti021857@cvs.devel.redhat.com> Author: caolanm Update of /cvs/dist/rpms/openoffice.org/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv21842 Modified Files: workspace.atkbridge.patch Log Message: update atkbridge workspace.atkbridge.patch: desktop/scripts/soffice.sh | 4 graphics/svx/source/accessibility/AccessibleContextBase.cxx | 1 graphics/svx/source/accessibility/AccessibleControlShape.cxx | 1 graphics/svx/source/accessibility/AccessibleEditableTextPara.cxx | 1 graphics/svx/source/accessibility/AccessibleFrameSelector.cxx | 3 graphics/svx/source/accessibility/AccessibleImageBullet.cxx | 1 graphics/svx/source/accessibility/GraphCtlAccessibleContext.cxx | 1 graphics/svx/source/accessibility/charmapacc.cxx | 8 graphics/svx/source/accessibility/svxrectctaccessiblecontext.cxx | 2 gsl/fpicker/source/unx/gnome/FPentry.cxx | 3 gsl/toolkit/source/awt/accessiblemenubasecomponent.cxx | 15 gsl/toolkit/source/awt/accessiblemenucomponent.cxx | 3 gsl/toolkit/source/awt/accessiblemenuitemcomponent.cxx | 3 gsl/toolkit/source/awt/vclxaccessiblecomponent.cxx | 10 gsl/toolkit/source/awt/vclxaccessiblelistitem.cxx | 1 gsl/toolkit/source/awt/vclxaccessiblemenuitem.cxx | 8 gsl/toolkit/source/awt/vclxaccessiblestatusbaritem.cxx | 1 gsl/toolkit/source/awt/vclxaccessibletabpage.cxx | 1 gsl/toolkit/source/awt/vclxaccessibletoolboxitem.cxx | 19 gsl/toolkit/source/awt/vclxwindow.cxx | 80 gsl/vcl/inc/menu.hxx | 3 gsl/vcl/inc/svapp.hxx | 2 gsl/vcl/prj/build.lst | 3 gsl/vcl/source/app/svapp.cxx | 14 gsl/vcl/source/window/menu.cxx | 35 gsl/vcl/unx/gtk/a11y/TODO | 49 gsl/vcl/unx/gtk/a11y/atkaction.cxx | 287 +++ gsl/vcl/unx/gtk/a11y/atkbridge.cxx | 56 gsl/vcl/unx/gtk/a11y/atkcomponent.cxx | 397 ++++ gsl/vcl/unx/gtk/a11y/atkeditabletext.cxx | 207 ++ gsl/vcl/unx/gtk/a11y/atkfactory.cxx | 168 ++ gsl/vcl/unx/gtk/a11y/atkfactory.hxx | 49 gsl/vcl/unx/gtk/a11y/atkhypertext.cxx | 295 +++ gsl/vcl/unx/gtk/a11y/atkimage.cxx | 144 + gsl/vcl/unx/gtk/a11y/atklistener.cxx | 474 +++++ gsl/vcl/unx/gtk/a11y/atklistener.hxx | 92 + gsl/vcl/unx/gtk/a11y/atkselection.cxx | 200 ++ gsl/vcl/unx/gtk/a11y/atktable.cxx | 737 ++++++++ gsl/vcl/unx/gtk/a11y/atktext.cxx | 547 ++++++ gsl/vcl/unx/gtk/a11y/atktextattributes.cxx | 572 ++++++ gsl/vcl/unx/gtk/a11y/atktextattributes.hxx | 60 gsl/vcl/unx/gtk/a11y/atkutil.cxx | 625 +++++++ gsl/vcl/unx/gtk/a11y/atkutil.hxx | 45 gsl/vcl/unx/gtk/a11y/atkvalue.cxx | 152 + gsl/vcl/unx/gtk/a11y/atkwindow.cxx | 145 + gsl/vcl/unx/gtk/a11y/atkwindow.hxx | 45 gsl/vcl/unx/gtk/a11y/atkwrapper.cxx | 819 ++++++++++ gsl/vcl/unx/gtk/a11y/atkwrapper.hxx | 125 + gsl/vcl/unx/gtk/a11y/makefile.mk | 96 + gsl/vcl/unx/gtk/app/gtkinst.cxx | 42 gsl/vcl/unx/gtk/window/gtkframe.cxx | 142 + gsl/vcl/unx/inc/plugins/gtk/atkbridge.hxx | 45 gsl/vcl/unx/inc/plugins/gtk/gtkframe.hxx | 16 gsl/vcl/util/makefile.mk | 2 util/comphelper/source/misc/accessiblewrapper.cxx | 6 util/svtools/source/Accessibility/accessibleiconchoicectrlentry.cxx | 1 util/svtools/source/Accessibility/accessiblelistboxentry.cxx | 1 util/svtools/source/Accessibility/accessibletabbar.cxx | 9 util/svtools/source/Accessibility/accessibletabbarpage.cxx | 21 util/svtools/source/Accessibility/accessibletabbarpagelist.cxx | 31 util/svtools/source/Accessibility/accessibletablistboxtable.cxx | 19 util/svtools/source/brwbox/brwbox3.cxx | 3 util/svtools/source/contnr/svtabbx.cxx | 3 util/svtools/source/control/valueacc.cxx | 2 util/svtools/source/edit/textwindowaccessibility.cxx | 2 65 files changed, 6837 insertions(+), 117 deletions(-) Index: workspace.atkbridge.patch =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/FC-5/workspace.atkbridge.patch,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- workspace.atkbridge.patch 22 Mar 2006 11:31:36 -0000 1.10 +++ workspace.atkbridge.patch 23 Mar 2006 15:07:09 -0000 1.11 @@ -211,7 +211,7 @@ MenuBarWindow::MenuBarWindow( Window* pParent ) : Index: gsl/vcl/unx/gtk/a11y/TODO diff -u /dev/null gsl/vcl/unx/gtk/a11y/TODO:1.1.2.6 ---- /dev/null Wed Mar 22 02:53:44 2006 +--- /dev/null Thu Mar 23 06:49:08 2006 +++ gsl/vcl/unx/gtk/a11y/TODO Tue May 31 07:08:21 2005 @@ -0,0 +1,49 @@ +cws 'atkbridge' @@ -265,7 +265,7 @@ + + tooltips create new toplevels with broken roles. Index: gsl/vcl/unx/gtk/a11y/atkaction.cxx diff -u /dev/null gsl/vcl/unx/gtk/a11y/atkaction.cxx:1.1.2.7 ---- /dev/null Wed Mar 22 02:53:44 2006 +--- /dev/null Thu Mar 23 06:49:08 2006 +++ gsl/vcl/unx/gtk/a11y/atkaction.cxx Wed Feb 15 02:59:20 2006 @@ -0,0 +1,287 @@ +/************************************************************************* @@ -557,7 +557,7 @@ +} Index: gsl/vcl/unx/gtk/a11y/atkbridge.cxx diff -u /dev/null gsl/vcl/unx/gtk/a11y/atkbridge.cxx:1.1.2.2 ---- /dev/null Wed Mar 22 02:53:44 2006 +--- /dev/null Thu Mar 23 06:49:08 2006 +++ gsl/vcl/unx/gtk/a11y/atkbridge.cxx Wed Feb 15 02:59:21 2006 @@ -0,0 +1,56 @@ +/************************************************************************* @@ -618,7 +618,7 @@ + Index: gsl/vcl/unx/gtk/a11y/atkcomponent.cxx diff -u /dev/null gsl/vcl/unx/gtk/a11y/atkcomponent.cxx:1.1.2.8 ---- /dev/null Wed Mar 22 02:53:44 2006 +--- /dev/null Thu Mar 23 06:49:08 2006 +++ gsl/vcl/unx/gtk/a11y/atkcomponent.cxx Wed Feb 15 02:58:57 2006 @@ -0,0 +1,397 @@ +/************************************************************************* @@ -1020,7 +1020,7 @@ +} Index: gsl/vcl/unx/gtk/a11y/atkeditabletext.cxx diff -u /dev/null gsl/vcl/unx/gtk/a11y/atkeditabletext.cxx:1.1.2.7 ---- /dev/null Wed Mar 22 02:53:44 2006 +--- /dev/null Thu Mar 23 06:49:08 2006 +++ gsl/vcl/unx/gtk/a11y/atkeditabletext.cxx Wed Feb 15 02:59:21 2006 @@ -0,0 +1,207 @@ +/************************************************************************* @@ -1231,10 +1231,10 @@ + iface->set_run_attributes = editable_text_wrapper_set_run_attributes; +} Index: gsl/vcl/unx/gtk/a11y/atkfactory.cxx -diff -u /dev/null gsl/vcl/unx/gtk/a11y/atkfactory.cxx:1.1.2.9 ---- /dev/null Wed Mar 22 02:53:44 2006 -+++ gsl/vcl/unx/gtk/a11y/atkfactory.cxx Wed Feb 15 02:59:22 2006 -@@ -0,0 +1,166 @@ +diff -u /dev/null gsl/vcl/unx/gtk/a11y/atkfactory.cxx:1.1.2.10 +--- /dev/null Thu Mar 23 06:49:08 2006 ++++ gsl/vcl/unx/gtk/a11y/atkfactory.cxx Thu Mar 23 06:45:26 2006 +@@ -0,0 +1,168 @@ +/************************************************************************* + * + * OpenOffice.org - a multi-platform office productivity suite @@ -1361,7 +1361,9 @@ + GtkSalFrame* pFrame = GtkSalFrame::getFromWindow( GTK_WINDOW( parent_widget ) ); + g_return_val_if_fail( pFrame != NULL, NULL ); + -+ AtkObject* parent_accessible = gtk_widget_get_accessible(parent_widget); ++ AtkObject* parent_accessible = (AtkObject *) g_object_get_data(G_OBJECT( parent_widget ), "Accessible"); ++ if( ! parent_accessible ) ++ parent_accessible = gtk_widget_get_accessible(parent_widget); + + uno::Reference< accessibility::XAccessible > xAccessible(pFrame->getAccessible( true )); + @@ -1403,7 +1405,7 @@ + Index: gsl/vcl/unx/gtk/a11y/atkfactory.hxx diff -u /dev/null gsl/vcl/unx/gtk/a11y/atkfactory.hxx:1.1.2.1 ---- /dev/null Wed Mar 22 02:53:44 2006 +--- /dev/null Thu Mar 23 06:49:08 2006 +++ gsl/vcl/unx/gtk/a11y/atkfactory.hxx Thu Jan 5 06:06:31 2006 @@ -0,0 +1,49 @@ +/************************************************************************* @@ -1457,7 +1459,7 @@ +#endif Index: gsl/vcl/unx/gtk/a11y/atkhypertext.cxx diff -u /dev/null gsl/vcl/unx/gtk/a11y/atkhypertext.cxx:1.1.2.9 ---- /dev/null Wed Mar 22 02:53:44 2006 +--- /dev/null Thu Mar 23 06:49:08 2006 +++ gsl/vcl/unx/gtk/a11y/atkhypertext.cxx Tue Mar 7 00:49:02 2006 @@ -0,0 +1,295 @@ +/************************************************************************* @@ -1757,7 +1759,7 @@ +} Index: gsl/vcl/unx/gtk/a11y/atkimage.cxx diff -u /dev/null gsl/vcl/unx/gtk/a11y/atkimage.cxx:1.1.2.4 ---- /dev/null Wed Mar 22 02:53:44 2006 +--- /dev/null Thu Mar 23 06:49:08 2006 +++ gsl/vcl/unx/gtk/a11y/atkimage.cxx Wed Feb 15 02:59:23 2006 @@ -0,0 +1,144 @@ +/************************************************************************* @@ -1906,7 +1908,7 @@ +} Index: gsl/vcl/unx/gtk/a11y/atklistener.cxx diff -u /dev/null gsl/vcl/unx/gtk/a11y/atklistener.cxx:1.1.2.17 ---- /dev/null Wed Mar 22 02:53:44 2006 +--- /dev/null Thu Mar 23 06:49:08 2006 +++ gsl/vcl/unx/gtk/a11y/atklistener.cxx Wed Mar 1 04:00:16 2006 @@ -0,0 +1,474 @@ +/************************************************************************* @@ -2385,7 +2387,7 @@ +} Index: gsl/vcl/unx/gtk/a11y/atklistener.hxx diff -u /dev/null gsl/vcl/unx/gtk/a11y/atklistener.hxx:1.1.2.7 ---- /dev/null Wed Mar 22 02:53:44 2006 +--- /dev/null Thu Mar 23 06:49:08 2006 +++ gsl/vcl/unx/gtk/a11y/atklistener.hxx Wed Feb 15 02:59:24 2006 @@ -0,0 +1,92 @@ +/************************************************************************* @@ -2482,7 +2484,7 @@ + Index: gsl/vcl/unx/gtk/a11y/atkselection.cxx diff -u /dev/null gsl/vcl/unx/gtk/a11y/atkselection.cxx:1.1.2.6 ---- /dev/null Wed Mar 22 02:53:44 2006 +--- /dev/null Thu Mar 23 06:49:08 2006 +++ gsl/vcl/unx/gtk/a11y/atkselection.cxx Wed Feb 15 02:59:24 2006 @@ -0,0 +1,200 @@ +/************************************************************************* @@ -2687,7 +2689,7 @@ +} Index: gsl/vcl/unx/gtk/a11y/atktable.cxx diff -u /dev/null gsl/vcl/unx/gtk/a11y/atktable.cxx:1.1.2.7 ---- /dev/null Wed Mar 22 02:53:44 2006 +--- /dev/null Thu Mar 23 06:49:08 2006 +++ gsl/vcl/unx/gtk/a11y/atktable.cxx Wed Feb 15 02:58:28 2006 @@ -0,0 +1,737 @@ +/************************************************************************* @@ -3429,7 +3431,7 @@ +} Index: gsl/vcl/unx/gtk/a11y/atktext.cxx diff -u /dev/null gsl/vcl/unx/gtk/a11y/atktext.cxx:1.1.2.12 ---- /dev/null Wed Mar 22 02:53:44 2006 +--- /dev/null Thu Mar 23 06:49:08 2006 +++ gsl/vcl/unx/gtk/a11y/atktext.cxx Wed Feb 15 02:59:25 2006 @@ -0,0 +1,547 @@ +/************************************************************************* @@ -3981,7 +3983,7 @@ +} Index: gsl/vcl/unx/gtk/a11y/atktextattributes.cxx diff -u /dev/null gsl/vcl/unx/gtk/a11y/atktextattributes.cxx:1.1.2.2 ---- /dev/null Wed Mar 22 02:53:44 2006 +--- /dev/null Thu Mar 23 06:49:08 2006 +++ gsl/vcl/unx/gtk/a11y/atktextattributes.cxx Tue Feb 14 04:42:40 2006 @@ -0,0 +1,572 @@ +/************************************************************************* @@ -4558,7 +4560,7 @@ + Index: gsl/vcl/unx/gtk/a11y/atktextattributes.hxx diff -u /dev/null gsl/vcl/unx/gtk/a11y/atktextattributes.hxx:1.1.2.1 ---- /dev/null Wed Mar 22 02:53:44 2006 +--- /dev/null Thu Mar 23 06:49:08 2006 +++ gsl/vcl/unx/gtk/a11y/atktextattributes.hxx Thu Dec 22 00:24:30 2005 @@ -0,0 +1,60 @@ +/************************************************************************* @@ -4623,7 +4625,7 @@ +#endif Index: gsl/vcl/unx/gtk/a11y/atkutil.cxx diff -u /dev/null gsl/vcl/unx/gtk/a11y/atkutil.cxx:1.1.2.14 ---- /dev/null Wed Mar 22 02:53:44 2006 +--- /dev/null Thu Mar 23 06:49:08 2006 +++ gsl/vcl/unx/gtk/a11y/atkutil.cxx Fri Mar 3 03:07:09 2006 @@ -0,0 +1,625 @@ +/************************************************************************* @@ -5253,7 +5255,7 @@ + Index: gsl/vcl/unx/gtk/a11y/atkutil.hxx diff -u /dev/null gsl/vcl/unx/gtk/a11y/atkutil.hxx:1.1.2.4 ---- /dev/null Wed Mar 22 02:53:44 2006 +--- /dev/null Thu Mar 23 06:49:08 2006 +++ gsl/vcl/unx/gtk/a11y/atkutil.hxx Thu Jan 5 06:06:32 2006 @@ -0,0 +1,45 @@ +/************************************************************************* @@ -5303,7 +5305,7 @@ +#endif Index: gsl/vcl/unx/gtk/a11y/atkvalue.cxx diff -u /dev/null gsl/vcl/unx/gtk/a11y/atkvalue.cxx:1.1.2.4 ---- /dev/null Wed Mar 22 02:53:44 2006 +--- /dev/null Thu Mar 23 06:49:08 2006 +++ gsl/vcl/unx/gtk/a11y/atkvalue.cxx Wed Feb 15 02:59:25 2006 @@ -0,0 +1,152 @@ +/************************************************************************* @@ -5459,10 +5461,10 @@ + iface->set_current_value = value_wrapper_set_current_value; +} Index: gsl/vcl/unx/gtk/a11y/atkwindow.cxx -diff -u /dev/null gsl/vcl/unx/gtk/a11y/atkwindow.cxx:1.1.2.3 ---- /dev/null Wed Mar 22 02:53:44 2006 -+++ gsl/vcl/unx/gtk/a11y/atkwindow.cxx Fri Feb 17 03:10:56 2006 -@@ -0,0 +1,138 @@ +diff -u /dev/null gsl/vcl/unx/gtk/a11y/atkwindow.cxx:1.1.2.4 +--- /dev/null Thu Mar 23 06:49:08 2006 ++++ gsl/vcl/unx/gtk/a11y/atkwindow.cxx Thu Mar 23 06:45:26 2006 +@@ -0,0 +1,145 @@ +/************************************************************************* + * + * OpenOffice.org - a multi-platform office productivity suite @@ -5514,6 +5516,13 @@ +{ + window_real_initialize(obj, data); + obj->role = GtkSalFrame::GetAtkRole( GTK_WINDOW( data ) ); ++ ++ if( obj->role == ATK_ROLE_TOOL_TIP ) ++ { ++ // Avoid endless loop when get_name this is called from ++ // gail_window_new () context ++ g_object_set_data( G_OBJECT( data ), "Accessible", obj ); ++ } +} + +/*****************************************************************************/ @@ -5603,7 +5612,7 @@ +} Index: gsl/vcl/unx/gtk/a11y/atkwindow.hxx diff -u /dev/null gsl/vcl/unx/gtk/a11y/atkwindow.hxx:1.1.2.1 ---- /dev/null Wed Mar 22 02:53:44 2006 +--- /dev/null Thu Mar 23 06:49:08 2006 +++ gsl/vcl/unx/gtk/a11y/atkwindow.hxx Thu Jan 5 06:06:34 2006 @@ -0,0 +1,45 @@ +/************************************************************************* @@ -5653,7 +5662,7 @@ +#endif Index: gsl/vcl/unx/gtk/a11y/atkwrapper.cxx diff -u /dev/null gsl/vcl/unx/gtk/a11y/atkwrapper.cxx:1.1.2.21 ---- /dev/null Wed Mar 22 02:53:44 2006 +--- /dev/null Thu Mar 23 06:49:08 2006 +++ gsl/vcl/unx/gtk/a11y/atkwrapper.cxx Wed Feb 15 02:58:57 2006 @@ -0,0 +1,819 @@ +/************************************************************************* @@ -6477,7 +6486,7 @@ +} Index: gsl/vcl/unx/gtk/a11y/atkwrapper.hxx diff -u /dev/null gsl/vcl/unx/gtk/a11y/atkwrapper.hxx:1.1.2.8 ---- /dev/null Wed Mar 22 02:53:44 2006 +--- /dev/null Thu Mar 23 06:49:08 2006 +++ gsl/vcl/unx/gtk/a11y/atkwrapper.hxx Wed Feb 15 02:59:26 2006 @@ -0,0 +1,125 @@ +/************************************************************************* @@ -6607,7 +6616,7 @@ +#endif /* __ATK_WRAPPER_HXX__ */ Index: gsl/vcl/unx/gtk/a11y/makefile.mk diff -u /dev/null gsl/vcl/unx/gtk/a11y/makefile.mk:1.1.2.12 ---- /dev/null Wed Mar 22 02:53:44 2006 +--- /dev/null Thu Mar 23 06:49:08 2006 +++ gsl/vcl/unx/gtk/a11y/makefile.mk Thu Feb 16 22:09:46 2006 @@ -0,0 +1,96 @@ +#************************************************************************* @@ -6977,7 +6986,7 @@ m_aForeignParentWindow = None; Index: gsl/vcl/unx/inc/plugins/gtk/atkbridge.hxx diff -u /dev/null gsl/vcl/unx/inc/plugins/gtk/atkbridge.hxx:1.1.2.3 ---- /dev/null Wed Mar 22 02:53:45 2006 +--- /dev/null Thu Mar 23 06:49:08 2006 +++ gsl/vcl/unx/inc/plugins/gtk/atkbridge.hxx Thu Jan 12 05:57:32 2006 @@ -0,0 +1,45 @@ +/************************************************************************* From fedora-cvs-commits at redhat.com Thu Mar 23 16:07:52 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 23 Mar 2006 11:07:52 -0500 Subject: rpms/pcmciautils/FC-5 pcmciautils-fedora.patch, 1.4, 1.5 pcmciautils.spec, 1.16, 1.17 Message-ID: <200603231607.k2NG7qrf017559@cvs.devel.redhat.com> Author: harald Update of /cvs/dist/rpms/pcmciautils/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv17541 Modified Files: pcmciautils-fedora.patch pcmciautils.spec Log Message: put RPM_OPT_FLAGS back in Makefile pcmciautils-fedora.patch: Makefile | 27 ++++++++------------------- udev/rules-base | 4 ++-- udev/rules-modprobe | 4 +--- 3 files changed, 11 insertions(+), 24 deletions(-) Index: pcmciautils-fedora.patch =================================================================== RCS file: /cvs/dist/rpms/pcmciautils/FC-5/pcmciautils-fedora.patch,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- pcmciautils-fedora.patch 23 Mar 2006 14:56:54 -0000 1.4 +++ pcmciautils-fedora.patch 23 Mar 2006 16:07:47 -0000 1.5 @@ -1,12 +1,12 @@ ---- pcmciautils-012/udev/rules-modprobe.fedora 2006-03-23 15:53:00.000000000 +0100 -+++ pcmciautils-012/udev/rules-modprobe 2006-03-23 15:54:14.000000000 +0100 +--- pcmciautils-012/udev/rules-modprobe.fedora 2005-12-18 15:20:06.000000000 +0100 ++++ pcmciautils-012/udev/rules-modprobe 2006-03-23 15:54:35.000000000 +0100 @@ -1,3 +1 @@ -# modprobe $modalias loads all possibly appropriate modules -ACTION=="add", SUBSYSTEM=="pcmcia", MODALIAS=="?*", \ - RUN+="/sbin/modprobe $modalias" +# modprobe done by general rule in 50-udev.rules ---- pcmciautils-012/udev/rules-base.fedora 2006-03-23 15:53:00.000000000 +0100 -+++ pcmciautils-012/udev/rules-base 2006-03-23 15:53:23.000000000 +0100 +--- pcmciautils-012/udev/rules-base.fedora 2005-12-18 15:20:06.000000000 +0100 ++++ pcmciautils-012/udev/rules-base 2006-03-23 15:54:35.000000000 +0100 @@ -3,12 +3,12 @@ # are so broken that we need to read out random bytes of it # instead of the manufactor, card or product ID. Then the @@ -23,8 +23,18 @@ # PCMCIA sockets: --- pcmciautils-012/Makefile.fedora 2005-12-18 15:20:06.000000000 +0100 -+++ pcmciautils-012/Makefile 2006-03-23 15:51:11.000000000 +0100 -@@ -143,8 +143,8 @@ ++++ pcmciautils-012/Makefile 2006-03-23 17:06:39.000000000 +0100 +@@ -109,8 +109,7 @@ + GCC_LIB := $(shell $(CC) -print-libgcc-file-name ) + + # use '-Os' optimization if available, else use -O2 +-OPTIMIZATION := ${shell if $(CC) -Os -S -o /dev/null -xc /dev/null >/dev/null 2>&1; \ +- then echo "-Os"; else echo "-O2" ; fi} ++OPTIMIZATION := $(RPM_OPT_FLAGS) + + # check if compiler option is supported + cc-supports = ${shell if $(CC) ${1} -S -o /dev/null -xc /dev/null > /dev/null 2>&1; then echo "$(1)"; fi;} +@@ -143,8 +142,8 @@ CFLAGS += $(WARNINGS) -I$(GCCINCDIR) @@ -35,7 +45,7 @@ ifeq ($(strip $(STATIC)),true) LIB_OBJS = -lsysfs -@@ -154,22 +154,12 @@ +@@ -154,22 +153,12 @@ LDFLAGS += -Wl,-warn-common endif Index: pcmciautils.spec =================================================================== RCS file: /cvs/dist/rpms/pcmciautils/FC-5/pcmciautils.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- pcmciautils.spec 23 Mar 2006 14:56:54 -0000 1.16 +++ pcmciautils.spec 23 Mar 2006 16:07:47 -0000 1.17 @@ -2,7 +2,7 @@ Summary: PCMCIA utilities and initialization programs License: GPL Version: 012 -Release: 0.FC5.1 +Release: 0.FC5.2 Group: System Environment/Base ExclusiveArch: i386 x86_64 ia64 ppc ppc64 Source: http://www.kernel.org/pub/linux/utils/kernel/pcmcia/pcmciautils-%{version}.tar.bz2 @@ -40,7 +40,7 @@ %{_mandir}/man*/* %changelog -* Thu Mar 23 2006 Harald Hoyer 012-1 +* Thu Mar 23 2006 Harald Hoyer 012-0.FC5.2 - version 012 fixes #186164 * Fri Feb 10 2006 Jesse Keating - 011-1.2 From fedora-cvs-commits at redhat.com Thu Mar 23 16:14:06 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 23 Mar 2006 11:14:06 -0500 Subject: rpms/checkpolicy/devel .cvsignore, 1.58, 1.59 checkpolicy.spec, 1.95, 1.96 sources, 1.59, 1.60 Message-ID: <200603231614.k2NGE60W017786@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/checkpolicy/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv17772 Modified Files: .cvsignore checkpolicy.spec sources Log Message: * Thu Mar 23 2006 Dan Walsh - 1.30.1-1 - Latest upgrade from NSA * Moved processing of role and user require statements to 2nd pass. Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/checkpolicy/devel/.cvsignore,v retrieving revision 1.58 retrieving revision 1.59 diff -u -r1.58 -r1.59 --- .cvsignore 17 Mar 2006 18:36:26 -0000 1.58 +++ .cvsignore 23 Mar 2006 16:14:03 -0000 1.59 @@ -42,3 +42,4 @@ checkpolicy-1.29.4.tgz checkpolicy-1.29.5.tgz checkpolicy-1.30.tgz +checkpolicy-1.30.1.tgz Index: checkpolicy.spec =================================================================== RCS file: /cvs/dist/rpms/checkpolicy/devel/checkpolicy.spec,v retrieving revision 1.95 retrieving revision 1.96 diff -u -r1.95 -r1.96 --- checkpolicy.spec 17 Mar 2006 18:36:26 -0000 1.95 +++ checkpolicy.spec 23 Mar 2006 16:14:03 -0000 1.96 @@ -1,7 +1,7 @@ %define libsepolver 1.12-1 Summary: SELinux policy compiler Name: checkpolicy -Version: 1.30 +Version: 1.30.1 Release: 1 License: GPL Group: Development/System @@ -47,6 +47,10 @@ %{_mandir}/man8/checkmodule.8.gz %changelog +* Thu Mar 23 2006 Dan Walsh - 1.30.1-1 +- Latest upgrade from NSA + * Moved processing of role and user require statements to 2nd pass. + * Fri Mar 17 2006 Dan Walsh - 1.30-1 - Latest upgrade from NSA * Updated version for release. Index: sources =================================================================== RCS file: /cvs/dist/rpms/checkpolicy/devel/sources,v retrieving revision 1.59 retrieving revision 1.60 diff -u -r1.59 -r1.60 --- sources 17 Mar 2006 18:36:26 -0000 1.59 +++ sources 23 Mar 2006 16:14:03 -0000 1.60 @@ -1 +1 @@ -20f388415dbdd002f0cb3bf726df0536 checkpolicy-1.30.tgz +f02868c0a7797054ca2bf3ce7a5c68ab checkpolicy-1.30.1.tgz From fedora-cvs-commits at redhat.com Thu Mar 23 17:24:49 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 23 Mar 2006 12:24:49 -0500 Subject: rpms/hplip/FC-5 hplip.spec,1.52,1.53 Message-ID: <200603231724.k2NHOnNs027430@cvs.devel.redhat.com> Author: twaugh Update of /cvs/dist/rpms/hplip/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv27417 Modified Files: hplip.spec Log Message: * Thu Mar 23 2006 Tim Waugh 0.9.9-5 - Rebuilt. Index: hplip.spec =================================================================== RCS file: /cvs/dist/rpms/hplip/FC-5/hplip.spec,v retrieving revision 1.52 retrieving revision 1.53 diff -u -r1.52 -r1.53 --- hplip.spec 13 Mar 2006 11:26:02 -0000 1.52 +++ hplip.spec 23 Mar 2006 17:24:47 -0000 1.53 @@ -1,7 +1,7 @@ Summary: HP Linux Imaging and Printing Project Name: hplip Version: 0.9.9 -Release: 4 +Release: 5 License: GPL/MIT/BSD Group: System Environment/Daemons Conflicts: system-config-printer < 0.6.132 @@ -160,6 +160,9 @@ fi %changelog +* Thu Mar 23 2006 Tim Waugh 0.9.9-5 +- Rebuilt. + * Mon Mar 13 2006 Tim Waugh 0.9.9-4 - Quieten hpssd on startup. From fedora-cvs-commits at redhat.com Thu Mar 23 17:50:30 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 23 Mar 2006 12:50:30 -0500 Subject: rpms/hplip/devel hplip.spec,1.52,1.53 Message-ID: <200603231750.k2NHoUPA009010@cvs.devel.redhat.com> Author: twaugh Update of /cvs/dist/rpms/hplip/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv8996 Modified Files: hplip.spec Log Message: * Thu Mar 23 2006 Tim Waugh 0.9.9-6 - Rebuilt. Index: hplip.spec =================================================================== RCS file: /cvs/dist/rpms/hplip/devel/hplip.spec,v retrieving revision 1.52 retrieving revision 1.53 diff -u -r1.52 -r1.53 --- hplip.spec 13 Mar 2006 11:26:02 -0000 1.52 +++ hplip.spec 23 Mar 2006 17:50:28 -0000 1.53 @@ -1,7 +1,7 @@ Summary: HP Linux Imaging and Printing Project Name: hplip Version: 0.9.9 -Release: 4 +Release: 6 License: GPL/MIT/BSD Group: System Environment/Daemons Conflicts: system-config-printer < 0.6.132 @@ -160,6 +160,9 @@ fi %changelog +* Thu Mar 23 2006 Tim Waugh 0.9.9-6 +- Rebuilt. + * Mon Mar 13 2006 Tim Waugh 0.9.9-4 - Quieten hpssd on startup. From fedora-cvs-commits at redhat.com Thu Mar 23 18:18:30 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 23 Mar 2006 13:18:30 -0500 Subject: rpms/hplip/devel hplip.spec,1.53,1.54 Message-ID: <200603231818.k2NIIU5n023287@cvs.devel.redhat.com> Author: twaugh Update of /cvs/dist/rpms/hplip/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv23274 Modified Files: hplip.spec Log Message: * Thu Mar 23 2006 Tim Waugh 0.9.9-6 - CUPS backend directory is always in /usr/lib. Index: hplip.spec =================================================================== RCS file: /cvs/dist/rpms/hplip/devel/hplip.spec,v retrieving revision 1.53 retrieving revision 1.54 diff -u -r1.53 -r1.54 --- hplip.spec 23 Mar 2006 17:50:28 -0000 1.53 +++ hplip.spec 23 Mar 2006 18:18:28 -0000 1.54 @@ -110,7 +110,7 @@ mv %{buildroot}%{_sysconfdir}/{init.d,rc.d/init.d}/hplip # Don't package hpfax yet. -rm -f %{buildroot}%{_libdir}/cups/backend/hpfax +rm -f %{buildroot}/usr/lib/cups/backend/hpfax rm -f %{buildroot}%{_datadir}/cups/model/HP-Fax* %clean @@ -124,7 +124,7 @@ %config(noreplace) %{_sysconfdir}/rc.d/init.d/hplip %{_bindir}/hp-* %{_sbindir}/hpiod -%{_libdir}/cups/backend/hp +/usr/lib/cups/backend/hp %{_datadir}/hplip %{_libdir}/python*/site-packages/* %{_datadir}/applications/*.desktop @@ -161,7 +161,7 @@ %changelog * Thu Mar 23 2006 Tim Waugh 0.9.9-6 -- Rebuilt. +- CUPS backend directory is always in /usr/lib. * Mon Mar 13 2006 Tim Waugh 0.9.9-4 - Quieten hpssd on startup. From fedora-cvs-commits at redhat.com Thu Mar 23 18:36:19 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 23 Mar 2006 13:36:19 -0500 Subject: rpms/bluez-utils/devel bluez-utils-2.25-poll-timeout.patch, NONE, 1.1 bluez-utils.spec, 1.38, 1.39 Message-ID: <200603231836.k2NIaJHv023539@cvs.devel.redhat.com> Author: pjones Update of /cvs/dist/rpms/bluez-utils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv23468 Modified Files: bluez-utils.spec Added Files: bluez-utils-2.25-poll-timeout.patch Log Message: - fix hidd event poll timeout, so we don't get ~20 context switches per second when nothing is happening bluez-utils-2.25-poll-timeout.patch: main.c | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE bluez-utils-2.25-poll-timeout.patch --- --- bluez-utils-2.25/hidd/main.c.timeout 2006-03-23 13:24:21.000000000 -0500 +++ bluez-utils-2.25/hidd/main.c 2006-03-23 13:24:26.000000000 -0500 @@ -335,7 +335,7 @@ p[0].revents = 0; p[1].revents = 0; - err = poll(p, 2, 100); + err = poll(p, 2, -1); if (err <= 0) continue; Index: bluez-utils.spec =================================================================== RCS file: /cvs/dist/rpms/bluez-utils/devel/bluez-utils.spec,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- bluez-utils.spec 14 Mar 2006 23:44:13 -0000 1.38 +++ bluez-utils.spec 23 Mar 2006 18:36:17 -0000 1.39 @@ -13,7 +13,8 @@ Source7: dund.conf Source8: hidd.conf Source9: bluetooth.conf -Patch1: bluez-utils-2.3-conf.patch +Patch0: bluez-utils-2.3-conf.patch +Patch1: bluez-utils-2.25-poll-timeout.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root URL: http://www.bluez.org/ BuildRequires: bluez-libs-devel >= %{version} @@ -51,6 +52,7 @@ rm -rf $RPM_BUILD_ROOT %setup -q +%patch0 -p1 %patch1 -p1 %build @@ -111,6 +113,10 @@ %{_libdir}/cups/backend/bluetooth %changelog +* Thu Mar 23 2006 Peter Jones - 2.25-5 +- Don't poll every 200ms when nothing happens unless there's poll event + in hidd. + * Wed Mar 14 2006 David Woodhouse - 2.25-4 - Require bluez-pin, since we're configured to use it by default From fedora-cvs-commits at redhat.com Thu Mar 23 18:37:37 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 23 Mar 2006 13:37:37 -0500 Subject: rpms/bluez-utils/devel bluez-utils.spec,1.39,1.40 Message-ID: <200603231837.k2NIbbSQ023588@cvs.devel.redhat.com> Author: pjones Update of /cvs/dist/rpms/bluez-utils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv23575 Modified Files: bluez-utils.spec Log Message: - update release number Index: bluez-utils.spec =================================================================== RCS file: /cvs/dist/rpms/bluez-utils/devel/bluez-utils.spec,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- bluez-utils.spec 23 Mar 2006 18:36:17 -0000 1.39 +++ bluez-utils.spec 23 Mar 2006 18:37:33 -0000 1.40 @@ -1,7 +1,7 @@ Summary: Bluetooth utilities Name: bluez-utils Version: 2.25 -Release: 4 +Release: 5 License: GPL Group: Applications/System Source: http://bluez.sourceforge.net/download/%{name}-%{version}.tar.gz From fedora-cvs-commits at redhat.com Thu Mar 23 19:30:30 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 23 Mar 2006 14:30:30 -0500 Subject: rpms/rhpl/devel .cvsignore, 1.59, 1.60 rhpl.spec, 1.71, 1.72 sources, 1.64, 1.65 Message-ID: <200603231930.k2NJUUaZ019631@cvs.devel.redhat.com> Author: clumens Update of /cvs/dist/rpms/rhpl/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv19616 Modified Files: .cvsignore rhpl.spec sources Log Message: Bump version. Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/rhpl/devel/.cvsignore,v retrieving revision 1.59 retrieving revision 1.60 diff -u -r1.59 -r1.60 --- .cvsignore 3 Mar 2006 01:52:35 -0000 1.59 +++ .cvsignore 23 Mar 2006 19:29:51 -0000 1.60 @@ -1 +1,2 @@ rhpl-0.185.tar.gz +rhpl-0.186.tar.gz Index: rhpl.spec =================================================================== RCS file: /cvs/dist/rpms/rhpl/devel/rhpl.spec,v retrieving revision 1.71 retrieving revision 1.72 diff -u -r1.71 -r1.72 --- rhpl.spec 3 Mar 2006 01:52:35 -0000 1.71 +++ rhpl.spec 23 Mar 2006 19:29:51 -0000 1.72 @@ -1,6 +1,6 @@ Summary: Library of python code used by programs in Red Hat Linux Name: rhpl -Version: 0.185 +Version: 0.186 Release: 1 Source0: %{name}-%{version}.tar.gz License: GPL @@ -39,6 +39,9 @@ %{_libdir}/python?.?/site-packages/rhpl %changelog +* Thu Mar 23 2006 Chris Lumens 0.186-1 +- Remove deprecated files now in rhpl or firstboot. + * Thu Mar 2 2006 Jeremy Katz - 0.185-1 - fix serbian keyboard (#182591) Index: sources =================================================================== RCS file: /cvs/dist/rpms/rhpl/devel/sources,v retrieving revision 1.64 retrieving revision 1.65 diff -u -r1.64 -r1.65 --- sources 3 Mar 2006 01:52:35 -0000 1.64 +++ sources 23 Mar 2006 19:29:51 -0000 1.65 @@ -1 +1 @@ -b05fdb494405fa077fc0eec6514edcdb rhpl-0.185.tar.gz +39603248f87f560199d224a41e114642 rhpl-0.186.tar.gz From fedora-cvs-commits at redhat.com Thu Mar 23 20:24:58 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 23 Mar 2006 15:24:58 -0500 Subject: rpms/kernel/devel kernel-2.6.spec, 1.2084, 1.2085 linux-2.6-compile-fixes.patch, 1.56, 1.57 Message-ID: <200603232024.k2NKOwH9015847@cvs.devel.redhat.com> Author: quintela Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv15831 Modified Files: kernel-2.6.spec linux-2.6-compile-fixes.patch Log Message: fixed git6 xen breakage Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.2084 retrieving revision 1.2085 diff -u -r1.2084 -r1.2085 --- kernel-2.6.spec 23 Mar 2006 09:13:55 -0000 1.2084 +++ kernel-2.6.spec 23 Mar 2006 20:24:56 -0000 1.2085 @@ -252,6 +252,7 @@ Patch691: linux-2.6-xen-net-csum.patch Patch692: linux-2.6-xen-pmd-shared.patch Patch693: linux-2.6-xen-smp-alts.patch + # 700 - 799 Xen Patch700: linux-2.6-xen.patch Patch701: linux-2.6-xen-compile-fixes.patch @@ -1644,6 +1645,9 @@ %endif %changelog +* Thu Mar 23 2006 Juan Quintela +- fix xen to compile with 2.6.16-git6. + * Thu Mar 23 2006 Dave Jones - 2.6.16-git6 linux-2.6-compile-fixes.patch: arch/i386/mm/init-xen.c | 8 ++++---- arch/i386/mm/pgtable-xen.c | 4 ++-- arch/x86_64/mm/init-xen.c | 6 +++--- drivers/xen/balloon/balloon.c | 2 +- drivers/xen/netback/netback.c | 4 ++-- 5 files changed, 12 insertions(+), 12 deletions(-) Index: linux-2.6-compile-fixes.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-compile-fixes.patch,v retrieving revision 1.56 retrieving revision 1.57 diff -u -r1.56 -r1.57 --- linux-2.6-compile-fixes.patch 26 Feb 2006 18:59:58 -0000 1.56 +++ linux-2.6-compile-fixes.patch 23 Mar 2006 20:24:56 -0000 1.57 @@ -0,0 +1,123 @@ +diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff linux-2.6.16.orig/arch/i386/mm/init-xen.c linux-2.6.16.noarch/arch/i386/mm/init-xen.c +--- linux-2.6.16.orig/arch/i386/mm/init-xen.c 2006-03-23 16:45:01.000000000 +0100 ++++ linux-2.6.16.noarch/arch/i386/mm/init-xen.c 2006-03-23 19:03:36.000000000 +0100 +@@ -317,7 +317,7 @@ static void __init permanent_kmaps_init( + + static void __meminit free_new_highpage(struct page *page, int pfn) + { +- set_page_count(page, 1); ++ init_page_count(page); + if (pfn < xen_start_info->nr_pages) + __free_page(page); + totalhigh_pages++; +@@ -676,7 +676,7 @@ void __init mem_init(void) + /* XEN: init and count low-mem pages outside initial allocation. */ + for (pfn = xen_start_info->nr_pages; pfn < max_low_pfn; pfn++) { + ClearPageReserved(&mem_map[pfn]); +- set_page_count(&mem_map[pfn], 1); ++ init_page_count(&mem_map[pfn]); + totalram_pages++; + } + +@@ -814,7 +814,7 @@ void free_initmem(void) + addr = (unsigned long)(&__init_begin); + for (; addr < (unsigned long)(&__init_end); addr += PAGE_SIZE) { + ClearPageReserved(virt_to_page(addr)); +- set_page_count(virt_to_page(addr), 1); ++ init_page_count(virt_to_page(addr)); + memset((void *)addr, 0xcc, PAGE_SIZE); + free_page(addr); + totalram_pages++; +@@ -853,7 +853,7 @@ void free_initrd_mem(unsigned long start + printk (KERN_INFO "Freeing initrd memory: %ldk freed\n", (end - start) >> 10); + for (; start < end; start += PAGE_SIZE) { + ClearPageReserved(virt_to_page(start)); +- set_page_count(virt_to_page(start), 1); ++ init_page_count(virt_to_page(start)); + free_page(start); + totalram_pages++; + } +diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff linux-2.6.16.orig/arch/i386/mm/pgtable-xen.c linux-2.6.16.noarch/arch/i386/mm/pgtable-xen.c +--- linux-2.6.16.orig/arch/i386/mm/pgtable-xen.c 2006-03-23 16:44:59.000000000 +0100 ++++ linux-2.6.16.noarch/arch/i386/mm/pgtable-xen.c 2006-03-23 19:04:29.000000000 +0100 +@@ -236,7 +236,7 @@ struct page *pte_alloc_one(struct mm_str + pte = alloc_pages(GFP_KERNEL|__GFP_REPEAT|__GFP_ZERO, 0); + if (pte) { + SetPageForeign(pte, pte_free); +- set_page_count(pte, 1); ++ init_page_count(pte); + } + #endif + return pte; +@@ -251,7 +251,7 @@ void pte_free(struct page *pte) + va, pfn_pte(page_to_pfn(pte), PAGE_KERNEL), 0)); + + ClearPageForeign(pte); +- set_page_count(pte, 1); ++ init_page_count(pte); + + __free_page(pte); + } +diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff linux-2.6.16.orig/arch/x86_64/mm/init-xen.c linux-2.6.16.noarch/arch/x86_64/mm/init-xen.c +--- linux-2.6.16.orig/arch/x86_64/mm/init-xen.c 2006-03-23 16:44:53.000000000 +0100 ++++ linux-2.6.16.noarch/arch/x86_64/mm/init-xen.c 2006-03-23 19:02:17.000000000 +0100 +@@ -812,7 +812,7 @@ void __init clear_kernel_mapping(unsigne + void online_page(struct page *page) + { + ClearPageReserved(page); +- set_page_count(page, 1); ++ init_page_count(page); + __free_page(page); + totalram_pages++; + num_physpages++; +@@ -930,7 +930,7 @@ void free_initmem(void) + addr = (unsigned long)(&__init_begin); + for (; addr < (unsigned long)(&__init_end); addr += PAGE_SIZE) { + ClearPageReserved(virt_to_page(addr)); +- set_page_count(virt_to_page(addr), 1); ++ init_page_count(virt_to_page(addr)); + memset((void *)(addr & ~(PAGE_SIZE-1)), 0xcc, PAGE_SIZE); + make_page_writable( + __va(__pa(addr)), XENFEAT_writable_page_tables); +@@ -978,7 +978,7 @@ void free_initrd_mem(unsigned long start + printk ("Freeing initrd memory: %ldk freed\n", (end - start) >> 10); + for (; start < end; start += PAGE_SIZE) { + ClearPageReserved(virt_to_page(start)); +- set_page_count(virt_to_page(start), 1); ++ init_page_count(virt_to_page(start)); + free_page(start); + totalram_pages++; + } +diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff linux-2.6.16.orig/drivers/xen/balloon/balloon.c linux-2.6.16.noarch/drivers/xen/balloon/balloon.c +--- linux-2.6.16.orig/drivers/xen/balloon/balloon.c 2006-03-23 16:44:53.000000000 +0100 ++++ linux-2.6.16.noarch/drivers/xen/balloon/balloon.c 2006-03-23 19:00:45.000000000 +0100 +@@ -231,7 +231,7 @@ static int increase_reservation(unsigned + + /* Relinquish the page back to the allocator. */ + ClearPageReserved(page); +- set_page_count(page, 1); ++ init_page_count(page); + __free_page(page); + } + +diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff linux-2.6.16.orig/drivers/xen/netback/netback.c linux-2.6.16.noarch/drivers/xen/netback/netback.c +--- linux-2.6.16.orig/drivers/xen/netback/netback.c 2006-03-23 16:44:53.000000000 +0100 ++++ linux-2.6.16.noarch/drivers/xen/netback/netback.c 2006-03-23 19:00:32.000000000 +0100 +@@ -665,7 +665,7 @@ static void netif_page_release(struct pa + u16 pending_idx = page - virt_to_page(mmap_vstart); + + /* Ready for next use. */ +- set_page_count(page, 1); ++ init_page_count(page); + + netif_idx_release(pending_idx); + } +@@ -785,7 +785,7 @@ static int __init netback_init(void) + + for (i = 0; i < MAX_PENDING_REQS; i++) { + page = virt_to_page(MMAP_VADDR(i)); +- set_page_count(page, 1); ++ init_page_count(page); + SetPageForeign(page, netif_page_release); + } + From fedora-cvs-commits at redhat.com Thu Mar 23 20:25:47 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 23 Mar 2006 15:25:47 -0500 Subject: rpms/kernel/devel kernel-2.6.spec,1.2085,1.2086 Message-ID: <200603232025.k2NKPl6v015878@cvs.devel.redhat.com> Author: quintela Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv15865 Modified Files: kernel-2.6.spec Log Message: enable buildxen again Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.2085 retrieving revision 1.2086 diff -u -r1.2085 -r1.2086 --- kernel-2.6.spec 23 Mar 2006 20:24:56 -0000 1.2085 +++ kernel-2.6.spec 23 Mar 2006 20:25:45 -0000 1.2086 @@ -8,7 +8,7 @@ # Whether to apply the Xen patches, leave this enabled. %define includexen 1 # Whether to build the Xen kernels, disable if you want. -%define buildxen 0 +%define buildxen 1 %define buildxenPAE 0 %define builddoc 0 %define buildkdump 1 From fedora-cvs-commits at redhat.com Thu Mar 23 21:21:25 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 23 Mar 2006 16:21:25 -0500 Subject: rpms/kernel/devel/configs config-generic,1.164,1.165 Message-ID: <200603232121.k2NLLPYb011497@cvs.devel.redhat.com> Author: quintela Update of /cvs/dist/rpms/kernel/devel/configs In directory cvs.devel.redhat.com:/tmp/cvs-serv11466/configs Modified Files: config-generic Log Message: really fix the set_page_count() xen thing & get it to compile Index: config-generic =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/configs/config-generic,v retrieving revision 1.164 retrieving revision 1.165 diff -u -r1.164 -r1.165 --- config-generic 23 Mar 2006 09:13:56 -0000 1.164 +++ config-generic 23 Mar 2006 21:21:22 -0000 1.165 @@ -993,7 +993,7 @@ # CONFIG_SK98LIN is not set CONFIG_SKGE=m CONFIG_TIGON3=m -CONFIG_SKY2=m +# CONFIG_SKY2 is not set # # Ethernet (10000 Mbit) From fedora-cvs-commits at redhat.com Thu Mar 23 21:21:25 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 23 Mar 2006 16:21:25 -0500 Subject: rpms/kernel/devel kernel-2.6.spec, 1.2086, 1.2087 linux-2.6-compile-fixes.patch, 1.57, 1.58 linux-2.6-xen-compile-fixes.patch, 1.2, 1.3 Message-ID: <200603232121.k2NLLPDL011488@cvs.devel.redhat.com> Author: quintela Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv11466 Modified Files: kernel-2.6.spec linux-2.6-compile-fixes.patch linux-2.6-xen-compile-fixes.patch Log Message: really fix the set_page_count() xen thing & get it to compile Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.2086 retrieving revision 1.2087 diff -u -r1.2086 -r1.2087 --- kernel-2.6.spec 23 Mar 2006 20:25:45 -0000 1.2086 +++ kernel-2.6.spec 23 Mar 2006 21:21:22 -0000 1.2087 @@ -1646,6 +1646,9 @@ %changelog * Thu Mar 23 2006 Juan Quintela +- disable sky2 (as it is broken upstream) + +* Thu Mar 23 2006 Juan Quintela - fix xen to compile with 2.6.16-git6. * Thu Mar 23 2006 Dave Jones linux-2.6-compile-fixes.patch: 0 files changed Index: linux-2.6-compile-fixes.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-compile-fixes.patch,v retrieving revision 1.57 retrieving revision 1.58 diff -u -r1.57 -r1.58 --- linux-2.6-compile-fixes.patch 23 Mar 2006 20:24:56 -0000 1.57 +++ linux-2.6-compile-fixes.patch 23 Mar 2006 21:21:22 -0000 1.58 @@ -1,123 +0,0 @@ -diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff linux-2.6.16.orig/arch/i386/mm/init-xen.c linux-2.6.16.noarch/arch/i386/mm/init-xen.c ---- linux-2.6.16.orig/arch/i386/mm/init-xen.c 2006-03-23 16:45:01.000000000 +0100 -+++ linux-2.6.16.noarch/arch/i386/mm/init-xen.c 2006-03-23 19:03:36.000000000 +0100 -@@ -317,7 +317,7 @@ static void __init permanent_kmaps_init( - - static void __meminit free_new_highpage(struct page *page, int pfn) - { -- set_page_count(page, 1); -+ init_page_count(page); - if (pfn < xen_start_info->nr_pages) - __free_page(page); - totalhigh_pages++; -@@ -676,7 +676,7 @@ void __init mem_init(void) - /* XEN: init and count low-mem pages outside initial allocation. */ - for (pfn = xen_start_info->nr_pages; pfn < max_low_pfn; pfn++) { - ClearPageReserved(&mem_map[pfn]); -- set_page_count(&mem_map[pfn], 1); -+ init_page_count(&mem_map[pfn]); - totalram_pages++; - } - -@@ -814,7 +814,7 @@ void free_initmem(void) - addr = (unsigned long)(&__init_begin); - for (; addr < (unsigned long)(&__init_end); addr += PAGE_SIZE) { - ClearPageReserved(virt_to_page(addr)); -- set_page_count(virt_to_page(addr), 1); -+ init_page_count(virt_to_page(addr)); - memset((void *)addr, 0xcc, PAGE_SIZE); - free_page(addr); - totalram_pages++; -@@ -853,7 +853,7 @@ void free_initrd_mem(unsigned long start - printk (KERN_INFO "Freeing initrd memory: %ldk freed\n", (end - start) >> 10); - for (; start < end; start += PAGE_SIZE) { - ClearPageReserved(virt_to_page(start)); -- set_page_count(virt_to_page(start), 1); -+ init_page_count(virt_to_page(start)); - free_page(start); - totalram_pages++; - } -diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff linux-2.6.16.orig/arch/i386/mm/pgtable-xen.c linux-2.6.16.noarch/arch/i386/mm/pgtable-xen.c ---- linux-2.6.16.orig/arch/i386/mm/pgtable-xen.c 2006-03-23 16:44:59.000000000 +0100 -+++ linux-2.6.16.noarch/arch/i386/mm/pgtable-xen.c 2006-03-23 19:04:29.000000000 +0100 -@@ -236,7 +236,7 @@ struct page *pte_alloc_one(struct mm_str - pte = alloc_pages(GFP_KERNEL|__GFP_REPEAT|__GFP_ZERO, 0); - if (pte) { - SetPageForeign(pte, pte_free); -- set_page_count(pte, 1); -+ init_page_count(pte); - } - #endif - return pte; -@@ -251,7 +251,7 @@ void pte_free(struct page *pte) - va, pfn_pte(page_to_pfn(pte), PAGE_KERNEL), 0)); - - ClearPageForeign(pte); -- set_page_count(pte, 1); -+ init_page_count(pte); - - __free_page(pte); - } -diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff linux-2.6.16.orig/arch/x86_64/mm/init-xen.c linux-2.6.16.noarch/arch/x86_64/mm/init-xen.c ---- linux-2.6.16.orig/arch/x86_64/mm/init-xen.c 2006-03-23 16:44:53.000000000 +0100 -+++ linux-2.6.16.noarch/arch/x86_64/mm/init-xen.c 2006-03-23 19:02:17.000000000 +0100 -@@ -812,7 +812,7 @@ void __init clear_kernel_mapping(unsigne - void online_page(struct page *page) - { - ClearPageReserved(page); -- set_page_count(page, 1); -+ init_page_count(page); - __free_page(page); - totalram_pages++; - num_physpages++; -@@ -930,7 +930,7 @@ void free_initmem(void) - addr = (unsigned long)(&__init_begin); - for (; addr < (unsigned long)(&__init_end); addr += PAGE_SIZE) { - ClearPageReserved(virt_to_page(addr)); -- set_page_count(virt_to_page(addr), 1); -+ init_page_count(virt_to_page(addr)); - memset((void *)(addr & ~(PAGE_SIZE-1)), 0xcc, PAGE_SIZE); - make_page_writable( - __va(__pa(addr)), XENFEAT_writable_page_tables); -@@ -978,7 +978,7 @@ void free_initrd_mem(unsigned long start - printk ("Freeing initrd memory: %ldk freed\n", (end - start) >> 10); - for (; start < end; start += PAGE_SIZE) { - ClearPageReserved(virt_to_page(start)); -- set_page_count(virt_to_page(start), 1); -+ init_page_count(virt_to_page(start)); - free_page(start); - totalram_pages++; - } -diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff linux-2.6.16.orig/drivers/xen/balloon/balloon.c linux-2.6.16.noarch/drivers/xen/balloon/balloon.c ---- linux-2.6.16.orig/drivers/xen/balloon/balloon.c 2006-03-23 16:44:53.000000000 +0100 -+++ linux-2.6.16.noarch/drivers/xen/balloon/balloon.c 2006-03-23 19:00:45.000000000 +0100 -@@ -231,7 +231,7 @@ static int increase_reservation(unsigned - - /* Relinquish the page back to the allocator. */ - ClearPageReserved(page); -- set_page_count(page, 1); -+ init_page_count(page); - __free_page(page); - } - -diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff linux-2.6.16.orig/drivers/xen/netback/netback.c linux-2.6.16.noarch/drivers/xen/netback/netback.c ---- linux-2.6.16.orig/drivers/xen/netback/netback.c 2006-03-23 16:44:53.000000000 +0100 -+++ linux-2.6.16.noarch/drivers/xen/netback/netback.c 2006-03-23 19:00:32.000000000 +0100 -@@ -665,7 +665,7 @@ static void netif_page_release(struct pa - u16 pending_idx = page - virt_to_page(mmap_vstart); - - /* Ready for next use. */ -- set_page_count(page, 1); -+ init_page_count(page); - - netif_idx_release(pending_idx); - } -@@ -785,7 +785,7 @@ static int __init netback_init(void) - - for (i = 0; i < MAX_PENDING_REQS; i++) { - page = virt_to_page(MMAP_VADDR(i)); -- set_page_count(page, 1); -+ init_page_count(page); - SetPageForeign(page, netif_page_release); - } - linux-2.6-xen-compile-fixes.patch: arch/i386/kernel/acpi/boot-xen.c | 3 +- linux-2.6.15.ia64/fs/Kconfig | 1 linux-2.6.15.xen/arch/i386/kernel/Makefile | 3 -- linux-2.6.15.xen/arch/i386/kernel/smp-xen.c | 1 linux-2.6.15.xen/arch/i386/mm/init-xen.c | 1 linux-2.6.15.xen/arch/x86_64/kernel/pmtimer.c | 2 + linux-2.6.15.xen/arch/x86_64/kernel/process-xen.c | 6 ---- linux-2.6.15.xen/arch/x86_64/mm/fault-xen.c | 2 - linux-2.6.15.xen/include/asm-i386/mach-xen/asm/desc.h | 14 +++++++++++ linux-2.6.15.xen/include/asm-i386/mach-xen/asm/mmu.h | 7 +++++ linux-2.6.15.xen/include/asm-i386/mach-xen/asm/pgalloc.h | 1 linux-2.6.15.xen/include/asm-i386/mach-xen/asm/processor.h | 7 ++++- linux-2.6.15.xen/include/asm-i386/mach-xen/asm/swiotlb.h | 1 linux-2.6.15.xen/include/asm-x86_64/mach-xen/asm/pgalloc.h | 7 +++++ linux-2.6.15.xen/include/asm-x86_64/mach-xen/asm/pgtable.h | 2 - linux-2.6.15.xen/include/asm-x86_64/mach-xen/asm/processor.h | 2 + linux-2.6.16.noarch/arch/i386/mm/init-xen.c | 8 +++--- linux-2.6.16.noarch/arch/i386/mm/pgtable-xen.c | 4 +-- linux-2.6.16.noarch/arch/x86_64/mm/init-xen.c | 6 ++-- linux-2.6.16.noarch/drivers/xen/balloon/balloon.c | 2 - linux-2.6.16.noarch/drivers/xen/netback/netback.c | 4 +-- 21 files changed, 59 insertions(+), 25 deletions(-) Index: linux-2.6-xen-compile-fixes.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-xen-compile-fixes.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- linux-2.6-xen-compile-fixes.patch 6 Mar 2006 16:31:47 -0000 1.2 +++ linux-2.6-xen-compile-fixes.patch 23 Mar 2006 21:21:22 -0000 1.3 @@ -231,3 +231,126 @@ return 0; } +diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff linux-2.6.16.orig/arch/i386/mm/init-xen.c linux-2.6.16.noarch/arch/i386/mm/init-xen.c +--- linux-2.6.16.orig/arch/i386/mm/init-xen.c 2006-03-23 16:45:01.000000000 +0100 ++++ linux-2.6.16.noarch/arch/i386/mm/init-xen.c 2006-03-23 19:03:36.000000000 +0100 +@@ -317,7 +317,7 @@ static void __init permanent_kmaps_init( + + static void __meminit free_new_highpage(struct page *page, int pfn) + { +- set_page_count(page, 1); ++ init_page_count(page); + if (pfn < xen_start_info->nr_pages) + __free_page(page); + totalhigh_pages++; +@@ -676,7 +676,7 @@ void __init mem_init(void) + /* XEN: init and count low-mem pages outside initial allocation. */ + for (pfn = xen_start_info->nr_pages; pfn < max_low_pfn; pfn++) { + ClearPageReserved(&mem_map[pfn]); +- set_page_count(&mem_map[pfn], 1); ++ init_page_count(&mem_map[pfn]); + totalram_pages++; + } + +@@ -814,7 +814,7 @@ void free_initmem(void) + addr = (unsigned long)(&__init_begin); + for (; addr < (unsigned long)(&__init_end); addr += PAGE_SIZE) { + ClearPageReserved(virt_to_page(addr)); +- set_page_count(virt_to_page(addr), 1); ++ init_page_count(virt_to_page(addr)); + memset((void *)addr, 0xcc, PAGE_SIZE); + free_page(addr); + totalram_pages++; +@@ -853,7 +853,7 @@ void free_initrd_mem(unsigned long start + printk (KERN_INFO "Freeing initrd memory: %ldk freed\n", (end - start) >> 10); + for (; start < end; start += PAGE_SIZE) { + ClearPageReserved(virt_to_page(start)); +- set_page_count(virt_to_page(start), 1); ++ init_page_count(virt_to_page(start)); + free_page(start); + totalram_pages++; + } +diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff linux-2.6.16.orig/arch/i386/mm/pgtable-xen.c linux-2.6.16.noarch/arch/i386/mm/pgtable-xen.c +--- linux-2.6.16.orig/arch/i386/mm/pgtable-xen.c 2006-03-23 16:44:59.000000000 +0100 ++++ linux-2.6.16.noarch/arch/i386/mm/pgtable-xen.c 2006-03-23 19:04:29.000000000 +0100 +@@ -236,7 +236,7 @@ struct page *pte_alloc_one(struct mm_str + pte = alloc_pages(GFP_KERNEL|__GFP_REPEAT|__GFP_ZERO, 0); + if (pte) { + SetPageForeign(pte, pte_free); +- set_page_count(pte, 1); ++ init_page_count(pte); + } + #endif + return pte; +@@ -251,7 +251,7 @@ void pte_free(struct page *pte) + va, pfn_pte(page_to_pfn(pte), PAGE_KERNEL), 0)); + + ClearPageForeign(pte); +- set_page_count(pte, 1); ++ init_page_count(pte); + + __free_page(pte); + } +diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff linux-2.6.16.orig/arch/x86_64/mm/init-xen.c linux-2.6.16.noarch/arch/x86_64/mm/init-xen.c +--- linux-2.6.16.orig/arch/x86_64/mm/init-xen.c 2006-03-23 16:44:53.000000000 +0100 ++++ linux-2.6.16.noarch/arch/x86_64/mm/init-xen.c 2006-03-23 19:02:17.000000000 +0100 +@@ -812,7 +812,7 @@ void __init clear_kernel_mapping(unsigne + void online_page(struct page *page) + { + ClearPageReserved(page); +- set_page_count(page, 1); ++ init_page_count(page); + __free_page(page); + totalram_pages++; + num_physpages++; +@@ -930,7 +930,7 @@ void free_initmem(void) + addr = (unsigned long)(&__init_begin); + for (; addr < (unsigned long)(&__init_end); addr += PAGE_SIZE) { + ClearPageReserved(virt_to_page(addr)); +- set_page_count(virt_to_page(addr), 1); ++ init_page_count(virt_to_page(addr)); + memset((void *)(addr & ~(PAGE_SIZE-1)), 0xcc, PAGE_SIZE); + make_page_writable( + __va(__pa(addr)), XENFEAT_writable_page_tables); +@@ -978,7 +978,7 @@ void free_initrd_mem(unsigned long start + printk ("Freeing initrd memory: %ldk freed\n", (end - start) >> 10); + for (; start < end; start += PAGE_SIZE) { + ClearPageReserved(virt_to_page(start)); +- set_page_count(virt_to_page(start), 1); ++ init_page_count(virt_to_page(start)); + free_page(start); + totalram_pages++; + } +diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff linux-2.6.16.orig/drivers/xen/balloon/balloon.c linux-2.6.16.noarch/drivers/xen/balloon/balloon.c +--- linux-2.6.16.orig/drivers/xen/balloon/balloon.c 2006-03-23 16:44:53.000000000 +0100 ++++ linux-2.6.16.noarch/drivers/xen/balloon/balloon.c 2006-03-23 19:00:45.000000000 +0100 +@@ -231,7 +231,7 @@ static int increase_reservation(unsigned + + /* Relinquish the page back to the allocator. */ + ClearPageReserved(page); +- set_page_count(page, 1); ++ init_page_count(page); + __free_page(page); + } + +diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff linux-2.6.16.orig/drivers/xen/netback/netback.c linux-2.6.16.noarch/drivers/xen/netback/netback.c +--- linux-2.6.16.orig/drivers/xen/netback/netback.c 2006-03-23 16:44:53.000000000 +0100 ++++ linux-2.6.16.noarch/drivers/xen/netback/netback.c 2006-03-23 19:00:32.000000000 +0100 +@@ -665,7 +665,7 @@ static void netif_page_release(struct pa + u16 pending_idx = page - virt_to_page(mmap_vstart); + + /* Ready for next use. */ +- set_page_count(page, 1); ++ init_page_count(page); + + netif_idx_release(pending_idx); + } +@@ -785,7 +785,7 @@ static int __init netback_init(void) + + for (i = 0; i < MAX_PENDING_REQS; i++) { + page = virt_to_page(MMAP_VADDR(i)); +- set_page_count(page, 1); ++ init_page_count(page); + SetPageForeign(page, netif_page_release); + } + From fedora-cvs-commits at redhat.com Thu Mar 23 22:49:07 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 23 Mar 2006 17:49:07 -0500 Subject: rpms/xorg-x11-server/devel xorg-x11-server.spec,1.47,1.48 Message-ID: <200603232249.k2NMn734021767@cvs.devel.redhat.com> Author: krh Update of /cvs/dist/rpms/xorg-x11-server/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv21754 Modified Files: xorg-x11-server.spec Log Message: - Pass --with-dri-driver-path so we're sure to point it to the right path. Index: xorg-x11-server.spec =================================================================== RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- xorg-x11-server.spec 22 Mar 2006 22:26:55 -0000 1.47 +++ xorg-x11-server.spec 23 Mar 2006 22:49:05 -0000 1.48 @@ -27,6 +27,8 @@ Patch6: xserver-1.0.1-randr-sdk.patch # https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=181292. hacky patch Patch7: xorg-x11-server-1.0.1-fpic-libxf86config.patch + +# Already in CVS as of Thu Mar 23 17:48:39 EST 2006 Patch8: xorg-server-1.0.99-composite-visibility.patch Patch1000: xorg-redhat-die-ugly-pattern-die-die-die.patch @@ -36,6 +38,7 @@ ExcludeArch: s390 s390x ppc64 %define moduledir %{_libdir}/xorg/modules +%define drimoduledir %{_libdir}/dri %define sdkdir %{_includedir}/xorg %ifarch %{ix86} x86_64 ppc ia64 @@ -267,6 +270,7 @@ %if %{with_dri} --enable-dri \ --with-mesa-source=%{_builddir}/%{pkgname}-%{version}/Mesa-6.5 \ + --with-dri-driver-path=%{drimoduledir} \ %endif --with-module-dir=%{moduledir} \ --with-os-name="Fedora Core 5" \ @@ -521,6 +525,9 @@ # ------------------------------------------------------------------- %changelog +* Thu Mar 23 2006 Kristian H??gsberg +- Pass --with-dri-driver-path so we're sure to point it to the right path. + * Wed Mar 22 2006 Soren Sandmann 1.0.99.1-2 - Add xorg-server-1.0.99-composite-visibility.patch to get rid of flashing titlebars in compositing metacity. From fedora-cvs-commits at redhat.com Thu Mar 23 22:50:47 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 23 Mar 2006 17:50:47 -0500 Subject: rpms/selinux-policy-targeted/FC-4 selinux-policy-targeted.spec, 1.364, 1.365 Message-ID: <200603232250.k2NMolrg021793@cvs.devel.redhat.com> Author: rcoker Update of /cvs/dist/rpms/selinux-policy-targeted/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv21780 Modified Files: selinux-policy-targeted.spec Log Message: Forgot to update version field Index: selinux-policy-targeted.spec =================================================================== RCS file: /cvs/dist/rpms/selinux-policy-targeted/FC-4/selinux-policy-targeted.spec,v retrieving revision 1.364 retrieving revision 1.365 diff -u -r1.364 -r1.365 --- selinux-policy-targeted.spec 23 Mar 2006 12:34:40 -0000 1.364 +++ selinux-policy-targeted.spec 23 Mar 2006 22:50:45 -0000 1.365 @@ -9,7 +9,7 @@ Summary: SELinux %{type} policy configuration Name: selinux-policy-%{type} Version: 1.27.1 -Release: 2.27 +Release: 2.28 License: GPL Group: System Environment/Base Source: http://www.nsa.gov/selinux/archives/policy-%{version}.tgz From fedora-cvs-commits at redhat.com Thu Mar 23 23:51:10 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 23 Mar 2006 18:51:10 -0500 Subject: rpms/kernel/devel linux-2.6-xen-compile-fixes.patch,1.3,1.4 Message-ID: <200603232351.k2NNpAcg017236@cvs.devel.redhat.com> Author: quintela Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv17220 Modified Files: linux-2.6-xen-compile-fixes.patch Log Message: fix x86_64 xen build linux-2.6-xen-compile-fixes.patch: arch/i386/kernel/acpi/boot-xen.c | 3 linux-2.6.15.ia64/fs/Kconfig | 1 linux-2.6.15.xen/arch/i386/kernel/Makefile | 3 linux-2.6.15.xen/arch/i386/kernel/smp-xen.c | 1 linux-2.6.15.xen/arch/i386/mm/init-xen.c | 1 linux-2.6.15.xen/arch/x86_64/kernel/pmtimer.c | 2 linux-2.6.15.xen/arch/x86_64/kernel/process-xen.c | 6 - linux-2.6.15.xen/arch/x86_64/mm/fault-xen.c | 2 linux-2.6.15.xen/include/asm-i386/mach-xen/asm/desc.h | 14 ++ linux-2.6.15.xen/include/asm-i386/mach-xen/asm/mmu.h | 7 + linux-2.6.15.xen/include/asm-i386/mach-xen/asm/pgalloc.h | 1 linux-2.6.15.xen/include/asm-i386/mach-xen/asm/processor.h | 7 + linux-2.6.15.xen/include/asm-i386/mach-xen/asm/swiotlb.h | 1 linux-2.6.15.xen/include/asm-x86_64/mach-xen/asm/pgalloc.h | 7 + linux-2.6.15.xen/include/asm-x86_64/mach-xen/asm/pgtable.h | 2 linux-2.6.15.xen/include/asm-x86_64/mach-xen/asm/processor.h | 2 linux-2.6.16.noarch/arch/i386/mm/init-xen.c | 8 - linux-2.6.16.noarch/arch/i386/mm/pgtable-xen.c | 4 linux-2.6.16.noarch/arch/x86_64/mm/init-xen.c | 6 - linux-2.6.16.noarch/arch/x86_64/mm/pageattr-xen.c | 63 ++++------- linux-2.6.16.noarch/drivers/xen/balloon/balloon.c | 2 linux-2.6.16.noarch/drivers/xen/netback/netback.c | 4 22 files changed, 86 insertions(+), 61 deletions(-) Index: linux-2.6-xen-compile-fixes.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-xen-compile-fixes.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- linux-2.6-xen-compile-fixes.patch 23 Mar 2006 21:21:22 -0000 1.3 +++ linux-2.6-xen-compile-fixes.patch 23 Mar 2006 23:51:08 -0000 1.4 @@ -354,3 +354,119 @@ SetPageForeign(page, netif_page_release); } +diff -uNp linux-2.6.16.noarch/arch/x86_64/mm/pageattr-xen.c.orig linux-2.6.16.noarch/arch/x86_64/mm/pageattr-xen.c +--- linux-2.6.16.noarch/arch/x86_64/mm/pageattr-xen.c.orig 2006-03-23 22:18:23.000000000 +0100 ++++ linux-2.6.16.noarch/arch/x86_64/mm/pageattr-xen.c 2006-03-24 00:15:24.000000000 +0100 +@@ -199,6 +199,13 @@ static struct page *split_large_page(uns + pte_t *pbase; + if (!base) + return NULL; ++ /* ++ * page_private is used to track the number of entries in ++ * the page table page have non standard attributes. ++ */ ++ SetPagePrivate(base); ++ page_private(base) = 0; ++ + address = __pa(address); + addr = address & LARGE_PAGE_MASK; + pbase = (pte_t *)page_address(base); +@@ -231,26 +238,12 @@ static inline void flush_map(unsigned lo + on_each_cpu(flush_kernel_map, (void *)address, 1, 1); + } + +-struct deferred_page { +- struct deferred_page *next; +- struct page *fpage; +- unsigned long address; +-}; +-static struct deferred_page *df_list; /* protected by init_mm.mmap_sem */ ++static struct page *deferred_pages; /* protected by init_mm.mmap_sem */ + +-static inline void save_page(unsigned long address, struct page *fpage) ++static inline void save_page(struct page *fpage) + { +- struct deferred_page *df; +- df = kmalloc(sizeof(struct deferred_page), GFP_KERNEL); +- if (!df) { +- flush_map(address); +- __free_page(fpage); +- } else { +- df->next = df_list; +- df->fpage = fpage; +- df->address = address; +- df_list = df; +- } ++ fpage->lru.next = (struct list_head *)deferred_pages; ++ deferred_pages = fpage; + } + + /* +@@ -292,8 +285,8 @@ __change_page_attr(unsigned long address + set_pte(kpte, pfn_pte(pfn, prot)); + } else { + /* +- * split_large_page will take the reference for this change_page_attr +- * on the split page. ++ * split_large_page will take the reference for this ++ * change_page_attr on the split page. + */ + + struct page *split; +@@ -305,10 +298,11 @@ __change_page_attr(unsigned long address + set_pte(kpte,mk_pte(split, ref_prot2)); + kpte_page = split; + } +- get_page(kpte_page); ++ page_private(kpte_page)++; + } else if ((kpte_flags & _PAGE_PSE) == 0) { + set_pte(kpte, pfn_pte(pfn, ref_prot)); +- __put_page(kpte_page); ++ BUG_ON(page_private(kpte_page) == 0); ++ page_private(kpte_page)--; + } else + BUG(); + +@@ -324,13 +318,9 @@ __change_page_attr(unsigned long address + #else + if (!PageReserved(kpte_page)) + #endif +- switch (page_count(kpte_page)) { +- case 1: +- save_page(address, kpte_page); ++ if (page_private(kpte_page) == 0) { ++ save_page(kpte_page); + revert_page(address, ref_prot); +- break; +- case 0: +- BUG(); /* memleak and failed 2M page regeneration */ + } + return 0; + } +@@ -383,17 +373,18 @@ int change_page_attr(struct page *page, + + void global_flush_tlb(void) + { +- struct deferred_page *df, *next_df; ++ struct page *dpage; + + down_read(&init_mm.mmap_sem); +- df = xchg(&df_list, NULL); ++ dpage = xchg(&deferred_pages, NULL); + up_read(&init_mm.mmap_sem); +- flush_map((df && !df->next) ? df->address : 0); +- for (; df; df = next_df) { +- next_df = df->next; +- if (df->fpage) +- __free_page(df->fpage); +- kfree(df); ++ ++ flush_map((dpage && !dpage->lru.next) ? (unsigned long)page_address(dpage) : 0); ++ while (dpage) { ++ struct page *tmp = dpage; ++ dpage = (struct page *)dpage->lru.next; ++ ClearPagePrivate(tmp); ++ __free_page(tmp); + } + } + From fedora-cvs-commits at redhat.com Fri Mar 24 08:52:19 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 24 Mar 2006 03:52:19 -0500 Subject: rpms/man/FC-5 man.spec,1.46,1.47 Message-ID: <200603240852.k2O8qJHG008014@cvs.devel.redhat.com> Author: varekova Update of /cvs/dist/rpms/man/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv8001 Modified Files: man.spec Log Message: fix the encoding of the Bulgarian translation Index: man.spec =================================================================== RCS file: /cvs/dist/rpms/man/FC-5/man.spec,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- man.spec 27 Feb 2006 13:46:03 -0000 1.46 +++ man.spec 24 Mar 2006 08:52:17 -0000 1.47 @@ -4,7 +4,7 @@ Summary: A set of documentation tools: man, apropos and whatis. Name: man Version: 1.6c -Release: 2 +Release: 2.fc5 License: GPL Group: System Environment/Base Source0: http://primates.ximian.com/~flucifredi/man/man-%{version}.tar.gz @@ -320,7 +320,7 @@ %attr(0775,root,man) %dir %{cache}/X11R6/cat[123456789n] %changelog -* Mon Feb 27 2006 Ivana Varekova - 1.6c-2 +* Mon Feb 27 2006 Ivana Varekova - 1.6c-2.fc5 - fix the encoding of the Bulgarian translation * Fri Feb 10 2006 Jesse Keating - 1.6c-1.2 From fedora-cvs-commits at redhat.com Fri Mar 24 09:17:00 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 24 Mar 2006 04:17:00 -0500 Subject: rpms/cups/devel cups-1.2svn5335.patch, NONE, 1.1 cups.spec, 1.137, 1.138 cups-1.2svn5322.patch, 1.1, NONE Message-ID: <200603240917.k2O9H0Gv010899@cvs.devel.redhat.com> Author: twaugh Update of /cvs/dist/rpms/cups/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv8744 Modified Files: cups.spec Added Files: cups-1.2svn5335.patch Removed Files: cups-1.2svn5322.patch Log Message: * Fri Mar 24 2006 Tim Waugh 1:1.2-0.1.b2.4 - Update to svn snapshot. cups-1.2svn5335.patch: CHANGES.txt | 58 CREDITS.txt | 62 Makedefs.in | 39 Makefile | 42 cgi-bin/admin.c | 8 cgi-bin/var.c | 10 config-scripts/cups-common.m4 | 10 config-scripts/cups-compiler.m4 | 260 ++ config-scripts/cups-defaults.m4 | 6 config-scripts/cups-directories.m4 | 15 config-scripts/cups-image.m4 | 24 configure.in | 23 cups/Dependencies | 189 +- cups/Makefile | 16 cups/adminutil.c | 6 cups/config-scripts/cups-pdf.m4 | 43 cups/desktop/cups.desktop | 19 cups/doc/es/index.html.in | 146 + cups/encode.c | 6 cups/file.c | 294 +++ cups/file.h | 9 cups/globals.c | 12 cups/globals.h | 19 cups/http.c | 5 cups/http.h | 6 cups/i18n.h | 39 cups/init/cups-lpd.in | 11 cups/ipp.c | 31 cups/libcups_s.exp | 10 cups/man/cupstestdsc.man | 59 cups/ppd.c | 100 - cups/string.c | 10 cups/systemv/cupstestdsc.c | 447 +++++ cups/templates/es/header.tmpl.in | 63 cups/testi18n.c | 907 +++------- cups/transcode.c | 2013 ++++++++++------------ cups/transcode.h | 127 - data/Makefile | 14 doc/Makefile | 6 doc/help/network.html | 2 doc/help/ref-cupsd-conf.html | 2 doc/help/security.html | 7 filter/Makefile | 20 filter/pstops.c | 3279 ++++++++++++++++++++++--------------- filter/rastertolabel.c | 54 locale/Makefile | 14 locale/cups.pot | 1178 +------------ locale/cups_ja.po | 1307 ++------------ man/Makefile | 5 man/backend.man | 8 man/cancel.man | 4 man/cups-lpd.man.in | 14 man/cupsaddsmb.man.in | 8 man/cupsd.conf.man.in | 26 man/filter.man | 17 man/lp.man | 10 man/lpadmin.man | 9 man/lpoptions.man.in | 8 man/lppasswd.man | 8 man/lpstat.man | 8 man/mime.convs.man | 8 packaging/cups.list.in | 52 packaging/cups.spec.in | 47 ppd/zebracpl.ppd | 16 scheduler/auth.c | 138 - scheduler/auth.h | 6 scheduler/banners.c | 141 - scheduler/banners.h | 6 scheduler/cert.c | 7 scheduler/client.c | 894 +++++----- scheduler/client.h | 10 scheduler/conf.c | 6 scheduler/cups-driverd.c | 51 scheduler/cups-polld.c | 11 scheduler/cupsd.h | 7 scheduler/dirsvc.c | 991 +++++------ scheduler/dirsvc.h | 9 scheduler/env.c | 39 scheduler/ipp.c | 97 - scheduler/job.c | 1985 ++++++++++------------ scheduler/job.h | 6 scheduler/main.c | 95 - scheduler/printers.c | 192 -- scheduler/printers.h | 8 scheduler/quotas.c | 127 - scheduler/server.c | 5 scheduler/subscriptions.c | 212 +- scheduler/subscriptions.h | 7 scheduler/sysman.c | 36 scheduler/testdirsvc.c | 6 scheduler/testspeed.c | 20 scheduler/util.c | 6 systemv/Dependencies | 27 systemv/Makefile | 23 systemv/lpstat.c | 12 templates/Makefile | 5 templates/choose-uri.tmpl | 4 templates/ja/admin.tmpl | 7 templates/ja/choose-uri.tmpl | 4 99 files changed, 8131 insertions(+), 8344 deletions(-) --- NEW FILE cups-1.2svn5335.patch --- --- cups-1.2b2/cgi-bin/admin.c 2006-03-08 18:34:07.000000000 +0000 +++ cups/cgi-bin/admin.c 2006-03-22 16:50:34.000000000 +0000 @@ -1,5 +1,5 @@ /* - * "$Id: admin.c 5251 2006-03-08 18:34:07Z mike $" + * "$Id: admin.c 5290 2006-03-14 21:43:57Z mike $" * * Administration CGI for the Common UNIX Printing System (CUPS). * @@ -2624,11 +2624,11 @@ NULL, uri); if (num_users == 0) - ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME, + ippAddString(request, IPP_TAG_PRINTER, IPP_TAG_NAME, "requesting-user-name-allowed", NULL, "all"); else { - attr = ippAddStrings(request, IPP_TAG_OPERATION, IPP_TAG_NAME, + attr = ippAddStrings(request, IPP_TAG_PRINTER, IPP_TAG_NAME, type, num_users, NULL, NULL); for (i = 0, ptr = (char *)users; *ptr; i ++) @@ -2859,5 +2859,5 @@ /* - * End of "$Id: admin.c 5251 2006-03-08 18:34:07Z mike $". + * End of "$Id: admin.c 5290 2006-03-14 21:43:57Z mike $". */ --- cups-1.2b2/cgi-bin/var.c 2005-12-06 02:43:40.000000000 +0000 +++ cups/cgi-bin/var.c 2006-03-24 08:34:05.000000000 +0000 @@ -1,5 +1,5 @@ /* - * "$Id: var.c 4869 2005-12-06 02:43:40Z mike $" + * "$Id: var.c 5331 2006-03-23 21:21:19Z mike $" * * CGI form variable and array functions. * @@ -239,6 +239,12 @@ cupsSetPasswordCB(cgi_passwd); + /* + * Set the locale so that times, etc. are formatted properly... + */ + + setlocale(LC_ALL, ""); + #ifdef DEBUG /* * Disable output buffering to find bugs... @@ -1020,5 +1026,5 @@ /* - * End of "$Id: var.c 4869 2005-12-06 02:43:40Z mike $". + * End of "$Id: var.c 5331 2006-03-23 21:21:19Z mike $". */ --- cups-1.2b2/CHANGES.txt 2006-03-10 20:18:44.000000000 +0000 +++ cups/CHANGES.txt 2006-03-24 08:34:06.000000000 +0000 @@ -1,6 +1,62 @@ -CHANGES.txt - 2006-03-10 +CHANGES.txt - 2006-03-23 ------------------------ +CHANGES IN CUPS V1.2rc1 + + - Documentation updates (STR #1497, STR #1498) + - The scheduler now redirects browsers to https: URLs + when encryption is required. + - The scheduler would crash when printing with a banner + (STR #1500) + - cups-driverd did not use the LanguageEncoding attribute + in PPD files to convert the NickName to UTF-8 (STR + #1503) + - The lpadmin command could not set the + printer-error-policy attribute (STR #1504) + - The web interface did not show the time and date in the + correct format for the locale (STR #1505) + - CUPS no longer accepts print jobs if a printer does not + support the file format (STR #1501) + - Cleaned up the PostScript filter (pstops) so that it + properly supports %%IncludeFeature and page scaling + (STR #1453) + - Fixed the cupsFileRewind() and cupsFileSeek() functions + to work properly with uncompressed files. + - Added cupsFileGetLine(), cupsFileStderr(), + cupsFileStdin(), and cupsFileStdout() functions to the + CUPS library. + - Added a new cupstestdsc program to test the DSC + conformance of PostScript files. + - Added KDE/GNOME icons and a Manage Printers menu item. + - Added --enable-image and --enable-pdftops configure + options to control whether the image and PDF filters + are built and installed (default = yes for all + platforms but MacOS X) + - Fixed a minor memory leak in the PPD API. + - Fixed transcoding issues (STR #1493) + - The scheduler now enforces a minimum job cost of 100 + when doing FilterLimit checks. + - The scheduler would leak file descriptors when printing + to raw queues (STR #1491) + - The IPv6 support did not compile on Tru64 UNIX (STR + #1488) + - ppdOpen2() now converts the NickName and all UI text to + UTF-8 (STR #1475) + - The Set Allows Users web page did not work (STR #1486) + - When the default policy was not set or set to a non- + existing policy, the scheduler did not set the default + policy name to "default" (STR #1484) + - The Zebra CPCL driver did not use the correct righthand + margin for the 4" wide label sizes. + - Fixed a problem with the parsing of fractional real + numbers in PPD files. + - Added Spanish localization files (STR #1480) + - Fixed localization of a few scheduler messages (STR + #1478) + - Fixed support for HEAD requests in the scheduler (STR + #1481) + + CHANGES IN CUPS V1.2b2 - Updated the CUPS design description. --- cups-1.2b2/config-scripts/cups-common.m4 2006-03-10 21:18:04.000000000 +0000 +++ cups/config-scripts/cups-common.m4 2006-03-22 16:48:03.000000000 +0000 @@ -1,5 +1,5 @@ dnl -dnl "$Id: cups-common.m4 5229 2006-03-05 16:48:12Z mike $" +dnl "$Id: cups-common.m4 5288 2006-03-14 02:38:07Z mike $" dnl dnl Common configuration stuff for the Common UNIX Printing System (CUPS). dnl @@ -29,8 +29,8 @@ AC_CONFIG_HEADER(config.h) dnl Versio number information... -CUPS_VERSION=1.2b2 -CUPS_REVISION= +CUPS_VERSION="1.2svn" +CUPS_REVISION="" if test -z "$CUPS_REVISION" -a -d .svn; then CUPS_REVISION="-r`svnversion . | awk -F: '{print $NF}' | sed -e '1,$s/[[a-zA-Z]]*//g'`" fi @@ -63,7 +63,7 @@ AC_PATH_PROG(LN,ln) AC_PATH_PROG(MV,mv) AC_PATH_PROG(RM,rm) -AC_PATH_PROG(RM,rmdir) +AC_PATH_PROG(RMDIR,rmdir) AC_PATH_PROG(SED,sed) AC_PATH_PROG(STRIP,strip) @@ -264,5 +264,5 @@ AC_DEFINE_UNQUOTED(CUPS_DEFAULT_IPP_PORT,$DEFAULT_IPP_PORT) dnl -dnl End of "$Id: cups-common.m4 5229 2006-03-05 16:48:12Z mike $". +dnl End of "$Id: cups-common.m4 5288 2006-03-14 02:38:07Z mike $". dnl --- cups-1.2b2/config-scripts/cups-compiler.m4 2006-03-10 20:57:09.000000000 +0000 +++ cups/config-scripts/cups-compiler.m4 2006-03-22 16:48:03.000000000 +0000 @@ -1,5 +1,5 @@ dnl -dnl "$Id: cups-compiler.m4 5274 2006-03-10 20:57:09Z mike $" +dnl "$Id: cups-compiler.m4 5288 2006-03-14 02:38:07Z mike $" dnl dnl Compiler stuff for the Common UNIX Printing System (CUPS). dnl @@ -24,10 +24,13 @@ dnl Clear the debugging and non-shared library options unless the user asks dnl for them... +ARCHFLAGS="" OPTIM="" +AC_SUBST(ARCHFLAGS) AC_SUBST(OPTIM) AC_ARG_WITH(optim, [ --with-optim="flags" set optimization flags ]) +AC_ARG_WITH(archflags, [ --with-arch="flags" set default architecture flags ]) AC_ARG_ENABLE(debug, [ --enable-debug turn on debugging, default=no], [if test x$enable_debug = xyes; then @@ -36,15 +39,16 @@ dnl Setup support for separate 32/64-bit library generation... AC_ARG_ENABLE(32bit, [ --enable-32bit generate 32-bit libraries on 32/64-bit systems, default=no]) +AC_ARG_WITH(arch32flags, [ --with-arch32="flags" specifies 32-bit architecture flags]) -C32FLAGS="" +ARCH32FLAGS="" INSTALL32="" LIB32CUPS="" LIB32CUPSIMAGE="" LIB32DIR="" UNINSTALL32="" -AC_SUBST(C32FLAGS) [...26505 lines suppressed...] + } + else + saw_pages = 1; + } + else if (!strncmp(line, "%%BoundingBox:", 14)) + { + if (strstr(line, "(atend)")) + saw_bounding_box = -1; + else if (sscanf(line + 14, "%d%d%d%d", lbrt + 0, lbrt + 1, lbrt + 2, + lbrt + 3) != 4) + { + if (!status) + _cupsLangPuts(stdout, _("FAIL\n")); + + status ++; + _cupsLangPrintf(stdout, _(" Bad %%%%BoundingBox: on line %d!\n" + " REF: Page 39, %%%%BoundingBox:\n"), + linenum); + } + else + saw_bounding_box = 1; + } + } + else if (saw_begin_prolog && !saw_end_prolog) + { + if (!strncmp(line, "%%EndProlog", 11)) + saw_end_prolog = 1; + } + else if (saw_begin_setup && !saw_end_setup) + { + if (!strncmp(line, "%%EndSetup", 10)) + saw_end_setup = 1; + } + else if (saw_end_comments) + { + if (!strncmp(line, "%%Page:", 7)) + { + if (sscanf(line + 7, "%255s%d", page_label, &page_number) != 2) + { + if (!status) + _cupsLangPuts(stdout, _("FAIL\n")); + + status ++; + _cupsLangPrintf(stdout, _(" Bad %%%%Page: on line %d!\n" + " REF: Page 53, %%%%Page:\n"), + linenum); + } + else + saw_page = 1; + } + else if (!strncmp(line, "%%BeginProlog", 13)) + saw_begin_prolog = 1; + else if (!strncmp(line, "%%BeginSetup", 12)) + saw_begin_setup = 1; + else if (!strncmp(line, "%%BeginDocument:", 16)) + level ++; + else if (!strncmp(line, "%%EndDocument", 13)) + level --; + else if (!strncmp(line, "%%Trailer", 9)) + saw_trailer = 1; + } + + for (i = 0; !binary && i < bytes; i ++) + { + ch = line[i]; + + if ((ch < ' ' || (ch & 0x80)) && ch != '\n' && ch != '\r' && ch != '\t') + binary = 1; + } + } + + if (saw_bounding_box <= 0) + { + if (!status) + _cupsLangPuts(stdout, _("FAIL\n")); + + status ++; + _cupsLangPuts(stdout, _(" Missing or bad %%BoundingBox: comment!\n" + " REF: Page 39, %%BoundingBox:\n")); + } + + if (saw_pages <= 0) + { + if (!status) + _cupsLangPuts(stdout, _("FAIL\n")); + + status ++; + _cupsLangPuts(stdout, _(" Missing or bad %%Pages: comment!\n" + " REF: Page 43, %%Pages:\n")); + } + + if (!saw_end_comments) + { + if (!status) + _cupsLangPuts(stdout, _("FAIL\n")); + + status ++; + _cupsLangPuts(stdout, _(" Missing %%EndComments comment!\n" + " REF: Page 41, %%EndComments\n")); + } + + if (!saw_page) + { + if (!status) + _cupsLangPuts(stdout, _("FAIL\n")); + + status ++; + _cupsLangPuts(stdout, _(" Missing or bad %%Page: comments!\n" + " REF: Page 53, %%Page:\n")); + } + + if (level < 0) + { + if (!status) + _cupsLangPuts(stdout, _("FAIL\n")); + + status ++; + _cupsLangPuts(stdout, _(" Too many %%EndDocument comments!\n")); + } + else if (level > 0) + { + if (!status) + _cupsLangPuts(stdout, _("FAIL\n")); + + status ++; + _cupsLangPuts(stdout, _(" Too many %%BeginDocument comments!\n")); + } + + if (saw_long_line > 1) + _cupsLangPrintf(stderr, + _(" Saw %d lines that exceeded 255 characters!\n"), + saw_long_line); + + if (!status) + _cupsLangPuts(stdout, _("PASS\n")); + + if (binary) + _cupsLangPuts(stdout, _(" Warning: file contains binary data!\n")); + + if (version < 3.0f) + _cupsLangPrintf(stdout, + _(" Warning: obsolete DSC version %.1f in file!\n"), + version); + + if (saw_end_comments < 0) + _cupsLangPuts(stdout, _(" Warning: no %%EndComments comment in file!\n")); + + cupsFileClose(fp); + + return (status); +} + + +/* + * 'usage()' - Show program usage. + */ + +static void +usage(void) +{ + _cupsLangPuts(stdout, + _("Usage: cupstestdsc [options] filename.ps [... filename.ps]\n" + " cupstestdsc [options] -\n" + "\n" + "Options:\n" + "\n" + " -h Show program usage\n" + "\n" + " Note: this program only validates the DSC comments, " + "not the PostScript itself.\n")); + + exit(1); +} + + +/* + * End of "$Id: cupstestdsc.c 5320 2006-03-21 19:03:25Z mike $". + */ --- /dev/null 2006-03-24 08:15:34.594119250 +0000 +++ cups/desktop/cups.desktop 2006-03-22 16:48:17.000000000 +0000 @@ -0,0 +1,19 @@ +[Desktop Entry] +Categories=Application;System;X-Red-Hat-Base; +Comment=CUPS Web Interface +Comment[en_US]=CUPS Web Interface +Encoding=UTF-8 +Exec=htmlview http://localhost:631/ +GenericName= +GenericName[en_US]= +Icon=cups +MimeType= +Name=Manage Printing +Path= +StartupNotify=false +Terminal=false +TerminalOptions= +Type=Application +X-DCOP-ServiceType= +X-KDE-SubstituteUID=false +X-KDE-Username= Index: cups.spec =================================================================== RCS file: /cvs/dist/rpms/cups/devel/cups.spec,v retrieving revision 1.137 retrieving revision 1.138 diff -u -r1.137 -r1.138 --- cups.spec 23 Mar 2006 12:37:52 -0000 1.137 +++ cups.spec 24 Mar 2006 09:16:57 -0000 1.138 @@ -7,7 +7,7 @@ Summary: Common Unix Printing System Name: cups Version: 1.2 -Release: 0.1.%{beta}.3 +Release: 0.1.%{beta}.4 License: GPL Group: System Environment/Daemons Source: ftp://ftp.easysw.com/pub/cups/test/cups-1.2%{beta}-source.tar.bz2 @@ -21,7 +21,7 @@ Source10: ncp.backend Source11: cups.conf Source12: cups.cron -Patch0: cups-1.2svn5322.patch +Patch0: cups-1.2svn5335.patch Patch1: cups-1.1.15-initscript.patch Patch2: cups-no-gzip-man.patch Patch3: cups-1.1.16-system-auth.patch @@ -107,7 +107,7 @@ %prep %setup -q -n %{name}-%{version}%{beta} -%patch0 -p1 -b .svn5322 +%patch0 -p1 -b .svn5335 %patch1 -p1 -b .noinit %patch2 -p1 -b .no-gzip-man %patch3 -p1 -b .system-auth @@ -369,6 +369,9 @@ %{cups_serverbin}/daemon/cups-lpd %changelog +* Fri Mar 24 2006 Tim Waugh 1:1.2-0.1.b2.4 +- Update to svn snapshot. + * Thu Mar 23 2006 Tim Waugh 1:1.2-0.1.b2.3 - Update to svn snapshot. No longer need users or policy patches. --- cups-1.2svn5322.patch DELETED --- From fedora-cvs-commits at redhat.com Fri Mar 24 09:27:56 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 24 Mar 2006 04:27:56 -0500 Subject: rpms/openoffice.org/devel openoffice.org.spec,1.650,1.651 Message-ID: <200603240927.k2O9RuWr022550@cvs.devel.redhat.com> Author: caolanm Update of /cvs/dist/rpms/openoffice.org/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv22538 Modified Files: openoffice.org.spec Log Message: rh#186515# missing mime-types Index: openoffice.org.spec =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v retrieving revision 1.650 retrieving revision 1.651 diff -u -r1.650 -r1.651 --- openoffice.org.spec 22 Mar 2006 11:53:38 -0000 1.650 +++ openoffice.org.spec 24 Mar 2006 09:27:54 -0000 1.651 @@ -1,6 +1,6 @@ %define oootag OOB680 %define ooomilestone 5 -%define rh_rpm_release 4 +%define rh_rpm_release 4.cmc %define build_fc6 1 %define build_rhel4 0 @@ -1123,6 +1123,9 @@ echo "StartupNotify=true" >> $RPM_BUILD_ROOT/%{instdir}/share/xdg/writer.desktop echo "StartupNotify=true" >> $RPM_BUILD_ROOT/%{instdir}/share/xdg/math.desktop echo "StartupNotify=true" >> $RPM_BUILD_ROOT/%{instdir}/share/xdg/draw.desktop +# rh#156677# / rh#186515# +echo "NoDisplay=true" >> $RPM_BUILD_ROOT/%{instdir}/share/xdg/math.desktop +echo "NoDisplay=true" >> $RPM_BUILD_ROOT/%{instdir}/share/xdg/draw.desktop chmod u-w $RPM_BUILD_ROOT/%{instdir}/share/xdg/*.desktop #relocate the .desktop and icon files @@ -1131,6 +1134,8 @@ mv $RPM_BUILD_ROOT/%{instdir}/share/xdg/calc.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/openoffice.org-1.9-calc.desktop mv $RPM_BUILD_ROOT/%{instdir}/share/xdg/impress.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/openoffice.org-1.9-impress.desktop mv $RPM_BUILD_ROOT/%{instdir}/share/xdg/writer.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/openoffice.org-1.9-writer.desktop +mv $RPM_BUILD_ROOT/%{instdir}/share/xdg/math.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/openoffice.org-1.9-math.desktop +mv $RPM_BUILD_ROOT/%{instdir}/share/xdg/draw.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/openoffice.org-1.9-draw.desktop rm -rf $RPM_BUILD_ROOT/%{instdir}/share/xdg cp -r sysui/unxlng*/misc/redhat/usr/share/icons $RPM_BUILD_ROOT/%{_datadir} cp -r sysui/unxlng*/misc/redhat/usr/share/mime-info $RPM_BUILD_ROOT/%{_datadir} @@ -2968,6 +2973,7 @@ %dir %{instdir}/share/registry/schema/org/openoffice/Office/UI %{instdir}/share/registry/schema/org/openoffice/Office/UI/DrawWindowState.xcs %dir %{_datadir}/applications +%{_datadir}/applications/openoffice.org-*-draw.desktop %dir %{_datadir}/mimelnk %dir %{_datadir}/mimelnk/application %{_datadir}/mimelnk/application/*drawing* @@ -3154,6 +3160,7 @@ %dir %{instdir}/share/registry/schema/org/openoffice/Office/UI %{instdir}/share/registry/schema/org/openoffice/Office/UI/MathCommands.xcs %dir %{_datadir}/applications +%{_datadir}/applications/openoffice.org-*-math.desktop %dir %{_datadir}/mimelnk %dir %{_datadir}/mimelnk/application %{_datadir}/mimelnk/application/*formula* @@ -3259,6 +3266,9 @@ %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu %changelog +* Fru Mar 24 2006 Caolan McNamara - 1:2.0.2-5.4.cmc +- rh#186515# Keep draw and math launchers for mimetypes + * Mon Mar 13 2006 Caolan McNamara - 1:2.0.2-5.4 - ooo#59997# replacement opens___.ttf updated - drop integrated openoffice.org-2.0.0.ooo56651.sw.rtfcrash.patch From fedora-cvs-commits at redhat.com Fri Mar 24 09:28:17 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 24 Mar 2006 04:28:17 -0500 Subject: rpms/openoffice.org/devel openoffice.org.spec,1.651,1.652 Message-ID: <200603240928.k2O9SHTK022595@cvs.devel.redhat.com> Author: caolanm Update of /cvs/dist/rpms/openoffice.org/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv22582 Modified Files: openoffice.org.spec Log Message: rh#186515# missing mime-types Index: openoffice.org.spec =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v retrieving revision 1.651 retrieving revision 1.652 diff -u -r1.651 -r1.652 --- openoffice.org.spec 24 Mar 2006 09:27:54 -0000 1.651 +++ openoffice.org.spec 24 Mar 2006 09:28:14 -0000 1.652 @@ -3266,7 +3266,7 @@ %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu %changelog -* Fru Mar 24 2006 Caolan McNamara - 1:2.0.2-5.4.cmc +* Fri Mar 24 2006 Caolan McNamara - 1:2.0.2-5.4.cmc - rh#186515# Keep draw and math launchers for mimetypes * Mon Mar 13 2006 Caolan McNamara - 1:2.0.2-5.4 From fedora-cvs-commits at redhat.com Fri Mar 24 09:57:52 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 24 Mar 2006 04:57:52 -0500 Subject: rpms/alsa-utils/devel alsa-utils.spec,1.34,1.35 Message-ID: <200603240957.k2O9vqPV004132@cvs.devel.redhat.com> Author: stransky Update of /cvs/dist/rpms/alsa-utils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv4118 Modified Files: alsa-utils.spec Log Message: fixed rules file (#186494) Index: alsa-utils.spec =================================================================== RCS file: /cvs/dist/rpms/alsa-utils/devel/alsa-utils.spec,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- alsa-utils.spec 20 Feb 2006 16:53:36 -0000 1.34 +++ alsa-utils.spec 24 Mar 2006 09:57:50 -0000 1.35 @@ -3,7 +3,7 @@ Summary: Advanced Linux Sound Architecture (ALSA) utilities Name: alsa-utils Version: 1.0.11 -Release: 3.rc2 +Release: 4.rc2 License: GPL Group: Applications/Multimedia URL: http://www.alsa-project.org/ @@ -45,7 +45,7 @@ install -m 755 salsa $RPM_BUILD_ROOT/sbin mkdir -p -m755 $RPM_BUILD_ROOT/etc/udev/rules.d/ -install -m 755 %{SOURCE10} $RPM_BUILD_ROOT/etc/udev/rules.d +install -m 644 %{SOURCE10} $RPM_BUILD_ROOT/etc/udev/rules.d/90-alsa.rules mkdir -p -m755 $RPM_BUILD_ROOT/bin install -m 755 alsaunmute %{buildroot}/bin install -m 755 alsacard %{buildroot}/bin @@ -68,6 +68,9 @@ /usr/share/locale/* %changelog +* Fri Mar 24 2006 Martin Stransky 1.0.11-4.rc2 +- fixed rules file (#186494) + * Mon Feb 20 2006 Martin Stransky 1.0.11-3.rc2 - removed autoreconf From fedora-cvs-commits at redhat.com Fri Mar 24 11:08:55 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 24 Mar 2006 06:08:55 -0500 Subject: rpms/kernel/devel kernel-2.6.spec,1.2087,1.2088 Message-ID: <200603241108.k2OB8tmd031959@cvs.devel.redhat.com> Author: dwmw2 Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv31946 Modified Files: kernel-2.6.spec Log Message: Fix bcm43xx lockup (#180953) Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.2087 retrieving revision 1.2088 diff -u -r1.2087 -r1.2088 --- kernel-2.6.spec 23 Mar 2006 21:21:22 -0000 1.2087 +++ kernel-2.6.spec 24 Mar 2006 11:08:52 -0000 1.2088 @@ -406,6 +406,7 @@ Patch5004: linux-2.6-softmac-scan-dwell-time.patch Patch5005: linux-2.6-bcm43xx-assoc-on-startup.patch Patch5006: linux-2.6-softmac-default-rate.patch +Patch5007: linux-2.6-bcm43xx-set-chan-lockup.patch # # 10000 to 20000 is for stuff that has to come last due to the @@ -1044,6 +1045,9 @@ %patch5005 -p1 # Default to 11Mbps not 54Mbps, since we don't back down automatically yet. %patch5006 -p1 +# bcm43xx dies if we attempt to set the channel while it's down. +%patch5007 -p1 + # # final stuff # @@ -1645,6 +1649,10 @@ %endif %changelog +* Fri Mar 24 2006 David Woodhouse +- Fix lockup when someone takes the bcm43xx device down while it's + scanning (#180953) + * Thu Mar 23 2006 Juan Quintela - disable sky2 (as it is broken upstream) @@ -1660,6 +1668,7 @@ * Wed Mar 22 2006 David Woodhouse - Update the bcm43xx driver to make it work nicely with initscripts and NetworkManager without user intervention. +- Fix Tux build * Tue Mar 21 2006 Dave Jones - 2.6.16-git3 From fedora-cvs-commits at redhat.com Fri Mar 24 11:09:56 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 24 Mar 2006 06:09:56 -0500 Subject: rpms/kernel/devel linux-2.6-bcm43xx-set-chan-lockup.patch,NONE,1.1 Message-ID: <200603241109.k2OB9uqS032001@cvs.devel.redhat.com> Author: dwmw2 Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv31987 Added Files: linux-2.6-bcm43xx-set-chan-lockup.patch Log Message: with the patch too linux-2.6-bcm43xx-set-chan-lockup.patch: bcm43xx_main.c | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) --- NEW FILE linux-2.6-bcm43xx-set-chan-lockup.patch --- --- linux-2.6.16.ppc/drivers/net/wireless/bcm43xx/bcm43xx_main.c~ 2006-03-22 16:52:18.000000000 +0000 +++ linux-2.6.16.ppc/drivers/net/wireless/bcm43xx/bcm43xx_main.c 2006-03-24 10:57:53.000000000 +0000 @@ -3937,9 +3937,13 @@ static void bcm43xx_ieee80211_set_chan(s unsigned long flags; spin_lock_irqsave(&bcm->lock, flags); - bcm43xx_mac_suspend(bcm); - bcm43xx_radio_selectchannel(bcm, channel, 0); - bcm43xx_mac_enable(bcm); + if (likely(bcm->initialized)) { + bcm43xx_mac_suspend(bcm); + bcm43xx_radio_selectchannel(bcm, channel, 0); + bcm43xx_mac_enable(bcm); + } else { + bcm->current_core->radio->initial_channel = channel; + } spin_unlock_irqrestore(&bcm->lock, flags); } From fedora-cvs-commits at redhat.com Fri Mar 24 11:10:56 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 24 Mar 2006 06:10:56 -0500 Subject: rpms/kernel/FC-5 linux-2.6-bcm43xx-set-chan-lockup.patch, NONE, 1.1 kernel-2.6.spec, 1.2070, 1.2071 Message-ID: <200603241110.k2OBAudP032042@cvs.devel.redhat.com> Author: dwmw2 Update of /cvs/dist/rpms/kernel/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv32030 Modified Files: kernel-2.6.spec Added Files: linux-2.6-bcm43xx-set-chan-lockup.patch Log Message: Fix bcm43xx lockup (#180953) linux-2.6-bcm43xx-set-chan-lockup.patch: bcm43xx_main.c | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) --- NEW FILE linux-2.6-bcm43xx-set-chan-lockup.patch --- --- linux-2.6.16.ppc/drivers/net/wireless/bcm43xx/bcm43xx_main.c~ 2006-03-22 16:52:18.000000000 +0000 +++ linux-2.6.16.ppc/drivers/net/wireless/bcm43xx/bcm43xx_main.c 2006-03-24 10:57:53.000000000 +0000 @@ -3937,9 +3937,13 @@ static void bcm43xx_ieee80211_set_chan(s unsigned long flags; spin_lock_irqsave(&bcm->lock, flags); - bcm43xx_mac_suspend(bcm); - bcm43xx_radio_selectchannel(bcm, channel, 0); - bcm43xx_mac_enable(bcm); + if (likely(bcm->initialized)) { + bcm43xx_mac_suspend(bcm); + bcm43xx_radio_selectchannel(bcm, channel, 0); + bcm43xx_mac_enable(bcm); + } else { + bcm->current_core->radio->initial_channel = channel; + } spin_unlock_irqrestore(&bcm->lock, flags); } Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-5/kernel-2.6.spec,v retrieving revision 1.2070 retrieving revision 1.2071 diff -u -r1.2070 -r1.2071 --- kernel-2.6.spec 22 Mar 2006 14:21:08 -0000 1.2070 +++ kernel-2.6.spec 24 Mar 2006 11:10:49 -0000 1.2071 @@ -412,6 +412,7 @@ Patch5004: linux-2.6-softmac-scan-dwell-time.patch Patch5005: linux-2.6-bcm43xx-assoc-on-startup.patch Patch5006: linux-2.6-softmac-default-rate.patch +Patch5007: linux-2.6-bcm43xx-set-chan-lockup.patch # # 10000 to 20000 is for stuff that has to come last due to the @@ -1064,6 +1065,8 @@ %patch5005 -p1 # Default to 11Mbps not 54Mbps, since we don't back down automatically yet. %patch5006 -p1 +# bcm43xx dies if we attempt to set the channel while it's down. +%patch5007 -p1 # # final stuff @@ -1666,6 +1669,10 @@ %endif %changelog +* Fri Mar 24 2006 David Woodhouse +- Fix lockup when someone takes the bcm43xx device down while it's + scanning (#180953) + * Wed Mar 22 2006 David Woodhouse - Update the bcm43xx driver to make it work nicely with initscripts and NetworkManager without user intervention. From fedora-cvs-commits at redhat.com Fri Mar 24 12:04:22 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 24 Mar 2006 07:04:22 -0500 Subject: rpms/sane-backends/FC-5 sane-backends.spec,1.56,1.57 Message-ID: <200603241204.k2OC4Mij027945@cvs.devel.redhat.com> Author: nphilipp Update of /cvs/dist/rpms/sane-backends/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv27932 Modified Files: sane-backends.spec Log Message: don't include *.la files Index: sane-backends.spec =================================================================== RCS file: /cvs/dist/rpms/sane-backends/FC-5/sane-backends.spec,v retrieving revision 1.56 retrieving revision 1.57 diff -u -r1.56 -r1.57 --- sane-backends.spec 14 Mar 2006 13:48:41 -0000 1.56 +++ sane-backends.spec 24 Mar 2006 12:04:20 -0000 1.57 @@ -94,13 +94,12 @@ %install rm -rf %{buildroot} %{makeinstall} docdir=%{buildroot}/%{_docdir}/%{name}-%{version} -perl -pi -e "s/installed.*/installed=yes/g" $RPM_BUILD_ROOT%{_libdir}/libsane.la -/sbin/ldconfig -n $RPM_BUILD_ROOT%{_libdir} $RPM_BUILD_ROOT%{_libdir}/sane mkdir -p %{buildroot}%{_datadir}/pixmaps install -m 644 %{SOURCE1} %{buildroot}%{_datadir}/pixmaps rm -f %{buildroot}%{_bindir}/gamma4scanimage rm -f %{buildroot}%{_libdir}/sane/*.a %{buildroot}%{_libdir}/*.a +rm -f %{buildroot}%{_libdir}/libsane*.la %{buildroot}%{_libdir}/sane/*.la mkdir -p %{buildroot}/%{_sysconfdir}/udev/rules.d/ sh tools/udev/convert-usermap.sh tools/hotplug/libsane.usermap @@ -141,9 +140,7 @@ %defattr(-,root,root) %{_bindir}/sane-config %{_includedir}/sane -%{_libdir}/libsane*.la %{_libdir}/libsane*.so -%{_libdir}/sane/*.la %{_libdir}/sane/*.so %files docs @@ -156,6 +153,9 @@ %{_docdir}/%{name}-%{version}/sane.ps %changelog +* Fri Mar 24 2006 Nils Philippsen +- don't include *.la files + * Tue Mar 14 2006 Nils Philippsen - 1.0.17-5 - buildrequire automake, autoconf, libtool (#178596) - don't require /sbin/ldconfig, /bin/mktemp, /bin/grep, /bin/cat, /bin/rm From fedora-cvs-commits at redhat.com Fri Mar 24 12:04:42 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 24 Mar 2006 07:04:42 -0500 Subject: rpms/sane-backends/devel sane-backends.spec,1.57,1.58 Message-ID: <200603241204.k2OC4gXS027969@cvs.devel.redhat.com> Author: nphilipp Update of /cvs/dist/rpms/sane-backends/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv27954 Modified Files: sane-backends.spec Log Message: don't include *.la files Index: sane-backends.spec =================================================================== RCS file: /cvs/dist/rpms/sane-backends/devel/sane-backends.spec,v retrieving revision 1.57 retrieving revision 1.58 diff -u -r1.57 -r1.58 --- sane-backends.spec 23 Mar 2006 16:33:20 -0000 1.57 +++ sane-backends.spec 24 Mar 2006 12:04:40 -0000 1.58 @@ -4,7 +4,7 @@ Summary: Scanner access software Name: sane-backends Version: 1.0.17 -Release: 6 +Release: 7 License: GPL (programs), relaxed LGPL (libraries), and public domain (docs) Group: System Environment/Libraries Source0: ftp://ftp.sane-project.org/pub/sane/%{name}-%{version}/%{name}-%{version}.tar.gz @@ -94,13 +94,12 @@ %install rm -rf %{buildroot} %{makeinstall} docdir=%{buildroot}/%{_docdir}/%{name}-%{version} -perl -pi -e "s/installed.*/installed=yes/g" $RPM_BUILD_ROOT%{_libdir}/libsane.la -/sbin/ldconfig -n $RPM_BUILD_ROOT%{_libdir} $RPM_BUILD_ROOT%{_libdir}/sane mkdir -p %{buildroot}%{_datadir}/pixmaps install -m 644 %{SOURCE1} %{buildroot}%{_datadir}/pixmaps rm -f %{buildroot}%{_bindir}/gamma4scanimage rm -f %{buildroot}%{_libdir}/sane/*.a %{buildroot}%{_libdir}/*.a +rm -f %{buildroot}%{_libdir}/libsane*.la %{buildroot}%{_libdir}/sane/*.la mkdir -p %{buildroot}/%{_sysconfdir}/udev/rules.d/ sh tools/udev/convert-usermap.sh tools/hotplug/libsane.usermap @@ -141,9 +140,7 @@ %defattr(-,root,root) %{_bindir}/sane-config %{_includedir}/sane -%{_libdir}/libsane*.la %{_libdir}/libsane*.so -%{_libdir}/sane/*.la %{_libdir}/sane/*.so %files docs @@ -156,6 +153,9 @@ %{_docdir}/%{name}-%{version}/sane.ps %changelog +* Fri Mar 24 2006 Nils Philippsen 1.0.17-7 +- don't include *.la files + * Thu Mar 23 2006 Than Ngo 1.0.17-6 - rebuild against gphoto2 to get rid of gphoto2.la From fedora-cvs-commits at redhat.com Fri Mar 24 13:16:15 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 24 Mar 2006 08:16:15 -0500 Subject: rpms/squirrelmail/devel squirrelmail.spec,1.32,1.33 Message-ID: <200603241316.k2ODGFTU024672@cvs.devel.redhat.com> Author: wtogami Update of /cvs/dist/rpms/squirrelmail/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv23384 Modified Files: squirrelmail.spec Log Message: Fix outgoing Japanese mail to iso-2022-jp for now (#185767) Index: squirrelmail.spec =================================================================== RCS file: /cvs/dist/rpms/squirrelmail/devel/squirrelmail.spec,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- squirrelmail.spec 4 Mar 2006 05:27:18 -0000 1.32 +++ squirrelmail.spec 24 Mar 2006 13:16:13 -0000 1.33 @@ -6,7 +6,7 @@ Summary: SquirrelMail webmail client Name: squirrelmail Version: 1.4.6 -Release: 3.fc5 +Release: 4.fc6 License: GPL URL: http://www.squirrelmail.org/ Group: Applications/Internet @@ -16,7 +16,7 @@ Source2: squirrelmail-splash-fedora.png Source3: squirrelmail-splash-rhel.png Source4: http://prdownloads.sourceforge.net/squirrelmail/all_locales-1.4.6-20060221.tar.bz2 -BuildRoot: %{_tmppath}/%{name}-%{version}-root +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch Requires: httpd, php >= 4.0.4, php-mbstring, perl, tmpwatch >= 2.8, aspell Requires: /usr/sbin/sendmail @@ -84,12 +84,18 @@ -e "s/^\(\$languages\['\([^']*\)'\]\['CHARSET'].*= '\)\([^']*\)';/\1utf-8';/" \ -e "s/^\(\$languages\['\([^']*\)'\]\['LOCALE'].*=\).*/\1 '\2.UTF-8';/" +# Hard-code Japanese to send iso-2022-jp +# Without this, 1.4.6 sends eucjp which is clearly wrong +sed -i s/"$languages\['ja_JP'\]\['CHARSET'\] = 'utf-8';"/"$languages\['ja_JP'\]\['CHARSET'\] = 'iso-2022-jp';"/ functions/i18n.php + + cd locale_tempdir for LOCALE in `ls locale/` ; do SKIPINVALID= case $LOCALE in ja_JP) # ja_JP uses iso2022-jp for email but euc-jp in its interface. + # But why!?!? CHARSET=euc-jp ;; ko_KR) @@ -215,6 +221,9 @@ %{_sysconfdir}/cron.daily/squirrelmail.cron %changelog +* Fri Mar 24 2006 Warren Togami 1.4.6-4 +- Fix outgoing Japanese mail to iso-2022-jp for now (#185767) + * Fri Mar 3 2006 Warren Togami 1.4.6-3 - Fix regex in doc mangling (#183943 Michal Jaegermann) From fedora-cvs-commits at redhat.com Fri Mar 24 13:17:32 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 24 Mar 2006 08:17:32 -0500 Subject: rpms/squirrelmail/FC-5 squirrelmail.spec,1.32,1.33 Message-ID: <200603241317.k2ODHWdG004695@cvs.devel.redhat.com> Author: wtogami Update of /cvs/dist/rpms/squirrelmail/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv4682 Modified Files: squirrelmail.spec Log Message: Fix outgoing Japanese mail to iso-2022-jp for now (#185767) Index: squirrelmail.spec =================================================================== RCS file: /cvs/dist/rpms/squirrelmail/FC-5/squirrelmail.spec,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- squirrelmail.spec 4 Mar 2006 05:27:18 -0000 1.32 +++ squirrelmail.spec 24 Mar 2006 13:17:30 -0000 1.33 @@ -6,7 +6,7 @@ Summary: SquirrelMail webmail client Name: squirrelmail Version: 1.4.6 -Release: 3.fc5 +Release: 4.fc5 License: GPL URL: http://www.squirrelmail.org/ Group: Applications/Internet @@ -16,7 +16,7 @@ Source2: squirrelmail-splash-fedora.png Source3: squirrelmail-splash-rhel.png Source4: http://prdownloads.sourceforge.net/squirrelmail/all_locales-1.4.6-20060221.tar.bz2 -BuildRoot: %{_tmppath}/%{name}-%{version}-root +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch Requires: httpd, php >= 4.0.4, php-mbstring, perl, tmpwatch >= 2.8, aspell Requires: /usr/sbin/sendmail @@ -84,12 +84,18 @@ -e "s/^\(\$languages\['\([^']*\)'\]\['CHARSET'].*= '\)\([^']*\)';/\1utf-8';/" \ -e "s/^\(\$languages\['\([^']*\)'\]\['LOCALE'].*=\).*/\1 '\2.UTF-8';/" +# Hard-code Japanese to send iso-2022-jp +# Without this, 1.4.6 sends eucjp which is clearly wrong +sed -i s/"$languages\['ja_JP'\]\['CHARSET'\] = 'utf-8';"/"$languages\['ja_JP'\]\['CHARSET'\] = 'iso-2022-jp';"/ functions/i18n.php + + cd locale_tempdir for LOCALE in `ls locale/` ; do SKIPINVALID= case $LOCALE in ja_JP) # ja_JP uses iso2022-jp for email but euc-jp in its interface. + # But why!?!? CHARSET=euc-jp ;; ko_KR) @@ -215,6 +221,9 @@ %{_sysconfdir}/cron.daily/squirrelmail.cron %changelog +* Fri Mar 24 2006 Warren Togami 1.4.6-4 +- Fix outgoing Japanese mail to iso-2022-jp for now (#185767) + * Fri Mar 3 2006 Warren Togami 1.4.6-3 - Fix regex in doc mangling (#183943 Michal Jaegermann) From fedora-cvs-commits at redhat.com Fri Mar 24 13:18:22 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 24 Mar 2006 08:18:22 -0500 Subject: rpms/squirrelmail/FC-4 squirrelmail.spec,1.23,1.24 Message-ID: <200603241318.k2ODIMmm004766@cvs.devel.redhat.com> Author: wtogami Update of /cvs/dist/rpms/squirrelmail/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv4753 Modified Files: squirrelmail.spec Log Message: Fix outgoing Japanese mail to iso-2022-jp for now (#185767) Index: squirrelmail.spec =================================================================== RCS file: /cvs/dist/rpms/squirrelmail/FC-4/squirrelmail.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- squirrelmail.spec 5 Mar 2006 11:07:48 -0000 1.23 +++ squirrelmail.spec 24 Mar 2006 13:18:20 -0000 1.24 @@ -6,7 +6,7 @@ Summary: SquirrelMail webmail client Name: squirrelmail Version: 1.4.6 -Release: 3.fc4 +Release: 4.fc4 License: GPL URL: http://www.squirrelmail.org/ Group: Applications/Internet @@ -16,7 +16,7 @@ Source2: squirrelmail-splash-fedora.png Source3: squirrelmail-splash-rhel.png Source4: http://prdownloads.sourceforge.net/squirrelmail/all_locales-1.4.6-20060221.tar.bz2 -BuildRoot: %{_tmppath}/%{name}-%{version}-root +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch Requires: httpd, php >= 4.0.4, php-mbstring, perl, tmpwatch >= 2.8, aspell Requires: /usr/sbin/sendmail @@ -84,12 +84,18 @@ -e "s/^\(\$languages\['\([^']*\)'\]\['CHARSET'].*= '\)\([^']*\)';/\1utf-8';/" \ -e "s/^\(\$languages\['\([^']*\)'\]\['LOCALE'].*=\).*/\1 '\2.UTF-8';/" +# Hard-code Japanese to send iso-2022-jp +# Without this, 1.4.6 sends eucjp which is clearly wrong +sed -i s/"$languages\['ja_JP'\]\['CHARSET'\] = 'utf-8';"/"$languages\['ja_JP'\]\['CHARSET'\] = 'iso-2022-jp';"/ functions/i18n.php + + cd locale_tempdir for LOCALE in `ls locale/` ; do SKIPINVALID= case $LOCALE in ja_JP) # ja_JP uses iso2022-jp for email but euc-jp in its interface. + # But why!?!? CHARSET=euc-jp ;; ko_KR) @@ -215,6 +221,9 @@ %{_sysconfdir}/cron.daily/squirrelmail.cron %changelog +* Fri Mar 24 2006 Warren Togami 1.4.6-4 +- Fix outgoing Japanese mail to iso-2022-jp for now (#185767) + * Fri Mar 3 2006 Warren Togami 1.4.6-3 - Fix regex in doc mangling (#183943 Michal Jaegermann) From fedora-cvs-commits at redhat.com Fri Mar 24 13:48:36 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 24 Mar 2006 08:48:36 -0500 Subject: rpms/coreutils/devel .cvsignore, 1.6, 1.7 coreutils-selinux.patch, 1.18, 1.19 coreutils.spec, 1.108, 1.109 sources, 1.6, 1.7 Message-ID: <200603241348.k2ODmaAd018652@cvs.devel.redhat.com> Author: twaugh Update of /cvs/dist/rpms/coreutils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv18636 Modified Files: .cvsignore coreutils-selinux.patch coreutils.spec sources Log Message: * Fri Mar 24 2006 Tim Waugh 5.94-2 - 5.94. Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/coreutils/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 8 Nov 2005 14:52:30 -0000 1.6 +++ .cvsignore 24 Mar 2006 13:48:34 -0000 1.7 @@ -1,3 +1,4 @@ coreutils-5.2.1.tar.bz2 coreutils-5.92.tar.bz2 coreutils-5.93.tar.bz2 +coreutils-5.94.tar.bz2 coreutils-selinux.patch: README | 4 config.hin | 27 +-- configure.ac | 7 man/Makefile.am | 4 man/Makefile.in | 56 +++---- man/chcon.1 | 64 ++++++++ man/chcon.x | 4 man/cp.1 | 5 man/dir.1 | 14 + man/id.1 | 3 man/install.1 | 5 man/ls.1 | 14 + man/mkdir.1 | 2 man/mkfifo.1 | 3 man/mknod.1 | 3 man/runcon.1 | 43 +++++ man/runcon.x | 14 + man/stat.1 | 6 man/vdir.1 | 14 + src/Makefile.am | 23 +- src/chcon.c | 421 +++++++++++++++++++++++++++++++++++++++++++++++++++++ src/copy.c | 49 ++++++ src/copy.h | 3 src/cp.c | 64 +++++++- src/id.c | 68 ++++++++ src/install.c | 99 ++++++++++++ src/ls.c | 309 ++++++++++++++++++++++++++++++++++---- src/mkdir.c | 30 +++ src/mkfifo.c | 29 +++ src/mknod.c | 30 +++ src/mv.c | 12 + src/runcon.c | 253 +++++++++++++++++++++++++++++++ src/stat.c | 142 ++++++++++++++--- tests/help-version | 4 34 files changed, 1704 insertions(+), 124 deletions(-) View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.18 -r 1.19 coreutils-selinux.patch Index: coreutils-selinux.patch =================================================================== RCS file: /cvs/dist/rpms/coreutils/devel/coreutils-selinux.patch,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- coreutils-selinux.patch 23 Jan 2006 13:26:36 -0000 1.18 +++ coreutils-selinux.patch 24 Mar 2006 13:48:34 -0000 1.19 @@ -1,1267 +1,5 @@ ---- coreutils-5.92/src/stat.c.selinux 2005-10-14 14:55:40.000000000 +0100 -+++ coreutils-5.92/src/stat.c 2005-10-26 17:51:02.000000000 +0100 -@@ -42,6 +42,13 @@ - # endif - #endif - -+#ifdef WITH_SELINUX -+#include -+#define SECURITY_ID_T security_context_t -+#else -+#define SECURITY_ID_T char * -+#endif -+ - #include "system.h" - - #include "error.h" -@@ -101,6 +108,7 @@ - #define AUTHORS "Michael Meskes" - - static struct option const long_options[] = { -+ {"context", no_argument, 0, 'Z'}, - {"dereference", no_argument, NULL, 'L'}, - {"file-system", no_argument, NULL, 'f'}, - {"filesystem", no_argument, NULL, 'f'}, /* obsolete and undocumented alias */ -@@ -311,7 +319,7 @@ - /* print statfs info */ - static void - print_statfs (char *pformat, size_t buf_len, char m, char const *filename, -- void const *data) -+ void const *data, SECURITY_ID_T scontext) - { - STRUCT_STATVFS const *statfsbuf = data; - -@@ -383,7 +391,10 @@ - xstrcat (pformat, buf_len, PRIdMAX); - printf (pformat, (intmax_t) (statfsbuf->f_ffree)); - break; -- -+ case 'C': -+ strcat (pformat, "s"); -+ printf(scontext); -+ break; - default: - xstrcat (pformat, buf_len, "c"); - printf (pformat, m); -@@ -394,7 +405,7 @@ - /* print stat info */ - static void - print_stat (char *pformat, size_t buf_len, char m, -- char const *filename, void const *data) -+ char const *filename, void const *data, SECURITY_ID_T scontext) - { - struct stat *statbuf = (struct stat *) data; - struct passwd *pw_ent; -@@ -528,6 +539,10 @@ - xstrcat (pformat, buf_len, TYPE_SIGNED (time_t) ? "ld" : "lu"); - printf (pformat, (unsigned long int) statbuf->st_ctime); - break; -+ case 'C': -+ strcat (pformat, "s"); -+ printf(pformat,scontext); -+ break; - default: - xstrcat (pformat, buf_len, "c"); - printf (pformat, m); -@@ -537,8 +552,9 @@ - - static void - print_it (char const *masterformat, char const *filename, -- void (*print_func) (char *, size_t, char, char const *, void const *), -- void const *data) -+ void (*print_func) (char *, size_t, char, char const *, void const *, -+ SECURITY_ID_T ), -+ void const *data, SECURITY_ID_T scontext) - { - char *b; - -@@ -576,7 +592,7 @@ - putchar ('%'); - break; - default: -- print_func (dest, n_alloc, *p, filename, data); -+ print_func (dest, n_alloc, *p, filename, data, scontext); - break; - } - } -@@ -592,9 +608,17 @@ - - /* Stat the file system and print what we find. */ - static bool --do_statfs (char const *filename, bool terse, char const *format) -+do_statfs (char const *filename, bool terse, bool secure, char const *format) - { - STRUCT_STATVFS statfsbuf; -+ SECURITY_ID_T scontext = NULL; -+#ifdef WITH_SELINUX -+ if(secure) -+ if (getfilecon(filename,&scontext)<0) { -+ perror (filename); -+ return; -+ } -+#endif - - if (STATFS (filename, &statfsbuf) != 0) - { -@@ -605,25 +629,46 @@ - - if (format == NULL) - { -- format = (terse -- ? "%n %i %l %t %s %S %b %f %a %c %d\n" -- : " File: \"%n\"\n" -- " ID: %-8i Namelen: %-7l Type: %T\n" -- "Block size: %-10s Fundamental block size: %S\n" -- "Blocks: Total: %-10b Free: %-10f Available: %a\n" -- "Inodes: Total: %-10c Free: %d\n"); -+ if (terse) -+ { -+ if (secure) -+ format = "%n %i %l %t %s %S %b %f %a %c %d %C\n"; -+ else -+ format = "%n %i %l %t %s %S %b %f %a %c %d\n"; -+ } -+ else -+ { -+ if (secure) -+ format = " File: \"%n\"\n" -+ " ID: %-8i Namelen: %-7l Type: %T\n" -+ "Block size: %-10s Fundamental block size: %S\n" -+ "Blocks: Total: %-10b Free: %-10f Available: %a\n" -+ "Inodes: Total: %-10c Free: %d\n" -+ " S_Context: %C\n"; -+ else -+ format = " File: \"%n\"\n" -+ " ID: %-8i Namelen: %-7l Type: %T\n" -+ "Block size: %-10s Fundamental block size: %S\n" -+ "Blocks: Total: %-10b Free: %-10f Available: %a\n" -+ "Inodes: Total: %-10c Free: %d\n"; -+ } - } - -- print_it (format, filename, print_statfs, &statfsbuf); -+ print_it (format, filename, print_statfs, &statfsbuf, scontext); -+#ifdef WITH_SELINUX -+ if (scontext != NULL) -+ freecon(scontext); -+#endif - return true; - } - - /* stat the file and print what we find */ - static bool --do_stat (char const *filename, bool follow_links, bool terse, -+do_stat (char const *filename, bool follow_links, bool terse, bool secure, - char const *format) - { - struct stat statbuf; -+ SECURITY_ID_T scontext = NULL; - - if ((follow_links ? stat : lstat) (filename, &statbuf) != 0) - { -@@ -631,11 +676,29 @@ - return false; - } - -+#ifdef WITH_SELINUX -+ if(secure) { -+ int i; -+ if (!follow_links) -+ i=lgetfilecon(filename, &scontext); -+ else -+ i=getfilecon(filename, &scontext); -+ if (i == -1) -+ { -+ perror (filename); -+ return false; -+ } -+ } -+#endif -+ - if (format == NULL) - { - if (terse) - { -- format = "%n %s %b %f %u %g %D %i %h %t %T %X %Y %Z %o\n"; -+ if (secure) -+ format = "%n %s %b %f %u %g %D %i %h %t %T %X %Y %Z %o %C\n"; -+ else -+ format = "%n %s %b %f %u %g %D %i %h %t %T %X %Y %Z %o\n"; - } - else [...5056 lines suppressed...] -+the first argument is used as the complete context. Any additional -+arguments after \fICOMMAND\fR are interpreted as arguments to the -+command. -+.PP -+Note that only carefully-chosen contexts are likely to successfully -+run. ---- coreutils-5.92/man/id.1.selinux 2005-10-22 19:14:47.000000000 +0100 -+++ coreutils-5.92/man/id.1 2005-10-26 17:42:29.000000000 +0100 -@@ -13,6 +13,9 @@ - \fB\-a\fR - ignore, for compatibility with other versions - .TP -+\fB\-Z\fR, \fB\-\-context\fR -+print only the security context -+.TP - \fB\-g\fR, \fB\-\-group\fR - print only the effective group ID - .TP ---- coreutils-5.92/man/cp.1.selinux 2005-10-22 19:14:46.000000000 +0100 -+++ coreutils-5.92/man/cp.1 2005-10-26 17:42:29.000000000 +0100 -@@ -57,7 +57,7 @@ - .TP - \fB\-\-preserve\fR[=\fIATTR_LIST\fR] - preserve the specified attributes (default: --mode,ownership,timestamps), if possible -+mode,ownership,timestamps) and security contexts, if possible - additional attributes: links, all - .TP - \fB\-\-no\-preserve\fR=\fIATTR_LIST\fR -@@ -105,6 +105,9 @@ - \fB\-\-help\fR - display this help and exit - .TP -+\fB\-Z\fR, \fB\-\-context\fR=\fICONTEXT\fR -+set security context of copy to CONTEXT -+.TP - \fB\-\-version\fR - output version information and exit - .PP ---- coreutils-5.92/man/vdir.1.selinux 2005-10-22 19:14:51.000000000 +0100 -+++ coreutils-5.92/man/vdir.1 2005-10-26 17:42:29.000000000 +0100 -@@ -201,6 +201,20 @@ - .TP - \fB\-1\fR - list one file per line -+.PP -+SELINUX options: -+.TP -+\fB\-\-lcontext\fR -+Display security context. Enable \fB\-l\fR. Lines -+will probably be too wide for most displays. -+.TP -+\fB\-\-context\fR -+Display security context so it fits on most -+displays. Displays only mode, user, group, -+security context and file name. -+.TP -+\fB\-\-scontext\fR -+Display only security context and file name. - .TP - \fB\-\-help\fR - display this help and exit ---- coreutils-5.92/tests/help-version.selinux 2005-10-26 17:42:29.000000000 +0100 -+++ coreutils-5.92/tests/help-version 2005-10-26 17:42:29.000000000 +0100 -@@ -45,6 +45,8 @@ - - # Skip `test'; it doesn't accept --help or --version. - test $i = test && continue; -+ test $i = chcon && continue; -+ test $i = runcon && continue; - - # false fails even when invoked with --help or --version. - if test $i = false; then -@@ -161,7 +163,7 @@ - - for i in $all_programs; do - # Skip these. -- case $i in chroot|stty|tty|false) continue;; esac -+ case $i in chroot|stty|tty|false|chcon|runcon) continue;; esac - - rm -rf $tmp_in $tmp_in2 $tmp_dir $tmp_out - echo > $tmp_in ---- coreutils-5.92/README.selinux 2005-10-26 17:42:29.000000000 +0100 -+++ coreutils-5.92/README 2005-10-26 17:42:29.000000000 +0100 -@@ -7,11 +7,11 @@ - - The programs that can be built with this package are: - -- [ basename cat chgrp chmod chown chroot cksum comm cp csplit cut date dd -+ [ basename cat chcon chgrp chmod chown chroot cksum comm cp csplit cut date dd - df dir dircolors dirname du echo env expand expr factor false fmt fold - ginstall groups head hostid hostname id join kill link ln logname ls - md5sum mkdir mkfifo mknod mv nice nl nohup od paste pathchk pinky pr -- printenv printf ptx pwd readlink rm rmdir runuser seq sha1sum shred sleep sort -+ printenv printf ptx pwd readlink rm rmdir runcon runuser seq sha1sum shred sleep sort - split stat stty su sum sync tac tail tee test touch tr true tsort tty - uname unexpand uniq unlink uptime users vdir wc who whoami yes - ---- coreutils-5.92/configure.ac.selinux 2005-10-26 17:42:28.000000000 +0100 -+++ coreutils-5.92/configure.ac 2005-10-26 17:42:29.000000000 +0100 -@@ -35,6 +35,13 @@ - LIB_PAM="-ldl -lpam -lpam_misc" - AC_SUBST(LIB_PAM)]) - -+dnl Give the chance to enable SELINUX -+AC_ARG_ENABLE(selinux, dnl -+[ --enable-selinux Enable use of the SELINUX libraries], -+[AC_DEFINE(WITH_SELINUX, 1, [Define if you want to use SELINUX]) -+LIB_SELINUX="-lselinux" -+AC_SUBST(LIB_SELINUX)]) -+ - gl_DEFAULT_POSIX2_VERSION - gl_USE_SYSTEM_EXTENSIONS - gl_PERL ---- coreutils-5.92/config.hin.selinux 2005-10-26 17:42:29.000000000 +0100 -+++ coreutils-5.92/config.hin 2005-10-26 17:48:09.000000000 +0100 -@@ -411,10 +411,6 @@ - don't. */ - #undef HAVE_DECL_TTYNAME - --/* Define to 1 if you have the declaration of `tzname', and to 0 if you don't. -- */ --#undef HAVE_DECL_TZNAME -- - /* Define to 1 if you have the declaration of wcwidth(), and to 0 otherwise. - */ - #undef HAVE_DECL_WCWIDTH -@@ -519,6 +515,9 @@ - /* Define to 1 if you have the `getdelim' function. */ - #undef HAVE_GETDELIM - -+/* Define to 1 if you have the `getgrouplist' function. */ -+#undef HAVE_GETGROUPLIST -+ - /* Define to 1 if your system has a working `getgroups' function. */ - #undef HAVE_GETGROUPS - -@@ -613,9 +612,6 @@ - /* Define to 1 if you have the `lchown' function. */ - #undef HAVE_LCHOWN - --/* Define to 1 if you have the `acl' library (-lacl). */ --#undef HAVE_LIBACL -- - /* Define to 1 if you have the `dgc' library (-ldgc). */ - #undef HAVE_LIBDGC - -@@ -1518,17 +1514,17 @@ - /* Define to 1 if unlink (dir) cannot possibly succeed. */ - #undef UNLINK_CANNOT_UNLINK_DIR - --/* Define to 1 if you want getc etc. to use unlocked I/O if available. -- Unlocked I/O can improve performance in unithreaded apps, but it is not -- safe for multithreaded apps. */ --#undef USE_UNLOCKED_IO -- - /* Define if you want access control list support. */ - #undef USE_ACL - - /* Define if you want to use PAM */ - #undef USE_PAM - -+/* Define to 1 if you want getc etc. to use unlocked I/O if available. -+ Unlocked I/O can improve performance in unithreaded apps, but it is not -+ safe for multithreaded apps. */ -+#undef USE_UNLOCKED_IO -+ - /* Version number of package */ - #undef VERSION - -@@ -1538,6 +1534,9 @@ - /* Define if sys/ptem.h is required for struct winsize. */ - #undef WINSIZE_IN_PTEM - -+/* Define if you want to use SELINUX */ -+#undef WITH_SELINUX -+ - /* Define to 1 if your processor stores words with the most significant byte - first (like Motorola and SPARC, unlike Intel and VAX). */ - #undef WORDS_BIGENDIAN -@@ -1683,7 +1682,7 @@ - /* Define to rpl_nanosleep if the replacement function should be used. */ - #undef nanosleep - --/* Define to `long int' if does not define. */ -+/* Define to `long' if does not define. */ - #undef off_t - - /* Define to `int' if does not define. */ -@@ -1750,7 +1749,7 @@ - /* Define to empty if the C compiler doesn't support this keyword. */ - #undef signed - --/* Define to `unsigned int' if does not define. */ -+/* Define to `unsigned' if does not define. */ - #undef size_t - - /* Map `socklen_t' to `int' if it is missing. */ + # Note the use of $t/$*, rather than just `$*' as in other packages. + # That is necessary to avoid failures for programs that are also shell built-in Index: coreutils.spec =================================================================== RCS file: /cvs/dist/rpms/coreutils/devel/coreutils.spec,v retrieving revision 1.108 retrieving revision 1.109 diff -u -r1.108 -r1.109 --- coreutils.spec 11 Feb 2006 02:19:21 -0000 1.108 +++ coreutils.spec 24 Mar 2006 13:48:34 -0000 1.109 @@ -1,7 +1,7 @@ Summary: The GNU core utilities: a set of tools commonly used in shell scripts Name: coreutils -Version: 5.93 -Release: 7.2 +Version: 5.94 +Release: 2 License: GPL Group: System Environment/Base Url: http://www.gnu.org/software/coreutils/ @@ -261,6 +261,9 @@ /sbin/runuser %changelog +* Fri Mar 24 2006 Tim Waugh 5.94-2 +- 5.94. + * Fri Feb 10 2006 Jesse Keating - 5.93-7.2 - bump again for double-long bug on ppc(64) Index: sources =================================================================== RCS file: /cvs/dist/rpms/coreutils/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 8 Nov 2005 14:52:30 -0000 1.6 +++ sources 24 Mar 2006 13:48:34 -0000 1.7 @@ -1 +1 @@ -955d8abfd3dd8af2ca3af51480f1f9af coreutils-5.93.tar.bz2 +11985c8345371546da8ff13f7efae359 coreutils-5.94.tar.bz2 From fedora-cvs-commits at redhat.com Fri Mar 24 13:52:49 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 24 Mar 2006 08:52:49 -0500 Subject: rpms/dvd+rw-tools/FC-5 dvd+rw-tools-5.17.4.8.6.manpatch, 1.1, 1.2 dvd+rw-tools-5.21.4.10.8-excl.patch, 1.1, 1.2 dvd+rw-tools.spec, 1.16, 1.17 Message-ID: <200603241352.k2ODqn3N018750@cvs.devel.redhat.com> Author: harald Update of /cvs/dist/rpms/dvd+rw-tools/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv18734 Modified Files: dvd+rw-tools-5.17.4.8.6.manpatch dvd+rw-tools-5.21.4.10.8-excl.patch dvd+rw-tools.spec Log Message: version 6.1 Index: dvd+rw-tools-5.17.4.8.6.manpatch =================================================================== RCS file: /cvs/dist/rpms/dvd+rw-tools/FC-5/dvd+rw-tools-5.17.4.8.6.manpatch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- dvd+rw-tools-5.17.4.8.6.manpatch 9 Sep 2004 04:23:06 -0000 1.1 +++ dvd+rw-tools-5.17.4.8.6.manpatch 24 Mar 2006 13:52:45 -0000 1.2 @@ -1,7 +1,7 @@ ---- dvd+rw-tools-5.17.4.8.6/Makefile.m4.manpatch 2004-01-29 12:07:37.187269384 +0100 -+++ dvd+rw-tools-5.17.4.8.6/Makefile.m4 2004-01-29 12:08:19.313865168 +0100 -@@ -115,7 +115,7 @@ - LINK.o=$(LINK.cc) +--- dvd+rw-tools-6.1/Makefile.m4.manpatch 2006-01-20 09:08:22.000000000 +0100 ++++ dvd+rw-tools-6.1/Makefile.m4 2006-03-22 14:08:08.000000000 +0100 +@@ -173,7 +173,7 @@ + LINK.o =$(LINK.cc) prefix?=/usr/local -manprefix?=$(shell case $(prefix) in (*/usr/?*) echo $(prefix)/man ;; (*) echo $(prefix)/share/man ;; esac) @@ -9,7 +9,7 @@ bin_mode?=0755 # yes, default is *no* set-uid minus_o:=$(shell [[ `id -u` == 0 ]] && echo "-o root") -@@ -123,8 +123,8 @@ +@@ -181,12 +181,12 @@ install: dvd+rw-tools [[ -d $(prefix)/bin ]] || mkdir -p $(prefix)/bin install $(minus_o) -m $(bin_mode) $(CHAIN) $(prefix)/bin @@ -17,6 +17,12 @@ - install $(minus_o) -m 0644 growisofs.1 $(manprefix)/man1 + [[ -d $(mandir)/man1 ]] || mkdir -p $(mandir)/man1 + install $(minus_o) -m 0644 growisofs.1 $(mandir)/man1 + [[ -f rpl8 ]] && \ +- install $(minus_o) -m $(bin_mode) rpl8 $(prefix)/bin ++ install $(minus_o) -m $(bin_mode) rpl8 $(prefix)/bin || : + [[ -f btcflash ]] && \ +- install $(minus_o) -m $(bin_mode) btcflash $(prefix)/bin ++ install $(minus_o) -m $(bin_mode) btcflash $(prefix)/bin || : ]) + # common section - [ dvd+rw-tools-5.21.4.10.8-excl.patch: growisofs.c | 28 +++++++++++++++++++++++++++- transport.hxx | 32 ++++++++++++++++++++++++++++++-- 2 files changed, 57 insertions(+), 3 deletions(-) Index: dvd+rw-tools-5.21.4.10.8-excl.patch =================================================================== RCS file: /cvs/dist/rpms/dvd+rw-tools/FC-5/dvd+rw-tools-5.21.4.10.8-excl.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- dvd+rw-tools-5.21.4.10.8-excl.patch 9 Sep 2004 04:24:14 -0000 1.1 +++ dvd+rw-tools-5.21.4.10.8-excl.patch 24 Mar 2006 13:52:45 -0000 1.2 @@ -1,6 +1,50 @@ ---- dvd+rw-tools-5.21.4.10.8/transport.hxx.excl 2004-08-25 01:36:29.000000000 +0200 -+++ dvd+rw-tools-5.21.4.10.8/transport.hxx 2004-09-01 13:01:48.669600384 +0200 -@@ -191,6 +191,33 @@ +--- dvd+rw-tools-6.1/growisofs.c.excl 2006-01-26 22:16:54.000000000 +0100 ++++ dvd+rw-tools-6.1/growisofs.c 2006-03-22 14:01:42.000000000 +0100 +@@ -593,6 +593,32 @@ + return ret; + } + ++int open64excl(const char *device, int mode) ++{ ++ int f, i; ++ ++ f = open64(device, mode | O_EXCL); ++ ++ if (f < 0) { ++ if (errno != EBUSY) ++ return f; ++ ++ for (i = 0; (i < 10) && (f == -1); i++) { ++ fprintf(stderr, "Error trying to open %s exclusively ... retrying in 1 second.\n", device); ++ usleep(1000000 + (long)(100000.0 * rand()/(RAND_MAX+1.0))); ++ f = open64(device, mode | O_EXCL); ++ } ++ ++ if (f < 0) { ++ fprintf(stderr, "Trying to open without locking.\n"); ++ f = open64(device, mode); ++ } ++ } ++ ++ return f; ++} ++ ++ + char *setup_fds (char *device) + { char *odevice; + uid_t uid=getuid(); +@@ -667,7 +693,7 @@ + * with set-root-uid should fill in for the kernel + * deficiency... + */ +- if ((fd = open64 (device,O_RDWR|O_NONBLOCK)) >= 0) ++ if ((fd = open64excl (device,O_RDWR|O_NONBLOCK)) >= 0) + { if (fstat64 (fd,&sc) < 0) + fprintf (stderr,":-( unable to stat64(\"%s\"): ",device), + perror (NULL), exit (FATAL_START(errno)); +--- dvd+rw-tools-6.1/transport.hxx.excl 2006-01-26 09:02:32.000000000 +0100 ++++ dvd+rw-tools-6.1/transport.hxx 2006-03-22 13:58:38.000000000 +0100 +@@ -217,6 +217,33 @@ ~Scsi_Command() { if (fd>=0 && autoclose) close(fd),fd=-1; if (filename) free(filename),filename=NULL; } @@ -34,7 +78,7 @@ int associate (const char *file,const struct stat *ref=NULL) { struct stat sb; -@@ -199,8 +226,9 @@ +@@ -225,8 +252,9 @@ * execution under Linux kernel 2.6[.8]. Under 2.4 it * falls down to O_RDONLY... */ @@ -46,47 +90,3 @@ if (fstat(fd,&sb) < 0) return 0; if (!S_ISBLK(sb.st_mode)) { errno=ENOTBLK;return 0; } ---- dvd+rw-tools-5.21.4.10.8/growisofs.c.excl 2004-08-25 01:02:29.000000000 +0200 -+++ dvd+rw-tools-5.21.4.10.8/growisofs.c 2004-09-01 13:01:09.706523672 +0200 -@@ -487,6 +487,32 @@ - return ret; - } - -+int open64excl(const char *device, int mode) -+{ -+ int f, i; -+ -+ f = open64(device, mode | O_EXCL); -+ -+ if (f < 0) { -+ if (errno != EBUSY) -+ return f; -+ -+ for (i = 0; (i < 10) && (f == -1); i++) { -+ fprintf(stderr, "Error trying to open %s exclusively ... retrying in 1 second.\n", device); -+ usleep(1000000 + (long)(100000.0 * rand()/(RAND_MAX+1.0))); -+ f = open64(device, mode | O_EXCL); -+ } -+ -+ if (f < 0) { -+ fprintf(stderr, "Trying to open without locking.\n"); -+ f = open64(device, mode); -+ } -+ } -+ -+ return f; -+} -+ -+ - char *setup_fds (char *device) - { char *odevice; - uid_t uid=getuid(); -@@ -561,7 +587,7 @@ - * with set-root-uid should fill in for the kernel - * deficiency... - */ -- if ((fd = open64 (device,O_RDWR|O_NONBLOCK)) >= 0) -+ if ((fd = open64excl(device,O_RDWR|O_NONBLOCK)) >= 0) - ioctl_handle=(void *)(long)fd; - else - ioctl_handle=(void *)(long)dup(in_fd); Index: dvd+rw-tools.spec =================================================================== RCS file: /cvs/dist/rpms/dvd+rw-tools/FC-5/dvd+rw-tools.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- dvd+rw-tools.spec 11 Feb 2006 02:28:10 -0000 1.16 +++ dvd+rw-tools.spec 24 Mar 2006 13:52:45 -0000 1.17 @@ -1,7 +1,7 @@ Summary: Toolchain to master DVD+RW/+R media Name: dvd+rw-tools -Version: 5.21.4.10.8 -Release: 6.2.1 +Version: 6.1 +Release: 1 License: GPL Group: Applications/Multimedia Source: http://fy.chalmers.se/~appro/linux/DVD+RW/tools/dvd+rw-tools-%{version}.tar.gz @@ -54,6 +54,9 @@ %{_mandir}/man1/growisofs.1* %changelog +* Fri Mar 24 2006 Harald Hoyer - 6.1-1 +- version 6.1 + * Fri Feb 10 2006 Jesse Keating - 5.21.4.10.8-6.2.1 - bump again for double-long bug on ppc(64) From fedora-cvs-commits at redhat.com Fri Mar 24 13:53:40 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 24 Mar 2006 08:53:40 -0500 Subject: rpms/dvd+rw-tools/FC-5 .cvsignore,1.6,1.7 sources,1.6,1.7 Message-ID: <200603241353.k2ODreYb018818@cvs.devel.redhat.com> Author: harald Update of /cvs/dist/rpms/dvd+rw-tools/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv18803 Modified Files: .cvsignore sources Log Message: version 6.1 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/dvd+rw-tools/FC-5/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 9 Sep 2004 04:24:11 -0000 1.6 +++ .cvsignore 24 Mar 2006 13:53:37 -0000 1.7 @@ -1 +1 @@ -dvd+rw-tools-5.21.4.10.8.tar.gz +dvd+rw-tools-6.1.tar.gz Index: sources =================================================================== RCS file: /cvs/dist/rpms/dvd+rw-tools/FC-5/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 9 Sep 2004 04:24:11 -0000 1.6 +++ sources 24 Mar 2006 13:53:37 -0000 1.7 @@ -1 +1 @@ -b931c02e2b23342f664276ef26d1502c dvd+rw-tools-5.21.4.10.8.tar.gz +d6bad594e55a2e0d7cf76ce452fce399 dvd+rw-tools-6.1.tar.gz From fedora-cvs-commits at redhat.com Fri Mar 24 13:57:48 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 24 Mar 2006 08:57:48 -0500 Subject: rpms/dvd+rw-tools/FC-5 dvd+rw-tools.spec,1.17,1.18 Message-ID: <200603241357.k2ODvmGZ019018@cvs.devel.redhat.com> Author: harald Update of /cvs/dist/rpms/dvd+rw-tools/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv19005 Modified Files: dvd+rw-tools.spec Log Message: version 6.1 Index: dvd+rw-tools.spec =================================================================== RCS file: /cvs/dist/rpms/dvd+rw-tools/FC-5/dvd+rw-tools.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- dvd+rw-tools.spec 24 Mar 2006 13:52:45 -0000 1.17 +++ dvd+rw-tools.spec 24 Mar 2006 13:57:45 -0000 1.18 @@ -1,7 +1,7 @@ Summary: Toolchain to master DVD+RW/+R media Name: dvd+rw-tools Version: 6.1 -Release: 1 +Release: 0.FC5.1 License: GPL Group: Applications/Multimedia Source: http://fy.chalmers.se/~appro/linux/DVD+RW/tools/dvd+rw-tools-%{version}.tar.gz @@ -54,7 +54,7 @@ %{_mandir}/man1/growisofs.1* %changelog -* Fri Mar 24 2006 Harald Hoyer - 6.1-1 +* Fri Mar 24 2006 Harald Hoyer - 6.1-0.FC5.1 - version 6.1 * Fri Feb 10 2006 Jesse Keating - 5.21.4.10.8-6.2.1 From fedora-cvs-commits at redhat.com Fri Mar 24 14:44:03 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 24 Mar 2006 09:44:03 -0500 Subject: rpms/cups/devel cups.spec,1.138,1.139 Message-ID: <200603241444.k2OEi3sS001048@cvs.devel.redhat.com> Author: twaugh Update of /cvs/dist/rpms/cups/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv1035 Modified Files: cups.spec Log Message: * Fri Mar 24 2006 Tim Waugh 1:1.2-0.1.b2.5 - Fix KDE compatibility symbols _ipp_add_attr/_ipp_free_attr. Index: cups.spec =================================================================== RCS file: /cvs/dist/rpms/cups/devel/cups.spec,v retrieving revision 1.138 retrieving revision 1.139 diff -u -r1.138 -r1.139 --- cups.spec 24 Mar 2006 09:16:57 -0000 1.138 +++ cups.spec 24 Mar 2006 14:44:00 -0000 1.139 @@ -7,7 +7,7 @@ Summary: Common Unix Printing System Name: cups Version: 1.2 -Release: 0.1.%{beta}.4 +Release: 0.1.%{beta}.5 License: GPL Group: System Environment/Daemons Source: ftp://ftp.easysw.com/pub/cups/test/cups-1.2%{beta}-source.tar.bz2 @@ -27,6 +27,7 @@ Patch3: cups-1.1.16-system-auth.patch Patch4: cups-1.1.17-backend.patch Patch5: cups-ext.patch +Patch6: cups-kde.patch Patch8: cups-logfileperm.patch Patch9: cups-1.1.17-rcp.patch Patch10: cups-1.1.17-ppdsdat.patch @@ -113,6 +114,7 @@ %patch3 -p1 -b .system-auth %patch4 -p1 -b .backend %patch5 -p1 -b .ext +%patch6 -p1 -b .kde %patch8 -p1 -b .logfileperm %patch9 -p1 -b .rcp %patch10 -p1 -b .ppdsdat @@ -369,6 +371,9 @@ %{cups_serverbin}/daemon/cups-lpd %changelog +* Fri Mar 24 2006 Tim Waugh 1:1.2-0.1.b2.5 +- Fix KDE compatibility symbols _ipp_add_attr/_ipp_free_attr. + * Fri Mar 24 2006 Tim Waugh 1:1.2-0.1.b2.4 - Update to svn snapshot. From fedora-cvs-commits at redhat.com Fri Mar 24 14:45:21 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 24 Mar 2006 09:45:21 -0500 Subject: rpms/cups/devel cups-kde.patch,NONE,1.1 Message-ID: <200603241445.k2OEjL66001122@cvs.devel.redhat.com> Author: twaugh Update of /cvs/dist/rpms/cups/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv1108 Added Files: cups-kde.patch Log Message: Add the patch. cups-kde.patch: ipp.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) --- NEW FILE cups-kde.patch --- --- cups-1.2b2/cups/ipp.c.kde 2006-03-24 14:42:41.000000000 +0000 +++ cups-1.2b2/cups/ipp.c 2006-03-24 14:42:53.000000000 +0000 @@ -2806,14 +2806,14 @@ */ ipp_attribute_t * /* O - New attribute */ -_ipp_add(ipp_t *ipp, /* I - IPP message */ +_ipp_add_attr(ipp_t *ipp, /* I - IPP message */ int num_values) /* I - Number of values */ { return (_ippAddAttr(ipp, num_values)); } void -_ipp_free(ipp_attribute_t *attr) /* I - Attribute to free */ +_ipp_free_attr(ipp_attribute_t *attr) /* I - Attribute to free */ { _ippFreeAttr(attr); } From fedora-cvs-commits at redhat.com Fri Mar 24 14:52:41 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 24 Mar 2006 09:52:41 -0500 Subject: rpms/openoffice.org/FC-5 openoffice.org-2.0.2.ooo63583.sd.accessibility.patch, NONE, 1.1 openoffice.org.spec, 1.646, 1.647 Message-ID: <200603241452.k2OEqfid015064@cvs.devel.redhat.com> Author: caolanm Update of /cvs/dist/rpms/openoffice.org/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv15049 Modified Files: openoffice.org.spec Added Files: openoffice.org-2.0.2.ooo63583.sd.accessibility.patch Log Message: accessibility fixes openoffice.org-2.0.2.ooo63583.sd.accessibility.patch: sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx | 2 + sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx | 19 +++++++++++--- source/ui/accessibility/AccessibleDrawDocumentView.cxx | 0 source/ui/slidesorter/shell/SlideSorterViewShell.cxx | 0 4 files changed, 17 insertions(+), 4 deletions(-) --- NEW FILE openoffice.org-2.0.2.ooo63583.sd.accessibility.patch --- Index: source/ui/slidesorter/shell/SlideSorterViewShell.cxx =================================================================== RCS file: /cvs/graphics/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx,v retrieving revision 1.20 diff -u -r1.20 SlideSorterViewShell.cxx --- openoffice.org.orig/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx 19 Jan 2006 12:53:55 -0000 1.20 +++ openoffice.org/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx 24 Mar 2006 14:28:02 -0000 @@ -274,10 +274,21 @@ ::com::sun::star::accessibility::XAccessible> SlideSorterViewShell::CreateAccessibleDocumentView (::sd::Window* pWindow) { - return new ::accessibility::AccessibleSlideSorterView ( - *mpSlideSorterController.get(), - pWindow->GetAccessibleParentWindow()->GetAccessible(), - pWindow); + ::com::sun::star::uno::Reference< + ::com::sun::star::accessibility::XAccessible> xAccessible; + + DBG_ASSERT (mpSlideSorterController.get()!=NULL, + "no controller when SlideSorterViewShell::CreateAccessibleDocumentView called"); + + if (mpSlideSorterController.get() != NULL) + { + xAccessible = new ::accessibility::AccessibleSlideSorterView ( + *mpSlideSorterController.get(), + pWindow->GetAccessibleParentWindow()->GetAccessible(), + pWindow); + } + + return xAccessible; } Index: source/ui/accessibility/AccessibleDrawDocumentView.cxx =================================================================== RCS file: /cvs/graphics/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx,v retrieving revision 1.24 diff -u -r1.24 AccessibleDrawDocumentView.cxx --- openoffice.org.orig/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx 9 Sep 2005 03:26:12 -0000 1.24 +++ openoffice.org/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx 24 Mar 2006 14:29:44 -0000 @@ -701,6 +701,8 @@ // Release resources. if (mpChildrenManager != NULL) { + maShapeTreeInfo.SetSdrView(NULL); + mpChildrenManager->SetInfo (maShapeTreeInfo); delete mpChildrenManager; mpChildrenManager = NULL; } Index: openoffice.org.spec =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/FC-5/openoffice.org.spec,v retrieving revision 1.646 retrieving revision 1.647 diff -u -r1.646 -r1.647 --- openoffice.org.spec 22 Mar 2006 11:40:38 -0000 1.646 +++ openoffice.org.spec 24 Mar 2006 14:52:39 -0000 1.647 @@ -159,6 +159,7 @@ Patch34: openoffice.org-2.0.2.ooo62030.solenv._version.patch Patch35: openoffice.org-2.0.2.oooXXXXX.config_office.noppds.patch Patch36: openoffice.org-2.0.2.ooo63155.sfx2.badscript.patch +Patch37: openoffice.org-2.0.2.ooo63583.sd.accessibility.patch %define instdir %{_libdir}/openoffice.org2.0 @@ -804,6 +805,7 @@ %patch34 -p1 -b .ooo62030.solenv._version.patch %patch35 -p1 -b .oooXXXXX.config_office.noppds.patch %patch36 -p1 -b .ooo63155.sfx2.badscript.patch +%patch37 -p1 -b .ooo63583.sd.accessibility.patch %if %{includingexternals} #start ludicrous workaround @@ -1097,6 +1099,9 @@ echo "StartupNotify=true" >> $RPM_BUILD_ROOT/%{instdir}/share/xdg/writer.desktop echo "StartupNotify=true" >> $RPM_BUILD_ROOT/%{instdir}/share/xdg/math.desktop echo "StartupNotify=true" >> $RPM_BUILD_ROOT/%{instdir}/share/xdg/draw.desktop +# rh#156677# / rh#186515# +echo "NoDisplay=true" >> $RPM_BUILD_ROOT/%{instdir}/share/xdg/math.desktop +echo "NoDisplay=true" >> $RPM_BUILD_ROOT/%{instdir}/share/xdg/draw.desktop chmod u-w $RPM_BUILD_ROOT/%{instdir}/share/xdg/*.desktop #relocate the .desktop and icon files @@ -1105,6 +1110,8 @@ mv $RPM_BUILD_ROOT/%{instdir}/share/xdg/calc.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/openoffice.org-1.9-calc.desktop mv $RPM_BUILD_ROOT/%{instdir}/share/xdg/impress.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/openoffice.org-1.9-impress.desktop mv $RPM_BUILD_ROOT/%{instdir}/share/xdg/writer.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/openoffice.org-1.9-writer.desktop +mv $RPM_BUILD_ROOT/%{instdir}/share/xdg/math.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/openoffice.org-1.9-math.desktop +mv $RPM_BUILD_ROOT/%{instdir}/share/xdg/draw.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/openoffice.org-1.9-draw.desktop rm -rf $RPM_BUILD_ROOT/%{instdir}/share/xdg cp -r sysui/unxlng*/misc/redhat/usr/share/icons $RPM_BUILD_ROOT/%{_datadir} cp -r sysui/unxlng*/misc/redhat/usr/share/mime-info $RPM_BUILD_ROOT/%{_datadir} @@ -2945,6 +2952,7 @@ %dir %{instdir}/share/registry/schema/org/openoffice/Office/UI %{instdir}/share/registry/schema/org/openoffice/Office/UI/DrawWindowState.xcs %dir %{_datadir}/applications +%{_datadir}/applications/openoffice.org-*-draw.desktop %dir %{_datadir}/mimelnk %dir %{_datadir}/mimelnk/application %{_datadir}/mimelnk/application/*drawing* @@ -3131,6 +3139,7 @@ %dir %{instdir}/share/registry/schema/org/openoffice/Office/UI %{instdir}/share/registry/schema/org/openoffice/Office/UI/MathCommands.xcs %dir %{_datadir}/applications +%{_datadir}/applications/openoffice.org-*-math.desktop %dir %{_datadir}/mimelnk %dir %{_datadir}/mimelnk/application %{_datadir}/mimelnk/application/*formula* @@ -3242,6 +3251,8 @@ - drop integrated openoffice.org-1.9.114.ooo51718.rpath.patch - add openoffice.org-2.0.2.ooo63155.sfx2.badscript.patch for rh#185390# - accessibility detection missing +- rh#186515# Keep draw and math launchers for mimetypes +- rh#186215#/ooo#63583# accessibility crashed in impress * Fri Mar 10 2006 Bill Nottingham - 1:2.0.2-5.2 - rebuild for PPC TLS issue (#184446) From fedora-cvs-commits at redhat.com Fri Mar 24 14:53:23 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 24 Mar 2006 09:53:23 -0500 Subject: rpms/openoffice.org/devel openoffice.org-2.0.2.ooo63583.sd.accessibility.patch, NONE, 1.1 openoffice.org.spec, 1.652, 1.653 Message-ID: <200603241453.k2OErNwG015091@cvs.devel.redhat.com> Author: caolanm Update of /cvs/dist/rpms/openoffice.org/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv15077 Modified Files: openoffice.org.spec Added Files: openoffice.org-2.0.2.ooo63583.sd.accessibility.patch Log Message: accessibility fixes openoffice.org-2.0.2.ooo63583.sd.accessibility.patch: sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx | 2 + sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx | 19 +++++++++++--- source/ui/accessibility/AccessibleDrawDocumentView.cxx | 0 source/ui/slidesorter/shell/SlideSorterViewShell.cxx | 0 4 files changed, 17 insertions(+), 4 deletions(-) --- NEW FILE openoffice.org-2.0.2.ooo63583.sd.accessibility.patch --- Index: source/ui/slidesorter/shell/SlideSorterViewShell.cxx =================================================================== RCS file: /cvs/graphics/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx,v retrieving revision 1.20 diff -u -r1.20 SlideSorterViewShell.cxx --- openoffice.org.orig/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx 19 Jan 2006 12:53:55 -0000 1.20 +++ openoffice.org/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx 24 Mar 2006 14:28:02 -0000 @@ -274,10 +274,21 @@ ::com::sun::star::accessibility::XAccessible> SlideSorterViewShell::CreateAccessibleDocumentView (::sd::Window* pWindow) { - return new ::accessibility::AccessibleSlideSorterView ( - *mpSlideSorterController.get(), - pWindow->GetAccessibleParentWindow()->GetAccessible(), - pWindow); + ::com::sun::star::uno::Reference< + ::com::sun::star::accessibility::XAccessible> xAccessible; + + DBG_ASSERT (mpSlideSorterController.get()!=NULL, + "no controller when SlideSorterViewShell::CreateAccessibleDocumentView called"); + + if (mpSlideSorterController.get() != NULL) + { + xAccessible = new ::accessibility::AccessibleSlideSorterView ( + *mpSlideSorterController.get(), + pWindow->GetAccessibleParentWindow()->GetAccessible(), + pWindow); + } + + return xAccessible; } Index: source/ui/accessibility/AccessibleDrawDocumentView.cxx =================================================================== RCS file: /cvs/graphics/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx,v retrieving revision 1.24 diff -u -r1.24 AccessibleDrawDocumentView.cxx --- openoffice.org.orig/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx 9 Sep 2005 03:26:12 -0000 1.24 +++ openoffice.org/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx 24 Mar 2006 14:29:44 -0000 @@ -701,6 +701,8 @@ // Release resources. if (mpChildrenManager != NULL) { + maShapeTreeInfo.SetSdrView(NULL); + mpChildrenManager->SetInfo (maShapeTreeInfo); delete mpChildrenManager; mpChildrenManager = NULL; } Index: openoffice.org.spec =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v retrieving revision 1.652 retrieving revision 1.653 diff -u -r1.652 -r1.653 --- openoffice.org.spec 24 Mar 2006 09:28:14 -0000 1.652 +++ openoffice.org.spec 24 Mar 2006 14:53:21 -0000 1.653 @@ -177,6 +177,7 @@ Patch34: openoffice.org-2.0.2.ooo62030.solenv._version.patch Patch35: openoffice.org-2.0.2.oooXXXXX.config_office.noppds.patch Patch36: openoffice.org-2.0.2.ooo63155.sfx2.badscript.patch +Patch37: openoffice.org-2.0.2.ooo63583.sd.accessibility.patch %define instdir %{_libdir}/openoffice.org2.0 @@ -823,6 +824,7 @@ %patch34 -p1 -b .ooo62030.solenv._version.patch %patch35 -p1 -b .oooXXXXX.config_office.noppds.patch %patch36 -p1 -b .ooo63155.sfx2.badscript.patch +%patch37 -p1 -b .ooo63583.sd.accessibility.patch %if %{includingexternals} #start ludicrous workaround @@ -3268,6 +3270,7 @@ %changelog * Fri Mar 24 2006 Caolan McNamara - 1:2.0.2-5.4.cmc - rh#186515# Keep draw and math launchers for mimetypes +- rh#186215#/ooo#63583# accessibility crashed in impress * Mon Mar 13 2006 Caolan McNamara - 1:2.0.2-5.4 - ooo#59997# replacement opens___.ttf updated From fedora-cvs-commits at redhat.com Fri Mar 24 14:57:21 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 24 Mar 2006 09:57:21 -0500 Subject: rpms/openoffice.org/FC-5 openoffice.org.spec,1.647,1.648 Message-ID: <200603241457.k2OEvLAW015135@cvs.devel.redhat.com> Author: caolanm Update of /cvs/dist/rpms/openoffice.org/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv15122 Modified Files: openoffice.org.spec Log Message: foo Index: openoffice.org.spec =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/FC-5/openoffice.org.spec,v retrieving revision 1.647 retrieving revision 1.648 diff -u -r1.647 -r1.648 --- openoffice.org.spec 24 Mar 2006 14:52:39 -0000 1.647 +++ openoffice.org.spec 24 Mar 2006 14:57:18 -0000 1.648 @@ -1,6 +1,6 @@ %define oootag OOB680 %define ooomilestone 5 -%define rh_rpm_release 4.testing +%define rh_rpm_release 5 %define build_fc5 1 @@ -3245,14 +3245,14 @@ %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu %changelog -* Mon Mar 13 2006 Caolan McNamara - 1:2.0.2-5.4 +* Fri Mar 24 2006 Caolan McNamara - 1:2.0.2-5.5 - ooo#59997# replacement opens___.ttf updated - drop integrated openoffice.org-2.0.0.ooo56651.sw.rtfcrash.patch - drop integrated openoffice.org-1.9.114.ooo51718.rpath.patch - add openoffice.org-2.0.2.ooo63155.sfx2.badscript.patch for rh#185390# - accessibility detection missing - rh#186515# Keep draw and math launchers for mimetypes -- rh#186215#/ooo#63583# accessibility crashed in impress +- rh#186215#/ooo#63583# accessibility crasher in impress * Fri Mar 10 2006 Bill Nottingham - 1:2.0.2-5.2 - rebuild for PPC TLS issue (#184446) From fedora-cvs-commits at redhat.com Fri Mar 24 14:58:17 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 24 Mar 2006 09:58:17 -0500 Subject: rpms/openoffice.org/devel openoffice.org.spec,1.653,1.654 Message-ID: <200603241458.k2OEwHhE015162@cvs.devel.redhat.com> Author: caolanm Update of /cvs/dist/rpms/openoffice.org/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv15149 Modified Files: openoffice.org.spec Log Message: organize to push Index: openoffice.org.spec =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v retrieving revision 1.653 retrieving revision 1.654 diff -u -r1.653 -r1.654 --- openoffice.org.spec 24 Mar 2006 14:53:21 -0000 1.653 +++ openoffice.org.spec 24 Mar 2006 14:58:15 -0000 1.654 @@ -1,6 +1,6 @@ %define oootag OOB680 %define ooomilestone 5 -%define rh_rpm_release 4.cmc +%define rh_rpm_release 5 %define build_fc6 1 %define build_rhel4 0 @@ -3268,9 +3268,9 @@ %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu %changelog -* Fri Mar 24 2006 Caolan McNamara - 1:2.0.2-5.4.cmc +* Fri Mar 24 2006 Caolan McNamara - 1:2.0.2-5.5 - rh#186515# Keep draw and math launchers for mimetypes -- rh#186215#/ooo#63583# accessibility crashed in impress +- rh#186215#/ooo#63583# accessibility crasher in impress * Mon Mar 13 2006 Caolan McNamara - 1:2.0.2-5.4 - ooo#59997# replacement opens___.ttf updated From fedora-cvs-commits at redhat.com Fri Mar 24 15:53:15 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 24 Mar 2006 10:53:15 -0500 Subject: rpms/cups/devel cups-kde.patch,1.1,1.2 cups.spec,1.139,1.140 Message-ID: <200603241553.k2OFrF6E010887@cvs.devel.redhat.com> Author: twaugh Update of /cvs/dist/rpms/cups/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv10872 Modified Files: cups-kde.patch cups.spec Log Message: * Fri Mar 24 2006 Tim Waugh 1:1.2-0.1.b2.6 - Add KDE compatibility symbols _ipp_add_attr/_ipp_free_attr to ipp.h, with a comment saying why they shouldn't be used. cups-kde.patch: ipp.c | 4 ++-- ipp.h | 11 +++++++++++ 2 files changed, 13 insertions(+), 2 deletions(-) Index: cups-kde.patch =================================================================== RCS file: /cvs/dist/rpms/cups/devel/cups-kde.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- cups-kde.patch 24 Mar 2006 14:45:19 -0000 1.1 +++ cups-kde.patch 24 Mar 2006 15:53:11 -0000 1.2 @@ -1,3 +1,23 @@ +--- cups-1.2b2/cups/ipp.h.kde 2006-03-24 15:51:54.000000000 +0000 ++++ cups-1.2b2/cups/ipp.h 2006-03-24 15:52:27.000000000 +0000 +@@ -487,6 +487,17 @@ + ipp_t *parent, ipp_t *ipp); + + ++#ifdef __linux ++/* ++ * The following symbol definitions are provided only for KDE ++ * compatibility during the CUPS 1.2 testing period and will be ++ * removed in a future release of CUPS. These are PRIVATE APIs ++ * from CUPS 1.1.x that the KDE developers chose to use... ++ */ ++extern ipp_attribute_t *_ipp_add_attr(ipp_t *, int); ++extern void _ipp_free_attr(ipp_attribute_t *); ++#endif /* __linux */ ++ + /* + * C++ magic... + */ --- cups-1.2b2/cups/ipp.c.kde 2006-03-24 14:42:41.000000000 +0000 +++ cups-1.2b2/cups/ipp.c 2006-03-24 14:42:53.000000000 +0000 @@ -2806,14 +2806,14 @@ Index: cups.spec =================================================================== RCS file: /cvs/dist/rpms/cups/devel/cups.spec,v retrieving revision 1.139 retrieving revision 1.140 diff -u -r1.139 -r1.140 --- cups.spec 24 Mar 2006 14:44:00 -0000 1.139 +++ cups.spec 24 Mar 2006 15:53:11 -0000 1.140 @@ -7,7 +7,7 @@ Summary: Common Unix Printing System Name: cups Version: 1.2 -Release: 0.1.%{beta}.5 +Release: 0.1.%{beta}.6 License: GPL Group: System Environment/Daemons Source: ftp://ftp.easysw.com/pub/cups/test/cups-1.2%{beta}-source.tar.bz2 @@ -371,6 +371,10 @@ %{cups_serverbin}/daemon/cups-lpd %changelog +* Fri Mar 24 2006 Tim Waugh 1:1.2-0.1.b2.6 +- Add KDE compatibility symbols _ipp_add_attr/_ipp_free_attr to ipp.h, with + a comment saying why they shouldn't be used. + * Fri Mar 24 2006 Tim Waugh 1:1.2-0.1.b2.5 - Fix KDE compatibility symbols _ipp_add_attr/_ipp_free_attr. From fedora-cvs-commits at redhat.com Fri Mar 24 16:12:04 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 24 Mar 2006 11:12:04 -0500 Subject: rpms/gthumb/FC-5 .cvsignore, 1.20, 1.21 gthumb.spec, 1.39, 1.40 sources, 1.20, 1.21 Message-ID: <200603241612.k2OGC4YY011198@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/gthumb/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv11177 Modified Files: .cvsignore gthumb.spec sources Log Message: 2.7.5.1 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/gthumb/FC-5/.cvsignore,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- .cvsignore 21 Mar 2006 03:40:15 -0000 1.20 +++ .cvsignore 24 Mar 2006 16:12:01 -0000 1.21 @@ -11,3 +11,4 @@ gthumb-2.7.2.tar.bz2 gthumb-2.7.3.tar.bz2 gthumb-2.7.5.tar.bz2 +gthumb-2.7.5.1.tar.bz2 Index: gthumb.spec =================================================================== RCS file: /cvs/dist/rpms/gthumb/FC-5/gthumb.spec,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- gthumb.spec 21 Mar 2006 03:40:15 -0000 1.39 +++ gthumb.spec 24 Mar 2006 16:12:01 -0000 1.40 @@ -9,8 +9,8 @@ Summary: Image viewer, editor, organizer Name: gthumb -Version: 2.7.5 -Release: 1 +Version: 2.7.5.1 +Release: 1.fc5.1 URL: http://gthumb.sourceforge.net Source0: ftp://ftp.gnome.org/pub/GNOME/sources/gthumb/2.4/%{name}-%{version}.tar.bz2 License: GPL @@ -100,6 +100,9 @@ %{_datadir}/pixmaps %changelog +* Fri Mar 24 2006 Matthias Clasen - 2.7.5.1-1 +- Update to 2.7.5.1 + * Mon Mar 20 2006 Matthias Clasen - 2.7.5-1 - Update to 2.7.5 Index: sources =================================================================== RCS file: /cvs/dist/rpms/gthumb/FC-5/sources,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- sources 21 Mar 2006 03:40:15 -0000 1.20 +++ sources 24 Mar 2006 16:12:01 -0000 1.21 @@ -1 +1 @@ -23a45e1cc1ae9951ac34a3a56da99974 gthumb-2.7.5.tar.bz2 +feefaead3582c0c3aa510bd3d2da93b1 gthumb-2.7.5.1.tar.bz2 From fedora-cvs-commits at redhat.com Fri Mar 24 16:22:30 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 24 Mar 2006 11:22:30 -0500 Subject: rpms/audiofile/devel audiofile-const.patch, NONE, 1.1 audiofile.spec, 1.18, 1.19 Message-ID: <200603241622.k2OGMU5h025203@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/audiofile/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv25186 Modified Files: audiofile.spec Added Files: audiofile-const.patch Log Message: Reduce memory consumption audiofile-const.patch: aiff.c | 4 ++-- compression.c | 4 ++-- debug.c | 2 +- format.c | 2 +- g711.c | 6 +++--- instrument.c | 2 +- modules.c | 12 ++++++------ next.c | 2 +- openclose.c | 2 +- pcm.c | 8 ++++---- query.c | 4 ++-- raw.c | 2 +- setup.c | 6 +++--- units.c | 4 ++-- util.c | 10 +++++----- wave.c | 4 ++-- 16 files changed, 37 insertions(+), 37 deletions(-) --- NEW FILE audiofile-const.patch --- diff -ur audiofile-0.2.6-orig/libaudiofile/aiff.c audiofile-0.2.6-mine/libaudiofile/aiff.c --- audiofile-0.2.6-orig/libaudiofile/aiff.c 2004-03-06 01:39:23.000000000 -0500 +++ audiofile-0.2.6-mine/libaudiofile/aiff.c 2006-03-22 02:15:50.058306000 -0500 @@ -64,7 +64,7 @@ static status ParseSSND (AFfilehandle file, AFvirtualfile *fh, u_int32_t type, size_t size); -_InstParamInfo _af_aiff_inst_params[_AF_AIFF_NUM_INSTPARAMS] = +const _InstParamInfo _af_aiff_inst_params[_AF_AIFF_NUM_INSTPARAMS] = { { AF_INST_MIDI_BASENOTE, AU_PVTYPE_LONG, "MIDI base note", {60} }, { AF_INST_NUMCENTS_DETUNE, AU_PVTYPE_LONG, "Detune in cents", {0} }, @@ -77,7 +77,7 @@ { AF_INST_RELLOOPID, AU_PVTYPE_LONG, "Release loop id", {0} } }; -int _af_aiffc_compression_types[_AF_AIFF_NUM_COMPTYPES] = +const int _af_aiffc_compression_types[_AF_AIFF_NUM_COMPTYPES] = { AF_COMPRESSION_G711_ULAW, AF_COMPRESSION_G711_ALAW diff -ur audiofile-0.2.6-orig/libaudiofile/compression.c audiofile-0.2.6-mine/libaudiofile/compression.c --- audiofile-0.2.6-orig/libaudiofile/compression.c 2004-03-06 01:39:23.000000000 -0500 +++ audiofile-0.2.6-mine/libaudiofile/compression.c 2006-03-22 02:04:44.948739250 -0500 @@ -37,7 +37,7 @@ #include "units.h" #include "util.h" -extern _CompressionUnit _af_compression[]; +extern const _CompressionUnit _af_compression[]; int _af_compression_index_from_id (int compressionid) { @@ -54,7 +54,7 @@ return -1; } -static _CompressionUnit *findCompression (int compressionid) +static const _CompressionUnit *findCompression (int compressionid) { int compressionno; diff -ur audiofile-0.2.6-orig/libaudiofile/debug.c audiofile-0.2.6-mine/libaudiofile/debug.c --- audiofile-0.2.6-orig/libaudiofile/debug.c 2004-03-06 01:39:23.000000000 -0500 +++ audiofile-0.2.6-mine/libaudiofile/debug.c 2006-03-22 01:56:31.187180000 -0500 @@ -49,7 +49,7 @@ #include "print.h" #include "debug.h" -extern _CompressionUnit _af_compression[]; +extern const _CompressionUnit _af_compression[]; void _af_printid (u_int32_t id) { diff -ur audiofile-0.2.6-orig/libaudiofile/format.c audiofile-0.2.6-mine/libaudiofile/format.c --- audiofile-0.2.6-orig/libaudiofile/format.c 2004-03-06 01:39:23.000000000 -0500 +++ audiofile-0.2.6-mine/libaudiofile/format.c 2006-03-22 01:56:21.586580000 -0500 @@ -43,7 +43,7 @@ #include "units.h" #include "modules.h" -extern _Unit _af_units[]; +extern const _Unit _af_units[]; AFfileoffset afGetDataOffset (AFfilehandle file, int trackid) { diff -ur audiofile-0.2.6-orig/libaudiofile/g711.c audiofile-0.2.6-mine/libaudiofile/g711.c --- audiofile-0.2.6-orig/libaudiofile/g711.c 2004-03-06 01:39:23.000000000 -0500 +++ audiofile-0.2.6-mine/libaudiofile/g711.c 2006-03-21 22:57:37.356130750 -0500 @@ -38,7 +38,7 @@ #define SEG_MASK (0x70) /* Segment field mask. */ /* copy from CCITT G.711 specifications */ -static unsigned char _u2a[128] = { /* u- to A-law conversions */ +static const unsigned char _u2a[128] = { /* u- to A-law conversions */ 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 7, 8, 8, 9, 10, 11, 12, 13, 14, 15, 16, @@ -56,7 +56,7 @@ 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127, 128}; -static unsigned char _a2u[128] = { /* A- to u-law conversions */ +static const unsigned char _a2u[128] = { /* A- to u-law conversions */ 1, 3, 5, 7, 9, 11, 13, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, @@ -77,7 +77,7 @@ /* see libst.h */ #ifdef SUPERCEDED -static short seg_end[8] = {0xFF, 0x1FF, 0x3FF, 0x7FF, +static const short seg_end[8] = {0xFF, 0x1FF, 0x3FF, 0x7FF, 0xFFF, 0x1FFF, 0x3FFF, 0x7FFF}; static int diff -ur audiofile-0.2.6-orig/libaudiofile/instrument.c audiofile-0.2.6-mine/libaudiofile/instrument.c --- audiofile-0.2.6-orig/libaudiofile/instrument.c 2004-03-06 01:39:23.000000000 -0500 +++ audiofile-0.2.6-mine/libaudiofile/instrument.c 2006-03-22 01:56:12.642021000 -0500 @@ -55,7 +55,7 @@ #include -extern _Unit _af_units[]; +extern const _Unit _af_units[]; /* Initialize instrument id list for audio file. diff -ur audiofile-0.2.6-orig/libaudiofile/modules.c audiofile-0.2.6-mine/libaudiofile/modules.c --- audiofile-0.2.6-orig/libaudiofile/modules.c 2004-03-06 01:39:23.000000000 -0500 +++ audiofile-0.2.6-mine/libaudiofile/modules.c 2006-03-22 02:07:29.411017500 -0500 @@ -56,15 +56,15 @@ #define NULLMODULEPARAM -extern _PCMInfo _af_default_signed_integer_pcm_mappings[]; -extern _PCMInfo _af_default_unsigned_integer_pcm_mappings[]; -extern _PCMInfo _af_default_float_pcm_mapping; -extern _PCMInfo _af_default_double_pcm_mapping; +extern const _PCMInfo _af_default_signed_integer_pcm_mappings[]; +extern const _PCMInfo _af_default_unsigned_integer_pcm_mappings[]; +extern const _PCMInfo _af_default_float_pcm_mapping; +extern const _PCMInfo _af_default_double_pcm_mapping; extern _CompressionUnit _af_compression[]; /* Define rebuffering modules. */ -extern _AFmodule int2rebufferv2f, int2rebufferf2v; +extern const _AFmodule int2rebufferv2f, int2rebufferf2v; /* module utility routines @@ -1511,7 +1511,7 @@ } }; -static _PCMInfo *intmappings[6] = +static const _PCMInfo *intmappings[6] = { &_af_default_signed_integer_pcm_mappings[1], &_af_default_signed_integer_pcm_mappings[2], diff -ur audiofile-0.2.6-orig/libaudiofile/next.c audiofile-0.2.6-mine/libaudiofile/next.c --- audiofile-0.2.6-orig/libaudiofile/next.c 2004-03-06 01:39:23.000000000 -0500 +++ audiofile-0.2.6-mine/libaudiofile/next.c 2006-03-22 02:15:59.742911250 -0500 @@ -47,7 +47,7 @@ #include "setup.h" #include "byteorder.h" -int _af_next_compression_types[_AF_NEXT_NUM_COMPTYPES] = +const int _af_next_compression_types[_AF_NEXT_NUM_COMPTYPES] = { AF_COMPRESSION_G711_ULAW, AF_COMPRESSION_G711_ALAW diff -ur audiofile-0.2.6-orig/libaudiofile/openclose.c audiofile-0.2.6-mine/libaudiofile/openclose.c --- audiofile-0.2.6-orig/libaudiofile/openclose.c 2004-03-06 01:39:23.000000000 -0500 +++ audiofile-0.2.6-mine/libaudiofile/openclose.c 2006-03-22 01:55:33.067547750 -0500 @@ -45,7 +45,7 @@ #define SETBINARYMODE(x) #endif /* WIN32 || __CYGWIN__ */ -extern _Unit _af_units[]; +extern const _Unit _af_units[]; static void freeFileHandle (AFfilehandle filehandle); static void freeInstParams (AFPVu *values, int fileFormat); diff -ur audiofile-0.2.6-orig/libaudiofile/pcm.c audiofile-0.2.6-mine/libaudiofile/pcm.c --- audiofile-0.2.6-orig/libaudiofile/pcm.c 2004-03-06 01:39:23.000000000 -0500 +++ audiofile-0.2.6-mine/libaudiofile/pcm.c 2006-03-21 22:56:53.581395000 -0500 @@ -33,7 +33,7 @@ #include "pcm.h" #include "util.h" -_PCMInfo _af_default_signed_integer_pcm_mappings[] = +const _PCMInfo _af_default_signed_integer_pcm_mappings[] = { {0, 0, 0, 0}, {SLOPE_INT8, 0, MIN_INT8, MAX_INT8}, @@ -42,7 +42,7 @@ {SLOPE_INT32, 0, MIN_INT32, MAX_INT32} }; -_PCMInfo _af_default_unsigned_integer_pcm_mappings[] = +const _PCMInfo _af_default_unsigned_integer_pcm_mappings[] = { {0, 0, 0, 0}, {SLOPE_INT8, INTERCEPT_U_INT8, 0, MAX_U_INT8}, @@ -51,10 +51,10 @@ {SLOPE_INT32, INTERCEPT_U_INT32, 0, MAX_U_INT32} }; -_PCMInfo _af_default_float_pcm_mapping = +const _PCMInfo _af_default_float_pcm_mapping = {1, 0, 0, 0}; -_PCMInfo _af_default_double_pcm_mapping = +const _PCMInfo _af_default_double_pcm_mapping = {1, 0, 0, 0}; /* diff -ur audiofile-0.2.6-orig/libaudiofile/query.c audiofile-0.2.6-mine/libaudiofile/query.c --- audiofile-0.2.6-orig/libaudiofile/query.c 2004-03-06 01:39:23.000000000 -0500 +++ audiofile-0.2.6-mine/libaudiofile/query.c 2006-03-22 01:55:23.070923000 -0500 @@ -43,8 +43,8 @@ #include "compression.h" #include "instrument.h" -extern _Unit _af_units[]; -extern _CompressionUnit _af_compression[]; +extern const _Unit _af_units[]; +extern const _CompressionUnit _af_compression[]; AUpvlist _afQueryFileFormat (int arg1, int arg2, int arg3, int arg4); AUpvlist _afQueryInstrument (int arg1, int arg2, int arg3, int arg4); diff -ur audiofile-0.2.6-orig/libaudiofile/raw.c audiofile-0.2.6-mine/libaudiofile/raw.c --- audiofile-0.2.6-orig/libaudiofile/raw.c 2004-03-06 01:39:23.000000000 -0500 +++ audiofile-0.2.6-mine/libaudiofile/raw.c 2006-03-22 02:16:08.563462500 -0500 @@ -50,7 +50,7 @@ NULL /* miscellaneous */ }; -int _af_raw_compression_types[_AF_RAW_NUM_COMPTYPES] = +const int _af_raw_compression_types[_AF_RAW_NUM_COMPTYPES] = { AF_COMPRESSION_G711_ULAW, AF_COMPRESSION_G711_ALAW diff -ur audiofile-0.2.6-orig/libaudiofile/setup.c audiofile-0.2.6-mine/libaudiofile/setup.c --- audiofile-0.2.6-orig/libaudiofile/setup.c 2004-03-06 01:39:23.000000000 -0500 +++ audiofile-0.2.6-mine/libaudiofile/setup.c 2006-03-22 02:16:14.567837750 -0500 @@ -39,7 +39,7 @@ extern _Unit _af_units[]; -_AFfilesetup _af_default_file_setup = +const _AFfilesetup _af_default_file_setup = { _AF_VALID_FILESETUP, /* valid */ #if WORDS_BIGENDIAN @@ -58,7 +58,7 @@ NULL /* miscellaneous */ }; -_InstrumentSetup _af_default_instrumentsetup = +const _InstrumentSetup _af_default_instrumentsetup = { 0, /* id */ 2, /* loopCount */ @@ -66,7 +66,7 @@ AF_FALSE /* loopSet */ }; -_TrackSetup _af_default_tracksetup = +const _TrackSetup _af_default_tracksetup = { 0, { diff -ur audiofile-0.2.6-orig/libaudiofile/units.c audiofile-0.2.6-mine/libaudiofile/units.c --- audiofile-0.2.6-orig/libaudiofile/units.c 2004-03-06 01:39:23.000000000 -0500 +++ audiofile-0.2.6-mine/libaudiofile/units.c 2006-03-22 02:02:12.335201500 -0500 @@ -56,7 +56,7 @@ extern int _af_next_compression_types[]; extern int _af_wave_compression_types[]; -_Unit _af_units[_AF_NUM_UNITS] = +const _Unit _af_units[_AF_NUM_UNITS] = { { AF_FILE_RAWDATA, @@ -221,7 +221,7 @@ } }; -_CompressionUnit _af_compression[_AF_NUM_COMPRESSION] = +const _CompressionUnit _af_compression[_AF_NUM_COMPRESSION] = { { AF_COMPRESSION_NONE, diff -ur audiofile-0.2.6-orig/libaudiofile/util.c audiofile-0.2.6-mine/libaudiofile/util.c --- audiofile-0.2.6-orig/libaudiofile/util.c 2004-03-06 01:39:23.000000000 -0500 +++ audiofile-0.2.6-mine/libaudiofile/util.c 2006-03-22 01:54:41.944352750 -0500 @@ -46,12 +46,12 @@ #include "byteorder.h" #include "aupvinternal.h" -extern _PCMInfo _af_default_signed_integer_pcm_mappings[]; -extern _PCMInfo _af_default_unsigned_integer_pcm_mappings[]; -extern _PCMInfo _af_default_float_pcm_mapping; -extern _PCMInfo _af_default_double_pcm_mapping; +extern const _PCMInfo _af_default_signed_integer_pcm_mappings[]; +extern const _PCMInfo _af_default_unsigned_integer_pcm_mappings[]; +extern const _PCMInfo _af_default_float_pcm_mapping; +extern const _PCMInfo _af_default_double_pcm_mapping; -extern _CompressionUnit _af_compression[]; +extern const _CompressionUnit _af_compression[]; /* _af_filesetup_ok and _af_filehandle_ok are sanity check routines diff -ur audiofile-0.2.6-orig/libaudiofile/wave.c audiofile-0.2.6-mine/libaudiofile/wave.c --- audiofile-0.2.6-orig/libaudiofile/wave.c 2004-03-06 01:39:23.000000000 -0500 +++ audiofile-0.2.6-mine/libaudiofile/wave.c 2006-03-22 02:16:29.568775250 -0500 @@ -49,13 +49,13 @@ #include "setup.h" #include "marker.h" -int _af_wave_compression_types[_AF_WAVE_NUM_COMPTYPES] = +const int _af_wave_compression_types[_AF_WAVE_NUM_COMPTYPES] = { AF_COMPRESSION_G711_ULAW, AF_COMPRESSION_G711_ALAW }; -_InstParamInfo _af_wave_inst_params[_AF_WAVE_NUM_INSTPARAMS] = +const _InstParamInfo _af_wave_inst_params[_AF_WAVE_NUM_INSTPARAMS] = { { AF_INST_MIDI_BASENOTE, AU_PVTYPE_LONG, "MIDI base note", {60} }, { AF_INST_NUMCENTS_DETUNE, AU_PVTYPE_LONG, "Detune in cents", {0} }, Index: audiofile.spec =================================================================== RCS file: /cvs/dist/rpms/audiofile/devel/audiofile.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- audiofile.spec 11 Feb 2006 01:59:17 -0000 1.18 +++ audiofile.spec 24 Mar 2006 16:22:28 -0000 1.19 @@ -1,12 +1,13 @@ Summary: A library for accessing various audio file formats. Name: audiofile Version: 0.2.6 -Release: 2.2.1 +Release: 3 Epoch: 1 License: LGPL Group: System Environment/Libraries Source: ftp://ftp.gnome.org/pub/gnome/sources/audiofile/0.2/audiofile-%{version}.tar.bz2 Patch0: audiofile-underquoted.patch +Patch1: audiofile-const.patch BuildRoot: %{_tmppath}/%{name}-%{version}-root Prereq: /sbin/ldconfig @@ -32,6 +33,7 @@ %prep %setup -q %patch0 -p1 -b .underquoted +%patch1 -p1 -b .const %build %configure @@ -71,6 +73,9 @@ %{_datadir}/aclocal/* %changelog +* Fri Mar 24 2006 Matthias Clasen - 1:0.2.6-3 +- Reduce memory consumption by making data tables const + * Fri Feb 10 2006 Jesse Keating - 1:0.2.6-2.2.1 - bump again for double-long bug on ppc(64) From fedora-cvs-commits at redhat.com Fri Mar 24 16:27:43 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 24 Mar 2006 11:27:43 -0500 Subject: rpms/gthumb/devel gthumb.spec,1.38,1.39 sources,1.19,1.20 Message-ID: <200603241627.k2OGRhNb025429@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/gthumb/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv25414 Modified Files: gthumb.spec sources Log Message: 2.7.5.1 Index: gthumb.spec =================================================================== RCS file: /cvs/dist/rpms/gthumb/devel/gthumb.spec,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- gthumb.spec 2 Mar 2006 19:22:00 -0000 1.38 +++ gthumb.spec 24 Mar 2006 16:27:41 -0000 1.39 @@ -9,7 +9,7 @@ Summary: Image viewer, editor, organizer Name: gthumb -Version: 2.7.3 +Version: 2.7.5.1 Release: 2 URL: http://gthumb.sourceforge.net Source0: ftp://ftp.gnome.org/pub/GNOME/sources/gthumb/2.4/%{name}-%{version}.tar.bz2 @@ -100,6 +100,12 @@ %{_datadir}/pixmaps %changelog +* Fri Mar 24 2006 Matthias Clasen - 2.7.5.1-2 +- Update to 2.7.5.1 + +* Mon Mar 20 2006 Matthias Clasen - 2.7.5-1 +- Update to 2.7.5 + * Thu Mar 2 2006 Ray Strode - 2.7.3-2 - Make saving work again (bug 183141) Index: sources =================================================================== RCS file: /cvs/dist/rpms/gthumb/devel/sources,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- sources 15 Feb 2006 06:03:22 -0000 1.19 +++ sources 24 Mar 2006 16:27:41 -0000 1.20 @@ -1 +1 @@ -3791412add993ad938f0fe4df021c88b gthumb-2.7.3.tar.bz2 +feefaead3582c0c3aa510bd3d2da93b1 gthumb-2.7.5.1.tar.bz2 From fedora-cvs-commits at redhat.com Fri Mar 24 16:44:08 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 24 Mar 2006 11:44:08 -0500 Subject: rpms/selinux-policy/devel policy-20060323.patch, NONE, 1.1 .cvsignore, 1.49, 1.50 modules-strict.conf, 1.7, 1.8 modules-targeted.conf, 1.18, 1.19 selinux-policy.spec, 1.158, 1.159 sources, 1.53, 1.54 Message-ID: <200603241644.k2OGi8LG025852@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/selinux-policy/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv25837 Modified Files: .cvsignore modules-strict.conf modules-targeted.conf selinux-policy.spec sources Added Files: policy-20060323.patch Log Message: * Wed Mar 22 2006 Dan Walsh 2.2.25-3 - Fix policyhelp policy-20060323.patch: admin/logwatch.te | 1 admin/rpm.fc | 1 kernel/corenetwork.te.in | 2 - kernel/devices.if | 58 +++++++++++++++++++++++++++++++++++++++++++++++ kernel/files.if | 27 +++++++++++++++++++++ kernel/kernel.if | 4 +-- services/apm.te | 4 +++ services/bluetooth.te | 34 ++++++++++++--------------- services/hal.te | 4 +++ services/pegasus.te | 1 services/privoxy.te | 5 ++++ services/xserver.if | 20 ++++++++++++++++ system/authlogin.te | 2 + system/fstools.te | 5 ++++ system/init.te | 1 system/selinuxutil.te | 1 16 files changed, 148 insertions(+), 22 deletions(-) --- NEW FILE policy-20060323.patch --- diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/logwatch.te serefpolicy-2.2.26/policy/modules/admin/logwatch.te --- nsaserefpolicy/policy/modules/admin/logwatch.te 2006-03-17 13:51:46.000000000 -0500 +++ serefpolicy-2.2.26/policy/modules/admin/logwatch.te 2006-03-23 16:21:01.000000000 -0500 @@ -52,6 +52,7 @@ files_read_etc_runtime_files(logwatch_t) files_read_usr_files(logwatch_t) files_search_spool(logwatch_t) +files_search_mnt(logwatch_t) files_dontaudit_search_home(logwatch_t) fs_getattr_all_fs(logwatch_t) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.fc serefpolicy-2.2.26/policy/modules/admin/rpm.fc --- nsaserefpolicy/policy/modules/admin/rpm.fc 2006-03-23 16:02:02.000000000 -0500 +++ serefpolicy-2.2.26/policy/modules/admin/rpm.fc 2006-03-23 16:21:01.000000000 -0500 @@ -3,6 +3,7 @@ /usr/bin/smart -- gen_context(system_u:object_r:rpm_exec_t,s0) /usr/bin/yum -- gen_context(system_u:object_r:rpm_exec_t,s0) +/usr/share/yumex/yumex -- gen_context(system_u:object_r:rpm_exec_t,s0) /usr/lib(64)?/rpm/rpmd -- gen_context(system_u:object_r:bin_t,s0) /usr/lib(64)?/rpm/rpmq -- gen_context(system_u:object_r:bin_t,s0) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corenetwork.te.in serefpolicy-2.2.26/policy/modules/kernel/corenetwork.te.in --- nsaserefpolicy/policy/modules/kernel/corenetwork.te.in 2006-03-23 16:02:03.000000000 -0500 +++ serefpolicy-2.2.26/policy/modules/kernel/corenetwork.te.in 2006-03-23 16:22:23.000000000 -0500 @@ -127,7 +127,7 @@ network_port(uucpd, tcp,540,s0) network_port(vnc, tcp,5900,s0) network_port(xen, tcp,8002,s0) -network_port(xserver, tcp,6001,s0, tcp,6002,s0, tcp,6003,s0, tcp,6004,s0, tcp,6005,s0, tcp,6006,s0, tcp,6007,s0, tcp,6008,s0, tcp,6009,s0, tcp,6010,s0, tcp,6011,s0, tcp,6012,s0, tcp,6013,s0, tcp,6014,s0, tcp,6015,s0, tcp,6016,s0, tcp,6017,s0, tcp,6018,s0, tcp,6019,s0) +network_port(xserver, tcp, 6000, s0, tcp,6001,s0, tcp,6002,s0, tcp,6003,s0, tcp,6004,s0, tcp,6005,s0, tcp,6006,s0, tcp,6007,s0, tcp,6008,s0, tcp,6009,s0, tcp,6010,s0, tcp,6011,s0, tcp,6012,s0, tcp,6013,s0, tcp,6014,s0, tcp,6015,s0, tcp,6016,s0, tcp,6017,s0, tcp,6018,s0, tcp,6019,s0) network_port(zebra, tcp,2601,s0) network_port(zope, tcp,8021,s0) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.if serefpolicy-2.2.26/policy/modules/kernel/devices.if --- nsaserefpolicy/policy/modules/kernel/devices.if 2006-03-23 16:02:03.000000000 -0500 +++ serefpolicy-2.2.26/policy/modules/kernel/devices.if 2006-03-23 16:21:01.000000000 -0500 @@ -2387,6 +2387,44 @@ ######################################## ## +## Getattr generic the USB devices. +## +## +## +## Domain allowed access. +## +## +# +interface(`dev_getattr_generic_usb_dev',` + gen_require(` + type usb_device_t; + ') + + allow $1 device_t:dir r_dir_perms; + allow $1 usb_device_t:chr_file getattr; +') + +######################################## +## +## Setattr generic the USB devices. +## +## +## +## Domain allowed access. +## +## +# +interface(`dev_setattr_generic_usb_dev',` + gen_require(` + type usb_device_t; + ') + + allow $1 device_t:dir r_dir_perms; + allow $1 usb_device_t:chr_file setattr; +') + +######################################## +## ## Mount a usbfs filesystem. ## ## @@ -2826,3 +2864,23 @@ allow $1 self:capability sys_rawio; typeattribute $1 memory_raw_write, memory_raw_read; ') + +######################################## +## +## Dontaudit getattr on all device nodes. +## +## +## +## Domain to not audit. +## +## +# +interface(`dev_dontaudit_getattr_all_device_nodes',` + gen_require(` + attribute device_node; + ') + + dontaudit $1 device_t:dir_file_class_set getattr; + dontaudit $1 device_node:dir_file_class_set getattr; +') + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.if serefpolicy-2.2.26/policy/modules/kernel/files.if --- nsaserefpolicy/policy/modules/kernel/files.if 2006-03-23 16:02:03.000000000 -0500 +++ serefpolicy-2.2.26/policy/modules/kernel/files.if 2006-03-23 16:21:01.000000000 -0500 @@ -1648,6 +1648,21 @@ ') ######################################## +# +# files_unlink_boot_flag(domain) +# +# /halt, /.autofsck, etc +# +interface(`files_unlink_boot_flag',` + gen_require(` + type root_t; + ') + + allow $1 root_t:file unlink; +') + + +######################################## ## ## Read files in /etc that are dynamically ## created on boot, such as mtab. @@ -2157,6 +2172,18 @@ ######################################## # +# files_dontaudit_search_mnt(domain) +# +interface(`files_dontaudit_search_mnt',` + gen_require(` + type mnt_t; + ') + + dontaudit $1 mnt_t:dir search_dir_perms; +') + +######################################## +# # files_list_mnt(domain) # interface(`files_list_mnt',` diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel.if serefpolicy-2.2.26/policy/modules/kernel/kernel.if --- nsaserefpolicy/policy/modules/kernel/kernel.if 2006-03-23 16:02:03.000000000 -0500 +++ serefpolicy-2.2.26/policy/modules/kernel/kernel.if 2006-03-23 16:21:01.000000000 -0500 @@ -1148,7 +1148,7 @@ allow $1 proc_t:dir search; allow $1 sysctl_t:dir r_dir_perms; - allow $1 sysctl_vm_t:dir list_dir_perms; + allow $1 sysctl_vm_t:dir rw_dir_perms; allow $1 sysctl_vm_t:file rw_file_perms; ') @@ -1433,7 +1433,7 @@ allow $1 proc_t:dir search; allow $1 sysctl_t:dir r_dir_perms; - allow $1 sysctl_kernel_t:dir r_dir_perms; + allow $1 sysctl_kernel_t:dir rw_dir_perms; allow $1 sysctl_kernel_t:file rw_file_perms; ') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apm.te serefpolicy-2.2.26/policy/modules/services/apm.te --- nsaserefpolicy/policy/modules/services/apm.te 2006-03-23 16:02:03.000000000 -0500 +++ serefpolicy-2.2.26/policy/modules/services/apm.te 2006-03-23 16:21:01.000000000 -0500 @@ -225,6 +225,10 @@ pcmcia_domtrans_cardctl(apmd_t) ') +optional_policy(`xserver',` + xserver_domtrans_xdm_xserver(apmd_t) +') + optional_policy(`selinuxutil',` seutil_sigchld_newrole(apmd_t) ') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bluetooth.te serefpolicy-2.2.26/policy/modules/services/bluetooth.te --- nsaserefpolicy/policy/modules/services/bluetooth.te 2006-03-23 16:02:03.000000000 -0500 +++ serefpolicy-2.2.26/policy/modules/services/bluetooth.te 2006-03-23 16:34:34.000000000 -0500 @@ -205,6 +205,8 @@ miscfiles_read_localization(bluetooth_helper_t) miscfiles_read_fonts(bluetooth_helper_t) +sysnet_read_config(bluetooth_helper_t) + optional_policy(`dbus',` dbus_system_bus_client_template(bluetooth_helper,bluetooth_helper_t) dbus_connect_system_bus(bluetooth_helper_t) @@ -215,27 +217,21 @@ nscd_socket_use(bluetooth_helper_t) ') -optional_policy(`xserver',` - xserver_stream_connect_xdm(bluetooth_helper_t) -') - -ifdef(`TODO',` -allow bluetooth_helper_t tmp_t:dir search; - -ifdef(`strict_policy',` - ifdef(`xdm.te',` - allow bluetooth_helper_t xdm_xserver_tmp_t:sock_file { read write }; - ') -') -') dnl end TODO +optional_policy(`locallogin', ` + locallogin_dontaudit_use_fds(bluetooth_helper_t) +'); + +optional_policy(`xserver', ` + xserver_stream_connect_xdm(bluetooth_helper_t) +'); ifdef(`targeted_policy',` + userdom_read_all_users_home_content_files(bluetooth_helper_t) +# Not sure we need the following anymore ???? files_rw_generic_tmp_sockets(bluetooth_helper_t) - allow bluetooth_helper_t tmpfs_t:file { read write }; allow bluetooth_helper_t unconfined_t:unix_stream_socket connectto; - userdom_read_all_users_home_content_files(bluetooth_helper_t) - - optional_policy(`xserver',` - xserver_stream_connect_xdm(bluetooth_helper_t) - ') + allow bluetooth_helper_t tmpfs_t:file { read write }; + optional_policy(`xserver', ` + xserver_rw_xdm_sockets(bluetooth_helper_t) + '); ') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.te serefpolicy-2.2.26/policy/modules/services/hal.te --- nsaserefpolicy/policy/modules/services/hal.te 2006-03-23 16:02:03.000000000 -0500 +++ serefpolicy-2.2.26/policy/modules/services/hal.te 2006-03-23 16:21:01.000000000 -0500 @@ -210,6 +210,10 @@ nis_use_ypbind(hald_t) ') +optional_policy(`ntp', ` + ntp_domtrans(hald_t) +') + optional_policy(`nscd',` nscd_socket_use(hald_t) ') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pegasus.te serefpolicy-2.2.26/policy/modules/services/pegasus.te --- nsaserefpolicy/policy/modules/services/pegasus.te 2006-03-04 00:06:36.000000000 -0500 +++ serefpolicy-2.2.26/policy/modules/services/pegasus.te 2006-03-23 16:21:01.000000000 -0500 @@ -77,6 +77,7 @@ corenet_tcp_bind_pegasus_https_port(pegasus_t) corenet_tcp_connect_pegasus_http_port(pegasus_t) corenet_tcp_connect_pegasus_https_port(pegasus_t) +corenet_tcp_connect_generic_port(pegasus_t) dev_read_sysfs(pegasus_t) dev_read_urand(pegasus_t) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/privoxy.te serefpolicy-2.2.26/policy/modules/services/privoxy.te --- nsaserefpolicy/policy/modules/services/privoxy.te 2006-03-04 00:06:36.000000000 -0500 +++ serefpolicy-2.2.26/policy/modules/services/privoxy.te 2006-03-23 16:21:01.000000000 -0500 @@ -51,6 +51,7 @@ corenet_tcp_bind_http_cache_port(privoxy_t) corenet_tcp_connect_http_port(privoxy_t) corenet_tcp_connect_ftp_port(privoxy_t) +corenet_tcp_connect_tor_port(privoxy_t) dev_read_sysfs(privoxy_t) @@ -94,6 +95,10 @@ nis_use_ypbind(privoxy_t) ') +optional_policy(`nscd',` + nscd_socket_use(privoxy_t) +') + optional_policy(`selinuxutil',` seutil_sigchld_newrole(privoxy_t) ') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.if serefpolicy-2.2.26/policy/modules/services/xserver.if --- nsaserefpolicy/policy/modules/services/xserver.if 2006-03-21 14:33:33.000000000 -0500 +++ serefpolicy-2.2.26/policy/modules/services/xserver.if 2006-03-23 16:21:01.000000000 -0500 @@ -922,3 +922,23 @@ dontaudit $1 xdm_xserver_t:tcp_socket { read write }; ') + +######################################## +## +## Allow read and write to +## a XDM X server socket. +## +## +## +## Domain to allow +## +## +# +interface(`xserver_rw_xdm_sockets',` + gen_require(` + type xdm_xserver_tmp_t; + ') + + allow $1 xdm_xserver_tmp_t:dir search; + allow $1 xdm_xserver_tmp_t:sock_file { read write }; +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlogin.te serefpolicy-2.2.26/policy/modules/system/authlogin.te --- nsaserefpolicy/policy/modules/system/authlogin.te 2006-03-17 13:51:50.000000000 -0500 +++ serefpolicy-2.2.26/policy/modules/system/authlogin.te 2006-03-23 16:21:01.000000000 -0500 @@ -171,6 +171,8 @@ dev_setattr_video_dev(pam_console_t) dev_getattr_xserver_misc_dev(pam_console_t) dev_setattr_xserver_misc_dev(pam_console_t) +dev_getattr_generic_usb_dev(pam_console_t) +dev_setattr_generic_usb_dev(pam_console_t) fs_search_auto_mountpoints(pam_console_t) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/fstools.te serefpolicy-2.2.26/policy/modules/system/fstools.te --- nsaserefpolicy/policy/modules/system/fstools.te 2006-03-23 16:02:04.000000000 -0500 +++ serefpolicy-2.2.26/policy/modules/system/fstools.te 2006-03-23 16:38:25.000000000 -0500 @@ -67,6 +67,10 @@ dev_read_urand(fsadm_t) # Recreate /dev/cdrom. dev_manage_generic_symlinks(fsadm_t) + +# fdisk needs this for early boot +dev_manage_generic_blk_files(fsadm_t) + # Access to /initrd devices dev_search_usbfs(fsadm_t) # for swapon @@ -75,6 +79,7 @@ dev_getattr_usbfs_dirs(fsadm_t) # Access to /dev/mapper/control dev_rw_lvm_control(fsadm_t) +dev_dontaudit_getattr_all_device_nodes(fsadm_t) fs_search_auto_mountpoints(fsadm_t) fs_getattr_xattr_fs(fsadm_t) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.te serefpolicy-2.2.26/policy/modules/system/init.te --- nsaserefpolicy/policy/modules/system/init.te 2006-03-23 16:02:04.000000000 -0500 +++ serefpolicy-2.2.26/policy/modules/system/init.te 2006-03-23 16:21:01.000000000 -0500 @@ -349,6 +349,7 @@ files_mounton_isid_type_dirs(initrc_t) files_list_default(initrc_t) files_mounton_default(initrc_t) +files_unlink_boot_flag(initrc_t) libs_rw_ld_so_cache(initrc_t) libs_use_ld_so(initrc_t) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.te serefpolicy-2.2.26/policy/modules/system/selinuxutil.te --- nsaserefpolicy/policy/modules/system/selinuxutil.te 2006-03-23 16:02:04.000000000 -0500 +++ serefpolicy-2.2.26/policy/modules/system/selinuxutil.te 2006-03-23 16:21:01.000000000 -0500 @@ -593,6 +593,7 @@ miscfiles_read_localization(setfiles_t) seutil_get_semanage_read_lock(setfiles_t) +seutil_get_semanage_trans_lock(setfiles_t) userdom_use_all_users_fds(setfiles_t) # for config files in a home directory Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/.cvsignore,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- .cvsignore 21 Mar 2006 19:46:10 -0000 1.49 +++ .cvsignore 24 Mar 2006 16:44:06 -0000 1.50 @@ -50,3 +50,4 @@ serefpolicy-2.2.23.tgz serefpolicy-2.2.24.tgz serefpolicy-2.2.25.tgz +serefpolicy-2.2.26.tgz Index: modules-strict.conf =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/modules-strict.conf,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- modules-strict.conf 20 Feb 2006 22:11:40 -0000 1.7 +++ modules-strict.conf 24 Mar 2006 16:44:06 -0000 1.8 @@ -1142,3 +1142,10 @@ # mrtg = module +# Layer: system +# Module: xen +# +# TCP/IP encryption +# +xen = base + Index: modules-targeted.conf =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/modules-targeted.conf,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- modules-targeted.conf 7 Mar 2006 22:22:14 -0000 1.18 +++ modules-targeted.conf 24 Mar 2006 16:44:06 -0000 1.19 @@ -987,14 +987,12 @@ # ipsec = off - # Layer: system -# Module: xend +# Module: xen # # TCP/IP encryption # -xend = base - +xen = base # Layer: apps # Module: java Index: selinux-policy.spec =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v retrieving revision 1.158 retrieving revision 1.159 diff -u -r1.158 -r1.159 --- selinux-policy.spec 22 Mar 2006 15:56:09 -0000 1.158 +++ selinux-policy.spec 24 Mar 2006 16:44:06 -0000 1.159 @@ -1,20 +1,26 @@ %define distro redhat %define polyinstatiate n %define monolithic n -%define BUILD_STRICT 0 -%define BUILD_TARGETED 0 +%if %{?BUILD_STRICT:0}%{!?BUILD_STRICT:1} +%define BUILD_STRICT 1 +%endif +%if %{?BUILD_TARGETED:0}%{!?BUILD_TARGETED:1} +%define BUILD_TARGETED 1 +%endif +%if %{?BUILD_MLS:0}%{!?BUILD_MLS:1} %define BUILD_MLS 1 +%endif %define POLICYVER 20 %define POLICYCOREUTILSVER 1.30-1 -%define CHECKPOLICYVER 1.30-1 +%define CHECKPOLICYVER 1.30.1-1 Summary: SELinux policy configuration Name: selinux-policy -Version: 2.2.25 -Release: 2 +Version: 2.2.26 +Release: 1 License: GPL Group: System Environment/Base Source: serefpolicy-%{version}.tgz -patch: policy-20060207.patch +patch: policy-20060323.patch Source1: modules-targeted.conf Source2: booleans-targeted.conf Source3: Makefile.devel @@ -143,7 +149,10 @@ %prep %setup -q -n serefpolicy-%{version} %patch -p1 - +echo BUILD_MLS = %{BUILD_MLS} +echo BUILD_TARGETED = %{BUILD_TARGETED} +echo BUILD_STRICT = %{BUILD_STRICT} + %install # Build targeted policy %{__rm} -fR $RPM_BUILD_ROOT @@ -163,46 +172,33 @@ install -m 755 ${RPM_SOURCE_DIR}/policygentool ${RPM_BUILD_ROOT}%{_usr}/share/selinux/devel/ install -m 644 ${RPM_SOURCE_DIR}/Makefile.devel ${RPM_BUILD_ROOT}%{_usr}/share/selinux/devel/Makefile install -m 644 doc/example.* ${RPM_BUILD_ROOT}%{_usr}/share/selinux/devel/ -echo "htmlview file:///usr/share/doc/selinux-policy-%{version}/html/index.html" -> ${RPM_BUILD_ROOT}%{_usr}/share/selinux/devel/policyhelp +echo "htmlview file:///usr/share/doc/selinux-policy-%{version}/html/index.html"> ${RPM_BUILD_ROOT}%{_usr}/share/selinux/devel/policyhelp chmod +x ${RPM_BUILD_ROOT}%{_usr}/share/selinux/devel/policyhelp +%if %{BUILD_TARGETED} # Build targeted policy # Commented out because only targeted ref policy currently builds %setupCmds targeted targeted-mcs y n %installCmds targeted targeted-mcs y n +%endif +%if %{BUILD_STRICT} # Build strict policy # Commented out because only targeted ref policy currently builds make NAME=strict TYPE=strict-mcs DISTRO=%{distro} DIRECT_INITRC=y MONOLITHIC=%{monolithic} POLY=n bare make NAME=strict TYPE=strict-mcs DISTRO=%{distro} DIRECT_INITRC=y MONOLITHIC=%{monolithic} POLY=n conf %installCmds strict strict-mcs y n +%endif +%if %{BUILD_MLS} # Build mls policy %setupCmds mls strict-mls n y %installCmds mls strict-mls n y +%endif %clean %{__rm} -fR $RPM_BUILD_ROOT -%package targeted -Summary: SELinux targeted base policy -Group: System Environment/Base -Provides: selinux-policy-base -Obsoletes: selinux-policy-targeted-sources -Prereq: policycoreutils >= %{POLICYCOREUTILSVER} -Prereq: coreutils -Prereq: selinux-policy = %{version}-%{release} - -%description targeted -SELinux Reference policy targeted base module. - -%files targeted -%fileList targeted - -%pre targeted -%saveFileContext targeted - %post if [ ! -s /etc/selinux/config ]; then # @@ -238,6 +234,22 @@ ">> /etc/selinux/config fi +%if %{BUILD_TARGETED} +%package targeted +Summary: SELinux targeted base policy +Group: System Environment/Base +Provides: selinux-policy-base +Obsoletes: selinux-policy-targeted-sources +Prereq: policycoreutils >= %{POLICYCOREUTILSVER} +Prereq: coreutils +Prereq: selinux-policy = %{version}-%{release} + +%description targeted +SELinux Reference policy targeted base module. + +%pre targeted +%saveFileContext targeted + %post targeted %rebuildpolicy targeted %relabel targeted @@ -245,6 +257,12 @@ %triggerpostun targeted -- selinux-policy-targeted <= 2.0.7 %rebuildpolicy targeted +%files targeted +%fileList targeted + +%endif + +%if %{BUILD_MLS} %package mls Summary: SELinux mls base policy Group: System Environment/Base @@ -271,6 +289,10 @@ %files mls %fileList mls +%endif + +%if %{BUILD_STRICT} + %package strict Summary: SELinux strict base policy Group: System Environment/Base @@ -297,7 +319,12 @@ %files strict %fileList strict +%endif + %changelog +* Wed Mar 22 2006 Dan Walsh 2.2.25-3 +- Fix policyhelp + * Wed Mar 22 2006 Dan Walsh 2.2.25-2 - Fix pam_console handling of usb_device - dontaudit logwatch reading /mnt dir Index: sources =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/sources,v retrieving revision 1.53 retrieving revision 1.54 diff -u -r1.53 -r1.54 --- sources 21 Mar 2006 19:46:10 -0000 1.53 +++ sources 24 Mar 2006 16:44:06 -0000 1.54 @@ -1 +1 @@ -efdb10103ce8e6d7c86d1b3153a6f04a serefpolicy-2.2.25.tgz +23bfdd40375a86dfb7cb58a84f0f2e3c serefpolicy-2.2.26.tgz From fedora-cvs-commits at redhat.com Fri Mar 24 17:26:05 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 24 Mar 2006 12:26:05 -0500 Subject: rpms/xinetd/devel .cvsignore, 1.14, 1.15 sources, 1.14, 1.15 xinetd.spec, 1.29, 1.30 Message-ID: <200603241726.k2OHQ5o6021434@cvs.devel.redhat.com> Author: fenlason Update of /cvs/dist/rpms/xinetd/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv21419 Modified Files: .cvsignore sources xinetd.spec Log Message: 2.3.14 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/xinetd/devel/.cvsignore,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- .cvsignore 9 Sep 2004 15:01:21 -0000 1.14 +++ .cvsignore 24 Mar 2006 17:26:03 -0000 1.15 @@ -1 +1 @@ -xinetd-2.3.13.tar.gz +xinetd-2.3.14.tar.gz Index: sources =================================================================== RCS file: /cvs/dist/rpms/xinetd/devel/sources,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- sources 9 Sep 2004 15:01:21 -0000 1.14 +++ sources 24 Mar 2006 17:26:03 -0000 1.15 @@ -1 +1 @@ -4295b5fe12350f09b5892b363348ac8b xinetd-2.3.13.tar.gz +567382d7972613090215c6c54f9b82d9 xinetd-2.3.14.tar.gz Index: xinetd.spec =================================================================== RCS file: /cvs/dist/rpms/xinetd/devel/xinetd.spec,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- xinetd.spec 11 Feb 2006 06:12:00 -0000 1.29 +++ xinetd.spec 24 Mar 2006 17:26:03 -0000 1.30 @@ -3,8 +3,8 @@ Summary: A secure replacement for inetd. Name: xinetd -Version: 2.3.13 -Release: 6.2.1 +Version: 2.3.14 +Release: 2 License: Distributable (BSD-like) Group: System Environment/Daemons Epoch: 2 @@ -25,12 +25,7 @@ Source99: filter-requires-xinetd.sh Provides: inetd Patch0: xinetd-2.3.11-pie.patch -Patch1: xinetd-2.3.13-libwrap.patch Patch2: xinetd-2.3.12-tcp_rpc.patch -Patch3: xinetd-2.3.13-rpc.patch -Patch4: xinetd-2.3.13-banner.patch -Patch5: xinetd-2.3.13-bug-140084-upstream.patch -Patch6: xinetd-2.3.13-gcc4.patch Prereq: /sbin/chkconfig /etc/init.d /sbin/service BuildRequires: glibc-devel %{!?tcp_wrappers:BuildRequires: tcp_wrappers} @@ -52,12 +47,7 @@ %prep %setup -q %patch0 -p0 -b .pie -%patch1 -p1 -b .libwrap %patch2 -p1 -b .tcp_rpc -%patch3 -p1 -b .rpc -%patch4 -p1 -b .banner -%patch5 -p1 -b .bug-140084 -%patch6 -p1 -b .gcc4 %build libtoolize --copy --force @@ -124,6 +114,10 @@ %config(noreplace) /etc/sysconfig/xinetd %changelog +* Fri Mar 24 2006 Jay Fenlason 2:2.3.14-2 +- Upgrade to new upstream version. This obsoletes the -libwrap, + -rpc, -banner, -bug140084 and -gcc4 patches. + * Fri Feb 10 2006 Jesse Keating - 2:2.3.13-6.2.1 - bump again for double-long bug on ppc(64) From fedora-cvs-commits at redhat.com Fri Mar 24 17:28:56 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 24 Mar 2006 12:28:56 -0500 Subject: rpms/hplip/FC-5 hplip.spec,1.53,1.54 Message-ID: <200603241728.k2OHSuIW021495@cvs.devel.redhat.com> Author: twaugh Update of /cvs/dist/rpms/hplip/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv21482 Modified Files: hplip.spec Log Message: * Fri Mar 24 2006 Tim Waugh 0.9.9-5.1 - Include hpfax. - Always use /usr/lib/cups/backend for CUPS backend directory. - Build requires libusb-devel. Index: hplip.spec =================================================================== RCS file: /cvs/dist/rpms/hplip/FC-5/hplip.spec,v retrieving revision 1.53 retrieving revision 1.54 diff -u -r1.53 -r1.54 --- hplip.spec 23 Mar 2006 17:24:47 -0000 1.53 +++ hplip.spec 24 Mar 2006 17:28:54 -0000 1.54 @@ -1,7 +1,7 @@ Summary: HP Linux Imaging and Printing Project Name: hplip Version: 0.9.9 -Release: 5 +Release: 5.1 License: GPL/MIT/BSD Group: System Environment/Daemons Conflicts: system-config-printer < 0.6.132 @@ -27,6 +27,7 @@ BuildRequires: python-devel BuildRequires: libjpeg-devel BuildRequires: desktop-file-utils +BuildRequires: libusb-devel %description The Hewlett-Packard Linux Imaging and Printing Project provides @@ -105,14 +106,17 @@ --add-category Application \ %{buildroot}%{_datadir}/hplip/data/hplip.desktop +if [ ! -d %{buildroot}/usr/lib/cups/backend ] +then + mkdir -p %{buildroot}/usr/lib/cups/backend + cp -a %{buildroot}/usr/lib{64,}/cups/backend/hp + cp -a %{buildroot}/usr/lib{64,}/cups/backend/hpfax +fi + # Move initscript mkdir -p %{buildroot}%{_sysconfdir}/rc.d/init.d mv %{buildroot}%{_sysconfdir}/{init.d,rc.d/init.d}/hplip -# Don't package hpfax yet. -rm -f %{buildroot}%{_libdir}/cups/backend/hpfax -rm -f %{buildroot}%{_datadir}/cups/model/HP-Fax* - %clean rm -rf %{buildroot} @@ -124,7 +128,12 @@ %config(noreplace) %{_sysconfdir}/rc.d/init.d/hplip %{_bindir}/hp-* %{_sbindir}/hpiod +%if "%{_libdir}" == "/usr/lib64" %{_libdir}/cups/backend/hp +%{_libdir}/cups/backend/hpfax +%endif +/usr/lib/cups/backend/hp +/usr/lib/cups/backend/hpfax %{_datadir}/hplip %{_libdir}/python*/site-packages/* %{_datadir}/applications/*.desktop @@ -160,6 +169,11 @@ fi %changelog +* Fri Mar 24 2006 Tim Waugh 0.9.9-5.1 +- Include hpfax. +- Always use /usr/lib/cups/backend for CUPS backend directory. +- Build requires libusb-devel. + * Thu Mar 23 2006 Tim Waugh 0.9.9-5 - Rebuilt. From fedora-cvs-commits at redhat.com Fri Mar 24 17:29:46 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 24 Mar 2006 12:29:46 -0500 Subject: rpms/hplip/devel hplip.spec,1.54,1.55 Message-ID: <200603241729.k2OHTkhf021567@cvs.devel.redhat.com> Author: twaugh Update of /cvs/dist/rpms/hplip/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv21550 Modified Files: hplip.spec Log Message: * Fri Mar 24 2006 Tim Waugh - Build requires libusb-devel. Index: hplip.spec =================================================================== RCS file: /cvs/dist/rpms/hplip/devel/hplip.spec,v retrieving revision 1.54 retrieving revision 1.55 diff -u -r1.54 -r1.55 --- hplip.spec 23 Mar 2006 18:18:28 -0000 1.54 +++ hplip.spec 24 Mar 2006 17:29:43 -0000 1.55 @@ -27,6 +27,7 @@ BuildRequires: python-devel BuildRequires: libjpeg-devel BuildRequires: desktop-file-utils +BuildRequires: libusb-devel %description The Hewlett-Packard Linux Imaging and Printing Project provides @@ -160,6 +161,9 @@ fi %changelog +* Fri Mar 24 2006 Tim Waugh +- Build requires libusb-devel. + * Thu Mar 23 2006 Tim Waugh 0.9.9-6 - CUPS backend directory is always in /usr/lib. From fedora-cvs-commits at redhat.com Fri Mar 24 17:32:39 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 24 Mar 2006 12:32:39 -0500 Subject: rpms/hplip/devel hplip.spec,1.55,1.56 Message-ID: <200603241732.k2OHWdR1021632@cvs.devel.redhat.com> Author: twaugh Update of /cvs/dist/rpms/hplip/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv21598 Modified Files: hplip.spec Log Message: * Fri Mar 24 2006 Tim Waugh - Include hpfax. Index: hplip.spec =================================================================== RCS file: /cvs/dist/rpms/hplip/devel/hplip.spec,v retrieving revision 1.55 retrieving revision 1.56 diff -u -r1.55 -r1.56 --- hplip.spec 24 Mar 2006 17:29:43 -0000 1.55 +++ hplip.spec 24 Mar 2006 17:31:45 -0000 1.56 @@ -110,10 +110,6 @@ mkdir -p %{buildroot}%{_sysconfdir}/rc.d/init.d mv %{buildroot}%{_sysconfdir}/{init.d,rc.d/init.d}/hplip -# Don't package hpfax yet. -rm -f %{buildroot}/usr/lib/cups/backend/hpfax -rm -f %{buildroot}%{_datadir}/cups/model/HP-Fax* - %clean rm -rf %{buildroot} @@ -126,6 +122,7 @@ %{_bindir}/hp-* %{_sbindir}/hpiod /usr/lib/cups/backend/hp +/usr/lib/cups/backend/hpfax %{_datadir}/hplip %{_libdir}/python*/site-packages/* %{_datadir}/applications/*.desktop @@ -162,6 +159,7 @@ %changelog * Fri Mar 24 2006 Tim Waugh +- Include hpfax. - Build requires libusb-devel. * Thu Mar 23 2006 Tim Waugh 0.9.9-6 From fedora-cvs-commits at redhat.com Fri Mar 24 17:33:55 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 24 Mar 2006 12:33:55 -0500 Subject: rpms/hplip/devel hplip.spec,1.56,1.57 Message-ID: <200603241733.k2OHXtM5021660@cvs.devel.redhat.com> Author: twaugh Update of /cvs/dist/rpms/hplip/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv21643 Modified Files: hplip.spec Log Message: 0.9.9-7 Index: hplip.spec =================================================================== RCS file: /cvs/dist/rpms/hplip/devel/hplip.spec,v retrieving revision 1.56 retrieving revision 1.57 diff -u -r1.56 -r1.57 --- hplip.spec 24 Mar 2006 17:31:45 -0000 1.56 +++ hplip.spec 24 Mar 2006 17:33:38 -0000 1.57 @@ -1,7 +1,7 @@ Summary: HP Linux Imaging and Printing Project Name: hplip Version: 0.9.9 -Release: 6 +Release: 7 License: GPL/MIT/BSD Group: System Environment/Daemons Conflicts: system-config-printer < 0.6.132 @@ -158,7 +158,7 @@ fi %changelog -* Fri Mar 24 2006 Tim Waugh +* Fri Mar 24 2006 Tim Waugh 0.9.9-7 - Include hpfax. - Build requires libusb-devel. From fedora-cvs-commits at redhat.com Fri Mar 24 17:50:10 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 24 Mar 2006 12:50:10 -0500 Subject: rpms/smartmontools/devel smartmontools.spec, 1.17, 1.18 smartmontools.sysconf, 1.1, 1.2 Message-ID: <200603241750.k2OHoAQx003354@cvs.devel.redhat.com> Author: tmraz Update of /cvs/dist/rpms/smartmontools/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv3340 Modified Files: smartmontools.spec smartmontools.sysconf Log Message: * Fri Mar 24 2006 Tomas Mraz - 1:5.33-7 - add missing quotes to /etc/sysconfig/smartmontools Index: smartmontools.spec =================================================================== RCS file: /cvs/dist/rpms/smartmontools/devel/smartmontools.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- smartmontools.spec 23 Mar 2006 13:14:16 -0000 1.17 +++ smartmontools.spec 24 Mar 2006 17:50:08 -0000 1.18 @@ -1,7 +1,7 @@ Summary: Tools for monitoring SMART capable hard disks Name: smartmontools Version: 5.33 -Release: 6 +Release: 7 Epoch: 1 Group: System Environment/Base License: GPL @@ -72,6 +72,9 @@ %changelog +* Fri Mar 24 2006 Tomas Mraz - 1:5.33-7 +- add missing quotes to /etc/sysconfig/smartmontools + * Wed Mar 22 2006 Tomas Mraz - 1:5.33-6 - test SATA drives correctly Index: smartmontools.sysconf =================================================================== RCS file: /cvs/dist/rpms/smartmontools/devel/smartmontools.sysconf,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- smartmontools.sysconf 22 Mar 2006 16:14:08 -0000 1.1 +++ smartmontools.sysconf 24 Mar 2006 17:50:08 -0000 1.2 @@ -1,2 +1,2 @@ # command line options for smartd -smartd_opts=-q never +smartd_opts="-q never" From fedora-cvs-commits at redhat.com Fri Mar 24 17:57:34 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 24 Mar 2006 12:57:34 -0500 Subject: rpms/libsepol/devel .cvsignore, 1.89, 1.90 libsepol.spec, 1.117, 1.118 sources, 1.90, 1.91 Message-ID: <200603241757.k2OHvYmd003471@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/libsepol/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv3455 Modified Files: .cvsignore libsepol.spec sources Log Message: * Fri Mar 24 2006 Dan Walsh 1.12.2-1 - Upgrade to latest from NSA * Fixed avrule_block_write num_decls endian bug. Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/libsepol/devel/.cvsignore,v retrieving revision 1.89 retrieving revision 1.90 diff -u -r1.89 -r1.90 --- .cvsignore 20 Mar 2006 20:24:57 -0000 1.89 +++ .cvsignore 24 Mar 2006 17:57:31 -0000 1.90 @@ -89,3 +89,4 @@ libsepol-1.11.20.tgz libsepol-1.12.tgz libsepol-1.12.1.tgz +libsepol-1.12.2.tgz Index: libsepol.spec =================================================================== RCS file: /cvs/dist/rpms/libsepol/devel/libsepol.spec,v retrieving revision 1.117 retrieving revision 1.118 diff -u -r1.117 -r1.118 --- libsepol.spec 20 Mar 2006 20:24:57 -0000 1.117 +++ libsepol.spec 24 Mar 2006 17:57:31 -0000 1.118 @@ -1,7 +1,7 @@ Summary: SELinux binary policy manipulation library Name: libsepol Version: 1.12.1 -Release: 1 +Release: 2 License: GPL Group: System Environment/Libraries Source: http://www.nsa.gov/selinux/archives/libsepol-%{version}.tgz @@ -80,7 +80,11 @@ %{_includedir}/sepol/policydb/*.h %changelog -* Fri Mar 10 2006 Dan Walsh 1.12.1-1 +* Fri Mar 24 2006 Dan Walsh 1.12.2-1 +- Upgrade to latest from NSA + * Fixed avrule_block_write num_decls endian bug. + +* Fri Mar 17 2006 Dan Walsh 1.12.1-1 - Upgrade to latest from NSA * Fixed sepol_module_package_write buffer overflow bug. Index: sources =================================================================== RCS file: /cvs/dist/rpms/libsepol/devel/sources,v retrieving revision 1.90 retrieving revision 1.91 diff -u -r1.90 -r1.91 --- sources 20 Mar 2006 20:24:57 -0000 1.90 +++ sources 24 Mar 2006 17:57:31 -0000 1.91 @@ -1 +1 @@ -2d99e03cd065f1e846da2e682d4d5366 libsepol-1.12.1.tgz +6b1c03c91b3428645ab52b8865b644cc libsepol-1.12.2.tgz From fedora-cvs-commits at redhat.com Fri Mar 24 17:58:29 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 24 Mar 2006 12:58:29 -0500 Subject: rpms/libsepol/devel libsepol.spec,1.118,1.119 Message-ID: <200603241758.k2OHwTrS003537@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/libsepol/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv3524 Modified Files: libsepol.spec Log Message: * Fri Mar 24 2006 Dan Walsh 1.12.2-1 - Upgrade to latest from NSA * Fixed avrule_block_write num_decls endian bug. Index: libsepol.spec =================================================================== RCS file: /cvs/dist/rpms/libsepol/devel/libsepol.spec,v retrieving revision 1.118 retrieving revision 1.119 diff -u -r1.118 -r1.119 --- libsepol.spec 24 Mar 2006 17:57:31 -0000 1.118 +++ libsepol.spec 24 Mar 2006 17:58:27 -0000 1.119 @@ -1,7 +1,7 @@ Summary: SELinux binary policy manipulation library Name: libsepol -Version: 1.12.1 -Release: 2 +Version: 1.12.2 +Release: 1 License: GPL Group: System Environment/Libraries Source: http://www.nsa.gov/selinux/archives/libsepol-%{version}.tgz From fedora-cvs-commits at redhat.com Fri Mar 24 18:01:45 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 24 Mar 2006 13:01:45 -0500 Subject: rpms/foomatic/devel foomatic-db-engine-libdir.patch, 1.3, 1.4 foomatic-filters-libdir.patch, 1.3, 1.4 foomatic.spec, 1.132, 1.133 Message-ID: <200603241801.k2OI1jeA003664@cvs.devel.redhat.com> Author: twaugh Update of /cvs/dist/rpms/foomatic/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv3620 Modified Files: foomatic-db-engine-libdir.patch foomatic-filters-libdir.patch foomatic.spec Log Message: * Fri Mar 24 2006 Tim Waugh 3.0.2-34 - Always use /usr/lib/cups/{backend,filter}. foomatic-db-engine-libdir.patch: configure.ac | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) Index: foomatic-db-engine-libdir.patch =================================================================== RCS file: /cvs/dist/rpms/foomatic/devel/foomatic-db-engine-libdir.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- foomatic-db-engine-libdir.patch 17 Jan 2006 13:50:45 -0000 1.3 +++ foomatic-db-engine-libdir.patch 24 Mar 2006 18:01:09 -0000 1.4 @@ -11,17 +11,6 @@ PTALPIPESSEARCHPATH=/var/run:/var:/var/ptal:/usr/var/run:/usr/var:/usr/var/ptal:/usr/local/var/run:/usr/local/var:/usr/local/var/ptal:/dev:/dev/ptal MTINKPIPESSEARCHPATH=/var:/var/run:/usr/var/:/usr/var/run:/usr/local/var:/usr/local/var/run:/dev -@@ -218,8 +218,8 @@ - AC_PATH_PROGS(CUPS_ADMIN,lpadmin,/usr/sbin/lpadmin,$SBINSEARCHPATH) - AC_PATH_PROGS(CUPS_LPSTAT,lpstat,/usr/bin/lpstat,$BINSEARCHPATH) - AC_PATH_DIRS(CUPS_PPDS,cups/model,/usr/share/cups/model,$DATASEARCHPATH) --AC_PATH_DIRS(CUPS_FILTERS,cups/filter,/usr/lib/cups/filter,$DATASEARCHPATH) --AC_PATH_DIRS(CUPS_BACKENDS,cups/backend,/usr/lib/cups/backend,$DATASEARCHPATH) -+AC_PATH_DIRS(CUPS_FILTERS,cups/filter,$libdir/cups/filter,$DATASEARCHPATH) -+AC_PATH_DIRS(CUPS_BACKENDS,cups/backend,$libdir/cups/backend,$DATASEARCHPATH) - AC_PATH_PROGS(CUPS_PCONF,cups/printers.conf,$CUPS_ETC/printers.conf,$SYSCONFSEARCHPATH) - AC_PATH_PROGS(CUPS_LPR,lpr-cups lpr,/usr/bin/lpr,$BINSEARCHPATH) - AC_PATH_PROGS(CUPS_LPQ,lpq-cups lpq,/usr/bin/lpq,$BINSEARCHPATH) @@ -236,15 +236,15 @@ AC_PATH_PROGS(CUPS_LPINFO,lpinfo,/usr/sbin/lpinfo,$SBINSEARCHPATH) foomatic-filters-libdir.patch: configure.in | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) Index: foomatic-filters-libdir.patch =================================================================== RCS file: /cvs/dist/rpms/foomatic/devel/foomatic-filters-libdir.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- foomatic-filters-libdir.patch 9 Dec 2005 15:16:34 -0000 1.3 +++ foomatic-filters-libdir.patch 24 Mar 2006 18:01:09 -0000 1.4 @@ -1,5 +1,5 @@ --- foomatic-filters-3.0-20051209/configure.in.libdir 2005-08-16 03:19:30.000000000 +0100 -+++ foomatic-filters-3.0-20051209/configure.in 2005-12-09 14:43:17.000000000 +0000 ++++ foomatic-filters-3.0-20051209/configure.in 2006-03-24 17:39:33.000000000 +0000 @@ -13,7 +13,7 @@ AC_PROG_MAKE_SET @@ -9,20 +9,8 @@ dnl Get the operating system and version number... uname=`uname` -@@ -38,22 +38,22 @@ - AC_PATH_DIR(PRINTCAP,printcap,/etc/printcap,$ETCSEARCHPATH) - - dnl Check for /usr/lib/cups --AC_PATH_DIR(CUPS,cups,/usr/lib/cups,$LIBSEARCHPATH) -+AC_PATH_DIR(CUPS,cups,$libdir/cups,$LIBSEARCHPATH) - - dnl Check for /usr/lib/cups/filter --AC_PATH_DIR(CUPS_FILTERS,cups/filter,/usr/lib/cups/filter,$LIBSEARCHPATH) -+AC_PATH_DIR(CUPS_FILTERS,cups/filter,$libdir/cups/filter,$LIBSEARCHPATH) - - dnl Check for /usr/lib/cups/backend --AC_PATH_DIR(CUPS_BACKENDS,cups/backend,/usr/lib/cups/backend,$LIBSEARCHPATH) -+AC_PATH_DIR(CUPS_BACKENDS,cups/backend,$libdir/cups/backend,$LIBSEARCHPATH) +@@ -47,13 +47,13 @@ + AC_PATH_DIR(CUPS_BACKENDS,cups/backend,/usr/lib/cups/backend,$LIBSEARCHPATH) dnl Check for /usr/lib/ppr -AC_PATH_DIR(PPR,ppr,/usr/lib/ppr,$LIBSEARCHPATH) Index: foomatic.spec =================================================================== RCS file: /cvs/dist/rpms/foomatic/devel/foomatic.spec,v retrieving revision 1.132 retrieving revision 1.133 diff -u -r1.132 -r1.133 --- foomatic.spec 11 Feb 2006 02:45:20 -0000 1.132 +++ foomatic.spec 24 Mar 2006 18:01:09 -0000 1.133 @@ -8,7 +8,7 @@ Summary: Foomatic printer database. Name: foomatic Version: 3.0.2 -Release: 33.2 +Release: 34 License: GPL Group: System Environment/Libraries @@ -141,6 +141,9 @@ popd %build +export CUPS_BACKENDS=/usr/lib/cups/backend +export CUPS_FILTERS=/usr/lib/cups/filter + pushd foomatic-filters-3.0-%{filtersver} %configure make PREFIX=%{_prefix} CFLAGS="$RPM_OPT_FLAGS" @@ -228,7 +231,7 @@ find %{buildroot}%{_datadir}/foomatic/db/source/ -type f | xargs chmod 0644 # Use relative, not absolute, symlink for CUPS filter. -ln -sf ../../../bin/foomatic-rip %{buildroot}%{_libdir}/cups/filter/foomatic-rip +ln -sf ../../../bin/foomatic-rip %{buildroot}/usr/lib/cups/filter/foomatic-rip mkdir $RPM_BUILD_ROOT%{_datadir}/foomatic/db/source/PPD/Custom mkdir -p $RPM_BUILD_ROOT%{_var}/cache/foomatic @@ -267,14 +270,17 @@ %{_bindir}/* %{_sbindir}/* %{_prefix}/lib*/perl5/vendor_perl/*/Foomatic -%dir %{_libdir}/cups -%{_libdir}/cups/* +%dir /usr/lib/cups +/usr/lib/cups/* %{_datadir}/foomatic %{_datadir}/cups/model/foomatic-db-ppds %{_mandir}/*/* %{_var}/cache/foomatic %changelog +* Fri Mar 24 2006 Tim Waugh 3.0.2-34 +- Always use /usr/lib/cups/{backend,filter}. + * Fri Feb 10 2006 Jesse Keating - 3.0.2-33.2 - bump again for double-long bug on ppc(64) From fedora-cvs-commits at redhat.com Fri Mar 24 18:16:31 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 24 Mar 2006 13:16:31 -0500 Subject: rpms/foomatic/FC-5 foomatic.spec,1.132,1.133 Message-ID: <200603241816.k2OIGV4D008226@cvs.devel.redhat.com> Author: twaugh Update of /cvs/dist/rpms/foomatic/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv7060 Modified Files: foomatic.spec Log Message: * Fri Mar 24 2006 Tim Waugh 3.0.2-33.3 - Use /usr/lib/cups/backend and /usr/lib/cups/filter. Index: foomatic.spec =================================================================== RCS file: /cvs/dist/rpms/foomatic/FC-5/foomatic.spec,v retrieving revision 1.132 retrieving revision 1.133 diff -u -r1.132 -r1.133 --- foomatic.spec 11 Feb 2006 02:45:20 -0000 1.132 +++ foomatic.spec 24 Mar 2006 18:16:29 -0000 1.133 @@ -8,7 +8,7 @@ Summary: Foomatic printer database. Name: foomatic Version: 3.0.2 -Release: 33.2 +Release: 33.3 License: GPL Group: System Environment/Libraries @@ -239,6 +239,15 @@ $RPM_BUILD_ROOT%{_sysconfdir}/foomatic/filter.conf.sample find $RPM_BUILD_ROOT -name .packlist -o -name '*.xml.*' | xargs rm -f +# Use /usr/lib/cups as well as /usr/lib64/cups, in preparation for CUPS 1.2. +if [ ! -d %{buildroot}/usr/lib/cups ] +then + mkdir -p %{buildroot}/usr/lib/cups/backend + mkdir -p %{buildroot}/usr/lib/cups/filter + cp -a %{buildroot}/usr/lib{64,}/cups/backend/beh + cp -a %{buildroot}/usr/lib{64,}/cups/filter/foomatic-rip +fi + %post /bin/rm -f /var/cache/foomatic/* @@ -267,14 +276,21 @@ %{_bindir}/* %{_sbindir}/* %{_prefix}/lib*/perl5/vendor_perl/*/Foomatic +%if "%_libdir" == "/usr/lib64" %dir %{_libdir}/cups %{_libdir}/cups/* +%endif +%dir /usr/lib/cups +/usr/lib/cups/* %{_datadir}/foomatic %{_datadir}/cups/model/foomatic-db-ppds %{_mandir}/*/* %{_var}/cache/foomatic %changelog +* Fri Mar 24 2006 Tim Waugh 3.0.2-33.3 +- Use /usr/lib/cups/backend and /usr/lib/cups/filter. + * Fri Feb 10 2006 Jesse Keating - 3.0.2-33.2 - bump again for double-long bug on ppc(64) From fedora-cvs-commits at redhat.com Fri Mar 24 22:39:12 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 24 Mar 2006 17:39:12 -0500 Subject: rpms/xscreensaver/FC-5 xscreensaver-4.24-clean-up-the-zombies.patch, NONE, 1.1 xscreensaver.spec, 1.75, 1.76 Message-ID: <200603242239.k2OMdCXr000621@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/xscreensaver/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv600 Modified Files: xscreensaver.spec Added Files: xscreensaver-4.24-clean-up-the-zombies.patch Log Message: - add patch from jwz to reap zombie processes (bug 185833) xscreensaver-4.24-clean-up-the-zombies.patch: grabclient.c | 13 ++++++++++++- 1 files changed, 12 insertions(+), 1 deletion(-) --- NEW FILE xscreensaver-4.24-clean-up-the-zombies.patch --- --- xscreensaver-4.24/utils/grabclient.c 1 Mar 2006 11:35:52 -0000 1.17 +++ xscreensaver-4.24/utils/grabclient.c 20 Mar 2006 01:35:43 -0000 @@ -302,6 +302,7 @@ FILE *read_pipe; FILE *write_pipe; XtInputId pipe_id; + pid_t pid; } grabclient_data; @@ -350,7 +351,8 @@ (XtPointer) (XtInputReadMask | XtInputExceptMask), finalize_cb, (XtPointer) data); - switch ((int) (forked = fork ())) + forked = fork (); + switch ((int) forked) { case -1: sprintf (buf, "%s: couldn't fork", progname); @@ -379,6 +381,7 @@ default: /* parent */ fclose (data->write_pipe); data->write_pipe = 0; + data->pid = forked; break; } } @@ -405,6 +408,14 @@ if (name) free (name); fclose (data->read_pipe); + + if (data->pid) /* reap zombies */ + { + int status; + waitpid (data->pid, &status, 0); + data->pid = 0; + } + memset (data, 0, sizeof (*data)); free (data); } Index: xscreensaver.spec =================================================================== RCS file: /cvs/dist/rpms/xscreensaver/FC-5/xscreensaver.spec,v retrieving revision 1.75 retrieving revision 1.76 diff -u -r1.75 -r1.76 --- xscreensaver.spec 11 Feb 2006 06:35:09 -0000 1.75 +++ xscreensaver.spec 24 Mar 2006 22:39:10 -0000 1.76 @@ -6,7 +6,7 @@ Summary: X screen saver and locker Name: %{name} Version: %{version} -Release: 1.1 +Release: 2 Epoch: 1 License: BSD Group: Amusements/Graphics @@ -29,6 +29,7 @@ Patch17: xscreensaver-4.23-default-text.patch Patch18: xscreensaver-4.23-modularX-addoption.patch Patch19: xscreensaver-4.23-remove-gccwarn-pointer.patch +Patch20: xscreensaver-4.24-clean-up-the-zombies.patch Buildroot: %{_tmppath}/%{name}-root @@ -105,6 +106,7 @@ %patch17 -p1 -b .default-text %patch18 -p1 -b .modularX-addoption %patch19 -p1 -b .remove-gccwarn-pointer +%patch20 -p1 -b .clean-up-the-zombies if [ -x %{_datadir}/libtool/config.guess ]; then @@ -245,6 +247,9 @@ %defattr(-,root,root) %changelog +* Fri Mar 24 2006 Ray Strode - 1:4.24-2 +- add patch from jwz to reap zombie processes (bug 185833) + * Fri Feb 10 2006 Jesse Keating - 1:4.24-1.1 - bump again for double-long bug on ppc(64) From fedora-cvs-commits at redhat.com Fri Mar 24 22:43:43 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 24 Mar 2006 17:43:43 -0500 Subject: rpms/kernel/devel/configs config-generic, 1.165, 1.166 config-s390-generic, 1.12, 1.13 config-x86-generic, 1.41, 1.42 config-x86_64-generic, 1.34, 1.35 Message-ID: <200603242243.k2OMhhIc000795@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel/configs In directory cvs.devel.redhat.com:/tmp/cvs-serv758/configs Modified Files: config-generic config-s390-generic config-x86-generic config-x86_64-generic Log Message: git9. Index: config-generic =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/configs/config-generic,v retrieving revision 1.165 retrieving revision 1.166 diff -u -r1.165 -r1.166 --- config-generic 23 Mar 2006 21:21:22 -0000 1.165 +++ config-generic 24 Mar 2006 22:43:39 -0000 1.166 @@ -87,6 +87,7 @@ # CONFIG_MMC_DEBUG is not set CONFIG_MMC_BLOCK=y CONFIG_MMC_WBSD=y +CONFIG_MMC_SDHCI=m CONFIG_INFINIBAND=m CONFIG_INFINIBAND_MTHCA=m @@ -281,6 +282,7 @@ CONFIG_BLK_DEV_INITRD=y CONFIG_BLK_DEV_ATIIXP=y CONFIG_LBD=y +CONFIG_BLK_DEV_IO_TRACE=y # CONFIG_DCSSBLK is not set @@ -1077,6 +1079,7 @@ CONFIG_PCMCIA_ATMEL=m CONFIG_PCMCIA_WL3501=m CONFIG_NET_WIRELESS=y +CONFIG_NET_WIRELESS_RTNETLINK=y CONFIG_HOSTAP=m CONFIG_HOSTAP_PCI=m @@ -1536,15 +1539,17 @@ CONFIG_RTC_X1205_I2C=m -CONFIG_W1=m -CONFIG_W1_MATROX=m -CONFIG_W1_DS9490=m -CONFIG_W1_DS9490_BRIDGE=m -CONFIG_W1_THERM=m -CONFIG_W1_SMEM=m -CONFIG_W1_DS2433=m +CONFIG_W1=m CONFIG_W1_DS2433_CRC=y +CONFIG_W1_MASTER_MATROX=m +CONFIG_W1_MASTER_DS9490=m +CONFIG_W1_MASTER_DS9490_BRIDGE=m +CONFIG_W1_MASTER_DS2482=m +CONFIG_W1_SLAVE_THERM=m +CONFIG_W1_SLAVE_SMEM=m +CONFIG_W1_SLAVE_DS2433=m + # # Mice # @@ -2268,7 +2273,6 @@ CONFIG_HUGETLB_PAGE=y CONFIG_RAMFS=y CONFIG_DEBUG_FS=y -CONFIG_RELAYFS_FS=m # # Miscellaneous filesystems @@ -2525,6 +2529,7 @@ # CONFIG_TUX_DEBUG is not set CONFIG_CPUSETS=y +CONFIG_RELAY=y # CONFIG_SECCOMP is not set # CONFIG_PRINTK_TIME is not set @@ -2675,6 +2680,8 @@ # FIXME: This needs to be made to depend on PPC # CONFIG_USB_HIDINPUT_POWERBOOK is not set +CONFIG_UNWIND_INFO=y # CONFIG_FORCED_INLINING is not set CONFIG_MIGRATION=y + Index: config-s390-generic =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/configs/config-s390-generic,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- config-s390-generic 13 Mar 2006 21:05:33 -0000 1.12 +++ config-s390-generic 24 Mar 2006 22:43:39 -0000 1.13 @@ -27,7 +27,7 @@ CONFIG_CMM=y # CONFIG_CMM_PROC is not set CONFIG_VIRT_TIMER=y -CONFIG_DASD_EER=m +CONFIG_DASD_EER=y CONFIG_DASD_CMB=m CONFIG_NETIUCV=m CONFIG_SMSGIUCV=m @@ -64,6 +64,7 @@ CONFIG_SCLP_VT220_CONSOLE=y CONFIG_SCLP_CPI=y CONFIG_S390_TAPE=m +CONFIG_S390_TAPE_3590=m CONFIG_APPLDATA_BASE=y CONFIG_APPLDATA_MEM=y Index: config-x86-generic =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/configs/config-x86-generic,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- config-x86-generic 20 Mar 2006 22:08:11 -0000 1.41 +++ config-x86-generic 24 Mar 2006 22:43:39 -0000 1.42 @@ -209,6 +209,7 @@ CONFIG_DEBUG_RODATA=y CONFIG_DEBUG_STACKOVERFLOW=y CONFIG_DEBUG_STACK_USAGE=y +CONFIG_STACK_BACKTRACE_COLS=2 CONFIG_4KSTACKS=y CONFIG_KPROBES=y @@ -226,6 +227,7 @@ CONFIG_HOTPLUG_PCI_IBM=m CONFIG_HOTPLUG_PCI_ACPI=m CONFIG_HOTPLUG_PCI_ACPI_IBM=m +CONFIG_ACPI_IBM_DOCK=y # CONFIG_HOTPLUG_PCI_CPCI is not set CONFIG_HOTPLUG_PCI_PCIE=m # CONFIG_HOTPLUG_PCI_PCIE_POLL_EVENT_MODE is not set Index: config-x86_64-generic =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/configs/config-x86_64-generic,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- config-x86_64-generic 20 Mar 2006 22:08:11 -0000 1.34 +++ config-x86_64-generic 24 Mar 2006 22:43:39 -0000 1.35 @@ -78,6 +78,7 @@ CONFIG_ACPI_BLACKLIST_YEAR=0 CONFIG_ACPI_VIDEO=m CONFIG_ACPI_IBM=m +CONFIG_ACPI_IBM_DOCK=y CONFIG_HOTPLUG_PCI=y # CONFIG_HOTPLUG_PCI_FAKE is not set From fedora-cvs-commits at redhat.com Fri Mar 24 22:43:43 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 24 Mar 2006 17:43:43 -0500 Subject: rpms/kernel/devel patch-2.6.16-git9.bz2.sign, NONE, 1.1 .cvsignore, 1.392, 1.393 kernel-2.6.spec, 1.2088, 1.2089 linux-2.6-debug-taint-vm.patch, 1.8, 1.9 linux-2.6-diskdump.patch, 1.5, 1.6 linux-2.6-random-patches.patch, 1.3, 1.4 sources, 1.333, 1.334 upstream, 1.305, 1.306 linux-2.6-softmac-git.patch, 1.9, NONE linux-2.6-softmac-scan-channel.patch, 1.1, NONE patch-2.6.16-git6.bz2.sign, 1.1, NONE Message-ID: <200603242243.k2OMhh7g000781@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv758 Modified Files: .cvsignore kernel-2.6.spec linux-2.6-debug-taint-vm.patch linux-2.6-diskdump.patch linux-2.6-random-patches.patch sources upstream Added Files: patch-2.6.16-git9.bz2.sign Removed Files: linux-2.6-softmac-git.patch linux-2.6-softmac-scan-channel.patch patch-2.6.16-git6.bz2.sign Log Message: git9. --- NEW FILE patch-2.6.16-git9.bz2.sign --- -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.2.2 (GNU/Linux) Comment: See http://www.kernel.org/signature.html for info iD8DBQBEJEIxyGugalF9Dw4RAi6zAJoCqATenzvunhq5ba9KFsOfJFFT9ACfR6ms 8O/g+PU7kRmJt/KYT8RkKVk= =94pH -----END PGP SIGNATURE----- Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v retrieving revision 1.392 retrieving revision 1.393 diff -u -r1.392 -r1.393 --- .cvsignore 23 Mar 2006 09:13:55 -0000 1.392 +++ .cvsignore 24 Mar 2006 22:43:38 -0000 1.393 @@ -3,4 +3,4 @@ kernel-2.6.16 linux-2.6.16.tar.bz2 xen-20060320.tar.bz2 -patch-2.6.16-git6.bz2 +patch-2.6.16-git9.bz2 Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.2088 retrieving revision 1.2089 diff -u -r1.2088 -r1.2089 --- kernel-2.6.spec 24 Mar 2006 11:08:52 -0000 1.2088 +++ kernel-2.6.spec 24 Mar 2006 22:43:38 -0000 1.2089 @@ -6,7 +6,7 @@ %define buildup 1 %define buildsmp 1 # Whether to apply the Xen patches, leave this enabled. -%define includexen 1 +%define includexen 0 # Whether to build the Xen kernels, disable if you want. %define buildxen 1 %define buildxenPAE 0 @@ -217,7 +217,7 @@ # # Patches 0 through 100 are meant for core subsystem upgrades # -Patch1: patch-2.6.16-git6.bz2 +Patch1: patch-2.6.16-git9.bz2 # Patches 100 through 500 are meant for architecture patches Patch100: linux-2.6-bzimage.patch @@ -302,7 +302,6 @@ Patch1020: linux-2.6-debug-sleep-in-irq-warning.patch Patch1021: linux-2.6-debug-reference-discarded-return-result.patch Patch1022: linux-2.6-debug-panic-stackdump.patch -Patch1024: linux-2.6-debug-dual-line-backtrace.patch Patch1025: linux-2.6-debug-sysfs-crash-debugging.patch Patch1026: linux-2.6-debug-no-quiet.patch Patch1027: linux-2.6-debug-slab-leak-detector.patch @@ -399,10 +398,8 @@ Patch2301: linux-2.6-acpi-ecdt-uid-hack.patch # Broadcom wireless driver -Patch5000: linux-2.6-softmac-git.patch Patch5001: linux-2.6-bcm43xx-git.patch Patch5002: linux-2.6-bcm43xx-neuter.patch -Patch5003: linux-2.6-softmac-scan-channel.patch Patch5004: linux-2.6-softmac-scan-dwell-time.patch Patch5005: linux-2.6-bcm43xx-assoc-on-startup.patch Patch5006: linux-2.6-softmac-default-rate.patch @@ -495,7 +492,7 @@ Provides: kernel-devel-%{_target_cpu} = %{rpmversion}-%{release}smp Provides: kernel-devel = %{rpmversion}-%{release}smp AutoReqProv: no -Prereq: /usr/sbin/hardlink, /usr/bin/find +Prereq: /usr/bin/find %description smp-devel This package provides kernel headers and makefiles sufficient to build modules @@ -533,7 +530,7 @@ Provides: kernel-xen0-devel-%{_target_cpu} = %{rpmversion}-%{release} Provides: kernel-devel-%{_target_cpu} = %{rpmversion}-%{release}xen0 Provides: kernel-devel = %{rpmversion}-%{release}xen0 -Prereq: /usr/sbin/hardlink, /usr/bin/find +Prereq: /usr/bin/find %description xen0-devel This package provides kernel headers and makefiles sufficient to build modules @@ -573,7 +570,7 @@ Provides: kernel-xen0-PAE-devel-%{_target_cpu} = %{rpmversion}-%{release} Provides: kernel-devel-%{_target_cpu} = %{rpmversion}-%{release}xen0-PAE Provides: kernel-devel = %{rpmversion}-%{release}xen0-PAE -Prereq: /usr/sbin/hardlink, /usr/bin/find +Prereq: /usr/bin/find %description xen0-PAE-devel This package provides kernel headers and makefiles sufficient to build modules @@ -607,7 +604,7 @@ Provides: kernel-xenU-devel-%{_target_cpu} = %{rpmversion}-%{release} Provides: kernel-devel-%{_target_cpu} = %{rpmversion}-%{release}xenU Provides: kernel-devel = %{rpmversion}-%{release}xenU -Prereq: /usr/sbin/hardlink, /usr/bin/find +Prereq: /usr/bin/find %description xenU-devel This package provides kernel headers and makefiles sufficient to build modules @@ -641,7 +638,7 @@ Provides: kernel-xenU-PAE-devel-%{_target_cpu} = %{rpmversion}-%{release} Provides: kernel-devel-%{_target_cpu} = %{rpmversion}-%{release}xenU-PAE Provides: kernel-devel = %{rpmversion}-%{release}xenU-PAE -Prereq: /usr/sbin/hardlink, /usr/bin/find +Prereq: /usr/bin/find %description xenU-PAE-devel This package provides kernel headers and makefiles sufficient to build modules @@ -674,7 +671,7 @@ Provides: kernel-devel-%{_target_cpu} = %{rpmversion}-%{release}kdump Provides: kernel-devel = %{rpmversion}-%{release}kdump AutoReqProv: no -Prereq: /usr/sbin/hardlink, /usr/bin/find +Prereq: /usr/bin/find %description kdump-devel This package provides kernel headers and makefiles sufficient to build modules @@ -872,13 +869,13 @@ %patch1020 -p1 %patch1021 -p1 %patch1022 -p1 -%patch1024 -p1 %patch1025 -p1 # Disable the 'quiet' boot switch for better bug reports. #%patch1026 -p1 # Slab leak detector. #%patch1027 -p1 -%patch1028 -p1 +# Pause on oops. +#%patch1028 -p1 #%patch1029 -p1 #%patch1030 -p1 %patch1031 -p1 @@ -1031,14 +1028,10 @@ # be merged upstream # -# Import softmac code from wireless-2.6 tree -%patch5000 -p1 # ... and bcm43xx driver too %patch5001 -p1 # temporarily remove bcm43xx's MODULE_DEVICE_TABLE entry #%patch5002 -p1 -# Go back to the original channel when we finish scanning. -%patch5003 -p1 # When scanning, spend only 20ms on each channel not 500ms. %patch5004 -p1 # Attempt to associate when the link is brought up @@ -1649,6 +1642,9 @@ %endif %changelog +* Fri Mar 24 2006 Dave Jones +- 2.6.16-git9 + * Fri Mar 24 2006 David Woodhouse - Fix lockup when someone takes the bcm43xx device down while it's scanning (#180953) linux-2.6-debug-taint-vm.patch: linux-2.6.15/mm/page_alloc.c | 4 ++-- linux-2.6.16.noarch/include/asm-generic/bug.h | 8 ++++++-- linux-2.6.16.noarch/mm/slab.c | 4 ++-- linux-2000/kernel/panic.c | 1 + 4 files changed, 11 insertions(+), 6 deletions(-) Index: linux-2.6-debug-taint-vm.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-debug-taint-vm.patch,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- linux-2.6-debug-taint-vm.patch 22 Mar 2006 23:50:26 -0000 1.8 +++ linux-2.6-debug-taint-vm.patch 24 Mar 2006 22:43:38 -0000 1.9 @@ -1,5 +1,5 @@ ---- linux-2.6.11/include/asm-generic/bug.h~ 2005-05-09 18:00:44.000000000 -0400 -+++ linux-2.6.11/include/asm-generic/bug.h 2005-05-09 18:01:23.000000000 -0400 +--- linux-2.6.16.noarch/include/asm-generic/bug.h~ 2006-03-24 15:32:04.000000000 -0500 ++++ linux-2.6.16.noarch/include/asm-generic/bug.h 2006-03-24 15:33:29.000000000 -0500 @@ -4,10 +4,14 @@ #include #include @@ -11,17 +11,17 @@ #ifdef CONFIG_BUG #ifndef HAVE_ARCH_BUG #define BUG() do { \ -- printk("kernel BUG at %s:%d!\n", __FILE__, __LINE__); \ -+ printk("kernel BUG at %s:%d! (%s)\n", __FILE__, __LINE__, print_tainted()); \ +- printk("BUG: failure at %s:%d/%s()!\n", __FILE__, __LINE__, __FUNCTION__); \ ++ printk("BUG: failure at %s:%d/%s()! (%s)\n", __FILE__, __LINE__, __FUNCTION__, print_tainted()); \ panic("BUG!"); \ } while (0) #endif -@@ -25,7 +29,7 @@ +@@ -19,7 +23,7 @@ #ifndef HAVE_ARCH_WARN_ON #define WARN_ON(condition) do { \ if (unlikely((condition)!=0)) { \ -- printk("Badness in %s at %s:%d\n", __FUNCTION__, __FILE__, __LINE__); \ -+ printk("Badness in %s at %s:%d (%s)\n", __FUNCTION__, __FILE__, __LINE__, print_tainted()); \ +- printk("BUG: warning at %s:%d/%s()\n", __FILE__, __LINE__, __FUNCTION__); \ ++ printk("BUG: warning at %s:%d/%s() (%s)\n", __FILE__, __LINE__, __FUNCTION__, print_tainted()); \ dump_stack(); \ } \ } while (0) linux-2.6-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-powerpc/diskdump.h | 55 ++ include/asm-ppc/diskdump.h | 6 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-diskdump.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-diskdump.patch,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- linux-2.6-diskdump.patch 9 Jan 2006 18:55:15 -0000 1.5 +++ linux-2.6-diskdump.patch 24 Mar 2006 22:43:38 -0000 1.6 @@ -1283,12 +1283,12 @@ switch (timeout) { case MAX_SCHEDULE_TIMEOUT: -@@ -1306,7 +1315,7 @@ asmlinkage long sys_sysinfo(struct sysin +@@ -1265,7 +1265,7 @@ asmlinkage long sys_sysinfo(struct sysin return 0; } --static void __devinit init_timers_cpu(int cpu) -+static void /* __devinit */ init_timers_cpu(int cpu) +-static int __devinit init_timers_cpu(int cpu) ++static int init_timers_cpu(int cpu) { int j; tvec_base_t *base; linux-2.6-random-patches.patch: linux-2.6.15.noarch/drivers/char/dtlk.c | 2 +- linux-2.6.15.noarch/drivers/char/watchdog/machzwd.c | 3 +-- linux-2.6.15.noarch/drivers/char/watchdog/sc1200wdt.c | 2 +- linux-2.6.15.noarch/drivers/media/dvb/ttpci/av7110.c | 2 +- linux-2.6.15.noarch/drivers/media/dvb/ttpci/budget-ci.c | 2 +- linux-2.6.15.noarch/drivers/media/dvb/ttpci/budget-patch.c | 2 +- linux-2.6.15.noarch/drivers/media/dvb/ttpci/budget.c | 5 +---- linux-2.6.15.noarch/drivers/media/video/cpia.c | 2 +- linux-2.6.15/kernel/power/snapshot.c | 1 + 9 files changed, 9 insertions(+), 12 deletions(-) Index: linux-2.6-random-patches.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-random-patches.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- linux-2.6-random-patches.patch 17 Feb 2006 07:42:45 -0000 1.3 +++ linux-2.6-random-patches.patch 24 Mar 2006 22:43:38 -0000 1.4 @@ -140,12 +140,3 @@ return 0; } -@@ -121,7 +122,7 @@ int save_highmem(void) - struct zone *zone; - int res = 0; - -- pr_debug("swsusp: Saving Highmem\n"); -+ pr_debug("swsusp: Saving Highmem"); - for_each_zone (zone) { - if (is_highmem(zone)) - res = save_highmem_zone(zone); Index: sources =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/sources,v retrieving revision 1.333 retrieving revision 1.334 diff -u -r1.333 -r1.334 --- sources 23 Mar 2006 09:13:55 -0000 1.333 +++ sources 24 Mar 2006 22:43:39 -0000 1.334 @@ -1,3 +1,3 @@ 9a91b2719949ff0856b40bc467fd47be linux-2.6.16.tar.bz2 8c70806f9075ebc0087f7ce1b8911700 xen-20060320.tar.bz2 -6871a3f3c4a8d29247ac81a0cdb2da99 patch-2.6.16-git6.bz2 +873d1092728523b4cce4dabfd821bb73 patch-2.6.16-git9.bz2 Index: upstream =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/upstream,v retrieving revision 1.305 retrieving revision 1.306 diff -u -r1.305 -r1.306 --- upstream 23 Mar 2006 09:13:55 -0000 1.305 +++ upstream 24 Mar 2006 22:43:39 -0000 1.306 @@ -1,2 +1,2 @@ linux-2.6.16.tar.bz2 -patch-2.6.16-git6.bz2 +patch-2.6.16-git9.bz2 --- linux-2.6-softmac-git.patch DELETED --- --- linux-2.6-softmac-scan-channel.patch DELETED --- --- patch-2.6.16-git6.bz2.sign DELETED --- From fedora-cvs-commits at redhat.com Fri Mar 24 23:05:08 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 24 Mar 2006 18:05:08 -0500 Subject: rpms/kernel/devel/configs config-generic,1.166,1.167 Message-ID: <200603242305.k2ON58GA014933@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel/configs In directory cvs.devel.redhat.com:/tmp/cvs-serv14901/configs Modified Files: config-generic Log Message: build fix Index: config-generic =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/configs/config-generic,v retrieving revision 1.166 retrieving revision 1.167 diff -u -r1.166 -r1.167 --- config-generic 24 Mar 2006 22:43:39 -0000 1.166 +++ config-generic 24 Mar 2006 23:05:05 -0000 1.167 @@ -1390,7 +1390,7 @@ # CONFIG_SYNCLINK is not set # CONFIG_SYNCLINKMP is not set # CONFIG_SYNCLINK_GT is not set -# CONFIG_N_HDLC is not set +CONFIG_N_HDLC=m # CONFIG_STALDRV is not set # CONFIG_FTAPE is not set # CONFIG_IBM_ASM is not set From fedora-cvs-commits at redhat.com Fri Mar 24 23:05:08 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 24 Mar 2006 18:05:08 -0500 Subject: rpms/kernel/devel linux-2.6-compile-fixes.patch,1.58,1.59 Message-ID: <200603242305.k2ON58fk014923@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv14901 Modified Files: linux-2.6-compile-fixes.patch Log Message: build fix linux-2.6-compile-fixes.patch: Kconfig | 1 + 1 files changed, 1 insertion(+) Index: linux-2.6-compile-fixes.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-compile-fixes.patch,v retrieving revision 1.58 retrieving revision 1.59 diff -u -r1.58 -r1.59 --- linux-2.6-compile-fixes.patch 23 Mar 2006 21:21:22 -0000 1.58 +++ linux-2.6-compile-fixes.patch 24 Mar 2006 23:05:04 -0000 1.59 @@ -0,0 +1,10 @@ +--- linux-2.6.16.noarch/drivers/net/wireless/Kconfig~ 2006-03-24 18:01:46.000000000 -0500 ++++ linux-2.6.16.noarch/drivers/net/wireless/Kconfig 2006-03-24 18:02:03.000000000 -0500 +@@ -27,6 +27,7 @@ config NET_RADIO + + config NET_WIRELESS_RTNETLINK + bool "Wireless Extension API over RtNetlink" ++ depends on NET_RADIO + ---help--- + Support the Wireless Extension API over the RtNetlink socket + in addition to the traditional ioctl interface (selected above). From fedora-cvs-commits at redhat.com Fri Mar 24 23:06:52 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 24 Mar 2006 18:06:52 -0500 Subject: rpms/kernel/FC-5/configs config-generic,1.160,1.161 Message-ID: <200603242306.k2ON6qX9015052@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/FC-5/configs In directory cvs.devel.redhat.com:/tmp/cvs-serv15023/configs Modified Files: config-generic Log Message: * Fri Mar 24 2006 Dave Jones - Reenable HDLC driver (#186257) Index: config-generic =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-5/configs/config-generic,v retrieving revision 1.160 retrieving revision 1.161 diff -u -r1.160 -r1.161 --- config-generic 13 Mar 2006 21:05:33 -0000 1.160 +++ config-generic 24 Mar 2006 23:06:50 -0000 1.161 @@ -1381,7 +1381,7 @@ # CONFIG_SYNCLINK is not set # CONFIG_SYNCLINKMP is not set # CONFIG_SYNCLINK_GT is not set -# CONFIG_N_HDLC is not set +CONFIG_N_HDLC=m # CONFIG_STALDRV is not set # CONFIG_FTAPE is not set # CONFIG_IBM_ASM is not set From fedora-cvs-commits at redhat.com Fri Mar 24 23:06:52 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 24 Mar 2006 18:06:52 -0500 Subject: rpms/kernel/FC-5 kernel-2.6.spec,1.2071,1.2072 Message-ID: <200603242306.k2ON6qPB015043@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv15023 Modified Files: kernel-2.6.spec Log Message: * Fri Mar 24 2006 Dave Jones - Reenable HDLC driver (#186257) Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-5/kernel-2.6.spec,v retrieving revision 1.2071 retrieving revision 1.2072 diff -u -r1.2071 -r1.2072 --- kernel-2.6.spec 24 Mar 2006 11:10:49 -0000 1.2071 +++ kernel-2.6.spec 24 Mar 2006 23:06:49 -0000 1.2072 @@ -1669,6 +1669,9 @@ %endif %changelog +* Fri Mar 24 2006 Dave Jones +- Reenable HDLC driver (#186257) + * Fri Mar 24 2006 David Woodhouse - Fix lockup when someone takes the bcm43xx device down while it's scanning (#180953) From fedora-cvs-commits at redhat.com Fri Mar 24 23:40:21 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 24 Mar 2006 18:40:21 -0500 Subject: rpms/kernel/devel kernel-2.6.spec,1.2089,1.2090 Message-ID: <200603242340.k2ONeLlC028951@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv28938 Modified Files: kernel-2.6.spec Log Message: build fixes Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.2089 retrieving revision 1.2090 diff -u -r1.2089 -r1.2090 --- kernel-2.6.spec 24 Mar 2006 22:43:38 -0000 1.2089 +++ kernel-2.6.spec 24 Mar 2006 23:40:17 -0000 1.2090 @@ -1048,7 +1048,7 @@ # # misc small stuff to make things compile or otherwise improve performance # -#%patch10000 -p1 +%patch10000 -p1 # Small 1-2 liners fixing silly bugs that get pushed upstream quickly. %patch10001 -p1 From fedora-cvs-commits at redhat.com Fri Mar 24 23:49:48 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 24 Mar 2006 18:49:48 -0500 Subject: rpms/kernel/FC-5 kernel-2.6.spec,1.2072,1.2073 Message-ID: <200603242349.k2ONnm2x010452@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv10432 Modified Files: kernel-2.6.spec Log Message: Reenable ISA NE2000 clones. (#136569) Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-5/kernel-2.6.spec,v retrieving revision 1.2072 retrieving revision 1.2073 diff -u -r1.2072 -r1.2073 --- kernel-2.6.spec 24 Mar 2006 23:06:49 -0000 1.2072 +++ kernel-2.6.spec 24 Mar 2006 23:49:46 -0000 1.2073 @@ -1671,6 +1671,7 @@ %changelog * Fri Mar 24 2006 Dave Jones - Reenable HDLC driver (#186257) +- Reenable ISA NE2000 clones. (#136569) * Fri Mar 24 2006 David Woodhouse - Fix lockup when someone takes the bcm43xx device down while it's From fedora-cvs-commits at redhat.com Fri Mar 24 23:49:48 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 24 Mar 2006 18:49:48 -0500 Subject: rpms/kernel/FC-5/configs config-generic,1.161,1.162 Message-ID: <200603242349.k2ONnmat010461@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/FC-5/configs In directory cvs.devel.redhat.com:/tmp/cvs-serv10432/configs Modified Files: config-generic Log Message: Reenable ISA NE2000 clones. (#136569) Index: config-generic =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-5/configs/config-generic,v retrieving revision 1.161 retrieving revision 1.162 diff -u -r1.161 -r1.162 --- config-generic 24 Mar 2006 23:06:50 -0000 1.161 +++ config-generic 24 Mar 2006 23:49:46 -0000 1.162 @@ -2570,7 +2570,19 @@ # CONFIG_NI65 is not set # CONFIG_AT1700 is not set # CONFIG_DEPCA is not set -# CONFIG_NET_ISA is not set +CONFIG_NET_ISA=y +CONFIG_NE2000=m +# CONFIG_E2100 is not set +CONFIG_EWRK3=m +# CONFIG_EEXPRESS is not set +# CONFIG_EEXPRESS_PRO is not set +# CONFIG_HPLAN_PLUS is not set +# CONFIG_HPLAN is not set +# CONFIG_LP486E is not set +# CONFIG_ETH16I is not set +# CONFIG_ZNET is not set +# CONFIG_SEEQ8005 is not set + # CONFIG_AC3200 is not set # CONFIG_APRICOT is not set # CONFIG_CS89x0 is not set From fedora-cvs-commits at redhat.com Fri Mar 24 23:51:37 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 24 Mar 2006 18:51:37 -0500 Subject: rpms/kernel/devel/configs config-generic,1.167,1.168 Message-ID: <200603242351.k2ONpbrN010506@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel/configs In directory cvs.devel.redhat.com:/tmp/cvs-serv10493/configs Modified Files: config-generic Log Message: ne2k isa. feh. Index: config-generic =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/configs/config-generic,v retrieving revision 1.167 retrieving revision 1.168 diff -u -r1.167 -r1.168 --- config-generic 24 Mar 2006 23:05:05 -0000 1.167 +++ config-generic 24 Mar 2006 23:51:35 -0000 1.168 @@ -2590,7 +2590,18 @@ # CONFIG_NI65 is not set # CONFIG_AT1700 is not set # CONFIG_DEPCA is not set -# CONFIG_NET_ISA is not set +CONFIG_NET_ISA=y +CONFIG_NE2000=m +# CONFIG_E2100 is not set +CONFIG_EWRK3=m +# CONFIG_EEXPRESS is not set +# CONFIG_EEXPRESS_PRO is not set +# CONFIG_HPLAN_PLUS is not set +# CONFIG_HPLAN is not set +# CONFIG_LP486E is not set +# CONFIG_ETH16I is not set +# CONFIG_ZNET is not set +# CONFIG_SEEQ8005 is not set # CONFIG_AC3200 is not set # CONFIG_APRICOT is not set # CONFIG_CS89x0 is not set From fedora-cvs-commits at redhat.com Fri Mar 24 23:52:01 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 24 Mar 2006 18:52:01 -0500 Subject: rpms/kernel/FC-5 kernel-2.6.spec,1.2073,1.2074 Message-ID: <200603242352.k2ONq1oQ010530@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv10516 Modified Files: kernel-2.6.spec Log Message: trim archs Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-5/kernel-2.6.spec,v retrieving revision 1.2073 retrieving revision 1.2074 diff -u -r1.2073 -r1.2074 --- kernel-2.6.spec 24 Mar 2006 23:49:46 -0000 1.2073 +++ kernel-2.6.spec 24 Mar 2006 23:51:59 -0000 1.2074 @@ -162,7 +162,7 @@ License: GPLv2 Version: %{rpmversion} Release: %{release} -ExclusiveArch: noarch %{all_x86} x86_64 ppc ppc64 ia64 sparc sparc64 ppc64iseries s390 s390x +ExclusiveArch: noarch %{all_x86} x86_64 ppc ppc64 ia64 ExclusiveOS: Linux Provides: kernel = %{version} Provides: kernel-drm = 4.3.0 From fedora-cvs-commits at redhat.com Sat Mar 25 00:06:24 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 24 Mar 2006 19:06:24 -0500 Subject: rpms/kernel/devel linux-2.6-bcm43xx-git.patch,1.3,1.4 Message-ID: <200603250006.k2P06OJa010687@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv10673 Modified Files: linux-2.6-bcm43xx-git.patch Log Message: remove dupe linux-2.6-bcm43xx-git.patch: Documentation/networking/bcm43xx.txt | 36 drivers/net/wireless/Kconfig | 6 drivers/net/wireless/Makefile | 1 drivers/net/wireless/bcm43xx/Kconfig | 62 drivers/net/wireless/bcm43xx/Makefile | 11 drivers/net/wireless/bcm43xx/bcm43xx.h | 955 +++++ drivers/net/wireless/bcm43xx/bcm43xx_debugfs.c | 503 ++ drivers/net/wireless/bcm43xx/bcm43xx_debugfs.h | 117 drivers/net/wireless/bcm43xx/bcm43xx_dma.c | 989 +++++ drivers/net/wireless/bcm43xx/bcm43xx_dma.h | 221 + drivers/net/wireless/bcm43xx/bcm43xx_ethtool.c | 50 drivers/net/wireless/bcm43xx/bcm43xx_ethtool.h | 8 drivers/net/wireless/bcm43xx/bcm43xx_ilt.c | 367 ++ drivers/net/wireless/bcm43xx/bcm43xx_ilt.h | 34 drivers/net/wireless/bcm43xx/bcm43xx_leds.c | 287 + drivers/net/wireless/bcm43xx/bcm43xx_leds.h | 56 drivers/net/wireless/bcm43xx/bcm43xx_main.c | 4364 +++++++++++++++++++++++++ drivers/net/wireless/bcm43xx/bcm43xx_main.h | 283 + drivers/net/wireless/bcm43xx/bcm43xx_phy.c | 2122 ++++++++++++ drivers/net/wireless/bcm43xx/bcm43xx_phy.h | 74 drivers/net/wireless/bcm43xx/bcm43xx_pio.c | 603 +++ drivers/net/wireless/bcm43xx/bcm43xx_pio.h | 138 drivers/net/wireless/bcm43xx/bcm43xx_power.c | 358 ++ drivers/net/wireless/bcm43xx/bcm43xx_power.h | 47 drivers/net/wireless/bcm43xx/bcm43xx_radio.c | 1766 ++++++++++ drivers/net/wireless/bcm43xx/bcm43xx_radio.h | 94 drivers/net/wireless/bcm43xx/bcm43xx_wx.c | 1070 ++++++ drivers/net/wireless/bcm43xx/bcm43xx_wx.h | 36 28 files changed, 14657 insertions(+), 1 deletion(-) Index: linux-2.6-bcm43xx-git.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-bcm43xx-git.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- linux-2.6-bcm43xx-git.patch 3 Mar 2006 03:36:21 -0000 1.3 +++ linux-2.6-bcm43xx-git.patch 25 Mar 2006 00:06:19 -0000 1.4 @@ -14759,86 +14759,3 @@ # yes, this works even when no drivers are selected config NET_WIRELESS ---- linux-2.6.15.noarch/net/ieee80211/ieee80211_rx.c.orig 2006-03-02 18:24:56.000000000 -0500 -+++ linux-2.6.15.noarch/net/ieee80211/ieee80211_rx.c 2006-03-02 18:25:19.000000000 -0500 -@@ -773,6 +773,80 @@ int ieee80211_rx(struct ieee80211_device - return 0; - } - -+/* Filter out unrelated packets, call ieee80211_rx[_mgt] */ -+int ieee80211_rx_any(struct ieee80211_device *ieee, -+ struct sk_buff *skb, struct ieee80211_rx_stats *stats) -+{ -+ struct ieee80211_hdr_4addr *hdr; -+ int is_packet_for_us; -+ u16 fc; -+ -+ if (ieee->iw_mode == IW_MODE_MONITOR) -+ return ieee80211_rx(ieee, skb, stats) ? 0 : -EINVAL; -+ -+ hdr = (struct ieee80211_hdr_4addr *)skb->data; -+ fc = le16_to_cpu(hdr->frame_ctl); -+ -+ if ((fc & IEEE80211_FCTL_VERS) != 0) -+ return -EINVAL; -+ -+ switch (fc & IEEE80211_FCTL_FTYPE) { -+ case IEEE80211_FTYPE_MGMT: -+ ieee80211_rx_mgt(ieee, hdr, stats); -+ return 0; -+ case IEEE80211_FTYPE_DATA: -+ break; -+ case IEEE80211_FTYPE_CTL: -+ return 0; -+ default: -+ return -EINVAL; -+ } -+ -+ is_packet_for_us = 0; -+ switch (ieee->iw_mode) { -+ case IW_MODE_ADHOC: -+ /* our BSS and not from/to DS */ -+ if (memcmp(hdr->addr3, ieee->bssid, ETH_ALEN) == 0) -+ if ((fc & (IEEE80211_FCTL_TODS+IEEE80211_FCTL_FROMDS)) == 0) { -+ /* promisc: get all */ -+ if (ieee->dev->flags & IFF_PROMISC) -+ is_packet_for_us = 1; -+ /* to us */ -+ else if (memcmp(hdr->addr1, ieee->dev->dev_addr, ETH_ALEN) == 0) -+ is_packet_for_us = 1; -+ /* mcast */ -+ else if (is_multicast_ether_addr(hdr->addr1)) -+ is_packet_for_us = 1; -+ } -+ break; -+ case IW_MODE_INFRA: -+ /* our BSS (== from our AP) and from DS */ -+ if (memcmp(hdr->addr2, ieee->bssid, ETH_ALEN) == 0) -+ if ((fc & (IEEE80211_FCTL_TODS+IEEE80211_FCTL_FROMDS)) == IEEE80211_FCTL_FROMDS) { -+ /* promisc: get all */ -+ if (ieee->dev->flags & IFF_PROMISC) -+ is_packet_for_us = 1; -+ /* to us */ -+ else if (memcmp(hdr->addr1, ieee->dev->dev_addr, ETH_ALEN) == 0) -+ is_packet_for_us = 1; -+ /* mcast */ -+ else if (is_multicast_ether_addr(hdr->addr1)) { -+ /* not our own packet bcasted from AP */ -+ if (memcmp(hdr->addr3, ieee->dev->dev_addr, ETH_ALEN)) -+ is_packet_for_us = 1; -+ } -+ } -+ break; -+ default: -+ /* ? */ -+ break; -+ } -+ -+ if (is_packet_for_us) -+ return (ieee80211_rx(ieee, skb, stats) ? 0 : -EINVAL); -+ return 0; -+} -+ - #define MGMT_FRAME_FIXED_PART_LENGTH 0x24 - - static u8 qos_oui[QOS_OUI_LEN] = { 0x00, 0x50, 0xF2 }; From fedora-cvs-commits at redhat.com Sat Mar 25 00:39:52 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 24 Mar 2006 19:39:52 -0500 Subject: rpms/kernel/devel kernel-2.6.spec,1.2090,1.2091 Message-ID: <200603250039.k2P0dqGA024582@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv24570 Modified Files: kernel-2.6.spec Log Message: xen doesn't exist if includexen undefined. it's there if buildxen=0 though. Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.2090 retrieving revision 1.2091 diff -u -r1.2090 -r1.2091 --- kernel-2.6.spec 24 Mar 2006 23:40:17 -0000 1.2090 +++ kernel-2.6.spec 25 Mar 2006 00:39:49 -0000 1.2091 @@ -1210,7 +1210,7 @@ ln -sf ../../../include/asm-ppc* asm popd fi -%if %{buildxen} +%if %{includexen} cp -a xen $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/include %endif @@ -1218,7 +1218,7 @@ # external modules can be built touch -r $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/Makefile $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/include/linux/version.h touch -r $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/.config $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/include/linux/autoconf.h - cd .. + cd .. # # save the vmlinux file for kernel debugging into the kernel-debuginfo rpm From fedora-cvs-commits at redhat.com Sat Mar 25 01:48:47 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 24 Mar 2006 20:48:47 -0500 Subject: rpms/kernel/devel kernel-2.6.spec,1.2091,1.2092 Message-ID: <200603250148.k2P1mlJe001247@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv1235 Modified Files: kernel-2.6.spec Log Message: don't build it if it isnt included Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.2091 retrieving revision 1.2092 diff -u -r1.2091 -r1.2092 --- kernel-2.6.spec 25 Mar 2006 00:39:49 -0000 1.2091 +++ kernel-2.6.spec 25 Mar 2006 01:48:45 -0000 1.2092 @@ -1311,10 +1311,12 @@ BuildKernel vmlinuz vmlinuz xenU-PAE %endif +%if %{includexen} %if %{buildxen} BuildKernel vmlinuz vmlinuz xen0 BuildKernel vmlinuz vmlinuz xenU %endif +%endif %if %{buildkdump} BuildKernel %make_target %kernel_image kdump From fedora-cvs-commits at redhat.com Sat Mar 25 02:32:19 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 24 Mar 2006 21:32:19 -0500 Subject: rpms/kernel/devel linux-2.6-crashdump-common.patch,1.13,1.14 Message-ID: <200603250232.k2P2WJoc015263@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv15249 Modified Files: linux-2.6-crashdump-common.patch Log Message: build fix linux-2.6-crashdump-common.patch: linux-2.6.12/Documentation/sysrq.txt | 8 linux-2.6.12/arch/i386/kernel/nmi.c | 1 linux-2.6.12/arch/i386/kernel/traps.c | 3 linux-2.6.12/arch/i386/mm/init.c | 47 +++++ linux-2.6.12/arch/ia64/kernel/process.c | 30 ++- linux-2.6.12/arch/ia64/kernel/traps.c | 6 linux-2.6.12/arch/ia64/mm/contig.c | 3 linux-2.6.12/arch/ia64/mm/discontig.c | 3 linux-2.6.12/arch/ia64/mm/init.c | 90 +++++++++ linux-2.6.12/arch/powerpc/kernel/process.c | 1 linux-2.6.12/arch/powerpc/kernel/traps.c | 3 linux-2.6.12/arch/powerpc/mm/mem.c | 29 +++ linux-2.6.12/arch/s390/kernel/traps.c | 6 linux-2.6.12/arch/x86_64/kernel/process.c | 2 linux-2.6.12/arch/x86_64/kernel/traps.c | 6 linux-2.6.12/arch/x86_64/mm/init.c | 32 +++ linux-2.6.12/drivers/char/sysrq.c | 2 linux-2.6.12/include/asm-generic/crashdump.h | 47 +++++ linux-2.6.12/include/asm-i386/crashdump.h | 123 +++++++++++++ linux-2.6.12/include/asm-i386/kmap_types.h | 4 linux-2.6.12/include/asm-ia64/crashdump.h | 72 +++++++ linux-2.6.12/include/asm-powerpc/crashdump.h | 61 ++++++ linux-2.6.12/include/asm-x86_64/crashdump.h | 86 +++++++++ linux-2.6.12/include/linux/kernel.h | 18 + linux-2.6.12/kernel/Makefile | 2 linux-2.6.12/kernel/dump.c | 246 +++++++++++++++++++++++++++ linux-2.6.12/kernel/panic.c | 4 linux-2.6.12/kernel/printk.c | 20 ++ linux-2.6.12/kernel/sched.c | 2 linux-2.6.13/arch/x86_64/mm/fault.c | 1 linux-2.6.13/drivers/char/sysrq.c | 5 linux-2.6.16.noarch/arch/i386/mm/pgtable.c | 3 32 files changed, 952 insertions(+), 14 deletions(-) Index: linux-2.6-crashdump-common.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-crashdump-common.patch,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- linux-2.6-crashdump-common.patch 21 Mar 2006 04:03:51 -0000 1.13 +++ linux-2.6-crashdump-common.patch 25 Mar 2006 02:32:03 -0000 1.14 @@ -887,8 +887,16 @@ /* * devmem_is_allowed() checks to see if /dev/mem access to a certain address is * valid. The argument is a physical page number. ---- linux-2.6.16/arch/i386/mm/pgtable.c~ 2006-03-20 22:19:50.000000000 -0500 -+++ linux-2.6.16/arch/i386/mm/pgtable.c 2006-03-20 22:19:59.000000000 -0500 +--- linux-2.6.16.noarch/arch/i386/mm/pgtable.c~ 2006-03-24 21:29:33.000000000 -0500 ++++ linux-2.6.16.noarch/arch/i386/mm/pgtable.c 2006-03-24 21:29:42.000000000 -0500 +@@ -13,6 +13,7 @@ + #include + #include + #include ++#include + + #include + #include @@ -63,6 +64,8 @@ printk(KERN_INFO "%lu pages pagetables\n", ps.nr_page_table_pages); } From fedora-cvs-commits at redhat.com Sat Mar 25 10:06:29 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sat, 25 Mar 2006 05:06:29 -0500 Subject: rpms/net-snmp/devel net-snmp-5.3-ipv6_retrans_ms.patch, NONE, 1.1 net-snmp.spec, 1.67, 1.68 Message-ID: <200603251006.k2PA6TBM029699@cvs.devel.redhat.com> Author: rvokal Update of /cvs/dist/rpms/net-snmp/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv29685 Modified Files: net-snmp.spec Added Files: net-snmp-5.3-ipv6_retrans_ms.patch Log Message: - use net.ipv6.neigh.lo.retrans_time_ms (#186546) net-snmp-5.3-ipv6_retrans_ms.patch: interface_linux.c | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE net-snmp-5.3-ipv6_retrans_ms.patch --- --- net-snmp-5.3/agent/mibgroup/if-mib/data_access/interface_linux.c.old 2005-12-08 12:08:34.000000000 +0100 +++ net-snmp-5.3/agent/mibgroup/if-mib/data_access/interface_linux.c 2006-03-25 10:50:27.000000000 +0100 @@ -192,7 +192,7 @@ /* * get the retransmit time */ - snprintf(line,sizeof(line),"/proc/sys/net/ipv6/neigh/%s/retrans_time", + snprintf(line,sizeof(line),"/proc/sys/net/ipv6/neigh/%s/retrans_time_ms", entry->name); if (!(fin = fopen(line, "r"))) { DEBUGMSGTL(("access:interface", Index: net-snmp.spec =================================================================== RCS file: /cvs/dist/rpms/net-snmp/devel/net-snmp.spec,v retrieving revision 1.67 retrieving revision 1.68 diff -u -r1.67 -r1.68 --- net-snmp.spec 20 Mar 2006 11:23:16 -0000 1.67 +++ net-snmp.spec 25 Mar 2006 10:06:25 -0000 1.68 @@ -3,7 +3,8 @@ Summary: A collection of SNMP protocol tools and libraries. Name: net-snmp Version: 5.3 -Release: 5 +Release: 6 + License: BSDish Group: System Environment/Daemons URL: http://net-snmp.sourceforge.net/ @@ -30,6 +31,7 @@ Patch22: net-snmp-5.3-agent-registry-unregister-free.patch Patch23: net-snmp-5.3-proc_if_inet6.patch Patch24: net-snmp-5.3-size_t.patch +Patch25: net-snmp-5.3-ipv6_retrans_ms.patch Prereq: /sbin/chkconfig Obsoletes: ucd-snmp @@ -134,6 +136,7 @@ %patch22 -p0 %patch23 -p1 -b .proc_if %patch24 -p1 -b .size_t +%patch25 -p1 -b .retrans_ms # Do this patch with a perl hack... perl -pi -e "s|'\\\$install_libdir'|'%{_libdir}'|" ltmain.sh @@ -316,6 +319,9 @@ %{_libdir}/*.a %changelog +* Sar Mar 25 2006 Radek Vokal 5.3-6 +- use net.ipv6.neigh.lo.retrans_time_ms (#186546) + * Mon Mar 20 2006 Radek Vokal 5.3-5 - allow disman/event-mib From fedora-cvs-commits at redhat.com Sat Mar 25 10:07:16 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sat, 25 Mar 2006 05:07:16 -0500 Subject: rpms/net-snmp/devel net-snmp.spec,1.68,1.69 Message-ID: <200603251007.k2PA7G0v029725@cvs.devel.redhat.com> Author: rvokal Update of /cvs/dist/rpms/net-snmp/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv29712 Modified Files: net-snmp.spec Log Message: date fix Index: net-snmp.spec =================================================================== RCS file: /cvs/dist/rpms/net-snmp/devel/net-snmp.spec,v retrieving revision 1.68 retrieving revision 1.69 diff -u -r1.68 -r1.69 --- net-snmp.spec 25 Mar 2006 10:06:25 -0000 1.68 +++ net-snmp.spec 25 Mar 2006 10:07:13 -0000 1.69 @@ -319,7 +319,7 @@ %{_libdir}/*.a %changelog -* Sar Mar 25 2006 Radek Vokal 5.3-6 +* Sat Mar 25 2006 Radek Vokal 5.3-6 - use net.ipv6.neigh.lo.retrans_time_ms (#186546) * Mon Mar 20 2006 Radek Vokal 5.3-5 From fedora-cvs-commits at redhat.com Sat Mar 25 17:40:55 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sat, 25 Mar 2006 12:40:55 -0500 Subject: rpms/cpio/devel cpio-2.6-lfs.patch,1.3,1.4 cpio.spec,1.37,1.38 Message-ID: <200603251740.k2PHetTj009816@cvs.devel.redhat.com> Author: pvrabec Update of /cvs/dist/rpms/cpio/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv9802 Modified Files: cpio-2.6-lfs.patch cpio.spec Log Message: fix (#186339) on ppc and s390 cpio-2.6-lfs.patch: copyin.c | 8 ++++---- cpiohdr.h | 6 +++--- extern.h | 14 +++++++------- util.c | 60 ++++++++++++++++++++++++++++++------------------------------ 4 files changed, 44 insertions(+), 44 deletions(-) Index: cpio-2.6-lfs.patch =================================================================== RCS file: /cvs/dist/rpms/cpio/devel/cpio-2.6-lfs.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- cpio-2.6-lfs.patch 15 Mar 2006 16:23:55 -0000 1.3 +++ cpio-2.6-lfs.patch 25 Mar 2006 17:40:51 -0000 1.4 @@ -1,58 +1,5 @@ ---- cpio-2.6/src/copyin.c.lfs 2006-03-15 16:30:48.000000000 -0500 -+++ cpio-2.6/src/copyin.c 2006-03-15 16:35:33.000000000 -0500 -@@ -106,7 +106,7 @@ - header type. */ - - static void --tape_skip_padding (int in_file_des, int offset) -+tape_skip_padding (int in_file_des, off_t offset) - { - int pad; - -@@ -911,7 +911,7 @@ - printf ("%3u, %3u ", file_hdr->c_rdev_maj, - file_hdr->c_rdev_min); - else -- printf ("%8lu ", file_hdr->c_filesize); -+ printf ("%8llu ", file_hdr->c_filesize); - - printf ("%s ", tbuf + 4); - -@@ -1153,7 +1153,7 @@ - tape_buffered_read (ascii_header, in_des, 70L); - ascii_header[70] = '\0'; - sscanf (ascii_header, -- "%6lo%6lo%6lo%6lo%6lo%6lo%6lo%11lo%6lo%11lo", -+ "%6lo%6lo%6lo%6lo%6lo%6lo%6lo%11lo%6lo%11llo", - &dev, &file_hdr->c_ino, - &file_hdr->c_mode, &file_hdr->c_uid, &file_hdr->c_gid, - &file_hdr->c_nlink, &rdev, &file_hdr->c_mtime, ---- cpio-2.6/src/extern.h.lfs 2004-09-08 06:49:57.000000000 -0400 -+++ cpio-2.6/src/extern.h 2006-03-15 16:28:46.000000000 -0500 -@@ -161,14 +161,14 @@ - void tape_empty_output_buffer P_((int out_des)); - void disk_empty_output_buffer P_((int out_des)); - void swahw_array P_((char *ptr, int count)); --void tape_buffered_write P_((char *in_buf, int out_des, long num_bytes)); --void tape_buffered_read P_((char *in_buf, int in_des, long num_bytes)); -+void tape_buffered_write P_((char *in_buf, int out_des, off_t num_bytes)); -+void tape_buffered_read P_((char *in_buf, int in_des, off_t num_bytes)); - int tape_buffered_peek P_((char *peek_buf, int in_des, int num_bytes)); --void tape_toss_input P_((int in_des, long num_bytes)); --void copy_files_tape_to_disk P_((int in_des, int out_des, long num_bytes)); --void copy_files_disk_to_tape P_((int in_des, int out_des, long num_bytes, char *filename)); --void copy_files_disk_to_disk P_((int in_des, int out_des, long num_bytes, char *filename)); --void warn_if_file_changed P_((char *file_name, unsigned long old_file_size, -+void tape_toss_input P_((int in_des, off_t num_bytes)); -+void copy_files_tape_to_disk P_((int in_des, int out_des, off_t num_bytes)); -+void copy_files_disk_to_tape P_((int in_des, int out_des, off_t num_bytes, char *filename)); -+void copy_files_disk_to_disk P_((int in_des, int out_des, off_t num_bytes, char *filename)); -+void warn_if_file_changed P_((char *file_name, off_t old_file_size, - unsigned long old_file_mtime)); - void create_all_directories P_((char *name)); - void prepare_append P_((int out_file_des)); ---- cpio-2.6/src/util.c.lfs 2004-09-08 06:44:49.000000000 -0400 -+++ cpio-2.6/src/util.c 2006-03-15 16:29:20.000000000 -0500 +--- cpio-2.6/src/util.c.lfs 2004-09-08 12:44:49.000000000 +0200 ++++ cpio-2.6/src/util.c 2006-03-25 13:34:10.000000000 +0100 @@ -207,7 +207,7 @@ Exit with an error if end of file is reached. */ @@ -222,8 +169,70 @@ return hash_table[temp]->file_name; } } ---- cpio-2.6/src/cpiohdr.h.lfs 2003-11-21 09:48:13.000000000 -0500 -+++ cpio-2.6/src/cpiohdr.h 2006-03-15 16:27:30.000000000 -0500 +--- cpio-2.6/src/copyin.c.lfs 2004-09-08 13:10:02.000000000 +0200 ++++ cpio-2.6/src/copyin.c 2006-03-25 13:35:43.000000000 +0100 +@@ -106,7 +106,7 @@ + header type. */ + + static void +-tape_skip_padding (int in_file_des, int offset) ++tape_skip_padding (int in_file_des, off_t offset) + { + int pad; + +@@ -911,7 +911,7 @@ + printf ("%3u, %3u ", file_hdr->c_rdev_maj, + file_hdr->c_rdev_min); + else +- printf ("%8lu ", file_hdr->c_filesize); ++ printf ("%8llu ", file_hdr->c_filesize); + + printf ("%s ", tbuf + 4); + +@@ -1153,7 +1153,7 @@ + tape_buffered_read (ascii_header, in_des, 70L); + ascii_header[70] = '\0'; + sscanf (ascii_header, +- "%6lo%6lo%6lo%6lo%6lo%6lo%6lo%11lo%6lo%11lo", ++ "%6lo%6lo%6lo%6lo%6lo%6lo%6lo%11lo%6lo%11llo", + &dev, &file_hdr->c_ino, + &file_hdr->c_mode, &file_hdr->c_uid, &file_hdr->c_gid, + &file_hdr->c_nlink, &rdev, &file_hdr->c_mtime, +@@ -1211,7 +1211,7 @@ + tape_buffered_read (ascii_header, in_des, 104L); + ascii_header[104] = '\0'; + sscanf (ascii_header, +- "%8lx%8lx%8lx%8lx%8lx%8lx%8lx%8lx%8lx%8lx%8lx%8lx%8lx", ++ "%8lx%8lx%8lx%8lx%8lx%8lx%8llx%8lx%8lx%8lx%8lx%8lx%8lx", + &file_hdr->c_ino, &file_hdr->c_mode, &file_hdr->c_uid, + &file_hdr->c_gid, &file_hdr->c_nlink, &file_hdr->c_mtime, + &file_hdr->c_filesize, &file_hdr->c_dev_maj, &file_hdr->c_dev_min, +--- cpio-2.6/src/extern.h.lfs 2004-09-08 12:49:57.000000000 +0200 ++++ cpio-2.6/src/extern.h 2006-03-25 13:34:10.000000000 +0100 +@@ -161,14 +161,14 @@ + void tape_empty_output_buffer P_((int out_des)); + void disk_empty_output_buffer P_((int out_des)); + void swahw_array P_((char *ptr, int count)); +-void tape_buffered_write P_((char *in_buf, int out_des, long num_bytes)); +-void tape_buffered_read P_((char *in_buf, int in_des, long num_bytes)); ++void tape_buffered_write P_((char *in_buf, int out_des, off_t num_bytes)); ++void tape_buffered_read P_((char *in_buf, int in_des, off_t num_bytes)); + int tape_buffered_peek P_((char *peek_buf, int in_des, int num_bytes)); +-void tape_toss_input P_((int in_des, long num_bytes)); +-void copy_files_tape_to_disk P_((int in_des, int out_des, long num_bytes)); +-void copy_files_disk_to_tape P_((int in_des, int out_des, long num_bytes, char *filename)); +-void copy_files_disk_to_disk P_((int in_des, int out_des, long num_bytes, char *filename)); +-void warn_if_file_changed P_((char *file_name, unsigned long old_file_size, ++void tape_toss_input P_((int in_des, off_t num_bytes)); ++void copy_files_tape_to_disk P_((int in_des, int out_des, off_t num_bytes)); ++void copy_files_disk_to_tape P_((int in_des, int out_des, off_t num_bytes, char *filename)); ++void copy_files_disk_to_disk P_((int in_des, int out_des, off_t num_bytes, char *filename)); ++void warn_if_file_changed P_((char *file_name, off_t old_file_size, + unsigned long old_file_mtime)); + void create_all_directories P_((char *name)); + void prepare_append P_((int out_file_des)); +--- cpio-2.6/src/cpiohdr.h.lfs 2003-11-21 15:48:13.000000000 +0100 ++++ cpio-2.6/src/cpiohdr.h 2006-03-25 13:34:10.000000000 +0100 @@ -34,8 +34,8 @@ unsigned short c_mtimes[2]; unsigned short c_namesize; Index: cpio.spec =================================================================== RCS file: /cvs/dist/rpms/cpio/devel/cpio.spec,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- cpio.spec 23 Mar 2006 10:11:39 -0000 1.37 +++ cpio.spec 25 Mar 2006 17:40:51 -0000 1.38 @@ -6,7 +6,7 @@ Summary: A GNU archiving program. Name: cpio Version: 2.6 -Release: 14 +Release: 15 License: GPL Group: Applications/Archiving URL: http://www.gnu.org/software/cpio/ @@ -106,6 +106,9 @@ %{_infodir}/*.info* %changelog +* Sat Mar 25 2006 Peter Vrabec 2.6-15 +- fix (#186339) on ppc and s390 + * Thu Mar 23 2006 Peter Vrabec 2.6-14 - init struct file_hdr (#186339) From fedora-cvs-commits at redhat.com Sat Mar 25 17:49:42 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sat, 25 Mar 2006 12:49:42 -0500 Subject: rpms/cpio/FC-5 cpio-2.6-lfs.patch,1.3,1.4 cpio.spec,1.38,1.39 Message-ID: <200603251749.k2PHngdv023578@cvs.devel.redhat.com> Author: pvrabec Update of /cvs/dist/rpms/cpio/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv23563 Modified Files: cpio-2.6-lfs.patch cpio.spec Log Message: fix (#186339) on ppc and s390 cpio-2.6-lfs.patch: copyin.c | 8 ++++---- cpiohdr.h | 6 +++--- extern.h | 14 +++++++------- util.c | 60 ++++++++++++++++++++++++++++++------------------------------ 4 files changed, 44 insertions(+), 44 deletions(-) Index: cpio-2.6-lfs.patch =================================================================== RCS file: /cvs/dist/rpms/cpio/FC-5/cpio-2.6-lfs.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- cpio-2.6-lfs.patch 15 Mar 2006 16:23:55 -0000 1.3 +++ cpio-2.6-lfs.patch 25 Mar 2006 17:49:38 -0000 1.4 @@ -1,58 +1,5 @@ ---- cpio-2.6/src/copyin.c.lfs 2006-03-15 16:30:48.000000000 -0500 -+++ cpio-2.6/src/copyin.c 2006-03-15 16:35:33.000000000 -0500 -@@ -106,7 +106,7 @@ - header type. */ - - static void --tape_skip_padding (int in_file_des, int offset) -+tape_skip_padding (int in_file_des, off_t offset) - { - int pad; - -@@ -911,7 +911,7 @@ - printf ("%3u, %3u ", file_hdr->c_rdev_maj, - file_hdr->c_rdev_min); - else -- printf ("%8lu ", file_hdr->c_filesize); -+ printf ("%8llu ", file_hdr->c_filesize); - - printf ("%s ", tbuf + 4); - -@@ -1153,7 +1153,7 @@ - tape_buffered_read (ascii_header, in_des, 70L); - ascii_header[70] = '\0'; - sscanf (ascii_header, -- "%6lo%6lo%6lo%6lo%6lo%6lo%6lo%11lo%6lo%11lo", -+ "%6lo%6lo%6lo%6lo%6lo%6lo%6lo%11lo%6lo%11llo", - &dev, &file_hdr->c_ino, - &file_hdr->c_mode, &file_hdr->c_uid, &file_hdr->c_gid, - &file_hdr->c_nlink, &rdev, &file_hdr->c_mtime, ---- cpio-2.6/src/extern.h.lfs 2004-09-08 06:49:57.000000000 -0400 -+++ cpio-2.6/src/extern.h 2006-03-15 16:28:46.000000000 -0500 -@@ -161,14 +161,14 @@ - void tape_empty_output_buffer P_((int out_des)); - void disk_empty_output_buffer P_((int out_des)); - void swahw_array P_((char *ptr, int count)); --void tape_buffered_write P_((char *in_buf, int out_des, long num_bytes)); --void tape_buffered_read P_((char *in_buf, int in_des, long num_bytes)); -+void tape_buffered_write P_((char *in_buf, int out_des, off_t num_bytes)); -+void tape_buffered_read P_((char *in_buf, int in_des, off_t num_bytes)); - int tape_buffered_peek P_((char *peek_buf, int in_des, int num_bytes)); --void tape_toss_input P_((int in_des, long num_bytes)); --void copy_files_tape_to_disk P_((int in_des, int out_des, long num_bytes)); --void copy_files_disk_to_tape P_((int in_des, int out_des, long num_bytes, char *filename)); --void copy_files_disk_to_disk P_((int in_des, int out_des, long num_bytes, char *filename)); --void warn_if_file_changed P_((char *file_name, unsigned long old_file_size, -+void tape_toss_input P_((int in_des, off_t num_bytes)); -+void copy_files_tape_to_disk P_((int in_des, int out_des, off_t num_bytes)); -+void copy_files_disk_to_tape P_((int in_des, int out_des, off_t num_bytes, char *filename)); -+void copy_files_disk_to_disk P_((int in_des, int out_des, off_t num_bytes, char *filename)); -+void warn_if_file_changed P_((char *file_name, off_t old_file_size, - unsigned long old_file_mtime)); - void create_all_directories P_((char *name)); - void prepare_append P_((int out_file_des)); ---- cpio-2.6/src/util.c.lfs 2004-09-08 06:44:49.000000000 -0400 -+++ cpio-2.6/src/util.c 2006-03-15 16:29:20.000000000 -0500 +--- cpio-2.6/src/util.c.lfs 2004-09-08 12:44:49.000000000 +0200 ++++ cpio-2.6/src/util.c 2006-03-25 13:34:10.000000000 +0100 @@ -207,7 +207,7 @@ Exit with an error if end of file is reached. */ @@ -222,8 +169,70 @@ return hash_table[temp]->file_name; } } ---- cpio-2.6/src/cpiohdr.h.lfs 2003-11-21 09:48:13.000000000 -0500 -+++ cpio-2.6/src/cpiohdr.h 2006-03-15 16:27:30.000000000 -0500 +--- cpio-2.6/src/copyin.c.lfs 2004-09-08 13:10:02.000000000 +0200 ++++ cpio-2.6/src/copyin.c 2006-03-25 13:35:43.000000000 +0100 +@@ -106,7 +106,7 @@ + header type. */ + + static void +-tape_skip_padding (int in_file_des, int offset) ++tape_skip_padding (int in_file_des, off_t offset) + { + int pad; + +@@ -911,7 +911,7 @@ + printf ("%3u, %3u ", file_hdr->c_rdev_maj, + file_hdr->c_rdev_min); + else +- printf ("%8lu ", file_hdr->c_filesize); ++ printf ("%8llu ", file_hdr->c_filesize); + + printf ("%s ", tbuf + 4); + +@@ -1153,7 +1153,7 @@ + tape_buffered_read (ascii_header, in_des, 70L); + ascii_header[70] = '\0'; + sscanf (ascii_header, +- "%6lo%6lo%6lo%6lo%6lo%6lo%6lo%11lo%6lo%11lo", ++ "%6lo%6lo%6lo%6lo%6lo%6lo%6lo%11lo%6lo%11llo", + &dev, &file_hdr->c_ino, + &file_hdr->c_mode, &file_hdr->c_uid, &file_hdr->c_gid, + &file_hdr->c_nlink, &rdev, &file_hdr->c_mtime, +@@ -1211,7 +1211,7 @@ + tape_buffered_read (ascii_header, in_des, 104L); + ascii_header[104] = '\0'; + sscanf (ascii_header, +- "%8lx%8lx%8lx%8lx%8lx%8lx%8lx%8lx%8lx%8lx%8lx%8lx%8lx", ++ "%8lx%8lx%8lx%8lx%8lx%8lx%8llx%8lx%8lx%8lx%8lx%8lx%8lx", + &file_hdr->c_ino, &file_hdr->c_mode, &file_hdr->c_uid, + &file_hdr->c_gid, &file_hdr->c_nlink, &file_hdr->c_mtime, + &file_hdr->c_filesize, &file_hdr->c_dev_maj, &file_hdr->c_dev_min, +--- cpio-2.6/src/extern.h.lfs 2004-09-08 12:49:57.000000000 +0200 ++++ cpio-2.6/src/extern.h 2006-03-25 13:34:10.000000000 +0100 +@@ -161,14 +161,14 @@ + void tape_empty_output_buffer P_((int out_des)); + void disk_empty_output_buffer P_((int out_des)); + void swahw_array P_((char *ptr, int count)); +-void tape_buffered_write P_((char *in_buf, int out_des, long num_bytes)); +-void tape_buffered_read P_((char *in_buf, int in_des, long num_bytes)); ++void tape_buffered_write P_((char *in_buf, int out_des, off_t num_bytes)); ++void tape_buffered_read P_((char *in_buf, int in_des, off_t num_bytes)); + int tape_buffered_peek P_((char *peek_buf, int in_des, int num_bytes)); +-void tape_toss_input P_((int in_des, long num_bytes)); +-void copy_files_tape_to_disk P_((int in_des, int out_des, long num_bytes)); +-void copy_files_disk_to_tape P_((int in_des, int out_des, long num_bytes, char *filename)); +-void copy_files_disk_to_disk P_((int in_des, int out_des, long num_bytes, char *filename)); +-void warn_if_file_changed P_((char *file_name, unsigned long old_file_size, ++void tape_toss_input P_((int in_des, off_t num_bytes)); ++void copy_files_tape_to_disk P_((int in_des, int out_des, off_t num_bytes)); ++void copy_files_disk_to_tape P_((int in_des, int out_des, off_t num_bytes, char *filename)); ++void copy_files_disk_to_disk P_((int in_des, int out_des, off_t num_bytes, char *filename)); ++void warn_if_file_changed P_((char *file_name, off_t old_file_size, + unsigned long old_file_mtime)); + void create_all_directories P_((char *name)); + void prepare_append P_((int out_file_des)); +--- cpio-2.6/src/cpiohdr.h.lfs 2003-11-21 15:48:13.000000000 +0100 ++++ cpio-2.6/src/cpiohdr.h 2006-03-25 13:34:10.000000000 +0100 @@ -34,8 +34,8 @@ unsigned short c_mtimes[2]; unsigned short c_namesize; Index: cpio.spec =================================================================== RCS file: /cvs/dist/rpms/cpio/FC-5/cpio.spec,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- cpio.spec 23 Mar 2006 10:15:42 -0000 1.38 +++ cpio.spec 25 Mar 2006 17:49:38 -0000 1.39 @@ -6,7 +6,7 @@ Summary: A GNU archiving program. Name: cpio Version: 2.6 -Release: 15.FC5 +Release: 16.FC5 License: GPL Group: Applications/Archiving URL: http://www.gnu.org/software/cpio/ @@ -106,6 +106,9 @@ %{_infodir}/*.info* %changelog +* Sat Mar 25 2006 Peter Vrabec 2.6-16.FC5 +- fix (#186339) on ppc and s390 + * Wed Mar 23 2006 Peter Vrabec 2.6-15.FC5 - init struct file_hdr (#186339) From fedora-cvs-commits at redhat.com Sun Mar 26 00:13:41 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sat, 25 Mar 2006 19:13:41 -0500 Subject: rpms/kernel/devel/configs config-ia64-generic, 1.22, 1.23 config-x86_64-generic, 1.35, 1.36 Message-ID: <200603260013.k2Q0DfAj027312@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel/configs In directory cvs.devel.redhat.com:/tmp/cvs-serv27280/configs Modified Files: config-ia64-generic config-x86_64-generic Log Message: git10 Index: config-ia64-generic =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/configs/config-ia64-generic,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- config-ia64-generic 22 Mar 2006 23:50:27 -0000 1.22 +++ config-ia64-generic 26 Mar 2006 00:13:38 -0000 1.23 @@ -170,3 +170,5 @@ # CONFIG_PERMIT_BSP_REMOVE is not set # CONFIG_FORCE_CPEI_RETARGET is not set +CONFIG_IA64_NR_NODES=256 + Index: config-x86_64-generic =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/configs/config-x86_64-generic,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- config-x86_64-generic 24 Mar 2006 22:43:39 -0000 1.35 +++ config-x86_64-generic 26 Mar 2006 00:13:38 -0000 1.36 @@ -154,3 +154,5 @@ CONFIG_EDAC_I82860=m CONFIG_EDAC_R82600=m +CONFIG_REORDER=y + From fedora-cvs-commits at redhat.com Sun Mar 26 00:13:41 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sat, 25 Mar 2006 19:13:41 -0500 Subject: rpms/kernel/devel linux-2.6-x86-tune-generic.patch, NONE, 1.1 patch-2.6.16-git10.bz2, NONE, 1.1 patch-2.6.16-git10.bz2.sign, NONE, 1.1 kernel-2.6.spec, 1.2092, 1.2093 linux-2.6-build-nonintconfig.patch, 1.4, 1.5 linux-2.6-compile-fixes.patch, 1.59, 1.60 linux-2.6-crash-driver.patch, 1.1, 1.2 linux-2.6-crashdump-common.patch, 1.14, 1.15 linux-2.6-devmem.patch, 1.5, 1.6 linux-2.6-execshield.patch, 1.15, 1.16 upstream, 1.306, 1.307 linux-2.6-NFSD-writes-shouldnt-clobber-utimes.patch, 1.1, NONE linux-2.6-audit-new-msg-types.patch, 1.1, NONE linux-2.6-debug-reference-discarded-return-result.patch, 1.1, NONE linux-2.6-debug-slab-leaks.patch, 1.3, NONE linux-2.6-pwc-powerup-by-default.patch, 1.1, NONE linux-2.6-x86-tune-p4.patch, 1.3, NONE patch-2.6.16-git9.bz2.sign, 1.1, NONE Message-ID: <200603260013.k2Q0Dfb8027304@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv27280 Modified Files: kernel-2.6.spec linux-2.6-build-nonintconfig.patch linux-2.6-compile-fixes.patch linux-2.6-crash-driver.patch linux-2.6-crashdump-common.patch linux-2.6-devmem.patch linux-2.6-execshield.patch upstream Added Files: linux-2.6-x86-tune-generic.patch patch-2.6.16-git10.bz2 patch-2.6.16-git10.bz2.sign Removed Files: linux-2.6-NFSD-writes-shouldnt-clobber-utimes.patch linux-2.6-audit-new-msg-types.patch linux-2.6-debug-reference-discarded-return-result.patch linux-2.6-debug-slab-leaks.patch linux-2.6-pwc-powerup-by-default.patch linux-2.6-x86-tune-p4.patch patch-2.6.16-git9.bz2.sign Log Message: git10 linux-2.6-x86-tune-generic.patch: Makefile.cpu | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE linux-2.6-x86-tune-generic.patch --- --- linux-2.6.15/arch/i386/Makefile.cpu~ 2006-01-09 11:39:04.000000000 -0500 +++ linux-2.6.15/arch/i386/Makefile.cpu 2006-01-09 11:39:36.000000000 -0500 @@ -15,7 +15,7 @@ cflags-$(CONFIG_M486) += -march=i486 cflags-$(CONFIG_M586) += -march=i586 cflags-$(CONFIG_M586TSC) += -march=i586 cflags-$(CONFIG_M586MMX) += -march=pentium-mmx -cflags-$(CONFIG_M686) += -march=i686 +cflags-$(CONFIG_M686) += -march=i686 $(call tune,generic) cflags-$(CONFIG_MPENTIUMII) += -march=i686 $(call tune,pentium2) cflags-$(CONFIG_MPENTIUMIII) += -march=i686 $(call tune,pentium3) cflags-$(CONFIG_MPENTIUMM) += -march=i686 $(call tune,pentium3) --- NEW FILE patch-2.6.16-git10.bz2 --- BZh91AY&SYbQO*?????????????????? 6????????>? ?< { RQ_{??x??]?ub?=b?? ??7?;???n??????n#??[J??M?}??w? ??  ,?????????E??0& C???ZI?????@RQ%P4ADP?vM,? C?d???)9??To?????DS\ m?%r?()? @D,a`?X????!?^k?n???q]R??]0*?f?O????U0???Z?,K??lJ[3?r???? ??B?,???4?29WSJ??"""%%?UQUU????k?.?,U?_???G?R??e?C\?#?U?????:2#??????r???????/???S?????M?E?}:|?b??F??????? (??m?{7Xsmi???Jw?z?9d???}??3???U?.g?n??Z????o???B??T????Q??Kk?V???????sb GRW-?Z?`?t?]??2??5?UU???L?m??jeQ???e??gPKm\????[[b?[???&nL??)??0?YX???????(eh?h?0s$?HJ?1?Qf????????k???M???#%?y?? !?`???[????j????R`,?e?%B???NZ??,6??jX~?~\|??Fc?(S!)PH??E4??????[?B?A) ?? ?s&??JX??(k?G?qlb:?QF K!l,R?*Q????s )M`iZ ??"EFA?Z?6LT,?`??X??@t???)O?????t??k)C~??){?z???R?a? ?? ?????????g|?u????????F!?????W?{/?Xf~?v?~?j?d\E????b? }|??@???`?f|?? ??? w?P???0v??s !D5M?Z???????i??^??XyuP?g??X#?UH???o?a?4?+??.0?V? _E???q?J?j??H1?????5zq)?????&%????Ex?5?oI?|?D?????O?>??k?Nm??X%? #????7?  (?8UUVr??8*L??j{w??l??pv??|??.??l?G???*??s?.??EhF??#miLQ?U??u2Q?v?T??6?%De??.?S:?R9q??:T)??????2+h????.??Z8E 77?Q??25n??V??k?E??dt ?lc?a????%M????G4????;??s0^?3 ????m?ZY??V??5??,`?.???E???J?u\?P43?{y??? r??v.??}????UUUV????KV??UZ??A? ?F?B?p?%8? S2T)?K????j,?E?*@E2AH`?& \?? ??A at T???TTUv? ??YZ?J]Mn&@,?C0???&???wC??:=`Q???sQ?^???hI?XE?H????`??n???ZE?ZC?o?su(~?????V?Y[IOW ??????+g)qK???v ?ri?J???7D??5*???Z?%?9???f??i?[?????;??g?????V?#-a????????10^??M?a2?b????. 7c?`????]BX? hL?a??iVV0?rI?D????j.?D?6!e?KiPX?p??]H?M??~f???zf?m??-?G??n?????d S?Hb??r??????nU%?"?Zb???^???????K???0??(?8P??P??5mI(?? T???a!Q???`??ADV???? ?e?ly???B?J?a??(?aFw7??{????xcf???tQ?'7?????????,si_???[ ????~??A@????W?????t?C=K????P??????f?(?d?6.X?U???_?M????>??yo??????%;;)??Z?????j???]s???????S?????????W????-*k?E?uP?v????,3?Y?F/y???x ???u???6:???{?l?xlY??f??$??xv?'e?$? ??(w?b???W?@?;?7?9?a?E???n1?????5ZkD???t?HBo+????$?\????_??Mk???I(q?vh=^?wN??????????L^??4???G??T??M??7?j??g?????#?mA#?'?}w?~o?qK???:?7??5Pb? ?.f4I???q9?1??q^0?WT,(?9Pg;?Q???? ?hd?V?M????>??"?g?????W????4f?w?????~?(q??-.?l??%?????????%g?????j?m??{:?????aT?y?/???U?o/T=J?P?j?????[??{?????J?9?O??>e?h:?zE??{W?????e?G???u??????=??????O?ddsU????>s3???X~?$%??V???HF?s?/U14(3?$?\??3???JZ?"????? H??v?d????????! ????x9????[?>Og??-{2 10?z7?*??aE??M{??9`??=Z?>?0T?-'???%t??ML?T_?w}??$:?u*H??R??????????1t?Uf???????? ?M?F?}yAM= ?r&z???$?j1??????/??N??O??*?????????)?:z??Sj?????_)???+?????n???M!??@?4?/k???????j???Y)F??u?B?e???8S???(?{?????8??????muu??lx?_#?{+?(??U??]?????????N?_?mla"i(???T$???a???????????t??K?+???|??~??$?^pDQS_????? ???d?+8y??ded??K??T??.^?????x????{?h?????t;??>?-?~t?@^?N2G?^R>_?*???s8p??~?f?I??4?%HJ???D??A?"e?????/?X?{???o??y,!.?!?n????&?$J?L|?H 4?{cw???;u?C???@?4?z[?J9S]???C ?U?#???l???,???'R???????Ah???'?????????R??[k??O??L?2 ??7u??|g? ?C l?D???F!?\9|???????}z?????\|??Qo|??????z??w??)U??\???A?DI??????O????~???????q???T?/???R?W/o???P??[??i"?g?????Ug5g(?????Y??????%?G?O??? ????}_??#?4??(<]P???^^??OIh?:???T?O??k?????}?????M?u?`??qi?_d??5?????{U???|?O?^?e??.????k?????}]??:?~ZN???^?3??Y ????????>?nS??}#???o????&?\?????????R?X???????????c"K,?s????IKNfPQ?w#?:q????????=??????R?????ml\???*???z??4?h??????.O??????7???????d??8????"F??????2?xQc??? Y ??m???T*@?,?????K&)\??s?,AJ??????s#??`?~?? 0??R?Y????????wx?gON?&~= P???!?WV????eC?????Y???.??????????VCx?c?n?s?M?mx?d???????H????;m????N?2??}??1?????????X????K?W}G???I???SL?q.%*xxX?Z5????????\??????N??%B?^?4n?|?)N ??:?uc 63???~?ph&L???? ?0A?R??i??{ ??="?==?r?? p>-{Q?K?????Z!???2:Gf?c??av????]???:KR/?$A#^+?:hq??(>I?I??Lc????=;?r|??????fV???????YW???Ti???6??K?Jrh\C????$%X?%7?????[?? 1?S?j"????\&??X???????t???O????N{????P???B?????+?7I??|(?Y????l?g6??TX?????Q}'?????G?k?J????????B???V!?d?G???#N?W???????z}=???J?kE?+=???$?hwgU?,???????:JIJ?b?6???=u8G?P=S?3????M??=??;??L??eb???Z????E?|+|5?1c7?$\?h??P??PA?a9?;??t_??V???OT????z?;??Ma??ty?????9j?o?????e???]?e[??UF????E=???,??C???p??@????t?L??H??w????#???o?????:??k?????mT@???J???d?????^??tx!_?h?#&??{?h ?UO???????%> `?k{ ?$d?k??T?ET?,??j?????U5Jy??k~O?K???????,M????vz??9?9? @???\??V??R??EP?]k??Uo2??7*????N%?????%????O???T??GG??????? F??F[|S??]???nP?T# [B????*?????c??`HR?$BL J|????(b?CFf?a??????*?`??`?f??x?Pn?S?+????k;j?;:g?d????????????g??l??????gT?7??G4 %5?;?????f?]????hHX?????????t??????MT8O??`???V ?R?z????T5m ?????????]????? ?J??P?%De??4I?????S?;'?Wp????B????"???????WL2?v?66^VH.kT??+T?????N????fYeA?VPk??Uy?Y????[?m?j??t~N ????m?y;7?????UUUUUSY?X@???????O??w)i|`?/JtDX ?a????r?bk?+pR???g?r?G????B?WcB9??1?n?Jv???q?:?O ??G ?????~???S??l?/_??S???iS6?????c??>?2??M???-???{? ?m???e"??a?-??A@?[a`?K?-jW?V?7??^????K??I????q>??i?~??Ks????9???EyC9OE????`??rn????n?-}.z???wO8XzJ??w??t?vTI?gM??4?qLp??*k??z?&???K??\? ?^ah????}??n?;?P??y??????M]?????????8?8;a??????? B?X???d??%H???Ru?W%?????Kj|?????S?ox@???C?w?????G]m?*n?F??S??6?t?_?F$^????iG'????zV????h{g??????j?_??`?=d6???? ?????4s ? ?????!w??*?O?);? ??"??? ]? ?K?F?>?????1???G??``????L? ??R? ???p?(W??t?P?a)?6?b?????e?4??\bx_???s?W???wu???;???]?<?? ?=?#????|c,?*??~8d?`???uE???C?!yd??x????oM ?????t3??rn^????:? ?A???]2?f??G?uRa ?=?????}?????9???~??????X?t]?S??f?W???Ju,?.?U???[?????[QMX.??w?c?????f??????????????????O?+LXd%o?YH??0?kg?)D"???Ns?2#(?? -??%=??(????=y??g??Y\D??(??'??2X?Q?JQDG??IB????M?> ?q$? ?f(?? 3c,?V-,,x?MOP??r?h??%TM?? ???c???m?V- ?r(9W$????]l???"? ?:?k?T$rHz7?%?#???? ?_>????=?K?r'?z1????L?_?s????y???UT? !???&R???5???"??S??W??~`??M>?o??????dz????+???>j??h>nU?-????????'?????]??^/???qw:? ?<\???6m??|???f?]?d??H;???4?????S?? L ???zD,B@??gU????o?9<_?????8??D?m/??o?0???7>???)JZ*?Z8?=? ??j?S#P???V????o/??t??_?`??x|?U???o??BI???:?y;??m?7?(v?'d?I O??n#Y??Q????]E??T?O??|?:?)? ?b?&b?1?W???|8?B?M??A?QT?? ??k???.?>?O??'d?(?gL????O*?]wO, ??XQ?I????\?4???C??????]c??p(G??O?t???????? ??g9\?QL?????9w1:?#?g?u?W:cFRk??????1v at Q??T?g?|?dr??G?&?:f????/~?????? ????oT?j??c???1O?FUh??C???Lo???????{????~?|*?S???w???X??,?e??r??=??R?1l?@EC???l?K5\?.??%;!??c??d;?[??? ??????n???6x~????s???b?*??? 9SNl?o???2lQ6??????'&????'v:?Rz????D?y???/?c???????T?????????wG???ymnv?FU?YE_Fu??????'5?9????/??|???6??Y??????#TV7????_^%??y?+.??6??????NM????E ??????wK0???<^?U??Z?C?z?????????>??????-?r??{????P)????|????ZX3??? ??;&????} P?F? ??rX?ro er????3???b??&*t????U@???_g^I???D???"'?K?4? ?p?P????r???Sjt?? ??JA?H6 ??JH%?+T?A*A8 ???D??MA*~?LO??tM+?M&?q$?+y???????M??E?R?H?D?? ??4?H? ?I+$&%?I RI $?? BJ`? ??CA,&$?I?bJ?$?T?`???4??HJ??I$???R?5 +RD?)?? $?HM& I?bUD??2?a 2BBI&$ &$?&b?????$???I$?(? ?"Q*T??J"R ? C ?$???RJ??Bf ????8???`$0??&HPae`???GI*>???J????1'$S%I$?Q???>??I ?s$?!?HRN??? ?H?X+?C?= ?7&V?2D???#W????3??&??1???(T?????W? K?~??^ ??gR??0?N?@?PD?.T~?w?????????m?~????????\???ur?????|% ?RH?A??=8;???A????j??U???t<&C???P`P???????{d1??S?[?@???u?:?? k?(???yJ?j?????????J?}>{???w???+????\?b??$?bcI0??D?E 8?_?T?Z]??G??]?`?{T?WiH?@?n?>??????>?t,??I%'?g??????}}?FT=?B?R???u??d?~B??)??????x???J??q?YWt??r?MLA???r ??UaY}???~?LZ?G??N?????cCw???.}U?$"L??5?0G}?/ ???:????????Y??????[V8b>?^??i?{??T?:I??b???j?????J???S??????u5?Ogtjs?e=D?M???t?R????????T????!????\m.{? ???5YH???5?????E?=??{Y(lgd? ,??hO?J??J???????.???v?|?A?xr??n??????!x??? ??????l?(?I????HXJR???u??M??u.?????????U?d???? ?o?om?Q=???S?F?0|?F?nG?is?8Wc?W???J?KuB??E???E?X0?m???m-?mS???&?"??d?U?Lk\3?\???}?4T????????6???;-rE?\_ju??0?|o?e\??*??f?] ?]2??g?h?U_???Z?????&7????(==sR/_?C????H?/?x?u???Fkw???nc??????U#?> ??L??r????z??_??_4?F???????????-d?X?eZ?>?9|??79?????w>?34???'???]?Z???????|??K????H|?6????v[????|?SC?S???B7??Q???2?U9?J???w;?????s??:t8??E?Z???t9????r???[?(tp?}???sQ?nj+?|??[:???bCgBk??MQ=?l)w?I????(X?K?u0????>??????B?-??. vL?x? ????u???X]??>?y??????]??:?o?b???v?E?W/????>l?v??{?6l?????A`?(??t ??-?????;!#g}??[????gx4W????s?W3vsM??Nu|H?P??{?)z??????????Z?,??bK;B???y?EG??E4??? ??? ?[?+??|^?n? ?la?!??$?"P?^?u????] t.???+_?u????U\\e??U.S???tQ???jZ?8X????? FK(g?N??y?Z??u?{*kj/?m?/\??|?rzs??x?????J^??\??????B?5?m??l???(0????&????B????]?????X??????v????????T???yO???_???_???????????O???(&????X??????NX????H?|??????t???H?4#Z @?3?d @?G?KM?>KY6???X%??D?? ?????l???e?Y-?Q ??????t?M"??m$@7A??9?T???B???a??]???F???????B*?0?+ U??d?q?X?/???????Q?!?%?????)???8???9???????uM?????S?e????-r?M??O??^?{?U?j?????_^?x??????^o|?w?H? . ???? ?h)4??C?????A???8ox???B??V?d?&+q [??p?`(????g f?????????b y? ;??)Qf ?N??F2???? =t???|~?? ??E?}O????We???,? N????4????.???t!$?????}'??x `?;??? ????a?K"??p???]????OV?4?? ' 7?sI????M? ????:\??????w????_???????b?%D??"/???!?U?????(?-"QZ???????????????nz??& "J???????{x? =~?????J???f???l??yC?~?y??D?m?*;?? ???&???$ ?x?m)?hP I?q???????R?~????????V?h#?Nv?.?x???g??V~w?,?????c{?.|????????%m??6??~;f??/q?:????/N??G???^#D?>???$????o????g????U??* U?i?????d???w?Z?rz???/?*??n!O??c??FS@?2?FAN???7mS|????"}'??{?Us???( ????RTh?>?H?e??x?C??J?K??????zMo?N?=W??b:F?;?,???:$J^!-???????????Z?kvo+}v???['b?I?Px? ???IG??qg?\??&>??o? ?0k??5??q?f[o??B?????,?8?X2%???3??T?[5?A???H?Sw? ????6?0??&b0P?-.?????QB?#????-"?*.?DVi???C??m?#o???`???0??S5??e?????!F.?n??!7pz-PG,??v?{??i???@? }???????C ?Pu" ???D??????k???? )? ?????[?;?UV????y??U?????c??????????r?D???? ??Zv(?;?0n??{8??b?X?+?}[?F??\?z?b???3?P]?-(J??H????????\=c?_?O?}?vL(?z????H%???????????,>? ?i???{???Q#??d????s}j??^Uv???s????Mb?:?*R"?|^}??_?q?'?cM ?:?? ??|R?<n???????)?_???k????C?????u??? `???)TD??%?)????u?????????>y?tU?????n?????T??%?r?n?k???s??3'????V??*|5h???_?I?; ~L7?????h??m??".?????Z??id?? ?z#(????????/3]?+????=PP? ?H`5R? = ?-2?= ??4Sv?d=lH?j\?]~(?A@?P??P(???D?jA9Qz ?6???_?e??????B??'_?UF???j???S?p C?~8?Dd?-???0),?Eq?Q??9????!C"?2qQ?.?Q_,~?$?Ewo??0???9??????ez8??w3?+m?t$o?sj?????E?p?X=^.t:j???+??)Z???.]??~?%?jS?*????%???-??m??nkUU?m-???DTm ?~n?$?HE?D????=???!w???M? DJ?? ??-??P?YF??8?(?Sh?m-O?O?s?? |?\#??)5w??u?}l?A+?>?%(?*-?c?5i??B?j?o????;pY? `Q??K?Y???S=??m?$?k?l&)???gy?q?}?????-???O;{?? ??2?6S0Ml?E-h???????jm??|???yn?????N?=z?Tuv@???G?!????F?~NZ???%[2? GU?C??C??E?hS)?????M* x+?MG???5??? ????~?????z???{??^????????{?g???????? &^tO???????S.??r??????'?(8???!?M???x~????7??????(?Y?s???*??45?2?c?????4?n????'?iO??/??~??_??z??G?=??> ?Z????1?????&???2P<2I??[j1H?_???k????a??6(PB????-?????L??%*?,?6MWd~??2?~?>??/?xY:;???z_Ji?e??$?????E????v??????\?C tC? ??????e!??gc?Qz?T[V????J?$?????4??? C~4%u?$?T ??o???T??R??pr??0?r??X#?k?????????j???LZ,?? C 2?i???(j"?-?mN?t??V???o?WV?{?I????z???5)??Dr??G?x?????Z??E? ?PTh??????? ??e?m??_?LI??R]?d,L??yl????? ?s?t?{?c&??L?b??0;0t???p~????7'r?Y,?yynLnOY???AF?????%?@??o????a????@j9??Q?I?[????vRI"???~ _?????d?Z6^???~#1?????<$?????n ?A??c?[???2? | ??~C????Ggs?Y?????????Xu?I??4$??Wn?Y??t?y?,?!????q??????OUv?dLD??q??? ?K????\???a8??F/????c??g????ylm?????????<*?j`????Xc(?????I $N??(???Oxs6e??P?????9XT?Jx???1}????'?{??oo?????/m4P???w??[????t?z????'??,,?lN??? ??~?????4xR?!a??3????????=????z5>???s?5?2??cs? ?????"Hn??O?~+?_=k???;?^??dR?????????}/?;?z?~??? Q4??J!?G.P????(??????????(??M?+?0Ll9?.?Ga$SI?_?8w?J?????:?Cw???QB?????T?/??C??X?!?~@???Q????.?P??TG?`Y?/?????,?q_?4????M+?tk??9K??l?????xd?!??? '?E ?~??x??(p??k*V%jw:?Y[P8m???t??m?p??}??C??! %Z9i??.???8???%j???'?D??pu???????U??x3?f??B?-/?B?W?x5?F??o?????????????:????H?$H????[J ?D?}??? #4&'?????g=?L1?<8??i$?? a???0X?k??W????????a?@G;3O?0T?"8???????,?J????/????0????fAAD?@4LDMH?3[????mXP?@%$@g?????????u?&???v?0jd???G2???_??/l?Gv?+??< }?2-}K?`??(T=K??1??'?w?ay??<i??F?/9??(?\??G?nwz/)???F???K;8??gy??J?c?x???p|C?)?~??O???KA/??RP`??->??J(U*?b[D)n] ?{.R?B*?,`?=? ?HAR (2??x?FN???[^? n???*??M?????:?X? ??r_?:??u?C=Y?ju[`;?W?????????- ?:???????5[-U]7:}?p????7???w~[???|?W?P?4v?????/???????{Ox????s????_|?g???\?7?m??u?X??i?????%??;N{??l?]??w?fx??G~?=.?????[?v? ?O???jv???]?=??w?k?{?????:]????????S??~s??y?????F?;c?s??z|?z?r%??~n_?o??p?G?|???????t}fz9?Rz??'=???' 9???{2m?a??m7K??~?-???\?tu??i@8b??????????????H??8????)?D??)?Up=??l?JL??6?R\??J;??:??? 4*??U?v)?+_?{???? ??J?"?(*?? ?????#?~???O=?g?o?v?D???6zW?'??%????????(0?*d?U3? ??"????I???`?S9G???:??`??e????????d?"(??q??k?GA?I???.f. ??\?8?(1?~>?/O?j?F?Rz??LR???SC???E??1??909<?? H?????v???  @+}?Ui??????=Eq??@???????t?]3??4 ??N4????Ak\?2pn????z???{n???f9e?=?;??1?I???@ ND?fpx?0? r?-&%???W? ???. ??ket= Q?T??%?:?#Qk5????ii???T\(??????v%?? #????B??!??p?`???#?????R?0?'?-?R?OQ?* F?????Kl?O]??t??)????\??beiR?(??9????mJR??eW H? ?wuCJ?[Y?<)?9CYD"????1^??Cu?>?]???????aD??T ?I???r????????^????}?FEDb??N262???P?Q?[4????????9????8=<44?B"???h?w? ?eaI??? -Z??B?(L?2?B6? ?P? , f?` &C*?? `????"???*Q?? ????2??`"9?1w??????(?@jB? ?MB?i? WI?.J+?X?*???I0L@? (l? ??\ ? ??????UUUUUPEV)? \?5?5 ???? 2?DL?U????IL11??30\?@M@!?p0???l?+k ????d????/Sh?=?????H?)wK??,?G?????ui?k?????????/]? ???????j[????ck %?(?b?QRA??T?a??y(.??1?0??_O??e??=?CLX???t|7&?f{G???/???v?P({?qQ{?????e ???????;??#???D?>???$OM??3m???l???????C?v`e??`???d?$?C??`???$??? AGA'T??Z'?8d ??]?D????i?P?dw?I???}???:??PD????b?@J g??JT?~????T??n?@??? ??QS??U?)? SxU?????4??x??\? M?C??o4-(??m??{?????*}_?=?8?????????r5?~o*t??)?I?? ???? o?uzC?????????y??O y??G????)?OHy ??????#???C?.?o5????5GK????'n <8v?Gc?y??~ ??(?X [ ?l??"xVF?N???j??????-g???9???#???2L8m^(QE:?5|<=D??~???h@?????Q9??l"l8?T????q?+8??Vh.F?XRx?????<'????j?y*3?EK?r??E??4?????M???>?ff\F1DN??7???=LH 7?????R?O;?9?UE?Xf0??X???????~?o???) ????G?k?\??;??????U????q???|???t?%>?? |!#[VY?5??\}n??)??????^??? ?_5???3?hMn????~*?O?1?Zwh4??"????????[3?????|P??[?)??_Y?*???????)t????UUT?????uh?0"7I???p?q:{?|4?,?????????D????6??9???V[^?UE ?T?o;U??YFz?*?&?}[K?u2??hUQQ)O?=~??? ?w?d???E??J+D?????v??-:?? >:?????M?"t?{?/@?5V???:?????(??o3c?6=g?t??????R*#???,H'??DQJPC(aY?+V8?|?lN[5?`3}?t>? ?`u?????? }"?i??Z??.=????#??s4?+??2EO??o?P??\??? od??X%3U????AU?q`????y??N?iU??Q5?j;??Qvb????h???TzU?Y`??g???dH??4????Y??Ds?M?[_?n?L??:?????!Q?  ?????R?$s{?Sw (A????]_?r???2/??O5??Y??`+???D?)?t2??!p?h?g?h???8?i?T???t??y ??8!? ???GW41?j?(??? =]??e?Jw?|? ?s 9U[????1?W?|?? ?$&i????:(6?NI?????7Z#?*??x????rMP?[:?w??~?UG?????Z?%(??)w???Y??* ????\?5???k?2?E? ]?pw????@????oO-?qx????z?f???gM?g,????_??????D- ???xzo??^?jD?[???????==E4????J??????c??^?=??=????x?[ ?Fx??????R?m?(??!D??3Nc?-3[ ?h:B?L??u[??e?L???????M?RZ?)^z7ZY???8?A#2????I#'???????\J=?)??aP??A?XY?c?L?n& ?w????f8??Y???v?%???{??:A?_???X%iT?~NeH?nB??"?{ .??N???Nd`?2??EQK:y????~??x??Q??dS?I??|?4?\?>?? ???Y?zG6|fk????????K?Tdo?v?R?2??@??OM??u8c? ?&h-wxj??M????y???2?z??N?l?? ??TVn??q??6???I9??-? ?&?C}qv2r?9?@??|?g?=?J???)M?G?T????>???? ?}P?c?-Q???/????.s?D?5J????CJ?D?r???qn?I??-?-?X???N-?'?*??oQ/???F?????LO"o9v?2?????,?q/?gWx??|~????=)%????V??????O??`?[???\2?0q?C????Q???????-?X?d???{??g??t?J:???9?g?? O?????3?4?3?????c?h7_???&?5???????m?u?[?Z?v????[ts?n? ???????Mne???y5h????F???G???[???9]??@?A)Z??:B??"X?!???C??9??????????????????????????????????*?????*???????????5UUUUUR?UUUUT????????????????????????????????*?????????????????????????????????????????????????????????????????*??I$??iG]$ >????o?????j?HQH??K???G?5A?zn??=Z?7?Y?r$??h???5O?????_??/T?^?L??Ah????5?r??A?:?Nj?v?A?????9C*)-#???J???t??'??t?+??`?????w??9?:?c7?Kl?j?zG???H?'?/??????W?K?<???*?^??3=?%?M??X[K??;":7??Y?z?7????y?Q!^? 1??:???f??T???L?_?3??E.s???????@u?:h?k??????TUQ??????_????$??????Q)R??C?8?q???P??_????q%T?V??9??c??????????????V?????N?71?z?????5O???>:?r?=?5?|??=??????W?D(?????x??/?Sd??b??t?+?4?G?%?N_???X?dN?_UtK???&?S???1m????n????Bl??g????? ???]?G??M??b?k,q???G?yV???????????????O?G????!w????vX??/y\A(0/mP?????w??X???R`Q_??M??7?I;9?A???-#?????????????G??? ??~?_?? ?=8?H"r????/?p?.2D?I?OT]?+???????7? ?????Z?c????")?/v)4???P?Q???33?'>y?s???o]?_?w[????l?o?Z??*??eUUUW?W??_ ?\???~j?UUEUUUUUU?y??n????t?????????,?UU???y?-??U.UU]X*?^????U\???UUUU^/????9??! ???m?????E????^q???]?? ?&EQt???p8j ?`?o?c(?1'?y)(??T??I?zQO???VIWV?n???J?@?M?y?c???C?2[??m??;??iE??#?_???T???A???wW??y??Fz3%49!]F ;?S?(?? ??C?)i????#\???h=??ZY??????Vz[(?? ??UFf??/[??????8???(9?9??|?QVJ@??KTv??x???????????W,'???D??????h??y???????Ht?b??? ??O???{??????S????H?@?&`??!??n? ?t????S?T???J??? ???????z[t??z?$?????????k??QTC|G0dM?1???bv???q?'8??da?=???=??? ?R??e???\ H??7??h)????x*(??R?7#_???? P?Y3??r_O,O:A0??iyC?l=}??:??}x.???g8?-???????G $}L????E?p?TR?L]?/?? ?'?x?3P?MJ?=??S?E????"bjr?2???G??GIWQ???X? Jks?e?M??R?n??Q??)??E!Tak?A!~/??????(???${? ???????S???g?;?"??/6,?'??(????8s'??`?1?????|??:>???=?!Nl????k?8k+?7?{pSSg??P}?? ???O?yJ??q[%DrS?????QS??S???1*&?'%e ?????v??>??L??&QAZ? ???o??0??EdBg-?MB???????4$?$/?A??P?O}??jt??8j?z?}?G??>(B????G??gu??mF??V?????eV??fr???????'??m1??y:?;???7^n(=?;o?z??$???"?z??T?P? ?{R?_??y??N? x?:?G?Uz???h?j??>?ES?f[(Z4?ge\?)?}?6Y???%?8???>??y1i??????&{??t" xxO???? ?T?~???B9.????T??5?q???Jy?r???N?A9j5????~???h????=a?W?Qx:?D?? ??{??L?O?????G?m???8??N???UZ?G?Zt?J|/?????;*??ZL??I????H9??X?l?a?c?\:!??\??p????A????G???q'???????|??????(?? ??p?3?=?X???;K???????f?A?J&;B$??j/??-?%Q??#?&???,???$?V! ???"=SJ?Rx???:=a2N?#??(f9}l??(?LM ?eD??? ??| ?????w=EC?????c5?~??}?????F?W??*|??t?2(? S??0+??????-0P&??-?? ?`????<2?to?)?8???sC?????J??EGa#*? 4???B???5??Z?;XH at B???D?????l$~?n??@??????????u??q???8$}???????b?-???????s ???b?\?;??V?;?????UN?_??????V?y?H?S8#?(?$?(B?(B?4R?(R?(E??f+???P+- ?[???h'8?u???;?j4.?????K?y??^?????]P?!??~F6????q?a?[Wu???H???AH?r?L\???????a????"?7???!??{bT?????B????? ?;8?=A?#???R?Q?k??G})h???78E\??_?/??? ?U????????I?S??????A???&??f3FM4?D??? n?Y ??S??g?HS-Z?????q}j????-???Q6???)c????T8???C???s??4??=?l??K??:????F|t??h?'(?B?U6 A? ?8??v??(?~?? crR?'?OG;h????J?c??`???6f?;?` L??0y??`9????Q?s?&??]~??????#<(?Y??? ??L??(????:P(F???x? ???P?!??2[???m?5????????~?z???*????| ?zjw??H n????????Q??}???????D??I1?x???w???9?^???I?yK?zS]?T?0?c?h??U????????j?u,?R+?p??hV]UF????<?????Gg?3wZ?2?? 2?^0]?p???FD??????????o DH}?E??i?????Q?*M?Z9?X???????I??w9??58]x?? E2?u??-\{1?h?$?????_?_9?A ?????^-M{?, ??? ?F??re?z???N??R?F)????+q??( M,????n??????\?<2??G??K1_?????i??c??Q??jx?d????? L? .??f??rgQt?4?hs/??_}F?;??H?m ?j(? ? =?????m???v;???;??e ????b7???Gjx7?Y??s??????u??j}~O??????*??~ ?FH`????X+?6?????N4Vz?ufBH?j\5 `???????H?? =??d????%O&7>hTF?IG?dq'cvR?*qq ?J?t??/O??e;??G?j?cq??6@?I ???????m?t??S~,vn?'G??p3?*S???k??W?? ?-??X??P???G=/k?????????hkR-M?B?J:\A;???[?WI?.jp?'=,???+?iRD*%?N1?M???XWJI?T?????y?X1X?????Y?&??o ???{?(?? ?????\?"|?????\6c?_??I???v????????s???????T+SB???? ??%??|??|??h?B`J??U>y)f?P??,??f??-????y?6w?7?H??X?>??m"??>>'??>+?i%???????'????A??p\?D4?Ea{re?????M???"E:????Y???:' ?_???EX?J??p???????W??`?+????6????????|?]?????"????>r????g???uH?i"?I??m4??:??I?L??2?.??J)???a?#??????t?? ?%??J???.????8?2?V????d?j??aG??Q ???`W???_?JUM?`??????-?fjPf???@?L}?D ?????%(?? 21?K???}??JA??B?dD??vR? B?@?+a?Cm???kF5??????????t ?qOZ???c????K??????&L?????t?? 0??M??O?z?;[? ?8?_ _pQ?a?5m>?o@;>J?c?#?M~?q0??\0!??1?O]A??Y?h???t(???!???f????8t?Z]%?`??S&?x:FE^??5;??J?i?|T??]??_:?N??U??j^????a???V???W?>?uy?????????)@K????_2?????iZj? h???%=??|f?x0??4?/?^?.p???-?U????u??_?^?q ?{?\L8????w? jp?dF???W??=?Z?#?????r??r?KUs??jR??3??o????????W&#?Xa?_???-)EHP?72l??????t??]?Q?L?3(N?fe?????In&???v?????q?fj??z?v&??j"??r???? ??Z??*??|?#??>??#?A??????=Ni?Vn|D?4a* ???n ?E(7+'~?M?&]?\?)?FE8(???8/??j?{9??u???????? ???b????i?W`)?q????Za??!???XTVD\?"??+(V_????v:??????n< (??Q?C??f^O?n????*u?j?}??X?%????-?????Q\??? ?%Y#?5\*?D?A????d?)?&?a?Ap)??E?z??8 #???a?0??s?k?*??h?R?e?y?S~?G?1????R???k??=?s?jz???\?p?<_{?x?#?Z???z??????????9:???,mm?????T?W>??,@???g?&??~uYy?????T??H?SC???m??hHOym???) T8sPRL?s%v????+???um???-?zh?I???I9'4????qORv???e;??N??O?N?{??T?L?R&?????nJN)??:$?qJ??NI?a4???????8'??'?L???M?D?N)~m?niT?N??N^????????&????)??D??y?'?D?L ?dy'zX?&??M???T?j?8?dt?)?????O"???????OQf|pq????q??r??&??+~???:?T??\?C?X l+=??O?i?(mu???:?,?7??&??QE??i8????|???G???????&V?E?H???QWF?'I??y/?[??`f?????O?O(???&?=???tqw???~??Z????????f?XwQ?????bI????N????????|??<?7?X;7???[~n????????pFt?-?R*? W!>6?UxQm_+?\)???????W#8(@l?G? 94?!@VF?j"??i")i??zc?,X??mnx?(???O)???f???????%????yb?2??dGzCJ?W?"O?rQ&J????i???Ht?8'?9?s ?Y??"JK??????I????h3 ?@?7??:?????z?qL?7=??C?A??C???m?????????q???????DiW??d?=?V???Z???2??? N7?%?"?J /????????o?NK?rQ?c???Dl/?l?-??!???????X8?? ?5M' ??r@????????;\??HP?h???A?!|??!t-f???IP`?*??S???'???"I)$?/3?G??*??F0U????\??g?p???????x<@h????6S?y?xY?????????d ?t? ?B?j?M??c??PU?P???,l?C?,./???l??".:x?w|??WO??o??XD?l????X???????$??????]p????/-?h??Z??.8]xv?_????9??????!/?pJ??G/!f???_U?A???????T)??*????)?$n?c???gg :#???a-gb?D%?J???s?????N??,KE?MFAW???2???[??M?Sy?? z???a??4(D,v???s%J&??????P?X???3j)???_q?O"??_s?L???QN?c.?????H???h???t?zw??b????t??^?w????????p????}??_?[w?:?????oSA?d?i??Bl?=??\?@.X!?k ?[6l????Q??$< I????[?????+?hY??? M?F?8??e??x|?;?k?v?? ]?,U?`?^?? ???=?Y?u????[t9??O?I???????~??Z?~w?2????]????" ?? S???????? ? ??????N?~??????`?1@?ZU?????Z\???N?p??;???D???B+?? /?????s??.??x???=??Q-_U_?C?????.???`???^*?(%,MSI?L?y??????????~cX??-?j???F?? 9?$BH?????S???_??L??r?d????MT????x?c?v?5neH~>g???M?Fn|~??YK?)??+?"??`s?%rB?C????;?h?2TJ???%B???Y?k??Wd????*I??$???T??hl6??????^t? La??wz?q???'?e??~{=7?????l??jZ~ xVZm??~2jQ???B?????15??@????R????$(?~{???????$??y??\LF?v^Z ??s???????J?*? 9Q?w{?????mw?bsh#?=aLlk]?'?????T?S''HT?#Dx?P??^qE?*???ItG??????]??nkV????52??8???IbC?(S?^????&??l$????S???H??Y M???rkq$???r??Ve??r/?tf???(:?0YO???9????????^"??r/?????f? jG? ????dG??aev)/H%??D???s??j?f&?G??;W???5??s????W??N?O??3?????H??m d?a!????;????????5z?F?]2????FG2?O?w?????r?|K?????w^k??#???H?6?v?V?3??????????sgn?c?-*???3???w????O??gR????????#r???0?a?:?= ?2&????????????i?O"0B)?? /H?_?]`?N?Af^?Of2r???suB4??.X?4Y?US?U?????L?W??????;?^?u]e`???????N???????cnyG_?A?&????;V?????j|????#v??a?%??8??2??? /??{??-??u??PB??W?!p??Dg-?$???9I5??9gh{?8 ??dscO???ui?G?rx??A?C? [?1hDF??j????Ah?D?)???z?[?N??'???UC? x? ?=???`8D?wm??U?q?tz;??????????sq?`??M?????\????Q?+Q????bM4??h??*S?G?c??K?9??By?H)E?|\J?LZ?,5m?0q*?????s?~?q?c??@az????H?v????h?????K?????\O??A??+???u?????P??????s?%??{??fZ???_+BQX5$?E??p??????OpxPG?r?X???[=w}_-:??K???{?^%g:#????oX?? ??????.???o_???????*????0a ?W?nq|SHs??W??l????3??)??8?}[^qDyr8k??????'?m*??YU???????qg???dr??????u????iM?p??+i??XB????Toc?&??6?01?s9????s1?? ????QC54?z??.??SB??$U?#2x??????[Y?4?js???1??k?c?g?i???Ce?s???(?MF~Yj?m:?:?! ??nb??,-????d????pZ???Z???? Sw?xUYL?_?G?Q^?.?KTj????c??yxI - B??"Z??}M??????V?O]dK1?8XZ?P??A?;??n??b /???H{????(?Y q0?M??^xPa?h{?oS??O???5V\?;??.?!????.??I??*??,*????a^j??d ?)??Q?????L? ?2x?3Jp/)?????P?)"??????f??x?4?N?2??aU?^??n?y?v8???W??g5J????G??#(?I=??8o????(?To?`?B?P??E2?????*????E=?/??`??7??I????X$?[??~??7??+ ?? ??fqb9???9???j???_&???q:?????F?S?u?b????S????KGt-??I??z ?0??????~07o~???S????#?x?N??s?????0hs??#???#?????[?????BA?r???????]{???B4xk??F?i??,; ?I&C?R?v??|9?b3?I?5??b??UU?r,v????????k??????\{????~&Q?(?>?^?vP? ?x!iiJJd.h?7;B???^ =?N??*??Nv??????????g?T?;OSSb??Q?f?gV??4?????2[???5?$6&p?(?J?????????tn???}J?DgZ???}?A??????F?y?9?L?(?&s*:????"??]DRN?DW??q}>???~???b(?6?Cf8??u????K???5?Z?F?1 D2?z?A??c N*;4?BhV????qB???35?!??W?#Up*??S?z???I?5:?????m:u?G-;SX?}???>?S1;?7[9???&?V??m???fh?G!?m?[Ml?K#?:??ig?#csL?t ??Z?6 ????I_l????x?*????_??Z ?MQ ???? -?b???5??????3?XV ?#???$i]?/U??k$?cUC FH?????????m??`  ??D+d$@P?? ???j?P?,_|?sA?????k?b?il??H?y?C?N??bn??@?%s?3??=??ctB?g"/(X??- FQdJu1#?H???fzs<&y???i?s???? ?p????j4f??g?y??A???H%C.???$??.Y????E??J??????+$"??;6?s?$36???E6?)?@"??`???`???A????HwFN:?-?P?i?x???C?v1??$>!:???? ?????U?cwW??Q???ob ?F?o???? i.`e!??q& e?r??C K\??P=???&?\N!???X@?????Px?1B}??~f~?FK??a45%eL h3?????-??uB??4?m0&`?h2-G???p?a3Pv5i?aP4M J aU??r[P ? ???????A?Z?Ba??h???????1?j?j?b?H?qL??G?E/?kn????)?  U??????5g:Jw; 6?C?w?']?G?FX?O`?????V????`9?i??u0L5?c???z????? ??]??8??3:??????k??h3*????CJo??????xy^??@?$;???r??Lp? ???U??^ "_?I???? ?#?f?(???Td`4?xA6!DPIHL?r?Av???* ??!?N@??V???;?? ??a?? ???!????Z3l?pq%?@78????S??h??O?????h??tb?????? X?IQ????T????y??q??????d*??X??? ???$?e `?!??4SSP%0?0? #=??M ?hA??? P? y?HQ???QH? ????I??P???)?EA2p?D7R*??L??@;`86`M?cNUG??Bm?tw??????????Q???f???1?p???$????T?5???X?F?{?VC???p*p4S@?8?????B`H?/??c???? ???O????a)>4Z??4?hB????????{? ????M???$uy ?!@?8`q8?$?f?7j????bs??'"??i8?XJdU???g8?*?????#hm?????W ?? ? ? ?}??h???O?`?Ie??????Z?vPy??q?????(??f L?22????h????]?N}[U^??????3?4x!Ba? ? ??e???????R??9%?F^??|?? XB#??(P?W? ??J??Q?Z??JG?Rl??K49???{z??>???@????@? b?w?:?h?@??HTRXq?????&?BJW??d-???w2-)FOP? L ????qQ?D???B?>??@??%#??R?b??+*K)dP?D(????C?P??(96?$z?J??-)l^????9?"4`??L*?C???? a?8u?8??*?.T?)G?zRW??4B{s???B!??????j)?d???*0/Q?}R?????86?>C?e#???r? ?\w??!@H90??/?4K1VW?1???{3Z????$??#????G? 2?I<,???T]L?':?]?9Y4,??`z?N?I?MI?)???????? ???}}????Z???v`????+?F?QX}I?D??u????$V?f0:???Q?S? ????H(?@??%? )F??j?b?(? ?8*???B|CM??????9?U??k?????e%(a??????h?????6???dJ??K?e???????? AC. o?(?4?.AO?Ey??l?b?}??8G?H`??!?????7Kj??;?n &|:??M?bP???7lL76?6??*,YQ???E R??"??0????1?2dT?$?? ?l0?(??'???1l?L mE? ?KJ?2? ?? ?2???B!&h e?6?ZJ????I?H ??KEZ?I0AR?A"L?h?-?mclJXFDW??X??O???fb#v?'???a?:??.U?"D? ("??@??b?? [????A???W0O?S?????!???1-a?????I&!?? ,`??d?,"??C????f??cY??j?m??=???@?D?OVP%?&<{X??)xf.?0??dr?n?_?v?? ?AVP?? ??r0???LQ???Dr@?%Ls R??R?bzC?!??jC?d&??196V??d ???1?M?V z??#????6?!,?i*2???/?#???&???i3,??' T??clIh (??K,K???? ye????YEN?>:?9"2??D???h ??" j +rZL&? 0Jh)? ???^??O?u??????3???J????l0b?B???\??????$?&?X???Lv3??p?l?t^?Y?pP?&????K??1BqO?s???? ??9?Q 5??0? ??q???o?Q 5K?f?+?uS???}z??w%_?>)h?4???S<2jXH???????/???????]!??"????????????V???S???i ?cN??????^?m???!!?'q????MZ??I0?Z?$?L??????(?W?????????~??_????&?x??? ??ZeK}??????GZ???y?Lm????f$????C0?u :i?8?W?D??E?? ?L?[| ??=?O}s`?KA???xl??$??i???u@?X-Q?????z???WI??L??????k0??4???V?j????{?v?__l???_d???t? ?;?Tw?V??Lz???NN?g? ?v6*?s???UR?D???????? ?w}?????-????V??????gC[h????o?? ?gKa? ?d?C??P????TM()??C?d?wOQ?????z3???!\?f????Y?5eL=DD???ip??B ?W0?@lC=GG?\QI??b`u! w?P???????&?y_?????'?????dB? ?K?Pz>9?D?i???l?f? ???b??Tn?LA??K,?D ?$;???B?oR?1????H78A?8F$eNcAL????b?]'?v??}H ?X??"?? ?D;v3<9????,v?F6aD????O_??1~?D????}???G?H?(?,????P?S)($ ??@???B /???q0?!}R?!?UW?A5?x?DM{?Nj;?:????{???T9????Aa??g U????%a\???VpBq? ??1?og??Q???++*Z???????????q ? ?????d?MmY?RN?17l??F4[J?T?h0??2??6a??OOQ?@S???????Y?k?2A1_??E???X???~(?""????OK?N'? ???x??ghL??Jt?D0??K?ZG`??W?|]?'???f%??_??*?8t?k?cy????@?_{????Q^fT:W???????N?A &i?V" L???p???wc?c??? ?_ 7?y????pb?S??"w2 J9??????(R???g??Zi$"| ??s?U?lCu>\??_8?????(m??^??????C???B???z|;?)????bR bzZ? ???? ?D@??T?#?Q8?????SS?D q ,?i?|?D2??/??@?>|?` j$ ?????$@P-4Q0>?u??dJB ??]P?~(*~1? ?? ? P???WSH$?'??&IaH?"Q?>u0DC????????Ce?E$ ????_??g?Oa????A>b?D???W?C??@1?2??3??$ ?"C???O???????O?aK#=? >v?` WC?NCq???7??z?T???G?J4?h??HMn???*??)tZ?0|b"!????R?'??W??s?sD7???????(EU?o5,? sig`S at jR??RZQb?il?#???e%V??T qq???????I??Rc???8?'??????]?d????z?X?d??Q?DQ?9????? ??`Z?*=z?????l?&xci#??sat? ?? ?y??Awq2?s?.0??t?IUN?? ? ??dx?'?S?g??}"?"H?????:??p(?p~hw??m??a?P?a???l??>>)???!?>?e?n?el)?m???3?????}N?#????b ?????s!???V&IEP?3m???i???A?F=?(=?VfQZX?)F???'?f&.??MLD1SL???? Z??l?!0?C4??bP@?? P? I a?-?e??2R? ??X ??!????46u@???@?C?l???n??*A???????BAA4?p?????Y8I????1???u???`^?E22H?I?&??P??@"E??R9(??`Aq?x?? "?????d?? eU??? ?`r8??????|??#c!;?????b? PPD?????F$~W?|?? Yw?h7 ???&b4A????y?x`Mm6l?4A??m????6MF??h??* ???:??Fu:??????y??C&!???c-\ BP???  HQ?[4?8C?S{?p?Y?<??`?.?D?????B@?lr??heR?>??>?0c??????G1?????>{????G??p??h???5 ?#? 0?]Dk???????fS?fFC??' ??b???#?8S?=?????A??C??cFT????TS????`?F :????8D??a?N????B???;?X???=???????????A(Q??J????????b? *?????QK([)????p?| ????????S????~L? BDL6?????nP?:'\xW????U@????????%?d?????w??:?????R?q3??E?D????z?H?4?4T:?;$?e?.???0?????)?_??Y0?!C??p??aC??I?}a?? bG?k??SBKM?v0?Y??0>?(`????4????G(b????%????t?f8J?3???B&C\??0?D?-??l?;??9c????}l8)?P?mF?h??i?1 l??? ??L?; ???B?????P67???Hd???????H??Q???!???vp u?X?? ???P?w2`Eu[=?N?HX?8?4ad!??n)?????Zm?????O<??b????0?_?q ?m?????2??5AJ?* b?0?Q?]t? ?c??A?N?L???]|= ?O?!????M5(?? p{??_?? ?be???A?"Q??$4M?L??7G??>?????a?:? !H?????5t;? ???j'NO????bx+???j??6???*s-A??? ???{ ?r|??????9??|?mO?7?s??_?????!?????hD???rm&,???????|????O??H??vNR?D? UJ4 ?+B#CB% DM ??@- @4 JJB? B? ???'?|ZX?q8D?%?`?!?TJB?e=p?s`v6P1???? Jb???8???H????m?????$( ?(?J (???(????{?x?0?$ V?1|T-????? ??? [?H[???)? S?????9Y???be?f??d"t?^+?????}????M?`?PP!???l5eV ?????????_?R?f!v?%?H?:????f???7??y?:???????????^???x?? ???)??"????)-??0????`Q??1 at R????9?????%x^?l???(W????@>??????:c?N"h??HS???S?oi??`?/%???i*?? ?U??P#/????? ?2??m?@t???0????????????????@P?@ 2\? qX??-??\???S5J??\?:\?V,? ? ?+?'?uI! ????Xj????? ?hC?=??z????IX|?s?????????' ?? L'>?#??????d?>?Z8? Q?;[Z0??X?lQ11<??"?H??????iQ:??n?????~???>???5???:?O5?n?S???O????}?T?&&?*I?L}??0?!e,!ZQRvM!+ $????C??E@ff??6??G'y[?vNz?c ??????l???i?y{n??,???g|??y?5?? !F:)%?*L"????'??b+?????k???\I?K?(?7?4uhC??s8??????V???(?N?3?????E??=x??0h?q??6v?[??{???#t?q+bB,y0?V?9?)??v??$?Z??p?,.???$i?o?`((){>(=?'?H}w*mv?? ??j? ?????HR?? E? +!?`c$Y??n?E?dP??D????R?????x??~???Y[?a? :J7?'??zr??8??????????u?d?q????[?XY?]I????o[?.??0g??g???????eC ?}:?.1>4u?????=?6??=X &????????????j?????VU???sC? ??[m??9???2B???O????]??&??8?!????d????^? E#95?_?????z?y???^6??p????5Po3???&?w*?IK?rE[??E? iq???o>?m???7????uh0o?J?$????{??g6??3, ???m??m$1? ???&??/"??;~?????J?????Td)DP,Q?g?????H( ???@??qj-???? W?0?4?b?DgJ??????????K???G???3?0????x???FT?5?e??^???(?{=Uw??? !?X???~ {E???? ????$U?4?9?m????>Qf~??>??s?????{8u ?-(???b?f3?7???8?s??o?e A`??8??????:?!?? ?za?? ??.R?~?+?K??x??-???&#M???? 7u qR.? Y??_??????>g???7kcq#?A??HHe??-???k?L?x??<&????VY?=Y(c ??)j??$?(?A???8?;?????????R)????d?D,????`jI ????B? ????????4???.[?e?>;7G?b}"|??^?I?)?? ?? _V1[?Z?,9???Ho9P?8????k??/GY???`((IiS?`?%? ???}????? ?? 3N?~?@?>=???????!IC~a?Y?p9hP??(?B];???W{??WOn=????`??J%????c!??|??|?cej??0?F?N;??:?s??!S 4"q?,??V ? ?A2O?3&?D 4.?????x??S??e???? ????D???i1????t?UJfun5gP???}?????3'YU.?W:????F]?1?R??N0P?hU)??Q????8?f]? ???Z4???QY3"???1??ku???????????? K |M? _?????\?~_l?0w ?????+??O|???!!???QHC??>H????e????L(??? v????z? ? ?e'????W?C?X\???C??q?nO???H?(?? ???9?in?-?E?@m??#???W??????|H? ?&BN??N ??? E?l?E?/e??1???????4? -%??JX@? Q X[???7cA??@??? k].Umz0mWr?,? ?v D? n?OMf?:C? ?Vj?g ????h9? d ,L??`??cd??[B??z??:?????[??.2,??????k????????)?x+? ??? w??9??y?k]?????\mMi?????H*????1?R$y?;???J?^?/?bd??}??@?? ??? =??$??3?t???o&[??,??k@?^??E??9]c??s{?a?s1??r$??D??W?\?O?? ????3%??-??q;F???s?????0?gd;?L???m>U???WV?!?V8?R?bfY1?Z?????0???1??mn?3?GF?? ?_?x?U????O?J???jM????K?7? ???q C??u?fA???;?Q?? j LQ?G?! o=???7s??|?j????|??????[?}^??P?z at dXB$XDd??? ? ?_?:?F????t14$??b???J??$?b?? E?? 4???M?????$? ????0?di Y'?&`?HVb?iX????!?Vk? iP M,?J?)aK dD\??? 3??i??y`"?l??dR@$G???P"? =O?Q,#?J?????????e{??????)S?$?@H~????B,cP?W??}?g???W???0?`??38>??o?~??8???R???? ??0jBh?W? %??.M?uvA????#lRf/ F??]?a&???H%a????Ib???????J H;????D4?t????<????vff??2?????'.?+??????A??T3??X????.G?%MT????]?i0l???S?u?H`??Fn?mND????$T?|;$???D?+lG????\P'?>?Y?8f ?b?@? ? ???OQ? BA??=?z???X??2/?H)?o#? 6GD6??? ?a????#l? UM,L?@?H?!es{?????{?[V??+???h??DH??t)?0?#X??-NQ ?n}Cp7;i?|??D?? ?!{?2? ?????0?v?????6?????g ??G n??:?D??k?rb ?? #?[3?& ??3~????vQ??H??N"7`????L????c??cc??0Rf???? ?W*????)|?_o???R?XT?[5??$>???????}????I???}???^?us???1/???p3D?q???a?.X{$w?????? o? ??0j ?F?Z???!??D??*Bjl?G ????R??Z1??T7???t]_s?g??[?u?%.Np?V????????K??X?G?c?~? ?=?????W?/?c??[ ??0)?G??ya?+?F?????w??qu????d\???????? ?r?bD?????{??y~hz??,???A???+?L3 ?fG?#?????]N>?/"^?a?sZT???~ ???u!??????!??Y9??3??:??4?????M0??S???{?5??????`27???!??| ?0i???L?PS3'?-a?A? z???V???c??? ??????n|x????ah???(??????jtw??4>N?9???'?!?? -|??"LK???? }?f?ehQrF????"8MD?? ? ? ??????J?8' ?N?  [?G???+??Q(@?F?[?P6M? ??sMuJ?N? ???d?????N>_???~?r ?CBw =??$R2?4?q??=????`????G?????@H?&???p???)?E/?F????*UM$kBU6?????/+B?1??U??2??bh?NPHyx???u?XUi?????????6??M??{y????? ???_/+!??YD!6Du? ??w?\W3?[?b?4????????? ?????W?? ???@z?B'??.[t?rd????er??Lf?d?????E@??????p??? E"?9???Ub@`?v?? ?????aM??va??#?IAB?M?5?i?X?4x?IH?????y? ??????0?d??? ??u>??? ??l???????+b_????M????????1w~ ?R?@kjn5?$Oh?Q;?|?$8?????!c?2"@@?D? -?7P%??????tn??\?KfP???I????Y?@s??I>@?????2#@j?R??0D???}GD0??.u ?id *??*??? e???????\?5K?[0@y_??????D??/????????0V5?45a1??U?B??^?q??G????LE]?????&_1@`?? $>?Hk$?/??o???S??$?+W???*????I??  ?f?????d????1?B???:P? HMI??-?F? ,5?????0?T?g`?J??sM???F??a D"?(???$?B???? ! ?Q? ??B?og?"s? JH"?)?1?p ?CHC?(m y ?F P#5W@?N???? ?)N?T?H5$ %?6?????G?S??p%???l ?? ?\?\ ?bJ??K?Z:?? ~??%????*K?*H??? ???%????a3?@????N???\: f8?^???`????h????:p????????H?E)n5??GE?T??>??*?X??@??;? ?%8? 9R?A ??F ????(?I1??HV?d?2GT?Z?$???U*????m!T.?Di??;^3??w8??=?L?8?B?KKD?Sv?????C???(????tK??YP?i?H!?g???~?#l???p????c=@????k??m??oqi?0q?2?3?/? ????>z3S???px?3??$T??I?jc?>???"? ??1???J?:?"F?@`???A!D@H?? *!??Y????0}C-?e?e`~??!F?-(? ????(?q?_?_I.?%tmL4??HF??d??'??N?3uyG???l}??????u??. ??&08??@8??A????-?n%1)'y???mN)?AHBF?????d ?.?xB;?????]?? ?w?6?? Z KN"d`3??Co?m?d?(?a??] ???"??&`?!(????@U# N(3r?9?X?%???????Xu?<? H? ?)? ?``)?? ?????&??Z??v?5J! ?d????$H??Y???D ?{P?_?g?\V,???!(?R??? F1?Kd?$??? ??????@?]PR(1 1??B??!?G?8` h4U?(&??}?????v4fH'??U&?????d?P?? d?eI?-???a0??dPiB?^?v08??????;??~?x? ?Ll ??,+ c?`E )P[????17????d'???????'A5????yb???eDM?2?Z?? ?-dV9?0?:I?I*0??ceF??!(?+?o at xl?y?*????1???? ?)???=?s???:?wG??V?????(??b??&??0v;? >3!??xZ?V?o?x??{??NmU?/?l Dm?!?B???I?aE)DV? A??R??eJ?p??0?G:???? ?????%??c?K?u?SX?Xp??jg?T0f?? ? ???w??+??n? |? +- 2.6.16-git10 + * Fri Mar 24 2006 Dave Jones - 2.6.16-git9 linux-2.6-build-nonintconfig.patch: linux-2.6.14/scripts/kconfig/confdata.c | 8 +++----- linux-2.6.16.noarch/scripts/kconfig/Makefile | 3 +++ linux-800/scripts/kconfig/conf.c | 26 +++++++++++++++++++++++--- 3 files changed, 29 insertions(+), 8 deletions(-) Index: linux-2.6-build-nonintconfig.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-build-nonintconfig.patch,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- linux-2.6-build-nonintconfig.patch 13 Feb 2006 18:04:43 -0000 1.4 +++ linux-2.6-build-nonintconfig.patch 26 Mar 2006 00:13:38 -0000 1.5 @@ -85,20 +85,18 @@ - return 0; + return return_value; } -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 +--- linux-2.6.16.noarch/scripts/kconfig/Makefile~ 2006-03-25 15:55:18.000000000 -0500 ++++ linux-2.6.16.noarch/scripts/kconfig/Makefile 2006-03-25 15:55:47.000000000 -0500 +@@ -23,6 +23,9 @@ oldconfig: $(obj)/conf silentoldconfig: $(obj)/conf $< -s arch/$(ARCH)/Kconfig +nonint_oldconfig: scripts/kconfig/conf + ./scripts/kconfig/conf -b arch/$(ARCH)/Kconfig + -+ - .PHONY: randconfig allyesconfig allnoconfig allmodconfig defconfig - - randconfig: $(obj)/conf + update-po-config: $(obj)/kxgettext + xgettext --default-domain=linux \ + --add-comments --keyword=_ --keyword=N_ \ --- linux-2.6.14/scripts/kconfig/confdata.c~ 2005-11-10 14:55:46.000000000 -0500 +++ linux-2.6.14/scripts/kconfig/confdata.c 2005-11-10 14:56:01.000000000 -0500 @@ -149,7 +149,7 @@ int conf_read_simple(const char *name) linux-2.6-compile-fixes.patch: 0 files changed Index: linux-2.6-compile-fixes.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-compile-fixes.patch,v retrieving revision 1.59 retrieving revision 1.60 diff -u -r1.59 -r1.60 --- linux-2.6-compile-fixes.patch 24 Mar 2006 23:05:04 -0000 1.59 +++ linux-2.6-compile-fixes.patch 26 Mar 2006 00:13:38 -0000 1.60 @@ -1,10 +0,0 @@ ---- linux-2.6.16.noarch/drivers/net/wireless/Kconfig~ 2006-03-24 18:01:46.000000000 -0500 -+++ linux-2.6.16.noarch/drivers/net/wireless/Kconfig 2006-03-24 18:02:03.000000000 -0500 -@@ -27,6 +27,7 @@ config NET_RADIO - - config NET_WIRELESS_RTNETLINK - bool "Wireless Extension API over RtNetlink" -+ depends on NET_RADIO - ---help--- - Support the Wireless Extension API over the RtNetlink socket - in addition to the traditional ioctl interface (selected above). linux-2.6-crash-driver.patch: linux-1060/arch/i386/mm/init.c | 2 linux-1060/arch/ia64/kernel/ia64_ksyms.c | 3 linux-1060/arch/x86_64/mm/init.c | 3 linux-1060/drivers/char/Kconfig | 2 linux-1060/drivers/char/crash.c | 129 ++++++++++++++++++++++++++++++ linux-1060/include/asm-i386/crash.h | 75 +++++++++++++++++ linux-1060/include/asm-ia64/crash.h | 90 ++++++++++++++++++++ linux-1060/include/asm-x86_64/crash.h | 75 +++++++++++++++++ linux-2.6.16.noarch/drivers/char/Makefile | 1 9 files changed, 380 insertions(+) Index: linux-2.6-crash-driver.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-crash-driver.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- linux-2.6-crash-driver.patch 15 Oct 2005 01:13:22 -0000 1.1 +++ linux-2.6-crash-driver.patch 26 Mar 2006 00:13:38 -0000 1.2 @@ -188,15 +188,14 @@ 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/ +--- linux-2.6.16.noarch/drivers/char/Makefile~ 2006-03-25 18:50:42.000000000 -0500 ++++ linux-2.6.16.noarch/drivers/char/Makefile 2006-03-25 18:50:59.000000000 -0500 +@@ -95,6 +95,7 @@ obj-$(CONFIG_IPMI_HANDLER) += ipmi/ + + obj-$(CONFIG_HANGCHECK_TIMER) += hangcheck-timer.o + obj-$(CONFIG_TCG_TPM) += tpm/ ++obj-$(CONFIG_CRASH) += crash.o - 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-2.6-crashdump-common.patch: linux-2.6.12/Documentation/sysrq.txt | 8 linux-2.6.12/arch/i386/kernel/nmi.c | 1 linux-2.6.12/arch/i386/kernel/traps.c | 3 linux-2.6.12/arch/i386/mm/init.c | 47 +++++ linux-2.6.12/arch/ia64/kernel/process.c | 30 ++- linux-2.6.12/arch/ia64/kernel/traps.c | 6 linux-2.6.12/arch/ia64/mm/contig.c | 3 linux-2.6.12/arch/ia64/mm/discontig.c | 3 linux-2.6.12/arch/ia64/mm/init.c | 90 +++++++++ linux-2.6.12/arch/powerpc/kernel/process.c | 1 linux-2.6.12/arch/powerpc/kernel/traps.c | 3 linux-2.6.12/arch/powerpc/mm/mem.c | 29 +++ linux-2.6.12/arch/s390/kernel/traps.c | 6 linux-2.6.12/arch/x86_64/kernel/process.c | 2 linux-2.6.12/arch/x86_64/kernel/traps.c | 6 linux-2.6.12/arch/x86_64/mm/init.c | 32 +++ linux-2.6.12/include/asm-generic/crashdump.h | 47 +++++ linux-2.6.12/include/asm-i386/crashdump.h | 123 +++++++++++++ linux-2.6.12/include/asm-i386/kmap_types.h | 4 linux-2.6.12/include/asm-ia64/crashdump.h | 72 +++++++ linux-2.6.12/include/asm-powerpc/crashdump.h | 61 ++++++ linux-2.6.12/include/asm-x86_64/crashdump.h | 86 +++++++++ linux-2.6.12/include/linux/kernel.h | 18 + linux-2.6.12/kernel/Makefile | 2 linux-2.6.12/kernel/dump.c | 246 +++++++++++++++++++++++++++ linux-2.6.12/kernel/panic.c | 4 linux-2.6.12/kernel/printk.c | 20 ++ linux-2.6.12/kernel/sched.c | 2 linux-2.6.13/arch/x86_64/mm/fault.c | 1 linux-2.6.16.noarch/arch/i386/mm/pgtable.c | 3 linux-2.6.16.noarch/drivers/char/sysrq.c | 7 31 files changed, 951 insertions(+), 15 deletions(-) Index: linux-2.6-crashdump-common.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-crashdump-common.patch,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- linux-2.6-crashdump-common.patch 25 Mar 2006 02:32:03 -0000 1.14 +++ linux-2.6-crashdump-common.patch 26 Mar 2006 00:13:38 -0000 1.15 @@ -1,14 +1,3 @@ ---- linux-2.6.12/drivers/char/sysrq.c.orig 2005-08-18 12:40:07.000000000 -0400 -+++ linux-2.6.12/drivers/char/sysrq.c 2005-08-18 14:29:25.000000000 -0400 -@@ -289,7 +300,7 @@ - it is handled specially on the sparc - and will never arrive */ - /* b */ &sysrq_reboot_op, --#ifdef CONFIG_KEXEC -+#if defined(CONFIG_KEXEC) || defined(CONFIG_NETDUMP) || defined(CONFIG_DISKDUMP) - /* c */ &sysrq_crashdump_op, - #else - /* c */ NULL, --- /dev/null 2005-08-18 08:15:49.820487896 -0400 +++ linux-2.6.12/include/asm-ia64/crashdump.h 2005-08-18 14:23:59.000000000 -0400 @@ -0,0 +1,72 @@ @@ -1335,30 +1324,30 @@ ssleep(5); #endif ---- linux-2.6.13/drivers/char/sysrq.c.orig -+++ linux-2.6.13/drivers/char/sysrq.c -@@ -95,12 +95,14 @@ static struct sysrq_key_op sysrq_unraw_o - }; +--- linux-2.6.16.noarch/drivers/char/sysrq.c~ 2006-03-25 18:53:30.000000000 -0500 ++++ linux-2.6.16.noarch/drivers/char/sysrq.c 2006-03-25 18:54:40.000000000 -0500 +@@ -95,11 +95,13 @@ static struct sysrq_key_op sysrq_unraw_o + #define sysrq_unraw_op (*(struct sysrq_key_op *)0) #endif /* CONFIG_VT */ -#ifdef CONFIG_KEXEC - /* crashdump sysrq handler */ static void sysrq_handle_crashdump(int key, struct pt_regs *pt_regs, struct tty_struct *tty) { +#ifdef CONFIG_KEXEC crash_kexec(pt_regs); +#endif -+ *( (char *) 0) = 0; ++ *( (char *) 0) = 0; } static struct sysrq_key_op sysrq_crashdump_op = { .handler = sysrq_handle_crashdump, -@@ -108,7 +110,6 @@ static struct sysrq_key_op sysrq_crashdu +@@ -107,9 +109,6 @@ static struct sysrq_key_op sysrq_crashdu .action_msg = "Trigger a crashdump", .enable_mask = SYSRQ_ENABLE_DUMP, }; +-#else +-#define sysrq_crashdump_op (*(struct sysrq_key_op *)0) -#endif - /* reboot sysrq handler */ static void sysrq_handle_reboot(int key, struct pt_regs *pt_regs, - + struct tty_struct *tty) linux-2.6-devmem.patch: arch/powerpc/mm/mem.c | 14 +++ linux-1050/arch/i386/mm/init.c | 19 ++++ linux-1050/arch/ia64/mm/init.c | 7 + linux-1050/arch/s390/mm/init.c | 5 + linux-1050/arch/x86_64/mm/init.c | 20 ++++ linux-1050/drivers/char/mem.c | 143 ++++---------------------------- linux-1050/fs/proc/kcore.c | 2 linux-1050/include/asm-alpha/page.h | 1 linux-1050/include/asm-arm/page.h | 2 linux-1050/include/asm-arm26/page.h | 2 linux-1050/include/asm-cris/page.h | 2 linux-1050/include/asm-h8300/page.h | 2 linux-1050/include/asm-i386/page.h | 4 linux-1050/include/asm-ia64/page.h | 2 linux-1050/include/asm-m68k/page.h | 2 linux-1050/include/asm-m68knommu/page.h | 2 linux-1050/include/asm-mips/page.h | 2 linux-1050/include/asm-parisc/page.h | 2 linux-1050/include/asm-ppc/page.h | 2 linux-1050/include/asm-s390/page.h | 2 linux-1050/include/asm-sh/page.h | 2 linux-1050/include/asm-sh64/page.h | 2 linux-1050/include/asm-sparc/page.h | 2 linux-1050/include/asm-sparc64/page.h | 2 linux-1050/include/asm-um/page.h | 1 linux-1050/include/asm-v850/page.h | 2 linux-1050/include/asm-x86_64/page.h | 4 linux-2.6.13/arch/x86_64/mm/init.c | 22 ++++ linux-2.6.14/include/asm-powerpc/page.h | 2 29 files changed, 154 insertions(+), 122 deletions(-) Index: linux-2.6-devmem.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-devmem.patch,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- linux-2.6-devmem.patch 13 Jan 2006 15:50:35 -0000 1.5 +++ linux-2.6-devmem.patch 26 Mar 2006 00:13:38 -0000 1.6 @@ -173,7 +173,7 @@ read = 0; virtr = 0; if (p < (unsigned long) high_memory) { -@@ -345,128 +367,6 @@ static ssize_t read_kmem(struct file *fi +@@ -432,67 +432,6 @@ static ssize_t read_kmem(struct file *fi } @@ -221,11 +221,9 @@ - - copied = copy_from_user(ptr, buf, sz); - if (copied) { -- ssize_t ret; -- -- ret = written + (sz - copied); -- if (ret) -- return ret; +- written += sz - copied; +- if (written) +- break; - return -EFAULT; - } - buf += sz; @@ -240,6 +238,13 @@ -} - - + /* + * This function writes to the *virtual* memory as seen by the kernel. + */ +@@ -432,64 +432,6 @@ static ssize_t read_kmem(struct file *fi + } + + -/* - * This function writes to the *virtual* memory as seen by the kernel. - */ @@ -279,11 +284,10 @@ - if (len) { - written = copy_from_user(kbuf, buf, len); - if (written) { -- ssize_t ret; -- +- if (wrote + virtr) +- break; - free_page((unsigned long)kbuf); -- ret = wrote + virtr + (len - written); -- return ret ? ret : -EFAULT; +- return -EFAULT; - } - } - len = vwrite(kbuf, (char *)p, len); linux-2.6-execshield.patch: linux-2.6.16.noarch/include/asm-powerpc/elf.h | 3 linux/arch/i386/kernel/asm-offsets.c | 1 linux/arch/i386/kernel/cpu/common.c | 7 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 | 81 +++++++++++ linux/arch/i386/kernel/traps.c | 93 ++++++++++++- 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/powerpc/kernel/vdso.c | 3 linux/arch/x86_64/ia32/ia32_binfmt.c | 6 linux/arch/x86_64/ia32/syscall32.c | 4 linux/arch/x86_64/kernel/process.c | 6 linux/arch/x86_64/kernel/setup64.c | 23 --- linux/arch/x86_64/mm/fault.c | 2 linux/arch/x86_64/mm/mmap.c | 99 +++++++++++--- linux/drivers/char/random.c | 7 linux/fs/binfmt_elf.c | 151 ++++++++++++++++----- linux/fs/proc/array.c | 8 - linux/fs/proc/base.c | 8 - linux/fs/proc/task_mmu.c | 34 +++- linux/include/asm-i386/a.out.h | 2 linux/include/asm-i386/desc.h | 14 + linux/include/asm-i386/elf.h | 50 +++++-- linux/include/asm-i386/mmu.h | 6 linux/include/asm-i386/page.h | 5 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-powerpc/pgalloc.h | 5 linux/include/asm-ppc/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/pgtable.h | 2 linux/include/linux/mm.h | 16 +- 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 | 57 ++++++++ linux/mm/fremap.c | 16 +- linux/mm/mmap.c | 183 ++++++++++++++++++++++++-- linux/mm/mprotect.c | 5 linux/mm/mremap.c | 4 52 files changed, 931 insertions(+), 161 deletions(-) Index: linux-2.6-execshield.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-execshield.patch,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- linux-2.6-execshield.patch 22 Mar 2006 23:50:26 -0000 1.15 +++ linux-2.6-execshield.patch 26 Mar 2006 00:13:38 -0000 1.16 @@ -608,7 +608,7 @@ { if (!strncmp(str, "on", 2)) { __supported_pte_mask |= _PAGE_NX; -@@ -55,28 +55,7 @@ int __init nonx_setup(char *str) +@@ -55,28 +55,7 @@ void __init nonx_setup(const char *str) do_not_nx = 1; __supported_pte_mask &= ~_PAGE_NX; } @@ -616,7 +616,7 @@ -} -__setup("noexec=", nonx_setup); /* parsed early actually */ - --int force_personality32 = READ_IMPLIES_EXEC; +-int force_personality32 = 0; - -/* noexec32=on|off -Control non executable heap for 32bit processes. Index: upstream =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/upstream,v retrieving revision 1.306 retrieving revision 1.307 diff -u -r1.306 -r1.307 --- upstream 24 Mar 2006 22:43:39 -0000 1.306 +++ upstream 26 Mar 2006 00:13:38 -0000 1.307 @@ -1,2 +1,2 @@ linux-2.6.16.tar.bz2 -patch-2.6.16-git9.bz2 +patch-2.6.16-git10.bz2 --- linux-2.6-NFSD-writes-shouldnt-clobber-utimes.patch DELETED --- --- linux-2.6-audit-new-msg-types.patch DELETED --- --- linux-2.6-debug-reference-discarded-return-result.patch DELETED --- --- linux-2.6-debug-slab-leaks.patch DELETED --- --- linux-2.6-pwc-powerup-by-default.patch DELETED --- --- linux-2.6-x86-tune-p4.patch DELETED --- --- patch-2.6.16-git9.bz2.sign DELETED --- From fedora-cvs-commits at redhat.com Sun Mar 26 02:23:48 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sat, 25 Mar 2006 21:23:48 -0500 Subject: rpms/gnome-screensaver/devel gnome-screensaver.spec,1.62,1.63 Message-ID: <200603260223.k2Q2NmCN031470@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/gnome-screensaver/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv31458 Modified Files: gnome-screensaver.spec Log Message: - Add missing "c" to the word "Screensaver" in summary (bug 186711). Index: gnome-screensaver.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-screensaver/devel/gnome-screensaver.spec,v retrieving revision 1.62 retrieving revision 1.63 diff -u -r1.62 -r1.63 --- gnome-screensaver.spec 13 Mar 2006 15:12:54 -0000 1.62 +++ gnome-screensaver.spec 26 Mar 2006 02:23:46 -0000 1.63 @@ -11,10 +11,10 @@ %define gnome_menus_version 2.11.1 %define libexif_version 0.6.12 -Summary: GNOME Sreensaver +Summary: GNOME Screensaver Name: gnome-screensaver Version: 2.14.0 -Release: 1 +Release: 2 License: GPL Group: Amusement/Graphics Source0: %{name}-%{version}.tar.bz2 @@ -162,6 +162,10 @@ %{_sysconfdir}/pam.d/* %changelog +* Sat Mar 25 2006 Ray Strode 2.14.0-2 +- Add missing "c" to the word "Screensaver" in summary + (bug 186711). + * Mon Mar 13 2006 Matthias Clasen 2.14.0-1 - Update to 2.14.0 From fedora-cvs-commits at redhat.com Sun Mar 26 22:27:05 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sun, 26 Mar 2006 17:27:05 -0500 Subject: rpms/texinfo/devel texinfo.spec,1.35,1.36 Message-ID: <200603262227.k2QMR5og003423@cvs.devel.redhat.com> Author: mitr Update of /cvs/dist/rpms/texinfo/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv3410 Modified Files: texinfo.spec Log Message: * Sat Mar 25 2006 Miloslav Trmac - 4.8-11 - Split texinfo-tex from the texinfo package (#178406) - Ship COPYING, don't ship INSTALL Index: texinfo.spec =================================================================== RCS file: /cvs/dist/rpms/texinfo/devel/texinfo.spec,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- texinfo.spec 19 Mar 2006 03:43:40 -0000 1.35 +++ texinfo.spec 26 Mar 2006 22:27:02 -0000 1.36 @@ -1,7 +1,7 @@ Summary: Tools needed to create Texinfo format documentation files. Name: texinfo Version: 4.8 -Release: 10 +Release: 11 License: GPL Group: Applications/Publishing Url: http://www.gnu.org/software/texinfo/ @@ -13,8 +13,6 @@ Prereq: /sbin/install-info Buildroot: %{_tmppath}/%{name}-%{version}-root BuildRequires: zlib-devel, ncurses-devel -Requires: tetex - # Redefine this so "dir" in the info directory isn't compressed @@ -44,6 +42,20 @@ documentation. The info package provides a standalone TTY-based browser program for viewing texinfo files. +%package tex +Summary: Tools for fromating Texinfo documentation files using TeX +Group: Applications/Publishing +Requires: texinfo = %{version}-%{release} +Requires: tetex + +%description tex +Texinfo is a documentation system that can produce both online +information and printed output from a single source file. The GNU +Project uses the Texinfo file format for most of its documentation. + +The texinfo-tex package provides tools to format Texinfo documents +for printing using TeX. + %prep %setup -q %patch1 -p1 -b .zlib @@ -64,7 +76,7 @@ install -m644 %{SOURCE2} .%{_mandir}/man1/texi2pdf.1 gzip -n -9f .%{_infodir}/*info* gzip -n -9f .%{_mandir}/*/* - install -m644 $RPM_SOURCE_DIR/info-dir .%{_infodir}/dir + install -m644 %{SOURCE1} .%{_infodir}/dir mv -f .%{_bindir}/install-info ./sbin popd @@ -94,22 +106,17 @@ %files -f %{name}.lang %defattr(-,root,root) -%doc AUTHORS ChangeLog INSTALL INTRODUCTION NEWS README TODO +%doc AUTHORS ChangeLog INTRODUCTION NEWS README TODO %{_bindir}/makeinfo -%{_bindir}/texindex -%{_bindir}/texi2dvi -%{_bindir}/texi2pdf %{_datadir}/texinfo %{_infodir}/texinfo* %{_mandir}/man1/makeinfo.1* -%{_mandir}/man1/texindex.1* -%{_mandir}/man1/texi2dvi.1* -%{_mandir}/man1/texi2pdf.1* %{_mandir}/man5/texinfo.5* %files -n info %defattr(-,root,root) %config(noreplace) %verify(not md5 size mtime) %{_infodir}/dir +%doc COPYING %{_bindir}/info %{_bindir}/infokey %{_infodir}/info.info* @@ -120,7 +127,20 @@ %{_mandir}/man1/install-info.1* %{_mandir}/man5/info.5* +%files tex +%defattr(-,root,root) +%{_bindir}/texindex +%{_bindir}/texi2dvi +%{_bindir}/texi2pdf +%{_mandir}/man1/texindex.1* +%{_mandir}/man1/texi2dvi.1* +%{_mandir}/man1/texi2pdf.1* + %changelog +* Sat Mar 25 2006 Miloslav Trmac - 4.8-11 +- Split texinfo-tex from the texinfo package (#178406) +- Ship COPYING, don't ship INSTALL + * Sun Mar 19 2006 Miloslav Trmac - 4.8-10 - Remove incorrect Prefix: - Drop info/README From fedora-cvs-commits at redhat.com Sun Mar 26 22:34:37 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sun, 26 Mar 2006 17:34:37 -0500 Subject: rpms/mgetty/devel mgetty.spec,1.36,1.37 Message-ID: <200603262234.k2QMYbqk003537@cvs.devel.redhat.com> Author: mitr Update of /cvs/dist/rpms/mgetty/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv3525 Modified Files: mgetty.spec Log Message: * Mon Mar 27 2006 Miloslav Trmac - 1.1.33-7.FC5.3 - Change BuildPrereq from texinfo to texinfo-tex Index: mgetty.spec =================================================================== RCS file: /cvs/dist/rpms/mgetty/devel/mgetty.spec,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- mgetty.spec 11 Feb 2006 04:35:32 -0000 1.36 +++ mgetty.spec 26 Mar 2006 22:34:07 -0000 1.37 @@ -5,7 +5,7 @@ Summary: A getty replacement for use with data and fax modems. Name: mgetty Version: 1.1.33 -Release: 7.FC5.2 +Release: 7.FC5.3 Source: ftp://alpha.greenie.net/pub/mgetty/source/1.1/mgetty%{version}-Apr10.tar.gz Source1: ftp://alpha.greenie.net/pub/mgetty/source/1.1/mgetty%{version}-Apr10.tar.gz.asc Source2: logrotate.mgetty @@ -37,7 +37,7 @@ License: GPL Group: Applications/Communications Prereq: /sbin/install-info -BuildPrereq: groff, tetex, tetex-latex, texinfo, tetex-dvips, libX11-devel, libXext-devel +BuildPrereq: groff, tetex, tetex-latex, texinfo-tex, tetex-dvips, libX11-devel, libXext-devel Buildroot: %{_tmppath}/%{name}-root Requires: mktemp URL: http://www.leo.org/~doering/mgetty/index.html @@ -341,6 +341,9 @@ %{_mandir}/man1/viewfax.1* %changelog +* Mon Mar 27 2006 Miloslav Trmac - 1.1.33-7.FC5.3 +- Change BuildPrereq from texinfo to texinfo-tex + * Fri Feb 10 2006 Jesse Keating - 1.1.33-7.FC5.2 - bump again for double-long bug on ppc(64) From fedora-cvs-commits at redhat.com Sun Mar 26 23:03:33 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sun, 26 Mar 2006 18:03:33 -0500 Subject: rpms/evolution/FC-5 evolution-2.5.91-check-only-active-folders.patch, NONE, 1.1.4.1 evolution.spec, 1.134, 1.134.2.1 Message-ID: <200603262303.k2QN3Xj4017463@cvs.devel.redhat.com> Author: dwmw2 Update of /cvs/dist/rpms/evolution/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv17449 Modified Files: Tag: private-1_6-check-only-active-folders-branch evolution.spec Added Files: Tag: private-1_6-check-only-active-folders-branch evolution-2.5.91-check-only-active-folders.patch Log Message: check only active folders for new mail evolution-2.5.91-check-only-active-folders.patch: mail-send-recv.c | 2 ++ 1 files changed, 2 insertions(+) --- NEW FILE evolution-2.5.91-check-only-active-folders.patch --- --- evolution-2.5.91/mail/mail-send-recv.c~ 2006-01-16 11:12:25.000000000 +0000 +++ evolution-2.5.91/mail/mail-send-recv.c 2006-02-27 16:41:46.000000000 +0000 @@ -762,6 +762,8 @@ get_folders(CamelStore *store, GPtrArray controls this refresh process. TODO: add virtual camel_store_refresh_info() which does this ... */ if (camel_url_get_param(((CamelService *)store)->url, "check_all") != NULL + || (camel_url_get_param(((CamelService *)store)->url, "check_subscribed") != NULL + && info->flags & CAMEL_FOLDER_SUBSCRIBED) || (strcmp(((CamelService *)store)->url->protocol, "imap") != 0 && strcmp(((CamelService *)store)->url->protocol, "groupwise") != 0 && strcmp(((CamelService *)store)->url->protocol, "scalix") != 0) Index: evolution.spec =================================================================== RCS file: /cvs/dist/rpms/evolution/FC-5/evolution.spec,v retrieving revision 1.134 retrieving revision 1.134.2.1 diff -u -r1.134 -r1.134.2.1 --- evolution.spec 14 Mar 2006 06:57:34 -0000 1.134 +++ evolution.spec 26 Mar 2006 23:03:15 -0000 1.134.2.1 @@ -39,7 +39,7 @@ Name: evolution Version: 2.6.0 -Release: 1 +Release: 1.dwmw2.1 License: GPL BuildRoot: %{_tmppath}/%{name}-%{version}-root URL: http://www.ximian.com/ @@ -102,6 +102,8 @@ Patch808: evolution-2.5.5.1-fix-missing-declarations-2.5.5.1.patch Patch809: evolution-2.6.0-prototypes.patch +Patch1000: evolution-2.5.91-check-only-active-folders.patch + Summary: GNOME's next-generation groupware suite Group: Applications/Productivity @@ -247,6 +249,8 @@ %patch808 -p1 -b .fix-missing-declarations-2.5.5.1 %patch809 -p1 -b .prototypes +%patch1000 -p1 -b .checksum + mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib mkdir -p krb5-fakeprefix/%{_lib} From fedora-cvs-commits at redhat.com Mon Mar 27 08:12:04 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 27 Mar 2006 03:12:04 -0500 Subject: rpms/iproute/devel iproute2-2.6.16-libdir.patch, NONE, 1.1 .cvsignore, 1.17, 1.18 iproute.spec, 1.47, 1.48 sources, 1.17, 1.18 Message-ID: <200603270812.k2R8C4eK022905@cvs.devel.redhat.com> Author: rvokal Update of /cvs/dist/rpms/iproute/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv22885 Modified Files: .cvsignore iproute.spec sources Added Files: iproute2-2.6.16-libdir.patch Log Message: - upgrade to 2.6.16-060323 - don't hardcode /usr/lib in tc (#186607) iproute2-2.6.16-libdir.patch: Makefile | 2 +- q_netem.c | 4 ++++ tc.c | 10 ++++++++-- 3 files changed, 13 insertions(+), 3 deletions(-) --- NEW FILE iproute2-2.6.16-libdir.patch --- --- iproute2-2.6.16-060323/tc/Makefile.libdir 2005-07-06 00:11:37.000000000 +0200 +++ iproute2-2.6.16-060323/tc/Makefile 2006-03-27 07:09:28.000000000 +0200 @@ -42,7 +42,7 @@ TCLIB += tc_cbq.o TCLIB += tc_estimator.o -CFLAGS += -DCONFIG_GACT -DCONFIG_GACT_PROB +CFLAGS += -DCONFIG_GACT -DCONFIG_GACT_PROB -DLIBDIR=\"$(LIBDIR)\" TCSO := TCSO += q_netem.so --- iproute2-2.6.16-060323/tc/q_netem.c.libdir 2005-12-10 01:01:02.000000000 +0100 +++ iproute2-2.6.16-060323/tc/q_netem.c 2006-03-27 07:09:28.000000000 +0200 @@ -60,7 +60,11 @@ char *line = NULL; char name[128]; + #ifdef LIBDIR + snprintf(name, sizeof(name), "%s/tc/%s.dist", LIBDIR, type); + #else snprintf(name, sizeof(name), "/usr/lib/tc/%s.dist", type); + #endif if ((f = fopen(name, "r")) == NULL) { fprintf(stderr, "No distribution data for %s (%s: %s)\n", type, name, strerror(errno)); --- iproute2-2.6.16-060323/tc/tc.c.libdir 2005-10-07 18:33:21.000000000 +0200 +++ iproute2-2.6.16-060323/tc/tc.c 2006-03-27 07:11:53.000000000 +0200 @@ -98,8 +98,11 @@ for (q = qdisc_list; q; q = q->next) if (strcmp(q->id, str) == 0) return q; - + #ifdef LIBDIR + snprintf(buf, sizeof(buf), "%s/tc/q_%s.so", LIBDIR, str); + #else snprintf(buf, sizeof(buf), "/usr/lib/tc/q_%s.so", str); + #endif dlh = dlopen(buf, RTLD_LAZY); if (!dlh) { /* look in current binary, only open once */ @@ -144,8 +147,11 @@ for (q = filter_list; q; q = q->next) if (strcmp(q->id, str) == 0) return q; - + #ifdef LIBDIR + snprintf(buf, sizeof(buf), "%s/tc/f_%s.so", LIBDIR, str); + #else snprintf(buf, sizeof(buf), "/usr/lib/tc/f_%s.so", str); + #endif dlh = dlopen(buf, RTLD_LAZY); if (dlh == NULL) { dlh = BODY; Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/iproute/devel/.cvsignore,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- .cvsignore 17 Jan 2006 18:06:01 -0000 1.17 +++ .cvsignore 27 Mar 2006 08:12:02 -0000 1.18 @@ -1 +1 @@ -iproute2-2.6.15-060110.tar.gz +iproute2-2.6.16-060323.tar.gz Index: iproute.spec =================================================================== RCS file: /cvs/dist/rpms/iproute/devel/iproute.spec,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- iproute.spec 24 Feb 2006 08:19:14 -0000 1.47 +++ iproute.spec 27 Mar 2006 08:12:02 -0000 1.48 @@ -1,17 +1,18 @@ -%define date_version 060110 +%define date_version 060323 %define cbq_version v0.7.3 Summary: Advanced IP routing and network device configuration tools. Name: iproute -Version: 2.6.15 -Release: 2 +Version: 2.6.16 +Release: 1 Group: Applications/System Source: http://developer.osdl.org/dev/iproute2/download/iproute2-%{version}-%{date_version}.tar.gz URL: http://linux-net.osdl.org/index.php/Iproute2 -Patch1: iproute2-2.4.7-rt_config.patch +#Patch1: iproute2-2.4.7-rt_config.patch Patch2: iproute2-2.6.9-kernel.patch Patch5: iproute2-ss050901-opt_flags.patch Patch7: iproute2-051007-add_tunnel.patch +Patch8: iproute2-2.6.16-libdir.patch License: GNU GPL BuildRoot: %{_tmppath}/%{name}-%{version}-root @@ -25,12 +26,15 @@ %prep %setup -q -n iproute2-%{version}-%{date_version} -%patch1 -p1 +#%patch1 -p1 %patch2 -p1 -b .kernel %patch5 -p1 -b .opt_flags %patch7 -p1 -b .tunnel_add +%patch8 -p1 -b .libdir %build +export LIBDIR=%{_libdir} + make make -C doc @@ -87,6 +91,10 @@ %config(noreplace) /etc/sysconfig/cbq/* %changelog +* Sun Mar 26 2006 Radek Vok??l - 2.6.16-1 +- upgrade to 2.6.16-060323 +- don't hardcode /usr/lib in tc (#186607) + * Wed Feb 22 2006 Radek Vok??l - 2.6.15-2 - own /usr/lib/tc (#181953) - obsoletes shapecfg (#182284) Index: sources =================================================================== RCS file: /cvs/dist/rpms/iproute/devel/sources,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- sources 17 Jan 2006 18:06:02 -0000 1.17 +++ sources 27 Mar 2006 08:12:02 -0000 1.18 @@ -1 +1 @@ -04f57a6d366d36426d276178b600f5c5 iproute2-2.6.15-060110.tar.gz +f31d4516b35bbfeaa72c762f5959e97c iproute2-2.6.16-060323.tar.gz From fedora-cvs-commits at redhat.com Mon Mar 27 08:22:22 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 27 Mar 2006 03:22:22 -0500 Subject: rpms/mod_authz_ldap/devel mod_authz_ldap.spec,1.14,1.15 Message-ID: <200603270822.k2R8MMeL004233@cvs.devel.redhat.com> Author: jorton Update of /cvs/dist/rpms/mod_authz_ldap/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv4210 Modified Files: mod_authz_ldap.spec Log Message: * Mon Mar 27 2006 Joe Orton 0.26-7 - don't package INSTALL - define -DLDAP_DEPRECATED=1 in CPPFLAGS Index: mod_authz_ldap.spec =================================================================== RCS file: /cvs/dist/rpms/mod_authz_ldap/devel/mod_authz_ldap.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- mod_authz_ldap.spec 11 Feb 2006 04:37:26 -0000 1.14 +++ mod_authz_ldap.spec 27 Mar 2006 08:22:20 -0000 1.15 @@ -2,7 +2,7 @@ Summary: LDAP authorization module for the Apache HTTP Server Name: mod_authz_ldap Version: 0.26 -Release: 6.2.1 +Release: 7 License: BSD Group: System Environment/Daemons URL: http://authzldap.othello.ch/ @@ -36,7 +36,7 @@ %build libtoolize --copy --force && aclocal && autoconf -export CPPFLAGS="`apu-1-config --includes` -I%{_includedir}/openssl" +export CPPFLAGS="`apu-1-config --includes` -I%{_includedir}/openssl -DLDAP_DEPRECATED=1" %configure --with-apxs=%{_sbindir}/apxs --disable-static cd module %{_sbindir}/apxs -Wl,-export-symbols-regex -Wl,authz_ldap_module \ @@ -70,9 +70,13 @@ %{_bindir}/cert* %{_mandir}/man1/cert* %doc ldap/*.schema docs/*.{html,jpg} docs/*.{HOWTO,txt} docs/README -%doc NEWS AUTHORS ChangeLog COPYING INSTALL +%doc NEWS AUTHORS ChangeLog COPYING %changelog +* Mon Mar 27 2006 Joe Orton 0.26-7 +- don't package INSTALL +- define -DLDAP_DEPRECATED=1 in CPPFLAGS + * Fri Feb 10 2006 Jesse Keating - 0.26-6.2.1 - bump again for double-long bug on ppc(64) From fedora-cvs-commits at redhat.com Mon Mar 27 09:54:49 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 27 Mar 2006 04:54:49 -0500 Subject: rpms/dmraid/devel dmraid.spec,1.39,1.40 Message-ID: <200603270954.k2R9sneC013934@cvs.devel.redhat.com> Author: mbroz Update of /cvs/dist/rpms/dmraid/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv13919 Modified Files: dmraid.spec Log Message: - fixed /var/lock/dmraid in specfile (#168195) Index: dmraid.spec =================================================================== RCS file: /cvs/dist/rpms/dmraid/devel/dmraid.spec,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- dmraid.spec 17 Feb 2006 20:43:26 -0000 1.39 +++ dmraid.spec 27 Mar 2006 09:54:47 -0000 1.40 @@ -7,7 +7,7 @@ Summary: dmraid (Device-mapper RAID tool and library) Name: dmraid Version: 1.0.0.rc10 -Release: FC5_6.1 +Release: FC5_6.2 License: GPL Group: System Environment/Base URL: http://people.redhat.com/heinzm/sw/dmraid @@ -76,6 +76,7 @@ %if "%{dmraid_build_dso}" == "1" %{_libdir}/libdmraid.so.* %endif +/var/lock/dmraid %files -n dmraid-devel %defattr(-,root,root) From fedora-cvs-commits at redhat.com Mon Mar 27 09:58:43 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 27 Mar 2006 04:58:43 -0500 Subject: rpms/dmraid/devel dmraid.spec,1.40,1.41 Message-ID: <200603270958.k2R9whMY013987@cvs.devel.redhat.com> Author: mbroz Update of /cvs/dist/rpms/dmraid/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv13974 Modified Files: dmraid.spec Log Message: Index: dmraid.spec =================================================================== RCS file: /cvs/dist/rpms/dmraid/devel/dmraid.spec,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- dmraid.spec 27 Mar 2006 09:54:47 -0000 1.40 +++ dmraid.spec 27 Mar 2006 09:58:41 -0000 1.41 @@ -89,6 +89,9 @@ %endif %changelog +* Mon Mar 27 2006 Milan Broz - 1.0.0.rc10-FC5_6.2 +- fixed /var/lock/dmraid in specfile (#168195) + * Fri Feb 17 2006 Heinz Mauelshagen - 1.0.0.rc10-FC5_6 - add doc/dmraid_design.txt to %doc (#181885) - add --enable-libselinux --enable-libsepol to configure From fedora-cvs-commits at redhat.com Mon Mar 27 10:20:46 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 27 Mar 2006 05:20:46 -0500 Subject: rpms/cups/devel .cvsignore, 1.15, 1.16 cups.spec, 1.140, 1.141 sources, 1.16, 1.17 cups-1.2svn5335.patch, 1.1, NONE Message-ID: <200603271020.k2RAKku8028031@cvs.devel.redhat.com> Author: twaugh Update of /cvs/dist/rpms/cups/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv28017 Modified Files: .cvsignore cups.spec sources Removed Files: cups-1.2svn5335.patch Log Message: * Mon Mar 27 2006 Tim Waugh 1:1.2-0.2.rc1.0 - 1.2rc1. Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/cups/devel/.cvsignore,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- .cvsignore 4 Jan 2005 12:24:50 -0000 1.15 +++ .cvsignore 27 Mar 2006 10:20:44 -0000 1.16 @@ -6,3 +6,4 @@ cups-1.1.22-source.tar.bz2 cups-1.1.23rc1-source.tar.bz2 cups-1.1.23-source.tar.bz2 +cups-1.2rc1-source.tar.bz2 Index: cups.spec =================================================================== RCS file: /cvs/dist/rpms/cups/devel/cups.spec,v retrieving revision 1.140 retrieving revision 1.141 diff -u -r1.140 -r1.141 --- cups.spec 24 Mar 2006 15:53:11 -0000 1.140 +++ cups.spec 27 Mar 2006 10:20:44 -0000 1.141 @@ -1,13 +1,13 @@ %define initdir /etc/rc.d/init.d %define use_alternatives 1 %define build_as_pie 1 -%define beta b2 +%define beta rc1 %define cups_serverbin %{_exec_prefix}/lib/cups Summary: Common Unix Printing System Name: cups Version: 1.2 -Release: 0.1.%{beta}.6 +Release: 0.2.%{beta}.0 License: GPL Group: System Environment/Daemons Source: ftp://ftp.easysw.com/pub/cups/test/cups-1.2%{beta}-source.tar.bz2 @@ -21,7 +21,6 @@ Source10: ncp.backend Source11: cups.conf Source12: cups.cron -Patch0: cups-1.2svn5335.patch Patch1: cups-1.1.15-initscript.patch Patch2: cups-no-gzip-man.patch Patch3: cups-1.1.16-system-auth.patch @@ -108,7 +107,6 @@ %prep %setup -q -n %{name}-%{version}%{beta} -%patch0 -p1 -b .svn5335 %patch1 -p1 -b .noinit %patch2 -p1 -b .no-gzip-man %patch3 -p1 -b .system-auth @@ -229,6 +227,7 @@ # Remove unshipped files. rm -rf $RPM_BUILD_ROOT%{_mandir}/cat? $RPM_BUILD_ROOT%{_mandir}/*/cat? rm -f $RPM_BUILD_ROOT%{_datadir}/applications/cups.desktop +rm -rf $RPM_BUILD_ROOT%{_datadir}/icons %post @@ -371,6 +370,9 @@ %{cups_serverbin}/daemon/cups-lpd %changelog +* Mon Mar 27 2006 Tim Waugh 1:1.2-0.2.rc1.0 +- 1.2rc1. + * Fri Mar 24 2006 Tim Waugh 1:1.2-0.1.b2.6 - Add KDE compatibility symbols _ipp_add_attr/_ipp_free_attr to ipp.h, with a comment saying why they shouldn't be used. Index: sources =================================================================== RCS file: /cvs/dist/rpms/cups/devel/sources,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- sources 17 Mar 2006 12:10:57 -0000 1.16 +++ sources 27 Mar 2006 10:20:44 -0000 1.17 @@ -1,2 +1,2 @@ b0bb017098e8e76b8a25e666c41ce540 postscript.ppd.gz -67a912af67de02e290a149f3947da96d cups-1.2b2-source.tar.bz2 +e1cebe3393c360eb7972efa0715befa1 cups-1.2rc1-source.tar.bz2 --- cups-1.2svn5335.patch DELETED --- From fedora-cvs-commits at redhat.com Mon Mar 27 12:43:35 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 27 Mar 2006 07:43:35 -0500 Subject: rpms/inn/devel .cvsignore, 1.10, 1.11 inn.spec, 1.26, 1.27 sources, 1.11, 1.12 inn-2.4.1-warn.patch, 1.1, NONE inn-2.4.1.diff.patch, 1.1, NONE inn-2.4.1.rh.patch, 1.1, NONE Message-ID: <200603271243.k2RChZPr018787@cvs.devel.redhat.com> Author: stransky Update of /cvs/dist/rpms/inn/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv18773 Modified Files: .cvsignore inn.spec sources Removed Files: inn-2.4.1-warn.patch inn-2.4.1.diff.patch inn-2.4.1.rh.patch Log Message: new upstream Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/inn/devel/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 11 Jan 2005 12:58:31 -0000 1.10 +++ .cvsignore 27 Mar 2006 12:43:33 -0000 1.11 @@ -2,3 +2,4 @@ inn-faq.tar.gz inn-2.4.1.tar.gz inn-2.4.2.tar.gz +inn-2.4.3.tar.gz Index: inn.spec =================================================================== RCS file: /cvs/dist/rpms/inn/devel/inn.spec,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- inn.spec 11 Feb 2006 03:35:33 -0000 1.26 +++ inn.spec 27 Mar 2006 12:43:33 -0000 1.27 @@ -1,7 +1,7 @@ Summary: The InterNetNews (INN) system, an Usenet news server. Name: inn -Version: 2.4.2 -Release: 4.2.1 +Version: 2.4.3 +Release: 1 License: GPL Group: System Environment/Daemons Source0: ftp://ftp.isc.org/isc/inn/inn-%{version}.tar.gz @@ -11,13 +11,12 @@ Source7: inn-cron-nntpsend Source8: innd.init Source10: inn-faq.tar.gz -Patch: inn-2.4.1.rh.patch +Patch: inn-2.4.3.rh.patch Patch2: inn-2.4.1.perl.patch Patch3: inn-2.4.1.headusage.patch Patch4: inn-2.4.1.pie.patch -Patch5: inn-2.4.1.diff.patch Patch6: inn-2.4.1.posix.patch -Patch7: inn-2.4.1-warn.patch +Patch7: inn-2.4.3.warn.patch Patch8: inn-2.4.2-makedbz.patch BuildRequires: db4-devel Prereq: /sbin/chkconfig, grep, coreutils, sed @@ -73,7 +72,6 @@ %patch2 -p1 -b .perl %patch3 -p1 -b .headusage %patch4 -p1 -b .pie -%patch5 -p1 -b .diff %patch6 -p1 -b .posix %patch7 -p1 -b .warn %patch8 -p1 -b .makedbz @@ -82,7 +80,7 @@ perl -pi -e 's/LOCK_WRITE/LLOCK_WRITE/' `find . -type f` %build -export DEFINE_INN_FLAGS="-D_XOPEN_SOURCE=600 -D_BSD_SOURCE" +export DEFINE_INN_FLAGS="-D_XOPEN_SOURCE=600 -D_BSD_SOURCE -DHAVE_ET_COM_ERR_H" %ifarch s390 s390x export CFLAGS="$RPM_OPT_FLAGS $DEFINE_INN_FLAGS -fPIC -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE" @@ -285,6 +283,9 @@ %{_mandir}/man1/inews* %changelog +* Mon Mar 27 2006 Martin Stransky 2.4.3-1 +- new upstream + * Fri Feb 10 2006 Jesse Keating - 2.4.2-4.2.1 - bump again for double-long bug on ppc(64) Index: sources =================================================================== RCS file: /cvs/dist/rpms/inn/devel/sources,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- sources 26 Jan 2005 13:47:05 -0000 1.11 +++ sources 27 Mar 2006 12:43:33 -0000 1.12 @@ -1,2 +1,2 @@ b5e6321446594749eea087c6710eefa5 inn-faq.tar.gz -4942a275c70e0256dad6f1857be6d62e inn-2.4.2.tar.gz +6caa10909a7bf55fb91535685990aec9 inn-2.4.3.tar.gz --- inn-2.4.1-warn.patch DELETED --- --- inn-2.4.1.diff.patch DELETED --- --- inn-2.4.1.rh.patch DELETED --- From fedora-cvs-commits at redhat.com Mon Mar 27 12:47:06 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 27 Mar 2006 07:47:06 -0500 Subject: rpms/inn/devel inn-2.4.3.rh.patch, NONE, 1.1 inn-2.4.3.warn.patch, NONE, 1.1 Message-ID: <200603271247.k2RCl6Rp032528@cvs.devel.redhat.com> Author: stransky Update of /cvs/dist/rpms/inn/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv32512 Added Files: inn-2.4.3.rh.patch inn-2.4.3.warn.patch Log Message: added patches inn-2.4.3.rh.patch: Makefile | 4 ++-- Makefile.global.in | 14 +++++++------- samples/inn.conf.in | 8 ++++---- site/Makefile | 2 -- 4 files changed, 13 insertions(+), 15 deletions(-) --- NEW FILE inn-2.4.3.rh.patch --- --- inn-2.4.1/Makefile.global.in.old 2004-12-13 13:09:57.000000000 +0100 +++ inn-2.4.1/Makefile.global.in 2004-12-13 13:57:18.826316440 +0100 @@ -241,8 +241,8 @@ RNEWSMODE = @RNEWSMODE@ FILEMODE = @FILEMODE@ -OWNER = -o $(NEWSUSER) -g $(NEWSGROUP) -ROWNER = -o $(NEWSUSER) -g @RNEWSGRP@ +OWNER = +ROWNER = INSTALL = $(top)/support/install-sh -c @@ -259,17 +259,17 @@ ## files like active and newsgroups that should have the same permissions as ## article files. -LI_SPRI = $(LIBTOOL) $(INSTALL) -o root -g $(NEWSGROUP) -m 4550 -B .OLD -LI_XPRI = $(LIBTOOL) $(INSTALL) $(OWNER) -m 0550 -B .OLD -LI_XPUB = $(LIBTOOL) $(INSTALL) $(OWNER) -m 0555 -B .OLD +LI_SPRI = $(LIBTOOL) $(INSTALL) -m 4750 -B .OLD +LI_XPRI = $(LIBTOOL) $(INSTALL) $(OWNER) -m 0750 -B .OLD +LI_XPUB = $(LIBTOOL) $(INSTALL) $(OWNER) -m 0755 -B .OLD LI_INEWS = $(LIBTOOL) $(INSTALL) $(OWNER) -m $(INEWSMODE) -B .OLD LI_RNEWS = $(LIBTOOL) $(INSTALL) $(ROWNER) -m $(RNEWSMODE) -B .OLD CP_RPRI = $(INSTALL) $(OWNER) -m 0640 -B .OLD CP_RPUB = $(INSTALL) $(OWNER) -m 0644 -B .OLD -CP_XPRI = $(INSTALL) $(OWNER) -m 0550 -B .OLD -CP_XPUB = $(INSTALL) $(OWNER) -m 0555 -B .OLD +CP_XPRI = $(INSTALL) $(OWNER) -m 0750 -B .OLD +CP_XPUB = $(INSTALL) $(OWNER) -m 0755 -B .OLD CP_DATA = $(INSTALL) $(OWNER) -m $(FILEMODE) -B .OLD --- inn-2.4.1/site/Makefile.old 2004-12-13 13:09:57.000000000 +0100 +++ inn-2.4.1/site/Makefile 2004-12-13 13:35:45.459938016 +0100 @@ -129,8 +129,6 @@ $D$(PATH_NEWSGROUPS): ; $(CP_DATA) newsgroups.minimal $@ $D$(PATH_ACTIVE_TIMES): touch $@ - chown $(NEWSUSER) $@ - chgrp $(NEWSGROUP) $@ chmod $(FILEMODE) $@ ## Remove files that are unchanged from the release version. --- inn-2.4.1/Makefile.old 2004-12-13 13:09:57.000000000 +0100 +++ inn-2.4.1/Makefile 2004-12-13 14:29:56.625685696 +0100 @@ -91,9 +91,9 @@ directories: @chmod +x support/install-sh for D in $(INSTDIRS) ; do \ - support/install-sh $(OWNER) -m 0755 -d $(D)$$D ; \ + support/install-sh $(OWNER) -m 0755 -d $(DESTDIR)/$$D ; \ done - support/install-sh $(OWNER) -m 0750 -d $(D)$(PATHRUN) + support/install-sh $(OWNER) -m 0750 -d $(DESTDIR)/$(PATHRUN) update: @chmod +x support/install-sh --- inn-2.4.1/samples/inn.conf.in.old 2004-12-13 13:09:57.000000000 +0100 +++ inn-2.4.1/samples/inn.conf.in 2004-12-13 13:31:12.475437968 +0100 @@ -21,7 +21,7 @@ organization: "A poorly-installed InterNetNews site" ovmethod: tradindexed hismethod: hisv6 -pathhost: @HOSTNAME@ +#pathhost: localhost pathnews: @prefix@ # General Settings @@ -73,7 +73,7 @@ allownewnews: true articlemmap: false -clienttimeout: 600 +clienttimeout: 1800 initialtimeout: 10 msgidcachesize: 10000 nnrpdcheckart: true @@ -122,7 +122,7 @@ # Monitoring -doinnwatch: true +doinnwatch: false innwatchbatchspace: 800 innwatchlibspace: 25000 innwatchloload: 1000 @@ -157,7 +157,7 @@ keepmmappedthreshold: 1024 #maxcmdreadsize: maxforks: 10 -nicekids: 4 +nicekids: 0 nicenewnews: 0 nicennrpd: 0 pauseretrytime: 300 inn-2.4.3.warn.patch: imap_connection.c | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE inn-2.4.3.warn.patch --- --- inn-2.4.3/innfeed/imap_connection.c.warn 2006-03-20 05:14:57.000000000 +0100 +++ inn-2.4.3/innfeed/imap_connection.c 2006-03-27 12:07:20.000000000 +0200 @@ -2452,7 +2452,7 @@ char *p; #ifdef HAVE_SASL - const char *mechusing; + const char *mechusing = NULL; char *inbase64; int inbase64len; int saslresult=SASL_NOMECH; From fedora-cvs-commits at redhat.com Mon Mar 27 13:10:15 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 27 Mar 2006 08:10:15 -0500 Subject: rpms/system-config-soundcard/devel system-config-soundcard-1.2.17-log.patch, NONE, 1.1 system-config-soundcard.spec, 1.37, 1.38 Message-ID: <200603271310.k2RDAF66000333@cvs.devel.redhat.com> Author: stransky Update of /cvs/dist/rpms/system-config-soundcard/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv317 Modified Files: system-config-soundcard.spec Added Files: system-config-soundcard-1.2.17-log.patch Log Message: added a log entry system-config-soundcard-1.2.17-log.patch: system-config-soundcard.logger | 1 + 1 files changed, 1 insertion(+) --- NEW FILE system-config-soundcard-1.2.17-log.patch --- --- system-config-soundcard-1.2.17/src/system-config-soundcard.logger.old 2006-03-27 15:05:30.000000000 +0200 +++ system-config-soundcard-1.2.17/src/system-config-soundcard.logger 2006-03-27 15:06:41.000000000 +0200 @@ -12,6 +12,7 @@ echo -e "------- /proc/asound/version --------\n`cat /proc/asound/version`\n" >> $LOG_FILE 2>&1 echo -e "------- rpm -q alsa-lib --------\n`rpm -q alsa-lib`\n" >> $LOG_FILE 2>&1 echo -e "------- rpm -q alsa-utils --------\n`rpm -q alsa-utils`\n" >> $LOG_FILE 2>&1 +echo -e "------- /proc/asound/cards --------\n`cat /proc/asound/cards`\n" >> $LOG_FILE 2>&1 echo -e "------- /proc/asound/modules --------\n`cat /proc/asound/modules`\n" >> $LOG_FILE 2>&1 echo -e "------- /proc/asound/pcm --------\n`cat /proc/asound/pcm`\n" >> $LOG_FILE 2>&1 echo -e "------- /etc/sysconfig/hwconf --------\n`cat /etc/sysconfig/hwconf`\n" >> $LOG_FILE 2>&1 Index: system-config-soundcard.spec =================================================================== RCS file: /cvs/dist/rpms/system-config-soundcard/devel/system-config-soundcard.spec,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- system-config-soundcard.spec 15 Mar 2006 09:46:26 -0000 1.37 +++ system-config-soundcard.spec 27 Mar 2006 13:10:12 -0000 1.38 @@ -1,7 +1,7 @@ Summary: A graphical interface for detecting and configuring soundcards Name: system-config-soundcard Version: 1.2.17 -Release: 4 +Release: 5 URL: http://fedora.redhat.com/projects/config-tools/redhat-config-soundcard.html License: GPL ExclusiveOS: Linux @@ -13,6 +13,7 @@ Patch1: system-config-soundcard-1.2.17-ok-button.patch Patch2: system-config-soundcard-1.2.17-save.patch Patch3: system-config-soundcard-1.2.17-volume.patch +Patch4: system-config-soundcard-1.2.17-log.patch BuildRequires: desktop-file-utils BuildRequires: gettext ExcludeArch: s390 s390x @@ -37,6 +38,7 @@ %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 %build make @@ -92,6 +94,9 @@ %ghost /root/scsound.log %changelog +* Wed Mar 27 2006 Martin Stransky 1.2.17-5 +- added a log entry + * Wed Mar 15 2006 Martin Stransky 1.2.17-4 - small fix in volume settings, inspired by #184299 From fedora-cvs-commits at redhat.com Mon Mar 27 13:48:08 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 27 Mar 2006 08:48:08 -0500 Subject: rpms/fribidi/devel .cvsignore, 1.2, 1.3 fribidi.spec, 1.8, 1.9 sources, 1.2, 1.3 Message-ID: <200603271348.k2RDm8se027977@cvs.devel.redhat.com> Author: caolanm Update of /cvs/dist/rpms/fribidi/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv27961 Modified Files: .cvsignore fribidi.spec sources Log Message: latest version Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/fribidi/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 9 Sep 2004 04:52:48 -0000 1.2 +++ .cvsignore 27 Mar 2006 13:48:06 -0000 1.3 @@ -1 +1,2 @@ fribidi-0.10.4.tar.bz2 +fribidi-0.10.7.tar.gz Index: fribidi.spec =================================================================== RCS file: /cvs/dist/rpms/fribidi/devel/fribidi.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- fribidi.spec 11 Feb 2006 02:46:37 -0000 1.8 +++ fribidi.spec 27 Mar 2006 13:48:06 -0000 1.9 @@ -1,9 +1,9 @@ Summary: Library implementing the Unicode Bidirectional Algorithm Name: fribidi -Version: 0.10.4 -Release: 8.2.1 -URL: http://freedesktop.org/Software/FriBidi -Source0: %{name}-%{version}.tar.bz2 +Version: 0.10.7 +Release: 1 +URL: http://fribidi.org +Source0: %{name}-%{version}.tar.gz License: LGPL Group: System Environment/Libraries BuildRoot: %{_tmppath}/%{name}-root @@ -56,6 +56,9 @@ %{_libdir}/pkgconfig/*.pc %changelog +* Mon Mar 27 2006 Caolan McNamara 0.10.7-1 +- latest version + * Fri Feb 10 2006 Jesse Keating - 0.10.4-8.2.1 - bump again for double-long bug on ppc(64) Index: sources =================================================================== RCS file: /cvs/dist/rpms/fribidi/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 9 Sep 2004 04:52:48 -0000 1.2 +++ sources 27 Mar 2006 13:48:06 -0000 1.3 @@ -1 +1 @@ -0f6e7ecca08e6e108dc06337f5b5cabf fribidi-0.10.4.tar.bz2 +0f602ed32869dbc551dc6bc83d8a3d28 fribidi-0.10.7.tar.gz From fedora-cvs-commits at redhat.com Mon Mar 27 14:24:28 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 27 Mar 2006 09:24:28 -0500 Subject: rpms/logwatch/devel logwatch-7.2.1-up2date.patch, NONE, 1.1 logwatch-7.3-samba.patch, NONE, 1.1 .cvsignore, 1.13, 1.14 logwatch.spec, 1.36, 1.37 sources, 1.13, 1.14 logwatch-7.2.1-audit.patch, 1.1, NONE logwatch-7.2.1-http.patch, 1.1, NONE logwatch-7.2.1-mountd.patch, 1.1, NONE logwatch-7.2.1-named.patch, 1.1, NONE logwatch-7.2.1-pam_unix.patch, 1.1, NONE logwatch-7.2.1-secure.patch, 1.1, NONE logwatch-7.2.1-smart.patch, 1.1, NONE logwatch-7.2.1-sshd.patch, 1.1, NONE Message-ID: <200603271424.k2REOSgl009603@cvs.devel.redhat.com> Author: varekova Update of /cvs/dist/rpms/logwatch/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv9588 Modified Files: .cvsignore logwatch.spec sources Added Files: logwatch-7.2.1-up2date.patch logwatch-7.3-samba.patch Removed Files: logwatch-7.2.1-audit.patch logwatch-7.2.1-http.patch logwatch-7.2.1-mountd.patch logwatch-7.2.1-named.patch logwatch-7.2.1-pam_unix.patch logwatch-7.2.1-secure.patch logwatch-7.2.1-smart.patch logwatch-7.2.1-sshd.patch Log Message: - update to 7.3 - added samba, up2date logwatch-7.2.1-up2date.patch: up2date | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletion(-) --- NEW FILE logwatch-7.2.1-up2date.patch --- --- logwatch-7.2.1/scripts/services/up2date.pom 2006-01-10 18:45:12.000000000 +0100 +++ logwatch-7.2.1/scripts/services/up2date 2006-03-24 15:02:15.000000000 +0100 @@ -38,7 +38,12 @@ ( $ThisLine =~ /^Error communicating with server\.\s+The message was:$/ ) or ( $ThisLine =~ /^Updating package profile/) or ( $ThisLine =~ /^Unable to import repomd/) or - ( $ThisLine =~ /^deleting \/var\/spool\/up2date\// ) ) { + ( $ThisLine =~ /^deleting \/var\/spool\/up2date\// ) or + ( $ThisLine =~ /^solving dep for: \[('.*')*\]/) or + ( $ThisLine =~ /^Adding [^ ]* to bootloader config/) or + ( $ThisLine =~ /^Modifying bootloader config to include the new kernel info/) or + ( $ThisLine =~ /^Running elilo with the new configuration/) ) { + # We don't care about these } elsif ( $ThisLine =~ s/^installing packages: ([^ ]+)/$1/ ) { $PackageInstalled{$ThisLine}++; logwatch-7.3-samba.patch: samba | 25 +++++++++++++++++++++++-- 1 files changed, 23 insertions(+), 2 deletions(-) --- NEW FILE logwatch-7.3-samba.patch --- --- logwatch-7.3/scripts/services/samba.pom 2005-11-22 19:37:56.000000000 +0100 +++ logwatch-7.3/scripts/services/samba 2006-03-27 14:49:52.000000000 +0200 @@ -51,6 +51,8 @@ $DbCorrupt = 0; $GetDomainMasterStatusFail = 0; %SIDnotvalid; +%RefConnect; +%CrFile; if ( $Debug >= 5 ) { print STDERR "\n\nDEBUG: Inside Samba Filter \n\n"; @@ -93,6 +95,7 @@ ($ThisLine =~ /start_async_dns/) or ($ThisLine =~ /timeout connecting to/) or ($ThisLine =~ /version .+ started/) or + ($ThisLine =~ /lib\/account_pol.c:account_policy_get\(204\) account_policy_get: tdb_fetch_uint32 failed for field \d+ \(.*\), returning 0/ ) or ($ThisLine =~ /===============================================================/) ) { #Don't care about these... @@ -198,6 +201,10 @@ $LockDbError{$Error}++; } elsif ( ($SID,$dsid) = ($ThisLine =~ /User administrator has Primary Group SID ([^ ]+), which conflicts with the domain sid ([^ ]+). Failing operation.$/)) { $SIDnotvalid{"$SID,$dsid"}++; + } elsif ( ($Addr) = ($ThisLine =~ /libsmb\/cliconnect.c:cli_connect\([0-9]+\) Error connecting to ([0-9.]*) \(Connection refused\)/)) { + $RefConnect{$Addr}++; + } elsif ( ($Name) = ($ThisLine =~ /passdb\/pdb_smbpasswd.c:startsmbfilepwent\([0-9]+\) startsmbfilepwent_internal: file ([^ ]*) did not exist. File successfully created./)) { + $CrFile{$Name}++; } elsif ( ($Location,$Reason) = ($ThisLine =~ /tdb_log\([0-9]+\) tdb\(([^ ]+)\): tdb_reopen: (open failed \([^ ]+\))/)) { $LockDbError{"$Location - $Reason"}++; } else { @@ -275,6 +282,20 @@ } } +if (keys %RefConnect) { + print "\nConnections Refused\n"; + foreach $Line (keys %RefConnect) { + print " Connection refused by $Line : $RefConnect{$Line} Time(s)\n"; + } +} + +if (keys %CrFile) { + print "\nCreated files\n"; + foreach $Line (keys %CrFile) { + print " file $Line did not exist. File succesfully created: $CrFile{$Line} Time(s)\n"; + } +} + if (($Detail >= 5) and (keys %PermissionDenied)) { print "\nPermission denied:\n"; foreach $user (sort {$a cmp $b} keys %PermissionDenied) { @@ -449,10 +470,10 @@ } if (keys %SIDnotvalid) { - print ("\n SID is not valid for the domain\n"); + print ("\nSID is not valid for the domain\n"); foreach $SIDLog (keys %SIDnotvalid) { ($SID,$dsid) = split(",",$SIDLog); - print "User administrator Primary Group SID ($SID) conflicts with the domain sid ($dsid): $SIDnotvalid{$SIDLog} Time(s) \n"; + print " User administrator Primary Group SID ($SID) conflicts with the domain sid ($dsid): $SIDnotvalid{$SIDLog} Time(s) \n"; } } Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/logwatch/devel/.cvsignore,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- .cvsignore 17 Mar 2006 09:12:20 -0000 1.13 +++ .cvsignore 27 Mar 2006 14:24:25 -0000 1.14 @@ -1 +1 @@ -logwatch-7.2.1.tar.gz +logwatch-7.3.tar.gz Index: logwatch.spec =================================================================== RCS file: /cvs/dist/rpms/logwatch/devel/logwatch.spec,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- logwatch.spec 17 Mar 2006 09:12:20 -0000 1.36 +++ logwatch.spec 27 Mar 2006 14:24:26 -0000 1.37 @@ -1,20 +1,14 @@ Summary: A log file analysis program. Name: logwatch -Version: 7.2.1 +Version: 7.3 Release: 1 License: MIT Group: Applications/System URL: http://www.logwatch.org/ Source: ftp://ftp.kaybee.org/pub/linux/logwatch-%{version}.tar.gz Patch2: logwatch-7.2.1-nosegfault.patch -Patch10: logwatch-7.2.1-pam_unix.patch -Patch11: logwatch-7.2.1-http.patch -Patch12: logwatch-7.2.1-sshd.patch -Patch13: logwatch-7.2.1-smart.patch -Patch14: logwatch-7.2.1-named.patch -Patch15: logwatch-7.2.1-audit.patch -Patch16: logwatch-7.2.1-secure.patch -Patch17: logwatch-7.2.1-mountd.patch +Patch3: logwatch-7.2.1-up2date.patch +Patch4: logwatch-7.3-samba.patch Requires: textutils sh-utils grep mailx BuildRoot: %{_tmppath}/logwatch-build @@ -29,14 +23,9 @@ %prep %setup -q %patch2 -p1 -%patch10 -p1 -%patch11 -p1 -%patch12 -p1 -%patch13 -p1 -%patch14 -p1 -%patch15 -p1 -%patch16 -p1 -%patch17 -p1 +%patch3 -p1 +%patch4 -p1 + %install @@ -138,6 +127,10 @@ %doc License project/CHANGES project/TODO %changelog +* Mon Mar 27 2006 Ivana Varekova 7.3-1 +- update to 7.3 +- added samba, up2date + * Fri Mar 17 2006 Ivana Varekova 7.2.1-1 - update to 7.2.1 - update nosegfault, pam_unix, http patches Index: sources =================================================================== RCS file: /cvs/dist/rpms/logwatch/devel/sources,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- sources 17 Mar 2006 09:12:20 -0000 1.13 +++ sources 27 Mar 2006 14:24:26 -0000 1.14 @@ -1 +1 @@ -a3b6f24d8976bbcf9e6e956891560635 logwatch-7.2.1.tar.gz +4a788202618a5a849b206c71c6b1766f logwatch-7.3.tar.gz --- logwatch-7.2.1-audit.patch DELETED --- --- logwatch-7.2.1-http.patch DELETED --- --- logwatch-7.2.1-mountd.patch DELETED --- --- logwatch-7.2.1-named.patch DELETED --- --- logwatch-7.2.1-pam_unix.patch DELETED --- --- logwatch-7.2.1-secure.patch DELETED --- --- logwatch-7.2.1-smart.patch DELETED --- --- logwatch-7.2.1-sshd.patch DELETED --- From fedora-cvs-commits at redhat.com Mon Mar 27 14:39:04 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 27 Mar 2006 09:39:04 -0500 Subject: rpms/cups/devel cups.spec,1.141,1.142 Message-ID: <200603271439.k2REd4OZ009758@cvs.devel.redhat.com> Author: twaugh Update of /cvs/dist/rpms/cups/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv9745 Modified Files: cups.spec Log Message: * Mon Mar 27 2006 Tim Waugh 1:1.2-0.2.rc1.1 - Ship a printers.conf file, and a client.conf file. That way, they get their SELinux file contexts set correctly. Index: cups.spec =================================================================== RCS file: /cvs/dist/rpms/cups/devel/cups.spec,v retrieving revision 1.141 retrieving revision 1.142 diff -u -r1.141 -r1.142 --- cups.spec 27 Mar 2006 10:20:44 -0000 1.141 +++ cups.spec 27 Mar 2006 14:39:02 -0000 1.142 @@ -7,7 +7,7 @@ Summary: Common Unix Printing System Name: cups Version: 1.2 -Release: 0.2.%{beta}.0 +Release: 0.2.%{beta}.1 License: GPL Group: System Environment/Daemons Source: ftp://ftp.easysw.com/pub/cups/test/cups-1.2%{beta}-source.tar.bz2 @@ -218,7 +218,9 @@ # Ship a generic postscript PPD file (#73061) install -c -m 644 %{SOURCE8} $RPM_BUILD_ROOT%{_datadir}/cups/model -# Ship a clients.conf file. +# Ship a printers.conf file, and a client.conf file. That way, they get +# their SELinux file contexts set correctly. +touch $RPM_BUILD_ROOT%{_sysconfdir}/cups/printers.conf touch $RPM_BUILD_ROOT%{_sysconfdir}/cups/client.conf # Ship an SSL directory @@ -370,6 +372,10 @@ %{cups_serverbin}/daemon/cups-lpd %changelog +* Mon Mar 27 2006 Tim Waugh 1:1.2-0.2.rc1.1 +- Ship a printers.conf file, and a client.conf file. That way, they get + their SELinux file contexts set correctly. + * Mon Mar 27 2006 Tim Waugh 1:1.2-0.2.rc1.0 - 1.2rc1. From fedora-cvs-commits at redhat.com Mon Mar 27 14:45:41 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 27 Mar 2006 09:45:41 -0500 Subject: rpms/cups/devel cups.spec,1.142,1.143 Message-ID: <200603271445.k2REjfFk009993@cvs.devel.redhat.com> Author: twaugh Update of /cvs/dist/rpms/cups/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv9979 Modified Files: cups.spec Log Message: Include printers.conf in the manifest. Index: cups.spec =================================================================== RCS file: /cvs/dist/rpms/cups/devel/cups.spec,v retrieving revision 1.142 retrieving revision 1.143 diff -u -r1.142 -r1.143 --- cups.spec 27 Mar 2006 14:39:02 -0000 1.142 +++ cups.spec 27 Mar 2006 14:45:39 -0000 1.143 @@ -296,6 +296,7 @@ %config(noreplace) %attr(0640,root,nobody) /etc/cups/cupsd.conf %attr(0640,root,nobody) /etc/cups/cupsd.conf.default %config(noreplace) %attr(0644,root,nobody) /etc/cups/client.conf +%config(noreplace) %attr(0600,root,nobody) /etc/cups/printers.conf /etc/cups/interfaces %config(noreplace) /etc/cups/mime.types %config(noreplace) /etc/cups/mime.convs From fedora-cvs-commits at redhat.com Mon Mar 27 14:57:07 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 27 Mar 2006 09:57:07 -0500 Subject: rpms/kbd/devel kbd-1.12-resizecon-man.patch, NONE, 1.1 kbd.spec, 1.29, 1.30 Message-ID: <200603271457.k2REv7r3023818@cvs.devel.redhat.com> Author: mitr Update of /cvs/dist/rpms/kbd/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv23803 Modified Files: kbd.spec Added Files: kbd-1.12-resizecon-man.patch Log Message: * Mon Mar 27 2006 Miloslav Trmac - 1.12-14 - Don't install resizecons.8 on non-x86 (#186877, patch by Keiichi Mori ) kbd-1.12-resizecon-man.patch: Makefile | 5 +++++ 1 files changed, 5 insertions(+) --- NEW FILE kbd-1.12-resizecon-man.patch --- Patch by Keiichi Mori . --- kbd-1.12/man/Makefile.orig 2002-10-12 07:12:53.000000000 +0900 +++ kbd-1.12/man/Makefile 2006-03-27 09:17:54.000000000 +0900 @@ -1,3 +1,5 @@ +include ../make_include + # Generated files GEN1=man1/dumpkeys.1 man1/loadkeys.1 GEN8=man8/setfont.8 man8/loadunimap.8 man8/mapscrn.8 @@ -8,6 +10,9 @@ install -m 644 $$i/*.[0-9] $(MANDIR)/$$i; \ done rm -f $(MANDIR)/man5/keytables.5 + if [ $(ARCH) != i386 ]; then \ + rm -f $(MANDIR)/man8/resizecons.8; \ + fi clean: rm -f $(GEN1) $(GEN8) Index: kbd.spec =================================================================== RCS file: /cvs/dist/rpms/kbd/devel/kbd.spec,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- kbd.spec 11 Feb 2006 03:43:33 -0000 1.29 +++ kbd.spec 27 Mar 2006 14:57:05 -0000 1.30 @@ -1,7 +1,7 @@ Summary: Tools for configuring the console (keyboard, virtual terminals, etc.) Name: kbd Version: 1.12 -Release: 13.2 +Release: 14 License: GPL Group: System Environment/Base Source0: ftp://ftp.kernel.org/pub/linux/utils/kbd/kbd-%{version}.tar.bz2 @@ -21,6 +21,7 @@ Patch7: kbd-1.12-alias.patch Patch8: kbd-1.12-dir.patch Patch9: kbd-1.12-no-user-map.patch +Patch10: kbd-1.12-resizecon-man.patch Obsoletes: console-tools Provides: console-tools Conflicts: util-linux < 2.11r-9 @@ -45,6 +46,7 @@ %patch7 -p1 -b .alias %patch8 -p1 -b .dir %patch9 -p1 -b .no-user-map +%patch10 -p1 -b .resizecon-man # 7-bit maps are obsolete; so are non-euro maps pushd data/keymaps/i386 @@ -121,6 +123,10 @@ %config %{_sysconfdir}/pam.d/* %changelog +* Mon Mar 27 2006 Miloslav Trmac - 1.12-14 +- Don't install resizecons.8 on non-x86 (#186877, patch by Keiichi Mori + ) + * Fri Feb 10 2006 Jesse Keating - 1.12-13.2 - bump again for double-long bug on ppc(64) From fedora-cvs-commits at redhat.com Mon Mar 27 15:01:41 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 27 Mar 2006 10:01:41 -0500 Subject: rpms/kernel/FC-5 0001-support-for-context-based-audit-filtering.patch, NONE, 1.1.4.1 0002-support-for-context-based-audit-filtering.patch, NONE, 1.1.4.1 0003-Inotify-kernel-API.patch, NONE, 1.1.4.1 0004-filesystem-location-based-auditing.patch, NONE, 1.1.4.1 linux-2.6-audit-git.patch, NONE, 1.1.16.1 linux-2.6-audit-slab-leak-tracking.patch, NONE, 1.1.4.1 linux-2.6-audit-sockaddr.patch, NONE, 1.1.2.1 kernel-2.6.spec, 1.2074, 1.2074.2.1 Message-ID: <200603271501.k2RF1f5x023975@cvs.devel.redhat.com> Author: sgrubb Update of /cvs/dist/rpms/kernel/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv23915 Modified Files: Tag: private-lspp-14-branch kernel-2.6.spec Added Files: Tag: private-lspp-14-branch 0001-support-for-context-based-audit-filtering.patch 0002-support-for-context-based-audit-filtering.patch 0003-Inotify-kernel-API.patch 0004-filesystem-location-based-auditing.patch linux-2.6-audit-git.patch linux-2.6-audit-slab-leak-tracking.patch linux-2.6-audit-sockaddr.patch Log Message: * Mon Mar 27 2006 Steve Grubb - lspp.14 kernel 0001-support-for-context-based-audit-filtering.patch: include/linux/audit.h | 5 include/linux/selinux.h | 112 +++++++++++++++++++ security/selinux/Makefile | 2 security/selinux/avc.c | 13 +- security/selinux/exports.c | 28 ++++ security/selinux/ss/mls.c | 30 +++++ security/selinux/ss/mls.h | 4 security/selinux/ss/services.c | 235 ++++++++++++++++++++++++++++++++++++++++- 8 files changed, 419 insertions(+), 10 deletions(-) --- NEW FILE 0001-support-for-context-based-audit-filtering.patch --- >From nobody Mon Sep 17 00:00:00 2001 Subject: [PATCH] support for context based audit filtering From: Darrel Goeddel Date: 1140817445 -0600 Stephen Smalley wrote: > On Thu, 2006-02-23 at 11:42 -0600, Darrel Goeddel wrote: > >>diff --git a/security/selinux/ss/mls.c b/security/selinux/ss/mls.c >>index 640d0bf..df358be 100644 >>--- a/security/selinux/ss/mls.c >>+++ b/security/selinux/ss/mls.c >>@@ -385,6 +385,31 @@ out: >> } >> >> /* >>+ * Set the MLS fields in the security context structure >>+ * `context' based on the string representation in >>+ * the string `str'. This function will allocate temporary memory with the >>+ * given constraints of gfp_mask. >>+ */ >>+int mls_from_string(char *str, struct context *context, gfp_t gfp_mask) >>+{ >>+ char *tmpstr, *freestr; >>+ int rc; > > > Likely should be checking selinux_mls_enabled on entry and returning an > error in that case (mls_context_to_sid will just return 0 in that case). > > >>diff --git a/security/selinux/ss/services.c b/security/selinux/ss/services.c >>index d877cd1..a2ad2cd 100644 >>--- a/security/selinux/ss/services.c >>+++ b/security/selinux/ss/services.c > > > Need to #include now to pick up the function > prototypes for the selinux_audit_ functions to ensure that they are > checked against the real functions. > > >>+ default: >>+ /* only the above fileds are valid */ > > > Nit: Typo in comment. > > Otherwise, looks good. Fixed up those two issues. I also fixed a compilation problem when selinux support is not compiled in, and a possible oops when selinux is compiled in but not initialized (including being disabled at runtime). The final version is below. -- The following patch provides selinux interfaces that will allow the audit system to perform filtering based on the process context (user, role, type, sensitivity, and clearance). These interfaces will allow the selinux module to perform efficient matches based on lower level selinux constructs, rather than relying on context retrievals and string comparisons within the audit module. It also allows for dominance checks on the mls portion of the contexts that are impossible with only string comparisons. Signed-off-by: Darrel Goeddel Signed-off-by: Al Viro --- include/linux/audit.h | 5 + include/linux/selinux.h | 112 +++++++++++++++++++ security/selinux/Makefile | 2 security/selinux/avc.c | 13 +- security/selinux/exports.c | 28 +++++ security/selinux/ss/mls.c | 30 +++++ security/selinux/ss/mls.h | 4 + security/selinux/ss/services.c | 235 ++++++++++++++++++++++++++++++++++++++++ 8 files changed, 419 insertions(+), 10 deletions(-) create mode 100644 include/linux/selinux.h create mode 100644 security/selinux/exports.c c938961808975be03ed5473f44301b2400af9a86 diff --git a/include/linux/audit.h b/include/linux/audit.h index 1c47c59..41b0813 100644 --- a/include/linux/audit.h +++ b/include/linux/audit.h @@ -145,6 +145,11 @@ #define AUDIT_PERS 10 #define AUDIT_ARCH 11 #define AUDIT_MSGTYPE 12 +#define AUDIT_SE_USER 13 /* security label user */ +#define AUDIT_SE_ROLE 14 /* security label role */ +#define AUDIT_SE_TYPE 15 /* security label type */ +#define AUDIT_SE_SEN 16 /* security label sensitivity label */ +#define AUDIT_SE_CLR 17 /* security label clearance label */ /* These are ONLY useful when checking * at syscall exit time (AUDIT_AT_EXIT). */ diff --git a/include/linux/selinux.h b/include/linux/selinux.h new file mode 100644 index 0000000..9d684b1 --- /dev/null +++ b/include/linux/selinux.h @@ -0,0 +1,112 @@ +/* + * SELinux services exported to the rest of the kernel. + * + * Author: James Morris + * + * Copyright (C) 2005 Red Hat, Inc., James Morris + * Copyright (C) 2006 Trusted Computer Solutions, Inc. + * + * 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. + */ +#ifndef _LINUX_SELINUX_H +#define _LINUX_SELINUX_H + +struct selinux_audit_rule; +struct audit_context; + +#ifdef CONFIG_SECURITY_SELINUX + +/** + * selinux_audit_rule_init - alloc/init an selinux audit rule structure. + * @field: the field this rule refers to + * @op: the operater the rule uses + * @rulestr: the text "target" of the rule + * @rule: pointer to the new rule structure returned via this + * + * Returns 0 if successful, -errno if not. On success, the rule structure + * will be allocated internally. The caller must free this structure with + * selinux_audit_rule_free() after use. + */ +int selinux_audit_rule_init(u32 field, u32 op, char *rulestr, + struct selinux_audit_rule **rule); + +/** + * selinux_audit_rule_free - free an selinux audit rule structure. + * @rule: pointer to the audit rule to be freed + * + * This will free all memory associated with the given rule. + * If @rule is NULL, no operation is performed. + */ +void selinux_audit_rule_free(struct selinux_audit_rule *rule); + +/** + * selinux_audit_rule_match - determine if a context ID matches a rule. + * @ctxid: the context ID to check + * @field: the field this rule refers to + * @op: the operater the rule uses + * @rule: pointer to the audit rule to check against + * @actx: the audit context (can be NULL) associated with the check + * + * Returns 1 if the context id matches the rule, 0 if it does not, and + * -errno on failure. + */ +int selinux_audit_rule_match(u32 ctxid, u32 field, u32 op, + struct selinux_audit_rule *rule, + struct audit_context *actx); + +/** + * selinux_audit_set_callback - set the callback for policy reloads. + * @callback: the function to call when the policy is reloaded + * + * This sets the function callback function that will update the rules + * upon policy reloads. This callback should rebuild all existing rules + * using selinux_audit_rule_init(). + */ +void selinux_audit_set_callback(int (*callback)(void)); + +/** + * selinux_task_ctxid - determine a context ID for a process. + * @tsk: the task object + * @ctxid: ID value returned via this + * + * On return, ctxid will contain an ID for the context. This value + * should only be used opaquely. + */ +void selinux_task_ctxid(struct task_struct *tsk, u32 *ctxid); + +#else + +static inline int selinux_audit_rule_init(u32 field, u32 op, + char *rulestr, + struct selinux_audit_rule **rule) +{ + return -ENOTSUPP; +} + +static inline void selinux_audit_rule_free(struct selinux_audit_rule *rule) +{ + return; +} + +static inline int selinux_audit_rule_match(u32 ctxid, u32 field, u32 op, + struct selinux_audit_rule *rule, + struct audit_context *actx) +{ + return 0; +} + +static inline void selinux_audit_set_callback(int (*callback)(void)) +{ + return; +} + +static inline void selinux_task_ctxid(struct task_struct *tsk, u32 *ctxid) +{ + *ctxid = 0; +} + +#endif /* CONFIG_SECURITY_SELINUX */ + +#endif /* _LINUX_SELINUX_H */ diff --git a/security/selinux/Makefile b/security/selinux/Makefile index 688c0a2..faf2e02 100644 --- a/security/selinux/Makefile +++ b/security/selinux/Makefile @@ -4,7 +4,7 @@ obj-$(CONFIG_SECURITY_SELINUX) := selinux.o ss/ -selinux-y := avc.o hooks.o selinuxfs.o netlink.o nlmsgtab.o netif.o +selinux-y := avc.o hooks.o selinuxfs.o netlink.o nlmsgtab.o netif.o exports.o selinux-$(CONFIG_SECURITY_NETWORK_XFRM) += xfrm.o diff --git a/security/selinux/avc.c b/security/selinux/avc.c index ac5d69b..a300702 100644 --- a/security/selinux/avc.c +++ b/security/selinux/avc.c @@ -800,7 +800,7 @@ out: int avc_ss_reset(u32 seqno) { struct avc_callback_node *c; - int i, rc = 0; + int i, rc = 0, tmprc; unsigned long flag; struct avc_node *node; @@ -813,15 +813,16 @@ int avc_ss_reset(u32 seqno) for (c = avc_callbacks; c; c = c->next) { if (c->events & AVC_CALLBACK_RESET) { - rc = c->callback(AVC_CALLBACK_RESET, - 0, 0, 0, 0, NULL); - if (rc) - goto out; + tmprc = c->callback(AVC_CALLBACK_RESET, + 0, 0, 0, 0, NULL); + /* save the first error encountered for the return + value and continue processing the callbacks */ + if (!rc) + rc = tmprc; } } avc_latest_notif_update(seqno, 0); -out: return rc; } diff --git a/security/selinux/exports.c b/security/selinux/exports.c new file mode 100644 index 0000000..333c4c7 --- /dev/null +++ b/security/selinux/exports.c @@ -0,0 +1,28 @@ +/* + * SELinux services exported to the rest of the kernel. + * + * Author: James Morris + * + * Copyright (C) 2005 Red Hat, Inc., James Morris + * Copyright (C) 2006 Trusted Computer Solutions, Inc. + * + * 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 "security.h" +#include "objsec.h" + +void selinux_task_ctxid(struct task_struct *tsk, u32 *ctxid) +{ + struct task_security_struct *tsec = tsk->security; + if (selinux_enabled) + *ctxid = tsec->sid; + else + *ctxid = 0; +} diff --git a/security/selinux/ss/mls.c b/security/selinux/ss/mls.c index 640d0bf..fc34f87 100644 --- a/security/selinux/ss/mls.c +++ b/security/selinux/ss/mls.c @@ -8,7 +8,7 @@ * * Support for enhanced MLS infrastructure. * - * Copyright (C) 2004-2005 Trusted Computer Solutions, Inc. + * Copyright (C) 2004-2006 Trusted Computer Solutions, Inc. */ #include @@ -385,6 +385,34 @@ out: } /* + * Set the MLS fields in the security context structure + * `context' based on the string representation in + * the string `str'. This function will allocate temporary memory with the + * given constraints of gfp_mask. + */ +int mls_from_string(char *str, struct context *context, gfp_t gfp_mask) +{ + char *tmpstr, *freestr; + int rc; + + if (!selinux_mls_enabled) + return -EINVAL; + + /* we need freestr because mls_context_to_sid will change + the value of tmpstr */ + tmpstr = freestr = kstrdup(str, gfp_mask); + if (!tmpstr) { + rc = -ENOMEM; + } else { + rc = mls_context_to_sid(':', &tmpstr, context, + NULL, SECSID_NULL); + kfree(freestr); + } + + return rc; +} + +/* * Copies the effective MLS range from `src' into `dst'. */ static inline int mls_scopy_context(struct context *dst, diff --git a/security/selinux/ss/mls.h b/security/selinux/ss/mls.h index 03de697..fbb42f0 100644 --- a/security/selinux/ss/mls.h +++ b/security/selinux/ss/mls.h @@ -8,7 +8,7 @@ * * Support for enhanced MLS infrastructure. * - * Copyright (C) 2004-2005 Trusted Computer Solutions, Inc. + * Copyright (C) 2004-2006 Trusted Computer Solutions, Inc. */ #ifndef _SS_MLS_H_ @@ -27,6 +27,8 @@ int mls_context_to_sid(char oldc, struct sidtab *s, u32 def_sid); +int mls_from_string(char *str, struct context *context, gfp_t gfp_mask); + int mls_convert_context(struct policydb *oldp, struct policydb *newp, struct context *context); diff --git a/security/selinux/ss/services.c b/security/selinux/ss/services.c index d877cd1..ce9378e 100644 --- a/security/selinux/ss/services.c +++ b/security/selinux/ss/services.c @@ -7,12 +7,13 @@ * Updated: Trusted Computer Solutions, Inc. * * Support for enhanced MLS infrastructure. + * Support for context based audit filters. * * Updated: Frank Mayer and Karl MacMillan * * Added conditional policy language extensions * - * Copyright (C) 2004-2005 Trusted Computer Solutions, Inc. + * Copyright (C) 2004-2006 Trusted Computer Solutions, Inc. * Copyright (C) 2003 - 2004 Tresys Technology, LLC * Copyright (C) 2003 Red Hat, Inc., James Morris * This program is free software; you can redistribute it and/or modify @@ -1810,3 +1811,235 @@ out: POLICY_RDUNLOCK; return rc; } + +struct selinux_audit_rule { + u32 au_seqno; + struct context au_ctxt; +}; + +void selinux_audit_rule_free(struct selinux_audit_rule *rule) +{ + if (rule) { + context_destroy(&rule->au_ctxt); + kfree(rule); + } +} + +int selinux_audit_rule_init(u32 field, u32 op, char *rulestr, + struct selinux_audit_rule **rule) +{ + struct selinux_audit_rule *tmprule; + struct role_datum *roledatum; + struct type_datum *typedatum; + struct user_datum *userdatum; + int rc = 0; + + *rule = NULL; + + if (!ss_initialized) + return -ENOTSUPP; + + switch (field) { + case AUDIT_SE_USER: + case AUDIT_SE_ROLE: + case AUDIT_SE_TYPE: + /* only 'equals' and 'not equals' fit user, role, and type */ + if (op != AUDIT_EQUAL && op != AUDIT_NOT_EQUAL) + return -EINVAL; + break; + case AUDIT_SE_SEN: + case AUDIT_SE_CLR: + /* we do not allow a range, indicated by the presense of '-' */ + if (strchr(rulestr, '-')) + return -EINVAL; + break; + default: + /* only the above fields are valid */ + return -EINVAL; + } + + tmprule = kzalloc(sizeof(struct selinux_audit_rule), GFP_KERNEL); + if (!tmprule) + return -ENOMEM; + + context_init(&tmprule->au_ctxt); + + POLICY_RDLOCK; + + tmprule->au_seqno = latest_granting; + + switch (field) { + case AUDIT_SE_USER: + userdatum = hashtab_search(policydb.p_users.table, rulestr); + if (!userdatum) + rc = -EINVAL; + else + tmprule->au_ctxt.user = userdatum->value; + break; + case AUDIT_SE_ROLE: + roledatum = hashtab_search(policydb.p_roles.table, rulestr); + if (!roledatum) + rc = -EINVAL; + else + tmprule->au_ctxt.role = roledatum->value; + break; + case AUDIT_SE_TYPE: + typedatum = hashtab_search(policydb.p_types.table, rulestr); + if (!typedatum) + rc = -EINVAL; + else + tmprule->au_ctxt.type = typedatum->value; + break; + case AUDIT_SE_SEN: + case AUDIT_SE_CLR: + rc = mls_from_string(rulestr, &tmprule->au_ctxt, GFP_ATOMIC); + break; + } + + POLICY_RDUNLOCK; + + if (rc) { + selinux_audit_rule_free(tmprule); + tmprule = NULL; + } + + *rule = tmprule; + + return rc; +} + +int selinux_audit_rule_match(u32 ctxid, u32 field, u32 op, + struct selinux_audit_rule *rule, + struct audit_context *actx) +{ + struct context *ctxt; + struct mls_level *level; + int match = 0; + + if (!rule) { + audit_log(actx, GFP_ATOMIC, AUDIT_SELINUX_ERR, + "selinux_audit_rule_match: missing rule\n"); + return -ENOENT; + } + + POLICY_RDLOCK; + + if (rule->au_seqno < latest_granting) { + audit_log(actx, GFP_ATOMIC, AUDIT_SELINUX_ERR, + "selinux_audit_rule_match: stale rule\n"); + match = -ESTALE; + goto out; + } + + ctxt = sidtab_search(&sidtab, ctxid); + if (!ctxt) { + audit_log(actx, GFP_ATOMIC, AUDIT_SELINUX_ERR, + "selinux_audit_rule_match: unrecognized SID %d\n", + ctxid); + match = -ENOENT; + goto out; + } + + /* a field/op pair that is not caught here will simply fall through + without a match */ + switch (field) { + case AUDIT_SE_USER: + switch (op) { + case AUDIT_EQUAL: + match = (ctxt->user == rule->au_ctxt.user); + break; + case AUDIT_NOT_EQUAL: + match = (ctxt->user != rule->au_ctxt.user); + break; + } + break; + case AUDIT_SE_ROLE: + switch (op) { + case AUDIT_EQUAL: + match = (ctxt->role == rule->au_ctxt.role); + break; + case AUDIT_NOT_EQUAL: + match = (ctxt->role != rule->au_ctxt.role); + break; + } + break; + case AUDIT_SE_TYPE: + switch (op) { + case AUDIT_EQUAL: + match = (ctxt->type == rule->au_ctxt.type); + break; + case AUDIT_NOT_EQUAL: + match = (ctxt->type != rule->au_ctxt.type); + break; + } + break; + case AUDIT_SE_SEN: + case AUDIT_SE_CLR: + level = (op == AUDIT_SE_SEN ? + &ctxt->range.level[0] : &ctxt->range.level[1]); + switch (op) { + case AUDIT_EQUAL: + match = mls_level_eq(&rule->au_ctxt.range.level[0], + level); + break; + case AUDIT_NOT_EQUAL: + match = !mls_level_eq(&rule->au_ctxt.range.level[0], + level); + break; + case AUDIT_LESS_THAN: + match = (mls_level_dom(&rule->au_ctxt.range.level[0], + level) && + !mls_level_eq(&rule->au_ctxt.range.level[0], + level)); + break; + case AUDIT_LESS_THAN_OR_EQUAL: + match = mls_level_dom(&rule->au_ctxt.range.level[0], + level); + break; + case AUDIT_GREATER_THAN: + match = (mls_level_dom(level, + &rule->au_ctxt.range.level[0]) && + !mls_level_eq(level, + &rule->au_ctxt.range.level[0])); + break; + case AUDIT_GREATER_THAN_OR_EQUAL: + match = mls_level_dom(level, + &rule->au_ctxt.range.level[0]); + break; + } + } + +out: + POLICY_RDUNLOCK; + return match; +} + +static int (*aurule_callback)(void) = NULL; + +static int aurule_avc_callback(u32 event, u32 ssid, u32 tsid, + u16 class, u32 perms, u32 *retained) +{ + int err = 0; + + if (event == AVC_CALLBACK_RESET && aurule_callback) + err = aurule_callback(); + return err; +} + +static int __init aurule_init(void) +{ + int err; + + err = avc_add_callback(aurule_avc_callback, AVC_CALLBACK_RESET, + SECSID_NULL, SECSID_NULL, SECCLASS_NULL, 0); + if (err) + panic("avc_add_callback() failed, error %d\n", err); + + return err; +} +__initcall(aurule_init); + +void selinux_audit_set_callback(int (*callback)(void)) +{ + aurule_callback = callback; +} -- 0.99.9.GIT 0002-support-for-context-based-audit-filtering.patch: audit.c | 8 + audit.h | 10 +- auditfilter.c | 245 ++++++++++++++++++++++++++++++++++++++++++++++++++++------ auditsc.c | 20 ++++ 4 files changed, 256 insertions(+), 27 deletions(-) --- NEW FILE 0002-support-for-context-based-audit-filtering.patch --- >From nobody Mon Sep 17 00:00:00 2001 Subject: [PATCH] support for context based audit filtering From: Darrel Goeddel Date: 1142036046 -0600 Darrel Goeddel wrote: > I like 'em. Here is a new patch that incorporates them. It also moves the > initialization call to selinux into the audit_init function as you had > suggested earlier. Look right? > The GFP_ATOMIC allocations are not necessary (noted on IRC). This version switches to GFP_KERNEL and gets rid of the gfp_mask argument to audit_init_entry(). -- Darrel Signed-off-by: Al Viro --- kernel/audit.c | 8 ++ kernel/audit.h | 10 +- kernel/auditfilter.c | 245 +++++++++++++++++++++++++++++++++++++++++++++----- kernel/auditsc.c | 20 ++++ 4 files changed, 256 insertions(+), 27 deletions(-) 1195ec220416c47699a08c8f4b7a464c380b6c00 diff --git a/kernel/audit.c b/kernel/audit.c index 04fe2e3..65e1d03 100644 --- a/kernel/audit.c +++ b/kernel/audit.c @@ -55,6 +55,9 @@ #include #include #include +#include + +#include "audit.h" /* No auditing will take place until audit_initialized != 0. * (Initialization happens after skb_init is called.) */ @@ -564,6 +567,11 @@ static int __init audit_init(void) skb_queue_head_init(&audit_skb_queue); audit_initialized = 1; audit_enabled = audit_default; + + /* Register the callback with selinux. This callback will be invoked + * when a new policy is loaded. */ + selinux_audit_set_callback(&selinux_audit_rule_update); + audit_log(NULL, GFP_KERNEL, AUDIT_KERNEL, "initialized"); return 0; } diff --git a/kernel/audit.h b/kernel/audit.h index bc53920..6f73392 100644 --- a/kernel/audit.h +++ b/kernel/audit.h @@ -54,9 +54,11 @@ enum audit_state { /* Rule lists */ struct audit_field { - u32 type; - u32 val; - u32 op; + u32 type; + u32 val; + u32 op; + char *se_str; + struct selinux_audit_rule *se_rule; }; struct audit_krule { @@ -86,3 +88,5 @@ extern void audit_send_reply(int pi extern void audit_log_lost(const char *message); extern void audit_panic(const char *message); extern struct mutex audit_netlink_mutex; + +extern int selinux_audit_rule_update(void); diff --git a/kernel/auditfilter.c b/kernel/auditfilter.c index d3a8539..4d2023a 100644 --- a/kernel/auditfilter.c +++ b/kernel/auditfilter.c @@ -23,6 +23,7 @@ #include #include #include +#include #include "audit.h" /* There are three lists of rules -- one to search at task creation @@ -42,6 +43,13 @@ struct list_head audit_filter_list[AUDIT static inline void audit_free_rule(struct audit_entry *e) { + int i; + if (e->rule.fields) + for (i = 0; i < e->rule.field_count; i++) { + struct audit_field *f = &e->rule.fields[i]; + kfree(f->se_str); + selinux_audit_rule_free(f->se_rule); + } kfree(e->rule.fields); kfree(e); } @@ -52,9 +60,29 @@ static inline void audit_free_rule_rcu(s audit_free_rule(e); } +/* Initialize an audit filterlist entry. */ +static inline struct audit_entry *audit_init_entry(u32 field_count) +{ + struct audit_entry *entry; + struct audit_field *fields; + + entry = kzalloc(sizeof(*entry), GFP_KERNEL); + if (unlikely(!entry)) + return NULL; + + fields = kzalloc(sizeof(*fields) * field_count, GFP_KERNEL); + if (unlikely(!fields)) { + kfree(entry); + return NULL; + } + entry->rule.fields = fields; + + return entry; +} + /* Unpack a filter field's string representation from user-space * buffer. */ -static __attribute__((unused)) char *audit_unpack_string(void **bufp, size_t *remain, size_t len) +static char *audit_unpack_string(void **bufp, size_t *remain, size_t len) { char *str; @@ -84,7 +112,6 @@ static inline struct audit_entry *audit_ { unsigned listnr; struct audit_entry *entry; - struct audit_field *fields; int i, err; err = -EINVAL; @@ -108,23 +135,14 @@ static inline struct audit_entry *audit_ goto exit_err; err = -ENOMEM; - entry = kmalloc(sizeof(*entry), GFP_KERNEL); - if (unlikely(!entry)) - goto exit_err; - fields = kmalloc(sizeof(*fields) * rule->field_count, GFP_KERNEL); - if (unlikely(!fields)) { - kfree(entry); + entry = audit_init_entry(rule->field_count); + if (!entry) goto exit_err; - } - - memset(&entry->rule, 0, sizeof(struct audit_krule)); - memset(fields, 0, sizeof(struct audit_field)); entry->rule.flags = rule->flags & AUDIT_FILTER_PREPEND; entry->rule.listnr = listnr; entry->rule.action = rule->action; entry->rule.field_count = rule->field_count; - entry->rule.fields = fields; for (i = 0; i < AUDIT_BITMASK_SIZE; i++) entry->rule.mask[i] = rule->mask[i]; @@ -150,15 +168,20 @@ static struct audit_entry *audit_rule_to for (i = 0; i < rule->field_count; i++) { struct audit_field *f = &entry->rule.fields[i]; - if (rule->fields[i] & AUDIT_UNUSED_BITS) { - err = -EINVAL; - goto exit_free; - } - f->op = rule->fields[i] & (AUDIT_NEGATE|AUDIT_OPERATORS); f->type = rule->fields[i] & ~(AUDIT_NEGATE|AUDIT_OPERATORS); f->val = rule->values[i]; + if (f->type & AUDIT_UNUSED_BITS || + f->type == AUDIT_SE_USER || + f->type == AUDIT_SE_ROLE || + f->type == AUDIT_SE_TYPE || + f->type == AUDIT_SE_SEN || + f->type == AUDIT_SE_CLR) { + err = -EINVAL; + goto exit_free; + } + entry->rule.vers_ops = (f->op & AUDIT_OPERATORS) ? 2 : 1; /* Support for legacy operators where @@ -188,8 +211,9 @@ static struct audit_entry *audit_data_to int err = 0; struct audit_entry *entry; void *bufp; - /* size_t remain = datasz - sizeof(struct audit_rule_data); */ + size_t remain = datasz - sizeof(struct audit_rule_data); int i; + char *str; entry = audit_to_entry_common((struct audit_rule *)data); if (IS_ERR(entry)) @@ -207,10 +231,35 @@ static struct audit_entry *audit_data_to f->op = data->fieldflags[i] & AUDIT_OPERATORS; f->type = data->fields[i]; + f->val = data->values[i]; + f->se_str = NULL; + f->se_rule = NULL; switch(f->type) { - /* call type-specific conversion routines here */ - default: - f->val = data->values[i]; + case AUDIT_SE_USER: + case AUDIT_SE_ROLE: + case AUDIT_SE_TYPE: + case AUDIT_SE_SEN: + case AUDIT_SE_CLR: + str = audit_unpack_string(&bufp, &remain, f->val); + if (IS_ERR(str)) + goto exit_free; + entry->rule.buflen += f->val; + + err = selinux_audit_rule_init(f->type, f->op, str, + &f->se_rule); + /* Keep currently invalid fields around in case they + * become valid after a policy reload. */ + if (err == -EINVAL) { + printk(KERN_WARNING "audit rule for selinux " + "\'%s\' is invalid\n", str); + err = 0; + } + if (err) { + kfree(str); + goto exit_free; + } else + f->se_str = str; + break; } } @@ -286,7 +335,14 @@ static struct audit_rule_data *audit_kru data->fields[i] = f->type; data->fieldflags[i] = f->op; switch(f->type) { - /* call type-specific conversion routines here */ + case AUDIT_SE_USER: + case AUDIT_SE_ROLE: + case AUDIT_SE_TYPE: + case AUDIT_SE_SEN: + case AUDIT_SE_CLR: + data->buflen += data->values[i] = + audit_pack_string(&bufp, f->se_str); + break; default: data->values[i] = f->val; } @@ -314,7 +370,14 @@ static int audit_compare_rule(struct aud return 1; switch(a->fields[i].type) { - /* call type-specific comparison routines here */ + case AUDIT_SE_USER: + case AUDIT_SE_ROLE: + case AUDIT_SE_TYPE: + case AUDIT_SE_SEN: + case AUDIT_SE_CLR: + if (strcmp(a->fields[i].se_str, b->fields[i].se_str)) + return 1; + break; default: if (a->fields[i].val != b->fields[i].val) return 1; @@ -328,6 +391,81 @@ static int audit_compare_rule(struct aud return 0; } +/* Duplicate selinux field information. The se_rule is opaque, so must be + * re-initialized. */ +static inline int audit_dupe_selinux_field(struct audit_field *df, + struct audit_field *sf) +{ + int ret = 0; + char *se_str; + + /* our own copy of se_str */ + se_str = kstrdup(sf->se_str, GFP_KERNEL); + if (unlikely(IS_ERR(se_str))) + return -ENOMEM; + df->se_str = se_str; + + /* our own (refreshed) copy of se_rule */ + ret = selinux_audit_rule_init(df->type, df->op, df->se_str, + &df->se_rule); + /* Keep currently invalid fields around in case they + * become valid after a policy reload. */ + if (ret == -EINVAL) { + printk(KERN_WARNING "audit rule for selinux \'%s\' is " + "invalid\n", df->se_str); + ret = 0; + } + + return ret; +} + +/* Duplicate an audit rule. This will be a deep copy with the exception + * of the watch - that pointer is carried over. The selinux specific fields + * will be updated in the copy. The point is to be able to replace the old + * rule with the new rule in the filterlist, then free the old rule. */ +static struct audit_entry *audit_dupe_rule(struct audit_krule *old) +{ + u32 fcount = old->field_count; + struct audit_entry *entry; + struct audit_krule *new; + int i, err = 0; + + entry = audit_init_entry(fcount); + if (unlikely(!entry)) + return ERR_PTR(-ENOMEM); + + new = &entry->rule; + new->vers_ops = old->vers_ops; + new->flags = old->flags; + new->listnr = old->listnr; + new->action = old->action; + for (i = 0; i < AUDIT_BITMASK_SIZE; i++) + new->mask[i] = old->mask[i]; + new->buflen = old->buflen; + new->field_count = old->field_count; + memcpy(new->fields, old->fields, sizeof(struct audit_field) * fcount); + + /* deep copy this information, updating the se_rule fields, because + * the originals will all be freed when the old rule is freed. */ + for (i = 0; i < fcount; i++) { + switch (new->fields[i].type) { + case AUDIT_SE_USER: + case AUDIT_SE_ROLE: + case AUDIT_SE_TYPE: + case AUDIT_SE_SEN: + case AUDIT_SE_CLR: + err = audit_dupe_selinux_field(&new->fields[i], + &old->fields[i]); + } + if (err) { + audit_free_rule(entry); + return ERR_PTR(err); + } + } + + return entry; +} + /* Add rule to given filterlist if not a duplicate. Protected by * audit_netlink_mutex. */ static inline int audit_add_rule(struct audit_entry *entry, @@ -628,3 +766,62 @@ unlock_and_return: rcu_read_unlock(); return result; } + +/* Check to see if the rule contains any selinux fields. Returns 1 if there + are selinux fields specified in the rule, 0 otherwise. */ +static inline int audit_rule_has_selinux(struct audit_krule *rule) +{ + int i; + + for (i = 0; i < rule->field_count; i++) { + struct audit_field *f = &rule->fields[i]; + switch (f->type) { + case AUDIT_SE_USER: + case AUDIT_SE_ROLE: + case AUDIT_SE_TYPE: + case AUDIT_SE_SEN: + case AUDIT_SE_CLR: + return 1; + } + } + + return 0; +} + +/* This function will re-initialize the se_rule field of all applicable rules. + * It will traverse the filter lists serarching for rules that contain selinux + * specific filter fields. When such a rule is found, it is copied, the + * selinux field is re-initialized, and the old rule is replaced with the + * updated rule. */ +int selinux_audit_rule_update(void) +{ + struct audit_entry *entry, *nentry; + int i, err = 0; + + /* audit_netlink_mutex synchronizes the writers */ + mutex_lock(&audit_netlink_mutex); + + for (i = 0; i < AUDIT_NR_FILTERS; i++) { + list_for_each_entry(entry, &audit_filter_list[i], list) { + if (!audit_rule_has_selinux(&entry->rule)) + continue; + + nentry = audit_dupe_rule(&entry->rule); + if (unlikely(IS_ERR(nentry))) { + /* save the first error encountered for the + * return value */ + if (!err) + err = PTR_ERR(nentry); + audit_panic("error updating selinux filters"); + list_del_rcu(&entry->list); + } else { + list_replace_rcu(&entry->list, &nentry->list); + } + call_rcu(&entry->rcu, audit_free_rule_rcu); + } + } + + mutex_unlock(&audit_netlink_mutex); + + return err; +} diff --git a/kernel/auditsc.c b/kernel/auditsc.c index b613ec8..ba9e9a3 100644 --- a/kernel/auditsc.c +++ b/kernel/auditsc.c @@ -58,6 +58,7 @@ #include #include #include +#include #include "audit.h" @@ -168,6 +169,9 @@ static int audit_filter_rules(struct tas enum audit_state *state) { int i, j; + u32 sid; + + selinux_task_ctxid(tsk, &sid); for (i = 0; i < rule->field_count; i++) { struct audit_field *f = &rule->fields[i]; @@ -257,6 +261,22 @@ static int audit_filter_rules(struct tas if (ctx) result = audit_comparator(ctx->loginuid, f->op, f->val); break; + case AUDIT_SE_USER: + case AUDIT_SE_ROLE: + case AUDIT_SE_TYPE: + case AUDIT_SE_SEN: + case AUDIT_SE_CLR: + /* NOTE: this may return negative values indicating + a temporary error. We simply treat this as a + match for now to avoid losing information that + may be wanted. An error message will also be + logged upon error */ + if (f->se_rule) + result = selinux_audit_rule_match(sid, f->type, + f->op, + f->se_rule, + ctx); + break; case AUDIT_ARG0: case AUDIT_ARG1: case AUDIT_ARG2: -- 0.99.9.GIT 0003-Inotify-kernel-API.patch: fs/inotify.c | 395 +++++++++++++++++++++++++++++------------------ include/linux/fsnotify.h | 29 +-- include/linux/inotify.h | 22 ++ 3 files changed, 281 insertions(+), 165 deletions(-) --- NEW FILE 0003-Inotify-kernel-API.patch --- Subject: [PATCH] Inotify kernel API From: Amy Griffis Date: 1137855413 -0500 This is the first of two patches, which when complete should be the last patches for the baseline filesystem audit functionality. This patch provides a kernel api for inotify. It was first posted as an RFC last year: https://www.redhat.com/archives/linux-audit/2005-August/msg00055.html I have made some minor changes to address feedback I received and to provide a little more information in the kernel's event callback. I found that adding or removing inotify watches from an event callback is unnecessary for audit's purposes, so I did not make that change. I also received some feedback regarding making a cleaner separation between the core inotify code and a kernel and userspace api. I haven't addressed this yet as it would make for a much larger patch against inotify, and I would like to discuss it with the inotify dev before making a lot of changes. I believe this patch represents the functionality audit requires in terms of an inotify kernel api. Please have a look and let me know what you think. [AV: rediffed] [folded akpm's fix for CONFIG_INOTIFY=n build] Signed-off-by: Al Viro --- fs/inotify.c | 395 +++++++++++++++++++++++++++++----------------- include/linux/fsnotify.h | 29 ++- include/linux/inotify.h | 22 ++- 3 files changed, 281 insertions(+), 165 deletions(-) 059170e790375f168bab670c2f9e0e04332430f4 diff --git a/fs/inotify.c b/fs/inotify.c index 3041503..ab57df6 100644 --- a/fs/inotify.c +++ b/fs/inotify.c @@ -85,14 +85,18 @@ struct inotify_device { wait_queue_head_t wq; /* wait queue for i/o */ struct idr idr; /* idr mapping wd -> watch */ struct semaphore sem; /* protects this bad boy */ - struct list_head events; /* list of queued events */ struct list_head watches; /* list of watches */ atomic_t count; /* reference count */ + u32 last_wd; /* the last wd allocated */ + /* userland consumer API */ + struct list_head events; /* list of queued events */ struct user_struct *user; /* user who opened this dev */ unsigned int queue_size; /* size of the queue (bytes) */ unsigned int event_count; /* number of pending events */ unsigned int max_events; /* maximum number of events */ - u32 last_wd; /* the last wd allocated */ + /* kernel consumer API */ + void (*callback)(struct inotify_event *, const char *, struct inode *, + void *); /* event callback */ }; /* @@ -124,6 +128,7 @@ struct inotify_watch { struct inode *inode; /* associated inode */ s32 wd; /* watch descriptor */ u32 mask; /* event mask for this watch */ + void *callback_arg; /* callback argument - kernel API */ }; #ifdef CONFIG_SYSCTL @@ -175,8 +180,10 @@ static inline void get_inotify_dev(struc static inline void put_inotify_dev(struct inotify_device *dev) { if (atomic_dec_and_test(&dev->count)) { - atomic_dec(&dev->user->inotify_devs); - free_uid(dev->user); + if (dev->user) { + atomic_dec(&dev->user->inotify_devs); + free_uid(dev->user); + } idr_destroy(&dev->idr); kfree(dev); } @@ -344,6 +351,24 @@ static void inotify_dev_event_dequeue(st } /* + * inotify_callback_event - notify kernel consumers of events + */ +static void inotify_callback_event(struct inotify_device *dev, + struct inotify_watch *watch, + u32 mask, u32 cookie, const char *name, + struct inode *inode) +{ + struct inotify_event event; + + event.wd = watch->wd; + event.mask = mask; + event.cookie = cookie; + event.len = 0; /* kernel consumers don't need length */ + + dev->callback(&event, name, inode, watch->callback_arg); +} + +/* * inotify_dev_get_wd - returns the next WD for use by the given dev * * Callers must hold dev->sem. This function can sleep. @@ -387,12 +412,13 @@ static int find_inode(const char __user * Both 'dev' and 'inode' (by way of nameidata) need to be pinned. */ static struct inotify_watch *create_watch(struct inotify_device *dev, - u32 mask, struct inode *inode) + u32 mask, struct inode *inode, + void *callback_arg) { struct inotify_watch *watch; int ret; - if (atomic_read(&dev->user->inotify_watches) >= + if (dev->user && atomic_read(&dev->user->inotify_watches) >= inotify_max_user_watches) return ERR_PTR(-ENOSPC); @@ -408,6 +434,7 @@ static struct inotify_watch *create_watc dev->last_wd = watch->wd; watch->mask = mask; + watch->callback_arg = callback_arg; atomic_set(&watch->count, 0); INIT_LIST_HEAD(&watch->d_list); INIT_LIST_HEAD(&watch->i_list); @@ -425,7 +452,8 @@ static struct inotify_watch *create_watc /* bump our own count, corresponding to our entry in dev->watches */ get_inotify_watch(watch); - atomic_inc(&dev->user->inotify_watches); + if (dev->user) + atomic_inc(&dev->user->inotify_watches); atomic_inc(&inotify_watches); return watch; @@ -458,7 +486,8 @@ static void remove_watch_no_event(struct list_del(&watch->i_list); list_del(&watch->d_list); - atomic_dec(&dev->user->inotify_watches); + if (dev->user) + atomic_dec(&dev->user->inotify_watches); atomic_dec(&inotify_watches); idr_remove(&dev->idr, watch->wd); put_inotify_watch(watch); @@ -477,7 +506,10 @@ static void remove_watch_no_event(struct */ static void remove_watch(struct inotify_watch *watch,struct inotify_device *dev) { - inotify_dev_queue_event(dev, watch, IN_IGNORED, 0, NULL); + if (dev->callback) + inotify_callback_event(dev, watch, IN_IGNORED, 0, NULL, NULL); + else + inotify_dev_queue_event(dev, watch, IN_IGNORED, 0, NULL); remove_watch_no_event(watch, dev); } @@ -490,7 +522,190 @@ static inline int inotify_inode_watched( return !list_empty(&inode->inotify_watches); } -/* Kernel API */ +/* Kernel consumer API */ + +/** + * inotify_init - allocates and initializes an inotify device + * @callback: kernel consumer's event callback + */ +struct inotify_device *inotify_init(void (*callback)(struct inotify_event *, + const char *, + struct inode *, void *)) +{ + struct inotify_device *dev; + + dev = kmalloc(sizeof(struct inotify_device), GFP_KERNEL); + if (unlikely(!dev)) + return NULL; + + idr_init(&dev->idr); + INIT_LIST_HEAD(&dev->events); + INIT_LIST_HEAD(&dev->watches); + init_waitqueue_head(&dev->wq); + sema_init(&dev->sem, 1); + dev->event_count = 0; + dev->queue_size = 0; + dev->max_events = inotify_max_queued_events; + dev->user = NULL; /* set in sys_inotify_init */ + dev->last_wd = 0; + dev->callback = callback; + atomic_set(&dev->count, 0); + get_inotify_dev(dev); + + return dev; +} +EXPORT_SYMBOL_GPL(inotify_init); + +/** + * inotify_free - clean up and free an inotify device + * @dev: inotify device to free + */ +int inotify_free(struct inotify_device *dev) +{ + /* + * Destroy all of the watches on this device. Unfortunately, not very + * pretty. We cannot do a simple iteration over the list, because we + * do not know the inode until we iterate to the watch. But we need to + * hold inode->inotify_sem before dev->sem. The following works. + */ + while (1) { + struct inotify_watch *watch; + struct list_head *watches; + struct inode *inode; + + down(&dev->sem); + watches = &dev->watches; + if (list_empty(watches)) { + up(&dev->sem); + break; + } + watch = list_entry(watches->next, struct inotify_watch, d_list); + get_inotify_watch(watch); + up(&dev->sem); + + inode = watch->inode; + down(&inode->inotify_sem); + down(&dev->sem); + remove_watch_no_event(watch, dev); + up(&dev->sem); + up(&inode->inotify_sem); + put_inotify_watch(watch); + } + + /* destroy all of the events on this device */ + down(&dev->sem); + while (!list_empty(&dev->events)) + inotify_dev_event_dequeue(dev); + up(&dev->sem); + + /* free this device: the put matching the get in inotify_init() */ + put_inotify_dev(dev); + + return 0; +} +EXPORT_SYMBOL_GPL(inotify_free); + +/** + * inotify_inotify_add_watch - add a watch to this inotify device + * @dev: inotify device + * @inode: inode to watch for events + * @mask: filesystem event mask + * @callback_arg - ptr to data that kernel consumer associates with this watch + * + * Caller must pin the inode in question, e.g. by calling path_lookup. + */ +s32 inotify_add_watch(struct inotify_device *dev, struct inode *inode, + u32 mask, void *callback_arg) +{ + int mask_add = 0; + struct inotify_watch *watch, *old; + int ret; + + down(&inode->inotify_sem); + down(&dev->sem); + + if (mask & IN_MASK_ADD) + mask_add = 1; + + /* don't let user-space set invalid bits: we don't want flags set */ + mask &= IN_ALL_EVENTS | IN_ONESHOT; + if (unlikely(!mask)) { + ret = -EINVAL; + goto out; + } + + /* + * Handle the case of re-adding a watch on an (inode,dev) pair that we + * are already watching. We just update the mask and callback_arg and + * return its wd. + */ + old = inode_find_dev(inode, dev); + if (unlikely(old)) { + if (mask_add) + old->mask |= mask; + else + old->mask = mask; + old->callback_arg = callback_arg; + ret = old->wd; + goto out; + } + + watch = create_watch(dev, mask, inode, callback_arg); + if (unlikely(IS_ERR(watch))) { + ret = PTR_ERR(watch); + goto out; + } + + /* Add the watch to the device's and the inode's list */ + list_add(&watch->d_list, &dev->watches); + list_add(&watch->i_list, &inode->inotify_watches); + ret = watch->wd; + +out: + up(&dev->sem); + up(&inode->inotify_sem); + return ret; +} +EXPORT_SYMBOL_GPL(inotify_add_watch); + +/** + * inotify_ignore - remove a given wd from this inotify device + * @dev: inotify device + * @wd: watch descriptor to remove + */ +int inotify_ignore(struct inotify_device *dev, s32 wd) +{ + struct inotify_watch *watch; + struct inode *inode; + + down(&dev->sem); + watch = idr_find(&dev->idr, wd); + if (unlikely(!watch)) { + up(&dev->sem); + return -EINVAL; + } + get_inotify_watch(watch); + inode = watch->inode; + up(&dev->sem); + + down(&inode->inotify_sem); + down(&dev->sem); + + /* make sure that we did not race */ + watch = idr_find(&dev->idr, wd); + if (likely(watch)) + remove_watch(watch, dev); + + up(&dev->sem); + up(&inode->inotify_sem); + put_inotify_watch(watch); + + return 0; + +} +EXPORT_SYMBOL_GPL(inotify_ignore); + +/* Kernel producer API */ /** * inotify_inode_queue_event - queue an event to all watches on this inode @@ -498,9 +713,10 @@ static inline int inotify_inode_watched( * @mask: event mask describing this event * @cookie: cookie for synchronization, or zero * @name: filename, if any + * @cinode: child inode, used for events on directories */ void inotify_inode_queue_event(struct inode *inode, u32 mask, u32 cookie, - const char *name) + const char *name, struct inode *cinode) { struct inotify_watch *watch, *next; @@ -514,7 +730,12 @@ void inotify_inode_queue_event(struct in struct inotify_device *dev = watch->dev; get_inotify_watch(watch); down(&dev->sem); - inotify_dev_queue_event(dev, watch, mask, cookie, name); + if (dev->callback) + inotify_callback_event(dev, watch, mask, + cookie, name, cinode); + else + inotify_dev_queue_event(dev, watch, mask, + cookie, name); if (watch_mask & IN_ONESHOT) remove_watch_no_event(watch, dev); up(&dev->sem); @@ -548,7 +769,8 @@ void inotify_dentry_parent_queue_event(s if (inotify_inode_watched(inode)) { dget(parent); spin_unlock(&dentry->d_lock); - inotify_inode_queue_event(inode, mask, cookie, name); + inotify_inode_queue_event(inode, mask, cookie, name, + dentry->d_inode); dput(parent); } else spin_unlock(&dentry->d_lock); @@ -631,7 +853,12 @@ void inotify_unmount_inodes(struct list_ list_for_each_entry_safe(watch, next_w, watches, i_list) { struct inotify_device *dev = watch->dev; down(&dev->sem); - inotify_dev_queue_event(dev, watch, IN_UNMOUNT,0,NULL); + if (dev->callback) + inotify_callback_event(dev, watch, IN_UNMOUNT, + 0, NULL, NULL); + else + inotify_dev_queue_event(dev, watch, IN_UNMOUNT, + 0, NULL); remove_watch(watch, dev); up(&dev->sem); } @@ -757,83 +984,7 @@ static ssize_t inotify_read(struct file static int inotify_release(struct inode *ignored, struct file *file) { - struct inotify_device *dev = file->private_data; - - /* - * Destroy all of the watches on this device. Unfortunately, not very - * pretty. We cannot do a simple iteration over the list, because we - * do not know the inode until we iterate to the watch. But we need to - * hold inode->inotify_sem before dev->sem. The following works. - */ - while (1) { - struct inotify_watch *watch; - struct list_head *watches; - struct inode *inode; - - down(&dev->sem); - watches = &dev->watches; - if (list_empty(watches)) { - up(&dev->sem); - break; - } - watch = list_entry(watches->next, struct inotify_watch, d_list); - get_inotify_watch(watch); - up(&dev->sem); - - inode = watch->inode; - down(&inode->inotify_sem); - down(&dev->sem); - remove_watch_no_event(watch, dev); - up(&dev->sem); - up(&inode->inotify_sem); - put_inotify_watch(watch); - } - - /* destroy all of the events on this device */ - down(&dev->sem); - while (!list_empty(&dev->events)) - inotify_dev_event_dequeue(dev); - up(&dev->sem); - - /* free this device: the put matching the get in inotify_init() */ - put_inotify_dev(dev); - - return 0; -} - -/* - * inotify_ignore - remove a given wd from this inotify instance. - * - * Can sleep. - */ -static int inotify_ignore(struct inotify_device *dev, s32 wd) -{ - struct inotify_watch *watch; - struct inode *inode; - - down(&dev->sem); - watch = idr_find(&dev->idr, wd); - if (unlikely(!watch)) { - up(&dev->sem); - return -EINVAL; - } - get_inotify_watch(watch); - inode = watch->inode; - up(&dev->sem); - - down(&inode->inotify_sem); - down(&dev->sem); - - /* make sure that we did not race */ - watch = idr_find(&dev->idr, wd); - if (likely(watch)) - remove_watch(watch, dev); - - up(&dev->sem); - up(&inode->inotify_sem); - put_inotify_watch(watch); - - return 0; + return inotify_free(file->private_data); } static long inotify_ioctl(struct file *file, unsigned int cmd, @@ -887,12 +1038,15 @@ asmlinkage long sys_inotify_init(void) goto out_free_uid; } - dev = kmalloc(sizeof(struct inotify_device), GFP_KERNEL); + dev = inotify_init(NULL); if (unlikely(!dev)) { ret = -ENOMEM; goto out_free_uid; } + dev->user = user; + atomic_inc(&user->inotify_devs); + filp->f_op = &inotify_fops; filp->f_vfsmnt = mntget(inotify_mnt); filp->f_dentry = dget(inotify_mnt->mnt_root); @@ -901,20 +1055,6 @@ asmlinkage long sys_inotify_init(void) filp->f_flags = O_RDONLY; filp->private_data = dev; - idr_init(&dev->idr); - INIT_LIST_HEAD(&dev->events); - INIT_LIST_HEAD(&dev->watches); - init_waitqueue_head(&dev->wq); - sema_init(&dev->sem, 1); - dev->event_count = 0; - dev->queue_size = 0; - dev->max_events = inotify_max_queued_events; - dev->user = user; - dev->last_wd = 0; - atomic_set(&dev->count, 0); - - get_inotify_dev(dev); - atomic_inc(&user->inotify_devs); fd_install(fd, filp); return fd; @@ -928,13 +1068,11 @@ out_put_fd: asmlinkage long sys_inotify_add_watch(int fd, const char __user *path, u32 mask) { - struct inotify_watch *watch, *old; struct inode *inode; struct inotify_device *dev; struct nameidata nd; struct file *filp; int ret, fput_needed; - int mask_add = 0; unsigned flags = 0; filp = fget_light(fd, &fput_needed); @@ -960,46 +1098,7 @@ asmlinkage long sys_inotify_add_watch(in inode = nd.dentry->d_inode; dev = filp->private_data; - down(&inode->inotify_sem); - down(&dev->sem); - - if (mask & IN_MASK_ADD) - mask_add = 1; - - /* don't let user-space set invalid bits: we don't want flags set */ - mask &= IN_ALL_EVENTS | IN_ONESHOT; - if (unlikely(!mask)) { - ret = -EINVAL; - goto out; - } - - /* - * Handle the case of re-adding a watch on an (inode,dev) pair that we - * are already watching. We just update the mask and return its wd. - */ - old = inode_find_dev(inode, dev); - if (unlikely(old)) { - if (mask_add) - old->mask |= mask; - else - old->mask = mask; - ret = old->wd; - goto out; - } - - watch = create_watch(dev, mask, inode); - if (unlikely(IS_ERR(watch))) { - ret = PTR_ERR(watch); - goto out; - } - - /* Add the watch to the device's and the inode's list */ - list_add(&watch->d_list, &dev->watches); - list_add(&watch->i_list, &inode->inotify_watches); - ret = watch->wd; -out: - up(&dev->sem); - up(&inode->inotify_sem); + ret = inotify_add_watch(dev, inode, mask, NULL); path_release(&nd); fput_and_out: fput_light(filp, fput_needed); diff --git a/include/linux/fsnotify.h b/include/linux/fsnotify.h index 94919c3..606b875 100644 --- a/include/linux/fsnotify.h +++ b/include/linux/fsnotify.h @@ -35,16 +35,18 @@ static inline void fsnotify_move(struct if (isdir) isdir = IN_ISDIR; - inotify_inode_queue_event(old_dir, IN_MOVED_FROM|isdir,cookie,old_name); - inotify_inode_queue_event(new_dir, IN_MOVED_TO|isdir, cookie, new_name); + inotify_inode_queue_event(old_dir, IN_MOVED_FROM|isdir, cookie, + old_name, NULL); + inotify_inode_queue_event(new_dir, IN_MOVED_TO|isdir, cookie, + new_name, source); if (target) { - inotify_inode_queue_event(target, IN_DELETE_SELF, 0, NULL); + inotify_inode_queue_event(target, IN_DELETE_SELF, 0, NULL,NULL); inotify_inode_is_dead(target); } if (source) { - inotify_inode_queue_event(source, IN_MOVE_SELF, 0, NULL); + inotify_inode_queue_event(source, IN_MOVE_SELF, 0, NULL, NULL); } audit_inode_child(old_name, source, old_dir->i_ino); audit_inode_child(new_name, target, new_dir->i_ino); @@ -66,7 +68,7 @@ static inline void fsnotify_nameremove(s */ static inline void fsnotify_inoderemove(struct inode *inode) { - inotify_inode_queue_event(inode, IN_DELETE_SELF, 0, NULL); + inotify_inode_queue_event(inode, IN_DELETE_SELF, 0, NULL, NULL); inotify_inode_is_dead(inode); } @@ -76,7 +78,8 @@ static inline void fsnotify_inoderemove( static inline void fsnotify_create(struct inode *inode, struct dentry *dentry) { inode_dir_notify(inode, DN_CREATE); - inotify_inode_queue_event(inode, IN_CREATE, 0, dentry->d_name.name); + inotify_inode_queue_event(inode, IN_CREATE, 0, dentry->d_name.name, + dentry->d_inode); audit_inode_child(dentry->d_name.name, dentry->d_inode, inode->i_ino); } @@ -87,7 +90,7 @@ static inline void fsnotify_mkdir(struct { inode_dir_notify(inode, DN_CREATE); inotify_inode_queue_event(inode, IN_CREATE | IN_ISDIR, 0, - dentry->d_name.name); + dentry->d_name.name, dentry->d_inode); audit_inode_child(dentry->d_name.name, dentry->d_inode, inode->i_ino); } @@ -104,7 +107,7 @@ static inline void fsnotify_access(struc dnotify_parent(dentry, DN_ACCESS); inotify_dentry_parent_queue_event(dentry, mask, 0, dentry->d_name.name); - inotify_inode_queue_event(inode, mask, 0, NULL); + inotify_inode_queue_event(inode, mask, 0, NULL, NULL); } /* @@ -120,7 +123,7 @@ static inline void fsnotify_modify(struc dnotify_parent(dentry, DN_MODIFY); inotify_dentry_parent_queue_event(dentry, mask, 0, dentry->d_name.name); - inotify_inode_queue_event(inode, mask, 0, NULL); + inotify_inode_queue_event(inode, mask, 0, NULL, NULL); } /* @@ -135,7 +138,7 @@ static inline void fsnotify_open(struct mask |= IN_ISDIR; inotify_dentry_parent_queue_event(dentry, mask, 0, dentry->d_name.name); - inotify_inode_queue_event(inode, mask, 0, NULL); + inotify_inode_queue_event(inode, mask, 0, NULL, NULL); } /* @@ -153,7 +156,7 @@ static inline void fsnotify_close(struct mask |= IN_ISDIR; inotify_dentry_parent_queue_event(dentry, mask, 0, name); - inotify_inode_queue_event(inode, mask, 0, NULL); + inotify_inode_queue_event(inode, mask, 0, NULL, NULL); } /* @@ -168,7 +171,7 @@ static inline void fsnotify_xattr(struct mask |= IN_ISDIR; inotify_dentry_parent_queue_event(dentry, mask, 0, dentry->d_name.name); - inotify_inode_queue_event(inode, mask, 0, NULL); + inotify_inode_queue_event(inode, mask, 0, NULL, NULL); } /* @@ -215,7 +218,7 @@ static inline void fsnotify_change(struc if (in_mask) { if (S_ISDIR(inode->i_mode)) in_mask |= IN_ISDIR; - inotify_inode_queue_event(inode, in_mask, 0, NULL); + inotify_inode_queue_event(inode, in_mask, 0, NULL, NULL); inotify_dentry_parent_queue_event(dentry, in_mask, 0, dentry->d_name.name); } diff --git a/include/linux/inotify.h b/include/linux/inotify.h index 267c88b..f32c70e 100644 --- a/include/linux/inotify.h +++ b/include/linux/inotify.h @@ -14,6 +14,9 @@ * * When you are watching a directory, you will receive the filename for events * such as IN_CREATE, IN_DELETE, IN_OPEN, IN_CLOSE, ..., relative to the wd. + * + * When using inotify from the kernel, len will always be zero. Instead you + * should check the path for non-NULL in your callback. */ struct inotify_event { __s32 wd; /* watch descriptor */ @@ -71,8 +74,19 @@ struct inotify_event { #ifdef CONFIG_INOTIFY +/* Kernel consumer API */ + +extern struct inotify_device *inotify_init(void (*)(struct inotify_event *, + const char *, + struct inode *, void *)); +extern int inotify_free(struct inotify_device *); +extern __s32 inotify_add_watch(struct inotify_device *, struct inode *, __u32, + void *); +extern int inotify_ignore(struct inotify_device *, __s32); + +/* Kernel producer API */ extern void inotify_inode_queue_event(struct inode *, __u32, __u32, - const char *); + const char *, struct inode *); extern void inotify_dentry_parent_queue_event(struct dentry *, __u32, __u32, const char *); extern void inotify_unmount_inodes(struct list_head *); @@ -81,9 +95,9 @@ extern u32 inotify_get_cookie(void); #else -static inline void inotify_inode_queue_event(struct inode *inode, - __u32 mask, __u32 cookie, - const char *filename) +/* Kernel producer API stubs */ +static inline void inotify_inode_queue_event(struct inode *inode, u32 mask, + u32 cookie, const char *name, struct inode *cinode) { } -- 0.99.9.GIT 0004-filesystem-location-based-auditing.patch: include/linux/audit.h | 1 init/Kconfig | 2 kernel/audit.c | 19 - kernel/audit.h | 32 ++ kernel/auditfilter.c | 671 +++++++++++++++++++++++++++++++++++++++++++++++--- kernel/auditsc.c | 65 ++-- 6 files changed, 713 insertions(+), 77 deletions(-) --- NEW FILE 0004-filesystem-location-based-auditing.patch --- Subject: [PATCH] filesystem location based auditing From: Amy Griffis Date: 1142295485 -0500 Here is another iteration based off of audit-current.git plus the following pre-requisites: selinux support for context based audit filtering: https://www.redhat.com/archives/linux-audit/2006-February/msg00160.html context based audit filtering: https://www.redhat.com/archives/linux-audit/2006-March/msg00107.html inotify kernel api: https://www.redhat.com/archives/linux-audit/2006-January/msg00084.html This version fixes the following: - remove extra parent put in audit_inotify_register() - add missing unlock in audit_add_rule() error path - replace per-filterlist spinlocks with use of audit_netlink_mutex (see below) - remove now un-needed GFP_ATOMIC allocations - remove now unused AUDIT_ENTRY_DEL flag - all code paths either avoid stale data by taking the mutex, or don't care - take mutex to update parent data in audit_inotify_register() - kernel enforces 1 watch per rule to avoid potential memleak - add comments describing locking and refcounts - miscellaneous code cleanup The audit_netlink_mutex was previously taken/released in audit_receive() with the following comment: /* The netlink socket is only to be read by 1 CPU, which lets us assume * that list additions and deletions never happen simultaneously in * auditsc.c */ audit_receive() is three calls up the stack from where we need to release the mutex for some operations in audit_add_rule() and audit_del_rule(). However, from what I could see, it didn't seem to be protecting anything specific to the netlink socket itself, but rather the operations on filterlists. For that reason I renamed it to audit_filter_mutex and modified the code to use it explicitly around filterlist manipulations. Please verify my analysis on this matter. If incorrect we will need two mutexes: audit_netlink_mutex and audit_filter_mutex. Thanks, Amy Signed-off-by: Al Viro --- include/linux/audit.h | 1 init/Kconfig | 2 kernel/audit.c | 19 + kernel/audit.h | 32 ++ kernel/auditfilter.c | 671 ++++++++++++++++++++++++++++++++++++++++++++++--- kernel/auditsc.c | 65 +++-- 6 files changed, 713 insertions(+), 77 deletions(-) 6ba23ad7c06151e53ec55c32e9f842c19ef08f5a diff --git a/include/linux/audit.h b/include/linux/audit.h index 41b0813..8350a55 100644 --- a/include/linux/audit.h +++ b/include/linux/audit.h @@ -158,6 +158,7 @@ #define AUDIT_INODE 102 #define AUDIT_EXIT 103 #define AUDIT_SUCCESS 104 /* exit >= 0; value ignored */ +#define AUDIT_WATCH 105 #define AUDIT_ARG0 200 #define AUDIT_ARG1 (AUDIT_ARG0+1) diff --git a/init/Kconfig b/init/Kconfig index 38416a1..7fc7b20 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -177,7 +177,7 @@ config AUDIT config AUDITSYSCALL bool "Enable system-call auditing support" - depends on AUDIT && (X86 || PPC || PPC64 || S390 || IA64 || UML || SPARC64) + depends on AUDIT && INOTIFY && (X86 || PPC || PPC64 || S390 || IA64 || UML || SPARC64) default y if SECURITY_SELINUX help Enable low-overhead system-call auditing infrastructure that diff --git a/kernel/audit.c b/kernel/audit.c index 65e1d03..6eff223 100644 --- a/kernel/audit.c +++ b/kernel/audit.c @@ -56,6 +56,7 @@ #include #include #include +#include #include "audit.h" @@ -102,6 +103,9 @@ static atomic_t audit_lost = ATOMIC_I /* The netlink socket. */ static struct sock *audit_sock; +/* Inotify device. */ +struct inotify_device *audit_idev; + /* The audit_freelist is a list of pre-allocated audit buffers (if more * than AUDIT_MAXFREE are in use, the audit buffer is freed instead of * being placed on the freelist). */ @@ -114,11 +118,6 @@ static struct task_struct *kauditd_task; static DECLARE_WAIT_QUEUE_HEAD(kauditd_wait); static DECLARE_WAIT_QUEUE_HEAD(audit_backlog_wait); -/* The netlink socket is only to be read by 1 CPU, which lets us assume - * that list additions and deletions never happen simultaneously in - * auditsc.c */ -DEFINE_MUTEX(audit_netlink_mutex); - /* AUDIT_BUFSIZ is the size of the temporary buffer used for formatting * audit records. Since printk uses a 1024 byte buffer, this buffer * should be at least that large. */ @@ -541,14 +540,11 @@ static void audit_receive(struct sock *s struct sk_buff *skb; unsigned int qlen; - mutex_lock(&audit_netlink_mutex); - for (qlen = skb_queue_len(&sk->sk_receive_queue); qlen; qlen--) { skb = skb_dequeue(&sk->sk_receive_queue); audit_receive_skb(skb); kfree_skb(skb); } - mutex_unlock(&audit_netlink_mutex); } @@ -573,6 +569,13 @@ static int __init audit_init(void) selinux_audit_set_callback(&selinux_audit_rule_update); audit_log(NULL, GFP_KERNEL, AUDIT_KERNEL, "initialized"); + +#ifdef CONFIG_AUDITSYSCALL + audit_idev = inotify_init(audit_handle_ievent); + if (IS_ERR(audit_idev)) + audit_panic("cannot initialize inotify device"); +#endif + return 0; } __initcall(audit_init); diff --git a/kernel/audit.h b/kernel/audit.h index 6f73392..423e826 100644 --- a/kernel/audit.h +++ b/kernel/audit.h @@ -19,10 +19,11 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include #include #include +struct inotify_event; + /* 0 = no checking 1 = put_count checking 2 = verbose put_count checking @@ -53,6 +54,27 @@ enum audit_state { }; /* Rule lists */ +struct audit_parent { + atomic_t count; /* reference count */ + unsigned int flags; /* flag in-process removals */ + u32 wd; /* inotify watch descriptor */ + dev_t dev; /* associated superblock device */ + unsigned long ino; /* associated inode number */ + struct list_head mlist; /* entry in master_parents */ + struct list_head ilist; /* entry in inotify registration list*/ + struct list_head watches; /* associated watches */ +}; + +struct audit_watch { + atomic_t count; /* reference count */ + char *path; /* watch insertion path */ + dev_t dev; /* associated superblock device */ + unsigned long ino; /* associated inode number */ + struct audit_parent *parent; /* associated parent */ + struct list_head wlist; /* entry in audit_parent.watches list*/ + struct list_head rules; /* associated rules */ +}; + struct audit_field { u32 type; u32 val; @@ -70,6 +92,8 @@ struct audit_krule { u32 buflen; /* for data alloc on list rules */ u32 field_count; struct audit_field *fields; + struct audit_watch *watch; /* associated watch */ + struct list_head rlist; /* entry in audit_watch.rules list */ }; struct audit_entry { @@ -81,12 +105,14 @@ struct audit_entry { extern int audit_pid; extern int audit_comparator(const u32 left, const u32 op, const u32 right); - +extern int audit_compare_dname_path(const char *dname, const char *path); extern void audit_send_reply(int pid, int seq, int type, int done, int multi, void *payload, int size); extern void audit_log_lost(const char *message); extern void audit_panic(const char *message); -extern struct mutex audit_netlink_mutex; extern int selinux_audit_rule_update(void); +extern void audit_handle_ievent(struct inotify_event *event, + const char *dname, struct inode * inode, + void *ptr); diff --git a/kernel/auditfilter.c b/kernel/auditfilter.c index 4d2023a..3966a49 100644 --- a/kernel/auditfilter.c +++ b/kernel/auditfilter.c @@ -22,13 +22,45 @@ #include #include #include +#include +#include +#include #include +#include #include #include "audit.h" -/* There are three lists of rules -- one to search at task creation - * time, one to search at syscall entry time, and another to search at - * syscall exit time. */ +/* + * Locking model: + * + * audit_filter_mutex: + * Synchronizes writes and blocking reads of audit's filterlist + * data. Rcu is used to traverse the filterlist and access + * contents of structs audit_entry, audit_watch and opaque + * selinux rules during filtering. If modified, these structures + * must be copied and replace their counterparts in the filterlist. + * An audit_parent struct is not accessed during filtering, so may + * be written directly provided audit_filter_mutex is held. + * + * master_parents_lock: (spinlock) + * Protects master_parents list. + */ + +/* + * Reference counting: + * + * audit_parent: lifetime is from audit_init_parent() to audit_remove_parent(). + * Each audit_watch holds a reference to its associated parent. + * + * audit_watch: if added to lists, lifetime is from audit_init_watch() to one + * of: audit_remove_watch() [user removes], audit_update_watch() [kernel + * replaces], or audit_remove_parent_watches() [kernel removes]. + * Additionally, an audit_watch may exist temporarily to assist in + * searching existing filter data. Each audit_krule holds a reference to + * its associated watch. + */ + +/* Audit filter lists, defined in */ struct list_head audit_filter_list[AUDIT_NR_FILTERS] = { LIST_HEAD_INIT(audit_filter_list[0]), LIST_HEAD_INIT(audit_filter_list[1]), @@ -41,9 +73,55 @@ struct list_head audit_filter_list[AUDIT #endif }; +DEFINE_MUTEX(audit_filter_mutex); + +static LIST_HEAD(master_parents); +static DEFINE_SPINLOCK(master_parents_lock); + +/* Inotify device. */ +extern struct inotify_device *audit_idev; + +/* Inotify events we care about. */ +#define AUDIT_IN_WATCH IN_MOVE|IN_CREATE|IN_DELETE|IN_DELETE_SELF|IN_MOVE_SELF +#define AUDIT_IN_SELF IN_DELETE_SELF|IN_MOVE_SELF|IN_UNMOUNT + +static inline void audit_get_parent(struct audit_parent *parent) +{ + atomic_inc(&parent->count); +} + +static inline void audit_put_parent(struct audit_parent *parent) +{ + if (atomic_dec_and_test(&parent->count)) { + WARN_ON(!list_empty(&parent->watches)); + kfree(parent); + } +} + +static inline void audit_get_watch(struct audit_watch *watch) +{ + atomic_inc(&watch->count); +} + +static inline void audit_put_watch(struct audit_watch *watch) +{ + if (atomic_dec_and_test(&watch->count)) { + WARN_ON(!list_empty(&watch->rules)); + /* watches that were never added don't have a parent */ + if (watch->parent) + audit_put_parent(watch->parent); + kfree(watch->path); + kfree(watch); + } +} + static inline void audit_free_rule(struct audit_entry *e) { int i; + + /* some rules don't have associated watches */ + if (e->rule.watch) + audit_put_watch(e->rule.watch); if (e->rule.fields) for (i = 0; i < e->rule.field_count; i++) { struct audit_field *f = &e->rule.fields[i]; @@ -60,6 +138,43 @@ static inline void audit_free_rule_rcu(s audit_free_rule(e); } +/* Initialize a parent watch entry. */ +static inline struct audit_parent *audit_init_parent(void) +{ + struct audit_parent *parent; + + parent = kzalloc(sizeof(*parent), GFP_KERNEL); + if (unlikely(!parent)) + return ERR_PTR(-ENOMEM); + + INIT_LIST_HEAD(&parent->watches); + atomic_set(&parent->count, 1); + + spin_lock(&master_parents_lock); + list_add(&parent->mlist, &master_parents); + spin_unlock(&master_parents_lock); + + return parent; +} + +/* Initialize a watch entry. */ +static inline struct audit_watch *audit_init_watch(char *path) +{ + struct audit_watch *watch; + + watch = kzalloc(sizeof(*watch), GFP_KERNEL); + if (unlikely(!watch)) + return ERR_PTR(-ENOMEM); + + INIT_LIST_HEAD(&watch->rules); + atomic_set(&watch->count, 1); + watch->path = path; + watch->dev = (dev_t)-1; + watch->ino = (unsigned long)-1; + + return watch; +} + /* Initialize an audit filterlist entry. */ static inline struct audit_entry *audit_init_entry(u32 field_count) { @@ -107,6 +222,28 @@ static char *audit_unpack_string(void ** return str; } +/* Translate a watch string to kernel respresentation. */ +static int audit_to_watch(struct audit_krule *krule, char *path, int len, + u32 op) +{ + struct audit_watch *watch; + + if (path[0] != '/' || path[len-1] == '/' || + krule->listnr != AUDIT_FILTER_EXIT || + op & ~AUDIT_EQUAL || + krule->watch) /* allow only 1 watch per rule */ + return -EINVAL; + + watch = audit_init_watch(path); + if (unlikely(IS_ERR(watch))) + return PTR_ERR(watch); + + audit_get_watch(watch); + krule->watch = watch; + + return 0; +} + /* Common user-space to kernel rule translation. */ static inline struct audit_entry *audit_to_entry_common(struct audit_rule *rule) { @@ -177,7 +314,8 @@ static struct audit_entry *audit_rule_to f->type == AUDIT_SE_ROLE || f->type == AUDIT_SE_TYPE || f->type == AUDIT_SE_SEN || - f->type == AUDIT_SE_CLR) { + f->type == AUDIT_SE_CLR || + f->type == AUDIT_WATCH) { err = -EINVAL; goto exit_free; } @@ -260,6 +398,18 @@ static struct audit_entry *audit_data_to } else f->se_str = str; break; + case AUDIT_WATCH: + str = audit_unpack_string(&bufp, &remain, f->val); + if (IS_ERR(str)) + goto exit_free; + entry->rule.buflen += f->val; + + err = audit_to_watch(&entry->rule, str, f->val, f->op); + if (err) { + kfree(str); + goto exit_free; + } + break; } } @@ -343,6 +493,10 @@ static struct audit_rule_data *audit_kru data->buflen += data->values[i] = audit_pack_string(&bufp, f->se_str); break; + case AUDIT_WATCH: + data->buflen += data->values[i] = + audit_pack_string(&bufp, krule->watch->path); + break; default: data->values[i] = f->val; } @@ -378,6 +532,10 @@ static int audit_compare_rule(struct aud if (strcmp(a->fields[i].se_str, b->fields[i].se_str)) return 1; break; + case AUDIT_WATCH: + if (strcmp(a->watch->path, b->watch->path)) + return 1; + break; default: if (a->fields[i].val != b->fields[i].val) return 1; @@ -391,6 +549,31 @@ static int audit_compare_rule(struct aud return 0; } +/* Duplicate the given audit watch. The new watch's rules list is initialized + * to an empty list and wlist is undefined. */ +static inline struct audit_watch *audit_dupe_watch(struct audit_watch *old) +{ + char *path; + struct audit_watch *new; + + path = kstrdup(old->path, GFP_KERNEL); + if (unlikely(!path)) + return ERR_PTR(-ENOMEM); + + new = audit_init_watch(path); + if (unlikely(!new)) { + kfree(path); + return ERR_PTR(-ENOMEM); + } + + new->dev = old->dev; + new->ino = old->ino; + audit_get_parent(old->parent); + new->parent = old->parent; + + return new; +} + /* Duplicate selinux field information. The se_rule is opaque, so must be * re-initialized. */ static inline int audit_dupe_selinux_field(struct audit_field *df, @@ -422,8 +605,11 @@ static inline int audit_dupe_selinux_fie /* Duplicate an audit rule. This will be a deep copy with the exception * of the watch - that pointer is carried over. The selinux specific fields * will be updated in the copy. The point is to be able to replace the old - * rule with the new rule in the filterlist, then free the old rule. */ -static struct audit_entry *audit_dupe_rule(struct audit_krule *old) + * rule with the new rule in the filterlist, then free the old rule. + * The rlist element is undefined; list manipulations are handled apart from + * the initial copy. */ +static struct audit_entry *audit_dupe_rule(struct audit_krule *old, + struct audit_watch *watch) { u32 fcount = old->field_count; struct audit_entry *entry; @@ -442,6 +628,7 @@ static struct audit_entry *audit_dupe_ru for (i = 0; i < AUDIT_BITMASK_SIZE; i++) new->mask[i] = old->mask[i]; new->buflen = old->buflen; + new->watch = NULL; new->field_count = old->field_count; memcpy(new->fields, old->fields, sizeof(struct audit_field) * fcount); @@ -463,48 +650,393 @@ static struct audit_entry *audit_dupe_ru } } + if (watch) { + audit_get_watch(watch); + new->watch = watch; + } + return entry; } -/* Add rule to given filterlist if not a duplicate. Protected by - * audit_netlink_mutex. */ -static inline int audit_add_rule(struct audit_entry *entry, - struct list_head *list) +/* Update inode numbers in audit rules based on filesystem event. */ +static inline void audit_update_watch(struct audit_parent *parent, + const char *dname, dev_t dev, + unsigned long ino) +{ + struct audit_watch *owatch, *nwatch, *nextw; + struct audit_krule *r, *nextr; + struct audit_entry *oentry, *nentry; + struct audit_buffer *ab; + + mutex_lock(&audit_filter_mutex); + list_for_each_entry_safe(owatch, nextw, &parent->watches, wlist) { + if (audit_compare_dname_path(dname, owatch->path)) + continue; + + nwatch = audit_dupe_watch(owatch); + if (unlikely(IS_ERR(nwatch))) { + mutex_unlock(&audit_filter_mutex); + audit_panic("error updating watch, skipping"); + return; + } + nwatch->dev = dev; + nwatch->ino = ino; + + list_for_each_entry_safe(r, nextr, &owatch->rules, rlist) { + oentry = container_of(r, struct audit_entry, rule); + + nentry = audit_dupe_rule(&oentry->rule, nwatch); + if (unlikely(IS_ERR(nentry))) { + audit_panic("error updating watch, removing"); + list_del(&oentry->rule.rlist); + list_del_rcu(&oentry->list); + } else { + list_add(&nentry->rule.rlist, &nwatch->rules); + list_del(&oentry->rule.rlist); + list_replace_rcu(&oentry->list, &nentry->list); + } + call_rcu(&oentry->rcu, audit_free_rule_rcu); + } + + ab = audit_log_start(NULL, GFP_KERNEL, AUDIT_CONFIG_CHANGE); + audit_log_format(ab, "audit updated rules specifying watch="); + audit_log_untrustedstring(ab, owatch->path); + audit_log_format(ab, " with dev=%u ino=%lu\n", dev, ino); + audit_log_end(ab); + + list_del(&owatch->wlist); + audit_put_watch(owatch); /* matches initial get */ + goto add_watch_to_parent; /* event applies to a single watch */ + } + mutex_unlock(&audit_filter_mutex); + return; + +add_watch_to_parent: + list_add(&nwatch->wlist, &parent->watches); + mutex_unlock(&audit_filter_mutex); + return; +} + +/* Remove all watches & rules associated with a parent that is going away. */ +static inline void audit_remove_parent_watches(struct audit_parent *parent) { + struct audit_watch *w, *nextw; + struct audit_krule *r, *nextr; struct audit_entry *e; - /* Do not use the _rcu iterator here, since this is the only - * addition routine. */ + mutex_lock(&audit_filter_mutex); + list_for_each_entry_safe(w, nextw, &parent->watches, wlist) { + list_for_each_entry_safe(r, nextr, &w->rules, rlist) { + e = container_of(r, struct audit_entry, rule); + list_del(&r->rlist); + list_del_rcu(&e->list); + call_rcu(&e->rcu, audit_free_rule_rcu); + + audit_log(NULL, GFP_KERNEL, AUDIT_CONFIG_CHANGE, + "audit implicitly removed rule from list=%d\n", + AUDIT_FILTER_EXIT); + } + list_del(&w->wlist); + audit_put_watch(w); /* matches initial get */ + } + mutex_unlock(&audit_filter_mutex); +} + +/* Actually remove the parent; inotify has acknowleged the removal. */ +static inline void audit_remove_parent(struct audit_parent *parent) +{ + WARN_ON(!list_empty(&parent->watches)); + spin_lock(&master_parents_lock); + list_del(&parent->mlist); + audit_put_parent(parent); + spin_unlock(&master_parents_lock); +} + +/* Register inotify watches for parents on in_list. */ +static int audit_inotify_register(struct nameidata *nd, + struct list_head *in_list) +{ + struct audit_parent *p; + s32 wd; + int ret = 0; + + list_for_each_entry(p, in_list, ilist) { + /* Grab a ref while calling inotify_add_watch(), so parent + * can't be removed until we've updated its data. */ + audit_get_parent(p); + + if (!audit_idev) + wd = -EOPNOTSUPP; + else + wd = inotify_add_watch(audit_idev, nd->dentry->d_inode, + AUDIT_IN_WATCH, p); + if (wd < 0) { + audit_remove_parent_watches(p); + audit_remove_parent(p); + /* save the first error for return value */ + if (!ret) + ret = wd; + } else { + struct inode *inode = nd->dentry->d_inode; + + mutex_lock(&audit_filter_mutex); + p->wd = wd; + p->dev = inode->i_sb->s_dev; + p->ino = inode->i_ino; + mutex_unlock(&audit_filter_mutex); + } + + audit_put_parent(p); + } + + return ret; +} + +/* Unregister inotify watches for parents on in_list. + * Generates an IN_IGNORED event. */ +static void audit_inotify_unregister(struct list_head *in_list) +{ + struct audit_parent *p; + + list_for_each_entry(p, in_list, ilist) { + if (audit_idev) + inotify_ignore(audit_idev, p->wd); + /* matches get in audit_remove_watch() */ + audit_put_parent(p); + } +} + +/* Get path information necessary for adding watches. */ +static int audit_get_nd(char *path, struct nameidata **ndp, + struct nameidata **ndw) +{ + struct nameidata *ndparent, *ndwatch; + int err; + + ndparent = kmalloc(sizeof(*ndparent), GFP_KERNEL); + if (unlikely(!ndparent)) + return -ENOMEM; + + ndwatch = kmalloc(sizeof(*ndwatch), GFP_KERNEL); + if (unlikely(!ndwatch)) { + kfree(ndparent); + return -ENOMEM; + } + + err = path_lookup(path, LOOKUP_PARENT, ndparent); + if (err) { + kfree(ndparent); + kfree(ndwatch); + return err; + } + + err = path_lookup(path, 0, ndwatch); + if (err) { + kfree(ndwatch); + ndwatch = NULL; + } + + *ndp = ndparent; + *ndw = ndwatch; + + return 0; +} + +/* Release resources used for watch path information. */ +static inline void audit_put_nd(struct nameidata *ndp, struct nameidata *ndw) +{ + if (ndp) { + path_release(ndp); + kfree(ndp); + } + if (ndw) { + path_release(ndw); + kfree(ndw); + } +} + +/* Find an existing parent entry for this watch, or create a new one. + * Caller must hold audit_filter_mutex. */ +static inline struct audit_parent *audit_find_parent(struct nameidata *nd, + struct list_head *in_list) +{ + struct audit_parent *p, *parent, *next; + struct inode *inode = nd->dentry->d_inode; + + list_for_each_entry_safe(p, next, &master_parents, mlist) { + if (p->ino != inode->i_ino || + p->dev != inode->i_sb->s_dev) + continue; + + parent = p; + goto out; + } + + parent = audit_init_parent(); + if (IS_ERR(parent)) + goto out; + /* add new parent to inotify registration list */ + list_add(&parent->ilist, in_list); + +out: + return parent; +} + +/* Find a matching watch entry, or add this one. + * Caller must hold audit_filter_mutex. */ +static inline int audit_add_watch(struct audit_krule *krule, + struct nameidata *ndp, struct nameidata *ndw, + struct list_head *list) +{ + struct audit_parent *parent; + struct audit_watch *w, *watch = krule->watch; + + parent = audit_find_parent(ndp, list); + if (IS_ERR(parent)) + return PTR_ERR(parent); + + list_for_each_entry(w, &parent->watches, wlist) { + if (strcmp(watch->path, w->path)) + continue; + + audit_put_watch(watch); /* tmp watch, krule's ref */ + audit_put_watch(watch); /* tmp watch, matches initial get */ + + audit_get_watch(w); + krule->watch = watch = w; + goto add_rule; + } + + audit_get_parent(parent); + watch->parent = parent; + list_add(&watch->wlist, &parent->watches); + +add_rule: + list_add(&krule->rlist, &watch->rules); + + if (ndw) { + watch->dev = ndw->dentry->d_inode->i_sb->s_dev; + watch->ino = ndw->dentry->d_inode->i_ino; + } + + return 0; +} + +/* Add rule to given filterlist if not a duplicate. */ +static inline int audit_add_rule(struct audit_entry *entry, + struct list_head *list) +{ + struct audit_entry *e; + struct audit_watch *watch = entry->rule.watch; + struct nameidata *ndp, *ndw; + LIST_HEAD(inotify_list); + int err; + + /* Taking audit_filter_mutex protects from stale rule data and + * writes to an audit_parent. */ + mutex_lock(&audit_filter_mutex); list_for_each_entry(e, list, list) { - if (!audit_compare_rule(&entry->rule, &e->rule)) - return -EEXIST; + if (!audit_compare_rule(&entry->rule, &e->rule)) { + err = -EEXIST; + mutex_unlock(&audit_filter_mutex); + goto error; + } + } + mutex_unlock(&audit_filter_mutex); + + /* Avoid calling path_lookup under audit_filter_mutex. */ + if (watch) { + err = audit_get_nd(watch->path, &ndp, &ndw); + if (err) + goto error; } + mutex_lock(&audit_filter_mutex); + if (watch) { + err = audit_add_watch(&entry->rule, ndp, ndw, &inotify_list); + if (err) { + mutex_unlock(&audit_filter_mutex); + audit_put_nd(ndp, ndw); + goto error; + } + } if (entry->rule.flags & AUDIT_FILTER_PREPEND) { list_add_rcu(&entry->list, list); } else { list_add_tail_rcu(&entry->list, list); } + mutex_unlock(&audit_filter_mutex); + + if (watch) { + err = audit_inotify_register(ndp, &inotify_list); + if (err) + goto error; + audit_put_nd(ndp, ndw); + } return 0; + +error: + if (watch) + audit_put_watch(watch); /* tmp watch, matches initial get */ + return err; +} + +/* Remove given krule from its associated watch's rules list and clean up any + * last instances of associated watch and parent. + * Caller must hold audit_filter_mutex. */ +static inline void audit_remove_watch(struct audit_krule *krule, + struct list_head *in_list) +{ + struct audit_watch *watch = krule->watch; + struct audit_parent *parent = watch->parent; + + list_del(&krule->rlist); + if (list_empty(&watch->rules)) { + list_del(&watch->wlist); + audit_put_watch(watch); /* matches initial get */ + + if (list_empty(&parent->watches)) { + /* Put parent on the inotify un-registration list. + * Grab a reference before releasing audit_filter_mutex, + * to be released in audit_inotify_unregister(). */ + list_add(&parent->ilist, in_list); + audit_get_parent(parent); + } + } } -/* Remove an existing rule from filterlist. Protected by - * audit_netlink_mutex. */ +/* Remove an existing rule from filterlist. */ static inline int audit_del_rule(struct audit_entry *entry, struct list_head *list) { struct audit_entry *e; + LIST_HEAD(inotify_list); - /* Do not use the _rcu iterator here, since this is the only - * deletion routine. */ + mutex_lock(&audit_filter_mutex); list_for_each_entry(e, list, list) { - if (!audit_compare_rule(&entry->rule, &e->rule)) { - list_del_rcu(&e->list); - call_rcu(&e->rcu, audit_free_rule_rcu); - return 0; + if (audit_compare_rule(&entry->rule, &e->rule)) + continue; + + if (e->rule.watch) { + audit_remove_watch(&e->rule, &inotify_list); + /* match initial get for tmp watch */ + audit_put_watch(entry->rule.watch); } - } + + list_del_rcu(&e->list); + call_rcu(&e->rcu, audit_free_rule_rcu); + mutex_unlock(&audit_filter_mutex); + + if (e->rule.watch) + audit_inotify_unregister(&inotify_list); + + return 0; + } + mutex_unlock(&audit_filter_mutex); + /* match initial get for tmp watch */ + if (entry->rule.watch) + audit_put_watch(entry->rule.watch); return -ENOENT; /* No matching rule */ } @@ -521,10 +1053,10 @@ static int audit_list(void *_dest) seq = dest[1]; kfree(dest); - mutex_lock(&audit_netlink_mutex); + mutex_lock(&audit_filter_mutex); - /* The *_rcu iterators not needed here because we are - always called with audit_netlink_mutex held. */ + /* This is a blocking read, so use audit_filter_mutex instead of rcu + * iterator to sync with list writers. */ for (i=0; ibuflen); kfree(data); } } audit_send_reply(pid, seq, AUDIT_LIST_RULES, 1, 1, NULL, 0); - mutex_unlock(&audit_netlink_mutex); + mutex_unlock(&audit_filter_mutex); return 0; } @@ -662,6 +1194,32 @@ int audit_receive_filter(int type, int p return err; } +/** + * audit_handle_ievent - handler for Inotify events + * @event: information about the event + * @dname: dentry name associated with event + * @inode: inode associated with event + * @ptr: kernel's version of a watch descriptor + */ +void audit_handle_ievent(struct inotify_event *event, const char *dname, + struct inode *inode, void *ptr) +{ + struct audit_parent *parent = (struct audit_parent *)ptr; + + if (event->mask & (IN_CREATE|IN_MOVED_TO) && inode) + audit_update_watch(parent, dname, inode->i_sb->s_dev, + inode->i_ino); + else if (event->mask & (IN_DELETE|IN_MOVED_FROM)) + audit_update_watch(parent, dname, (dev_t)-1, (unsigned long)-1); + /* Note: Inotify doesn't remove the watch for the IN_MOVE_SELF event. + * Work around this by leaving the parent around with an empty + * watchlist. It will be re-used if new watches are added. */ + else if (event->mask & (AUDIT_IN_SELF)) + audit_remove_parent_watches(parent); + else if (event->mask & IN_IGNORED) + audit_remove_parent(parent); +} + int audit_comparator(const u32 left, const u32 op, const u32 right) { switch (op) { @@ -682,7 +1240,39 @@ int audit_comparator(const u32 left, con return 0; } +/* Compare given dentry name with last component in given path, + * return of 0 indicates a match. */ +int audit_compare_dname_path(const char *dname, const char *path) +{ + int dlen, plen; + const char *p; + + if (!dname || !path) + return 1; + + dlen = strlen(dname); + plen = strlen(path); + if (plen < dlen) + return 1; + + /* disregard trailing slashes */ + p = path + plen - 1; + while ((*p == '/') && (p > path)) + p--; + + /* find last path component */ + p = p - dlen + 1; + if (p < path) + return 1; + else if (p > path) { + if (*--p != '/') + return 1; + else + p++; + } + return strncmp(p, dname, dlen); +} static int audit_filter_user_rules(struct netlink_skb_parms *cb, struct audit_krule *rule, @@ -796,32 +1386,41 @@ static inline int audit_rule_has_selinux int selinux_audit_rule_update(void) { struct audit_entry *entry, *nentry; + struct audit_watch *watch; int i, err = 0; - /* audit_netlink_mutex synchronizes the writers */ - mutex_lock(&audit_netlink_mutex); + /* audit_filter_mutex synchronizes the writers */ + mutex_lock(&audit_filter_mutex); for (i = 0; i < AUDIT_NR_FILTERS; i++) { list_for_each_entry(entry, &audit_filter_list[i], list) { if (!audit_rule_has_selinux(&entry->rule)) continue; - nentry = audit_dupe_rule(&entry->rule); + watch = entry->rule.watch; + nentry = audit_dupe_rule(&entry->rule, watch); if (unlikely(IS_ERR(nentry))) { /* save the first error encountered for the * return value */ if (!err) err = PTR_ERR(nentry); audit_panic("error updating selinux filters"); + if (watch) + list_del(&entry->rule.rlist); list_del_rcu(&entry->list); } else { + if (watch) { + list_add(&nentry->rule.rlist, + &watch->rules); + list_del(&entry->rule.rlist); + } list_replace_rcu(&entry->list, &nentry->list); } call_rcu(&entry->rcu, audit_free_rule_rcu); } } - mutex_unlock(&audit_netlink_mutex); + mutex_unlock(&audit_filter_mutex); return err; } diff --git a/kernel/auditsc.c b/kernel/auditsc.c index ba9e9a3..0f56c69 100644 --- a/kernel/auditsc.c +++ b/kernel/auditsc.c @@ -160,6 +160,27 @@ struct audit_context { #endif }; +/* Determine if any context name data matches a rule's watch data */ +static inline int audit_match_watch(struct audit_context *ctx, + struct audit_watch *watch) +{ + int i; + + if (!ctx) + return 0; + + if (watch->ino == (unsigned long)-1) + return 0; + + for (i = 0; i < ctx->name_count; i++) { + if (ctx->names[i].dev == watch->dev && + (ctx->names[i].ino == watch->ino || + ctx->names[i].pino == watch->ino)) + return 1; + } + + return 0; +} /* Compare a task_struct with an audit_rule. Return 1 on match, 0 * otherwise. */ @@ -256,6 +277,9 @@ static int audit_filter_rules(struct tas } } break; + case AUDIT_WATCH: + result = audit_match_watch(ctx, rule->watch); + break; case AUDIT_LOGINUID: result = 0; if (ctx) @@ -1067,37 +1091,20 @@ void __audit_inode_child(const char *dna return; /* determine matching parent */ - if (dname) - for (idx = 0; idx < context->name_count; idx++) - if (context->names[idx].pino == pino) { - const char *n; - const char *name = context->names[idx].name; - int dlen = strlen(dname); - int nlen = name ? strlen(name) : 0; - - if (nlen < dlen) - continue; - - /* disregard trailing slashes */ - n = name + nlen - 1; - while ((*n == '/') && (n > name)) - n--; - - /* find last path component */ - n = n - dlen + 1; - if (n < name) - continue; - else if (n > name) { - if (*--n != '/') - continue; - else - n++; - } + if (!dname) + goto no_match; + for (idx = 0; idx < context->name_count; idx++) + if (context->names[idx].pino == pino) { + const char *name = context->names[idx].name; - if (strncmp(n, dname, dlen) == 0) - goto update_context; - } + if (!name) + continue; + + if (audit_compare_dname_path(dname, name) == 0) + goto update_context; + } +no_match: /* catch-all in case match not found */ idx = context->name_count++; context->names[idx].name = NULL; -- 0.99.9.GIT linux-2.6-audit-git.patch: arch/i386/kernel/vm86.c | 12 arch/ia64/kernel/ptrace.c | 10 fs/namei.c | 11 fs/open.c | 8 fs/xattr.c | 11 include/linux/audit.h | 130 +++++- include/linux/fsnotify.h | 14 include/linux/security.h | 33 + ipc/msg.c | 5 ipc/sem.c | 5 ipc/shm.c | 4 kernel/Makefile | 2 kernel/audit.c | 175 ++++++-- kernel/audit.h | 88 ++++ kernel/auditfilter.c | 630 +++++++++++++++++++++++++++++++ kernel/auditsc.c | 832 +++++++++++++++++++++-------------------- net/core/dev.c | 7 security/dummy.c | 14 security/selinux/hooks.c | 98 ++-- security/selinux/nlmsgtab.c | 9 security/selinux/selinuxfs.c | 11 security/selinux/ss/services.c | 15 22 files changed, 1579 insertions(+), 545 deletions(-) --- NEW FILE linux-2.6-audit-git.patch --- diff --git a/arch/i386/kernel/vm86.c b/arch/i386/kernel/vm86.c index f51c894..aee14fa 100644 --- a/arch/i386/kernel/vm86.c +++ b/arch/i386/kernel/vm86.c @@ -43,6 +43,7 @@ #include #include #include +#include #include #include @@ -252,6 +253,7 @@ out: #ifndef CONFIG_X86_NO_TSS struct tss_struct *tss; #endif + long eax; /* * make sure the vm86() system call doesn't try to do anything silly */ @@ -305,13 +307,19 @@ static void do_sys_vm86(struct kernel_vm tsk->thread.screen_bitmap = info->screen_bitmap; if (info->flags & VM86_SCREEN_BITMAP) mark_screen_rdonly(tsk->mm); + __asm__ __volatile__("xorl %eax,%eax; movl %eax,%fs; movl %eax,%gs\n\t"); + __asm__ __volatile__("movl %%eax, %0\n" :"=r"(eax)); + + /*call audit_syscall_exit since we do not exit via the normal paths */ + if (unlikely(current->audit_context)) + audit_syscall_exit(current, AUDITSC_RESULT(eax), eax); + __asm__ __volatile__( - "xorl %%eax,%%eax; movl %%eax,%%fs; movl %%eax,%%gs\n\t" "movl %0,%%esp\n\t" "movl %1,%%ebp\n\t" "jmp resume_userspace" : /* no outputs */ - :"r" (&info->regs), "r" (task_thread_info(tsk)) : "ax"); + :"r" (&info->regs), "r" (task_thread_info(tsk))); /* we never return here */ } diff --git a/arch/ia64/kernel/ptrace.c b/arch/ia64/kernel/ptrace.c index eaed14a..9887c87 100644 --- a/arch/ia64/kernel/ptrace.c +++ b/arch/ia64/kernel/ptrace.c @@ -1656,8 +1656,14 @@ syscall_trace_leave (long arg0, long arg long arg4, long arg5, long arg6, long arg7, struct pt_regs regs) { - if (unlikely(current->audit_context)) - audit_syscall_exit(current, AUDITSC_RESULT(regs.r10), regs.r8); + if (unlikely(current->audit_context)) { + int success = AUDITSC_RESULT(regs.r10); + long result = regs.r8; + + if (success != AUDITSC_SUCCESS) + result = -result; + audit_syscall_exit(current, success, result); + } if (test_thread_flag(TIF_SYSCALL_TRACE) && (current->ptrace & PT_PTRACED)) diff --git a/fs/namei.c b/fs/namei.c index 8dc2b03..51cfc9c 100644 --- a/fs/namei.c +++ b/fs/namei.c @@ -1353,6 +1353,7 @@ static int may_delete(struct inode *dir, return -ENOENT; BUG_ON(victim->d_parent->d_inode != dir); + audit_inode_child(victim->d_name.name, victim->d_inode, dir->i_ino); error = permission(dir,MAY_WRITE | MAY_EXEC, NULL); if (error) @@ -1472,7 +1473,7 @@ int vfs_create(struct inode *dir, struct DQUOT_INIT(dir); error = dir->i_op->create(dir, dentry, mode, nd); if (!error) - fsnotify_create(dir, dentry->d_name.name); + fsnotify_create(dir, dentry); return error; } @@ -1793,7 +1794,7 @@ int vfs_mknod(struct inode *dir, struct DQUOT_INIT(dir); error = dir->i_op->mknod(dir, dentry, mode, dev); if (!error) - fsnotify_create(dir, dentry->d_name.name); + fsnotify_create(dir, dentry); return error; } @@ -1870,7 +1871,7 @@ int vfs_mkdir(struct inode *dir, struct DQUOT_INIT(dir); error = dir->i_op->mkdir(dir, dentry, mode); if (!error) - fsnotify_mkdir(dir, dentry->d_name.name); + fsnotify_mkdir(dir, dentry); return error; } @@ -2133,7 +2134,7 @@ int vfs_symlink(struct inode *dir, struc DQUOT_INIT(dir); error = dir->i_op->symlink(dir, dentry, oldname); if (!error) - fsnotify_create(dir, dentry->d_name.name); + fsnotify_create(dir, dentry); return error; } @@ -2210,7 +2211,7 @@ int vfs_link(struct dentry *old_dentry, error = dir->i_op->link(old_dentry, dir, new_dentry); mutex_unlock(&old_dentry->d_inode->i_mutex); if (!error) - fsnotify_create(dir, new_dentry->d_name.name); + fsnotify_create(dir, new_dentry); return error; } diff --git a/fs/open.c b/fs/open.c index 70e0230..7051000 100644 --- a/fs/open.c +++ b/fs/open.c @@ -27,6 +27,7 @@ #include #include #include +#include #include @@ -626,6 +627,8 @@ asmlinkage long sys_fchmod(unsigned int dentry = file->f_dentry; inode = dentry->d_inode; + audit_inode(NULL, inode, 0); + err = -EROFS; if (IS_RDONLY(inode)) goto out_putf; @@ -775,7 +778,10 @@ asmlinkage long sys_fchown(unsigned int file = fget(fd); if (file) { - error = chown_common(file->f_dentry, user, group); + struct dentry * dentry; + dentry = file->f_dentry; + audit_inode(NULL, dentry->d_inode, 0); + error = chown_common(dentry, user, group); fput(file); } return error; diff --git a/fs/xattr.c b/fs/xattr.c index 80eca7d..e416190 100644 --- a/fs/xattr.c +++ b/fs/xattr.c @@ -17,6 +17,7 @@ #include #include #include +#include #include @@ -234,12 +235,15 @@ sys_fsetxattr(int fd, char __user *name, size_t size, int flags) { struct file *f; + struct dentry *dentry; int error = -EBADF; f = fget(fd); if (!f) return error; - error = setxattr(f->f_dentry, name, value, size, flags); + dentry = f->f_dentry; + audit_inode(NULL, dentry->d_inode, 0); + error = setxattr(dentry, name, value, size, flags); fput(f); return error; } @@ -458,12 +462,15 @@ asmlinkage long sys_fremovexattr(int fd, char __user *name) { struct file *f; + struct dentry *dentry; int error = -EBADF; f = fget(fd); if (!f) return error; - error = removexattr(f->f_dentry, name); + dentry = f->f_dentry; + audit_inode(NULL, dentry->d_inode, 0); + error = removexattr(dentry, name); fput(f); return error; } [...2995 lines suppressed...] - rc = len; - goto out_free; - } - if (size < len) { - rc = -ERANGE; - goto out_free; - } + if (strcmp(name, XATTR_SELINUX_SUFFIX)) + return -EOPNOTSUPP; - if (err > 0) { - if ((len == err) && !(memcmp(context, buffer, len))) { - /* Don't need to canonicalize value */ - rc = err; - goto out_free; - } - memset(buffer, 0, size); - } - memcpy(buffer, context, len); - rc = len; -out_free: - kfree(context); -out: - return rc; + return selinux_getsecurity(isec->sid, buffer, size); } static int selinux_inode_setsecurity(struct inode *inode, const char *name, @@ -4022,6 +4020,13 @@ static int selinux_ipc_permission(struct return ipc_has_perm(ipcp, av); } +static int selinux_ipc_getsecurity(struct kern_ipc_perm *ipcp, void *buffer, size_t size) +{ + struct ipc_security_struct *isec = ipcp->security; + + return selinux_getsecurity(isec->sid, buffer, size); +} + /* module stacking operations */ static int selinux_register_security (const char *name, struct security_operations *ops) { @@ -4063,8 +4068,7 @@ static int selinux_getprocattr(struct ta char *name, void *value, size_t size) { struct task_security_struct *tsec; - u32 sid, len; - char *context; + u32 sid; int error; if (current != p) { @@ -4073,9 +4077,6 @@ static int selinux_getprocattr(struct ta return error; } - if (!size) - return -ERANGE; - tsec = p->security; if (!strcmp(name, "current")) @@ -4092,16 +4093,7 @@ static int selinux_getprocattr(struct ta if (!sid) return 0; - error = security_sid_to_context(sid, &context, &len); - if (error) - return error; - if (len > size) { - kfree(context); - return -ERANGE; - } - memcpy(value, context, len); - kfree(context); - return len; + return selinux_getsecurity(sid, value, size); } static int selinux_setprocattr(struct task_struct *p, @@ -4259,6 +4251,7 @@ static struct security_operations selinu .inode_getxattr = selinux_inode_getxattr, .inode_listxattr = selinux_inode_listxattr, .inode_removexattr = selinux_inode_removexattr, + .inode_xattr_getsuffix = selinux_inode_xattr_getsuffix, .inode_getsecurity = selinux_inode_getsecurity, .inode_setsecurity = selinux_inode_setsecurity, .inode_listsecurity = selinux_inode_listsecurity, @@ -4296,6 +4289,7 @@ static struct security_operations selinu .task_to_inode = selinux_task_to_inode, .ipc_permission = selinux_ipc_permission, + .ipc_getsecurity = selinux_ipc_getsecurity, .msg_msg_alloc_security = selinux_msg_msg_alloc_security, .msg_msg_free_security = selinux_msg_msg_free_security, diff --git a/security/selinux/nlmsgtab.c b/security/selinux/nlmsgtab.c index 69b9329..7315824 100644 --- a/security/selinux/nlmsgtab.c +++ b/security/selinux/nlmsgtab.c @@ -99,6 +99,9 @@ static struct nlmsg_perm nlmsg_audit_per { AUDIT_LIST, NETLINK_AUDIT_SOCKET__NLMSG_READPRIV }, { AUDIT_ADD, NETLINK_AUDIT_SOCKET__NLMSG_WRITE }, { AUDIT_DEL, NETLINK_AUDIT_SOCKET__NLMSG_WRITE }, + { AUDIT_LIST_RULES, NETLINK_AUDIT_SOCKET__NLMSG_READPRIV }, + { AUDIT_ADD_RULE, NETLINK_AUDIT_SOCKET__NLMSG_WRITE }, + { AUDIT_DEL_RULE, NETLINK_AUDIT_SOCKET__NLMSG_WRITE }, { AUDIT_USER, NETLINK_AUDIT_SOCKET__NLMSG_RELAY }, { AUDIT_SIGNAL_INFO, NETLINK_AUDIT_SOCKET__NLMSG_READ }, }; @@ -145,8 +148,10 @@ int selinux_nlmsg_lookup(u16 sclass, u16 break; case SECCLASS_NETLINK_AUDIT_SOCKET: - if (nlmsg_type >= AUDIT_FIRST_USER_MSG && - nlmsg_type <= AUDIT_LAST_USER_MSG) { + if ((nlmsg_type >= AUDIT_FIRST_USER_MSG && + nlmsg_type <= AUDIT_LAST_USER_MSG) || + (nlmsg_type >= AUDIT_FIRST_USER_MSG2 && + nlmsg_type <= AUDIT_LAST_USER_MSG2)) { *perm = NETLINK_AUDIT_SOCKET__NLMSG_RELAY; } else { err = nlmsg_perm(nlmsg_type, perm, nlmsg_audit_perms, diff --git a/security/selinux/selinuxfs.c b/security/selinux/selinuxfs.c index b5fa02d..5eba666 100644 --- a/security/selinux/selinuxfs.c +++ b/security/selinux/selinuxfs.c @@ -21,6 +21,7 @@ #include #include #include +#include #include #include @@ -126,6 +127,10 @@ static ssize_t sel_write_enforce(struct length = task_has_security(current, SECURITY__SETENFORCE); if (length) goto out; + audit_log(current->audit_context, GFP_KERNEL, AUDIT_MAC_STATUS, + "enforcing=%d old_enforcing=%d auid=%u", new_value, + selinux_enforcing, + audit_get_loginuid(current->audit_context)); selinux_enforcing = new_value; if (selinux_enforcing) avc_ss_reset(0); @@ -176,6 +181,9 @@ static ssize_t sel_write_disable(struct length = selinux_disable(); if (length < 0) goto out; + audit_log(current->audit_context, GFP_KERNEL, AUDIT_MAC_STATUS, + "selinux=0 auid=%u", + audit_get_loginuid(current->audit_context)); } length = count; @@ -261,6 +269,9 @@ static ssize_t sel_write_load(struct fil length = ret; else length = count; + audit_log(current->audit_context, GFP_KERNEL, AUDIT_MAC_POLICY_LOAD, + "policy loaded auid=%u", + audit_get_loginuid(current->audit_context)); out: up(&sel_sem); vfree(data); diff --git a/security/selinux/ss/services.c b/security/selinux/ss/services.c index 8a76492..d877cd1 100644 --- a/security/selinux/ss/services.c +++ b/security/selinux/ss/services.c @@ -1758,19 +1758,22 @@ int security_set_bools(int len, int *val goto out; } - printk(KERN_INFO "security: committed booleans { "); for (i = 0; i < len; i++) { + if (!!values[i] != policydb.bool_val_to_struct[i]->state) { + audit_log(current->audit_context, GFP_ATOMIC, + AUDIT_MAC_CONFIG_CHANGE, + "bool=%s val=%d old_val=%d auid=%u", + policydb.p_bool_val_to_name[i], + !!values[i], + policydb.bool_val_to_struct[i]->state, + audit_get_loginuid(current->audit_context)); + } if (values[i]) { policydb.bool_val_to_struct[i]->state = 1; } else { policydb.bool_val_to_struct[i]->state = 0; } - if (i != 0) - printk(", "); - printk("%s:%d", policydb.p_bool_val_to_name[i], - policydb.bool_val_to_struct[i]->state); } - printk(" }\n"); for (cur = policydb.cond_list; cur != NULL; cur = cur->next) { rc = evaluate_cond_node(&policydb, cur); linux-2.6-audit-slab-leak-tracking.patch: fs/proc/proc_misc.c | 37 +++++++++++ include/linux/slab.h | 6 + lib/Kconfig.debug | 4 + mm/slab.c | 166 +++++++++++++++++++++++++++++++++++++++++++++++++-- mm/util.c | 4 - net/core/skbuff.c | 2 6 files changed, 210 insertions(+), 9 deletions(-) --- NEW FILE linux-2.6-audit-slab-leak-tracking.patch --- diff --git a/fs/proc/proc_misc.c b/fs/proc/proc_misc.c index 1d24fea..8d1b548 100644 --- a/fs/proc/proc_misc.c +++ b/fs/proc/proc_misc.c @@ -485,6 +485,40 @@ static struct file_operations proc_slabi .llseek = seq_lseek, .release = seq_release, }; + +#ifdef CONFIG_DEBUG_SLAB_LEAK +extern struct seq_operations slabstats_op; +static int slabstats_open(struct inode *inode, struct file *file) +{ + unsigned long *n = kzalloc(PAGE_SIZE, GFP_KERNEL); + int ret = -ENOMEM; + if (n) { + ret = seq_open(file, &slabstats_op); + if (!ret) { + struct seq_file *m = file->private_data; + *n = PAGE_SIZE / (2 * sizeof(unsigned long)); + m->private = n; + n = NULL; + } + kfree(n); + } + return ret; +} + +static int slabstats_release(struct inode *inode, struct file *file) +{ + struct seq_file *m = file->private_data; + kfree(m->private); + return seq_release(inode, file); +} + +static struct file_operations proc_slabstats_operations = { + .open = slabstats_open, + .read = seq_read, + .llseek = seq_lseek, + .release = slabstats_release, +}; +#endif #endif static int show_stat(struct seq_file *p, void *v) @@ -744,6 +778,9 @@ void __init proc_misc_init(void) create_seq_entry("interrupts", 0, &proc_interrupts_operations); #ifdef CONFIG_SLAB create_seq_entry("slabinfo",S_IWUSR|S_IRUGO,&proc_slabinfo_operations); +#ifdef CONFIG_DEBUG_SLAB_LEAK + create_seq_entry("slab_allocators", 0 ,&proc_slabstats_operations); +#endif #endif create_seq_entry("buddyinfo",S_IRUGO, &fragmentation_file_operations); create_seq_entry("vmstat",S_IRUGO, &proc_vmstat_file_operations); diff --git a/include/linux/slab.h b/include/linux/slab.h index 8cf5293..1115742 100644 --- a/include/linux/slab.h +++ b/include/linux/slab.h @@ -77,11 +77,12 @@ struct cache_sizes { }; extern struct cache_sizes malloc_sizes[]; -#ifndef CONFIG_DEBUG_SLAB extern void *__kmalloc(size_t, gfp_t); +#ifndef CONFIG_DEBUG_SLAB +#define ____kmalloc(size, flags) __kmalloc(size, flags) #else extern void *__kmalloc_track_caller(size_t, gfp_t, void*); -#define __kmalloc(size, flags) \ +#define ____kmalloc(size, flags) \ __kmalloc_track_caller(size, flags, __builtin_return_address(0)) #endif @@ -173,6 +174,7 @@ static inline void *kcalloc(size_t n, si #define kmem_ptr_validate(a, b) (0) #define kmem_cache_alloc_node(c, f, n) kmem_cache_alloc(c, f) #define kmalloc_node(s, f, n) kmalloc(s, f) +#define ____kmalloc kmalloc #endif /* CONFIG_SLOB */ diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug index a314e66..69f2362 100644 --- a/lib/Kconfig.debug +++ b/lib/Kconfig.debug @@ -85,6 +85,10 @@ config DEBUG_SLAB allocation as well as poisoning memory on free to catch use of freed memory. This can make kmalloc/kfree-intensive workloads much slower. +config DEBUG_SLAB_LEAK + bool "Memory leak debugging" + depends on DEBUG_SLAB + config DEBUG_PREEMPT bool "Debug preemptible kernel" depends on DEBUG_KERNEL && PREEMPT diff --git a/mm/slab.c b/mm/slab.c index add05d8..3443bc0 100644 --- a/mm/slab.c +++ b/mm/slab.c @@ -3118,22 +3118,23 @@ static __always_inline void *__do_kmallo return __cache_alloc(cachep, flags, caller); } -#ifndef CONFIG_DEBUG_SLAB void *__kmalloc(size_t size, gfp_t flags) { +#ifndef CONFIG_DEBUG_SLAB return __do_kmalloc(size, flags, NULL); +#else + return __do_kmalloc(size, flags, __builtin_return_address(0)); +#endif } EXPORT_SYMBOL(__kmalloc); -#else - +#ifdef CONFIG_DEBUG_SLAB void *__kmalloc_track_caller(size_t size, gfp_t flags, void *caller) { return __do_kmalloc(size, flags, caller); } EXPORT_SYMBOL(__kmalloc_track_caller); - #endif #ifdef CONFIG_SMP @@ -3778,6 +3779,163 @@ ssize_t slabinfo_write(struct file *file res = count; return res; } + +#ifdef CONFIG_DEBUG_SLAB_LEAK + +static void *leaks_start(struct seq_file *m, loff_t *pos) +{ + loff_t n = *pos; + struct list_head *p; + + mutex_lock(&cache_chain_mutex); + p = cache_chain.next; + while (n--) { + p = p->next; + if (p == &cache_chain) + return NULL; + } + return list_entry(p, struct kmem_cache, next); +} + +static inline int add_caller(unsigned long *n, unsigned long v) +{ + unsigned long *p; + int l; + if (!v) + return 1; + l = n[1]; + p = n + 2; + while (l) { + int i = l/2; + unsigned long *q = p + 2 * i; + if (*q == v) { + q[1]++; + return 1; + } + if (*q > v) { + l = i; + } else { + p = q + 2; + l -= i + 1; + } + } + if (++n[1] == n[0]) + return 0; + memmove(p + 2, p, n[1] * 2 * sizeof(unsigned long) - ((void *)p - (void *)n)); + p[0] = v; + p[1] = 1; + return 1; +} + +static void handle_slab(unsigned long *n, struct kmem_cache *c, struct slab *s) +{ + void *p; + int i; + if (n[0] == n[1]) + return; + for (i = 0, p = s->s_mem; i < c->num; i++, p += c->buffer_size) { + if (slab_bufctl(s)[i] != BUFCTL_ALLOC) + continue; + if (*dbg_redzone1(c, p) != RED_ACTIVE) + continue; + if (!add_caller(n, (unsigned long)*dbg_userword(c, p))) + return; + } +} + +static void show_symbol(struct seq_file *m, unsigned long address) +{ +#ifdef CONFIG_KALLSYMS + char *modname; + const char *name; + unsigned long offset, size; + char namebuf[KSYM_NAME_LEN+1]; + + name = kallsyms_lookup(address, &size, &offset, &modname, namebuf); + + if (name) { + seq_printf(m, "%s+%#lx/%#lx", name, offset, size); + if (modname) + seq_printf(m, " [%s]", modname); + return; + } +#endif + seq_printf(m, "%p", (void *)address); +} + +static int leaks_show(struct seq_file *m, void *p) +{ + struct kmem_cache *cachep = p; + struct list_head *q; + struct slab *slabp; + struct kmem_list3 *l3; + const char *name; + unsigned long *n = m->private; + int node; + int i; + + if (!(cachep->flags & SLAB_STORE_USER)) + return 0; + if (!(cachep->flags & SLAB_RED_ZONE)) + return 0; + + /* OK, we can do it */ + + n[1] = 0; + + spin_lock(&cachep->spinlock); + for_each_online_node(node) { + l3 = cachep->nodelists[node]; + if (!l3) + continue; + + check_irq_on(); + spin_lock_irq(&l3->list_lock); + + list_for_each(q, &l3->slabs_full) { + slabp = list_entry(q, struct slab, list); + handle_slab(n, cachep, slabp); + } + list_for_each(q, &l3->slabs_partial) { + slabp = list_entry(q, struct slab, list); + handle_slab(n, cachep, slabp); + } + spin_unlock_irq(&l3->list_lock); + } + name = cachep->name; + spin_unlock(&cachep->spinlock); + if (n[0] == n[1]) { + /* Increase the buffer size */ + mutex_unlock(&cache_chain_mutex); + m->private = kzalloc(n[0] * 4 * sizeof(unsigned long), GFP_KERNEL); + if (!m->private) { + /* Too bad, we are really out */ + m->private = n; + mutex_lock(&cache_chain_mutex); + return -ENOMEM; + } + *(unsigned long *)m->private = n[0] * 2; + kfree(n); + mutex_lock(&cache_chain_mutex); + /* Now make sure this entry will be retried */ + m->count = m->size; + return 0; + } + for (i = 0; i < n[1]; i++) { + seq_printf(m, "%s: %lu ", name, n[2*i+3]); + show_symbol(m, n[2*i+2]); + seq_putc(m, '\n'); + } + return 0; +} + +struct seq_operations slabstats_op = { + .start = leaks_start, + .next = s_next, + .stop = s_stop, + .show = leaks_show, +}; +#endif #endif /** diff --git a/mm/util.c b/mm/util.c index 5f4bb59..229000d 100644 --- a/mm/util.c +++ b/mm/util.c @@ -9,7 +9,7 @@ */ void *kzalloc(size_t size, gfp_t flags) { - void *ret = kmalloc(size, flags); + void *ret = ____kmalloc(size, flags); if (ret) memset(ret, 0, size); return ret; @@ -31,7 +31,7 @@ char *kstrdup(const char *s, gfp_t gfp) return NULL; len = strlen(s) + 1; - buf = kmalloc(len, gfp); + buf = ____kmalloc(len, gfp); if (buf) memcpy(buf, s, len); return buf; diff --git a/net/core/skbuff.c b/net/core/skbuff.c index 2144952..150423c 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c @@ -149,7 +149,7 @@ struct sk_buff *__alloc_skb(unsigned int /* Get the DATA. Size must match skb_add_mtu(). */ size = SKB_DATA_ALIGN(size); - data = kmalloc(size + sizeof(struct skb_shared_info), gfp_mask); + data = ____kmalloc(size + sizeof(struct skb_shared_info), gfp_mask); if (!data) goto nodata; linux-2.6-audit-sockaddr.patch: socket.c | 2 ++ 1 files changed, 2 insertions(+) --- NEW FILE linux-2.6-audit-sockaddr.patch --- diff -urp linux-2.6.15.x86_64.orig/net/socket.c linux-2.6.15.x86_64/net/socket.c --- linux-2.6.15.x86_64.orig/net/socket.c 2006-03-23 10:16:44.000000000 -0500 +++ linux-2.6.15.x86_64/net/socket.c 2006-03-23 10:27:20.000000000 -0500 @@ -263,6 +263,8 @@ int move_addr_to_user(void *kaddr, int k return -EINVAL; if(len) { + if (audit_sockaddr(klen, kaddr)) + return -ENOMEM; if(copy_to_user(uaddr,kaddr,len)) return -EFAULT; } Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-5/kernel-2.6.spec,v retrieving revision 1.2074 retrieving revision 1.2074.2.1 diff -u -r1.2074 -r1.2074.2.1 --- kernel-2.6.spec 24 Mar 2006 23:51:59 -0000 1.2074 +++ kernel-2.6.spec 27 Mar 2006 15:01:06 -0000 1.2074.2.1 @@ -8,7 +8,7 @@ # Whether to apply the Xen patches, leave this enabled. %define includexen 1 # Whether to build the Xen kernels, disable if you want. -%define buildxen 1 +%define buildxen 0 %define buildxenPAE 0 %define builddoc 0 %define buildkdump 1 @@ -24,7 +24,7 @@ %define sublevel 16 %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 .lspp.14 %define release %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})_FC5%{rhbsys} %define signmodules 0 %define make_target bzImage @@ -431,6 +431,15 @@ Patch20001: xen-9232_fix_vmx.patch Patch20002: xen-9236_fix_vmx.patch +# Audit & lspp patches +Patch20100: linux-2.6-audit-git.patch +Patch20101: linux-2.6-audit-slab-leak-tracking.patch +Patch20102: 0001-support-for-context-based-audit-filtering.patch +Patch20103: 0002-support-for-context-based-audit-filtering.patch +Patch20104: 0003-Inotify-kernel-API.patch +Patch20105: 0004-filesystem-location-based-auditing.patch +Patch20106: linux-2.6-audit-sockaddr.patch + # END OF PATCH DEFINITIONS @@ -1009,7 +1018,7 @@ # Fix incorrect hardlink count in selinuxfs %patch1803 -p1 # Add some more audit message types. -%patch1804 -p1 +#%patch1804 -p1 # Warn about obsolete functionality usage. %patch1900 -p1 @@ -1080,6 +1089,15 @@ # Small 1-2 liners fixing silly bugs that get pushed upstream quickly. %patch10001 -p1 +# Audit patches +%patch20100 -p1 +#%patch20101 -p1 +%patch20102 -p1 +%patch20103 -p1 +%patch20104 -p1 +%patch20105 -p1 +%patch20106 -p1 + # END OF PATCH APPLICATIONS @@ -1669,6 +1687,9 @@ %endif %changelog +* Mon Mar 27 2006 Steve Grubb +- lspp.14 kernel + * Fri Mar 24 2006 Dave Jones - Reenable HDLC driver (#186257) - Reenable ISA NE2000 clones. (#136569) From fedora-cvs-commits at redhat.com Mon Mar 27 15:08:29 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 27 Mar 2006 10:08:29 -0500 Subject: rpms/kernel/FC-5 kernel-2.6.spec,1.2074.2.1,1.2074.2.2 Message-ID: <200603271508.k2RF8TBO024060@cvs.devel.redhat.com> Author: sgrubb Update of /cvs/dist/rpms/kernel/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv24048 Modified Files: Tag: private-lspp-14-branch kernel-2.6.spec Log Message: Minor update to spec file Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-5/kernel-2.6.spec,v retrieving revision 1.2074.2.1 retrieving revision 1.2074.2.2 diff -u -r1.2074.2.1 -r1.2074.2.2 --- kernel-2.6.spec 27 Mar 2006 15:01:06 -0000 1.2074.2.1 +++ kernel-2.6.spec 27 Mar 2006 15:08:16 -0000 1.2074.2.2 @@ -1111,7 +1111,8 @@ # now run oldconfig over all the config files for i in *.config do - mv $i .config + mv $i .config +# echo "CONFIG_DEBUG_SLAB_LEAK=y" >> .config Arch=`head -1 .config | cut -b 3-` %if %{includexen} make ARCH=$Arch nonint_oldconfig > /dev/null From fedora-cvs-commits at redhat.com Mon Mar 27 15:31:50 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 27 Mar 2006 10:31:50 -0500 Subject: rpms/system-config-kickstart/devel .cvsignore, 1.24, 1.25 sources, 1.31, 1.32 system-config-kickstart.spec, 1.35, 1.36 Message-ID: <200603271531.k2RFVoMx005628@cvs.devel.redhat.com> Author: clumens Update of /cvs/dist/rpms/system-config-kickstart/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv5612 Modified Files: .cvsignore sources system-config-kickstart.spec Log Message: Bump version. Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/system-config-kickstart/devel/.cvsignore,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- .cvsignore 9 Feb 2006 15:09:26 -0000 1.24 +++ .cvsignore 27 Mar 2006 15:31:32 -0000 1.25 @@ -17,3 +17,4 @@ system-config-kickstart-2.6.4.tar.bz2 system-config-kickstart-2.6.5.tar.bz2 system-config-kickstart-2.6.6.tar.bz2 +system-config-kickstart-2.6.7.tar.bz2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/system-config-kickstart/devel/sources,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- sources 24 Feb 2006 18:21:11 -0000 1.31 +++ sources 27 Mar 2006 15:31:32 -0000 1.32 @@ -1 +1 @@ -02bbbb3158a7db72685081b20d442812 system-config-kickstart-2.6.6.tar.bz2 +6ccd78a74913133f136183ac4034c36e system-config-kickstart-2.6.7.tar.bz2 Index: system-config-kickstart.spec =================================================================== RCS file: /cvs/dist/rpms/system-config-kickstart/devel/system-config-kickstart.spec,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- system-config-kickstart.spec 24 Feb 2006 18:21:11 -0000 1.35 +++ system-config-kickstart.spec 27 Mar 2006 15:31:32 -0000 1.36 @@ -1,7 +1,7 @@ Summary: A graphical interface for making kickstart files. Name: system-config-kickstart -Version: 2.6.6 -Release: 2 +Version: 2.6.7 +Release: 1 URL: http://fedora.redhat.com/projects/config-tools/ License: GPL ExclusiveOS: Linux @@ -78,6 +78,9 @@ %attr(0644,root,root) %{_datadir}/icons/hicolor/48x48/apps/system-config-kickstart.png %changelog +* Mon Mar 27 2006 Chris Lumens 2.6.7-1 +- Fix support for --generate (#186635). + * Fri Feb 24 2006 Chris Lumens 2.6.6-2 - Add requirement for scriptlets (#182865, #182866). From fedora-cvs-commits at redhat.com Mon Mar 27 15:53:03 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 27 Mar 2006 10:53:03 -0500 Subject: rpms/system-config-users/devel .cvsignore, 1.30, 1.31 sources, 1.30, 1.31 system-config-users.spec, 1.35, 1.36 Message-ID: <200603271553.k2RFr3of019752@cvs.devel.redhat.com> Author: nphilipp Update of /cvs/dist/rpms/system-config-users/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv19737 Modified Files: .cvsignore sources system-config-users.spec Log Message: pick up translation updates Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/system-config-users/devel/.cvsignore,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- .cvsignore 3 Mar 2006 15:49:56 -0000 1.30 +++ .cvsignore 27 Mar 2006 15:53:01 -0000 1.31 @@ -1 +1 @@ -system-config-users-1.2.42.tar.bz2 +system-config-users-1.2.43.tar.bz2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/system-config-users/devel/sources,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- sources 3 Mar 2006 15:49:56 -0000 1.30 +++ sources 27 Mar 2006 15:53:01 -0000 1.31 @@ -1 +1 @@ -59734ff1805c478fc3cd34ec05da71fe system-config-users-1.2.42.tar.bz2 +b48296a3df976f1fd9dab64187ec3b2e system-config-users-1.2.43.tar.bz2 Index: system-config-users.spec =================================================================== RCS file: /cvs/dist/rpms/system-config-users/devel/system-config-users.spec,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- system-config-users.spec 3 Mar 2006 15:49:56 -0000 1.35 +++ system-config-users.spec 27 Mar 2006 15:53:01 -0000 1.36 @@ -1,6 +1,6 @@ Summary: A graphical interface for administering users and groups Name: system-config-users -Version: 1.2.42 +Version: 1.2.43 Release: 1 URL: http://fedora.redhat.com/projects/config-tools/ License: GPL @@ -77,6 +77,9 @@ %attr(0644,root,root) %config (noreplace) /etc/sysconfig/system-config-users %changelog +* Mon Mar 27 2006 Nils Philippsen - 1.2.43 +- pick up translation updates + * Fri Mar 03 2006 Nils Philippsen - 1.2.42 - require hicolor-icon-theme (#182882, #182883) From fedora-cvs-commits at redhat.com Mon Mar 27 15:53:29 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 27 Mar 2006 10:53:29 -0500 Subject: rpms/tix/FC-5 tix.spec,1.12,1.13 Message-ID: <200603271553.k2RFrTQA019781@cvs.devel.redhat.com> Author: dcantrel Update of /cvs/dist/rpms/tix/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv19767 Modified Files: tix.spec Log Message: Make sure libTix8.4.so is in /usr/lib/Tix8.4 and bump release to 4. Index: tix.spec =================================================================== RCS file: /cvs/dist/rpms/tix/FC-5/tix.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- tix.spec 11 Feb 2006 05:52:04 -0000 1.12 +++ tix.spec 27 Mar 2006 15:53:27 -0000 1.13 @@ -5,7 +5,7 @@ Name: tix Epoch: 1 Version: %{tixmajor}.0 -Release: 3.1 +Release: 4 License: BSD Group: Development/Languages URL: http://tix.sourceforge.net/ @@ -65,17 +65,17 @@ rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT +# devel symlinks +( cd $RPM_BUILD_ROOT%{_libdir} + rm -f libtix.so libTix.so + ln -s Tix%{tixmajor}/libTix%{tixmajor}.so libtix.so + ln -s Tix%{tixmajor}/libTix%{tixmajor}.so libTix.so +) + # install demo scripts mkdir -p $RPM_BUILD_ROOT%{_datadir}/Tix%{tixmajor} cp -a demos $RPM_BUILD_ROOT%{_datadir}/Tix%{tixmajor} -# move shared lib -mv $RPM_BUILD_ROOT%{_libdir}/Tix%{tixmajor}/libTix%{tixmajor}.so $RPM_BUILD_ROOT%{_libdir}/libTix%{tixmajor}.so -( cd $RPM_BUILD_ROOT%{_libdir} - ln -sf libTix%{tixmajor}.so libTix.so - ln -sf libTix%{tixmajor}.so libtix.so -) - # the header and man pages were in the previous package, keeping for now... mkdir -p $RPM_BUILD_ROOT%{_includedir} install -m 0644 generic/tix.h $RPM_BUILD_ROOT%{_includedir}/tix.h @@ -91,7 +91,6 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/Tix%{tixmajor}/README.txt rm -f $RPM_BUILD_ROOT%{_libdir}/Tix%{tixmajor}/license.terms - %clean rm -rf $RPM_BUILD_ROOT @@ -99,11 +98,10 @@ %postun -p /sbin/ldconfig - %files %defattr(-,root,root,-) -%{_libdir}/libTix%{tixmajor}.so %dir %{_libdir}/Tix%{tixmajor} +%{_libdir}/Tix%{tixmajor}/libTix%{tixmajor}.so %{_libdir}/Tix%{tixmajor}/*.tcl %{_libdir}/Tix%{tixmajor}/bitmaps %{_libdir}/Tix%{tixmajor}/pref @@ -112,17 +110,19 @@ %files devel %defattr(-,root,root,-) -%{_includedir}/tix.h -%{_libdir}/libtix.so %{_libdir}/libTix.so +%{_libdir}/libtix.so +%{_includedir}/tix.h %{_mandir}/mann %files doc %defattr(-,root,root,-) %doc docs/* - %changelog +* Mon Mar 27 2006 David Cantrell - 1:8.4.0-4 +- Make sure libTix8.4.so is in /usr/lib/Tix8.4 + * Fri Feb 10 2006 Jesse Keating - 1:8.4.0-3.1 - bump again for double-long bug on ppc(64) From fedora-cvs-commits at redhat.com Mon Mar 27 16:03:54 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 27 Mar 2006 11:03:54 -0500 Subject: rpms/system-config-kickstart/FC-5 system-config-kickstart-profile.patch, NONE, 1.1 system-config-kickstart.spec, 1.35, 1.36 Message-ID: <200603271603.k2RG3sR0019953@cvs.devel.redhat.com> Author: clumens Update of /cvs/dist/rpms/system-config-kickstart/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv19933 Modified Files: system-config-kickstart.spec Added Files: system-config-kickstart-profile.patch Log Message: Added a patch to fix system profiling mode (#186635). system-config-kickstart-profile.patch: src/profileSystem.py | 37 +++++++++++++++++++++++++------------ src/system-config-kickstart.py | 14 ++++++-------- system-config-kickstart.spec | 7 ++++++- 3 files changed, 37 insertions(+), 21 deletions(-) --- NEW FILE system-config-kickstart-profile.patch --- diff -ur system-config-kickstart.orig/src/profileSystem.py system-config-kickstart/src/profileSystem.py --- system-config-kickstart.orig/src/profileSystem.py 2005-09-13 13:26:02.000000000 -0400 +++ system-config-kickstart/src/profileSystem.py 2006-03-27 10:48:02.000000000 -0500 @@ -23,6 +23,8 @@ import language_backend import rhpl.keyboard as keyboard +from pykickstart.constants import * + class ProfileSystem: def __init__(self, kickstartData): self.kickstartData = kickstartData @@ -32,22 +34,22 @@ self.getKeyboard() self.getTimezone() self.getRootPassword() + self.getSELinux() self.getPackages() - self.kickstartData.setCdrom("cdrom") - self.kickstartData.setInstall("install") - self.kickstartData.setZeroMbr("yes") - self.kickstartData.setClearPart(["--linux"]) + self.kickstartData.method["method"] = "cdrom" + self.kickstartData.upgrade = False + self.kickstartData.zerombr = True + self.kickstartData.clearpart["type"] = CLEARPART_TYPE_LINUX def getLang(self): default, langs = self.languageBackend.getInstalledLangs() - self.kickstartData.setLang([default]) - self.kickstartData.setDefaultLang(default) + self.kickstartData.lang = default def getKeyboard(self): kbd = keyboard.Keyboard() kbd.read() - self.kickstartData.setKeyboard([kbd.get()]) + self.kickstartData.keyboard = kbd.get() def getTimezone(self): lines = open('/etc/sysconfig/clock', 'r').readlines() @@ -59,18 +61,29 @@ zone = string.replace(zone, '"', "") zone = string.replace(zone, "'", "") zone = string.strip(zone) - - self.kickstartData.setTimezone([zone]) + + self.kickstartData.timezone["timezone"] = zone + self.kickstartData.timezone["isUtc"] = False def getRootPassword(self): if os.access('/etc/shadow', os.R_OK) == 1: line = open('/etc/shadow', 'r').readline() tokens = string.split(line, ":") - passwd = "--iscrypted " + tokens[1] - self.kickstartData.setRootPw([passwd]) + self.kickstartData.rootpw["isCrypted"] = True + self.kickstartData.rootpw["password"] = tokens[1] else: print "no access to /etc/shadow" + def getSELinux(self): + lines = os.popen("/usr/sbin/getenforce").readlines() + + if lines[0].lower().startswith("disabled"): + self.kickstartData.selinux = SELINUX_DISABLED + elif lines[0].lower().startswith("permissive"): + self.kickstartData.selinux = SELINUX_PERMISSIVE + elif lines[0].lower().startswith("enforcing"): + self.kickstartData.selinux = SELINUX_ENFORCING + def getPackages(self): fd = os.popen("/bin/rpm -qa --queryformat \"%{NAME}\n\"") packages = fd.readlines() @@ -80,4 +93,4 @@ for package in packages: packages[packages.index(package)] = string.strip(package) - self.kickstartData.setIndividualPackageList(packages) + self.kickstartData.packageList = packages diff -ur system-config-kickstart.orig/src/system-config-kickstart.py system-config-kickstart/src/system-config-kickstart.py --- system-config-kickstart.orig/src/system-config-kickstart.py 2005-10-07 11:26:05.000000000 -0400 +++ system-config-kickstart/src/system-config-kickstart.py 2006-03-27 10:47:56.000000000 -0500 @@ -35,18 +35,16 @@ domain = 'system-config-kickstart' translate.textdomain (domain) -# FIXME def useCliMode(value): - import kickstartData + from pykickstart.data import KickstartData + from pykickstart.writer import KickstartWriter import profileSystem - data = kickstartData.KickstartData() - profileSystem = profileSystem.ProfileSystem(data) - file = data.getAll() - fd = open(value, "w") - for line in file: - fd.write(line + "\n") + data = KickstartData() + profileSystem = profileSystem.ProfileSystem(data) + fd = open(value, "w") + fd.write(KickstartWriter(data).write()) fd.close() diff -ur system-config-kickstart.orig/system-config-kickstart.spec system-config-kickstart/system-config-kickstart.spec --- system-config-kickstart.orig/system-config-kickstart.spec 2006-02-24 13:18:31.000000000 -0500 +++ system-config-kickstart/system-config-kickstart.spec 2006-03-27 10:56:58.000000000 -0500 @@ -1,7 +1,7 @@ Summary: A graphical interface for making kickstart files. Name: system-config-kickstart Version: 2.6.6 -Release: 2 +Release: 3 URL: http://fedora.redhat.com/projects/config-tools/ License: GPL ExclusiveOS: Linux @@ -9,6 +9,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildArch: noarch Source0: %{name}-%{version}.tar.bz2 +Patch0: %{name}-profile.patch Obsoletes: ksconfig Obsoletes: redhat-config-kickstart BuildRequires: desktop-file-utils @@ -30,6 +31,7 @@ %prep %setup -q +%patch0 -p1 %install rm -rf $RPM_BUILD_ROOT @@ -78,6 +80,9 @@ %attr(0644,root,root) %{_datadir}/icons/hicolor/48x48/apps/system-config-kickstart.png %changelog +* Mon Mar 27 2006 Chris Lumens 2.6.6-3 +- Add patch to fix system profiling mode (#186635). + * Fri Feb 24 2006 Chris Lumens 2.6.6-2 - Add requirement for scriptlets (#182865, #182866). Index: system-config-kickstart.spec =================================================================== RCS file: /cvs/dist/rpms/system-config-kickstart/FC-5/system-config-kickstart.spec,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- system-config-kickstart.spec 24 Feb 2006 18:21:11 -0000 1.35 +++ system-config-kickstart.spec 27 Mar 2006 16:03:21 -0000 1.36 @@ -1,7 +1,7 @@ Summary: A graphical interface for making kickstart files. Name: system-config-kickstart Version: 2.6.6 -Release: 2 +Release: 3 URL: http://fedora.redhat.com/projects/config-tools/ License: GPL ExclusiveOS: Linux @@ -9,6 +9,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildArch: noarch Source0: %{name}-%{version}.tar.bz2 +Patch0: %{name}-profile.patch Obsoletes: ksconfig Obsoletes: redhat-config-kickstart BuildRequires: desktop-file-utils @@ -30,6 +31,7 @@ %prep %setup -q +%patch0 -p1 %install rm -rf $RPM_BUILD_ROOT @@ -78,6 +80,9 @@ %attr(0644,root,root) %{_datadir}/icons/hicolor/48x48/apps/system-config-kickstart.png %changelog +* Mon Mar 27 2006 Chris Lumens 2.6.6-3 +- Add patch to fix system profiling mode (#186635). + * Fri Feb 24 2006 Chris Lumens 2.6.6-2 - Add requirement for scriptlets (#182865, #182866). From fedora-cvs-commits at redhat.com Mon Mar 27 16:11:06 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 27 Mar 2006 11:11:06 -0500 Subject: rpms/tix/devel tix.spec,1.12,1.13 Message-ID: <200603271611.k2RGB6FC020147@cvs.devel.redhat.com> Author: dcantrel Update of /cvs/dist/rpms/tix/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv20133 Modified Files: tix.spec Log Message: Move libTix8.4.so to /usr/lib/Tix8.4 Index: tix.spec =================================================================== RCS file: /cvs/dist/rpms/tix/devel/tix.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- tix.spec 11 Feb 2006 05:52:04 -0000 1.12 +++ tix.spec 27 Mar 2006 16:11:04 -0000 1.13 @@ -5,7 +5,7 @@ Name: tix Epoch: 1 Version: %{tixmajor}.0 -Release: 3.1 +Release: 5 License: BSD Group: Development/Languages URL: http://tix.sourceforge.net/ @@ -65,17 +65,17 @@ rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT +# devel symlinks +( cd $RPM_BUILD_ROOT%{_libdir} + rm -f libtix.so libTix.so + ln -s Tix%{tixmajor}/libTix%{tixmajor}.so libtix.so + ln -s Tix%{tixmajor}/libTix%{tixmajor}.so libTix.so +) + # install demo scripts mkdir -p $RPM_BUILD_ROOT%{_datadir}/Tix%{tixmajor} cp -a demos $RPM_BUILD_ROOT%{_datadir}/Tix%{tixmajor} -# move shared lib -mv $RPM_BUILD_ROOT%{_libdir}/Tix%{tixmajor}/libTix%{tixmajor}.so $RPM_BUILD_ROOT%{_libdir}/libTix%{tixmajor}.so -( cd $RPM_BUILD_ROOT%{_libdir} - ln -sf libTix%{tixmajor}.so libTix.so - ln -sf libTix%{tixmajor}.so libtix.so -) - # the header and man pages were in the previous package, keeping for now... mkdir -p $RPM_BUILD_ROOT%{_includedir} install -m 0644 generic/tix.h $RPM_BUILD_ROOT%{_includedir}/tix.h @@ -91,7 +91,6 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/Tix%{tixmajor}/README.txt rm -f $RPM_BUILD_ROOT%{_libdir}/Tix%{tixmajor}/license.terms - %clean rm -rf $RPM_BUILD_ROOT @@ -99,11 +98,10 @@ %postun -p /sbin/ldconfig - %files %defattr(-,root,root,-) -%{_libdir}/libTix%{tixmajor}.so %dir %{_libdir}/Tix%{tixmajor} +%{_libdir}/Tix%{tixmajor}/libTix%{tixmajor}.so %{_libdir}/Tix%{tixmajor}/*.tcl %{_libdir}/Tix%{tixmajor}/bitmaps %{_libdir}/Tix%{tixmajor}/pref @@ -112,17 +110,19 @@ %files devel %defattr(-,root,root,-) -%{_includedir}/tix.h -%{_libdir}/libtix.so %{_libdir}/libTix.so +%{_libdir}/libtix.so +%{_includedir}/tix.h %{_mandir}/mann %files doc %defattr(-,root,root,-) %doc docs/* - %changelog +* Mon Mar 27 2006 David Cantrell - 1:8.4.0-5 +- Make sure libTix8.4.so is in /usr/lib/Tix8.4 + * Fri Feb 10 2006 Jesse Keating - 1:8.4.0-3.1 - bump again for double-long bug on ppc(64) From fedora-cvs-commits at redhat.com Mon Mar 27 16:36:46 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 27 Mar 2006 11:36:46 -0500 Subject: rpms/kernel/FC-5 kernel-2.6.spec, 1.2074, 1.2075 linux-2.6-audit-new-msg-types.patch, 1.1, 1.2 Message-ID: <200603271636.k2RGakQN001785@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv1769 Modified Files: kernel-2.6.spec linux-2.6-audit-new-msg-types.patch Log Message: - Updated new audit msg types. Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-5/kernel-2.6.spec,v retrieving revision 1.2074 retrieving revision 1.2075 diff -u -r1.2074 -r1.2075 --- kernel-2.6.spec 24 Mar 2006 23:51:59 -0000 1.2074 +++ kernel-2.6.spec 27 Mar 2006 16:36:39 -0000 1.2075 @@ -1669,6 +1669,9 @@ %endif %changelog +* Mon Mar 25 2006 Dave Jones +- Updated new audit msg types. + * Fri Mar 24 2006 Dave Jones - Reenable HDLC driver (#186257) - Reenable ISA NE2000 clones. (#136569) linux-2.6-audit-new-msg-types.patch: include/linux/audit.h | 22 ++++++++++++++++++---- kernel/audit.c | 2 ++ security/selinux/nlmsgtab.c | 9 +++++++-- 3 files changed, 27 insertions(+), 6 deletions(-) Index: linux-2.6-audit-new-msg-types.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-5/linux-2.6-audit-new-msg-types.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- linux-2.6-audit-new-msg-types.patch 27 Jan 2006 18:51:43 -0000 1.1 +++ linux-2.6-audit-new-msg-types.patch 27 Mar 2006 16:36:40 -0000 1.2 @@ -1,5 +1,6 @@ ---- a/include/linux/audit.h -+++ b/include/linux/audit.h +diff -urp linux-2.6.15.x86_64.orig/include/linux/audit.h linux-2.6.15.x86_64/include/linux/audit.h +--- linux-2.6.15.x86_64.orig/include/linux/audit.h 2006-03-22 08:27:53.000000000 -0500 ++++ linux-2.6.15.x86_64/include/linux/audit.h 2006-03-22 08:26:56.000000000 -0500 @@ -33,11 +33,20 @@ * 1200 - 1299 messages internal to the audit daemon * 1300 - 1399 audit event messages @@ -25,7 +26,14 @@ */ #define AUDIT_GET 1000 /* Get status */ #define AUDIT_SET 1001 /* Set status (enable/disable/auditd) */ -@@ -54,6 +63,8 @@ +@@ -50,10 +59,15 @@ + #define AUDIT_WATCH_REM 1008 /* Remove file/dir watch entry */ + #define AUDIT_WATCH_LIST 1009 /* List all file/dir watches */ + #define AUDIT_SIGNAL_INFO 1010 /* Get info about sender of signal to auditd */ ++#define AUDIT_ADD_RULE 1011 /* Add syscall filtering rule */ ++#define AUDIT_DEL_RULE 1012 /* Delete syscall filtering rule */ ++#define AUDIT_LIST_RULES 1013 /* List syscall filtering rules */ + #define AUDIT_FIRST_USER_MSG 1100 /* Userspace messages mostly uninteresting to kernel */ #define AUDIT_USER_AVC 1107 /* We filter this differently */ #define AUDIT_LAST_USER_MSG 1199 @@ -34,9 +42,10 @@ #define AUDIT_DAEMON_START 1200 /* Daemon startup record */ #define AUDIT_DAEMON_END 1201 /* Daemon normal stop record */ ---- a/kernel/audit.c -+++ b/kernel/audit.c -@@ -367,6 +367,7 @@ static int audit_netlink_ok(kernel_cap_t +diff -urp linux-2.6.15.x86_64.orig/kernel/audit.c linux-2.6.15.x86_64/kernel/audit.c +--- linux-2.6.15.x86_64.orig/kernel/audit.c 2006-03-22 08:28:05.000000000 -0500 ++++ linux-2.6.15.x86_64/kernel/audit.c 2006-03-22 08:20:04.000000000 -0500 +@@ -351,6 +351,7 @@ static int audit_netlink_ok(kernel_cap_t break; case AUDIT_USER: case AUDIT_FIRST_USER_MSG...AUDIT_LAST_USER_MSG: @@ -44,7 +53,7 @@ if (!cap_raised(eff_cap, CAP_AUDIT_WRITE)) err = -EPERM; break; -@@ -447,6 +448,7 @@ static int audit_receive_msg(struct sk_b +@@ -430,6 +431,7 @@ static int audit_receive_msg(struct sk_b break; case AUDIT_USER: case AUDIT_FIRST_USER_MSG...AUDIT_LAST_USER_MSG: @@ -52,9 +61,20 @@ if (!audit_enabled && msg_type != AUDIT_USER_AVC) return 0; ---- a/security/selinux/nlmsgtab.c -+++ b/security/selinux/nlmsgtab.c -@@ -145,8 +145,10 @@ int selinux_nlmsg_lookup(u16 sclass, u16 +diff -urp linux-2.6.15.x86_64.orig/security/selinux/nlmsgtab.c linux-2.6.15.x86_64/security/selinux/nlmsgtab.c +--- linux-2.6.15.x86_64.orig/security/selinux/nlmsgtab.c 2006-03-22 08:28:08.000000000 -0500 ++++ linux-2.6.15.x86_64/security/selinux/nlmsgtab.c 2006-03-22 08:23:38.000000000 -0500 +@@ -104,6 +104,9 @@ static struct nlmsg_perm nlmsg_audit_per + { AUDIT_WATCH_INS, NETLINK_AUDIT_SOCKET__NLMSG_WRITE }, + { AUDIT_WATCH_REM, NETLINK_AUDIT_SOCKET__NLMSG_WRITE }, + { AUDIT_WATCH_LIST, NETLINK_AUDIT_SOCKET__NLMSG_READPRIV }, ++ { AUDIT_ADD_RULE, NETLINK_AUDIT_SOCKET__NLMSG_WRITE }, ++ { AUDIT_DEL_RULE, NETLINK_AUDIT_SOCKET__NLMSG_WRITE }, ++ { AUDIT_LIST_RULES, NETLINK_AUDIT_SOCKET__NLMSG_READPRIV }, + }; + + +@@ -148,8 +151,10 @@ int selinux_nlmsg_lookup(u16 sclass, u16 break; case SECCLASS_NETLINK_AUDIT_SOCKET: @@ -67,3 +87,4 @@ *perm = NETLINK_AUDIT_SOCKET__NLMSG_RELAY; } else { err = nlmsg_perm(nlmsg_type, perm, nlmsg_audit_perms, + From fedora-cvs-commits at redhat.com Mon Mar 27 16:41:13 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 27 Mar 2006 11:41:13 -0500 Subject: rpms/liboil/FC-5 liboil-0.3.8-s390.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 liboil.spec, 1.6, 1.7 sources, 1.3, 1.4 liboil-0.3.6-s390.patch, 1.1, NONE Message-ID: <200603271641.k2RGfDIO001895@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/liboil/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv1878 Modified Files: .cvsignore liboil.spec sources Added Files: liboil-0.3.8-s390.patch Removed Files: liboil-0.3.6-s390.patch Log Message: - Update to 0.3.8 (bug 186930) liboil-0.3.8-s390.patch: liboilprofile.c | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE liboil-0.3.8-s390.patch --- --- liboil-0.3.8/liboil/liboilprofile.c.s390 2006-03-27 11:38:46.000000000 -0500 +++ liboil-0.3.8/liboil/liboilprofile.c 2006-03-27 11:39:21.000000000 -0500 @@ -193,7 +193,7 @@ static unsigned long oil_profile_stamp_counter(void) { uint64_t ts; - __asm__ __volatile__ ("STCK %0\n" : : "m" (ts)); + __asm__ __volatile__ ("STCK %0(%0)\n" : : "r" (&ts)); return ts; } #endif Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/liboil/FC-5/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 22 Mar 2006 13:38:22 -0000 1.3 +++ .cvsignore 27 Mar 2006 16:41:11 -0000 1.4 @@ -1 +1 @@ -liboil-0.3.7.1.tar.gz +liboil-0.3.8.tar.gz Index: liboil.spec =================================================================== RCS file: /cvs/dist/rpms/liboil/FC-5/liboil.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- liboil.spec 22 Mar 2006 13:38:22 -0000 1.6 +++ liboil.spec 27 Mar 2006 16:41:11 -0000 1.7 @@ -1,12 +1,13 @@ Summary: Library of Optimized Inner Loops, CPU optimized functions Name: liboil -Version: 0.3.7.1 -Release: 2.fc5 +Version: 0.3.8 +Release: 1.fc5 License: LGPL Group: System Environment/Libraries URL: http://liboil.freedesktop.org/ Source: http://liboil.freedesktop.org/download/liboil-%{version}.tar.gz Patch0: liboil-0.3.3-gccoptfixes.patch +Patch1: liboil-0.3.8-s390.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: glib2-devel, gcc-c++ @@ -36,7 +37,7 @@ %prep %setup -q %patch0 -p1 -b .gccoptfixes - +%patch1 -p1 -b .s390 %build %configure @@ -48,7 +49,7 @@ %install %{__rm} -rf %{buildroot} -%makeinstall +make install DESTDIR=$RPM_BUILD_ROOT rm -f $RPM_BUILD_ROOT%{_libdir}/*.la rm -f $RPM_BUILD_ROOT%{_libdir}/*.a @@ -77,9 +78,8 @@ %changelog -* Wed Mar 22 2006 Warren Togami 0.3.7.1-2 -- merge Extras with Core spec -- remove .a files too +* Mon Mar 27 2006 Ray Strode 0.3.8-1.fc5 +- Update to 0.3.8 (bug 186930) * Tue Mar 21 2006 Matthias Saou 0.3.7.1-1 - Update to today's CVS code which should fix the PPC build issue. Index: sources =================================================================== RCS file: /cvs/dist/rpms/liboil/FC-5/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 22 Mar 2006 13:38:22 -0000 1.3 +++ sources 27 Mar 2006 16:41:11 -0000 1.4 @@ -1 +1 @@ -e6c5aee5a2f69e6ddce48a5ac74ee5bb liboil-0.3.7.1.tar.gz +a402c4af2603c8fb69b365af0b8ec775 liboil-0.3.8.tar.gz --- liboil-0.3.6-s390.patch DELETED --- From fedora-cvs-commits at redhat.com Mon Mar 27 17:12:01 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 27 Mar 2006 12:12:01 -0500 Subject: rpms/liboil/devel liboil-0.3.8-s390.patch, NONE, 1.1 liboil.spec, 1.5, 1.6 sources, 1.2, 1.3 liboil-0.3.6-s390.patch, 1.1, NONE Message-ID: <200603271712.k2RHC13D016004@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/liboil/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv15984 Modified Files: liboil.spec sources Added Files: liboil-0.3.8-s390.patch Removed Files: liboil-0.3.6-s390.patch Log Message: - Update to 0.3.8 (bug 186930) liboil-0.3.8-s390.patch: liboilprofile.c | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE liboil-0.3.8-s390.patch --- --- liboil-0.3.8/liboil/liboilprofile.c.s390 2006-03-27 11:38:46.000000000 -0500 +++ liboil-0.3.8/liboil/liboilprofile.c 2006-03-27 11:39:21.000000000 -0500 @@ -193,7 +193,7 @@ static unsigned long oil_profile_stamp_counter(void) { uint64_t ts; - __asm__ __volatile__ ("STCK %0\n" : : "m" (ts)); + __asm__ __volatile__ ("STCK %0(%0)\n" : : "r" (&ts)); return ts; } #endif Index: liboil.spec =================================================================== RCS file: /cvs/dist/rpms/liboil/devel/liboil.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- liboil.spec 11 Feb 2006 04:10:55 -0000 1.5 +++ liboil.spec 27 Mar 2006 17:11:59 -0000 1.6 @@ -1,13 +1,13 @@ Summary: Library of Optimized Inner Loops, CPU optimized functions Name: liboil -Version: 0.3.6 -Release: 3.fc5.2 +Version: 0.3.8 +Release: 2 License: LGPL Group: System Environment/Libraries URL: http://liboil.freedesktop.org/ Source: http://liboil.freedesktop.org/download/liboil-%{version}.tar.gz Patch0: liboil-0.3.3-gccoptfixes.patch -Patch1: liboil-0.3.6-s390.patch +Patch1: liboil-0.3.8-s390.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: glib2-devel, gcc-c++ @@ -37,11 +37,10 @@ %prep %setup -q %patch0 -p1 -b .gccoptfixes -%patch1 -p0 -b .s390 - +%patch1 -p1 -b .s390 %build -%configure --disable-static +%configure # multi-jobbed make makes the build fail: # ./build_prototypes_doc >liboilfuncs-doc.h # /bin/sh: ./build_prototypes_doc: No such file or directory @@ -50,8 +49,9 @@ %install %{__rm} -rf %{buildroot} -%makeinstall +make install DESTDIR=$RPM_BUILD_ROOT rm -f $RPM_BUILD_ROOT%{_libdir}/*.la +rm -f $RPM_BUILD_ROOT%{_libdir}/*.a %clean @@ -70,6 +70,7 @@ %files devel %defattr(-, root, root, 0755) +%{_bindir}/oil-bugreport %{_includedir}/* %{_libdir}/*.so %{_libdir}/pkgconfig/*.pc @@ -77,17 +78,21 @@ %changelog -* Fri Feb 10 2006 Jesse Keating - 0.3.6-3.fc5.2 -- bump again for double-long bug on ppc(64) +* Mon Mar 27 2006 Ray Strode 0.3.8-2 +- Update to 0.3.8 (bug 186930) + +* Tue Mar 21 2006 Matthias Saou 0.3.7.1-1 +- Update to today's CVS code which should fix the PPC build issue. +- Include new oil-bugreport tool in the devel package. -* Tue Feb 07 2006 Jesse Keating - 0.3.6-3.fc5.1 -- rebuilt for new gcc4.1 snapshot and glibc changes +* Mon Mar 6 2006 Matthias Saou 0.3.7-3 +- FC5 rebuild (well, try at least since PPC fixes are required). -* Thu Dec 22 2005 Warren Togami 0.3.6-3 -- s390 build patch +* Thu Feb 9 2006 Matthias Saou 0.3.7-2 +- Rebuild for new gcc/glibc. -* Mon Dec 19 2005 Warren Togami 0.3.6-2 -- cleanup spec, remove static, and import into FC5 for gstreamer-0.10 +* Fri Feb 3 2006 Matthias Saou 0.3.7-1 +- Update to 0.3.7. * Wed Dec 14 2005 Matthias Saou 0.3.6-1 - Update to 0.3.6. Index: sources =================================================================== RCS file: /cvs/dist/rpms/liboil/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 19 Dec 2005 19:28:00 -0000 1.2 +++ sources 27 Mar 2006 17:11:59 -0000 1.3 @@ -1 +1 @@ -a36b2d9cc71d75d814d7bdca2263290f liboil-0.3.6.tar.gz +a402c4af2603c8fb69b365af0b8ec775 liboil-0.3.8.tar.gz --- liboil-0.3.6-s390.patch DELETED --- From fedora-cvs-commits at redhat.com Mon Mar 27 17:16:08 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 27 Mar 2006 12:16:08 -0500 Subject: rpms/pykickstart/devel .cvsignore, 1.24, 1.25 pykickstart.spec, 1.24, 1.25 sources, 1.25, 1.26 Message-ID: <200603271716.k2RHG8ij022640@cvs.devel.redhat.com> Author: clumens Update of /cvs/dist/rpms/pykickstart/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv21226 Modified Files: .cvsignore pykickstart.spec sources Log Message: Bump version. Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/pykickstart/devel/.cvsignore,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- .cvsignore 7 Mar 2006 22:10:15 -0000 1.24 +++ .cvsignore 27 Mar 2006 17:16:06 -0000 1.25 @@ -13,3 +13,4 @@ pykickstart-0.21.tar.gz pykickstart-0.22.tar.gz pykickstart-0.23.tar.gz +pykickstart-0.24.tar.gz Index: pykickstart.spec =================================================================== RCS file: /cvs/dist/rpms/pykickstart/devel/pykickstart.spec,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- pykickstart.spec 7 Mar 2006 22:10:15 -0000 1.24 +++ pykickstart.spec 27 Mar 2006 17:16:06 -0000 1.25 @@ -2,7 +2,7 @@ Summary: A python library for manipulating kickstart files Name: pykickstart -Version: 0.23 +Version: 0.24 Release: 1 Source0: %{name}-%{version}.tar.gz License: GPL @@ -36,6 +36,11 @@ /usr/bin/ksvalidator %changelog +* Mon Mar 27 2006 Chris Lumens 0.24-1 +- Don't write out a blank xconfig line. +- Reorder output handlers to group like commands together. +- Mark strings for translation. + * Tue Mar 07 2006 Chris Lumens 0.23-1 - Backwards compatibility support for options to zerombr. Index: sources =================================================================== RCS file: /cvs/dist/rpms/pykickstart/devel/sources,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- sources 7 Mar 2006 22:10:15 -0000 1.25 +++ sources 27 Mar 2006 17:16:06 -0000 1.26 @@ -1 +1 @@ -aa52b2e3ad0bb422095f14029d527503 pykickstart-0.23.tar.gz +5c24c788e3c7290157f3c74cf0f5a4da pykickstart-0.24.tar.gz From fedora-cvs-commits at redhat.com Mon Mar 27 17:57:46 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 27 Mar 2006 12:57:46 -0500 Subject: rpms/mysql-connector-odbc/devel myodbc-shutdown.patch, NONE, 1.1 mysql-connector-odbc.spec, 1.4, 1.5 Message-ID: <200603271757.k2RHvkhA011734@cvs.devel.redhat.com> Author: tgl Update of /cvs/dist/rpms/mysql-connector-odbc/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv11719 Modified Files: mysql-connector-odbc.spec Added Files: myodbc-shutdown.patch Log Message: Remove DLL-unload cleanup call from connection shutdown (bz#185343) myodbc-shutdown.patch: handle.c | 1 - 1 files changed, 1 deletion(-) --- NEW FILE myodbc-shutdown.patch --- myodbc_end really should only be invoked during Windows DLL unload, since it's not connection-specific and not thread-safe either. This bit of brain fade accounts for our bug #185343 and several bugs filed at mysql.com. diff -Naur mysql-connector-odbc-3.51.12.orig/driver/handle.c mysql-connector-odbc-3.51.12/driver/handle.c --- mysql-connector-odbc-3.51.12.orig/driver/handle.c 2005-10-09 15:33:40.000000000 -0400 +++ mysql-connector-odbc-3.51.12/driver/handle.c 2006-03-24 14:28:33.000000000 -0500 @@ -107,7 +107,6 @@ GlobalFree(GlobalHandle((HGLOBAL) henv)); #else if (henv) my_free((char*) henv,MYF(0)); - myodbc_end(); #endif /* _UNIX_ */ return (SQL_SUCCESS); } Index: mysql-connector-odbc.spec =================================================================== RCS file: /cvs/dist/rpms/mysql-connector-odbc/devel/mysql-connector-odbc.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- mysql-connector-odbc.spec 11 Feb 2006 04:41:11 -0000 1.4 +++ mysql-connector-odbc.spec 27 Mar 2006 17:57:44 -0000 1.5 @@ -1,12 +1,13 @@ Summary: ODBC driver for MySQL Name: mysql-connector-odbc Version: 3.51.12 -Release: 1.2.1 +Release: 2 License: GPL Group: System Environment/Libraries URL: http://www.mysql.com/downloads/api-myodbc.html Source: http://www.mysql.com/Downloads/MyODBC/mysql-connector-odbc-%{version}.tar.gz Patch1: myodbc-locale.patch +Patch2: myodbc-shutdown.patch Requires: unixODBC BuildRequires: mysql-devel unixODBC-devel BuildRequires: automake autoconf libtool libtool-ltdl-devel @@ -19,6 +20,7 @@ %setup -q %patch1 -p1 +%patch2 -p1 %build CFLAGS="%{optflags} -fno-strict-aliasing" @@ -65,6 +67,9 @@ %{_libdir}/lib*so %changelog +* Mon Mar 27 2006 Tom Lane 3.51.12-2 +- Remove DLL-unload cleanup call from connection shutdown (bz#185343) + * Fri Feb 10 2006 Jesse Keating - 3.51.12-1.2.1 - bump again for double-long bug on ppc(64) From fedora-cvs-commits at redhat.com Mon Mar 27 18:03:02 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 27 Mar 2006 13:03:02 -0500 Subject: rpms/mysql-connector-odbc/FC-5 myodbc-shutdown.patch, NONE, 1.1 mysql-connector-odbc.spec, 1.4, 1.5 Message-ID: <200603271803.k2RI32Tb011903@cvs.devel.redhat.com> Author: tgl Update of /cvs/dist/rpms/mysql-connector-odbc/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv11886 Modified Files: mysql-connector-odbc.spec Added Files: myodbc-shutdown.patch Log Message: Remove DLL-unload cleanup call from connection shutdown (bz#185343) myodbc-shutdown.patch: handle.c | 1 - 1 files changed, 1 deletion(-) --- NEW FILE myodbc-shutdown.patch --- myodbc_end really should only be invoked during Windows DLL unload, since it's not connection-specific and not thread-safe either. This bit of brain fade accounts for our bug #185343 and several bugs filed at mysql.com. diff -Naur mysql-connector-odbc-3.51.12.orig/driver/handle.c mysql-connector-odbc-3.51.12/driver/handle.c --- mysql-connector-odbc-3.51.12.orig/driver/handle.c 2005-10-09 15:33:40.000000000 -0400 +++ mysql-connector-odbc-3.51.12/driver/handle.c 2006-03-24 14:28:33.000000000 -0500 @@ -107,7 +107,6 @@ GlobalFree(GlobalHandle((HGLOBAL) henv)); #else if (henv) my_free((char*) henv,MYF(0)); - myodbc_end(); #endif /* _UNIX_ */ return (SQL_SUCCESS); } Index: mysql-connector-odbc.spec =================================================================== RCS file: /cvs/dist/rpms/mysql-connector-odbc/FC-5/mysql-connector-odbc.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- mysql-connector-odbc.spec 11 Feb 2006 04:41:11 -0000 1.4 +++ mysql-connector-odbc.spec 27 Mar 2006 18:02:59 -0000 1.5 @@ -1,12 +1,13 @@ Summary: ODBC driver for MySQL Name: mysql-connector-odbc Version: 3.51.12 -Release: 1.2.1 +Release: 2.FC5.1 License: GPL Group: System Environment/Libraries URL: http://www.mysql.com/downloads/api-myodbc.html Source: http://www.mysql.com/Downloads/MyODBC/mysql-connector-odbc-%{version}.tar.gz Patch1: myodbc-locale.patch +Patch2: myodbc-shutdown.patch Requires: unixODBC BuildRequires: mysql-devel unixODBC-devel BuildRequires: automake autoconf libtool libtool-ltdl-devel @@ -19,6 +20,7 @@ %setup -q %patch1 -p1 +%patch2 -p1 %build CFLAGS="%{optflags} -fno-strict-aliasing" @@ -65,6 +67,9 @@ %{_libdir}/lib*so %changelog +* Mon Mar 27 2006 Tom Lane 3.51.12-2 +- Remove DLL-unload cleanup call from connection shutdown (bz#185343) + * Fri Feb 10 2006 Jesse Keating - 3.51.12-1.2.1 - bump again for double-long bug on ppc(64) From fedora-cvs-commits at redhat.com Mon Mar 27 18:54:24 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 27 Mar 2006 13:54:24 -0500 Subject: rpms/kernel/devel/configs config-generic,1.168,1.169 Message-ID: <200603271854.k2RIsOHF008073@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel/configs In directory cvs.devel.redhat.com:/tmp/cvs-serv8039/configs Modified Files: config-generic Log Message: git13 Index: config-generic =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/configs/config-generic,v retrieving revision 1.168 retrieving revision 1.169 diff -u -r1.168 -r1.169 --- config-generic 24 Mar 2006 23:51:35 -0000 1.168 +++ config-generic 27 Mar 2006 18:54:21 -0000 1.169 @@ -283,6 +283,7 @@ CONFIG_BLK_DEV_ATIIXP=y CONFIG_LBD=y CONFIG_BLK_DEV_IO_TRACE=y +CONFIG_LSF=y # CONFIG_DCSSBLK is not set @@ -1292,6 +1293,12 @@ CONFIG_ISDN_DIVAS_USERIDI=m CONFIG_ISDN_DIVAS_MAINT=m +CONFIG_ISDN_DRV_GIGASET=m +CONFIG_GIGASET_BASE=m +CONFIG_GIGASET_M105=m +# CONFIG_GIGASET_DEBUG is not set +# CONFIG_GIGASET_UNDOCREQ is not set + # # Telephony Support # From fedora-cvs-commits at redhat.com Mon Mar 27 18:54:24 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 27 Mar 2006 13:54:24 -0500 Subject: rpms/kernel/devel patch-2.6.16-git13.bz2.sign, NONE, 1.1 .cvsignore, 1.393, 1.394 kernel-2.6.spec, 1.2093, 1.2094 linux-2.6-crashdump-common.patch, 1.15, 1.16 linux-2.6-debug-sysfs-crash-debugging.patch, 1.3, 1.4 linux-2.6-dump_smp_call_function.patch, 1.11, 1.12 linux-2.6-tux.patch, 1.15, 1.16 sources, 1.334, 1.335 upstream, 1.307, 1.308 patch-2.6.16-git10.bz2, 1.1, NONE patch-2.6.16-git10.bz2.sign, 1.1, NONE Message-ID: <200603271854.k2RIsOU0008059@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv8039 Modified Files: .cvsignore kernel-2.6.spec linux-2.6-crashdump-common.patch linux-2.6-debug-sysfs-crash-debugging.patch linux-2.6-dump_smp_call_function.patch linux-2.6-tux.patch sources upstream Added Files: patch-2.6.16-git13.bz2.sign Removed Files: patch-2.6.16-git10.bz2 patch-2.6.16-git10.bz2.sign Log Message: git13 --- NEW FILE patch-2.6.16-git13.bz2.sign --- -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.2.2 (GNU/Linux) Comment: See http://www.kernel.org/signature.html for info iD8DBQBEJ44xyGugalF9Dw4RAqsjAKCFkBV48WnxuESRu3+NZQji1WWxggCgjkWW WSPFk57zgZaLaTdfF91ycdY= =5nMQ -----END PGP SIGNATURE----- Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v retrieving revision 1.393 retrieving revision 1.394 diff -u -r1.393 -r1.394 --- .cvsignore 24 Mar 2006 22:43:38 -0000 1.393 +++ .cvsignore 27 Mar 2006 18:54:19 -0000 1.394 @@ -3,4 +3,4 @@ kernel-2.6.16 linux-2.6.16.tar.bz2 xen-20060320.tar.bz2 -patch-2.6.16-git9.bz2 +patch-2.6.16-git13.bz2 Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.2093 retrieving revision 1.2094 diff -u -r1.2093 -r1.2094 --- kernel-2.6.spec 26 Mar 2006 00:13:37 -0000 1.2093 +++ kernel-2.6.spec 27 Mar 2006 18:54:19 -0000 1.2094 @@ -217,7 +217,7 @@ # # Patches 0 through 100 are meant for core subsystem upgrades # -Patch1: patch-2.6.16-git10.bz2 +Patch1: patch-2.6.16-git13.bz2 # Patches 100 through 500 are meant for architecture patches Patch100: linux-2.6-bzimage.patch @@ -1631,6 +1631,9 @@ %endif %changelog +* Mon Mar 27 2006 Dave Jones +- 2.6.16-git13 + * Sat Mar 25 2006 Dave Jones - 2.6.16-git10 linux-2.6-crashdump-common.patch: linux-2.6.12/Documentation/sysrq.txt | 8 linux-2.6.12/arch/i386/kernel/nmi.c | 1 linux-2.6.12/arch/i386/mm/init.c | 47 +++++ linux-2.6.12/arch/ia64/kernel/process.c | 30 ++- linux-2.6.12/arch/ia64/kernel/traps.c | 6 linux-2.6.12/arch/ia64/mm/contig.c | 3 linux-2.6.12/arch/ia64/mm/discontig.c | 3 linux-2.6.12/arch/ia64/mm/init.c | 90 +++++++++ linux-2.6.12/arch/powerpc/kernel/process.c | 1 linux-2.6.12/arch/powerpc/kernel/traps.c | 3 linux-2.6.12/arch/powerpc/mm/mem.c | 29 +++ linux-2.6.12/arch/s390/kernel/traps.c | 6 linux-2.6.12/arch/x86_64/kernel/process.c | 2 linux-2.6.12/arch/x86_64/kernel/traps.c | 6 linux-2.6.12/arch/x86_64/mm/init.c | 32 +++ linux-2.6.12/include/asm-generic/crashdump.h | 47 +++++ linux-2.6.12/include/asm-i386/crashdump.h | 123 +++++++++++++ linux-2.6.12/include/asm-i386/kmap_types.h | 4 linux-2.6.12/include/asm-ia64/crashdump.h | 72 +++++++ linux-2.6.12/include/asm-powerpc/crashdump.h | 61 ++++++ linux-2.6.12/include/asm-x86_64/crashdump.h | 86 +++++++++ linux-2.6.12/include/linux/kernel.h | 18 + linux-2.6.12/kernel/Makefile | 2 linux-2.6.12/kernel/dump.c | 246 +++++++++++++++++++++++++++ linux-2.6.12/kernel/panic.c | 4 linux-2.6.12/kernel/printk.c | 20 ++ linux-2.6.12/kernel/sched.c | 2 linux-2.6.13/arch/x86_64/mm/fault.c | 1 linux-2.6.16.noarch/arch/i386/kernel/traps.c | 7 linux-2.6.16.noarch/arch/i386/mm/pgtable.c | 3 linux-2.6.16.noarch/drivers/char/sysrq.c | 7 31 files changed, 953 insertions(+), 17 deletions(-) Index: linux-2.6-crashdump-common.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-crashdump-common.patch,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- linux-2.6-crashdump-common.patch 26 Mar 2006 00:13:38 -0000 1.15 +++ linux-2.6-crashdump-common.patch 27 Mar 2006 18:54:19 -0000 1.16 @@ -895,16 +895,21 @@ /* * Associate a virtual page frame with a given physical page frame * and protection flags for that frame. ---- linux-2.6.12/arch/i386/kernel/traps.c.orig 2005-08-18 14:09:19.000000000 -0400 -+++ linux-2.6.12/arch/i386/kernel/traps.c 2005-08-18 14:10:35.000000000 -0400 -@@ -342,6 +342,7 @@ - printk("\n"); - notify_die(DIE_OOPS, (char *)str, regs, err, 255, SIGSEGV); - show_registers(regs); -+ try_crashdump(regs); +--- linux-2.6.16.noarch/arch/i386/kernel/traps.c~ 2006-03-27 13:37:54.000000000 -0500 ++++ linux-2.6.16.noarch/arch/i386/kernel/traps.c 2006-03-27 13:38:38.000000000 -0500 +@@ -393,9 +393,10 @@ void die(const char * str, struct pt_reg + #endif + if (notify_die(DIE_OOPS, str, regs, err, + current->thread.trap_no, SIGSEGV) != +- NOTIFY_STOP) ++ NOTIFY_STOP) { + show_registers(regs); +- else ++ try_crashdump(regs); ++ } else + regs = NULL; } else - printk(KERN_ERR "Recursive die() failure, output suppressed\n"); - + printk(KERN_EMERG "Recursive die() failure, output suppressed\n"); @@ -356,6 +357,8 @@ panic("Fatal exception in interrupt"); linux-2.6-debug-sysfs-crash-debugging.patch: devel-akpm/arch/i386/kernel/traps.c | 5 +++++ devel-akpm/fs/sysfs/file.c | 8 ++++++++ linux-2.6.14/arch/x86_64/kernel/traps.c | 5 +++++ 3 files changed, 18 insertions(+) Index: linux-2.6-debug-sysfs-crash-debugging.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-debug-sysfs-crash-debugging.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- linux-2.6-debug-sysfs-crash-debugging.patch 12 Jan 2006 23:52:50 -0000 1.3 +++ linux-2.6-debug-sysfs-crash-debugging.patch 27 Mar 2006 18:54:19 -0000 1.4 @@ -54,16 +54,16 @@ int register_die_notifier(struct notifier_block *nb) { int err = 0; -@@ -346,6 +346,9 @@ void die(const char * str, struct pt_reg +@@ -388,6 +388,9 @@ void die(const char * str, struct pt_reg #endif if (nl) printk("\n"); +#ifdef CONFIG_SYSFS + printk(KERN_ALERT "last sysfs file: %s\n", last_sysfs_file); +#endif - notify_die(DIE_OOPS, (char *)str, regs, err, 255, SIGSEGV); - show_registers(regs); - try_crashdump(regs); + if (notify_die(DIE_OOPS, str, regs, err, + current->thread.trap_no, SIGSEGV) != + NOTIFY_STOP) --- linux-2.6.14/arch/x86_64/kernel/traps.c~ 2005-12-02 18:38:28.000000000 -0500 +++ linux-2.6.14/arch/x86_64/kernel/traps.c 2005-12-02 18:38:57.000000000 -0500 @@ -75,6 +75,8 @@ asmlinkage void call_debug(void); linux-2.6-dump_smp_call_function.patch: linux-2.6.12/arch/i386/kernel/smp.c | 46 ++++++++++++++++++++++++++++++++ linux-2.6.12/arch/ia64/kernel/smp.c | 44 ++++++++++++++++++++++++++++++ linux-2.6.12/arch/powerpc/kernel/smp.c | 45 ++++++++++++++++++++++++++++++- linux-2.6.12/arch/x86_64/kernel/smp.c | 45 +++++++++++++++++++++++++++++++ linux-2.6.12/drivers/block/diskdump.c | 2 - linux-2.6.12/drivers/net/netdump.c | 2 - linux-2.6.16.noarch/include/linux/smp.h | 2 + 7 files changed, 183 insertions(+), 3 deletions(-) Index: linux-2.6-dump_smp_call_function.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-dump_smp_call_function.patch,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- linux-2.6-dump_smp_call_function.patch 23 Mar 2006 01:11:45 -0000 1.11 +++ linux-2.6-dump_smp_call_function.patch 27 Mar 2006 18:54:19 -0000 1.12 @@ -295,11 +295,11 @@ /* * Call a function on all processors -@@ -83,6 +84,7 @@ void smp_prepare_boot_cpu(void); - #define raw_smp_processor_id() 0 - #define hard_smp_processor_id() 0 - #define smp_call_function(func,info,retry,wait) ({ 0; }) -+#define dump_smp_call_function(func,info) ({ 0; }) +@@ -88,6 +88,7 @@ static inline int up_smp_call_function(v + return 0; + } + #define smp_call_function(func,info,retry,wait) (up_smp_call_function()) ++#define dump_smp_call_function(func,info) ({ 0; }) #define on_each_cpu(func,info,retry,wait) \ ({ \ local_irq_disable(); \ linux-2.6-tux.patch: linux-2.6.16.noarch/include/linux/buffer_head.h | 1 linux-2.6.16.noarch/include/linux/sysctl.h | 50 linux-2.6.16.noarch/net/socket.c | 54 linux-tux.q/arch/alpha/kernel/systbls.S | 8 linux-tux.q/arch/i386/kernel/syscall_table.S | 10 linux-tux.q/arch/ia64/kernel/entry.S | 8 linux-tux.q/arch/ia64/kernel/ia64_ksyms.c | 5 linux-tux.q/arch/x86_64/ia32/ia32entry.S | 10 linux-tux.q/fs/dcache.c | 36 linux-tux.q/fs/exec.c | 2 linux-tux.q/fs/fcntl.c | 4 linux-tux.q/fs/namei.c | 18 linux-tux.q/fs/namespace.c | 2 linux-tux.q/fs/open.c | 4 linux-tux.q/fs/pipe.c | 2 linux-tux.q/fs/read_write.c | 2 linux-tux.q/include/asm-alpha/fcntl.h | 1 linux-tux.q/include/asm-generic/fcntl.h | 4 linux-tux.q/include/asm-i386/unistd.h | 5 linux-tux.q/include/asm-ia64/unistd.h | 2 linux-tux.q/include/asm-sparc/fcntl.h | 1 linux-tux.q/include/asm-sparc64/fcntl.h | 1 linux-tux.q/include/asm-x86_64/unistd.h | 10 linux-tux.q/include/linux/dcache.h | 8 linux-tux.q/include/linux/errno.h | 3 linux-tux.q/include/linux/file.h | 2 linux-tux.q/include/linux/fs.h | 7 linux-tux.q/include/linux/kmod.h | 2 linux-tux.q/include/linux/namei.h | 2 linux-tux.q/include/linux/net.h | 1 linux-tux.q/include/linux/sched.h | 5 linux-tux.q/include/linux/skbuff.h | 2 linux-tux.q/include/linux/socket.h | 4 linux-tux.q/include/net/sock.h | 8 linux-tux.q/include/net/tcp.h | 3 linux-tux.q/include/net/tux.h | 804 ++++++++ linux-tux.q/include/net/tux_u.h | 163 + linux-tux.q/kernel/exit.c | 7 linux-tux.q/kernel/fork.c | 1 linux-tux.q/kernel/kmod.c | 28 linux-tux.q/kernel/signal.c | 1 linux-tux.q/mm/filemap.c | 19 linux-tux.q/mm/truncate.c | 2 linux-tux.q/net/Kconfig | 1 linux-tux.q/net/Makefile | 1 linux-tux.q/net/core/sock.c | 5 linux-tux.q/net/ipv4/tcp.c | 3 linux-tux.q/net/ipv4/tcp_input.c | 1 linux-tux.q/net/ipv4/tcp_output.c | 3 linux-tux.q/net/tux/Kconfig | 25 linux-tux.q/net/tux/Makefile | 12 linux-tux.q/net/tux/abuf.c | 190 ++ linux-tux.q/net/tux/accept.c | 863 +++++++++ linux-tux.q/net/tux/cachemiss.c | 265 ++ linux-tux.q/net/tux/cgi.c | 171 + linux-tux.q/net/tux/directory.c | 302 +++ linux-tux.q/net/tux/extcgi.c | 329 +++ linux-tux.q/net/tux/gzip.c | 40 linux-tux.q/net/tux/input.c | 641 +++++++ linux-tux.q/net/tux/logger.c | 837 +++++++++ linux-tux.q/net/tux/main.c | 1417 +++++++++++++++ linux-tux.q/net/tux/mod.c | 262 ++ linux-tux.q/net/tux/output.c | 352 +++ linux-tux.q/net/tux/parser.h | 102 + linux-tux.q/net/tux/postpone.c | 77 linux-tux.q/net/tux/proc.c | 1149 ++++++++++++ linux-tux.q/net/tux/proto_ftp.c | 1555 ++++++++++++++++ linux-tux.q/net/tux/proto_http.c | 2197 ++++++++++++++++++++++++ linux-tux.q/net/tux/redirect.c | 172 + linux-tux.q/net/tux/times.c | 392 ++++ linux-tux.q/net/tux/times.h | 26 linux-tux.q/net/tux/userspace.c | 27 72 files changed, 12697 insertions(+), 32 deletions(-) Index: linux-2.6-tux.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-tux.patch,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- linux-2.6-tux.patch 22 Mar 2006 15:56:30 -0000 1.15 +++ linux-2.6-tux.patch 27 Mar 2006 18:54:19 -0000 1.16 @@ -453,14 +453,12 @@ #define __NR_security 185 __SYSCALL(__NR_security, sys_ni_syscall) -Index: linux-tux.q/include/linux/buffer_head.h -=================================================================== ---- linux-tux.q.orig/include/linux/buffer_head.h -+++ linux-tux.q/include/linux/buffer_head.h -@@ -201,6 +201,7 @@ int generic_cont_expand(struct inode *in +--- linux-2.6.16.noarch/include/linux/buffer_head.h~ 2006-03-27 13:32:25.000000000 -0500 ++++ linux-2.6.16.noarch/include/linux/buffer_head.h 2006-03-27 13:32:30.000000000 -0500 +@@ -204,6 +204,7 @@ int generic_cont_expand(struct inode *in int generic_cont_expand_simple(struct inode *inode, loff_t size); int block_commit_write(struct page *page, unsigned from, unsigned to); - int block_sync_page(struct page *); + void 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); Index: sources =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/sources,v retrieving revision 1.334 retrieving revision 1.335 diff -u -r1.334 -r1.335 --- sources 24 Mar 2006 22:43:39 -0000 1.334 +++ sources 27 Mar 2006 18:54:20 -0000 1.335 @@ -1,3 +1,3 @@ 9a91b2719949ff0856b40bc467fd47be linux-2.6.16.tar.bz2 8c70806f9075ebc0087f7ce1b8911700 xen-20060320.tar.bz2 -873d1092728523b4cce4dabfd821bb73 patch-2.6.16-git9.bz2 +cb4f49853e97c197e5774e2c9885aaf4 patch-2.6.16-git13.bz2 Index: upstream =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/upstream,v retrieving revision 1.307 retrieving revision 1.308 diff -u -r1.307 -r1.308 --- upstream 26 Mar 2006 00:13:38 -0000 1.307 +++ upstream 27 Mar 2006 18:54:20 -0000 1.308 @@ -1,2 +1,2 @@ linux-2.6.16.tar.bz2 -patch-2.6.16-git10.bz2 +patch-2.6.16-git13.bz2 --- patch-2.6.16-git10.bz2 DELETED --- --- patch-2.6.16-git10.bz2.sign DELETED --- From fedora-cvs-commits at redhat.com Mon Mar 27 19:06:55 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 27 Mar 2006 14:06:55 -0500 Subject: rpms/wpa_supplicant/devel wpa_supplicant-wep-key-fix.patch, NONE, 1.1 wpa_supplicant.config, 1.1, 1.2 wpa_supplicant.spec, 1.12, 1.13 Message-ID: <200603271906.k2RJ6tip008395@cvs.devel.redhat.com> Author: dcbw Update of /cvs/dist/rpms/wpa_supplicant/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv8379 Modified Files: wpa_supplicant.config wpa_supplicant.spec Added Files: wpa_supplicant-wep-key-fix.patch Log Message: * Mon Mar 27 2006 Dan Williams - 0.4.8-6 - Add patch to make orinoco happy with WEP keys - Enable Prism54-specific driver - Disable ipw-specific driver; ipw2x00 should be using WEXT instead wpa_supplicant-wep-key-fix.patch: driver_wext.c | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE wpa_supplicant-wep-key-fix.patch --- Index: wpa_supplicant-0.4.8/driver_wext.c =================================================================== --- wpa_supplicant-0.4.8.orig/driver_wext.c +++ wpa_supplicant-0.4.8/driver_wext.c @@ -1415,7 +1415,7 @@ int wpa_driver_wext_set_key(void *priv, memset(&iwr, 0, sizeof(iwr)); strncpy(iwr.ifr_name, drv->ifname, IFNAMSIZ); iwr.u.encoding.flags = key_idx + 1; - iwr.u.encoding.pointer = (caddr_t) key; + iwr.u.encoding.pointer = (caddr_t) NULL; iwr.u.encoding.length = 0; if (ioctl(drv->ioctl_sock, SIOCSIWENCODE, &iwr) < 0) { perror("ioctl[SIOCSIWENCODE] (set_tx)"); Index: wpa_supplicant.config =================================================================== RCS file: /cvs/dist/rpms/wpa_supplicant/devel/wpa_supplicant.config,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- wpa_supplicant.config 27 Jan 2006 06:08:29 -0000 1.1 +++ wpa_supplicant.config 27 Mar 2006 19:06:52 -0000 1.2 @@ -5,8 +5,9 @@ CONFIG_DRIVER_ATMEL=y CONFIG_DRIVER_WEXT=y CONFIG_DRIVER_NDISWRAPPER=y +CONFIG_DRIVER_PRISM54=y //CONFIG_DRIVER_BROADCOM=y -CONFIG_DRIVER_IPW=y +//CONFIG_DRIVER_IPW=y //CONFIG_DRIVER_BSD=y //CONFIG_DRIVER_NDIS=y CONFIG_WIRELESS_EXTENSION=y Index: wpa_supplicant.spec =================================================================== RCS file: /cvs/dist/rpms/wpa_supplicant/devel/wpa_supplicant.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- wpa_supplicant.spec 4 Mar 2006 07:24:19 -0000 1.12 +++ wpa_supplicant.spec 27 Mar 2006 19:06:52 -0000 1.13 @@ -2,7 +2,7 @@ Name: wpa_supplicant Epoch: 1 Version: 0.4.8 -Release: 5 +Release: 6.fc6 License: GPL Group: System Environment/Base Source0: http://hostap.epitest.fi/releases/%{name}-%{version}.tar.gz @@ -16,6 +16,7 @@ Patch2: wpa_supplicant-ctrl-iface-hide-keys.patch Patch3: wpa_supplicant-assoc-timeout.patch Patch4: wpa_supplicant-driver-wext-debug.patch +Patch5: wpa_supplicant-wep-key-fix.patch URL: http://hostap.epitest.fi/wpa_supplicant/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -46,6 +47,7 @@ %patch2 -p1 -b .ctrl-iface-hide-keys %patch3 -p1 -b .assoc-timeout %patch4 -p1 -b .driver-wext-debug +%patch5 -p1 -b .wep-key-fix %build cp %{SOURCE1} ./.config @@ -123,6 +125,11 @@ %{_bindir}/wpa_gui %changelog +* Mon Mar 27 2006 Dan Williams - 0.4.8-6 +- Add patch to make orinoco happy with WEP keys +- Enable Prism54-specific driver +- Disable ipw-specific driver; ipw2x00 should be using WEXT instead + * Fri Mar 3 2006 Dan Williams - 0.4.8-5 - Increase association timeout, mainly for drivers that don't fully support WPA ioctls yet From fedora-cvs-commits at redhat.com Mon Mar 27 19:07:05 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 27 Mar 2006 14:07:05 -0500 Subject: rpms/openoffice.org/devel workspace.atkbridge.patch,1.9,1.10 Message-ID: <200603271907.k2RJ75uu008422@cvs.devel.redhat.com> Author: caolanm Update of /cvs/dist/rpms/openoffice.org/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv8387 Modified Files: workspace.atkbridge.patch Log Message: not needed workspace.atkbridge.patch: graphics/svx/source/accessibility/AccessibleContextBase.cxx | 1 graphics/svx/source/accessibility/AccessibleControlShape.cxx | 1 graphics/svx/source/accessibility/AccessibleEditableTextPara.cxx | 1 graphics/svx/source/accessibility/AccessibleFrameSelector.cxx | 3 graphics/svx/source/accessibility/AccessibleImageBullet.cxx | 1 graphics/svx/source/accessibility/GraphCtlAccessibleContext.cxx | 1 graphics/svx/source/accessibility/charmapacc.cxx | 8 graphics/svx/source/accessibility/svxrectctaccessiblecontext.cxx | 2 gsl/fpicker/source/unx/gnome/FPentry.cxx | 3 gsl/toolkit/source/awt/accessiblemenubasecomponent.cxx | 15 gsl/toolkit/source/awt/accessiblemenucomponent.cxx | 3 gsl/toolkit/source/awt/accessiblemenuitemcomponent.cxx | 3 gsl/toolkit/source/awt/vclxaccessiblecomponent.cxx | 10 gsl/toolkit/source/awt/vclxaccessiblelistitem.cxx | 1 gsl/toolkit/source/awt/vclxaccessiblemenuitem.cxx | 8 gsl/toolkit/source/awt/vclxaccessiblestatusbaritem.cxx | 1 gsl/toolkit/source/awt/vclxaccessibletabpage.cxx | 1 gsl/toolkit/source/awt/vclxaccessibletoolboxitem.cxx | 19 gsl/toolkit/source/awt/vclxwindow.cxx | 80 gsl/vcl/inc/menu.hxx | 3 gsl/vcl/inc/svapp.hxx | 2 gsl/vcl/prj/build.lst | 3 gsl/vcl/source/app/svapp.cxx | 14 gsl/vcl/source/window/menu.cxx | 35 gsl/vcl/unx/gtk/a11y/TODO | 49 gsl/vcl/unx/gtk/a11y/atkaction.cxx | 287 +++ gsl/vcl/unx/gtk/a11y/atkbridge.cxx | 56 gsl/vcl/unx/gtk/a11y/atkcomponent.cxx | 397 ++++ gsl/vcl/unx/gtk/a11y/atkeditabletext.cxx | 207 ++ gsl/vcl/unx/gtk/a11y/atkfactory.cxx | 168 ++ gsl/vcl/unx/gtk/a11y/atkfactory.hxx | 49 gsl/vcl/unx/gtk/a11y/atkhypertext.cxx | 295 +++ gsl/vcl/unx/gtk/a11y/atkimage.cxx | 144 + gsl/vcl/unx/gtk/a11y/atklistener.cxx | 474 +++++ gsl/vcl/unx/gtk/a11y/atklistener.hxx | 92 + gsl/vcl/unx/gtk/a11y/atkselection.cxx | 200 ++ gsl/vcl/unx/gtk/a11y/atktable.cxx | 737 ++++++++ gsl/vcl/unx/gtk/a11y/atktext.cxx | 547 ++++++ gsl/vcl/unx/gtk/a11y/atktextattributes.cxx | 572 ++++++ gsl/vcl/unx/gtk/a11y/atktextattributes.hxx | 60 gsl/vcl/unx/gtk/a11y/atkutil.cxx | 625 +++++++ gsl/vcl/unx/gtk/a11y/atkutil.hxx | 45 gsl/vcl/unx/gtk/a11y/atkvalue.cxx | 152 + gsl/vcl/unx/gtk/a11y/atkwindow.cxx | 145 + gsl/vcl/unx/gtk/a11y/atkwindow.hxx | 45 gsl/vcl/unx/gtk/a11y/atkwrapper.cxx | 819 ++++++++++ gsl/vcl/unx/gtk/a11y/atkwrapper.hxx | 125 + gsl/vcl/unx/gtk/a11y/makefile.mk | 96 + gsl/vcl/unx/gtk/app/gtkinst.cxx | 42 gsl/vcl/unx/gtk/window/gtkframe.cxx | 142 + gsl/vcl/unx/inc/plugins/gtk/atkbridge.hxx | 45 gsl/vcl/unx/inc/plugins/gtk/gtkframe.hxx | 16 gsl/vcl/util/makefile.mk | 2 util/comphelper/source/misc/accessiblewrapper.cxx | 6 util/svtools/source/Accessibility/accessibleiconchoicectrlentry.cxx | 1 util/svtools/source/Accessibility/accessiblelistboxentry.cxx | 1 util/svtools/source/Accessibility/accessibletabbar.cxx | 9 util/svtools/source/Accessibility/accessibletabbarpage.cxx | 21 util/svtools/source/Accessibility/accessibletabbarpagelist.cxx | 31 util/svtools/source/Accessibility/accessibletablistboxtable.cxx | 19 util/svtools/source/brwbox/brwbox3.cxx | 3 util/svtools/source/contnr/svtabbx.cxx | 3 util/svtools/source/control/valueacc.cxx | 2 util/svtools/source/edit/textwindowaccessibility.cxx | 2 64 files changed, 6833 insertions(+), 117 deletions(-) Index: workspace.atkbridge.patch =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/devel/workspace.atkbridge.patch,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- workspace.atkbridge.patch 23 Mar 2006 15:06:09 -0000 1.9 +++ workspace.atkbridge.patch 27 Mar 2006 19:07:01 -0000 1.10 @@ -7762,16 +7762,3 @@ << ::css::accessibility::AccessibleStateType::FOCUSABLE) | (static_cast< ::sal_Int64 >(1) << ::css::accessibility::AccessibleStateType::MULTI_LINE); ---- SRC680_m130.orig/desktop/scripts/soffice.sh 2005-09-30 15:34:21.000000000 +0100 -+++ SRC680_m130/desktop/scripts/soffice.sh 2005-09-30 15:34:56.000000000 +0100 -@@ -35,6 +35,10 @@ - #************************************************************************* - - if [ -z $SAL_USE_VCLPLUGIN ]; then export SAL_USE_VCLPLUGIN=gtk; fi -+if [ true == `gconftool-2 -g "/desktop/gnome/interface/accessibility"` ]; then -+export GTK_MODULES="gail:atk-bridge $GTK_MODULES" -+fi -+export SAL_IGNOREXERRORS=true - export SAL_ENABLE_NATIVE_XFONTS=0 - # - # STAR_PROFILE_LOCKING_DISABLED=1 From fedora-cvs-commits at redhat.com Mon Mar 27 19:08:25 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 27 Mar 2006 14:08:25 -0500 Subject: rpms/openoffice.org/FC-5 workspace.atkbridge.patch,1.11,1.12 Message-ID: <200603271908.k2RJ8PJF008510@cvs.devel.redhat.com> Author: caolanm Update of /cvs/dist/rpms/openoffice.org/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv8476 Modified Files: workspace.atkbridge.patch Log Message: not needed workspace.atkbridge.patch: graphics/svx/source/accessibility/AccessibleContextBase.cxx | 1 graphics/svx/source/accessibility/AccessibleControlShape.cxx | 1 graphics/svx/source/accessibility/AccessibleEditableTextPara.cxx | 1 graphics/svx/source/accessibility/AccessibleFrameSelector.cxx | 3 graphics/svx/source/accessibility/AccessibleImageBullet.cxx | 1 graphics/svx/source/accessibility/GraphCtlAccessibleContext.cxx | 1 graphics/svx/source/accessibility/charmapacc.cxx | 8 graphics/svx/source/accessibility/svxrectctaccessiblecontext.cxx | 2 gsl/fpicker/source/unx/gnome/FPentry.cxx | 3 gsl/toolkit/source/awt/accessiblemenubasecomponent.cxx | 15 gsl/toolkit/source/awt/accessiblemenucomponent.cxx | 3 gsl/toolkit/source/awt/accessiblemenuitemcomponent.cxx | 3 gsl/toolkit/source/awt/vclxaccessiblecomponent.cxx | 10 gsl/toolkit/source/awt/vclxaccessiblelistitem.cxx | 1 gsl/toolkit/source/awt/vclxaccessiblemenuitem.cxx | 8 gsl/toolkit/source/awt/vclxaccessiblestatusbaritem.cxx | 1 gsl/toolkit/source/awt/vclxaccessibletabpage.cxx | 1 gsl/toolkit/source/awt/vclxaccessibletoolboxitem.cxx | 19 gsl/toolkit/source/awt/vclxwindow.cxx | 80 gsl/vcl/inc/menu.hxx | 3 gsl/vcl/inc/svapp.hxx | 2 gsl/vcl/prj/build.lst | 3 gsl/vcl/source/app/svapp.cxx | 14 gsl/vcl/source/window/menu.cxx | 35 gsl/vcl/unx/gtk/a11y/TODO | 49 gsl/vcl/unx/gtk/a11y/atkaction.cxx | 287 +++ gsl/vcl/unx/gtk/a11y/atkbridge.cxx | 56 gsl/vcl/unx/gtk/a11y/atkcomponent.cxx | 397 ++++ gsl/vcl/unx/gtk/a11y/atkeditabletext.cxx | 207 ++ gsl/vcl/unx/gtk/a11y/atkfactory.cxx | 168 ++ gsl/vcl/unx/gtk/a11y/atkfactory.hxx | 49 gsl/vcl/unx/gtk/a11y/atkhypertext.cxx | 295 +++ gsl/vcl/unx/gtk/a11y/atkimage.cxx | 144 + gsl/vcl/unx/gtk/a11y/atklistener.cxx | 474 +++++ gsl/vcl/unx/gtk/a11y/atklistener.hxx | 92 + gsl/vcl/unx/gtk/a11y/atkselection.cxx | 200 ++ gsl/vcl/unx/gtk/a11y/atktable.cxx | 737 ++++++++ gsl/vcl/unx/gtk/a11y/atktext.cxx | 547 ++++++ gsl/vcl/unx/gtk/a11y/atktextattributes.cxx | 572 ++++++ gsl/vcl/unx/gtk/a11y/atktextattributes.hxx | 60 gsl/vcl/unx/gtk/a11y/atkutil.cxx | 625 +++++++ gsl/vcl/unx/gtk/a11y/atkutil.hxx | 45 gsl/vcl/unx/gtk/a11y/atkvalue.cxx | 152 + gsl/vcl/unx/gtk/a11y/atkwindow.cxx | 145 + gsl/vcl/unx/gtk/a11y/atkwindow.hxx | 45 gsl/vcl/unx/gtk/a11y/atkwrapper.cxx | 819 ++++++++++ gsl/vcl/unx/gtk/a11y/atkwrapper.hxx | 125 + gsl/vcl/unx/gtk/a11y/makefile.mk | 96 + gsl/vcl/unx/gtk/app/gtkinst.cxx | 42 gsl/vcl/unx/gtk/window/gtkframe.cxx | 142 + gsl/vcl/unx/inc/plugins/gtk/atkbridge.hxx | 45 gsl/vcl/unx/inc/plugins/gtk/gtkframe.hxx | 16 gsl/vcl/util/makefile.mk | 2 util/comphelper/source/misc/accessiblewrapper.cxx | 6 util/svtools/source/Accessibility/accessibleiconchoicectrlentry.cxx | 1 util/svtools/source/Accessibility/accessiblelistboxentry.cxx | 1 util/svtools/source/Accessibility/accessibletabbar.cxx | 9 util/svtools/source/Accessibility/accessibletabbarpage.cxx | 21 util/svtools/source/Accessibility/accessibletabbarpagelist.cxx | 31 util/svtools/source/Accessibility/accessibletablistboxtable.cxx | 19 util/svtools/source/brwbox/brwbox3.cxx | 3 util/svtools/source/contnr/svtabbx.cxx | 3 util/svtools/source/control/valueacc.cxx | 2 util/svtools/source/edit/textwindowaccessibility.cxx | 2 64 files changed, 6833 insertions(+), 117 deletions(-) Index: workspace.atkbridge.patch =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/FC-5/workspace.atkbridge.patch,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- workspace.atkbridge.patch 23 Mar 2006 15:07:09 -0000 1.11 +++ workspace.atkbridge.patch 27 Mar 2006 19:08:19 -0000 1.12 @@ -7762,16 +7762,3 @@ << ::css::accessibility::AccessibleStateType::FOCUSABLE) | (static_cast< ::sal_Int64 >(1) << ::css::accessibility::AccessibleStateType::MULTI_LINE); ---- SRC680_m130.orig/desktop/scripts/soffice.sh 2005-09-30 15:34:21.000000000 +0100 -+++ SRC680_m130/desktop/scripts/soffice.sh 2005-09-30 15:34:56.000000000 +0100 -@@ -35,6 +35,10 @@ - #************************************************************************* - - if [ -z $SAL_USE_VCLPLUGIN ]; then export SAL_USE_VCLPLUGIN=gtk; fi -+if [ true == `gconftool-2 -g "/desktop/gnome/interface/accessibility"` ]; then -+export GTK_MODULES="gail:atk-bridge $GTK_MODULES" -+fi -+export SAL_IGNOREXERRORS=true - export SAL_ENABLE_NATIVE_XFONTS=0 - # - # STAR_PROFILE_LOCKING_DISABLED=1 From fedora-cvs-commits at redhat.com Mon Mar 27 19:10:36 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 27 Mar 2006 14:10:36 -0500 Subject: rpms/wpa_supplicant/FC-5 wpa_supplicant-wep-key-fix.patch, NONE, 1.1 wpa_supplicant.config, 1.1, 1.2 wpa_supplicant.spec, 1.12, 1.13 Message-ID: <200603271910.k2RJAaNQ008580@cvs.devel.redhat.com> Author: dcbw Update of /cvs/dist/rpms/wpa_supplicant/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv8553 Modified Files: wpa_supplicant.config wpa_supplicant.spec Added Files: wpa_supplicant-wep-key-fix.patch Log Message: * Mon Mar 27 2006 Dan Williams - 0.4.8-6 - Add patch to make orinoco happy with WEP keys - Enable Prism54-specific driver - Disable ipw-specific driver; ipw2x00 should be using WEXT instead wpa_supplicant-wep-key-fix.patch: driver_wext.c | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE wpa_supplicant-wep-key-fix.patch --- Index: wpa_supplicant-0.4.8/driver_wext.c =================================================================== --- wpa_supplicant-0.4.8.orig/driver_wext.c +++ wpa_supplicant-0.4.8/driver_wext.c @@ -1415,7 +1415,7 @@ int wpa_driver_wext_set_key(void *priv, memset(&iwr, 0, sizeof(iwr)); strncpy(iwr.ifr_name, drv->ifname, IFNAMSIZ); iwr.u.encoding.flags = key_idx + 1; - iwr.u.encoding.pointer = (caddr_t) key; + iwr.u.encoding.pointer = (caddr_t) NULL; iwr.u.encoding.length = 0; if (ioctl(drv->ioctl_sock, SIOCSIWENCODE, &iwr) < 0) { perror("ioctl[SIOCSIWENCODE] (set_tx)"); Index: wpa_supplicant.config =================================================================== RCS file: /cvs/dist/rpms/wpa_supplicant/FC-5/wpa_supplicant.config,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- wpa_supplicant.config 27 Jan 2006 06:08:29 -0000 1.1 +++ wpa_supplicant.config 27 Mar 2006 19:10:21 -0000 1.2 @@ -5,8 +5,9 @@ CONFIG_DRIVER_ATMEL=y CONFIG_DRIVER_WEXT=y CONFIG_DRIVER_NDISWRAPPER=y +CONFIG_DRIVER_PRISM54=y //CONFIG_DRIVER_BROADCOM=y -CONFIG_DRIVER_IPW=y +//CONFIG_DRIVER_IPW=y //CONFIG_DRIVER_BSD=y //CONFIG_DRIVER_NDIS=y CONFIG_WIRELESS_EXTENSION=y Index: wpa_supplicant.spec =================================================================== RCS file: /cvs/dist/rpms/wpa_supplicant/FC-5/wpa_supplicant.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- wpa_supplicant.spec 4 Mar 2006 07:24:19 -0000 1.12 +++ wpa_supplicant.spec 27 Mar 2006 19:10:21 -0000 1.13 @@ -2,7 +2,7 @@ Name: wpa_supplicant Epoch: 1 Version: 0.4.8 -Release: 5 +Release: 6.fc5 License: GPL Group: System Environment/Base Source0: http://hostap.epitest.fi/releases/%{name}-%{version}.tar.gz @@ -16,6 +16,7 @@ Patch2: wpa_supplicant-ctrl-iface-hide-keys.patch Patch3: wpa_supplicant-assoc-timeout.patch Patch4: wpa_supplicant-driver-wext-debug.patch +Patch5: wpa_supplicant-wep-key-fix.patch URL: http://hostap.epitest.fi/wpa_supplicant/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -46,6 +47,7 @@ %patch2 -p1 -b .ctrl-iface-hide-keys %patch3 -p1 -b .assoc-timeout %patch4 -p1 -b .driver-wext-debug +%patch5 -p1 -b .wep-key-fix %build cp %{SOURCE1} ./.config @@ -123,6 +125,11 @@ %{_bindir}/wpa_gui %changelog +* Mon Mar 27 2006 Dan Williams - 0.4.8-6 +- Add patch to make orinoco happy with WEP keys +- Enable Prism54-specific driver +- Disable ipw-specific driver; ipw2x00 should be using WEXT instead + * Fri Mar 3 2006 Dan Williams - 0.4.8-5 - Increase association timeout, mainly for drivers that don't fully support WPA ioctls yet From fedora-cvs-commits at redhat.com Mon Mar 27 19:19:53 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 27 Mar 2006 14:19:53 -0500 Subject: rpms/kernel/devel kernel-2.6.spec,1.2094,1.2095 Message-ID: <200603271919.k2RJJrd9022424@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv22411 Modified Files: kernel-2.6.spec Log Message: buildcheck is no longer a valid target (done as part of MODPOST now) Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.2094 retrieving revision 1.2095 diff -u -r1.2094 -r1.2095 --- kernel-2.6.spec 27 Mar 2006 18:54:19 -0000 1.2094 +++ kernel-2.6.spec 27 Mar 2006 19:19:51 -0000 1.2095 @@ -1125,7 +1125,6 @@ make -s ARCH=$Arch nonint_oldconfig > /dev/null make -s ARCH=$Arch %{?_smp_mflags} $MakeTarget make -s ARCH=$Arch %{?_smp_mflags} modules || exit 1 - make ARCH=$Arch buildcheck # Start installing the results @@ -1147,13 +1146,13 @@ mkdir -p $RPM_BUILD_ROOT/lib/modules/$KernelVer make -s ARCH=$Arch INSTALL_MOD_PATH=$RPM_BUILD_ROOT modules_install KERNELRELEASE=$KernelVer - + # And save the headers/makefiles etc for building modules against # # This all looks scary, but the end result is supposed to be: # * all arch relevant include/ files # * all Makefile/Kconfig files - # * all script/ files + # * all script/ files rm -f $RPM_BUILD_ROOT/lib/modules/$KernelVer/build rm -f $RPM_BUILD_ROOT/lib/modules/$KernelVer/source From fedora-cvs-commits at redhat.com Mon Mar 27 19:25:31 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 27 Mar 2006 14:25:31 -0500 Subject: rpms/system-config-kickstart/devel .cvsignore, 1.25, 1.26 sources, 1.32, 1.33 system-config-kickstart.spec, 1.36, 1.37 Message-ID: <200603271925.k2RJPVIe022564@cvs.devel.redhat.com> Author: clumens Update of /cvs/dist/rpms/system-config-kickstart/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv22549 Modified Files: .cvsignore sources system-config-kickstart.spec Log Message: Bump version. Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/system-config-kickstart/devel/.cvsignore,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- .cvsignore 27 Mar 2006 15:31:32 -0000 1.25 +++ .cvsignore 27 Mar 2006 19:25:29 -0000 1.26 @@ -18,3 +18,4 @@ system-config-kickstart-2.6.5.tar.bz2 system-config-kickstart-2.6.6.tar.bz2 system-config-kickstart-2.6.7.tar.bz2 +system-config-kickstart-2.6.8.tar.bz2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/system-config-kickstart/devel/sources,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- sources 27 Mar 2006 15:31:32 -0000 1.32 +++ sources 27 Mar 2006 19:25:29 -0000 1.33 @@ -1 +1 @@ -6ccd78a74913133f136183ac4034c36e system-config-kickstart-2.6.7.tar.bz2 +36cc96e06f416ad37c01793819d6cdd9 system-config-kickstart-2.6.8.tar.bz2 Index: system-config-kickstart.spec =================================================================== RCS file: /cvs/dist/rpms/system-config-kickstart/devel/system-config-kickstart.spec,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- system-config-kickstart.spec 27 Mar 2006 15:31:32 -0000 1.36 +++ system-config-kickstart.spec 27 Mar 2006 19:25:29 -0000 1.37 @@ -1,6 +1,6 @@ Summary: A graphical interface for making kickstart files. Name: system-config-kickstart -Version: 2.6.7 +Version: 2.6.8 Release: 1 URL: http://fedora.redhat.com/projects/config-tools/ License: GPL @@ -78,6 +78,9 @@ %attr(0644,root,root) %{_datadir}/icons/hicolor/48x48/apps/system-config-kickstart.png %changelog +* Mon Mar 27 2006 Chris Lumens 2.6.8-1 +- Fix loading kickstart files (#186944). + * Mon Mar 27 2006 Chris Lumens 2.6.7-1 - Fix support for --generate (#186635). From fedora-cvs-commits at redhat.com Mon Mar 27 19:36:18 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 27 Mar 2006 14:36:18 -0500 Subject: rpms/system-config-kickstart/FC-5 system-config-kickstart-xconfig.patch, NONE, 1.1 system-config-kickstart.spec, 1.36, 1.37 Message-ID: <200603271936.k2RJaIpT022761@cvs.devel.redhat.com> Author: clumens Update of /cvs/dist/rpms/system-config-kickstart/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv22744 Modified Files: system-config-kickstart.spec Added Files: system-config-kickstart-xconfig.patch Log Message: Add patch to fix loading kickstart files (#186944). system-config-kickstart-xconfig.patch: src/xconfig.py | 2 +- system-config-kickstart.spec | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) --- NEW FILE system-config-kickstart-xconfig.patch --- diff -ru fc5-scks.orig/src/xconfig.py fc5-scks/src/xconfig.py --- fc5-scks.orig/src/xconfig.py 2006-01-31 11:20:01.000000000 -0500 +++ fc5-scks/src/xconfig.py 2006-03-27 14:27:19.000000000 -0500 @@ -287,7 +287,7 @@ if self.ksdata.monitor["hsync"] != "": self.sync_button.set_active(True) - self.hsync_entry.monitort(string.strip(self.ksdata.monitor["hsync"])) + self.hsync_entry.set_text(string.strip(self.ksdata.monitor["hsync"])) self.monitor_probe_check.set_active(False) if self.ksdata.monitor["vsync"] != "": diff -ru fc5-scks.orig/system-config-kickstart.spec fc5-scks/system-config-kickstart.spec --- fc5-scks.orig/system-config-kickstart.spec 2006-03-27 14:33:05.000000000 -0500 +++ fc5-scks/system-config-kickstart.spec 2006-03-27 14:28:54.000000000 -0500 @@ -1,7 +1,7 @@ Summary: A graphical interface for making kickstart files. Name: system-config-kickstart Version: 2.6.6 -Release: 3 +Release: 4 URL: http://fedora.redhat.com/projects/config-tools/ License: GPL ExclusiveOS: Linux @@ -10,6 +10,7 @@ BuildArch: noarch Source0: %{name}-%{version}.tar.bz2 Patch0: %{name}-profile.patch +Patch1: %{name}-xconfig.patch Obsoletes: ksconfig Obsoletes: redhat-config-kickstart BuildRequires: desktop-file-utils @@ -32,6 +33,7 @@ %prep %setup -q %patch0 -p1 +%patch1 -p1 %install rm -rf $RPM_BUILD_ROOT @@ -80,6 +82,9 @@ %attr(0644,root,root) %{_datadir}/icons/hicolor/48x48/apps/system-config-kickstart.png %changelog +* Mon Mar 27 2006 Chris Lumens 2.6.6-4 +- Add patch to fix loading kickstart files (#186944). + * Mon Mar 27 2006 Chris Lumens 2.6.6-3 - Add patch to fix system profiling mode (#186635). Index: system-config-kickstart.spec =================================================================== RCS file: /cvs/dist/rpms/system-config-kickstart/FC-5/system-config-kickstart.spec,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- system-config-kickstart.spec 27 Mar 2006 16:03:21 -0000 1.36 +++ system-config-kickstart.spec 27 Mar 2006 19:36:03 -0000 1.37 @@ -1,7 +1,7 @@ Summary: A graphical interface for making kickstart files. Name: system-config-kickstart Version: 2.6.6 -Release: 3 +Release: 4 URL: http://fedora.redhat.com/projects/config-tools/ License: GPL ExclusiveOS: Linux @@ -10,6 +10,7 @@ BuildArch: noarch Source0: %{name}-%{version}.tar.bz2 Patch0: %{name}-profile.patch +Patch1: %{name}-xconfig.patch Obsoletes: ksconfig Obsoletes: redhat-config-kickstart BuildRequires: desktop-file-utils @@ -32,6 +33,7 @@ %prep %setup -q %patch0 -p1 +%patch1 -p1 %install rm -rf $RPM_BUILD_ROOT @@ -80,6 +82,9 @@ %attr(0644,root,root) %{_datadir}/icons/hicolor/48x48/apps/system-config-kickstart.png %changelog +* Mon Mar 27 2006 Chris Lumens 2.6.6-4 +- Add patch to fix loading kickstart files (#186944). + * Mon Mar 27 2006 Chris Lumens 2.6.6-3 - Add patch to fix system profiling mode (#186635). From fedora-cvs-commits at redhat.com Mon Mar 27 19:55:01 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 27 Mar 2006 14:55:01 -0500 Subject: rpms/mysql/devel mysql-install-test.patch, NONE, 1.1 mysql.spec, 1.73, 1.74 mysql.logrotate, 1.6, NONE Message-ID: <200603271955.k2RJt1ib004316@cvs.devel.redhat.com> Author: tgl Update of /cvs/dist/rpms/mysql/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv4304 Modified Files: mysql.spec Added Files: mysql-install-test.patch Removed Files: mysql.logrotate Log Message: Synchronize FC6 with recent work in 4E-stacks branch. mysql-install-test.patch: README | 13 +++++++++++-- install_test_db.sh | 15 ++++++++------- mysql-test-run.sh | 2 ++ 3 files changed, 21 insertions(+), 9 deletions(-) --- NEW FILE mysql-install-test.patch --- mysql's idea of a suitable place to install the regression tests is /usr/mysql-test. To relocate this to a reasonably FHS-compliant place like /usr/share/mysql-test, we have to hack up the paths in install_test_db and mysql-test-run. This patch also improves the documentation a tad. diff -Naur mysql-5.0.18.orig/mysql-test/README mysql-5.0.18/mysql-test/README --- mysql-5.0.18.orig/mysql-test/README 2005-12-21 14:39:48.000000000 -0500 +++ mysql-5.0.18/mysql-test/README 2006-03-09 20:29:24.000000000 -0500 @@ -2,11 +2,20 @@ the currently existing test cases, simply execute ./mysql-test-run in this directory. It will fire up the newly built mysqld and test it. +For use in Red Hat distributions, you should run the script as user mysql, +so the best bet is something like + cd /usr/share/mysql-test + sudo -u mysql ./mysql-test-run +This will use the installed mysql executables, but will run a private copy +of the server process (using data files within /usr/share/mysql-test), +so you need not start the mysqld service beforehand. + If you want to run a test with a running MySQL server use the --extern option to mysql-test-run. Please note that in this mode the test suite expects user to specify test names to run. Otherwise it falls back to the -normal "non-extern" behaviour. The reason is that some tests -could not run with external server. Here is the sample command +normal "non-extern" behaviour. The reason is that many tests +will fail with external server (because they need to control the options +with which the server is started). Here is the sample command to test "alias" and "analyze" tests on external server: mysql-test-run --extern alias analyze diff -Naur mysql-5.0.18.orig/mysql-test/install_test_db.sh mysql-5.0.18/mysql-test/install_test_db.sh --- mysql-5.0.18.orig/mysql-test/install_test_db.sh 2005-12-21 14:39:48.000000000 -0500 +++ mysql-5.0.18/mysql-test/install_test_db.sh 2006-03-09 20:20:45.000000000 -0500 @@ -9,17 +9,17 @@ shift 1 # Check if it's a binary distribution or a 'make install' - if test -x ../libexec/mysqld + if test -x /usr/libexec/mysqld then - execdir=../libexec + execdir=/usr/libexec else - execdir=../bin + execdir=/usr/bin fi - bindir=../bin + bindir=/usr/bin BINARY_DIST=1 fix_bin=mysql-test - scriptdir=../bin - libexecdir=../libexec + scriptdir=/usr/bin + libexecdir=/usr/libexec else execdir=../sql bindir=../client @@ -75,7 +75,8 @@ #for error messages if [ x$BINARY_DIST = x1 ] ; then -basedir=.. +basedir=/usr/share +EXTRA_ARG="--language=/usr/share/mysql/english/ --character-sets-dir=/usr/share/mysql/charsets/" else basedir=. EXTRA_ARG="--language=../sql/share/english/ --character-sets-dir=../sql/share/charsets/" diff -Naur mysql-5.0.18.orig/mysql-test/mysql-test-run.sh mysql-5.0.18/mysql-test/mysql-test-run.sh --- mysql-5.0.18.orig/mysql-test/mysql-test-run.sh 2005-12-21 14:39:59.000000000 -0500 +++ mysql-5.0.18/mysql-test/mysql-test-run.sh 2006-03-09 20:20:45.000000000 -0500 @@ -693,6 +693,8 @@ # currently all binaries are in "bin", for a MySQL AB packaging # some are in "tests". + BASEDIR="/usr" + if test -x "$BASEDIR/libexec/mysqld" then MYSQLD="$VALGRIND $BASEDIR/libexec/mysqld" Index: mysql.spec =================================================================== RCS file: /cvs/dist/rpms/mysql/devel/mysql.spec,v retrieving revision 1.73 retrieving revision 1.74 diff -u -r1.73 -r1.74 --- mysql.spec 11 Feb 2006 04:40:02 -0000 1.73 +++ mysql.spec 27 Mar 2006 19:54:58 -0000 1.74 @@ -1,6 +1,6 @@ Name: mysql Version: 5.0.18 -Release: 2.1 +Release: 4 Summary: MySQL client programs and shared libraries. License: GPL Group: Applications/Databases @@ -11,7 +11,6 @@ Source0: http://dev.mysql.com/get/Downloads/MySQL-5.0/mysql-%{version}.tar.gz Source1: mysql.init -Source2: mysql.logrotate Source3: my.cnf Source4: scriptstub.c Source5: my_config.h @@ -24,6 +23,7 @@ Patch5: mysql-no-atomic.patch Patch6: mysql-rpl_ddl.patch Patch7: mysql-rpl-test.patch +Patch8: mysql-install-test.patch BuildRoot: %{_tmppath}/%{name}-%{version}-root Prereq: /sbin/ldconfig, /sbin/install-info, grep, fileutils, chkconfig @@ -90,6 +90,19 @@ package contains benchmark scripts and data for use when benchmarking MySQL. +%package test + +Summary: The test suite distributed with MySQL. +License: GPL +Group: Applications/Databases +Requires: %{name} = %{version}-%{release} +Requires: %{name}-server = %{version}-%{release} + +%description test +MySQL is a multi-user, multi-threaded SQL database server. This +package contains the regression test suite distributed with +the MySQL sources. + %prep %setup -q @@ -100,6 +113,7 @@ %patch5 -p1 %patch6 -p1 %patch7 -p1 +%patch8 -p1 libtoolize --force aclocal @@ -153,33 +167,40 @@ rm -rf $RPM_BUILD_ROOT %makeinstall -install -m 644 include/my_config.h $RPM_BUILD_ROOT/usr/include/mysql/my_config_`uname -i`.h -install -m 644 %{SOURCE5} $RPM_BUILD_ROOT/usr/include/mysql/ + +# multilib header hack +# we only apply this to known Red Hat multilib arches, per bug #181335 +case `uname -i` in + i386 | x86_64 | ppc | ppc64 | s390 | s390x) + install -m 644 include/my_config.h $RPM_BUILD_ROOT/usr/include/mysql/my_config_`uname -i`.h + install -m 644 %{SOURCE5} $RPM_BUILD_ROOT/usr/include/mysql/ + ;; + *) + ;; +esac + mkdir -p $RPM_BUILD_ROOT/var/log touch $RPM_BUILD_ROOT/var/log/mysqld.log # List the installed tree for RPM package maintenance purposes. find $RPM_BUILD_ROOT -print | sed "s|^$RPM_BUILD_ROOT||" | sort > ROOTFILES + gzip ${RPM_BUILD_ROOT}%{_infodir}/* -rm -f ${RPM_BUILD_ROOT}%{_datadir}/mysql/mysql-*.spec -rm -f ${RPM_BUILD_ROOT}%{_datadir}/mysql/mysql-log-rotate -mkdir -p $RPM_BUILD_ROOT/etc/{rc.d/init.d,logrotate.d} +mkdir -p $RPM_BUILD_ROOT/etc/rc.d/init.d mkdir -p $RPM_BUILD_ROOT/var/run/mysqld install -m 0755 -d $RPM_BUILD_ROOT/var/lib/mysql install -m 0755 %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/mysqld -install -m 0644 %{SOURCE2} $RPM_BUILD_ROOT/etc/logrotate.d/mysqld install -m 0644 %{SOURCE3} $RPM_BUILD_ROOT/etc/my.cnf rm -f $RPM_BUILD_ROOT/%{_infodir}/dir* mv $RPM_BUILD_ROOT/usr/sql-bench $RPM_BUILD_ROOT%{_datadir}/sql-bench +mv $RPM_BUILD_ROOT/usr/mysql-test $RPM_BUILD_ROOT%{_datadir}/mysql-test mv ${RPM_BUILD_ROOT}%{_bindir}/mysqlbug ${RPM_BUILD_ROOT}%{_libdir}/mysql/mysqlbug install -m 0755 scriptstub ${RPM_BUILD_ROOT}%{_bindir}/mysqlbug mv ${RPM_BUILD_ROOT}%{_bindir}/mysql_config ${RPM_BUILD_ROOT}%{_libdir}/mysql/mysql_config install -m 0755 scriptstub ${RPM_BUILD_ROOT}%{_bindir}/mysql_config -rm -fr $RPM_BUILD_ROOT/usr/mysql-test -rm -f ${RPM_BUILD_ROOT}%{_bindir}/*client_test rm -f ${RPM_BUILD_ROOT}%{_bindir}/comp_err rm -f ${RPM_BUILD_ROOT}%{_bindir}/make_win_binary_distribution rm -f ${RPM_BUILD_ROOT}%{_bindir}/make_win_src_distribution @@ -195,6 +216,8 @@ rm -f ${RPM_BUILD_ROOT}%{_datadir}/mysql/*.plist rm -f ${RPM_BUILD_ROOT}%{_datadir}/mysql/preinstall rm -f ${RPM_BUILD_ROOT}%{_datadir}/mysql/postinstall +rm -f ${RPM_BUILD_ROOT}%{_datadir}/mysql/mysql-*.spec +rm -f ${RPM_BUILD_ROOT}%{_datadir}/mysql/mysql-log-rotate mkdir -p $RPM_BUILD_ROOT/etc/ld.so.conf.d echo "%{_libdir}/mysql" > $RPM_BUILD_ROOT/etc/ld.so.conf.d/%{name}-%{_arch}.conf @@ -364,7 +387,6 @@ %{_datadir}/mysql/mysql_fix_privilege_tables.sql /etc/rc.d/init.d/mysqld %attr(0755,mysql,mysql) %dir /var/run/mysqld -%config(noreplace) /etc/logrotate.d/mysqld %attr(0755,mysql,mysql) %dir /var/lib/mysql %attr(0640,mysql,mysql) %config(noreplace) %verify(not md5 size mtime) /var/log/mysqld.log @@ -379,7 +401,18 @@ %defattr(-,root,root) %{_datadir}/sql-bench +%files test +%defattr(-,root,root) +%{_bindir}/mysql_client_test +%attr(-,mysql,mysql) %{_datadir}/mysql-test + %changelog +* Mon Mar 27 2006 Tom Lane 5.0.18-4 +- Modify multilib header hack to not break non-RH arches, per bug #181335 +- Remove logrotate script, per bug #180639. +- Add a new mysql-test RPM to carry the regression test files; + hack up test scripts as needed to make them run in /usr/share/mysql-test. + * Fri Feb 10 2006 Jesse Keating - 5.0.18-2.1 - bump again for double-long bug on ppc(64) --- mysql.logrotate DELETED --- From fedora-cvs-commits at redhat.com Mon Mar 27 20:09:04 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 27 Mar 2006 15:09:04 -0500 Subject: rpms/unixODBC/devel DataManager.desktop, 1.3, 1.4 ODBCConfig.desktop, 1.3, 1.4 unixODBC.spec, 1.33, 1.34 Message-ID: <200603272009.k2RK94Bc004647@cvs.devel.redhat.com> Author: tgl Update of /cvs/dist/rpms/unixODBC/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv4608 Modified Files: DataManager.desktop ODBCConfig.desktop unixODBC.spec Log Message: Fix minor problems in desktop files (bug #185764) Index: DataManager.desktop =================================================================== RCS file: /cvs/dist/rpms/unixODBC/devel/DataManager.desktop,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- DataManager.desktop 9 Sep 2004 13:50:02 -0000 1.3 +++ DataManager.desktop 27 Mar 2006 20:08:51 -0000 1.4 @@ -3,7 +3,7 @@ Comment=ODBC Data Source Browsing Tool Exec=DataManager Icon=LinuxODBC.xpm -MiniIcon=odbc.xpm Type=Application -Terminal=0 +Encoding=UTF-8 +Terminal=false Categories=X-Red-Hat-Extra; Index: ODBCConfig.desktop =================================================================== RCS file: /cvs/dist/rpms/unixODBC/devel/ODBCConfig.desktop,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- ODBCConfig.desktop 9 Sep 2004 13:50:02 -0000 1.3 +++ ODBCConfig.desktop 27 Mar 2006 20:08:51 -0000 1.4 @@ -1,9 +1,9 @@ [Desktop Entry] Name=ODBC Data Source Administrator -Comment=ODBC Data Source Administraton Tool +Comment=ODBC Data Source Administration Tool Exec=ODBCConfig Icon=LinuxODBC.xpm -MiniIcon=odbc.xpm Type=Application -Terminal=0 +Encoding=UTF-8 +Terminal=false Categories=X-Red-Hat-Extra; Index: unixODBC.spec =================================================================== RCS file: /cvs/dist/rpms/unixODBC/devel/unixODBC.spec,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- unixODBC.spec 11 Feb 2006 05:55:22 -0000 1.33 +++ unixODBC.spec 27 Mar 2006 20:08:51 -0000 1.34 @@ -1,7 +1,7 @@ Summary: A complete ODBC driver manager for Linux. Name: unixODBC Version: 2.2.11 -Release: 6.2.1 +Release: 7 License: LGPL Group: System Environment/Libraries URL: http://www.unixODBC.org/ @@ -176,6 +176,9 @@ %postun -p /sbin/ldconfig %changelog +* Mon Mar 27 2006 Tom Lane 2.2.11-7 +- Fix minor problems in desktop files (bug #185764) + * Fri Feb 10 2006 Jesse Keating - 2.2.11-6.2.1 - bump again for double-long bug on ppc(64) From fedora-cvs-commits at redhat.com Mon Mar 27 20:54:49 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 27 Mar 2006 15:54:49 -0500 Subject: rpms/kernel/devel kernel-2.6.spec,1.2095,1.2096 Message-ID: <200603272054.k2RKsn0b000331@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv313 Modified Files: kernel-2.6.spec Log Message: no xen* files if includexen=0 Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.2095 retrieving revision 1.2096 diff -u -r1.2095 -r1.2096 --- kernel-2.6.spec 27 Mar 2006 19:19:51 -0000 1.2095 +++ kernel-2.6.spec 27 Mar 2006 20:54:47 -0000 1.2096 @@ -1519,6 +1519,7 @@ /usr/src/kernels/%{KVERREL}smp-%{_target_cpu} %endif +%if %{includexen} %if %{buildxen} %files xen0 %defattr(-,root,root) @@ -1598,6 +1599,7 @@ %verify(not mtime) /usr/src/kernels/%{KVERREL}-xenU-PAE-%{_target_cpu} /usr/src/kernels/%{KVERREL}xenU-PAE-%{_target_cpu} %endif +%endif %if %{buildkdump} From fedora-cvs-commits at redhat.com Mon Mar 27 21:02:00 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 27 Mar 2006 16:02:00 -0500 Subject: rpms/pykickstart/devel .cvsignore, 1.25, 1.26 pykickstart.spec, 1.25, 1.26 sources, 1.26, 1.27 Message-ID: <200603272102.k2RL20HW000589@cvs.devel.redhat.com> Author: clumens Update of /cvs/dist/rpms/pykickstart/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv526 Modified Files: .cvsignore pykickstart.spec sources Log Message: Bump version. Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/pykickstart/devel/.cvsignore,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- .cvsignore 27 Mar 2006 17:16:06 -0000 1.25 +++ .cvsignore 27 Mar 2006 21:01:26 -0000 1.26 @@ -14,3 +14,4 @@ pykickstart-0.22.tar.gz pykickstart-0.23.tar.gz pykickstart-0.24.tar.gz +pykickstart-0.25.tar.gz Index: pykickstart.spec =================================================================== RCS file: /cvs/dist/rpms/pykickstart/devel/pykickstart.spec,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- pykickstart.spec 27 Mar 2006 17:16:06 -0000 1.25 +++ pykickstart.spec 27 Mar 2006 21:01:41 -0000 1.26 @@ -2,7 +2,7 @@ Summary: A python library for manipulating kickstart files Name: pykickstart -Version: 0.24 +Version: 0.25 Release: 1 Source0: %{name}-%{version}.tar.gz License: GPL @@ -36,6 +36,9 @@ /usr/bin/ksvalidator %changelog +* Mon Mar 27 2006 Chris Lumens 0.25-1 +- Add support for the logging command. + * Mon Mar 27 2006 Chris Lumens 0.24-1 - Don't write out a blank xconfig line. - Reorder output handlers to group like commands together. Index: sources =================================================================== RCS file: /cvs/dist/rpms/pykickstart/devel/sources,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- sources 27 Mar 2006 17:16:06 -0000 1.26 +++ sources 27 Mar 2006 21:01:41 -0000 1.27 @@ -1 +1 @@ -5c24c788e3c7290157f3c74cf0f5a4da pykickstart-0.24.tar.gz +bacb2a262490ffbe8d8c3fb14662cbe4 pykickstart-0.25.tar.gz From fedora-cvs-commits at redhat.com Mon Mar 27 21:06:07 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 27 Mar 2006 16:06:07 -0500 Subject: rpms/kernel/FC-5 linux-2.6-cpufreq-acpi-sticky.patch, NONE, 1.1 kernel-2.6.spec, 1.2075, 1.2076 Message-ID: <200603272106.k2RL669J000702@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv679 Modified Files: kernel-2.6.spec Added Files: linux-2.6-cpufreq-acpi-sticky.patch Log Message: make acpi-cpufreq sticky linux-2.6-cpufreq-acpi-sticky.patch: acpi-cpufreq.c | 1 + 1 files changed, 1 insertion(+) --- NEW FILE linux-2.6-cpufreq-acpi-sticky.patch --- --- linux-2.6.16.noarch/arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c~ 2006-03-27 16:03:22.000000000 -0500 +++ linux-2.6.16.noarch/arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c 2006-03-27 16:04:26.000000000 -0500 @@ -452,6 +452,7 @@ static struct cpufreq_driver acpi_cpufre .name = "acpi-cpufreq", .owner = THIS_MODULE, .attr = acpi_cpufreq_attr, + .flags = CPUFREQ_STICKY, }; Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-5/kernel-2.6.spec,v retrieving revision 1.2075 retrieving revision 1.2076 diff -u -r1.2075 -r1.2076 --- kernel-2.6.spec 27 Mar 2006 16:36:39 -0000 1.2075 +++ kernel-2.6.spec 27 Mar 2006 21:06:00 -0000 1.2076 @@ -371,6 +371,7 @@ Patch1750: linux-2.6-drm-cripple-r300.patch Patch1760: linux-2.6-suspend-slab-warnings.patch Patch1770: linux-2.6-optimise-spinlock-debug.patch +Patch1780: linux-2.6-cpufreq-acpi-sticky.patch # SELinux/audit patches. Patch1800: linux-2.6-selinux-hush.patch @@ -999,6 +1000,8 @@ %patch1760 -p1 # Speed up spinlock debug. %patch1770 -p1 +# Make acpi-cpufreq sticky. +%patch1780 -p1 # Silence some selinux messages. %patch1800 -p1 @@ -1671,6 +1674,7 @@ %changelog * Mon Mar 25 2006 Dave Jones - Updated new audit msg types. +- Make acpi-cpufreq 'sticky' * Fri Mar 24 2006 Dave Jones - Reenable HDLC driver (#186257) From fedora-cvs-commits at redhat.com Mon Mar 27 21:11:57 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 27 Mar 2006 16:11:57 -0500 Subject: rpms/gnucash/devel .cvsignore, 1.12, 1.13 gnucash.spec, 1.25, 1.26 sources, 1.13, 1.14 Message-ID: <200603272111.k2RLBv40000850@cvs.devel.redhat.com> Author: notting Update of /cvs/dist/rpms/gnucash/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv830 Modified Files: .cvsignore gnucash.spec sources Log Message: merge the g2 changes. update to 1.9.3 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/gnucash/devel/.cvsignore,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- .cvsignore 9 Feb 2005 20:09:09 -0000 1.12 +++ .cvsignore 27 Mar 2006 21:11:55 -0000 1.13 @@ -1,2 +1,4 @@ -gnucash-1.8.11.tar.gz -gnucash-docs-1.8.5.tar.gz +gnucash-1.9.1.svn13429.tar.bz2 +gnucash-docs-1.9.1.svn13429.tar.bz2 +gnucash-1.9.3.tar.gz +gnucash-docs-1.9.3.svn13703.tar.bz2 Index: gnucash.spec =================================================================== RCS file: /cvs/dist/rpms/gnucash/devel/gnucash.spec,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- gnucash.spec 20 Feb 2006 20:14:09 -0000 1.25 +++ gnucash.spec 27 Mar 2006 21:11:55 -0000 1.26 @@ -1,24 +1,35 @@ -%define docver 1.8.5 +%define svnrev 13703 + +%define buildsvn 1 Name: gnucash Summary: GnuCash is an application to keep track of your finances. -Version: 1.8.12 -Release: 3 +Version: 1.9.3 +%if %{buildsvn} +Release: 1.svn%{svnrev}.1 +%else +Release: 1 +%endif License: GPL/GFDL Group: Applications/Productivity -Source: http://www.gnucash.org/pub/gnucash/sources/unstable/%{name}-%{version}.tar.gz -Source1: http://www.gnucash.org/pub/gnucash/sources/unstable/%{name}-docs-%{docver}.tar.gz +%if %{buildsvn} +Source: gnucash-%{version}.svn%{svnrev}.tar.bz2 +Source1: gnucash-docs-%{version}.svn%{svnrev}.tar.bz2 +%else +Source: http://www.gnucash.org/pub/gnucash/sources/unstable/1.9.x/gnucash-%{version}.tar.gz +#Source1: http://www.gnucash.org/pub/gnucash/sources/unstable/gnucash-docs-%{docver}.tar.gz +Source1: gnucash-docs-%{version}.svn%{svnrev}.tar.bz2 +%endif Patch3: gnucash-1.8.11-icon.patch Patch4: gnucash-1.8.6-64bit-fixes.patch Patch5: gnucash-1.8.12-aq.patch BuildRoot: %{_tmppath}/%{name}-%{version}-root -BuildPrereq: g-wrap-devel >= 1.3.2, gtkhtml-devel >= 1.1.4, -BuildPrereq: Guppi-devel, gal-devel, libxml-devel, db4-devel -BuildPrereq: libglade-devel, libghttp-devel, python-devel, libtermcap-devel -BuildPrereq: readline-devel, autoconf -BuildPrereq: libofx-devel, aqbanking-devel, docbook-style-xsl -BuildPrereq: libtool-ltdl-devel, GConf-devel -BuildRequires: desktop-file-utils, scrollkeeper +BuildRequires: g-wrap-devel >= 1.3.2, gtkhtml3-devel +BuildRequires: libgsf-devel >= 1.12.2 +# cairo-devel >= 0.5.0 +BuildRequires: libglade2-devel >= 2.3.6, libgnomeprint22-devel >= 2.8.0 +BuildRequires: libofx-devel, aqbanking-devel, docbook-style-xsl +BuildRequires: desktop-file-utils, scrollkeeper, texinfo, libtool-ltdl-devel Requires: slib >= 3a1-5 Prereq: /sbin/ldconfig, scrollkeeper >= 0.3.4 %define __perl_requires %{nil} @@ -32,21 +43,29 @@ balanced books. %prep +%if %{buildsvn} +%setup -q -a 1 -n gnucash +%else %setup -q -a 1 -%patch3 -p1 -b .icon +%endif + +#%patch3 -p1 -b .icon %patch4 -p1 -b .64bit -%patch5 -p1 -b .aq +#%patch5 -p1 -b .aq %build -autoconf +%if %{buildsvn} +./autogen.sh +%endif %configure --disable-sql --enable-error-on-warning=no \ --enable-ofx \ - --enable-hbci + --enable-hbci \ +# --with-cairo \ make LIBTOOL=/usr/bin/libtool CC=gcc -cd gnucash-docs-%{docver} -autoconf-2.13 +cd gnucash-docs +./autogen.sh --prefix=/usr %configure make @@ -57,7 +76,7 @@ %find_lang %{name} -cd gnucash-docs-%{docver} +cd gnucash-docs make install DESTDIR=$RPM_BUILD_ROOT || : # vfolder desktop file install stuff @@ -67,7 +86,7 @@ --add-category X-Red-Hat-Extra \ --add-category Application \ --add-category Office \ - $RPM_BUILD_ROOT%{_datadir}/gnome/apps/Applications/gnucash.desktop + $RPM_BUILD_ROOT%{_datadir}/applications/gnucash.desktop echo "StartupWMClass=GnuCash" >> $RPM_BUILD_ROOT%{_datadir}/applications/gnome-gnucash.desktop rm -rf $RPM_BUILD_ROOT/%{_infodir} \ @@ -75,7 +94,9 @@ $RPM_BUILD_ROOT/%{_datadir}/aclocal \ $RPM_BUILD_ROOT/var/scrollkeeper \ $RPM_BUILD_ROOT/%{_libdir}/lib*.a \ - $RPM_BUILD_ROOT/%{_libdir}/gnucash/lib*.a + $RPM_BUILD_ROOT/%{_libdir}/gnucash/lib*.a \ + $RPM_BUILD_ROOT/%{_datadir}/gnome/apps \ + $RPM_BUILD_ROOT/%{_libdir}/pkgconfig %clean rm -rf $RPM_BUILD_ROOT @@ -84,28 +105,40 @@ /sbin/ldconfig /usr/bin/scrollkeeper-update -o %{_datadir}/omf/gnucash-docs +export GCONF_CONFIG_SOURCE=$(gconftool-2 --get-default-source) +SCHEMAS="apps_gnucash_dialog_business_common.schemas apps_gnucash_dialog_commodities.schemas apps_gnucash_dialog_common.schemas apps_gnucash_dialog_hbci.schemas apps_gnucash_dialog_prices.schemas apps_gnucash_dialog_reconcile.schemas apps_gnucash_dialog_totd.schemas apps_gnucash_general.schemas apps_gnucash_history.schemas apps_gnucash_import_generic_matcher.schemas apps_gnucash_warnings.schemas apps_gnucash_window_pages_account_tree.schemas apps_gnucash_window_pages_register.schemas" + +for S in $SCHEMAS; do + gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/$S >/dev/null +done + %postun /sbin/ldconfig /usr/bin/scrollkeeper-update %files -f %{name}.lang %defattr(-,root,root,755) +%{_sysconfdir}/gconf/schemas/* +%{_sysconfdir}/gnucash %{_bindir}/* %{_libexecdir}/gnucash %{_libdir}/* %exclude /usr/lib/debug +%{_datadir}/xml/* %{_datadir}/gnucash %{_datadir}/gnome/help/gnucash %{_datadir}/mime-info/gnucash.* %{_datadir}/omf/gnucash-docs -%{_datadir}/pixmaps/gnucash %{_datadir}/applications/* %{_mandir}/man*/* %config %{_sysconfdir}/gnucash -%doc AUTHORS COPYING ChangeLog ChangeLog.1 HACKING NEWS README README.patches +%doc AUTHORS COPYING ChangeLog* HACKING NEWS README README.patches %doc doc/README.german doc/README.francais doc/guile-hackers.txt %changelog +* Mon Mar 27 2006 Bill Nottingham - 1.9.3-1 +- update to 1.9.x + * Mon Feb 20 2006 Bill Nottingham - 1.8.12-3 - rebuild against g-wrap-1.9.6 Index: sources =================================================================== RCS file: /cvs/dist/rpms/gnucash/devel/sources,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- sources 22 Dec 2005 21:42:37 -0000 1.13 +++ sources 27 Mar 2006 21:11:55 -0000 1.14 @@ -1,2 +1,2 @@ -81e7c703db56bb203e106664157779cc gnucash-1.8.12.tar.gz -9758d8e523530c2509912761e327a9d5 gnucash-docs-1.8.5.tar.gz +00841051fe0a68547178765148f319aa gnucash-1.9.3.tar.gz +c507275cde120fb23ff03aac8d81ee89 gnucash-docs-1.9.3.svn13703.tar.bz2 From fedora-cvs-commits at redhat.com Mon Mar 27 21:12:37 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 27 Mar 2006 16:12:37 -0500 Subject: rpms/g-wrap/devel g-wrap.spec,1.24,1.25 Message-ID: <200603272112.k2RLCboS000952@cvs.devel.redhat.com> Author: notting Update of /cvs/dist/rpms/g-wrap/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv933 Modified Files: g-wrap.spec Log Message: build against glib2 Index: g-wrap.spec =================================================================== RCS file: /cvs/dist/rpms/g-wrap/devel/g-wrap.spec,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- g-wrap.spec 28 Feb 2006 03:33:04 -0000 1.24 +++ g-wrap.spec 27 Mar 2006 21:12:34 -0000 1.25 @@ -41,7 +41,7 @@ %prep %setup -q -a 1 %patch0 -p1 -#%patch1 -p1 +%patch1 -p1 %patch2 -p1 %patch3 -p1 %patch4 -p1 @@ -100,6 +100,9 @@ %doc %{_infodir}/g-wrap.info* %changelog +* Mon Mar 27 2006 Bill Nottingham 1.9.6-3 +- build against glib2 + * Mon Feb 27 2006 Bill Nottingham 1.9.6-2 - don't use an executable stack (#183287) From fedora-cvs-commits at redhat.com Mon Mar 27 21:12:58 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 27 Mar 2006 16:12:58 -0500 Subject: rpms/g-wrap/devel g-wrap.spec,1.25,1.26 Message-ID: <200603272112.k2RLCwmj001012@cvs.devel.redhat.com> Author: notting Update of /cvs/dist/rpms/g-wrap/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv998 Modified Files: g-wrap.spec Log Message: bump Index: g-wrap.spec =================================================================== RCS file: /cvs/dist/rpms/g-wrap/devel/g-wrap.spec,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- g-wrap.spec 27 Mar 2006 21:12:34 -0000 1.25 +++ g-wrap.spec 27 Mar 2006 21:12:56 -0000 1.26 @@ -1,7 +1,7 @@ Summary: A tool for creating Scheme interfaces to C libraries Name: g-wrap Version: 1.9.6 -Release: 2 +Release: 3 Group: Development/Libraries License: GPL Requires: guile From fedora-cvs-commits at redhat.com Mon Mar 27 21:17:00 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 27 Mar 2006 16:17:00 -0500 Subject: rpms/perl/devel perl-5.8.7-172396.patch,1.1,1.2 Message-ID: <200603272117.k2RLH0oA014785@cvs.devel.redhat.com> Author: jvdias Update of /cvs/dist/rpms/perl/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv14770 Modified Files: perl-5.8.7-172396.patch Log Message: fix for bug 172396: localtime_r needs to call tzset. Fix patch to allow non-multithreaded perl builds to work. perl-5.8.7-172396.patch: Configure | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++ config_h.SH | 13 ++++++++++++- reentr.inc | 4 ++-- 3 files changed, 67 insertions(+), 3 deletions(-) Index: perl-5.8.7-172396.patch =================================================================== RCS file: /cvs/dist/rpms/perl/devel/perl-5.8.7-172396.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-5.8.7-172396.patch 3 Nov 2005 19:14:29 -0000 1.1 +++ perl-5.8.7-172396.patch 27 Mar 2006 21:16:56 -0000 1.2 @@ -1,21 +1,6 @@ ---- perl-5.8.7/reentr.inc.161305 2005-11-03 12:56:58.000000000 -0500 -+++ perl-5.8.7/reentr.inc 2005-11-03 12:58:16.000000000 -0500 -@@ -1368,10 +1368,10 @@ - #ifdef HAS_LOCALTIME_R - # undef localtime - # if !defined(localtime) && LOCALTIME_R_PROTO == REENTRANT_PROTO_S_TS --# define localtime(a) (localtime_r(a, &PL_reentrant_buffer->_localtime_struct) ? &PL_reentrant_buffer->_localtime_struct : 0) -+# define localtime(a) ( L_R_TZSET localtime_r(a, &PL_reentrant_buffer->_localtime_struct) ? &PL_reentrant_buffer->_localtime_struct : 0) - # endif - # if !defined(localtime) && LOCALTIME_R_PROTO == REENTRANT_PROTO_I_TS --# define localtime(a) (localtime_r(a, &PL_reentrant_buffer->_localtime_struct) == 0 ? &PL_reentrant_buffer->_localtime_struct : 0) -+# define localtime(a) ( L_R_TZSET localtime_r(a, &PL_reentrant_buffer->_localtime_struct) == 0 ? &PL_reentrant_buffer->_localtime_struct : 0) - # endif - #endif /* HAS_LOCALTIME_R */ - ---- perl-5.8.7/config_h.SH.161305 2005-04-30 10:34:20.000000000 -0400 -+++ perl-5.8.7/config_h.SH 2005-11-03 12:58:16.000000000 -0500 -@@ -1916,7 +1916,18 @@ +--- perl-5.8.8/config_h.SH.bz172396 2005-10-31 13:13:05.000000000 -0500 ++++ perl-5.8.8/config_h.SH 2006-03-27 16:09:01.000000000 -0500 +@@ -1912,7 +1912,18 @@ */ #$d_localtime_r HAS_LOCALTIME_R /**/ #define LOCALTIME_R_PROTO $localtime_r_proto /**/ @@ -35,9 +20,24 @@ /* HAS_LONG_DOUBLE: * This symbol will be defined if the C compiler supports long * doubles. ---- perl-5.8.7/Configure.161305 2005-11-03 12:56:58.000000000 -0500 -+++ perl-5.8.7/Configure 2005-11-03 13:13:54.000000000 -0500 -@@ -528,6 +528,7 @@ +--- perl-5.8.8/reentr.inc.bz172396 2006-03-27 16:09:01.000000000 -0500 ++++ perl-5.8.8/reentr.inc 2006-03-27 16:09:01.000000000 -0500 +@@ -1368,10 +1368,10 @@ + #ifdef HAS_LOCALTIME_R + # undef localtime + # if !defined(localtime) && LOCALTIME_R_PROTO == REENTRANT_PROTO_S_TS +-# define localtime(a) (localtime_r(a, &PL_reentrant_buffer->_localtime_struct) ? &PL_reentrant_buffer->_localtime_struct : 0) ++# define localtime(a) ( L_R_TZSET localtime_r(a, &PL_reentrant_buffer->_localtime_struct) ? &PL_reentrant_buffer->_localtime_struct : 0) + # endif + # if !defined(localtime) && LOCALTIME_R_PROTO == REENTRANT_PROTO_I_TS +-# define localtime(a) (localtime_r(a, &PL_reentrant_buffer->_localtime_struct) == 0 ? &PL_reentrant_buffer->_localtime_struct : 0) ++# define localtime(a) ( L_R_TZSET localtime_r(a, &PL_reentrant_buffer->_localtime_struct) == 0 ? &PL_reentrant_buffer->_localtime_struct : 0) + # endif + #endif /* HAS_LOCALTIME_R */ + +--- perl-5.8.8/Configure.bz172396 2006-03-27 16:09:01.000000000 -0500 ++++ perl-5.8.8/Configure 2006-03-27 16:09:33.000000000 -0500 +@@ -542,6 +542,7 @@ d_libm_lib_version='' d_link='' d_localtime_r='' @@ -45,7 +45,7 @@ localtime_r_proto='' d_locconv='' d_lockf='' -@@ -14023,7 +14024,55 @@ +@@ -14261,7 +14262,58 @@ *) localtime_r_proto=0 ;; esac @@ -72,13 +72,13 @@ + + strcpy(tz_e,e_tz); + strcpy(tz_w,w_tz); -+ + + putenv(tz_e); + localtime_r(&t, &tm_e); + + putenv(tz_w); + localtime_r(&t, &tm_w); - ++ + if( memcmp(&tm_e, &tm_w, sizeof(struct tm)) == 0 ) + return 1; + return 0; @@ -97,11 +97,14 @@ + fi; + rm -f try.c; + ;; ++ *) ++ d_localtime_r_needs_tzset=undef; ++ ;; +esac : see if localeconv exists set localeconv d_locconv eval $inlibc -@@ -20769,6 +20818,7 @@ +@@ -21220,6 +21272,7 @@ d_libm_lib_version='$d_libm_lib_version' d_link='$d_link' d_localtime_r='$d_localtime_r' From fedora-cvs-commits at redhat.com Mon Mar 27 21:18:05 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 27 Mar 2006 16:18:05 -0500 Subject: rpms/postgresql/devel .cvsignore, 1.29, 1.30 postgresql.spec, 1.66, 1.67 sources, 1.30, 1.31 Message-ID: <200603272118.k2RLI5kK014815@cvs.devel.redhat.com> Author: tgl Update of /cvs/dist/rpms/postgresql/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv14800 Modified Files: .cvsignore postgresql.spec sources Log Message: Remove JDBC from this build; we will package it as separate SRPM Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/postgresql/devel/.cvsignore,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- .cvsignore 13 Feb 2006 15:53:02 -0000 1.29 +++ .cvsignore 27 Mar 2006 21:18:02 -0000 1.30 @@ -3,6 +3,3 @@ pgtcl1.5.2.tar.gz pgtcldocs-20041108.zip postgresql-8.1-US.pdf -postgresql-8.1-405.jdbc2.jar -postgresql-8.1-405.jdbc2ee.jar -postgresql-8.1-405.jdbc3.jar Index: postgresql.spec =================================================================== RCS file: /cvs/dist/rpms/postgresql/devel/postgresql.spec,v retrieving revision 1.66 retrieving revision 1.67 diff -u -r1.66 -r1.67 --- postgresql.spec 13 Feb 2006 18:43:53 -0000 1.66 +++ postgresql.spec 27 Mar 2006 21:18:02 -0000 1.67 @@ -60,7 +60,7 @@ %{!?aconfver:%define aconfver autoconf} %{!?tcldevel:%define tcldevel 1} -%{!?jdbc:%define jdbc 1} +%{!?jdbc:%define jdbc 0} %{!?test:%define test 1} %{!?python:%define python 1} %{!?pltcl:%define pltcl 1} @@ -82,7 +82,7 @@ Summary: PostgreSQL client programs and libraries. Name: postgresql Version: 8.1.3 -Release: 1.1 +Release: 2 License: BSD Group: Applications/Databases Url: http://www.postgresql.org/ @@ -92,9 +92,11 @@ Source4: Makefile.regress Source5: pg_config.h Source6: README.rpm-dist +%if %jdbc Source8: http://jdbc.postgresql.org/download/postgresql-8.1-405.jdbc2.jar Source9: http://jdbc.postgresql.org/download/postgresql-8.1-405.jdbc2ee.jar Source10: http://jdbc.postgresql.org/download/postgresql-8.1-405.jdbc3.jar +%endif Source14: postgresql.pam Source15: postgresql-bashprofile Source16: filter-requires-perl-Pg.sh @@ -826,6 +828,9 @@ %endif %changelog +* Mon Mar 27 2006 Tom Lane 8.1.3-2 +- Remove JDBC from this build; we will package it as separate SRPM + * Mon Feb 13 2006 Jesse Keating - 8.1.3-1.1 - rebump for build order issues during double-long bump Index: sources =================================================================== RCS file: /cvs/dist/rpms/postgresql/devel/sources,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- sources 13 Feb 2006 15:53:02 -0000 1.30 +++ sources 27 Mar 2006 21:18:02 -0000 1.31 @@ -3,6 +3,3 @@ d19dfdcb54c334495d32456a043e0232 pgtcl1.5.2.tar.gz 3d504b46231914d61fd49175f67e8715 pgtcldocs-20041108.zip 66d80897840724917cb838c76393692b postgresql-8.1-US.pdf -32e874651c4916bfd1a827c503d3505a postgresql-8.1-405.jdbc2.jar -80ca36179ab2ea0fd4e8dbf6d76ade6a postgresql-8.1-405.jdbc2ee.jar -2b699f0e686bcf7ec56bea16474ab2c2 postgresql-8.1-405.jdbc3.jar From fedora-cvs-commits at redhat.com Mon Mar 27 21:18:22 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 27 Mar 2006 16:18:22 -0500 Subject: rpms/g-wrap/FC-5 g-wrap.spec,1.24,1.25 Message-ID: <200603272118.k2RLIMTr014870@cvs.devel.redhat.com> Author: notting Update of /cvs/dist/rpms/g-wrap/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv14855 Modified Files: g-wrap.spec Log Message: build against glib2 Index: g-wrap.spec =================================================================== RCS file: /cvs/dist/rpms/g-wrap/FC-5/g-wrap.spec,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- g-wrap.spec 28 Feb 2006 03:33:04 -0000 1.24 +++ g-wrap.spec 27 Mar 2006 21:18:20 -0000 1.25 @@ -1,7 +1,7 @@ Summary: A tool for creating Scheme interfaces to C libraries Name: g-wrap Version: 1.9.6 -Release: 2 +Release: 2.1 Group: Development/Libraries License: GPL Requires: guile @@ -41,7 +41,7 @@ %prep %setup -q -a 1 %patch0 -p1 -#%patch1 -p1 +%patch1 -p1 %patch2 -p1 %patch3 -p1 %patch4 -p1 @@ -100,6 +100,9 @@ %doc %{_infodir}/g-wrap.info* %changelog +* Mon Mar 27 2006 Bill Nottingham 1.9.6-2.1 +- build against glib-2 + * Mon Feb 27 2006 Bill Nottingham 1.9.6-2 - don't use an executable stack (#183287) From fedora-cvs-commits at redhat.com Mon Mar 27 21:18:39 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 27 Mar 2006 16:18:39 -0500 Subject: rpms/kernel/FC-5 linux-2.6.16.1pre.patch, NONE, 1.1 kernel-2.6.spec, 1.2076, 1.2077 Message-ID: <200603272118.k2RLIdHO014925@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv14879 Modified Files: kernel-2.6.spec Added Files: linux-2.6.16.1pre.patch Log Message: .16.1pre linux-2.6.16.1pre.patch: arch/i386/kernel/dmi_scan.c | 3 - devel-akpm/arch/i386/kernel/cpu/cpufreq/speedstep-smi.c | 4 + drivers/base/cpu.c | 2 drivers/base/firmware_class.c | 7 +- drivers/block/cciss.c | 3 - drivers/md/dm.c | 46 ++++++++-------- drivers/media/video/Kconfig | 2 drivers/media/video/tuner-types.c | 5 - drivers/scsi/sata_mv.c | 9 +-- drivers/video/i810/i810_main.c | 2 fs/9p/vfs_inode.c | 4 - fs/proc/proc_misc.c | 3 - fs/sysfs/dir.c | 1 fs/sysfs/inode.c | 7 +- fs/sysfs/symlink.c | 2 fs/xfs/linux-2.6/xfs_aops.c | 3 - include/linux/cpu.h | 3 - include/linux/raid/raid1.h | 3 - include/linux/rtc.h | 5 - kernel/sched.c | 10 ++- net/core/sock.c | 6 +- net/ipv4/ip_output.c | 7 -- 22 files changed, 69 insertions(+), 68 deletions(-) --- NEW FILE linux-2.6.16.1pre.patch --- >From davej Fri Mar 24 23:27:24 2006 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.1.0 (2005-09-13) on nwo.kernelslacker.org X-Spam-Level: X-Spam-Status: No, score=-2.2 required=5.0 tests=ALL_TRUSTED,AWL,BAYES_00 autolearn=ham version=3.1.0 Received: from 172.16.58.1 [172.16.58.1] by nwo.kernelslacker.org with IMAP (fetchmail-6.3.2) for (single-drop); Fri, 24 Mar 2006 23:27:24 -0500 (EST) Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com [172.16.52.254]) by devserv.devel.redhat.com (8.12.11/8.12.11) with ESMTP id k2P4R2ED005456 for ; Fri, 24 Mar 2006 23:27:02 -0500 Received: from mx3.redhat.com (mx3.redhat.com [172.16.48.32]) by int-mx1.corp.redhat.com (8.12.11.20060308/8.11.6) with ESMTP id k2P4R1B8005177 for ; Fri, 24 Mar 2006 23:27:01 -0500 Received: from aria.kroah.org (dsl093-040-174.pdx1.dsl.speakeasy.net [66.93.40.174]) by mx3.redhat.com (8.13.1/8.13.1) with ESMTP id k2P4QtRi013551 for ; Fri, 24 Mar 2006 23:26:56 -0500 Received: from [192.168.0.13] (helo=localhost) by aria.kroah.org with esmtpsa (TLSv1:AES256-SHA:256) (Exim 4.54) id 1FN0M8-0006j7-J1; Fri, 24 Mar 2006 20:26:28 -0800 Date: Fri, 24 Mar 2006 20:26:13 -0800 From: Greg KH To: linux-kernel at vger.kernel.org, stable at kernel.org, Andrew Morton , Linus Torvalds Cc: Justin Forbes , Zwane Mwaikambo , "Theodore Ts'o" , Randy Dunlap , Dave Jones , Chuck Wolber , alan at lxorguk.ukuu.org.uk, "linux-ide at vger.kernel.org" , Jeff Garzik , Chris Wright , Greg Kroah-Hartman Subject: [patch 01/20] sata_mv: fix irq port status usage Message-ID: <20060325042613.GB21260 at kroah.com> References: <20060325041355.180237000 at quad.kroah.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline; filename="sata_mv-fix-irq-port-status-usage.patch" In-Reply-To: <20060325042556.GA21260 at kroah.com> User-Agent: Mutt/1.5.11 X-RedHat-Spam-Score: -2.82 Status: RO Content-Length: 1156 Lines: 38 -stable review patch. If anyone has any objections, please let us know. ------------------ From: Jeff Garzik Interrupt handler did not properly initialize a variable on a per-port basis, leading to incorrect behavior on ports other than port 0. Bug caught and fixed by Mark Lord. Signed-off-by: Jeff Garzik Signed-off-by: Chris Wright Signed-off-by: Greg Kroah-Hartman --- drivers/scsi/sata_mv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- linux-2.6.16.orig/drivers/scsi/sata_mv.c +++ linux-2.6.16/drivers/scsi/sata_mv.c @@ -1192,7 +1192,6 @@ static void mv_host_intr(struct ata_host u32 hc_irq_cause; int shift, port, port0, hard_port, handled; unsigned int err_mask; - u8 ata_status = 0; if (hc == 0) { port0 = 0; @@ -1210,6 +1209,7 @@ static void mv_host_intr(struct ata_host hc,relevant,hc_irq_cause); for (port = port0; port < port0 + MV_PORTS_PER_HC; port++) { + u8 ata_status = 0; ap = host_set->ports[port]; hard_port = port & MV_PORT_MASK; /* range 0-3 */ handled = 0; /* ensure ata_status is set if handled++ */ -- From fedora-cvs-commits at redhat.com Mon Mar 27 21:35:10 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 27 Mar 2006 16:35:10 -0500 Subject: rpms/kernel/FC-5 linux-2.6-x86_64-vdso-compile-m32.patch, NONE, 1.1 kernel-2.6.spec, 1.2077, 1.2078 linux-2.6-xen.patch, 1.4, 1.5 Message-ID: <200603272135.k2RLZASK015413@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv15392 Modified Files: kernel-2.6.spec linux-2.6-xen.patch Added Files: linux-2.6-x86_64-vdso-compile-m32.patch Log Message: Fix broken x86-64 32bit vDSO. (#186924) linux-2.6-x86_64-vdso-compile-m32.patch: Makefile | 6 ++++++ 1 files changed, 6 insertions(+) --- NEW FILE linux-2.6-x86_64-vdso-compile-m32.patch --- --- linux-2.6.16.noarch/arch/x86_64/ia32/Makefile~ 2006-03-27 16:20:58.000000000 -0500 +++ linux-2.6.16.noarch/arch/x86_64/ia32/Makefile 2006-03-27 16:22:44.000000000 -0500 @@ -2,6 +2,9 @@ # Makefile for the ia32 kernel emulation subsystem. # +# Avoid gcc -m64 -m32 ... foo.S +AFLAGS := $(filter-out -m64, $(AFLAGS)) + obj-$(CONFIG_IA32_EMULATION) := ia32entry.o sys_ia32.o ia32_signal.o tls32.o \ ia32_binfmt.o fpu32.o ptrace32.o syscall32.o syscall32_syscall.o \ mmap32.o @@ -29,3 +32,6 @@ $(obj)/vsyscall-%.so: $(src)/vsyscall.ld AFLAGS_vsyscall-sysenter.o = -m32 AFLAGS_vsyscall-syscall.o = -m32 +AFLAGS_syscall32_syscall.o += -m64 +AFLAGS_ia32entry.o += -m64 + Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-5/kernel-2.6.spec,v retrieving revision 1.2077 retrieving revision 1.2078 diff -u -r1.2077 -r1.2078 --- kernel-2.6.spec 27 Mar 2006 21:18:37 -0000 1.2077 +++ kernel-2.6.spec 27 Mar 2006 21:35:04 -0000 1.2078 @@ -232,6 +232,7 @@ Patch205: linux-2.6-x86_64-smp-on-uphw-cpucount.patch Patch206: linux-2.6-x86-hp-reboot.patch Patch207: linux-2.6-x86-cpu_index-false.patch +Patch208: linux-2.6-x86_64-vdso-compile-m32.patch # 300 - 399 ppc(64) Patch301: linux-2.6-cell-numa-init.patch @@ -761,6 +762,8 @@ %patch206 -p1 # cpu_index >= NR_CPUS becomming always false. %patch207 -p1 +# Fix broken x86-64 32bit vDSO +%patch208 -p1 # # ppc64 @@ -1678,6 +1681,7 @@ - Include patches posted for review for inclusion in 2.6.16.1 - Updated new audit msg types. - Make acpi-cpufreq 'sticky' +- Fix broken x86-64 32bit vDSO. (#186924) * Fri Mar 24 2006 Dave Jones - Reenable HDLC driver (#186257) linux-2.6-xen.patch: linux-2.6.16-rc5-xen0/arch/i386/Kconfig | 98 linux-2.6.16-rc5-xen0/arch/i386/Kconfig.cpu | 2 linux-2.6.16-rc5-xen0/arch/i386/Makefile | 18 linux-2.6.16-rc5-xen0/arch/i386/boot-xen/Makefile | 21 linux-2.6.16-rc5-xen0/arch/i386/kernel/Makefile | 33 linux-2.6.16-rc5-xen0/arch/i386/kernel/acpi/Makefile | 4 linux-2.6.16-rc5-xen0/arch/i386/kernel/acpi/boot-xen.c | 1161 ++++ linux-2.6.16-rc5-xen0/arch/i386/kernel/apic-xen.c | 140 linux-2.6.16-rc5-xen0/arch/i386/kernel/asm-offsets.c | 5 linux-2.6.16-rc5-xen0/arch/i386/kernel/cpu/Makefile | 5 linux-2.6.16-rc5-xen0/arch/i386/kernel/cpu/common-xen.c | 719 ++ linux-2.6.16-rc5-xen0/arch/i386/kernel/cpu/mtrr/Makefile | 7 linux-2.6.16-rc5-xen0/arch/i386/kernel/cpu/mtrr/main-xen.c | 187 linux-2.6.16-rc5-xen0/arch/i386/kernel/early_printk-xen.c | 2 linux-2.6.16-rc5-xen0/arch/i386/kernel/entry-xen.S | 857 +++ linux-2.6.16-rc5-xen0/arch/i386/kernel/fixup.c | 95 linux-2.6.16-rc5-xen0/arch/i386/kernel/head-xen.S | 173 linux-2.6.16-rc5-xen0/arch/i386/kernel/init_task-xen.c | 51 linux-2.6.16-rc5-xen0/arch/i386/kernel/io_apic-xen.c | 2730 ++++++++++ linux-2.6.16-rc5-xen0/arch/i386/kernel/ioport-xen.c | 122 linux-2.6.16-rc5-xen0/arch/i386/kernel/irq-xen.c | 306 + linux-2.6.16-rc5-xen0/arch/i386/kernel/ldt-xen.c | 269 linux-2.6.16-rc5-xen0/arch/i386/kernel/microcode-xen.c | 164 linux-2.6.16-rc5-xen0/arch/i386/kernel/mpparse-xen.c | 1188 ++++ linux-2.6.16-rc5-xen0/arch/i386/kernel/pci-dma-xen.c | 344 + linux-2.6.16-rc5-xen0/arch/i386/kernel/process-xen.c | 833 +++ linux-2.6.16-rc5-xen0/arch/i386/kernel/quirks-xen.c | 48 linux-2.6.16-rc5-xen0/arch/i386/kernel/setup-xen.c | 1888 ++++++ linux-2.6.16-rc5-xen0/arch/i386/kernel/smp-xen.c | 617 ++ linux-2.6.16-rc5-xen0/arch/i386/kernel/swiotlb.c | 674 ++ linux-2.6.16-rc5-xen0/arch/i386/kernel/sysenter.c | 90 linux-2.6.16-rc5-xen0/arch/i386/kernel/time-xen.c | 1067 +++ linux-2.6.16-rc5-xen0/arch/i386/kernel/traps-xen.c | 1094 ++++ linux-2.6.16-rc5-xen0/arch/i386/kernel/vm86.c | 8 linux-2.6.16-rc5-xen0/arch/i386/kernel/vmlinux.lds.S | 4 linux-2.6.16-rc5-xen0/arch/i386/kernel/vsyscall-note-xen.S | 32 linux-2.6.16-rc5-xen0/arch/i386/kernel/vsyscall.S | 2 linux-2.6.16-rc5-xen0/arch/i386/mach-xen/Makefile | 5 linux-2.6.16-rc5-xen0/arch/i386/mach-xen/setup.c | 37 linux-2.6.16-rc5-xen0/arch/i386/mm/Makefile | 8 linux-2.6.16-rc5-xen0/arch/i386/mm/fault-xen.c | 617 ++ linux-2.6.16-rc5-xen0/arch/i386/mm/highmem-xen.c | 123 linux-2.6.16-rc5-xen0/arch/i386/mm/hypervisor.c | 471 + linux-2.6.16-rc5-xen0/arch/i386/mm/init-xen.c | 846 +++ linux-2.6.16-rc5-xen0/arch/i386/mm/ioremap-xen.c | 462 + linux-2.6.16-rc5-xen0/arch/i386/mm/pgtable-xen.c | 646 ++ linux-2.6.16-rc5-xen0/arch/i386/mm/pgtable.c | 63 linux-2.6.16-rc5-xen0/arch/i386/pci/Makefile | 9 linux-2.6.16-rc5-xen0/arch/i386/pci/irq-xen.c | 1202 ++++ linux-2.6.16-rc5-xen0/arch/i386/pci/pcifront.c | 55 linux-2.6.16-rc5-xen0/arch/i386/power/Makefile | 4 linux-2.6.16-rc5-xen0/arch/ia64/Kconfig | 43 linux-2.6.16-rc5-xen0/arch/ia64/Makefile | 10 linux-2.6.16-rc5-xen0/arch/ia64/hp/sim/Makefile | 2 linux-2.6.16-rc5-xen0/arch/ia64/kernel/entry.S | 32 linux-2.6.16-rc5-xen0/arch/ia64/kernel/head.S | 4 linux-2.6.16-rc5-xen0/arch/ia64/kernel/pal.S | 5 linux-2.6.16-rc5-xen0/arch/ia64/kernel/sal.c | 3 linux-2.6.16-rc5-xen0/arch/ia64/kernel/setup.c | 4 linux-2.6.16-rc5-xen0/arch/ia64/xen-mkbuildtree-post | 2 linux-2.6.16-rc5-xen0/arch/ia64/xen-mkbuildtree-pre | 50 linux-2.6.16-rc5-xen0/arch/ia64/xen/Makefile | 5 linux-2.6.16-rc5-xen0/arch/ia64/xen/drivers/Makefile | 20 linux-2.6.16-rc5-xen0/arch/ia64/xen/drivers/README | 2 linux-2.6.16-rc5-xen0/arch/ia64/xen/drivers/coreMakefile | 24 linux-2.6.16-rc5-xen0/arch/ia64/xen/drivers/evtchn_ia64.c | 266 linux-2.6.16-rc5-xen0/arch/ia64/xen/drivers/patches/blkback.c.patch | 33 linux-2.6.16-rc5-xen0/arch/ia64/xen/drivers/patches/console.c.patch | 11 linux-2.6.16-rc5-xen0/arch/ia64/xen/drivers/patches/devmem.c.patch | 2 linux-2.6.16-rc5-xen0/arch/ia64/xen/drivers/patches/gnttab.c.patch | 33 linux-2.6.16-rc5-xen0/arch/ia64/xen/drivers/patches/privcmd.c.patch | 30 linux-2.6.16-rc5-xen0/arch/ia64/xen/drivers/xenia64_init.c | 55 linux-2.6.16-rc5-xen0/arch/ia64/xen/hypercall.S | 323 + linux-2.6.16-rc5-xen0/arch/ia64/xen/xen_ksyms.c | 12 linux-2.6.16-rc5-xen0/arch/ia64/xen/xenconsole.c | 19 linux-2.6.16-rc5-xen0/arch/ia64/xen/xenentry.S | 850 +++ linux-2.6.16-rc5-xen0/arch/ia64/xen/xenhpski.c | 19 linux-2.6.16-rc5-xen0/arch/ia64/xen/xenivt.S | 2044 +++++++ linux-2.6.16-rc5-xen0/arch/ia64/xen/xenminstate.h | 367 + linux-2.6.16-rc5-xen0/arch/ia64/xen/xenpal.S | 73 linux-2.6.16-rc5-xen0/arch/ia64/xen/xensetup.S | 33 linux-2.6.16-rc5-xen0/arch/um/kernel/physmem.c | 4 linux-2.6.16-rc5-xen0/arch/x86_64/Kconfig | 60 linux-2.6.16-rc5-xen0/arch/x86_64/Makefile | 16 linux-2.6.16-rc5-xen0/arch/x86_64/ia32/ia32entry-xen.S | 721 ++ linux-2.6.16-rc5-xen0/arch/x86_64/ia32/syscall32-xen.c | 128 linux-2.6.16-rc5-xen0/arch/x86_64/ia32/syscall32_syscall-xen.S | 28 linux-2.6.16-rc5-xen0/arch/x86_64/ia32/vsyscall-int80.S | 58 linux-2.6.16-rc5-xen0/arch/x86_64/ia32/vsyscall-sigreturn.S | 2 linux-2.6.16-rc5-xen0/arch/x86_64/kernel/Makefile | 18 linux-2.6.16-rc5-xen0/arch/x86_64/kernel/acpi/Makefile | 1 linux-2.6.16-rc5-xen0/arch/x86_64/kernel/apic-xen.c | 200 linux-2.6.16-rc5-xen0/arch/x86_64/kernel/asm-offsets.c | 2 linux-2.6.16-rc5-xen0/arch/x86_64/kernel/e820-xen.c | 744 ++ linux-2.6.16-rc5-xen0/arch/x86_64/kernel/early_printk-xen.c | 306 + linux-2.6.16-rc5-xen0/arch/x86_64/kernel/entry-xen.S | 1140 ++++ linux-2.6.16-rc5-xen0/arch/x86_64/kernel/genapic-xen.c | 144 linux-2.6.16-rc5-xen0/arch/x86_64/kernel/genapic_xen.c | 162 linux-2.6.16-rc5-xen0/arch/x86_64/kernel/head-xen.S | 156 linux-2.6.16-rc5-xen0/arch/x86_64/kernel/head64-xen.c | 140 linux-2.6.16-rc5-xen0/arch/x86_64/kernel/init_task.c | 3 linux-2.6.16-rc5-xen0/arch/x86_64/kernel/io_apic-xen.c | 2231 ++++++++ linux-2.6.16-rc5-xen0/arch/x86_64/kernel/ioport-xen.c | 58 linux-2.6.16-rc5-xen0/arch/x86_64/kernel/irq-xen.c | 168 linux-2.6.16-rc5-xen0/arch/x86_64/kernel/ldt-xen.c | 282 + linux-2.6.16-rc5-xen0/arch/x86_64/kernel/mpparse-xen.c | 1005 +++ linux-2.6.16-rc5-xen0/arch/x86_64/kernel/pci-swiotlb-xen.c | 54 linux-2.6.16-rc5-xen0/arch/x86_64/kernel/process-xen.c | 810 ++ linux-2.6.16-rc5-xen0/arch/x86_64/kernel/setup-xen.c | 1635 +++++ linux-2.6.16-rc5-xen0/arch/x86_64/kernel/setup64-xen.c | 360 + linux-2.6.16-rc5-xen0/arch/x86_64/kernel/smp-xen.c | 596 ++ linux-2.6.16-rc5-xen0/arch/x86_64/kernel/traps-xen.c | 1023 +++ linux-2.6.16-rc5-xen0/arch/x86_64/kernel/vsyscall-xen.c | 239 linux-2.6.16-rc5-xen0/arch/x86_64/kernel/x8664_ksyms-xen.c | 172 linux-2.6.16-rc5-xen0/arch/x86_64/kernel/xen_entry.S | 41 linux-2.6.16-rc5-xen0/arch/x86_64/mm/Makefile | 10 linux-2.6.16-rc5-xen0/arch/x86_64/mm/fault-xen.c | 595 ++ linux-2.6.16-rc5-xen0/arch/x86_64/mm/init-xen.c | 1107 ++++ linux-2.6.16-rc5-xen0/arch/x86_64/mm/pageattr-xen.c | 392 + linux-2.6.16-rc5-xen0/arch/x86_64/pci/Makefile | 12 linux-2.6.16-rc5-xen0/drivers/Makefile | 1 linux-2.6.16-rc5-xen0/drivers/acpi/Kconfig | 3 linux-2.6.16-rc5-xen0/drivers/acpi/tables.c | 7 linux-2.6.16-rc5-xen0/drivers/char/mem.c | 6 linux-2.6.16-rc5-xen0/drivers/char/tpm/Kconfig | 14 linux-2.6.16-rc5-xen0/drivers/char/tpm/Makefile | 1 linux-2.6.16-rc5-xen0/drivers/char/tpm/tpm.c | 44 linux-2.6.16-rc5-xen0/drivers/char/tpm/tpm.h | 7 linux-2.6.16-rc5-xen0/drivers/char/tpm/tpm_xen.c | 536 + linux-2.6.16-rc5-xen0/drivers/char/tty_io.c | 7 linux-2.6.16-rc5-xen0/drivers/firmware/Kconfig | 2 linux-2.6.16-rc5-xen0/drivers/pci/Kconfig | 1 linux-2.6.16-rc5-xen0/drivers/serial/Kconfig | 1 linux-2.6.16-rc5-xen0/drivers/video/Kconfig | 2 linux-2.6.16-rc5-xen0/drivers/xen/Kconfig | 200 linux-2.6.16-rc5-xen0/drivers/xen/Makefile | 22 linux-2.6.16-rc5-xen0/drivers/xen/balloon/Makefile | 2 linux-2.6.16-rc5-xen0/drivers/xen/balloon/balloon.c | 585 ++ linux-2.6.16-rc5-xen0/drivers/xen/blkback/Makefile | 3 linux-2.6.16-rc5-xen0/drivers/xen/blkback/blkback.c | 596 ++ linux-2.6.16-rc5-xen0/drivers/xen/blkback/common.h | 123 linux-2.6.16-rc5-xen0/drivers/xen/blkback/interface.c | 164 linux-2.6.16-rc5-xen0/drivers/xen/blkback/vbd.c | 102 linux-2.6.16-rc5-xen0/drivers/xen/blkback/xenbus.c | 421 + linux-2.6.16-rc5-xen0/drivers/xen/blkfront/Makefile | 5 linux-2.6.16-rc5-xen0/drivers/xen/blkfront/blkfront.c | 834 +++ linux-2.6.16-rc5-xen0/drivers/xen/blkfront/block.h | 162 linux-2.6.16-rc5-xen0/drivers/xen/blkfront/vbd.c | 323 + linux-2.6.16-rc5-xen0/drivers/xen/blktap/Makefile | 3 linux-2.6.16-rc5-xen0/drivers/xen/blktap/blktap.c | 910 +++ linux-2.6.16-rc5-xen0/drivers/xen/blktap/common.h | 110 linux-2.6.16-rc5-xen0/drivers/xen/blktap/interface.c | 146 linux-2.6.16-rc5-xen0/drivers/xen/blktap/xenbus.c | 234 linux-2.6.16-rc5-xen0/drivers/xen/char/Makefile | 2 linux-2.6.16-rc5-xen0/drivers/xen/char/mem.c | 156 linux-2.6.16-rc5-xen0/drivers/xen/console/Makefile | 2 linux-2.6.16-rc5-xen0/drivers/xen/console/console.c | 647 ++ linux-2.6.16-rc5-xen0/drivers/xen/console/xencons_ring.c | 125 linux-2.6.16-rc5-xen0/drivers/xen/core/Makefile | 9 linux-2.6.16-rc5-xen0/drivers/xen/core/evtchn.c | 823 +++ linux-2.6.16-rc5-xen0/drivers/xen/core/features.c | 29 linux-2.6.16-rc5-xen0/drivers/xen/core/gnttab.c | 429 + linux-2.6.16-rc5-xen0/drivers/xen/core/reboot.c | 442 + linux-2.6.16-rc5-xen0/drivers/xen/core/skbuff.c | 144 linux-2.6.16-rc5-xen0/drivers/xen/core/smpboot.c | 464 + linux-2.6.16-rc5-xen0/drivers/xen/core/xen_proc.c | 29 linux-2.6.16-rc5-xen0/drivers/xen/evtchn/Makefile | 2 linux-2.6.16-rc5-xen0/drivers/xen/evtchn/evtchn.c | 459 + linux-2.6.16-rc5-xen0/drivers/xen/net_driver_util.c | 68 linux-2.6.16-rc5-xen0/drivers/xen/netback/Makefile | 5 linux-2.6.16-rc5-xen0/drivers/xen/netback/common.h | 110 linux-2.6.16-rc5-xen0/drivers/xen/netback/interface.c | 320 + linux-2.6.16-rc5-xen0/drivers/xen/netback/loopback.c | 231 linux-2.6.16-rc5-xen0/drivers/xen/netback/netback.c | 835 +++ linux-2.6.16-rc5-xen0/drivers/xen/netback/xenbus.c | 327 + linux-2.6.16-rc5-xen0/drivers/xen/netfront/Makefile | 4 linux-2.6.16-rc5-xen0/drivers/xen/netfront/netfront.c | 1504 +++++ linux-2.6.16-rc5-xen0/drivers/xen/pciback/Makefile | 10 linux-2.6.16-rc5-xen0/drivers/xen/pciback/conf_space.c | 324 + linux-2.6.16-rc5-xen0/drivers/xen/pciback/conf_space.h | 97 linux-2.6.16-rc5-xen0/drivers/xen/pciback/conf_space_header.c | 269 linux-2.6.16-rc5-xen0/drivers/xen/pciback/passthrough.c | 116 linux-2.6.16-rc5-xen0/drivers/xen/pciback/pci_stub.c | 377 + linux-2.6.16-rc5-xen0/drivers/xen/pciback/pciback.h | 73 linux-2.6.16-rc5-xen0/drivers/xen/pciback/pciback_ops.c | 84 linux-2.6.16-rc5-xen0/drivers/xen/pciback/vpci.c | 163 linux-2.6.16-rc5-xen0/drivers/xen/pciback/xenbus.c | 439 + linux-2.6.16-rc5-xen0/drivers/xen/pcifront/Makefile | 7 linux-2.6.16-rc5-xen0/drivers/xen/pcifront/pci.c | 44 linux-2.6.16-rc5-xen0/drivers/xen/pcifront/pci_op.c | 245 linux-2.6.16-rc5-xen0/drivers/xen/pcifront/pcifront.h | 40 linux-2.6.16-rc5-xen0/drivers/xen/pcifront/xenbus.c | 295 + linux-2.6.16-rc5-xen0/drivers/xen/privcmd/Makefile | 2 linux-2.6.16-rc5-xen0/drivers/xen/privcmd/privcmd.c | 302 + linux-2.6.16-rc5-xen0/drivers/xen/tpmback/Makefile | 4 linux-2.6.16-rc5-xen0/drivers/xen/tpmback/common.h | 91 linux-2.6.16-rc5-xen0/drivers/xen/tpmback/interface.c | 203 linux-2.6.16-rc5-xen0/drivers/xen/tpmback/tpmback.c | 1118 ++++ linux-2.6.16-rc5-xen0/drivers/xen/tpmback/xenbus.c | 333 + linux-2.6.16-rc5-xen0/drivers/xen/tpmfront/Makefile | 2 linux-2.6.16-rc5-xen0/drivers/xen/tpmfront/tpmfront.c | 729 ++ linux-2.6.16-rc5-xen0/drivers/xen/tpmfront/tpmfront.h | 40 linux-2.6.16-rc5-xen0/drivers/xen/util.c | 80 linux-2.6.16-rc5-xen0/drivers/xen/xenbus/Makefile | 8 linux-2.6.16-rc5-xen0/drivers/xen/xenbus/xenbus_client.c | 403 + linux-2.6.16-rc5-xen0/drivers/xen/xenbus/xenbus_comms.c | 203 linux-2.6.16-rc5-xen0/drivers/xen/xenbus/xenbus_comms.h | 50 linux-2.6.16-rc5-xen0/drivers/xen/xenbus/xenbus_dev.c | 238 linux-2.6.16-rc5-xen0/drivers/xen/xenbus/xenbus_probe.c | 1015 +++ linux-2.6.16-rc5-xen0/drivers/xen/xenbus/xenbus_xs.c | 821 +++ linux-2.6.16-rc5-xen0/fs/Kconfig | 1 linux-2.6.16-rc5-xen0/include/asm-i386/a.out.h | 2 linux-2.6.16-rc5-xen0/include/asm-i386/apic.h | 2 linux-2.6.16-rc5-xen0/include/asm-i386/elf.h | 7 linux-2.6.16-rc5-xen0/include/asm-i386/fixmap.h | 13 linux-2.6.16-rc5-xen0/include/asm-i386/mach-xen/asm/agp.h | 37 linux-2.6.16-rc5-xen0/include/asm-i386/mach-xen/asm/desc.h | 164 linux-2.6.16-rc5-xen0/include/asm-i386/mach-xen/asm/dma-mapping.h | 156 linux-2.6.16-rc5-xen0/include/asm-i386/mach-xen/asm/fixmap.h | 158 linux-2.6.16-rc5-xen0/include/asm-i386/mach-xen/asm/floppy.h | 147 linux-2.6.16-rc5-xen0/include/asm-i386/mach-xen/asm/highmem.h | 81 linux-2.6.16-rc5-xen0/include/asm-i386/mach-xen/asm/hw_irq.h | 73 linux-2.6.16-rc5-xen0/include/asm-i386/mach-xen/asm/hypercall.h | 323 + linux-2.6.16-rc5-xen0/include/asm-i386/mach-xen/asm/hypervisor.h | 163 linux-2.6.16-rc5-xen0/include/asm-i386/mach-xen/asm/io.h | 401 + linux-2.6.16-rc5-xen0/include/asm-i386/mach-xen/asm/kmap_types.h | 32 linux-2.6.16-rc5-xen0/include/asm-i386/mach-xen/asm/mmu.h | 21 linux-2.6.16-rc5-xen0/include/asm-i386/mach-xen/asm/mmu_context.h | 105 linux-2.6.16-rc5-xen0/include/asm-i386/mach-xen/asm/page.h | 326 + linux-2.6.16-rc5-xen0/include/asm-i386/mach-xen/asm/param.h | 24 linux-2.6.16-rc5-xen0/include/asm-i386/mach-xen/asm/pci.h | 154 linux-2.6.16-rc5-xen0/include/asm-i386/mach-xen/asm/pgalloc.h | 64 linux-2.6.16-rc5-xen0/include/asm-i386/mach-xen/asm/pgtable-2level-defs.h | 21 linux-2.6.16-rc5-xen0/include/asm-i386/mach-xen/asm/pgtable-2level.h | 83 linux-2.6.16-rc5-xen0/include/asm-i386/mach-xen/asm/pgtable-3level-defs.h | 25 linux-2.6.16-rc5-xen0/include/asm-i386/mach-xen/asm/pgtable-3level.h | 181 linux-2.6.16-rc5-xen0/include/asm-i386/mach-xen/asm/pgtable.h | 512 + linux-2.6.16-rc5-xen0/include/asm-i386/mach-xen/asm/processor.h | 762 ++ linux-2.6.16-rc5-xen0/include/asm-i386/mach-xen/asm/ptrace.h | 90 linux-2.6.16-rc5-xen0/include/asm-i386/mach-xen/asm/scatterlist.h | 22 linux-2.6.16-rc5-xen0/include/asm-i386/mach-xen/asm/segment.h | 117 linux-2.6.16-rc5-xen0/include/asm-i386/mach-xen/asm/setup.h | 66 linux-2.6.16-rc5-xen0/include/asm-i386/mach-xen/asm/smp.h | 103 linux-2.6.16-rc5-xen0/include/asm-i386/mach-xen/asm/spinlock.h | 217 linux-2.6.16-rc5-xen0/include/asm-i386/mach-xen/asm/swiotlb.h | 43 linux-2.6.16-rc5-xen0/include/asm-i386/mach-xen/asm/synch_bitops.h | 141 linux-2.6.16-rc5-xen0/include/asm-i386/mach-xen/asm/system.h | 679 ++ linux-2.6.16-rc5-xen0/include/asm-i386/mach-xen/asm/tlbflush.h | 102 linux-2.6.16-rc5-xen0/include/asm-i386/mach-xen/asm/vga.h | 20 linux-2.6.16-rc5-xen0/include/asm-i386/mach-xen/irq_vectors.h | 125 linux-2.6.16-rc5-xen0/include/asm-i386/mach-xen/mach_traps.h | 33 linux-2.6.16-rc5-xen0/include/asm-i386/mach-xen/setup_arch_post.h | 50 linux-2.6.16-rc5-xen0/include/asm-i386/mach-xen/setup_arch_pre.h | 5 linux-2.6.16-rc5-xen0/include/asm-i386/page.h | 4 linux-2.6.16-rc5-xen0/include/asm-i386/spinlock.h | 6 linux-2.6.16-rc5-xen0/include/asm-i386/system.h | 2 linux-2.6.16-rc5-xen0/include/asm-ia64/fixmap.h | 2 linux-2.6.16-rc5-xen0/include/asm-ia64/gcc_intrin.h | 60 linux-2.6.16-rc5-xen0/include/asm-ia64/hypercall.h | 500 + linux-2.6.16-rc5-xen0/include/asm-ia64/hypervisor.h | 70 linux-2.6.16-rc5-xen0/include/asm-ia64/intel_intrin.h | 68 linux-2.6.16-rc5-xen0/include/asm-ia64/pal.h | 1 linux-2.6.16-rc5-xen0/include/asm-ia64/privop.h | 59 linux-2.6.16-rc5-xen0/include/asm-ia64/processor.h | 1 linux-2.6.16-rc5-xen0/include/asm-ia64/synch_bitops.h | 61 linux-2.6.16-rc5-xen0/include/asm-ia64/system.h | 4 linux-2.6.16-rc5-xen0/include/asm-ia64/xen/privop.h | 272 linux-2.6.16-rc5-xen0/include/asm-um/page.h | 2 linux-2.6.16-rc5-xen0/include/asm-x86_64/apic.h | 2 linux-2.6.16-rc5-xen0/include/asm-x86_64/mach-xen/asm/arch_hooks.h | 27 linux-2.6.16-rc5-xen0/include/asm-x86_64/mach-xen/asm/bootsetup.h | 42 linux-2.6.16-rc5-xen0/include/asm-x86_64/mach-xen/asm/desc.h | 263 linux-2.6.16-rc5-xen0/include/asm-x86_64/mach-xen/asm/dma-mapping.h | 191 linux-2.6.16-rc5-xen0/include/asm-x86_64/mach-xen/asm/fixmap.h | 111 linux-2.6.16-rc5-xen0/include/asm-x86_64/mach-xen/asm/floppy.h | 206 linux-2.6.16-rc5-xen0/include/asm-x86_64/mach-xen/asm/hw_irq.h | 141 linux-2.6.16-rc5-xen0/include/asm-x86_64/mach-xen/asm/hypercall.h | 323 + linux-2.6.16-rc5-xen0/include/asm-x86_64/mach-xen/asm/hypervisor.h | 2 linux-2.6.16-rc5-xen0/include/asm-x86_64/mach-xen/asm/io.h | 359 + linux-2.6.16-rc5-xen0/include/asm-x86_64/mach-xen/asm/irq.h | 39 linux-2.6.16-rc5-xen0/include/asm-x86_64/mach-xen/asm/mmu.h | 33 linux-2.6.16-rc5-xen0/include/asm-x86_64/mach-xen/asm/mmu_context.h | 134 linux-2.6.16-rc5-xen0/include/asm-x86_64/mach-xen/asm/nmi.h | 75 linux-2.6.16-rc5-xen0/include/asm-x86_64/mach-xen/asm/page.h | 317 + linux-2.6.16-rc5-xen0/include/asm-x86_64/mach-xen/asm/pci.h | 174 linux-2.6.16-rc5-xen0/include/asm-x86_64/mach-xen/asm/pgalloc.h | 199 linux-2.6.16-rc5-xen0/include/asm-x86_64/mach-xen/asm/pgtable.h | 560 ++ linux-2.6.16-rc5-xen0/include/asm-x86_64/mach-xen/asm/processor.h | 503 + linux-2.6.16-rc5-xen0/include/asm-x86_64/mach-xen/asm/ptrace.h | 125 linux-2.6.16-rc5-xen0/include/asm-x86_64/mach-xen/asm/smp.h | 152 linux-2.6.16-rc5-xen0/include/asm-x86_64/mach-xen/asm/synch_bitops.h | 2 linux-2.6.16-rc5-xen0/include/asm-x86_64/mach-xen/asm/system.h | 434 + linux-2.6.16-rc5-xen0/include/asm-x86_64/mach-xen/asm/timer.h | 67 linux-2.6.16-rc5-xen0/include/asm-x86_64/mach-xen/asm/tlbflush.h | 104 linux-2.6.16-rc5-xen0/include/asm-x86_64/mach-xen/asm/vga.h | 20 linux-2.6.16-rc5-xen0/include/asm-x86_64/mach-xen/asm/xor.h | 328 + linux-2.6.16-rc5-xen0/include/asm-x86_64/mach-xen/irq_vectors.h | 123 linux-2.6.16-rc5-xen0/include/asm-x86_64/mach-xen/mach_time.h | 122 linux-2.6.16-rc5-xen0/include/asm-x86_64/mach-xen/mach_timer.h | 48 linux-2.6.16-rc5-xen0/include/asm-x86_64/mach-xen/setup_arch_post.h | 52 linux-2.6.16-rc5-xen0/include/asm-x86_64/mach-xen/setup_arch_pre.h | 5 linux-2.6.16-rc5-xen0/include/linux/gfp.h | 6 linux-2.6.16-rc5-xen0/include/linux/highmem.h | 6 linux-2.6.16-rc5-xen0/include/linux/irq.h | 3 linux-2.6.16-rc5-xen0/include/linux/mm.h | 13 linux-2.6.16-rc5-xen0/include/linux/skbuff.h | 13 linux-2.6.16-rc5-xen0/include/xen/balloon.h | 70 linux-2.6.16-rc5-xen0/include/xen/driver_util.h | 26 linux-2.6.16-rc5-xen0/include/xen/evtchn.h | 123 linux-2.6.16-rc5-xen0/include/xen/features.h | 20 linux-2.6.16-rc5-xen0/include/xen/foreign_page.h | 40 linux-2.6.16-rc5-xen0/include/xen/gnttab.h | 120 linux-2.6.16-rc5-xen0/include/xen/interface/COPYING | 28 linux-2.6.16-rc5-xen0/include/xen/interface/acm.h | 181 linux-2.6.16-rc5-xen0/include/xen/interface/acm_ops.h | 96 linux-2.6.16-rc5-xen0/include/xen/interface/arch-ia64.h | 314 + linux-2.6.16-rc5-xen0/include/xen/interface/arch-x86_32.h | 158 linux-2.6.16-rc5-xen0/include/xen/interface/arch-x86_64.h | 243 linux-2.6.16-rc5-xen0/include/xen/interface/dom0_ops.h | 488 + linux-2.6.16-rc5-xen0/include/xen/interface/event_channel.h | 203 linux-2.6.16-rc5-xen0/include/xen/interface/features.h | 53 linux-2.6.16-rc5-xen0/include/xen/interface/grant_table.h | 306 + linux-2.6.16-rc5-xen0/include/xen/interface/hvm/hvm_info_table.h | 24 linux-2.6.16-rc5-xen0/include/xen/interface/hvm/ioreq.h | 93 linux-2.6.16-rc5-xen0/include/xen/interface/hvm/vmx_assist.h | 97 linux-2.6.16-rc5-xen0/include/xen/interface/io/blkif.h | 85 linux-2.6.16-rc5-xen0/include/xen/interface/io/console.h | 33 linux-2.6.16-rc5-xen0/include/xen/interface/io/netif.h | 76 linux-2.6.16-rc5-xen0/include/xen/interface/io/pciif.h | 55 linux-2.6.16-rc5-xen0/include/xen/interface/io/ring.h | 270 linux-2.6.16-rc5-xen0/include/xen/interface/io/tpmif.h | 56 linux-2.6.16-rc5-xen0/include/xen/interface/io/xenbus.h | 44 linux-2.6.16-rc5-xen0/include/xen/interface/io/xs_wire.h | 97 linux-2.6.16-rc5-xen0/include/xen/interface/memory.h | 153 linux-2.6.16-rc5-xen0/include/xen/interface/nmi.h | 54 linux-2.6.16-rc5-xen0/include/xen/interface/physdev.h | 70 linux-2.6.16-rc5-xen0/include/xen/interface/sched.h | 60 linux-2.6.16-rc5-xen0/include/xen/interface/sched_ctl.h | 68 linux-2.6.16-rc5-xen0/include/xen/interface/trace.h | 90 linux-2.6.16-rc5-xen0/include/xen/interface/vcpu.h | 119 linux-2.6.16-rc5-xen0/include/xen/interface/version.h | 64 linux-2.6.16-rc5-xen0/include/xen/interface/xen.h | 463 + linux-2.6.16-rc5-xen0/include/xen/net_driver_util.h | 56 linux-2.6.16-rc5-xen0/include/xen/pcifront.h | 39 linux-2.6.16-rc5-xen0/include/xen/public/evtchn.h | 98 linux-2.6.16-rc5-xen0/include/xen/public/privcmd.h | 91 linux-2.6.16-rc5-xen0/include/xen/public/xenstored.h | 89 linux-2.6.16-rc5-xen0/include/xen/tpmfe.h | 40 linux-2.6.16-rc5-xen0/include/xen/xen_proc.h | 23 linux-2.6.16-rc5-xen0/include/xen/xenbus.h | 298 + linux-2.6.16-rc5-xen0/include/xen/xencons.h | 14 linux-2.6.16-rc5-xen0/kernel/Kconfig.preempt | 1 linux-2.6.16-rc5-xen0/kernel/irq/manage.c | 84 linux-2.6.16-rc5-xen0/lib/Kconfig.debug | 2 linux-2.6.16-rc5-xen0/lib/Makefile | 3 linux-2.6.16-rc5-xen0/mm/Kconfig | 3 linux-2.6.16-rc5-xen0/mm/highmem.c | 11 linux-2.6.16-rc5-xen0/mm/memory.c | 112 linux-2.6.16-rc5-xen0/mm/mmap.c | 4 linux-2.6.16-rc5-xen0/mm/page_alloc.c | 6 linux-2.6.16-rc5-xen0/net/core/dev.c | 50 linux-2.6.16-rc5-xen0/net/core/skbuff.c | 41 linux-2.6.16-rc5-xen0/scripts/Makefile.xen | 14 linux-2.6.16.noarch/arch/x86_64/ia32/Makefile | 21 364 files changed, 77455 insertions(+), 245 deletions(-) Index: linux-2.6-xen.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-5/linux-2.6-xen.patch,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- linux-2.6-xen.patch 6 Mar 2006 16:31:49 -0000 1.4 +++ linux-2.6-xen.patch 27 Mar 2006 21:35:04 -0000 1.5 @@ -25689,10 +25689,9 @@ + .rept IA32_NR_syscalls-(ia32_syscall_end-ia32_sys_call_table)/8 + .quad ni_syscall + .endr -diff -Nru -p --exclude='.*' ref-linux-2.6.16-rc5/arch/x86_64/ia32/Makefile linux-2.6.16-rc5-xen0/arch/x86_64/ia32/Makefile ---- ref-linux-2.6.16-rc5/arch/x86_64/ia32/Makefile 2006-03-01 11:12:27.000000000 -0500 -+++ linux-2.6.16-rc5-xen0/arch/x86_64/ia32/Makefile 2006-03-01 11:09:37.000000000 -0500 -@@ -23,9 +23,25 @@ quiet_cmd_syscall = SYSCALL $@ +--- linux-2.6.16.noarch/arch/x86_64/ia32/Makefile~ 2006-03-27 16:31:51.000000000 -0500 ++++ linux-2.6.16.noarch/arch/x86_64/ia32/Makefile 2006-03-27 16:32:22.000000000 -0500 +@@ -26,6 +26,7 @@ quiet_cmd_syscall = SYSCALL $@ -Wl,-soname=linux-gate.so.1 -o $@ \ -Wl,-T,$(filter-out FORCE,$^) @@ -25700,16 +25699,22 @@ $(obj)/vsyscall-sysenter.so $(obj)/vsyscall-syscall.so: \ $(obj)/vsyscall-%.so: $(src)/vsyscall.lds $(obj)/vsyscall-%.o FORCE $(call if_changed,syscall) +@@ -30,8 +30,24 @@ $(obj)/vsyscall-sysenter.so $(obj)/vsysc + $(obj)/vsyscall-%.so: $(src)/vsyscall.lds $(obj)/vsyscall-%.o FORCE + $(call if_changed,syscall) -AFLAGS_vsyscall-sysenter.o = -m32 -AFLAGS_vsyscall-syscall.o = -m32 +AFLAGS_vsyscall-sysenter.o = -m32 -Iarch/i386/kernel +AFLAGS_vsyscall-syscall.o = -m32 -Iarch/i386/kernel -+ + AFLAGS_syscall32_syscall.o += -m64 + AFLAGS_ia32entry.o += -m64 + +ifdef CONFIG_XEN +AFLAGS_vsyscall-int80.o = -m32 -Iarch/i386/kernel +CFLAGS_syscall32-xen.o += -DUSE_INT80 -+AFLAGS_syscall32_syscall-xen.o += -DUSE_INT80 ++AFLAGS_syscall32_syscall-xen.o += =m64 -DUSE_INT80 ++AFLAGS_ia32entry-xen.o += -m64 + +$(obj)/syscall32_syscall-xen.o: \ + $(foreach F,int80 sysenter syscall,$(obj)/vsyscall-$F.so) @@ -25720,6 +25725,7 @@ + +obj-y := $(call cherrypickxen, $(obj-y)) +endif ++ diff -Nru -p --exclude='.*' ref-linux-2.6.16-rc5/arch/x86_64/ia32/syscall32_syscall-xen.S linux-2.6.16-rc5-xen0/arch/x86_64/ia32/syscall32_syscall-xen.S --- ref-linux-2.6.16-rc5/arch/x86_64/ia32/syscall32_syscall-xen.S 1969-12-31 19:00:00.000000000 -0500 +++ linux-2.6.16-rc5-xen0/arch/x86_64/ia32/syscall32_syscall-xen.S 2006-03-01 11:09:37.000000000 -0500 From fedora-cvs-commits at redhat.com Mon Mar 27 21:35:56 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 27 Mar 2006 16:35:56 -0500 Subject: rpms/g-wrap/FC-5 g-wrap-glib2.patch,1.1,1.2 Message-ID: <200603272135.k2RLZuY3015467@cvs.devel.redhat.com> Author: notting Update of /cvs/dist/rpms/g-wrap/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv15435 Modified Files: g-wrap-glib2.patch Log Message: fix glib2 g-wrap-glib2.patch: configure | 10 +++++----- configure.ac | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) Index: g-wrap-glib2.patch =================================================================== RCS file: /cvs/dist/rpms/g-wrap/FC-5/g-wrap-glib2.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- g-wrap-glib2.patch 19 Feb 2006 05:45:44 -0000 1.1 +++ g-wrap-glib2.patch 27 Mar 2006 21:35:52 -0000 1.2 @@ -1,3 +1,14 @@ +--- g-wrap-1.9.6/configure.ac.moo 2006-03-27 16:31:41.000000000 -0500 ++++ g-wrap-1.9.6/configure.ac 2006-03-27 16:31:15.000000000 -0500 +@@ -95,7 +95,7 @@ + AM_CONDITIONAL(HAVE_SRFI_35, test "$HAVE_SRFI_35" = yes) + + dnl Check for optional libraries +-PKG_CHECK_MODULES(GLIB, glib, [have_glib=yes], [have_glib=no]) ++PKG_CHECK_MODULES(GLIB, glib-2.0, [have_glib=yes], [have_glib=no]) + AM_CONDITIONAL(HAVE_GLIB, test "$have_glib" = yes) + + dnl Check for compiler flags and warnings. This should be last, since --- g-wrap-1.9.6/configure.glib2 2006-02-18 15:10:25.000000000 -0500 +++ g-wrap-1.9.6/configure 2006-02-18 15:11:39.000000000 -0500 @@ -21699,8 +21699,8 @@ From fedora-cvs-commits at redhat.com Mon Mar 27 21:36:13 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 27 Mar 2006 16:36:13 -0500 Subject: rpms/g-wrap/devel g-wrap-glib2.patch,1.1,1.2 Message-ID: <200603272136.k2RLaDkK015503@cvs.devel.redhat.com> Author: notting Update of /cvs/dist/rpms/g-wrap/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv15447 Modified Files: g-wrap-glib2.patch Log Message: fix glib2 build g-wrap-glib2.patch: configure | 10 +++++----- configure.ac | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) Index: g-wrap-glib2.patch =================================================================== RCS file: /cvs/dist/rpms/g-wrap/devel/g-wrap-glib2.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- g-wrap-glib2.patch 19 Feb 2006 05:45:44 -0000 1.1 +++ g-wrap-glib2.patch 27 Mar 2006 21:35:57 -0000 1.2 @@ -1,3 +1,14 @@ +--- g-wrap-1.9.6/configure.ac.moo 2006-03-27 16:31:41.000000000 -0500 ++++ g-wrap-1.9.6/configure.ac 2006-03-27 16:31:15.000000000 -0500 +@@ -95,7 +95,7 @@ + AM_CONDITIONAL(HAVE_SRFI_35, test "$HAVE_SRFI_35" = yes) + + dnl Check for optional libraries +-PKG_CHECK_MODULES(GLIB, glib, [have_glib=yes], [have_glib=no]) ++PKG_CHECK_MODULES(GLIB, glib-2.0, [have_glib=yes], [have_glib=no]) + AM_CONDITIONAL(HAVE_GLIB, test "$have_glib" = yes) + + dnl Check for compiler flags and warnings. This should be last, since --- g-wrap-1.9.6/configure.glib2 2006-02-18 15:10:25.000000000 -0500 +++ g-wrap-1.9.6/configure 2006-02-18 15:11:39.000000000 -0500 @@ -21699,8 +21699,8 @@ From fedora-cvs-commits at redhat.com Mon Mar 27 21:46:18 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 27 Mar 2006 16:46:18 -0500 Subject: rpms/kernel/devel kernel-2.6.spec,1.2096,1.2097 Message-ID: <200603272146.k2RLkIfm023808@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv22618 Modified Files: kernel-2.6.spec Log Message: more !xen fixing Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.2096 retrieving revision 1.2097 diff -u -r1.2096 -r1.2097 --- kernel-2.6.spec 27 Mar 2006 20:54:47 -0000 1.2096 +++ kernel-2.6.spec 27 Mar 2006 21:46:15 -0000 1.2097 @@ -1267,6 +1267,7 @@ rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT/boot +%if %{includexen} %if %{buildxen} cd xen mkdir -p $RPM_BUILD_ROOT/%{image_install_path} @@ -1281,6 +1282,7 @@ install -m 755 xen-syms $RPM_BUILD_ROOT/boot/xen-syms-%{KVERREL} cd .. %endif +%endif cd linux-%{kversion}.%{_target_cpu} @@ -1316,6 +1318,7 @@ cd linux-%{kversion}.%{_target_cpu} +%if %{includexen} %if %{buildxen} mkdir -p $RPM_BUILD_ROOT/etc/ld.so.conf.d rm -f $RPM_BUILD_ROOT/etc/ld.so.conf.d/kernelcap-%{KVERREL}.conf @@ -1329,6 +1332,7 @@ EOF chmod 444 $RPM_BUILD_ROOT/etc/ld.so.conf.d/kernelcap-%{KVERREL}.conf %endif +%endif %if %{builddoc} mkdir -p $RPM_BUILD_ROOT/usr/share/doc/kernel-doc-%{kversion}/Documentation From fedora-cvs-commits at redhat.com Mon Mar 27 21:47:18 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 27 Mar 2006 16:47:18 -0500 Subject: rpms/gnucash/devel gnucash.spec,1.26,1.27 Message-ID: <200603272147.k2RLlIP8029622@cvs.devel.redhat.com> Author: notting Update of /cvs/dist/rpms/gnucash/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv29608 Modified Files: gnucash.spec Log Message: oops, no svn Index: gnucash.spec =================================================================== RCS file: /cvs/dist/rpms/gnucash/devel/gnucash.spec,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- gnucash.spec 27 Mar 2006 21:11:55 -0000 1.26 +++ gnucash.spec 27 Mar 2006 21:47:16 -0000 1.27 @@ -1,6 +1,6 @@ %define svnrev 13703 -%define buildsvn 1 +%define buildsvn 0 Name: gnucash Summary: GnuCash is an application to keep track of your finances. From fedora-cvs-commits at redhat.com Mon Mar 27 21:52:20 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 27 Mar 2006 16:52:20 -0500 Subject: rpms/kernel/FC-5 linux-2.6-x86_64-vdso-compile-m32.patch,1.1,1.2 Message-ID: <200603272152.k2RLqKhM029729@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv29714 Modified Files: linux-2.6-x86_64-vdso-compile-m32.patch Log Message: description linux-2.6-x86_64-vdso-compile-m32.patch: Makefile | 6 ++++++ 1 files changed, 6 insertions(+) Index: linux-2.6-x86_64-vdso-compile-m32.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-5/linux-2.6-x86_64-vdso-compile-m32.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- linux-2.6-x86_64-vdso-compile-m32.patch 27 Mar 2006 21:35:04 -0000 1.1 +++ linux-2.6-x86_64-vdso-compile-m32.patch 27 Mar 2006 21:52:16 -0000 1.2 @@ -1,3 +1,10 @@ + +/usr/bin/ld: warning: i386:x86-64 architecture of input file `arch/x86_64/ia32/vsyscall-int80.o' is incompatible with i386 output +/usr/bin/ld: warning: i386:x86-64 architecture of input file `arch/x86_64/ia32/vsyscall-syscall.o' is incompatible with i386 output +/usr/bin/ld: warning: i386:x86-64 architecture of input file `arch/x86_64/ia32/vsyscall-sysenter.o' is incompatible with i386 output + +https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=186924 + --- linux-2.6.16.noarch/arch/x86_64/ia32/Makefile~ 2006-03-27 16:20:58.000000000 -0500 +++ linux-2.6.16.noarch/arch/x86_64/ia32/Makefile 2006-03-27 16:22:44.000000000 -0500 @@ -2,6 +2,9 @@ From fedora-cvs-commits at redhat.com Mon Mar 27 21:53:27 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 27 Mar 2006 16:53:27 -0500 Subject: rpms/kernel/devel linux-2.6-x86_64-vdso-compile-m32.patch, NONE, 1.1 kernel-2.6.spec, 1.2097, 1.2098 Message-ID: <200603272153.k2RLrRfr029759@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv29744 Modified Files: kernel-2.6.spec Added Files: linux-2.6-x86_64-vdso-compile-m32.patch Log Message: Fix broken x86-64 32bit vDSO (#186924) linux-2.6-x86_64-vdso-compile-m32.patch: Makefile | 6 ++++++ 1 files changed, 6 insertions(+) --- NEW FILE linux-2.6-x86_64-vdso-compile-m32.patch --- /usr/bin/ld: warning: i386:x86-64 architecture of input file `arch/x86_64/ia32/vsyscall-int80.o' is incompatible with i386 output /usr/bin/ld: warning: i386:x86-64 architecture of input file `arch/x86_64/ia32/vsyscall-syscall.o' is incompatible with i386 output /usr/bin/ld: warning: i386:x86-64 architecture of input file `arch/x86_64/ia32/vsyscall-sysenter.o' is incompatible with i386 output https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=186924 --- linux-2.6.16.noarch/arch/x86_64/ia32/Makefile~ 2006-03-27 16:20:58.000000000 -0500 +++ linux-2.6.16.noarch/arch/x86_64/ia32/Makefile 2006-03-27 16:22:44.000000000 -0500 @@ -2,6 +2,9 @@ # Makefile for the ia32 kernel emulation subsystem. # +# Avoid gcc -m64 -m32 ... foo.S +AFLAGS := $(filter-out -m64, $(AFLAGS)) + obj-$(CONFIG_IA32_EMULATION) := ia32entry.o sys_ia32.o ia32_signal.o tls32.o \ ia32_binfmt.o fpu32.o ptrace32.o syscall32.o syscall32_syscall.o \ mmap32.o @@ -29,3 +32,6 @@ $(obj)/vsyscall-%.so: $(src)/vsyscall.ld AFLAGS_vsyscall-sysenter.o = -m32 AFLAGS_vsyscall-syscall.o = -m32 +AFLAGS_syscall32_syscall.o += -m64 +AFLAGS_ia32entry.o += -m64 + Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.2097 retrieving revision 1.2098 diff -u -r1.2097 -r1.2098 --- kernel-2.6.spec 27 Mar 2006 21:46:15 -0000 1.2097 +++ kernel-2.6.spec 27 Mar 2006 21:53:24 -0000 1.2098 @@ -232,6 +232,7 @@ Patch205: linux-2.6-x86_64-smp-on-uphw-cpucount.patch Patch206: linux-2.6-x86-hp-reboot.patch Patch207: linux-2.6-x86-cpu_index-false.patch +Patch208: linux-2.6-x86_64-vdso-compile-m32.patch # 300 - 399 ppc(64) Patch301: linux-2.6-cell-numa-init.patch @@ -741,6 +742,8 @@ %patch206 -p1 # cpu_index >= NR_CPUS becomming always false. %patch207 -p1 +# Fix broken x86-64 32bit vDSO (#186924) +%patch208 -p1 # # ppc64 @@ -1638,6 +1641,7 @@ %changelog * Mon Mar 27 2006 Dave Jones - 2.6.16-git13 +- Fix broken x86-64 32bit vDSO (#186924) * Sat Mar 25 2006 Dave Jones - 2.6.16-git10 From fedora-cvs-commits at redhat.com Mon Mar 27 22:05:23 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 27 Mar 2006 17:05:23 -0500 Subject: rpms/libsepol/devel .cvsignore, 1.90, 1.91 libsepol-rhat.patch, 1.12, 1.13 libsepol.spec, 1.119, 1.120 sources, 1.91, 1.92 Message-ID: <200603272205.k2RM5NP8029959@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/libsepol/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv29933 Modified Files: .cvsignore libsepol-rhat.patch libsepol.spec sources Log Message: * Mon Mar 27 2006 Dan Walsh 1.12.3-1 - Upgrade to latest from NSA * Fixed attr_convert_callback and expand_convert_type_set typemap bug. Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/libsepol/devel/.cvsignore,v retrieving revision 1.90 retrieving revision 1.91 diff -u -r1.90 -r1.91 --- .cvsignore 24 Mar 2006 17:57:31 -0000 1.90 +++ .cvsignore 27 Mar 2006 22:04:35 -0000 1.91 @@ -90,3 +90,4 @@ libsepol-1.12.tgz libsepol-1.12.1.tgz libsepol-1.12.2.tgz +libsepol-1.12.3.tgz libsepol-rhat.patch: ebitmap.c | 5 +++++ expand.c | 4 ++++ 2 files changed, 9 insertions(+) Index: libsepol-rhat.patch =================================================================== RCS file: /cvs/dist/rpms/libsepol/devel/libsepol-rhat.patch,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- libsepol-rhat.patch 27 Dec 2005 20:14:51 -0000 1.12 +++ libsepol-rhat.patch 27 Mar 2006 22:04:50 -0000 1.13 @@ -1,55 +1,47 @@ -diff --exclude-from=exclude -N -u -r nsalibsepol/src/libsepol.map libsepol-1.11.1/src/libsepol.map ---- nsalibsepol/src/libsepol.map 2005-11-15 08:06:55.000000000 -0500 -+++ libsepol-1.11.1/src/libsepol.map 2005-12-27 11:07:34.000000000 -0500 -@@ -4,6 +4,7 @@ - sepol_bool_*; sepol_genbools*; - sepol_context*; sepol_check_context; - sepol_iface_*; -+ sepol_port_*; - sepol_user_*; sepol_genusers; sepol_set_delusers; - sepol_msg_*; sepol_debug; - sepol_handle_*; -diff --exclude-from=exclude -N -u -r nsalibsepol/src/port_record.c libsepol-1.11.1/src/port_record.c ---- nsalibsepol/src/port_record.c 2005-11-01 17:32:59.000000000 -0500 -+++ libsepol-1.11.1/src/port_record.c 2005-12-27 11:07:34.000000000 -0500 -@@ -84,8 +84,8 @@ - sepol_port_t* port, - sepol_port_key_t* key) { - -- if ((port->low <= key->low) && -- (port->high >= key->high) && -+ if ((port->low == key->low) && -+ (port->high == key->high) && - (port->proto == key->proto)) - return 0; - -diff --exclude-from=exclude -N -u -r nsalibsepol/src/ports.c libsepol-1.11.1/src/ports.c ---- nsalibsepol/src/ports.c 2005-11-04 15:37:13.000000000 -0500 -+++ libsepol-1.11.1/src/ports.c 2005-12-27 11:07:34.000000000 -0500 -@@ -182,7 +182,7 @@ - int low2 = c->u.port.low_port; - int high2 = c->u.port.high_port; - -- if (proto == proto2 && low2 <= low && high2 >= high) { -+ if (proto == proto2 && low2 == low && high2 == high) { - *response = 1; - return STATUS_SUCCESS; - } -@@ -220,7 +220,7 @@ - int low2 = c->u.port.low_port; - int high2 = c->u.port.high_port; - -- if (proto == proto2 && low2 <= low && high2 >= high) { -+ if (proto == proto2 && low2 == low && high2 == high) { - if (port_to_record(handle, policydb, c, response) < 0) - goto err; - return STATUS_SUCCESS; -@@ -263,7 +263,7 @@ - int low2 = c->u.port.low_port; - int high2 = c->u.port.high_port; - -- if (proto == proto2 && low2 <= low && high2 >= high) { -+ if (proto == proto2 && low2 == low && high2 == high) { - - /* Replace */ - port->next = c->next; +diff -u -p -r1.5 ebitmap.c +--- libsepol/src/ebitmap.c 7 Oct 2005 20:10:15 -0000 1.5 ++++ libsepol/src/ebitmap.c 27 Mar 2006 21:13:45 -0000 +@@ -12,6 +12,7 @@ + #include + #include + ++#include "debug.h" + #include "private.h" + + int ebitmap_or(ebitmap_t * dst, ebitmap_t * e1, ebitmap_t * e2) +@@ -182,6 +183,10 @@ int ebitmap_set_bit(ebitmap_t * e, unsig + { + ebitmap_node_t *n, *prev, *new; + ++ if (bit == (unsigned int)-1) { ++ ERR(NULL, "negative bit position."); ++ return -EINVAL; ++ } + + prev = 0; + n = e->node; +Index: libsepol/src/expand.c +=================================================================== +RCS file: /nfshome/pal/CVS/selinux-usr/libsepol/src/expand.c,v +retrieving revision 1.23 +diff -u -p -r1.23 expand.c +--- libsepol/src/expand.c 13 Feb 2006 13:59:54 -0000 1.23 ++++ libsepol/src/expand.c 27 Mar 2006 21:17:21 -0000 +@@ -138,6 +138,8 @@ static int attr_convert_callback(hashtab + ebitmap_for_each_bit(&type->types, node, i) { + if (!ebitmap_node_get_bit(node, i)) + continue; ++ if (!state->typemap[i]) ++ continue; + if (ebitmap_set_bit(&new_type->types, + state->typemap[i]-1, 1)) { + ERR (state->handle, "out of memory"); +@@ -1441,6 +1443,8 @@ int expand_convert_type_set(policydb_t * + ebitmap_for_each_bit(&tmp, tnode, i) { + if (!ebitmap_node_get_bit(tnode, i)) + continue; ++ if (!typemap[i]) ++ continue; + if (ebitmap_set_bit(types, typemap[i] - 1, 1)) + return -1; + } Index: libsepol.spec =================================================================== RCS file: /cvs/dist/rpms/libsepol/devel/libsepol.spec,v retrieving revision 1.119 retrieving revision 1.120 diff -u -r1.119 -r1.120 --- libsepol.spec 24 Mar 2006 17:58:27 -0000 1.119 +++ libsepol.spec 27 Mar 2006 22:04:50 -0000 1.120 @@ -1,6 +1,6 @@ Summary: SELinux binary policy manipulation library Name: libsepol -Version: 1.12.2 +Version: 1.12.3 Release: 1 License: GPL Group: System Environment/Libraries @@ -80,6 +80,11 @@ %{_includedir}/sepol/policydb/*.h %changelog +* Mon Mar 27 2006 Dan Walsh 1.12.3-1 +- Upgrade to latest from NSA + * Fixed attr_convert_callback and expand_convert_type_set + typemap bug. + * Fri Mar 24 2006 Dan Walsh 1.12.2-1 - Upgrade to latest from NSA * Fixed avrule_block_write num_decls endian bug. Index: sources =================================================================== RCS file: /cvs/dist/rpms/libsepol/devel/sources,v retrieving revision 1.91 retrieving revision 1.92 diff -u -r1.91 -r1.92 --- sources 24 Mar 2006 17:57:31 -0000 1.91 +++ sources 27 Mar 2006 22:04:50 -0000 1.92 @@ -1 +1 @@ -6b1c03c91b3428645ab52b8865b644cc libsepol-1.12.2.tgz +515f91c72954fd5addb05769030f3373 libsepol-1.12.3.tgz From fedora-cvs-commits at redhat.com Mon Mar 27 22:07:41 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 27 Mar 2006 17:07:41 -0500 Subject: rpms/selinux-policy/devel .cvsignore, 1.50, 1.51 policy-20060323.patch, 1.1, 1.2 selinux-policy.spec, 1.159, 1.160 sources, 1.54, 1.55 Message-ID: <200603272207.k2RM7f52030047@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/selinux-policy/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv30028 Modified Files: .cvsignore policy-20060323.patch selinux-policy.spec sources Log Message: * Mon Mar 27 2006 Dan Walsh 2.2.28-1 - Update to upstream Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/.cvsignore,v retrieving revision 1.50 retrieving revision 1.51 diff -u -r1.50 -r1.51 --- .cvsignore 24 Mar 2006 16:44:06 -0000 1.50 +++ .cvsignore 27 Mar 2006 22:07:37 -0000 1.51 @@ -51,3 +51,4 @@ serefpolicy-2.2.24.tgz serefpolicy-2.2.25.tgz serefpolicy-2.2.26.tgz +serefpolicy-2.2.27.tgz policy-20060323.patch: admin/logwatch.te | 1 admin/rpm.fc | 1 kernel/corenetwork.te.in | 4 +-- kernel/devices.if | 58 +++++++++++++++++++++++++++++++++++++++++++++++ kernel/files.if | 27 +++++++++++++++++++++ kernel/kernel.if | 4 +-- services/apm.te | 4 +++ services/bluetooth.te | 28 +++++++++------------- services/cups.te | 1 services/hal.te | 4 +++ services/pegasus.te | 1 services/privoxy.te | 5 ++++ services/xserver.if | 20 ++++++++++++++++ system/authlogin.te | 2 + system/fstools.te | 5 ++++ system/init.te | 1 system/selinuxutil.te | 1 17 files changed, 147 insertions(+), 20 deletions(-) Index: policy-20060323.patch =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20060323.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- policy-20060323.patch 24 Mar 2006 16:44:06 -0000 1.1 +++ policy-20060323.patch 27 Mar 2006 22:07:37 -0000 1.2 @@ -1,6 +1,6 @@ -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/logwatch.te serefpolicy-2.2.26/policy/modules/admin/logwatch.te ---- nsaserefpolicy/policy/modules/admin/logwatch.te 2006-03-17 13:51:46.000000000 -0500 -+++ serefpolicy-2.2.26/policy/modules/admin/logwatch.te 2006-03-23 16:21:01.000000000 -0500 +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/logwatch.te serefpolicy-2.2.28/policy/modules/admin/logwatch.te +--- nsaserefpolicy/policy/modules/admin/logwatch.te 2006-03-24 11:54:26.000000000 -0500 ++++ serefpolicy-2.2.28/policy/modules/admin/logwatch.te 2006-03-27 15:50:50.000000000 -0500 @@ -52,6 +52,7 @@ files_read_etc_runtime_files(logwatch_t) files_read_usr_files(logwatch_t) @@ -9,9 +9,9 @@ files_dontaudit_search_home(logwatch_t) fs_getattr_all_fs(logwatch_t) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.fc serefpolicy-2.2.26/policy/modules/admin/rpm.fc +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.fc serefpolicy-2.2.28/policy/modules/admin/rpm.fc --- nsaserefpolicy/policy/modules/admin/rpm.fc 2006-03-23 16:02:02.000000000 -0500 -+++ serefpolicy-2.2.26/policy/modules/admin/rpm.fc 2006-03-23 16:21:01.000000000 -0500 ++++ serefpolicy-2.2.28/policy/modules/admin/rpm.fc 2006-03-27 15:50:50.000000000 -0500 @@ -3,6 +3,7 @@ /usr/bin/smart -- gen_context(system_u:object_r:rpm_exec_t,s0) @@ -20,9 +20,18 @@ /usr/lib(64)?/rpm/rpmd -- gen_context(system_u:object_r:bin_t,s0) /usr/lib(64)?/rpm/rpmq -- gen_context(system_u:object_r:bin_t,s0) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corenetwork.te.in serefpolicy-2.2.26/policy/modules/kernel/corenetwork.te.in +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corenetwork.te.in serefpolicy-2.2.28/policy/modules/kernel/corenetwork.te.in --- nsaserefpolicy/policy/modules/kernel/corenetwork.te.in 2006-03-23 16:02:03.000000000 -0500 -+++ serefpolicy-2.2.26/policy/modules/kernel/corenetwork.te.in 2006-03-23 16:22:23.000000000 -0500 ++++ serefpolicy-2.2.28/policy/modules/kernel/corenetwork.te.in 2006-03-27 15:51:13.000000000 -0500 +@@ -68,7 +68,7 @@ + network_port(http_cache, tcp,3128,s0, udp,3130,s0, tcp,8080,s0, tcp,8118,s0) # 8118 is for privoxy + network_port(http, tcp,80,s0, tcp,443,s0, tcp,488,s0, tcp,8008,s0) + network_port(howl, tcp,5335,s0, udp,5353,s0) +-network_port(hplip, tcp,50000,s0, tcp,50002,s0) ++network_port(hplip, tcp,50000,s0, tcp,50002,s0, tcp,9100,s0) + network_port(i18n_input, tcp,9010,s0) + network_port(imaze, tcp,5323,s0, udp,5323,s0) + network_port(inetd_child, tcp,7,s0, udp,7,s0, tcp,9,s0, udp,9,s0, tcp,13,s0, udp,13,s0, tcp,19,s0, udp,19,s0, tcp,37,s0, udp,37,s0, tcp,512,s0, tcp,543,s0, tcp,544,s0, tcp,891,s0, udp,891,s0, tcp,892,s0, udp,892,s0, tcp,2105,s0, tcp,5666,s0) @@ -127,7 +127,7 @@ network_port(uucpd, tcp,540,s0) network_port(vnc, tcp,5900,s0) @@ -32,9 +41,9 @@ network_port(zebra, tcp,2601,s0) network_port(zope, tcp,8021,s0) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.if serefpolicy-2.2.26/policy/modules/kernel/devices.if +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.if serefpolicy-2.2.28/policy/modules/kernel/devices.if --- nsaserefpolicy/policy/modules/kernel/devices.if 2006-03-23 16:02:03.000000000 -0500 -+++ serefpolicy-2.2.26/policy/modules/kernel/devices.if 2006-03-23 16:21:01.000000000 -0500 ++++ serefpolicy-2.2.28/policy/modules/kernel/devices.if 2006-03-27 15:50:50.000000000 -0500 @@ -2387,6 +2387,44 @@ ######################################## @@ -104,9 +113,9 @@ + dontaudit $1 device_node:dir_file_class_set getattr; +') + -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.if serefpolicy-2.2.26/policy/modules/kernel/files.if ---- nsaserefpolicy/policy/modules/kernel/files.if 2006-03-23 16:02:03.000000000 -0500 -+++ serefpolicy-2.2.26/policy/modules/kernel/files.if 2006-03-23 16:21:01.000000000 -0500 +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.if serefpolicy-2.2.28/policy/modules/kernel/files.if +--- nsaserefpolicy/policy/modules/kernel/files.if 2006-03-24 11:54:27.000000000 -0500 ++++ serefpolicy-2.2.28/policy/modules/kernel/files.if 2006-03-27 15:50:50.000000000 -0500 @@ -1648,6 +1648,21 @@ ') @@ -148,9 +157,9 @@ # files_list_mnt(domain) # interface(`files_list_mnt',` -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel.if serefpolicy-2.2.26/policy/modules/kernel/kernel.if +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel.if serefpolicy-2.2.28/policy/modules/kernel/kernel.if --- nsaserefpolicy/policy/modules/kernel/kernel.if 2006-03-23 16:02:03.000000000 -0500 -+++ serefpolicy-2.2.26/policy/modules/kernel/kernel.if 2006-03-23 16:21:01.000000000 -0500 ++++ serefpolicy-2.2.28/policy/modules/kernel/kernel.if 2006-03-27 15:50:50.000000000 -0500 @@ -1148,7 +1148,7 @@ allow $1 proc_t:dir search; @@ -169,54 +178,51 @@ allow $1 sysctl_kernel_t:file rw_file_perms; ') -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apm.te serefpolicy-2.2.26/policy/modules/services/apm.te ---- nsaserefpolicy/policy/modules/services/apm.te 2006-03-23 16:02:03.000000000 -0500 -+++ serefpolicy-2.2.26/policy/modules/services/apm.te 2006-03-23 16:21:01.000000000 -0500 -@@ -225,6 +225,10 @@ - pcmcia_domtrans_cardctl(apmd_t) +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apm.te serefpolicy-2.2.28/policy/modules/services/apm.te +--- nsaserefpolicy/policy/modules/services/apm.te 2006-03-24 11:54:27.000000000 -0500 ++++ serefpolicy-2.2.28/policy/modules/services/apm.te 2006-03-27 15:50:50.000000000 -0500 +@@ -226,6 +226,10 @@ ') -+optional_policy(`xserver',` + optional_policy(` + xserver_domtrans_xdm_xserver(apmd_t) +') + - optional_policy(`selinuxutil',` ++optional_policy(` seutil_sigchld_newrole(apmd_t) ') -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bluetooth.te serefpolicy-2.2.26/policy/modules/services/bluetooth.te ---- nsaserefpolicy/policy/modules/services/bluetooth.te 2006-03-23 16:02:03.000000000 -0500 -+++ serefpolicy-2.2.26/policy/modules/services/bluetooth.te 2006-03-23 16:34:34.000000000 -0500 + +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bluetooth.te serefpolicy-2.2.28/policy/modules/services/bluetooth.te +--- nsaserefpolicy/policy/modules/services/bluetooth.te 2006-03-24 11:54:27.000000000 -0500 ++++ serefpolicy-2.2.28/policy/modules/services/bluetooth.te 2006-03-27 15:50:50.000000000 -0500 @@ -205,6 +205,8 @@ miscfiles_read_localization(bluetooth_helper_t) miscfiles_read_fonts(bluetooth_helper_t) +sysnet_read_config(bluetooth_helper_t) + - optional_policy(`dbus',` + optional_policy(` dbus_system_bus_client_template(bluetooth_helper,bluetooth_helper_t) dbus_connect_system_bus(bluetooth_helper_t) -@@ -215,27 +217,21 @@ - nscd_socket_use(bluetooth_helper_t) +@@ -216,26 +218,20 @@ ') --optional_policy(`xserver',` + optional_policy(` - xserver_stream_connect_xdm(bluetooth_helper_t) -') - -ifdef(`TODO',` -allow bluetooth_helper_t tmp_t:dir search; -- ++ locallogin_dontaudit_use_fds(bluetooth_helper_t) ++'); + -ifdef(`strict_policy',` - ifdef(`xdm.te',` - allow bluetooth_helper_t xdm_xserver_tmp_t:sock_file { read write }; - ') -') -') dnl end TODO -+optional_policy(`locallogin', ` -+ locallogin_dontaudit_use_fds(bluetooth_helper_t) -+'); -+ -+optional_policy(`xserver', ` ++optional_policy(` + xserver_stream_connect_xdm(bluetooth_helper_t) +'); @@ -228,31 +234,41 @@ allow bluetooth_helper_t unconfined_t:unix_stream_socket connectto; - userdom_read_all_users_home_content_files(bluetooth_helper_t) - -- optional_policy(`xserver',` ++ allow bluetooth_helper_t tmpfs_t:file { read write }; + optional_policy(` - xserver_stream_connect_xdm(bluetooth_helper_t) - ') -+ allow bluetooth_helper_t tmpfs_t:file { read write }; -+ optional_policy(`xserver', ` + xserver_rw_xdm_sockets(bluetooth_helper_t) + '); ') -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.te serefpolicy-2.2.26/policy/modules/services/hal.te ---- nsaserefpolicy/policy/modules/services/hal.te 2006-03-23 16:02:03.000000000 -0500 -+++ serefpolicy-2.2.26/policy/modules/services/hal.te 2006-03-23 16:21:01.000000000 -0500 -@@ -210,6 +210,10 @@ - nis_use_ypbind(hald_t) +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.te serefpolicy-2.2.28/policy/modules/services/cups.te +--- nsaserefpolicy/policy/modules/services/cups.te 2006-03-24 11:54:27.000000000 -0500 ++++ serefpolicy-2.2.28/policy/modules/services/cups.te 2006-03-27 15:51:21.000000000 -0500 +@@ -375,6 +375,7 @@ + # HPLIP local policy + # + ++allow hplip_t self:capability net_raw; + dontaudit hplip_t self:capability sys_tty_config; + allow hplip_t self:process signal_perms; + allow hplip_t self:unix_dgram_socket create_socket_perms; +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.te serefpolicy-2.2.28/policy/modules/services/hal.te +--- nsaserefpolicy/policy/modules/services/hal.te 2006-03-24 11:54:28.000000000 -0500 ++++ serefpolicy-2.2.28/policy/modules/services/hal.te 2006-03-27 15:50:50.000000000 -0500 +@@ -211,6 +211,10 @@ ') -+optional_policy(`ntp', ` + optional_policy(` + ntp_domtrans(hald_t) +') + - optional_policy(`nscd',` ++optional_policy(` nscd_socket_use(hald_t) ') -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pegasus.te serefpolicy-2.2.26/policy/modules/services/pegasus.te ---- nsaserefpolicy/policy/modules/services/pegasus.te 2006-03-04 00:06:36.000000000 -0500 -+++ serefpolicy-2.2.26/policy/modules/services/pegasus.te 2006-03-23 16:21:01.000000000 -0500 + +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pegasus.te serefpolicy-2.2.28/policy/modules/services/pegasus.te +--- nsaserefpolicy/policy/modules/services/pegasus.te 2006-03-24 11:54:28.000000000 -0500 ++++ serefpolicy-2.2.28/policy/modules/services/pegasus.te 2006-03-27 15:50:50.000000000 -0500 @@ -77,6 +77,7 @@ corenet_tcp_bind_pegasus_https_port(pegasus_t) corenet_tcp_connect_pegasus_http_port(pegasus_t) @@ -261,9 +277,9 @@ dev_read_sysfs(pegasus_t) dev_read_urand(pegasus_t) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/privoxy.te serefpolicy-2.2.26/policy/modules/services/privoxy.te ---- nsaserefpolicy/policy/modules/services/privoxy.te 2006-03-04 00:06:36.000000000 -0500 -+++ serefpolicy-2.2.26/policy/modules/services/privoxy.te 2006-03-23 16:21:01.000000000 -0500 +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/privoxy.te serefpolicy-2.2.28/policy/modules/services/privoxy.te +--- nsaserefpolicy/policy/modules/services/privoxy.te 2006-03-24 11:54:28.000000000 -0500 ++++ serefpolicy-2.2.28/policy/modules/services/privoxy.te 2006-03-27 15:50:50.000000000 -0500 @@ -51,6 +51,7 @@ corenet_tcp_bind_http_cache_port(privoxy_t) corenet_tcp_connect_http_port(privoxy_t) @@ -272,20 +288,20 @@ dev_read_sysfs(privoxy_t) -@@ -94,6 +95,10 @@ - nis_use_ypbind(privoxy_t) +@@ -95,6 +96,10 @@ ') -+optional_policy(`nscd',` + optional_policy(` + nscd_socket_use(privoxy_t) +') + - optional_policy(`selinuxutil',` ++optional_policy(` seutil_sigchld_newrole(privoxy_t) ') -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.if serefpolicy-2.2.26/policy/modules/services/xserver.if ---- nsaserefpolicy/policy/modules/services/xserver.if 2006-03-21 14:33:33.000000000 -0500 -+++ serefpolicy-2.2.26/policy/modules/services/xserver.if 2006-03-23 16:21:01.000000000 -0500 + +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.if serefpolicy-2.2.28/policy/modules/services/xserver.if +--- nsaserefpolicy/policy/modules/services/xserver.if 2006-03-24 11:54:29.000000000 -0500 ++++ serefpolicy-2.2.28/policy/modules/services/xserver.if 2006-03-27 15:50:50.000000000 -0500 @@ -922,3 +922,23 @@ dontaudit $1 xdm_xserver_t:tcp_socket { read write }; @@ -310,9 +326,9 @@ + allow $1 xdm_xserver_tmp_t:dir search; + allow $1 xdm_xserver_tmp_t:sock_file { read write }; +') -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlogin.te serefpolicy-2.2.26/policy/modules/system/authlogin.te ---- nsaserefpolicy/policy/modules/system/authlogin.te 2006-03-17 13:51:50.000000000 -0500 -+++ serefpolicy-2.2.26/policy/modules/system/authlogin.te 2006-03-23 16:21:01.000000000 -0500 +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlogin.te serefpolicy-2.2.28/policy/modules/system/authlogin.te +--- nsaserefpolicy/policy/modules/system/authlogin.te 2006-03-24 11:54:29.000000000 -0500 ++++ serefpolicy-2.2.28/policy/modules/system/authlogin.te 2006-03-27 15:50:50.000000000 -0500 @@ -171,6 +171,8 @@ dev_setattr_video_dev(pam_console_t) dev_getattr_xserver_misc_dev(pam_console_t) @@ -322,9 +338,9 @@ fs_search_auto_mountpoints(pam_console_t) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/fstools.te serefpolicy-2.2.26/policy/modules/system/fstools.te ---- nsaserefpolicy/policy/modules/system/fstools.te 2006-03-23 16:02:04.000000000 -0500 -+++ serefpolicy-2.2.26/policy/modules/system/fstools.te 2006-03-23 16:38:25.000000000 -0500 +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/fstools.te serefpolicy-2.2.28/policy/modules/system/fstools.te +--- nsaserefpolicy/policy/modules/system/fstools.te 2006-03-24 11:54:29.000000000 -0500 ++++ serefpolicy-2.2.28/policy/modules/system/fstools.te 2006-03-27 15:50:50.000000000 -0500 @@ -67,6 +67,10 @@ dev_read_urand(fsadm_t) # Recreate /dev/cdrom. @@ -344,9 +360,9 @@ fs_search_auto_mountpoints(fsadm_t) fs_getattr_xattr_fs(fsadm_t) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.te serefpolicy-2.2.26/policy/modules/system/init.te ---- nsaserefpolicy/policy/modules/system/init.te 2006-03-23 16:02:04.000000000 -0500 -+++ serefpolicy-2.2.26/policy/modules/system/init.te 2006-03-23 16:21:01.000000000 -0500 +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.te serefpolicy-2.2.28/policy/modules/system/init.te +--- nsaserefpolicy/policy/modules/system/init.te 2006-03-24 11:54:29.000000000 -0500 ++++ serefpolicy-2.2.28/policy/modules/system/init.te 2006-03-27 15:50:50.000000000 -0500 @@ -349,6 +349,7 @@ files_mounton_isid_type_dirs(initrc_t) files_list_default(initrc_t) @@ -355,10 +371,10 @@ libs_rw_ld_so_cache(initrc_t) libs_use_ld_so(initrc_t) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.te serefpolicy-2.2.26/policy/modules/system/selinuxutil.te ---- nsaserefpolicy/policy/modules/system/selinuxutil.te 2006-03-23 16:02:04.000000000 -0500 -+++ serefpolicy-2.2.26/policy/modules/system/selinuxutil.te 2006-03-23 16:21:01.000000000 -0500 -@@ -593,6 +593,7 @@ +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.te serefpolicy-2.2.28/policy/modules/system/selinuxutil.te +--- nsaserefpolicy/policy/modules/system/selinuxutil.te 2006-03-24 11:54:29.000000000 -0500 ++++ serefpolicy-2.2.28/policy/modules/system/selinuxutil.te 2006-03-27 15:50:50.000000000 -0500 +@@ -595,6 +595,7 @@ miscfiles_read_localization(setfiles_t) seutil_get_semanage_read_lock(setfiles_t) Index: selinux-policy.spec =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v retrieving revision 1.159 retrieving revision 1.160 diff -u -r1.159 -r1.160 --- selinux-policy.spec 24 Mar 2006 16:44:06 -0000 1.159 +++ selinux-policy.spec 27 Mar 2006 22:07:37 -0000 1.160 @@ -12,10 +12,10 @@ %endif %define POLICYVER 20 %define POLICYCOREUTILSVER 1.30-1 -%define CHECKPOLICYVER 1.30.1-1 +%define CHECKPOLICYVER 1.29.1-1 Summary: SELinux policy configuration Name: selinux-policy -Version: 2.2.26 +Version: 2.2.28 Release: 1 License: GPL Group: System Environment/Base @@ -149,9 +149,6 @@ %prep %setup -q -n serefpolicy-%{version} %patch -p1 -echo BUILD_MLS = %{BUILD_MLS} -echo BUILD_TARGETED = %{BUILD_TARGETED} -echo BUILD_STRICT = %{BUILD_STRICT} %install # Build targeted policy @@ -322,6 +319,12 @@ %endif %changelog +* Mon Mar 27 2006 Dan Walsh 2.2.28-1 +- Update to upstream + +* Wed Mar 22 2006 Dan Walsh 2.2.27-1 +- Update to upstream + * Wed Mar 22 2006 Dan Walsh 2.2.25-3 - Fix policyhelp Index: sources =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/sources,v retrieving revision 1.54 retrieving revision 1.55 diff -u -r1.54 -r1.55 --- sources 24 Mar 2006 16:44:06 -0000 1.54 +++ sources 27 Mar 2006 22:07:37 -0000 1.55 @@ -1 +1 @@ -23bfdd40375a86dfb7cb58a84f0f2e3c serefpolicy-2.2.26.tgz +6291a19a03cf7d618816142e36a23913 serefpolicy-2.2.27.tgz From fedora-cvs-commits at redhat.com Mon Mar 27 22:10:58 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 27 Mar 2006 17:10:58 -0500 Subject: rpms/kernel/FC-5 linux-2.6-xen.patch,1.5,1.6 Message-ID: <200603272210.k2RMAwNW030229@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv30176 Modified Files: linux-2.6-xen.patch Log Message: typo linux-2.6-xen.patch: linux-2.6.16-rc5-xen0/arch/i386/Kconfig | 98 linux-2.6.16-rc5-xen0/arch/i386/Kconfig.cpu | 2 linux-2.6.16-rc5-xen0/arch/i386/Makefile | 18 linux-2.6.16-rc5-xen0/arch/i386/boot-xen/Makefile | 21 linux-2.6.16-rc5-xen0/arch/i386/kernel/Makefile | 33 linux-2.6.16-rc5-xen0/arch/i386/kernel/acpi/Makefile | 4 linux-2.6.16-rc5-xen0/arch/i386/kernel/acpi/boot-xen.c | 1161 ++++ linux-2.6.16-rc5-xen0/arch/i386/kernel/apic-xen.c | 140 linux-2.6.16-rc5-xen0/arch/i386/kernel/asm-offsets.c | 5 linux-2.6.16-rc5-xen0/arch/i386/kernel/cpu/Makefile | 5 linux-2.6.16-rc5-xen0/arch/i386/kernel/cpu/common-xen.c | 719 ++ linux-2.6.16-rc5-xen0/arch/i386/kernel/cpu/mtrr/Makefile | 7 linux-2.6.16-rc5-xen0/arch/i386/kernel/cpu/mtrr/main-xen.c | 187 linux-2.6.16-rc5-xen0/arch/i386/kernel/early_printk-xen.c | 2 linux-2.6.16-rc5-xen0/arch/i386/kernel/entry-xen.S | 857 +++ linux-2.6.16-rc5-xen0/arch/i386/kernel/fixup.c | 95 linux-2.6.16-rc5-xen0/arch/i386/kernel/head-xen.S | 173 linux-2.6.16-rc5-xen0/arch/i386/kernel/init_task-xen.c | 51 linux-2.6.16-rc5-xen0/arch/i386/kernel/io_apic-xen.c | 2730 ++++++++++ linux-2.6.16-rc5-xen0/arch/i386/kernel/ioport-xen.c | 122 linux-2.6.16-rc5-xen0/arch/i386/kernel/irq-xen.c | 306 + linux-2.6.16-rc5-xen0/arch/i386/kernel/ldt-xen.c | 269 linux-2.6.16-rc5-xen0/arch/i386/kernel/microcode-xen.c | 164 linux-2.6.16-rc5-xen0/arch/i386/kernel/mpparse-xen.c | 1188 ++++ linux-2.6.16-rc5-xen0/arch/i386/kernel/pci-dma-xen.c | 344 + linux-2.6.16-rc5-xen0/arch/i386/kernel/process-xen.c | 833 +++ linux-2.6.16-rc5-xen0/arch/i386/kernel/quirks-xen.c | 48 linux-2.6.16-rc5-xen0/arch/i386/kernel/setup-xen.c | 1888 ++++++ linux-2.6.16-rc5-xen0/arch/i386/kernel/smp-xen.c | 617 ++ linux-2.6.16-rc5-xen0/arch/i386/kernel/swiotlb.c | 674 ++ linux-2.6.16-rc5-xen0/arch/i386/kernel/sysenter.c | 90 linux-2.6.16-rc5-xen0/arch/i386/kernel/time-xen.c | 1067 +++ linux-2.6.16-rc5-xen0/arch/i386/kernel/traps-xen.c | 1094 ++++ linux-2.6.16-rc5-xen0/arch/i386/kernel/vm86.c | 8 linux-2.6.16-rc5-xen0/arch/i386/kernel/vmlinux.lds.S | 4 linux-2.6.16-rc5-xen0/arch/i386/kernel/vsyscall-note-xen.S | 32 linux-2.6.16-rc5-xen0/arch/i386/kernel/vsyscall.S | 2 linux-2.6.16-rc5-xen0/arch/i386/mach-xen/Makefile | 5 linux-2.6.16-rc5-xen0/arch/i386/mach-xen/setup.c | 37 linux-2.6.16-rc5-xen0/arch/i386/mm/Makefile | 8 linux-2.6.16-rc5-xen0/arch/i386/mm/fault-xen.c | 617 ++ linux-2.6.16-rc5-xen0/arch/i386/mm/highmem-xen.c | 123 linux-2.6.16-rc5-xen0/arch/i386/mm/hypervisor.c | 471 + linux-2.6.16-rc5-xen0/arch/i386/mm/init-xen.c | 846 +++ linux-2.6.16-rc5-xen0/arch/i386/mm/ioremap-xen.c | 462 + linux-2.6.16-rc5-xen0/arch/i386/mm/pgtable-xen.c | 646 ++ linux-2.6.16-rc5-xen0/arch/i386/mm/pgtable.c | 63 linux-2.6.16-rc5-xen0/arch/i386/pci/Makefile | 9 linux-2.6.16-rc5-xen0/arch/i386/pci/irq-xen.c | 1202 ++++ linux-2.6.16-rc5-xen0/arch/i386/pci/pcifront.c | 55 linux-2.6.16-rc5-xen0/arch/i386/power/Makefile | 4 linux-2.6.16-rc5-xen0/arch/ia64/Kconfig | 43 linux-2.6.16-rc5-xen0/arch/ia64/Makefile | 10 linux-2.6.16-rc5-xen0/arch/ia64/hp/sim/Makefile | 2 linux-2.6.16-rc5-xen0/arch/ia64/kernel/entry.S | 32 linux-2.6.16-rc5-xen0/arch/ia64/kernel/head.S | 4 linux-2.6.16-rc5-xen0/arch/ia64/kernel/pal.S | 5 linux-2.6.16-rc5-xen0/arch/ia64/kernel/sal.c | 3 linux-2.6.16-rc5-xen0/arch/ia64/kernel/setup.c | 4 linux-2.6.16-rc5-xen0/arch/ia64/xen-mkbuildtree-post | 2 linux-2.6.16-rc5-xen0/arch/ia64/xen-mkbuildtree-pre | 50 linux-2.6.16-rc5-xen0/arch/ia64/xen/Makefile | 5 linux-2.6.16-rc5-xen0/arch/ia64/xen/drivers/Makefile | 20 linux-2.6.16-rc5-xen0/arch/ia64/xen/drivers/README | 2 linux-2.6.16-rc5-xen0/arch/ia64/xen/drivers/coreMakefile | 24 linux-2.6.16-rc5-xen0/arch/ia64/xen/drivers/evtchn_ia64.c | 266 linux-2.6.16-rc5-xen0/arch/ia64/xen/drivers/patches/blkback.c.patch | 33 linux-2.6.16-rc5-xen0/arch/ia64/xen/drivers/patches/console.c.patch | 11 linux-2.6.16-rc5-xen0/arch/ia64/xen/drivers/patches/devmem.c.patch | 2 linux-2.6.16-rc5-xen0/arch/ia64/xen/drivers/patches/gnttab.c.patch | 33 linux-2.6.16-rc5-xen0/arch/ia64/xen/drivers/patches/privcmd.c.patch | 30 linux-2.6.16-rc5-xen0/arch/ia64/xen/drivers/xenia64_init.c | 55 linux-2.6.16-rc5-xen0/arch/ia64/xen/hypercall.S | 323 + linux-2.6.16-rc5-xen0/arch/ia64/xen/xen_ksyms.c | 12 linux-2.6.16-rc5-xen0/arch/ia64/xen/xenconsole.c | 19 linux-2.6.16-rc5-xen0/arch/ia64/xen/xenentry.S | 850 +++ linux-2.6.16-rc5-xen0/arch/ia64/xen/xenhpski.c | 19 linux-2.6.16-rc5-xen0/arch/ia64/xen/xenivt.S | 2044 +++++++ linux-2.6.16-rc5-xen0/arch/ia64/xen/xenminstate.h | 367 + linux-2.6.16-rc5-xen0/arch/ia64/xen/xenpal.S | 73 linux-2.6.16-rc5-xen0/arch/ia64/xen/xensetup.S | 33 linux-2.6.16-rc5-xen0/arch/um/kernel/physmem.c | 4 linux-2.6.16-rc5-xen0/arch/x86_64/Kconfig | 60 linux-2.6.16-rc5-xen0/arch/x86_64/Makefile | 16 linux-2.6.16-rc5-xen0/arch/x86_64/ia32/ia32entry-xen.S | 721 ++ linux-2.6.16-rc5-xen0/arch/x86_64/ia32/syscall32-xen.c | 128 linux-2.6.16-rc5-xen0/arch/x86_64/ia32/syscall32_syscall-xen.S | 28 linux-2.6.16-rc5-xen0/arch/x86_64/ia32/vsyscall-int80.S | 58 linux-2.6.16-rc5-xen0/arch/x86_64/ia32/vsyscall-sigreturn.S | 2 linux-2.6.16-rc5-xen0/arch/x86_64/kernel/Makefile | 18 linux-2.6.16-rc5-xen0/arch/x86_64/kernel/acpi/Makefile | 1 linux-2.6.16-rc5-xen0/arch/x86_64/kernel/apic-xen.c | 200 linux-2.6.16-rc5-xen0/arch/x86_64/kernel/asm-offsets.c | 2 linux-2.6.16-rc5-xen0/arch/x86_64/kernel/e820-xen.c | 744 ++ linux-2.6.16-rc5-xen0/arch/x86_64/kernel/early_printk-xen.c | 306 + linux-2.6.16-rc5-xen0/arch/x86_64/kernel/entry-xen.S | 1140 ++++ linux-2.6.16-rc5-xen0/arch/x86_64/kernel/genapic-xen.c | 144 linux-2.6.16-rc5-xen0/arch/x86_64/kernel/genapic_xen.c | 162 linux-2.6.16-rc5-xen0/arch/x86_64/kernel/head-xen.S | 156 linux-2.6.16-rc5-xen0/arch/x86_64/kernel/head64-xen.c | 140 linux-2.6.16-rc5-xen0/arch/x86_64/kernel/init_task.c | 3 linux-2.6.16-rc5-xen0/arch/x86_64/kernel/io_apic-xen.c | 2231 ++++++++ linux-2.6.16-rc5-xen0/arch/x86_64/kernel/ioport-xen.c | 58 linux-2.6.16-rc5-xen0/arch/x86_64/kernel/irq-xen.c | 168 linux-2.6.16-rc5-xen0/arch/x86_64/kernel/ldt-xen.c | 282 + linux-2.6.16-rc5-xen0/arch/x86_64/kernel/mpparse-xen.c | 1005 +++ linux-2.6.16-rc5-xen0/arch/x86_64/kernel/pci-swiotlb-xen.c | 54 linux-2.6.16-rc5-xen0/arch/x86_64/kernel/process-xen.c | 810 ++ linux-2.6.16-rc5-xen0/arch/x86_64/kernel/setup-xen.c | 1635 +++++ linux-2.6.16-rc5-xen0/arch/x86_64/kernel/setup64-xen.c | 360 + linux-2.6.16-rc5-xen0/arch/x86_64/kernel/smp-xen.c | 596 ++ linux-2.6.16-rc5-xen0/arch/x86_64/kernel/traps-xen.c | 1023 +++ linux-2.6.16-rc5-xen0/arch/x86_64/kernel/vsyscall-xen.c | 239 linux-2.6.16-rc5-xen0/arch/x86_64/kernel/x8664_ksyms-xen.c | 172 linux-2.6.16-rc5-xen0/arch/x86_64/kernel/xen_entry.S | 41 linux-2.6.16-rc5-xen0/arch/x86_64/mm/Makefile | 10 linux-2.6.16-rc5-xen0/arch/x86_64/mm/fault-xen.c | 595 ++ linux-2.6.16-rc5-xen0/arch/x86_64/mm/init-xen.c | 1107 ++++ linux-2.6.16-rc5-xen0/arch/x86_64/mm/pageattr-xen.c | 392 + linux-2.6.16-rc5-xen0/arch/x86_64/pci/Makefile | 12 linux-2.6.16-rc5-xen0/drivers/Makefile | 1 linux-2.6.16-rc5-xen0/drivers/acpi/Kconfig | 3 linux-2.6.16-rc5-xen0/drivers/acpi/tables.c | 7 linux-2.6.16-rc5-xen0/drivers/char/mem.c | 6 linux-2.6.16-rc5-xen0/drivers/char/tpm/Kconfig | 14 linux-2.6.16-rc5-xen0/drivers/char/tpm/Makefile | 1 linux-2.6.16-rc5-xen0/drivers/char/tpm/tpm.c | 44 linux-2.6.16-rc5-xen0/drivers/char/tpm/tpm.h | 7 linux-2.6.16-rc5-xen0/drivers/char/tpm/tpm_xen.c | 536 + linux-2.6.16-rc5-xen0/drivers/char/tty_io.c | 7 linux-2.6.16-rc5-xen0/drivers/firmware/Kconfig | 2 linux-2.6.16-rc5-xen0/drivers/pci/Kconfig | 1 linux-2.6.16-rc5-xen0/drivers/serial/Kconfig | 1 linux-2.6.16-rc5-xen0/drivers/video/Kconfig | 2 linux-2.6.16-rc5-xen0/drivers/xen/Kconfig | 200 linux-2.6.16-rc5-xen0/drivers/xen/Makefile | 22 linux-2.6.16-rc5-xen0/drivers/xen/balloon/Makefile | 2 linux-2.6.16-rc5-xen0/drivers/xen/balloon/balloon.c | 585 ++ linux-2.6.16-rc5-xen0/drivers/xen/blkback/Makefile | 3 linux-2.6.16-rc5-xen0/drivers/xen/blkback/blkback.c | 596 ++ linux-2.6.16-rc5-xen0/drivers/xen/blkback/common.h | 123 linux-2.6.16-rc5-xen0/drivers/xen/blkback/interface.c | 164 linux-2.6.16-rc5-xen0/drivers/xen/blkback/vbd.c | 102 linux-2.6.16-rc5-xen0/drivers/xen/blkback/xenbus.c | 421 + linux-2.6.16-rc5-xen0/drivers/xen/blkfront/Makefile | 5 linux-2.6.16-rc5-xen0/drivers/xen/blkfront/blkfront.c | 834 +++ linux-2.6.16-rc5-xen0/drivers/xen/blkfront/block.h | 162 linux-2.6.16-rc5-xen0/drivers/xen/blkfront/vbd.c | 323 + linux-2.6.16-rc5-xen0/drivers/xen/blktap/Makefile | 3 linux-2.6.16-rc5-xen0/drivers/xen/blktap/blktap.c | 910 +++ linux-2.6.16-rc5-xen0/drivers/xen/blktap/common.h | 110 linux-2.6.16-rc5-xen0/drivers/xen/blktap/interface.c | 146 linux-2.6.16-rc5-xen0/drivers/xen/blktap/xenbus.c | 234 linux-2.6.16-rc5-xen0/drivers/xen/char/Makefile | 2 linux-2.6.16-rc5-xen0/drivers/xen/char/mem.c | 156 linux-2.6.16-rc5-xen0/drivers/xen/console/Makefile | 2 linux-2.6.16-rc5-xen0/drivers/xen/console/console.c | 647 ++ linux-2.6.16-rc5-xen0/drivers/xen/console/xencons_ring.c | 125 linux-2.6.16-rc5-xen0/drivers/xen/core/Makefile | 9 linux-2.6.16-rc5-xen0/drivers/xen/core/evtchn.c | 823 +++ linux-2.6.16-rc5-xen0/drivers/xen/core/features.c | 29 linux-2.6.16-rc5-xen0/drivers/xen/core/gnttab.c | 429 + linux-2.6.16-rc5-xen0/drivers/xen/core/reboot.c | 442 + linux-2.6.16-rc5-xen0/drivers/xen/core/skbuff.c | 144 linux-2.6.16-rc5-xen0/drivers/xen/core/smpboot.c | 464 + linux-2.6.16-rc5-xen0/drivers/xen/core/xen_proc.c | 29 linux-2.6.16-rc5-xen0/drivers/xen/evtchn/Makefile | 2 linux-2.6.16-rc5-xen0/drivers/xen/evtchn/evtchn.c | 459 + linux-2.6.16-rc5-xen0/drivers/xen/net_driver_util.c | 68 linux-2.6.16-rc5-xen0/drivers/xen/netback/Makefile | 5 linux-2.6.16-rc5-xen0/drivers/xen/netback/common.h | 110 linux-2.6.16-rc5-xen0/drivers/xen/netback/interface.c | 320 + linux-2.6.16-rc5-xen0/drivers/xen/netback/loopback.c | 231 linux-2.6.16-rc5-xen0/drivers/xen/netback/netback.c | 835 +++ linux-2.6.16-rc5-xen0/drivers/xen/netback/xenbus.c | 327 + linux-2.6.16-rc5-xen0/drivers/xen/netfront/Makefile | 4 linux-2.6.16-rc5-xen0/drivers/xen/netfront/netfront.c | 1504 +++++ linux-2.6.16-rc5-xen0/drivers/xen/pciback/Makefile | 10 linux-2.6.16-rc5-xen0/drivers/xen/pciback/conf_space.c | 324 + linux-2.6.16-rc5-xen0/drivers/xen/pciback/conf_space.h | 97 linux-2.6.16-rc5-xen0/drivers/xen/pciback/conf_space_header.c | 269 linux-2.6.16-rc5-xen0/drivers/xen/pciback/passthrough.c | 116 linux-2.6.16-rc5-xen0/drivers/xen/pciback/pci_stub.c | 377 + linux-2.6.16-rc5-xen0/drivers/xen/pciback/pciback.h | 73 linux-2.6.16-rc5-xen0/drivers/xen/pciback/pciback_ops.c | 84 linux-2.6.16-rc5-xen0/drivers/xen/pciback/vpci.c | 163 linux-2.6.16-rc5-xen0/drivers/xen/pciback/xenbus.c | 439 + linux-2.6.16-rc5-xen0/drivers/xen/pcifront/Makefile | 7 linux-2.6.16-rc5-xen0/drivers/xen/pcifront/pci.c | 44 linux-2.6.16-rc5-xen0/drivers/xen/pcifront/pci_op.c | 245 linux-2.6.16-rc5-xen0/drivers/xen/pcifront/pcifront.h | 40 linux-2.6.16-rc5-xen0/drivers/xen/pcifront/xenbus.c | 295 + linux-2.6.16-rc5-xen0/drivers/xen/privcmd/Makefile | 2 linux-2.6.16-rc5-xen0/drivers/xen/privcmd/privcmd.c | 302 + linux-2.6.16-rc5-xen0/drivers/xen/tpmback/Makefile | 4 linux-2.6.16-rc5-xen0/drivers/xen/tpmback/common.h | 91 linux-2.6.16-rc5-xen0/drivers/xen/tpmback/interface.c | 203 linux-2.6.16-rc5-xen0/drivers/xen/tpmback/tpmback.c | 1118 ++++ linux-2.6.16-rc5-xen0/drivers/xen/tpmback/xenbus.c | 333 + linux-2.6.16-rc5-xen0/drivers/xen/tpmfront/Makefile | 2 linux-2.6.16-rc5-xen0/drivers/xen/tpmfront/tpmfront.c | 729 ++ linux-2.6.16-rc5-xen0/drivers/xen/tpmfront/tpmfront.h | 40 linux-2.6.16-rc5-xen0/drivers/xen/util.c | 80 linux-2.6.16-rc5-xen0/drivers/xen/xenbus/Makefile | 8 linux-2.6.16-rc5-xen0/drivers/xen/xenbus/xenbus_client.c | 403 + linux-2.6.16-rc5-xen0/drivers/xen/xenbus/xenbus_comms.c | 203 linux-2.6.16-rc5-xen0/drivers/xen/xenbus/xenbus_comms.h | 50 linux-2.6.16-rc5-xen0/drivers/xen/xenbus/xenbus_dev.c | 238 linux-2.6.16-rc5-xen0/drivers/xen/xenbus/xenbus_probe.c | 1015 +++ linux-2.6.16-rc5-xen0/drivers/xen/xenbus/xenbus_xs.c | 821 +++ linux-2.6.16-rc5-xen0/fs/Kconfig | 1 linux-2.6.16-rc5-xen0/include/asm-i386/a.out.h | 2 linux-2.6.16-rc5-xen0/include/asm-i386/apic.h | 2 linux-2.6.16-rc5-xen0/include/asm-i386/elf.h | 7 linux-2.6.16-rc5-xen0/include/asm-i386/fixmap.h | 13 linux-2.6.16-rc5-xen0/include/asm-i386/mach-xen/asm/agp.h | 37 linux-2.6.16-rc5-xen0/include/asm-i386/mach-xen/asm/desc.h | 164 linux-2.6.16-rc5-xen0/include/asm-i386/mach-xen/asm/dma-mapping.h | 156 linux-2.6.16-rc5-xen0/include/asm-i386/mach-xen/asm/fixmap.h | 158 linux-2.6.16-rc5-xen0/include/asm-i386/mach-xen/asm/floppy.h | 147 linux-2.6.16-rc5-xen0/include/asm-i386/mach-xen/asm/highmem.h | 81 linux-2.6.16-rc5-xen0/include/asm-i386/mach-xen/asm/hw_irq.h | 73 linux-2.6.16-rc5-xen0/include/asm-i386/mach-xen/asm/hypercall.h | 323 + linux-2.6.16-rc5-xen0/include/asm-i386/mach-xen/asm/hypervisor.h | 163 linux-2.6.16-rc5-xen0/include/asm-i386/mach-xen/asm/io.h | 401 + linux-2.6.16-rc5-xen0/include/asm-i386/mach-xen/asm/kmap_types.h | 32 linux-2.6.16-rc5-xen0/include/asm-i386/mach-xen/asm/mmu.h | 21 linux-2.6.16-rc5-xen0/include/asm-i386/mach-xen/asm/mmu_context.h | 105 linux-2.6.16-rc5-xen0/include/asm-i386/mach-xen/asm/page.h | 326 + linux-2.6.16-rc5-xen0/include/asm-i386/mach-xen/asm/param.h | 24 linux-2.6.16-rc5-xen0/include/asm-i386/mach-xen/asm/pci.h | 154 linux-2.6.16-rc5-xen0/include/asm-i386/mach-xen/asm/pgalloc.h | 64 linux-2.6.16-rc5-xen0/include/asm-i386/mach-xen/asm/pgtable-2level-defs.h | 21 linux-2.6.16-rc5-xen0/include/asm-i386/mach-xen/asm/pgtable-2level.h | 83 linux-2.6.16-rc5-xen0/include/asm-i386/mach-xen/asm/pgtable-3level-defs.h | 25 linux-2.6.16-rc5-xen0/include/asm-i386/mach-xen/asm/pgtable-3level.h | 181 linux-2.6.16-rc5-xen0/include/asm-i386/mach-xen/asm/pgtable.h | 512 + linux-2.6.16-rc5-xen0/include/asm-i386/mach-xen/asm/processor.h | 762 ++ linux-2.6.16-rc5-xen0/include/asm-i386/mach-xen/asm/ptrace.h | 90 linux-2.6.16-rc5-xen0/include/asm-i386/mach-xen/asm/scatterlist.h | 22 linux-2.6.16-rc5-xen0/include/asm-i386/mach-xen/asm/segment.h | 117 linux-2.6.16-rc5-xen0/include/asm-i386/mach-xen/asm/setup.h | 66 linux-2.6.16-rc5-xen0/include/asm-i386/mach-xen/asm/smp.h | 103 linux-2.6.16-rc5-xen0/include/asm-i386/mach-xen/asm/spinlock.h | 217 linux-2.6.16-rc5-xen0/include/asm-i386/mach-xen/asm/swiotlb.h | 43 linux-2.6.16-rc5-xen0/include/asm-i386/mach-xen/asm/synch_bitops.h | 141 linux-2.6.16-rc5-xen0/include/asm-i386/mach-xen/asm/system.h | 679 ++ linux-2.6.16-rc5-xen0/include/asm-i386/mach-xen/asm/tlbflush.h | 102 linux-2.6.16-rc5-xen0/include/asm-i386/mach-xen/asm/vga.h | 20 linux-2.6.16-rc5-xen0/include/asm-i386/mach-xen/irq_vectors.h | 125 linux-2.6.16-rc5-xen0/include/asm-i386/mach-xen/mach_traps.h | 33 linux-2.6.16-rc5-xen0/include/asm-i386/mach-xen/setup_arch_post.h | 50 linux-2.6.16-rc5-xen0/include/asm-i386/mach-xen/setup_arch_pre.h | 5 linux-2.6.16-rc5-xen0/include/asm-i386/page.h | 4 linux-2.6.16-rc5-xen0/include/asm-i386/spinlock.h | 6 linux-2.6.16-rc5-xen0/include/asm-i386/system.h | 2 linux-2.6.16-rc5-xen0/include/asm-ia64/fixmap.h | 2 linux-2.6.16-rc5-xen0/include/asm-ia64/gcc_intrin.h | 60 linux-2.6.16-rc5-xen0/include/asm-ia64/hypercall.h | 500 + linux-2.6.16-rc5-xen0/include/asm-ia64/hypervisor.h | 70 linux-2.6.16-rc5-xen0/include/asm-ia64/intel_intrin.h | 68 linux-2.6.16-rc5-xen0/include/asm-ia64/pal.h | 1 linux-2.6.16-rc5-xen0/include/asm-ia64/privop.h | 59 linux-2.6.16-rc5-xen0/include/asm-ia64/processor.h | 1 linux-2.6.16-rc5-xen0/include/asm-ia64/synch_bitops.h | 61 linux-2.6.16-rc5-xen0/include/asm-ia64/system.h | 4 linux-2.6.16-rc5-xen0/include/asm-ia64/xen/privop.h | 272 linux-2.6.16-rc5-xen0/include/asm-um/page.h | 2 linux-2.6.16-rc5-xen0/include/asm-x86_64/apic.h | 2 linux-2.6.16-rc5-xen0/include/asm-x86_64/mach-xen/asm/arch_hooks.h | 27 linux-2.6.16-rc5-xen0/include/asm-x86_64/mach-xen/asm/bootsetup.h | 42 linux-2.6.16-rc5-xen0/include/asm-x86_64/mach-xen/asm/desc.h | 263 linux-2.6.16-rc5-xen0/include/asm-x86_64/mach-xen/asm/dma-mapping.h | 191 linux-2.6.16-rc5-xen0/include/asm-x86_64/mach-xen/asm/fixmap.h | 111 linux-2.6.16-rc5-xen0/include/asm-x86_64/mach-xen/asm/floppy.h | 206 linux-2.6.16-rc5-xen0/include/asm-x86_64/mach-xen/asm/hw_irq.h | 141 linux-2.6.16-rc5-xen0/include/asm-x86_64/mach-xen/asm/hypercall.h | 323 + linux-2.6.16-rc5-xen0/include/asm-x86_64/mach-xen/asm/hypervisor.h | 2 linux-2.6.16-rc5-xen0/include/asm-x86_64/mach-xen/asm/io.h | 359 + linux-2.6.16-rc5-xen0/include/asm-x86_64/mach-xen/asm/irq.h | 39 linux-2.6.16-rc5-xen0/include/asm-x86_64/mach-xen/asm/mmu.h | 33 linux-2.6.16-rc5-xen0/include/asm-x86_64/mach-xen/asm/mmu_context.h | 134 linux-2.6.16-rc5-xen0/include/asm-x86_64/mach-xen/asm/nmi.h | 75 linux-2.6.16-rc5-xen0/include/asm-x86_64/mach-xen/asm/page.h | 317 + linux-2.6.16-rc5-xen0/include/asm-x86_64/mach-xen/asm/pci.h | 174 linux-2.6.16-rc5-xen0/include/asm-x86_64/mach-xen/asm/pgalloc.h | 199 linux-2.6.16-rc5-xen0/include/asm-x86_64/mach-xen/asm/pgtable.h | 560 ++ linux-2.6.16-rc5-xen0/include/asm-x86_64/mach-xen/asm/processor.h | 503 + linux-2.6.16-rc5-xen0/include/asm-x86_64/mach-xen/asm/ptrace.h | 125 linux-2.6.16-rc5-xen0/include/asm-x86_64/mach-xen/asm/smp.h | 152 linux-2.6.16-rc5-xen0/include/asm-x86_64/mach-xen/asm/synch_bitops.h | 2 linux-2.6.16-rc5-xen0/include/asm-x86_64/mach-xen/asm/system.h | 434 + linux-2.6.16-rc5-xen0/include/asm-x86_64/mach-xen/asm/timer.h | 67 linux-2.6.16-rc5-xen0/include/asm-x86_64/mach-xen/asm/tlbflush.h | 104 linux-2.6.16-rc5-xen0/include/asm-x86_64/mach-xen/asm/vga.h | 20 linux-2.6.16-rc5-xen0/include/asm-x86_64/mach-xen/asm/xor.h | 328 + linux-2.6.16-rc5-xen0/include/asm-x86_64/mach-xen/irq_vectors.h | 123 linux-2.6.16-rc5-xen0/include/asm-x86_64/mach-xen/mach_time.h | 122 linux-2.6.16-rc5-xen0/include/asm-x86_64/mach-xen/mach_timer.h | 48 linux-2.6.16-rc5-xen0/include/asm-x86_64/mach-xen/setup_arch_post.h | 52 linux-2.6.16-rc5-xen0/include/asm-x86_64/mach-xen/setup_arch_pre.h | 5 linux-2.6.16-rc5-xen0/include/linux/gfp.h | 6 linux-2.6.16-rc5-xen0/include/linux/highmem.h | 6 linux-2.6.16-rc5-xen0/include/linux/irq.h | 3 linux-2.6.16-rc5-xen0/include/linux/mm.h | 13 linux-2.6.16-rc5-xen0/include/linux/skbuff.h | 13 linux-2.6.16-rc5-xen0/include/xen/balloon.h | 70 linux-2.6.16-rc5-xen0/include/xen/driver_util.h | 26 linux-2.6.16-rc5-xen0/include/xen/evtchn.h | 123 linux-2.6.16-rc5-xen0/include/xen/features.h | 20 linux-2.6.16-rc5-xen0/include/xen/foreign_page.h | 40 linux-2.6.16-rc5-xen0/include/xen/gnttab.h | 120 linux-2.6.16-rc5-xen0/include/xen/interface/COPYING | 28 linux-2.6.16-rc5-xen0/include/xen/interface/acm.h | 181 linux-2.6.16-rc5-xen0/include/xen/interface/acm_ops.h | 96 linux-2.6.16-rc5-xen0/include/xen/interface/arch-ia64.h | 314 + linux-2.6.16-rc5-xen0/include/xen/interface/arch-x86_32.h | 158 linux-2.6.16-rc5-xen0/include/xen/interface/arch-x86_64.h | 243 linux-2.6.16-rc5-xen0/include/xen/interface/dom0_ops.h | 488 + linux-2.6.16-rc5-xen0/include/xen/interface/event_channel.h | 203 linux-2.6.16-rc5-xen0/include/xen/interface/features.h | 53 linux-2.6.16-rc5-xen0/include/xen/interface/grant_table.h | 306 + linux-2.6.16-rc5-xen0/include/xen/interface/hvm/hvm_info_table.h | 24 linux-2.6.16-rc5-xen0/include/xen/interface/hvm/ioreq.h | 93 linux-2.6.16-rc5-xen0/include/xen/interface/hvm/vmx_assist.h | 97 linux-2.6.16-rc5-xen0/include/xen/interface/io/blkif.h | 85 linux-2.6.16-rc5-xen0/include/xen/interface/io/console.h | 33 linux-2.6.16-rc5-xen0/include/xen/interface/io/netif.h | 76 linux-2.6.16-rc5-xen0/include/xen/interface/io/pciif.h | 55 linux-2.6.16-rc5-xen0/include/xen/interface/io/ring.h | 270 linux-2.6.16-rc5-xen0/include/xen/interface/io/tpmif.h | 56 linux-2.6.16-rc5-xen0/include/xen/interface/io/xenbus.h | 44 linux-2.6.16-rc5-xen0/include/xen/interface/io/xs_wire.h | 97 linux-2.6.16-rc5-xen0/include/xen/interface/memory.h | 153 linux-2.6.16-rc5-xen0/include/xen/interface/nmi.h | 54 linux-2.6.16-rc5-xen0/include/xen/interface/physdev.h | 70 linux-2.6.16-rc5-xen0/include/xen/interface/sched.h | 60 linux-2.6.16-rc5-xen0/include/xen/interface/sched_ctl.h | 68 linux-2.6.16-rc5-xen0/include/xen/interface/trace.h | 90 linux-2.6.16-rc5-xen0/include/xen/interface/vcpu.h | 119 linux-2.6.16-rc5-xen0/include/xen/interface/version.h | 64 linux-2.6.16-rc5-xen0/include/xen/interface/xen.h | 463 + linux-2.6.16-rc5-xen0/include/xen/net_driver_util.h | 56 linux-2.6.16-rc5-xen0/include/xen/pcifront.h | 39 linux-2.6.16-rc5-xen0/include/xen/public/evtchn.h | 98 linux-2.6.16-rc5-xen0/include/xen/public/privcmd.h | 91 linux-2.6.16-rc5-xen0/include/xen/public/xenstored.h | 89 linux-2.6.16-rc5-xen0/include/xen/tpmfe.h | 40 linux-2.6.16-rc5-xen0/include/xen/xen_proc.h | 23 linux-2.6.16-rc5-xen0/include/xen/xenbus.h | 298 + linux-2.6.16-rc5-xen0/include/xen/xencons.h | 14 linux-2.6.16-rc5-xen0/kernel/Kconfig.preempt | 1 linux-2.6.16-rc5-xen0/kernel/irq/manage.c | 84 linux-2.6.16-rc5-xen0/lib/Kconfig.debug | 2 linux-2.6.16-rc5-xen0/lib/Makefile | 3 linux-2.6.16-rc5-xen0/mm/Kconfig | 3 linux-2.6.16-rc5-xen0/mm/highmem.c | 11 linux-2.6.16-rc5-xen0/mm/memory.c | 112 linux-2.6.16-rc5-xen0/mm/mmap.c | 4 linux-2.6.16-rc5-xen0/mm/page_alloc.c | 6 linux-2.6.16-rc5-xen0/net/core/dev.c | 50 linux-2.6.16-rc5-xen0/net/core/skbuff.c | 41 linux-2.6.16-rc5-xen0/scripts/Makefile.xen | 14 linux-2.6.16.noarch/arch/x86_64/ia32/Makefile | 21 364 files changed, 77455 insertions(+), 245 deletions(-) Index: linux-2.6-xen.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-5/linux-2.6-xen.patch,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- linux-2.6-xen.patch 27 Mar 2006 21:35:04 -0000 1.5 +++ linux-2.6-xen.patch 27 Mar 2006 22:10:39 -0000 1.6 @@ -25713,7 +25713,7 @@ +ifdef CONFIG_XEN +AFLAGS_vsyscall-int80.o = -m32 -Iarch/i386/kernel +CFLAGS_syscall32-xen.o += -DUSE_INT80 -+AFLAGS_syscall32_syscall-xen.o += =m64 -DUSE_INT80 ++AFLAGS_syscall32_syscall-xen.o += -m64 -DUSE_INT80 +AFLAGS_ia32entry-xen.o += -m64 + +$(obj)/syscall32_syscall-xen.o: \ From fedora-cvs-commits at redhat.com Mon Mar 27 22:13:24 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 27 Mar 2006 17:13:24 -0500 Subject: rpms/checkpolicy/devel checkpolicy.spec,1.96,1.97 Message-ID: <200603272213.k2RMDOVa030384@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/checkpolicy/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv30370 Modified Files: checkpolicy.spec Log Message: * Mon Mar 27 2006 Dan Walsh - 1.30.1-2 - Rebuild with new libsepol Index: checkpolicy.spec =================================================================== RCS file: /cvs/dist/rpms/checkpolicy/devel/checkpolicy.spec,v retrieving revision 1.96 retrieving revision 1.97 diff -u -r1.96 -r1.97 --- checkpolicy.spec 23 Mar 2006 16:14:03 -0000 1.96 +++ checkpolicy.spec 27 Mar 2006 22:13:22 -0000 1.97 @@ -1,8 +1,8 @@ -%define libsepolver 1.12-1 +%define libsepolver 1.12.3-1 Summary: SELinux policy compiler Name: checkpolicy Version: 1.30.1 -Release: 1 +Release: 2 License: GPL Group: Development/System Source: http://www.nsa.gov/selinux/archives/%{name}-%{version}.tgz @@ -47,6 +47,9 @@ %{_mandir}/man8/checkmodule.8.gz %changelog +* Mon Mar 27 2006 Dan Walsh - 1.30.1-2 +- Rebuild with new libsepol + * Thu Mar 23 2006 Dan Walsh - 1.30.1-1 - Latest upgrade from NSA * Moved processing of role and user require statements to 2nd pass. From fedora-cvs-commits at redhat.com Mon Mar 27 22:31:55 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 27 Mar 2006 17:31:55 -0500 Subject: rpms/selinux-policy/devel selinux-policy.spec,1.160,1.161 Message-ID: <200603272231.k2RMVsNB011889@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/selinux-policy/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv11876 Modified Files: selinux-policy.spec Log Message: * Mon Mar 27 2006 Dan Walsh 2.2.28-1 - Update to upstream Index: selinux-policy.spec =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v retrieving revision 1.160 retrieving revision 1.161 diff -u -r1.160 -r1.161 --- selinux-policy.spec 27 Mar 2006 22:07:37 -0000 1.160 +++ selinux-policy.spec 27 Mar 2006 22:31:50 -0000 1.161 @@ -12,7 +12,7 @@ %endif %define POLICYVER 20 %define POLICYCOREUTILSVER 1.30-1 -%define CHECKPOLICYVER 1.29.1-1 +%define CHECKPOLICYVER 1.30.1-2 Summary: SELinux policy configuration Name: selinux-policy Version: 2.2.28 From fedora-cvs-commits at redhat.com Mon Mar 27 22:47:16 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 27 Mar 2006 17:47:16 -0500 Subject: rpms/selinux-policy/devel .cvsignore,1.51,1.52 sources,1.55,1.56 Message-ID: <200603272247.k2RMlGae025811@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/selinux-policy/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv25796 Modified Files: .cvsignore sources Log Message: * Mon Mar 27 2006 Dan Walsh 2.2.28-1 - Update to upstream Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/.cvsignore,v retrieving revision 1.51 retrieving revision 1.52 diff -u -r1.51 -r1.52 --- .cvsignore 27 Mar 2006 22:07:37 -0000 1.51 +++ .cvsignore 27 Mar 2006 22:47:14 -0000 1.52 @@ -52,3 +52,4 @@ serefpolicy-2.2.25.tgz serefpolicy-2.2.26.tgz serefpolicy-2.2.27.tgz +serefpolicy-2.2.28.tgz Index: sources =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/sources,v retrieving revision 1.55 retrieving revision 1.56 diff -u -r1.55 -r1.56 --- sources 27 Mar 2006 22:07:37 -0000 1.55 +++ sources 27 Mar 2006 22:47:14 -0000 1.56 @@ -1 +1 @@ -6291a19a03cf7d618816142e36a23913 serefpolicy-2.2.27.tgz +6bb1dd9bdc2e31b1b1980cc2ed41dc8e serefpolicy-2.2.28.tgz From fedora-cvs-commits at redhat.com Tue Mar 28 00:09:35 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 27 Mar 2006 19:09:35 -0500 Subject: rpms/kernel/FC-5 kernel-2.6.spec,1.2078,1.2079 Message-ID: <200603280009.k2S09Zhh007963@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv7950 Modified Files: kernel-2.6.spec Log Message: dont care for older releases Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-5/kernel-2.6.spec,v retrieving revision 1.2078 retrieving revision 1.2079 diff -u -r1.2078 -r1.2079 --- kernel-2.6.spec 27 Mar 2006 21:35:04 -0000 1.2078 +++ kernel-2.6.spec 28 Mar 2006 00:09:32 -0000 1.2079 @@ -1173,7 +1173,6 @@ make -s ARCH=$Arch nonint_oldconfig > /dev/null make -s ARCH=$Arch %{?_smp_mflags} $MakeTarget make -s ARCH=$Arch %{?_smp_mflags} modules || exit 1 - make ARCH=$Arch buildcheck # Start installing the results From fedora-cvs-commits at redhat.com Tue Mar 28 00:35:03 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 27 Mar 2006 19:35:03 -0500 Subject: rpms/xterm/devel xterm-211-bz186935.patch,NONE,1.1 Message-ID: <200603280035.k2S0Z3oc021904@cvs.devel.redhat.com> Author: jvdias Update of /cvs/dist/rpms/xterm/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv21890 Added Files: xterm-211-bz186935.patch Log Message: fix potential double free on ReverseVideo() / screen flash xterm-211-bz186935.patch: charproc.c | 29 +++++++++++++++++++++++------ 1 files changed, 23 insertions(+), 6 deletions(-) --- NEW FILE xterm-211-bz186935.patch --- --- xterm-211/charproc.c.bz186935 2006-03-27 14:59:36.000000000 -0500 +++ xterm-211/charproc.c 2006-03-27 15:00:55.000000000 -0500 @@ -5762,14 +5762,31 @@ static void releaseCursorGCs(TScreen * screen) { - if (screen->cursorGC) - XFreeGC(screen->display, screen->cursorGC); - if (screen->fillCursorGC) - XFreeGC(screen->display, screen->fillCursorGC); - if (screen->reversecursorGC) + GC cursorGC=screen->cursorGC, fillCursorGC=screen->fillCursorGC, + reverseCursorGC=screen->reversecursorGC, cursorOutlineGC=screen->cursoroutlineGC; + + if ( cursorGC ) + XFreeGC(screen->display, cursorGC); + screen->cursorGC = 0; + + if ( fillCursorGC && (fillCursorGC != cursorGC)) + XFreeGC(screen->display, fillCursorGC); + screen->fillCursorGC = 0; + + if ( reverseCursorGC + &&( reverseCursorGC != cursorGC ) + &&( reverseCursorGC != fillCursorGC ) + ) XFreeGC(screen->display, screen->reversecursorGC); - if (screen->cursoroutlineGC) + screen->reversecursorGC = 0; + + if ( cursorOutlineGC + && ( cursorOutlineGC != cursorGC ) + && ( cursorOutlineGC != fillCursorGC ) + && ( cursorOutlineGC != reverseCursorGC ) + ) XFreeGC(screen->display, screen->cursoroutlineGC); + screen->cursoroutlineGC = 0; } #ifdef NO_LEAKS From fedora-cvs-commits at redhat.com Tue Mar 28 01:14:38 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 27 Mar 2006 20:14:38 -0500 Subject: rpms/spamassassin/devel spamassassin-3.1.1-nls-spamd-init.patch, NONE, 1.1 spamassassin.spec, 1.62, 1.63 spamassassin-3.1.0-nls-spamd-init.patch, 1.1, NONE Message-ID: <200603280114.k2S1EcLX003438@cvs.devel.redhat.com> Author: wtogami Update of /cvs/dist/rpms/spamassassin/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv3421 Modified Files: spamassassin.spec Added Files: spamassassin-3.1.1-nls-spamd-init.patch Removed Files: spamassassin-3.1.0-nls-spamd-init.patch Log Message: 3.1.1 spamassassin-3.1.1-nls-spamd-init.patch: redhat-rc-script.sh | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) --- NEW FILE spamassassin-3.1.1-nls-spamd-init.patch --- diff -urN Mail-SpamAssassin-3.1.1.orig/spamd/redhat-rc-script.sh Mail-SpamAssassin-3.1.1/spamd/redhat-rc-script.sh --- Mail-SpamAssassin-3.1.1.orig/spamd/redhat-rc-script.sh 2006-03-10 21:37:38.000000000 -0500 +++ Mail-SpamAssassin-3.1.1/spamd/redhat-rc-script.sh 2006-03-11 20:53:00.000000000 -0500 @@ -11,6 +11,8 @@ # Source function library. . /etc/rc.d/init.d/functions +prog="spamd" + # Source networking configuration. . /etc/sysconfig/network @@ -36,7 +38,7 @@ case "$1" in start) # Start daemon. - echo -n "Starting spamd: " + echo -n $"Starting $prog: " daemon $NICELEVEL spamd $SPAMDOPTIONS -r $SPAMD_PID RETVAL=$? echo @@ -46,7 +48,7 @@ ;; stop) # Stop daemons. - echo -n "Shutting down spamd: " + echo -n $"Stopping $prog: " killproc spamd RETVAL=$? echo Index: spamassassin.spec =================================================================== RCS file: /cvs/dist/rpms/spamassassin/devel/spamassassin.spec,v retrieving revision 1.62 retrieving revision 1.63 diff -u -r1.62 -r1.63 --- spamassassin.spec 11 Feb 2006 05:42:56 -0000 1.62 +++ spamassassin.spec 28 Mar 2006 01:14:35 -0000 1.63 @@ -5,8 +5,8 @@ Summary: Spam filter for email which can be invoked from mail delivery agents. Name: spamassassin -Version: 3.1.0 -Release: 5.fc5.2 +Version: 3.1.1 +Release: 1.fc6 License: Apache License Group: Applications/Internet URL: http://spamassassin.apache.org/ @@ -19,7 +19,7 @@ # Patches 0-99 are RH specific # none yet # Patches 100+ are SVN backports (DO NOT REUSE!) -Patch122: spamassassin-3.1.0-nls-spamd-init.patch +Patch123: spamassassin-3.1.1-nls-spamd-init.patch # end of patches Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) Buildroot: %{_tmppath}/%{name}-root @@ -61,7 +61,7 @@ # Patches 0-99 are RH specific # none yet # Patches 100+ are SVN backports (DO NOT REUSE!) -%patch122 -p1 +%patch123 -p1 # end of patches %build @@ -149,10 +149,13 @@ exit 0 %changelog -* Fri Feb 10 2006 Jesse Keating - 3.1.0-5.fc5.2 +* Mon Mar 11 2006 Warren Togami - 3.1.1-1 +- 3.1.1 + +* Fri Feb 10 2006 Jesse Keating - 3.1.0-5 - bump again for double-long bug on ppc(64) -* Tue Feb 07 2006 Jesse Keating - 3.1.0-5.fc5.1 +* Tue Feb 07 2006 Jesse Keating - 3.1.0-5 - rebuilt for new gcc4.1 snapshot and glibc changes * Wed Jan 18 2006 Warren Togami - 3.1.0-5 --- spamassassin-3.1.0-nls-spamd-init.patch DELETED --- From fedora-cvs-commits at redhat.com Tue Mar 28 01:25:15 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 27 Mar 2006 20:25:15 -0500 Subject: rpms/spamassassin/devel .cvsignore,1.27,1.28 sources,1.26,1.27 Message-ID: <200603280125.k2S1PFJ9017444@cvs.devel.redhat.com> Author: wtogami Update of /cvs/dist/rpms/spamassassin/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv17430 Modified Files: .cvsignore sources Log Message: add the sources Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/spamassassin/devel/.cvsignore,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- .cvsignore 14 Sep 2005 07:39:55 -0000 1.27 +++ .cvsignore 28 Mar 2006 01:25:13 -0000 1.28 @@ -1 +1 @@ -Mail-SpamAssassin-3.1.0.tar.bz2 +Mail-SpamAssassin-3.1.1.tar.bz2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/spamassassin/devel/sources,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- sources 14 Sep 2005 07:39:55 -0000 1.26 +++ sources 28 Mar 2006 01:25:13 -0000 1.27 @@ -1 +1 @@ -d28bd7e83d01b234144e336bbfde0caa Mail-SpamAssassin-3.1.0.tar.bz2 +33bc2bef2619135125ccf3b5a663be1d Mail-SpamAssassin-3.1.1.tar.bz2 From fedora-cvs-commits at redhat.com Tue Mar 28 03:37:57 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 27 Mar 2006 22:37:57 -0500 Subject: rpms/spamassassin/FC-5 spamassassin-3.1.1-nls-spamd-init.patch, NONE, 1.1 .cvsignore, 1.27, 1.28 sources, 1.26, 1.27 spamassassin.spec, 1.62, 1.63 spamassassin-3.1.0-nls-spamd-init.patch, 1.1, NONE Message-ID: <200603280337.k2S3bvO7008496@cvs.devel.redhat.com> Author: wtogami Update of /cvs/dist/rpms/spamassassin/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv8479 Modified Files: .cvsignore sources spamassassin.spec Added Files: spamassassin-3.1.1-nls-spamd-init.patch Removed Files: spamassassin-3.1.0-nls-spamd-init.patch Log Message: 3.1.1 with a whole bunch of bug fixes spamassassin-3.1.1-nls-spamd-init.patch: redhat-rc-script.sh | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) --- NEW FILE spamassassin-3.1.1-nls-spamd-init.patch --- diff -urN Mail-SpamAssassin-3.1.1.orig/spamd/redhat-rc-script.sh Mail-SpamAssassin-3.1.1/spamd/redhat-rc-script.sh --- Mail-SpamAssassin-3.1.1.orig/spamd/redhat-rc-script.sh 2006-03-10 21:37:38.000000000 -0500 +++ Mail-SpamAssassin-3.1.1/spamd/redhat-rc-script.sh 2006-03-11 20:53:00.000000000 -0500 @@ -11,6 +11,8 @@ # Source function library. . /etc/rc.d/init.d/functions +prog="spamd" + # Source networking configuration. . /etc/sysconfig/network @@ -36,7 +38,7 @@ case "$1" in start) # Start daemon. - echo -n "Starting spamd: " + echo -n $"Starting $prog: " daemon $NICELEVEL spamd $SPAMDOPTIONS -r $SPAMD_PID RETVAL=$? echo @@ -46,7 +48,7 @@ ;; stop) # Stop daemons. - echo -n "Shutting down spamd: " + echo -n $"Stopping $prog: " killproc spamd RETVAL=$? echo Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/spamassassin/FC-5/.cvsignore,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- .cvsignore 14 Sep 2005 07:39:55 -0000 1.27 +++ .cvsignore 28 Mar 2006 03:37:54 -0000 1.28 @@ -1 +1 @@ -Mail-SpamAssassin-3.1.0.tar.bz2 +Mail-SpamAssassin-3.1.1.tar.bz2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/spamassassin/FC-5/sources,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- sources 14 Sep 2005 07:39:55 -0000 1.26 +++ sources 28 Mar 2006 03:37:54 -0000 1.27 @@ -1 +1 @@ -d28bd7e83d01b234144e336bbfde0caa Mail-SpamAssassin-3.1.0.tar.bz2 +33bc2bef2619135125ccf3b5a663be1d Mail-SpamAssassin-3.1.1.tar.bz2 Index: spamassassin.spec =================================================================== RCS file: /cvs/dist/rpms/spamassassin/FC-5/spamassassin.spec,v retrieving revision 1.62 retrieving revision 1.63 diff -u -r1.62 -r1.63 --- spamassassin.spec 11 Feb 2006 05:42:56 -0000 1.62 +++ spamassassin.spec 28 Mar 2006 03:37:54 -0000 1.63 @@ -5,8 +5,8 @@ Summary: Spam filter for email which can be invoked from mail delivery agents. Name: spamassassin -Version: 3.1.0 -Release: 5.fc5.2 +Version: 3.1.1 +Release: 1.fc6 License: Apache License Group: Applications/Internet URL: http://spamassassin.apache.org/ @@ -19,7 +19,7 @@ # Patches 0-99 are RH specific # none yet # Patches 100+ are SVN backports (DO NOT REUSE!) -Patch122: spamassassin-3.1.0-nls-spamd-init.patch +Patch123: spamassassin-3.1.1-nls-spamd-init.patch # end of patches Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) Buildroot: %{_tmppath}/%{name}-root @@ -61,7 +61,7 @@ # Patches 0-99 are RH specific # none yet # Patches 100+ are SVN backports (DO NOT REUSE!) -%patch122 -p1 +%patch123 -p1 # end of patches %build @@ -149,10 +149,13 @@ exit 0 %changelog -* Fri Feb 10 2006 Jesse Keating - 3.1.0-5.fc5.2 +* Mon Mar 11 2006 Warren Togami - 3.1.1-1 +- 3.1.1 + +* Fri Feb 10 2006 Jesse Keating - 3.1.0-5 - bump again for double-long bug on ppc(64) -* Tue Feb 07 2006 Jesse Keating - 3.1.0-5.fc5.1 +* Tue Feb 07 2006 Jesse Keating - 3.1.0-5 - rebuilt for new gcc4.1 snapshot and glibc changes * Wed Jan 18 2006 Warren Togami - 3.1.0-5 --- spamassassin-3.1.0-nls-spamd-init.patch DELETED --- From fedora-cvs-commits at redhat.com Tue Mar 28 03:42:42 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 27 Mar 2006 22:42:42 -0500 Subject: rpms/spamassassin/FC-5 spamassassin.spec,1.63,1.64 Message-ID: <200603280342.k2S3ggZq008574@cvs.devel.redhat.com> Author: wtogami Update of /cvs/dist/rpms/spamassassin/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv8561 Modified Files: spamassassin.spec Log Message: Fix dist tag Index: spamassassin.spec =================================================================== RCS file: /cvs/dist/rpms/spamassassin/FC-5/spamassassin.spec,v retrieving revision 1.63 retrieving revision 1.64 diff -u -r1.63 -r1.64 --- spamassassin.spec 28 Mar 2006 03:37:54 -0000 1.63 +++ spamassassin.spec 28 Mar 2006 03:42:40 -0000 1.64 @@ -6,7 +6,7 @@ Summary: Spam filter for email which can be invoked from mail delivery agents. Name: spamassassin Version: 3.1.1 -Release: 1.fc6 +Release: 1.fc5 License: Apache License Group: Applications/Internet URL: http://spamassassin.apache.org/ From fedora-cvs-commits at redhat.com Tue Mar 28 08:27:59 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 28 Mar 2006 03:27:59 -0500 Subject: rpms/kernel/FC-5 patch-2.6.16.1.bz2.sign, NONE, 1.1 kernel-2.6.spec, 1.2079, 1.2080 upstream, 1.297, 1.298 linux-2.6.16.1pre.patch, 1.1, NONE Message-ID: <200603280827.k2S8RxqC018322@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv18308 Modified Files: kernel-2.6.spec upstream Added Files: patch-2.6.16.1.bz2.sign Removed Files: linux-2.6.16.1pre.patch Log Message: .1 final --- NEW FILE patch-2.6.16.1.bz2.sign --- -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.2.2 (GNU/Linux) Comment: See http://www.kernel.org/signature.html for info iD8DBQBEKOe7yGugalF9Dw4RAuspAJ4myTbOD6spwBjJBFamnyRhDTuUqACfaFoh asbJhu1RZthQXm/RQ0Jdf/Y= =g52y -----END PGP SIGNATURE----- Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-5/kernel-2.6.spec,v retrieving revision 1.2079 retrieving revision 1.2080 diff -u -r1.2079 -r1.2080 --- kernel-2.6.spec 28 Mar 2006 00:09:32 -0000 1.2079 +++ kernel-2.6.spec 28 Mar 2006 08:27:56 -0000 1.2080 @@ -217,7 +217,7 @@ # # Patches 0 through 100 are meant for core subsystem upgrades # -Patch1: linux-2.6.16.1pre.patch +Patch1: patch-2.6.16.1.bz2 # Patches 100 through 500 are meant for architecture patches Patch100: linux-2.6-bzimage.patch @@ -1676,6 +1676,9 @@ %endif %changelog +* Tue Mar 26 2006 Dave Jones +- 2.6.16.1 + * Mon Mar 25 2006 Dave Jones - Include patches posted for review for inclusion in 2.6.16.1 - Updated new audit msg types. Index: upstream =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-5/upstream,v retrieving revision 1.297 retrieving revision 1.298 diff -u -r1.297 -r1.298 --- upstream 20 Mar 2006 07:00:29 -0000 1.297 +++ upstream 28 Mar 2006 08:27:56 -0000 1.298 @@ -1 +1,3 @@ linux-2.6.16.tar.bz2 +patch-2.6.16.1.bz2 + --- linux-2.6.16.1pre.patch DELETED --- From fedora-cvs-commits at redhat.com Tue Mar 28 08:28:20 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 28 Mar 2006 03:28:20 -0500 Subject: rpms/kernel/FC-5 .cvsignore,1.383,1.384 sources,1.324,1.325 Message-ID: <200603280828.k2S8SKu4018350@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv18336 Modified Files: .cvsignore sources Log Message: upload Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-5/.cvsignore,v retrieving revision 1.383 retrieving revision 1.384 diff -u -r1.383 -r1.384 --- .cvsignore 20 Mar 2006 07:00:18 -0000 1.383 +++ .cvsignore 28 Mar 2006 08:28:18 -0000 1.384 @@ -3,3 +3,4 @@ kernel-2.6.16 xen-20060301.tar.bz2 linux-2.6.16.tar.bz2 +patch-2.6.16.1.bz2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-5/sources,v retrieving revision 1.324 retrieving revision 1.325 diff -u -r1.324 -r1.325 --- sources 20 Mar 2006 07:00:29 -0000 1.324 +++ sources 28 Mar 2006 08:28:18 -0000 1.325 @@ -1,2 +1,3 @@ 9a91b2719949ff0856b40bc467fd47be linux-2.6.16.tar.bz2 cdfde609af8adcf58d7ff626599b2d90 xen-20060301.tar.bz2 +9ffe7df0263d5e4ba5007237c848c97a patch-2.6.16.1.bz2 From fedora-cvs-commits at redhat.com Tue Mar 28 10:09:28 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 28 Mar 2006 05:09:28 -0500 Subject: rpms/openoffice.org/devel openoffice.org-2.0.2.ooo63583.sd.accessibility.patch, 1.1, 1.2 Message-ID: <200603281009.k2SA9Spg028238@cvs.devel.redhat.com> Author: caolanm Update of /cvs/dist/rpms/openoffice.org/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv28221 Modified Files: openoffice.org-2.0.2.ooo63583.sd.accessibility.patch Log Message: more accessibility fixes openoffice.org-2.0.2.ooo63583.sd.accessibility.patch: sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx | 2 sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx | 19 ++++- source/accessibility/ChildrenManagerImpl.cxx | 0 source/ui/accessibility/AccessibleDrawDocumentView.cxx | 0 source/ui/slidesorter/shell/SlideSorterViewShell.cxx | 0 svx/source/accessibility/ChildrenManagerImpl.cxx | 47 ++++++++------ 6 files changed, 46 insertions(+), 22 deletions(-) Index: openoffice.org-2.0.2.ooo63583.sd.accessibility.patch =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org-2.0.2.ooo63583.sd.accessibility.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- openoffice.org-2.0.2.ooo63583.sd.accessibility.patch 24 Mar 2006 14:53:21 -0000 1.1 +++ openoffice.org-2.0.2.ooo63583.sd.accessibility.patch 28 Mar 2006 10:09:24 -0000 1.2 @@ -47,3 +47,74 @@ delete mpChildrenManager; mpChildrenManager = NULL; } +Index: source/accessibility/ChildrenManagerImpl.cxx +=================================================================== +RCS file: /cvs/graphics/svx/source/accessibility/ChildrenManagerImpl.cxx,v +retrieving revision 1.33 +diff -u -r1.33 ChildrenManagerImpl.cxx +--- openoffice.org.orig/svx/source/accessibility/ChildrenManagerImpl.cxx 8 Sep 2005 20:20:26 -0000 1.33 ++++ openoffice.org/svx/source/accessibility/ChildrenManagerImpl.cxx 28 Mar 2006 10:07:40 -0000 +@@ -537,34 +537,45 @@ + + void ChildrenManagerImpl::ClearAccessibleShapeList (void) + { ++ // Copy the list of (visible) shapes to local lists and clear the ++ // originals. ++ ChildDescriptorListType aLocalVisibleChildren; ++ aLocalVisibleChildren.swap(maVisibleChildren); ++ AccessibleShapeList aLocalAccessibleShapes; ++ aLocalAccessibleShapes.swap(maAccessibleShapes); ++ ++ // Tell the listeners that all children are gone. ++ mrContext.CommitChange ( ++ AccessibleEventId::INVALIDATE_ALL_CHILDREN, ++ uno::Any(), ++ uno::Any()); ++ ++ // There are no accessible shapes left so the index assigned to new ++ // accessible shapes can be reset. ++ mnNewNameIndex = 1; ++ ++ // Now the objects in the local lists can be safely disposed without ++ // having problems with callers that want to update their child lists. ++ + // Clear the list of visible accessible objects. Objects not created on + // demand for XShapes are treated below. +- ChildDescriptorListType::iterator I,aEnd = maVisibleChildren.end(); +- for (I=maVisibleChildren.begin(); I != aEnd; ++I) ++ ChildDescriptorListType::iterator I,aEnd = aLocalVisibleChildren.end(); ++ for (I=aLocalVisibleChildren.begin(); I != aEnd; ++I) + if ( I->mxAccessibleShape.is() && I->mxShape.is() ) +- I->disposeAccessibleObject(mrContext); +- +- maVisibleChildren.clear (); +- ++ { ++ ::comphelper::disposeComponent(I->mxAccessibleShape); ++ I->mxAccessibleShape = NULL; ++ } + + // Dispose all objects in the accessible shape list. +- AccessibleShapeList::iterator J,aEnd2 = maAccessibleShapes.end(); +- for (J=maAccessibleShapes.begin(); J != aEnd2; ++J) ++ AccessibleShapeList::iterator J,aEnd2 = aLocalAccessibleShapes.end(); ++ for (J=aLocalAccessibleShapes.begin(); J != aEnd2; ++J) + if (J->is()) + { +- mrContext.CommitChange ( +- AccessibleEventId::CHILD, +- uno::Any(), +- uno::makeAny (*J)); +- + // Dispose the object. + ::comphelper::disposeComponent(*J); ++ *J = NULL; + } +- maAccessibleShapes.clear (); +- +- // Now that no accessible shapes remain we can reset the index assigned +- // to new accessible shapes. +- mnNewNameIndex = 1; + } + + From fedora-cvs-commits at redhat.com Tue Mar 28 10:10:26 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 28 Mar 2006 05:10:26 -0500 Subject: rpms/openoffice.org/FC-5 openoffice.org-2.0.2.ooo63583.sd.accessibility.patch, 1.1, 1.2 Message-ID: <200603281010.k2SAAQFC028284@cvs.devel.redhat.com> Author: caolanm Update of /cvs/dist/rpms/openoffice.org/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv28270 Modified Files: openoffice.org-2.0.2.ooo63583.sd.accessibility.patch Log Message: more accessibility fixes openoffice.org-2.0.2.ooo63583.sd.accessibility.patch: sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx | 2 sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx | 19 ++++- source/accessibility/ChildrenManagerImpl.cxx | 0 source/ui/accessibility/AccessibleDrawDocumentView.cxx | 0 source/ui/slidesorter/shell/SlideSorterViewShell.cxx | 0 svx/source/accessibility/ChildrenManagerImpl.cxx | 47 ++++++++------ 6 files changed, 46 insertions(+), 22 deletions(-) Index: openoffice.org-2.0.2.ooo63583.sd.accessibility.patch =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/FC-5/openoffice.org-2.0.2.ooo63583.sd.accessibility.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- openoffice.org-2.0.2.ooo63583.sd.accessibility.patch 24 Mar 2006 14:52:39 -0000 1.1 +++ openoffice.org-2.0.2.ooo63583.sd.accessibility.patch 28 Mar 2006 10:10:22 -0000 1.2 @@ -47,3 +47,74 @@ delete mpChildrenManager; mpChildrenManager = NULL; } +Index: source/accessibility/ChildrenManagerImpl.cxx +=================================================================== +RCS file: /cvs/graphics/svx/source/accessibility/ChildrenManagerImpl.cxx,v +retrieving revision 1.33 +diff -u -r1.33 ChildrenManagerImpl.cxx +--- openoffice.org.orig/svx/source/accessibility/ChildrenManagerImpl.cxx 8 Sep 2005 20:20:26 -0000 1.33 ++++ openoffice.org/svx/source/accessibility/ChildrenManagerImpl.cxx 28 Mar 2006 10:07:40 -0000 +@@ -537,34 +537,45 @@ + + void ChildrenManagerImpl::ClearAccessibleShapeList (void) + { ++ // Copy the list of (visible) shapes to local lists and clear the ++ // originals. ++ ChildDescriptorListType aLocalVisibleChildren; ++ aLocalVisibleChildren.swap(maVisibleChildren); ++ AccessibleShapeList aLocalAccessibleShapes; ++ aLocalAccessibleShapes.swap(maAccessibleShapes); ++ ++ // Tell the listeners that all children are gone. ++ mrContext.CommitChange ( ++ AccessibleEventId::INVALIDATE_ALL_CHILDREN, ++ uno::Any(), ++ uno::Any()); ++ ++ // There are no accessible shapes left so the index assigned to new ++ // accessible shapes can be reset. ++ mnNewNameIndex = 1; ++ ++ // Now the objects in the local lists can be safely disposed without ++ // having problems with callers that want to update their child lists. ++ + // Clear the list of visible accessible objects. Objects not created on + // demand for XShapes are treated below. +- ChildDescriptorListType::iterator I,aEnd = maVisibleChildren.end(); +- for (I=maVisibleChildren.begin(); I != aEnd; ++I) ++ ChildDescriptorListType::iterator I,aEnd = aLocalVisibleChildren.end(); ++ for (I=aLocalVisibleChildren.begin(); I != aEnd; ++I) + if ( I->mxAccessibleShape.is() && I->mxShape.is() ) +- I->disposeAccessibleObject(mrContext); +- +- maVisibleChildren.clear (); +- ++ { ++ ::comphelper::disposeComponent(I->mxAccessibleShape); ++ I->mxAccessibleShape = NULL; ++ } + + // Dispose all objects in the accessible shape list. +- AccessibleShapeList::iterator J,aEnd2 = maAccessibleShapes.end(); +- for (J=maAccessibleShapes.begin(); J != aEnd2; ++J) ++ AccessibleShapeList::iterator J,aEnd2 = aLocalAccessibleShapes.end(); ++ for (J=aLocalAccessibleShapes.begin(); J != aEnd2; ++J) + if (J->is()) + { +- mrContext.CommitChange ( +- AccessibleEventId::CHILD, +- uno::Any(), +- uno::makeAny (*J)); +- + // Dispose the object. + ::comphelper::disposeComponent(*J); ++ *J = NULL; + } +- maAccessibleShapes.clear (); +- +- // Now that no accessible shapes remain we can reset the index assigned +- // to new accessible shapes. +- mnNewNameIndex = 1; + } + + From fedora-cvs-commits at redhat.com Tue Mar 28 10:15:54 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 28 Mar 2006 05:15:54 -0500 Subject: rpms/glibc/devel .cvsignore, 1.143, 1.144 glibc-fedora.patch, 1.146, 1.147 glibc.spec, 1.232, 1.233 sources, 1.167, 1.168 Message-ID: <200603281015.k2SAFsW8031631@cvs.devel.redhat.com> Author: jakub Update of /cvs/dist/rpms/glibc/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv30220 Modified Files: .cvsignore glibc-fedora.patch glibc.spec sources Log Message: 2.4-5 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/glibc/devel/.cvsignore,v retrieving revision 1.143 retrieving revision 1.144 diff -u -r1.143 -r1.144 --- .cvsignore 6 Mar 2006 13:33:54 -0000 1.143 +++ .cvsignore 28 Mar 2006 10:15:50 -0000 1.144 @@ -1,2 +1,2 @@ -glibc-20060306T1239.tar.bz2 -glibc-fedora-20060306T1239.tar.bz2 +glibc-20060328T0900.tar.bz2 +glibc-fedora-20060328T0900.tar.bz2 glibc-fedora.patch: ChangeLog | 96 +++ ChangeLog.11 | 21 ChangeLog.12 | 12 ChangeLog.15 | 45 + csu/elf-init.c | 17 debug/tst-chk1.c | 7 elf/ldconfig.c | 25 elf/tst-stackguard1.c | 8 iconv/iconvconfig.c | 55 - include/bits/stdlib-ldbl.h | 1 include/bits/wchar-ldbl.h | 1 include/features.h | 8 intl/locale.alias | 2 libio/bits/stdio2.h | 19 libio/stdio.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/no_NO | 69 ++ localedata/locales/zh_TW | 6 malloc/mcheck.c | 30 - malloc/mtrace.c | 20 nptl/ChangeLog | 19 nptl/Makefile | 8 nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S | 61 +- nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevelrobustlock.S | 45 + nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h | 242 +++++--- nptl/sysdeps/unix/sysv/linux/kernel-features.h | 6 nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S | 59 +- nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h | 294 +++++++--- nptl/sysdeps/unix/sysv/linux/x86_64/lowlevelrobustlock.S | 41 + nptl/tst-stackguard1.c | 8 nscd/connections.c | 15 nscd/nscd.c | 4 nscd/nscd.conf | 4 nscd/nscd.init | 19 posix/Makefile | 19 posix/getconf.speclist.h | 15 sysdeps/generic/dl-cache.h | 8 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/fcntl.h | 8 sysdeps/unix/sysv/linux/dl-osinfo.h | 29 sysdeps/unix/sysv/linux/futimesat.c | 23 sysdeps/unix/sysv/linux/i386/bits/fcntl.h | 8 sysdeps/unix/sysv/linux/i386/dl-cache.h | 59 ++ sysdeps/unix/sysv/linux/ia64/bits/fcntl.h | 8 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/fcntl.h | 8 sysdeps/unix/sysv/linux/s390/bits/fcntl.h | 8 sysdeps/unix/sysv/linux/sh/bits/fcntl.h | 8 sysdeps/unix/sysv/linux/sparc/bits/fcntl.h | 8 sysdeps/unix/sysv/linux/tcsetattr.c | 32 + sysdeps/unix/sysv/linux/x86_64/bits/fcntl.h | 8 63 files changed, 1385 insertions(+), 686 deletions(-) View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.146 -r 1.147 glibc-fedora.patch Index: glibc-fedora.patch =================================================================== RCS file: /cvs/dist/rpms/glibc/devel/glibc-fedora.patch,v retrieving revision 1.146 retrieving revision 1.147 diff -u -r1.146 -r1.147 --- glibc-fedora.patch 7 Mar 2006 13:39:01 -0000 1.146 +++ glibc-fedora.patch 28 Mar 2006 10:15:50 -0000 1.147 @@ -1,50 +1,6 @@ ---- glibc-20060306T1239/ChangeLog 6 Mar 2006 10:59:43 -0000 1.10062 -+++ glibc-20060306T1239-fedora/ChangeLog 7 Mar 2006 13:28:11 -0000 1.8782.2.174 -@@ -1,3 +1,43 @@ -+2006-03-07 Jakub Jelinek -+ -+ * math/libm-test.inc [TEST_LDOUBLE] (ceil_test, floor_test, rint_test, -+ round_test, trunc_test): Only run some of the new tests if -+ LDBL_MANT_DIG > 100. -+ -+2006-03-03 Steven Munroe -+ Alan Modra -+ -+ [BZ #2423] -+ * math/libm-test.inc [TEST_LDOUBLE] (ceil_test, floor_test, rint_test, -+ round_test, trunc_test): Add new tests. -+ -+ * sysdeps/powerpc/fpu/fenv_libc.h (__fegetround, __fesetround): -+ Define inline implementations. -+ * sysdeps/powerpc/fpu/fegetround.c: Use __fegetround. -+ * sysdeps/powerpc/fpu/fesetround.c: Use __fesetround. -+ -+ * sysdeps/ieee754/ldbl-128ibm/math_ldbl.h -+ (EXTRACT_IBM_EXTENDED_MANTISSA, INSERT_IBM_EXTENDED_MANTISSA): -+ Removed, replaced with. -+ (ldbl_extract_mantissa, ldbl_insert_mantissa, ldbl_pack, ldbl_unpack, -+ ldbl_canonicalise, ldbl_nearbyint): Define inline utility -+ functions for IBM long double format. -+ * sysdeps/ieee754/ldbl-128ibm/e_fmodl.c (__ieee754_fmodl): Replace -+ EXTRACT_IBM_EXTENDED_MANTISSA and INSERT_IBM_EXTENDED_MANTISSA -+ with ldbl_extract_mantissa and ldbl_insert_mantissa. -+ * sysdeps/ieee754/ldbl-128ibm/e_rem_pio2l.c (__ieee754_rem_pio2l): -+ Replace EXTRACT_IBM_EXTENDED_MANTISSA with ldbl_extract_mantissa. -+ (ldbl_extract_mantissa, ldbl_insert_mantissa): Defined. -+ -+ * sysdeps/ieee754/ldbl-128ibm/s_ceill.c (__ceill): Handle rounding -+ that spans doubles in IBM long double format. -+ * sysdeps/ieee754/ldbl-128ibm/s_floorl.c: Likewise. -+ * sysdeps/ieee754/ldbl-128ibm/s_rintl.c: Likewise. -+ * sysdeps/ieee754/ldbl-128ibm/s_roundl.c: Likewise. -+ * sysdeps/ieee754/ldbl-128ibm/s_truncl.c: Likewise. -+ * sysdeps/powerpc/fpu/math_ldbl.h: New file. -+ * sysdeps/powerpc/powerpc64/fpu/s_rintl.S: Removed. -+ - 2006-03-06 Roland McGrath - - * version.h (VERSION): 2.4 -@@ -18,6 +58,34 @@ +--- glibc-20060328T0900/ChangeLog 28 Mar 2006 04:31:31 -0000 1.10076 ++++ glibc-20060328T0900-fedora/ChangeLog 28 Mar 2006 09:36:21 -0000 1.8782.2.175 +@@ -206,6 +206,34 @@ _SC_CPUTIME and _SC_THREAD_CPUTIME here. * sysdeps/unix/sysv/linux/x86_64/sysconf.c (__sysconf): Likewise. @@ -79,7 +35,7 @@ 2006-03-05 Roland McGrath * malloc/malloc.c (MALLOC_ALIGNMENT): Revert to (2 * SIZE_SZ) value. -@@ -1030,6 +1098,11 @@ +@@ -1218,6 +1246,11 @@ (__MATHDECL_2): Use __REDIRECT_NTH instead of __REDIRECT followed by __THROW. @@ -91,7 +47,7 @@ 2006-02-02 Ulrich Drepper * sysdeps/unix/sysv/linux/futimesat.c [__NR_futimesat] -@@ -1089,6 +1162,11 @@ +@@ -1277,6 +1310,11 @@ * sysdeps/ieee754/ldbl-128/s_llrintl.c (__llrintl): Fix a typo. * sysdeps/s390/fpu/libm-test-ulps: Remove llrint ulps. @@ -103,7 +59,7 @@ 2006-01-19 Thomas Schwinge * libio/genops.c: Include . -@@ -3515,6 +3593,10 @@ +@@ -3703,6 +3741,10 @@ * elf/order2mod2.c (init): Cast ignored value to void. @@ -114,7 +70,7 @@ 2005-12-27 Ulrich Drepper * elf/tst-tls13.c (do_test): Avoid using the library path when -@@ -3798,6 +3880,26 @@ +@@ -3986,6 +4028,26 @@ * sysdeps/unix/sysv/linux/time.c: If __NR_time is not defined, use sysdeps/unix/time.c implementation. @@ -141,7 +97,7 @@ 2005-12-19 Ulrich Drepper [BZ #1955] -@@ -6916,6 +7018,11 @@ +@@ -7104,6 +7166,11 @@ R_ARM_TLS_TPOFF32, R_ARM_TLS_GD32, R_ARM_TLS_LDM32, R_ARM_TLS_LDO32, R_ARM_TLS_IE32, R_ARM_TLS_LE32): New macros. @@ -153,7 +109,7 @@ 2005-10-03 Roland McGrath * sysdeps/powerpc/nofpu: Directory removed, saved in ports repository. -@@ -7910,6 +8017,12 @@ +@@ -8098,6 +8165,12 @@ * argp/argp-help.c (__argp_error): __asprintf -> vasprintf. (__argp_failure): Likewise. @@ -166,7 +122,7 @@ 2005-08-08 Ulrich Drepper * nscd/cache.c (cache_add): Commit hash table and header to disk. -@@ -8034,6 +8147,17 @@ +@@ -8222,6 +8295,17 @@ __syslog_chk. * misc/Versions: Export __syslog_chk and __vsyslog_chk. @@ -184,7 +140,7 @@ 2005-07-28 Thomas Schwinge [BZ #1137] -@@ -11094,6 +11218,18 @@ +@@ -11282,6 +11366,18 @@ * scripts/soversions.awk: Fix default version set handling. @@ -203,8 +159,8 @@ 2005-02-10 Roland McGrath [BZ #157] ---- glibc-20060306T1239/ChangeLog.11 10 Nov 2000 03:31:36 -0000 1.1 -+++ glibc-20060306T1239-fedora/ChangeLog.11 22 Sep 2004 21:20:47 -0000 1.1.4.1 +--- glibc-20060328T0900/ChangeLog.11 10 Nov 2000 03:31:36 -0000 1.1 ++++ glibc-20060328T0900-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. @@ -254,8 +210,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-20060306T1239/ChangeLog.12 16 Aug 2001 05:24:54 -0000 1.1 -+++ glibc-20060306T1239-fedora/ChangeLog.12 22 Sep 2004 21:20:47 -0000 1.1.4.1 +--- glibc-20060328T0900/ChangeLog.12 16 Aug 2001 05:24:54 -0000 1.1 ++++ glibc-20060328T0900-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. @@ -282,8 +238,8 @@ 2001-01-02 Franz Sirl * sysdeps/powerpc/dl-machine.c (__process_machine_rela): Fix typo. ---- glibc-20060306T1239/ChangeLog.15 16 Feb 2005 07:34:17 -0000 1.1 -+++ glibc-20060306T1239-fedora/ChangeLog.15 3 Mar 2005 17:29:57 -0000 1.1.6.2 +--- glibc-20060328T0900/ChangeLog.15 16 Feb 2005 07:34:17 -0000 1.1 ++++ glibc-20060328T0900-fedora/ChangeLog.15 3 Mar 2005 17:29:57 -0000 1.1.6.2 @@ -477,6 +477,14 @@ 2004-11-26 Jakub Jelinek @@ -364,8 +320,8 @@ 2004-08-30 Roland McGrath * scripts/extract-abilist.awk: If `lastversion' variable defined, omit ---- glibc-20060306T1239/csu/elf-init.c 5 Nov 2005 17:41:38 -0000 1.8 -+++ glibc-20060306T1239-fedora/csu/elf-init.c 15 Nov 2005 09:54:10 -0000 1.3.2.6 +--- glibc-20060328T0900/csu/elf-init.c 5 Nov 2005 17:41:38 -0000 1.8 ++++ glibc-20060328T0900-fedora/csu/elf-init.c 15 Nov 2005 09:54:10 -0000 1.3.2.6 @@ -49,6 +49,23 @@ extern void (*__init_array_end []) (int, extern void (*__fini_array_start []) (void) attribute_hidden; extern void (*__fini_array_end []) (void) attribute_hidden; @@ -390,8 +346,8 @@ /* These function symbols are provided for the .init/.fini section entry points automagically by the linker. */ ---- glibc-20060306T1239/debug/tst-chk1.c 22 Aug 2005 15:12:34 -0000 1.14 -+++ glibc-20060306T1239-fedora/debug/tst-chk1.c 24 Aug 2005 07:23:26 -0000 1.1.2.15 +--- glibc-20060328T0900/debug/tst-chk1.c 22 Aug 2005 15:12:34 -0000 1.14 ++++ glibc-20060328T0900-fedora/debug/tst-chk1.c 24 Aug 2005 07:23:26 -0000 1.1.2.15 @@ -17,6 +17,9 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ @@ -420,8 +376,8 @@ # define O 0 #else # define O 1 ---- glibc-20060306T1239/elf/ldconfig.c 6 Mar 2006 08:40:11 -0000 1.53 -+++ glibc-20060306T1239-fedora/elf/ldconfig.c 6 Mar 2006 13:15:14 -0000 1.47.2.8 +--- glibc-20060328T0900/elf/ldconfig.c 6 Mar 2006 08:40:11 -0000 1.53 ++++ glibc-20060328T0900-fedora/elf/ldconfig.c 6 Mar 2006 13:15:14 -0000 1.47.2.8 @@ -964,17 +964,19 @@ search_dirs (void) [...2517 lines suppressed...] ++++ glibc-20060328T0900-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. @@ -5314,8 +3287,30 @@ + } while (0) + +#include_next ---- glibc-20060306T1239/sysdeps/unix/sysv/linux/ia64/dl-cache.h 6 Jul 2001 04:56:17 -0000 1.2 -+++ glibc-20060306T1239-fedora/sysdeps/unix/sysv/linux/ia64/dl-cache.h 22 Sep 2004 21:21:09 -0000 1.2.4.1 +--- glibc-20060328T0900/sysdeps/unix/sysv/linux/i386/bits/fcntl.h 24 Mar 2006 16:36:38 -0000 1.14 ++++ glibc-20060328T0900-fedora/sysdeps/unix/sysv/linux/i386/bits/fcntl.h 23 Aug 2004 07:28:44 -0000 1.13 +@@ -1,5 +1,5 @@ + /* O_*, F_*, FD_* bit values for Linux. +- Copyright (C) 1995, 1996, 1997, 1998, 2000, 2004, 2006 ++ Copyright (C) 1995, 1996, 1997, 1998, 2000, 2004 + Free Software Foundation, Inc. + This file is part of the GNU C Library. + +@@ -180,12 +180,6 @@ struct flock64 + # define POSIX_FADV_NOREUSE 5 /* Data will be accessed once. */ + #endif + +-/* Linux-specific operations for posix_fadvise. */ +-#ifdef __USE_GNU +-# define LINUX_FADV_ASYNC_WRITE 32 /* Start writeout on range. */ +-# define LINUX_FADV_WRITE_WAIT 33 /* Wait upon writeout to range. */ +-#endif +- + __BEGIN_DECLS + + /* Provide kernel hint to read ahead. */ +--- glibc-20060328T0900/sysdeps/unix/sysv/linux/ia64/dl-cache.h 6 Jul 2001 04:56:17 -0000 1.2 ++++ glibc-20060328T0900-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) @@ -5348,24 +3343,156 @@ + } while (0) + #include_next ---- glibc-20060306T1239/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 1 Jan 1970 00:00:00 -0000 -+++ glibc-20060306T1239-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 22 Sep 2004 21:21:09 -0000 1.1.2.1 +--- glibc-20060328T0900/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 1 Jan 1970 00:00:00 -0000 ++++ glibc-20060328T0900-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-20060306T1239/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 1 Jan 1970 00:00:00 -0000 -+++ glibc-20060306T1239-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 22 Sep 2004 21:21:09 -0000 1.1.2.1 +--- glibc-20060328T0900/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 1 Jan 1970 00:00:00 -0000 ++++ glibc-20060328T0900-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-20060306T1239/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed 17 Jan 2002 06:49:28 -0000 1.2 -+++ glibc-20060306T1239-fedora/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed 22 Sep 2004 21:21:09 -0000 1.2.2.1 +--- glibc-20060328T0900/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed 17 Jan 2002 06:49:28 -0000 1.2 ++++ glibc-20060328T0900-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-20060328T0900/sysdeps/unix/sysv/linux/ia64/bits/fcntl.h 24 Mar 2006 16:36:38 -0000 1.9 ++++ glibc-20060328T0900-fedora/sysdeps/unix/sysv/linux/ia64/bits/fcntl.h 23 Aug 2004 07:28:44 -0000 1.8 +@@ -1,5 +1,5 @@ + /* O_*, F_*, FD_* bit values for Linux/IA64. +- Copyright (C) 1999, 2000, 2004, 2006 Free Software Foundation, Inc. ++ Copyright (C) 1999, 2000, 2004 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or +@@ -174,12 +174,6 @@ struct flock64 + # define POSIX_FADV_NOREUSE 5 /* Data will be accessed once. */ + #endif + +-/* Linux-specific operations for posix_fadvise. */ +-#ifdef __USE_GNU +-# define LINUX_FADV_ASYNC_WRITE 32 /* Start writeout on range. */ +-# define LINUX_FADV_WRITE_WAIT 33 /* Wait upon writeout to range. */ +-#endif +- + __BEGIN_DECLS + + /* Provide kernel hint to read ahead. */ +--- glibc-20060328T0900/sysdeps/unix/sysv/linux/powerpc/bits/fcntl.h 24 Mar 2006 16:36:38 -0000 1.13 ++++ glibc-20060328T0900-fedora/sysdeps/unix/sysv/linux/powerpc/bits/fcntl.h 23 Aug 2004 07:28:45 -0000 1.12 +@@ -1,5 +1,5 @@ + /* O_*, F_*, FD_* bit values for Linux/PowerPC. +- Copyright (C) 1995, 1996, 1997, 1998, 2000, 2003, 2004, 2006 ++ Copyright (C) 1995, 1996, 1997, 1998, 2000, 2003, 2004 + Free Software Foundation, Inc. + This file is part of the GNU C Library. + +@@ -180,12 +180,6 @@ struct flock64 + # define POSIX_FADV_NOREUSE 5 /* Data will be accessed once. */ + #endif + +-/* Linux-specific operations for posix_fadvise. */ +-#ifdef __USE_GNU +-# define LINUX_FADV_ASYNC_WRITE 32 /* Start writeout on range. */ +-# define LINUX_FADV_WRITE_WAIT 33 /* Wait upon writeout to range. */ +-#endif +- + __BEGIN_DECLS + + /* Provide kernel hint to read ahead. */ +--- glibc-20060328T0900/sysdeps/unix/sysv/linux/s390/bits/fcntl.h 24 Mar 2006 16:36:38 -0000 1.10 ++++ glibc-20060328T0900-fedora/sysdeps/unix/sysv/linux/s390/bits/fcntl.h 23 Aug 2004 07:28:45 -0000 1.9 +@@ -1,5 +1,5 @@ + /* O_*, F_*, FD_* bit values for Linux. +- Copyright (C) 2000, 2001, 2002, 2004, 2006 Free Software Foundation, Inc. ++ Copyright (C) 2000, 2001, 2002, 2004 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or +@@ -199,12 +199,6 @@ struct flock64 + # endif + #endif + +-/* Linux-specific operations for posix_fadvise. */ +-#ifdef __USE_GNU +-# define LINUX_FADV_ASYNC_WRITE 32 /* Start writeout on range. */ +-# define LINUX_FADV_WRITE_WAIT 33 /* Wait upon writeout to range. */ +-#endif +- + __BEGIN_DECLS + + /* Provide kernel hint to read ahead. */ +--- glibc-20060328T0900/sysdeps/unix/sysv/linux/sh/bits/fcntl.h 24 Mar 2006 16:36:38 -0000 1.7 ++++ glibc-20060328T0900-fedora/sysdeps/unix/sysv/linux/sh/bits/fcntl.h 1 Mar 2006 06:55:56 -0000 1.5.2.1 +@@ -1,5 +1,5 @@ + /* O_*, F_*, FD_* bit values for Linux. +- Copyright (C) 1995, 1996, 1997, 1998, 2000, 2004, 2006 ++ Copyright (C) 1995, 1996, 1997, 1998, 2000, 2004 + Free Software Foundation, Inc. + This file is part of the GNU C Library. + +@@ -180,12 +180,6 @@ struct flock64 + # define POSIX_FADV_NOREUSE 5 /* Data will be accessed once. */ + #endif + +-/* Linux-specific operations for posix_fadvise. */ +-#ifdef __USE_GNU +-# define LINUX_FADV_ASYNC_WRITE 32 /* Start writeout on range. */ +-# define LINUX_FADV_WRITE_WAIT 33 /* Wait upon writeout to range. */ +-#endif +- + __BEGIN_DECLS + + /* Provide kernel hint to read ahead. */ +--- glibc-20060328T0900/sysdeps/unix/sysv/linux/sparc/bits/fcntl.h 24 Mar 2006 16:36:38 -0000 1.23 ++++ glibc-20060328T0900-fedora/sysdeps/unix/sysv/linux/sparc/bits/fcntl.h 23 Aug 2004 07:28:46 -0000 1.22 +@@ -1,5 +1,5 @@ + /* O_*, F_*, FD_* bit values for Linux/SPARC. +- Copyright (C) 1995, 1996, 1997, 1998, 2000, 2003, 2004, 2006 ++ Copyright (C) 1995, 1996, 1997, 1998, 2000, 2003, 2004 + Free Software Foundation, Inc. + This file is part of the GNU C Library. + +@@ -199,12 +199,6 @@ struct flock64 + # define POSIX_FADV_NOREUSE 5 /* Data will be accessed once. */ + #endif + +-/* Linux-specific operations for posix_fadvise. */ +-#ifdef __USE_GNU +-# define LINUX_FADV_ASYNC_WRITE 32 /* Start writeout on range. */ +-# define LINUX_FADV_WRITE_WAIT 33 /* Wait upon writeout to range. */ +-#endif +- + __BEGIN_DECLS + + /* Provide kernel hint to read ahead. */ +--- glibc-20060328T0900/sysdeps/unix/sysv/linux/x86_64/bits/fcntl.h 24 Mar 2006 16:36:37 -0000 1.7 ++++ glibc-20060328T0900-fedora/sysdeps/unix/sysv/linux/x86_64/bits/fcntl.h 23 Aug 2004 07:28:46 -0000 1.6 +@@ -1,5 +1,5 @@ + /* O_*, F_*, FD_* bit values for Linux/x86-64. +- Copyright (C) 2001, 2002, 2004, 2006 Free Software Foundation, Inc. ++ Copyright (C) 2001, 2002, 2004 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or +@@ -194,12 +194,6 @@ struct flock64 + # define POSIX_FADV_NOREUSE 5 /* Data will be accessed once. */ + #endif + +-/* Linux-specific operations for posix_fadvise. */ +-#ifdef __USE_GNU +-# define LINUX_FADV_ASYNC_WRITE 32 /* Start writeout on range. */ +-# define LINUX_FADV_WRITE_WAIT 33 /* Wait upon writeout to range. */ +-#endif +- + __BEGIN_DECLS + + /* Provide kernel hint to read ahead. */ Index: glibc.spec =================================================================== RCS file: /cvs/dist/rpms/glibc/devel/glibc.spec,v retrieving revision 1.232 retrieving revision 1.233 diff -u -r1.232 -r1.233 --- glibc.spec 7 Mar 2006 21:37:04 -0000 1.232 +++ glibc.spec 28 Mar 2006 10:15:50 -0000 1.233 @@ -1,6 +1,6 @@ -%define glibcdate 20060306T1239 +%define glibcdate 20060328T0900 %define glibcname glibc -%define glibcsrcdir glibc-20060306T1239 +%define glibcsrcdir glibc-20060328T0900 %define glibc_release_tarballs 0 %define glibcversion 2.4 %define glibcrelease 5 @@ -59,10 +59,6 @@ %ifarch x86_64 %{ix86} # Need gdb that understands DW_CFA_val_expression Conflicts: gdb < 6.3.0.0-1.111 -# XXX new gdb is broken, >= -1.111 is adequate if not great (no crashes) -# Need gdb that understands DW_CFA_val_expression and handles two frames -# with the same entry point and CFA, but different PC -#Conflicts: gdb < 6.3.0.0-1.115 %endif # Earlier shadow-utils packages had too restrictive permissions on # /etc/default @@ -188,10 +184,7 @@ %description -n nscd Nscd caches name service lookups and can dramatically improve -performance with NIS+, and may help with DNS as well. Note that you -can't use nscd with 2.0 kernels because of bugs in the kernel-side -thread support. Unfortunately, nscd happens to hit these bugs -particularly hard. +performance with NIS+, and may help with DNS as well. %package utils Summary: Development utilities from GNU C library @@ -1348,7 +1341,15 @@ %endif %changelog -* Tue Mar 7 2006 Roland McGrath 2.4-5 +* Tue Mar 28 2006 Jakub Jelinek 2.4-5 +- update from CVS + - pshared robust mutex support + - fix btowc and bwtoc in C++ (#186410) + - fix NIS+ (#186592) + - don't declare __wcsto*l_internal for non-GCC or if not -O1+ (#185667) +- don't mention nscd failures on 2.0 kernels (#185335) + +* Tue Mar 7 2006 Roland McGrath 2.4-4 - back up %%{ix86} gdb conflicts to < 6.3.0.0-1.111 * Tue Mar 7 2006 Jakub Jelinek 2.4-3 Index: sources =================================================================== RCS file: /cvs/dist/rpms/glibc/devel/sources,v retrieving revision 1.167 retrieving revision 1.168 diff -u -r1.167 -r1.168 --- sources 7 Mar 2006 13:39:01 -0000 1.167 +++ sources 28 Mar 2006 10:15:50 -0000 1.168 @@ -1,2 +1,2 @@ -c3bd549b42829d73aad876a10435ae73 glibc-20060306T1239.tar.bz2 -f4732d93d3749c864b1909e9f9d39524 glibc-fedora-20060306T1239.tar.bz2 +76218e49e12649e83d18f0cb82395ede glibc-20060328T0900.tar.bz2 +f691b4f8f607db7bfbf75dc766651856 glibc-fedora-20060328T0900.tar.bz2 From fedora-cvs-commits at redhat.com Tue Mar 28 11:39:48 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 28 Mar 2006 06:39:48 -0500 Subject: rpms/hplip/devel .cvsignore, 1.8, 1.9 hplip.spec, 1.57, 1.58 sources, 1.8, 1.9 hplip-0.9.9-1.patch, 1.1, NONE Message-ID: <200603281139.k2SBdmR4005056@cvs.devel.redhat.com> Author: twaugh Update of /cvs/dist/rpms/hplip/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv5041 Modified Files: .cvsignore hplip.spec sources Removed Files: hplip-0.9.9-1.patch Log Message: * Tue Mar 28 2006 Tim Waugh 0.9.10-2 - 0.9.10. - Ship PPDs. Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/hplip/devel/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 9 Mar 2006 10:03:23 -0000 1.8 +++ .cvsignore 28 Mar 2006 11:39:46 -0000 1.9 @@ -5,3 +5,4 @@ hplip-0.9.7.tar.gz hplip-0.9.8.tar.gz hplip-0.9.9.tar.gz +hplip-0.9.10.tar.gz Index: hplip.spec =================================================================== RCS file: /cvs/dist/rpms/hplip/devel/hplip.spec,v retrieving revision 1.57 retrieving revision 1.58 diff -u -r1.57 -r1.58 --- hplip.spec 24 Mar 2006 17:33:38 -0000 1.57 +++ hplip.spec 28 Mar 2006 11:39:46 -0000 1.58 @@ -1,7 +1,7 @@ Summary: HP Linux Imaging and Printing Project Name: hplip -Version: 0.9.9 -Release: 7 +Version: 0.9.10 +Release: 2 License: GPL/MIT/BSD Group: System Environment/Daemons Conflicts: system-config-printer < 0.6.132 @@ -12,8 +12,7 @@ Source: http://kent.dl.sourceforge.net/sourceforge/hpinkjet/%{name}-%{version}.tar.gz Patch1: hplip-desktop.patch Patch2: hplip-config.patch -Patch3: hplip-0.9.9-1.patch -Patch4: hplip-quiet.patch +Patch3: hplip-quiet.patch BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot Requires: desktop-file-utils >= 0.2.92 @@ -66,14 +65,11 @@ # Use static IP ports (for SELinux policy). %patch2 -p1 -b .config -# Patchlevel 1. -%patch3 -p1 -b .0.9.9-1 - # Quieten hpssd on startup. -%patch4 -p1 -b .quiet +%patch3 -p1 -b .quiet %build -%configure --disable-foomatic-install --disable-cups-install +%configure --enable-foomatic-install --disable-cups-install make %install @@ -87,7 +83,6 @@ # Remove unpackaged files rm -rf %{buildroot}%{_sysconfdir}/sane.d \ - %{buildroot}%{_datadir}/ppd \ %{buildroot}%{_docdir} rm -f %{buildroot}%{_bindir}/foomatic-rip \ @@ -126,11 +121,13 @@ %{_datadir}/hplip %{_libdir}/python*/site-packages/* %{_datadir}/applications/*.desktop +%{_datadir}/ppd %files -n hpijs %defattr(-,root,root) %doc prnt/hpijs/COPYING prnt/hpijs/hpijs_readme.html prnt/hpijs/gs_hpijs.png %{_bindir}/hpijs +%{_bindir}/hppgsz %files -n libsane-hpaio %defattr(-,root,root) @@ -158,6 +155,10 @@ fi %changelog +* Tue Mar 28 2006 Tim Waugh 0.9.10-2 +- 0.9.10. +- Ship PPDs. + * Fri Mar 24 2006 Tim Waugh 0.9.9-7 - Include hpfax. - Build requires libusb-devel. Index: sources =================================================================== RCS file: /cvs/dist/rpms/hplip/devel/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 9 Mar 2006 10:03:24 -0000 1.8 +++ sources 28 Mar 2006 11:39:46 -0000 1.9 @@ -1 +1 @@ -836affd511fd4831e6904b4f7f079c7d hplip-0.9.9.tar.gz +349489b10fb44d1bf105b04ff5352551 hplip-0.9.10.tar.gz --- hplip-0.9.9-1.patch DELETED --- From fedora-cvs-commits at redhat.com Tue Mar 28 11:58:10 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 28 Mar 2006 06:58:10 -0500 Subject: rpms/hplip/devel hplip.spec,1.58,1.59 Message-ID: <200603281158.k2SBwAFm018881@cvs.devel.redhat.com> Author: twaugh Update of /cvs/dist/rpms/hplip/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv18867 Modified Files: hplip.spec Log Message: Oops, left this in. Index: hplip.spec =================================================================== RCS file: /cvs/dist/rpms/hplip/devel/hplip.spec,v retrieving revision 1.58 retrieving revision 1.59 diff -u -r1.58 -r1.59 --- hplip.spec 28 Mar 2006 11:39:46 -0000 1.58 +++ hplip.spec 28 Mar 2006 11:58:08 -0000 1.59 @@ -69,7 +69,7 @@ %patch3 -p1 -b .quiet %build -%configure --enable-foomatic-install --disable-cups-install +%configure --disable-foomatic-install --disable-cups-install make %install From fedora-cvs-commits at redhat.com Tue Mar 28 12:07:50 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 28 Mar 2006 07:07:50 -0500 Subject: rpms/tcpdump/devel arpwatch-ethcodes.patch.bz2, NONE, 1.1 tcpdump.spec, 1.48, 1.49 Message-ID: <200603281207.k2SC7ovf018984@cvs.devel.redhat.com> Author: stransky Update of /cvs/dist/rpms/tcpdump/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv18970 Modified Files: tcpdump.spec Added Files: arpwatch-ethcodes.patch.bz2 Log Message: updated ethernet codes (#186633) --- NEW FILE arpwatch-ethcodes.patch.bz2 --- BZh91AY&SYYD? }? 4? ?;q;???????gw????K??x;?gl?v??? XnY4#??a??,??K???s????m?S??%/Y?????U??bf?Y???F"V.7KD Haq???'??. ??/z?*?f?|?? ??{???>CsZJY???????E?8??w?rDT??K%0L??????Y????j????m?????z?"Vv=?~?f??n??_&????C??Up??V????c<#?y{?T}?QU?-Wt9f ???X??g;wW????@}??(?????#L???y??E?G#????. [????y??KKqZ?? ???.6W???=?Q&_w???h r?7K?iH????????f?IN?????b?3?*??fZ???&zBo$h?;n???*?7 ???`?ec??xUA?i????C?=??O7D????#??-|dg?;?t?GG??`??RCCl??T?W ??[?r?O?0???shQ???9?)??a???I ? ????|?b-??6?)5??&???;mb?y?@?^?*1???r?! ?? ????g??o?,w??^ 7~??Xp9???C|S????[?%G?? D(???!p"?Y????l?ZSJ?qF? UVu??>?Q??????d??]?g#???x??~-?:??????+5?3(??????????uTS???p??=?)?g|?1?'?Q??????????4??&h???`????G%~???^?1?W5 ??? ??>?????~ZL??N)??W????c???{??D,9?Z?2??kc};SHj?i???$v?????z?`????m;?e?5??;???&?8?D?fp?/???????T?1?(h??U/qPMT??Tta?Y,)?P?fX?????P?Y?y#?vD??????|??o?\g??????!???????r?6j#o???*b]?I?R??_?e?^????d O???????h??_=? P\???.????f ?????m?3??T???; ?v$d7?|u=QX???v???{x?g??j1??n?}-Ug??R?????v?????{?x\? ??g?? ?"??????A ?`oi???? ???&4g*f???{??WQ5?!b1z??'?D4 ?I9????m??w9 :???%?popp?=CF`{-F/ ^f?1E???L???7??B1?%mn ???s^?*ZM? ?EW??z}????.??*????99??|-?X????O??<??~??a.?}?m??t?????t?d???+8c???$??q?P?1R%?lq?????$ ?? ??pv3F?B?r???\&?? P]Q'????-=$?????G?+=??, ?0F?? ?R?3????L?C?t?g?????e??Q??q?ko?X??_?9?*?l/??S??#c"N?A`??lE2?f?_?c???q???'@??hQ??????v?-vCg??1Aq??u?^a'?0?.??6????????..+x)?0??(?B|????s?I??t:??N:(Z?`vB"74,ta.d?????q?(?????-?l??lo?~ Y;D?:=?D/?{??R???"h?????8>uv??k?wz??.XV???]c??EBx?v?WT??jg? Kl???uK,????3x??D???q|???????LssH?Jv ???g?K^`???K?T?^Q?? M? ??\??THSe#r???v?? ?b??^W?T%??/gh?????%?*?(?2?d?^?????'\???|? ??w??J??V??+?_?$,?U???3?Ci?I ?B41?Ao?}? ? ??C?7g?tv<:z?^w]??6?G^????NQU4??/.z?(?? ?>ce????p?.=?b?!O?_=??g?m?R){^?8e????,?S}tSi??N]???W!Wj?E???????VM??1q:P?? ??sF??E???ky?vh????~??{0?Y?X????.?f??y{"?v???????????????s???_??x?x???>????l?>>??Q?7r???:??MkGA:???x????jT?bwp???QPV?,??i\???DAC??i??cIJI?kwC[?? FY??IC%?X`??6.???7k lDj?W???gOe n???????M??p.??b????(?t??[??w?y0?l/.X??W3????z??B?;????$?-(? ?m[??s???b|??;5E?dC??9????C?.?,?}?61yTt??uR|K?x9?2?=??C??UB ????z?????X??J|?9???~?V?)???6M 4}??6Ir?m$?}n??D???n?7h??)??k???|/??o?U? =7o#?.?_ ?%=??ze6??'???C?I;Z?;E???|G???YoI?20???`?P?'E%??pM??<\?A?y4?{?Tn-?????\KIu]S??ED ??P??'[r???????????????x??XzGo???9u??|???BQo2??V?a`$?s}??9??y=?z=?{??{?dJG?P???Sb6?o?? ?"+??^,>uW<\%?6J"?B?P?iu(T?Wnl?x?0w$???rp8?v??W????????????l,?????pqe???:???|t?p!???[F at 0FZ??? ??y5S??R??u??? QAaf ^???^+O?#w?5? ???? ??.???"/??O\wP?s? i?????????1Z????r?????]??????l7x????q?a+?4,??3?????^??]vK??y3q k?#s+W5y?????E3{~???hVHRV?I???y*S??q???w??(?{??*?t?????I#5R??n?Z??????Z????~_?N??82@???U????d`??e? 3???k??_????_???mg??????rerE2?E?+?? ??s??}????????????:????o11 "????????C?Wi3&?JA?????????j??+V?l??iZ??? n`?%???gk??)?z?b4}???>6??x?L/??\?7?oB???d x?3eD???W?60@?o????6?????>?+c?8???o??Z>???N??????>?_?????q*?>?zT}?+???;/ p??M????T?E|S ??X?h?,???? ?.O??-??? |?r)j?g???]?+ St s1??d?N;?4/z??w@?? ???B?@?0?2,H?? ?$?% k^+??X???N????j!??>?]'ZZHea?!?Y??*.l???$I??????????m?3???it!Mm9?a???%???? !?f??8=??h????G??????cNgA?? I?07-V?*??????`?21Xh??4?o!???-CQ???v??? h??}N???w?????._?|???`|?%ur?:?r??R_?Ig????????P(A??8,Ob??????e?s?l;0d?9hA?V????4?b???!Fla?m?f1@???????6?`o-L????d?K??!? #W??&Vi^Q8????m?-???K????{?yiZ??4?z?FO0????2??L!??dC2?;Q`??!??&???T?I???[?2r???j?w??=??????1?-Y?????5??9?aWs?-?{V???5?I?t??WM?94?>U??p?AR??b?\???[??X??s ????????0g?^?????Y ??c8Q?1?r??\?????om|pN\P???3???i?8?9????SM??????(??????o?f???Kv??U?????i-%bb??^????"?????D~??4u??F??H ???Y??||??y Y??????o????l! ??(Ysv?cm???l?.?T????h?M???X ????Bl????"????/?LjE?1j7???????????k?????? .?ts930zuK.??.?qL' Fok?6h?k??????#Uk??[?$??{??wSS??.???????_??V????Du????? ??a?????k?A?~b????^XBq???????L,j???Cc??vh?$(?rZ????+-??Bu??is??? ???2?b?????)Tg3????8?b6?????33?????c???r???? ??3?my????J?PsX?{????H }??????R?>?????^Tg?v[??*}~?\???c???Bo??~??sy% ? ???A???E???l???%s?5en??;CV?\s???X???x??i 'x??????'q|li'???j??????^?c7??8[??m????,?qz?i??k>m\*????%???0????!%?1???qf?????I???????0???_3;?z?????????.h6????V??-????D? />F7??e?? ??T?k?r?G?`>?J??6???Q??o[?????u2q?A? ??????b?? ?????aY2 at d?N&i4????X??(?/O7?G|q?zz ???88}?}e?????J?b???????????)? ?????V6?L\?s???? ??4W?~??????v?i?7???????M?Z?'w??ykD?0???,s,u{y??4?????Nh ?5X??z?6l??i4v????/+3?,??N???{~Pv??k?|4Y???(???A?E??2Xl???I?x??????e?4c/ ?/?s'???/v??y??7???*? ?F???Dk???X???Y?Qm+????ss?s?J????% ?)t??  ??a? ?????0?zl1X?9e???5??W ?? ??8,.??>-?45??|B,?b?-?Ca ?|Z?E_???Y`c ????,??Bvv`WI?U???b?YF5j??4?d???1_;?7@?.?Q?u??K?8f?m8?J??o???W?fY{A???/*?H?T?,?????f?????????n?? ??Ps?c???"?=???^y???`?????3????B)??s_????????"?? ?f????????a?gV?O|X??y???oZ?#t??3~?c?Z??K???E????z??:b?L????lo?(?????s9=?u??[gc ??P^?e?????bk????%????,?V?f?yy??????????z???-?C's<1?????? ?/???7ty3???YR???W???ak ?]???[gu? ?n???|???cV???K???[(?I?&u6?-??-?D?A??\v??! l_k??z????+?{?z?z?????n???h?????????????&e;??2#???''?W6??-?W????{J??tF|-0?ln???j??x/?.???????4J??????P.?;??_?es????O V?W?????N???N??.????? Gt?`?? ?Y?????C??p? ?P#??z?PU?K>???F%?qe??&?Z??t?[ ??Z??DL??u?>??????=??????N?p????D4'x??n??7`:5??cr?L]?1?c_?r?w;????F?zm???Y?!?aGk3???? ??#ji_??m??2z??Y at q?Moe{t??? ???Y??Dh??{B ?????}??????a?pf9?z`???N?=???????8o/+?2j??sr????L?c-E?CH?????' ??PP7????x?? ??DD)?\??\???}`?J??=???%?d]??r',\???#?< n?Xv???Ug??????g?iJ6[??=]??$F:!???????????WM??7??C ???f V??m?I?;1]???s~'?7j]u?,?? :???????=-????e ????? ??T???? ??9?4????;????v_?i[?(x?Q$h????{f%?f1?/vp?-i?I??GG?m?Vk???d?k???d???zo????^????;2p?????7???y???? oH?.' uRVTu!????????#????>ux7?|\?z?? ?????E^?RW23?4F??????1?C}Z5a??????.r?c ??`?v?????7?P?IU|}?S?>???%???ZD???=?6|????x?X??Ndh???p?LI?'?1?~hq?????yeH????Lu.Z?J????h%I????.??_~ ?w]?^!D;U???Gv?3.n?Z???U??c??p??_?p?k?????????o??_;?]F?y((?DDQ??H(E?` d! 4x?mtR??1uo?????s???a ?%?1?\??w?????????$?.b?{?/????>?0~|8?#1????X? :0xtxM????[??/;-?m?F?[Im%??iam??-???m#i-??F???g???/w? ??????v?I% ??yy?Im?[A???m?m?????[Im%???[O??|f3??????SDU?????????=?x??]I;?????Q!D?4`?0h?B?jo?????zuB BB Q %m#l-????Im%?A??? ??6????ci-?????o>?}??5m??j\cm??^? $8?" 0@??????????|Fc????[Im?m#i-?Im#h?!??D "R?o?7?~G??9NS???g??zo??t?6??5??????$????Hs?????>?M??n??? ?IT:C?D?^Z1??????!??h????m?f-?ug]lOB?????XHJ9;?%Y??t4*???>d??`??d?()VR??v????????????7??%[??????K????h,?*n?7oz??b????h?3?Lo??C?_D??;?P???#?_ cHT?? ?????u??????"+{??=?yCa? ?8a;s? ?U?=e???? ""????U??*???*???Eb??*(??UEDV(??DTUDUUQ??UX??FATV"!EF**?QV,?I?V????? ?E "?????EQdDE?d??????"*?"?Q ??*?U??TEEUN???#QUUDDY+??????*??E?Ub"???????G?3??TUEQEDDV"1?????? ????????i6????x?K??????,k?S???y??4??B??\9\!??q???Q?1??RH??>V?8?B??=^i?M1???B?(n??4 ??"?QVAQDYDEH(??? ?1UQTEU?[l"????s^|?[???>}??m?!?oz????{?SoEc???:w???=??N???7DK@?J]?????+?Q???????[J??????Dm0? ???<@l\fL?w?CID??@('W? &????? ??Y?VrJ 9?U??UW3?T???/5wy??k^?? ?r????p?U oS?? x#Z?^?????|5??0JI???? ?}?4?_ _???D???|????R1?=??a?? 37???^?Ke?c ???ClcU?TQU?"???EQ???"?EUH*?"??TTDTE????????(??*? ??UU??d?$??n? ?%1?? !?f??(??+2?z?8]? A???i??????B???:9U|]???zw??w??Nt??????)d?/?????{???ZiN?\??h?I???l??uB?\w??.{??S?x???S???V?2d0h?m????S?????fiED?ft6???Z??Q?}?Q??0H at I ( iIm ?!m ;?u???j???,?Z?aR?X[C4]0?? m??"?2??pJ+?Q?o??T?fqKF%?oP??dah????6?>?j???????S?`?2[????6.?{>????z??N_?(????v|???1?e?????)?8?| ?N???]??4I?,???????)%!??| ?IxBn?] >??P at 8?R? ?kMF???????o????(}????+ ?b??'w?????x???s????p???u?iW)??? T?=T????????[????&??=??hv1,d???^?????|;a5?V? ?D(13IT?mIJ%?????qH,??.2?w?9??2%/???=-+?^,?????Q??????>t?N??????  X?`@?8,?GG?Q??'?{?n??????? xr?A???B?:????? ??????|w???r?0PC?b??ty????i^k??%??h????k??L*????=???D?UMH?s ??i???A?~???{??????#V?s???=?????s????82???C???????{KJ?6?[_a!????+?q??b..e??0(d?:??{Z(?T?v? ??t5??Q?a?????!rt?8C|y???}???????|0?!z?gM ?Q??????G???_6???*!???U%??\?.????-VV?f?)? ?"?? n2s"??o5YY??.?F??&???+.m?|??N??U??????"?????E?5?7)sM7/^{)?R?k???N???Pt??????zCFs??z?????OW?*{?>sTz?????\|#$F???R???b????0-??5??!>2???8???s??!???? ?|?e??Xx????s??%??u????z~??d/??M???b?;?d?????jx??X????w??????lf ??????Yl.???(??j?zzZ?A0???????????? Nq7???fy?cK?^??.p????-??Qf?A]?????K?n??i??<}O at Qj3+??0X??Q?3B99(n?????op???c??TCY?????0? 8;R%??c??H??M"A?Q?MkZ??X?0U:?M?&?40?*????'U8??9????H??#?L???/???@c?????8Q\x? p3????C??_:??6??=fNN] G^?*??/?JL?????Em??{X??? |?:D?{?'???*i?L+?t?:"??????I?.O????.?[?q ?66????l????,????!M??>9???>?:??$lyzST?-c?>????S?w`_??4z???????\??6\???2??????=????a ?D?^V?????????? ??3???J? ? ???????V?RJ???,??????BZ?I????.?:X01Mw|??????????w?i ??S~>?h.???k???q[?c|YF???????yz?b????????8??4]K??q??B?gC??&?=??l???#jqk?? ?M6?{c$?Gn????Q????4??[J?Q??}?s??Pc?"m?'tS?G??a?f???{???My??DQ??1Q??? ?y{??/??w??eDx~??????:?4?T??>T7??s5zQ?h??? ?N?i1?Y13????????/I?B??u?^?iF?A?C~????~6?????%0z?Vv?6Y?kw??> ??p?SA??Tz??B*N???#o????9???+?y?B??o ?R????.???#|T??$????????J?DN??????7?W]??YiQTd4?i??j(%u!??XS]?^\?c??'??/?????????B??Eg??m??}?v?t?=)I?@???$?T???U ????"?;??N ??kX? ????o??r????p???4?d? ?tgvk#?<,?=???4r??o1!QC${?@??d;?????]?,?????/>?.?X???^?? WA ???????!A %H@ P?g ??C)IO??0)?Y("??Qddg?R??V"?( Ex???I???(+>?????dyd(??C?? PF"??X#?j0OOO??????}?>??~D???: ?? `?F???Jq??L??otD>F?$??rCC?sF ,?Kq???o?:???NF$EE??B?t?A??p%??b?! ?G]G}hN???xy}??O?NI?7??g?(?i?9>???i?qEF3????K???R????? *???,??y???//???a{ XjF???!?f\?V??z ?H*????W?? _[_\? ?k?ZX?-?+??"m?+???Q?"^kH???A!]??To?R9+GBK??{e?Rm**????? ? ?y}??0m?J??B?n??k???????????TF( ?k`?XUDb???q8??CL??>????v?=??ly???T????&?~????/.???@???? ?Q??J at Qd??`???XE???Ad???"`?"@UDE,???%H?Xp?jx???H ??}????#????qXp?5?[? #?b0_???J ~?v??v?????K??-??g???V?O???????^?P9??p?V??]?????E)?Ic??=???F??\?t??I?^?g& ?@#?[?G?l??"??1??????e4??????_??40??M????*i????I4?1?3: ???kI????TB1E?!QEF1TTO??!?"?3dk}?=8-???????#d?c???1????2!M?_??,_K?R?h?`?!5?k???E??g????+0?X?????|?w? ??x8?????Ehp?3??=????G-?[n)kz?u?????o?:j??'?g??h????"Q??`????@-? a;????d?u???z:i??z??v????l:?]#?rC}?+??????9=3?&{^en 6? ????Z?? ?A?Z?H?!??????8???\U?C?k??????+Bk?\?`?Z at -??,m??X?6??|???nmq,???L??t;??o ?:|'\{#????(???????!????M?????.???Dwd ?`B?"?%IX"E?R,??,YR(E? a ????B,$?E???z}???????)G???,eb??K_hCm|?]-????[?`GB?? ?]E ?'?? ?$RX??w???}V???|?2h????;{??m??????6y$???-?R [!?d?8q?8???s???O???A?d?h??}???4N????3?????y?wh`??L?x?)r?'>1?;?2ih???p???#?A?.l? ?????? ??? hEU????.?T??``(? ????0?8???d?`??K?8;??N?5C?F?T?9?4?,/C_????qv?x?x1 ?OH?m*??FH????(?? ????*D?????{???^?a?V???Oq?1 /?????????it?2???i??G?aCPJ?2r?????J[} ???X?? ? ?C;vWbBSi???+o??7????}- T???EAa?X?d at Y?W???$???????S?C??*AR(}6?1?????*????[O??!(D?? H?bW??H"6??0U????&??i???$?cj??DI /O] ?HH??1??Q?????D$?????(????f3?kR?? HQ?^`^[nF,????-MM$7D?A:9?"5??_ ??[$R95"tg?"mv?t?R ?EKF???vZ? ?/9r-?????????)m?w???I? 4rs ?*a???4zv?$P$????>[x?????~n?#?L2A[{jX`?FU???f?M???.?"??%??M?9????SA?scbR??kiF ??0?7h?=3??_??i/q?f?,?GxPX?P?g?l????O?? ????j6?$?[????X?M:???????? ?=6??ci????O[N?N@?d?????/I?MZV??N?f?4??L`?? ??C?@2%wO?(???????AE?js????L??S? MWW??????3????bhb$?a{????|? ?5???u?X?"?8nB????5"????4I????????t?????(?K$?(;]x???8??M??(??\v?z?????g|???5?sb?(?-??k??x:?@?J"?y?E?+? ?G?????1%??d??&?????????']\Wxl?%Q?JHH)4?Ne?+???Q%t8????VMm??????{????ZN{?????9?_????wm?v??SUn!Q??e#f?????m??~???&| AlC????H?Q?L??{z??.a??>??i?J????Z??????@????QO?f?P?T??}?cc??l?H?d0 4??\5?cD\&W????]y?????h??x1r!? ???5?&??w?4??z?XX?8?,?DK?M{??`??Kb?z?????{??E????mY???:?l?YK? ?^R/???????F*T0QDy%2??02jah??2??X???E??K-J????12???c?[b???5?oE?W?Wm??????????{?i?n?&?d?)T????5R???r??sU:L?y?$?2?????.?:?3?R /???}c??x>n??h?B?l???Yh?H?R?????Ly?\rc?????`?j??y?y}? ?l?~f??Im??HR???K?A?????^r?`????P???n????H?? ?c_S???2?4"???;G??F???-??????#???F?C?k%(?????l?#}????Vcn?id h?? ??]:???F?/???$J?JD&j?:????[?????E??????-wa?k??&???@???t; )?8????F?h:?frd?%LM???sB4z????????????KHP??>???? ??x!??4?8b\????*???3Q??`??H??Y?l???4?})????vs_??P ???c????????Y?4U??=J???BJ?B-;??e??N)?^?f?_??b?Q??"?K?z,R?Lyj?????am ???????J????????"k??ak#x?H?x:pd???hkD?E????E5?Zn"??i ????A?? _????]?X4?cf?Y??F???Qb?VhA??r????Q?,????? ~??b????~H`?;[?d???h?,?~???????q?? U#$? B+??A%?~???y??????I??????>???1'? ??? ?F?????7?>?? _`~?5?MO???Z?^?1?q?;?Lq ??}m??8??????D_(q8AED??"#m?=??q?2?????d??{???/???~j??I?w????????]??I7?????7??#L?? ?? H?3W???2?A? ?w0??y??G??Kv"}|@???N????+N 9????#1??P-?u'=?BU?Jn????X??????W?5?#????8?e??"@A???iV?8?6 P_?4X?? ???'Uo?g?????L>_?'@hj????~?L?x?4?DS?wY?Mq ?B????6G$6?V???9h????@^kS|?EH??#U?_?h??DfJ? ?"??\???6q?6i ??;??v????w?@??N?Sy????6?)????;~??5??????? #??T??r6???@??@???\?f%?mC..YR????7????u? ?????hZ?z?N???4(w4??? ?3c?H{=?? 6???9e+FD|-????????q ??/Jk,6????wND??? ?????fS:??p??61:y?g?#??&??p6? N2????x?s?i?&1???CG??:`s????3?V??\x.#r?m{?F^>??WCE??p?H?1?K[v?????*??f?;R=???~JK"*???/_}C?7(??@^?????|Roe??????dx??S=?os????F_u??,]Tv9N???:?X!?5?:t?????Q!??????q?????????E(??~??a?L9E?.?/H ?3?pz~??v)?????5?F?V????????/??x?(2`?]dC2?)]08`~???dk??'L7=u?d?F;?V??Q?????X?A???='sw?????')???f?@YN???E???)?;M?\bN? |??(??k!?!?C yN??e??j?2P????)cM at i????????#?+??????? ????D` *??L~>?@???/,?R?q?#G???E'??B??????5???)8??b? ?{?U?????A??T?CE~???C?Z ?*k?*"H?jQFY??? ?h???5d9k6$Q?2`?*?I1???C????(?4?r??8F??c?Fa$?g?}???lL? L ????`?r/???Xg?9?)?????????>?????l%??y ?F*?Y`OzI-?"?@uIGHc&0??c?\??>y???J??=??X??n??????U? Xb?6??02,??C??????j?5?????? ??(b? uq?Bn??N~?%??????????1"Ea"?H???(??#"????S?????s?9 ??S?????3U?B?='?2?<}?G?e?cR&?????3? a(l \NE???r????J?C?m????l$???=z4 C?????*P?JR? ?????? r?B??.3x????{C|???S?S?t??S~-????????:?lvH?G QM??6???K??/ME??uNY??>V?????EZ%?aEE ?.?,????/??D?{???ll?????v???0?J??9??$??+x???9???????4 +??'?Aa a?????9??& ???k?????,?l????o??o??????(???B???lf\6???c1???`&????Ly??3S?&?%-?*??9????@?P8dr?4k0? ?T???w?q?1?g?FSe???~s?V?I)??@?vw?/ ??ho???0?`??Mg?*f?,? ??c??FT??o????3??#:h?{?}??{D?/?_}P!Cl@??!?0D04???E ?[V??/lc??????~???nX?z??b??Y?.?????fQ@?J?la+&?]D??#"%J??????wVV\,????+??al?*<8?????%@? ?&?f?V??9J?An?????y?1u? ??3?5k??'U9^ !O????Yl !??T??/??Z:???Fhq???$?6H?,?] @?(b????x???K??w???C?a??????U??S/G?"V???_ B(a +?*Og???????+??h??U ??!" /?~?????C{?????????????Z ?`?%???`?6rIJn???????pW7x(???F"}?????????????-? ?s??X??5??gn ?w?>?X`?? ????*????6?????J??O?> ?? ????a?/?????P?iL???@? ?[F???,?M???:?{????[#3??}1???h??O?.u???oN?? ??????????i??M?BA-! ??????Z???*Z???a?0??o.&????Q???Qb??e?IYX"?L????q??:9?Q?Qh)???????g?QDX??J?9??f?q aX;???w??@???E'???F?WK?Z???t?h???` ??e ? P at Q????? ?s?d??g????>?????h?@8]?>* ??H??|?~?k=3%]Y?A??Z???8&?6NO??????m?f??51}B????9z_?????:_5?S????b&????D?z=OE??s?Y7{=?)?/???m?J??m????????X?-+??:?U??]??)!m?TE?@???q4??@ F?M??=?????f?H??~S?]?l??iBx??)b`????4?_=/??????YQY")ZIZ?^JS???????h??i?g???Q?OJ??JI??^c?2 ???T?????^???n????p?????'?S?F^??y???x??(b?? \SI??vA?7=??]???????q????@???????N$EQ!? Index: tcpdump.spec =================================================================== RCS file: /cvs/dist/rpms/tcpdump/devel/tcpdump.spec,v retrieving revision 1.48 retrieving revision 1.49 diff -u -r1.48 -r1.49 --- tcpdump.spec 11 Feb 2006 05:48:13 -0000 1.48 +++ tcpdump.spec 28 Mar 2006 12:07:47 -0000 1.49 @@ -2,8 +2,8 @@ %define PCAP_UID 77 %define PCAP_GID 77 -%define releaseno 2 -%define arpwatch_release 14 +%define releaseno 3 +%define arpwatch_release 15 %define pcap_release %{releaseno} %define tcpdump_release %{releaseno} @@ -19,7 +19,7 @@ Version: %{tcpdump_version} %define tcpdump_dir tcpdump-%{tcpdump_version} %define tcpslice_dir tcpslice -Release: %{tcpdump_release}.2 +Release: %{tcpdump_release} # XXX epoch is necessary to obsolete tcpdump-3.4a5 Epoch: 14 @@ -51,6 +51,7 @@ Patch39: arpwatch-drop-man.patch Patch41: arpwatch-addr.patch Patch42: arpwatch-dir-man.patch +Patch43: arpwatch-ethcodes.patch.bz2 Patch50: libpcap-shared.patch Patch52: tcpdump-3.7.2-s390.patch @@ -76,7 +77,7 @@ # if you change the Version, don't forget to edit libpcap-shared.patch # could be sed'd automatically Version: %{pcap_version} -Release: %{pcap_release}.1.2 +Release: %{pcap_release} %define libpcap_dir libpcap-%{pcap_version} Summary: A system-independent interface for user-level packet capture. Group: Development/Libraries @@ -98,7 +99,7 @@ %package -n arpwatch Version: 2.1a13 -Release: %{arpwatch_release}.1.2 +Release: %{arpwatch_release} %define arpwatch_dir arpwatch-2.1a13 Summary: Network monitoring tools for tracking IP addresses on a network. Group: Applications/System @@ -147,6 +148,7 @@ %patch39 -p0 -b .droprootman %patch41 -p1 -b .mailuser %patch42 -p1 -b .dirman +%patch43 -p1 popd pushd tcpslice @@ -315,6 +317,9 @@ %{_vararpwatch}/massagevendor-old %changelog +* Tue Mar 28 2006 Martin Stransky - 14:3.9.4-3 +- updated ethernet codes (#186633) + * Fri Feb 10 2006 Jesse Keating - 14:3.9.4-2.2 - bump again for double-long bug on ppc(64) From fedora-cvs-commits at redhat.com Tue Mar 28 12:13:16 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 28 Mar 2006 07:13:16 -0500 Subject: rpms/dovecot/FC-4 dovecot-0.99.14-userdb-nss-check.patch, NONE, 1.1 dovecot.spec, 1.32, 1.33 Message-ID: <200603281213.k2SCDGS3019094@cvs.devel.redhat.com> Author: prockai Update of /cvs/dist/rpms/dovecot/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv19075 Modified Files: dovecot.spec Added Files: dovecot-0.99.14-userdb-nss-check.patch Log Message: * Tue Mar 28 2006 Petr Rockai - 0.99.14-8.fc4 - apply patch to prevent confusion when nss implementation is broken (nss_ldap) and returns wrong user info dovecot-0.99.14-userdb-nss-check.patch: userdb-passwd.c | 7 +++++++ 1 files changed, 7 insertions(+) --- NEW FILE dovecot-0.99.14-userdb-nss-check.patch --- --- src/auth/userdb-passwd.c.old 2005-04-09 21:09:45.093469928 +0300 +++ src/auth/userdb-passwd.c 2005-04-09 21:11:18.282291066 +0300 @@ -24,6 +24,13 @@ return; } + if (strcasecmp(pw->pw_name, user) != 0) { + /* try to catch broken NSS implementations (nss_ldap) */ + i_fatal("BROKEN NSS IMPLEMENTATION: " + "getpwnam() lookup returned different user than was " + "requested (%s != %s).", pw->pw_name, user); + } + memset(&data, 0, sizeof(data)); data.uid = pw->pw_uid; data.gid = pw->pw_gid; Index: dovecot.spec =================================================================== RCS file: /cvs/dist/rpms/dovecot/FC-4/dovecot.spec,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- dovecot.spec 16 Jun 2005 19:35:50 -0000 1.32 +++ dovecot.spec 28 Mar 2006 12:13:14 -0000 1.33 @@ -1,7 +1,7 @@ Summary: Dovecot Secure imap server Name: dovecot Version: 0.99.14 -Release: 7.fc4 +Release: 8.fc4 License: LGPL Group: System Environment/Daemons @@ -20,6 +20,7 @@ Patch101: dovecot-configfile.patch Patch102: dovecot-0.99-no-literal-plus-capability.patch Patch103: dovecot-pam-setcred.patch +Patch104: dovecot-0.99.14-userdb-nss-check.patch # Patches 500+ from upstream fixes URL: http://dovecot.procontrol.fi/ @@ -62,6 +63,7 @@ %patch101 -p1 -b .configfile %patch102 -p1 -b .no-literal-plus-capability %patch103 -p1 -b .pam-setcred +%patch104 -p0 -b .userdb-nss-check %build rm -f ./configure @@ -174,6 +176,10 @@ %changelog +* Tue Mar 28 2006 Petr Rockai - 0.99.14-8.fc4 +- apply patch to prevent confusion when nss implementation is broken (nss_ldap) + and returns wrong user info + * Thu Jun 16 2005 John Dennis - 0.99.14-7.fc4 - change permission of %%{ssldir}/dovecot.pem to 644 from 600 From fedora-cvs-commits at redhat.com Tue Mar 28 12:27:35 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 28 Mar 2006 07:27:35 -0500 Subject: rpms/hplip/FC-5 hplip.spec, 1.54, 1.55 sources, 1.8, 1.9 hplip-0.9.9-1.patch, 1.1, NONE Message-ID: <200603281227.k2SCRZKc000414@cvs.devel.redhat.com> Author: twaugh Update of /cvs/dist/rpms/hplip/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv369 Modified Files: hplip.spec sources Removed Files: hplip-0.9.9-1.patch Log Message: * Tue Mar 28 2006 Tim Waugh 0.9.10-1.1 - 0.9.10. - Ship PPDs. Index: hplip.spec =================================================================== RCS file: /cvs/dist/rpms/hplip/FC-5/hplip.spec,v retrieving revision 1.54 retrieving revision 1.55 diff -u -r1.54 -r1.55 --- hplip.spec 24 Mar 2006 17:28:54 -0000 1.54 +++ hplip.spec 28 Mar 2006 12:27:33 -0000 1.55 @@ -1,7 +1,7 @@ Summary: HP Linux Imaging and Printing Project Name: hplip -Version: 0.9.9 -Release: 5.1 +Version: 0.9.10 +Release: 1.1 License: GPL/MIT/BSD Group: System Environment/Daemons Conflicts: system-config-printer < 0.6.132 @@ -12,8 +12,7 @@ Source: http://kent.dl.sourceforge.net/sourceforge/hpinkjet/%{name}-%{version}.tar.gz Patch1: hplip-desktop.patch Patch2: hplip-config.patch -Patch3: hplip-0.9.9-1.patch -Patch4: hplip-quiet.patch +Patch3: hplip-quiet.patch BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot Requires: desktop-file-utils >= 0.2.92 @@ -66,11 +65,8 @@ # Use static IP ports (for SELinux policy). %patch2 -p1 -b .config -# Patchlevel 1. -%patch3 -p1 -b .0.9.9-1 - # Quieten hpssd on startup. -%patch4 -p1 -b .quiet +%patch3 -p1 -b .quiet %build %configure --disable-foomatic-install --disable-cups-install @@ -87,7 +83,6 @@ # Remove unpackaged files rm -rf %{buildroot}%{_sysconfdir}/sane.d \ - %{buildroot}%{_datadir}/ppd \ %{buildroot}%{_docdir} rm -f %{buildroot}%{_bindir}/foomatic-rip \ @@ -106,12 +101,15 @@ --add-category Application \ %{buildroot}%{_datadir}/hplip/data/hplip.desktop -if [ ! -d %{buildroot}/usr/lib/cups/backend ] +%if "%{_libdir}" == "/usr/lib64" +# This is for compatibility. +if [ ! -d %{buildroot}/usr/lib64/cups/backend ] then - mkdir -p %{buildroot}/usr/lib/cups/backend - cp -a %{buildroot}/usr/lib{64,}/cups/backend/hp - cp -a %{buildroot}/usr/lib{64,}/cups/backend/hpfax + mkdir -p %{buildroot}/usr/lib64/cups/backend + cp -a %{buildroot}/usr/lib{,64}/cups/backend/hp + cp -a %{buildroot}/usr/lib{,64}/cups/backend/hpfax fi +%endif # Move initscript mkdir -p %{buildroot}%{_sysconfdir}/rc.d/init.d @@ -137,11 +135,13 @@ %{_datadir}/hplip %{_libdir}/python*/site-packages/* %{_datadir}/applications/*.desktop +%{_datadir}/ppd %files -n hpijs %defattr(-,root,root) %doc prnt/hpijs/COPYING prnt/hpijs/hpijs_readme.html prnt/hpijs/gs_hpijs.png %{_bindir}/hpijs +%{_bindir}/hppgsz %files -n libsane-hpaio %defattr(-,root,root) @@ -169,6 +169,10 @@ fi %changelog +* Tue Mar 28 2006 Tim Waugh 0.9.10-1.1 +- 0.9.10. +- Ship PPDs. + * Fri Mar 24 2006 Tim Waugh 0.9.9-5.1 - Include hpfax. - Always use /usr/lib/cups/backend for CUPS backend directory. Index: sources =================================================================== RCS file: /cvs/dist/rpms/hplip/FC-5/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 9 Mar 2006 10:03:24 -0000 1.8 +++ sources 28 Mar 2006 12:27:33 -0000 1.9 @@ -1 +1 @@ -836affd511fd4831e6904b4f7f079c7d hplip-0.9.9.tar.gz +349489b10fb44d1bf105b04ff5352551 hplip-0.9.10.tar.gz --- hplip-0.9.9-1.patch DELETED --- From fedora-cvs-commits at redhat.com Tue Mar 28 12:54:03 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 28 Mar 2006 07:54:03 -0500 Subject: rpms/hplip/devel hplip-cups-backend.patch, NONE, 1.1 hplip.spec, 1.59, 1.60 Message-ID: <200603281254.k2SCs3v0014367@cvs.devel.redhat.com> Author: twaugh Update of /cvs/dist/rpms/hplip/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv14352 Modified Files: hplip.spec Added Files: hplip-cups-backend.patch Log Message: * Tue Mar 28 2006 Tim Waugh - Always use /usr/lib/cups/backend. hplip-cups-backend.patch: configure.in | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE hplip-cups-backend.patch --- --- hplip-0.9.10/configure.in.cups-backend 2006-03-28 13:48:42.000000000 +0100 +++ hplip-0.9.10/configure.in 2006-03-28 13:49:03.000000000 +0100 @@ -71,7 +71,7 @@ AC_MSG_RESULT(no) fi -CUPSSEARCHPATH="/usr/share /usr/local/share /usr/lib /usr/local/lib /usr/libexec /usr/lib64 /opt" +CUPSSEARCHPATH="/usr/share /usr/local/share /usr/lib /usr/local/lib /usr/libexec /opt" AC_MSG_CHECKING("for cups ppd path") CUPS_PPD_PATH="/usr/share/cups" Index: hplip.spec =================================================================== RCS file: /cvs/dist/rpms/hplip/devel/hplip.spec,v retrieving revision 1.59 retrieving revision 1.60 diff -u -r1.59 -r1.60 --- hplip.spec 28 Mar 2006 11:58:08 -0000 1.59 +++ hplip.spec 28 Mar 2006 12:54:01 -0000 1.60 @@ -13,6 +13,7 @@ Patch1: hplip-desktop.patch Patch2: hplip-config.patch Patch3: hplip-quiet.patch +Patch4: hplip-cups-backend.patch BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot Requires: desktop-file-utils >= 0.2.92 @@ -68,6 +69,10 @@ # Quieten hpssd on startup. %patch3 -p1 -b .quiet +# Always use /usr/lib/cups/backend. +%patch4 -p1 -b .cups-backend +autoconf + %build %configure --disable-foomatic-install --disable-cups-install make @@ -155,6 +160,9 @@ fi %changelog +* Tue Mar 28 2006 Tim Waugh +- Always use /usr/lib/cups/backend. + * Tue Mar 28 2006 Tim Waugh 0.9.10-2 - 0.9.10. - Ship PPDs. From fedora-cvs-commits at redhat.com Tue Mar 28 12:55:39 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 28 Mar 2006 07:55:39 -0500 Subject: rpms/hplip/FC-5 hplip-cups-backend.patch, NONE, 1.1 hplip.spec, 1.55, 1.56 Message-ID: <200603281255.k2SCtd8o014399@cvs.devel.redhat.com> Author: twaugh Update of /cvs/dist/rpms/hplip/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv14384 Modified Files: hplip.spec Added Files: hplip-cups-backend.patch Log Message: - Always use /usr/lib/cups/backend. hplip-cups-backend.patch: configure.in | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE hplip-cups-backend.patch --- --- hplip-0.9.10/configure.in.cups-backend 2006-03-28 13:48:42.000000000 +0100 +++ hplip-0.9.10/configure.in 2006-03-28 13:49:03.000000000 +0100 @@ -71,7 +71,7 @@ AC_MSG_RESULT(no) fi -CUPSSEARCHPATH="/usr/share /usr/local/share /usr/lib /usr/local/lib /usr/libexec /usr/lib64 /opt" +CUPSSEARCHPATH="/usr/share /usr/local/share /usr/lib /usr/local/lib /usr/libexec /opt" AC_MSG_CHECKING("for cups ppd path") CUPS_PPD_PATH="/usr/share/cups" Index: hplip.spec =================================================================== RCS file: /cvs/dist/rpms/hplip/FC-5/hplip.spec,v retrieving revision 1.55 retrieving revision 1.56 diff -u -r1.55 -r1.56 --- hplip.spec 28 Mar 2006 12:27:33 -0000 1.55 +++ hplip.spec 28 Mar 2006 12:55:37 -0000 1.56 @@ -13,6 +13,7 @@ Patch1: hplip-desktop.patch Patch2: hplip-config.patch Patch3: hplip-quiet.patch +Patch4: hplip-cups-backend.patch BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot Requires: desktop-file-utils >= 0.2.92 @@ -68,6 +69,10 @@ # Quieten hpssd on startup. %patch3 -p1 -b .quiet +# Always use /usr/lib/cups/backend. +%patch4 -p1 -b .cups-backend +autoconf + %build %configure --disable-foomatic-install --disable-cups-install make @@ -172,6 +177,7 @@ * Tue Mar 28 2006 Tim Waugh 0.9.10-1.1 - 0.9.10. - Ship PPDs. +- Always use /usr/lib/cups/backend. * Fri Mar 24 2006 Tim Waugh 0.9.9-5.1 - Include hpfax. From fedora-cvs-commits at redhat.com Tue Mar 28 13:04:09 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 28 Mar 2006 08:04:09 -0500 Subject: rpms/hplip/devel hplip.spec,1.60,1.61 Message-ID: <200603281304.k2SD49oB014573@cvs.devel.redhat.com> Author: twaugh Update of /cvs/dist/rpms/hplip/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv14557 Modified Files: hplip.spec Log Message: * Tue Mar 28 2006 Tim Waugh 0.9.10-3 - Always use /usr/lib/cups/backend. Index: hplip.spec =================================================================== RCS file: /cvs/dist/rpms/hplip/devel/hplip.spec,v retrieving revision 1.60 retrieving revision 1.61 diff -u -r1.60 -r1.61 --- hplip.spec 28 Mar 2006 12:54:01 -0000 1.60 +++ hplip.spec 28 Mar 2006 13:04:03 -0000 1.61 @@ -1,7 +1,7 @@ Summary: HP Linux Imaging and Printing Project Name: hplip Version: 0.9.10 -Release: 2 +Release: 3 License: GPL/MIT/BSD Group: System Environment/Daemons Conflicts: system-config-printer < 0.6.132 @@ -160,7 +160,7 @@ fi %changelog -* Tue Mar 28 2006 Tim Waugh +* Tue Mar 28 2006 Tim Waugh 0.9.10-3 - Always use /usr/lib/cups/backend. * Tue Mar 28 2006 Tim Waugh 0.9.10-2 From fedora-cvs-commits at redhat.com Tue Mar 28 13:11:29 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 28 Mar 2006 08:11:29 -0500 Subject: rpms/cpio/devel cpio.spec,1.38,1.39 Message-ID: <200603281311.k2SDBTE2014711@cvs.devel.redhat.com> Author: pvrabec Update of /cvs/dist/rpms/cpio/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv14698 Modified Files: cpio.spec Log Message: rebuild Index: cpio.spec =================================================================== RCS file: /cvs/dist/rpms/cpio/devel/cpio.spec,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- cpio.spec 25 Mar 2006 17:40:51 -0000 1.38 +++ cpio.spec 28 Mar 2006 13:11:26 -0000 1.39 @@ -6,7 +6,7 @@ Summary: A GNU archiving program. Name: cpio Version: 2.6 -Release: 15 +Release: 17 License: GPL Group: Applications/Archiving URL: http://www.gnu.org/software/cpio/ @@ -106,6 +106,9 @@ %{_infodir}/*.info* %changelog +* Tue Mar 28 2006 Peter Vrabec 2.6-17 +- rebuild + * Sat Mar 25 2006 Peter Vrabec 2.6-15 - fix (#186339) on ppc and s390 From fedora-cvs-commits at redhat.com Tue Mar 28 13:15:07 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 28 Mar 2006 08:15:07 -0500 Subject: rpms/openoffice.org/devel openoffice.org-1.9.87.rh151357.setlangtolocale.patch, 1.12, 1.13 Message-ID: <200603281315.k2SDF7HB014788@cvs.devel.redhat.com> Author: caolanm Update of /cvs/dist/rpms/openoffice.org/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv14773 Modified Files: openoffice.org-1.9.87.rh151357.setlangtolocale.patch Log Message: better fallback to english for help openoffice.org-1.9.87.rh151357.setlangtolocale.patch: bin/modules/installer/scriptitems.pm | 0 com/sun/star/wizards/letter/LetterWizardDialogImpl.java | 0 com/sun/star/wizards/letter/LetterWizardDialogResources.java | 0 desktop/source/app/langselect.cxx | 15 desktop/source/app/langselect.hxx | 2 desktop/source/migration/wizard.cxx | 19 framework/source/services/substitutepathvars.cxx | 93 +++ framework/util/makefile.mk | 1 officecfg/registry/schema/org/openoffice/Office/Common.xcs | 8 registry/schema/org/openoffice/Office/Common.xcs | 0 sfx2/source/appl/sfxhelp.cxx | 69 ++ solenv/bin/modules/installer/scriptitems.pm | 3 source/app/langselect.cxx | 0 source/app/langselect.hxx | 0 source/appl/sfxhelp.cxx | 0 source/formwizard/dbwizres.src | 0 source/migration/wizard.cxx | 0 source/rc/resmgr.cxx | 0 source/services/substitutepathvars.cxx | 0 source/treeview/tvread.cxx | 0 source/ui/misc/glosdoc.cxx | 0 svx/source/dialog/optgdlg.cxx | 248 +++++----- svx/source/dialog/optgdlg.hxx | 4 sw/source/ui/misc/glosdoc.cxx | 14 tools/source/rc/resmgr.cxx | 19 util/makefile.mk | 0 wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.java | 24 wizards/com/sun/star/wizards/letter/LetterWizardDialogResources.java | 8 wizards/source/formwizard/dbwizres.src | 11 xmlhelp/source/treeview/tvread.cxx | 4 30 files changed, 353 insertions(+), 189 deletions(-) Index: openoffice.org-1.9.87.rh151357.setlangtolocale.patch =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org-1.9.87.rh151357.setlangtolocale.patch,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- openoffice.org-1.9.87.rh151357.setlangtolocale.patch 22 Feb 2006 11:26:17 -0000 1.12 +++ openoffice.org-1.9.87.rh151357.setlangtolocale.patch 28 Mar 2006 13:15:03 -0000 1.13 @@ -126,9 +126,9 @@ =================================================================== RCS file: /cvs/framework/sfx2/source/appl/sfxhelp.cxx,v retrieving revision 1.66 -diff -u -p -u -r1.66 sfxhelp.cxx ---- openoffice.org.orig/sfx2/source/appl/sfxhelp.cxx 7 Sep 2005 17:47:17 -0000 1.66 -+++ openoffice.org/sfx2/source/appl/sfxhelp.cxx 24 Oct 2005 11:16:54 -0000 +diff -u -r1.68 sfxhelp.cxx +--- openoffice.org.orig/sfx2/source/appl/sfxhelp.cxx 7 Feb 2006 10:29:33 -0000 1.68 ++++ openoffice.org/sfx2/source/appl/sfxhelp.cxx 28 Mar 2006 13:12:14 -0000 @@ -99,6 +99,9 @@ #ifndef _URLOBJ_HXX #include @@ -151,7 +151,7 @@ #include #include #include -@@ -165,16 +173,50 @@ void NoHelpErrorBox::RequestHelp( const +@@ -165,16 +173,53 @@ #define STARTERLIST 0 @@ -175,12 +175,15 @@ + rtl::OUString sHelpPath = aBaseInstallPath + + rtl::OUString::createFromAscii(szHelpPath) + aLocaleStr; + osl::DirectoryItem aDirItem; ++ + if (!osl::DirectoryItem::get(sHelpPath, aDirItem) == osl::FileBase::E_None) + { ++ bOk = false; + String sLang(aLocaleStr); + xub_StrLen nSepPos = sLang.Search( '-' ); + if (nSepPos != STRING_NOTFOUND) + { ++ bOk = true; + sLang = sLang.Copy( 0, nSepPos ); + sHelpPath = aBaseInstallPath + + rtl::OUString::createFromAscii(szHelpPath) + sLang; @@ -210,7 +213,7 @@ // query part exists? if ( bQuestionMark ) -@@ -189,6 +231,7 @@ void AppendConfigToken_Impl( String& rUR +@@ -189,6 +234,7 @@ rURL += String( aLocaleStr ); rURL += DEFINE_CONST_UNICODE("&System="); rURL += SvtHelpOptions().GetSystem(); @@ -218,7 +221,7 @@ } // ----------------------------------------------------------------------- -@@ -426,11 +469,8 @@ SfxHelp::SfxHelp() : +@@ -426,11 +472,8 @@ pImp = new SfxHelp_Impl( bIsDebug ); From fedora-cvs-commits at redhat.com Tue Mar 28 13:16:04 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 28 Mar 2006 08:16:04 -0500 Subject: rpms/openoffice.org/FC-5 openoffice.org-1.9.87.rh151357.setlangtolocale.patch, 1.12, 1.13 Message-ID: <200603281316.k2SDG4jJ020270@cvs.devel.redhat.com> Author: caolanm Update of /cvs/dist/rpms/openoffice.org/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv19836 Modified Files: openoffice.org-1.9.87.rh151357.setlangtolocale.patch Log Message: better fallback to english for help openoffice.org-1.9.87.rh151357.setlangtolocale.patch: bin/modules/installer/scriptitems.pm | 0 com/sun/star/wizards/letter/LetterWizardDialogImpl.java | 0 com/sun/star/wizards/letter/LetterWizardDialogResources.java | 0 desktop/source/app/langselect.cxx | 15 desktop/source/app/langselect.hxx | 2 desktop/source/migration/wizard.cxx | 19 framework/source/services/substitutepathvars.cxx | 93 +++ framework/util/makefile.mk | 1 officecfg/registry/schema/org/openoffice/Office/Common.xcs | 8 registry/schema/org/openoffice/Office/Common.xcs | 0 sfx2/source/appl/sfxhelp.cxx | 69 ++ solenv/bin/modules/installer/scriptitems.pm | 3 source/app/langselect.cxx | 0 source/app/langselect.hxx | 0 source/appl/sfxhelp.cxx | 0 source/formwizard/dbwizres.src | 0 source/migration/wizard.cxx | 0 source/rc/resmgr.cxx | 0 source/services/substitutepathvars.cxx | 0 source/treeview/tvread.cxx | 0 source/ui/misc/glosdoc.cxx | 0 svx/source/dialog/optgdlg.cxx | 248 +++++----- svx/source/dialog/optgdlg.hxx | 4 sw/source/ui/misc/glosdoc.cxx | 14 tools/source/rc/resmgr.cxx | 19 util/makefile.mk | 0 wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.java | 24 wizards/com/sun/star/wizards/letter/LetterWizardDialogResources.java | 8 wizards/source/formwizard/dbwizres.src | 11 xmlhelp/source/treeview/tvread.cxx | 4 30 files changed, 353 insertions(+), 189 deletions(-) Index: openoffice.org-1.9.87.rh151357.setlangtolocale.patch =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/FC-5/openoffice.org-1.9.87.rh151357.setlangtolocale.patch,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- openoffice.org-1.9.87.rh151357.setlangtolocale.patch 22 Feb 2006 11:26:17 -0000 1.12 +++ openoffice.org-1.9.87.rh151357.setlangtolocale.patch 28 Mar 2006 13:16:02 -0000 1.13 @@ -126,9 +126,9 @@ =================================================================== RCS file: /cvs/framework/sfx2/source/appl/sfxhelp.cxx,v retrieving revision 1.66 -diff -u -p -u -r1.66 sfxhelp.cxx ---- openoffice.org.orig/sfx2/source/appl/sfxhelp.cxx 7 Sep 2005 17:47:17 -0000 1.66 -+++ openoffice.org/sfx2/source/appl/sfxhelp.cxx 24 Oct 2005 11:16:54 -0000 +diff -u -r1.68 sfxhelp.cxx +--- openoffice.org.orig/sfx2/source/appl/sfxhelp.cxx 7 Feb 2006 10:29:33 -0000 1.68 ++++ openoffice.org/sfx2/source/appl/sfxhelp.cxx 28 Mar 2006 13:12:14 -0000 @@ -99,6 +99,9 @@ #ifndef _URLOBJ_HXX #include @@ -151,7 +151,7 @@ #include #include #include -@@ -165,16 +173,50 @@ void NoHelpErrorBox::RequestHelp( const +@@ -165,16 +173,53 @@ #define STARTERLIST 0 @@ -175,12 +175,15 @@ + rtl::OUString sHelpPath = aBaseInstallPath + + rtl::OUString::createFromAscii(szHelpPath) + aLocaleStr; + osl::DirectoryItem aDirItem; ++ + if (!osl::DirectoryItem::get(sHelpPath, aDirItem) == osl::FileBase::E_None) + { ++ bOk = false; + String sLang(aLocaleStr); + xub_StrLen nSepPos = sLang.Search( '-' ); + if (nSepPos != STRING_NOTFOUND) + { ++ bOk = true; + sLang = sLang.Copy( 0, nSepPos ); + sHelpPath = aBaseInstallPath + + rtl::OUString::createFromAscii(szHelpPath) + sLang; @@ -210,7 +213,7 @@ // query part exists? if ( bQuestionMark ) -@@ -189,6 +231,7 @@ void AppendConfigToken_Impl( String& rUR +@@ -189,6 +234,7 @@ rURL += String( aLocaleStr ); rURL += DEFINE_CONST_UNICODE("&System="); rURL += SvtHelpOptions().GetSystem(); @@ -218,7 +221,7 @@ } // ----------------------------------------------------------------------- -@@ -426,11 +469,8 @@ SfxHelp::SfxHelp() : +@@ -426,11 +472,8 @@ pImp = new SfxHelp_Impl( bIsDebug ); From fedora-cvs-commits at redhat.com Tue Mar 28 13:28:56 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 28 Mar 2006 08:28:56 -0500 Subject: rpms/gcc/devel gcc41-pr20297-test.patch, NONE, 1.1 gcc41-pr21581.patch, NONE, 1.1 gcc41-pr21764.patch, NONE, 1.1 .cvsignore, 1.139, 1.140 gcc41-rh184446.patch, 1.3, 1.4 gcc41.spec, 1.44, 1.45 sources, 1.141, 1.142 Message-ID: <200603281328.k2SDSuQo028606@cvs.devel.redhat.com> Author: jakub Update of /cvs/dist/rpms/gcc/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv28588 Modified Files: .cvsignore gcc41-rh184446.patch gcc41.spec sources Added Files: gcc41-pr20297-test.patch gcc41-pr21581.patch gcc41-pr21764.patch Log Message: 4.1.0-4 gcc41-pr20297-test.patch: gcc.dg/visibility-11.c | 24 ------------------------ gcc.target/i386/visibility-1.c | 24 ++++++++++++++++++++++++ 2 files changed, 24 insertions(+), 24 deletions(-) --- NEW FILE gcc41-pr20297-test.patch --- 2006-03-28 Jakub Jelinek PR middle-end/20297 * gcc.dg/visibility-11.c: Moved to... * gcc.target/i386/visibility-1.c: ... here. Only run on 32-bit linux and bsds. --- gcc/testsuite/gcc.dg/visibility-11.c.jj 2006-03-24 17:07:15.000000000 +0100 +++ gcc/testsuite/gcc.dg/visibility-11.c 2006-03-28 14:59:27.000000000 +0200 @@ -1,24 +0,0 @@ -/* PR middle-end/20297 */ -/* The memcpy FUNCTION_DECL built in the middle-end for block moves got - hidden visibility from the first push, so the call didn't use the PLT. */ - -/* { dg-do compile { target i?86-*-* x86_64-*-* } } */ -/* { dg-require-visibility "" } */ -/* { dg-options "-Os -fpic" } */ -/* { dg-final { scan-assembler "memcpy at PLT" } } */ - -#pragma GCC visibility push(hidden) -#pragma GCC visibility push(default) -extern void* memcpy (void *, const void *, __SIZE_TYPE__); -#pragma GCC visibility pop - -struct a { int a[10]; }; - -extern void *bar (struct a *, struct a *, int); - -void * -foo (struct a *a, struct a *b, int c) -{ - struct a cc = *b; - return bar (a, &cc, 4 * c); -} --- gcc/testsuite/gcc.target/i386/visibility-1.c.jj 2006-03-28 14:30:17.000000000 +0200 +++ gcc/testsuite/gcc.target/i386/visibility-1.c 2006-03-28 14:58:48.000000000 +0200 @@ -0,0 +1,24 @@ +/* PR middle-end/20297 */ +/* The memcpy FUNCTION_DECL built in the middle-end for block moves got + hidden visibility from the first push, so the call didn't use the PLT. */ + +/* { dg-do compile { target { { i?86-*-linux* x86_64-*-linux* i?86-*-*bsd* x86_64-*-*bsd* } && ilp32 } } } */ +/* { dg-require-visibility "" } */ +/* { dg-options "-Os -fpic" } */ +/* { dg-final { scan-assembler "memcpy at PLT" } } */ + +#pragma GCC visibility push(hidden) +#pragma GCC visibility push(default) +extern void* memcpy (void *, const void *, __SIZE_TYPE__); +#pragma GCC visibility pop + +struct a { int a[10]; }; + +extern void *bar (struct a *, struct a *, int); + +void * +foo (struct a *a, struct a *b, int c) +{ + struct a cc = *b; + return bar (a, &cc, 4 * c); +} gcc41-pr21581.patch: 0 files changed --- NEW FILE gcc41-pr21581.patch --- 2006-03-22 Jason Merrill * name-lookup.c (push_namespace_with_attribs): Only apply hidden visibility to anonymous namespaces if HAVE_GAS_HIDDEN. 2006-03-21 Jason Merrill PR c++/21581 * parser.c (cp_parser_declaration): Support attributes on anonymous namespaces. * name-lookup.c (push_namespace_with_attribs): Anonymous namespaces default to hidden visibility. --- gcc/cp/name-lookup.c (revision 112249) +++ gcc/cp/name-lookup.c (revision 112312) @@ -3046,7 +3046,7 @@ push_namespace_with_attribs (tree name, tree name = TREE_PURPOSE (d); tree args = TREE_VALUE (d); tree x; - + if (! is_attribute_p ("visibility", name)) { warning (OPT_Wattributes, "%qs attribute directive ignored", @@ -3055,17 +3055,28 @@ push_namespace_with_attribs (tree name, } x = args ? TREE_VALUE (args) : NULL_TREE; - if (x == NULL_TREE || TREE_CODE (x) != STRING_CST) + if (x == NULL_TREE || TREE_CODE (x) != STRING_CST || TREE_CHAIN (args)) { - warning (OPT_Wattributes, "%qs attribute requires an NTBS argument", + warning (OPT_Wattributes, "%qs attribute requires a single NTBS argument", IDENTIFIER_POINTER (name)); continue; } current_binding_level->has_visibility = 1; push_visibility (TREE_STRING_POINTER (x)); + goto found; + } +#ifdef HAVE_GAS_HIDDEN + if (anon) + { + /* Anonymous namespaces default to hidden visibility. This might + change once we implement export. */ + current_binding_level->has_visibility = 1; + push_visibility ("hidden"); } #endif + found: +#endif timevar_pop (TV_NAME_LOOKUP); } --- gcc/cp/parser.c (revision 112249) +++ gcc/cp/parser.c (revision 112250) @@ -7066,7 +7066,8 @@ cp_parser_declaration (cp_parser* parser && (cp_lexer_peek_nth_token (parser->lexer, 3)->type != CPP_EQ)) /* An unnamed namespace definition. */ - || token2.type == CPP_OPEN_BRACE)) + || token2.type == CPP_OPEN_BRACE + || token2.keyword == RID_ATTRIBUTE)) cp_parser_namespace_definition (parser); /* Objective-C++ declaration/definition. */ else if (c_dialect_objc () && OBJC_IS_AT_KEYWORD (token1.keyword)) --- gcc/testsuite/g++.dg/ext/visibility/anon1.C (revision 0) +++ gcc/testsuite/g++.dg/ext/visibility/anon1.C (revision 112250) @@ -0,0 +1,10 @@ +// PR c++/21581 +// Test for anonymous namespace default hidden visibility + +// { dg-require-visibility "" } +// { dg-final { scan-hidden "_ZN.*1fEv" } } + +namespace +{ + int f() { } +} gcc41-pr21764.patch: 0 files changed --- NEW FILE gcc41-pr21764.patch --- 2006-03-20 Jason Merrill PR c++/21764 * c-pragma.c (visstack): Move out of handle_pragma_visibility. (push_visibility, pop_visibility): Likewise. * c-pragma.h: Declare them. cp/ PR c++/21764, c++/19238 * decl.c (cp_finish_decl): Call determine_visibility later. (start_preparsed_function): Likewise. * cp-tree.h (CP_TYPE_CONTEXT, TYPE_NAMESPACE_SCOPE_P): New macros. (TYPE_CLASS_SCOPE_P, TYPE_FUNCTION_SCOPE_P): New macros. * name-lookup.h (struct cp_binding_level): Add has_visibility bitfield. * name-lookup.c: Include c-pragma.h. (push_namespace_with_attribs): Split out from push_namespace. Push visibility if appropriate. Set TREE_PUBLIC on namespaces. (leave_scope): Pop visibility if appropriate. * decl2.c (determine_visibility_from_class): Split out from... (determine_visibility): ...here. Handle function scope and nested classes. (import_export_decl): Move visibility handling to determine_visibility_from_class. * parser.c (cp_parser_declaration, cp_parser_namespace_name): Allow attributes on namespace declarations. --- gcc/cp/decl.c (revision 112238) +++ gcc/cp/decl.c (revision 112241) @@ -5178,9 +5178,6 @@ cp_finish_decl (tree decl, tree init, bo the class specifier. */ if (!DECL_EXTERNAL (decl)) var_definition_p = true; - /* The variable is being defined, so determine its - visibility. */ - determine_visibility (decl); } /* If the variable has an array type, lay out the type, even if there is no initializer. It is valid to index through the @@ -5244,6 +5241,10 @@ cp_finish_decl (tree decl, tree init, bo initialize_local_var (decl, init); } + /* The variable is being defined, so determine its visibility. + This needs to happen after the linkage is set. */ + determine_visibility (decl); + /* If a variable is defined, and then a subsequent definition with external linkage is encountered, we will get here twice for the same variable. We want to avoid @@ -10422,12 +10423,6 @@ start_preparsed_function (tree decl1, tr maybe_apply_pragma_weak (decl1); } - /* Determine the ELF visibility attribute for the function. We must - not do this before calling "pushdecl", as we must allow - "duplicate_decls" to merge any attributes appropriately. */ - if (!DECL_CLONED_FUNCTION_P (decl1)) - determine_visibility (decl1); - /* Reset these in case the call to pushdecl changed them. */ current_function_decl = decl1; cfun->decl = decl1; @@ -10546,6 +10541,13 @@ start_preparsed_function (tree decl1, tr DECL_INTERFACE_KNOWN (decl1) = 1; } + /* Determine the ELF visibility attribute for the function. We must not + do this before calling "pushdecl", as we must allow "duplicate_decls" + to merge any attributes appropriately. We also need to wait until + linkage is set. */ + if (!DECL_CLONED_FUNCTION_P (decl1)) + determine_visibility (decl1); + begin_scope (sk_function_parms, decl1); ++function_depth; --- gcc/cp/cp-tree.h (revision 112238) +++ gcc/cp/cp-tree.h (revision 112241) @@ -1964,6 +1964,8 @@ struct lang_decl GTY(()) /* NULL_TREE in DECL_CONTEXT represents the global namespace. */ #define CP_DECL_CONTEXT(NODE) \ (DECL_CONTEXT (NODE) ? DECL_CONTEXT (NODE) : global_namespace) +#define CP_TYPE_CONTEXT(NODE) \ + (TYPE_CONTEXT (NODE) ? TYPE_CONTEXT (NODE) : global_namespace) #define FROB_CONTEXT(NODE) ((NODE) == global_namespace ? NULL_TREE : (NODE)) /* 1 iff NODE has namespace scope, including the global namespace. */ @@ -1971,15 +1973,25 @@ struct lang_decl GTY(()) (!DECL_TEMPLATE_PARM_P (NODE) \ && TREE_CODE (CP_DECL_CONTEXT (NODE)) == NAMESPACE_DECL) +#define TYPE_NAMESPACE_SCOPE_P(NODE) \ + (TREE_CODE (CP_TYPE_CONTEXT (NODE)) == NAMESPACE_DECL) + /* 1 iff NODE is a class member. */ #define DECL_CLASS_SCOPE_P(NODE) \ (DECL_CONTEXT (NODE) && TYPE_P (DECL_CONTEXT (NODE))) +#define TYPE_CLASS_SCOPE_P(NODE) \ + (TYPE_CONTEXT (NODE) && TYPE_P (TYPE_CONTEXT (NODE))) + /* 1 iff NODE is function-local. */ #define DECL_FUNCTION_SCOPE_P(NODE) \ (DECL_CONTEXT (NODE) \ && TREE_CODE (DECL_CONTEXT (NODE)) == FUNCTION_DECL) +#define TYPE_FUNCTION_SCOPE_P(NODE) \ + (TYPE_CONTEXT (NODE) \ + && TREE_CODE (TYPE_CONTEXT (NODE)) == FUNCTION_DECL) + /* 1 iff VAR_DECL node NODE is a type-info decl. This flag is set for both the primary typeinfo object and the associated NTBS name. */ #define DECL_TINFO_P(NODE) TREE_LANG_FLAG_4 (VAR_DECL_CHECK (NODE)) --- gcc/cp/name-lookup.c (revision 112238) +++ gcc/cp/name-lookup.c (revision 112241) @@ -31,6 +31,7 @@ Boston, MA 02110-1301, USA. */ #include "toplev.h" #include "diagnostic.h" #include "debug.h" +#include "c-pragma.h" /* The bindings for a particular name in a particular scope. */ @@ -1330,11 +1331,16 @@ leave_scope (void) is_class_level = 0; } +#ifdef HANDLE_PRAGMA_VISIBILITY + if (scope->has_visibility) + pop_visibility (); +#endif + /* Move one nesting level up. */ current_binding_level = scope->level_chain; /* Namespace-scopes are left most probably temporarily, not - completely; they can be reopen later, e.g. in namespace-extension + completely; they can be reopened later, e.g. in namespace-extension or any name binding activity that requires us to resume a namespace. For classes, we cache some binding levels. For other scopes, we just make the structure available for reuse. */ @@ -2958,6 +2964,15 @@ current_decl_namespace (void) void push_namespace (tree name) { + push_namespace_with_attribs (name, NULL_TREE); +} + +/* Same, but specify attributes to apply to the namespace. The attributes + only apply to the current namespace-body, not to any later extensions. */ + +void +push_namespace_with_attribs (tree name, tree attributes) +{ tree d = NULL_TREE; int need_new = 1; int implicit_use = 0; @@ -3004,6 +3019,7 @@ push_namespace (tree name) /* Make a new namespace, binding the name to it. */ d = build_lang_decl (NAMESPACE_DECL, name, void_type_node); DECL_CONTEXT (d) = FROB_CONTEXT (current_namespace); + TREE_PUBLIC (d) = 1; pushdecl (d); if (anon) { @@ -3021,6 +3037,36 @@ push_namespace (tree name) /* Enter the name space. */ current_namespace = d; +#ifdef HANDLE_PRAGMA_VISIBILITY + /* Clear has_visibility in case a previous namespace-definition had a + visibility attribute and this one doesn't. */ + current_binding_level->has_visibility = 0; + for (d = attributes; d; d = TREE_CHAIN (d)) + { + tree name = TREE_PURPOSE (d); + tree args = TREE_VALUE (d); + tree x; + + if (! is_attribute_p ("visibility", name)) + { + warning (OPT_Wattributes, "%qs attribute directive ignored", + IDENTIFIER_POINTER (name)); + continue; + } + + x = args ? TREE_VALUE (args) : NULL_TREE; + if (x == NULL_TREE || TREE_CODE (x) != STRING_CST) + { + warning (OPT_Wattributes, "%qs attribute requires an NTBS argument", + IDENTIFIER_POINTER (name)); + continue; + } + + current_binding_level->has_visibility = 1; + push_visibility (TREE_STRING_POINTER (x)); + } +#endif + timevar_pop (TV_NAME_LOOKUP); } --- gcc/cp/decl2.c (revision 112238) +++ gcc/cp/decl2.c (revision 112241) @@ -82,6 +82,7 @@ static tree prune_vars_needing_no_initia static void write_out_vars (tree); static void import_export_class (tree); static tree get_guard_bits (tree); +static void determine_visibility_from_class (tree, tree); /* A list of static class variables. This is needed, because a static class variable can be declared inside the class without @@ -1566,13 +1567,27 @@ maybe_emit_vtables (tree ctype) } /* Like c_determine_visibility, but with additional C++-specific - behavior. */ + behavior. + + Function-scope entities can rely on the function's visibility because + it is set in start_preparsed_function. + + Class-scope entities cannot rely on the class's visibility until the end + of the enclosing class definition. + + Note that because namespaces have multiple independent definitions, + namespace visibility is handled elsewhere using the #pragma visibility + machinery rather than by decorating the namespace declaration. */ void determine_visibility (tree decl) { tree class_type; + /* Only relevant for names with external linkage. */ + if (!TREE_PUBLIC (decl)) + return; + /* Cloned constructors and destructors get the same visibility as the underlying function. That should be set up in maybe_clone_body. */ @@ -1596,6 +1611,14 @@ determine_visibility (tree decl) so they are automatically handled above. */ gcc_assert (TREE_CODE (decl) != VAR_DECL || !DECL_VTABLE_OR_VTT_P (decl)); + + if (DECL_FUNCTION_SCOPE_P (decl)) + { + tree fn = DECL_CONTEXT (decl); + DECL_VISIBILITY (decl) = DECL_VISIBILITY (fn); + DECL_VISIBILITY_SPECIFIED (decl) = DECL_VISIBILITY_SPECIFIED (fn); + } + /* Entities not associated with any class just get the visibility specified by their attributes. */ return; @@ -1605,33 +1628,62 @@ determine_visibility (tree decl) the visibility of their containing class. */ if (class_type) { - if (TARGET_DLLIMPORT_DECL_ATTRIBUTES - && lookup_attribute ("dllexport", TYPE_ATTRIBUTES (class_type))) - { - DECL_VISIBILITY (decl) = VISIBILITY_DEFAULT; - DECL_VISIBILITY_SPECIFIED (decl) = 1; - } - else if (TREE_CODE (decl) == FUNCTION_DECL - && DECL_DECLARED_INLINE_P (decl) - && visibility_options.inlines_hidden) - { - /* Don't change it if it has been set explicitly by user. */ - if (!DECL_VISIBILITY_SPECIFIED (decl)) - { - DECL_VISIBILITY (decl) = VISIBILITY_HIDDEN; - DECL_VISIBILITY_SPECIFIED (decl) = 1; - } - } - else if (CLASSTYPE_VISIBILITY_SPECIFIED (class_type)) + determine_visibility_from_class (decl, class_type); + + /* Give the target a chance to override the visibility associated + with DECL. */ + if (TREE_CODE (decl) == VAR_DECL + && (DECL_TINFO_P (decl) + || (DECL_VTABLE_OR_VTT_P (decl) + /* Construction virtual tables are not exported because + they cannot be referred to from other object files; + their name is not standardized by the ABI. */ + && !DECL_CONSTRUCTION_VTABLE_P (decl))) + && TREE_PUBLIC (decl) + && !DECL_REALLY_EXTERN (decl) + && DECL_VISIBILITY_SPECIFIED (decl) + && (!class_type || !CLASSTYPE_VISIBILITY_SPECIFIED (class_type))) + targetm.cxx.determine_class_data_visibility (decl); + } +} + +static void +determine_visibility_from_class (tree decl, tree class_type) +{ + if (TARGET_DLLIMPORT_DECL_ATTRIBUTES + && lookup_attribute ("dllexport", TYPE_ATTRIBUTES (class_type))) + { + DECL_VISIBILITY (decl) = VISIBILITY_DEFAULT; + DECL_VISIBILITY_SPECIFIED (decl) = 1; + } + else if (TREE_CODE (decl) == FUNCTION_DECL + && DECL_DECLARED_INLINE_P (decl) + && visibility_options.inlines_hidden) + { + /* Don't change it if it has been set explicitly by user. */ + if (!DECL_VISIBILITY_SPECIFIED (decl)) { - DECL_VISIBILITY (decl) = CLASSTYPE_VISIBILITY (class_type); + DECL_VISIBILITY (decl) = VISIBILITY_HIDDEN; DECL_VISIBILITY_SPECIFIED (decl) = 1; } - else if (!DECL_VISIBILITY_SPECIFIED (decl)) - { - DECL_VISIBILITY (decl) = CLASSTYPE_VISIBILITY (class_type); - DECL_VISIBILITY_SPECIFIED (decl) = 0; - } + } + else if (CLASSTYPE_VISIBILITY_SPECIFIED (class_type)) + { + DECL_VISIBILITY (decl) = CLASSTYPE_VISIBILITY (class_type); + DECL_VISIBILITY_SPECIFIED (decl) = 1; + } + else if (TYPE_CLASS_SCOPE_P (class_type)) + determine_visibility_from_class (decl, TYPE_CONTEXT (class_type)); + else if (TYPE_FUNCTION_SCOPE_P (class_type)) + { + tree fn = TYPE_CONTEXT (class_type); + DECL_VISIBILITY (decl) = DECL_VISIBILITY (fn); + DECL_VISIBILITY_SPECIFIED (decl) = DECL_VISIBILITY_SPECIFIED (fn); + } + else if (!DECL_VISIBILITY_SPECIFIED (decl)) + { + DECL_VISIBILITY (decl) = CLASSTYPE_VISIBILITY (class_type); + DECL_VISIBILITY_SPECIFIED (decl) = 0; } } @@ -1905,21 +1957,6 @@ import_export_decl (tree decl) comdat_linkage (decl); } - /* Give the target a chance to override the visibility associated - with DECL. */ - if (TREE_CODE (decl) == VAR_DECL - && (DECL_TINFO_P (decl) - || (DECL_VTABLE_OR_VTT_P (decl) - /* Construction virtual tables are not exported because - they cannot be referred to from other object files; - their name is not standardized by the ABI. */ - && !DECL_CONSTRUCTION_VTABLE_P (decl))) - && TREE_PUBLIC (decl) - && !DECL_REALLY_EXTERN (decl) - && DECL_VISIBILITY_SPECIFIED (decl) - && (!class_type || !CLASSTYPE_VISIBILITY_SPECIFIED (class_type))) - targetm.cxx.determine_class_data_visibility (decl); - DECL_INTERFACE_KNOWN (decl) = 1; } --- gcc/cp/name-lookup.h (revision 112238) +++ gcc/cp/name-lookup.h (revision 112241) @@ -259,7 +259,11 @@ struct cp_binding_level GTY(()) unsigned more_cleanups_ok : 1; unsigned have_cleanups : 1; - /* 22 bits left to fill a 32-bit word. */ + /* Nonzero if this level has associated visibility which we should pop + when leaving the scope. */ + unsigned has_visibility : 1; + + /* 23 bits left to fill a 32-bit word. */ }; /* The binding level currently in effect. */ @@ -307,6 +311,7 @@ extern void pop_inner_scope (tree, tree) extern void push_binding_level (struct cp_binding_level *); extern void push_namespace (tree); +extern void push_namespace_with_attribs (tree, tree); extern void pop_namespace (void); extern void push_nested_namespace (tree); extern void pop_nested_namespace (tree); --- gcc/cp/parser.c (revision 112238) +++ gcc/cp/parser.c (revision 112241) @@ -7064,7 +7064,7 @@ cp_parser_declaration (cp_parser* parser && (/* A named namespace definition. */ (token2.type == CPP_NAME && (cp_lexer_peek_nth_token (parser->lexer, 3)->type - == CPP_OPEN_BRACE)) + != CPP_EQ)) /* An unnamed namespace definition. */ || token2.type == CPP_OPEN_BRACE)) cp_parser_namespace_definition (parser); @@ -10470,7 +10470,7 @@ cp_parser_namespace_name (cp_parser* par static void cp_parser_namespace_definition (cp_parser* parser) { - tree identifier; + tree identifier, attribs; /* Look for the `namespace' keyword. */ cp_parser_require_keyword (parser, RID_NAMESPACE, "`namespace'"); @@ -10484,10 +10484,13 @@ cp_parser_namespace_definition (cp_parse else identifier = NULL_TREE; + /* Parse any specified attributes. */ + attribs = cp_parser_attributes_opt (parser); + /* Look for the `{' to start the namespace. */ cp_parser_require (parser, CPP_OPEN_BRACE, "`{'"); /* Start the namespace. */ - push_namespace (identifier); + push_namespace_with_attribs (identifier, attribs); /* Parse the body of the namespace. */ cp_parser_namespace_body (parser); /* Finish the namespace. */ --- gcc/c-pragma.c (revision 112238) +++ gcc/c-pragma.c (revision 112241) @@ -593,9 +593,42 @@ static void handle_pragma_visibility (cp typedef enum symbol_visibility visibility; DEF_VEC_I (visibility); DEF_VEC_ALLOC_I (visibility, heap); +static VEC (visibility, heap) *visstack; + +/* Push the visibility indicated by STR onto the top of the #pragma + visibility stack. */ + +void +push_visibility (const char *str) +{ + VEC_safe_push (visibility, heap, visstack, + default_visibility); + if (!strcmp (str, "default")) + default_visibility = VISIBILITY_DEFAULT; + else if (!strcmp (str, "internal")) + default_visibility = VISIBILITY_INTERNAL; + else if (!strcmp (str, "hidden")) + default_visibility = VISIBILITY_HIDDEN; + else if (!strcmp (str, "protected")) + default_visibility = VISIBILITY_PROTECTED; + else + GCC_BAD ("#pragma GCC visibility push() must specify default, internal, hidden or protected"); + visibility_options.inpragma = 1; +} + +/* Pop a level of the #pragma visibility stack. */ + +void +pop_visibility (void) +{ + default_visibility = VEC_pop (visibility, visstack); + visibility_options.inpragma + = VEC_length (visibility, visstack) != 0; +} /* Sets the default visibility for symbols to something other than that specified on the command line. */ + static void handle_pragma_visibility (cpp_reader *dummy ATTRIBUTE_UNUSED) { @@ -603,7 +636,6 @@ handle_pragma_visibility (cpp_reader *du tree x; enum cpp_ttype token; enum { bad, push, pop } action = bad; - static VEC (visibility, heap) *visstack; token = pragma_lex (&x); if (token == CPP_NAME) @@ -621,15 +653,9 @@ handle_pragma_visibility (cpp_reader *du if (pop == action) { if (!VEC_length (visibility, visstack)) - { - GCC_BAD ("no matching push for %<#pragma GCC visibility pop%>"); - } + GCC_BAD ("no matching push for %<#pragma GCC visibility pop%>"); else - { - default_visibility = VEC_pop (visibility, visstack); - visibility_options.inpragma - = VEC_length (visibility, visstack) != 0; - } + pop_visibility (); } else { @@ -637,28 +663,9 @@ handle_pragma_visibility (cpp_reader *du GCC_BAD ("missing %<(%> after %<#pragma GCC visibility push%> - ignored"); token = pragma_lex (&x); if (token != CPP_NAME) - { - GCC_BAD ("malformed #pragma GCC visibility push"); - } + GCC_BAD ("malformed #pragma GCC visibility push"); else - { - const char *str = IDENTIFIER_POINTER (x); - VEC_safe_push (visibility, heap, visstack, - default_visibility); - if (!strcmp (str, "default")) - default_visibility = VISIBILITY_DEFAULT; - else if (!strcmp (str, "internal")) - default_visibility = VISIBILITY_INTERNAL; - else if (!strcmp (str, "hidden")) - default_visibility = VISIBILITY_HIDDEN; - else if (!strcmp (str, "protected")) - default_visibility = VISIBILITY_PROTECTED; - else - { - GCC_BAD ("#pragma GCC visibility push() must specify default, internal, hidden or protected"); - } - visibility_options.inpragma = 1; - } + push_visibility (IDENTIFIER_POINTER (x)); if (pragma_lex (&x) != CPP_CLOSE_PAREN) GCC_BAD ("missing %<(%> after %<#pragma GCC visibility push%> - ignored"); } --- gcc/c-pragma.h (revision 112238) +++ gcc/c-pragma.h (revision 112241) @@ -75,6 +75,8 @@ extern struct cpp_reader* parse_in; visibility is not supported on the host OS platform the statements are ignored. */ #define HANDLE_PRAGMA_VISIBILITY 1 +extern void push_visibility (const char *); +extern void pop_visibility (void); extern void init_pragma (void); --- gcc/testsuite/g++.dg/ext/visibility/local1.C (revision 0) +++ gcc/testsuite/g++.dg/ext/visibility/local1.C (revision 112241) @@ -0,0 +1,25 @@ +// PR c++/19238 +// Test that hidden visibility on an inline function is inherited by static +// local variables and local classes. + +// { dg-require-visibility "" } +// { dg-final { scan-hidden "_Z1fv" } } +// { dg-final { scan-hidden "_ZZ1fvE1i" } } +// { dg-final { scan-hidden "_ZZ1fvEN1A1fEv" } } + +__attribute ((visibility ("hidden"))) inline int +f() +{ + static int i = 2; + struct A + { + void f () { } + } a; + a.f(); + return i; +} + +int main() +{ + f(); +} --- gcc/testsuite/g++.dg/ext/visibility/namespace1.C (revision 0) +++ gcc/testsuite/g++.dg/ext/visibility/namespace1.C (revision 112241) @@ -0,0 +1,30 @@ +// PR c++/21764 +// Test for namespace visibility attribute semantics. + +// { dg-require-visibility "" } +// { dg-final { scan-hidden "_ZN3foo1fEv" } } +// { dg-final { scan-hidden "_ZN3foo1gEv" } } +// { dg-final { scan-hidden "_ZN3foo1A1mEv" } } +// { dg-final { scan-hidden "_ZN3foo1tIiEEvv" } } +// { dg-final { scan-not-hidden "_ZN3foo1hEv" } } + +namespace foo __attribute ((visibility ("hidden"))) +{ + int f() { } + void g(); + template void t() { } + class A + { + void m (); + }; +} + +namespace foo +{ + void h() {} +} + +void foo::g() { t (); } + +void foo::A::m() { } + Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/gcc/devel/.cvsignore,v retrieving revision 1.139 retrieving revision 1.140 diff -u -r1.139 -r1.140 --- .cvsignore 4 Mar 2006 08:09:07 -0000 1.139 +++ .cvsignore 28 Mar 2006 13:28:54 -0000 1.140 @@ -1 +1 @@ -gcc-4.1.0-20060304.tar.bz2 +gcc-4.1.0-20060328.tar.bz2 gcc41-rh184446.patch: rs6000.c | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) Index: gcc41-rh184446.patch =================================================================== RCS file: /cvs/dist/rpms/gcc/devel/gcc41-rh184446.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- gcc41-rh184446.patch 10 Mar 2006 01:06:24 -0000 1.3 +++ gcc41-rh184446.patch 28 Mar 2006 13:28:54 -0000 1.4 @@ -1,12 +1,10 @@ -for gcc/ChangeLog -from Richard Henderson , Alexandre Oliva +2006-03-09 Richard Henderson + Alexandre Oliva * config/rs6000/rs6000.c (rs6000_legitimize_tls_address): Use secure-plt-compatible load sequence to compute the GOT address for -fPIC -msecure-plt. -Index: gcc/config/rs6000/rs6000.c -=================================================================== --- gcc/config/rs6000/rs6000.c.orig 2006-03-09 20:02:13.000000000 -0300 +++ gcc/config/rs6000/rs6000.c 2006-03-09 22:00:43.000000000 -0300 @@ -3081,7 +3081,7 @@ rs6000_legitimize_tls_address (rtx addr, Index: gcc41.spec =================================================================== RCS file: /cvs/dist/rpms/gcc/devel/gcc41.spec,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- gcc41.spec 9 Mar 2006 23:09:49 -0000 1.44 +++ gcc41.spec 28 Mar 2006 13:28:54 -0000 1.45 @@ -1,6 +1,6 @@ -%define DATE 20060304 +%define DATE 20060328 %define gcc_version 4.1.0 -%define gcc_release 3 +%define gcc_release 4 %define _unpackaged_files_terminate_build 0 %define multilib_64_archs sparc64 ppc64 s390x x86_64 %ifarch %{ix86} x86_64 ia64 @@ -108,6 +108,9 @@ Patch11: gcc41-mni.patch Patch12: gcc41-cfaval.patch Patch13: gcc41-rh184446.patch +Patch14: gcc41-pr21764.patch +Patch15: gcc41-pr21581.patch +Patch16: gcc41-pr20297-test.patch %define _gnu %{nil} %ifarch sparc @@ -400,6 +403,9 @@ %patch11 -p0 -b .mni~ %patch12 -p0 -b .cfaval~ %patch13 -p0 -b .rh184446~ +%patch14 -p0 -b .pr21764~ +%patch15 -p0 -b .pr21581~ +%patch16 -p0 -E -b .pr20297-test~ sed -i -e 's/4\.1\.1/4.1.0/' gcc/BASE-VER gcc/version.c sed -i -e 's/" (Red Hat[^)]*)"/" (Red Hat %{version}-%{gcc_release})"/' gcc/version.c @@ -1417,12 +1423,38 @@ %doc rpm.doc/changelogs/libmudflap/ChangeLog* %changelog +* Tue Mar 28 2006 Jakub Jelinek 4.1.0-4 +- update from gcc-4_1-branch (-r111697:112431) + - PRs ada/25885, c/26004, fortran/17298, fortran/20935, fortran/20938, + fortran/23092, fortran/24519, fortran/24557, fortran/25045, + fortran/25054, fortran/25075, fortran/25089, fortran/25378, + fortran/25395, fortran/26041, fortran/26054, fortran/26064, + fortran/26107, fortran/26277, fortran/26393, fortran/26716, + fortran/26741, libfortran/21303, libfortran/24903, libgcj/24461, + libgcj/25713, libgcj/26103, libgcj/26688, libgcj/26706, + libgfortran/26499, libgfortran/26509, libgfortran/26554, + libgfortran/26661, libgfortran/26880, libstdc++/26132, + middle-end/18859, middle-end/19543, middle-end/26557, + middle-end/26630, other/26489, target/25917, target/26347, + target/26459, target/26532, target/26607, tree-optimization/26524, + tree-optimization/26587, tree-optimization/26672 + - fix visibility and builtins interaction (Jason Merrill, + PR middle-end/20297, #175442) +- merge gomp changes from trunk (-r112022:112023, -r112250:112251, + -r112252:112253, -r112350:112351 and -r112282:112283) + - PRs c++/26691, middle-end/26084, middle-end/26611, c++/26690, + middle-end/25989 +- support visibility attribute on namespaces (Jason Merrill, PR c++/21764, + PR c++/19238) +- use hidden visibility for anonymous namespaces by default (Jason Merrill, + PR c++/21581) + * Thu Mar 9 2006 Alexandre Oliva 4.1.0-3 - make ppc32 TLS PIC code sequences compatible with secure plt (#184446) (Richard Henderson and myself) * Sat Mar 4 2006 Jakub Jelinek 4.1.0-2 -- update from -gcc-4_1-branch (-r111570:111697) +- update from gcc-4_1-branch (-r111570:111697) - PRs c++/26291, libgfortran/26136, libgfortran/26423, libgfortran/26464, libstdc++/26526, rtl-optimization/26345, target/19061, target/26453 - handle DW_CFA_val_{offset,offset_sf,expression} in the libgcc{,_s} unwinder Index: sources =================================================================== RCS file: /cvs/dist/rpms/gcc/devel/sources,v retrieving revision 1.141 retrieving revision 1.142 diff -u -r1.141 -r1.142 --- sources 4 Mar 2006 08:09:07 -0000 1.141 +++ sources 28 Mar 2006 13:28:54 -0000 1.142 @@ -1 +1 @@ -cc39dd702c70d0a784c7ecdedbb503b7 gcc-4.1.0-20060304.tar.bz2 +40cb6ec0b50a317a12929f270a0d7c02 gcc-4.1.0-20060328.tar.bz2 From fedora-cvs-commits at redhat.com Tue Mar 28 14:51:31 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 28 Mar 2006 09:51:31 -0500 Subject: rpms/openoffice.org/devel openoffice.org.spec,1.654,1.655 Message-ID: <200603281451.k2SEpV4u005788@cvs.devel.redhat.com> Author: caolanm Update of /cvs/dist/rpms/openoffice.org/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv5775 Modified Files: openoffice.org.spec Log Message: more accessibility fixes Index: openoffice.org.spec =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v retrieving revision 1.654 retrieving revision 1.655 diff -u -r1.654 -r1.655 --- openoffice.org.spec 24 Mar 2006 14:58:15 -0000 1.654 +++ openoffice.org.spec 28 Mar 2006 14:51:28 -0000 1.655 @@ -1,6 +1,6 @@ %define oootag OOB680 %define ooomilestone 5 -%define rh_rpm_release 5 +%define rh_rpm_release 6 %define build_fc6 1 %define build_rhel4 0 @@ -3268,6 +3268,10 @@ %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu %changelog +* Tue Mar 28 2006 Caolan McNamara - 1:2.0.2-5.6 +- more rh#186215#/ooo#63583# accessibility fixes +- better fallback to english if help is missing + * Fri Mar 24 2006 Caolan McNamara - 1:2.0.2-5.5 - rh#186515# Keep draw and math launchers for mimetypes - rh#186215#/ooo#63583# accessibility crasher in impress From fedora-cvs-commits at redhat.com Tue Mar 28 15:17:38 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 28 Mar 2006 10:17:38 -0500 Subject: rpms/selinux-policy/FC-5 policy-20060207.patch, 1.52, 1.53 selinux-policy.spec, 1.156, 1.157 Message-ID: <200603281517.k2SFHcpg019926@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/selinux-policy/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv19911 Modified Files: policy-20060207.patch selinux-policy.spec Log Message: * Wed Mar 22 2006 Dan Walsh 2.2.25-2.1.fc5 - Fixes for hplip and klogd policy-20060207.patch: Rules.modular | 2 policy/mcs | 4 policy/modules/admin/bootloader.te | 2 policy/modules/admin/dmidecode.te | 2 policy/modules/admin/logwatch.te | 1 policy/modules/admin/readahead.te | 2 policy/modules/admin/rpm.fc | 3 policy/modules/admin/rpm.if | 3 policy/modules/admin/rpm.te | 1 policy/modules/admin/su.fc | 1 policy/modules/admin/su.if | 6 policy/modules/admin/updfstab.te | 4 policy/modules/admin/vbetool.te | 9 + policy/modules/kernel/corenetwork.te.in | 5 policy/modules/kernel/devices.fc | 1 policy/modules/kernel/devices.if | 59 ++++++++ policy/modules/kernel/files.fc | 8 - policy/modules/kernel/files.if | 33 ++++ policy/modules/kernel/filesystem.te | 1 policy/modules/kernel/kernel.if | 102 ++++++++++++++ policy/modules/kernel/kernel.te | 3 policy/modules/services/apache.fc | 2 policy/modules/services/apache.if | 5 policy/modules/services/apm.fc | 2 policy/modules/services/apm.te | 4 policy/modules/services/bluetooth.te | 38 ++--- policy/modules/services/cron.te | 3 policy/modules/services/cups.fc | 2 policy/modules/services/cups.if | 22 +++ policy/modules/services/cups.te | 10 + policy/modules/services/cvs.te | 2 policy/modules/services/dovecot.te | 2 policy/modules/services/hal.if | 41 +++++ policy/modules/services/hal.te | 17 ++ policy/modules/services/ktalk.fc | 1 policy/modules/services/ktalk.te | 8 + policy/modules/services/mailman.if | 25 +++ policy/modules/services/nis.fc | 1 policy/modules/services/nis.if | 25 +++ policy/modules/services/nis.te | 32 ++++ policy/modules/services/nscd.if | 2 policy/modules/services/pegasus.te | 1 policy/modules/services/postfix.te | 4 policy/modules/services/privoxy.te | 5 policy/modules/services/samba.te | 2 policy/modules/services/sendmail.te | 1 policy/modules/services/xserver.if | 20 ++ policy/modules/system/authlogin.te | 2 policy/modules/system/fstools.if | 18 ++ policy/modules/system/fstools.te | 7 + policy/modules/system/init.te | 5 policy/modules/system/libraries.fc | 2 policy/modules/system/locallogin.te | 1 policy/modules/system/lvm.fc | 1 policy/modules/system/lvm.te | 3 policy/modules/system/mount.te | 3 policy/modules/system/selinuxutil.fc | 6 policy/modules/system/selinuxutil.if | 23 ++- policy/modules/system/selinuxutil.te | 16 ++ policy/modules/system/sysnetwork.te | 7 + policy/modules/system/udev.te | 2 policy/modules/system/unconfined.te | 8 - policy/modules/system/userdomain.te | 1 policy/modules/system/xend.fc | 23 +++ policy/modules/system/xend.if | 71 ++++++++++ policy/modules/system/xend.te | 219 ++++++++++++++++++++++++++++++++ 66 files changed, 882 insertions(+), 65 deletions(-) Index: policy-20060207.patch =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/FC-5/policy-20060207.patch,v retrieving revision 1.52 retrieving revision 1.53 diff -u -r1.52 -r1.53 --- policy-20060207.patch 22 Mar 2006 18:44:17 -0000 1.52 +++ policy-20060207.patch 28 Mar 2006 15:17:34 -0000 1.53 @@ -1,6 +1,6 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/mcs serefpolicy-2.2.25/policy/mcs ---- nsaserefpolicy/policy/mcs 2006-02-16 14:46:56.000000000 -0500 -+++ serefpolicy-2.2.25/policy/mcs 2006-03-21 14:39:07.000000000 -0500 +--- nsaserefpolicy/policy/mcs 2006-03-21 14:33:50.000000000 -0500 ++++ serefpolicy-2.2.25/policy/mcs 2006-03-28 09:47:09.000000000 -0500 @@ -141,9 +141,7 @@ mlsconstrain file { create relabelto } ((h1 dom h2) and (l2 eq h2)); @@ -13,8 +13,8 @@ # new file labels must be dominated by the relabeling subject clearance mlsconstrain { dir lnk_file chr_file blk_file sock_file fifo_file } { relabelfrom } diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/bootloader.te serefpolicy-2.2.25/policy/modules/admin/bootloader.te ---- nsaserefpolicy/policy/modules/admin/bootloader.te 2006-03-17 13:51:46.000000000 -0500 -+++ serefpolicy-2.2.25/policy/modules/admin/bootloader.te 2006-03-21 14:39:07.000000000 -0500 +--- nsaserefpolicy/policy/modules/admin/bootloader.te 2006-03-21 14:33:50.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/admin/bootloader.te 2006-03-28 09:47:09.000000000 -0500 @@ -103,7 +103,7 @@ files_manage_boot_symlinks(bootloader_t) files_read_etc_files(bootloader_t) @@ -25,8 +25,8 @@ files_read_usr_files(bootloader_t) files_read_var_files(bootloader_t) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/dmidecode.te serefpolicy-2.2.25/policy/modules/admin/dmidecode.te ---- nsaserefpolicy/policy/modules/admin/dmidecode.te 2006-03-04 00:06:33.000000000 -0500 -+++ serefpolicy-2.2.25/policy/modules/admin/dmidecode.te 2006-03-21 14:39:07.000000000 -0500 +--- nsaserefpolicy/policy/modules/admin/dmidecode.te 2006-03-21 14:33:50.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/admin/dmidecode.te 2006-03-28 09:47:09.000000000 -0500 @@ -32,6 +32,8 @@ locallogin_use_fds(dmidecode_t) @@ -37,8 +37,8 @@ term_use_generic_ptys(dmidecode_t) term_use_unallocated_ttys(dmidecode_t) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/logwatch.te serefpolicy-2.2.25/policy/modules/admin/logwatch.te ---- nsaserefpolicy/policy/modules/admin/logwatch.te 2006-03-17 13:51:46.000000000 -0500 -+++ serefpolicy-2.2.25/policy/modules/admin/logwatch.te 2006-03-22 10:16:38.000000000 -0500 +--- nsaserefpolicy/policy/modules/admin/logwatch.te 2006-03-21 14:33:50.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/admin/logwatch.te 2006-03-28 09:47:09.000000000 -0500 @@ -53,6 +53,7 @@ files_read_usr_files(logwatch_t) files_search_spool(logwatch_t) @@ -48,8 +48,8 @@ fs_getattr_all_fs(logwatch_t) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/readahead.te serefpolicy-2.2.25/policy/modules/admin/readahead.te ---- nsaserefpolicy/policy/modules/admin/readahead.te 2006-03-17 13:51:47.000000000 -0500 -+++ serefpolicy-2.2.25/policy/modules/admin/readahead.te 2006-03-21 14:39:07.000000000 -0500 +--- nsaserefpolicy/policy/modules/admin/readahead.te 2006-03-21 14:33:50.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/admin/readahead.te 2006-03-28 09:47:09.000000000 -0500 @@ -18,7 +18,7 @@ # Local policy # @@ -60,8 +60,8 @@ allow readahead_t readahead_var_run_t:file create_file_perms; diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.fc serefpolicy-2.2.25/policy/modules/admin/rpm.fc ---- nsaserefpolicy/policy/modules/admin/rpm.fc 2006-03-17 13:51:47.000000000 -0500 -+++ serefpolicy-2.2.25/policy/modules/admin/rpm.fc 2006-03-21 14:39:07.000000000 -0500 +--- nsaserefpolicy/policy/modules/admin/rpm.fc 2006-03-21 14:33:50.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/admin/rpm.fc 2006-03-28 09:47:09.000000000 -0500 @@ -3,6 +3,7 @@ /usr/bin/smart -- gen_context(system_u:object_r:rpm_exec_t,s0) @@ -80,8 +80,8 @@ # SuSE ifdef(`distro_suse', ` diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.if serefpolicy-2.2.25/policy/modules/admin/rpm.if ---- nsaserefpolicy/policy/modules/admin/rpm.if 2006-03-04 00:06:33.000000000 -0500 -+++ serefpolicy-2.2.25/policy/modules/admin/rpm.if 2006-03-21 14:39:07.000000000 -0500 +--- nsaserefpolicy/policy/modules/admin/rpm.if 2006-03-21 14:33:50.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/admin/rpm.if 2006-03-28 09:47:09.000000000 -0500 @@ -78,6 +78,9 @@ role $2 types rpm_t; role $2 types rpm_script_t; @@ -93,8 +93,8 @@ ') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.te serefpolicy-2.2.25/policy/modules/admin/rpm.te ---- nsaserefpolicy/policy/modules/admin/rpm.te 2006-03-17 13:51:47.000000000 -0500 -+++ serefpolicy-2.2.25/policy/modules/admin/rpm.te 2006-03-21 14:39:07.000000000 -0500 +--- nsaserefpolicy/policy/modules/admin/rpm.te 2006-03-21 14:33:50.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/admin/rpm.te 2006-03-28 09:47:09.000000000 -0500 @@ -326,6 +326,7 @@ seutil_domtrans_loadpolicy(rpm_script_t) @@ -104,16 +104,16 @@ userdom_use_all_users_fds(rpm_script_t) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/su.fc serefpolicy-2.2.25/policy/modules/admin/su.fc ---- nsaserefpolicy/policy/modules/admin/su.fc 2005-11-14 18:24:06.000000000 -0500 -+++ serefpolicy-2.2.25/policy/modules/admin/su.fc 2006-03-21 14:39:07.000000000 -0500 +--- nsaserefpolicy/policy/modules/admin/su.fc 2006-03-21 14:33:50.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/admin/su.fc 2006-03-28 09:47:09.000000000 -0500 @@ -2,3 +2,4 @@ /bin/su -- gen_context(system_u:object_r:su_exec_t,s0) /usr(/local)?/bin/ksu -- gen_context(system_u:object_r:su_exec_t,s0) +/usr/bin/kdesu -- gen_context(system_u:object_r:su_exec_t,s0) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/su.if serefpolicy-2.2.25/policy/modules/admin/su.if ---- nsaserefpolicy/policy/modules/admin/su.if 2006-03-04 00:06:33.000000000 -0500 -+++ serefpolicy-2.2.25/policy/modules/admin/su.if 2006-03-21 14:39:07.000000000 -0500 +--- nsaserefpolicy/policy/modules/admin/su.if 2006-03-21 14:33:50.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/admin/su.if 2006-03-28 09:47:09.000000000 -0500 @@ -141,10 +141,10 @@ # By default, revert to the calling domain when a shell is executed. @@ -129,8 +129,8 @@ kernel_read_system_state($1_su_t) kernel_read_kernel_sysctls($1_su_t) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/updfstab.te serefpolicy-2.2.25/policy/modules/admin/updfstab.te ---- nsaserefpolicy/policy/modules/admin/updfstab.te 2006-03-04 00:06:33.000000000 -0500 -+++ serefpolicy-2.2.25/policy/modules/admin/updfstab.te 2006-03-21 14:39:07.000000000 -0500 +--- nsaserefpolicy/policy/modules/admin/updfstab.te 2006-03-21 14:33:50.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/admin/updfstab.te 2006-03-28 09:47:09.000000000 -0500 @@ -125,6 +125,6 @@ udev_read_db(updfstab_t) ') @@ -141,8 +141,8 @@ + fstools_getattr_swap_files(updfstab_t) ') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/vbetool.te serefpolicy-2.2.25/policy/modules/admin/vbetool.te ---- nsaserefpolicy/policy/modules/admin/vbetool.te 2006-02-01 08:23:27.000000000 -0500 -+++ serefpolicy-2.2.25/policy/modules/admin/vbetool.te 2006-03-21 14:39:07.000000000 -0500 +--- nsaserefpolicy/policy/modules/admin/vbetool.te 2006-03-21 14:33:50.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/admin/vbetool.te 2006-03-28 09:47:09.000000000 -0500 @@ -15,6 +15,7 @@ # Local policy # @@ -164,8 +164,17 @@ + hal_rw_var_run(vbetool_t) +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corenetwork.te.in serefpolicy-2.2.25/policy/modules/kernel/corenetwork.te.in ---- nsaserefpolicy/policy/modules/kernel/corenetwork.te.in 2006-03-21 11:38:20.000000000 -0500 -+++ serefpolicy-2.2.25/policy/modules/kernel/corenetwork.te.in 2006-03-21 14:39:07.000000000 -0500 +--- nsaserefpolicy/policy/modules/kernel/corenetwork.te.in 2006-03-21 14:33:50.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/kernel/corenetwork.te.in 2006-03-28 09:53:54.000000000 -0500 +@@ -68,7 +68,7 @@ + network_port(http_cache, tcp,3128,s0, udp,3130,s0, tcp,8080,s0, tcp,8118,s0) # 8118 is for privoxy + network_port(http, tcp,80,s0, tcp,443,s0, tcp,488,s0, tcp,8008,s0) + network_port(howl, tcp,5335,s0, udp,5353,s0) +-network_port(hplip, tcp,50000,s0, tcp,50002,s0) ++network_port(hplip, tcp,50000,s0, tcp,50002,s0, tcp,9100,s0) + network_port(i18n_input, tcp,9010,s0) + network_port(imaze, tcp,5323,s0, udp,5323,s0) + network_port(inetd_child, tcp,7,s0, udp,7,s0, tcp,9,s0, udp,9,s0, tcp,13,s0, udp,13,s0, tcp,19,s0, udp,19,s0, tcp,37,s0, udp,37,s0, tcp,512,s0, tcp,543,s0, tcp,544,s0, tcp,891,s0, udp,891,s0, tcp,892,s0, udp,892,s0, tcp,2105,s0, tcp,5666,s0) @@ -126,7 +126,8 @@ type utcpserver_port_t, port_type; dnl network_port(utcpserver) # no defined portcon network_port(uucpd, tcp,540,s0) @@ -177,8 +186,8 @@ network_port(zope, tcp,8021,s0) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.fc serefpolicy-2.2.25/policy/modules/kernel/devices.fc ---- nsaserefpolicy/policy/modules/kernel/devices.fc 2006-03-21 11:38:20.000000000 -0500 -+++ serefpolicy-2.2.25/policy/modules/kernel/devices.fc 2006-03-21 14:39:07.000000000 -0500 +--- nsaserefpolicy/policy/modules/kernel/devices.fc 2006-03-21 14:33:50.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/kernel/devices.fc 2006-03-28 09:47:09.000000000 -0500 @@ -37,6 +37,7 @@ /dev/par.* -c gen_context(system_u:object_r:printer_device_t,s0) /dev/patmgr[01] -c gen_context(system_u:object_r:sound_device_t,s0) @@ -188,8 +197,8 @@ /dev/(misc/)?psaux -c gen_context(system_u:object_r:mouse_device_t,s0) /dev/rmidi.* -c gen_context(system_u:object_r:sound_device_t,s0) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.if serefpolicy-2.2.25/policy/modules/kernel/devices.if ---- nsaserefpolicy/policy/modules/kernel/devices.if 2006-03-17 13:51:48.000000000 -0500 -+++ serefpolicy-2.2.25/policy/modules/kernel/devices.if 2006-03-22 10:19:58.000000000 -0500 +--- nsaserefpolicy/policy/modules/kernel/devices.if 2006-03-21 14:33:50.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/kernel/devices.if 2006-03-28 09:47:09.000000000 -0500 @@ -2382,7 +2382,45 @@ ') @@ -261,8 +270,8 @@ +') + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.fc serefpolicy-2.2.25/policy/modules/kernel/files.fc ---- nsaserefpolicy/policy/modules/kernel/files.fc 2006-03-04 00:06:34.000000000 -0500 -+++ serefpolicy-2.2.25/policy/modules/kernel/files.fc 2006-03-21 14:39:07.000000000 -0500 +--- nsaserefpolicy/policy/modules/kernel/files.fc 2006-03-21 14:33:50.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/kernel/files.fc 2006-03-28 09:47:09.000000000 -0500 @@ -45,7 +45,7 @@ /etc(/.*)? gen_context(system_u:object_r:etc_t,s0) /etc/\.fstab\.hal\..+ -- gen_context(system_u:object_r:etc_runtime_t,s0) @@ -300,8 +309,8 @@ HOME_ROOT/lost\+found -d gen_context(system_u:object_r:lost_found_t,s15:c0.c255) HOME_ROOT/lost\+found/.* <> diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.if serefpolicy-2.2.25/policy/modules/kernel/files.if ---- nsaserefpolicy/policy/modules/kernel/files.if 2006-03-17 13:51:48.000000000 -0500 -+++ serefpolicy-2.2.25/policy/modules/kernel/files.if 2006-03-22 10:16:33.000000000 -0500 +--- nsaserefpolicy/policy/modules/kernel/files.if 2006-03-21 14:33:50.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/kernel/files.if 2006-03-28 09:47:09.000000000 -0500 @@ -1648,6 +1648,21 @@ ') @@ -368,16 +377,16 @@ ######################################## diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/filesystem.te serefpolicy-2.2.25/policy/modules/kernel/filesystem.te ---- nsaserefpolicy/policy/modules/kernel/filesystem.te 2006-03-17 13:51:48.000000000 -0500 -+++ serefpolicy-2.2.25/policy/modules/kernel/filesystem.te 2006-03-21 14:39:07.000000000 -0500 +--- nsaserefpolicy/policy/modules/kernel/filesystem.te 2006-03-21 14:33:50.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/kernel/filesystem.te 2006-03-28 09:47:09.000000000 -0500 @@ -167,3 +167,4 @@ genfscon nfs / gen_context(system_u:object_r:nfs_t,s0) genfscon nfs4 / gen_context(system_u:object_r:nfs_t,s0) genfscon afs / gen_context(system_u:object_r:nfs_t,s0) +genfscon hfsplus / gen_context(system_u:object_r:nfs_t,s0) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel.if serefpolicy-2.2.25/policy/modules/kernel/kernel.if ---- nsaserefpolicy/policy/modules/kernel/kernel.if 2006-03-04 00:06:34.000000000 -0500 -+++ serefpolicy-2.2.25/policy/modules/kernel/kernel.if 2006-03-21 14:39:07.000000000 -0500 +--- nsaserefpolicy/policy/modules/kernel/kernel.if 2006-03-21 14:33:50.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/kernel/kernel.if 2006-03-28 09:47:09.000000000 -0500 @@ -1044,6 +1044,7 @@ allow $1 proc_t:dir search; @@ -499,8 +508,8 @@ + allow $1 proc_xen_t:file write; +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel.te serefpolicy-2.2.25/policy/modules/kernel/kernel.te ---- nsaserefpolicy/policy/modules/kernel/kernel.te 2006-03-17 13:51:48.000000000 -0500 -+++ serefpolicy-2.2.25/policy/modules/kernel/kernel.te 2006-03-21 14:39:07.000000000 -0500 +--- nsaserefpolicy/policy/modules/kernel/kernel.te 2006-03-21 14:33:50.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/kernel/kernel.te 2006-03-28 09:47:09.000000000 -0500 @@ -75,6 +75,9 @@ type proc_net_t, proc_type; genfscon proc /net gen_context(system_u:object_r:proc_net_t,s0) @@ -512,8 +521,8 @@ # Sysctl types # diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.fc serefpolicy-2.2.25/policy/modules/services/apache.fc ---- nsaserefpolicy/policy/modules/services/apache.fc 2006-02-27 17:17:23.000000000 -0500 -+++ serefpolicy-2.2.25/policy/modules/services/apache.fc 2006-03-21 14:39:07.000000000 -0500 +--- nsaserefpolicy/policy/modules/services/apache.fc 2006-03-21 14:33:50.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/services/apache.fc 2006-03-28 09:47:09.000000000 -0500 @@ -15,6 +15,7 @@ /etc/vhosts -- gen_context(system_u:object_r:httpd_config_t,s0) @@ -528,8 +537,8 @@ /var/www/perl(/.*)? gen_context(system_u:object_r:httpd_sys_script_exec_t,s0) +/usr/share/selinux-policy([^/]*)?/html(/.*)? gen_context(system_u:object_r:httpd_sys_content_t,s0) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.if serefpolicy-2.2.25/policy/modules/services/apache.if ---- nsaserefpolicy/policy/modules/services/apache.if 2006-03-17 13:51:48.000000000 -0500 -+++ serefpolicy-2.2.25/policy/modules/services/apache.if 2006-03-21 14:39:07.000000000 -0500 +--- nsaserefpolicy/policy/modules/services/apache.if 2006-03-21 14:33:50.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/services/apache.if 2006-03-28 09:47:09.000000000 -0500 @@ -12,6 +12,11 @@ ## # @@ -543,8 +552,8 @@ # services files. gen_tunable(allow_httpd_$1_script_anon_write,false) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apm.fc serefpolicy-2.2.25/policy/modules/services/apm.fc ---- nsaserefpolicy/policy/modules/services/apm.fc 2005-11-14 18:24:08.000000000 -0500 -+++ serefpolicy-2.2.25/policy/modules/services/apm.fc 2006-03-21 14:39:07.000000000 -0500 +--- nsaserefpolicy/policy/modules/services/apm.fc 2006-03-21 14:33:50.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/services/apm.fc 2006-03-28 09:47:09.000000000 -0500 @@ -11,7 +11,7 @@ # # /var @@ -555,8 +564,8 @@ /var/run/\.?acpid\.socket -s gen_context(system_u:object_r:apmd_var_run_t,s0) /var/run/apmd\.pid -- gen_context(system_u:object_r:apmd_var_run_t,s0) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apm.te serefpolicy-2.2.25/policy/modules/services/apm.te ---- nsaserefpolicy/policy/modules/services/apm.te 2006-03-04 00:06:35.000000000 -0500 -+++ serefpolicy-2.2.25/policy/modules/services/apm.te 2006-03-21 14:39:07.000000000 -0500 +--- nsaserefpolicy/policy/modules/services/apm.te 2006-03-21 14:33:50.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/services/apm.te 2006-03-28 09:47:09.000000000 -0500 @@ -225,6 +225,10 @@ pcmcia_domtrans_cardctl(apmd_t) ') @@ -569,8 +578,8 @@ seutil_sigchld_newrole(apmd_t) ') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bluetooth.te serefpolicy-2.2.25/policy/modules/services/bluetooth.te ---- nsaserefpolicy/policy/modules/services/bluetooth.te 2006-03-17 13:51:48.000000000 -0500 -+++ serefpolicy-2.2.25/policy/modules/services/bluetooth.te 2006-03-21 14:39:07.000000000 -0500 +--- nsaserefpolicy/policy/modules/services/bluetooth.te 2006-03-21 14:33:50.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/services/bluetooth.te 2006-03-28 09:47:09.000000000 -0500 @@ -115,6 +115,7 @@ corecmd_exec_shell(bluetooth_t) @@ -653,8 +662,8 @@ + allow bluetooth_helper_t tmpfs_t:file { read write }; ') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.te serefpolicy-2.2.25/policy/modules/services/cron.te ---- nsaserefpolicy/policy/modules/services/cron.te 2006-03-17 13:51:48.000000000 -0500 -+++ serefpolicy-2.2.25/policy/modules/services/cron.te 2006-03-21 14:39:07.000000000 -0500 +--- nsaserefpolicy/policy/modules/services/cron.te 2006-03-21 14:33:50.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/services/cron.te 2006-03-28 09:47:09.000000000 -0500 @@ -166,6 +166,9 @@ allow crond_t unconfined_t:dbus send_msg; @@ -666,8 +675,8 @@ allow crond_t crond_tmp_t:dir create_dir_perms; allow crond_t crond_tmp_t:file create_file_perms; diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.fc serefpolicy-2.2.25/policy/modules/services/cups.fc ---- nsaserefpolicy/policy/modules/services/cups.fc 2005-11-14 18:24:08.000000000 -0500 -+++ serefpolicy-2.2.25/policy/modules/services/cups.fc 2006-03-21 14:39:07.000000000 -0500 +--- nsaserefpolicy/policy/modules/services/cups.fc 2006-03-21 14:33:50.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/services/cups.fc 2006-03-28 09:47:09.000000000 -0500 @@ -43,7 +43,7 @@ /var/log/cups(/.*)? gen_context(system_u:object_r:cupsd_log_t,s0) /var/log/turboprint_cups\.log.* -- gen_context(system_u:object_r:cupsd_log_t,s0) @@ -678,8 +687,8 @@ /var/run/hp.*\.port -- gen_context(system_u:object_r:hplip_var_run_t,s0) /var/run/ptal-printd(/.*)? gen_context(system_u:object_r:ptal_var_run_t,s0) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.if serefpolicy-2.2.25/policy/modules/services/cups.if ---- nsaserefpolicy/policy/modules/services/cups.if 2006-02-23 09:25:09.000000000 -0500 -+++ serefpolicy-2.2.25/policy/modules/services/cups.if 2006-03-21 14:39:07.000000000 -0500 +--- nsaserefpolicy/policy/modules/services/cups.if 2006-03-21 14:33:50.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/services/cups.if 2006-03-28 09:47:09.000000000 -0500 @@ -226,3 +226,25 @@ allow cupsd_t $1:tcp_socket { acceptfrom recvfrom }; kernel_tcp_recvfrom($1) @@ -707,8 +716,8 @@ +') + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.te serefpolicy-2.2.25/policy/modules/services/cups.te ---- nsaserefpolicy/policy/modules/services/cups.te 2006-03-17 13:51:48.000000000 -0500 -+++ serefpolicy-2.2.25/policy/modules/services/cups.te 2006-03-21 14:39:07.000000000 -0500 +--- nsaserefpolicy/policy/modules/services/cups.te 2006-03-21 14:33:50.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/services/cups.te 2006-03-28 09:54:50.000000000 -0500 @@ -77,7 +77,7 @@ dontaudit cupsd_t self:capability { sys_tty_config net_admin }; allow cupsd_t self:process { setsched signal_perms }; @@ -734,7 +743,17 @@ kernel_read_all_sysctls(cupsd_t) kernel_tcp_recvfrom(cupsd_t) -@@ -382,6 +384,7 @@ +@@ -372,7 +374,9 @@ + # HPLIP local policy + # + ++allow hplip_t self:capability net_raw; + dontaudit hplip_t self:capability sys_tty_config; ++allow hplip_t self:fifo_file rw_file_perms; + allow hplip_t self:process signal_perms; + allow hplip_t self:unix_dgram_socket create_socket_perms; + allow hplip_t self:unix_stream_socket create_socket_perms; +@@ -382,6 +386,7 @@ allow hplip_t self:rawip_socket create_socket_perms; allow hplip_t cupsd_etc_t:dir search; @@ -742,7 +761,15 @@ allow hplip_t hplip_etc_t:file r_file_perms; allow hplip_t hplip_etc_t:dir r_dir_perms; -@@ -649,7 +652,7 @@ +@@ -413,6 +418,7 @@ + dev_read_sysfs(hplip_t) + dev_rw_printer(hplip_t) + dev_read_urand(hplip_t) ++dev_rw_generic_usb_dev(hplip_t) + + fs_getattr_all_fs(hplip_t) + fs_search_auto_mountpoints(hplip_t) +@@ -649,7 +655,7 @@ ifdef(`targeted_policy',` term_use_generic_ptys(cupsd_config_t) @@ -752,8 +779,8 @@ ######################################## diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cvs.te serefpolicy-2.2.25/policy/modules/services/cvs.te ---- nsaserefpolicy/policy/modules/services/cvs.te 2006-03-04 00:06:35.000000000 -0500 -+++ serefpolicy-2.2.25/policy/modules/services/cvs.te 2006-03-21 14:39:07.000000000 -0500 +--- nsaserefpolicy/policy/modules/services/cvs.te 2006-03-21 14:33:50.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/services/cvs.te 2006-03-28 09:47:09.000000000 -0500 @@ -11,7 +11,7 @@ inetd_tcp_service_domain(cvs_t,cvs_exec_t) role system_r types cvs_t; @@ -763,9 +790,27 @@ files_type(cvs_data_t) type cvs_tmp_t; +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dovecot.te serefpolicy-2.2.25/policy/modules/services/dovecot.te +--- nsaserefpolicy/policy/modules/services/dovecot.te 2006-03-21 14:33:50.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/services/dovecot.te 2006-03-28 10:07:15.000000000 -0500 +@@ -79,12 +79,14 @@ + corenet_tcp_bind_all_nodes(dovecot_t) + corenet_tcp_bind_pop_port(dovecot_t) + corenet_tcp_connect_all_ports(dovecot_t) ++corenet_tcp_connect_postgresql_port(dovecot_t) + + dev_read_sysfs(dovecot_t) + dev_read_urand(dovecot_t) + + fs_getattr_all_fs(dovecot_t) + fs_search_auto_mountpoints(dovecot_t) ++fs_list_inotifyfs(dovecot_t) + + term_dontaudit_use_console(dovecot_t) + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.if serefpolicy-2.2.25/policy/modules/services/hal.if ---- nsaserefpolicy/policy/modules/services/hal.if 2006-03-04 00:06:36.000000000 -0500 -+++ serefpolicy-2.2.25/policy/modules/services/hal.if 2006-03-21 14:39:07.000000000 -0500 +--- nsaserefpolicy/policy/modules/services/hal.if 2006-03-21 14:33:50.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/services/hal.if 2006-03-28 09:47:09.000000000 -0500 @@ -100,3 +100,44 @@ allow $1 hald_t:dbus send_msg; allow hald_t $1:dbus send_msg; @@ -812,8 +857,8 @@ +') + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.te serefpolicy-2.2.25/policy/modules/services/hal.te ---- nsaserefpolicy/policy/modules/services/hal.te 2006-03-17 13:51:48.000000000 -0500 -+++ serefpolicy-2.2.25/policy/modules/services/hal.te 2006-03-21 14:39:07.000000000 -0500 +--- nsaserefpolicy/policy/modules/services/hal.te 2006-03-21 14:33:50.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/services/hal.te 2006-03-28 09:47:09.000000000 -0500 @@ -22,7 +22,7 @@ # @@ -882,16 +927,16 @@ nscd_socket_use(hald_t) ') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ktalk.fc serefpolicy-2.2.25/policy/modules/services/ktalk.fc ---- nsaserefpolicy/policy/modules/services/ktalk.fc 2006-02-20 14:07:37.000000000 -0500 -+++ serefpolicy-2.2.25/policy/modules/services/ktalk.fc 2006-03-21 14:39:07.000000000 -0500 +--- nsaserefpolicy/policy/modules/services/ktalk.fc 2006-03-21 14:33:50.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/services/ktalk.fc 2006-03-28 09:47:09.000000000 -0500 @@ -1,3 +1,4 @@ /usr/bin/in.talkd -- gen_context(system_u:object_r:ktalkd_exec_t,s0) /usr/bin/ktalkd -- gen_context(system_u:object_r:ktalkd_exec_t,s0) +/var/log/talkd.* -- gen_context(system_u:object_r:ktalkd_log_t,s0) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ktalk.te serefpolicy-2.2.25/policy/modules/services/ktalk.te ---- nsaserefpolicy/policy/modules/services/ktalk.te 2006-03-17 13:51:48.000000000 -0500 -+++ serefpolicy-2.2.25/policy/modules/services/ktalk.te 2006-03-21 14:39:07.000000000 -0500 +--- nsaserefpolicy/policy/modules/services/ktalk.te 2006-03-21 14:33:50.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/services/ktalk.te 2006-03-28 09:56:17.000000000 -0500 @@ -14,6 +14,9 @@ type ktalkd_tmp_t; files_tmp_file(ktalkd_tmp_t) @@ -902,7 +947,17 @@ type ktalkd_var_run_t; files_pid_file(ktalkd_var_run_t) -@@ -68,9 +71,12 @@ +@@ -38,6 +41,9 @@ + ') + #end for identd + ++allow ktalkd_t ktalkd_log_t:file manage_file_perms; ++logging_log_filetrans(ktalkd_t,ktalkd_log_t,file) ++ + allow ktalkd_t ktalkd_tmp_t:dir create_dir_perms; + allow ktalkd_t ktalkd_tmp_t:file create_file_perms; + files_tmp_filetrans(ktalkd_t, ktalkd_tmp_t, { file dir }) +@@ -68,6 +74,8 @@ files_read_etc_files(ktalkd_t) @@ -911,13 +966,9 @@ libs_use_ld_so(ktalkd_t) libs_use_shared_libs(ktalkd_t) logging_send_syslog_msg(ktalkd_t) -+logging_log_filetrans(ktalkd_t,ktalkd_log_t,file) - - miscfiles_read_localization(ktalkd_t) - diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mailman.if serefpolicy-2.2.25/policy/modules/services/mailman.if ---- nsaserefpolicy/policy/modules/services/mailman.if 2006-03-04 00:06:36.000000000 -0500 -+++ serefpolicy-2.2.25/policy/modules/services/mailman.if 2006-03-21 14:39:07.000000000 -0500 +--- nsaserefpolicy/policy/modules/services/mailman.if 2006-03-21 14:33:50.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/services/mailman.if 2006-03-28 09:47:09.000000000 -0500 @@ -275,3 +275,28 @@ allow $1 mailman_archive_t:file r_file_perms; allow $1 mailman_archive_t:lnk_file { getattr read }; @@ -948,16 +999,16 @@ +') + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nis.fc serefpolicy-2.2.25/policy/modules/services/nis.fc ---- nsaserefpolicy/policy/modules/services/nis.fc 2005-11-28 21:48:04.000000000 -0500 -+++ serefpolicy-2.2.25/policy/modules/services/nis.fc 2006-03-21 14:39:07.000000000 -0500 +--- nsaserefpolicy/policy/modules/services/nis.fc 2006-03-21 14:33:50.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/services/nis.fc 2006-03-28 09:47:09.000000000 -0500 @@ -7,3 +7,4 @@ /usr/sbin/ypserv -- gen_context(system_u:object_r:ypserv_exec_t,s0) /var/yp(/.*)? gen_context(system_u:object_r:var_yp_t,s0) +/usr/sbin/rpc.ypxfr -- gen_context(system_u:object_r:ypxfr_exec_t,s0) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nis.if serefpolicy-2.2.25/policy/modules/services/nis.if ---- nsaserefpolicy/policy/modules/services/nis.if 2006-02-10 21:34:14.000000000 -0500 -+++ serefpolicy-2.2.25/policy/modules/services/nis.if 2006-03-21 14:39:07.000000000 -0500 +--- nsaserefpolicy/policy/modules/services/nis.if 2006-03-21 14:33:50.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/services/nis.if 2006-03-28 09:47:09.000000000 -0500 @@ -277,3 +277,28 @@ files_search_etc($1) allow $1 ypserv_conf_t:file { getattr read }; @@ -988,8 +1039,8 @@ + allow ypxfr_t $1:process sigchld; +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nis.te serefpolicy-2.2.25/policy/modules/services/nis.te ---- nsaserefpolicy/policy/modules/services/nis.te 2006-03-04 00:06:36.000000000 -0500 -+++ serefpolicy-2.2.25/policy/modules/services/nis.te 2006-03-21 14:39:07.000000000 -0500 +--- nsaserefpolicy/policy/modules/services/nis.te 2006-03-21 14:33:50.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/services/nis.te 2006-03-28 09:58:18.000000000 -0500 @@ -31,6 +31,10 @@ type ypserv_exec_t; init_daemon_domain(ypserv_t,ypserv_exec_t) @@ -1018,11 +1069,17 @@ sysnet_read_config(ypserv_t) userdom_dontaudit_use_unpriv_user_fds(ypserv_t) -@@ -326,3 +333,24 @@ +@@ -326,3 +333,28 @@ optional_policy(`udev',` udev_read_db(ypserv_t) ') + ++######################################## ++# ++# ypxfr local policy ++# ++ ++allow ypxfr_t self:unix_stream_socket create_stream_socket_perms; +corenet_tcp_sendrecv_all_if(ypxfr_t) +corenet_udp_sendrecv_all_if(ypxfr_t) +corenet_raw_sendrecv_all_if(ypxfr_t) @@ -1039,13 +1096,11 @@ +corenet_dontaudit_tcp_bind_all_reserved_ports(ypxfr_t) +corenet_dontaudit_udp_bind_all_reserved_ports(ypxfr_t) +corenet_tcp_connect_all_ports(ypxfr_t) -+allow ypxfr_t self:unix_stream_socket create_stream_socket_perms; + -+allow ypxfr_t etc_t:file { getattr read }; +files_read_etc_files(ypxfr_t) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nscd.if serefpolicy-2.2.25/policy/modules/services/nscd.if ---- nsaserefpolicy/policy/modules/services/nscd.if 2006-02-10 21:34:14.000000000 -0500 -+++ serefpolicy-2.2.25/policy/modules/services/nscd.if 2006-03-21 14:39:07.000000000 -0500 +--- nsaserefpolicy/policy/modules/services/nscd.if 2006-03-21 14:33:50.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/services/nscd.if 2006-03-28 09:47:09.000000000 -0500 @@ -49,8 +49,8 @@ dontaudit $1 nscd_t:nscd { shmempwd shmemgrp shmemhost }; @@ -1057,8 +1112,8 @@ ') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pegasus.te serefpolicy-2.2.25/policy/modules/services/pegasus.te ---- nsaserefpolicy/policy/modules/services/pegasus.te 2006-03-04 00:06:36.000000000 -0500 -+++ serefpolicy-2.2.25/policy/modules/services/pegasus.te 2006-03-21 14:39:07.000000000 -0500 +--- nsaserefpolicy/policy/modules/services/pegasus.te 2006-03-21 14:33:50.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/services/pegasus.te 2006-03-28 09:47:09.000000000 -0500 @@ -77,6 +77,7 @@ corenet_tcp_bind_pegasus_https_port(pegasus_t) corenet_tcp_connect_pegasus_http_port(pegasus_t) @@ -1068,8 +1123,8 @@ dev_read_sysfs(pegasus_t) dev_read_urand(pegasus_t) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postfix.te serefpolicy-2.2.25/policy/modules/services/postfix.te ---- nsaserefpolicy/policy/modules/services/postfix.te 2006-03-17 13:51:49.000000000 -0500 -+++ serefpolicy-2.2.25/policy/modules/services/postfix.te 2006-03-21 14:39:07.000000000 -0500 +--- nsaserefpolicy/policy/modules/services/postfix.te 2006-03-21 14:33:50.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/services/postfix.te 2006-03-28 09:47:09.000000000 -0500 @@ -406,6 +406,10 @@ procmail_domtrans(postfix_pipe_t) ') @@ -1082,8 +1137,8 @@ # # Postfix postdrop local policy diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/privoxy.te serefpolicy-2.2.25/policy/modules/services/privoxy.te ---- nsaserefpolicy/policy/modules/services/privoxy.te 2006-03-04 00:06:36.000000000 -0500 -+++ serefpolicy-2.2.25/policy/modules/services/privoxy.te 2006-03-21 14:39:07.000000000 -0500 +--- nsaserefpolicy/policy/modules/services/privoxy.te 2006-03-21 14:33:50.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/services/privoxy.te 2006-03-28 09:47:09.000000000 -0500 @@ -51,6 +51,7 @@ corenet_tcp_bind_http_cache_port(privoxy_t) corenet_tcp_connect_http_port(privoxy_t) @@ -1104,8 +1159,8 @@ seutil_sigchld_newrole(privoxy_t) ') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/samba.te serefpolicy-2.2.25/policy/modules/services/samba.te ---- nsaserefpolicy/policy/modules/services/samba.te 2006-03-04 00:06:36.000000000 -0500 -+++ serefpolicy-2.2.25/policy/modules/services/samba.te 2006-03-21 14:39:07.000000000 -0500 +--- nsaserefpolicy/policy/modules/services/samba.te 2006-03-21 14:33:50.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/services/samba.te 2006-03-28 09:47:09.000000000 -0500 @@ -32,7 +32,7 @@ type samba_secrets_t; files_type(samba_secrets_t) @@ -1116,8 +1171,8 @@ type samba_var_t; diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/sendmail.te serefpolicy-2.2.25/policy/modules/services/sendmail.te ---- nsaserefpolicy/policy/modules/services/sendmail.te 2006-03-04 00:06:36.000000000 -0500 -+++ serefpolicy-2.2.25/policy/modules/services/sendmail.te 2006-03-21 14:39:07.000000000 -0500 +--- nsaserefpolicy/policy/modules/services/sendmail.te 2006-03-21 14:33:50.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/services/sendmail.te 2006-03-28 09:47:09.000000000 -0500 @@ -125,6 +125,7 @@ ') @@ -1127,8 +1182,8 @@ postfix_search_spool(sendmail_t) ') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.if serefpolicy-2.2.25/policy/modules/services/xserver.if ---- nsaserefpolicy/policy/modules/services/xserver.if 2006-03-21 14:33:33.000000000 -0500 -+++ serefpolicy-2.2.25/policy/modules/services/xserver.if 2006-03-21 14:39:07.000000000 -0500 +--- nsaserefpolicy/policy/modules/services/xserver.if 2006-03-21 14:33:50.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/services/xserver.if 2006-03-28 09:47:09.000000000 -0500 @@ -922,3 +922,23 @@ dontaudit $1 xdm_xserver_t:tcp_socket { read write }; @@ -1154,8 +1209,8 @@ + allow $1 xdm_xserver_tmp_t:sock_file { read write }; +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlogin.te serefpolicy-2.2.25/policy/modules/system/authlogin.te ---- nsaserefpolicy/policy/modules/system/authlogin.te 2006-03-17 13:51:50.000000000 -0500 -+++ serefpolicy-2.2.25/policy/modules/system/authlogin.te 2006-03-22 10:19:37.000000000 -0500 +--- nsaserefpolicy/policy/modules/system/authlogin.te 2006-03-21 14:33:50.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/system/authlogin.te 2006-03-28 09:47:09.000000000 -0500 @@ -171,6 +171,8 @@ dev_setattr_video_dev(pam_console_t) dev_getattr_xserver_misc_dev(pam_console_t) @@ -1166,8 +1221,8 @@ fs_search_auto_mountpoints(pam_console_t) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/fstools.if serefpolicy-2.2.25/policy/modules/system/fstools.if ---- nsaserefpolicy/policy/modules/system/fstools.if 2006-02-10 21:34:15.000000000 -0500 -+++ serefpolicy-2.2.25/policy/modules/system/fstools.if 2006-03-21 14:39:07.000000000 -0500 +--- nsaserefpolicy/policy/modules/system/fstools.if 2006-03-21 14:33:50.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/system/fstools.if 2006-03-28 09:47:09.000000000 -0500 @@ -110,3 +110,21 @@ allow $1 fsadm_exec_t:file create_file_perms; @@ -1191,8 +1246,8 @@ + allow $1 swapfile_t:file getattr; +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/fstools.te serefpolicy-2.2.25/policy/modules/system/fstools.te ---- nsaserefpolicy/policy/modules/system/fstools.te 2006-03-17 13:51:50.000000000 -0500 -+++ serefpolicy-2.2.25/policy/modules/system/fstools.te 2006-03-21 14:39:07.000000000 -0500 +--- nsaserefpolicy/policy/modules/system/fstools.te 2006-03-21 14:33:50.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/system/fstools.te 2006-03-28 09:47:09.000000000 -0500 @@ -53,6 +53,7 @@ kernel_change_ring_buffer_level(fsadm_t) # mkreiserfs needs this @@ -1229,8 +1284,8 @@ libs_use_ld_so(fsadm_t) libs_use_shared_libs(fsadm_t) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.te serefpolicy-2.2.25/policy/modules/system/init.te ---- nsaserefpolicy/policy/modules/system/init.te 2006-03-17 13:51:50.000000000 -0500 -+++ serefpolicy-2.2.25/policy/modules/system/init.te 2006-03-21 14:39:07.000000000 -0500 +--- nsaserefpolicy/policy/modules/system/init.te 2006-03-21 14:33:50.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/system/init.te 2006-03-28 09:47:09.000000000 -0500 @@ -349,6 +349,7 @@ files_mounton_isid_type_dirs(initrc_t) files_list_default(initrc_t) @@ -1251,8 +1306,8 @@ # cjp: require doesnt work in optionals :\ # this also would result in a type transition diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.fc serefpolicy-2.2.25/policy/modules/system/libraries.fc ---- nsaserefpolicy/policy/modules/system/libraries.fc 2006-02-20 14:07:38.000000000 -0500 -+++ serefpolicy-2.2.25/policy/modules/system/libraries.fc 2006-03-21 14:39:07.000000000 -0500 +--- nsaserefpolicy/policy/modules/system/libraries.fc 2006-03-21 14:33:50.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/system/libraries.fc 2006-03-28 09:47:09.000000000 -0500 @@ -65,6 +65,7 @@ /usr/lib(64)?/(nvidia/)?libGL(core)?\.so(\.[^/]*)* -- gen_context(system_u:object_r:textrel_shlib_t,s0) /usr/lib(64)?/libGLU\.so(\.[^/]*)* -- gen_context(system_u:object_r:textrel_shlib_t,s0) @@ -1270,8 +1325,8 @@ ifdef(`distro_redhat',` /usr/lib(64)?/.*/program/.*\.so.* gen_context(system_u:object_r:shlib_t,s0) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/locallogin.te serefpolicy-2.2.25/policy/modules/system/locallogin.te ---- nsaserefpolicy/policy/modules/system/locallogin.te 2006-03-17 13:51:50.000000000 -0500 -+++ serefpolicy-2.2.25/policy/modules/system/locallogin.te 2006-03-21 14:39:07.000000000 -0500 +--- nsaserefpolicy/policy/modules/system/locallogin.te 2006-03-21 14:33:50.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/system/locallogin.te 2006-03-28 09:47:09.000000000 -0500 @@ -20,6 +20,7 @@ type local_login_tmp_t; @@ -1281,8 +1336,8 @@ type sulogin_t; type sulogin_exec_t; diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/lvm.fc serefpolicy-2.2.25/policy/modules/system/lvm.fc ---- nsaserefpolicy/policy/modules/system/lvm.fc 2005-11-14 18:24:06.000000000 -0500 -+++ serefpolicy-2.2.25/policy/modules/system/lvm.fc 2006-03-21 14:39:07.000000000 -0500 +--- nsaserefpolicy/policy/modules/system/lvm.fc 2006-03-21 14:33:50.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/system/lvm.fc 2006-03-28 09:47:09.000000000 -0500 @@ -25,6 +25,7 @@ # /sbin # @@ -1292,8 +1347,8 @@ /sbin/dmsetup\.static -- gen_context(system_u:object_r:lvm_exec_t,s0) /sbin/e2fsadm -- gen_context(system_u:object_r:lvm_exec_t,s0) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/lvm.te serefpolicy-2.2.25/policy/modules/system/lvm.te ---- nsaserefpolicy/policy/modules/system/lvm.te 2006-03-17 13:51:50.000000000 -0500 -+++ serefpolicy-2.2.25/policy/modules/system/lvm.te 2006-03-21 14:39:07.000000000 -0500 +--- nsaserefpolicy/policy/modules/system/lvm.te 2006-03-21 14:33:50.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/system/lvm.te 2006-03-28 09:47:09.000000000 -0500 @@ -129,6 +129,8 @@ # DAC overrides and mknod for modifying /dev entries (vgmknodes) @@ -1312,8 +1367,8 @@ fs_getattr_xattr_fs(lvm_t) fs_search_auto_mountpoints(lvm_t) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.te serefpolicy-2.2.25/policy/modules/system/mount.te ---- nsaserefpolicy/policy/modules/system/mount.te 2006-03-17 13:51:50.000000000 -0500 -+++ serefpolicy-2.2.25/policy/modules/system/mount.te 2006-03-21 14:39:07.000000000 -0500 +--- nsaserefpolicy/policy/modules/system/mount.te 2006-03-21 14:33:50.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/system/mount.te 2006-03-28 09:47:09.000000000 -0500 @@ -26,6 +26,7 @@ files_tmp_filetrans(mount_t,mount_tmp_t,{ file dir }) @@ -1339,8 +1394,8 @@ libs_use_ld_so(mount_t) libs_use_shared_libs(mount_t) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.fc serefpolicy-2.2.25/policy/modules/system/selinuxutil.fc ---- nsaserefpolicy/policy/modules/system/selinuxutil.fc 2006-02-23 09:25:09.000000000 -0500 -+++ serefpolicy-2.2.25/policy/modules/system/selinuxutil.fc 2006-03-21 14:39:07.000000000 -0500 +--- nsaserefpolicy/policy/modules/system/selinuxutil.fc 2006-03-21 14:33:50.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/system/selinuxutil.fc 2006-03-28 09:47:09.000000000 -0500 @@ -8,9 +8,9 @@ /etc/selinux/([^/]*/)?contexts/files(/.*)? gen_context(system_u:object_r:file_context_t,s0) /etc/selinux/([^/]*/)?policy(/.*)? gen_context(system_u:object_r:policy_config_t,s15:c0.c255) @@ -1355,8 +1410,8 @@ # diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.if serefpolicy-2.2.25/policy/modules/system/selinuxutil.if ---- nsaserefpolicy/policy/modules/system/selinuxutil.if 2006-02-23 09:25:09.000000000 -0500 -+++ serefpolicy-2.2.25/policy/modules/system/selinuxutil.if 2006-03-21 14:39:07.000000000 -0500 +--- nsaserefpolicy/policy/modules/system/selinuxutil.if 2006-03-21 14:33:50.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/system/selinuxutil.if 2006-03-28 09:47:09.000000000 -0500 @@ -675,8 +675,8 @@ files_search_etc($1) @@ -1399,8 +1454,8 @@ +') + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.te serefpolicy-2.2.25/policy/modules/system/selinuxutil.te ---- nsaserefpolicy/policy/modules/system/selinuxutil.te 2006-03-17 13:51:50.000000000 -0500 -+++ serefpolicy-2.2.25/policy/modules/system/selinuxutil.te 2006-03-21 14:39:07.000000000 -0500 +--- nsaserefpolicy/policy/modules/system/selinuxutil.te 2006-03-21 14:33:50.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/system/selinuxutil.te 2006-03-28 09:47:09.000000000 -0500 @@ -192,6 +192,9 @@ selinux_load_policy(load_policy_t) selinux_set_boolean(load_policy_t) @@ -1467,8 +1522,8 @@ userdom_use_all_users_fds(setfiles_t) # for config files in a home directory diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/sysnetwork.te serefpolicy-2.2.25/policy/modules/system/sysnetwork.te ---- nsaserefpolicy/policy/modules/system/sysnetwork.te 2006-03-04 00:06:37.000000000 -0500 -+++ serefpolicy-2.2.25/policy/modules/system/sysnetwork.te 2006-03-21 14:39:07.000000000 -0500 +--- nsaserefpolicy/policy/modules/system/sysnetwork.te 2006-03-21 14:33:50.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/system/sysnetwork.te 2006-03-28 09:47:09.000000000 -0500 @@ -161,6 +161,10 @@ consoletype_domtrans(dhcpc_t) ') @@ -1491,8 +1546,8 @@ ifdef(`targeted_policy',` term_use_generic_ptys(ifconfig_t) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.te serefpolicy-2.2.25/policy/modules/system/udev.te ---- nsaserefpolicy/policy/modules/system/udev.te 2006-03-17 13:51:50.000000000 -0500 -+++ serefpolicy-2.2.25/policy/modules/system/udev.te 2006-03-21 14:39:07.000000000 -0500 +--- nsaserefpolicy/policy/modules/system/udev.te 2006-03-21 14:33:50.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/system/udev.te 2006-03-28 09:47:09.000000000 -0500 @@ -39,7 +39,7 @@ # Local policy # @@ -1503,8 +1558,8 @@ allow udev_t self:process ~{ ptrace setcurrent setexec setfscreate setrlimit execmem execstack execheap }; allow udev_t self:process { execmem setfscreate }; diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.te serefpolicy-2.2.25/policy/modules/system/unconfined.te ---- nsaserefpolicy/policy/modules/system/unconfined.te 2006-03-17 13:51:50.000000000 -0500 -+++ serefpolicy-2.2.25/policy/modules/system/unconfined.te 2006-03-21 14:39:07.000000000 -0500 +--- nsaserefpolicy/policy/modules/system/unconfined.te 2006-03-21 14:33:50.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/system/unconfined.te 2006-03-28 09:47:09.000000000 -0500 @@ -89,10 +89,6 @@ firstboot_domtrans(unconfined_t) ') @@ -1528,8 +1583,8 @@ netutils_domtrans_ping(unconfined_t) ') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-2.2.25/policy/modules/system/userdomain.te ---- nsaserefpolicy/policy/modules/system/userdomain.te 2006-03-17 13:51:50.000000000 -0500 -+++ serefpolicy-2.2.25/policy/modules/system/userdomain.te 2006-03-21 14:39:07.000000000 -0500 +--- nsaserefpolicy/policy/modules/system/userdomain.te 2006-03-21 14:33:50.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/system/userdomain.te 2006-03-28 09:47:09.000000000 -0500 @@ -180,6 +180,7 @@ logging_read_audit_log(secadm_t) logging_domtrans_auditctl(secadm_t) @@ -1540,7 +1595,7 @@ logging_read_audit_log(sysadm_t) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xend.fc serefpolicy-2.2.25/policy/modules/system/xend.fc --- nsaserefpolicy/policy/modules/system/xend.fc 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-2.2.25/policy/modules/system/xend.fc 2006-03-21 14:39:07.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/system/xend.fc 2006-03-28 09:47:09.000000000 -0500 @@ -0,0 +1,23 @@ +# xend executable will have: +# label: system_u:object_r:xend_exec_t @@ -1567,7 +1622,7 @@ + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xend.if serefpolicy-2.2.25/policy/modules/system/xend.if --- nsaserefpolicy/policy/modules/system/xend.if 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-2.2.25/policy/modules/system/xend.if 2006-03-21 14:39:07.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/system/xend.if 2006-03-28 09:47:09.000000000 -0500 @@ -0,0 +1,71 @@ +## policy for xen + @@ -1642,7 +1697,7 @@ + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/xend.te serefpolicy-2.2.25/policy/modules/system/xend.te --- nsaserefpolicy/policy/modules/system/xend.te 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-2.2.25/policy/modules/system/xend.te 2006-03-21 14:39:07.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/system/xend.te 2006-03-28 09:47:09.000000000 -0500 @@ -0,0 +1,219 @@ +policy_module(xend,1.0.0) + @@ -1864,8 +1919,8 @@ +xend_append_log(xenstored_t) + diff --exclude-from=exclude -N -u -r nsaserefpolicy/Rules.modular serefpolicy-2.2.25/Rules.modular ---- nsaserefpolicy/Rules.modular 2006-03-21 14:33:29.000000000 -0500 -+++ serefpolicy-2.2.25/Rules.modular 2006-03-21 14:39:07.000000000 -0500 +--- nsaserefpolicy/Rules.modular 2006-03-21 14:33:50.000000000 -0500 ++++ serefpolicy-2.2.25/Rules.modular 2006-03-28 09:47:09.000000000 -0500 @@ -208,7 +208,7 @@ # $(APPDIR)/customizable_types: $(BASE_CONF) Index: selinux-policy.spec =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/FC-5/selinux-policy.spec,v retrieving revision 1.156 retrieving revision 1.157 diff -u -r1.156 -r1.157 --- selinux-policy.spec 22 Mar 2006 18:53:07 -0000 1.156 +++ selinux-policy.spec 28 Mar 2006 15:17:34 -0000 1.157 @@ -10,7 +10,7 @@ Summary: SELinux policy configuration Name: selinux-policy Version: 2.2.25 -Release: 2.fc5 +Release: 2.1.fc5 License: GPL Group: System Environment/Base Source: serefpolicy-%{version}.tgz @@ -300,6 +300,9 @@ %fileList strict %changelog +* Wed Mar 22 2006 Dan Walsh 2.2.25-2.1.fc5 +- Fixes for hplip and klogd + * Wed Mar 22 2006 Dan Walsh 2.2.25-2.fc5 - Rebuild for FC5 From fedora-cvs-commits at redhat.com Tue Mar 28 15:20:54 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 28 Mar 2006 10:20:54 -0500 Subject: rpms/selinux-policy/FC-5 selinux-policy.spec,1.157,1.158 Message-ID: <200603281520.k2SFKsOa020053@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/selinux-policy/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv20042 Modified Files: selinux-policy.spec Log Message: * Wed Mar 22 2006 Dan Walsh 2.2.25-3.fc5 - Fixes for hplip and klogd Index: selinux-policy.spec =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/FC-5/selinux-policy.spec,v retrieving revision 1.157 retrieving revision 1.158 diff -u -r1.157 -r1.158 --- selinux-policy.spec 28 Mar 2006 15:17:34 -0000 1.157 +++ selinux-policy.spec 28 Mar 2006 15:20:51 -0000 1.158 @@ -10,7 +10,7 @@ Summary: SELinux policy configuration Name: selinux-policy Version: 2.2.25 -Release: 2.1.fc5 +Release: 3.fc5 License: GPL Group: System Environment/Base Source: serefpolicy-%{version}.tgz @@ -300,7 +300,7 @@ %fileList strict %changelog -* Wed Mar 22 2006 Dan Walsh 2.2.25-2.1.fc5 +* Wed Mar 22 2006 Dan Walsh 2.2.25-3.fc5 - Fixes for hplip and klogd * Wed Mar 22 2006 Dan Walsh 2.2.25-2.fc5 From fedora-cvs-commits at redhat.com Tue Mar 28 15:48:19 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 28 Mar 2006 10:48:19 -0500 Subject: rpms/kernel/devel/configs config-generic, 1.169, 1.170 config-x86-generic, 1.42, 1.43 config-x86_64-generic, 1.36, 1.37 Message-ID: <200603281548.k2SFmJLk002054@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel/configs In directory cvs.devel.redhat.com:/tmp/cvs-serv2021/configs Modified Files: config-generic config-x86-generic config-x86_64-generic Log Message: git14 Index: config-generic =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/configs/config-generic,v retrieving revision 1.169 retrieving revision 1.170 diff -u -r1.169 -r1.170 --- config-generic 27 Mar 2006 18:54:21 -0000 1.169 +++ config-generic 28 Mar 2006 15:48:17 -0000 1.170 @@ -495,6 +495,7 @@ CONFIG_MD_RAID0=m CONFIG_MD_RAID1=m CONFIG_MD_RAID5=m +CONFIG_MD_RAID5_RESHAPE=y CONFIG_MD_RAID6=m CONFIG_MD_RAID10=m CONFIG_MD_MULTIPATH=m @@ -1607,6 +1608,20 @@ CONFIG_HW_RANDOM=m # CONFIG_NVRAM is not set CONFIG_RTC=y +CONFIG_RTC_CLASS=m +CONFIG_RTC_HCTOSYS=y +CONFIG_RTC_HCTOSYS_DEVICE="rtc0" +CONFIG_RTC_INTF_SYSFS=m +CONFIG_RTC_INTF_PROC=m +CONFIG_RTC_INTF_DEV=m +CONFIG_RTC_DRV_X1205=m +CONFIG_RTC_DRV_DS1672=m +CONFIG_RTC_DRV_PCF8563=m +CONFIG_RTC_DRV_RS5C372=m +CONFIG_RTC_DRV_M48T86=m +# CONFIG_RTC_DRV_EP93XX is not set +# CONFIG_RTC_DRV_SA1100 is not set +# CONFIG_RTC_DRV_TEST is not set CONFIG_DTLK=m CONFIG_R3964=m # CONFIG_APPLICOM is not set @@ -1854,11 +1869,14 @@ # CONFIG_FB_GEODE is not set # CONFIG_FB_S1D13XXX is not set CONFIG_FB_CYBLA=m +# CONFIG_FB_FIRMWARE_EDID is not set # # Console display driver support # CONFIG_VGA_CONSOLE=y +CONFIG_VGACON_SOFT_SCROLLBACK=y +CONFIG_VGACON_SOFT_SCROLLBACK_SIZE=64 # CONFIG_MDA_CONSOLE is not set CONFIG_DUMMY_CONSOLE=y CONFIG_FRAMEBUFFER_CONSOLE=y @@ -2703,3 +2721,4 @@ CONFIG_MIGRATION=y + Index: config-x86-generic =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/configs/config-x86-generic,v retrieving revision 1.42 retrieving revision 1.43 diff -u -r1.42 -r1.43 --- config-x86-generic 24 Mar 2006 22:43:39 -0000 1.42 +++ config-x86-generic 28 Mar 2006 15:48:17 -0000 1.43 @@ -289,3 +289,5 @@ CONFIG_EDAC_I82860=m CONFIG_EDAC_R82600=m +CONFIG_SCHED_MC=y + Index: config-x86_64-generic =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/configs/config-x86_64-generic,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- config-x86_64-generic 26 Mar 2006 00:13:38 -0000 1.36 +++ config-x86_64-generic 28 Mar 2006 15:48:17 -0000 1.37 @@ -156,3 +156,4 @@ CONFIG_REORDER=y +CONFIG_SCHED_MC=y From fedora-cvs-commits at redhat.com Tue Mar 28 15:48:19 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 28 Mar 2006 10:48:19 -0500 Subject: rpms/kernel/devel patch-2.6.16-git14.bz2.sign, NONE, 1.1 .cvsignore, 1.394, 1.395 kernel-2.6.spec, 1.2098, 1.2099 linux-2.6-devmem.patch, 1.6, 1.7 sources, 1.335, 1.336 upstream, 1.308, 1.309 patch-2.6.16-git13.bz2.sign, 1.1, NONE Message-ID: <200603281548.k2SFmJG4002044@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv2021 Modified Files: .cvsignore kernel-2.6.spec linux-2.6-devmem.patch sources upstream Added Files: patch-2.6.16-git14.bz2.sign Removed Files: patch-2.6.16-git13.bz2.sign Log Message: git14 --- NEW FILE patch-2.6.16-git14.bz2.sign --- -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.2.2 (GNU/Linux) Comment: See http://www.kernel.org/signature.html for info iD8DBQBEKDc8yGugalF9Dw4RArXNAJ0buN2t9vcPDGaI2d96Z18RpiTvmgCaAx6n BhmUVDYmzv8aTWPNYjcOl6M= =dRUd -----END PGP SIGNATURE----- Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v retrieving revision 1.394 retrieving revision 1.395 diff -u -r1.394 -r1.395 --- .cvsignore 27 Mar 2006 18:54:19 -0000 1.394 +++ .cvsignore 28 Mar 2006 15:48:16 -0000 1.395 @@ -3,4 +3,4 @@ kernel-2.6.16 linux-2.6.16.tar.bz2 xen-20060320.tar.bz2 -patch-2.6.16-git13.bz2 +patch-2.6.16-git14.bz2 Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.2098 retrieving revision 1.2099 diff -u -r1.2098 -r1.2099 --- kernel-2.6.spec 27 Mar 2006 21:53:24 -0000 1.2098 +++ kernel-2.6.spec 28 Mar 2006 15:48:16 -0000 1.2099 @@ -217,7 +217,7 @@ # # Patches 0 through 100 are meant for core subsystem upgrades # -Patch1: patch-2.6.16-git13.bz2 +Patch1: patch-2.6.16-git14.bz2 # Patches 100 through 500 are meant for architecture patches Patch100: linux-2.6-bzimage.patch @@ -953,7 +953,7 @@ # Silence noisy CD drive spew %patch1641 -p1 # autofs4 looks up wrong path element when ghosting is enabled -%patch1650 -p1 +#%patch1650 -p1 # %patch1660 -p1 # Use persistent allocation in softcursor @@ -1639,6 +1639,9 @@ %endif %changelog +* Tue Mar 28 2006 Dave Jones +- 2.6.16-git14 + * Mon Mar 27 2006 Dave Jones - 2.6.16-git13 - Fix broken x86-64 32bit vDSO (#186924) linux-2.6-devmem.patch: arch/powerpc/mm/mem.c | 14 ++ linux-1050/arch/i386/mm/init.c | 19 +++ linux-1050/arch/ia64/mm/init.c | 7 + linux-1050/arch/s390/mm/init.c | 5 linux-1050/arch/x86_64/mm/init.c | 20 +++ linux-1050/drivers/char/mem.c | 143 ++++----------------------- linux-1050/fs/proc/kcore.c | 2 linux-1050/include/asm-arm/page.h | 2 linux-1050/include/asm-arm26/page.h | 2 linux-1050/include/asm-cris/page.h | 2 linux-1050/include/asm-h8300/page.h | 2 linux-1050/include/asm-i386/page.h | 4 linux-1050/include/asm-ia64/page.h | 2 linux-1050/include/asm-m68k/page.h | 2 linux-1050/include/asm-m68knommu/page.h | 2 linux-1050/include/asm-mips/page.h | 2 linux-1050/include/asm-parisc/page.h | 2 linux-1050/include/asm-s390/page.h | 2 linux-1050/include/asm-sh/page.h | 2 linux-1050/include/asm-sh64/page.h | 2 linux-1050/include/asm-sparc/page.h | 2 linux-1050/include/asm-sparc64/page.h | 2 linux-1050/include/asm-um/page.h | 1 linux-1050/include/asm-v850/page.h | 2 linux-1050/include/asm-x86_64/page.h | 4 linux-2.6.13/arch/x86_64/mm/init.c | 22 ++++ linux-2.6.14/include/asm-powerpc/page.h | 2 linux-2.6.16.noarch/include/asm-alpha/page.h | 1 linux-2.6.16.noarch/include/asm-ppc/page.h | 2 29 files changed, 154 insertions(+), 122 deletions(-) Index: linux-2.6-devmem.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-devmem.patch,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- linux-2.6-devmem.patch 26 Mar 2006 00:13:38 -0000 1.6 +++ linux-2.6-devmem.patch 28 Mar 2006 15:48:16 -0000 1.7 @@ -55,8 +55,8 @@ #include #include "mmu_decl.h" -@@ -722,6 +722,19 @@ void __init mem_init(void) - max_mapnr = num_physpages; +@@ -352,6 +352,19 @@ void __init mem_init(void) + max_mapnr = max_pfn; totalram_pages += free_all_bootmem(); #endif + @@ -72,9 +72,9 @@ + } +#endif + - for_each_pgdat(pgdat) { + for_each_online_pgdat(pgdat) { for (i = 0; i < pgdat->node_spanned_pages; i++) { - page = pgdat->node_mem_map + i; + if (!pfn_valid(pgdat->node_start_pfn + 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 @@ -334,17 +334,16 @@ } 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 +--- linux-2.6.16.noarch/include/asm-alpha/page.h~ 2006-03-28 10:15:44.000000000 -0500 ++++ linux-2.6.16.noarch/include/asm-alpha/page.h 2006-03-28 10:15:55.000000000 -0500 +@@ -93,6 +93,7 @@ typedef unsigned long pgprot_t; + #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 */ + #include 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 @@ -470,15 +469,15 @@ #endif /* __KERNEL__ */ #endif /* _PARISC_PAGE_H */ -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) +--- linux-2.6.16.noarch/include/asm-ppc/page.h~ 2006-03-28 10:16:25.000000000 -0500 ++++ linux-2.6.16.noarch/include/asm-ppc/page.h 2006-03-28 10:16:35.000000000 -0500 +@@ -174,6 +174,8 @@ extern __inline__ int get_order(unsigned + /* We do define AT_SYSINFO_EHDR but don't use the gate mecanism */ + #define __HAVE_ARCH_GATE_AREA 1 +#define devmem_is_allowed(x) 1 + + #include #endif /* __KERNEL__ */ #endif /* _PPC_PAGE_H */ --- linux-2.6.14/include/asm-powerpc/page.h~ 2005-11-15 12:12:43.000000000 -0500 Index: sources =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/sources,v retrieving revision 1.335 retrieving revision 1.336 diff -u -r1.335 -r1.336 --- sources 27 Mar 2006 18:54:20 -0000 1.335 +++ sources 28 Mar 2006 15:48:16 -0000 1.336 @@ -1,3 +1,3 @@ 9a91b2719949ff0856b40bc467fd47be linux-2.6.16.tar.bz2 8c70806f9075ebc0087f7ce1b8911700 xen-20060320.tar.bz2 -cb4f49853e97c197e5774e2c9885aaf4 patch-2.6.16-git13.bz2 +35a2659715e73ff493c815ed3a900d07 patch-2.6.16-git14.bz2 Index: upstream =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/upstream,v retrieving revision 1.308 retrieving revision 1.309 diff -u -r1.308 -r1.309 --- upstream 27 Mar 2006 18:54:20 -0000 1.308 +++ upstream 28 Mar 2006 15:48:16 -0000 1.309 @@ -1,2 +1,2 @@ linux-2.6.16.tar.bz2 -patch-2.6.16-git13.bz2 +patch-2.6.16-git14.bz2 --- patch-2.6.16-git13.bz2.sign DELETED --- From fedora-cvs-commits at redhat.com Tue Mar 28 16:14:13 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 28 Mar 2006 11:14:13 -0500 Subject: rpms/kernel/FC-4/configs config-generic, 1.54, 1.55 config-ia64-generic, 1.6, 1.7 config-powerpc-generic, 1.2, 1.3 config-powerpc32-generic, 1.1, 1.2 config-powerpc64, 1.1, 1.2 config-powerpc64-iseries, 1.1, 1.2 config-ppc-generic, 1.23, 1.24 config-ppc64-generic, 1.12, 1.13 config-s390-generic, 1.4, 1.5 config-x86-generic, 1.20, 1.21 config-x86_64-generic, 1.19, 1.20 Message-ID: <200603281614.k2SGEDM4003168@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/FC-4/configs In directory cvs.devel.redhat.com:/tmp/cvs-serv3108/configs Modified Files: config-generic config-ia64-generic config-powerpc-generic config-powerpc32-generic config-powerpc64 config-powerpc64-iseries config-ppc-generic config-ppc64-generic config-s390-generic config-x86-generic config-x86_64-generic Log Message: move .16 rebase from scratch/ to FC-4/ Index: config-generic =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-4/configs/config-generic,v retrieving revision 1.54 retrieving revision 1.55 diff -u -r1.54 -r1.55 --- config-generic 21 Feb 2006 05:47:00 -0000 1.54 +++ config-generic 28 Mar 2006 16:14:10 -0000 1.55 @@ -59,7 +59,7 @@ # CONFIG_PCI=y # CONFIG_PCI_DEBUG is not set -CONFIG_PCI_MSI=y +# CONFIG_PCI_MSI is not set CONFIG_PCI_LEGACY_PROC=y CONFIG_PCIEPORTBUS=y CONFIG_HOTPLUG_PCI_PCIE=m @@ -480,6 +480,7 @@ # CONFIG_SCSI_DEBUG is not set CONFIG_SCSI_DC390T=m CONFIG_SCSI_QLA2XXX=m +CONFIG_SCSI_QLA2XXX_EMBEDDED_FIRMWARE=y CONFIG_SCSI_QLA21XX=m CONFIG_SCSI_QLA22XX=m CONFIG_SCSI_QLA2300=m @@ -573,11 +574,13 @@ # I2O device support # # CONFIG_I2O is not set +# CONFIG_I2O_LCT_NOTIFY_ON_CHANGES is not set # # Networking support # CONFIG_NET=y +# CONFIG_NETDEBUG is not set # CONFIG_TCP_CONG_ADVANCED is not set @@ -658,6 +661,30 @@ # CONFIG_NETFILTER_DEBUG is not set CONFIG_BRIDGE_NETFILTER=y +CONFIG_NETFILTER_XTABLES=m +CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m +CONFIG_NETFILTER_XT_TARGET_CONNMARK=m +CONFIG_NETFILTER_XT_TARGET_MARK=m +CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m +CONFIG_NETFILTER_XT_TARGET_NOTRACK=m +CONFIG_NETFILTER_XT_MATCH_COMMENT=m +CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m +CONFIG_NETFILTER_XT_MATCH_CONNMARK=m +CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m +CONFIG_NETFILTER_XT_MATCH_DCCP=m +CONFIG_NETFILTER_XT_MATCH_HELPER=m +CONFIG_NETFILTER_XT_MATCH_LENGTH=m +CONFIG_NETFILTER_XT_MATCH_LIMIT=m +CONFIG_NETFILTER_XT_MATCH_MAC=m +CONFIG_NETFILTER_XT_MATCH_MARK=m +CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m +CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m +CONFIG_NETFILTER_XT_MATCH_REALM=m +CONFIG_NETFILTER_XT_MATCH_SCTP=m +CONFIG_NETFILTER_XT_MATCH_STATE=m +CONFIG_NETFILTER_XT_MATCH_STRING=m +CONFIG_NETFILTER_XT_MATCH_TCPMSS=m + # # IP: Netfilter Configuration # @@ -693,6 +720,7 @@ CONFIG_IP_NF_MATCH_DCCP=m CONFIG_IP_NF_MATCH_CONNBYTES=m CONFIG_IP_NF_MATCH_STRING=m +CONFIG_IP_NF_MATCH_POLICY=m CONFIG_IP_NF_TARGET_CONNMARK=m CONFIG_IP_NF_TARGET_CLUSTERIP=m CONFIG_IP_NF_TARGET_MASQUERADE=m @@ -754,6 +782,7 @@ CONFIG_IP6_NF_MATCH_LENGTH=m CONFIG_IP6_NF_MATCH_EUI64=m CONFIG_IP6_NF_MATCH_PHYSDEV=m +CONFIG_IP6_NF_MATCH_POLICY=m CONFIG_IP6_NF_FILTER=m CONFIG_IP6_NF_MANGLE=m CONFIG_IP6_NF_RAW=m @@ -1032,6 +1061,7 @@ CONFIG_DL2K=m CONFIG_E1000=m CONFIG_E1000_NAPI=y +# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set CONFIG_NS83820=m CONFIG_HAMACHI=m CONFIG_YELLOWFIN=m @@ -1041,6 +1071,7 @@ CONFIG_SK98LIN=m CONFIG_SKGE=m CONFIG_TIGON3=m +CONFIG_SKY2=m # # Ethernet (10000 Mbit) @@ -1099,10 +1130,11 @@ CONFIG_IEEE80211_CRYPT_CCMP=m CONFIG_IEEE80211_CRYPT_TKIP=m # CONFIG_IPW2100 is not set -# CONFIG_IPW_DEBUG is not set # CONFIG_IPW2100_PROMISC is not set # CONFIG_IPW2100_LEGACY_FW_LOAD is not set # CONFIG_IPW2200 is not set +# CONFIG_IPW2100_DEBUG is not set +# CONFIG_IPW2200_DEBUG is not set CONFIG_AIRO=m CONFIG_HERMES=m CONFIG_PLX_HERMES=m @@ -1128,6 +1160,7 @@ CONFIG_HOSTAP_PLX=m CONFIG_HOSTAP_FIRMWARE=y CONFIG_HOSTAP_CS=m +CONFIG_HOSTAP_FIRMWARE_NVRAM=y # # Token Ring devices @@ -1449,12 +1482,13 @@ CONFIG_VT=y CONFIG_VT_CONSOLE=y CONFIG_HW_CONSOLE=y -CONFIG_SERIAL_NONSTANDARD=y -CONFIG_ROCKETPORT=m +# CONFIG_SERIAL_NONSTANDARD is not set +# CONFIG_ROCKETPORT is not set # CONFIG_SYNCLINK is not set # CONFIG_SYNCLINKMP is not set +# CONFIG_SYNCLINK_GT is not set CONFIG_N_HDLC=m -CONFIG_STALDRV=y +# CONFIG_STALDRV is not set # CONFIG_FTAPE is not set # CONFIG_IBM_ASM is not set # CONFIG_TCG_TPM is not set @@ -1470,7 +1504,7 @@ CONFIG_SERIAL_8250_CS=m # CONFIG_SERIAL_8250_ACPI is not set CONFIG_SERIAL_8250_NR_UARTS=32 -CONFIG_SERIAL_8250_RUNTIME_UARTS=4 +CONFIG_SERIAL_8250_RUNTIME_UARTS=2 CONFIG_SERIAL_8250_EXTENDED=y CONFIG_SERIAL_8250_MANY_PORTS=y CONFIG_SERIAL_8250_SHARE_IRQ=y @@ -1575,6 +1609,7 @@ CONFIG_SENSORS_EEPROM=m CONFIG_SENSORS_FSCHER=m CONFIG_SENSORS_FSCPOS=m +CONFIG_SENSORS_F71805F=m CONFIG_SENSORS_GL518SM=m CONFIG_SENSORS_GL520SM=m CONFIG_SENSORS_HDAPS=m @@ -1600,6 +1635,7 @@ CONFIG_SENSORS_SMSC47M1=m CONFIG_SENSORS_SMSC47B397=m CONFIG_SENSORS_VIA686A=m +CONFIG_SENSORS_VT8231=m CONFIG_SENSORS_W83627HF=m CONFIG_SENSORS_W83781D=m CONFIG_SENSORS_W83L785TS=m @@ -1715,6 +1751,7 @@ # Multimedia devices # CONFIG_VIDEO_DEV=m +# CONFIG_VIDEO_ADV_DEBUG is not set # # Video For Linux @@ -1751,6 +1788,7 @@ CONFIG_VIDEO_HEXIUM_GEMINI=m CONFIG_VIDEO_CX88=m CONFIG_VIDEO_CX88_DVB=m +CONFIG_VIDEO_CX88_ALSA=m CONFIG_VIDEO_SAA5246A=m CONFIG_VIDEO_OVCAMCHIP=m @@ -1839,6 +1877,7 @@ CONFIG_DVB_USB_A800=m CONFIG_DVB_USB_DIBUSB_MB=m CONFIG_DVB_USB_DIBUSB_MC=m +# CONFIG_DVB_USB_DIBUSB_MB_FAULTY is not set CONFIG_DVB_USB_UMT_010=m CONFIG_DVB_USB_DIGITV=m CONFIG_DVB_USB_VP7045=m @@ -1953,6 +1992,8 @@ CONFIG_SND_MIXER_OSS=m CONFIG_SND_PCM_OSS=m CONFIG_SND_RTCTIMER=m +# CONFIG_SND_DYNAMIC_MINORS is not set +CONFIG_SND_SUPPORT_OLD_API=y # CONFIG_SND_VERBOSE_PRINTK is not set # CONFIG_SND_DEBUG is not set @@ -2011,6 +2052,7 @@ CONFIG_SND_CA0106=m CONFIG_SND_KORG1212=m CONFIG_SND_NM256=m +CONFIG_SND_PCXHR=m CONFIG_SND_RME32=m CONFIG_SND_RME96=m CONFIG_SND_RME9652=m @@ -2021,6 +2063,7 @@ CONFIG_SND_CMIPCI=m CONFIG_SND_ENS1370=m CONFIG_SND_ENS1371=m +CONFIG_SND_CS5535AUDIO=m CONFIG_SND_ES1938=m CONFIG_SND_ES1968=m CONFIG_SND_MAESTRO3=m @@ -2112,6 +2155,7 @@ CONFIG_USB_STORAGE_JUMPSHOT=y CONFIG_USB_STORAGE_USBAT=y CONFIG_USB_STORAGE_ONETOUCH=y +CONFIG_USB_STORAGE_ALAUDA=y # # USB Human Interface Devices (HID) @@ -2148,6 +2192,7 @@ CONFIG_USB_DABUSB=m CONFIG_USB_VICAM=m CONFIG_USB_DSBR=m +CONFIG_USB_ET61X251=m CONFIG_USB_IBMCAM=m CONFIG_USB_KONICAWC=m CONFIG_USB_OV511=m @@ -2164,7 +2209,7 @@ CONFIG_USB_RTL8150=m CONFIG_USB_USBNET=m CONFIG_USB_SPEEDTOUCH=m -# CONFIG_USB_YEALINK is not set +CONFIG_USB_YEALINK=m CONFIG_USB_ZD1201=m CONFIG_USB_NET_AX8817X=m CONFIG_USB_NET_GL620A=m @@ -2291,6 +2336,7 @@ CONFIG_USB_ATM=m CONFIG_USB_CXACRU=m CONFIG_USB_XUSBATM=m +CONFIG_USB_UEAGLEATM=m # # File systems @@ -2434,6 +2480,9 @@ # CONFIG_AFS_FS is not set # CONFIG_RXRPC is not set +CONFIG_OCFS2_FS=m +CONFIG_CONFIGFS_FS=m + # # Partition Types # @@ -2453,6 +2502,7 @@ # CONFIG_ULTRIX_PARTITION is not set CONFIG_SUN_PARTITION=y CONFIG_EFI_PARTITION=y +CONFIG_KARMA_PARTITION=y CONFIG_NLS=y # @@ -2509,10 +2559,7 @@ # CONFIG_DEBUG_KERNEL=y CONFIG_MAGIC_SYSRQ=y -CONFIG_DEBUG_SPINLOCK=y -CONFIG_DEBUG_HIGHMEM=y CONFIG_DEBUG_INFO=y -CONFIG_DEBUG_SPINLOCK_SLEEP=y # CONFIG_FRAME_POINTER is not set # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set # CONFIG_DEBUG_DRIVER is not set @@ -2520,12 +2567,24 @@ # Turn off these debug options for production kernels. # CONFIG_DEBUG_SLAB is not set +# CONFIG_DEBUG_MUTEXES is not set +# CONFIG_DEBUG_VM is not set + +# These debug options are deliberatly left on. +# They aren't that much of a performance impact, and the value +# from getting out-of-tree modules fixed is worth the trade-off. +CONFIG_DEBUG_HIGHMEM=y +CONFIG_DEBUG_SPINLOCK=y +CONFIG_DEBUG_SPINLOCK_SLEEP=y +CONFIG_BOOT_DELAY=y +CONFIG_DEBUG_SLAB_LEAK=y # # Security options # CONFIG_SECURITY=y CONFIG_SECURITY_NETWORK=y +CONFIG_SECURITY_NETWORK_XFRM=y CONFIG_SECURITY_CAPABILITIES=y # CONFIG_SECURITY_ROOTPLUG is not set CONFIG_SECURITY_SELINUX=y @@ -2619,6 +2678,7 @@ CONFIG_HWMON=m # CONFIG_HWMON_DEBUG_CHIP is not set CONFIG_USB_KEYSPAN_REMOTE=m +CONFIG_USB_ATI_REMOTE2=m CONFIG_USB_LD=m CONFIG_USB_APPLETOUCH=m @@ -2661,5 +2721,13 @@ # CONFIG_DEBUG_VM is not set # CONFIG_RCU_TORTURE_TEST is not set -CONFIG_BOOT_DELAY=y +# CONFIG_CRASH_DUMP is not set +CONFIG_TIPC=m +# CONFIG_TIPC_ADVANCED is not set +# CONFIG_TIPC_DEBUG is not set +CONFIG_SCSI_QLA_FC=m +# CONFIG_SBC_EPX_C3_WATCHDOG is not set +# CONFIG_SPI is not set +# CONFIG_USB_HIDINPUT_POWERBOOK is not set +# CONFIG_FORCED_INLINING is not set Index: config-ia64-generic =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-4/configs/config-ia64-generic,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- config-ia64-generic 6 Dec 2005 23:12:21 -0000 1.6 +++ config-ia64-generic 28 Mar 2006 16:14:10 -0000 1.7 @@ -47,6 +47,8 @@ # # IDE chipset support/bugfixes # +CONFIG_IDE_MAX_HWIFS=4 + CONFIG_BLK_DEV_SGIIOC4=m # @@ -101,12 +103,7 @@ # CONFIG_SCSI_BUSLOGIC is not set # -# Compiler b0rkage and broken driver workarounds -# -# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set CONFIG_ACPI=y -CONFIG_ACPI_BOOT=y -CONFIG_ACPI_INTERPRETER=y CONFIG_ACPI_SLEEP=y CONFIG_ACPI_AC=m CONFIG_ACPI_BATTERY=m @@ -114,13 +111,11 @@ CONFIG_ACPI_FAN=y CONFIG_ACPI_PROCESSOR=y CONFIG_ACPI_THERMAL=y -CONFIG_ACPI_ASUS=m -CONFIG_ACPI_TOSHIBA=m +# CONFIG_ACPI_ASUS is not set +# CONFIG_ACPI_TOSHIBA is not set # CONFIG_ACPI_DEBUG is not set -CONFIG_ACPI_BUS=y CONFIG_ACPI_EC=y CONFIG_ACPI_POWER=y -CONFIG_ACPI_PCI=y CONFIG_ACPI_SYSTEM=y CONFIG_ACPI_NUMA=y CONFIG_ACPI_BLACKLIST_YEAR=0 @@ -163,3 +158,7 @@ CONFIG_IA64_ACPI_CPUFREQ=m +# CONFIG_CRASH is not set + +CONFIG_SERIAL_SGI_IOC3=m +CONFIG_SGI_IOC3=m Index: config-powerpc-generic =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-4/configs/config-powerpc-generic,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- config-powerpc-generic 9 Mar 2006 23:16:32 -0000 1.2 +++ config-powerpc-generic 28 Mar 2006 16:14:10 -0000 1.3 @@ -25,7 +25,8 @@ CONFIG_CPU_FREQ_STAT_DETAILS=y CONFIG_PM=y CONFIG_PM_DEBUG=y -# CONFIG_SOFTWARE_SUSPEND is not set +CONFIG_SOFTWARE_SUSPEND=y +CONFIG_PM_STD_PARTITION="" # CONFIG_RTC is not set CONFIG_GEN_RTC=y # CONFIG_GEN_RTC_X is not set @@ -39,7 +40,8 @@ CONFIG_ADB=y CONFIG_ADB_PMU=y CONFIG_WINDFARM=y -CONFIG_I2C_KEYWEST=y +CONFIG_WINDFARM_PM112=m +CONFIG_I2C_POWERMAC=y CONFIG_APPLE_AIRPORT=m CONFIG_SERIAL_PMACZILOG=m CONFIG_AGP_UNINORTH=y @@ -78,3 +80,5 @@ # CONFIG_ATM_AMBASSADOR is not set # CONFIG_SCSI_DC390T is not set # CONFIG_SCSI_BUSLOGIC is not set + +CONFIG_USB_HIDINPUT_POWERBOOK=y Index: config-powerpc32-generic =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-4/configs/config-powerpc32-generic,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- config-powerpc32-generic 6 Jan 2006 05:54:36 -0000 1.1 +++ config-powerpc32-generic 28 Mar 2006 16:14:10 -0000 1.2 @@ -4,9 +4,10 @@ # CONFIG_RTAS_PROC is not set # CONFIG_PCMCIA_M8XX is not set # CONFIG_HOTPLUG_PCI is not set +CONFIG_CLASSIC32=y CONFIG_CPU_FREQ_PMAC=y CONFIG_PPC_MULTIPLATFORM=y -CONFIG_PPC_CHRP=y +# CONFIG_PPC_CHRP is not set CONFIG_PPC_PMAC=y # CONFIG_PPC_PREP is not set @@ -51,6 +52,7 @@ CONFIG_DMASOUND_PMAC=m # CONFIG_BDI_SWITCH is not set CONFIG_MAC_FLOPPY=m +# CONFIG_BLK_DEV_FD is not set CONFIG_FB_ATY128=y CONFIG_FB_ATY=y Index: config-powerpc64 =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-4/configs/config-powerpc64,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- config-powerpc64 6 Jan 2006 05:54:36 -0000 1.1 +++ config-powerpc64 28 Mar 2006 16:14:10 -0000 1.2 @@ -1,11 +1,13 @@ CONFIG_WINDFARM_PM81=y CONFIG_WINDFARM_PM91=y CONFIG_PPC_PMAC64=y -CONFIG_PPC_MAPLE=y +# CONFIG_PPC_MAPLE is not set CONFIG_PPC_CELL=y # CONFIG_PPC_ISERIES is not set CONFIG_PPC_PSERIES=y CONFIG_PPC_PMAC=y +CONFIG_IBMEBUS=y +CONFIG_SPU_FS=m CONFIG_RTAS_FLASH=y CONFIG_PPC_SPLPAR=y CONFIG_SCANLOG=y Index: config-powerpc64-iseries =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-4/configs/config-powerpc64-iseries,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- config-powerpc64-iseries 6 Jan 2006 05:54:36 -0000 1.1 +++ config-powerpc64-iseries 28 Mar 2006 16:14:10 -0000 1.2 @@ -22,6 +22,7 @@ # CONFIG_FB_OF is not set # CONFIG_BLK_DEV_FD is not set # CONFIG_USB is not set +# CONFIG_BT is not set # CONFIG_INPUT is not set # CONFIG_NET_RADIO is not set # CONFIG_MTD is not set @@ -46,13 +47,6 @@ # CONFIG_SCHED_SMT is not set # CONFIG_XMON is not set # CONFIG_ROCKETPORT is not set - -# Disabled due to compile failure 2005-09-21 (dwmw2) -# drivers/infiniband/hw/mthca/mthca_cmd.c: In function 'mthca_cmd_poll': -# drivers/infiniband/hw/mthca/mthca_cmd.c:280: error: syntax error before 'do' -# drivers/infiniband/hw/mthca/mthca_cmd.c:280: error: called object '"i"' is not a function -# CONFIG_INFINIBAND_MTHCA is not set - # CONFIG_WINDFARM is not set CONFIG_LPARCFG=y CONFIG_HOTPLUG_PCI=y @@ -65,4 +59,30 @@ CONFIG_SERIAL_ICOM=m # CONFIG_ISDN is not set # CONFIG_IEEE80211 is not set +# CONFIG_DVB is not set +# CONFIG_VIDEO_DEV is not set +# CONFIG_SND is not set +# CONFIG_IRDA is not set +# CONFIG_IEEE1394 is not set +# CONFIG_CPU_FREQ is not set +# CONFIG_PCCARD is not set +# CONFIG_CARDBUS is not set +# CONFIG_HOTPLUG_PCI is not set +# CONFIG_ATM is not set +# CONFIG_IPX is not set +# CONFIG_ATALK is not set +# CONFIG_WAN_ROUTER is not set +# CONFIG_BLK_DEV_SX8 is not set +# CONFIG_CDROM_PKTCDVD is not set +# CONFIG_ATA_OVER_ETH is not set +# CONFIG_SERIO is not set +# CONFIG_GAMEPORT is not set +# CONFIG_AGP is not set +# CONFIG_DRM is not set +# CONFIG_I2C is not set +# CONFIG_W1 is not set +# CONFIG_HWMON is not set +# CONFIG_SOUND is not set +# CONFIG_MMC is not set +# CONFIG_INFINIBAND is not set Index: config-ppc-generic =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-4/configs/config-ppc-generic,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- config-ppc-generic 28 Oct 2005 05:23:09 -0000 1.23 +++ config-ppc-generic 28 Mar 2006 16:14:10 -0000 1.24 @@ -177,11 +177,6 @@ # CONFIG_DISKDUMP is not set -CONFIG_MV643XX_ETH=m -CONFIG_MV643XX_ETH_0=y -CONFIG_MV643XX_ETH_1=y -CONFIG_MV643XX_ETH_2=y - # ISA stuff that won't work, mostly due to isa_virt_to_bus or isa_bus_to_virt # CONFIG_SCSI_IN2000 is not set # CONFIG_SCSI_AHA1542 is not set Index: config-ppc64-generic =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-4/configs/config-ppc64-generic,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- config-ppc64-generic 28 Oct 2005 05:23:09 -0000 1.12 +++ config-ppc64-generic 28 Mar 2006 16:14:10 -0000 1.13 @@ -104,11 +104,6 @@ CONFIG_I2C_VIA=m CONFIG_I2C_VIAPRO=m -CONFIG_MV643XX_ETH=m -CONFIG_MV643XX_ETH_0=y -CONFIG_MV643XX_ETH_1=y -CONFIG_MV643XX_ETH_2=y - CONFIG_I2C_AMD756=m CONFIG_I2C_AMD8111=m CONFIG_I2C_PIIX4=m Index: config-s390-generic =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-4/configs/config-s390-generic,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- config-s390-generic 21 Feb 2006 05:47:00 -0000 1.4 +++ config-s390-generic 28 Mar 2006 16:14:10 -0000 1.5 @@ -27,6 +27,7 @@ CONFIG_CMM=y # CONFIG_CMM_PROC is not set CONFIG_VIRT_TIMER=y +CONFIG_DASD_EER=m CONFIG_DASD_CMB=m CONFIG_NETIUCV=m CONFIG_SMSGIUCV=m @@ -114,6 +115,7 @@ # CONFIG_IRDA is not set # CONFIG_BT is not set # CONFIG_NET_RADIO is not set +# CONFIG_IEEE80211 is not set # The s390 CPU does not have hardware support for big pages at all. # CONFIG_HUGETLBFS is not set @@ -134,8 +136,10 @@ # # S390 crypto hw # -CONFIG_CRYPTO_SHA1_Z990=m -CONFIG_CRYPTO_DES_Z990=m +CONFIG_CRYPTO_SHA1_S390=m +CONFIG_CRYPTO_SHA256_S390=m +CONFIG_CRYPTO_DES_S390=m +CONFIG_CRYPTO_AES_S390=m # # Kernel hacking @@ -164,5 +168,11 @@ CONFIG_VMCP=m +# CONFIG_ATMEL is not set + +# CONFIG_CDROM_PKTCDVD is not set +# CONFIG_ATA_OVER_ETH is not set +# CONFIG_MII is not set + # CONFIG_BOOT_DELAY is not set Index: config-x86-generic =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-4/configs/config-x86-generic,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- config-x86-generic 21 Feb 2006 02:35:46 -0000 1.20 +++ config-x86-generic 28 Mar 2006 16:14:10 -0000 1.21 @@ -277,3 +277,16 @@ # CONFIG_CRASH_DUMP is not set CONFIG_PHYSICAL_START=0x100000 + +CONFIG_CS5535_GPIO=m + +CONFIG_EDAC=y +CONFIG_EDAC_DEBUG=y +CONFIG_EDAC_MM_EDAC=m +CONFIG_EDAC_AMD76X=m +CONFIG_EDAC_E7XXX=m +CONFIG_EDAC_E752X=m +CONFIG_EDAC_I82875P=m +CONFIG_EDAC_I82860=m +CONFIG_EDAC_R82600=m + Index: config-x86_64-generic =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-4/configs/config-x86_64-generic,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- config-x86_64-generic 5 Mar 2006 02:31:30 -0000 1.19 +++ config-x86_64-generic 28 Mar 2006 16:14:10 -0000 1.20 @@ -41,8 +41,7 @@ CONFIG_GENERIC_ISA_DMA=y CONFIG_SCHED_SMT=y # CONFIG_SOFTWARE_SUSPEND is not set -# FIXME: Disable this before release. -CONFIG_PM_DEBUG=y +# CONFIG_PM_DEBUG is not set CONFIG_CPU_FREQ=y # CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set @@ -144,3 +143,13 @@ CONFIG_NVRAM=m +CONFIG_EDAC=y +# CONFIG_EDAC_DEBUG is not set +CONFIG_EDAC_MM_EDAC=m +CONFIG_EDAC_AMD76X=m +CONFIG_EDAC_E7XXX=m +CONFIG_EDAC_E752X=m +CONFIG_EDAC_I82875P=m +CONFIG_EDAC_I82860=m +CONFIG_EDAC_R82600=m + From fedora-cvs-commits at redhat.com Tue Mar 28 16:14:12 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 28 Mar 2006 11:14:12 -0500 Subject: rpms/kernel/FC-4 linux-2.6-NFSD-writes-shouldnt-clobber-utimes.patch, NONE, 1.1 linux-2.6-acpi-ecdt-uid-hack.patch, NONE, 1.1 linux-2.6-acpi_os_acquire_object-gfp_kernel-called-with-irqs.patch, NONE, 1.1 linux-2.6-audit-new-msg-types.patch, NONE, 1.1 linux-2.6-cpufreq-acpi-sticky.patch, NONE, 1.1 linux-2.6-debug-account-kmalloc.patch, NONE, 1.1 linux-2.6-debug-latency-tracing.patch, NONE, 1.1 linux-2.6-debug-must_check.patch, NONE, 1.1 linux-2.6-debug-periodic-slab-check.patch, 1.2, 1.3 linux-2.6-debug-pm-pci.patch, NONE, 1.1 linux-2.6-debug-slab-leaks.patch, NONE, 1.1 linux-2.6-defaults-enable-sata-atapi.patch, NONE, 1.1 linux-2.6-defaults-fat-utf8.patch, NONE, 1.1 linux-2.6-defaults-firmware-loader-timeout.patch, NONE, 1.1 linux-2.6-defaults-max-symlinks.patch, NONE, 1.1 linux-2.6-drm-cripple-r300.patch, NONE, 1.1 linux-2.6-edid-check.patch, NONE, 1.1 linux-2.6-intel-cache-build.patch, NONE, 1.1 linux-2.6-mv643xx-compile-fix.patch, NONE, 1.1 linux-2.6-net-ipw2200-hwcrypto.patch, NONE, 1.1 linux-2.6-net-! wireless-features.patch, NONE, 1.1 linux-2.6-optimise-spinlock-debug.patch, NONE, 1.1 linux-2.6-sata-silence-dumb-msg.patch, NONE, 1.1 linux-2.6-sched-up-migration-cost.patch, NONE, 1.1 linux-2.6-selinux-disable-attributes-no-policy.patch, NONE, 1.1 linux-2.6-selinux-mprotect-checks.patch, NONE, 1.1 linux-2.6-selinux-selinuxfs-hard-link-count.patch, NONE, 1.1 linux-2.6-signal-trampolines-unwind-info.patch, NONE, 1.1 linux-2.6-softcursor-persistent-alloc.patch, NONE, 1.1 linux-2.6-softlockup-disable.patch, NONE, 1.1 linux-2.6-suspend-slab-warnings.patch, NONE, 1.1 linux-2.6-x86-cpu_index-false.patch, NONE, 1.1 linux-2.6-x86_64-smp-on-uphw-cpucount.patch, NONE, 1.1 linux-2.6-x86_64-vdso-compile-m32.patch, NONE, 1.1 linux-2.6.16.tar.bz2.sign, NONE, 1.1 patch-2.6.16.1.bz2.sign, NONE, 1.1 .cvsignore, 1.176, 1.177 Makefile.config, 1.27, 1.28 kernel-2.6.spec, 1.1614, 1.1615 linux-2.6-crashdump-common.patch, 1.6, 1.7 linux-2.6-crashdump-reboot-exports.patch, 1.6, 1.7 linux-2.6-debug-dual-line-backtrace.patch, 1.1, 1.2 linux-! 2.6-debug-singlebiterror.patch,1.3,1.4 linux-2.6-debug-spinloc! k-panic. Message-ID: <200603281614.k2SGECqA003132@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv3108 Modified Files: .cvsignore Makefile.config kernel-2.6.spec linux-2.6-crashdump-common.patch linux-2.6-crashdump-reboot-exports.patch linux-2.6-debug-dual-line-backtrace.patch linux-2.6-debug-singlebiterror.patch linux-2.6-debug-spinlock-panic.patch linux-2.6-debug-spinlock-taint.patch linux-2.6-debug-sysfs-crash-debugging.patch linux-2.6-debug-taint-vm.patch linux-2.6-devmem.patch linux-2.6-diskdump.patch linux-2.6-dump_smp_call_function.patch linux-2.6-execshield.patch linux-2.6-modsign-core.patch linux-2.6-net-ipw2200-monitor.patch linux-2.6-netdump.patch linux-2.6-radeon-backlight.patch linux-2.6-sata-promise-pata-ports.patch linux-2.6-sleepon.patch linux-2.6-tux.patch linux-2.6-vm-clear-unreclaimable.patch linux-2.6-vm-silence-atomic-alloc-failures.patch linux-2.6-x86-tune-p4.patch sources upstream Added Files: linux-2.6-NFSD-writes-shouldnt-clobber-utimes.patch linux-2.6-acpi-ecdt-uid-hack.patch linux-2.6-acpi_os_acquire_object-gfp_kernel-called-with-irqs.patch linux-2.6-audit-new-msg-types.patch linux-2.6-cpufreq-acpi-sticky.patch linux-2.6-debug-account-kmalloc.patch linux-2.6-debug-latency-tracing.patch linux-2.6-debug-must_check.patch linux-2.6-debug-periodic-slab-check.patch linux-2.6-debug-pm-pci.patch linux-2.6-debug-slab-leaks.patch linux-2.6-defaults-enable-sata-atapi.patch linux-2.6-defaults-fat-utf8.patch linux-2.6-defaults-firmware-loader-timeout.patch linux-2.6-defaults-max-symlinks.patch linux-2.6-drm-cripple-r300.patch linux-2.6-edid-check.patch linux-2.6-intel-cache-build.patch linux-2.6-mv643xx-compile-fix.patch linux-2.6-net-ipw2200-hwcrypto.patch linux-2.6-net-wireless-features.patch linux-2.6-optimise-spinlock-debug.patch linux-2.6-sata-silence-dumb-msg.patch linux-2.6-sched-up-migration-cost.patch linux-2.6-selinux-disable-attributes-no-policy.patch linux-2.6-selinux-mprotect-checks.patch linux-2.6-selinux-selinuxfs-hard-link-count.patch linux-2.6-signal-trampolines-unwind-info.patch linux-2.6-softcursor-persistent-alloc.patch linux-2.6-softlockup-disable.patch linux-2.6-suspend-slab-warnings.patch linux-2.6-x86-cpu_index-false.patch linux-2.6-x86_64-smp-on-uphw-cpucount.patch linux-2.6-x86_64-vdso-compile-m32.patch linux-2.6.16.tar.bz2.sign patch-2.6.16.1.bz2.sign Removed Files: linux-2.6-8250-16c950-faster.patch linux-2.6-acpi-thinkpad-c2c3.patch linux-2.6-atkbd-dell-multimedia.patch linux-2.6-block-reduce-stack.patch linux-2.6-build-reference-discarded-opd.patch linux-2.6-crash-xen.patch linux-2.6-debug-taint-check.patch linux-2.6-debug-taint-proprietary-helpers.patch linux-2.6-devmem-xen.patch linux-2.6-execshield-vdso.patch linux-2.6-execshield-xen.patch linux-2.6-firmware-loader-timeout.patch linux-2.6-g5-dualcore.patch linux-2.6-input-usblegacy.patch linux-2.6-ipw2200-hwcrypto.patch linux-2.6-max-symlinks.patch linux-2.6-missing-exports.patch linux-2.6-net-acenic-use-after-free.patch linux-2.6-net-nat-pmtu.patch linux-2.6-posix-timers-sched_time-accumulation.patch linux-2.6-powerpc-parport.patch linux-2.6-powerpc64-fpexc.patch linux-2.6-procfs-i_nlink-miscalculate.patch linux-2.6-sata-enable-atapi-by-default.patch linux-2.6-scsi-megaraid-legacy.patch linux-2.6-serial-nrports.patch linux-2.6-serial-of.patch linux-2.6-swsusp-nofreeze.patch linux-2.6-ub.patch linux-2.6-usb-find-interface.patch linux-2.6-usb-unusual-devices.patch linux-2.6-vm-debug.patch linux-2.6-vm-oomkiller-debugging.patch linux-2.6-write-protect-rodata.patch linux-2.6-x86_64-disable-hotplug-guessing.patch linux-2.6-xen-additional.patch linux-2.6-xen-compile.patch linux-2.6-xen-vdso-note.patch linux-2.6-xen.patch linux-2.6.14-intel-cache-build.patch linux-2.6.14.tar.bz2.sign linux-2.6.15-default-powerpc.patch linux-2.6.15-mv643xx-fixes.patch linux-2.6.15-rc1-ppc64-syscallpath.patch linux-2.6.15.tar.bz2.sign patch-2.6.15.6.bz2.sign Log Message: move .16 rebase from scratch/ to FC-4/ linux-2.6-NFSD-writes-shouldnt-clobber-utimes.patch: inode.c | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) --- NEW FILE linux-2.6-NFSD-writes-shouldnt-clobber-utimes.patch --- Author: Trond Myklebust NFS: writes should not clobber utimes() calls Ensure that we flush out writes in the case when someone calls utimes() in order to set the file times. Signed-off-by: Trond Myklebust --- fs/nfs/inode.c | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c index a77ee95..0524a20 100644 --- a/fs/nfs/inode.c +++ b/fs/nfs/inode.c @@ -859,11 +859,9 @@ nfs_setattr(struct dentry *dentry, struc lock_kernel(); nfs_begin_data_update(inode); - /* Write all dirty data if we're changing file permissions or size */ - if ((attr->ia_valid & (ATTR_MODE|ATTR_UID|ATTR_GID|ATTR_SIZE)) != 0) { - filemap_write_and_wait(inode->i_mapping); - nfs_wb_all(inode); - } + /* Write all dirty data */ + filemap_write_and_wait(inode->i_mapping); + nfs_wb_all(inode); /* * Return any delegations if we're going to change ACLs */ linux-2.6-acpi-ecdt-uid-hack.patch: ec.c | 16 ++++++---------- 1 files changed, 6 insertions(+), 10 deletions(-) --- NEW FILE linux-2.6-acpi-ecdt-uid-hack.patch --- acpi-ecdt-uid-hack On some boxes ecdt uid may be equal to 0, so do not test for uids equality, so that fake handler will be unconditionally removed to allow loading the real one. Signed-off-by: Jiri Slaby --- commit ff7e5094ceaf67b950f7684c66c54011fa0e5cd5 tree bde2662da704bea931d88fcc8a5d16d2f8895700 parent 8e07cf694b71c1cddded6f311e15db6e25696157 author Jiri Slaby Mon, 06 Mar 2006 17:40:42 +0059 committer Jiri Slaby Mon, 06 Mar 2006 17:40:42 +0059 drivers/acpi/ec.c | 16 ++++++---------- 1 files changed, 6 insertions(+), 10 deletions(-) diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c index f339bd4..de95a09 100644 --- a/drivers/acpi/ec.c +++ b/drivers/acpi/ec.c @@ -989,7 +989,6 @@ static int acpi_ec_poll_add(struct acpi_ int result = 0; acpi_status status = AE_OK; union acpi_ec *ec = NULL; - unsigned long uid; ACPI_FUNCTION_TRACE("acpi_ec_add"); @@ -1012,10 +1011,9 @@ static int acpi_ec_poll_add(struct acpi_ acpi_evaluate_integer(ec->common.handle, "_GLK", NULL, &ec->common.global_lock); - /* If our UID matches the UID for the ECDT-enumerated EC, - we now have the *real* EC info, so kill the makeshift one. */ - acpi_evaluate_integer(ec->common.handle, "_UID", NULL, &uid); - if (ec_ecdt && ec_ecdt->common.uid == uid) { + /* XXX we doesn't test uids, because on some boxes ecdt uid = 0, see: + http://bugzilla.kernel.org/show_bug.cgi?id=6111 */ + if (ec_ecdt) { acpi_remove_address_space_handler(ACPI_ROOT_OBJECT, ACPI_ADR_SPACE_EC, &acpi_ec_space_handler); @@ -1059,7 +1057,6 @@ static int acpi_ec_intr_add(struct acpi_ int result = 0; acpi_status status = AE_OK; union acpi_ec *ec = NULL; - unsigned long uid; ACPI_FUNCTION_TRACE("acpi_ec_add"); @@ -1085,10 +1082,9 @@ static int acpi_ec_intr_add(struct acpi_ acpi_evaluate_integer(ec->common.handle, "_GLK", NULL, &ec->common.global_lock); - /* If our UID matches the UID for the ECDT-enumerated EC, - we now have the *real* EC info, so kill the makeshift one. */ - acpi_evaluate_integer(ec->common.handle, "_UID", NULL, &uid); - if (ec_ecdt && ec_ecdt->common.uid == uid) { + /* XXX we doesn't test uids, because on some boxes ecdt uid = 0, see: + http://bugzilla.kernel.org/show_bug.cgi?id=6111 */ + if (ec_ecdt) { acpi_remove_address_space_handler(ACPI_ROOT_OBJECT, ACPI_ADR_SPACE_EC, &acpi_ec_space_handler); linux-2.6-acpi_os_acquire_object-gfp_kernel-called-with-irqs.patch: osl.c | 7 ++++++- parser/psutils.c | 8 ++++++-- 2 files changed, 12 insertions(+), 3 deletions(-) --- NEW FILE linux-2.6-acpi_os_acquire_object-gfp_kernel-called-with-irqs.patch --- From: Davi Arnaut acpi_os_acquire_object() gets called, with IRQs disabled, from: Debug: sleeping function called from invalid context at mm/slab.c:2499 in_atomic():0, irqs_disabled():1 [] kmem_cache_alloc+0x40/0x4f [] acpi_os_acquire_object+0xb/0x3c [] acpi_ut_allocate_object_desc_dbg+0x13/0x49 [] acpi_ut_create_internal_object_dbg+0xf/0x5e [] acpi_rs_set_srs_method_data+0x3d/0xb9 [] acpi_pci_link_set+0x102/0x17b [] irqrouter_resume+0x1e/0x3c [] __sysdev_resume+0x11/0x6b [] sysdev_resume+0x34/0x52 [] device_power_up+0x5/0xa [] suspend_enter+0x44/0x46 [] suspend_prepare+0x63/0xc1 [] enter_state+0x5e/0x7c [] state_store+0x81/0x8f [] state_store+0x0/0x8f [] subsys_attr_store+0x1e/0x22 [] flush_write_buffer+0x22/0x28 [] sysfs_write_file+0x4c/0x71 [] sysfs_write_file+0x0/0x71 [] vfs_write+0xa2/0x15a [] sys_write+0x41/0x6a [] syscall_call+0x7/0xb The patch also fixes a missing check for NULL return from acpi_os_acquire_object(). Signed-off-by: Davi Arnaut Cc: "Brown, Len" Cc: Pavel Machek Signed-off-by: Andrew Morton --- drivers/acpi/osl.c | 7 ++++++- drivers/acpi/parser/psutils.c | 8 ++++++-- 2 files changed, 12 insertions(+), 3 deletions(-) diff -puN drivers/acpi/osl.c~acpi_os_acquire_object-gfp_kernel-called-with-irqs drivers/acpi/osl.c --- devel/drivers/acpi/osl.c~acpi_os_acquire_object-gfp_kernel-called-with-irqs 2006-02-13 16:59:30.000000000 -0800 +++ devel-akpm/drivers/acpi/osl.c 2006-02-13 16:59:30.000000000 -0800 @@ -1175,7 +1175,12 @@ acpi_status acpi_os_release_object(acpi_ void *acpi_os_acquire_object(acpi_cache_t * cache) { - void *object = kmem_cache_alloc(cache, GFP_KERNEL); + void *object; + + if (acpi_in_resume) + object = kmem_cache_alloc(cache, GFP_ATOMIC); + else + object = kmem_cache_alloc(cache, GFP_KERNEL); WARN_ON(!object); return object; } diff -puN drivers/acpi/parser/psutils.c~acpi_os_acquire_object-gfp_kernel-called-with-irqs drivers/acpi/parser/psutils.c --- devel/drivers/acpi/parser/psutils.c~acpi_os_acquire_object-gfp_kernel-called-with-irqs 2006-02-13 16:59:30.000000000 -0800 +++ devel-akpm/drivers/acpi/parser/psutils.c 2006-02-13 16:59:30.000000000 -0800 @@ -139,12 +139,16 @@ union acpi_parse_object *acpi_ps_alloc_o /* The generic op (default) is by far the most common (16 to 1) */ op = acpi_os_acquire_object(acpi_gbl_ps_node_cache); - memset(op, 0, sizeof(struct acpi_parse_obj_common)); + + if (op) + memset(op, 0, sizeof(struct acpi_parse_obj_common)); } else { /* Extended parseop */ op = acpi_os_acquire_object(acpi_gbl_ps_node_ext_cache); - memset(op, 0, sizeof(struct acpi_parse_obj_named)); + + if (op) + memset(op, 0, sizeof(struct acpi_parse_obj_named)); } /* Initialize the Op */ _ linux-2.6-audit-new-msg-types.patch: include/linux/audit.h | 22 ++++++++++++++++++---- kernel/audit.c | 2 ++ security/selinux/nlmsgtab.c | 9 +++++++-- 3 files changed, 27 insertions(+), 6 deletions(-) --- NEW FILE linux-2.6-audit-new-msg-types.patch --- diff -urp linux-2.6.15.x86_64.orig/include/linux/audit.h linux-2.6.15.x86_64/include/linux/audit.h --- linux-2.6.15.x86_64.orig/include/linux/audit.h 2006-03-22 08:27:53.000000000 -0500 +++ linux-2.6.15.x86_64/include/linux/audit.h 2006-03-22 08:26:56.000000000 -0500 @@ -33,11 +33,20 @@ * 1200 - 1299 messages internal to the audit daemon * 1300 - 1399 audit event messages * 1400 - 1499 SE Linux use - * 1500 - 1999 future use - * 2000 is for otherwise unclassified kernel audit messages + * 1500 - 1599 kernel LSPP events + * 1600 - 1699 kernel crypto events + * 1700 - 1999 future kernel use (maybe integrity labels and related events) + * 2000 is for otherwise unclassified kernel audit messages (legacy) + * 2001 - 2099 unused (kernel) + * 2100 - 2199 user space anomaly records + * 2200 - 2299 user space actions taken in response to anomalies + * 2300 - 2399 user space generated LSPP events + * 2400 - 2499 user space crypto events + * 2500 - 2999 future user space (maybe integrity labels and related events) * - * Messages from 1000-1199 are bi-directional. 1200-1299 are exclusively user - * space. Anything over that is kernel --> user space communication. + * Messages from 1000-1199 are bi-directional. 1200-1299 & 2100 - 2999 are + * exclusively user space. 1300-2099 is kernel --> user space + * communication. */ #define AUDIT_GET 1000 /* Get status */ #define AUDIT_SET 1001 /* Set status (enable/disable/auditd) */ @@ -50,10 +59,15 @@ #define AUDIT_WATCH_REM 1008 /* Remove file/dir watch entry */ #define AUDIT_WATCH_LIST 1009 /* List all file/dir watches */ #define AUDIT_SIGNAL_INFO 1010 /* Get info about sender of signal to auditd */ +#define AUDIT_ADD_RULE 1011 /* Add syscall filtering rule */ +#define AUDIT_DEL_RULE 1012 /* Delete syscall filtering rule */ +#define AUDIT_LIST_RULES 1013 /* List syscall filtering rules */ #define AUDIT_FIRST_USER_MSG 1100 /* Userspace messages mostly uninteresting to kernel */ #define AUDIT_USER_AVC 1107 /* We filter this differently */ #define AUDIT_LAST_USER_MSG 1199 +#define AUDIT_FIRST_USER_MSG2 2100 /* More user space messages */ +#define AUDIT_LAST_USER_MSG2 2999 #define AUDIT_DAEMON_START 1200 /* Daemon startup record */ #define AUDIT_DAEMON_END 1201 /* Daemon normal stop record */ diff -urp linux-2.6.15.x86_64.orig/kernel/audit.c linux-2.6.15.x86_64/kernel/audit.c --- linux-2.6.15.x86_64.orig/kernel/audit.c 2006-03-22 08:28:05.000000000 -0500 +++ linux-2.6.15.x86_64/kernel/audit.c 2006-03-22 08:20:04.000000000 -0500 @@ -351,6 +351,7 @@ static int audit_netlink_ok(kernel_cap_t break; case AUDIT_USER: case AUDIT_FIRST_USER_MSG...AUDIT_LAST_USER_MSG: + case AUDIT_FIRST_USER_MSG2...AUDIT_LAST_USER_MSG2: if (!cap_raised(eff_cap, CAP_AUDIT_WRITE)) err = -EPERM; break; @@ -430,6 +431,7 @@ static int audit_receive_msg(struct sk_b break; case AUDIT_USER: case AUDIT_FIRST_USER_MSG...AUDIT_LAST_USER_MSG: + case AUDIT_FIRST_USER_MSG2...AUDIT_LAST_USER_MSG2: if (!audit_enabled && msg_type != AUDIT_USER_AVC) return 0; diff -urp linux-2.6.15.x86_64.orig/security/selinux/nlmsgtab.c linux-2.6.15.x86_64/security/selinux/nlmsgtab.c --- linux-2.6.15.x86_64.orig/security/selinux/nlmsgtab.c 2006-03-22 08:28:08.000000000 -0500 +++ linux-2.6.15.x86_64/security/selinux/nlmsgtab.c 2006-03-22 08:23:38.000000000 -0500 @@ -104,6 +104,9 @@ static struct nlmsg_perm nlmsg_audit_per { AUDIT_WATCH_INS, NETLINK_AUDIT_SOCKET__NLMSG_WRITE }, { AUDIT_WATCH_REM, NETLINK_AUDIT_SOCKET__NLMSG_WRITE }, { AUDIT_WATCH_LIST, NETLINK_AUDIT_SOCKET__NLMSG_READPRIV }, + { AUDIT_ADD_RULE, NETLINK_AUDIT_SOCKET__NLMSG_WRITE }, + { AUDIT_DEL_RULE, NETLINK_AUDIT_SOCKET__NLMSG_WRITE }, + { AUDIT_LIST_RULES, NETLINK_AUDIT_SOCKET__NLMSG_READPRIV }, }; @@ -148,8 +151,10 @@ int selinux_nlmsg_lookup(u16 sclass, u16 break; case SECCLASS_NETLINK_AUDIT_SOCKET: - if (nlmsg_type >= AUDIT_FIRST_USER_MSG && - nlmsg_type <= AUDIT_LAST_USER_MSG) { + if ((nlmsg_type >= AUDIT_FIRST_USER_MSG && + nlmsg_type <= AUDIT_LAST_USER_MSG) || + (nlmsg_type >= AUDIT_FIRST_USER_MSG2 && + nlmsg_type <= AUDIT_LAST_USER_MSG2)) { *perm = NETLINK_AUDIT_SOCKET__NLMSG_RELAY; } else { err = nlmsg_perm(nlmsg_type, perm, nlmsg_audit_perms, linux-2.6-cpufreq-acpi-sticky.patch: acpi-cpufreq.c | 1 + 1 files changed, 1 insertion(+) --- NEW FILE linux-2.6-cpufreq-acpi-sticky.patch --- --- linux-2.6.16.noarch/arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c~ 2006-03-27 16:03:22.000000000 -0500 +++ linux-2.6.16.noarch/arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c 2006-03-27 16:04:26.000000000 -0500 @@ -452,6 +452,7 @@ static struct cpufreq_driver acpi_cpufre .name = "acpi-cpufreq", .owner = THIS_MODULE, .attr = acpi_cpufreq_attr, + .flags = CPUFREQ_STICKY, }; linux-2.6-debug-account-kmalloc.patch: linux-2.6.14/include/linux/slab.h | 29 +++++ linux-2.6.14/include/linux/string.h | 2 linux-2.6.14/mm/slab.c | 36 ------- tiny/fs/proc/proc_misc.c | 21 ++++ tiny/include/linux/slab.h | 19 +++ tiny/init/Kconfig | 7 + tiny/mm/Makefile | 1 tiny/mm/kmallocacct.c | 182 ++++++++++++++++++++++++++++++++++++ tiny/mm/slab.c | 8 + 9 files changed, 265 insertions(+), 40 deletions(-) --- NEW FILE linux-2.6-debug-account-kmalloc.patch --- /proc/kmalloc allocation tracing tiny-mpm/fs/proc/proc_misc.c | 21 ++++ tiny-mpm/include/linux/slab.h | 19 ++++ tiny-mpm/init/Kconfig | 7 + tiny-mpm/mm/Makefile | 2 tiny-mpm/mm/kmallocacct.c | 182 ++++++++++++++++++++++++++++++++++++++++++ tiny-mpm/mm/slab.c | 7 + 6 files changed, 237 insertions(+), 1 deletion(-) Index: tiny/init/Kconfig =================================================================== --- tiny.orig/init/Kconfig 2005-10-10 17:41:44.000000000 -0700 +++ tiny/init/Kconfig 2005-10-10 17:41:46.000000000 -0700 @@ -315,6 +315,13 @@ config BUG option for embedded systems with no facilities for reporting errors. Just say Y. +config KMALLOC_ACCOUNTING + default n + bool "Enabled accounting of kmalloc/kfree allocations" + help + This option records kmalloc and kfree activity and reports it via + /proc/kmalloc. + config BASE_FULL default y bool "Enable full-sized data structures for core" if EMBEDDED Index: tiny/mm/slab.c =================================================================== --- tiny.orig/mm/slab.c 2005-10-10 17:32:51.000000000 -0700 +++ tiny/mm/slab.c 2005-10-10 17:41:46.000000000 -0700 @@ -2911,6 +2911,8 @@ EXPORT_SYMBOL(kmalloc_node); void *__kmalloc(size_t size, unsigned int __nocast flags) { kmem_cache_t *cachep; + struct cache_sizes *csizep = malloc_sizes; + void *a; /* If you want to save a few bytes .text space: replace * __ with kmem_. @@ -2920,7 +2921,9 @@ void *__kmalloc(size_t size, unsigned in cachep = __find_general_cachep(size, flags); if (unlikely(cachep == NULL)) return NULL; - return __cache_alloc(cachep, flags); + a = __cache_alloc(cachep, flags); + kmalloc_account(a, cachep->objsize, size); + return a; } EXPORT_SYMBOL(__kmalloc); @@ -3020,6 +3023,8 @@ void kfree(const void *objp) kmem_cache_t *c; unsigned long flags; + kfree_account(objp, ksize(objp)); + if (unlikely(!objp)) return; local_irq_save(flags); Index: tiny/mm/kmallocacct.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 +++ tiny/mm/kmallocacct.c 2005-10-10 17:41:46.000000000 -0700 @@ -0,0 +1,182 @@ +#include +#include +#include + +struct kma_caller { + const void *caller; + int total, net, slack, allocs, frees; +}; + +struct kma_list { + int callerhash; + const void *address; +}; + +#define MAX_CALLER_TABLE 512 +#define MAX_ALLOC_TRACK 4096 + +#define kma_hash(address, size) (((u32)address / (u32)size) % size) + +static struct kma_list kma_alloc[MAX_ALLOC_TRACK]; +static struct kma_caller kma_caller[MAX_CALLER_TABLE]; + +static int kma_callers; +static int kma_lost_callers, kma_lost_allocs, kma_unknown_frees; +static int kma_total, kma_net, kma_slack, kma_allocs, kma_frees; +static spinlock_t kma_lock = SPIN_LOCK_UNLOCKED; + +void __kmalloc_account(const void *caller, const void *addr, int size, int req) +{ + int i, hasha, hashc; + unsigned long flags; + + spin_lock_irqsave(&kma_lock, flags); + if(req >= 0) /* kmalloc */ + { + /* find callers slot */ + hashc = kma_hash(caller, MAX_CALLER_TABLE); + for (i = 0; i < MAX_CALLER_TABLE; i++) { + if (!kma_caller[hashc].caller || + kma_caller[hashc].caller == caller) + break; + hashc = (hashc + 1) % MAX_CALLER_TABLE; + } + + if (!kma_caller[hashc].caller) + kma_callers++; + + if (i < MAX_CALLER_TABLE) { + /* update callers stats */ + kma_caller[hashc].caller = caller; + kma_caller[hashc].total += size; + kma_caller[hashc].net += size; + kma_caller[hashc].slack += size - req; + kma_caller[hashc].allocs++; + + /* add malloc to list */ + hasha = kma_hash(addr, MAX_ALLOC_TRACK); + for (i = 0; i < MAX_ALLOC_TRACK; i++) { + if (!kma_alloc[hasha].callerhash) + break; + hasha = (hasha + 1) % MAX_ALLOC_TRACK; + } + + if(i < MAX_ALLOC_TRACK) { + kma_alloc[hasha].callerhash = hashc; + kma_alloc[hasha].address = addr; + } + else + kma_lost_allocs++; + } + else { + kma_lost_callers++; + kma_lost_allocs++; + } + + kma_total += size; + kma_net += size; + kma_slack += size - req; + kma_allocs++; + } + else { /* kfree */ + hasha = kma_hash(addr, MAX_ALLOC_TRACK); + for (i = 0; i < MAX_ALLOC_TRACK ; i++) { + if (kma_alloc[hasha].address == addr) + break; + hasha = (hasha + 1) % MAX_ALLOC_TRACK; + } + + if (i < MAX_ALLOC_TRACK) { + hashc = kma_alloc[hasha].callerhash; + kma_alloc[hasha].callerhash = 0; + kma_caller[hashc].net -= size; + kma_caller[hashc].frees++; + } + else + kma_unknown_frees++; + + kma_net -= size; + kma_frees++; + } + spin_unlock_irqrestore(&kma_lock, flags); +} + +static void *as_start(struct seq_file *m, loff_t *pos) +{ + int i; + loff_t n = *pos; + + if (!n) { + seq_printf(m, "total bytes allocated: %8d\n", kma_total); + seq_printf(m, "slack bytes allocated: %8d\n", kma_slack); + seq_printf(m, "net bytes allocated: %8d\n", kma_net); + seq_printf(m, "number of allocs: %8d\n", kma_allocs); + seq_printf(m, "number of frees: %8d\n", kma_frees); + seq_printf(m, "number of callers: %8d\n", kma_callers); + seq_printf(m, "lost callers: %8d\n", + kma_lost_callers); + seq_printf(m, "lost allocs: %8d\n", + kma_lost_allocs); + seq_printf(m, "unknown frees: %8d\n", + kma_unknown_frees); + seq_puts(m, "\n total slack net alloc/free caller\n"); + } + + for (i = 0; i < MAX_CALLER_TABLE; i++) { + if(kma_caller[i].caller) + n--; + if(n < 0) + return (void *)(i+1); + } + + return 0; +} + +static void *as_next(struct seq_file *m, void *p, loff_t *pos) +{ + int n = (int)p-1, i; + ++*pos; + + for (i = n + 1; i < MAX_CALLER_TABLE; i++) + if(kma_caller[i].caller) + return (void *)(i+1); + + return 0; +} + +static void as_stop(struct seq_file *m, void *p) +{ +} + +static int as_show(struct seq_file *m, void *p) +{ + int n = (int)p-1; + struct kma_caller *c; +#ifdef CONFIG_KALLSYMS + char *modname; + const char *name; + unsigned long offset = 0, size; + char namebuf[128]; + + c = &kma_caller[n]; + name = kallsyms_lookup((int)c->caller, &size, &offset, &modname, + namebuf); + seq_printf(m, "%8d %8d %8d %5d/%-5d %s+0x%lx\n", + c->total, c->slack, c->net, c->allocs, c->frees, + name, offset); +#else + c = &kma_caller[n]; + seq_printf(m, "%8d %8d %8d %5d/%-5d %p\n", + c->total, c->slack, c->net, c->allocs, c->frees, c->caller); +#endif + + return 0; +} + +struct seq_operations kmalloc_account_op = { + .start = as_start, + .next = as_next, + .stop = as_stop, + .show = as_show, +}; + Index: tiny/mm/Makefile =================================================================== --- tiny.orig/mm/Makefile 2005-10-10 17:30:45.000000000 -0700 +++ tiny/mm/Makefile 2005-10-10 17:41:46.000000000 -0700 @@ -12,6 +12,7 @@ obj-y := bootmem.o filemap.o mempool.o readahead.o slab.o swap.o truncate.o vmscan.o \ prio_tree.o $(mmu-y) +obj-$(CONFIG_KMALLOC_ACCOUNTING) += kmallocacct.o obj-$(CONFIG_SWAP) += page_io.o swap_state.o swapfile.o thrash.o obj-$(CONFIG_HUGETLBFS) += hugetlb.o obj-$(CONFIG_NUMA) += mempolicy.o Index: tiny/include/linux/slab.h =================================================================== --- tiny.orig/include/linux/slab.h 2005-10-10 17:32:41.000000000 -0700 +++ tiny/include/linux/slab.h 2005-10-10 17:41:46.000000000 -0700 @@ -53,6 +53,23 @@ typedef struct kmem_cache_s kmem_cache_t #define SLAB_CTOR_ATOMIC 0x002UL /* tell constructor it can't sleep */ #define SLAB_CTOR_VERIFY 0x004UL /* tell constructor it's a verify call */ +#ifdef CONFIG_KMALLOC_ACCOUNTING +void __kmalloc_account(const void *, const void *, int, int); + +static void inline kmalloc_account(const void *addr, int size, int req) +{ + __kmalloc_account(__builtin_return_address(0), addr, size, req); +} + +static void inline kfree_account(const void *addr, int size) +{ + __kmalloc_account(__builtin_return_address(0), addr, size, -1); +} +#else +#define kmalloc_account(a, b, c) +#define kfree_account(a, b) +#endif + /* prototypes */ extern void __init kmem_cache_init(void); @@ -78,6 +95,7 @@ extern void *__kmalloc(size_t, unsigned static inline void *kmalloc(size_t size, unsigned int __nocast flags) { +#ifndef CONFIG_KMALLOC_ACCOUNTING if (__builtin_constant_p(size)) { int i = 0; #define CACHE(x) \ @@ -96,6 +114,7 @@ found: malloc_sizes[i].cs_dmacachep : malloc_sizes[i].cs_cachep, flags); } +#endif return __kmalloc(size, flags); } Index: tiny/fs/proc/proc_misc.c =================================================================== --- tiny.orig/fs/proc/proc_misc.c 2005-10-10 17:30:45.000000000 -0700 +++ tiny/fs/proc/proc_misc.c 2005-10-10 17:41:46.000000000 -0700 @@ -337,6 +337,24 @@ static struct file_operations proc_slabi .release = seq_release, }; +#ifdef CONFIG_KMALLOC_ACCOUNTING + +extern struct seq_operations kmalloc_account_op; + +static int kmalloc_account_open(struct inode *inode, struct file *file) +{ + return seq_open(file, &kmalloc_account_op); +} + +static struct file_operations proc_kmalloc_account_operations = { + .open = kmalloc_account_open, + .read = seq_read, + .llseek = seq_lseek, + .release = seq_release, +}; + +#endif + static int show_stat(struct seq_file *p, void *v) { int i; @@ -601,6 +619,9 @@ void __init proc_misc_init(void) create_seq_entry("stat", 0, &proc_stat_operations); create_seq_entry("interrupts", 0, &proc_interrupts_operations); create_seq_entry("slabinfo",S_IWUSR|S_IRUGO,&proc_slabinfo_operations); +#ifdef CONFIG_KMALLOC_ACCOUNTING + create_seq_entry("kmalloc",S_IRUGO,&proc_kmalloc_account_operations); +#endif create_seq_entry("buddyinfo",S_IRUGO, &fragmentation_file_operations); create_seq_entry("vmstat",S_IRUGO, &proc_vmstat_file_operations); create_seq_entry("zoneinfo",S_IRUGO, &proc_zoneinfo_file_operations); --- linux-2.6.14/mm/slab.c~ 2005-12-28 16:37:04.000000000 -0500 +++ linux-2.6.14/mm/slab.c 2005-12-28 16:37:14.000000000 -0500 @@ -3045,20 +3045,6 @@ void kmem_cache_free(kmem_cache_t *cache EXPORT_SYMBOL(kmem_cache_free); /** - * kzalloc - allocate memory. The memory is set to zero. - * @size: how many bytes of memory are required. - * @flags: the type of memory to allocate. - */ -void *kzalloc(size_t size, gfp_t flags) -{ - void *ret = kmalloc(size, flags); - if (ret) - memset(ret, 0, size); - return ret; -} -EXPORT_SYMBOL(kzalloc); - -/** * kfree - free previously allocated memory * @objp: pointer returned by kmalloc. * --- linux-2.6.14/include/linux/slab.h~ 2005-12-28 16:37:19.000000000 -0500 +++ linux-2.6.14/include/linux/slab.h 2005-12-28 16:38:51.000000000 -0500 @@ -118,7 +118,13 @@ found: return __kmalloc(size, flags); } -extern void *kzalloc(size_t, gfp_t); +static inline void *kzalloc(size_t size, gfp_t flags) +{ + void *ret = kmalloc(size, flags); + if (ret) + memset(ret, 0, size); + return ret; +} /** * kcalloc - allocate memory for an array. The memory is set to zero. --- linux-2.6.14/include/linux/slab.h~ 2005-12-28 19:04:06.000000000 -0500 +++ linux-2.6.14/include/linux/slab.h 2005-12-28 19:04:47.000000000 -0500 @@ -126,6 +126,27 @@ static inline void *kzalloc(size_t size, return ret; } +/* + * kstrdup - allocate space for and copy an existing string + * + * @s: the string to duplicate + * @gfp: the GFP mask used in the kmalloc() call when allocating memory + */ +static inline char *kstrdup(const char *s, gfp_t gfp) +{ + size_t len; + char *buf; + + if (!s) + return NULL; + + len = strlen(s) + 1; + buf = kmalloc(len, gfp); + if (buf) + memcpy(buf, s, len); + return buf; +} + /** * kcalloc - allocate memory for an array. The memory is set to zero. * @n: number of elements. --- linux-2.6.14/mm/slab.c~ 2005-12-28 19:04:54.000000000 -0500 +++ linux-2.6.14/mm/slab.c 2005-12-28 19:04:59.000000000 -0500 @@ -3669,25 +3669,3 @@ unsigned int ksize(const void *objp) return obj_reallen(page_get_cache(virt_to_page(objp))); } - -/* - * kstrdup - allocate space for and copy an existing string - * - * @s: the string to duplicate - * @gfp: the GFP mask used in the kmalloc() call when allocating memory - */ -char *kstrdup(const char *s, gfp_t gfp) -{ - size_t len; - char *buf; - - if (!s) - return NULL; - - len = strlen(s) + 1; - buf = kmalloc(len, gfp); - if (buf) - memcpy(buf, s, len); - return buf; -} -EXPORT_SYMBOL(kstrdup); --- linux-2.6.14/include/linux/string.h~ 2005-12-28 19:12:06.000000000 -0500 +++ linux-2.6.14/include/linux/string.h 2005-12-28 19:12:19.000000000 -0500 @@ -88,8 +88,6 @@ extern int memcmp(const void *,const voi extern void * memchr(const void *,int,__kernel_size_t); #endif -extern char *kstrdup(const char *s, gfp_t gfp); - #ifdef __cplusplus } #endif linux-2.6-debug-latency-tracing.patch: Makefile | 10 arch/arm/boot/compressed/head.S | 13 arch/arm/boot/compressed/misc.c | 1 arch/arm/kernel/entry-common.S | 109 + arch/arm/kernel/fiq.c | 4 arch/arm/kernel/irq.c | 4 arch/arm/kernel/traps.c | 2 arch/arm/mm/copypage-v4mc.c | 4 arch/arm/mm/copypage-xscale.c | 4 arch/arm/mm/fault.c | 14 arch/arm26/boot/compressed/misc.c | 1 arch/i386/Kconfig | 2 arch/i386/boot/compressed/misc.c | 9 arch/i386/kernel/Makefile | 1 arch/i386/kernel/entry.S | 41 arch/i386/kernel/irq.c | 8 arch/i386/kernel/mcount-wrapper.S | 27 arch/i386/kernel/traps.c | 1 arch/i386/mm/fault.c | 1 arch/ppc/boot/Makefile | 9 arch/ppc/boot/lib/Makefile | 48 arch/ppc/kernel/entry.S | 82 + arch/x86_64/boot/compressed/misc.c | 1 arch/x86_64/kernel/entry.S | 48 arch/x86_64/kernel/vsyscall.c | 2 arch/x86_64/mm/fault.c | 1 fs/proc/proc_misc.c | 17 include/asm-arm/pgalloc.h | 4 include/asm-arm/timex.h | 10 include/asm-arm/unistd.h | 4 include/asm-i386/system.h | 8 include/asm-x86_64/system.h | 15 include/asm-x86_64/unistd.h | 2 include/linux/interrupt.h | 10 include/linux/kernel.h | 2 include/linux/latency_hist.h | 32 include/linux/linkage.h | 2 include/linux/preempt.h | 20 include/linux/sched.h | 86 + kernel/Makefile | 3 kernel/latency.c | 2465 +++++++++++++++++++++++++++++++++++++ kernel/latency_hist.c | 267 ++++ kernel/sched.c | 101 + kernel/sysctl.c | 77 + kernel/time.c | 19 lib/Kconfig.debug | 152 ++ lib/inflate.c | 44 lib/zlib_inflate/inftrees.c | 45 48 files changed, 3734 insertions(+), 98 deletions(-) --- NEW FILE linux-2.6-debug-latency-tracing.patch --- Index: linux-latency-tracing.q/Makefile =================================================================== --- linux-latency-tracing.q.orig/Makefile +++ linux-latency-tracing.q/Makefile @@ -511,10 +511,14 @@ CFLAGS += $(call add-align,CONFIG_CC_AL CFLAGS += $(call add-align,CONFIG_CC_ALIGN_LOOPS,-loops) CFLAGS += $(call add-align,CONFIG_CC_ALIGN_JUMPS,-jumps) -ifdef CONFIG_FRAME_POINTER -CFLAGS += -fno-omit-frame-pointer $(call cc-option,-fno-optimize-sibling-calls,) +ifdef CONFIG_MCOUNT +CFLAGS += -pg -fno-omit-frame-pointer $(call cc-option,-fno-optimize-sibling-calls,) else -CFLAGS += -fomit-frame-pointer + ifdef CONFIG_FRAME_POINTER + CFLAGS += -fno-omit-frame-pointer $(call cc-option,-fno-optimize-sibling-calls,) + else + CFLAGS += -fomit-frame-pointer + endif endif ifdef CONFIG_DEBUG_INFO Index: linux-latency-tracing.q/arch/arm/boot/compressed/head.S =================================================================== --- linux-latency-tracing.q.orig/arch/arm/boot/compressed/head.S +++ linux-latency-tracing.q/arch/arm/boot/compressed/head.S @@ -714,6 +714,19 @@ memdump: mov r12, r0 mov pc, r10 #endif +#ifdef CONFIG_MCOUNT +/* CONFIG_MCOUNT causes boot header to be built with -pg requiring this + * trampoline + */ + .text + .align 0 + .type mcount %function + .global mcount +mcount: + mov pc, lr @ just return +#endif + + reloc_end: .align Index: linux-latency-tracing.q/arch/arm/boot/compressed/misc.c =================================================================== --- linux-latency-tracing.q.orig/arch/arm/boot/compressed/misc.c +++ linux-latency-tracing.q/arch/arm/boot/compressed/misc.c @@ -199,6 +199,7 @@ static ulg free_mem_ptr_end; #define HEAP_SIZE 0x2000 +#define ZLIB_INFLATE_NO_INFLATE_LOCK #include "../../../../lib/inflate.c" #ifndef STANDALONE_DEBUG Index: linux-latency-tracing.q/arch/arm/kernel/entry-common.S =================================================================== --- linux-latency-tracing.q.orig/arch/arm/kernel/entry-common.S +++ linux-latency-tracing.q/arch/arm/kernel/entry-common.S @@ -3,6 +3,8 @@ * * Copyright (C) 2000 Russell King * + * LATENCY_TRACE/mcount support (C) 2005 Timesys john.cooper at timesys.com + * * 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. @@ -389,5 +391,112 @@ ENTRY(sys_oabi_call_table) #undef ABI #undef OBSOLETE +#ifdef CONFIG_FRAME_POINTER + +#ifdef CONFIG_MCOUNT +/* + * At the point where we are in mcount() we maintain the + * frame of the prologue code and keep the call to mcount() + * out of the stack frame list: + + saved pc <---\ caller of instrumented routine + saved lr | + ip/prev_sp | + fp -----^ | + : | + | + -> saved pc | instrumented routine + | saved lr | + | ip/prev_sp | + | fp ---------/ + | : + | + | mcount + | saved pc + | saved lr + | ip/prev sp + -- fp + r3 + r2 + r1 + sp-> r0 + : + */ + + .text + .align 0 + .type mcount %function + .global mcount + +/* gcc -pg generated FUNCTION_PROLOGUE references mcount() + * and has already created the stack frame invocation for + * the routine we have been called to instrument. We create + * a complete frame nevertheless, as we want to use the same + * call to mcount() from c code. + */ +mcount: + + ldr ip, =mcount_enabled @ leave early, if disabled + ldr ip, [ip] + cmp ip, #0 + moveq pc,lr + + mov ip, sp + stmdb sp!, {r0 - r3, fp, ip, lr, pc} @ create stack frame + + ldr r1, [fp, #-4] @ get lr (the return address + @ of the caller of the + @ instrumented function) + mov r0, lr @ get lr - (the return address + @ of the instrumented function) + + sub fp, ip, #4 @ point fp at this frame + + bl __trace +1: + ldmdb fp, {r0 - r3, fp, sp, pc} @ pop entry frame and return + +#endif + +/* ARM replacement for unsupported gcc __builtin_return_address(n) + * where 0 < n. n == 0 is supported here as well. + * + * Walk up the stack frame until the desired frame is found or a NULL + * fp is encountered, return NULL in the latter case. + * + * Note: it is possible under code optimization for the stack invocation + * of an ancestor function (level N) to be removed before calling a + * descendant function (level N+1). No easy means is available to deduce + * this scenario with the result being [for example] caller_addr(0) when + * called from level N+1 returning level N-1 rather than the expected + * level N. This optimization issue appears isolated to the case of + * a call to a level N+1 routine made at the tail end of a level N + * routine -- the level N frame is deleted and a simple branch is made + * to the level N+1 routine. + */ + + .text + .align 0 + .type arm_return_addr %function + .global arm_return_addr + +arm_return_addr: + mov ip, r0 + mov r0, fp +3: + cmp r0, #0 + beq 1f @ frame list hit end, bail + cmp ip, #0 + beq 2f @ reached desired frame + ldr r0, [r0, #-12] @ else continue, get next fp + sub ip, ip, #1 + b 3b +2: + ldr r0, [r0, #-4] @ get target return address +1: + mov pc, lr + +#endif + #endif Index: linux-latency-tracing.q/arch/arm/kernel/fiq.c =================================================================== --- linux-latency-tracing.q.orig/arch/arm/kernel/fiq.c +++ linux-latency-tracing.q/arch/arm/kernel/fiq.c @@ -88,7 +88,7 @@ void set_fiq_handler(void *start, unsign * disable irqs for the duration. Note - these functions are almost * entirely coded in assembly. */ -void __attribute__((naked)) set_fiq_regs(struct pt_regs *regs) +void notrace __attribute__((naked)) set_fiq_regs(struct pt_regs *regs) { register unsigned long tmp; asm volatile ( @@ -106,7 +106,7 @@ void __attribute__((naked)) set_fiq_regs : "r" (®s->ARM_r8), "I" (PSR_I_BIT | PSR_F_BIT | FIQ_MODE)); [...4409 lines suppressed...] +# define DEFINE_SPINLOCK(x) int x +# define spin_lock(x) (void)(x) +# define spin_unlock(x) (void)(x) +#endif + +/* + * lock protecting static variables of huft_build() and other inflate + * functions, to reduce their insane stack footprint. + */ +static DEFINE_SPINLOCK(inflate_lock); /* Function prototypes */ STATIC int INIT huft_build OF((unsigned *, unsigned, unsigned, @@ -304,7 +323,7 @@ STATIC int INIT huft_build( register struct huft *q; /* points to current table */ struct huft r; /* table entry for structure assignment */ struct huft *u[BMAX]; /* table stack */ - unsigned v[N_MAX]; /* values in order of bit length */ + static unsigned v[N_MAX]; /* values in order of bit length */ register int w; /* bits before this table == (l * h) */ unsigned x[BMAX+1]; /* bit offsets, then code stack */ unsigned *xp; /* pointer into x */ @@ -705,7 +724,7 @@ STATIC int noinline INIT inflate_fixed(v struct huft *td; /* distance code table */ int bl; /* lookup bits for tl */ int bd; /* lookup bits for td */ - unsigned l[288]; /* length list for huft_build */ + static unsigned l[288]; /* length list for huft_build */ DEBG(""); /* bad block type */ - return 2; + return ret; underrun: return 4; /* Input underrun */ Index: linux-latency-tracing.q/lib/zlib_inflate/inftrees.c =================================================================== --- linux-latency-tracing.q.orig/lib/zlib_inflate/inftrees.c +++ linux-latency-tracing.q/lib/zlib_inflate/inftrees.c @@ -4,11 +4,19 @@ */ #include +#include #include "inftrees.h" #include "infutil.h" static const char inflate_copyright[] __attribute_used__ = " inflate 1.1.3 Copyright 1995-1998 Mark Adler "; + +/* + * lock protecting static variables of huft_build() and other inflate + * functions, to reduce their insane stack footprint. + */ +static DEFINE_SPINLOCK(inflate_lock); + /* If you use the zlib library in a product, an acknowledgment is welcome in the documentation of your product. If for some reason you cannot @@ -107,7 +115,7 @@ static int huft_build( { uInt a; /* counter for codes of length k */ - uInt c[BMAX+1]; /* bit length count table */ + static uInt c[BMAX+1]; /* bit length count table */ uInt f; /* i repeats in table every f entries */ int g; /* maximum code length */ int h; /* table level */ @@ -118,10 +126,10 @@ static int huft_build( uInt mask; /* (1 << w) - 1, to avoid cc -O bug on HP */ register uInt *p; /* pointer into c[], b[], or v[] */ inflate_huft *q; /* points to current table */ - struct inflate_huft_s r; /* table entry for structure assignment */ - inflate_huft *u[BMAX]; /* table stack */ + static struct inflate_huft_s r; /* table entry for structure assignment */ + static inflate_huft *u[BMAX]; /* table stack */ register int w; /* bits before this table == (l * h) */ - uInt x[BMAX+1]; /* bit offsets, then code stack */ + static uInt x[BMAX+1]; /* bit offsets, then code stack */ uInt *xp; /* pointer into x */ int y; /* number of dummy codes added */ uInt z; /* number of entries in current table */ @@ -300,9 +308,13 @@ int zlib_inflate_trees_bits( int r; uInt hn = 0; /* hufts used in space */ uInt *v; /* work area for huft_build */ - + v = WS(z)->tree_work_area_1; + + spin_lock(&inflate_lock); r = huft_build(c, 19, 19, NULL, NULL, tb, bb, hp, &hn, v); + spin_unlock(&inflate_lock); + if (r == Z_DATA_ERROR) z->msg = (char*)"oversubscribed dynamic bit lengths tree"; else if (r == Z_BUF_ERROR || *bb == 0) @@ -333,7 +345,10 @@ int zlib_inflate_trees_dynamic( v = WS(z)->tree_work_area_2; /* build literal/length tree */ + spin_lock(&inflate_lock); r = huft_build(c, nl, 257, cplens, cplext, tl, bl, hp, &hn, v); + spin_unlock(&inflate_lock); + if (r != Z_OK || *bl == 0) { if (r == Z_DATA_ERROR) @@ -347,7 +362,10 @@ int zlib_inflate_trees_dynamic( } /* build distance tree */ + spin_lock(&inflate_lock); r = huft_build(c + nl, nd, 0, cpdist, cpdext, td, bd, hp, &hn, v); + spin_unlock(&inflate_lock); + if (r != Z_OK || (*bd == 0 && nl > 257)) { if (r == Z_DATA_ERROR) @@ -383,9 +401,11 @@ int zlib_inflate_trees_fixed( z_streamp z /* for memory allocation */ ) { - int i; /* temporary variable */ - unsigned l[288]; /* length list for huft_build */ - uInt *v; /* work area for huft_build */ + int i; /* temporary variable */ + static unsigned l[288]; /* length list for huft_build */ + uInt *v; /* work area for huft_build */ + + spin_lock(&inflate_lock); /* set up literal table */ for (i = 0; i < 144; i++) @@ -398,15 +418,20 @@ int zlib_inflate_trees_fixed( l[i] = 8; *bl = 9; v = WS(z)->tree_work_area_1; - if ((i = huft_build(l, 288, 257, cplens, cplext, tl, bl, hp, &i, v)) != 0) + if ((i = huft_build(l, 288, 257, cplens, cplext, tl, bl, hp, &i, v)) != 0) { + spin_unlock(&inflate_lock); return i; + } /* set up distance table */ for (i = 0; i < 30; i++) /* make an incomplete code set */ l[i] = 5; *bd = 5; - if ((i = huft_build(l, 30, 0, cpdist, cpdext, td, bd, hp, &i, v)) > 1) + if ((i = huft_build(l, 30, 0, cpdist, cpdext, td, bd, hp, &i, v)) > 1) { + spin_unlock(&inflate_lock); return i; + } + spin_unlock(&inflate_lock); return Z_OK; } linux-2.6-debug-must_check.patch: bitmap.h | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) --- NEW FILE linux-2.6-debug-must_check.patch --- --- linux-2.6.15.noarch/include/linux/bitmap.h~ 2006-02-17 14:05:18.000000000 -0500 +++ linux-2.6.15.noarch/include/linux/bitmap.h 2006-02-17 14:06:14.000000000 -0500 @@ -196,7 +196,7 @@ static inline void bitmap_complement(uns __bitmap_complement(dst, src, nbits); } -static inline int bitmap_equal(const unsigned long *src1, +static inline int __must_check bitmap_equal(const unsigned long *src1, const unsigned long *src2, int nbits) { if (nbits <= BITS_PER_LONG) @@ -205,7 +205,7 @@ static inline int bitmap_equal(const uns return __bitmap_equal(src1, src2, nbits); } -static inline int bitmap_intersects(const unsigned long *src1, +static inline int __must_check bitmap_intersects(const unsigned long *src1, const unsigned long *src2, int nbits) { if (nbits <= BITS_PER_LONG) @@ -214,7 +214,7 @@ static inline int bitmap_intersects(cons return __bitmap_intersects(src1, src2, nbits); } -static inline int bitmap_subset(const unsigned long *src1, +static inline int __must_check bitmap_subset(const unsigned long *src1, const unsigned long *src2, int nbits) { if (nbits <= BITS_PER_LONG) @@ -223,7 +223,7 @@ static inline int bitmap_subset(const un return __bitmap_subset(src1, src2, nbits); } -static inline int bitmap_empty(const unsigned long *src, int nbits) +static inline int __must_check bitmap_empty(const unsigned long *src, int nbits) { if (nbits <= BITS_PER_LONG) return ! (*src & BITMAP_LAST_WORD_MASK(nbits)); @@ -231,7 +231,7 @@ static inline int bitmap_empty(const uns return __bitmap_empty(src, nbits); } -static inline int bitmap_full(const unsigned long *src, int nbits) +static inline int __must_check bitmap_full(const unsigned long *src, int nbits) { if (nbits <= BITS_PER_LONG) return ! (~(*src) & BITMAP_LAST_WORD_MASK(nbits)); @@ -239,7 +239,7 @@ static inline int bitmap_full(const unsi return __bitmap_full(src, nbits); } -static inline int bitmap_weight(const unsigned long *src, int nbits) +static inline int __must_check bitmap_weight(const unsigned long *src, int nbits) { return __bitmap_weight(src, nbits); } linux-2.6-debug-periodic-slab-check.patch: slab.c | 134 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 131 insertions(+), 3 deletions(-) Index: linux-2.6-debug-periodic-slab-check.patch =================================================================== RCS file: linux-2.6-debug-periodic-slab-check.patch diff -N linux-2.6-debug-periodic-slab-check.patch --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ linux-2.6-debug-periodic-slab-check.patch 28 Mar 2006 16:14:09 -0000 1.3 @@ -0,0 +1,199 @@ + + mm/slab.c | 134 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-- + 1 file changed, 131 insertions(+), 3 deletions(-) + +Index: 2.6-git/mm/slab.c +=================================================================== +--- 2.6-git.orig/mm/slab.c ++++ 2.6-git/mm/slab.c +@@ -202,7 +202,7 @@ + + typedef unsigned int kmem_bufctl_t; + #define BUFCTL_END (((kmem_bufctl_t)(~0U))-0) +-#define BUFCTL_FREE (((kmem_bufctl_t)(~0U))-1) ++#define BUFCTL_ALLOC (((kmem_bufctl_t)(~0U))-1) + #define SLAB_LIMIT (((kmem_bufctl_t)(~0U))-2) + + /* Max number of objs-per-slab for caches which use off-slab slabs. +@@ -430,6 +430,11 @@ struct kmem_cache { + */ + int obj_offset; + int obj_size; ++ ++ /* ++ * Time for next cache verification. ++ */ ++ unsigned long next_verify; + #endif + }; + +@@ -445,6 +450,7 @@ struct kmem_cache { + */ + #define REAPTIMEOUT_CPUC (2*HZ) + #define REAPTIMEOUT_LIST3 (4*HZ) ++#define REDZONETIMEOUT (300*HZ) + + #if STATS + #define STATS_INC_ACTIVE(x) ((x)->num_active++) +@@ -1923,6 +1929,11 @@ kmem_cache_create (const char *name, siz + cachep->limit = BOOT_CPUCACHE_ENTRIES; + } + ++#if DEBUG ++ cachep->next_verify = jiffies + REDZONETIMEOUT + ++ ((unsigned long)cachep/L1_CACHE_BYTES)%REDZONETIMEOUT; ++#endif ++ + /* cache setup completed, link it into the list */ + list_add(&cachep->next, &cache_chain); + unlock_cpu_hotplug(); +@@ -2251,7 +2262,7 @@ static void *slab_get_obj(struct kmem_ca + slabp->inuse++; + next = slab_bufctl(slabp)[slabp->free]; + #if DEBUG +- slab_bufctl(slabp)[slabp->free] = BUFCTL_FREE; ++ slab_bufctl(slabp)[slabp->free] = BUFCTL_ALLOC; + WARN_ON(slabp->nodeid != nodeid); + #endif + slabp->free = next; +@@ -2268,7 +2279,7 @@ static void slab_put_obj(struct kmem_cac + /* Verify that the slab belongs to the intended node */ + WARN_ON(slabp->nodeid != nodeid); + +- if (slab_bufctl(slabp)[objnr] != BUFCTL_FREE) { ++ if (slab_bufctl(slabp)[objnr] != BUFCTL_ALLOC) { + printk(KERN_ERR "slab: double free detected in cache " + "'%s', objp %p\n", cachep->name, objp); + BUG(); +@@ -3266,6 +3277,116 @@ static int alloc_kmemlist(struct kmem_ca + return err; + } + ++#if DEBUG ++ ++static void verify_slab_redzone(struct kmem_cache *cache, struct slab *slab) ++{ ++ int i; ++ ++ if (!(cache->flags & SLAB_RED_ZONE)) ++ return; ++ ++#ifdef CONFIG_DEBUG_PAGEALLOC ++ /* Page alloc debugging on for this cache. Mapping & Unmapping happens ++ * without any locking, thus parallel checks are impossible. ++ */ ++ if ((cache->buffer_size % PAGE_SIZE) == 0 && OFF_SLAB(cache)) ++ return; ++#endif ++ ++ for (i = 0; i < cache->num; i++) { ++ unsigned long red1, red2; ++ void *obj = slab->s_mem + cache->buffer_size * i; ++ ++ red1 = *dbg_redzone1(cache, obj); ++ red2 = *dbg_redzone2(cache, obj); ++ ++ /* Simplest case: redzones marked as inactive. */ ++ if (red1 == RED_INACTIVE && red2 == RED_INACTIVE) ++ continue; ++ ++ /* ++ * Tricky case: if the bufctl value is BUFCTL_ALLOC, then ++ * the object is either allocated or somewhere in a cpu ++ * cache. The cpu caches are lockless and there might be ++ * a concurrent alloc/free call, thus we must accept random ++ * combinations of RED_ACTIVE and _INACTIVE ++ */ ++ if (slab_bufctl(slab)[i] == BUFCTL_ALLOC && ++ (red1 == RED_INACTIVE || red1 == RED_ACTIVE) && ++ (red2 == RED_INACTIVE || red2 == RED_ACTIVE)) ++ continue; ++ ++ printk(KERN_ERR "slab %s: redzone mismatch in slab %p," ++ " obj %p, bufctl 0x%lx\n", cache->name, slab, obj, ++ slab_bufctl(slab)[i]); ++ ++ print_objinfo(cache, obj, 2); ++ } ++} ++ ++static void print_invalid_slab(const char *list_name, struct kmem_cache *cache, ++ struct slab *slab) ++{ ++ printk(KERN_ERR "slab %s: invalid slab found in %s list at %p (%d/%d).\n", ++ cache->name, list_name, slab, slab->inuse, cache->num); ++} ++ ++static void verify_nodelists(struct kmem_cache *cache, ++ struct kmem_list3 *lists) ++{ ++ struct list_head *q; ++ struct slab *slab; ++ ++ list_for_each(q, &lists->slabs_full) { ++ slab = list_entry(q, struct slab, list); ++ ++ if (slab->inuse != cache->num) ++ print_invalid_slab("full", cache, slab); ++ ++ check_slabp(cache, slab); ++ verify_slab_redzone(cache, slab); ++ } ++ list_for_each(q, &lists->slabs_partial) { ++ slab = list_entry(q, struct slab, list); ++ ++ if (slab->inuse == cache->num || slab->inuse == 0) ++ print_invalid_slab("partial", cache, slab); ++ ++ check_slabp(cache, slab); ++ verify_slab_redzone(cache, slab); ++ } ++ list_for_each(q, &lists->slabs_free) { ++ slab = list_entry(q, struct slab, list); ++ ++ if (slab->inuse != 0) ++ print_invalid_slab("free", cache, slab); ++ ++ check_slabp(cache, slab); ++ verify_slab_redzone(cache, slab); ++ } ++} ++ ++/* ++ * Perform a self test on all slabs from a cache ++ */ ++static void verify_cache(struct kmem_cache *cache) ++{ ++ int node; ++ ++ check_spinlock_acquired(cache); ++ ++ for_each_online_node(node) { ++ struct kmem_list3 *lists = cache->nodelists[node]; ++ ++ if (!lists) ++ continue; ++ verify_nodelists(cache, lists); ++ } ++} ++ ++#endif ++ + struct ccupdate_struct { + struct kmem_cache *cachep; + struct array_cache *new[NR_CPUS]; +@@ -3446,6 +3567,13 @@ static void cache_reap(void *unused) + drain_array_locked(searchp, cpu_cache_get(searchp), 0, + numa_node_id()); + ++#if DEBUG ++ if (time_before(searchp->next_verify, jiffies)) { ++ searchp->next_verify = jiffies + REDZONETIMEOUT; ++ verify_cache(searchp); ++ } ++#endif ++ + if (time_after(l3->next_reap, jiffies)) + goto next_unlock; + + linux-2.6-debug-pm-pci.patch: pci.c | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) --- NEW FILE linux-2.6-debug-pm-pci.patch --- --- linux-2.6.15.noarch/drivers/pci/pci.c~ 2006-03-01 15:41:00.000000000 -0500 +++ linux-2.6.15.noarch/drivers/pci/pci.c 2006-03-01 15:47:37.000000000 -0500 @@ -454,9 +454,17 @@ int pci_restore_state(struct pci_dev *dev) { int i; + int val; - for (i = 0; i < 16; i++) - pci_write_config_dword(dev,i * 4, dev->saved_config_space[i]); + for (i = 0; i < 16; i++) { + pci_read_config_dword(dev, i * 4, &val); + if (val != dev->saved_config_space[i]) { + printk (KERN_DEBUG "PM: Writing back config space on device %s at offset %x. (Was %x, writing %x)\n", + pci_name(dev), i, + val, (int) dev->saved_config_space[i]); + pci_write_config_dword(dev,i * 4, dev->saved_config_space[i]); + } + } return 0; } linux-2.6-debug-slab-leaks.patch: fs/proc/proc_misc.c | 37 +++++++++++ include/linux/slab.h | 6 + lib/Kconfig.debug | 4 + mm/slab.c | 166 +++++++++++++++++++++++++++++++++++++++++++++++++-- mm/util.c | 4 - net/core/skbuff.c | 2 6 files changed, 210 insertions(+), 9 deletions(-) --- NEW FILE linux-2.6-debug-slab-leaks.patch --- diff --git a/fs/proc/proc_misc.c b/fs/proc/proc_misc.c index 1d24fea..8d1b548 100644 --- a/fs/proc/proc_misc.c +++ b/fs/proc/proc_misc.c @@ -485,6 +485,40 @@ static struct file_operations proc_slabi .llseek = seq_lseek, .release = seq_release, }; + +#ifdef CONFIG_DEBUG_SLAB_LEAK +extern struct seq_operations slabstats_op; +static int slabstats_open(struct inode *inode, struct file *file) +{ + unsigned long *n = kzalloc(PAGE_SIZE, GFP_KERNEL); + int ret = -ENOMEM; + if (n) { + ret = seq_open(file, &slabstats_op); + if (!ret) { + struct seq_file *m = file->private_data; + *n = PAGE_SIZE / (2 * sizeof(unsigned long)); + m->private = n; + n = NULL; + } + kfree(n); + } + return ret; +} + +static int slabstats_release(struct inode *inode, struct file *file) +{ + struct seq_file *m = file->private_data; + kfree(m->private); + return seq_release(inode, file); +} + +static struct file_operations proc_slabstats_operations = { + .open = slabstats_open, + .read = seq_read, + .llseek = seq_lseek, + .release = slabstats_release, +}; +#endif #endif static int show_stat(struct seq_file *p, void *v) @@ -744,6 +778,9 @@ void __init proc_misc_init(void) create_seq_entry("interrupts", 0, &proc_interrupts_operations); #ifdef CONFIG_SLAB create_seq_entry("slabinfo",S_IWUSR|S_IRUGO,&proc_slabinfo_operations); +#ifdef CONFIG_DEBUG_SLAB_LEAK + create_seq_entry("slab_allocators", 0 ,&proc_slabstats_operations); +#endif #endif create_seq_entry("buddyinfo",S_IRUGO, &fragmentation_file_operations); create_seq_entry("vmstat",S_IRUGO, &proc_vmstat_file_operations); diff --git a/include/linux/slab.h b/include/linux/slab.h index 8cf5293..1115742 100644 --- a/include/linux/slab.h +++ b/include/linux/slab.h @@ -77,11 +77,12 @@ struct cache_sizes { }; extern struct cache_sizes malloc_sizes[]; -#ifndef CONFIG_DEBUG_SLAB extern void *__kmalloc(size_t, gfp_t); +#ifndef CONFIG_DEBUG_SLAB +#define ____kmalloc(size, flags) __kmalloc(size, flags) #else extern void *__kmalloc_track_caller(size_t, gfp_t, void*); -#define __kmalloc(size, flags) \ +#define ____kmalloc(size, flags) \ __kmalloc_track_caller(size, flags, __builtin_return_address(0)) #endif @@ -173,6 +174,7 @@ static inline void *kcalloc(size_t n, si #define kmem_ptr_validate(a, b) (0) #define kmem_cache_alloc_node(c, f, n) kmem_cache_alloc(c, f) #define kmalloc_node(s, f, n) kmalloc(s, f) +#define ____kmalloc kmalloc #endif /* CONFIG_SLOB */ diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug index a314e66..69f2362 100644 --- a/lib/Kconfig.debug +++ b/lib/Kconfig.debug @@ -85,6 +85,10 @@ config DEBUG_SLAB allocation as well as poisoning memory on free to catch use of freed memory. This can make kmalloc/kfree-intensive workloads much slower. +config DEBUG_SLAB_LEAK + bool "Memory leak debugging" + depends on DEBUG_SLAB + config DEBUG_PREEMPT bool "Debug preemptible kernel" depends on DEBUG_KERNEL && PREEMPT diff --git a/mm/slab.c b/mm/slab.c index add05d8..3443bc0 100644 --- a/mm/slab.c +++ b/mm/slab.c @@ -3118,22 +3118,23 @@ static __always_inline void *__do_kmallo return __cache_alloc(cachep, flags, caller); } -#ifndef CONFIG_DEBUG_SLAB void *__kmalloc(size_t size, gfp_t flags) { +#ifndef CONFIG_DEBUG_SLAB return __do_kmalloc(size, flags, NULL); +#else + return __do_kmalloc(size, flags, __builtin_return_address(0)); +#endif } EXPORT_SYMBOL(__kmalloc); -#else - +#ifdef CONFIG_DEBUG_SLAB void *__kmalloc_track_caller(size_t size, gfp_t flags, void *caller) { return __do_kmalloc(size, flags, caller); } EXPORT_SYMBOL(__kmalloc_track_caller); - #endif #ifdef CONFIG_SMP @@ -3778,6 +3779,163 @@ ssize_t slabinfo_write(struct file *file res = count; return res; } + +#ifdef CONFIG_DEBUG_SLAB_LEAK + +static void *leaks_start(struct seq_file *m, loff_t *pos) +{ + loff_t n = *pos; + struct list_head *p; + + mutex_lock(&cache_chain_mutex); + p = cache_chain.next; + while (n--) { + p = p->next; + if (p == &cache_chain) + return NULL; + } + return list_entry(p, struct kmem_cache, next); +} + +static inline int add_caller(unsigned long *n, unsigned long v) +{ + unsigned long *p; + int l; + if (!v) + return 1; + l = n[1]; + p = n + 2; + while (l) { + int i = l/2; + unsigned long *q = p + 2 * i; + if (*q == v) { + q[1]++; + return 1; + } + if (*q > v) { + l = i; + } else { + p = q + 2; + l -= i + 1; + } + } + if (++n[1] == n[0]) + return 0; + memmove(p + 2, p, n[1] * 2 * sizeof(unsigned long) - ((void *)p - (void *)n)); + p[0] = v; + p[1] = 1; + return 1; +} + +static void handle_slab(unsigned long *n, struct kmem_cache *c, struct slab *s) +{ + void *p; + int i; + if (n[0] == n[1]) + return; + for (i = 0, p = s->s_mem; i < c->num; i++, p += c->buffer_size) { + if (slab_bufctl(s)[i] != BUFCTL_ALLOC) + continue; + if (*dbg_redzone1(c, p) != RED_ACTIVE) + continue; + if (!add_caller(n, (unsigned long)*dbg_userword(c, p))) + return; + } +} + +static void show_symbol(struct seq_file *m, unsigned long address) +{ +#ifdef CONFIG_KALLSYMS + char *modname; + const char *name; + unsigned long offset, size; + char namebuf[KSYM_NAME_LEN+1]; + + name = kallsyms_lookup(address, &size, &offset, &modname, namebuf); + + if (name) { + seq_printf(m, "%s+%#lx/%#lx", name, offset, size); + if (modname) + seq_printf(m, " [%s]", modname); + return; + } +#endif + seq_printf(m, "%p", (void *)address); +} + +static int leaks_show(struct seq_file *m, void *p) +{ + struct kmem_cache *cachep = p; + struct list_head *q; + struct slab *slabp; + struct kmem_list3 *l3; + const char *name; + unsigned long *n = m->private; + int node; + int i; + + if (!(cachep->flags & SLAB_STORE_USER)) + return 0; + if (!(cachep->flags & SLAB_RED_ZONE)) + return 0; + + /* OK, we can do it */ + + n[1] = 0; + + spin_lock(&cachep->spinlock); + for_each_online_node(node) { + l3 = cachep->nodelists[node]; + if (!l3) + continue; + + check_irq_on(); + spin_lock_irq(&l3->list_lock); + + list_for_each(q, &l3->slabs_full) { + slabp = list_entry(q, struct slab, list); + handle_slab(n, cachep, slabp); + } + list_for_each(q, &l3->slabs_partial) { + slabp = list_entry(q, struct slab, list); + handle_slab(n, cachep, slabp); + } + spin_unlock_irq(&l3->list_lock); + } + name = cachep->name; + spin_unlock(&cachep->spinlock); + if (n[0] == n[1]) { + /* Increase the buffer size */ + mutex_unlock(&cache_chain_mutex); + m->private = kzalloc(n[0] * 4 * sizeof(unsigned long), GFP_KERNEL); + if (!m->private) { + /* Too bad, we are really out */ + m->private = n; + mutex_lock(&cache_chain_mutex); + return -ENOMEM; + } + *(unsigned long *)m->private = n[0] * 2; + kfree(n); + mutex_lock(&cache_chain_mutex); + /* Now make sure this entry will be retried */ + m->count = m->size; + return 0; + } + for (i = 0; i < n[1]; i++) { + seq_printf(m, "%s: %lu ", name, n[2*i+3]); + show_symbol(m, n[2*i+2]); + seq_putc(m, '\n'); + } + return 0; +} + +struct seq_operations slabstats_op = { + .start = leaks_start, + .next = s_next, + .stop = s_stop, + .show = leaks_show, +}; +#endif #endif /** diff --git a/mm/util.c b/mm/util.c index 5f4bb59..229000d 100644 --- a/mm/util.c +++ b/mm/util.c @@ -9,7 +9,7 @@ */ void *kzalloc(size_t size, gfp_t flags) { - void *ret = kmalloc(size, flags); + void *ret = ____kmalloc(size, flags); if (ret) memset(ret, 0, size); return ret; @@ -31,7 +31,7 @@ char *kstrdup(const char *s, gfp_t gfp) return NULL; len = strlen(s) + 1; - buf = kmalloc(len, gfp); + buf = ____kmalloc(len, gfp); if (buf) memcpy(buf, s, len); return buf; diff --git a/net/core/skbuff.c b/net/core/skbuff.c index 2144952..150423c 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c @@ -149,7 +149,7 @@ struct sk_buff *__alloc_skb(unsigned int /* Get the DATA. Size must match skb_add_mtu(). */ size = SKB_DATA_ALIGN(size); - data = kmalloc(size + sizeof(struct skb_shared_info), gfp_mask); + data = ____kmalloc(size + sizeof(struct skb_shared_info), gfp_mask); if (!data) goto nodata; linux-2.6-defaults-enable-sata-atapi.patch: libata-core.c | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE linux-2.6-defaults-enable-sata-atapi.patch --- --- linux-2.6.14/drivers/scsi/libata-core.c~ 2005-11-22 11:33:25.000000000 -0500 +++ linux-2.6.14/drivers/scsi/libata-core.c 2005-11-22 11:33:37.000000000 -0500 @@ -78,7 +78,7 @@ static void __ata_qc_complete(struct ata static unsigned int ata_unique_id = 1; static struct workqueue_struct *ata_wq; -int atapi_enabled = 0; +int atapi_enabled = 1; module_param(atapi_enabled, int, 0444); MODULE_PARM_DESC(atapi_enabled, "Enable discovery of ATAPI devices (0=off, 1=on)"); linux-2.6-defaults-fat-utf8.patch: inode.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletion(-) --- NEW FILE linux-2.6-defaults-fat-utf8.patch --- https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=181963 --- linux-2.6.15.noarch/fs/fat/inode.c~ 2006-02-20 23:20:12.000000000 -0500 +++ linux-2.6.15.noarch/fs/fat/inode.c 2006-02-20 23:21:42.000000000 -0500 @@ -952,7 +952,8 @@ static int parse_options(char *options, opts->shortname = 0; opts->name_check = 'n'; opts->quiet = opts->showexec = opts->sys_immutable = opts->dotsOK = 0; - opts->utf8 = opts->unicode_xlate = 0; + opts->utf8 = 1; + opts->unicode_xlate = 0; opts->numtail = 1; opts->nocase = 0; *debug = 0; linux-2.6-defaults-firmware-loader-timeout.patch: firmware_class.c | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE linux-2.6-defaults-firmware-loader-timeout.patch --- https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=174589 The ipw driver sometimes takes a long time to load its firmware. Whilst the ipw driver should be using the async interface of the firmware loader to make this a non-issue, this is a minimal fix. Signed-off-by: Dave Jones --- linux-2.6.14/drivers/base/firmware_class.c~ 2005-12-01 16:56:29.000000000 -0500 +++ linux-2.6.14/drivers/base/firmware_class.c 2005-12-01 16:56:35.000000000 -0500 @@ -31,7 +31,7 @@ enum { FW_STATUS_READY_NOHOTPLUG, }; -static int loading_timeout = 10; /* In seconds */ +static int loading_timeout = 60; /* In seconds */ /* fw_lock could be moved to 'struct firmware_priv' but since it is just * guarding for corner cases a global lock should be OK */ linux-2.6-defaults-max-symlinks.patch: namei.h | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE linux-2.6-defaults-max-symlinks.patch --- Bump up the maximum nested amount of symlinks. 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; linux-2.6-drm-cripple-r300.patch: drm_pciids.h | 33 --------------------------------- 1 files changed, 33 deletions(-) --- NEW FILE linux-2.6-drm-cripple-r300.patch --- Cripple the Radeon driver so that it doesn't work on R300 and above right now. Fedora Xorg isn't ready for it yet, and loading the module for it causes crashes. https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=174646 https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=182196 --- linux-2.6.15.noarch/drivers/char/drm/drm_pciids.h~ 2006-03-05 23:37:54.000000000 -0500 +++ linux-2.6.15.noarch/drivers/char/drm/drm_pciids.h 2006-03-05 23:39:38.000000000 -0500 @@ -3,19 +3,8 @@ Please contact dri-devel at lists.sf.net to add new cards to this list */ #define radeon_PCI_IDS \ - {0x1002, 0x3150, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV350},\ {0x1002, 0x4136, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS100|CHIP_IS_IGP}, \ {0x1002, 0x4137, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS200|CHIP_IS_IGP}, \ - {0x1002, 0x4144, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R300}, \ - {0x1002, 0x4145, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R300}, \ - {0x1002, 0x4146, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R300}, \ - {0x1002, 0x4147, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R300}, \ - {0x1002, 0x4150, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV350}, \ - {0x1002, 0x4151, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV350}, \ - {0x1002, 0x4152, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV350}, \ - {0x1002, 0x4153, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV350}, \ - {0x1002, 0x4154, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV350}, \ - {0x1002, 0x4156, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV350}, \ {0x1002, 0x4237, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS250|CHIP_IS_IGP}, \ {0x1002, 0x4242, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R200}, \ {0x1002, 0x4243, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R200}, \ @@ -26,8 +15,6 @@ {0x1002, 0x4965, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R250}, \ {0x1002, 0x4966, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R250}, \ {0x1002, 0x4967, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R250}, \ - {0x1002, 0x4A49, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R420}, \ - {0x1002, 0x4A4B, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R420}, \ {0x1002, 0x4C57, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV200|CHIP_IS_MOBILITY}, \ {0x1002, 0x4C58, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV200|CHIP_IS_MOBILITY}, \ {0x1002, 0x4C59, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV100|CHIP_IS_MOBILITY}, \ @@ -36,18 +23,6 @@ {0x1002, 0x4C65, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R250|CHIP_IS_MOBILITY}, \ {0x1002, 0x4C66, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R250|CHIP_IS_MOBILITY}, \ {0x1002, 0x4C67, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R250|CHIP_IS_MOBILITY}, \ - {0x1002, 0x4E44, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R300}, \ - {0x1002, 0x4E45, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R300}, \ - {0x1002, 0x4E46, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV350}, \ - {0x1002, 0x4E47, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R300}, \ - {0x1002, 0x4E48, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R350}, \ - {0x1002, 0x4E49, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R350}, \ - {0x1002, 0x4E4A, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV350}, \ - {0x1002, 0x4E4B, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R350}, \ - {0x1002, 0x4E50, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV350|CHIP_IS_MOBILITY}, \ - {0x1002, 0x4E51, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV350|CHIP_IS_MOBILITY}, \ - {0x1002, 0x4E54, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV350|CHIP_IS_MOBILITY}, \ - {0x1002, 0x4E56, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV350|CHIP_IS_MOBILITY}, \ {0x1002, 0x5144, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R100|CHIP_SINGLE_CRTC}, \ {0x1002, 0x5145, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R100|CHIP_SINGLE_CRTC}, \ {0x1002, 0x5146, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R100|CHIP_SINGLE_CRTC}, \ @@ -70,12 +45,6 @@ {0x1002, 0x516A, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R200}, \ {0x1002, 0x516B, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R200}, \ {0x1002, 0x516C, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R200}, \ - {0x1002, 0x5460, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV350}, \ - {0x1002, 0x554F, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R350}, \ - {0x1002, 0x5834, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS300|CHIP_IS_IGP}, \ - {0x1002, 0x5835, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS300|CHIP_IS_IGP|CHIP_IS_MOBILITY}, \ - {0x1002, 0x5836, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS300|CHIP_IS_IGP}, \ - {0x1002, 0x5837, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS300|CHIP_IS_IGP}, \ {0x1002, 0x5960, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV280}, \ {0x1002, 0x5961, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV280}, \ {0x1002, 0x5962, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV280}, \ @@ -89,8 +58,6 @@ {0x1002, 0x5c62, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV280}, \ {0x1002, 0x5c63, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV280|CHIP_IS_MOBILITY}, \ {0x1002, 0x5c64, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV280}, \ - {0x1002, 0x5d4d, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R350}, \ - {0x1002, 0x5e4b, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R420}, \ {0, 0, 0} #define r128_PCI_IDS \ linux-2.6-edid-check.patch: video.S | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-) --- NEW FILE linux-2.6-edid-check.patch --- --- linux-2.6.15/arch/i386/boot/video.S~ 2006-01-06 01:26:06.000000000 -0500 +++ linux-2.6.15/arch/i386/boot/video.S 2006-01-06 01:28:40.000000000 -0500 @@ -1951,9 +1951,18 @@ store_edid: stosl movw $0x4f15, %ax # do VBE/DDC - movw $0x01, %bx + movw $0x00, %bx # INSTALLATION CHECK / CAPABILITIES movw $0x00, %cx - movw $0x00, %dx + movw $0x00, %dx + movw $0x140, %di + int $0x10 + cmpb $0x01, %ah + je no_edid + + movw $0x4f15, %ax # do VBE/DDC + movw $0x01, %bx # READ_EDID + movw $0x00, %cx + movw $0x00, %dx movw $0x140, %di int $0x10 --- linux-2.6.15/arch/i386/boot/video.S~ 2006-01-06 02:55:20.000000000 -0500 +++ linux-2.6.15/arch/i386/boot/video.S 2006-01-06 02:55:28.000000000 -0500 @@ -1966,6 +1966,7 @@ store_edid: movw $0x140, %di int $0x10 +no_edid: popw %di # restore all registers popw %dx popw %cx linux-2.6-intel-cache-build.patch: intel_cacheinfo.c | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE linux-2.6-intel-cache-build.patch --- --- linux-2.6.14/arch/i386/kernel/cpu/intel_cacheinfo.c.orig 2005-11-02 11:25:14.000000000 +0000 +++ linux-2.6.14/arch/i386/kernel/cpu/intel_cacheinfo.c 2005-11-02 11:25:23.000000000 +0000 @@ -569,7 +569,7 @@ static int __cpuinit cache_add_dev(struc return retval; } -static void __cpuexit cache_remove_dev(struct sys_device * sys_dev) +static void cache_remove_dev(struct sys_device * sys_dev) { unsigned int cpu = sys_dev->id; unsigned long i; linux-2.6-mv643xx-compile-fix.patch: mv643xx_eth.c | 1 + 1 files changed, 1 insertion(+) --- NEW FILE linux-2.6-mv643xx-compile-fix.patch --- --- linux-2.6.15/drivers/net/mv643xx_eth.c~ 2006-01-06 13:13:34.000000000 +0000 +++ linux-2.6.15/drivers/net/mv643xx_eth.c 2006-01-06 13:41:03.000000000 +0000 @@ -40,6 +40,7 @@ #include #include #include +#include #include #include linux-2.6-net-ipw2200-hwcrypto.patch: ipw2200.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) --- NEW FILE linux-2.6-net-ipw2200-hwcrypto.patch --- --- linux-2.6.15.noarch/drivers/net/wireless/ipw2200.c.orig 2006-02-14 14:43:12.000000000 -0500 +++ linux-2.6.15.noarch/drivers/net/wireless/ipw2200.c 2006-02-14 14:55:29.000000000 -0500 @@ -55,7 +55,7 @@ static int associate = 1; static int auto_create = 1; static int led = 0; static int disable = 0; -static int hwcrypto = 1; +static int hwcrypto = 0; static const char ipw_modes[] = { 'a', 'b', 'g', '?' }; @@ -7058,8 +7058,7 @@ static int ipw_associate_network(struct priv->assoc_request.auth_key = priv->ieee->sec.active_key; if ((priv->capability & CAP_PRIVACY_ON) && - (priv->ieee->sec.level == SEC_LEVEL_1) && - !(priv->ieee->host_encrypt || priv->ieee->host_decrypt)) + (priv->ieee->sec.level == SEC_LEVEL_1)) ipw_send_wep_keys(priv, DCW_WEP_KEY_SEC_TYPE_WEP); } else { priv->assoc_request.auth_type = AUTH_OPEN; @@ -11285,7 +11284,7 @@ MODULE_PARM_DESC(mode, "network mode (0= #endif module_param(hwcrypto, int, 0444); -MODULE_PARM_DESC(hwcrypto, "enable hardware crypto (default on)"); +MODULE_PARM_DESC(hwcrypto, "enable hardware crypto (default off)"); module_param(cmdlog, int, 0444); MODULE_PARM_DESC(cmdlog, linux-2.6-net-wireless-features.patch: a/drivers/net/wireless/ipw2200.c | 5 drivers/net/wireless/airo.c | 276 +++++++++++++++++++++++- linux-2.6.15.noarch/drivers/net/wireless/airo.c | 10 3 files changed, 286 insertions(+), 5 deletions(-) --- NEW FILE linux-2.6-net-wireless-features.patch --- Subject: [2.6.15 patch] wireless/airo: add IWENCODEEXT and IWAUTH support From: Dan Williams To: breed at users.sourceforge.net Cc: netdev at vger.kernel.org, "John W. Linville" , jgarzik at pobox.com, networkmanager-list at gnome.org Date: Mon, 30 Jan 2006 11:58:00 -0500 Message-Id: <1138640281.12551.5.camel at dhcp83-115.boston.redhat.com> This patch adds IWENCODEEXT and IWAUTH support to the airo driver for WEP and unencrypted operation. No WPA though. It allows the driver to operate more willingly with wpa_supplicant and NetworkManager. Signed-off-by: Dan Williams --- a/drivers/net/wireless/airo.c 2006-01-30 10:14:23.000000000 -0500 +++ b/drivers/net/wireless/airo.c 2006-01-30 11:05:15.000000000 -0500 @@ -5802,11 +5802,13 @@ static int airo_set_wap(struct net_devic Cmd cmd; Resp rsp; APListRid APList_rid; - static const unsigned char bcast[ETH_ALEN] = { 255, 255, 255, 255, 255, 255 }; + static const u8 any[ETH_ALEN] = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF }; + static const u8 off[ETH_ALEN] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; if (awrq->sa_family != ARPHRD_ETHER) return -EINVAL; - else if (!memcmp(bcast, awrq->sa_data, ETH_ALEN)) { + else if (!memcmp(any, awrq->sa_data, ETH_ALEN) || + !memcmp(off, awrq->sa_data, ETH_ALEN)) { memset(&cmd, 0, sizeof(cmd)); cmd.cmd=CMD_LOSE_SYNC; if (down_interruptible(&local->sem)) @@ -6297,6 +6299,267 @@ static int airo_get_encode(struct net_de /*------------------------------------------------------------------*/ /* + * Wireless Handler : set extended Encryption parameters + */ +static int airo_set_encodeext(struct net_device *dev, + struct iw_request_info *info, + union iwreq_data *wrqu, + char *extra) +{ + struct airo_info *local = dev->priv; + struct iw_point *encoding = &wrqu->encoding; + struct iw_encode_ext *ext = (struct iw_encode_ext *)extra; + CapabilityRid cap_rid; /* Card capability info */ + int perm = ( encoding->flags & IW_ENCODE_TEMP ? 0 : 1 ); + u16 currentAuthType = local->config.authType; + int idx, key_len, alg = ext->alg; /* Check encryption mode */ + wep_key_t key; + + /* Is WEP supported ? */ + readCapabilityRid(local, &cap_rid, 1); + /* Older firmware doesn't support this... + if(!(cap_rid.softCap & 2)) { + return -EOPNOTSUPP; + } */ + readConfigRid(local, 1); + + /* Determine and validate the key index */ + idx = encoding->flags & IW_ENCODE_INDEX; + if (idx) { + if (idx < 1 || idx > ((cap_rid.softCap & 0x80) ? 4:1)) + return -EINVAL; + idx--; + } else + idx = get_wep_key(local, 0xffff); + + if (encoding->flags & IW_ENCODE_DISABLED) + alg = IW_ENCODE_ALG_NONE; + + /* Just setting the transmit key? */ + if (ext->ext_flags & IW_ENCODE_EXT_SET_TX_KEY) { + set_wep_key(local, idx, NULL, 0, perm, 1); + } else { + /* Set the requested key first */ + memset(key.key, 0, MAX_KEY_SIZE); + switch (alg) { + case IW_ENCODE_ALG_NONE: + key.len = 0; + break; + case IW_ENCODE_ALG_WEP: + if (ext->key_len > MIN_KEY_SIZE) { + key.len = MAX_KEY_SIZE; + } else if (ext->key_len > 0) { + key.len = MIN_KEY_SIZE; + } else { + return -EINVAL; + } + key_len = min (ext->key_len, key.len); + memcpy(key.key, ext->key, key_len); + break; + default: + return -EINVAL; + } + /* Send the key to the card */ + set_wep_key(local, idx, key.key, key.len, perm, 1); + } + + /* Read the flags */ + if(encoding->flags & IW_ENCODE_DISABLED) + local->config.authType = AUTH_OPEN; // disable encryption + if(encoding->flags & IW_ENCODE_RESTRICTED) + local->config.authType = AUTH_SHAREDKEY; // Only Both + if(encoding->flags & IW_ENCODE_OPEN) + local->config.authType = AUTH_ENCRYPT; // Only Wep + /* Commit the changes to flags if needed */ + if (local->config.authType != currentAuthType) + set_bit (FLAG_COMMIT, &local->flags); + + return -EINPROGRESS; +} + + +/*------------------------------------------------------------------*/ +/* + * Wireless Handler : get extended Encryption parameters + */ +static int airo_get_encodeext(struct net_device *dev, + struct iw_request_info *info, + union iwreq_data *wrqu, + char *extra) +{ + struct airo_info *local = dev->priv; + struct iw_point *encoding = &wrqu->encoding; + struct iw_encode_ext *ext = (struct iw_encode_ext *)extra; + CapabilityRid cap_rid; /* Card capability info */ + int idx, max_key_len; + + /* Is it supported ? */ + readCapabilityRid(local, &cap_rid, 1); + if(!(cap_rid.softCap & 2)) { + return -EOPNOTSUPP; + } + readConfigRid(local, 1); + + max_key_len = encoding->length - sizeof(*ext); + if (max_key_len < 0) + return -EINVAL; + + idx = encoding->flags & IW_ENCODE_INDEX; + if (idx) { + if (idx < 1 || idx > ((cap_rid.softCap & 0x80) ? 4:1)) + return -EINVAL; + idx--; + } else + idx = get_wep_key(local, 0xffff); + + encoding->flags = idx + 1; + memset(ext, 0, sizeof(*ext)); + + /* Check encryption mode */ + switch(local->config.authType) { + case AUTH_ENCRYPT: + encoding->flags = IW_ENCODE_ALG_WEP | IW_ENCODE_ENABLED; + break; + case AUTH_SHAREDKEY: + encoding->flags = IW_ENCODE_ALG_WEP | IW_ENCODE_ENABLED; + break; + default: + case AUTH_OPEN: + encoding->flags = IW_ENCODE_ALG_NONE | IW_ENCODE_DISABLED; + break; + } + /* We can't return the key, so set the proper flag and return zero */ + encoding->flags |= IW_ENCODE_NOKEY; + memset(extra, 0, 16); + + /* Copy the key to the user buffer */ + ext->key_len = get_wep_key(local, idx); + if (ext->key_len > 16) { + ext->key_len=0; + } + + return 0; +} + + +/*------------------------------------------------------------------*/ +/* + * Wireless Handler : set extended authentication parameters + */ +static int airo_set_auth(struct net_device *dev, + struct iw_request_info *info, + union iwreq_data *wrqu, char *extra) +{ + struct airo_info *local = dev->priv; + struct iw_param *param = &wrqu->param; + u16 currentAuthType = local->config.authType; + + switch (param->flags & IW_AUTH_INDEX) { + case IW_AUTH_WPA_VERSION: + case IW_AUTH_CIPHER_PAIRWISE: + case IW_AUTH_CIPHER_GROUP: + case IW_AUTH_KEY_MGMT: + case IW_AUTH_RX_UNENCRYPTED_EAPOL: + case IW_AUTH_PRIVACY_INVOKED: + /* + * airo does not use these parameters + */ + break; + + case IW_AUTH_DROP_UNENCRYPTED: + if (param->value) { + /* Only change auth type if unencrypted */ + if (currentAuthType == AUTH_OPEN) + local->config.authType = AUTH_ENCRYPT; + } else { + local->config.authType = AUTH_OPEN; + } + + /* Commit the changes to flags if needed */ + if (local->config.authType != currentAuthType) + set_bit (FLAG_COMMIT, &local->flags); + break; + + case IW_AUTH_80211_AUTH_ALG: { + /* FIXME: What about AUTH_OPEN? This API seems to + * disallow setting our auth to AUTH_OPEN. + */ + if (param->value & IW_AUTH_ALG_SHARED_KEY) { + local->config.authType = AUTH_SHAREDKEY; + } else if (param->value & IW_AUTH_ALG_OPEN_SYSTEM) { + local->config.authType = AUTH_ENCRYPT; + } else + return -EINVAL; + break; + + /* Commit the changes to flags if needed */ + if (local->config.authType != currentAuthType) + set_bit (FLAG_COMMIT, &local->flags); + } + + case IW_AUTH_WPA_ENABLED: + /* Silently accept disable of WPA */ + if (param->value > 0) + return -EOPNOTSUPP; + break; + + default: + return -EOPNOTSUPP; + } + return -EINPROGRESS; +} + + +/*------------------------------------------------------------------*/ +/* + * Wireless Handler : get extended authentication parameters + */ +static int airo_get_auth(struct net_device *dev, + struct iw_request_info *info, + union iwreq_data *wrqu, char *extra) +{ + struct airo_info *local = dev->priv; + struct iw_param *param = &wrqu->param; + u16 currentAuthType = local->config.authType; + + switch (param->flags & IW_AUTH_INDEX) { + case IW_AUTH_DROP_UNENCRYPTED: + switch (currentAuthType) { + case AUTH_SHAREDKEY: + case AUTH_ENCRYPT: + param->value = 1; + break; + default: + param->value = 0; + break; + } + break; + + case IW_AUTH_80211_AUTH_ALG: + switch (currentAuthType) { + case AUTH_SHAREDKEY: + param->value = IW_AUTH_ALG_SHARED_KEY; + break; + case AUTH_ENCRYPT: + default: + param->value = IW_AUTH_ALG_OPEN_SYSTEM; + break; + } + break; + + case IW_AUTH_WPA_ENABLED: + param->value = 0; + break; + + default: + return -EOPNOTSUPP; + } + return 0; +} + + +/*------------------------------------------------------------------*/ +/* * Wireless Handler : set Tx-Power */ static int airo_set_txpow(struct net_device *dev, @@ -7051,6 +7314,15 @@ static const iw_handler airo_handler[] (iw_handler) airo_get_encode, /* SIOCGIWENCODE */ (iw_handler) airo_set_power, /* SIOCSIWPOWER */ (iw_handler) airo_get_power, /* SIOCGIWPOWER */ + (iw_handler) NULL, /* -- hole -- */ + (iw_handler) NULL, /* -- hole -- */ + (iw_handler) NULL, /* SIOCSIWGENIE */ + (iw_handler) NULL, /* SIOCGIWGENIE */ + (iw_handler) airo_set_auth, /* SIOCSIWAUTH */ + (iw_handler) airo_get_auth, /* SIOCGIWAUTH */ + (iw_handler) airo_set_encodeext, /* SIOCSIWENCODEEXT */ + (iw_handler) airo_get_encodeext, /* SIOCGIWENCODEEXT */ + (iw_handler) NULL, /* SIOCSIWPMKSA */ }; /* Note : don't describe AIROIDIFC and AIROOLDIDIFC in here. Subject: [2.6.15 PATCH] wireless/ipw2200: support WE-18 WPA enc_capa From: Dan Williams To: netdev at vger.kernel.org Cc: rml at novell.com, jgarzik at pobox.com, "John W. Linville" Date: Mon, 30 Jan 2006 13:58:56 -0500 Message-Id: <1138647537.5393.6.camel at dhcp83-115.boston.redhat.com> This patch allows ipw2100 driver to advertise the WPA-related encryption options that it does really support. It's necessary to work correctly with NetworkManager and other programs that actually check driver & card capabilities. Signed-off-by: Dan Williams --- a/drivers/net/wireless/ipw2200.c 2006-01-30 13:52:58.000000000 -0500 +++ a/drivers/net/wireless/ipw2200.c 2006-01-30 13:54:04.000000000 -0500 @@ -8383,7 +8383,7 @@ /* Set the Wireless Extension versions */ range->we_version_compiled = WIRELESS_EXT; - range->we_version_source = 16; + range->we_version_source = 18; i = 0; if (priv->ieee->mode & (IEEE_B | IEEE_G)) { @@ -8415,6 +8415,9 @@ IW_EVENT_CAPA_MASK(SIOCGIWAP)); range->event_capa[1] = IW_EVENT_CAPA_K_1; + range->enc_capa = IW_ENC_CAPA_WPA | IW_ENC_CAPA_WPA2 | + IW_ENC_CAPA_CIPHER_TKIP | IW_ENC_CAPA_CIPHER_CCMP; + IPW_DEBUG_WX("GET Range\n"); return 0; } The previous patch that added ENCODEEXT and AUTH support to the airo driver contained a slight error which would cause setting the TX key index ignore a valid key-set request at the same time. This patch allows any combination of setting the TX key index and setting an encryption key. Signed-off-by: Dan Williams --- linux-2.6.15.noarch/drivers/net/wireless/airo.c~ 2006-02-09 11:37:23.000000000 -0500 +++ linux-2.6.15.noarch/drivers/net/wireless/airo.c 2006-02-09 11:40:46.000000000 -0500 @@ -6311,7 +6311,7 @@ static int airo_set_encodeext(struct net CapabilityRid cap_rid; /* Card capability info */ int perm = ( encoding->flags & IW_ENCODE_TEMP ? 0 : 1 ); u16 currentAuthType = local->config.authType; - int idx, key_len, alg = ext->alg; /* Check encryption mode */ + int idx, key_len, alg = ext->alg, set_key = 1; /* Check encryption mode */ wep_key_t key; /* Is WEP supported ? */ @@ -6336,8 +6336,14 @@ static int airo_set_encodeext(struct net /* Just setting the transmit key? */ if (ext->ext_flags & IW_ENCODE_EXT_SET_TX_KEY) { + /* Only set transmit key index here, actual + * key is set below if needed. + */ set_wep_key(local, idx, NULL, 0, perm, 1); - } else { + set_key = ext->key_len > 0 ? 1 : 0; + } + + if (set_key) { /* Set the requested key first */ memset(key.key, 0, MAX_KEY_SIZE); switch (alg) { linux-2.6-optimise-spinlock-debug.patch: spinlock_debug.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) --- NEW FILE linux-2.6-optimise-spinlock-debug.patch --- --- linux-2.6.16/lib/spinlock_debug.c~ 2006-03-20 16:31:13.000000000 -0500 +++ linux-2.6.16/lib/spinlock_debug.c 2006-03-20 16:31:24.000000000 -0500 @@ -9,8 +9,9 @@ #include #include #include #include #include +#include int nopanic; static int __init nopanic_setup(char *str) --- linux-2.6.16/lib/spinlock_debug.c~ 2006-03-20 16:29:56.000000000 -0500 +++ linux-2.6.16/lib/spinlock_debug.c 2006-03-20 16:30:52.000000000 -0500 @@ -88,7 +88,7 @@ static void __spin_lock_debug(spinlock_t for (i = 0; i < loops_per_jiffy * HZ; i++) { if (__raw_spin_trylock(&lock->raw_lock)) return; - __delay(1); + cpu_relax(); } /* lockup suspected: */ if (print_once) { @@ -160,7 +160,7 @@ static void __read_lock_debug(rwlock_t * for (i = 0; i < loops_per_jiffy * HZ; i++) { if (__raw_read_trylock(&lock->raw_lock)) return; - __delay(1); + cpu_relax(); } /* lockup suspected: */ if (print_once) { @@ -233,7 +233,7 @@ static void __write_lock_debug(rwlock_t for (i = 0; i < loops_per_jiffy * HZ; i++) { if (__raw_write_trylock(&lock->raw_lock)) return; - __delay(1); + cpu_relax(); } /* lockup suspected: */ if (print_once) { linux-2.6-sata-silence-dumb-msg.patch: libata-scsi.c | 3 --- 1 files changed, 3 deletions(-) --- NEW FILE linux-2.6-sata-silence-dumb-msg.patch --- https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=183348 --- linux-2.6.15.noarch/drivers/scsi/libata-scsi.c~ 2006-03-04 15:51:08.000000000 -0500 +++ linux-2.6.15.noarch/drivers/scsi/libata-scsi.c 2006-03-04 15:51:25.000000000 -0500 @@ -520,9 +520,6 @@ void ata_to_sense_error(unsigned id, u8 *ascq = 0x04; /* "auto-reallocation failed" */ translate_done: - printk(KERN_ERR "ata%u: translated ATA stat/err 0x%02x/%02x to " - "SCSI SK/ASC/ASCQ 0x%x/%02x/%02x\n", id, drv_stat, drv_err, - *sk, *asc, *ascq); return; } linux-2.6-sched-up-migration-cost.patch: sched.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletion(-) --- NEW FILE linux-2.6-sched-up-migration-cost.patch --- --- linux-2.6/kernel/sched.c~ 2006-02-10 17:15:29.000000000 -0500 +++ linux-2.6/kernel/sched.c 2006-02-10 17:18:19.000000000 -0500 @@ -5459,7 +5459,8 @@ static void calibrate_migration_costs(co #endif ); if (system_state == SYSTEM_BOOTING) { - printk("migration_cost="); + if (num_online_cpus() > 1) + printk("migration_cost="); for (distance = 0; distance <= max_distance; distance++) { if (distance) printk(","); linux-2.6-selinux-disable-attributes-no-policy.patch: hooks.c | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE linux-2.6-selinux-disable-attributes-no-policy.patch --- https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=180296 Disable setting of security attributes on new inodes when no policy is loaded --- linux-2.6.15.noarch/security/selinux/hooks.c~ 2006-02-18 18:31:02.000000000 -0500 +++ linux-2.6.15.noarch/security/selinux/hooks.c 2006-02-18 18:31:17.000000000 -0500 @@ -1957,7 +1957,7 @@ static int selinux_inode_init_security(s inode_security_set_sid(inode, newsid); - if (sbsec->behavior == SECURITY_FS_USE_MNTPOINT) + if (!ss_initialized || sbsec->behavior == SECURITY_FS_USE_MNTPOINT) return -EOPNOTSUPP; if (name) { linux-2.6-selinux-mprotect-checks.patch: hooks.c | 4 ---- 1 files changed, 4 deletions(-) --- NEW FILE linux-2.6-selinux-mprotect-checks.patch --- --- linux-2.6.16-rc3/security/selinux/hooks.c 2006-02-13 13:19:09.000000000 -0500 +++ linux-2.6.16-rc3-x/security/selinux/hooks.c 2006-02-14 14:44:48.000000000 -0500 @@ -2365,7 +2365,6 @@ static int selinux_file_ioctl(struct fil static int file_map_prot_check(struct file *file, unsigned long prot, int shared) { -#ifndef CONFIG_PPC32 if ((prot & PROT_EXEC) && (!file || (!shared && (prot & PROT_WRITE)))) { /* * We are making executable an anonymous mapping or a @@ -2376,7 +2375,6 @@ static int file_map_prot_check(struct fi if (rc) return rc; } -#endif if (file) { /* read access is always possible with a mapping */ @@ -2423,7 +2421,6 @@ static int selinux_file_mprotect(struct if (selinux_checkreqprot) prot = reqprot; -#ifndef CONFIG_PPC32 if ((prot & PROT_EXEC) && !(vma->vm_flags & VM_EXEC)) { rc = 0; if (vma->vm_start >= vma->vm_mm->start_brk && @@ -2448,7 +2445,6 @@ static int selinux_file_mprotect(struct if (rc) return rc; } -#endif return file_map_prot_check(vma->vm_file, prot, vma->vm_flags&VM_SHARED); } linux-2.6-selinux-selinuxfs-hard-link-count.patch: linux-2.6.16-rc4-mm2.w/security/selinux/selinuxfs.c | 11 +++++++---- linux-2.6.16-rc4.w/security/selinux/selinuxfs.c | 4 ++++ 2 files changed, 11 insertions(+), 4 deletions(-) --- NEW FILE linux-2.6-selinux-selinuxfs-hard-link-count.patch --- Fix the hard link count for selinuxfs directories. https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=182001 Signed-off-by: James Morris --- security/selinux/selinuxfs.c | 4 ++++ 1 files changed, 4 insertions(+) diff -purN -X dontdiff linux-2.6.16-rc4.o/security/selinux/selinuxfs.c linux-2.6.16-rc4.w/security/selinux/selinuxfs.c --- linux-2.6.16-rc4.o/security/selinux/selinuxfs.c 2006-02-17 17:23:45.000000000 -0500 +++ linux-2.6.16-rc4.w/security/selinux/selinuxfs.c 2006-02-19 17:48:41.000000000 -0500 @@ -1198,6 +1198,8 @@ static int sel_make_dir(struct super_blo } inode->i_op = &simple_dir_inode_operations; inode->i_fop = &simple_dir_operations; + /* directory inodes start off with i_nlink == 2 (for "." entry) */ + inode->i_nlink++; d_add(dentry, inode); out: return ret; @@ -1239,6 +1241,8 @@ static int sel_fill_super(struct super_b goto out; inode->i_op = &simple_dir_inode_operations; inode->i_fop = &simple_dir_operations; + /* directory inodes start off with i_nlink == 2 (for "." entry) */ + inode->i_nlink++; d_add(dentry, inode); bool_dir = dentry; ret = sel_make_bools(); diff -purN -X dontdiff linux-2.6.16-rc4-mm2.o/security/selinux/selinuxfs.c linux-2.6.16-rc4-mm2.w/security/selinux/selinuxfs.c --- linux-2.6.16-rc4-mm2.o/security/selinux/selinuxfs.c 2006-02-25 00:29:32.000000000 -0500 +++ linux-2.6.16-rc4-mm2.w/security/selinux/selinuxfs.c 2006-02-25 12:35:26.000000000 -0500 @@ -1177,12 +1177,12 @@ out: return ret; } -static int sel_make_dir(struct super_block *sb, struct dentry *dentry) +static int sel_make_dir(struct inode *dir, struct dentry *dentry) { int ret = 0; struct inode *inode; - inode = sel_make_inode(sb, S_IFDIR | S_IRUGO | S_IXUGO); + inode = sel_make_inode(dir->i_sb, S_IFDIR | S_IRUGO | S_IXUGO); if (!inode) { ret = -ENOMEM; goto out; @@ -1192,6 +1192,8 @@ static int sel_make_dir(struct super_blo /* directory inodes start off with i_nlink == 2 (for "." entry) */ inode->i_nlink++; d_add(dentry, inode); + /* bump link count on parent directory, too */ + dir->i_nlink++; out: return ret; } @@ -1200,7 +1202,7 @@ static int sel_fill_super(struct super_b { int ret; struct dentry *dentry; - struct inode *inode; + struct inode *inode, *root_inode; struct inode_security_struct *isec; static struct tree_descr selinux_files[] = { @@ -1267,6 +1267,7 @@ static int sel_fill_super(struct super_b d_add(dentry, inode); selinux_null = dentry; + root_inode = sb->s_root->d_inode; dentry = d_alloc_name(sb->s_root, "avc"); if (!dentry) return -ENOMEM; @@ -1272,7 +1272,7 @@ static int sel_fill_super(struct super_b if (!dentry) return -ENOMEM; - ret = sel_make_dir(sb, dentry); + ret = sel_make_dir(root_inode, dentry); if (ret) goto out; linux-2.6-signal-trampolines-unwind-info.patch: i386/kernel/vsyscall-sigreturn.S | 2 +- powerpc/kernel/vdso32/sigtramp.S | 2 +- powerpc/kernel/vdso64/sigtramp.S | 2 +- x86_64/ia32/vsyscall-sigreturn.S | 23 +++++++++++++++++++++-- 4 files changed, 24 insertions(+), 5 deletions(-) --- NEW FILE linux-2.6-signal-trampolines-unwind-info.patch --- --- linux-2.6.15/arch/i386/kernel/vsyscall-sigreturn.S.jj 2006-01-02 22:21:10.000000000 -0500 +++ linux-2.6.15/arch/i386/kernel/vsyscall-sigreturn.S 2006-02-21 05:10:31.000000000 -0500 @@ -44,7 +44,7 @@ __kernel_rt_sigreturn: .LSTARTCIEDLSI1: .long 0 /* CIE ID */ .byte 1 /* Version number */ - .string "zR" /* NUL-terminated augmentation string */ + .string "zRS" /* NUL-terminated augmentation string */ .uleb128 1 /* Code alignment factor */ .sleb128 -4 /* Data alignment factor */ .byte 8 /* Return address register column */ --- linux-2.6.15/arch/x86_64/ia32/vsyscall-sigreturn.S.jj 2006-01-02 22:21:10.000000000 -0500 +++ linux-2.6.15/arch/x86_64/ia32/vsyscall-sigreturn.S 2006-02-21 05:17:41.000000000 -0500 @@ -31,8 +31,27 @@ __kernel_rt_sigreturn: .size __kernel_rt_sigreturn,.-.LSTART_rt_sigreturn .section .eh_frame,"a", at progbits +.LSTARTFRAMES: + .long .LENDCIES-.LSTARTCIES +.LSTARTCIES: + .long 0 /* CIE ID */ + .byte 1 /* Version number */ + .string "zRS" /* NUL-terminated augmentation string */ + .uleb128 1 /* Code alignment factor */ + .sleb128 -4 /* Data alignment factor */ + .byte 8 /* Return address register column */ + .uleb128 1 /* Augmentation value length */ + .byte 0x1b /* DW_EH_PE_pcrel|DW_EH_PE_sdata4. */ + .byte 0x0c /* DW_CFA_def_cfa */ + .uleb128 4 + .uleb128 4 + .byte 0x88 /* DW_CFA_offset, column 0x8 */ + .uleb128 1 + .align 4 +.LENDCIES: + .long .LENDFDE2-.LSTARTFDE2 /* Length FDE */ .LSTARTFDE2: - .long .LSTARTFDE2-.LSTARTFRAME /* CIE pointer */ + .long .LSTARTFDE2-.LSTARTFRAMES /* CIE pointer */ /* HACK: The dwarf2 unwind routines will subtract 1 from the return address to get an address in the middle of the @@ -96,7 +116,7 @@ __kernel_rt_sigreturn: .long .LENDFDE3-.LSTARTFDE3 /* Length FDE */ .LSTARTFDE3: - .long .LSTARTFDE3-.LSTARTFRAME /* CIE pointer */ + .long .LSTARTFDE3-.LSTARTFRAMES /* CIE pointer */ /* HACK: See above wrt unwind library assumptions. */ .long .LSTART_rt_sigreturn-1-. /* PC-relative start address */ .long .LEND_rt_sigreturn-.LSTART_rt_sigreturn+1 --- linux-2.6.15/arch/powerpc/kernel/vdso32/sigtramp.S.jj 2006-01-02 22:21:10.000000000 -0500 +++ linux-2.6.15/arch/powerpc/kernel/vdso32/sigtramp.S 2006-02-21 05:24:12.000000000 -0500 @@ -261,7 +261,7 @@ V_FUNCTION_END(__kernel_sigtramp_rt32) .Lcie_start: .long 0 /* CIE ID */ .byte 1 /* Version number */ - .string "zR" /* NUL-terminated augmentation string */ + .string "zRS" /* NUL-terminated augmentation string */ .uleb128 4 /* Code alignment factor */ .sleb128 -4 /* Data alignment factor */ .byte 67 /* Return address register column, ap */ --- linux-2.6.15/arch/powerpc/kernel/vdso64/sigtramp.S.jj 2006-01-02 22:21:10.000000000 -0500 +++ linux-2.6.15/arch/powerpc/kernel/vdso64/sigtramp.S 2006-02-21 05:28:28.000000000 -0500 @@ -263,7 +263,7 @@ V_FUNCTION_END(__kernel_sigtramp_rt64) .Lcie_start: .long 0 /* CIE ID */ .byte 1 /* Version number */ - .string "zR" /* NUL-terminated augmentation string */ + .string "zRS" /* NUL-terminated augmentation string */ .uleb128 4 /* Code alignment factor */ .sleb128 -8 /* Data alignment factor */ .byte 67 /* Return address register column, ap */ linux-2.6-softcursor-persistent-alloc.patch: softcursor.c | 17 ++++++++++++----- 1 files changed, 12 insertions(+), 5 deletions(-) --- NEW FILE linux-2.6-softcursor-persistent-alloc.patch --- --- linux-2.6.14/drivers/video/console/softcursor.c~ 2005-12-28 18:40:08.000000000 -0500 +++ linux-2.6.14/drivers/video/console/softcursor.c 2005-12-28 18:45:50.000000000 -0500 @@ -23,7 +23,9 @@ int soft_cursor(struct fb_info *info, st unsigned int buf_align = info->pixmap.buf_align - 1; unsigned int i, size, dsize, s_pitch, d_pitch; struct fb_image *image; - u8 *dst, *src; + u8 *dst; + static u8 *src=NULL; + static int allocsize=0; if (info->state != FBINFO_STATE_RUNNING) return 0; @@ -31,9 +33,15 @@ int soft_cursor(struct fb_info *info, st s_pitch = (cursor->image.width + 7) >> 3; dsize = s_pitch * cursor->image.height; - src = kmalloc(dsize + sizeof(struct fb_image), GFP_ATOMIC); - if (!src) - return -ENOMEM; + if (dsize + sizeof(struct fb_image) != allocsize) { + if (src != NULL) + kfree(src); + allocsize = dsize + sizeof(struct fb_image); + + src = kmalloc(allocsize, GFP_ATOMIC); + if (!src) + return -ENOMEM; + } image = (struct fb_image *) (src + dsize); *image = cursor->image; @@ -61,7 +69,6 @@ int soft_cursor(struct fb_info *info, st fb_pad_aligned_buffer(dst, d_pitch, src, s_pitch, image->height); image->data = dst; info->fbops->fb_imageblit(info, image); - kfree(src); return 0; } linux-2.6-softlockup-disable.patch: main.c | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletion(-) --- NEW FILE linux-2.6-softlockup-disable.patch --- --- linux-2.6.15.noarch/init/main.c~ 2006-03-05 00:45:51.000000000 -0500 +++ linux-2.6.15.noarch/init/main.c 2006-03-05 00:49:41.000000000 -0500 @@ -640,6 +640,15 @@ static void __init do_basic_setup(void) do_initcalls(); } +static int __initdata nosoftlockup; + +static int __init nosoftlockup_setup(char *str) +{ + nosoftlockup = 1; + return 1; +} +__setup("nosoftlockup", nosoftlockup_setup); + static void do_pre_smp_initcalls(void) { extern int spawn_ksoftirqd(void); @@ -649,7 +657,8 @@ static void do_pre_smp_initcalls(void) migration_init(); #endif spawn_ksoftirqd(); - spawn_softlockup_task(); + if (!nosoftlockup) + spawn_softlockup_task(); } static void run_init_process(char *init_filename) linux-2.6-suspend-slab-warnings.patch: osl.c | 4 ++-- utils.c | 6 +++++- 2 files changed, 7 insertions(+), 3 deletions(-) --- NEW FILE linux-2.6-suspend-slab-warnings.patch --- When going into suspend irqs must be disabled for a long time. There is already a acpi_in_resume variable in osl.c to not make use of sleeping functions (mem allocs/mutexes). This one just makes a bit more intensive use of it. The acpi_in_resume seem to vanish later (pci_link.c): /* * FIXME: this is a workaround to avoid nasty warning. It will be removed * after every device calls pci_disable_device in .resume. */ but for now below patch seem to be needed: Subject: No GFP_KERNEL buffer alloc or mutexes if resuming Signed-off-by: Thomas Renninger drivers/acpi/osl.c | 10 +++++++--- drivers/acpi/utils.c | 6 +++++- 2 files changed, 12 insertions(+), 4 deletions(-) Index: linux-2.6.15/drivers/acpi/osl.c =================================================================== --- linux-2.6.15.orig/drivers/acpi/osl.c +++ linux-2.6.15/drivers/acpi/osl.c @@ -880,7 +880,7 @@ acpi_status acpi_os_wait_semaphore(acpi_ ACPI_DEBUG_PRINT((ACPI_DB_MUTEX, "Waiting for semaphore[%p|%d|%d]\n", handle, units, timeout)); - if (in_atomic()) + if (in_atomic() || acpi_in_resume) timeout = 0; switch (timeout) { @@ -1009,7 +1009,7 @@ u8 acpi_os_writable(void *ptr, acpi_size u32 acpi_os_get_thread_id(void) { - if (!in_atomic()) + if (!in_atomic() && !acpi_in_resume) return current->pid; return 0; Index: linux-2.6.15/drivers/acpi/utils.c =================================================================== --- linux-2.6.15.orig/drivers/acpi/utils.c +++ linux-2.6.15/drivers/acpi/utils.c @@ -250,6 +250,7 @@ acpi_extract_package(union acpi_object * EXPORT_SYMBOL(acpi_extract_package); +extern int acpi_in_resume; acpi_status acpi_evaluate_integer(acpi_handle handle, acpi_string pathname, @@ -264,7 +265,10 @@ acpi_evaluate_integer(acpi_handle handle if (!data) return_ACPI_STATUS(AE_BAD_PARAMETER); - element = kmalloc(sizeof(union acpi_object), GFP_KERNEL); + if (acpi_in_resume) + element = kmalloc(sizeof(union acpi_object), GFP_ATOMIC); + else + element = kmalloc(sizeof(union acpi_object), GFP_KERNEL); if (!element) return_ACPI_STATUS(AE_NO_MEMORY); linux-2.6-x86-cpu_index-false.patch: processor_core.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) --- NEW FILE linux-2.6-x86-cpu_index-false.patch --- Local apic entries are only 8 bits, but it seemed to not be caught with u8 return value result in the check cpu_index >= NR_CPUS becomming always false. drivers/acpi/processor_core.c: In function `acpi_processor_get_info': drivers/acpi/processor_core.c:483: warning: comparison is always false due to limited range of data type Signed-off-by: Ashok Raj ----------------------------------------------------- drivers/acpi/processor_core.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) Index: linux-2.6.16-rc5-mm1/drivers/acpi/processor_core.c =================================================================== --- linux-2.6.16-rc5-mm1.orig/drivers/acpi/processor_core.c +++ linux-2.6.16-rc5-mm1/drivers/acpi/processor_core.c @@ -382,7 +382,7 @@ static int acpi_processor_remove_fs(stru /* Use the acpiid in MADT to map cpus in case of SMP */ #ifndef CONFIG_SMP -#define convert_acpiid_to_cpu(acpi_id) (0xff) +#define convert_acpiid_to_cpu(acpi_id) (-1) #else #ifdef CONFIG_IA64 @@ -395,7 +395,7 @@ static int acpi_processor_remove_fs(stru #define ARCH_BAD_APICID (0xff) #endif -static u8 convert_acpiid_to_cpu(u8 acpi_id) +static int convert_acpiid_to_cpu(u8 acpi_id) { u16 apic_id; int i; @@ -421,7 +421,7 @@ static int acpi_processor_get_info(struc acpi_status status = 0; union acpi_object object = { 0 }; struct acpi_buffer buffer = { sizeof(union acpi_object), &object }; - u8 cpu_index; + int cpu_index; static int cpu0_initialized; ACPI_FUNCTION_TRACE("acpi_processor_get_info"); @@ -466,7 +466,7 @@ static int acpi_processor_get_info(struc cpu_index = convert_acpiid_to_cpu(pr->acpi_id); /* Handle UP system running SMP kernel, with no LAPIC in MADT */ - if (!cpu0_initialized && (cpu_index == 0xff) && + if (!cpu0_initialized && (cpu_index == -1) && (num_online_cpus() == 1)) { cpu_index = 0; } @@ -480,7 +480,7 @@ static int acpi_processor_get_info(struc * less than the max # of CPUs. They should be ignored _iff * they are physically not present. */ - if (cpu_index >= NR_CPUS) { + if (cpu_index == -1) { if (ACPI_FAILURE (acpi_processor_hotadd_init(pr->handle, &pr->id))) { ACPI_ERROR((AE_INFO, linux-2.6-x86_64-smp-on-uphw-cpucount.patch: smpboot.c | 5 +++++ 1 files changed, 5 insertions(+) --- NEW FILE linux-2.6-x86_64-smp-on-uphw-cpucount.patch --- --- linux-2.6.15.noarch/arch/x86_64/kernel/smpboot.c~ 2006-02-20 21:59:56.000000000 -0500 +++ linux-2.6.15.noarch/arch/x86_64/kernel/smpboot.c 2006-02-20 22:01:57.000000000 -0500 @@ -975,6 +975,11 @@ __init void prefill_possible_map(void) if (possible > NR_CPUS) possible = NR_CPUS; + if (possible == 0) { /* Could be SMP kernel on UP hw with broken BIOS */ + possible = 1; + printk (KERN_DEBUG "BIOS never enumerated boot CPU, fixing.\n"); + } + printk(KERN_INFO "SMP: Allowing %d CPUs, %d hotplug CPUs\n", possible, max_t(int, possible - num_processors, 0)); linux-2.6-x86_64-vdso-compile-m32.patch: Makefile | 6 ++++++ 1 files changed, 6 insertions(+) --- NEW FILE linux-2.6-x86_64-vdso-compile-m32.patch --- --- linux-2.6.16.noarch/arch/x86_64/ia32/Makefile~ 2006-03-27 16:20:58.000000000 -0500 +++ linux-2.6.16.noarch/arch/x86_64/ia32/Makefile 2006-03-27 16:22:44.000000000 -0500 @@ -2,6 +2,9 @@ # Makefile for the ia32 kernel emulation subsystem. # +# Avoid gcc -m64 -m32 ... foo.S +AFLAGS := $(filter-out -m64, $(AFLAGS)) + obj-$(CONFIG_IA32_EMULATION) := ia32entry.o sys_ia32.o ia32_signal.o tls32.o \ ia32_binfmt.o fpu32.o ptrace32.o syscall32.o syscall32_syscall.o \ mmap32.o @@ -29,3 +32,6 @@ $(obj)/vsyscall-%.so: $(src)/vsyscall.ld AFLAGS_vsyscall-sysenter.o = -m32 AFLAGS_vsyscall-syscall.o = -m32 +AFLAGS_syscall32_syscall.o += -m64 +AFLAGS_ia32entry.o += -m64 + --- NEW FILE linux-2.6.16.tar.bz2.sign --- -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.2.2 (GNU/Linux) Comment: See http://www.kernel.org/signature.html for info iD8DBQBEHkvVyGugalF9Dw4RAjwOAJ0cSl/JxfHUGsfOzkXTikTK/opIfgCfdegH bYUe57rJLc9oZJYLFmc2/aE= =YZjA -----END PGP SIGNATURE----- --- NEW FILE patch-2.6.16.1.bz2.sign --- -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.2.2 (GNU/Linux) Comment: See http://www.kernel.org/signature.html for info iD8DBQBEKOe7yGugalF9Dw4RAuspAJ4myTbOD6spwBjJBFamnyRhDTuUqACfaFoh asbJhu1RZthQXm/RQ0Jdf/Y= =g52y -----END PGP SIGNATURE----- Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-4/.cvsignore,v retrieving revision 1.176 retrieving revision 1.177 diff -u -r1.176 -r1.177 --- .cvsignore 9 Mar 2006 23:16:31 -0000 1.176 +++ .cvsignore 28 Mar 2006 16:14:09 -0000 1.177 @@ -1,6 +1,5 @@ kernel-2.6.*.config temp-* -kernel-2.6.15 -linux-2.6.15.tar.bz2 -patch-2.6.15.5.bz2 -patch-2.6.15.6.bz2 +kernel-2.6.16 +linux-2.6.16.tar.bz2 +patch-2.6.16.1.bz2 Index: Makefile.config =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-4/Makefile.config,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- Makefile.config 6 Jan 2006 05:42:17 -0000 1.27 +++ Makefile.config 28 Mar 2006 16:14:09 -0000 1.28 @@ -11,17 +11,14 @@ $(CFG)-ppc64iseries.config \ $(CFG)-s390.config $(CFG)-s390x.config \ $(CFG)-ppc.config $(CFG)-ppc-smp.config \ - $(CFG)-ppc64.config $(CFG)-ia64.config \ - $(CFG)-i686-xen0.config $(CFG)-i686-xenU.config \ - $(CFG)-x86_64-xen0.config $(CFG)-x86_64-xenU.config + $(CFG)-ppc64.config $(CFG)-ia64.config PLATFORMS = x86 x86_64 powerpc powerpc32 powerpc64 s390 ia64 # sparc sparc64 TEMPFILES = $(addprefix temp-, $(addsuffix -generic, $(PLATFORMS))) configs: $(CONFIGFILES) @rm -f $(TEMPFILES) - @rm -f temp-xen-generic temp-x86-xen-generic temp-x86_64-xen-generic \ - temp-generic temp-x86_64-xen-generic-tmp + @rm -f temp-generic # Augment the clean target to clean up our own cruft clean :: @@ -58,40 +55,31 @@ temp-ia64-generic: configs/config-ia64-generic temp-generic perl scripts/merge.pl $^ > $@ -temp-x86-xen-generic: configs/config-xen-generic temp-x86-generic - perl scripts/merge.pl $^ > $@ - -temp-x86_64-xen-generic-tmp: configs/config-xen-generic temp-x86_64-generic - perl scripts/merge.pl $^ > $@ - -temp-x86_64-xen-generic: configs/config-xen-x86_64 temp-x86_64-xen-generic-tmp - perl scripts/merge.pl $^ > $@ - -kernel-$(VERSION)-i686.config: configs/config-i686 temp-x86-generic +kernel-$(VERSION)-i686.config: configs/config-i686 temp-x86-generic perl scripts/merge.pl $^ i386 > $@ -kernel-$(VERSION)-i686-smp.config: configs/config-i686-smp temp-x86-generic +kernel-$(VERSION)-i686-smp.config: configs/config-i686-smp temp-x86-generic perl scripts/merge.pl $^ i386 > $@ -kernel-$(VERSION)-i586.config: configs/config-i586 temp-x86-generic +kernel-$(VERSION)-i586.config: configs/config-i586 temp-x86-generic perl scripts/merge.pl $^ i386 > $@ -kernel-$(VERSION)-x86_64-smp.config: configs/config-x86_64-smp temp-x86_64-generic +kernel-$(VERSION)-x86_64-smp.config: configs/config-x86_64-smp temp-x86_64-generic perl scripts/merge.pl $^ x86_64 > $@ -kernel-$(VERSION)-x86_64.config: configs/config-x86_64 temp-x86_64-generic +kernel-$(VERSION)-x86_64.config: configs/config-x86_64 temp-x86_64-generic perl scripts/merge.pl $^ x86_64 > $@ -kernel-$(VERSION)-sparc-smp.config: configs/config-sparc-smp temp-sparc-generic +kernel-$(VERSION)-sparc-smp.config: configs/config-sparc-smp temp-sparc-generic perl scripts/merge.pl $^ sparc > $@ -kernel-$(VERSION)-sparc.config: configs/config-sparc temp-sparc-generic +kernel-$(VERSION)-sparc.config: configs/config-sparc temp-sparc-generic perl scripts/merge.pl $^ sparc > $@ -kernel-$(VERSION)-sparc64-smp.config: configs/config-sparc64-smp temp-sparc64-generic +kernel-$(VERSION)-sparc64-smp.config: configs/config-sparc64-smp temp-sparc64-generic perl scripts/merge.pl $^ sparc64 > $@ -kernel-$(VERSION)-sparc64.config: configs/config-sparc64 temp-sparc-generic +kernel-$(VERSION)-sparc64.config: configs/config-sparc64 temp-sparc-generic perl scripts/merge.pl $^ sparc64 > $@ kernel-$(VERSION)-ppc64.config: configs/config-powerpc64 temp-powerpc64-generic @@ -115,15 +103,3 @@ kernel-$(VERSION)-ia64.config: configs/config-ia64 temp-ia64-generic perl scripts/merge.pl $^ ia64 > $@ -kernel-$(VERSION)-i686-xen0.config: configs/config-xen-xen0 temp-x86-xen-generic - perl scripts/merge.pl $^ xen > $@ - -kernel-$(VERSION)-i686-xenU.config: configs/config-xen-xenU temp-x86-xen-generic - perl scripts/merge.pl $^ xen > $@ - -kernel-$(VERSION)-x86_64-xen0.config: configs/config-xen-xen0 temp-x86_64-xen-generic - perl scripts/merge.pl $^ xen > $@ - -kernel-$(VERSION)-x86_64-xenU.config: configs/config-xen-xenU temp-x86_64-xen-generic - perl scripts/merge.pl $^ xen > $@ - View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.1614 -r 1.1615 kernel-2.6.spec Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-4/kernel-2.6.spec,v retrieving revision 1.1614 retrieving revision 1.1615 diff -u -r1.1614 -r1.1615 --- kernel-2.6.spec 11 Mar 2006 04:10:06 -0000 1.1614 +++ kernel-2.6.spec 28 Mar 2006 16:14:09 -0000 1.1615 @@ -5,7 +5,6 @@ %define buildup 1 %define buildsmp 1 -%define includexen 0 %define builddoc 0 # Versions of various parts @@ -16,7 +15,7 @@ # that the kernel isn't the stock distribution kernel, for example by # adding some text to the end of the version number. # -%define sublevel 15 +%define sublevel 16 %define kversion 2.6.%{sublevel} %define rpmversion 2.6.%{sublevel} %define rhbsys %([ -r /etc/beehive-root -o -n "%{?__beehive_build}" ] && echo || echo .`whoami`) @@ -45,12 +44,6 @@ %define buildsmp 0 %endif -%ifarch i686 -%define buildxen %{includexen} -%else -%define buildxen 0 -%endif - %ifarch %{all_x86} %define all_arch_configs $RPM_SOURCE_DIR/kernel-%{kversion}-i?86*.config %define image_install_path boot @@ -125,7 +118,7 @@ # First the general kernel 2.6 required versions as per # Documentation/Changes # -%define kernel_dot_org_conflicts ppp <= 2.3.15, pcmcia-cs <= 3.1.20, isdn4k-utils <= 3.0, mount < 2.10r-5, nfs-utils < 1.0.3, e2fsprogs < 1.29, util-linux < 2.10, jfsutils < 1.0.14, reiserfsprogs < 3.6.3, xfsprogs < 2.1.0, procps < 2.0.9, oprofile < 0.5.3, udev < 071-0.FC4.2 +%define kernel_dot_org_conflicts ppp <= 2.3.15, pcmcia-cs <= 3.1.20, isdn4k-utils <= 3.0, mount < 2.10r-5, nfs-utils < 1.0.3, e2fsprogs < 1.29, util-linux < 2.10, jfsutils < 1.0.14, reiserfsprogs < 3.6.3, xfsprogs < 2.1.0, procps < 2.0.9, oprofile < 0.5.3 # # Then a series of requirements that are distribution specific, either @@ -142,22 +135,17 @@ %define nptl_conflicts SysVinit < 2.84-13, pam < 0.75-48, vixie-cron < 3.0.1-73, privoxy < 3.0.0-8, spamassassin < 2.44-4.8.x, cups < 1.1.17-13 # -# The ld.so.conf.d file we install uses syntax older ldconfig's don't grok. -# -%define xen_conflicts glibc < 2.3.5-1 - -# # Packages that need to be installed before the kernel is, because the %post # scripts use them. # -%define kernel_prereq fileutils, module-init-tools >= 3.2-0.pre9.0.FC4.1, initscripts >= 5.83, mkinitrd >= 4.2.15-1 +%define kernel_prereq fileutils, module-init-tools, initscripts >= 5.83, mkinitrd >= 4.2.15-1 Name: kernel Group: System Environment/Kernel License: GPLv2 Version: %{rpmversion} Release: %{release} -ExclusiveArch: noarch %{all_x86} x86_64 ppc ppc64 sparc sparc64 +ExclusiveArch: noarch %{all_x86} x86_64 ppc ppc64 ExclusiveOS: Linux Provides: kernel = %{version} Provides: kernel-drm = 4.3.0 @@ -197,61 +185,46 @@ Source29: kernel-%{kversion}-ppc.config Source30: kernel-%{kversion}-ppc-smp.config Source31: kernel-%{kversion}-ia64.config -Source32: kernel-%{kversion}-i686-xen0.config -Source33: kernel-%{kversion}-i686-xenU.config -#Source34: kernel-%{kversion}-sparc.config -#Source35: kernel-%{kversion}-sparc64.config -#Source36: kernel-%{kversion}-sparc64-smp.config +#Source32: kernel-%{kversion}-sparc.config +#Source33: kernel-%{kversion}-sparc64.config +#Source34: kernel-%{kversion}-sparc64-smp.config # # Patches 0 through 100 are meant for core subsystem upgrades # -Patch1: patch-2.6.15.6.bz2 +Patch1: patch-2.6.16.1.bz2 # Patches 100 through 500 are meant for architecture patches Patch100: linux-2.6-bzimage.patch # 200 - 299 x86(-64) - Patch200: linux-2.6-x86-tune-p4.patch Patch201: linux-2.6-x86-vga-vidfail.patch -Patch202: linux-2.6.14-intel-cache-build.patch +Patch202: linux-2.6-intel-cache-build.patch Patch203: linux-2.6-x86_64-silence-up-apic-errors.patch -Patch204: linux-2.6-x86_64-disable-hotplug-guessing.patch +Patch204: linux-2.6-edid-check.patch +Patch205: linux-2.6-x86_64-smp-on-uphw-cpucount.patch +Patch206: linux-2.6-x86-hp-reboot.patch +Patch207: linux-2.6-x86-cpu_index-false.patch +Patch208: linux-2.6-x86_64-vdso-compile-m32.patch # 300 - 399 ppc(64) -Patch300: linux-2.6.15-default-powerpc.patch -Patch301: linux-2.6-serial-of.patch -Patch302: linux-2.6.15-rc1-ppc64-syscallpath.patch -Patch303: linux-2.6.15-mv643xx-fixes.patch Patch304: linux-2.6-ppc-rtas-check.patch -Patch305: linux-2.6-powerpc-parport.patch -Patch306: linux-2.6-powerpc64-fpexc.patch -Patch307: linux-2.6-g5-dualcore.patch +Patch305: linux-2.6-mv643xx-compile-fix.patch # 400 - 499 ia64 # 500 - 599 s390(x) # 600 - 699 sparc(64) -# 700 - 799 Xen -Patch700: linux-2.6-xen.patch -Patch701: linux-2.6-xen-additional.patch -Patch702: linux-2.6-xen-compile.patch - # # Patches 800 through 899 are reserved for bugfixes to the core system # and patches related to how RPMs are build # Patch800: linux-2.6-build-nonintconfig.patch Patch801: linux-2.6-build-userspace-headers-warning.patch -Patch802: linux-2.6-build-reference-discarded-opd.patch # Exec-shield. Patch810: linux-2.6-execshield.patch -Patch811: linux-2.6-execshield-xen.patch -Patch812: linux-2.6-execshield-vdso.patch -Patch813: linux-2.6-xen-vdso-note.patch -Patch814: linux-2.6-write-protect-rodata.patch # Module signing infrastructure. Patch900: linux-2.6-modsign-core.patch @@ -271,7 +244,7 @@ Patch1011: linux-2.6-debug-slab-backtrace.patch Patch1012: linux-2.6-debug-list_head.patch Patch1013: linux-2.6-debug-taint-vm.patch -Patch1014: linux-2.6-debug-taint-check.patch +Patch1014: linux-2.6-debug-slab-leaks.patch Patch1015: linux-2.6-debug-singlebiterror.patch Patch1016: linux-2.6-debug-spinlock-taint.patch Patch1017: linux-2.6-debug-spinlock-panic.patch @@ -280,41 +253,41 @@ Patch1020: linux-2.6-debug-sleep-in-irq-warning.patch Patch1021: linux-2.6-debug-reference-discarded-return-result.patch Patch1022: linux-2.6-debug-panic-stackdump.patch -Patch1023: linux-2.6-debug-taint-proprietary-helpers.patch Patch1024: linux-2.6-debug-dual-line-backtrace.patch Patch1025: linux-2.6-debug-sysfs-crash-debugging.patch Patch1026: linux-2.6-debug-no-quiet.patch Patch1027: linux-2.6-debug-slab-leak-detector.patch Patch1028: linux-2.6-debug-oops-pause.patch +Patch1029: linux-2.6-debug-account-kmalloc.patch +Patch1030: linux-2.6-debug-latency-tracing.patch +Patch1031: linux-2.6-debug-periodic-slab-check.patch Patch1032: linux-2.6-debug-boot-delay.patch +Patch1033: linux-2.6-debug-must_check.patch +Patch1034: linux-2.6-debug-pm-pci.patch # Restrict /dev/mem usage. Patch1050: linux-2.6-devmem.patch -Patch1051: linux-2.6-devmem-xen.patch # Provide read only /dev/crash driver. Patch1060: linux-2.6-crash-driver.patch -Patch1061: linux-2.6-crash-xen.patch Patch1070: linux-2.6-sleepon.patch -# Tweak some defaults. -Patch1081: linux-2.6-max-symlinks.patch - # SCSI bits. Patch1101: linux-2.6-scsi-advansys-enabler.patch -Patch1102: linux-2.6-scsi-megaraid-legacy.patch -Patch1103: linux-2.6-scsi-advansys-pcitable.patch +Patch1102: linux-2.6-scsi-advansys-pcitable.patch # NFS bits. Patch1200: linux-2.6-NFSD-non-null-getxattr.patch Patch1201: linux-2.6-NFSD-ctlbits.patch Patch1203: linux-2.6-NFSD-badness.patch +Patch1204: linux-2.6-NFSD-writes-shouldnt-clobber-utimes.patch # NIC driver updates Patch1301: linux-2.6-net-sundance-ip100A.patch -Patch1302: linux-2.6-ipw2200-hwcrypto.patch -Patch1303: linux-2.6-net-ipw2200-monitor.patch [...2483 lines suppressed...] -- add NX support for x86 (Intel, Ingo) - -* Tue Jun 1 2004 Arjan van de Ven -- refresh ext3 reservation patch - -* Sun May 30 2004 Arjan van de Ven -- 2.6.7-rc2 -- set the ACPI OS name to "Microsoft Windows XP" for better compatibility - -* Thu May 27 2004 Pete Zaitcev -- Fix qeth and zfcp (s390 drivers): align qib by 256, embedded into qdio_irq. - -* Thu May 27 2004 Dave Jones -- Fix the crashes on boot on Asus P4P800 boards. (#121819) - -* Wed May 26 2004 Dave Jones -- Lots more updates to the SCSI whitelist for various - USB card readers. (#112778, among others..) - -* Wed May 26 2004 Arjan van de Ven -- back out ehci suspend/resume patch, it breaks -- add fix for 3c59x-meets-kudzu bug from Alan - -* Tue May 25 2004 Arjan van de Ven -- try improving suspend/resume by restoring more PCI state -- 2.6.7-rc1-bk1 - -* Mon May 24 2004 Dave Jones -- Add yet another multi-card reader to the whitelist (#85851) - -* Sun May 23 2004 Dave Jones -- Add another multi-card reader to the whitelist (#124048) - -* Wed May 19 2004 Arjan van de Ven -- put firewire race fix in (datacorruptor) - -* Tue May 18 2004 Dave Jones -- Fix typo in ibmtr driver preventing compile (#123391) - -* Mon May 17 2004 Arjan van de Ven -- update to 2.6.6-bk3 -- made kernel-source and kernel-doc noarch.rpm's since they are not - architecture specific. - -* Sat May 08 2004 Arjan van de Ven -- fix non-booting on Transmeta cpus (Peter Anvin) -- fix count leak in message queues - -* Fri May 07 2004 Arjan van de Ven -- more ide cache flush work -- patch from scsi-bk to fix sd refcounting - -* Thu May 06 2004 Arjan van de Ven -- some more ide cache flush fixes - -* Wed May 05 2004 Arjan van de Ven -- fix bug 122504 -- convert b44 to ethtool ops (jgarzik) -- make IDE do a cache-flush on shutdown (me/Alan) - -* Tue May 04 2004 Arjan van de Ven -- work around i810/i830 DRM issue - -* Fri Apr 30 2004 Arjan van de Ven -- 2.6.6-rc3-bk1 -- make amd64 boot again -- fix vm86-vs-4g4g interaction (Ingo) - -* Thu Apr 22 2004 Arjan van de Ven -- 2.6.6-rc2 - -* Tue Apr 20 2004 Arjan van de Ven -- add the ext3 online resize patch - -* Mon Apr 19 2004 Arjan van de Ven -- 2.6.6-rc1-bk3 -- add the objrmap vm from the -mm tree; it needs testing - -* Thu Apr 15 2004 Arjan van de Ven -- 2.6.5-bk2 -- disable DISCONTIGMEM on ia64 for performance -- fix sleep_on use in reiserfs (Chris Mason) - -* Tue Apr 13 2004 Arjan van de Ven -- 2.6.5-mc4 -- reenable sg driver for scsi tape changers and such -- the sk98lin driver oopses on module unload, preven that - -* Mon Apr 12 2004 Arjan van de Ven -- fix "bad pmd" bug with patch from Ingo - -* Fri Apr 09 2004 Arjan van de Ven -- 2.6.5-mc3 -- finish up the -mc2 merge -- latest 4g/4g patch from Ingo -- latest execshield patch from Ingo -- fix a few framebuffer bugs - -* Thu Apr 08 2004 Arjan van de Ven -- first attempt at a 2.6.5-mc2 merge - -* Thu Apr 08 2004 Dave Jones -- Add in missing SiS AGP fix. - -* Tue Apr 06 2004 Dave Jones -- More agpgart fixes. - -* Fri Apr 02 2004 Arjan van de Ven -- fix another 4g/4g-vs-resume bug - -* Tue Mar 30 2004 Arjan van de Ven -- 2.6.5-rc3 -- fix PCI posting bug in i830 DRM - -* Mon Mar 29 2004 Arjan van de Ven -- 2.6.5-rc2-bk8 - -* Mon Mar 29 2004 Dave Jones -- Include latest agpgart fixes. - -* Thu Mar 25 2004 Arjan van de Ven -- more DRM fixes -- add the fsync patches from akpm - -* Tue Mar 23 2004 Arjan van de Ven -- 2.6.5-rc2-bk3 -- fix direct userspace memory access in i830 drm driver - -* Mon Mar 22 2004 Arjan van de Ven -- 2.6.5-rc2-bk2 -- some stackbloat reductions from Dave and me - -* Sat Mar 20 2004 Arjan van de Ven -- 2.6.5-rc2 - -* Tue Mar 16 2004 Dave Jones -- 2.6.5-rc1 - -* Mon Mar 15 2004 Arjan van de Ven -- 2.6.4-bk3 -- fix oops in toshiba_acpi (Barry K. Nathan) - -* Sat Mar 13 2004 Arjan van de Ven -- 2.6.4-bk2 merge - -* Thu Mar 11 2004 Arjan van de Ven -- renable sonypi driver that was off accidentally -- 2.6.4-final -- fix the oops on alsa module unloads - -* Wed Mar 10 2004 Arjan van de Ven -- add ppc64/iseries, ppc32 (powermac/ibook) and ia64 architectures -- 2.6.4-rc3 - -* Tue Mar 09 2004 Arjan van de Ven -- 2.6.4-rc2-bk5 -- fix nfs-vs-selinux issue -- fix typo in URL as per #117849 - -* Mon Mar 08 2004 Arjan van de Ven -- fix race in lp.c (#117710) -- 2.6.4-rc2-bk3 -- attempt to fix S3 suspend-to-ram with 4g/4g split - -* Sat Mar 06 2004 Arjan van de Ven -- fix reiserfs -- set HZ to 1000 again for some tests - -* Wed Feb 25 2004 Arjan van de Ven -- merge back a bunch of fedora fixes -- disable audit - -* Tue Feb 24 2004 Arjan van de Ven -- audit bugfixes -- update tux to a working version -- 2.6.3-bk5 merge - -* Fri Feb 20 2004 Arjan van de Ven -- re-add and enable the Auditing patch -- switch several cpufreq modules to built in since detecting in userspace - which to use is unpleasant +* Tue Mar 26 2006 Dave Jones +- 2.6.16.1 -* Thu Jul 03 2003 Arjan van de Ven -- 2.6 start +* Mon Mar 25 2006 Dave Jones +- Include patches posted for review for inclusion in 2.6.16.1 +- Updated new audit msg types. +- Reenable HDLC driver (#186257) +- Make acpi-cpufreq 'sticky' +- Fix broken x86-64 32bit vDSO (#186924) + +* Tue Mar 21 2006 Dave Jones +- Improve spinlock scalability on big machines. + +* Mon Mar 20 2006 Dave Jones +- Sync with FC5's 2.6.16 kernel. +- Update Tux & Exec-shield to latest. linux-2.6-crashdump-common.patch: linux-2.6.12/Documentation/sysrq.txt | 8 linux-2.6.12/arch/i386/kernel/nmi.c | 1 linux-2.6.12/arch/i386/kernel/traps.c | 3 linux-2.6.12/arch/i386/mm/init.c | 47 +++++ linux-2.6.12/arch/ia64/kernel/process.c | 30 ++- linux-2.6.12/arch/ia64/kernel/traps.c | 6 linux-2.6.12/arch/ia64/mm/contig.c | 3 linux-2.6.12/arch/ia64/mm/discontig.c | 3 linux-2.6.12/arch/ia64/mm/init.c | 90 +++++++++ linux-2.6.12/arch/powerpc/kernel/process.c | 1 linux-2.6.12/arch/powerpc/kernel/traps.c | 3 linux-2.6.12/arch/powerpc/mm/mem.c | 29 +++ linux-2.6.12/arch/s390/kernel/traps.c | 6 linux-2.6.12/arch/x86_64/kernel/process.c | 2 linux-2.6.12/arch/x86_64/kernel/traps.c | 6 linux-2.6.12/arch/x86_64/mm/init.c | 32 +++ linux-2.6.12/drivers/char/sysrq.c | 2 linux-2.6.12/include/asm-generic/crashdump.h | 47 +++++ linux-2.6.12/include/asm-i386/crashdump.h | 123 +++++++++++++ linux-2.6.12/include/asm-i386/kmap_types.h | 4 linux-2.6.12/include/asm-ia64/crashdump.h | 72 +++++++ linux-2.6.12/include/asm-powerpc/crashdump.h | 61 ++++++ linux-2.6.12/include/asm-x86_64/crashdump.h | 86 +++++++++ linux-2.6.12/include/linux/kernel.h | 18 + linux-2.6.12/kernel/Makefile | 2 linux-2.6.12/kernel/dump.c | 246 +++++++++++++++++++++++++++ linux-2.6.12/kernel/panic.c | 4 linux-2.6.12/kernel/printk.c | 20 ++ linux-2.6.12/kernel/sched.c | 2 linux-2.6.13/arch/x86_64/mm/fault.c | 1 linux-2.6.13/drivers/char/sysrq.c | 5 linux-2.6.16/arch/i386/mm/pgtable.c | 3 32 files changed, 952 insertions(+), 14 deletions(-) Index: linux-2.6-crashdump-common.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-4/linux-2.6-crashdump-common.patch,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- linux-2.6-crashdump-common.patch 6 Jan 2006 05:42:17 -0000 1.6 +++ linux-2.6-crashdump-common.patch 28 Mar 2006 16:14:09 -0000 1.7 @@ -1,23 +1,5 @@ --- linux-2.6.12/drivers/char/sysrq.c.orig 2005-08-18 12:40:07.000000000 -0400 +++ linux-2.6.12/drivers/char/sysrq.c 2005-08-18 14:29:25.000000000 -0400 -@@ -125,6 +125,17 @@ - .enable_mask = SYSRQ_ENABLE_BOOT, - }; - -+/* crash sysrq handler */ -+static void sysrq_handle_crash(int key, struct pt_regs *pt_regs, -+ struct tty_struct *tty) { -+ *( (char *) 0) = 0; -+} -+static struct sysrq_key_op sysrq_crash_op = { -+ .handler = sysrq_handle_crash, -+ .help_msg = "Crash", -+ .action_msg = "Crashing the kernel by request", -+}; -+ - static void sysrq_handle_sync(int key, struct pt_regs *pt_regs, - struct tty_struct *tty) - { @@ -289,7 +300,7 @@ it is handled specially on the sparc and will never arrive */ @@ -414,10 +396,10 @@ /* Values used for system_state */ extern enum system_states { SYSTEM_BOOTING, -@@ -182,6 +193,7 @@ - SYSTEM_HALT, +@@ -197,6 +197,7 @@ extern enum system_states { SYSTEM_POWER_OFF, SYSTEM_RESTART, + SYSTEM_SUSPEND_DISK, + SYSTEM_DUMPING, } system_state; @@ -797,14 +779,14 @@ --- linux-2.6.12/kernel/Makefile.orig 2005-08-18 12:41:10.000000000 -0400 +++ linux-2.6.12/kernel/Makefile 2005-08-18 14:23:59.000000000 -0400 @@ -7,7 +7,7 @@ - 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 + kthread.o wait.o kfifo.o sys_ni.o posix-cpu-timers.o mutex.o \ +- hrtimer.o ++ hrtimer.o dump.o + obj-$(CONFIG_DEBUG_MUTEXES) += mutex-debug.o obj-$(CONFIG_FUTEX) += futex.o - obj-$(CONFIG_GENERIC_ISA_DMA) += dma.o --- linux-2.6.12/kernel/sched.c.orig 2005-08-18 12:41:14.000000000 -0400 +++ linux-2.6.12/kernel/sched.c 2005-08-18 14:32:27.000000000 -0400 @@ -4177,6 +4177,8 @@ @@ -905,8 +887,8 @@ /* * devmem_is_allowed() checks to see if /dev/mem access to a certain address is * valid. The argument is a physical page number. ---- linux-2.6.12/arch/i386/mm/pgtable.c.orig 2005-08-18 12:39:56.000000000 -0400 -+++ linux-2.6.12/arch/i386/mm/pgtable.c 2005-08-18 14:23:58.000000000 -0400 +--- linux-2.6.16/arch/i386/mm/pgtable.c~ 2006-03-20 22:19:50.000000000 -0500 ++++ linux-2.6.16/arch/i386/mm/pgtable.c 2006-03-20 22:19:59.000000000 -0500 @@ -13,6 +13,7 @@ #include #include @@ -949,7 +931,7 @@ EXPORT_SYMBOL(release_lapic_nmi); EXPORT_SYMBOL(disable_timer_nmi_watchdog); EXPORT_SYMBOL(enable_timer_nmi_watchdog); -+EXPORT_SYMBOL(touch_nmi_watchdog); ++EXPORT_SYMBOL_GPL(touch_nmi_watchdog); --- linux-2.6.13/arch/x86_64/mm/fault.c~ 2005-09-13 00:42:55.000000000 -0400 +++ linux-2.6.13/arch/x86_64/mm/fault.c 2005-09-13 00:43:20.000000000 -0400 @@ -536,6 +536,7 @@ no_context: linux-2.6-crashdump-reboot-exports.patch: linux-2.6.12/arch/i386/kernel/process.c | 2 ++ linux-2.6.12/arch/i386/kernel/reboot.c | 4 ++++ linux-2.6.12/arch/powerpc/kernel/setup-common.c | 2 ++ linux-2.6.12/arch/powerpc/kernel/setup_64.c | 2 ++ linux-2.6.12/arch/s390/kernel/process.c | 2 ++ linux-2.6.12/arch/s390/kernel/setup.c | 4 ++++ linux-2.6.12/arch/x86_64/kernel/reboot.c | 4 ++++ linux-2.6.14/arch/ia64/kernel/process.c | 2 ++ 8 files changed, 22 insertions(+) Index: linux-2.6-crashdump-reboot-exports.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-4/linux-2.6-crashdump-reboot-exports.patch,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- linux-2.6-crashdump-reboot-exports.patch 6 Jan 2006 05:42:17 -0000 1.6 +++ linux-2.6-crashdump-reboot-exports.patch 28 Mar 2006 16:14:09 -0000 1.7 @@ -4,7 +4,7 @@ show_trace(0,(unsigned long *) regs->gprs[15]); } -+EXPORT_SYMBOL(show_regs); ++EXPORT_SYMBOL_GPL(show_regs); + extern void kernel_thread_starter(void); @@ -15,7 +15,7 @@ _machine_restart(command); } -+EXPORT_SYMBOL(machine_restart); ++EXPORT_SYMBOL_GPL(machine_restart); + void machine_halt(void) { @@ -23,7 +23,7 @@ _machine_halt(); } -+EXPORT_SYMBOL(machine_halt); ++EXPORT_SYMBOL_GPL(machine_halt); + void machine_power_off(void) { @@ -34,7 +34,7 @@ (void) notify_die(DIE_MACHINE_RESTART, restart_cmd, NULL, 0, 0, 0); (*efi.reset_system)(EFI_RESET_WARM, 0, 0, NULL); } -+EXPORT_SYMBOL(machine_restart); ++EXPORT_SYMBOL_GPL(machine_restart); void machine_halt (void) @@ -42,7 +42,7 @@ (void) notify_die(DIE_MACHINE_HALT, "", NULL, 0, 0, 0); cpu_halt(); } -+EXPORT_SYMBOL(machine_halt); ++EXPORT_SYMBOL_GPL(machine_halt); void machine_power_off (void) @@ -52,7 +52,7 @@ while (1) ; } -+EXPORT_SYMBOL(machine_restart); ++EXPORT_SYMBOL_GPL(machine_restart); + void machine_power_off(void) { @@ -63,7 +63,7 @@ while (1) ; } -+EXPORT_SYMBOL(machine_halt); ++EXPORT_SYMBOL_GPL(machine_halt); + static int ppc64_panic_event(struct notifier_block *this, unsigned long event, void *ptr) @@ -74,7 +74,7 @@ show_trace(NULL, ®s->esp); } -+EXPORT_SYMBOL(show_regs); ++EXPORT_SYMBOL_GPL(show_regs); + /* * This gets run with %ebx containing the @@ -85,13 +85,13 @@ machine_emergency_restart(); } -+EXPORT_SYMBOL(machine_restart); ++EXPORT_SYMBOL_GPL(machine_restart); + void machine_halt(void) { } -+EXPORT_SYMBOL(machine_halt); ++EXPORT_SYMBOL_GPL(machine_halt); + void machine_power_off(void) { @@ -102,13 +102,13 @@ machine_emergency_restart(); } -+EXPORT_SYMBOL(machine_restart); ++EXPORT_SYMBOL_GPL(machine_restart); + void machine_halt(void) { } -+EXPORT_SYMBOL(machine_halt); ++EXPORT_SYMBOL_GPL(machine_halt); + void machine_power_off(void) { linux-2.6-debug-dual-line-backtrace.patch: traps.c | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) Index: linux-2.6-debug-dual-line-backtrace.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-4/linux-2.6-debug-dual-line-backtrace.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- linux-2.6-debug-dual-line-backtrace.patch 6 Jan 2006 05:42:17 -0000 1.1 +++ linux-2.6-debug-dual-line-backtrace.patch 28 Mar 2006 16:14:09 -0000 1.2 @@ -1,29 +1,22 @@ ---- linux-2.6.14/arch/i386/kernel/traps.c~ 2005-12-01 04:25:36.000000000 -0500 -+++ linux-2.6.14/arch/i386/kernel/traps.c 2005-12-01 04:36:19.000000000 -0500 -@@ -116,6 +116,7 @@ static inline unsigned long print_contex - unsigned long *stack, unsigned long ebp) - { - unsigned long addr; -+ char space=0; +--- linux-2.6.15.noarch/arch/i386/kernel/traps.c~ 2006-01-17 01:46:02.000000000 -0500 ++++ linux-2.6.15.noarch/arch/i386/kernel/traps.c 2006-01-17 01:46:50.000000000 -0500 +@@ -114,10 +114,17 @@ static inline int valid_stack_ptr(struct - #ifdef CONFIG_FRAME_POINTER - while (valid_stack_ptr(tinfo, (void *)ebp)) { -@@ -131,9 +132,17 @@ static inline unsigned long print_contex - if (__kernel_text_address(addr)) { - printk(" [<%08lx>]", addr); - print_symbol(" %s", addr); -- printk("\n"); -+ if (space == 0) { -+ printk(" "); -+ space = 1; -+ } else { -+ printk("\n"); -+ space = 0; -+ } - } - } -+ if (space==1) + static void print_addr_and_symbol(unsigned long addr, char *log_lvl) + { +- printk(log_lvl); ++ static char space=0; ++ ++ if (space == 0) ++ printk(log_lvl); + printk(" [<%08lx>] ", addr); + print_symbol("%s", addr); +- printk("\n"); ++ if (space == 0) ++ printk(" "); ++ else + printk("\n"); - #endif - return ebp; ++ space = !space; } + + static inline unsigned long print_context_stack(struct thread_info *tinfo, linux-2.6-debug-singlebiterror.patch: slab.c | 15 +++++++++++++++ 1 files changed, 15 insertions(+) Index: linux-2.6-debug-singlebiterror.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-4/linux-2.6-debug-singlebiterror.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- linux-2.6-debug-singlebiterror.patch 28 Oct 2005 05:23:06 -0000 1.3 +++ linux-2.6-debug-singlebiterror.patch 28 Mar 2006 16:14:09 -0000 1.4 @@ -1,18 +1,17 @@ ---- linux-2.6.11/mm/slab.c~ 2005-05-01 00:51:59.000000000 -0400 -+++ linux-2.6.11/mm/slab.c 2005-05-01 01:19:38.000000000 -0400 -@@ -1004,8 +1004,12 @@ static void poison_obj(kmem_cache_t *cac +--- linux-2.6.15/mm/slab.c~ 2006-01-09 13:25:17.000000000 -0500 ++++ linux-2.6.15/mm/slab.c 2006-01-09 13:26:01.000000000 -0500 +@@ -1313,8 +1313,11 @@ static void poison_obj(kmem_cache_t *cac static void dump_line(char *data, int offset, int limit) { int i; + unsigned char total=0; -+ printk(KERN_ERR "%03x:", offset); - for (i=0;iowner && lock->owner != SPINLOCK_OWNER_INIT) owner = lock->owner; -- printk("BUG: spinlock %s on CPU#%d, %s/%d\n", -+ printk("BUG: spinlock %s on CPU#%d, %s/%d (%s)\n", +- printk(KERN_EMERG "BUG: spinlock %s on CPU#%d, %s/%d\n", ++ printk(KERN_EMERG "BUG: spinlock %s on CPU#%d, %s/%d (%s)\n", msg, raw_smp_processor_id(), - current->comm, current->pid); -+ current->comm, current->pid, print_tainted()); - printk(" lock: %p, .magic: %08x, .owner: %s/%d, .owner_cpu: %d\n", ++ current->comm, current->pid, print_tainted()); + printk(KERN_EMERG " lock: %p, .magic: %08x, .owner: %s/%d, " + ".owner_cpu: %d\n", lock, lock->magic, - owner ? owner->comm : "", -@@ -78,9 +78,9 @@ static void __spin_lock_debug(spinlock_t - /* lockup suspected: */ +@@ -80,9 +80,9 @@ static void __spin_lock_debug(spinlock_t if (print_once) { print_once = 0; -- printk("BUG: spinlock lockup on CPU#%d, %s/%d, %p\n", -+ printk("BUG: spinlock lockup on CPU#%d, %s/%d, %p (%s)\n", + printk(KERN_EMERG "BUG: spinlock lockup on CPU#%d, " +- "%s/%d, %p\n", ++ "%s/%d, %p (%s)\n", raw_smp_processor_id(), current->comm, - current->pid, lock); + current->pid, lock, print_tainted()); dump_stack(); } } -@@ -120,9 +120,9 @@ static void rwlock_bug(rwlock_t *lock, c +@@ -122,9 +122,9 @@ static void rwlock_bug(rwlock_t *lock, c static long print_once = 1; if (xchg(&print_once, 0)) { -- printk("BUG: rwlock %s on CPU#%d, %s/%d, %p\n", msg, -+ printk("BUG: rwlock %s on CPU#%d, %s/%d, %p (%s)\n", msg, - raw_smp_processor_id(), current->comm, +- printk(KERN_EMERG "BUG: rwlock %s on CPU#%d, %s/%d, %p\n", ++ printk(KERN_EMERG "BUG: rwlock %s on CPU#%d, %s/%d, %p (%s)\n", + msg, raw_smp_processor_id(), current->comm, - current->pid, lock); + current->pid, lock, print_tainted()); dump_stack(); #ifdef CONFIG_SMP /* -@@ -149,9 +149,9 @@ static void __read_lock_debug(rwlock_t * - /* lockup suspected: */ +@@ -152,9 +152,9 @@ static void __read_lock_debug(rwlock_t * if (print_once) { print_once = 0; -- printk("BUG: read-lock lockup on CPU#%d, %s/%d, %p\n", -+ printk("BUG: read-lock lockup on CPU#%d, %s/%d, %p (%s)\n", + printk(KERN_EMERG "BUG: read-lock lockup on CPU#%d, " +- "%s/%d, %p\n", ++ "%s/%d, %p (%s)\n", raw_smp_processor_id(), current->comm, - current->pid, lock); + current->pid, lock, print_tainted()); dump_stack(); } } -@@ -221,9 +221,9 @@ static void __write_lock_debug(rwlock_t - /* lockup suspected: */ +@@ -225,9 +225,9 @@ static void __write_lock_debug(rwlock_t if (print_once) { print_once = 0; -- printk("BUG: write-lock lockup on CPU#%d, %s/%d, %p\n", -+ printk("BUG: write-lock lockup on CPU#%d, %s/%d, %p (%s)\n", + printk(KERN_EMERG "BUG: write-lock lockup on CPU#%d, " +- "%s/%d, %p\n", ++ "%s/%d, %p (%s)\n", raw_smp_processor_id(), current->comm, - current->pid, lock); + current->pid, lock, print_tainted()); linux-2.6-debug-sysfs-crash-debugging.patch: devel-akpm/arch/i386/kernel/traps.c | 5 +++++ devel-akpm/fs/sysfs/file.c | 8 ++++++++ linux-2.6.14/arch/x86_64/kernel/traps.c | 5 +++++ 3 files changed, 18 insertions(+) Index: linux-2.6-debug-sysfs-crash-debugging.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-4/linux-2.6-debug-sysfs-crash-debugging.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- linux-2.6-debug-sysfs-crash-debugging.patch 6 Jan 2006 05:42:17 -0000 1.1 +++ linux-2.6-debug-sysfs-crash-debugging.patch 28 Mar 2006 16:14:09 -0000 1.2 @@ -75,13 +75,13 @@ int register_die_notifier(struct notifier_block *nb) { int err = 0; -@@ -385,6 +387,9 @@ void __die(const char * str, struct pt_r +@@ -416,6 +416,9 @@ void __die(const char * str, struct pt_r printk("DEBUG_PAGEALLOC"); #endif printk("\n"); +#ifdef CONFIG_SYSFS + printk(KERN_ALERT "last sysfs file: %s\n", last_sysfs_file); +#endif - notify_die(DIE_OOPS, (char *)str, regs, err, 255, SIGSEGV); + notify_die(DIE_OOPS, str, regs, err, current->thread.trap_no, SIGSEGV); show_registers(regs); /* Executive summary in case the oops scrolled away */ linux-2.6-debug-taint-vm.patch: linux-2.6.11/include/asm-generic/bug.h | 8 ++++++-- linux-2.6.15/mm/page_alloc.c | 4 ++-- linux-2.6.15/mm/slab.c | 4 ++-- linux-2000/kernel/panic.c | 1 + 4 files changed, 11 insertions(+), 6 deletions(-) Index: linux-2.6-debug-taint-vm.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-4/linux-2.6-debug-taint-vm.patch,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- linux-2.6-debug-taint-vm.patch 6 Jan 2006 05:42:17 -0000 1.4 +++ linux-2.6-debug-taint-vm.patch 28 Mar 2006 16:14:09 -0000 1.5 @@ -36,31 +36,33 @@ void add_taint(unsigned flag) { ---- linux-2.6.14/mm/page_alloc.c~ 2005-11-15 12:09:41.000000000 -0500 -+++ linux-2.6.14/mm/page_alloc.c 2005-11-15 12:10:01.000000000 -0500 -@@ -126,9 +126,9 @@ static void bad_page(const char *functio +--- linux-2.6.15/mm/page_alloc.c~ 2006-01-07 20:48:33.000000000 -0500 ++++ linux-2.6.15/mm/page_alloc.c 2006-01-07 20:49:24.000000000 -0500 +@@ -137,12 +137,12 @@ static inline int bad_range(struct zone + static void bad_page(struct page *page) { - 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(unsigned long)), (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"); + printk(KERN_EMERG "Bad page state in process '%s'\n" +- KERN_EMERG "page:%p flags:0x%0*lx mapping:%p mapcount:%d count:%d\n" ++ KERN_EMERG "page:%p flags:0x%0*lx mapping:%p mapcount:%d count:%d (%s)\n" + KERN_EMERG "Trying to fix it up, but a reboot is needed\n" + KERN_EMERG "Backtrace:\n", + current->comm, page, (int)(2*sizeof(unsigned long)), + (unsigned long)page->flags, page->mapping, +- page_mapcount(page), page_count(page)); ++ page_mapcount(page), page_count(page), print_tainted()); 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 ! */ + page->flags &= ~(1 << PG_lru | + 1 << PG_private | +--- linux-2.6.15/mm/slab.c~ 2006-01-09 13:19:33.000000000 -0500 ++++ linux-2.6.15/mm/slab.c 2006-01-09 13:19:55.000000000 -0500 +@@ -1371,8 +1371,8 @@ static void check_poison_obj(kmem_cache_ /* 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); + printk(KERN_ERR +- "Slab corruption: start=%p, len=%d\n", +- realobj, size); ++ "Slab corruption: (%s) start=%p, len=%d\n", ++ print_tainted(), realobj, size); print_objinfo(cachep, objp, 0); + dump_stack(); } - /* Hexdump the affected line */ linux-2.6-devmem.patch: arch/powerpc/mm/mem.c | 14 +++ linux-1050/arch/i386/mm/init.c | 19 ++++ linux-1050/arch/ia64/mm/init.c | 7 + linux-1050/arch/s390/mm/init.c | 5 + linux-1050/arch/x86_64/mm/init.c | 20 ++++ linux-1050/drivers/char/mem.c | 146 ++++---------------------------- linux-1050/fs/proc/kcore.c | 2 linux-1050/include/asm-alpha/page.h | 1 linux-1050/include/asm-arm/page.h | 2 linux-1050/include/asm-arm26/page.h | 2 linux-1050/include/asm-cris/page.h | 2 linux-1050/include/asm-h8300/page.h | 2 linux-1050/include/asm-i386/page.h | 4 linux-1050/include/asm-ia64/page.h | 2 linux-1050/include/asm-m68k/page.h | 2 linux-1050/include/asm-m68knommu/page.h | 2 linux-1050/include/asm-mips/page.h | 2 linux-1050/include/asm-parisc/page.h | 2 linux-1050/include/asm-ppc/page.h | 2 linux-1050/include/asm-s390/page.h | 2 linux-1050/include/asm-sh/page.h | 2 linux-1050/include/asm-sh64/page.h | 2 linux-1050/include/asm-sparc/page.h | 2 linux-1050/include/asm-sparc64/page.h | 2 linux-1050/include/asm-um/page.h | 1 linux-1050/include/asm-v850/page.h | 2 linux-1050/include/asm-x86_64/page.h | 4 linux-2.6.13/arch/x86_64/mm/init.c | 22 ++++ linux-2.6.14/include/asm-powerpc/page.h | 2 29 files changed, 154 insertions(+), 125 deletions(-) Index: linux-2.6-devmem.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-4/linux-2.6-devmem.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- linux-2.6-devmem.patch 6 Jan 2006 05:42:17 -0000 1.2 +++ linux-2.6-devmem.patch 28 Mar 2006 16:14:09 -0000 1.3 @@ -299,7 +299,7 @@ - return virtr + wrote; -} - - #if (defined(CONFIG_ISA) || !defined(__mc68000__)) && (!defined(CONFIG_PPC_ISERIES) || defined(CONFIG_PCI)) + #if defined(CONFIG_ISA) || !defined(__mc68000__) static ssize_t read_port(struct file * file, char __user * buf, size_t count, loff_t *ppos) @@ -717,7 +617,6 @@ static struct file_operations mem_fops = linux-2.6-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-powerpc/diskdump.h | 55 ++ include/asm-ppc/diskdump.h | 6 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-diskdump.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-4/linux-2.6-diskdump.patch,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- linux-2.6-diskdump.patch 6 Jan 2006 05:42:17 -0000 1.5 +++ linux-2.6-diskdump.patch 28 Mar 2006 16:14:09 -0000 1.6 @@ -1233,11 +1233,10 @@ open_softirq(TASKLET_SOFTIRQ, tasklet_action, NULL); --- linux-2.6.12/kernel/timer.c.diskdump.orig 2005-08-19 16:44:27.502410144 -0400 +++ linux-2.6.12/kernel/timer.c 2005-08-19 16:49:13.988620772 -0400 -@@ -33,6 +33,8 @@ - #include +@@ -34,6 +34,7 @@ #include #include -+#include + #include +#include #include linux-2.6-dump_smp_call_function.patch: arch/i386/kernel/smp.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ arch/ia64/kernel/smp.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ arch/powerpc/kernel/smp.c | 45 ++++++++++++++++++++++++++++++++++++++++++++- arch/x86_64/kernel/smp.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ drivers/block/diskdump.c | 2 +- drivers/net/netdump.c | 2 +- include/linux/smp.h | 2 ++ 7 files changed, 181 insertions(+), 3 deletions(-) Index: linux-2.6-dump_smp_call_function.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-4/linux-2.6-dump_smp_call_function.patch,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- linux-2.6-dump_smp_call_function.patch 6 Jan 2006 05:42:17 -0000 1.8 +++ linux-2.6-dump_smp_call_function.patch 28 Mar 2006 16:14:09 -0000 1.9 @@ -59,7 +59,7 @@ + /* Don't wait */ + spin_unlock(&dump_call_lock); +} -+EXPORT_SYMBOL(dump_smp_call_function); ++EXPORT_SYMBOL_GPL(dump_smp_call_function); + +/* * this function sends a 'generic call function' IPI to all other CPUs @@ -125,7 +125,7 @@ + spin_unlock(&dump_call_lock); +} + -+EXPORT_SYMBOL(dump_smp_call_function); ++EXPORT_SYMBOL_GPL(dump_smp_call_function); + +/* * This function sends a 'generic call function' IPI to all other CPUs @@ -187,7 +187,7 @@ + spin_unlock(&dump_call_lock); +} + -+EXPORT_SYMBOL(dump_smp_call_function); ++EXPORT_SYMBOL_GPL(dump_smp_call_function); /* * this function sends a 'generic call function' IPI to all other CPUs @@ -255,7 +255,7 @@ + /* Don't wait */ + spin_unlock(&dump_call_lock); +} -+EXPORT_SYMBOL(dump_smp_call_function); ++EXPORT_SYMBOL_GPL(dump_smp_call_function); void lock_ipi_call_lock(void) { linux-2.6-execshield.patch: arch/i386/kernel/asm-offsets.c | 1 arch/i386/kernel/cpu/common.c | 7 + 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 | 81 +++++++++++++++ arch/i386/kernel/traps.c | 93 +++++++++++++++++ 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/powerpc/kernel/vdso.c | 3 arch/x86_64/ia32/ia32_binfmt.c | 6 - arch/x86_64/ia32/syscall32.c | 4 arch/x86_64/kernel/process.c | 6 - arch/x86_64/kernel/setup64.c | 23 ---- arch/x86_64/mm/fault.c | 2 arch/x86_64/mm/mmap.c | 99 ++++++++++++++---- drivers/char/random.c | 7 + fs/binfmt_elf.c | 151 ++++++++++++++++++++++------ fs/proc/array.c | 8 + fs/proc/base.c | 8 - fs/proc/task_mmu.c | 34 +++++- include/asm-i386/a.out.h | 2 include/asm-i386/desc.h | 14 ++ include/asm-i386/elf.h | 50 ++++++--- include/asm-i386/mmu.h | 6 + include/asm-i386/page.h | 5 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-powerpc/pgalloc.h | 5 include/asm-ppc/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/pgtable.h | 2 include/linux/mm.h | 16 ++- include/linux/resource.h | 5 include/linux/sched.h | 9 + include/linux/sysctl.h | 3 kernel/signal.c | 38 +++++++ kernel/sysctl.c | 57 ++++++++++ mm/fremap.c | 16 +-- mm/mmap.c | 183 +++++++++++++++++++++++++++++++++-- mm/mprotect.c | 5 mm/mremap.c | 4 51 files changed, 929 insertions(+), 160 deletions(-) Index: linux-2.6-execshield.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-4/linux-2.6-execshield.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- linux-2.6-execshield.patch 6 Jan 2006 05:42:17 -0000 1.3 +++ linux-2.6-execshield.patch 28 Mar 2006 16:14:09 -0000 1.4 @@ -1,6 +1,7 @@ -diff -urNp --exclude-from=/home/davej/.exclude linux-804/arch/i386/kernel/asm-offsets.c linux-810/arch/i386/kernel/asm-offsets.c ---- linux-804/arch/i386/kernel/asm-offsets.c -+++ linux-810/arch/i386/kernel/asm-offsets.c +Index: linux/arch/i386/kernel/asm-offsets.c +=================================================================== +--- linux.orig/arch/i386/kernel/asm-offsets.c ++++ 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); @@ -9,9 +10,28 @@ BLANK(); OFFSET(EXEC_DOMAIN_handler, exec_domain, handler); -diff -urNp --exclude-from=/home/davej/.exclude linux-804/arch/i386/kernel/entry.S linux-810/arch/i386/kernel/entry.S ---- linux-804/arch/i386/kernel/entry.S -+++ linux-810/arch/i386/kernel/entry.S +Index: linux/arch/i386/kernel/cpu/common.c +=================================================================== +--- linux.orig/arch/i386/kernel/cpu/common.c ++++ linux/arch/i386/kernel/cpu/common.c +@@ -408,6 +408,13 @@ void __devinit identify_cpu(struct cpuin + if (disable_pse) + clear_bit(X86_FEATURE_PSE, c->x86_capability); + ++ if (exec_shield != 0) { ++#ifdef CONFIG_HIGHMEM64G /* NX implies PAE */ ++ if (!test_bit(X86_FEATURE_NX, c->x86_capability)) ++#endif ++ clear_bit(X86_FEATURE_SEP, c->x86_capability); ++ } ++ + /* If the model name is still unset, do table lookup. */ + if ( !c->x86_model_id[0] ) { + char *p; +Index: linux/arch/i386/kernel/entry.S +=================================================================== +--- linux.orig/arch/i386/kernel/entry.S ++++ linux/arch/i386/kernel/entry.S @@ -184,8 +184,12 @@ sysenter_past_esp: pushl %ebp pushfl @@ -27,10 +47,11 @@ /* * Load the potential sixth argument from user stack. * Careful about security. -diff -urNp --exclude-from=/home/davej/.exclude linux-804/arch/i386/kernel/process.c linux-810/arch/i386/kernel/process.c ---- linux-804/arch/i386/kernel/process.c -+++ linux-810/arch/i386/kernel/process.c -@@ -676,6 +676,8 @@ struct task_struct fastcall * __switch_t +Index: linux/arch/i386/kernel/process.c +=================================================================== +--- linux.orig/arch/i386/kernel/process.c ++++ linux/arch/i386/kernel/process.c +@@ -638,6 +638,8 @@ struct task_struct fastcall * __switch_t /* never put a printk in __switch_to... printk() calls wake_up*() indirectly */ __unlazy_fpu(prev_p); @@ -39,7 +60,7 @@ /* * Reload esp0. -@@ -949,3 +951,60 @@ unsigned long arch_align_stack(unsigned +@@ -911,3 +913,60 @@ unsigned long arch_align_stack(unsigned sp -= get_random_int() % 8192; return sp & ~0xf; } @@ -100,10 +121,11 @@ + current->mm->brk = new_brk; +} + -diff -urNp --exclude-from=/home/davej/.exclude linux-804/arch/i386/kernel/signal.c linux-810/arch/i386/kernel/signal.c ---- linux-804/arch/i386/kernel/signal.c -+++ linux-810/arch/i386/kernel/signal.c -@@ -380,7 +380,7 @@ static int setup_frame(int sig, struct k +Index: linux/arch/i386/kernel/signal.c +=================================================================== +--- linux.orig/arch/i386/kernel/signal.c ++++ linux/arch/i386/kernel/signal.c +@@ -350,7 +350,7 @@ static int setup_frame(int sig, struct k goto give_sigsegv; } @@ -112,7 +134,7 @@ if (ka->sa.sa_flags & SA_RESTORER) restorer = ka->sa.sa_restorer; -@@ -476,7 +476,7 @@ static int setup_rt_frame(int sig, struc +@@ -446,7 +446,7 @@ static int setup_rt_frame(int sig, struc goto give_sigsegv; /* Set up to return from userspace. */ @@ -121,10 +143,11 @@ if (ka->sa.sa_flags & SA_RESTORER) restorer = ka->sa.sa_restorer; err |= __put_user(restorer, &frame->pretcode); -diff -urNp --exclude-from=/home/davej/.exclude linux-804/arch/i386/kernel/smp.c linux-810/arch/i386/kernel/smp.c ---- linux-804/arch/i386/kernel/smp.c -+++ linux-810/arch/i386/kernel/smp.c -@@ -24,6 +24,7 @@ +Index: linux/arch/i386/kernel/smp.c +=================================================================== +--- linux.orig/arch/i386/kernel/smp.c ++++ linux/arch/i386/kernel/smp.c +@@ -23,6 +23,7 @@ #include #include @@ -132,7 +155,7 @@ #include /* -@@ -315,6 +316,8 @@ fastcall void smp_invalidate_interrupt(s +@@ -314,6 +315,8 @@ fastcall void smp_invalidate_interrupt(s unsigned long cpu; cpu = get_cpu(); @@ -141,90 +164,119 @@ if (!cpu_isset(cpu, flush_cpumask)) goto out; -diff -urNp --exclude-from=/home/davej/.exclude linux-804/arch/i386/kernel/sysenter.c linux-810/arch/i386/kernel/sysenter.c ---- linux-804/arch/i386/kernel/sysenter.c -+++ linux-810/arch/i386/kernel/sysenter.c -@@ -13,6 +13,7 @@ +Index: linux/arch/i386/kernel/sysenter.c +=================================================================== +--- linux.orig/arch/i386/kernel/sysenter.c ++++ linux/arch/i386/kernel/sysenter.c +@@ -13,7 +13,9 @@ #include #include #include +#include ++#include #include #include -@@ -46,11 +47,20 @@ void enable_sep_cpu(void) + #include +@@ -46,11 +48,13 @@ void enable_sep_cpu(void) extern const char vsyscall_int80_start, vsyscall_int80_end; extern const char vsyscall_sysenter_start, vsyscall_sysenter_end; -+struct page *sysenter_page; ++static struct page *sysenter_pages[2]; + 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); ++ sysenter_pages[0] = virt_to_page(page); if (!boot_cpu_has(X86_FEATURE_SEP)) { memcpy(page, -@@ -65,3 +75,46 @@ int __init sysenter_setup(void) +@@ -65,3 +69,78 @@ int __init sysenter_setup(void) return 0; } + +extern void SYSENTER_RETURN_OFFSET; + -+unsigned int vdso_enabled = 0; ++unsigned int vdso_enabled = 1; + -+void map_vsyscall(void) ++/* ++ * This is called from binfmt_elf, we create the special vma for the ++ * vDSO and insert it into the mm struct tree. ++ */ ++int arch_setup_additional_pages(struct linux_binprm *bprm, ++ int executable_stack, unsigned long start_code, ++ unsigned long interp_map_address) +{ + struct thread_info *ti = current_thread_info(); -+ struct vm_area_struct *vma; -+ unsigned long addr; ++ unsigned long addr = 0, len; ++ unsigned flags = MAP_PRIVATE; ++ int err; + -+ if (unlikely(!vdso_enabled)) { + current->mm->context.vdso = NULL; -+ return; -+ } ++ if (unlikely(!vdso_enabled) || unlikely(!sysenter_pages[0])) ++ return 0; + + /* + * 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); -+ ++ len = PAGE_SIZE > ELF_EXEC_PAGESIZE ? PAGE_SIZE : ELF_EXEC_PAGESIZE; ++ if (0==exec_shield) { /* off; %cs limit off */ ++ addr = STACK_TOP; /* minimal interference with anybody */ ++ flags = MAP_PRIVATE | MAP_FIXED; ++ } ++ else if ((3<<2) & exec_shield) { /* vdso just below .text */ ++ addr = (((2<<2) & exec_shield) && interp_map_address) ? ++ interp_map_address : start_code; ++ /* 1MB for vm86; 64K for vm86 himem */ ++ if ((0x110000 + len) <= addr) { ++ addr = (PAGE_MASK & addr) - len; ++ } ++ else { /* start_code is too low */ ++ addr = 0; + } + } ++ addr = get_unmapped_area_prot(NULL, addr, len, 0, ++ flags, PROT_READ | PROT_EXEC); ++ if (unlikely(addr & ~PAGE_MASK)) { ++ up_write(¤t->mm->mmap_sem); ++ return addr; ++ } ++ err = install_special_mapping(current->mm, addr, len, ++ VM_DONTEXPAND | VM_READ | VM_EXEC | ++ VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC, ++ PAGE_READONLY_EXEC, ++ sysenter_pages); ++ if (likely(err == 0)) { ++ current->mm->context.vdso = (void *)addr; ++ ti->sysenter_return = &SYSENTER_RETURN_OFFSET + addr; ++ } + up_write(¤t->mm->mmap_sem); ++ return err; +} + -+static int __init vdso_setup(char *str) ++int in_gate_area_no_task(unsigned long addr) +{ -+ vdso_enabled = simple_strtoul(str, NULL, 0); -+ return 1; ++ return 0; ++} ++ ++int in_gate_area(struct task_struct *task, unsigned long addr) ++{ ++ return 0; +} -+__setup("vdso=", vdso_setup); + -diff -urNp --exclude-from=/home/davej/.exclude linux-804/arch/i386/kernel/traps.c linux-810/arch/i386/kernel/traps.c ---- linux-804/arch/i386/kernel/traps.c -+++ linux-810/arch/i386/kernel/traps.c -@@ -458,13 +458,89 @@ DO_ERROR(10, SIGSEGV, "invalid TSS", inv ++struct vm_area_struct *get_gate_vma(struct task_struct *tsk) ++{ ++ return NULL; ++} +Index: linux/arch/i386/kernel/traps.c +=================================================================== +--- linux.orig/arch/i386/kernel/traps.c ++++ linux/arch/i386/kernel/traps.c +@@ -490,7 +490,82 @@ DO_ERROR(10, SIGSEGV, "invalid TSS", inv DO_ERROR(11, SIGBUS, "segment not present", segment_not_present) DO_ERROR(12, SIGBUS, "stack segment", stack_segment) DO_ERROR_INFO(17, SIGBUS, "alignment check", alignment_check, BUS_ADRALN, 0) @@ -262,7 +314,7 @@ + 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; ++ desc2 = get_cpu_gdt_table(cpu) + GDT_ENTRY_DEFAULT_USER_CS; + + if (desc1->a != desc2->a || desc1->b != desc2->b) { + /* @@ -308,14 +360,15 @@ fastcall void __kprobes do_general_protection(struct pt_regs * regs, long error_code) - { +@@ -498,6 +573,7 @@ fastcall void __kprobes do_general_prote int cpu = get_cpu(); struct tss_struct *tss = &per_cpu(init_tss, cpu); struct thread_struct *thread = ¤t->thread; + int ok; /* -@@ -490,7 +566,6 @@ fastcall void do_general_protection(stru + * Perform the lazy TSS's I/O bitmap copy. If the TSS has an +@@ -524,7 +600,6 @@ fastcall void __kprobes do_general_prote put_cpu(); return; } @@ -323,7 +376,7 @@ current->thread.error_code = error_code; current->thread.trap_no = 13; -@@ -501,17 +576,31 @@ fastcall void do_general_protection(stru +@@ -535,17 +610,31 @@ fastcall void __kprobes do_general_prote if (!user_mode(regs)) goto gp_in_kernel; @@ -355,9 +408,29 @@ if (!fixup_exception(regs)) { if (notify_die(DIE_GPF, "general protection fault", regs, error_code, 13, SIGSEGV) == NOTIFY_STOP) -diff -urNp --exclude-from=/home/davej/.exclude linux-804/arch/i386/kernel/vsyscall.lds.S linux-810/arch/i386/kernel/vsyscall.lds.S ---- linux-804/arch/i386/kernel/vsyscall.lds.S -+++ linux-810/arch/i386/kernel/vsyscall.lds.S +Index: linux/arch/i386/kernel/vsyscall-sysenter.S +=================================================================== +--- linux.orig/arch/i386/kernel/vsyscall-sysenter.S ++++ linux/arch/i386/kernel/vsyscall-sysenter.S +@@ -39,11 +39,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 +Index: linux/arch/i386/kernel/vsyscall.lds.S +=================================================================== +--- linux.orig/arch/i386/kernel/vsyscall.lds.S ++++ linux/arch/i386/kernel/vsyscall.lds.S @@ -7,7 +7,7 @@ SECTIONS @@ -376,28 +449,11 @@ .text : { *(.text) } :text =0x90909090 .note : { *(.note.*) } :text :note -diff -urNp --exclude-from=/home/davej/.exclude linux-804/arch/i386/kernel/vsyscall-sysenter.S linux-810/arch/i386/kernel/vsyscall-sysenter.S ---- linux-804/arch/i386/kernel/vsyscall-sysenter.S -+++ linux-810/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 -diff -urNp --exclude-from=/home/davej/.exclude linux-804/arch/i386/mm/init.c linux-810/arch/i386/mm/init.c ---- linux-804/arch/i386/mm/init.c -+++ linux-810/arch/i386/mm/init.c -@@ -401,7 +401,7 @@ u64 __supported_pte_mask = ~_PAGE_NX; +Index: linux/arch/i386/mm/init.c +=================================================================== +--- linux.orig/arch/i386/mm/init.c ++++ linux/arch/i386/mm/init.c +@@ -432,7 +432,7 @@ u64 __supported_pte_mask __read_mostly = * Control non executable mappings. * * on Enable @@ -406,7 +462,7 @@ */ void __init noexec_setup(const char *str) { -@@ -411,6 +411,7 @@ void __init noexec_setup(const char *str +@@ -442,6 +442,7 @@ void __init noexec_setup(const char *str } else if (!strncmp(str,"off",3)) { disable_nx = 1; __supported_pte_mask &= ~_PAGE_NX; @@ -414,7 +470,7 @@ } } -@@ -475,7 +476,10 @@ void __init paging_init(void) +@@ -506,7 +507,10 @@ void __init paging_init(void) set_nx(); if (nx_enabled) printk("NX (Execute Disable) protection: active\n"); @@ -425,15 +481,16 @@ pagetable_init(); -diff -urNp --exclude-from=/home/davej/.exclude linux-804/arch/i386/mm/mmap.c linux-810/arch/i386/mm/mmap.c ---- linux-804/arch/i386/mm/mmap.c -+++ linux-810/arch/i386/mm/mmap.c +Index: linux/arch/i386/mm/mmap.c +=================================================================== +--- linux.orig/arch/i386/mm/mmap.c ++++ 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 || ++ if (!(2 & exec_shield) && (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)) { @@ -448,10 +505,11 @@ mm->unmap_area = arch_unmap_area_topdown; } } -diff -urNp --exclude-from=/home/davej/.exclude linux-804/arch/ia64/ia32/binfmt_elf32.c linux-810/arch/ia64/ia32/binfmt_elf32.c ---- linux-804/arch/ia64/ia32/binfmt_elf32.c -+++ linux-810/arch/ia64/ia32/binfmt_elf32.c -@@ -272,7 +272,7 @@ elf32_set_personality (void) +Index: linux/arch/ia64/ia32/binfmt_elf32.c +=================================================================== +--- linux.orig/arch/ia64/ia32/binfmt_elf32.c ++++ linux/arch/ia64/ia32/binfmt_elf32.c +@@ -264,7 +264,7 @@ elf32_set_personality (void) } static unsigned long @@ -460,36 +518,130 @@ { unsigned long pgoff = (eppnt->p_vaddr) & ~IA32_PAGE_MASK; -diff -urNp --exclude-from=/home/davej/.exclude linux-804/arch/x86_64/ia32/ia32_binfmt.c linux-810/arch/x86_64/ia32/ia32_binfmt.c ---- linux-804/arch/x86_64/ia32/ia32_binfmt.c -+++ linux-810/arch/x86_64/ia32/ia32_binfmt.c -@@ -396,7 +396,7 @@ int setup_arg_pages(struct linux_binprm - } +Index: linux/arch/powerpc/kernel/vdso.c +=================================================================== +--- linux.orig/arch/powerpc/kernel/vdso.c ++++ linux/arch/powerpc/kernel/vdso.c +@@ -218,7 +218,8 @@ static struct vm_operations_struct vdso_ + * vDSO and insert it into the mm struct tree + */ + int arch_setup_additional_pages(struct linux_binprm *bprm, +- int executable_stack) ++ int executable_stack, unsigned long start_code, ++ unsigned long interp_map_address) + { + struct mm_struct *mm = current->mm; + struct vm_area_struct *vma; +Index: linux/arch/x86_64/ia32/ia32_binfmt.c +=================================================================== +--- linux.orig/arch/x86_64/ia32/ia32_binfmt.c ++++ linux/arch/x86_64/ia32/ia32_binfmt.c +@@ -247,8 +247,6 @@ elf_core_copy_task_xfpregs(struct task_s + #define elf_check_arch(x) \ + ((x)->e_machine == EM_386) - 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) +-extern int force_personality32; +- + #define ELF_EXEC_PAGESIZE PAGE_SIZE + #define ELF_HWCAP (boot_cpu_data.x86_capability[0]) + #define ELF_PLATFORM ("i686") +@@ -262,8 +260,6 @@ do { \ + set_thread_flag(TIF_ABI_PENDING); \ + else \ + clear_thread_flag(TIF_ABI_PENDING); \ +- /* XXX This overwrites the user set personality */ \ +- current->personality |= force_personality32; \ + } while (0) + + /* Override some function names */ +@@ -307,7 +303,7 @@ static void elf32_init(struct pt_regs *) + + #define ARCH_HAS_SETUP_ADDITIONAL_PAGES 1 + #define arch_setup_additional_pages syscall32_setup_pages +-extern int syscall32_setup_pages(struct linux_binprm *, int exstack); ++extern int syscall32_setup_pages(struct linux_binprm *, int exstack, unsigned long start_code, unsigned long interp_map_address); + + #include "../../../fs/binfmt_elf.c" + +Index: linux/arch/x86_64/ia32/syscall32.c +=================================================================== +--- linux.orig/arch/x86_64/ia32/syscall32.c ++++ linux/arch/x86_64/ia32/syscall32.c +@@ -42,7 +42,9 @@ static struct vm_operations_struct sysca + struct linux_binprm; + + /* Setup a VMA at program startup for the vsyscall page */ +-int syscall32_setup_pages(struct linux_binprm *bprm, int exstack) ++int syscall32_setup_pages(struct linux_binprm *bprm, int exstack, ++ unsigned long start_code, ++ unsigned long interp_map_address) { - unsigned long map_addr; - struct task_struct *me = current; -diff -urNp --exclude-from=/home/davej/.exclude linux-804/arch/x86_64/kernel/process.c linux-810/arch/x86_64/kernel/process.c ---- linux-804/arch/x86_64/kernel/process.c -+++ linux-810/arch/x86_64/kernel/process.c -@@ -833,10 +833,3 @@ int dump_task_regs(struct task_struct *t - - return 1; + int npages = (VSYSCALL32_END - VSYSCALL32_BASE) >> PAGE_SHIFT; + struct vm_area_struct *vma; +Index: linux/arch/x86_64/kernel/process.c +=================================================================== +--- linux.orig/arch/x86_64/kernel/process.c ++++ linux/arch/x86_64/kernel/process.c +@@ -660,12 +660,6 @@ void set_personality_64bit(void) + + /* Make sure to be in 64bit mode */ + clear_thread_flag(TIF_IA32); +- +- /* TBD: overwrites user setup. Should have two bits. +- But 64bit processes have always behaved this way, +- so it's not too bad. The main problem is just that +- 32bit childs are affected again. */ +- current->personality &= ~READ_IMPLIES_EXEC; } + + asmlinkage long sys_fork(struct pt_regs *regs) +Index: linux/arch/x86_64/kernel/setup64.c +=================================================================== +--- linux.orig/arch/x86_64/kernel/setup64.c ++++ linux/arch/x86_64/kernel/setup64.c +@@ -46,7 +46,7 @@ Control non executable mappings for 64bi + on Enable(default) + off Disable + */ +-int __init nonx_setup(char *str) ++void __init nonx_setup(const char *str) + { + if (!strncmp(str, "on", 2)) { + __supported_pte_mask |= _PAGE_NX; +@@ -55,28 +55,7 @@ int __init nonx_setup(char *str) + do_not_nx = 1; + __supported_pte_mask &= ~_PAGE_NX; + } +- return 0; +-} +-__setup("noexec=", nonx_setup); /* parsed early actually */ +- +-int force_personality32 = READ_IMPLIES_EXEC; - --unsigned long arch_align_stack(unsigned long sp) +-/* noexec32=on|off +-Control non executable heap for 32bit processes. +-To control the stack too use noexec=off +- +-on PROT_READ does not imply PROT_EXEC for 32bit processes +-off PROT_READ implies PROT_EXEC (default) +-*/ +-static int __init nonx32_setup(char *str) -{ -- if (randomize_va_space) -- sp -= get_random_int() % 8192; -- return sp & ~0xf; --} -diff -urNp --exclude-from=/home/davej/.exclude linux-804/arch/x86_64/mm/fault.c linux-810/arch/x86_64/mm/fault.c ---- linux-804/arch/x86_64/mm/fault.c -+++ linux-810/arch/x86_64/mm/fault.c -@@ -73,7 +73,7 @@ static noinline int is_prefetch(struct p +- if (!strcmp(str, "on")) +- force_personality32 &= ~READ_IMPLIES_EXEC; +- else if (!strcmp(str, "off")) +- force_personality32 |= READ_IMPLIES_EXEC; +- return 0; + } +-__setup("noexec32=", nonx32_setup); + + /* + * Great future plan: +Index: linux/arch/x86_64/mm/fault.c +=================================================================== +--- linux.orig/arch/x86_64/mm/fault.c ++++ linux/arch/x86_64/mm/fault.c +@@ -80,7 +80,7 @@ static noinline int is_prefetch(struct p instr = (unsigned char *)convert_rip_to_linear(current, regs); max_instr = instr + 15; @@ -498,22 +650,13 @@ return 0; while (scan_more && instr < max_instr) { -diff -urNp --exclude-from=/home/davej/.exclude linux-804/arch/x86_64/mm/Makefile linux-810/arch/x86_64/mm/Makefile ---- linux-804/arch/x86_64/mm/Makefile -+++ linux-810/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_NUMA) += numa.o - obj-$(CONFIG_K8_NUMA) += k8topology.o -diff -urNp --exclude-from=/home/davej/.exclude linux-804/arch/x86_64/mm/mmap.c linux-810/arch/x86_64/mm/mmap.c ---- linux-804/arch/x86_64/mm/mmap.c -+++ linux-810/arch/x86_64/mm/mmap.c -@@ -0,0 +1,95 @@ +Index: linux/arch/x86_64/mm/mmap.c +=================================================================== +--- linux.orig/arch/x86_64/mm/mmap.c ++++ linux/arch/x86_64/mm/mmap.c +@@ -1,30 +1,87 @@ +-/* Copyright 2005 Andi Kleen, SuSE Labs. +- * Licensed under GPL, v.2 +/* + * linux/arch/x86-64/mm/mmap.c + * @@ -538,12 +681,16 @@ + * + * + * Started by Ingo Molnar -+ */ + */ +-#include + +#include -+#include -+#include -+ + #include +-#include + #include +-#include + +-/* Notebook: move the mmap code from sys_x86_64.c over here. */ +/* + * Top of mmap area (just below the process stack). + * @@ -563,7 +710,7 @@ + + return TASK_SIZE - (gap & PAGE_MASK); +} -+ + +static inline int mmap_is_legacy(void) +{ + /* @@ -571,13 +718,13 @@ + */ + if (!test_thread_flag(TIF_IA32)) + return 1; -+ -+ if (current->personality & ADDR_COMPAT_LAYOUT) ++ ++ 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; +} + @@ -585,8 +732,20 @@ + * 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) -+{ + void arch_pick_mmap_layout(struct mm_struct *mm) + { +-#ifdef CONFIG_IA32_EMULATION +- if (current_thread_info()->flags & _TIF_IA32) +- return ia32_pick_mmap_layout(mm); +-#endif +- mm->mmap_base = TASK_UNMAPPED_BASE; +- if (current->flags & PF_RANDOMIZE) { +- /* Add 28bit randomness which is about 40bits of address space +- because mmap base has to be page aligned. +- or ~1/128 of the total user VM +- (total user address space is 47bits) */ +- unsigned rnd = get_random_int() & 0xfffffff; +- mm->mmap_base += ((unsigned long)rnd) << PAGE_SHIFT; + /* + * Fall back to the standard layout if the personality + * bit is set, or if the expected stack growth is unlimited: @@ -599,20 +758,16 @@ + 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; -+} -+ -diff -urNp --exclude-from=/home/davej/.exclude linux-804/drivers/char/random.c linux-810/drivers/char/random.c ---- linux-804/drivers/char/random.c -+++ linux-810/drivers/char/random.c -@@ -1634,13 +1634,18 @@ EXPORT_SYMBOL(secure_dccp_sequence_numbe + } +- mm->get_unmapped_area = arch_get_unmapped_area; +- mm->unmap_area = arch_unmap_area; + } +- +Index: linux/drivers/char/random.c +=================================================================== +--- linux.orig/drivers/char/random.c ++++ linux/drivers/char/random.c +@@ -1632,13 +1632,18 @@ EXPORT_SYMBOL(secure_dccp_sequence_numbe */ unsigned int get_random_int(void) { @@ -632,9 +787,10 @@ } /* -diff -urNp --exclude-from=/home/davej/.exclude linux-804/fs/binfmt_elf.c linux-810/fs/binfmt_elf.c ---- linux-804/fs/binfmt_elf.c -+++ linux-810/fs/binfmt_elf.c +Index: linux/fs/binfmt_elf.c +=================================================================== +--- linux.orig/fs/binfmt_elf.c ++++ linux/fs/binfmt_elf.c @@ -47,7 +47,7 @@ static int load_elf_binary(struct linux_binprm * bprm, struct pt_regs * regs); @@ -644,7 +800,16 @@ 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 +@@ -86,7 +86,7 @@ static struct linux_binfmt elf_format = + .min_coredump = ELF_EXEC_PAGESIZE + }; + +-#define BAD_ADDR(x) ((unsigned long)(x) > TASK_SIZE) ++#define BAD_ADDR(x) ((unsigned long)(x) > PAGE_MASK) + + static int set_brk(unsigned long start, unsigned long end) + { +@@ -285,26 +285,65 @@ create_elf_tables(struct linux_binprm *b #ifndef elf_map static unsigned long elf_map(struct file *filep, unsigned long addr, @@ -653,16 +818,26 @@ + unsigned long total_size) { unsigned long map_addr; +- unsigned long pageoffset = ELF_PAGEOFFSET(eppnt->p_vaddr); + 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)); +- down_write(¤t->mm->mmap_sem); + /* mmap() will return -EINVAL if given a zero size, but a + * segment with zero filesize is perfectly valid */ +- if (eppnt->p_filesz + pageoffset) +- map_addr = do_mmap(filep, ELF_PAGESTART(addr), +- eppnt->p_filesz + pageoffset, prot, type, +- eppnt->p_offset - pageoffset); +- else +- map_addr = ELF_PAGESTART(addr); ++ if (!size) ++ return addr; ++ ++ down_write(¤t->mm->mmap_sem); + + /* + * total_size is the size of the ELF (interpreter) image. @@ -679,7 +854,7 @@ + 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); + @@ -706,20 +881,21 @@ + 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 +@@ -312,7 +351,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 *interp_map_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 +@@ -320,6 +360,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; @@ -727,7 +903,7 @@ int retval, i, size; /* First of all, some simple consistency checks */ -@@ -352,6 +393,10 @@ static unsigned long load_elf_interp(str +@@ -358,6 +399,10 @@ static unsigned long load_elf_interp(str goto out_close; } @@ -738,7 +914,7 @@ 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 +@@ -372,8 +417,13 @@ 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; @@ -748,10 +924,28 @@ - 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; ++ if (!*interp_map_addr) ++ *interp_map_addr = map_addr; error = map_addr; if (BAD_ADDR(map_addr)) goto out_close; -@@ -527,7 +575,7 @@ static int load_elf_binary(struct linux_ +@@ -435,8 +485,7 @@ static unsigned long load_elf_interp(str + goto out_close; + } + +- *interp_load_addr = load_addr; +- error = ((unsigned long) interp_elf_ex->e_entry) + load_addr; ++ error = load_addr; + + out_close: + kfree(elf_phdata); +@@ -528,12 +577,12 @@ static int load_elf_binary(struct linux_ + int elf_exec_fileno; + int retval, i; + unsigned int size; +- unsigned long elf_entry, interp_load_addr = 0; ++ unsigned long elf_entry, interp_load_addr = 0, interp_map_addr = 0; + unsigned long start_code, end_code, start_data, end_data; unsigned long reloc_func_desc = 0; char passed_fileno[6]; struct files_struct *files; @@ -760,7 +954,7 @@ unsigned long def_flags = 0; struct { struct elfhdr elf_ex; -@@ -683,6 +731,8 @@ static int load_elf_binary(struct linux_ +@@ -689,6 +738,8 @@ static int load_elf_binary(struct linux_ } elf_ppnt = elf_phdata; @@ -769,11 +963,11 @@ 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_ +@@ -699,6 +750,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) { ++ if (current->personality == PER_LINUX && (exec_shield & 2)) { + executable_stack = EXSTACK_DISABLE_X; + current->flags |= PF_RANDOMIZE; + } @@ -781,7 +975,7 @@ /* 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_ +@@ -752,6 +808,15 @@ static int load_elf_binary(struct linux_ if (retval) goto out_free_dentry; @@ -797,17 +991,17 @@ /* Discard our unneeded old files struct */ if (files) { steal_locks(files); -@@ -764,7 +828,8 @@ static int load_elf_binary(struct linux_ +@@ -770,7 +835,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 && ++ 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) -@@ -785,10 +850,10 @@ static int load_elf_binary(struct linux_ +@@ -790,10 +856,10 @@ static int load_elf_binary(struct linux_ current->mm->start_stack = bprm->p; @@ -821,7 +1015,7 @@ for(i = 0, elf_ppnt = elf_phdata; i < loc->elf_ex.e_phnum; i++, elf_ppnt++) { int elf_prot = 0, elf_flags; -@@ -832,16 +897,16 @@ static int load_elf_binary(struct linux_ +@@ -837,16 +903,16 @@ static int load_elf_binary(struct linux_ elf_flags = MAP_PRIVATE|MAP_DENYWRITE|MAP_EXECUTABLE; vaddr = elf_ppnt->p_vaddr; @@ -845,32 +1039,54 @@ if (BAD_ADDR(error)) { send_sig(SIGKILL, current, 0); goto out_free_dentry; -@@ -918,7 +983,8 @@ static int load_elf_binary(struct linux_ - else +@@ -920,10 +986,17 @@ static int load_elf_binary(struct linux_ + if (interpreter_type == INTERPRETER_AOUT) + elf_entry = load_aout_interp(&loc->interp_ex, + interpreter); +- else ++ else { elf_entry = load_elf_interp(&loc->interp_elf_ex, interpreter, - &interp_load_addr); -+ &interp_load_addr, ++ &interp_map_addr, + load_bias); ++ if (!BAD_ADDR(elf_entry)) { ++ /* load_elf_interp() returns relocation adjustment */ ++ interp_load_addr = elf_entry; ++ elf_entry += loc->interp_elf_ex.e_entry; ++ } ++ } if (BAD_ADDR(elf_entry)) { printk(KERN_ERR "Unable to load interpreter %.128s\n", elf_interpreter); -@@ -950,6 +1016,14 @@ static int load_elf_binary(struct linux_ +@@ -945,21 +1018,22 @@ static int load_elf_binary(struct linux_ + } + } + +- kfree(elf_phdata); +- + if (interpreter_type != INTERPRETER_AOUT) + sys_close(elf_exec_fileno); + + set_binfmt(&elf_format); + + #ifdef ARCH_HAS_SETUP_ADDITIONAL_PAGES +- retval = arch_setup_additional_pages(bprm, executable_stack); ++ retval = arch_setup_additional_pages(bprm, executable_stack, ++ start_code, interp_map_addr); + if (retval < 0) { + send_sig(SIGKILL, current, 0); +- goto out; ++ goto out_free_fh; } #endif /* ARCH_HAS_SETUP_ADDITIONAL_PAGES */ -+ /* -+ * Map the vsyscall trampoline. This address is then passed via -+ * AT_SYSINFO. -+ */ -+#ifdef __HAVE_ARCH_VSYSCALL -+ map_vsyscall(); -+#endif ++ kfree(elf_phdata); + compute_creds(bprm); current->flags &= ~PF_FORKNOEXEC; create_elf_tables(bprm, &loc->elf_ex, (interpreter_type == INTERPRETER_AOUT), -@@ -963,6 +1037,10 @@ static int load_elf_binary(struct linux_ +@@ -973,6 +1047,10 @@ static int load_elf_binary(struct linux_ current->mm->end_data = end_data; current->mm->start_stack = bprm->p; @@ -881,10 +1097,21 @@ 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. -diff -urNp --exclude-from=/home/davej/.exclude linux-804/fs/proc/array.c linux-810/fs/proc/array.c ---- linux-804/fs/proc/array.c -+++ linux-810/fs/proc/array.c -@@ -385,8 +385,12 @@ static int do_task_stat(struct task_stru +@@ -1158,6 +1236,9 @@ static int maydump(struct vm_area_struct + if (vma->vm_flags & (VM_IO | VM_RESERVED)) + return 0; + ++ if (vma->vm_flags & VM_DONTEXPAND) /* Kludge for vDSO. */ ++ return 1; ++ + /* Dump shared memory only if mapped from an anonymous file. */ + if (vma->vm_flags & VM_SHARED) + return vma->vm_file->f_dentry->d_inode->i_nlink == 0; +Index: linux/fs/proc/array.c +=================================================================== +--- linux.orig/fs/proc/array.c ++++ linux/fs/proc/array.c +@@ -391,8 +391,12 @@ static int do_task_stat(struct task_stru ppid = pid_alive(task) ? task->group_leader->real_parent->tgid : 0; read_unlock(&tasklist_lock); @@ -899,10 +1126,11 @@ if (!whole) { min_flt = task->min_flt; maj_flt = task->maj_flt; -diff -urNp --exclude-from=/home/davej/.exclude linux-804/fs/proc/base.c linux-810/fs/proc/base.c ---- linux-804/fs/proc/base.c -+++ linux-810/fs/proc/base.c -@@ -181,7 +181,7 @@ static struct pid_entry tgid_base_stuff[ +Index: linux/fs/proc/base.c +=================================================================== +--- linux.orig/fs/proc/base.c ++++ linux/fs/proc/base.c +@@ -189,7 +189,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), @@ -911,7 +1139,16 @@ #ifdef CONFIG_NUMA E(PROC_TGID_NUMA_MAPS, "numa_maps", S_IFREG|S_IRUGO), #endif -@@ -221,7 +221,7 @@ static struct pid_entry tid_base_stuff[] +@@ -202,7 +202,7 @@ static struct pid_entry tgid_base_stuff[ + E(PROC_TGID_EXE, "exe", S_IFLNK|S_IRWXUGO), + E(PROC_TGID_MOUNTS, "mounts", S_IFREG|S_IRUGO), + #ifdef CONFIG_MMU +- E(PROC_TGID_SMAPS, "smaps", S_IFREG|S_IRUGO), ++ E(PROC_TGID_SMAPS, "smaps", S_IFREG|S_IRUSR), + #endif + #ifdef CONFIG_SECURITY + E(PROC_TGID_ATTR, "attr", S_IFDIR|S_IRUGO|S_IXUGO), +@@ -231,7 +231,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), @@ -920,9 +1157,19 @@ #ifdef CONFIG_NUMA E(PROC_TID_NUMA_MAPS, "numa_maps", S_IFREG|S_IRUGO), #endif -diff -urNp --exclude-from=/home/davej/.exclude linux-804/fs/proc/task_mmu.c linux-810/fs/proc/task_mmu.c ---- linux-804/fs/proc/task_mmu.c -+++ linux-810/fs/proc/task_mmu.c +@@ -244,7 +244,7 @@ static struct pid_entry tid_base_stuff[] + E(PROC_TID_EXE, "exe", S_IFLNK|S_IRWXUGO), + E(PROC_TID_MOUNTS, "mounts", S_IFREG|S_IRUGO), + #ifdef CONFIG_MMU +- E(PROC_TID_SMAPS, "smaps", S_IFREG|S_IRUGO), ++ E(PROC_TID_SMAPS, "smaps", S_IFREG|S_IRUSR), + #endif + #ifdef CONFIG_SECURITY + E(PROC_TID_ATTR, "attr", S_IFDIR|S_IRUGO|S_IXUGO), +Index: linux/fs/proc/task_mmu.c +=================================================================== +--- linux.orig/fs/proc/task_mmu.c ++++ linux/fs/proc/task_mmu.c @@ -43,7 +43,11 @@ char *task_mem(struct mm_struct *mm, cha "VmStk:\t%8lu kB\n" "VmExe:\t%8lu kB\n" @@ -951,7 +1198,7 @@ return buffer; } -@@ -123,7 +133,13 @@ static int show_map_internal(struct seq_ +@@ -140,7 +150,13 @@ static int show_map_internal(struct seq_ vma->vm_end, flags & VM_READ ? 'r' : '-', flags & VM_WRITE ? 'w' : '-', @@ -966,7 +1213,7 @@ flags & VM_MAYSHARE ? 's' : 'p', vma->vm_pgoff << PAGE_SHIFT, MAJOR(dev), MINOR(dev), ino, &len); -@@ -137,8 +153,7 @@ static int show_map_internal(struct seq_ +@@ -154,18 +170,22 @@ static int show_map_internal(struct seq_ seq_path(m, file->f_vfsmnt, file->f_dentry, "\n"); } else { if (mm) { @@ -975,11 +1222,42 @@ + if (vma->vm_end == mm->brk) { pad_len_spaces(m, len); seq_puts(m, "[heap]"); - } else { -diff -urNp --exclude-from=/home/davej/.exclude linux-804/include/asm-i386/desc.h linux-810/include/asm-i386/desc.h ---- linux-804/include/asm-i386/desc.h -+++ linux-810/include/asm-i386/desc.h -@@ -156,6 +156,20 @@ static inline unsigned long get_desc_bas +- } else { +- if (vma->vm_start <= mm->start_stack && ++ } else if (vma->vm_start <= mm->start_stack && + vma->vm_end >= mm->start_stack) { + + pad_len_spaces(m, len); + seq_puts(m, "[stack]"); + } ++#ifdef __i386__ ++ else if (vma->vm_start == ++ (unsigned long)mm->context.vdso) { ++ pad_len_spaces(m, len); ++ seq_puts(m, "[vdso]"); + } ++#endif + } else { + pad_len_spaces(m, len); + seq_puts(m, "[vdso]"); +Index: linux/include/asm-i386/a.out.h +=================================================================== +--- linux.orig/include/asm-i386/a.out.h ++++ linux/include/asm-i386/a.out.h +@@ -19,7 +19,7 @@ struct exec + + #ifdef __KERNEL__ + +-#define STACK_TOP TASK_SIZE ++#define STACK_TOP (TASK_SIZE - PAGE_SIZE) /* 1 page for vdso */ + + #endif + +Index: linux/include/asm-i386/desc.h +=================================================================== +--- linux.orig/include/asm-i386/desc.h ++++ linux/include/asm-i386/desc.h +@@ -162,6 +162,20 @@ static inline unsigned long get_desc_bas return base; } @@ -991,7 +1269,7 @@ +} + +#define load_user_cs_desc(cpu, mm) \ -+ per_cpu(cpu_gdt_table, (cpu))[GDT_ENTRY_DEFAULT_USER_CS] = (mm)->context.user_cs ++ get_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); @@ -1000,18 +1278,19 @@ #endif /* !__ASSEMBLY__ */ #endif -diff -urNp --exclude-from=/home/davej/.exclude linux-804/include/asm-i386/elf.h linux-810/include/asm-i386/elf.h ---- linux-804/include/asm-i386/elf.h -+++ linux-810/include/asm-i386/elf.h -@@ -9,6 +9,7 @@ - #include +Index: linux/include/asm-i386/elf.h +=================================================================== +--- linux.orig/include/asm-i386/elf.h ++++ linux/include/asm-i386/elf.h +@@ -10,6 +10,7 @@ #include #include /* for savesegment */ #include +#include #include -@@ -133,15 +134,22 @@ extern int dump_task_extended_fpu (struc + +@@ -129,17 +130,31 @@ 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) @@ -1040,8 +1319,17 @@ + } \ } while (0) ++#define ARCH_HAS_SETUP_ADDITIONAL_PAGES ++struct linux_binprm; ++extern int arch_setup_additional_pages(struct linux_binprm *bprm, ++ int executable_stack, unsigned long start_code, ++ unsigned long interp_map_address); ++ ++#if 0 /* Disabled for exec-shield, where a normal vma holds the vDSO. */ /* -@@ -152,15 +160,15 @@ do { \ + * These macros parameterize elf_core_dump in fs/binfmt_elf.c to write out + * extra segments containing the vsyscall DSO contents. Dumping its +@@ -148,15 +163,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. */ @@ -1061,7 +1349,7 @@ struct elf_phdr phdr = vsyscall_phdrs[i]; \ if (phdr.p_type == PT_LOAD) { \ BUG_ON(ofs != 0); \ -@@ -178,10 +186,10 @@ do { \ +@@ -174,16 +189,23 @@ do { \ #define ELF_CORE_WRITE_EXTRA_DATA \ do { \ const struct elf_phdr *const vsyscall_phdrs = \ @@ -1075,7 +1363,9 @@ 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 { \ + } \ + } while (0) ++#endif #endif @@ -1086,9 +1376,10 @@ +extern void map_vsyscall(void); + #endif -diff -urNp --exclude-from=/home/davej/.exclude linux-804/include/asm-i386/mmu.h linux-810/include/asm-i386/mmu.h ---- linux-804/include/asm-i386/mmu.h -+++ linux-810/include/asm-i386/mmu.h +Index: linux/include/asm-i386/mmu.h +=================================================================== +--- linux.orig/include/asm-i386/mmu.h ++++ linux/include/asm-i386/mmu.h @@ -7,11 +7,17 @@ * we put the segment information here. * @@ -1107,9 +1398,26 @@ } mm_context_t; #endif -diff -urNp --exclude-from=/home/davej/.exclude linux-804/include/asm-i386/pgalloc.h linux-810/include/asm-i386/pgalloc.h ---- linux-804/include/asm-i386/pgalloc.h -+++ linux-810/include/asm-i386/pgalloc.h +Index: linux/include/asm-i386/page.h +=================================================================== +--- linux.orig/include/asm-i386/page.h ++++ linux/include/asm-i386/page.h +@@ -118,6 +118,11 @@ extern int page_is_ram(unsigned long pag + #endif + #define __KERNEL_START (__PAGE_OFFSET + __PHYSICAL_START) + ++/* ++ * Under exec-shield we don't use the generic fixmap gate area. ++ * The vDSO ("gate area") has a normal vma found the normal ways. ++ */ ++#define __HAVE_ARCH_GATE_AREA 1 + + #define PAGE_OFFSET ((unsigned long)__PAGE_OFFSET) + #define VMALLOC_RESERVE ((unsigned long)__VMALLOC_RESERVE) +Index: linux/include/asm-i386/pgalloc.h +=================================================================== +--- linux.orig/include/asm-i386/pgalloc.h ++++ linux/include/asm-i386/pgalloc.h @@ -3,6 +3,7 @@ #include @@ -1118,10 +1426,11 @@ #include #include /* for struct page */ -diff -urNp --exclude-from=/home/davej/.exclude linux-804/include/asm-i386/processor.h linux-810/include/asm-i386/processor.h ---- linux-804/include/asm-i386/processor.h -+++ linux-810/include/asm-i386/processor.h -@@ -317,7 +317,10 @@ extern int bootloader_type; +Index: linux/include/asm-i386/processor.h +=================================================================== +--- linux.orig/include/asm-i386/processor.h ++++ linux/include/asm-i386/processor.h +@@ -323,7 +323,10 @@ extern int bootloader_type; /* This decides where the kernel will search for a free chunk of vm * space during mmap's. */ @@ -1133,7 +1442,7 @@ #define HAVE_ARCH_PICK_MMAP_LAYOUT -@@ -499,6 +502,9 @@ static inline void load_esp0(struct tss_ +@@ -505,6 +508,9 @@ static inline void load_esp0(struct tss_ regs->xcs = __USER_CS; \ regs->eip = new_eip; \ regs->esp = new_esp; \ @@ -1143,9 +1452,10 @@ } while (0) /* -diff -urNp --exclude-from=/home/davej/.exclude linux-804/include/asm-i386/thread_info.h linux-810/include/asm-i386/thread_info.h ---- linux-804/include/asm-i386/thread_info.h -+++ linux-810/include/asm-i386/thread_info.h +Index: linux/include/asm-i386/thread_info.h +=================================================================== +--- linux.orig/include/asm-i386/thread_info.h ++++ linux/include/asm-i386/thread_info.h @@ -38,6 +38,7 @@ struct thread_info { 0-0xBFFFFFFF for user-thead 0-0xFFFFFFFF for kernel-thread @@ -1154,9 +1464,10 @@ struct restart_block restart_block; unsigned long previous_esp; /* ESP of the previous stack in case -diff -urNp --exclude-from=/home/davej/.exclude linux-804/include/asm-ia64/pgalloc.h linux-810/include/asm-ia64/pgalloc.h ---- linux-804/include/asm-ia64/pgalloc.h -+++ linux-810/include/asm-ia64/pgalloc.h +Index: linux/include/asm-ia64/pgalloc.h +=================================================================== +--- linux.orig/include/asm-ia64/pgalloc.h ++++ linux/include/asm-ia64/pgalloc.h @@ -1,6 +1,10 @@ #ifndef _ASM_IA64_PGALLOC_H #define _ASM_IA64_PGALLOC_H @@ -1168,9 +1479,26 @@ /* * This file contains the functions and defines necessary to allocate * page tables. -diff -urNp --exclude-from=/home/davej/.exclude linux-804/include/asm-ppc/pgalloc.h linux-810/include/asm-ppc/pgalloc.h ---- linux-804/include/asm-ppc/pgalloc.h -+++ linux-810/include/asm-ppc/pgalloc.h +Index: linux/include/asm-powerpc/pgalloc.h +=================================================================== +--- linux.orig/include/asm-powerpc/pgalloc.h ++++ linux/include/asm-powerpc/pgalloc.h +@@ -24,6 +24,11 @@ extern kmem_cache_t *pgtable_cache[]; + #define PGD_CACHE_NUM 0 + #endif + ++/* 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 +Index: linux/include/asm-ppc/pgalloc.h +=================================================================== +--- linux.orig/include/asm-ppc/pgalloc.h ++++ linux/include/asm-ppc/pgalloc.h @@ -40,5 +40,10 @@ extern void pte_free(struct page *pte); #define check_pgt_cache() do { } while (0) @@ -1182,24 +1510,10 @@ + #endif /* _PPC_PGALLOC_H */ #endif /* __KERNEL__ */ -diff -urNp --exclude-from=/home/davej/.exclude linux-804/include/asm-powerpc/pgalloc.h linux-810/include/asm-powerpc/pgalloc.h ---- linux-804/include/asm-powerpc/pgalloc.h -+++ linux-810/include/asm-powerpc/pgalloc.h -@@ -13,6 +13,11 @@ extern kmem_cache_t *pgtable_cache[]; - #define PUD_CACHE_NUM 1 - #define PGD_CACHE_NUM 0 - -+/* 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 -diff -urNp --exclude-from=/home/davej/.exclude linux-804/include/asm-s390/pgalloc.h linux-810/include/asm-s390/pgalloc.h ---- linux-804/include/asm-s390/pgalloc.h -+++ linux-810/include/asm-s390/pgalloc.h +Index: linux/include/asm-s390/pgalloc.h +=================================================================== +--- linux.orig/include/asm-s390/pgalloc.h ++++ linux/include/asm-s390/pgalloc.h @@ -18,6 +18,10 @@ #include #include @@ -1211,9 +1525,10 @@ #define check_pgt_cache() do {} while (0) extern void diag10(unsigned long addr); -diff -urNp --exclude-from=/home/davej/.exclude linux-804/include/asm-sparc/pgalloc.h linux-810/include/asm-sparc/pgalloc.h ---- linux-804/include/asm-sparc/pgalloc.h -+++ linux-810/include/asm-sparc/pgalloc.h +Index: linux/include/asm-sparc/pgalloc.h +=================================================================== +--- linux.orig/include/asm-sparc/pgalloc.h ++++ 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) @@ -1223,10 +1538,11 @@ +#define arch_remove_exec_range(mm, limit) do { ; } while (0) + #endif /* _SPARC_PGALLOC_H */ -diff -urNp --exclude-from=/home/davej/.exclude linux-804/include/asm-sparc64/pgalloc.h linux-810/include/asm-sparc64/pgalloc.h ---- linux-804/include/asm-sparc64/pgalloc.h -+++ linux-810/include/asm-sparc64/pgalloc.h -@@ -180,4 +180,8 @@ static inline void pte_free(struct page +Index: linux/include/asm-sparc64/pgalloc.h +=================================================================== +--- linux.orig/include/asm-sparc64/pgalloc.h ++++ linux/include/asm-sparc64/pgalloc.h +@@ -181,4 +181,8 @@ static inline void pte_free(struct page #define pgd_free(pgd) free_pgd_fast(pgd) #define pgd_alloc(mm) get_pgd_fast() @@ -1235,9 +1551,10 @@ +#define arch_remove_exec_range(mm, limit) do { ; } while (0) + #endif /* _SPARC64_PGALLOC_H */ -diff -urNp --exclude-from=/home/davej/.exclude linux-804/include/asm-x86_64/pgalloc.h linux-810/include/asm-x86_64/pgalloc.h ---- linux-804/include/asm-x86_64/pgalloc.h -+++ linux-810/include/asm-x86_64/pgalloc.h +Index: linux/include/asm-x86_64/pgalloc.h +=================================================================== +--- linux.orig/include/asm-x86_64/pgalloc.h ++++ linux/include/asm-x86_64/pgalloc.h @@ -6,6 +6,13 @@ #include #include @@ -1252,25 +1569,24 @@ #define pmd_populate_kernel(mm, pmd, pte) \ set_pmd(pmd, __pmd(_PAGE_TABLE | __pa(pte))) #define pud_populate(mm, pud, pmd) \ -diff -urNp --exclude-from=/home/davej/.exclude linux-804/include/asm-x86_64/processor.h linux-810/include/asm-x86_64/processor.h ---- linux-804/include/asm-x86_64/processor.h -+++ linux-810/include/asm-x86_64/processor.h -@@ -162,6 +162,11 @@ static inline void clear_in_cr4 (unsigne - */ - #define TASK_SIZE64 (0x800000000000UL - 4096) +Index: linux/include/asm-x86_64/pgtable.h +=================================================================== +--- linux.orig/include/asm-x86_64/pgtable.h ++++ linux/include/asm-x86_64/pgtable.h +@@ -21,7 +21,7 @@ extern unsigned long __supported_pte_mas -+#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. - */ -diff -urNp --exclude-from=/home/davej/.exclude linux-804/include/linux/mm.h linux-810/include/linux/mm.h ---- linux-804/include/linux/mm.h -+++ linux-810/include/linux/mm.h -@@ -840,7 +840,14 @@ extern struct vm_area_struct *copy_vma(s + #define swapper_pg_dir init_level4_pgt + +-extern int nonx_setup(char *str); ++extern void nonx_setup(const char *str); + extern void paging_init(void); + extern void clear_kernel_mapping(unsigned long addr, unsigned long size); + +Index: linux/include/linux/mm.h +=================================================================== +--- linux.orig/include/linux/mm.h ++++ linux/include/linux/mm.h +@@ -916,7 +916,19 @@ extern struct vm_area_struct *copy_vma(s extern void exit_mmap(struct mm_struct *); extern int may_expand_vm(struct mm_struct *mm, unsigned long npages); @@ -1278,17 +1594,32 @@ +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, ++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); ++ return get_unmapped_area_prot(file, addr, len, pgoff, flags, 0); +} ++ ++extern int install_special_mapping(struct mm_struct *mm, ++ unsigned long addr, unsigned long len, ++ unsigned long vm_flags, pgprot_t pgprot, ++ struct page **pages); extern unsigned long do_mmap_pgoff(struct file *file, unsigned long addr, unsigned long len, unsigned long prot, -diff -urNp --exclude-from=/home/davej/.exclude linux-804/include/linux/resource.h linux-810/include/linux/resource.h ---- linux-804/include/linux/resource.h -+++ linux-810/include/linux/resource.h +@@ -968,7 +980,7 @@ unsigned long page_cache_readahead(struc + struct file *filp, + pgoff_t offset, + unsigned long size); +-void handle_ra_miss(struct address_space *mapping, ++void handle_ra_miss(struct address_space *mapping, + struct file_ra_state *ra, pgoff_t offset); + unsigned long max_sane_readahead(unsigned long nr); + +Index: linux/include/linux/resource.h +=================================================================== +--- linux.orig/include/linux/resource.h ++++ linux/include/linux/resource.h @@ -52,8 +52,11 @@ struct rlimit { /* * Limit the stack by to some sane default: root can always @@ -1302,11 +1633,12 @@ /* * GPG wants 32kB of mlocked memory, to make sure pass phrases -diff -urNp --exclude-from=/home/davej/.exclude linux-804/include/linux/sched.h linux-810/include/linux/sched.h ---- linux-804/include/linux/sched.h -+++ linux-810/include/linux/sched.h -@@ -36,6 +36,8 @@ - #include +Index: linux/include/linux/sched.h +=================================================================== +--- linux.orig/include/linux/sched.h ++++ linux/include/linux/sched.h +@@ -39,6 +39,8 @@ + #include /* For AT_VECTOR_SIZE */ struct exec_domain; +extern int exec_shield; @@ -1314,7 +1646,7 @@ /* * cloning flags: -@@ -197,6 +199,10 @@ extern int sysctl_max_map_count; +@@ -245,6 +247,10 @@ extern int sysctl_max_map_count; extern unsigned long arch_get_unmapped_area(struct file *, unsigned long, unsigned long, unsigned long, unsigned long); @@ -1325,7 +1657,7 @@ extern unsigned long arch_get_unmapped_area_topdown(struct file *filp, unsigned long addr, unsigned long len, unsigned long pgoff, -@@ -218,6 +224,9 @@ struct mm_struct { +@@ -297,6 +303,9 @@ struct mm_struct { unsigned long (*get_unmapped_area) (struct file *filp, unsigned long addr, unsigned long len, unsigned long pgoff, unsigned long flags); @@ -1333,11 +1665,12 @@ + unsigned long addr, unsigned long len, + unsigned long pgoff, unsigned long flags); void (*unmap_area) (struct mm_struct *mm, unsigned long addr); - unsigned long mmap_base; /* base of mmap area */ - unsigned long cached_hole_size; /* if non-zero, the largest hole below free_area_cache */ -diff -urNp --exclude-from=/home/davej/.exclude linux-804/include/linux/sysctl.h linux-810/include/linux/sysctl.h ---- linux-804/include/linux/sysctl.h -+++ linux-810/include/linux/sysctl.h + unsigned long mmap_base; /* base of mmap area */ + unsigned long task_size; /* size of task vm space */ +Index: linux/include/linux/sysctl.h +=================================================================== +--- linux.orig/include/linux/sysctl.h ++++ linux/include/linux/sysctl.h @@ -92,6 +92,9 @@ enum KERN_CAP_BSET=14, /* int: capability bounding set */ @@ -1348,12 +1681,13 @@ KERN_REALROOTDEV=16, /* real root device to mount after initrd */ KERN_SPARC_REBOOT=21, /* reboot command on Sparc */ -diff -urNp --exclude-from=/home/davej/.exclude linux-804/kernel/signal.c linux-810/kernel/signal.c ---- linux-804/kernel/signal.c -+++ linux-810/kernel/signal.c -@@ -1209,6 +1209,37 @@ kill_proc_info(int sig, struct siginfo * - return error; - } +Index: linux/kernel/signal.c +=================================================================== +--- linux.orig/kernel/signal.c ++++ linux/kernel/signal.c +@@ -869,6 +869,37 @@ out_set: + #define LEGACY_QUEUE(sigptr, sig) \ + (((sig) < SIGRTMIN) && sigismember(&(sigptr)->signal, (sig))) +int print_fatal_signals = 0; + @@ -1361,7 +1695,7 @@ +{ + printk("%s/%d: potentially unexpected fatal signal %d.\n", + current->comm, current->pid, signr); -+ ++ +#ifdef __i386__ + printk("code at %08lx: ", regs->eip); + { @@ -1373,7 +1707,7 @@ + printk("%02x ", insn); + } + } -+#endif ++#endif + printk("\n"); + show_regs(regs); +} @@ -1387,9 +1721,9 @@ + +__setup("print-fatal-signals=", setup_print_fatal_signals); - /* - * kill_something_info() interprets pid in interesting ways just like kill(2). -@@ -1859,6 +1890,11 @@ relock: + static int + specific_send_sig_info(int sig, struct siginfo *info, struct task_struct *t) +@@ -1936,6 +1967,11 @@ relock: if (!signr) break; /* will return 0 */ @@ -1401,7 +1735,7 @@ if ((current->ptrace & PT_PTRACED) && signr != SIGKILL) { ptrace_signal_deliver(regs, cookie); -@@ -1954,6 +1990,8 @@ relock: +@@ -2031,6 +2067,8 @@ relock: * Anything else is fatal, maybe with a core dump. */ current->flags |= PF_SIGNALED; @@ -1410,16 +1744,27 @@ if (sig_kernel_coredump(signr)) { /* * If it was able to dump core, this kills all -diff -urNp --exclude-from=/home/davej/.exclude linux-804/kernel/sysctl.c linux-810/kernel/sysctl.c ---- linux-804/kernel/sysctl.c -+++ linux-810/kernel/sysctl.c -@@ -74,6 +74,19 @@ extern int proc_unknown_nmi_panic(ctl_ta +Index: linux/kernel/sysctl.c +=================================================================== +--- linux.orig/kernel/sysctl.c ++++ linux/kernel/sysctl.c +@@ -79,6 +79,29 @@ extern int proc_unknown_nmi_panic(ctl_ta void __user *, size_t *, loff_t *); #endif -+extern unsigned int vdso_enabled; ++extern unsigned int vdso_enabled, vdso_populate; + -+int exec_shield = 1; ++int exec_shield = (1<<3) | (1<<1) | (1<<0); ++/* exec_shield is a bitmask: ++ 0: off; vdso at STACK_TOP, 1 page below TASK_SIZE ++ (1<<0) 1: on [also on if !=0] ++ (1<<1) 2: noexecstack by default ++ (1<<2) 4: vdso just below .text of main (unless too low) ++ (1<<3) 8: vdso just below .text of PT_INTERP (unless too low) ++Yes, vdso placement is overloaded here; but exec_shield off ++is a strong incentive to place vdso at STACK_TOP, so the bit ++for vdso just below .text comes along for the ride. ++*/ + +static int __init setup_exec_shield(char *str) +{ @@ -1433,7 +1778,7 @@ /* this is needed for the proc_dointvec_minmax for [fs_]overflow UID and GID */ static int maxolduid = 65535; static int minolduid; -@@ -279,6 +292,32 @@ static ctl_table kern_table[] = { +@@ -284,6 +307,40 @@ static ctl_table kern_table[] = { .proc_handler = &proc_dointvec, }, { @@ -1461,14 +1806,24 @@ + .mode = 0644, + .proc_handler = &proc_dointvec, + }, ++ { ++ .ctl_name = KERN_VDSO, ++ .procname = "vdso_populate", ++ .data = &vdso_populate, ++ .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-2.6.13/mm/fremap.c~ 2005-10-13 17:34:08.000000000 -0400 -+++ linux-2.6.13/mm/fremap.c 2005-10-13 17:34:58.000000000 -0400 -@@ -83,13 +83,15 @@ int install_page(struct mm_struct *mm, s +Index: linux/mm/fremap.c +=================================================================== +--- linux.orig/mm/fremap.c ++++ linux/mm/fremap.c +@@ -67,13 +67,15 @@ int install_page(struct mm_struct *mm, s * caller about it. */ err = -EINVAL; @@ -1491,10 +1846,11 @@ if (pte_none(*pte) || !zap_pte(mm, vma, addr, pte)) inc_mm_counter(mm, file_rss); -diff -urNp --exclude-from=/home/davej/.exclude linux-804/mm/mmap.c linux-810/mm/mmap.c ---- linux-804/mm/mmap.c -+++ linux-810/mm/mmap.c -@@ -24,6 +24,7 @@ +Index: linux/mm/mmap.c +=================================================================== +--- linux.orig/mm/mmap.c ++++ linux/mm/mmap.c +@@ -25,6 +25,7 @@ #include #include #include @@ -1660,7 +2016,7 @@ return -ENOMEM; /* mlock limit tests */ -@@ -1740,10 +1824,14 @@ int split_vma(struct mm_struct * mm, str +@@ -1738,10 +1822,14 @@ int split_vma(struct mm_struct * mm, str if (new->vm_ops && new->vm_ops->open) new->vm_ops->open(new); @@ -1677,7 +2033,7 @@ vma_adjust(vma, vma->vm_start, addr, vma->vm_pgoff, new); return 0; -@@ -2048,6 +2048,7 @@ void exit_mmap(struct mm_struct *mm) +@@ -1946,6 +2034,7 @@ void exit_mmap(struct mm_struct *mm) vm_unacct_memory(nr_accounted); free_pgtables(&tlb, vma, FIRST_USER_ADDRESS, 0); tlb_finish_mmu(tlb, 0, end); @@ -1685,9 +2041,92 @@ /* * Walk the list again, actually closing and freeing it, -diff -urNp --exclude-from=/home/davej/.exclude linux-804/mm/mprotect.c linux-810/mm/mprotect.c ---- linux-804/mm/mprotect.c -+++ linux-810/mm/mprotect.c +@@ -2061,3 +2150,81 @@ int may_expand_vm(struct mm_struct *mm, + return 0; + return 1; + } ++ ++ ++static struct page * ++special_mapping_nopage(struct vm_area_struct *vma, ++ unsigned long address, int *type) ++{ ++ struct page **pages; ++ ++ BUG_ON(address < vma->vm_start || address >= vma->vm_end); ++ ++ address -= vma->vm_start; ++ for (pages = vma->vm_private_data; address > 0 && *pages; ++pages) ++ address -= PAGE_SIZE; ++ ++ if (*pages) { ++ get_page(*pages); ++ return *pages; ++ } ++ ++ return NOPAGE_SIGBUS; ++} ++ ++static struct vm_operations_struct special_mapping_vmops = { ++ .nopage = special_mapping_nopage, ++}; ++ ++unsigned int vdso_populate = 1; ++ ++/* ++ * Insert a new vma covering the given region, with the given flags and ++ * protections. Its pages are supplied by the given null-terminated array. ++ * The region past the last page supplied will always produce SIGBUS. ++ * The array pointer and the pages it points to are assumed to stay alive ++ * for as long as this mapping might exist. ++ */ ++int install_special_mapping(struct mm_struct *mm, ++ unsigned long addr, unsigned long len, ++ unsigned long vm_flags, pgprot_t pgprot, ++ struct page **pages) ++{ ++ struct vm_area_struct *vma; ++ int err; ++ ++ vma = kmem_cache_alloc(vm_area_cachep, SLAB_KERNEL); ++ if (unlikely(vma == NULL)) ++ return -ENOMEM; ++ memset(vma, 0, sizeof(*vma)); ++ ++ vma->vm_mm = mm; ++ vma->vm_start = addr; ++ vma->vm_end = addr + len; ++ ++ vma->vm_flags = vm_flags; ++ vma->vm_page_prot = pgprot; ++ ++ vma->vm_ops = &special_mapping_vmops; ++ vma->vm_private_data = pages; ++ ++ insert_vm_struct(mm, vma); ++ mm->total_vm += len >> PAGE_SHIFT; ++ ++ if (!vdso_populate) ++ return 0; ++ ++ err = 0; ++ while (*pages) { ++ struct page *page = *pages++; ++ get_page(page); ++ err = install_page(mm, vma, addr, page, vma->vm_page_prot); ++ if (err) { ++ put_page(page); ++ break; ++ } ++ addr += PAGE_SIZE; ++ } ++ ++ return err; ++} +Index: linux/mm/mprotect.c +=================================================================== +--- linux.orig/mm/mprotect.c ++++ linux/mm/mprotect.c @@ -22,6 +22,7 @@ #include @@ -1696,7 +2135,7 @@ #include #include -@@ -106,7 +107,7 @@ mprotect_fixup(struct vm_area_struct *vm +@@ -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; @@ -1705,146 +2144,27 @@ pgprot_t newprot; pgoff_t pgoff; int error; -@@ -167,6 +168,8 @@ success: +@@ -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-804/mm/mremap.c linux-810/mm/mremap.c ---- linux-804/mm/mremap.c -+++ linux-810/mm/mremap.c -@@ -407,8 +407,8 @@ unsigned long do_mremap(unsigned long ad + vm_stat_account(mm, oldflags, vma->vm_file, -nrpages); + vm_stat_account(mm, newflags, vma->vm_file, nrpages); +Index: linux/mm/mremap.c +=================================================================== +--- linux.orig/mm/mremap.c ++++ linux/mm/mremap.c +@@ -387,8 +387,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, ++ 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; -diff -urNp --exclude-from=/home/davej/.exclude linux-812/arch/i386/kernel/cpu/common.c linux-813/arch/i386/kernel/cpu/common.c ---- linux-812/arch/i386/kernel/cpu/common.c -+++ linux-813/arch/i386/kernel/cpu/common.c -@@ -397,6 +397,13 @@ void __devinit identify_cpu(struct cpuin - if (disable_pse) - clear_bit(X86_FEATURE_PSE, c->x86_capability); - -+ if (exec_shield != 0) { -+#ifdef CONFIG_HIGHMEM64G /* NX implies PAE */ -+ if (!test_bit(X86_FEATURE_NX, c->x86_capability)) -+#endif -+ clear_bit(X86_FEATURE_SEP, c->x86_capability); -+ } -+ - /* If the model name is still unset, do table lookup. */ - if ( !c->x86_model_id[0] ) { - char *p; -diff -urpN --exclude-from=/home/devel/davej/.exclude linux-2.6.13/arch/x86_64/ia32/ia32_binfmt.c linux-2.6.13-a/arch/x86_64/ia32/ia32_binfmt.c ---- linux-2.6.13/arch/x86_64/ia32/ia32_binfmt.c 2005-10-14 20:55:36.000000000 -0400 -+++ linux-2.6.13-a/arch/x86_64/ia32/ia32_binfmt.c 2005-10-14 20:56:15.000000000 -0400 -@@ -249,8 +249,6 @@ elf_core_copy_task_xfpregs(struct task_s - #define elf_check_arch(x) \ - ((x)->e_machine == EM_386) - --extern int force_personality32; -- - #define ELF_EXEC_PAGESIZE PAGE_SIZE - #define ELF_HWCAP (boot_cpu_data.x86_capability[0]) - #define ELF_PLATFORM ("i686") -@@ -264,8 +262,6 @@ do { \ - set_thread_flag(TIF_ABI_PENDING); \ - else \ - clear_thread_flag(TIF_ABI_PENDING); \ -- /* XXX This overwrites the user set personality */ \ -- current->personality |= force_personality32; \ - } while (0) - - /* Override some function names */ -diff -urpN --exclude-from=/home/devel/davej/.exclude linux-2.6.13/arch/x86_64/kernel/process.c linux-2.6.13-a/arch/x86_64/kernel/process.c ---- linux-2.6.13/arch/x86_64/kernel/process.c 2005-10-14 20:55:36.000000000 -0400 -+++ linux-2.6.13-a/arch/x86_64/kernel/process.c 2005-10-14 20:56:15.000000000 -0400 -@@ -638,12 +638,6 @@ void set_personality_64bit(void) - - /* Make sure to be in 64bit mode */ - clear_thread_flag(TIF_IA32); -- -- /* TBD: overwrites user setup. Should have two bits. -- But 64bit processes have always behaved this way, -- so it's not too bad. The main problem is just that -- 32bit childs are affected again. */ -- current->personality &= ~READ_IMPLIES_EXEC; - } - - asmlinkage long sys_fork(struct pt_regs *regs) -diff -urpN --exclude-from=/home/devel/davej/.exclude linux-2.6.13/arch/x86_64/kernel/setup64.c linux-2.6.13-a/arch/x86_64/kernel/setup64.c ---- linux-2.6.13/arch/x86_64/kernel/setup64.c 2005-10-14 20:55:36.000000000 -0400 -+++ linux-2.6.13-a/arch/x86_64/kernel/setup64.c 2005-10-14 20:56:15.000000000 -0400 -@@ -45,7 +45,7 @@ Control non executable mappings for 64bi - on Enable(default) - off Disable - */ --int __init nonx_setup(char *str) -+void __init nonx_setup(const char *str) - { - if (!strncmp(str, "on", 2)) { - __supported_pte_mask |= _PAGE_NX; -@@ -53,29 +53,8 @@ int __init nonx_setup(char *str) - } else if (!strncmp(str, "off", 3)) { - do_not_nx = 1; - __supported_pte_mask &= ~_PAGE_NX; -- } -- return 0; -+ } - } --__setup("noexec=", nonx_setup); /* parsed early actually */ -- --int force_personality32 = READ_IMPLIES_EXEC; -- --/* noexec32=on|off --Control non executable heap for 32bit processes. --To control the stack too use noexec=off -- --on PROT_READ does not imply PROT_EXEC for 32bit processes --off PROT_READ implies PROT_EXEC (default) --*/ --static int __init nonx32_setup(char *str) --{ -- if (!strcmp(str, "on")) -- force_personality32 &= ~READ_IMPLIES_EXEC; -- else if (!strcmp(str, "off")) -- force_personality32 |= READ_IMPLIES_EXEC; -- return 0; --} --__setup("noexec32=", nonx32_setup); - - /* - * Great future plan: -diff -urpN --exclude-from=/home/devel/davej/.exclude linux-2.6.13/include/asm-x86_64/pgtable.h linux-2.6.13-a/include/asm-x86_64/pgtable.h ---- linux-2.6.13/include/asm-x86_64/pgtable.h 2005-10-14 20:55:36.000000000 -0400 -+++ linux-2.6.13-a/include/asm-x86_64/pgtable.h 2005-10-14 20:56:15.000000000 -0400 -@@ -20,7 +20,7 @@ extern unsigned long __supported_pte_mas - - #define swapper_pg_dir init_level4_pgt - --extern int nonx_setup(char *str); -+extern void nonx_setup(const char *str); - extern void paging_init(void); - extern void clear_kernel_mapping(unsigned long addr, unsigned long size); - ---- linux-2.6.14/fs/proc/base.c~ 2005-12-29 19:25:42.000000000 -0500 -+++ linux-2.6.14/fs/proc/base.c 2005-12-29 19:26:20.000000000 -0500 -@@ -200,7 +200,7 @@ static struct pid_entry tgid_base_stuff[ - E(PROC_TGID_EXE, "exe", S_IFLNK|S_IRWXUGO), - E(PROC_TGID_MOUNTS, "mounts", S_IFREG|S_IRUGO), - #ifdef CONFIG_MMU -- E(PROC_TGID_SMAPS, "smaps", S_IFREG|S_IRUGO), -+ E(PROC_TGID_SMAPS, "smaps", S_IFREG|S_IRUSR), - #endif - #ifdef CONFIG_SECURITY - E(PROC_TGID_ATTR, "attr", S_IFDIR|S_IRUGO|S_IXUGO), linux-2.6-modsign-core.patch: linux-2.6.12/kernel/module-verify.c | 2 linux-900/include/linux/module.h | 3 linux-900/init/Kconfig | 16 + linux-900/kernel/Makefile | 3 linux-900/kernel/module-verify-sig.c | 442 +++++++++++++++++++++++++++++++++++ linux-900/kernel/module-verify.c | 340 ++++++++++++++++++++++++++ linux-900/kernel/module-verify.h | 37 ++ linux-900/kernel/module.c | 19 + 8 files changed, 857 insertions(+), 5 deletions(-) Index: linux-2.6-modsign-core.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-4/linux-2.6-modsign-core.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- linux-2.6-modsign-core.patch 28 Oct 2005 05:23:06 -0000 1.1 +++ linux-2.6-modsign-core.patch 28 Mar 2006 16:14:09 -0000 1.2 @@ -47,9 +47,9 @@ -obj-$(CONFIG_MODULES) += module.o +obj-$(CONFIG_MODULES) += module.o module-verify.o +obj-$(CONFIG_MODULE_SIG) += module-verify-sig.o + obj-$(CONFIG_OBSOLETE_INTERMODULE) += intermodule.o obj-$(CONFIG_KALLSYMS) += kallsyms.o obj-$(CONFIG_PM) += power/ - obj-$(CONFIG_BSD_PROCESS_ACCT) += acct.o 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 linux-2.6-net-ipw2200-monitor.patch: Kconfig | 9 +++++++++ 1 files changed, 9 insertions(+) Index: linux-2.6-net-ipw2200-monitor.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-4/linux-2.6-net-ipw2200-monitor.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- linux-2.6-net-ipw2200-monitor.patch 21 Feb 2006 02:35:45 -0000 1.1 +++ linux-2.6-net-ipw2200-monitor.patch 28 Mar 2006 16:14:09 -0000 1.2 @@ -1,18 +1,18 @@ ---- linux-2.6.15/drivers/net/wireless/Kconfig~ 2006-02-20 21:30:24.000000000 -0500 -+++ linux-2.6.15/drivers/net/wireless/Kconfig 2006-02-20 21:30:41.000000000 -0500 -@@ -241,6 +241,15 @@ config IPW_DEBUG +--- linux-2.6.15.i686/drivers/net/wireless/Kconfig.BAD 2006-02-18 09:57:26.000000000 -0600 ++++ linux-2.6.15.i686/drivers/net/wireless/Kconfig 2006-02-18 09:58:07.000000000 -0600 +@@ -237,6 +237,15 @@ If you are not trying to debug or develop the IPW2200 driver, you most likely want to say N here. +config IPW2200_MONITOR -+ bool "Enable promiscuous mode" -+ depends on IPW2200 -+ ---help--- -+ Enables promiscuous/monitor mode support for the ipw2200 driver. -+ With this feature compiled into the driver, you can switch to -+ promiscuous mode via the Wireless Tool's Monitor mode. While in this -+ mode, no packets can be sent. ++ bool "Enable promiscuous mode" ++ depends on IPW2200 ++ ---help--- ++ Enables promiscuous/monitor mode support for the ipw2200 driver. ++ With this feature compiled into the driver, you can switch to ++ promiscuous mode via the Wireless Tool's Monitor mode. While in this ++ mode, no packets can be sent. + config AIRO tristate "Cisco/Aironet 34X/35X/4500/4800 ISA and PCI cards" - depends on NET_RADIO && ISA_DMA_API && (PCI || BROKEN) + depends on NET_RADIO && ISA_DMA_API && CRYPTO && (PCI || BROKEN) linux-2.6-netdump.patch: linux-2.6.12/drivers/net/netdump.c | 550 +++++++++++++++++++++++++++++ linux-2.6.12/drivers/net/netdump.h | 90 ++++ linux-2.6.12/include/asm-generic/netdump.h | 48 ++ linux-2.6.12/include/asm-i386/netdump.h | 79 ++++ linux-2.6.12/include/asm-ia64/netdump.h | 82 ++++ linux-2.6.12/include/asm-powerpc/netdump.h | 79 ++++ linux-2.6.12/include/asm-s390/netdump.h | 6 linux-2.6.12/include/asm-x86_64/netdump.h | 79 ++++ linux-2.6.12/include/linux/netdevice.h | 8 linux-2.6.12/include/linux/netpoll.h | 4 linux-2.6.12/net/core/netpoll.c | 17 linux-2.6.14/drivers/net/Makefile | 1 linux-2.6.15.noarch/drivers/net/Kconfig | 7 13 files changed, 1039 insertions(+), 11 deletions(-) Index: linux-2.6-netdump.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-4/linux-2.6-netdump.patch,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- linux-2.6-netdump.patch 6 Jan 2006 05:42:17 -0000 1.5 +++ linux-2.6-netdump.patch 28 Mar 2006 16:14:09 -0000 1.6 @@ -644,22 +644,22 @@ + +module_init(init_netdump); +module_exit(cleanup_netdump); ---- linux-2.6.12/drivers/net/Kconfig.netdump.orig 2005-08-19 17:45:43.052483533 -0400 -+++ linux-2.6.12/drivers/net/Kconfig 2005-08-19 17:48:14.835252548 -0400 -@@ -2545,6 +2545,13 @@ config NETCONSOLE +--- linux-2.6.15.noarch/drivers/net/Kconfig~ 2006-02-09 16:15:49.000000000 -0500 ++++ linux-2.6.15.noarch/drivers/net/Kconfig 2006-02-09 16:16:28.000000000 -0500 +@@ -2715,6 +2715,13 @@ config NETCONSOLE If you want to log kernel messages over the network, enable this. See for details. -+ config NETDUMP ++config NETDUMP + tristate "Network kernel crash dump support" + depends on NETPOLL && NETPOLL_TRAP && (X86 || PPC_PSERIES || IA64) + ---help--- + Enable this option if you have a netdump server and you would like + to collect kernel crash dumps. + - endif #NETDEVICES - config NETPOLL + def_bool NETCONSOLE + --- linux-2.6.14/drivers/net/Makefile~ 2005-10-30 21:44:17.000000000 -0500 +++ linux-2.6.14/drivers/net/Makefile 2005-10-30 21:44:33.000000000 -0500 @@ -203,6 +203,7 @@ obj-$(CONFIG_IRDA) += irda/ linux-2.6-radeon-backlight.patch: radeon_base.c | 11 + radeon_pm.c | 557 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 567 insertions(+), 1 deletion(-) Index: linux-2.6-radeon-backlight.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-4/linux-2.6-radeon-backlight.patch,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- linux-2.6-radeon-backlight.patch 6 Jan 2006 05:42:17 -0000 1.4 +++ linux-2.6-radeon-backlight.patch 28 Mar 2006 16:14:09 -0000 1.5 @@ -560,10 +560,10 @@ OUTREG(CRTC_OFFSET_CNTL, (INREG(CRTC_OFFSET_CNTL) & ~CRTC_OFFSET_CNTL__CRTC_STEREO_SYNC_OUT_EN)); -@@ -2779,6 +3311,29 @@ void radeonfb_pm_init(struct radeonfb_in - #endif +@@ -3322,6 +3322,29 @@ void radeonfb_pm_init(struct radeonfb_in } - #endif /* defined(CONFIG_PM) && defined(CONFIG_PPC_OF) */ + #endif /* defined(CONFIG_PPC_PMAC) */ + #endif /* defined(CONFIG_PM) */ + +/* The PM code also works on some PC laptops. + * Only a few models are actually tested so Your mileage may vary. linux-2.6-sata-promise-pata-ports.patch: drivers/scsi/libata-core.c | 1 drivers/scsi/sata_promise.c | 52 ++++++++++++++++++++++++++++++++++++++------ include/linux/libata.h | 1 3 files changed, 48 insertions(+), 6 deletions(-) Index: linux-2.6-sata-promise-pata-ports.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-4/linux-2.6-sata-promise-pata-ports.patch,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- linux-2.6-sata-promise-pata-ports.patch 6 Jan 2006 06:13:52 -0000 1.5 +++ linux-2.6-sata-promise-pata-ports.patch 28 Mar 2006 16:14:09 -0000 1.6 @@ -1,232 +1,136 @@ -diff --git a/drivers/scsi/ata_piix.c b/drivers/scsi/ata_piix.c -index 333d69d..887b2b9 100644 ---- a/drivers/scsi/ata_piix.c -+++ b/drivers/scsi/ata_piix.c -@@ -78,9 +78,7 @@ enum { - ich5_sata = 1, - piix4_pata = 2, - ich6_sata = 3, -- ich6_sata_rm = 4, -- ich7_sata = 5, -- esb2_sata = 6, -+ ich6_sata_ahci = 4, - - PIIX_AHCI_DEVICE = 6, - }; -@@ -111,11 +109,11 @@ static const struct pci_device_id piix_p - { 0x8086, 0x25a3, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich5_sata }, - { 0x8086, 0x25b0, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich5_sata }, - { 0x8086, 0x2651, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich6_sata }, -- { 0x8086, 0x2652, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich6_sata_rm }, -- { 0x8086, 0x2653, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich6_sata_rm }, -- { 0x8086, 0x27c0, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich7_sata }, -- { 0x8086, 0x27c4, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich7_sata }, -- { 0x8086, 0x2680, PCI_ANY_ID, PCI_ANY_ID, 0, 0, esb2_sata }, -+ { 0x8086, 0x2652, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich6_sata_ahci }, -+ { 0x8086, 0x2653, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich6_sata_ahci }, -+ { 0x8086, 0x27c0, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich6_sata_ahci }, -+ { 0x8086, 0x27c4, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich6_sata_ahci }, -+ { 0x8086, 0x2680, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich6_sata_ahci }, - - { } /* terminate list */ - }; -@@ -258,31 +256,7 @@ static struct ata_port_info piix_port_in - .port_ops = &piix_sata_ops, - }, - -- /* ich6_sata_rm */ -- { -- .sht = &piix_sht, -- .host_flags = ATA_FLAG_SATA | ATA_FLAG_SRST | -- PIIX_FLAG_COMBINED | PIIX_FLAG_CHECKINTR | -- ATA_FLAG_SLAVE_POSS | PIIX_FLAG_AHCI, -- .pio_mask = 0x1f, /* pio0-4 */ -- .mwdma_mask = 0x07, /* mwdma0-2 */ -- .udma_mask = 0x7f, /* udma0-6 */ -- .port_ops = &piix_sata_ops, -- }, -- -- /* ich7_sata */ -- { -- .sht = &piix_sht, -- .host_flags = ATA_FLAG_SATA | ATA_FLAG_SRST | -- PIIX_FLAG_COMBINED | PIIX_FLAG_CHECKINTR | -- ATA_FLAG_SLAVE_POSS | PIIX_FLAG_AHCI, -- .pio_mask = 0x1f, /* pio0-4 */ -- .mwdma_mask = 0x07, /* mwdma0-2 */ -- .udma_mask = 0x7f, /* udma0-6 */ -- .port_ops = &piix_sata_ops, -- }, -- -- /* esb2_sata */ -+ /* ich6_sata_ahci */ - { - .sht = &piix_sht, - .host_flags = ATA_FLAG_SATA | ATA_FLAG_SRST | -diff --git a/drivers/scsi/libata-core.c b/drivers/scsi/libata-core.c -index 665ae79..d9aa624 100644 ---- a/drivers/scsi/libata-core.c -+++ b/drivers/scsi/libata-core.c -@@ -1444,11 +1444,23 @@ void __sata_phy_reset(struct ata_port *a - } while (time_before(jiffies, timeout)); - - /* TODO: phy layer with polling, timeouts, etc. */ -- if (sata_dev_present(ap)) -+ sstatus = scr_read(ap, SCR_STATUS); -+ if (sata_dev_present(ap)) { -+ const char *speed; -+ u32 tmp; -+ -+ tmp = (sstatus >> 4) & 0xf; -+ if (tmp & (1 << 0)) -+ speed = "1.5"; -+ else if (tmp & (1 << 1)) -+ speed = "3.0"; -+ else -+ speed = ""; -+ printk(KERN_INFO "ata%u: SATA link up %s Gbps (SStatus %X)\n", -+ ap->id, speed, sstatus); - ata_port_probe(ap); -- else { -- sstatus = scr_read(ap, SCR_STATUS); -- printk(KERN_INFO "ata%u: no device found (phy stat %08x)\n", -+ } else { -+ printk(KERN_INFO "ata%u: SATA link down (SStatus %X)\n", - ap->id, sstatus); - ata_port_disable(ap); - } -@@ -4220,6 +4232,7 @@ static void ata_host_init(struct ata_por +This will update the following files: + + drivers/scsi/libata-core.c + include/linux/libata.h + drivers/scsi/sata_promise.c + +through these ChangeSets: + + o [libata sata_promise] support PATA ports on SATA controllers + +diff -Nru a/drivers/scsi/libata-core.c b/drivers/scsi/libata-core.c +--- a/drivers/scsi/libata-core.c 2006-02-08 11:34:51.000000000 -0700 ++++ b/drivers/scsi/libata-core.c 2006-02-08 11:37:11.000000000 -0700 +@@ -4423,6 +4423,7 @@ ap->mwdma_mask = ent->mwdma_mask; ap->udma_mask = ent->udma_mask; ap->flags |= ent->host_flags; -+ ap->flags |= ent->port_flags[port_no]; ++ ap->flags |= ent->port_flags[port_no]; /* pata fix */ ap->ops = ent->port_ops; ap->cbl = ATA_CBL_NONE; ap->active_tag = ATA_TAG_POISON; -diff --git a/drivers/scsi/sata_promise.c b/drivers/scsi/sata_promise.c -index 8a8e3e3..4ccb978 100644 ---- a/drivers/scsi/sata_promise.c -+++ b/drivers/scsi/sata_promise.c -@@ -85,6 +85,7 @@ static irqreturn_t pdc_interrupt (int ir - static void pdc_eng_timeout(struct ata_port *ap); - static int pdc_port_start(struct ata_port *ap); - static void pdc_port_stop(struct ata_port *ap); -+static void pdc_pata_cbl_detect(struct ata_port *ap); - static void pdc_pata_phy_reset(struct ata_port *ap); - static void pdc_sata_phy_reset(struct ata_port *ap); - static void pdc_qc_prep(struct ata_queued_cmd *qc); -@@ -165,7 +165,7 @@ static struct ata_port_info pdc_port_inf +diff -Nru a/drivers/scsi/sata_promise.c b/drivers/scsi/sata_promise.c +--- a/drivers/scsi/sata_promise.c 2006-02-08 10:08:08.000000000 -0700 ++++ b/drivers/scsi/sata_promise.c 2006-02-08 11:26:47.000000000 -0700 +@@ -165,7 +165,7 @@ /* board_2037x */ { .sht = &pdc_ata_sht, - .host_flags = PDC_COMMON_FLAGS | ATA_FLAG_SATA, -+ .host_flags = PDC_COMMON_FLAGS, ++ .host_flags = PDC_COMMON_FLAGS /* | ATA_FLAG_SATA */, /* pata fix */ .pio_mask = 0x1f, /* pio0-4 */ .mwdma_mask = 0x07, /* mwdma0-2 */ .udma_mask = 0x7f, /* udma0-6 ; FIXME */ -@@ -311,17 +312,34 @@ static void pdc_reset_port(struct ata_po +@@ -322,15 +322,34 @@ + static void pdc_sata_phy_reset(struct ata_port *ap) { - pdc_reset_port(ap); +- pdc_reset_port(ap); - sata_phy_reset(ap); -+ if (ap->flags & ATA_FLAG_SATA) -+ sata_phy_reset(ap); -+ else -+ pdc_pata_phy_reset(ap); ++/* pdc_reset_port(ap); */ /* pata fix */ ++/* sata_phy_reset(ap); */ /* pata fix */ ++ /* if no sata flag, test for pata drive */ /* pata fix */ ++ if (ap->flags & ATA_FLAG_SATA) /* pata fix */ ++ { /* pata fix */ ++ pdc_reset_port(ap); /* pata fix */ ++ sata_phy_reset(ap); /* pata fix */ ++ } /* pata fix */ ++ else /* pata fix */ ++ pdc_pata_phy_reset(ap); /* pata fix */ } -+static void pdc_pata_cbl_detect(struct ata_port *ap) -+{ -+ u8 tmp; -+ void *mmio = (void *) ap->ioaddr.cmd_addr + PDC_CTLSTAT + 0x03; -+ -+ tmp = readb(mmio); -+ -+ if (tmp & 0x01) -+ { -+ ap->cbl = ATA_CBL_PATA40; -+ ap->udma_mask &= ATA_UDMA_MASK_40C; -+ } -+ else -+ ap->cbl = ATA_CBL_PATA80; -+} -+ static void pdc_pata_phy_reset(struct ata_port *ap) { -- /* FIXME: add cable detect. Don't assume 40-pin cable */ + /* FIXME: add cable detect. Don't assume 40-pin cable */ - ap->cbl = ATA_CBL_PATA40; - ap->udma_mask &= ATA_UDMA_MASK_40C; -+ pdc_pata_cbl_detect(ap); ++/* ap->cbl = ATA_CBL_PATA40; */ /* pata fix */ ++/* ap->udma_mask &= ATA_UDMA_MASK_40C; */ /* pata fix */ ++ /* add cable detection code for pata drives */ /* pata fix */ ++ u8 tmp; /* pata fix */ ++ void *mmio = (void *) ap->ioaddr.cmd_addr + PDC_CTLSTAT + 0x03; /* pata fix */ ++ tmp = readb(mmio); /* pata fix */ ++ if (tmp & 0x01) /* pata fix */ ++ { /* pata fix */ ++ ap->cbl = ATA_CBL_PATA40; /* pata fix */ ++ ap->udma_mask &= ATA_UDMA_MASK_40C; /* pata fix */ ++ } /* pata fix */ ++ else /* pata fix */ ++ ap->cbl = ATA_CBL_PATA80; /* pata fix */ -- pdc_reset_port(ap); + pdc_reset_port(ap); ata_port_probe(ap); -+ - ata_bus_reset(ap); - } - -@@ -632,6 +650,7 @@ static int pdc_ata_init_one (struct pci_ +@@ -646,6 +665,7 @@ unsigned int board_idx = (unsigned int) ent->driver_data; int pci_dev_busy = 0; int rc; -+ u8 tmp; ++ u8 tmp; /* pata fix */ if (!printed_version++) dev_printk(KERN_DEBUG, &pdev->dev, "version " DRV_VERSION "\n"); -@@ -691,6 +710,9 @@ static int pdc_ata_init_one (struct pci_ +@@ -705,6 +725,9 @@ probe_ent->port[0].scr_addr = base + 0x400; probe_ent->port[1].scr_addr = base + 0x500; -+ probe_ent->port_flags[0] = ATA_FLAG_SATA; -+ probe_ent->port_flags[1] = ATA_FLAG_SATA; ++ probe_ent->port_flags[0] = ATA_FLAG_SATA; /* pata fix */ ++ probe_ent->port_flags[1] = ATA_FLAG_SATA; /* pata fix */ + /* notice 4-port boards */ switch (board_idx) { case board_20319: -@@ -701,9 +723,25 @@ static int pdc_ata_init_one (struct pci_ +@@ -715,9 +738,23 @@ probe_ent->port[2].scr_addr = base + 0x600; probe_ent->port[3].scr_addr = base + 0x700; -+ -+ probe_ent->port_flags[2] = ATA_FLAG_SATA; -+ probe_ent->port_flags[3] = ATA_FLAG_SATA; ++ ++ probe_ent->port_flags[2] = ATA_FLAG_SATA; /* pata fix */ ++ probe_ent->port_flags[3] = ATA_FLAG_SATA; /* pata fix */ break; case board_2037x: -- probe_ent->n_ports = 2; -+ /* Some boards have also PATA port */ -+ tmp = readb(mmio_base + PDC_FLASH_CTL+1); -+ if (!(tmp & 0x80)) -+ { -+ probe_ent->n_ports = 3; -+ -+ pdc_ata_setup_port(&probe_ent->port[2], base + 0x300); +- probe_ent->n_ports = 2; ++/* probe_ent->n_ports = 2; */ /* pata fix */ ++ /* Some boards have also PATA port */ /* pata fix */ ++ tmp = readb(mmio_base + PDC_FLASH_CTL+1); /* pata fix */ ++ if (!(tmp & 0x80)) /* pata fix */ ++ { /* pata fix */ ++ probe_ent->n_ports = 3; /* pata fix */ ++ pdc_ata_setup_port(&probe_ent->port[2], base + 0x300); /* pata fix */ ++ probe_ent->port_flags[2] = ATA_FLAG_SLAVE_POSS; /* pata fix */ ++ printk(KERN_INFO DRV_NAME " PATA port found\n"); /* pata fix */ ++ } /* pata fix */ ++ else /* pata fix */ ++ probe_ent->n_ports = 2; /* pata fix */ + break; + case board_20771: + probe_ent->n_ports = 2; +@@ -730,6 +767,9 @@ + + probe_ent->port[2].scr_addr = base + 0x600; + probe_ent->port[3].scr_addr = base + 0x700; + -+ probe_ent->port_flags[2] = ATA_FLAG_SLAVE_POSS; -+ -+ printk(KERN_INFO DRV_NAME " PATA port found\n"); -+ } -+ else -+ probe_ent->n_ports = 2; ++ probe_ent->port_flags[2] = ATA_FLAG_SATA; /* pata fix */ ++ probe_ent->port_flags[3] = ATA_FLAG_SATA; /* pata fix */ break; - case board_20619: - probe_ent->n_ports = 4; -diff --git a/include/linux/libata.h b/include/linux/libata.h -index f2dbb68..1146232 100644 ---- a/include/linux/libata.h -+++ b/include/linux/libata.h -@@ -229,6 +229,7 @@ struct ata_probe_ent { + default: + BUG(); +diff -Nru a/include/linux/libata.h b/include/linux/libata.h +--- a/include/linux/libata.h 2006-02-08 11:40:54.000000000 -0700 ++++ b/include/linux/libata.h 2006-02-08 11:45:02.000000000 -0700 +@@ -237,6 +237,7 @@ unsigned long irq; unsigned int irq_flags; unsigned long host_flags; -+ unsigned long port_flags[ATA_MAX_PORTS]; ++ unsigned long port_flags[ATA_MAX_PORTS]; /* pata fix */ void __iomem *mmio_base; void *private_data; }; -@@ -330,8 +331,6 @@ struct ata_port { - - u8 ctl; /* cache of ATA control register */ - u8 last_ctl; /* Cache last written value */ -- unsigned int bus_state; -- unsigned int port_state; - unsigned int pio_mask; - unsigned int mwdma_mask; - unsigned int udma_mask; linux-2.6-sleepon.patch: drivers/block/DAC960.c | 12 +++++++++++- drivers/net/tokenring/ibmtr.c | 9 ++++++++- include/linux/wait.h | 6 +++--- kernel/sched.c | 28 +++++++++++++++------------- 4 files changed, 37 insertions(+), 18 deletions(-) Index: linux-2.6-sleepon.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-4/linux-2.6-sleepon.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- linux-2.6-sleepon.patch 28 Oct 2005 05:23:06 -0000 1.1 +++ linux-2.6-sleepon.patch 28 Mar 2006 16:14:09 -0000 1.2 @@ -140,32 +140,3 @@ current->state = TASK_UNINTERRUPTIBLE; SLEEP_ON_HEAD -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 -@@ -223,17 +223,24 @@ out_no_clnt: - int - rpc_shutdown_client(struct rpc_clnt *clnt) - { -+ wait_queue_t __wait; -+ init_waitqueue_entry(&__wait, current); - dprintk("RPC: shutting down %s client for %s, tasks=%d\n", - clnt->cl_protname, clnt->cl_server, - atomic_read(&clnt->cl_users)); - -+ add_wait_queue(&destroy_wait, &__wait); -+ set_current_state(TASK_UNINTERRUPTIBLE); - while (atomic_read(&clnt->cl_users) > 0) { - /* Don't let rpc_release_client destroy us */ - clnt->cl_oneshot = 0; - clnt->cl_dead = 0; - rpc_killall_tasks(clnt); -- sleep_on_timeout(&destroy_wait, 1*HZ); -+ schedule_timeout(1*HZ); -+ set_current_state(TASK_UNINTERRUPTIBLE); - } -+ current->state = TASK_RUNNING; -+ remove_wait_queue(&destroy_wait, &__wait); - - if (atomic_read(&clnt->cl_users) < 0) { - printk(KERN_ERR "RPC: rpc_shutdown_client clnt %p tasks=%d\n", linux-2.6-tux.patch: arch/alpha/kernel/systbls.S | 8 arch/i386/kernel/syscall_table.S | 10 arch/ia64/kernel/entry.S | 8 arch/ia64/kernel/ia64_ksyms.c | 5 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-generic/fcntl.h | 4 include/asm-i386/unistd.h | 5 include/asm-ia64/unistd.h | 2 include/asm-sparc/fcntl.h | 1 include/asm-sparc64/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 | 2 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 | 8 include/net/tcp.h | 3 include/net/tux.h | 804 ++++++++++++++ include/net/tux_u.h | 163 ++ kernel/exit.c | 7 kernel/fork.c | 1 kernel/kmod.c | 28 kernel/signal.c | 1 mm/filemap.c | 19 mm/truncate.c | 2 net/Kconfig | 1 net/Makefile | 1 net/core/sock.c | 5 net/ipv4/tcp.c | 3 net/ipv4/tcp_input.c | 1 net/ipv4/tcp_output.c | 3 net/socket.c | 197 ++- net/tux/Kconfig | 25 net/tux/Makefile | 12 net/tux/abuf.c | 190 +++ net/tux/accept.c | 863 +++++++++++++++ net/tux/cachemiss.c | 265 ++++ net/tux/cgi.c | 171 +++ net/tux/directory.c | 302 +++++ net/tux/extcgi.c | 329 +++++ net/tux/gzip.c | 40 net/tux/input.c | 641 +++++++++++ net/tux/logger.c | 837 ++++++++++++++ net/tux/main.c | 1417 +++++++++++++++++++++++++ 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 | 1555 +++++++++++++++++++++++++++ net/tux/proto_http.c | 2197 +++++++++++++++++++++++++++++++++++++++ net/tux/redirect.c | 172 +++ net/tux/times.c | 392 ++++++ net/tux/times.h | 26 net/tux/userspace.c | 27 72 files changed, 12775 insertions(+), 98 deletions(-) Index: linux-2.6-tux.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-4/linux-2.6-tux.patch,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- linux-2.6-tux.patch 6 Jan 2006 05:42:17 -0000 1.5 +++ linux-2.6-tux.patch 28 Mar 2006 16:14:09 -0000 1.6 @@ -1,81 +1,7 @@ - arch/alpha/kernel/systbls.S | 8 - arch/i386/kernel/syscall_table.S | 10 - arch/ia64/kernel/entry.S | 8 - arch/ia64/kernel/ia64_ksyms.c | 5 - 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-generic/fcntl.h | 4 - include/asm-i386/unistd.h | 5 - include/asm-ia64/unistd.h | 2 - include/asm-sparc/fcntl.h | 1 - include/asm-sparc64/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 | 2 - 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 | 8 - include/net/tcp.h | 3 - include/net/tux.h | 804 ++++++++++++++ - include/net/tux_u.h | 163 ++ - kernel/exit.c | 7 - kernel/fork.c | 1 - kernel/kmod.c | 28 - kernel/signal.c | 1 - mm/filemap.c | 19 - mm/truncate.c | 2 - net/Kconfig | 1 - net/Makefile | 1 - net/core/sock.c | 5 - net/ipv4/tcp.c | 3 - net/ipv4/tcp_input.c | 1 - net/ipv4/tcp_output.c | 1 - net/socket.c | 197 ++- - net/tux/Kconfig | 25 - net/tux/Makefile | 12 - net/tux/abuf.c | 190 +++ - net/tux/accept.c | 863 +++++++++++++++ - net/tux/cachemiss.c | 265 ++++ - net/tux/cgi.c | 171 +++ - net/tux/directory.c | 302 +++++ - net/tux/extcgi.c | 329 +++++ - net/tux/gzip.c | 40 - net/tux/input.c | 641 +++++++++++ - net/tux/logger.c | 837 ++++++++++++++ - net/tux/main.c | 1417 +++++++++++++++++++++++++ - 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 | 1555 +++++++++++++++++++++++++++ - net/tux/proto_http.c | 2197 +++++++++++++++++++++++++++++++++++++++ - net/tux/redirect.c | 172 +++ - net/tux/times.c | 392 ++++++ - net/tux/times.h | 26 - net/tux/userspace.c | 27 - 72 files changed, 12773 insertions(+), 98 deletions(-) - -Index: linux/arch/alpha/kernel/systbls.S +Index: linux-tux.q/arch/alpha/kernel/systbls.S =================================================================== ---- linux.orig/arch/alpha/kernel/systbls.S -+++ linux/arch/alpha/kernel/systbls.S +--- linux-tux.q.orig/arch/alpha/kernel/systbls.S ++++ linux-tux.q/arch/alpha/kernel/systbls.S @@ -240,7 +240,15 @@ sys_call_table: .quad alpha_ni_syscall .quad alpha_ni_syscall /* 220 */ @@ -92,11 +18,11 @@ .quad alpha_ni_syscall .quad alpha_ni_syscall .quad alpha_ni_syscall /* 225 */ -Index: linux/arch/i386/kernel/syscall_table.S +Index: linux-tux.q/arch/i386/kernel/syscall_table.S =================================================================== ---- linux.orig/arch/i386/kernel/syscall_table.S -+++ linux/arch/i386/kernel/syscall_table.S -@@ -222,7 +222,15 @@ ENTRY(sys_call_table) +--- linux-tux.q.orig/arch/i386/kernel/syscall_table.S ++++ linux-tux.q/arch/i386/kernel/syscall_table.S +@@ -221,7 +221,15 @@ ENTRY(sys_call_table) .long sys_madvise .long sys_getdents64 /* 220 */ .long sys_fcntl64 @@ -113,11 +39,11 @@ .long sys_ni_syscall .long sys_gettid .long sys_readahead /* 225 */ -Index: linux/arch/ia64/kernel/entry.S +Index: linux-tux.q/arch/ia64/kernel/entry.S =================================================================== ---- linux.orig/arch/ia64/kernel/entry.S -+++ linux/arch/ia64/kernel/entry.S -@@ -1440,7 +1440,15 @@ sys_call_table: +--- linux-tux.q.orig/arch/ia64/kernel/entry.S ++++ linux-tux.q/arch/ia64/kernel/entry.S +@@ -1442,7 +1442,15 @@ sys_call_table: data8 sys_syslog data8 sys_setitimer data8 sys_getitimer @@ -133,27 +59,27 @@ data8 sys_ni_syscall /* was: ia64_oldlstat */ data8 sys_ni_syscall /* was: ia64_oldfstat */ data8 sys_vhangup -Index: linux/arch/ia64/kernel/ia64_ksyms.c +Index: linux-tux.q/arch/ia64/kernel/ia64_ksyms.c =================================================================== ---- linux.orig/arch/ia64/kernel/ia64_ksyms.c -+++ linux/arch/ia64/kernel/ia64_ksyms.c -@@ -58,6 +58,11 @@ EXPORT_SYMBOL(__strlen_user); +--- linux-tux.q.orig/arch/ia64/kernel/ia64_ksyms.c ++++ linux-tux.q/arch/ia64/kernel/ia64_ksyms.c +@@ -44,6 +44,11 @@ EXPORT_SYMBOL(__strlen_user); EXPORT_SYMBOL(__strncpy_from_user); EXPORT_SYMBOL(__strnlen_user); +#define __KERNEL_SYSCALLS__ +#include -+EXPORT_SYMBOL(sys_execve); -+EXPORT_SYMBOL(clone); ++EXPORT_SYMBOL_GPL(sys_execve); ++EXPORT_SYMBOL_GPL(clone); + /* from arch/ia64/lib */ extern void __divsi3(void); extern void __udivsi3(void); -Index: linux/arch/x86_64/ia32/ia32entry.S +Index: linux-tux.q/arch/x86_64/ia32/ia32entry.S =================================================================== ---- linux.orig/arch/x86_64/ia32/ia32entry.S -+++ linux/arch/x86_64/ia32/ia32entry.S -@@ -571,7 +571,15 @@ ia32_sys_call_table: +--- linux-tux.q.orig/arch/x86_64/ia32/ia32entry.S ++++ linux-tux.q/arch/x86_64/ia32/ia32entry.S +@@ -599,7 +599,15 @@ ia32_sys_call_table: .quad sys_madvise .quad compat_sys_getdents64 /* 220 getdents64 */ .quad compat_sys_fcntl64 @@ -170,19 +96,19 @@ .quad quiet_ni_syscall /* security */ .quad sys_gettid .quad sys_readahead /* 225 */ -Index: linux/fs/dcache.c +Index: linux-tux.q/fs/dcache.c =================================================================== ---- linux.orig/fs/dcache.c -+++ linux/fs/dcache.c +--- linux-tux.q.orig/fs/dcache.c ++++ linux-tux.q/fs/dcache.c @@ -86,6 +86,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); ++ if (dentry->d_extra_attributes) { ++ kfree(dentry->d_extra_attributes); ++ dentry->d_extra_attributes = NULL; ++ } + call_rcu(&dentry->d_u.d_rcu, d_callback); } @@ -742,6 +746,7 @@ struct dentry *d_alloc(struct dentry * p @@ -191,26 +117,26 @@ dentry->d_fsdata = NULL; + dentry->d_extra_attributes = NULL; dentry->d_mounted = 0; + #ifdef CONFIG_PROFILING dentry->d_cookie = NULL; - INIT_HLIST_NODE(&dentry->d_hash); -@@ -1310,6 +1315,16 @@ already_unhashed: +@@ -1317,6 +1322,16 @@ already_unhashed: /* Unhash the target: dput() will then get rid of it */ __d_drop(target); -+ /* flush any possible attributes */ -+ if (dentry->d_extra_attributes) { -+ kfree(dentry->d_extra_attributes); -+ dentry->d_extra_attributes = NULL; -+ } -+ if (target->d_extra_attributes) { -+ kfree(target->d_extra_attributes); -+ target->d_extra_attributes = NULL; -+ } -+ - list_del(&dentry->d_child); - list_del(&target->d_child); ++ /* flush any possible attributes */ ++ if (dentry->d_extra_attributes) { ++ kfree(dentry->d_extra_attributes); ++ dentry->d_extra_attributes = NULL; ++ } ++ if (target->d_extra_attributes) { ++ kfree(target->d_extra_attributes); ++ target->d_extra_attributes = NULL; ++ } ++ + list_del(&dentry->d_u.d_child); + list_del(&target->d_u.d_child); -@@ -1353,7 +1368,7 @@ already_unhashed: +@@ -1360,7 +1375,7 @@ already_unhashed: * * "buflen" should be positive. Caller holds the dcache_lock. */ @@ -219,7 +145,7 @@ struct dentry *root, struct vfsmount *rootmnt, char *buffer, int buflen) { -@@ -1421,6 +1436,8 @@ Elong: +@@ -1428,6 +1443,8 @@ Elong: return ERR_PTR(-ENAMETOOLONG); } @@ -228,7 +154,7 @@ /* write full pathname into buffer and return start of pathname */ char * d_path(struct dentry *dentry, struct vfsmount *vfsmnt, char *buf, int buflen) -@@ -1663,6 +1680,23 @@ static void __init dcache_init_early(voi +@@ -1670,6 +1687,23 @@ static void __init dcache_init_early(voi INIT_HLIST_HEAD(&dentry_hashtable[loop]); } @@ -252,11 +178,11 @@ static void __init dcache_init(unsigned long mempages) { int loop; -Index: linux/fs/exec.c +Index: linux-tux.q/fs/exec.c =================================================================== ---- linux.orig/fs/exec.c -+++ linux/fs/exec.c -@@ -1450,6 +1450,8 @@ int do_coredump(long signr, int exit_cod +--- linux-tux.q.orig/fs/exec.c ++++ linux-tux.q/fs/exec.c +@@ -1446,6 +1446,8 @@ int do_coredump(long signr, int exit_cod binfmt = current->binfmt; if (!binfmt || !binfmt->core_dump) goto fail; @@ -265,11 +191,11 @@ down_write(&mm->mmap_sem); if (!mm->dumpable) { up_write(&mm->mmap_sem); -Index: linux/fs/fcntl.c +Index: linux-tux.q/fs/fcntl.c =================================================================== ---- linux.orig/fs/fcntl.c -+++ linux/fs/fcntl.c -@@ -111,7 +111,7 @@ out: +--- linux-tux.q.orig/fs/fcntl.c ++++ linux-tux.q/fs/fcntl.c +@@ -112,7 +112,7 @@ out: return error; } @@ -278,7 +204,7 @@ { struct files_struct * files = current->files; struct fdtable *fdt; -@@ -134,6 +134,8 @@ static int dupfd(struct file *file, unsi +@@ -135,6 +135,8 @@ static int dupfd(struct file *file, unsi return fd; } @@ -287,11 +213,11 @@ asmlinkage long sys_dup2(unsigned int oldfd, unsigned int newfd) { int err = -EBADF; -Index: linux/fs/namei.c +Index: linux-tux.q/fs/namei.c =================================================================== ---- linux.orig/fs/namei.c -+++ linux/fs/namei.c -@@ -732,7 +732,7 @@ static inline void follow_dotdot(struct +--- linux-tux.q.orig/fs/namei.c ++++ linux-tux.q/fs/namei.c +@@ -735,7 +735,7 @@ static __always_inline void follow_dotdo * It _is_ time-critical. */ static int do_lookup(struct nameidata *nd, struct qstr *name, @@ -300,7 +226,7 @@ { struct vfsmount *mnt = nd->mnt; struct dentry *dentry = __d_lookup(nd->dentry, name); -@@ -748,12 +748,16 @@ done: +@@ -751,12 +751,16 @@ done: return 0; need_lookup: @@ -317,7 +243,7 @@ if (dentry->d_op->d_revalidate(dentry, nd)) goto done; if (d_invalidate(dentry)) -@@ -777,9 +781,11 @@ static fastcall int __link_path_walk(con +@@ -780,9 +784,11 @@ static fastcall int __link_path_walk(con { struct path next; struct inode *inode; @@ -331,7 +257,7 @@ while (*name=='/') name++; if (!*name) -@@ -848,7 +854,7 @@ static fastcall int __link_path_walk(con +@@ -851,7 +857,7 @@ static fastcall int __link_path_walk(con break; } /* This does the actual lookups.. */ @@ -340,7 +266,7 @@ if (err) break; -@@ -902,7 +908,7 @@ last_component: +@@ -906,7 +912,7 @@ last_component: if (err < 0) break; } @@ -349,7 +275,7 @@ if (err) break; inode = next.dentry->d_inode; -@@ -1354,6 +1360,8 @@ static inline int lookup_flags(unsigned +@@ -1406,6 +1412,8 @@ static inline int lookup_flags(unsigned if (f & O_DIRECTORY) retval |= LOOKUP_DIRECTORY; @@ -358,11 +284,11 @@ return retval; } -Index: linux/fs/namespace.c +Index: linux-tux.q/fs/namespace.c =================================================================== ---- linux.orig/fs/namespace.c -+++ linux/fs/namespace.c -@@ -1465,6 +1465,8 @@ void set_fs_root(struct fs_struct *fs, s +--- linux-tux.q.orig/fs/namespace.c ++++ linux-tux.q/fs/namespace.c +@@ -1491,6 +1491,8 @@ void set_fs_root(struct fs_struct *fs, s } } @@ -371,11 +297,11 @@ /* * Replace the fs->{pwdmnt,pwd} with {mnt,dentry}. Put the old values. * It can block. Requires the big lock held. -Index: linux/fs/open.c +Index: linux-tux.q/fs/open.c =================================================================== ---- linux.orig/fs/open.c -+++ linux/fs/open.c -@@ -542,6 +542,8 @@ out: +--- linux-tux.q.orig/fs/open.c ++++ linux-tux.q/fs/open.c +@@ -555,6 +555,8 @@ out: return error; } @@ -384,7 +310,7 @@ asmlinkage long sys_fchdir(unsigned int fd) { struct file *file; -@@ -598,6 +600,8 @@ out: +@@ -611,6 +613,8 @@ out: return error; } @@ -393,10 +319,10 @@ asmlinkage long sys_fchmod(unsigned int fd, mode_t mode) { struct inode * inode; -Index: linux/fs/pipe.c +Index: linux-tux.q/fs/pipe.c =================================================================== ---- linux.orig/fs/pipe.c -+++ linux/fs/pipe.c +--- linux-tux.q.orig/fs/pipe.c ++++ linux-tux.q/fs/pipe.c @@ -798,6 +798,8 @@ no_files: return error; } @@ -406,11 +332,11 @@ /* * pipefs should _never_ be mounted by userland - too much of security hassle, * no real gain from having the whole whorehouse mounted. So we don't need -Index: linux/fs/read_write.c +Index: linux-tux.q/fs/read_write.c =================================================================== ---- linux.orig/fs/read_write.c -+++ linux/fs/read_write.c -@@ -360,6 +360,8 @@ asmlinkage ssize_t sys_write(unsigned in +--- linux-tux.q.orig/fs/read_write.c ++++ linux-tux.q/fs/read_write.c +@@ -374,6 +374,8 @@ asmlinkage ssize_t sys_write(unsigned in return ret; } @@ -419,10 +345,10 @@ asmlinkage ssize_t sys_pread64(unsigned int fd, char __user *buf, size_t count, loff_t pos) { -Index: linux/include/asm-alpha/fcntl.h +Index: linux-tux.q/include/asm-alpha/fcntl.h =================================================================== ---- linux.orig/include/asm-alpha/fcntl.h -+++ linux/include/asm-alpha/fcntl.h +--- linux-tux.q.orig/include/asm-alpha/fcntl.h ++++ linux-tux.q/include/asm-alpha/fcntl.h @@ -14,6 +14,7 @@ #define O_DIRECTORY 0100000 /* must be a directory */ #define O_NOFOLLOW 0200000 /* don't follow links */ @@ -431,10 +357,10 @@ #define O_DIRECT 02000000 /* direct disk access - should check with OSF/1 */ #define O_NOATIME 04000000 -Index: linux/include/asm-generic/fcntl.h +Index: linux-tux.q/include/asm-generic/fcntl.h =================================================================== ---- linux.orig/include/asm-generic/fcntl.h -+++ linux/include/asm-generic/fcntl.h +--- linux-tux.q.orig/include/asm-generic/fcntl.h ++++ linux-tux.q/include/asm-generic/fcntl.h @@ -49,6 +49,10 @@ #ifndef O_NOATIME #define O_NOATIME 01000000 @@ -446,19 +372,19 @@ #ifndef O_NDELAY #define O_NDELAY O_NONBLOCK #endif -Index: linux/include/asm-i386/unistd.h +Index: linux-tux.q/include/asm-i386/unistd.h =================================================================== ---- linux.orig/include/asm-i386/unistd.h -+++ linux/include/asm-i386/unistd.h -@@ -302,6 +302,7 @@ +--- linux-tux.q.orig/include/asm-i386/unistd.h ++++ linux-tux.q/include/asm-i386/unistd.h +@@ -319,6 +319,7 @@ - #define NR_syscalls 294 + #define NR_syscalls 311 +#ifndef __KERNEL_SYSCALLS_NO_ERRNO__ /* * user-visible error numbers are in the range -1 - -128: see * -@@ -315,6 +316,10 @@ do { \ +@@ -332,6 +333,10 @@ do { \ return (type) (res); \ } while (0) @@ -469,10 +395,10 @@ /* XXX - _foo needs to be __foo, while __NR_bar could be _NR_bar. */ #define _syscall0(type,name) \ type name(void) \ -Index: linux/include/asm-ia64/unistd.h +Index: linux-tux.q/include/asm-ia64/unistd.h =================================================================== ---- linux.orig/include/asm-ia64/unistd.h -+++ linux/include/asm-ia64/unistd.h +--- linux-tux.q.orig/include/asm-ia64/unistd.h ++++ linux-tux.q/include/asm-ia64/unistd.h @@ -109,7 +109,7 @@ #define __NR_syslog 1117 #define __NR_setitimer 1118 @@ -482,10 +408,10 @@ /* 1121 was __NR_old_lstat */ /* 1122 was __NR_old_fstat */ #define __NR_vhangup 1123 -Index: linux/include/asm-sparc/fcntl.h +Index: linux-tux.q/include/asm-sparc/fcntl.h =================================================================== ---- linux.orig/include/asm-sparc/fcntl.h -+++ linux/include/asm-sparc/fcntl.h +--- linux-tux.q.orig/include/asm-sparc/fcntl.h ++++ linux-tux.q/include/asm-sparc/fcntl.h @@ -14,6 +14,7 @@ #define O_NDELAY (0x0004 | O_NONBLOCK) #define O_NOCTTY 0x8000 /* not fcntl */ @@ -494,10 +420,10 @@ #define O_DIRECT 0x100000 /* direct disk access hint */ #define O_NOATIME 0x200000 -Index: linux/include/asm-sparc64/fcntl.h +Index: linux-tux.q/include/asm-sparc64/fcntl.h =================================================================== ---- linux.orig/include/asm-sparc64/fcntl.h -+++ linux/include/asm-sparc64/fcntl.h +--- linux-tux.q.orig/include/asm-sparc64/fcntl.h ++++ linux-tux.q/include/asm-sparc64/fcntl.h @@ -14,6 +14,7 @@ #define O_NONBLOCK 0x4000 #define O_NOCTTY 0x8000 /* not fcntl */ @@ -506,10 +432,10 @@ #define O_DIRECT 0x100000 /* direct disk access hint */ #define O_NOATIME 0x200000 -Index: linux/include/asm-x86_64/unistd.h +Index: linux-tux.q/include/asm-x86_64/unistd.h =================================================================== ---- linux.orig/include/asm-x86_64/unistd.h -+++ linux/include/asm-x86_64/unistd.h +--- linux-tux.q.orig/include/asm-x86_64/unistd.h ++++ linux-tux.q/include/asm-x86_64/unistd.h @@ -425,7 +425,15 @@ __SYSCALL(__NR_putpmsg, sys_ni_syscall) __SYSCALL(__NR_afs_syscall, sys_ni_syscall) @@ -527,31 +453,31 @@ #define __NR_security 185 __SYSCALL(__NR_security, sys_ni_syscall) -Index: linux/include/linux/buffer_head.h +Index: linux-tux.q/include/linux/buffer_head.h =================================================================== ---- linux.orig/include/linux/buffer_head.h -+++ linux/include/linux/buffer_head.h -@@ -200,6 +200,7 @@ int cont_prepare_write(struct page*, uns - int generic_cont_expand(struct inode *inode, loff_t size) ; +--- linux-tux.q.orig/include/linux/buffer_head.h ++++ linux-tux.q/include/linux/buffer_head.h +@@ -201,6 +201,7 @@ int generic_cont_expand(struct inode *in + int generic_cont_expand_simple(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 *); -Index: linux/include/linux/dcache.h +Index: linux-tux.q/include/linux/dcache.h =================================================================== ---- linux.orig/include/linux/dcache.h -+++ linux/include/linux/dcache.h -@@ -102,6 +102,7 @@ struct dentry { +--- linux-tux.q.orig/include/linux/dcache.h ++++ linux-tux.q/include/linux/dcache.h +@@ -107,6 +107,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; ++ void *d_extra_attributes; /* TUX-specific data */ + #ifdef CONFIG_PROFILING struct dcookie_struct *d_cookie; /* cookie, if any */ - int d_mounted; -@@ -211,6 +212,7 @@ extern void shrink_dcache_sb(struct supe + #endif +@@ -217,6 +218,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 *); @@ -559,7 +485,7 @@ /* only used at mount-time */ extern struct dentry * d_alloc_root(struct inode *); -@@ -271,8 +273,12 @@ extern struct dentry * __d_lookup(struct +@@ -277,8 +279,12 @@ extern struct dentry * __d_lookup(struct /* validate "insecure" dentry pointer */ extern int d_validate(struct dentry *, struct dentry *); @@ -573,10 +499,10 @@ /* Allocation counts.. */ /** -Index: linux/include/linux/errno.h +Index: linux-tux.q/include/linux/errno.h =================================================================== ---- linux.orig/include/linux/errno.h -+++ linux/include/linux/errno.h +--- linux-tux.q.orig/include/linux/errno.h ++++ linux-tux.q/include/linux/errno.h @@ -24,6 +24,9 @@ #define EIOCBQUEUED 529 /* iocb queued, will get completion event */ #define EIOCBRETRY 530 /* iocb queued, will trigger a retry */ @@ -587,22 +513,22 @@ #endif #endif -Index: linux/include/linux/file.h +Index: linux-tux.q/include/linux/file.h =================================================================== ---- linux.orig/include/linux/file.h -+++ linux/include/linux/file.h -@@ -95,4 +95,6 @@ struct task_struct; +--- linux-tux.q.orig/include/linux/file.h ++++ linux-tux.q/include/linux/file.h +@@ -93,4 +93,6 @@ struct task_struct; struct files_struct *get_files_struct(struct task_struct *); void FASTCALL(put_files_struct(struct files_struct *fs)); +extern int dupfd(struct file *file, unsigned int start); + #endif /* __LINUX_FILE_H */ -Index: linux/include/linux/fs.h +Index: linux-tux.q/include/linux/fs.h =================================================================== ---- linux.orig/include/linux/fs.h -+++ linux/include/linux/fs.h -@@ -1537,7 +1537,7 @@ ssize_t generic_file_write_nolock(struct +--- linux-tux.q.orig/include/linux/fs.h ++++ linux-tux.q/include/linux/fs.h +@@ -1575,7 +1575,7 @@ ssize_t generic_file_write_nolock(struct extern ssize_t generic_file_sendfile(struct file *, loff_t *, size_t, read_actor_t, void *); extern void do_generic_mapping_read(struct address_space *mapping, struct file_ra_state *, struct file *, @@ -611,7 +537,7 @@ extern void file_ra_state_init(struct file_ra_state *ra, struct address_space *mapping); extern ssize_t generic_file_readv(struct file *filp, const struct iovec *iov, -@@ -1569,14 +1569,15 @@ static inline int xip_truncate_page(stru +@@ -1607,14 +1607,15 @@ static inline int xip_truncate_page(stru static inline void do_generic_file_read(struct file * filp, loff_t *ppos, read_descriptor_t * desc, @@ -629,10 +555,10 @@ } ssize_t __blockdev_direct_IO(int rw, struct kiocb *iocb, struct inode *inode, -Index: linux/include/linux/kmod.h +Index: linux-tux.q/include/linux/kmod.h =================================================================== ---- linux.orig/include/linux/kmod.h -+++ linux/include/linux/kmod.h +--- linux-tux.q.orig/include/linux/kmod.h ++++ linux-tux.q/include/linux/kmod.h @@ -47,5 +47,7 @@ call_usermodehelper(char *path, char **a } @@ -641,10 +567,10 @@ + struct key *ring); #endif /* __LINUX_KMOD_H__ */ -Index: linux/include/linux/namei.h +Index: linux-tux.q/include/linux/namei.h =================================================================== ---- linux.orig/include/linux/namei.h -+++ linux/include/linux/namei.h +--- linux-tux.q.orig/include/linux/namei.h ++++ linux-tux.q/include/linux/namei.h @@ -48,6 +48,8 @@ enum {LAST_NORM, LAST_ROOT, LAST_DOT, LA #define LOOKUP_PARENT 16 #define LOOKUP_NOALT 32 @@ -654,10 +580,10 @@ /* * Intent data */ -Index: linux/include/linux/net.h +Index: linux-tux.q/include/linux/net.h =================================================================== ---- linux.orig/include/linux/net.h -+++ linux/include/linux/net.h +--- linux-tux.q.orig/include/linux/net.h ++++ linux-tux.q/include/linux/net.h @@ -183,6 +183,7 @@ extern int sock_create_kern(int fam struct socket **res); extern int sock_create_lite(int family, int type, int proto, @@ -666,11 +592,11 @@ extern void sock_release(struct socket *sock); extern int sock_sendmsg(struct socket *sock, struct msghdr *msg, size_t len); -Index: linux/include/linux/sched.h +Index: linux-tux.q/include/linux/sched.h =================================================================== ---- linux.orig/include/linux/sched.h -+++ linux/include/linux/sched.h -@@ -807,6 +807,11 @@ struct task_struct { +--- linux-tux.q.orig/include/linux/sched.h ++++ linux-tux.q/include/linux/sched.h +@@ -815,6 +815,11 @@ struct task_struct { int (*notifier)(void *priv); void *notifier_data; sigset_t *notifier_mask; @@ -682,11 +608,11 @@ void *security; struct audit_context *audit_context; -Index: linux/include/linux/skbuff.h +Index: linux-tux.q/include/linux/skbuff.h =================================================================== ---- linux.orig/include/linux/skbuff.h -+++ linux/include/linux/skbuff.h -@@ -1327,6 +1327,8 @@ static inline unsigned int skb_checksum_ +--- linux-tux.q.orig/include/linux/skbuff.h ++++ linux-tux.q/include/linux/skbuff.h +@@ -1328,6 +1328,8 @@ static inline unsigned int skb_checksum_ __skb_checksum_complete(skb); } @@ -695,11 +621,11 @@ #ifdef CONFIG_NETFILTER static inline void nf_conntrack_put(struct nf_conntrack *nfct) { -Index: linux/include/linux/socket.h +Index: linux-tux.q/include/linux/socket.h =================================================================== ---- linux.orig/include/linux/socket.h -+++ linux/include/linux/socket.h -@@ -299,6 +299,11 @@ extern int move_addr_to_user(void *kaddr +--- linux-tux.q.orig/include/linux/socket.h ++++ linux-tux.q/include/linux/socket.h +@@ -301,6 +301,11 @@ extern int move_addr_to_user(void *kaddr extern int move_addr_to_kernel(void __user *uaddr, int ulen, void *kaddr); extern int put_cmsg(struct msghdr*, int level, int type, int len, void *data); @@ -711,11 +637,11 @@ #endif #endif /* not kernel and not glibc */ #endif /* _LINUX_SOCKET_H */ -Index: linux/include/linux/sysctl.h +Index: linux-tux.q/include/linux/sysctl.h =================================================================== ---- linux.orig/include/linux/sysctl.h -+++ linux/include/linux/sysctl.h -@@ -205,6 +205,7 @@ enum +--- linux-tux.q.orig/include/linux/sysctl.h ++++ linux-tux.q/include/linux/sysctl.h +@@ -211,6 +211,7 @@ enum NET_SCTP=17, NET_LLC=18, NET_NETFILTER=19, @@ -723,7 +649,7 @@ }; /* /proc/sys/kernel/random */ -@@ -725,6 +726,55 @@ enum { +@@ -735,6 +736,55 @@ enum { NET_BRIDGE_NF_FILTER_VLAN_TAGGED = 4, }; @@ -779,10 +705,10 @@ /* CTL_PROC names: */ /* CTL_FS names: */ -Index: linux/include/net/sock.h +Index: linux-tux.q/include/net/sock.h =================================================================== ---- linux.orig/include/net/sock.h -+++ linux/include/net/sock.h +--- linux-tux.q.orig/include/net/sock.h ++++ linux-tux.q/include/net/sock.h @@ -62,7 +62,7 @@ */ @@ -826,11 +752,11 @@ const gfp_t priority); extern struct sk_buff *sock_wmalloc(struct sock *sk, -Index: linux/include/net/tcp.h +Index: linux-tux.q/include/net/tcp.h =================================================================== ---- linux.orig/include/net/tcp.h -+++ linux/include/net/tcp.h -@@ -310,6 +310,8 @@ extern void tcp_shutdown (struct sock +--- linux-tux.q.orig/include/net/tcp.h ++++ linux-tux.q/include/net/tcp.h +@@ -263,6 +263,8 @@ extern void tcp_shutdown (struct sock extern int tcp_v4_rcv(struct sk_buff *skb); @@ -839,7 +765,7 @@ extern int tcp_v4_remember_stamp(struct sock *sk); extern int tcp_v4_tw_remember_stamp(struct inet_timewait_sock *tw); -@@ -467,6 +469,7 @@ extern int tcp_send_synack(struct sock +@@ -422,6 +424,7 @@ extern int tcp_send_synack(struct sock extern void tcp_push_one(struct sock *, unsigned int mss_now); extern void tcp_send_ack(struct sock *sk); extern void tcp_send_delayed_ack(struct sock *sk); @@ -847,10 +773,10 @@ /* tcp_input.c */ extern void tcp_cwnd_application_limited(struct sock *sk); -Index: linux/include/net/tux.h +Index: linux-tux.q/include/net/tux.h =================================================================== --- /dev/null -+++ linux/include/net/tux.h ++++ linux-tux.q/include/net/tux.h @@ -0,0 +1,804 @@ +#ifndef _NET_TUX_H +#define _NET_TUX_H @@ -1656,10 +1582,10 @@ +extern void free_tux_request_slabs(void); + +#endif -Index: linux/include/net/tux_u.h +Index: linux-tux.q/include/net/tux_u.h =================================================================== --- /dev/null -+++ linux/include/net/tux_u.h ++++ linux-tux.q/include/net/tux_u.h @@ -0,0 +1,163 @@ +#ifndef _NET_TUX_U_H +#define _NET_TUX_U_H @@ -1824,12 +1750,12 @@ +} ftp_command_t; + +#endif -Index: linux/kernel/exit.c +Index: linux-tux.q/kernel/exit.c =================================================================== ---- linux.orig/kernel/exit.c -+++ linux/kernel/exit.c -@@ -845,6 +845,13 @@ fastcall NORET_TYPE void do_exit(long co - del_timer_sync(&tsk->signal->real_timer); +--- linux-tux.q.orig/kernel/exit.c ++++ linux-tux.q/kernel/exit.c +@@ -851,6 +851,13 @@ fastcall NORET_TYPE void do_exit(long co + hrtimer_cancel(&tsk->signal->real_timer); exit_itimers(tsk->signal); acct_process(code); + if (current->tux_info) { @@ -1842,11 +1768,11 @@ } exit_mm(tsk); -Index: linux/kernel/fork.c +Index: linux-tux.q/kernel/fork.c =================================================================== ---- linux.orig/kernel/fork.c -+++ linux/kernel/fork.c -@@ -896,6 +896,7 @@ static task_t *copy_process(unsigned lon +--- linux-tux.q.orig/kernel/fork.c ++++ linux-tux.q/kernel/fork.c +@@ -944,6 +944,7 @@ static task_t *copy_process(unsigned lon p = dup_task_struct(current); if (!p) goto fork_out; @@ -1854,10 +1780,10 @@ retval = -EAGAIN; if (atomic_read(&p->user->processes) >= -Index: linux/kernel/kmod.c +Index: linux-tux.q/kernel/kmod.c =================================================================== ---- linux.orig/kernel/kmod.c -+++ linux/kernel/kmod.c +--- linux-tux.q.orig/kernel/kmod.c ++++ linux-tux.q/kernel/kmod.c @@ -128,14 +128,14 @@ struct subprocess_info { /* * This is the task which runs the usermode application @@ -1908,11 +1834,11 @@ /* Exec failed? */ sub_info->retval = retval; -Index: linux/kernel/signal.c +Index: linux-tux.q/kernel/signal.c =================================================================== ---- linux.orig/kernel/signal.c -+++ linux/kernel/signal.c -@@ -430,6 +430,7 @@ flush_signal_handlers(struct task_struct +--- linux-tux.q.orig/kernel/signal.c ++++ linux-tux.q/kernel/signal.c +@@ -441,6 +441,7 @@ flush_signal_handlers(struct task_struct } } @@ -1920,11 +1846,11 @@ /* Notify the system that a driver wants to block all signals for this * process, and wants to be notified if any signals at all were to be -Index: linux/mm/filemap.c +Index: linux-tux.q/mm/filemap.c =================================================================== ---- linux.orig/mm/filemap.c -+++ linux/mm/filemap.c -@@ -718,7 +718,8 @@ void do_generic_mapping_read(struct addr +--- linux-tux.q.orig/mm/filemap.c ++++ linux-tux.q/mm/filemap.c +@@ -735,7 +735,8 @@ void do_generic_mapping_read(struct addr struct file *filp, loff_t *ppos, read_descriptor_t *desc, @@ -1934,7 +1860,7 @@ { struct inode *inode = mapping->host; unsigned long index; -@@ -768,11 +769,21 @@ void do_generic_mapping_read(struct addr +@@ -785,11 +786,21 @@ void do_generic_mapping_read(struct addr find_page: page = find_get_page(mapping, index); if (unlikely(page == NULL)) { @@ -1957,7 +1883,7 @@ page_ok: /* If users can be writing to this page using arbitrary -@@ -1028,7 +1039,7 @@ __generic_file_aio_read(struct kiocb *io +@@ -1050,7 +1061,7 @@ __generic_file_aio_read(struct kiocb *io if (desc.count == 0) continue; desc.error = 0; @@ -1966,7 +1892,7 @@ retval += desc.written; if (desc.error) { retval = retval ?: desc.error; -@@ -1102,7 +1113,7 @@ ssize_t generic_file_sendfile(struct fil +@@ -1124,7 +1135,7 @@ ssize_t generic_file_sendfile(struct fil desc.arg.data = target; desc.error = 0; @@ -1975,11 +1901,11 @@ if (desc.written) return desc.written; return desc.error; -Index: linux/mm/truncate.c +Index: linux-tux.q/mm/truncate.c =================================================================== ---- linux.orig/mm/truncate.c -+++ linux/mm/truncate.c -@@ -224,6 +224,8 @@ unlock: +--- linux-tux.q.orig/mm/truncate.c ++++ linux-tux.q/mm/truncate.c +@@ -253,6 +253,8 @@ unlock: return ret; } @@ -1988,11 +1914,11 @@ unsigned long invalidate_inode_pages(struct address_space *mapping) { return invalidate_mapping_pages(mapping, 0, ~0UL); -Index: linux/net/Kconfig +Index: linux-tux.q/net/Kconfig =================================================================== ---- linux.orig/net/Kconfig -+++ linux/net/Kconfig -@@ -215,6 +215,7 @@ source "net/ax25/Kconfig" +--- linux-tux.q.orig/net/Kconfig ++++ linux-tux.q/net/Kconfig +@@ -223,6 +223,7 @@ source "net/ax25/Kconfig" source "net/irda/Kconfig" source "net/bluetooth/Kconfig" source "net/ieee80211/Kconfig" @@ -2000,10 +1926,10 @@ endif # if NET endmenu # Networking -Index: linux/net/Makefile +Index: linux-tux.q/net/Makefile =================================================================== ---- linux.orig/net/Makefile -+++ linux/net/Makefile +--- linux-tux.q.orig/net/Makefile ++++ linux-tux.q/net/Makefile @@ -22,6 +22,7 @@ obj-$(CONFIG_UNIX) += unix/ ifneq ($(CONFIG_IPV6),) obj-y += ipv6/ @@ -2012,11 +1938,11 @@ obj-$(CONFIG_PACKET) += packet/ obj-$(CONFIG_NET_KEY) += key/ obj-$(CONFIG_NET_SCHED) += sched/ -Index: linux/net/core/sock.c +Index: linux-tux.q/net/core/sock.c =================================================================== ---- linux.orig/net/core/sock.c -+++ linux/net/core/sock.c -@@ -704,7 +704,7 @@ void sk_free(struct sock *sk) +--- linux-tux.q.orig/net/core/sock.c ++++ linux-tux.q/net/core/sock.c +@@ -705,7 +705,7 @@ void sk_free(struct sock *sk) module_put(owner); } @@ -2025,7 +1951,7 @@ { struct sock *newsk = sk_alloc(sk->sk_family, priority, sk->sk_prot, 0); -@@ -741,6 +741,9 @@ struct sock *sk_clone(const struct sock +@@ -742,6 +742,9 @@ struct sock *sk_clone(const struct sock if (filter != NULL) sk_filter_charge(newsk, filter); @@ -2035,10 +1961,10 @@ if (unlikely(xfrm_sk_clone_policy(newsk))) { /* It is still raw copy of parent, so invalidate * destructor and make plain sk_free() */ -Index: linux/net/ipv4/tcp.c +Index: linux-tux.q/net/ipv4/tcp.c =================================================================== ---- linux.orig/net/ipv4/tcp.c -+++ linux/net/ipv4/tcp.c +--- linux-tux.q.orig/net/ipv4/tcp.c ++++ linux-tux.q/net/ipv4/tcp.c @@ -936,7 +936,7 @@ static int tcp_recv_urg(struct sock *sk, * calculation of whether or not we must ACK for the sake of * a window update. @@ -2048,16 +1974,16 @@ { struct tcp_sock *tp = tcp_sk(sk); int time_to_ack = 0; -@@ -2144,3 +2144,4 @@ EXPORT_SYMBOL(tcp_sendpage); +@@ -2142,3 +2142,4 @@ EXPORT_SYMBOL(tcp_sendpage); EXPORT_SYMBOL(tcp_setsockopt); EXPORT_SYMBOL(tcp_shutdown); EXPORT_SYMBOL(tcp_statistics); +EXPORT_SYMBOL_GPL(cleanup_rbuf); -Index: linux/net/ipv4/tcp_input.c +Index: linux-tux.q/net/ipv4/tcp_input.c =================================================================== ---- linux.orig/net/ipv4/tcp_input.c -+++ linux/net/ipv4/tcp_input.c -@@ -3433,6 +3433,7 @@ static int tcp_prune_queue(struct sock * +--- linux-tux.q.orig/net/ipv4/tcp_input.c ++++ linux-tux.q/net/ipv4/tcp_input.c +@@ -3474,6 +3474,7 @@ static int tcp_prune_queue(struct sock * return -1; } @@ -2065,11 +1991,20 @@ /* RFC2861, slow part. Adjust cwnd, after it was not full during one rto. * As additional protections, we do not touch cwnd in retransmission phases, -Index: linux/net/ipv4/tcp_output.c +Index: linux-tux.q/net/ipv4/tcp_output.c =================================================================== ---- linux.orig/net/ipv4/tcp_output.c -+++ linux/net/ipv4/tcp_output.c -@@ -1069,6 +1069,7 @@ void __tcp_push_pending_frames(struct so +--- linux-tux.q.orig/net/ipv4/tcp_output.c ++++ linux-tux.q/net/ipv4/tcp_output.c +@@ -791,6 +791,8 @@ unsigned int tcp_current_mss(struct sock + return mss_now; + } + ++EXPORT_SYMBOL_GPL(tcp_current_mss); ++ + /* Congestion window validation. (RFC2861) */ + + static void tcp_cwnd_validate(struct sock *sk, struct tcp_sock *tp) +@@ -1160,6 +1162,7 @@ void __tcp_push_pending_frames(struct so tcp_check_probe_timer(sk, tp); } } @@ -2077,10 +2012,10 @@ /* Send _single_ skb sitting at the send head. This function requires * true push pending frames to setup probe timer etc. -Index: linux/net/socket.c +Index: linux-tux.q/net/socket.c =================================================================== ---- linux.orig/net/socket.c -+++ linux/net/socket.c +--- linux-tux.q.orig/net/socket.c ++++ linux-tux.q/net/socket.c @@ -68,6 +68,7 @@ #include #include @@ -2273,7 +2208,7 @@ /* * In theory you can't get an open on this inode, but /proc provides * a back door. Remember to keep it shut otherwise you'll let the -@@ -1041,6 +1055,8 @@ static int sock_fasync(int fd, struct fi +@@ -1044,6 +1058,8 @@ static int sock_fasync(int fd, struct fi } out: @@ -2282,9 +2217,9 @@ release_sock(sock->sk); return 0; } -@@ -2067,6 +2083,51 @@ void __init sock_init(void) - #endif - } +@@ -2072,6 +2088,51 @@ static int __init sock_init(void) + + core_initcall(sock_init); /* early initcall */ +int tux_Dprintk; +int tux_TDprintk; @@ -2334,10 +2269,10 @@ #ifdef CONFIG_PROC_FS void socket_seq_show(struct seq_file *seq) { -Index: linux/net/tux/Kconfig +Index: linux-tux.q/net/tux/Kconfig =================================================================== --- /dev/null -+++ linux/net/tux/Kconfig ++++ linux-tux.q/net/tux/Kconfig @@ -0,0 +1,25 @@ + +config TUX @@ -2364,10 +2299,10 @@ + +endmenu + -Index: linux/net/tux/Makefile +Index: linux-tux.q/net/tux/Makefile =================================================================== --- /dev/null -+++ linux/net/tux/Makefile ++++ linux-tux.q/net/tux/Makefile @@ -0,0 +1,12 @@ +# +# Makefile for TUX @@ -2381,10 +2316,10 @@ + +tux-$(subst m,y,$(CONFIG_TUX_EXTCGI)) += cgi.o extcgi.o + -Index: linux/net/tux/abuf.c +Index: linux-tux.q/net/tux/abuf.c =================================================================== --- /dev/null -+++ linux/net/tux/abuf.c ++++ linux-tux.q/net/tux/abuf.c @@ -0,0 +1,190 @@ +/* + * TUX - Integrated Application Protocols Layer and Object Cache @@ -2576,10 +2511,10 @@ + send_abuf(req, size, flags); + add_req_to_workqueue(req); +} -Index: linux/net/tux/accept.c +Index: linux-tux.q/net/tux/accept.c =================================================================== --- /dev/null -+++ linux/net/tux/accept.c ++++ linux-tux.q/net/tux/accept.c @@ -0,0 +1,863 @@ +/* + * TUX - Integrated Application Protocols Layer and Object Cache @@ -3444,10 +3379,10 @@ + goto out; +} + -Index: linux/net/tux/cachemiss.c +Index: linux-tux.q/net/tux/cachemiss.c =================================================================== --- /dev/null -+++ linux/net/tux/cachemiss.c ++++ linux-tux.q/net/tux/cachemiss.c @@ -0,0 +1,265 @@ +/* + * TUX - Integrated Application Protocols Layer and Object Cache @@ -3714,10 +3649,10 @@ + return 0; +} + -Index: linux/net/tux/cgi.c +Index: linux-tux.q/net/tux/cgi.c =================================================================== --- /dev/null -+++ linux/net/tux/cgi.c ++++ linux-tux.q/net/tux/cgi.c @@ -0,0 +1,171 @@ +/* + * TUX - Integrated Application Protocols Layer and Object Cache @@ -3890,10 +3825,10 @@ + } + return pid; +} -Index: linux/net/tux/directory.c +Index: linux-tux.q/net/tux/directory.c =================================================================== --- /dev/null -+++ linux/net/tux/directory.c ++++ linux-tux.q/net/tux/directory.c @@ -0,0 +1,302 @@ +/* + * TUX - Integrated Application Protocols Layer and Object Cache @@ -4197,10 +4132,10 @@ + add_req_to_workqueue(req); +} + -Index: linux/net/tux/extcgi.c +Index: linux-tux.q/net/tux/extcgi.c =================================================================== --- /dev/null -+++ linux/net/tux/extcgi.c ++++ linux-tux.q/net/tux/extcgi.c @@ -0,0 +1,329 @@ +/* + * TUX - Integrated Application Protocols Layer and Object Cache @@ -4531,10 +4466,10 @@ + +#define EXTCGI_INVALID EXTCGI_INVALID_HEADER EXTCGI_INVALID_BODY + -Index: linux/net/tux/gzip.c +Index: linux-tux.q/net/tux/gzip.c =================================================================== --- /dev/null -+++ linux/net/tux/gzip.c ++++ linux-tux.q/net/tux/gzip.c @@ -0,0 +1,40 @@ +/* $Id$ */ + @@ -4576,10 +4511,10 @@ + return left; +} + -Index: linux/net/tux/input.c +Index: linux-tux.q/net/tux/input.c =================================================================== --- /dev/null -+++ linux/net/tux/input.c ++++ linux-tux.q/net/tux/input.c @@ -0,0 +1,641 @@ +/* + * TUX - Integrated Application Protocols Layer and Object Cache @@ -5222,10 +5157,10 @@ + return count; +} + -Index: linux/net/tux/logger.c +Index: linux-tux.q/net/tux/logger.c =================================================================== --- /dev/null -+++ linux/net/tux/logger.c ++++ linux-tux.q/net/tux/logger.c @@ -0,0 +1,837 @@ +/* + * TUX - Integrated Application Protocols Layer and Object Cache @@ -5936,7 +5871,7 @@ + inode = log_filp->f_dentry->d_inode; + mapping = inode->i_mapping; + if (mapping->nrpages > 256) { /* batch stuff up */ -+ down(&inode->i_sem); ++ mutex_lock(&inode->i_mutex); + filemap_fdatawrite(inode->i_mapping); + + /* @@ -5946,7 +5881,7 @@ + */ + invalidate_mapping_pages(mapping, 0, log_filp_last_index); + log_filp_last_index = log_filp->f_pos >> PAGE_CACHE_SHIFT; -+ up(&inode->i_sem); ++ mutex_unlock(&inode->i_mutex); + } + +out_lock: @@ -6064,10 +5999,10 @@ + + Dprintk("logger thread stopped!\n"); +} -Index: linux/net/tux/main.c +Index: linux-tux.q/net/tux/main.c =================================================================== --- /dev/null -+++ linux/net/tux/main.c ++++ linux-tux.q/net/tux/main.c @@ -0,0 +1,1417 @@ +/* + * TUX - Integrated Application Protocols Layer and Object Cache @@ -7486,10 +7421,10 @@ + +MODULE_LICENSE("GPL"); + -Index: linux/net/tux/mod.c +Index: linux-tux.q/net/tux/mod.c =================================================================== --- /dev/null -+++ linux/net/tux/mod.c ++++ linux-tux.q/net/tux/mod.c @@ -0,0 +1,262 @@ +/* + * TUX - Integrated Application Protocols Layer and Object Cache @@ -7753,10 +7688,10 @@ + return ret; +} + -Index: linux/net/tux/output.c +Index: linux-tux.q/net/tux/output.c =================================================================== --- /dev/null -+++ linux/net/tux/output.c ++++ linux-tux.q/net/tux/output.c @@ -0,0 +1,352 @@ +/* + * TUX - Integrated Application Protocols Layer and Object Cache @@ -8110,10 +8045,10 @@ + return 0; +} + -Index: linux/net/tux/parser.h +Index: linux-tux.q/net/tux/parser.h =================================================================== --- /dev/null -+++ linux/net/tux/parser.h ++++ linux-tux.q/net/tux/parser.h @@ -0,0 +1,102 @@ +/* + * TUX - Integrated Application Protocols Layer and Object Cache @@ -8217,10 +8152,10 @@ + GOTO_REDIR; \ +} while (0) + -Index: linux/net/tux/postpone.c +Index: linux-tux.q/net/tux/postpone.c =================================================================== --- /dev/null -+++ linux/net/tux/postpone.c ++++ linux-tux.q/net/tux/postpone.c @@ -0,0 +1,77 @@ +/* + * TUX - Integrated Application Protocols Layer and Object Cache @@ -8299,10 +8234,10 @@ + return err; +} + -Index: linux/net/tux/proc.c +Index: linux-tux.q/net/tux/proc.c =================================================================== --- /dev/null -+++ linux/net/tux/proc.c ++++ linux-tux.q/net/tux/proc.c @@ -0,0 +1,1149 @@ +/* + * TUX - Integrated Application Protocols Layer and Object Cache @@ -9453,10 +9388,10 @@ +} + + -Index: linux/net/tux/proto_ftp.c +Index: linux-tux.q/net/tux/proto_ftp.c =================================================================== --- /dev/null -+++ linux/net/tux/proto_ftp.c ++++ linux-tux.q/net/tux/proto_ftp.c @@ -0,0 +1,1555 @@ +/* + * TUX - Integrated Application Protocols Layer and Object Cache @@ -11013,10 +10948,10 @@ + name: "ftp", +}; + -Index: linux/net/tux/proto_http.c +Index: linux-tux.q/net/tux/proto_http.c =================================================================== --- /dev/null -+++ linux/net/tux/proto_http.c ++++ linux-tux.q/net/tux/proto_http.c @@ -0,0 +1,2197 @@ +/* + * TUX - Integrated Application Protocols Layer and Object Cache @@ -13215,10 +13150,10 @@ + name: "http", +}; + -Index: linux/net/tux/redirect.c +Index: linux-tux.q/net/tux/redirect.c =================================================================== --- /dev/null -+++ linux/net/tux/redirect.c ++++ linux-tux.q/net/tux/redirect.c @@ -0,0 +1,172 @@ +/* + * TUX - Integrated Application Protocols Layer and Object Cache @@ -13392,10 +13327,10 @@ +{ + kmem_cache_destroy(tux_req.slab); +} -Index: linux/net/tux/times.c +Index: linux-tux.q/net/tux/times.c =================================================================== --- /dev/null -+++ linux/net/tux/times.c ++++ linux-tux.q/net/tux/times.c @@ -0,0 +1,392 @@ +/* + * TUX - Integrated Application Protocols Layer and Object Cache @@ -13789,10 +13724,10 @@ + + return mktime(year, mon, mday, hour, min, sec); +} -Index: linux/net/tux/times.h +Index: linux-tux.q/net/tux/times.h =================================================================== --- /dev/null -+++ linux/net/tux/times.h ++++ linux-tux.q/net/tux/times.h @@ -0,0 +1,26 @@ +static time_t TimeDays[10][13] = { + { 852073200, 854751600, 857170800, 859849200, 862441200, 865119600, 867711600, 870390000, 873068400, 875660400, 878338800, 880930800, 883609200 } , @@ -13820,10 +13755,10 @@ +}; +#define TUX_YEAROFFSET 1997 +#define TUX_NUMYEARS 10 -Index: linux/net/tux/userspace.c +Index: linux-tux.q/net/tux/userspace.c =================================================================== --- /dev/null -+++ linux/net/tux/userspace.c ++++ linux-tux.q/net/tux/userspace.c @@ -0,0 +1,27 @@ +/* + * TUX - Integrated Application Protocols Layer and Object Cache @@ -13852,13 +13787,3 @@ + * + ****************************************************************/ + ---- linux-2.6.14/net/ipv4/tcp_output.c~ 2005-12-12 00:42:02.000000000 -0500 -+++ linux-2.6.14/net/ipv4/tcp_output.c 2005-12-12 00:42:17.000000000 -0500 -@@ -703,6 +703,7 @@ unsigned int tcp_current_mss(struct sock - - return mss_now; - } -+EXPORT_SYMBOL_GPL(tcp_current_mss); - - /* Congestion window validation. (RFC2861) */ - linux-2.6-vm-clear-unreclaimable.patch: linux-2.6.14/mm/filemap.c | 7 +++++++ linux-2.6.15/mm/page_alloc.c | 5 +++++ 2 files changed, 12 insertions(+) Index: linux-2.6-vm-clear-unreclaimable.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-4/linux-2.6-vm-clear-unreclaimable.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- linux-2.6-vm-clear-unreclaimable.patch 10 Dec 2005 06:51:26 -0000 1.1 +++ linux-2.6-vm-clear-unreclaimable.patch 28 Mar 2006 16:14:09 -0000 1.2 @@ -19,18 +19,17 @@ wake_up_page(page, PG_writeback); } EXPORT_SYMBOL(end_page_writeback); ---- linux-2.6.14/mm/page_alloc.c~ 2005-12-10 01:47:51.000000000 -0500 -+++ linux-2.6.14/mm/page_alloc.c 2005-12-10 01:48:25.000000000 -0500 -@@ -657,6 +657,12 @@ static void fastcall free_hot_cold_page( - pcp->count++; - if (pcp->count >= pcp->high) - pcp->count -= free_pages_bulk(zone, pcp->batch, &pcp->list, 0); -+ else if (zone->all_unreclaimable) { +--- linux-2.6.15/mm/page_alloc.c~ 2006-01-09 13:40:03.000000000 -0500 ++++ linux-2.6.15/mm/page_alloc.c 2006-01-09 13:40:50.000000000 -0500 +@@ -722,6 +722,11 @@ static void fastcall free_hot_cold_page( + if (pcp->count >= pcp->high) { + free_pages_bulk(zone, pcp->batch, &pcp->list, 0); + pcp->count -= pcp->batch; ++ } else if (zone->all_unreclaimable) { + spin_lock(&zone->lock); + zone->all_unreclaimable = 0; + zone->pages_scanned = 0; + spin_unlock(&zone->lock); -+ } + } local_irq_restore(flags); put_cpu(); - } linux-2.6-vm-silence-atomic-alloc-failures.patch: gfp.h | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) Index: linux-2.6-vm-silence-atomic-alloc-failures.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-4/linux-2.6-vm-silence-atomic-alloc-failures.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- linux-2.6-vm-silence-atomic-alloc-failures.patch 28 Oct 2005 05:23:07 -0000 1.3 +++ linux-2.6-vm-silence-atomic-alloc-failures.patch 28 Mar 2006 16:14:09 -0000 1.4 @@ -1,12 +1,11 @@ Atomic failures aren't too interesting. -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 -@@ -47,7 +47,7 @@ struct vm_area_struct; - __GFP_COLD|__GFP_NOWARN|__GFP_REPEAT| \ - __GFP_NOFAIL|__GFP_NORETRY|__GFP_NO_GROW|__GFP_COMP) +--- linux-2.6.15/include/linux/gfp.h~ 2006-01-12 18:48:46.000000000 -0500 ++++ linux-2.6.15/include/linux/gfp.h 2006-01-12 18:48:57.000000000 -0500 +@@ -58,7 +58,7 @@ struct vm_area_struct; + __GFP_NOMEMALLOC|__GFP_HARDWALL) + /* GFP_ATOMIC means both !wait (__GFP_WAIT not set) and use emergency pool */ -#define GFP_ATOMIC (__GFP_HIGH) +#define GFP_ATOMIC (__GFP_HIGH | __GFP_NOWARN) #define GFP_NOIO (__GFP_WAIT) linux-2.6-x86-tune-p4.patch: linux-2.6.12/arch/x86_64/Makefile | 4 +--- linux-2.6.15/arch/i386/Makefile.cpu | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) Index: linux-2.6-x86-tune-p4.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-4/linux-2.6-x86-tune-p4.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- linux-2.6-x86-tune-p4.patch 6 Jan 2006 05:42:17 -0000 1.2 +++ linux-2.6-x86-tune-p4.patch 28 Mar 2006 16:14:10 -0000 1.3 @@ -1,10 +1,9 @@ -diff -urNp --exclude-from=/home/davej/.exclude linux-1/arch/i386/Makefile linux-212/arch/i386/Makefile ---- linux-2.6.10/arch/i386/Makefile.cpu -+++ linux-2.6.10/arch/i386/Makefile.cpu -@@ -33,7 +33,7 @@ cflags-$(CONFIG_M486) += -march=i486 +--- linux-2.6.15/arch/i386/Makefile.cpu~ 2006-01-09 11:39:04.000000000 -0500 ++++ linux-2.6.15/arch/i386/Makefile.cpu 2006-01-09 11:39:36.000000000 -0500 +@@ -15,7 +15,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) + cflags-$(CONFIG_M586MMX) += -march=pentium-mmx -cflags-$(CONFIG_M686) += -march=i686 +cflags-$(CONFIG_M686) += -march=i686 $(call tune,pentium4) cflags-$(CONFIG_MPENTIUMII) += -march=i686 $(call tune,pentium2) Index: sources =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-4/sources,v retrieving revision 1.160 retrieving revision 1.161 diff -u -r1.160 -r1.161 --- sources 9 Mar 2006 23:16:31 -0000 1.160 +++ sources 28 Mar 2006 16:14:10 -0000 1.161 @@ -1,2 +1 @@ -cdf95e00f5111e31f78e1d97304d9522 linux-2.6.15.tar.bz2 -a2c39bf318cfac3fdc322e793402c46c patch-2.6.15.6.bz2 +9ffe7df0263d5e4ba5007237c848c97a patch-2.6.16.1.bz2 Index: upstream =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-4/upstream,v retrieving revision 1.101 retrieving revision 1.102 diff -u -r1.101 -r1.102 --- upstream 9 Mar 2006 23:16:31 -0000 1.101 +++ upstream 28 Mar 2006 16:14:10 -0000 1.102 @@ -1,3 +1,2 @@ -linux-2.6.15.tar.bz2 -patch-2.6.15.6.bz2 - +linux-2.6.16.tar.bz2 +patch-2.6.16.1.bz2 --- linux-2.6-8250-16c950-faster.patch DELETED --- --- linux-2.6-acpi-thinkpad-c2c3.patch DELETED --- --- linux-2.6-atkbd-dell-multimedia.patch DELETED --- --- linux-2.6-block-reduce-stack.patch DELETED --- --- linux-2.6-build-reference-discarded-opd.patch DELETED --- --- linux-2.6-crash-xen.patch DELETED --- --- linux-2.6-debug-taint-check.patch DELETED --- --- linux-2.6-debug-taint-proprietary-helpers.patch DELETED --- --- linux-2.6-devmem-xen.patch DELETED --- --- linux-2.6-execshield-vdso.patch DELETED --- --- linux-2.6-execshield-xen.patch DELETED --- --- linux-2.6-firmware-loader-timeout.patch DELETED --- --- linux-2.6-g5-dualcore.patch DELETED --- --- linux-2.6-input-usblegacy.patch DELETED --- --- linux-2.6-ipw2200-hwcrypto.patch DELETED --- --- linux-2.6-max-symlinks.patch DELETED --- --- linux-2.6-missing-exports.patch DELETED --- --- linux-2.6-net-acenic-use-after-free.patch DELETED --- --- linux-2.6-net-nat-pmtu.patch DELETED --- --- linux-2.6-posix-timers-sched_time-accumulation.patch DELETED --- --- linux-2.6-powerpc-parport.patch DELETED --- --- linux-2.6-powerpc64-fpexc.patch DELETED --- --- linux-2.6-procfs-i_nlink-miscalculate.patch DELETED --- --- linux-2.6-sata-enable-atapi-by-default.patch DELETED --- --- linux-2.6-scsi-megaraid-legacy.patch DELETED --- --- linux-2.6-serial-nrports.patch DELETED --- --- linux-2.6-serial-of.patch DELETED --- --- linux-2.6-swsusp-nofreeze.patch DELETED --- --- linux-2.6-ub.patch DELETED --- --- linux-2.6-usb-find-interface.patch DELETED --- --- linux-2.6-usb-unusual-devices.patch DELETED --- --- linux-2.6-vm-debug.patch DELETED --- --- linux-2.6-vm-oomkiller-debugging.patch DELETED --- --- linux-2.6-write-protect-rodata.patch DELETED --- --- linux-2.6-x86_64-disable-hotplug-guessing.patch DELETED --- --- linux-2.6-xen-additional.patch DELETED --- --- linux-2.6-xen-compile.patch DELETED --- --- linux-2.6-xen-vdso-note.patch DELETED --- --- linux-2.6-xen.patch DELETED --- --- linux-2.6.14-intel-cache-build.patch DELETED --- --- linux-2.6.14.tar.bz2.sign DELETED --- --- linux-2.6.15-default-powerpc.patch DELETED --- --- linux-2.6.15-mv643xx-fixes.patch DELETED --- --- linux-2.6.15-rc1-ppc64-syscallpath.patch DELETED --- --- linux-2.6.15.tar.bz2.sign DELETED --- --- patch-2.6.15.6.bz2.sign DELETED --- From fedora-cvs-commits at redhat.com Tue Mar 28 16:31:25 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 28 Mar 2006 11:31:25 -0500 Subject: rpms/cups/devel cups-str1515.patch,NONE,1.1 cups.spec,1.143,1.144 Message-ID: <200603281631.k2SGVPVq017433@cvs.devel.redhat.com> Author: twaugh Update of /cvs/dist/rpms/cups/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv17391 Modified Files: cups.spec Added Files: cups-str1515.patch Log Message: * Tue Mar 28 2006 Tim Waugh - Fix lpq -h (STR#1515, bug #186686). cups-str1515.patch: lpq.c | 62 ++++++++++++++++++++++++++++++++++++++++++++------------------ 1 files changed, 44 insertions(+), 18 deletions(-) --- NEW FILE cups-str1515.patch --- --- cups-1.2rc1/berkeley/lpq.c.str1515 2006-01-29 14:39:44.000000000 +0000 +++ cups-1.2rc1/berkeley/lpq.c 2006-03-28 17:27:50.000000000 +0100 @@ -49,6 +49,7 @@ * Local functions... */ +static http_t *connect_server(const char *, http_t *); static int show_jobs(const char *, http_t *, const char *, const char *, const int, const int); static void show_printer(const char *, http_t *, const char *); @@ -76,35 +77,23 @@ int num_dests; /* Number of destinations */ cups_dest_t *dests; /* Destinations */ cups_lang_t *language; /* Language */ -#ifdef HAVE_SSL - http_encryption_t encryption; /* Encryption? */ -#endif /* HAVE_SSL */ - language = cupsLangDefault(); - /* - * Connect to the scheduler... - */ - - if ((http = httpConnectEncrypt(cupsServer(), ippPort(), - cupsEncryption())) == NULL) - { - _cupsLangPrintf(stderr, _("%s: Unable to contact server!\n"), argv[0]); - return (1); - } /* * Check for command-line options... */ + http = NULL; dest = NULL; user = NULL; id = 0; interval = 0; longstatus = 0; all = 0; - num_dests = cupsGetDests(&dests); + language = cupsLangDefault(); + num_dests = 0; for (i = 1; i < argc; i ++) if (argv[i][0] == '+') @@ -115,10 +104,10 @@ { case 'E' : /* Encrypt */ #ifdef HAVE_SSL - encryption = HTTP_ENCRYPT_REQUIRED; + cupsSetEncryption(HTTP_ENCRYPT_REQUIRED); if (http) - httpEncryption(http, encryption); + httpEncryption(http, HTTP_ENCRYPT_REQUIRED); #else _cupsLangPrintf(stderr, _("%s: Sorry, no encryption support compiled in!\n"), @@ -166,6 +155,11 @@ if ((instance = strchr(dest, '/')) != NULL) *instance++ = '\0'; + http = connect_server(argv[0], http); + + if (num_dests == 0) + num_dests = cupsGetDests2(http, &dests); + if (cupsGetDest(dest, instance, num_dests, dests) == NULL) { if (instance) @@ -186,8 +180,11 @@ break; case 'h' : /* Connect to host */ - if (http != NULL) + if (http) + { httpClose(http); + http = NULL; + } if (argv[i][2] != '\0') cupsSetServer(argv[i] + 2); @@ -225,8 +222,13 @@ else user = argv[i]; + http = connect_server(argv[0], http); + if (dest == NULL && !all) { + if (num_dests == 0) + num_dests = cupsGetDests2(http, &dests); + for (i = 0; i < num_dests; i ++) if (dests[i].is_default) dest = dests[i].name; @@ -295,6 +297,30 @@ /* + * 'connect_server()' - Connect to the server as necessary... + */ + +static http_t * /* O - New HTTP connection */ +connect_server(const char *command, /* I - Command name */ + http_t *http) /* I - Current HTTP connection */ +{ + if (!http) + { + http = httpConnectEncrypt(cupsServer(), ippPort(), + cupsEncryption()); + + if (http == NULL) + { + _cupsLangPrintf(stderr, _("%s: Unable to connect to server\n"), command); + exit(1); + } + } + + return (http); +} + + +/* * 'show_jobs()' - Show jobs. */ Index: cups.spec =================================================================== RCS file: /cvs/dist/rpms/cups/devel/cups.spec,v retrieving revision 1.143 retrieving revision 1.144 diff -u -r1.143 -r1.144 --- cups.spec 27 Mar 2006 14:45:39 -0000 1.143 +++ cups.spec 28 Mar 2006 16:31:19 -0000 1.144 @@ -27,6 +27,7 @@ Patch4: cups-1.1.17-backend.patch Patch5: cups-ext.patch Patch6: cups-kde.patch +Patch7: cups-str1515.patch Patch8: cups-logfileperm.patch Patch9: cups-1.1.17-rcp.patch Patch10: cups-1.1.17-ppdsdat.patch @@ -113,6 +114,7 @@ %patch4 -p1 -b .backend %patch5 -p1 -b .ext %patch6 -p1 -b .kde +%patch7 -p1 -b .str1515 %patch8 -p1 -b .logfileperm %patch9 -p1 -b .rcp %patch10 -p1 -b .ppdsdat @@ -373,6 +375,9 @@ %{cups_serverbin}/daemon/cups-lpd %changelog +* Tue Mar 28 2006 Tim Waugh +- Fix lpq -h (STR#1515, bug #186686). + * Mon Mar 27 2006 Tim Waugh 1:1.2-0.2.rc1.1 - Ship a printers.conf file, and a client.conf file. That way, they get their SELinux file contexts set correctly. From fedora-cvs-commits at redhat.com Tue Mar 28 16:33:20 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 28 Mar 2006 11:33:20 -0500 Subject: rpms/cups/devel cups.spec,1.144,1.145 Message-ID: <200603281633.k2SGXKTZ017475@cvs.devel.redhat.com> Author: twaugh Update of /cvs/dist/rpms/cups/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv17456 Modified Files: cups.spec Log Message: 1:1.2-0.2.rc1.2 Index: cups.spec =================================================================== RCS file: /cvs/dist/rpms/cups/devel/cups.spec,v retrieving revision 1.144 retrieving revision 1.145 diff -u -r1.144 -r1.145 --- cups.spec 28 Mar 2006 16:31:19 -0000 1.144 +++ cups.spec 28 Mar 2006 16:32:33 -0000 1.145 @@ -7,7 +7,7 @@ Summary: Common Unix Printing System Name: cups Version: 1.2 -Release: 0.2.%{beta}.1 +Release: 0.2.%{beta}.2 License: GPL Group: System Environment/Daemons Source: ftp://ftp.easysw.com/pub/cups/test/cups-1.2%{beta}-source.tar.bz2 @@ -375,7 +375,7 @@ %{cups_serverbin}/daemon/cups-lpd %changelog -* Tue Mar 28 2006 Tim Waugh +* Tue Mar 28 2006 Tim Waugh 1:1.2-0.2.rc1.2 - Fix lpq -h (STR#1515, bug #186686). * Mon Mar 27 2006 Tim Waugh 1:1.2-0.2.rc1.1 From fedora-cvs-commits at redhat.com Tue Mar 28 17:08:23 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 28 Mar 2006 12:08:23 -0500 Subject: rpms/kernel/FC-4 linux-2.6-execshield.patch,1.4,1.5 Message-ID: <200603281708.k2SH8NBV031855@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv31843 Modified Files: linux-2.6-execshield.patch Log Message: ppc build fix linux-2.6-execshield.patch: linux-2.6.16.noarch/include/asm-powerpc/elf.h | 3 linux/arch/i386/kernel/asm-offsets.c | 1 linux/arch/i386/kernel/cpu/common.c | 7 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 | 81 +++++++++++ linux/arch/i386/kernel/traps.c | 93 ++++++++++++- 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/powerpc/kernel/vdso.c | 3 linux/arch/x86_64/ia32/ia32_binfmt.c | 6 linux/arch/x86_64/ia32/syscall32.c | 4 linux/arch/x86_64/kernel/process.c | 6 linux/arch/x86_64/kernel/setup64.c | 23 --- linux/arch/x86_64/mm/fault.c | 2 linux/arch/x86_64/mm/mmap.c | 99 +++++++++++--- linux/drivers/char/random.c | 7 linux/fs/binfmt_elf.c | 151 ++++++++++++++++----- linux/fs/proc/array.c | 8 - linux/fs/proc/base.c | 8 - linux/fs/proc/task_mmu.c | 34 +++- linux/include/asm-i386/a.out.h | 2 linux/include/asm-i386/desc.h | 14 + linux/include/asm-i386/elf.h | 50 +++++-- linux/include/asm-i386/mmu.h | 6 linux/include/asm-i386/page.h | 5 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-powerpc/pgalloc.h | 5 linux/include/asm-ppc/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/pgtable.h | 2 linux/include/linux/mm.h | 16 +- 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 | 57 ++++++++ linux/mm/fremap.c | 16 +- linux/mm/mmap.c | 183 ++++++++++++++++++++++++-- linux/mm/mprotect.c | 5 linux/mm/mremap.c | 4 52 files changed, 931 insertions(+), 161 deletions(-) Index: linux-2.6-execshield.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-4/linux-2.6-execshield.patch,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- linux-2.6-execshield.patch 28 Mar 2006 16:14:09 -0000 1.4 +++ linux-2.6-execshield.patch 28 Mar 2006 17:08:10 -0000 1.5 @@ -215,7 +215,7 @@ + unsigned flags = MAP_PRIVATE; + int err; + -+ current->mm->context.vdso = NULL; ++ current->mm->context.vdso = NULL; + if (unlikely(!vdso_enabled) || unlikely(!sysenter_pages[0])) + return 0; + @@ -244,7 +244,7 @@ + if (unlikely(addr & ~PAGE_MASK)) { + up_write(¤t->mm->mmap_sem); + return addr; -+ } ++ } + err = install_special_mapping(current->mm, addr, len, + VM_DONTEXPAND | VM_READ | VM_EXEC | + VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC, @@ -2168,3 +2168,15 @@ ret = new_addr; if (new_addr & ~PAGE_MASK) goto out; +--- linux-2.6.16.noarch/include/asm-powerpc/elf.h~ 2006-03-20 21:52:50.000000000 -0500 ++++ linux-2.6.16.noarch/include/asm-powerpc/elf.h 2006-03-20 21:53:20.000000000 -0500 +@@ -273,7 +273,8 @@ extern int ucache_bsize; + #define ARCH_HAS_SETUP_ADDITIONAL_PAGES + struct linux_binprm; + extern int arch_setup_additional_pages(struct linux_binprm *bprm, +- int executable_stack); ++ int executable_stack, unsigned long start_code, ++ unsigned long interp_map_address); + #define VDSO_AUX_ENT(a,b) NEW_AUX_ENT(a,b); + + /* From fedora-cvs-commits at redhat.com Tue Mar 28 17:14:19 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 28 Mar 2006 12:14:19 -0500 Subject: rpms/kernel/devel kernel-2.6.spec, 1.2099, 1.2100 linux-2.6-ide-cd-shutup.patch, 1.1, NONE Message-ID: <200603281714.k2SHEJ8g032263@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv32215 Modified Files: kernel-2.6.spec Removed Files: linux-2.6-ide-cd-shutup.patch Log Message: no longer needed Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.2099 retrieving revision 1.2100 diff -u -r1.2099 -r1.2100 --- kernel-2.6.spec 28 Mar 2006 15:48:16 -0000 1.2099 +++ kernel-2.6.spec 28 Mar 2006 17:14:16 -0000 1.2100 @@ -352,7 +352,6 @@ Patch1620: linux-2.6-serial-tickle-nmi.patch Patch1630: linux-2.6-radeon-backlight.patch Patch1640: linux-2.6-ide-tune-locking.patch -Patch1641: linux-2.6-ide-cd-shutup.patch Patch1650: linux-2.6-autofs-pathlookup.patch Patch1660: linux-2.6-valid-ether-addr.patch Patch1670: linux-2.6-softcursor-persistent-alloc.patch @@ -950,8 +949,6 @@ %patch1630 -p1 # Fix IDE locking bug. %patch1640 -p1 -# Silence noisy CD drive spew -%patch1641 -p1 # autofs4 looks up wrong path element when ghosting is enabled #%patch1650 -p1 # --- linux-2.6-ide-cd-shutup.patch DELETED --- From fedora-cvs-commits at redhat.com Tue Mar 28 17:16:54 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 28 Mar 2006 12:16:54 -0500 Subject: rpms/hal-cups-utils/devel hal-cups-utils.spec,1.24,1.25 Message-ID: <200603281716.k2SHGsGX013573@cvs.devel.redhat.com> Author: johnp Update of /cvs/dist/rpms/hal-cups-utils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv13556 Modified Files: hal-cups-utils.spec Log Message: - Make sure backends install into /usr/lib and not /usr/lib64 Index: hal-cups-utils.spec =================================================================== RCS file: /cvs/dist/rpms/hal-cups-utils/devel/hal-cups-utils.spec,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- hal-cups-utils.spec 11 Feb 2006 03:24:41 -0000 1.24 +++ hal-cups-utils.spec 28 Mar 2006 17:16:52 -0000 1.25 @@ -1,7 +1,7 @@ Summary: Halified CUPS utilities Name: hal-cups-utils Version: 0.5.5 -Release: 1.2 +Release: 2 License: GPL Group: Applications/System Source: %{name}-%{version}.tar.gz @@ -37,6 +37,11 @@ rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT +if [ -n "`echo %{_libdir} | grep lib64`" ] ; then + mkdir -p $RPM_BUILD_ROOT/usr/lib/cups/backend + mv $RPM_BUILD_ROOT/usr/lib64/cups/backend/* $RPM_BUILD_ROOT/usr/lib/cups/backend/ +fi + install -p -D %{SOURCE1} $RPM_BUILD_ROOT/%{_datadir}/hal/fdi/policy/10osvendor/10-hal_lpadmin.fdi %clean @@ -64,12 +69,15 @@ %doc AUTHORS COPYING ChangeLog NEWS README %{_bindir}/cups-config-daemon %{_sbindir}/hal_lpadmin -%{_libdir}/cups/backend/hal +/usr/lib/cups/backend/hal %{_datadir}/hal/fdi/policy/10osvendor/10-hal_lpadmin.fdi %{_sysconfdir}/dbus-1/system.d/cups-config-daemon-dbus.conf %{_sysconfdir}/rc.d/init.d/cups-config-daemon %changelog +* Tue Mar 28 2006 John (J5) Palmieri - 0.5.5-2 +- Make sure backends install into /usr/lib and not /usr/lib64 + * Fri Feb 10 2006 Jesse Keating - 0.5.5-1.2 - bump again for double-long bug on ppc(64) From fedora-cvs-commits at redhat.com Tue Mar 28 17:29:14 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 28 Mar 2006 12:29:14 -0500 Subject: rpms/kernel/devel linux-2.6-debug-dual-line-backtrace.patch, 1.3, NONE linux-2.6-powermac-pfunc-noise.patch, 1.1, NONE linux-2.6-xen-cpusteal-hv.patch, 1.3, NONE linux-2.6-xen-disable_ati_timer_quirk.patch, 1.1, NONE linux-2.6-xen-kva-mmap.patch, 1.1, NONE linux-2.6-xen-time-went-backwards.patch, 1.1, NONE Message-ID: <200603281729.k2SHTEm3013763@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv13748 Removed Files: linux-2.6-debug-dual-line-backtrace.patch linux-2.6-powermac-pfunc-noise.patch linux-2.6-xen-cpusteal-hv.patch linux-2.6-xen-disable_ati_timer_quirk.patch linux-2.6-xen-kva-mmap.patch linux-2.6-xen-time-went-backwards.patch Log Message: drop old dead patches. --- linux-2.6-debug-dual-line-backtrace.patch DELETED --- --- linux-2.6-powermac-pfunc-noise.patch DELETED --- --- linux-2.6-xen-cpusteal-hv.patch DELETED --- --- linux-2.6-xen-disable_ati_timer_quirk.patch DELETED --- --- linux-2.6-xen-kva-mmap.patch DELETED --- --- linux-2.6-xen-time-went-backwards.patch DELETED --- From fedora-cvs-commits at redhat.com Tue Mar 28 17:33:42 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 28 Mar 2006 12:33:42 -0500 Subject: rpms/hal-cups-utils/FC-5 hal-cups-utils.spec,1.24,1.25 Message-ID: <200603281733.k2SHXgOU013834@cvs.devel.redhat.com> Author: johnp Update of /cvs/dist/rpms/hal-cups-utils/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv13818 Modified Files: hal-cups-utils.spec Log Message: - Move the hal backend to /usr/lib on 64bit arch's Index: hal-cups-utils.spec =================================================================== RCS file: /cvs/dist/rpms/hal-cups-utils/FC-5/hal-cups-utils.spec,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- hal-cups-utils.spec 11 Feb 2006 03:24:41 -0000 1.24 +++ hal-cups-utils.spec 28 Mar 2006 17:33:09 -0000 1.25 @@ -1,7 +1,7 @@ Summary: Halified CUPS utilities Name: hal-cups-utils Version: 0.5.5 -Release: 1.2 +Release: 1.2.fc5.1 License: GPL Group: Applications/System Source: %{name}-%{version}.tar.gz @@ -37,6 +37,13 @@ rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT +if [ -n "`echo %{_libdir} | grep lib64`" ] ; then + mkdir -p $RPM_BUILD_ROOT/usr/lib/cups/backend + mv $RPM_BUILD_ROOT/usr/lib64/cups/backend/* $RPM_BUILD_ROOT/usr/lib/cups/backend/ + +fi + + install -p -D %{SOURCE1} $RPM_BUILD_ROOT/%{_datadir}/hal/fdi/policy/10osvendor/10-hal_lpadmin.fdi %clean @@ -64,12 +71,15 @@ %doc AUTHORS COPYING ChangeLog NEWS README %{_bindir}/cups-config-daemon %{_sbindir}/hal_lpadmin -%{_libdir}/cups/backend/hal +/usr/lib/cups/backend/hal %{_datadir}/hal/fdi/policy/10osvendor/10-hal_lpadmin.fdi %{_sysconfdir}/dbus-1/system.d/cups-config-daemon-dbus.conf %{_sysconfdir}/rc.d/init.d/cups-config-daemon %changelog +* Tue Mar 28 2006 John (J5) Palmieri - 0.5.5-1.2.fc5.1 +- Move the hal backend to /usr/lib on 64bit arch's + * Fri Feb 10 2006 Jesse Keating - 0.5.5-1.2 - bump again for double-long bug on ppc(64) From fedora-cvs-commits at redhat.com Tue Mar 28 20:06:18 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 28 Mar 2006 15:06:18 -0500 Subject: rpms/gconf-editor/FC-5 gconf-editor-2.14.0-use-correct-free.patch, NONE, 1.1 gconf-editor.spec, 1.31, 1.32 Message-ID: <200603282006.k2SK6I0U020258@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/gconf-editor/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv20246 Modified Files: gconf-editor.spec Added Files: gconf-editor-2.14.0-use-correct-free.patch Log Message: - Use gconf_value_free instead of g_free (bug 186479) gconf-editor-2.14.0-use-correct-free.patch: gconf-editor-window.c | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE gconf-editor-2.14.0-use-correct-free.patch --- --- gconf-editor-2.14.0/src/gconf-editor-window.c.use-correct-free 2006-03-28 14:57:18.000000000 -0500 +++ gconf-editor-2.14.0/src/gconf-editor-window.c 2006-03-28 14:57:36.000000000 -0500 @@ -950,7 +950,7 @@ gconf_editor_gconf_value_changed (GConfC gconf_add_recent_key (window, key); } - g_free (value); + gconf_value_free (value); g_free (key); gtk_tree_path_free (path); } Index: gconf-editor.spec =================================================================== RCS file: /cvs/dist/rpms/gconf-editor/FC-5/gconf-editor.spec,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- gconf-editor.spec 13 Mar 2006 05:20:10 -0000 1.31 +++ gconf-editor.spec 28 Mar 2006 20:06:01 -0000 1.32 @@ -8,7 +8,7 @@ Summary: Editor/admin tool for GConf Name: gconf-editor Version: 2.14.0 -Release: 1 +Release: 1.fc5 URL: http://www.gnome.org Source0: %{name}-%{version}.tar.bz2 License: GPL @@ -25,12 +25,15 @@ BuildRequires: desktop-file-utils >= %{desktop_file_utils_version} BuildRequires: scrollkeeper +Patch0: gconf-editor-2.14.0-use-correct-free.patch + %description gconf-editor allows you to browse and modify GConf configuration sources. %prep %setup -q +%patch0 -p1 -b .use-correct-free %build %configure @@ -40,7 +43,7 @@ rm -rf $RPM_BUILD_ROOT export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 -%makeinstall +make install DESTDIR=$RPM_BUILD_ROOT unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL # stuff we don't want @@ -94,6 +97,9 @@ %{_datadir}/omf/gconf-editor %changelog +* Tue Mar 28 2006 Ray Strode - 2.14.0-1.fc5 +- Use gconf_value_free instead of g_free (bug 186479) + * Mon Mar 13 2006 Matthias Clasen - 2.14.0-1 - Update to 2.14.0 From fedora-cvs-commits at redhat.com Tue Mar 28 20:07:45 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 28 Mar 2006 15:07:45 -0500 Subject: rpms/checkpolicy/devel .cvsignore, 1.59, 1.60 checkpolicy.spec, 1.97, 1.98 sources, 1.60, 1.61 Message-ID: <200603282007.k2SK7jgt020293@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/checkpolicy/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv20277 Modified Files: .cvsignore checkpolicy.spec sources Log Message: * Tue Mar 28 2006 Dan Walsh - 1.30.3-1 - Latest upgrade from NSA * Fixed checkmodule to call link_modules prior to expand_module to handle optionals. * Fixed require_class to avoid shadowing permissions already defined in an inherited common definition. Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/checkpolicy/devel/.cvsignore,v retrieving revision 1.59 retrieving revision 1.60 diff -u -r1.59 -r1.60 --- .cvsignore 23 Mar 2006 16:14:03 -0000 1.59 +++ .cvsignore 28 Mar 2006 20:07:33 -0000 1.60 @@ -43,3 +43,4 @@ checkpolicy-1.29.5.tgz checkpolicy-1.30.tgz checkpolicy-1.30.1.tgz +checkpolicy-1.30.3.tgz Index: checkpolicy.spec =================================================================== RCS file: /cvs/dist/rpms/checkpolicy/devel/checkpolicy.spec,v retrieving revision 1.97 retrieving revision 1.98 diff -u -r1.97 -r1.98 --- checkpolicy.spec 27 Mar 2006 22:13:22 -0000 1.97 +++ checkpolicy.spec 28 Mar 2006 20:07:42 -0000 1.98 @@ -1,8 +1,8 @@ %define libsepolver 1.12.3-1 Summary: SELinux policy compiler Name: checkpolicy -Version: 1.30.1 -Release: 2 +Version: 1.30.3 +Release: 1 License: GPL Group: Development/System Source: http://www.nsa.gov/selinux/archives/%{name}-%{version}.tgz @@ -47,6 +47,13 @@ %{_mandir}/man8/checkmodule.8.gz %changelog +* Tue Mar 28 2006 Dan Walsh - 1.30.3-1 +- Latest upgrade from NSA + * Fixed checkmodule to call link_modules prior to expand_module + to handle optionals. + * Fixed require_class to avoid shadowing permissions already defined + in an inherited common definition. + * Mon Mar 27 2006 Dan Walsh - 1.30.1-2 - Rebuild with new libsepol Index: sources =================================================================== RCS file: /cvs/dist/rpms/checkpolicy/devel/sources,v retrieving revision 1.60 retrieving revision 1.61 diff -u -r1.60 -r1.61 --- sources 23 Mar 2006 16:14:03 -0000 1.60 +++ sources 28 Mar 2006 20:07:42 -0000 1.61 @@ -1 +1 @@ -f02868c0a7797054ca2bf3ce7a5c68ab checkpolicy-1.30.1.tgz +82ccee7997d31663c842c707b4771b70 checkpolicy-1.30.3.tgz From fedora-cvs-commits at redhat.com Tue Mar 28 20:12:36 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 28 Mar 2006 15:12:36 -0500 Subject: rpms/gconf-editor/devel gconf-editor-2.14.0-use-correct-free.patch, NONE, 1.1 gconf-editor.spec, 1.31, 1.32 Message-ID: <200603282012.k2SKCa2f020512@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/gconf-editor/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv20495 Modified Files: gconf-editor.spec Added Files: gconf-editor-2.14.0-use-correct-free.patch Log Message: - Use gconf_value_free instead of g_free (bug 186479) gconf-editor-2.14.0-use-correct-free.patch: gconf-editor-window.c | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE gconf-editor-2.14.0-use-correct-free.patch --- --- gconf-editor-2.14.0/src/gconf-editor-window.c.use-correct-free 2006-03-28 14:57:18.000000000 -0500 +++ gconf-editor-2.14.0/src/gconf-editor-window.c 2006-03-28 14:57:36.000000000 -0500 @@ -950,7 +950,7 @@ gconf_editor_gconf_value_changed (GConfC gconf_add_recent_key (window, key); } - g_free (value); + gconf_value_free (value); g_free (key); gtk_tree_path_free (path); } Index: gconf-editor.spec =================================================================== RCS file: /cvs/dist/rpms/gconf-editor/devel/gconf-editor.spec,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- gconf-editor.spec 13 Mar 2006 05:20:10 -0000 1.31 +++ gconf-editor.spec 28 Mar 2006 20:12:34 -0000 1.32 @@ -8,7 +8,7 @@ Summary: Editor/admin tool for GConf Name: gconf-editor Version: 2.14.0 -Release: 1 +Release: 2 URL: http://www.gnome.org Source0: %{name}-%{version}.tar.bz2 License: GPL @@ -25,12 +25,15 @@ BuildRequires: desktop-file-utils >= %{desktop_file_utils_version} BuildRequires: scrollkeeper +Patch0: gconf-editor-2.14.0-use-correct-free.patch + %description gconf-editor allows you to browse and modify GConf configuration sources. %prep %setup -q +%patch0 -p1 -b .use-correct-free %build %configure @@ -40,7 +43,7 @@ rm -rf $RPM_BUILD_ROOT export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 -%makeinstall +make install DESTDIR=$RPM_BUILD_ROOT unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL # stuff we don't want @@ -94,6 +97,9 @@ %{_datadir}/omf/gconf-editor %changelog +* Tue Mar 28 2006 Ray Strode - 2.14.0-2 +- Use gconf_value_free instead of g_free (bug 186479) + * Mon Mar 13 2006 Matthias Clasen - 2.14.0-1 - Update to 2.14.0 From fedora-cvs-commits at redhat.com Tue Mar 28 20:34:55 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 28 Mar 2006 15:34:55 -0500 Subject: rpms/kernel/devel patch-2.6.16-git15.bz2.sign, NONE, 1.1 .cvsignore, 1.395, 1.396 kernel-2.6.spec, 1.2100, 1.2101 sources, 1.336, 1.337 upstream, 1.309, 1.310 patch-2.6.16-git14.bz2.sign, 1.1, NONE Message-ID: <200603282034.k2SKYtxv020688@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv20675 Modified Files: .cvsignore kernel-2.6.spec sources upstream Added Files: patch-2.6.16-git15.bz2.sign Removed Files: patch-2.6.16-git14.bz2.sign Log Message: git15 --- NEW FILE patch-2.6.16-git15.bz2.sign --- -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.2.2 (GNU/Linux) Comment: See http://www.kernel.org/signature.html for info iD8DBQBEKYhwyGugalF9Dw4RAjToAJ9scyq/WVY0LyfBTcHIjuMkrKMEaACeK3Sf lRTAwIO/l7SmBNKMJihdAUA= =huTu -----END PGP SIGNATURE----- Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v retrieving revision 1.395 retrieving revision 1.396 diff -u -r1.395 -r1.396 --- .cvsignore 28 Mar 2006 15:48:16 -0000 1.395 +++ .cvsignore 28 Mar 2006 20:34:47 -0000 1.396 @@ -4,3 +4,4 @@ linux-2.6.16.tar.bz2 xen-20060320.tar.bz2 patch-2.6.16-git14.bz2 +patch-2.6.16-git15.bz2 Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.2100 retrieving revision 1.2101 diff -u -r1.2100 -r1.2101 --- kernel-2.6.spec 28 Mar 2006 17:14:16 -0000 1.2100 +++ kernel-2.6.spec 28 Mar 2006 20:34:48 -0000 1.2101 @@ -217,7 +217,7 @@ # # Patches 0 through 100 are meant for core subsystem upgrades # -Patch1: patch-2.6.16-git14.bz2 +Patch1: patch-2.6.16-git15.bz2 # Patches 100 through 500 are meant for architecture patches Patch100: linux-2.6-bzimage.patch @@ -1637,7 +1637,7 @@ %changelog * Tue Mar 28 2006 Dave Jones -- 2.6.16-git14 +- 2.6.16-git14 & git15 * Mon Mar 27 2006 Dave Jones - 2.6.16-git13 Index: sources =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/sources,v retrieving revision 1.336 retrieving revision 1.337 diff -u -r1.336 -r1.337 --- sources 28 Mar 2006 15:48:16 -0000 1.336 +++ sources 28 Mar 2006 20:34:52 -0000 1.337 @@ -1,3 +1,4 @@ 9a91b2719949ff0856b40bc467fd47be linux-2.6.16.tar.bz2 8c70806f9075ebc0087f7ce1b8911700 xen-20060320.tar.bz2 35a2659715e73ff493c815ed3a900d07 patch-2.6.16-git14.bz2 +890ad77f2d6d31d29be508a4c848d21b patch-2.6.16-git15.bz2 Index: upstream =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/upstream,v retrieving revision 1.309 retrieving revision 1.310 diff -u -r1.309 -r1.310 --- upstream 28 Mar 2006 15:48:16 -0000 1.309 +++ upstream 28 Mar 2006 20:34:52 -0000 1.310 @@ -1,2 +1,2 @@ linux-2.6.16.tar.bz2 -patch-2.6.16-git14.bz2 +patch-2.6.16-git15.bz2 --- patch-2.6.16-git14.bz2.sign DELETED --- From fedora-cvs-commits at redhat.com Tue Mar 28 21:17:38 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 28 Mar 2006 16:17:38 -0500 Subject: rpms/kernel/FC-5/configs config-generic, 1.162, 1.162.4.1 config-x86-generic, 1.39, 1.39.6.1 config-x86_64-generic, 1.33, 1.33.10.1 Message-ID: <200603282117.k2SLHc1k003563@cvs.devel.redhat.com> Author: linville Update of /cvs/dist/rpms/kernel/FC-5/configs In directory cvs.devel.redhat.com:/tmp/cvs-serv3533/configs Modified Files: Tag: private-linville-netdev-fc5-1-branch config-generic config-x86-generic config-x86_64-generic Log Message: Index: config-generic =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-5/configs/config-generic,v retrieving revision 1.162 retrieving revision 1.162.4.1 diff -u -r1.162 -r1.162.4.1 --- config-generic 24 Mar 2006 23:49:46 -0000 1.162 +++ config-generic 28 Mar 2006 21:17:35 -0000 1.162.4.1 @@ -621,6 +621,8 @@ CONFIG_IPV6=m CONFIG_IPV6_PRIVACY=y +CONFIG_IPV6_ROUTER_PREF=y +CONFIG_IPV6_ROUTE_INFO=y CONFIG_INET6_AH=m CONFIG_INET6_ESP=m CONFIG_INET6_IPCOMP=m @@ -649,6 +651,7 @@ CONFIG_NETFILTER_XT_MATCH_MARK=m CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m +CONFIG_NETFILTER_XT_MATCH_POLICY=m CONFIG_NETFILTER_XT_MATCH_REALM=m CONFIG_NETFILTER_XT_MATCH_SCTP=m CONFIG_NETFILTER_XT_MATCH_STATE=m @@ -713,6 +716,7 @@ CONFIG_IP_NF_FILTER=m CONFIG_IP_NF_NETBIOS_NS=m CONFIG_IP_NF_PPTP=m +CONFIG_IP_NF_H323=m # # IPv6: Netfilter Configuration @@ -789,6 +793,7 @@ CONFIG_WAN_ROUTER=m CONFIG_IP_DCCP=m CONFIG_IP_DCCP_CCID3=m +CONFIG_IP_DCCP_CCID2=m # CONFIG_IP_DCCP_DEBUG is not set CONFIG_IP_DCCP_UNLOAD_HACK=y @@ -1023,6 +1028,7 @@ # Wireless LAN (non-hamradio) # CONFIG_NET_RADIO=y +CONFIG_NET_WIRELESS_RTNETLINK=y # # Obsolete Wireless cards support (pre-802.11) @@ -1051,6 +1057,7 @@ # CONFIG_IPW2200 is not set # CONFIG_IPW2100_DEBUG is not set # CONFIG_IPW2200_DEBUG is not set +# CONFIG_IPW_QOS is not set CONFIG_AIRO=m CONFIG_HERMES=m CONFIG_PLX_HERMES=m @@ -1060,8 +1067,11 @@ CONFIG_ATMEL=m CONFIG_PCI_ATMEL=m CONFIG_PRISM54=m +CONFIG_PRISM54_USB=m CONFIG_BCM43XX=m CONFIG_BCM43XX_DEBUG=y +CONFIG_ACX_PCI=m +CONFIG_ACX_USB=m # # Wireless 802.11b Pcmcia/Cardbus cards support @@ -1138,6 +1148,7 @@ CONFIG_TEKRAM_DONGLE=m CONFIG_IRPORT_SIR=m # CONFIG_DONGLE_OLD is not set +CONFIG_TOIM3232_DONGLE=m CONFIG_LITELINK_DONGLE=m CONFIG_MA600_DONGLE=m CONFIG_GIRBIL_DONGLE=m Index: config-x86-generic =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-5/configs/config-x86-generic,v retrieving revision 1.39 retrieving revision 1.39.6.1 diff -u -r1.39 -r1.39.6.1 --- config-x86-generic 12 Mar 2006 00:53:17 -0000 1.39 +++ config-x86-generic 28 Mar 2006 21:17:36 -0000 1.39.6.1 @@ -240,6 +240,7 @@ CONFIG_IPW2100_MONITOR=y CONFIG_IPW2200=m CONFIG_IPW2200_MONITOR=y +CONFIG_IPW_QOS=y CONFIG_BLK_DEV_AMD74XX=y Index: config-x86_64-generic =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-5/configs/config-x86_64-generic,v retrieving revision 1.33 retrieving revision 1.33.10.1 diff -u -r1.33 -r1.33.10.1 --- config-x86_64-generic 3 Mar 2006 18:59:15 -0000 1.33 +++ config-x86_64-generic 28 Mar 2006 21:17:36 -0000 1.33.10.1 @@ -107,6 +107,7 @@ CONFIG_IPW2100_MONITOR=y CONFIG_IPW2200=m CONFIG_IPW2200_MONITOR=y +CONFIG_IPW_QOS=y CONFIG_PNP=y CONFIG_PNPACPI=y From fedora-cvs-commits at redhat.com Tue Mar 28 21:37:11 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 28 Mar 2006 16:37:11 -0500 Subject: rpms/anaconda/devel .cvsignore, 1.240, 1.241 anaconda.spec, 1.361, 1.362 sources, 1.360, 1.361 Message-ID: <200603282137.k2SLbBB2003962@cvs.devel.redhat.com> Author: clumens Update of /cvs/dist/rpms/anaconda/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv3935/devel Modified Files: .cvsignore anaconda.spec sources Log Message: auto-import anaconda-11.1.0.1-1 on branch devel from anaconda-11.1.0.1-1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/anaconda/devel/.cvsignore,v retrieving revision 1.240 retrieving revision 1.241 diff -u -r1.240 -r1.241 --- .cvsignore 21 Mar 2006 23:10:58 -0000 1.240 +++ .cvsignore 28 Mar 2006 21:37:08 -0000 1.241 @@ -1 +1 @@ -anaconda-11.1.0.0.tar.bz2 +anaconda-11.1.0.1.tar.bz2 Index: anaconda.spec =================================================================== RCS file: /cvs/dist/rpms/anaconda/devel/anaconda.spec,v retrieving revision 1.361 retrieving revision 1.362 diff -u -r1.361 -r1.362 --- anaconda.spec 21 Mar 2006 23:10:58 -0000 1.361 +++ anaconda.spec 28 Mar 2006 21:37:08 -0000 1.362 @@ -1,5 +1,5 @@ Name: anaconda -Version: 11.1.0.0 +Version: 11.1.0.1 Release: 1 License: GPL Summary: Graphical system installer @@ -79,6 +79,22 @@ /sbin/chkconfig --del reconfig >/dev/null 2>&1 || : %changelog +* Tue Mar 28 2006 Chris Lumens 11.1.0.1-1 +- Prompt for reformatting ancient swap partitions (dcantrel, #122101) +- Fix lots of deprecation warnings (dcantrel) +- Check for suspend signatures in swap (dcantrel, #186018) +- Support logging command in kickstart +- Clean up URLs we try to fetch in the loader +- Fix SELinux conditional inclusion (pjones) +- Remove customClass +- Always ignore disks listed in ignoredisks (#186438) +- Fix loader segmentation fault (#186210) +- Reiser fs label avoidance (dcantrel, #183183) +- Remove traceonly mode +- Add rhpl to minstg2.img (#185840) +- Remove lots of unneeded code in isys, iutil, and elsewhere + (clumens, dcantrel, pnasrat) + * Tue Mar 21 2006 Jeremy Katz - 11.1.0.0-1 - Fix text for rescue images - Fix some file contexts (#182252) Index: sources =================================================================== RCS file: /cvs/dist/rpms/anaconda/devel/sources,v retrieving revision 1.360 retrieving revision 1.361 diff -u -r1.360 -r1.361 --- sources 21 Mar 2006 23:10:58 -0000 1.360 +++ sources 28 Mar 2006 21:37:08 -0000 1.361 @@ -1 +1 @@ -c7c7642859d23336176364ae7a86a81c anaconda-11.1.0.0.tar.bz2 +4636c0dfbab1c9da0e74ee9fd09433f8 anaconda-11.1.0.1.tar.bz2 From fedora-cvs-commits at redhat.com Tue Mar 28 21:38:54 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 28 Mar 2006 16:38:54 -0500 Subject: rpms/kernel/devel/configs config-generic,1.170,1.171 Message-ID: <200603282138.k2SLcsIJ004039@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel/configs In directory cvs.devel.redhat.com:/tmp/cvs-serv4028/configs Modified Files: config-generic Log Message: borked Index: config-generic =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/configs/config-generic,v retrieving revision 1.170 retrieving revision 1.171 diff -u -r1.170 -r1.171 --- config-generic 28 Mar 2006 15:48:17 -0000 1.170 +++ config-generic 28 Mar 2006 21:38:52 -0000 1.171 @@ -1618,7 +1618,7 @@ CONFIG_RTC_DRV_DS1672=m CONFIG_RTC_DRV_PCF8563=m CONFIG_RTC_DRV_RS5C372=m -CONFIG_RTC_DRV_M48T86=m +# CONFIG_RTC_DRV_M48T86 is not set # CONFIG_RTC_DRV_EP93XX is not set # CONFIG_RTC_DRV_SA1100 is not set # CONFIG_RTC_DRV_TEST is not set From fedora-cvs-commits at redhat.com Tue Mar 28 21:44:43 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 28 Mar 2006 16:44:43 -0500 Subject: rpms/anaconda/devel .cvsignore, 1.241, 1.242 anaconda.spec, 1.362, 1.363 sources, 1.361, 1.362 Message-ID: <200603282144.k2SLihwu004409@cvs.devel.redhat.com> Author: clumens Update of /cvs/dist/rpms/anaconda/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv4349/devel Modified Files: .cvsignore anaconda.spec sources Log Message: auto-import anaconda-11.1.0.2-1 on branch devel from anaconda-11.1.0.2-1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/anaconda/devel/.cvsignore,v retrieving revision 1.241 retrieving revision 1.242 diff -u -r1.241 -r1.242 --- .cvsignore 28 Mar 2006 21:37:08 -0000 1.241 +++ .cvsignore 28 Mar 2006 21:44:40 -0000 1.242 @@ -1 +1 @@ -anaconda-11.1.0.1.tar.bz2 +anaconda-11.1.0.2.tar.bz2 Index: anaconda.spec =================================================================== RCS file: /cvs/dist/rpms/anaconda/devel/anaconda.spec,v retrieving revision 1.362 retrieving revision 1.363 diff -u -r1.362 -r1.363 --- anaconda.spec 28 Mar 2006 21:37:08 -0000 1.362 +++ anaconda.spec 28 Mar 2006 21:44:41 -0000 1.363 @@ -1,5 +1,5 @@ Name: anaconda -Version: 11.1.0.1 +Version: 11.1.0.2 Release: 1 License: GPL Summary: Graphical system installer @@ -79,6 +79,9 @@ /sbin/chkconfig --del reconfig >/dev/null 2>&1 || : %changelog +* Tue Mar 28 2006 Chris Lumens 11.1.0.2-1 +- Remove reference to pythondeps. + * Tue Mar 28 2006 Chris Lumens 11.1.0.1-1 - Prompt for reformatting ancient swap partitions (dcantrel, #122101) - Fix lots of deprecation warnings (dcantrel) Index: sources =================================================================== RCS file: /cvs/dist/rpms/anaconda/devel/sources,v retrieving revision 1.361 retrieving revision 1.362 diff -u -r1.361 -r1.362 --- sources 28 Mar 2006 21:37:08 -0000 1.361 +++ sources 28 Mar 2006 21:44:41 -0000 1.362 @@ -1 +1 @@ -4636c0dfbab1c9da0e74ee9fd09433f8 anaconda-11.1.0.1.tar.bz2 +f18b978f472896a63691f4dcb9e5cda2 anaconda-11.1.0.2.tar.bz2 From fedora-cvs-commits at redhat.com Tue Mar 28 22:44:14 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 28 Mar 2006 17:44:14 -0500 Subject: rpms/gnome-applets/FC-5 gnome-applets-2.14.0-gswitchit-export-dynamic.patch, NONE, 1.1 gnome-applets.spec, 1.127, 1.128 Message-ID: <200603282244.k2SMiEUA005542@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/gnome-applets/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv5525 Modified Files: gnome-applets.spec Added Files: gnome-applets-2.14.0-gswitchit-export-dynamic.patch Log Message: - export symbols in gswitchit applet so applet plugins work (bug 187168) gnome-applets-2.14.0-gswitchit-export-dynamic.patch: Makefile.am | 1 + 1 files changed, 1 insertion(+) --- NEW FILE gnome-applets-2.14.0-gswitchit-export-dynamic.patch --- --- gnome-applets-2.14.0/gswitchit/Makefile.am.gswitchit-export-dynamic 2006-03-28 17:41:17.000000000 -0500 +++ gnome-applets-2.14.0/gswitchit/Makefile.am 2006-03-28 17:42:13.000000000 -0500 @@ -37,6 +37,7 @@ libgswitchit_applet_a_CFLAGS = $(COMMON_ gnome_keyboard_applet_CFLAGS = $(COMMON_CFLAGS) \ $(GNOME_APPLETS_CFLAGS) +gnome_keyboard_applet_LDFLAGS = -export-dynamic gnome_keyboard_applet_LDADD = \ libgswitchit-applet.a \ Index: gnome-applets.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-applets/FC-5/gnome-applets.spec,v retrieving revision 1.127 retrieving revision 1.128 diff -u -r1.127 -r1.128 --- gnome-applets.spec 12 Mar 2006 18:22:19 -0000 1.127 +++ gnome-applets.spec 28 Mar 2006 22:44:12 -0000 1.128 @@ -18,7 +18,7 @@ Summary: Small applications for the GNOME panel. Name: gnome-applets Version: 2.14.0 -Release: 1 +Release: 1.fc5 Epoch: 1 License: GPL Group: User Interface/Desktops @@ -31,6 +31,7 @@ Patch5: gnome-applets-2.13.4-warning.patch Patch6: gnome-applets-2.13.90-stock-ticker.patch Patch8: gnome-applets-2.13.90-mixer-crash.patch +Patch9: gnome-applets-2.14.0-gswitchit-export-dynamic.patch URL: http://www.gnome.org/ @@ -89,6 +90,7 @@ %patch5 -p1 -b .warning %patch6 -p1 -b .stock-ticker %patch8 -p1 -b .mixer-crash +#%patch9 -p1 -b .gswitchit-export-dynamic cp gswitchit/gswitchit-applet.png gswitchit/gswitchit-properties-capplet.png @@ -101,6 +103,7 @@ autoconf %build +autoreconf %configure \ --enable-suid=no \ --disable-scrollkeeper \ @@ -196,6 +199,10 @@ %{_libdir}/pkgconfig/gweather.pc %changelog +* Tue Mar 28 2006 Ray Strode - 2.14.0-1.fc5 +- export symbols in gswitchit applet so applet plugins + work (bug 187168) + * Sun Mar 12 2006 Ray Strode - 2.14.0-1 - update to 2.14.0 From fedora-cvs-commits at redhat.com Tue Mar 28 22:45:37 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 28 Mar 2006 17:45:37 -0500 Subject: rpms/gnome-applets/devel gnome-applets-2.14.0-gswitchit-export-dynamic.patch, NONE, 1.1 gnome-applets.spec, 1.127, 1.128 Message-ID: <200603282245.k2SMjb0n005631@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/gnome-applets/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv5616 Modified Files: gnome-applets.spec Added Files: gnome-applets-2.14.0-gswitchit-export-dynamic.patch Log Message: - export symbols in gswitchit applet so applet plugins work (bug 187168) gnome-applets-2.14.0-gswitchit-export-dynamic.patch: Makefile.am | 1 + 1 files changed, 1 insertion(+) --- NEW FILE gnome-applets-2.14.0-gswitchit-export-dynamic.patch --- --- gnome-applets-2.14.0/gswitchit/Makefile.am.gswitchit-export-dynamic 2006-03-28 17:41:17.000000000 -0500 +++ gnome-applets-2.14.0/gswitchit/Makefile.am 2006-03-28 17:42:13.000000000 -0500 @@ -37,6 +37,7 @@ libgswitchit_applet_a_CFLAGS = $(COMMON_ gnome_keyboard_applet_CFLAGS = $(COMMON_CFLAGS) \ $(GNOME_APPLETS_CFLAGS) +gnome_keyboard_applet_LDFLAGS = -export-dynamic gnome_keyboard_applet_LDADD = \ libgswitchit-applet.a \ Index: gnome-applets.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-applets/devel/gnome-applets.spec,v retrieving revision 1.127 retrieving revision 1.128 diff -u -r1.127 -r1.128 --- gnome-applets.spec 12 Mar 2006 18:22:19 -0000 1.127 +++ gnome-applets.spec 28 Mar 2006 22:45:35 -0000 1.128 @@ -18,7 +18,7 @@ Summary: Small applications for the GNOME panel. Name: gnome-applets Version: 2.14.0 -Release: 1 +Release: 2 Epoch: 1 License: GPL Group: User Interface/Desktops @@ -31,6 +31,7 @@ Patch5: gnome-applets-2.13.4-warning.patch Patch6: gnome-applets-2.13.90-stock-ticker.patch Patch8: gnome-applets-2.13.90-mixer-crash.patch +Patch9: gnome-applets-2.14.0-gswitchit-export-dynamic.patch URL: http://www.gnome.org/ @@ -89,6 +90,7 @@ %patch5 -p1 -b .warning %patch6 -p1 -b .stock-ticker %patch8 -p1 -b .mixer-crash +#%patch9 -p1 -b .gswitchit-export-dynamic cp gswitchit/gswitchit-applet.png gswitchit/gswitchit-properties-capplet.png @@ -101,6 +103,7 @@ autoconf %build +autoreconf %configure \ --enable-suid=no \ --disable-scrollkeeper \ @@ -196,6 +199,10 @@ %{_libdir}/pkgconfig/gweather.pc %changelog +* Tue Mar 28 2006 Ray Strode - 2.14.0-2 +- export symbols in gswitchit applet so applet plugins + work (bug 187168) + * Sun Mar 12 2006 Ray Strode - 2.14.0-1 - update to 2.14.0 From fedora-cvs-commits at redhat.com Tue Mar 28 23:02:38 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 28 Mar 2006 18:02:38 -0500 Subject: rpms/kernel/devel/configs config-generic,1.171,1.172 Message-ID: <200603282302.k2SN2cZD005852@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel/configs In directory cvs.devel.redhat.com:/tmp/cvs-serv5766/configs Modified Files: config-generic Log Message: reenable sky2 Index: config-generic =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/configs/config-generic,v retrieving revision 1.171 retrieving revision 1.172 diff -u -r1.171 -r1.172 --- config-generic 28 Mar 2006 21:38:52 -0000 1.171 +++ config-generic 28 Mar 2006 23:02:21 -0000 1.172 @@ -997,7 +997,7 @@ # CONFIG_SK98LIN is not set CONFIG_SKGE=m CONFIG_TIGON3=m -# CONFIG_SKY2 is not set +CONFIG_SKY2=m # # Ethernet (10000 Mbit) From fedora-cvs-commits at redhat.com Tue Mar 28 23:02:23 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 28 Mar 2006 18:02:23 -0500 Subject: rpms/kernel/devel kernel-2.6.spec,1.2101,1.2102 Message-ID: <200603282302.k2SN2NlX005840@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv5766 Modified Files: kernel-2.6.spec Log Message: reenable sky2 Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.2101 retrieving revision 1.2102 diff -u -r1.2101 -r1.2102 --- kernel-2.6.spec 28 Mar 2006 20:34:48 -0000 1.2101 +++ kernel-2.6.spec 28 Mar 2006 23:02:04 -0000 1.2102 @@ -1638,6 +1638,7 @@ %changelog * Tue Mar 28 2006 Dave Jones - 2.6.16-git14 & git15 +- reenable sky2. * Mon Mar 27 2006 Dave Jones - 2.6.16-git13 From fedora-cvs-commits at redhat.com Tue Mar 28 23:20:35 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 28 Mar 2006 18:20:35 -0500 Subject: rpms/gnome-applets/FC-5 gnome-applets.spec,1.128,1.129 Message-ID: <200603282320.k2SNKZ6E005993@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/gnome-applets/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv5976 Modified Files: gnome-applets.spec Log Message: - apply patch Index: gnome-applets.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-applets/FC-5/gnome-applets.spec,v retrieving revision 1.128 retrieving revision 1.129 diff -u -r1.128 -r1.129 --- gnome-applets.spec 28 Mar 2006 22:44:12 -0000 1.128 +++ gnome-applets.spec 28 Mar 2006 23:20:33 -0000 1.129 @@ -90,7 +90,7 @@ %patch5 -p1 -b .warning %patch6 -p1 -b .stock-ticker %patch8 -p1 -b .mixer-crash -#%patch9 -p1 -b .gswitchit-export-dynamic +%patch9 -p1 -b .gswitchit-export-dynamic cp gswitchit/gswitchit-applet.png gswitchit/gswitchit-properties-capplet.png From fedora-cvs-commits at redhat.com Tue Mar 28 23:34:14 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 28 Mar 2006 18:34:14 -0500 Subject: rpms/gnome-applets/devel gnome-applets.spec,1.128,1.129 Message-ID: <200603282334.k2SNYEqI006154@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/gnome-applets/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv6142 Modified Files: gnome-applets.spec Log Message: - apply patch Index: gnome-applets.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-applets/devel/gnome-applets.spec,v retrieving revision 1.128 retrieving revision 1.129 diff -u -r1.128 -r1.129 --- gnome-applets.spec 28 Mar 2006 22:45:35 -0000 1.128 +++ gnome-applets.spec 28 Mar 2006 23:33:57 -0000 1.129 @@ -18,7 +18,7 @@ Summary: Small applications for the GNOME panel. Name: gnome-applets Version: 2.14.0 -Release: 2 +Release: 3 Epoch: 1 License: GPL Group: User Interface/Desktops @@ -90,7 +90,7 @@ %patch5 -p1 -b .warning %patch6 -p1 -b .stock-ticker %patch8 -p1 -b .mixer-crash -#%patch9 -p1 -b .gswitchit-export-dynamic +%patch9 -p1 -b .gswitchit-export-dynamic cp gswitchit/gswitchit-applet.png gswitchit/gswitchit-properties-capplet.png @@ -199,7 +199,10 @@ %{_libdir}/pkgconfig/gweather.pc %changelog -* Tue Mar 28 2006 Ray Strode - 2.14.0-2 +* Tue Mar 28 2006 Ray Strode - 2.14.0-3 +- apply patch + + * Tue Mar 28 2006 Ray Strode - 2.14.0-2 - export symbols in gswitchit applet so applet plugins work (bug 187168) From fedora-cvs-commits at redhat.com Wed Mar 29 00:03:53 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 28 Mar 2006 19:03:53 -0500 Subject: rpms/kernel/devel/configs config-x86-generic,1.43,1.44 Message-ID: <200603290003.k2T03rMR006569@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel/configs In directory cvs.devel.redhat.com:/tmp/cvs-serv6547/configs Modified Files: config-x86-generic Log Message: dead sym Index: config-x86-generic =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/configs/config-x86-generic,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- config-x86-generic 28 Mar 2006 15:48:17 -0000 1.43 +++ config-x86-generic 29 Mar 2006 00:03:23 -0000 1.44 @@ -49,7 +49,6 @@ CONFIG_HPET_EMULATE_RTC=y # CONFIG_HPET_RTC_IRQ is not set # CONFIG_HPET_MMAP is not set -# CONFIG_SMP_ALTERNATIVES is not set CONFIG_NR_CPUS=8 CONFIG_X86_LOCAL_APIC=y CONFIG_X86_IO_APIC=y From fedora-cvs-commits at redhat.com Wed Mar 29 02:39:47 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 28 Mar 2006 21:39:47 -0500 Subject: rpms/kernel/FC-5 kernel-2.6.spec, 1.2080.2.1, 1.2080.2.2 1473-SECURITY-TCP-UDP-getpeersec.txt, 1.1.2.1, NONE Message-ID: <200603290239.k2T2dlOr021223@cvs.devel.redhat.com> Author: linville Update of /cvs/dist/rpms/kernel/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv21210 Modified Files: Tag: private-linville-netdev-fc5-1-branch kernel-2.6.spec Removed Files: Tag: private-linville-netdev-fc5-1-branch 1473-SECURITY-TCP-UDP-getpeersec.txt Log Message: Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-5/kernel-2.6.spec,v retrieving revision 1.2080.2.1 retrieving revision 1.2080.2.2 diff -u -r1.2080.2.1 -r1.2080.2.2 --- kernel-2.6.spec 28 Mar 2006 21:17:26 -0000 1.2080.2.1 +++ kernel-2.6.spec 29 Mar 2006 02:39:44 -0000 1.2080.2.2 @@ -742,272 +742,271 @@ Patch30314: 1469-IPV4-ARP-Alloc-acceptance-of-unsolicited-ARP-via-netdevice-sysctl.txt Patch30315: 1471-TCP-sysctl-to-allow-TCP-window-32767-sans-wscale.txt Patch30316: 1472-XFRM-Fix-aevent-related-crash.txt -Patch30317: 1473-SECURITY-TCP-UDP-getpeersec.txt -Patch30318: 1474-DECnet-Endian-annotation-and-fixes-for-DECnet.txt -Patch30319: 1475-DECnet-Patch-to-fix-recvmsg-flag-check.txt -Patch30320: 1476-DECnet-Use-RCU-locking-in-dn_rules.c.txt -Patch30321: 1477-NET-Replace-skb_pull-skb_postpull_rcsum-with-skb_pull_rcsum.txt -Patch30322: 1478-PKT_SCHED-Let-NET_CLS_ACT-no-longer-depend-on-EXPERIMENTAL.txt -Patch30323: 1479-IPV6-remove-useless-test-in-ip6_append_data.txt -Patch30324: 1481-SNAP-Remove-leftover-unused-hdr-variable.txt -Patch30325: 1485-SK_BUFF-export-skb_pull_rcsum.txt -Patch30326: 1492-BRIDGE-ebtables-Build-fix.txt -Patch30327: 1493-BRIDGE-br_netfilter-Warning-fixes.txt -Patch30328: 1494-BRIDGE-remove-unneeded-bh-disables.txt -Patch30329: 1495-BRIDGE-use-setup_timer.txt -Patch30330: 1496-BRIDGE-use-kcalloc.txt -Patch30331: 1497-BRIDGE-use-kzalloc.txt -Patch30332: 1498-BRIDGE-optimize-frame-pass-up.txt -Patch30333: 1499-BRIDGE-netfilter-whitespace.txt -Patch30334: 1500-BRIDGE-netfilter-dont-use-__constant_htons.txt -Patch30335: 1501-BRIDGE-netfilter-VLAN-macro-cleanup.txt -Patch30336: 1502-BRIDGE-netfilter-inline-cleanup.txt -Patch30337: 1503-BRIDGE-forwarding-remove-unneeded-preempt-and-bh-diasables.txt -Patch30338: 1504-BRIDGE-stp-timer-to-jiffies-cleanup.txt -Patch30339: 1505-BRIDGE-use-llc-for-receiving-STP-packets.txt -Patch30340: 1506-BRIDGE-allow-show-store-of-group-multicast-address.txt -Patch30341: 1507-LLC-llc_mac_hdr_init-const-arguments.txt -Patch30342: 1508-BRIDGE-use-LLC-to-send-STP.txt -Patch30343: 1509-TG3-make-drivers-net-tg3.c-tg3_request_irq-static.txt -Patch30344: 1510-DECNET-net-decnet-dn_route.c-fix-inconsequent-NULL-checking.txt -Patch30345: 1511-BRIDGE-Remove-duplicate-const-from-is_link_local-argument-type.txt -Patch30346: 1512-IPV6-Cleanup-of-net-ipv6-reassambly.c.txt -Patch30347: 1513-IPV6-Nearly-complete-kzalloc-cleanup-for-net-ipv6.txt -Patch30348: 1514-IPV6-Cleanups-for-net-ipv6-addrconf.c-kzalloc-early-exit-v2.txt -Patch30349: 1515-TG3-Don-t-mark-tg3_test_registers-as-returning-const.txt -Patch30350: 1516-NETFILTER-Add-H.323-conntrack-NAT-helper.txt -Patch30351: 1593-skge-use-NAPI-for-tx-cleanup.txt -Patch30352: 1594-skge-use-auto-masking-of-irqs.txt -Patch30353: 1595-skge-check-the-allocation-of-ring-buffer.txt -Patch30354: 1596-skge-dma-configuration-cleanup.txt -Patch30355: 1597-skge-use-kcalloc.txt -Patch30356: 1598-skge-use-mmiowb.txt -Patch30357: 1599-skge-formmating-and-whitespace-cleanup.txt -Patch30358: 1600-skge-handle-pci-errors-better.txt -Patch30359: 1601-skge-version-1.4.txt -Patch30360: 1602-mv643xx_eth-Cache-align-skb-data-if-CONFIG_NOT_COHERENT_CACHE.txt -Patch30361: 1603-sky2-remove-support-for-untested-Yukon-EC-rev-0.txt -Patch30362: 1604-sky2-drop-broken-wake-on-lan-support.txt -Patch30363: 1605-sky2-rework-of-NAPI-and-IRQ-management.txt -Patch30364: 1606-sky2-coalescing-parameters.txt -Patch30365: 1607-sky2-add-MSI-support.txt -Patch30366: 1608-sky2-whitespace-fixes.txt -Patch30367: 1609-sky2-transmit-recovery.txt -Patch30368: 1610-sky2-handle-all-error-irqs.txt -Patch30369: 1611-sky2-version-1.1.txt -Patch30370: 1612-pcnet32-support-boards-with-multiple-phys.txt -Patch30371: 1613-smc91x-allow-for-dynamic-bus-access-configs.txt -Patch30372: 1614-skfp-warning-fixes.txt -Patch30373: 1615-netdrvr-pcnet32-Lindent.txt -Patch30374: 1616-netdrvr-pcnet32-other-source-formatting-cleanups.txt -Patch30375: 1648-ARM-3373-1-move-uengine-loader-to-arch-arm-common.txt -Patch30376: 1667-Fix-spelling-in-E1000_DISABLE_PACKET_SPLIT-Kconfig-description.txt -Patch30377: 1712-BLUETOOTH-Return-negative-error-constant.txt -Patch30378: 1713-NET-allow-32-bit-socket-ioctl-in-64-bit-kernel.txt -Patch30379: 1714-NET-socket-timestamp-32-bit-handler-for-64-bit-kernel.txt -Patch30380: 1715-X25-ioctl-conversion-32-bit-user-to-64-bit-kernel.txt -Patch30381: 1716-X25-fix-kernel-error-message-64-bit-kernel.txt -Patch30382: 1717-X25-allow-ITU-T-DTE-facilities-for-x25.txt -Patch30383: 1718-X25-dte-facilities-32-64-ioctl-conversion.txt -Patch30384: 1719-TG3-Fix-SRAM-access-during-tg3_init_one.txt -Patch30385: 1720-TG3-Skip-phy-power-down-on-some-devices.txt -Patch30386: 1721-TG3-Bump-driver-version-and-reldate.txt -Patch30387: 1848-netdrvr-e100-experiment-with-doing-RX-in-a-similar-manner-to-eepro100.txt -Patch30388: 1957-NETFILTER-Fix-Kconfig-typos.txt -Patch30389: 1958-NETFILTER-ctnetlink-Fix-expectaction-mask-dumping.txt -Patch30390: 1959-NETFILTER-nfnetlink_queue-fix-nfnetlink-message-size.txt -Patch30391: 1960-NETFILTER-conntrack-cleanup-the-conntrack-ID-initialization.txt -Patch30392: 1961-NETFILTER-x_tables-set-the-protocol-family-in-x_tables-targets-matches.txt -Patch30393: 1962-NETFILTER-nf_conntrack-support-for-layer-3-protocol-load-on-demand.txt -Patch30394: 1963-NETFILTER-Fix-xt_policy-address-matching.txt -Patch30395: 1964-NETFILTER-futher-ip-ip6-arp-_tables-unification.txt -Patch30396: 1965-NETFILTER-Fix-undefined-references-to-get_h225_addr.txt -Patch30397: 1982-fix-spidernet-build-issue.txt -Patch30398: 1983-AMD-Au1xx0-fix-Ethernet-TX-stats.txt -Patch30399: 1987-sky2-more-ethtool-stats.txt -Patch30400: 1988-sis900-adm7001-PHY-support.txt -Patch30401: 1989-Use-after-free-in-net-tulip-de2104x.c.txt -Patch30402: 1990-Use-of-uninitialized-variable-in-drivers-net-depca.c.txt -Patch30403: 1992-wireless-Add-softmac-layer-to-the-kernel.txt -Patch30404: 1993-make-softmac-depend-on-IEEE80211-and-EXPERIMENTAL.txt -Patch30405: 1994-softmac-fix-some-sparse-warnings.txt -Patch30406: 1995-softmac-fix-Makefiles.txt -Patch30407: 1996-softmac-convert-to-use-global-workqueue.txt -Patch30408: 1997-softmac-correctly-use-netif_carrier_-on-off.txt -Patch30409: 1998-softmac-try-to-reassociate-when-being-disassociated-from-the-AP.txt -Patch30410: 1999-softmac-add-fixme-for-disassoc.txt -Patch30411: 2000-softmac-select-best-network-based-on-rssi.txt -Patch30412: 2001-softmac-check-if-disassociation-is-for-us-before-processing-it.txt -Patch30413: 2002-softmac-scan-at-least-once-before-selecting-a-network-by-essid.txt -Patch30414: 2003-softmac-properly-check-return-value-of-ieee80211softmac_alloc_mgt.txt -Patch30415: 2004-softmac-some-comment-stuff.txt -Patch30416: 2005-softmac-add-copyright-and-license-headers.txt -Patch30417: 2006-softmac-add-MODULE_DESCRIPTION-and-MODULE_AUTHORs.txt -Patch30418: 2007-softmac-move-EXPORT_SYMBOL_GPL-right-after-functions.txt -Patch30419: 2009-update-copyright-in-softmac.txt -Patch30420: 2010-trivial-fixes-to-softmac.txt -Patch30421: 2011-softmac-update-deauth-handler-to-quiet-warning.txt -Patch30422: 2012-softmac-add-reassociation-code.txt -Patch30423: 2013-softmac-remove-dead-code.txt -Patch30424: 2014-Fix-softmac-scan.txt -Patch30425: 2028-PKTGEN-Add-MPLS-extension.txt -Patch30426: 2029-BNX2-Fix-link-change-handling.txt -Patch30427: 2030-BNX2-Combine-small-mem-allocations.txt -Patch30428: 2031-BNX2-Move-.h-files-to-bnx2.c.txt -Patch30429: 2032-BNX2-Separate-tx-producer-and-consumer-fields.txt -Patch30430: 2033-BNX2-Update-version-and-reldate.txt -Patch30431: 2034-IPV4-Add-fib-rule-netlink-notifications.txt -Patch30432: 2035-NET_SCHED-cls_u32-remove-unnecessary-NULL-ptr-check.txt -Patch30433: 2036-IPV6-ip6_xmit-remove-unnecessary-NULL-ptr-check.txt -Patch30434: 2037-TG3-Add-5755-support.txt -Patch30435: 2038-TG3-Add-5755-nvram-support.txt -Patch30436: 2039-TG3-Update-driver-version-and-reldate.txt -Patch30437: 2040-softmac-remove-function_enter.txt -Patch30438: 2041-WE-20-for-kernel-2.6.16.txt -Patch30439: 2120-sem2mutex-drivers-raw-connector-dcdbas-ppp_generic.txt -Patch30440: 2171-more-for_each_cpu-conversions.txt -Patch30441: 2188-wireless-airo-clean-up-printk-usage-to-print-device-name.txt -Patch30442: 2189-wireless-airo-define-default-MTU.txt -Patch30443: 2190-wireless-airo-cache-wireless-scans.txt -Patch30444: 2191-hostap-Fix-hw-reset-after-CMDCODE_ACCESS_WRITE-timeout.txt -Patch30445: 2192-hostap-Fix-ap_add_sta-return-value-verification.txt -Patch30446: 2193-hostap-Fix-double-free-in-prism2_config-error-path.txt -Patch30447: 2194-hostap-Fix-unlikely-read-overrun-in-CIS-parsing.txt -Patch30448: 2195-hostap-Remove-dead-code-duplicated-idx-0.txt -Patch30449: 2196-hostap-Fix-memory-leak-on-PCI-probe-error-path.txt -Patch30450: 2198-sky2-typo-in-last-stats-patch.txt -Patch30451: 2199-sky2-Fix-RX-stats.txt -Patch30452: 2200-sky2-dont-need-to-use-dev_kfree_skb_any.txt -Patch30453: 2201-skge-align-receive-buffers.txt -Patch30454: 2202-skge-dont-use-dev_alloc_skb-for-rx-buffs.txt -Patch30455: 2203-skge-rx_reuse-called-twice.txt -Patch30456: 2204-skge-multicast-statistics-fix.txt -Patch30457: 2205-skge-dont-free-skb-until-multi-part-transmit-complete.txt -Patch30458: 2206-skge-compute-available-ring-buffers.txt -Patch30459: 2207-skge-version-1.5.txt -Patch30460: 2361-remove-ISA-legacy-functions-drivers-net-hp-plus.c.txt -Patch30461: 2362-remove-ISA-legacy-functions-drivers-net-lance.c.txt -Patch30462: 2425-Fix-value-computed-not-used-warnings.txt -Patch30463: 2449-AT91RM9200-Ethernet-driver.txt -Patch30464: 2450-net-ne2k.c-won-t-compile-if-pci_clone_list-is-const.txt -Patch30465: 2514-BRIDGE-Unaligned-accesses-in-the-ethernet-bridge.txt -Patch30466: 2517-NET-Fill-in-a-32-bit-hole-in-struct-sock-on-64-bit-platforms.txt -Patch30467: 2519-WIRELESS-Fix-config-dependencies.txt -Patch30468: 2531-NET-Take-RTNL-when-unregistering-notifier.txt -Patch30469: 2532-SCTP-Fix-up-sctp_rcv-return-value.txt -Patch30470: 2533-TCP-Set-default-max-buffers-from-memory-pool-size.txt -Patch30471: 2534-TCP-Mark-tcp_-mem-__read_mostly.txt -Patch30472: 2535-IPV4-Aggregate-route-entries-with-different-TOS-values.txt -Patch30473: 2536-NETFILTER-x_table.c-sem2mutex.txt -Patch30474: 2578-fix-defined-but-not-used-warning-in-net-rxrpc-main.c-rxrpc_initialise.txt -Patch30475: 2587-hp300-fix-driver_register-return-handling-remove-dio_module_init.txt -Patch30476: 2588-EISA-tidy-up-driver_register-return-value.txt -Patch30477: 2589-amiga-fix-driver_register-return-handling-remove-zorro_module_init.txt -Patch30478: 2608-POLLRDHUP-EPOLLRDHUP-handling-for-half-closed-devices-notifications.txt -Patch30479: 2799-3c59x-use-mii_check_media.txt -Patch30480: 2800-3c59x-decrease-polling-interval.txt -Patch30481: 2801-3c59x-carriercheck-for-forced-media.txt -Patch30482: 2802-3c59x-use-ethtool_op_get_link.txt -Patch30483: 2803-3c59x-remove-per-driver-versioning.txt -Patch30484: 2804-3c59x-minor-cleanups.txt -Patch30485: 2882-more-s-fucn-func-typo-fixes.txt -Patch30486: 2942-IPSEC-Fix-tunnel-error-handling-in-ipcomp6.txt -Patch30487: 2943-NET-drop-duplicate-assignment-in-request_sock.txt -Patch30488: 2954-wireless-import-bcm43xx-sources.txt -Patch30489: 2955-bcm43xx-patch-Kconfig-and-wireless-Makefile-for-import.txt -Patch30490: 2956-bcm43xx-sync-with-svn.berlios.de.txt -Patch30491: 2957-bcm43xx-remove-linux-version-compatibility-code.txt -Patch30492: 2960-bcm43xx-add-DEBUG-Kconfig-option.-Also-fix-indention.txt -Patch30493: 2961-bcm43xx-Fix-makefile.-Remove-all-the-out-of-tree-stuff.txt -Patch30494: 2962-bcm43xx-Add-more-initvals-sanity-checks-and-error-out-if-one-sanity-check-fails.txt -Patch30495: 2963-bcm43xx-Remove-function-bcm43xx_channel_is_allowed.txt -Patch30496: 2964-bcm43xx-basic-ethtool-support.txt -Patch30497: 2965-bcm43xx-Wireless-Ext-update.txt -Patch30498: 2966-Sync-bcm43xx_phy_initb6-with-specs.txt -Patch30499: 2967-bcm43xx-fix-txpower-reporting-in-WE.txt -Patch30500: 2968-bcm43xx-enable-SPROM-writing.txt -Patch30501: 2969-bcm43xx-heavily-increase-mac_suspend-timeout.txt -Patch30502: 2970-bcm43xx-fix-compiletime-warning-phy_xmitpower.txt -Patch30503: 2971-bcm43xx-remove-WX-debugging.txt -Patch30504: 2972-bcm43xx-Partially-fix-PIO-code.-Add-Kconfig-option-for-PIO-or-DMA-mode-or-both.txt -Patch30505: 2973-bcm43xx-add-a-note-that-not-all-devices-support-PIO.txt -Patch30506: 2974-Apple-Airport-Add-Kconfig-note-that-the-bcm43xx-driver-has-to-be-used-for-Airport-Extreme-cards.txt -Patch30507: 2976-bcm43xx-fix-LED-code.txt -Patch30508: 2977-bcm43xx-rewrite-and-simplify-the-periodic-task-handling.txt -Patch30509: 2978-bcm43xx-Code-cleanups.-This-removes-various-inline-statements-and-reduces-codesize.txt -Patch30510: 2979-bcm43xx-Move-sprom-lowlevel-reading-writing-to-its-own-functions.txt -Patch30511: 2980-bcm43xx-make-bcm43xx_sprom_crc-static.txt -Patch30512: 2981-bcm43xx-split-the-channel-helper-functions-so-that-they-can-be-used-without-a-valid-running-core.txt -Patch30513: 2982-bcm43xx-remove-old-unused-struct.txt -Patch30514: 2983-bcm43xx-Fix-Kconfig-typo-transfer-mode-default.txt -Patch30515: 2984-bcm43xx-Workaround-init_board-vs-IRQ-race.txt -Patch30516: 2985-bcm43xx-move-initialized-1-to-the-end-of-init_board.txt -Patch30517: 2986-bcm43xx-add-assert-bcm-initialized-to-periodic_tasks_setup.txt -Patch30518: 2987-bcm43xx-Move-TX-RX-related-functions-to-its-own-file.-Add-basic-RTS-CTS-code.txt -Patch30519: 2988-bcm43xx-Add-sysfs-attributes-for-device-specific-tunables.txt -Patch30520: 2989-bcm43xx-fix-DMA-TX-skb-freeing-in-case-of-fragmented-packets.txt -Patch30521: 2990-bcm43xx-Set-both-the-DMAmask-and-the-coherent-DMAmask.txt -Patch30522: 2991-bcm43xx-Abstract-the-locking-mechanism.txt -Patch30523: 2992-bcm43xx-Remove-the-mmio-access-printing-facility-overhead.txt -Patch30524: 2993-bcm43xx-fix-some-stuff-add-a-few-missing-mmiowb-remove-dead-code.txt -Patch30525: 2994-bcm43xx-receive-TX-status-on-MMIO-or-DMA-unconditionally-regarding-the-80211-core-rev.txt -Patch30526: 2995-bcm43xx-add-functions-bcm43xx_dma_read-write-bcm43xx_dma_tx_suspend-resume.txt -Patch30527: 2996-bcm43xx-reduce-the-size-of-bcm43xx_private-by-removing-unneeded-members.txt -Patch30528: 2997-bcm43xx-Fix-crash-on-ifdown-by-being-careful-in-pio-dma-freeing.txt -Patch30529: 2998-bcm43xx-Remove-the-workaround-in-dummy_transmission.txt -Patch30530: 2999-bcm43xx-Do-boardflags-workarounds-for-specific-boards.txt -Patch30531: 3000-bcm43xx-properly-mask-txctl1-before-writing-it-to-hardware.txt -Patch30532: 3001-bcm43xx-remove-check-for-mmio-length-as-it-differs-among-platforms.-especially-embedded.txt -Patch30533: 3002-bcm43xx-fix-some-gpio-register-trashing-hopefully-D.txt -Patch30534: 3003-bcm43xx-merge-all-iwmode-code-into-the-set_iwmode-function.txt -Patch30535: 3004-bcm43xx-some-IRQ-handler-cleanups.txt -Patch30536: 3005-bcm43xx-set-default-attenuation-values.txt -Patch30537: 3006-bcm43xx-sync-interference-mitigation-code-to-the-specs.txt -Patch30538: 3007-bcm43xx-fix-nrssi_threshold-calculation.txt -Patch30539: 3008-bcm43xx-add-useless-and-broken-statistics-stuff.-People-seem-to-want-it.-well.txt -Patch30540: 3009-bcm43xx-get-rid-of-vim-.-lines-at-the-end-of-several-files.txt -Patch30541: 3010-bcm43xx-fix-include-issues-on-some-platforms.txt -Patch30542: 3011-bcm43xx-remove-some-compilerwarnings.txt -Patch30543: 3012-bcm43xx-fix-the-remaining-sparse-warnings.txt -Patch30544: 3013-bcm43xx-sync-GPHY-init-with-the-specs.txt -Patch30545: 3014-bcm43xx-don-t-set-the-channel-on-a-device-which-is-down.txt -Patch30546: 3015-PCMCIA_SPECTRUM-must-select-FW_LOADER.txt -Patch30547: 3017-hostap-Make-hostap_tx_encrypt-static.txt -Patch30548: 3018-hostap-Fix-EAPOL-frame-encryption.txt -Patch30549: 3056-knfsd-Change-the-store-of-auth_domains-to-not-be-a-cache.txt -Patch30550: 3058-knfsd-Get-rid-of-inplace-sunrpc-caches.txt -Patch30551: 3059-knfsd-Create-cache_lookup-function-instead-of-using-a-macro-to-declare-one.txt -Patch30552: 3060-knfsd-Convert-ip_map-cache-to-use-the-new-lookup-routine.txt -Patch30553: 3063-knfsd-Use-new-sunrpc-cache-for-rsi-cache.txt -Patch30554: 3064-knfsd-Use-new-cache-code-for-rsc-cache.txt -Patch30555: 3066-knfsd-An-assortment-of-little-fixes-to-the-sunrpc-cache-code.txt -Patch30556: 3068-knfsd-Unexport-cache_fresh-and-fix-a-small-race.txt -Patch30557: 3071-knfsd-Tidy-up-unix_domain_find.txt -Patch30558: 3143-pnp-IRDA-adjust-pnp_register_driver-signature.txt -Patch30559: 3219-Minor-janitorial-change-to-ieee80211.txt -Patch30560: 3220-wireless-add-prism54usb-driver.txt -Patch30561: 3221-prism54usb-fix-build-break-in-islusb_init.c.txt -Patch30562: 3222-wireless-add-acx-driver.txt -Patch30563: 3223-acxsm-merge-from-acx-0.3.32.txt -Patch30564: 3224-tiacx-Let-only-ACX_PCI-ACX_USB-be-user-visible.txt -Patch30565: 3225-softmac-prism54usb-update.txt -Patch30566: 3226-tiacx-revert-neither-PCI-nor-USB-is-selected-change.txt -Patch30567: 3227-tiacx-implement-much-more-flexible-firmware-statistics-parsing.txt -Patch30568: 3228-tiacx-Change-acx_ioctl_-get-set-_encode-to-use-kernel-80211-stack.txt -Patch30569: 3229-tiacx-fix-breakage-of-Get-rid-of-circular-list-of-adev-s.txt -Patch30570: 3230-tiacx-split-module-into-acx-common-acx-pci-acx-usb.txt -Patch30571: 3231-softmac-reduce-scan-dwell-time.txt -Patch30572: 3232-softmac-reduce-default-rate-to-11Mbps.txt -Patch30573: 3233-update-prism54usb-sources.txt -Patch30574: 3234-TG3-Fix-probe-failure-due-to-invalid-MAC-address.txt -Patch30575: 3235-TG3-Fix-bug-in-40-bit-DMA-workaround-code.txt -Patch30576: 3236-TG3-Fix-PHY-loopback-on-5700.txt -Patch30577: 3237-TG3-Speed-up-SRAM-access.txt -Patch30578: 3238-TG3-Skip-timer-code-during-full-lock.txt -Patch30579: 3239-TG3-Update-version-and-reldate.txt -Patch30580: 3241-NET-Fix-ipx-econet-appletalk-irda-ioctl-crashes.txt -Patch30581: 3242-ECONET-Convert-away-from-SOCKOPS_WRAPPED.txt -Patch30582: 3243-NET-deinline-200-byte-inlines-in-sock.h.txt +Patch30317: 1474-DECnet-Endian-annotation-and-fixes-for-DECnet.txt +Patch30318: 1475-DECnet-Patch-to-fix-recvmsg-flag-check.txt +Patch30319: 1476-DECnet-Use-RCU-locking-in-dn_rules.c.txt +Patch30320: 1477-NET-Replace-skb_pull-skb_postpull_rcsum-with-skb_pull_rcsum.txt +Patch30321: 1478-PKT_SCHED-Let-NET_CLS_ACT-no-longer-depend-on-EXPERIMENTAL.txt +Patch30322: 1479-IPV6-remove-useless-test-in-ip6_append_data.txt +Patch30323: 1481-SNAP-Remove-leftover-unused-hdr-variable.txt +Patch30324: 1485-SK_BUFF-export-skb_pull_rcsum.txt +Patch30325: 1492-BRIDGE-ebtables-Build-fix.txt +Patch30326: 1493-BRIDGE-br_netfilter-Warning-fixes.txt +Patch30327: 1494-BRIDGE-remove-unneeded-bh-disables.txt +Patch30328: 1495-BRIDGE-use-setup_timer.txt +Patch30329: 1496-BRIDGE-use-kcalloc.txt +Patch30330: 1497-BRIDGE-use-kzalloc.txt +Patch30331: 1498-BRIDGE-optimize-frame-pass-up.txt +Patch30332: 1499-BRIDGE-netfilter-whitespace.txt +Patch30333: 1500-BRIDGE-netfilter-dont-use-__constant_htons.txt +Patch30334: 1501-BRIDGE-netfilter-VLAN-macro-cleanup.txt +Patch30335: 1502-BRIDGE-netfilter-inline-cleanup.txt +Patch30336: 1503-BRIDGE-forwarding-remove-unneeded-preempt-and-bh-diasables.txt +Patch30337: 1504-BRIDGE-stp-timer-to-jiffies-cleanup.txt +Patch30338: 1505-BRIDGE-use-llc-for-receiving-STP-packets.txt +Patch30339: 1506-BRIDGE-allow-show-store-of-group-multicast-address.txt +Patch30340: 1507-LLC-llc_mac_hdr_init-const-arguments.txt +Patch30341: 1508-BRIDGE-use-LLC-to-send-STP.txt +Patch30342: 1509-TG3-make-drivers-net-tg3.c-tg3_request_irq-static.txt +Patch30343: 1510-DECNET-net-decnet-dn_route.c-fix-inconsequent-NULL-checking.txt +Patch30344: 1511-BRIDGE-Remove-duplicate-const-from-is_link_local-argument-type.txt +Patch30345: 1512-IPV6-Cleanup-of-net-ipv6-reassambly.c.txt +Patch30346: 1513-IPV6-Nearly-complete-kzalloc-cleanup-for-net-ipv6.txt +Patch30347: 1514-IPV6-Cleanups-for-net-ipv6-addrconf.c-kzalloc-early-exit-v2.txt +Patch30348: 1515-TG3-Don-t-mark-tg3_test_registers-as-returning-const.txt +Patch30349: 1516-NETFILTER-Add-H.323-conntrack-NAT-helper.txt +Patch30350: 1593-skge-use-NAPI-for-tx-cleanup.txt +Patch30351: 1594-skge-use-auto-masking-of-irqs.txt +Patch30352: 1595-skge-check-the-allocation-of-ring-buffer.txt +Patch30353: 1596-skge-dma-configuration-cleanup.txt +Patch30354: 1597-skge-use-kcalloc.txt +Patch30355: 1598-skge-use-mmiowb.txt +Patch30356: 1599-skge-formmating-and-whitespace-cleanup.txt +Patch30357: 1600-skge-handle-pci-errors-better.txt +Patch30358: 1601-skge-version-1.4.txt +Patch30359: 1602-mv643xx_eth-Cache-align-skb-data-if-CONFIG_NOT_COHERENT_CACHE.txt +Patch30360: 1603-sky2-remove-support-for-untested-Yukon-EC-rev-0.txt +Patch30361: 1604-sky2-drop-broken-wake-on-lan-support.txt +Patch30362: 1605-sky2-rework-of-NAPI-and-IRQ-management.txt +Patch30363: 1606-sky2-coalescing-parameters.txt +Patch30364: 1607-sky2-add-MSI-support.txt +Patch30365: 1608-sky2-whitespace-fixes.txt +Patch30366: 1609-sky2-transmit-recovery.txt +Patch30367: 1610-sky2-handle-all-error-irqs.txt +Patch30368: 1611-sky2-version-1.1.txt +Patch30369: 1612-pcnet32-support-boards-with-multiple-phys.txt +Patch30370: 1613-smc91x-allow-for-dynamic-bus-access-configs.txt +Patch30371: 1614-skfp-warning-fixes.txt +Patch30372: 1615-netdrvr-pcnet32-Lindent.txt +Patch30373: 1616-netdrvr-pcnet32-other-source-formatting-cleanups.txt +Patch30374: 1648-ARM-3373-1-move-uengine-loader-to-arch-arm-common.txt +Patch30375: 1667-Fix-spelling-in-E1000_DISABLE_PACKET_SPLIT-Kconfig-description.txt +Patch30376: 1712-BLUETOOTH-Return-negative-error-constant.txt +Patch30377: 1713-NET-allow-32-bit-socket-ioctl-in-64-bit-kernel.txt +Patch30378: 1714-NET-socket-timestamp-32-bit-handler-for-64-bit-kernel.txt +Patch30379: 1715-X25-ioctl-conversion-32-bit-user-to-64-bit-kernel.txt +Patch30380: 1716-X25-fix-kernel-error-message-64-bit-kernel.txt +Patch30381: 1717-X25-allow-ITU-T-DTE-facilities-for-x25.txt +Patch30382: 1718-X25-dte-facilities-32-64-ioctl-conversion.txt +Patch30383: 1719-TG3-Fix-SRAM-access-during-tg3_init_one.txt +Patch30384: 1720-TG3-Skip-phy-power-down-on-some-devices.txt +Patch30385: 1721-TG3-Bump-driver-version-and-reldate.txt +Patch30386: 1848-netdrvr-e100-experiment-with-doing-RX-in-a-similar-manner-to-eepro100.txt +Patch30387: 1957-NETFILTER-Fix-Kconfig-typos.txt +Patch30388: 1958-NETFILTER-ctnetlink-Fix-expectaction-mask-dumping.txt +Patch30389: 1959-NETFILTER-nfnetlink_queue-fix-nfnetlink-message-size.txt +Patch30390: 1960-NETFILTER-conntrack-cleanup-the-conntrack-ID-initialization.txt +Patch30391: 1961-NETFILTER-x_tables-set-the-protocol-family-in-x_tables-targets-matches.txt +Patch30392: 1962-NETFILTER-nf_conntrack-support-for-layer-3-protocol-load-on-demand.txt +Patch30393: 1963-NETFILTER-Fix-xt_policy-address-matching.txt +Patch30394: 1964-NETFILTER-futher-ip-ip6-arp-_tables-unification.txt +Patch30395: 1965-NETFILTER-Fix-undefined-references-to-get_h225_addr.txt +Patch30396: 1982-fix-spidernet-build-issue.txt +Patch30397: 1983-AMD-Au1xx0-fix-Ethernet-TX-stats.txt +Patch30398: 1987-sky2-more-ethtool-stats.txt +Patch30399: 1988-sis900-adm7001-PHY-support.txt +Patch30400: 1989-Use-after-free-in-net-tulip-de2104x.c.txt +Patch30401: 1990-Use-of-uninitialized-variable-in-drivers-net-depca.c.txt +Patch30402: 1992-wireless-Add-softmac-layer-to-the-kernel.txt +Patch30403: 1993-make-softmac-depend-on-IEEE80211-and-EXPERIMENTAL.txt +Patch30404: 1994-softmac-fix-some-sparse-warnings.txt +Patch30405: 1995-softmac-fix-Makefiles.txt +Patch30406: 1996-softmac-convert-to-use-global-workqueue.txt +Patch30407: 1997-softmac-correctly-use-netif_carrier_-on-off.txt +Patch30408: 1998-softmac-try-to-reassociate-when-being-disassociated-from-the-AP.txt +Patch30409: 1999-softmac-add-fixme-for-disassoc.txt +Patch30410: 2000-softmac-select-best-network-based-on-rssi.txt +Patch30411: 2001-softmac-check-if-disassociation-is-for-us-before-processing-it.txt +Patch30412: 2002-softmac-scan-at-least-once-before-selecting-a-network-by-essid.txt +Patch30413: 2003-softmac-properly-check-return-value-of-ieee80211softmac_alloc_mgt.txt +Patch30414: 2004-softmac-some-comment-stuff.txt +Patch30415: 2005-softmac-add-copyright-and-license-headers.txt +Patch30416: 2006-softmac-add-MODULE_DESCRIPTION-and-MODULE_AUTHORs.txt +Patch30417: 2007-softmac-move-EXPORT_SYMBOL_GPL-right-after-functions.txt +Patch30418: 2009-update-copyright-in-softmac.txt +Patch30419: 2010-trivial-fixes-to-softmac.txt +Patch30420: 2011-softmac-update-deauth-handler-to-quiet-warning.txt +Patch30421: 2012-softmac-add-reassociation-code.txt +Patch30422: 2013-softmac-remove-dead-code.txt +Patch30423: 2014-Fix-softmac-scan.txt +Patch30424: 2028-PKTGEN-Add-MPLS-extension.txt +Patch30425: 2029-BNX2-Fix-link-change-handling.txt +Patch30426: 2030-BNX2-Combine-small-mem-allocations.txt +Patch30427: 2031-BNX2-Move-.h-files-to-bnx2.c.txt +Patch30428: 2032-BNX2-Separate-tx-producer-and-consumer-fields.txt +Patch30429: 2033-BNX2-Update-version-and-reldate.txt +Patch30430: 2034-IPV4-Add-fib-rule-netlink-notifications.txt +Patch30431: 2035-NET_SCHED-cls_u32-remove-unnecessary-NULL-ptr-check.txt +Patch30432: 2036-IPV6-ip6_xmit-remove-unnecessary-NULL-ptr-check.txt +Patch30433: 2037-TG3-Add-5755-support.txt +Patch30434: 2038-TG3-Add-5755-nvram-support.txt +Patch30435: 2039-TG3-Update-driver-version-and-reldate.txt +Patch30436: 2040-softmac-remove-function_enter.txt +Patch30437: 2041-WE-20-for-kernel-2.6.16.txt +Patch30438: 2120-sem2mutex-drivers-raw-connector-dcdbas-ppp_generic.txt +Patch30439: 2171-more-for_each_cpu-conversions.txt +Patch30440: 2188-wireless-airo-clean-up-printk-usage-to-print-device-name.txt +Patch30441: 2189-wireless-airo-define-default-MTU.txt +Patch30442: 2190-wireless-airo-cache-wireless-scans.txt +Patch30443: 2191-hostap-Fix-hw-reset-after-CMDCODE_ACCESS_WRITE-timeout.txt +Patch30444: 2192-hostap-Fix-ap_add_sta-return-value-verification.txt +Patch30445: 2193-hostap-Fix-double-free-in-prism2_config-error-path.txt +Patch30446: 2194-hostap-Fix-unlikely-read-overrun-in-CIS-parsing.txt +Patch30447: 2195-hostap-Remove-dead-code-duplicated-idx-0.txt +Patch30448: 2196-hostap-Fix-memory-leak-on-PCI-probe-error-path.txt +Patch30449: 2198-sky2-typo-in-last-stats-patch.txt +Patch30450: 2199-sky2-Fix-RX-stats.txt +Patch30451: 2200-sky2-dont-need-to-use-dev_kfree_skb_any.txt +Patch30452: 2201-skge-align-receive-buffers.txt +Patch30453: 2202-skge-dont-use-dev_alloc_skb-for-rx-buffs.txt +Patch30454: 2203-skge-rx_reuse-called-twice.txt +Patch30455: 2204-skge-multicast-statistics-fix.txt +Patch30456: 2205-skge-dont-free-skb-until-multi-part-transmit-complete.txt +Patch30457: 2206-skge-compute-available-ring-buffers.txt +Patch30458: 2207-skge-version-1.5.txt +Patch30459: 2361-remove-ISA-legacy-functions-drivers-net-hp-plus.c.txt +Patch30460: 2362-remove-ISA-legacy-functions-drivers-net-lance.c.txt +Patch30461: 2425-Fix-value-computed-not-used-warnings.txt +Patch30462: 2449-AT91RM9200-Ethernet-driver.txt +Patch30463: 2450-net-ne2k.c-won-t-compile-if-pci_clone_list-is-const.txt +Patch30464: 2514-BRIDGE-Unaligned-accesses-in-the-ethernet-bridge.txt +Patch30465: 2517-NET-Fill-in-a-32-bit-hole-in-struct-sock-on-64-bit-platforms.txt +Patch30466: 2519-WIRELESS-Fix-config-dependencies.txt +Patch30467: 2531-NET-Take-RTNL-when-unregistering-notifier.txt +Patch30468: 2532-SCTP-Fix-up-sctp_rcv-return-value.txt +Patch30469: 2533-TCP-Set-default-max-buffers-from-memory-pool-size.txt +Patch30470: 2534-TCP-Mark-tcp_-mem-__read_mostly.txt +Patch30471: 2535-IPV4-Aggregate-route-entries-with-different-TOS-values.txt +Patch30472: 2536-NETFILTER-x_table.c-sem2mutex.txt +Patch30473: 2578-fix-defined-but-not-used-warning-in-net-rxrpc-main.c-rxrpc_initialise.txt +Patch30474: 2587-hp300-fix-driver_register-return-handling-remove-dio_module_init.txt +Patch30475: 2588-EISA-tidy-up-driver_register-return-value.txt +Patch30476: 2589-amiga-fix-driver_register-return-handling-remove-zorro_module_init.txt +Patch30477: 2608-POLLRDHUP-EPOLLRDHUP-handling-for-half-closed-devices-notifications.txt +Patch30478: 2799-3c59x-use-mii_check_media.txt +Patch30479: 2800-3c59x-decrease-polling-interval.txt +Patch30480: 2801-3c59x-carriercheck-for-forced-media.txt +Patch30481: 2802-3c59x-use-ethtool_op_get_link.txt +Patch30482: 2803-3c59x-remove-per-driver-versioning.txt +Patch30483: 2804-3c59x-minor-cleanups.txt +Patch30484: 2882-more-s-fucn-func-typo-fixes.txt +Patch30485: 2942-IPSEC-Fix-tunnel-error-handling-in-ipcomp6.txt +Patch30486: 2943-NET-drop-duplicate-assignment-in-request_sock.txt +Patch30487: 2954-wireless-import-bcm43xx-sources.txt +Patch30488: 2955-bcm43xx-patch-Kconfig-and-wireless-Makefile-for-import.txt +Patch30489: 2956-bcm43xx-sync-with-svn.berlios.de.txt +Patch30490: 2957-bcm43xx-remove-linux-version-compatibility-code.txt +Patch30491: 2960-bcm43xx-add-DEBUG-Kconfig-option.-Also-fix-indention.txt +Patch30492: 2961-bcm43xx-Fix-makefile.-Remove-all-the-out-of-tree-stuff.txt +Patch30493: 2962-bcm43xx-Add-more-initvals-sanity-checks-and-error-out-if-one-sanity-check-fails.txt +Patch30494: 2963-bcm43xx-Remove-function-bcm43xx_channel_is_allowed.txt +Patch30495: 2964-bcm43xx-basic-ethtool-support.txt +Patch30496: 2965-bcm43xx-Wireless-Ext-update.txt +Patch30497: 2966-Sync-bcm43xx_phy_initb6-with-specs.txt +Patch30498: 2967-bcm43xx-fix-txpower-reporting-in-WE.txt +Patch30499: 2968-bcm43xx-enable-SPROM-writing.txt +Patch30500: 2969-bcm43xx-heavily-increase-mac_suspend-timeout.txt +Patch30501: 2970-bcm43xx-fix-compiletime-warning-phy_xmitpower.txt +Patch30502: 2971-bcm43xx-remove-WX-debugging.txt +Patch30503: 2972-bcm43xx-Partially-fix-PIO-code.-Add-Kconfig-option-for-PIO-or-DMA-mode-or-both.txt +Patch30504: 2973-bcm43xx-add-a-note-that-not-all-devices-support-PIO.txt +Patch30505: 2974-Apple-Airport-Add-Kconfig-note-that-the-bcm43xx-driver-has-to-be-used-for-Airport-Extreme-cards.txt +Patch30506: 2976-bcm43xx-fix-LED-code.txt +Patch30507: 2977-bcm43xx-rewrite-and-simplify-the-periodic-task-handling.txt +Patch30508: 2978-bcm43xx-Code-cleanups.-This-removes-various-inline-statements-and-reduces-codesize.txt +Patch30509: 2979-bcm43xx-Move-sprom-lowlevel-reading-writing-to-its-own-functions.txt +Patch30510: 2980-bcm43xx-make-bcm43xx_sprom_crc-static.txt +Patch30511: 2981-bcm43xx-split-the-channel-helper-functions-so-that-they-can-be-used-without-a-valid-running-core.txt +Patch30512: 2982-bcm43xx-remove-old-unused-struct.txt +Patch30513: 2983-bcm43xx-Fix-Kconfig-typo-transfer-mode-default.txt +Patch30514: 2984-bcm43xx-Workaround-init_board-vs-IRQ-race.txt +Patch30515: 2985-bcm43xx-move-initialized-1-to-the-end-of-init_board.txt +Patch30516: 2986-bcm43xx-add-assert-bcm-initialized-to-periodic_tasks_setup.txt +Patch30517: 2987-bcm43xx-Move-TX-RX-related-functions-to-its-own-file.-Add-basic-RTS-CTS-code.txt +Patch30518: 2988-bcm43xx-Add-sysfs-attributes-for-device-specific-tunables.txt +Patch30519: 2989-bcm43xx-fix-DMA-TX-skb-freeing-in-case-of-fragmented-packets.txt +Patch30520: 2990-bcm43xx-Set-both-the-DMAmask-and-the-coherent-DMAmask.txt +Patch30521: 2991-bcm43xx-Abstract-the-locking-mechanism.txt +Patch30522: 2992-bcm43xx-Remove-the-mmio-access-printing-facility-overhead.txt +Patch30523: 2993-bcm43xx-fix-some-stuff-add-a-few-missing-mmiowb-remove-dead-code.txt +Patch30524: 2994-bcm43xx-receive-TX-status-on-MMIO-or-DMA-unconditionally-regarding-the-80211-core-rev.txt +Patch30525: 2995-bcm43xx-add-functions-bcm43xx_dma_read-write-bcm43xx_dma_tx_suspend-resume.txt +Patch30526: 2996-bcm43xx-reduce-the-size-of-bcm43xx_private-by-removing-unneeded-members.txt +Patch30527: 2997-bcm43xx-Fix-crash-on-ifdown-by-being-careful-in-pio-dma-freeing.txt +Patch30528: 2998-bcm43xx-Remove-the-workaround-in-dummy_transmission.txt +Patch30529: 2999-bcm43xx-Do-boardflags-workarounds-for-specific-boards.txt +Patch30530: 3000-bcm43xx-properly-mask-txctl1-before-writing-it-to-hardware.txt +Patch30531: 3001-bcm43xx-remove-check-for-mmio-length-as-it-differs-among-platforms.-especially-embedded.txt +Patch30532: 3002-bcm43xx-fix-some-gpio-register-trashing-hopefully-D.txt +Patch30533: 3003-bcm43xx-merge-all-iwmode-code-into-the-set_iwmode-function.txt +Patch30534: 3004-bcm43xx-some-IRQ-handler-cleanups.txt +Patch30535: 3005-bcm43xx-set-default-attenuation-values.txt +Patch30536: 3006-bcm43xx-sync-interference-mitigation-code-to-the-specs.txt +Patch30537: 3007-bcm43xx-fix-nrssi_threshold-calculation.txt +Patch30538: 3008-bcm43xx-add-useless-and-broken-statistics-stuff.-People-seem-to-want-it.-well.txt +Patch30539: 3009-bcm43xx-get-rid-of-vim-.-lines-at-the-end-of-several-files.txt +Patch30540: 3010-bcm43xx-fix-include-issues-on-some-platforms.txt +Patch30541: 3011-bcm43xx-remove-some-compilerwarnings.txt +Patch30542: 3012-bcm43xx-fix-the-remaining-sparse-warnings.txt +Patch30543: 3013-bcm43xx-sync-GPHY-init-with-the-specs.txt +Patch30544: 3014-bcm43xx-don-t-set-the-channel-on-a-device-which-is-down.txt +Patch30545: 3015-PCMCIA_SPECTRUM-must-select-FW_LOADER.txt +Patch30546: 3017-hostap-Make-hostap_tx_encrypt-static.txt +Patch30547: 3018-hostap-Fix-EAPOL-frame-encryption.txt +Patch30548: 3056-knfsd-Change-the-store-of-auth_domains-to-not-be-a-cache.txt +Patch30549: 3058-knfsd-Get-rid-of-inplace-sunrpc-caches.txt +Patch30550: 3059-knfsd-Create-cache_lookup-function-instead-of-using-a-macro-to-declare-one.txt +Patch30551: 3060-knfsd-Convert-ip_map-cache-to-use-the-new-lookup-routine.txt +Patch30552: 3063-knfsd-Use-new-sunrpc-cache-for-rsi-cache.txt +Patch30553: 3064-knfsd-Use-new-cache-code-for-rsc-cache.txt +Patch30554: 3066-knfsd-An-assortment-of-little-fixes-to-the-sunrpc-cache-code.txt +Patch30555: 3068-knfsd-Unexport-cache_fresh-and-fix-a-small-race.txt +Patch30556: 3071-knfsd-Tidy-up-unix_domain_find.txt +Patch30557: 3143-pnp-IRDA-adjust-pnp_register_driver-signature.txt +Patch30558: 3219-Minor-janitorial-change-to-ieee80211.txt +Patch30559: 3220-wireless-add-prism54usb-driver.txt +Patch30560: 3221-prism54usb-fix-build-break-in-islusb_init.c.txt +Patch30561: 3222-wireless-add-acx-driver.txt +Patch30562: 3223-acxsm-merge-from-acx-0.3.32.txt +Patch30563: 3224-tiacx-Let-only-ACX_PCI-ACX_USB-be-user-visible.txt +Patch30564: 3225-softmac-prism54usb-update.txt +Patch30565: 3226-tiacx-revert-neither-PCI-nor-USB-is-selected-change.txt +Patch30566: 3227-tiacx-implement-much-more-flexible-firmware-statistics-parsing.txt +Patch30567: 3228-tiacx-Change-acx_ioctl_-get-set-_encode-to-use-kernel-80211-stack.txt +Patch30568: 3229-tiacx-fix-breakage-of-Get-rid-of-circular-list-of-adev-s.txt +Patch30569: 3230-tiacx-split-module-into-acx-common-acx-pci-acx-usb.txt +Patch30570: 3231-softmac-reduce-scan-dwell-time.txt +Patch30571: 3232-softmac-reduce-default-rate-to-11Mbps.txt +Patch30572: 3233-update-prism54usb-sources.txt +Patch30573: 3234-TG3-Fix-probe-failure-due-to-invalid-MAC-address.txt +Patch30574: 3235-TG3-Fix-bug-in-40-bit-DMA-workaround-code.txt +Patch30575: 3236-TG3-Fix-PHY-loopback-on-5700.txt +Patch30576: 3237-TG3-Speed-up-SRAM-access.txt +Patch30577: 3238-TG3-Skip-timer-code-during-full-lock.txt +Patch30578: 3239-TG3-Update-version-and-reldate.txt +Patch30579: 3241-NET-Fix-ipx-econet-appletalk-irda-ioctl-crashes.txt +Patch30580: 3242-ECONET-Convert-away-from-SOCKOPS_WRAPPED.txt +Patch30581: 3243-NET-deinline-200-byte-inlines-in-sock.h.txt # END OF PATCH DEFINITIONS @@ -2279,538 +2278,536 @@ %patch30315 -p1 # [XFRM]: Fix aevent related crash %patch30316 -p1 -# [SECURITY]: TCP/UDP getpeersec -%patch30317 -p1 # [DECnet]: Endian annotation and fixes for DECnet. -%patch30318 -p1 +%patch30317 -p1 # [DECnet]: Patch to fix recvmsg() flag check -%patch30319 -p1 +%patch30318 -p1 # [DECnet]: Use RCU locking in dn_rules.c -%patch30320 -p1 +%patch30319 -p1 # [NET]: Replace skb_pull/skb_postpull_rcsum with skb_pull_rcsum -%patch30321 -p1 +%patch30320 -p1 # [PKT_SCHED]: Let NET_CLS_ACT no longer depend on EXPERIMENTAL -%patch30322 -p1 +%patch30321 -p1 # [IPV6]: remove useless test in ip6_append_data -%patch30323 -p1 +%patch30322 -p1 # [SNAP]: Remove leftover unused hdr variable -%patch30324 -p1 +%patch30323 -p1 # [SK_BUFF]: export skb_pull_rcsum -%patch30325 -p1 +%patch30324 -p1 # [BRIDGE] ebtables: Build fix. -%patch30326 -p1 +%patch30325 -p1 # [BRIDGE] br_netfilter: Warning fixes. -%patch30327 -p1 +%patch30326 -p1 # [BRIDGE]: remove unneeded bh disables -%patch30328 -p1 +%patch30327 -p1 # [BRIDGE]: use setup_timer -%patch30329 -p1 +%patch30328 -p1 # [BRIDGE]: use kcalloc -%patch30330 -p1 +%patch30329 -p1 # [BRIDGE]: use kzalloc -%patch30331 -p1 +%patch30330 -p1 # [BRIDGE]: optimize frame pass up -%patch30332 -p1 +%patch30331 -p1 # [BRIDGE]: netfilter whitespace -%patch30333 -p1 +%patch30332 -p1 # [BRIDGE]: netfilter dont use __constant_htons -%patch30334 -p1 +%patch30333 -p1 # [BRIDGE]: netfilter VLAN macro cleanup -%patch30335 -p1 +%patch30334 -p1 # [BRIDGE]: netfilter inline cleanup -%patch30336 -p1 +%patch30335 -p1 # [BRIDGE]: forwarding remove unneeded preempt and bh diasables -%patch30337 -p1 +%patch30336 -p1 # [BRIDGE]: stp timer to jiffies cleanup -%patch30338 -p1 +%patch30337 -p1 # [BRIDGE]: use llc for receiving STP packets -%patch30339 -p1 +%patch30338 -p1 # [BRIDGE]: allow show/store of group multicast address -%patch30340 -p1 +%patch30339 -p1 # [LLC]: llc_mac_hdr_init const arguments -%patch30341 -p1 +%patch30340 -p1 # [BRIDGE]: use LLC to send STP -%patch30342 -p1 +%patch30341 -p1 # [TG3]: make drivers/net/tg3.c:tg3_request_irq() static -%patch30343 -p1 +%patch30342 -p1 # [DECNET]: net/decnet/dn_route.c: fix inconsequent NULL checking -%patch30344 -p1 +%patch30343 -p1 # [BRIDGE]: Remove duplicate const from is_link_local() argument type. -%patch30345 -p1 +%patch30344 -p1 # [IPV6]: Cleanup of net/ipv6/reassambly.c -%patch30346 -p1 +%patch30345 -p1 # [IPV6]: Nearly complete kzalloc cleanup for net/ipv6 -%patch30347 -p1 +%patch30346 -p1 # [IPV6]: Cleanups for net/ipv6/addrconf.c (kzalloc, early exit) v2 -%patch30348 -p1 +%patch30347 -p1 # [TG3]: Don't mark tg3_test_registers() as returning const. -%patch30349 -p1 +%patch30348 -p1 # [NETFILTER]: Add H.323 conntrack/NAT helper -%patch30350 -p1 +%patch30349 -p1 # skge: use NAPI for tx cleanup. -%patch30351 -p1 +%patch30350 -p1 # skge: use auto masking of irqs -%patch30352 -p1 +%patch30351 -p1 # skge: check the allocation of ring buffer -%patch30353 -p1 +%patch30352 -p1 # skge: dma configuration cleanup -%patch30354 -p1 +%patch30353 -p1 # skge: use kcalloc -%patch30355 -p1 +%patch30354 -p1 # skge: use mmiowb -%patch30356 -p1 +%patch30355 -p1 # skge: formmating and whitespace cleanup -%patch30357 -p1 +%patch30356 -p1 # skge: handle pci errors better -%patch30358 -p1 +%patch30357 -p1 # skge: version 1.4 -%patch30359 -p1 +%patch30358 -p1 # mv643xx_eth: Cache align skb->data if CONFIG_NOT_COHERENT_CACHE -%patch30360 -p1 +%patch30359 -p1 # sky2: remove support for untested Yukon EC/rev 0 -%patch30361 -p1 +%patch30360 -p1 # sky2: drop broken wake on lan support -%patch30362 -p1 +%patch30361 -p1 # sky2: rework of NAPI and IRQ management -%patch30363 -p1 +%patch30362 -p1 # sky2: coalescing parameters -%patch30364 -p1 +%patch30363 -p1 # sky2: add MSI support -%patch30365 -p1 +%patch30364 -p1 # sky2: whitespace fixes -%patch30366 -p1 +%patch30365 -p1 # sky2: transmit recovery -%patch30367 -p1 +%patch30366 -p1 # sky2: handle all error irqs -%patch30368 -p1 +%patch30367 -p1 # sky2 version 1.1 -%patch30369 -p1 +%patch30368 -p1 # pcnet32: support boards with multiple phys -%patch30370 -p1 +%patch30369 -p1 # smc91x: allow for dynamic bus access configs -%patch30371 -p1 +%patch30370 -p1 # skfp warning fixes -%patch30372 -p1 +%patch30371 -p1 # [netdrvr] pcnet32: Lindent -%patch30373 -p1 +%patch30372 -p1 # [netdrvr] pcnet32: other source formatting cleanups -%patch30374 -p1 +%patch30373 -p1 # [ARM] 3373/1: move uengine loader to arch/arm/common -%patch30375 -p1 +%patch30374 -p1 # Fix spelling in E1000_DISABLE_PACKET_SPLIT Kconfig description -%patch30376 -p1 +%patch30375 -p1 # [BLUETOOTH]: Return negative error constant -%patch30377 -p1 +%patch30376 -p1 # [NET]: allow 32 bit socket ioctl in 64 bit kernel -%patch30378 -p1 +%patch30377 -p1 # [NET]: socket timestamp 32 bit handler for 64 bit kernel -%patch30379 -p1 +%patch30378 -p1 # [X25]: ioctl conversion 32 bit user to 64 bit kernel -%patch30380 -p1 +%patch30379 -p1 # [X25]: fix kernel error message 64 bit kernel -%patch30381 -p1 +%patch30380 -p1 # [X25]: allow ITU-T DTE facilities for x25 -%patch30382 -p1 +%patch30381 -p1 # [X25]: dte facilities 32 64 ioctl conversion -%patch30383 -p1 +%patch30382 -p1 # [TG3]: Fix SRAM access during tg3_init_one() -%patch30384 -p1 +%patch30383 -p1 # [TG3]: Skip phy power down on some devices -%patch30385 -p1 +%patch30384 -p1 # [TG3]: Bump driver version and reldate. -%patch30386 -p1 +%patch30385 -p1 # [netdrvr e100] experiment with doing RX in a similar manner to eepro100 -%patch30387 -p1 +%patch30386 -p1 # [NETFILTER]: Fix Kconfig typos -%patch30388 -p1 +%patch30387 -p1 # [NETFILTER]: ctnetlink: Fix expectaction mask dumping -%patch30389 -p1 +%patch30388 -p1 # [NETFILTER]: nfnetlink_queue: fix nfnetlink message size -%patch30390 -p1 +%patch30389 -p1 # [NETFILTER]: conntrack: cleanup the conntrack ID initialization -%patch30391 -p1 +%patch30390 -p1 # [NETFILTER]: x_tables: set the protocol family in x_tables targets/matches -%patch30392 -p1 +%patch30391 -p1 # [NETFILTER]: nf_conntrack: support for layer 3 protocol load on demand -%patch30393 -p1 +%patch30392 -p1 # [NETFILTER]: Fix xt_policy address matching -%patch30394 -p1 +%patch30393 -p1 # [NETFILTER]: futher {ip,ip6,arp}_tables unification -%patch30395 -p1 +%patch30394 -p1 # [NETFILTER]: Fix undefined references to get_h225_addr -%patch30396 -p1 +%patch30395 -p1 # fix spidernet build issue -%patch30397 -p1 +%patch30396 -p1 # AMD Au1xx0: fix Ethernet TX stats -%patch30398 -p1 +%patch30397 -p1 # sky2: more ethtool stats -%patch30399 -p1 +%patch30398 -p1 # sis900 adm7001 PHY support -%patch30400 -p1 +%patch30399 -p1 # Use after free in net/tulip/de2104x.c -%patch30401 -p1 +%patch30400 -p1 # Use of uninitialized variable in drivers/net/depca.c -%patch30402 -p1 +%patch30401 -p1 # wireless: Add softmac layer to the kernel -%patch30403 -p1 +%patch30402 -p1 # make softmac depend on IEEE80211 and EXPERIMENTAL -%patch30404 -p1 +%patch30403 -p1 # softmac: fix some sparse warnings -%patch30405 -p1 +%patch30404 -p1 # softmac: fix Makefiles -%patch30406 -p1 +%patch30405 -p1 # softmac: convert to use global workqueue -%patch30407 -p1 +%patch30406 -p1 # softmac: correctly use netif_carrier_{on,off} -%patch30408 -p1 +%patch30407 -p1 # softmac: try to reassociate when being disassociated from the AP -%patch30409 -p1 +%patch30408 -p1 # softmac: add fixme for disassoc -%patch30410 -p1 +%patch30409 -p1 # softmac: select "best" network based on rssi -%patch30411 -p1 +%patch30410 -p1 # softmac: check if disassociation is for us before processing it -%patch30412 -p1 +%patch30411 -p1 # softmac: scan at least once before selecting a network by essid -%patch30413 -p1 +%patch30412 -p1 # softmac: properly check return value of ieee80211softmac_alloc_mgt -%patch30414 -p1 +%patch30413 -p1 # softmac: some comment stuff -%patch30415 -p1 +%patch30414 -p1 # softmac: add copyright and license headers -%patch30416 -p1 +%patch30415 -p1 # softmac: add MODULE_DESCRIPTION and MODULE_AUTHORs -%patch30417 -p1 +%patch30416 -p1 # softmac: move EXPORT_SYMBOL_GPL right after functions -%patch30418 -p1 +%patch30417 -p1 # update copyright in softmac -%patch30419 -p1 +%patch30418 -p1 # trivial fixes to softmac -%patch30420 -p1 +%patch30419 -p1 # softmac: update deauth handler to quiet warning -%patch30421 -p1 +%patch30420 -p1 # softmac: add reassociation code -%patch30422 -p1 +%patch30421 -p1 # softmac: remove dead code -%patch30423 -p1 +%patch30422 -p1 # Fix softmac scan -%patch30424 -p1 +%patch30423 -p1 # [PKTGEN]: Add MPLS extension. -%patch30425 -p1 +%patch30424 -p1 # [BNX2]: Fix link change handling -%patch30426 -p1 +%patch30425 -p1 # [BNX2]: Combine small mem allocations -%patch30427 -p1 +%patch30426 -p1 # [BNX2]: Move .h files to bnx2.c -%patch30428 -p1 +%patch30427 -p1 # [BNX2]: Separate tx producer and consumer fields -%patch30429 -p1 +%patch30428 -p1 # [BNX2]: Update version and reldate -%patch30430 -p1 +%patch30429 -p1 # [IPV4]: Add fib rule netlink notifications -%patch30431 -p1 +%patch30430 -p1 # [NET_SCHED]: cls_u32: remove unnecessary NULL-ptr check -%patch30432 -p1 +%patch30431 -p1 # [IPV6]: ip6_xmit: remove unnecessary NULL ptr check -%patch30433 -p1 +%patch30432 -p1 # [TG3]: Add 5755 support -%patch30434 -p1 +%patch30433 -p1 # [TG3]: Add 5755 nvram support -%patch30435 -p1 +%patch30434 -p1 # [TG3]: Update driver version and reldate. -%patch30436 -p1 +%patch30435 -p1 # softmac: remove function_enter() -%patch30437 -p1 +%patch30436 -p1 # WE-20 for kernel 2.6.16 -%patch30438 -p1 +%patch30437 -p1 # sem2mutex: drivers: raw, connector, dcdbas, ppp_generic -%patch30439 -p1 +%patch30438 -p1 # more for_each_cpu() conversions -%patch30440 -p1 +%patch30439 -p1 # wireless/airo: clean up printk usage to print device name -%patch30441 -p1 +%patch30440 -p1 # wireless/airo: define default MTU -%patch30442 -p1 +%patch30441 -p1 # wireless/airo: cache wireless scans -%patch30443 -p1 +%patch30442 -p1 # hostap: Fix hw reset after CMDCODE_ACCESS_WRITE timeout -%patch30444 -p1 +%patch30443 -p1 # hostap: Fix ap_add_sta() return value verification -%patch30445 -p1 +%patch30444 -p1 # hostap: Fix double free in prism2_config() error path -%patch30446 -p1 +%patch30445 -p1 # hostap: Fix unlikely read overrun in CIS parsing -%patch30447 -p1 +%patch30446 -p1 # hostap: Remove dead code (duplicated idx != 0) -%patch30448 -p1 +%patch30447 -p1 # hostap: Fix memory leak on PCI probe error path -%patch30449 -p1 +%patch30448 -p1 # sky2: typo in last stats patch -%patch30450 -p1 +%patch30449 -p1 # sky2: Fix RX stats -%patch30451 -p1 +%patch30450 -p1 # sky2: dont need to use dev_kfree_skb_any -%patch30452 -p1 +%patch30451 -p1 # skge: align receive buffers -%patch30453 -p1 +%patch30452 -p1 # skge: dont use dev_alloc_skb for rx buffs -%patch30454 -p1 +%patch30453 -p1 # skge: rx_reuse called twice -%patch30455 -p1 +%patch30454 -p1 # skge: multicast statistics fix -%patch30456 -p1 +%patch30455 -p1 # skge: dont free skb until multi-part transmit complete -%patch30457 -p1 +%patch30456 -p1 # skge: compute available ring buffers -%patch30458 -p1 +%patch30457 -p1 # skge: version 1.5 -%patch30459 -p1 +%patch30458 -p1 # remove ISA legacy functions: drivers/net/hp-plus.c -%patch30460 -p1 +%patch30459 -p1 # remove ISA legacy functions: drivers/net/lance.c -%patch30461 -p1 +%patch30460 -p1 # Fix "value computed not used" warnings -%patch30462 -p1 +%patch30461 -p1 # AT91RM9200 Ethernet driver -%patch30463 -p1 +%patch30462 -p1 # net: ne2k.c won't compile if pci_clone_list is const -%patch30464 -p1 +%patch30463 -p1 # [BRIDGE]: Unaligned accesses in the ethernet bridge -%patch30465 -p1 +%patch30464 -p1 # [NET]: Fill in a 32-bit hole in struct sock on 64-bit platforms. -%patch30466 -p1 +%patch30465 -p1 # [WIRELESS]: Fix config dependencies. -%patch30467 -p1 +%patch30466 -p1 # [NET]: Take RTNL when unregistering notifier -%patch30468 -p1 +%patch30467 -p1 # [SCTP]: Fix up sctp_rcv return value -%patch30469 -p1 +%patch30468 -p1 # [TCP]: Set default max buffers from memory pool size -%patch30470 -p1 +%patch30469 -p1 # [TCP]: Mark tcp_\*mem[] __read_mostly. -%patch30471 -p1 +%patch30470 -p1 # [IPV4]: Aggregate route entries with different TOS values -%patch30472 -p1 +%patch30471 -p1 # [NETFILTER] x_table.c: sem2mutex -%patch30473 -p1 +%patch30472 -p1 # fix 'defined but not used' warning in net/rxrpc/main.c::rxrpc_initialise -%patch30474 -p1 +%patch30473 -p1 # hp300: fix driver_register() return handling, remove dio_module_init() -%patch30475 -p1 +%patch30474 -p1 # EISA: tidy-up driver_register() return value -%patch30476 -p1 +%patch30475 -p1 # amiga: fix driver_register() return handling, remove zorro_module_init() -%patch30477 -p1 +%patch30476 -p1 # POLLRDHUP/EPOLLRDHUP handling for half-closed devices notifications -%patch30478 -p1 +%patch30477 -p1 # 3c59x: use mii_check_media -%patch30479 -p1 +%patch30478 -p1 # 3c59x: decrease polling interval -%patch30480 -p1 +%patch30479 -p1 # 3c59x: carriercheck for forced media -%patch30481 -p1 +%patch30480 -p1 # 3c59x: use ethtool_op_get_link -%patch30482 -p1 +%patch30481 -p1 # 3c59x: remove per-driver versioning -%patch30483 -p1 +%patch30482 -p1 # 3c59x: minor cleanups -%patch30484 -p1 +%patch30483 -p1 # more s/fucn/func/ typo fixes -%patch30485 -p1 +%patch30484 -p1 # [IPSEC]: Fix tunnel error handling in ipcomp6 -%patch30486 -p1 +%patch30485 -p1 # [NET]: drop duplicate assignment in request_sock -%patch30487 -p1 +%patch30486 -p1 # wireless: import bcm43xx sources -%patch30488 -p1 +%patch30487 -p1 # bcm43xx: patch Kconfig and wireless/Makefile for import -%patch30489 -p1 +%patch30488 -p1 # bcm43xx: sync with svn.berlios.de -%patch30490 -p1 +%patch30489 -p1 # bcm43xx: remove linux version compatibility code. -%patch30491 -p1 +%patch30490 -p1 # bcm43xx: add DEBUG Kconfig option. Also fix indention. -%patch30492 -p1 +%patch30491 -p1 # bcm43xx: Fix makefile. Remove all the "out-of-tree" stuff. -%patch30493 -p1 +%patch30492 -p1 # bcm43xx: Add more initvals sanity checks and error out, if one sanity check fails. -%patch30494 -p1 +%patch30493 -p1 # bcm43xx: Remove function bcm43xx_channel_is_allowed() -%patch30495 -p1 +%patch30494 -p1 # bcm43xx: basic ethtool support -%patch30496 -p1 +%patch30495 -p1 # bcm43xx: Wireless Ext update -%patch30497 -p1 +%patch30496 -p1 # Sync bcm43xx_phy_initb6() with specs -%patch30498 -p1 +%patch30497 -p1 # bcm43xx: fix txpower reporting in WE. -%patch30499 -p1 +%patch30498 -p1 # bcm43xx: enable SPROM writing. -%patch30500 -p1 +%patch30499 -p1 # bcm43xx: heavily increase mac_suspend timeout. -%patch30501 -p1 +%patch30500 -p1 # bcm43xx: fix compiletime warning (phy_xmitpower) -%patch30502 -p1 +%patch30501 -p1 # bcm43xx: remove WX debugging. -%patch30503 -p1 +%patch30502 -p1 # bcm43xx: Partially fix PIO code. Add Kconfig option for PIO or DMA mode (or both). -%patch30504 -p1 +%patch30503 -p1 # bcm43xx: add a note that not all devices support PIO. -%patch30505 -p1 +%patch30504 -p1 # Apple Airport: Add Kconfig note that the bcm43xx driver has to be used for Airport Extreme cards. -%patch30506 -p1 +%patch30505 -p1 # bcm43xx: fix LED code. -%patch30507 -p1 +%patch30506 -p1 # bcm43xx: rewrite and simplify the periodic task handling. -%patch30508 -p1 +%patch30507 -p1 # bcm43xx: Code cleanups. This removes various "inline" statements and reduces codesize. -%patch30509 -p1 +%patch30508 -p1 # bcm43xx: Move sprom lowlevel reading/writing to its own functions. -%patch30510 -p1 +%patch30509 -p1 # bcm43xx: make bcm43xx_sprom_crc() static. -%patch30511 -p1 +%patch30510 -p1 # bcm43xx: split the channel helper functions, so that they can be used without a valid running core. -%patch30512 -p1 +%patch30511 -p1 # bcm43xx: remove old unused struct. -%patch30513 -p1 +%patch30512 -p1 # bcm43xx: Fix Kconfig typo (transfer mode default) -%patch30514 -p1 +%patch30513 -p1 # bcm43xx: Workaround init_board vs IRQ race. -%patch30515 -p1 +%patch30514 -p1 # bcm43xx: move initialized = 1 to the end of init_board. -%patch30516 -p1 +%patch30515 -p1 # bcm43xx: add assert(bcm->initialized) to periodic_tasks_setup(). -%patch30517 -p1 +%patch30516 -p1 # bcm43xx: Move TX/RX related functions to its own file. Add basic RTS/CTS code. -%patch30518 -p1 +%patch30517 -p1 # bcm43xx: Add sysfs attributes for device specific tunables. -%patch30519 -p1 +%patch30518 -p1 # bcm43xx: fix DMA TX skb freeing in case of fragmented packets. -%patch30520 -p1 +%patch30519 -p1 # bcm43xx: Set both, the DMAmask and the coherent DMAmask. -%patch30521 -p1 +%patch30520 -p1 # bcm43xx: Abstract the locking mechanism. -%patch30522 -p1 +%patch30521 -p1 # bcm43xx: Remove the mmio access printing facility overhead. -%patch30523 -p1 +%patch30522 -p1 # bcm43xx: fix some stuff, add a few missing mmiowb(), remove dead code. -%patch30524 -p1 +%patch30523 -p1 # bcm43xx: receive TX status on MMIO or DMA unconditionally regarding the 80211 core rev. -%patch30525 -p1 +%patch30524 -p1 # bcm43xx: add functions bcm43xx_dma_read/write, bcm43xx_dma_tx_suspend/resume. -%patch30526 -p1 +%patch30525 -p1 # bcm43xx: reduce the size of bcm43xx_private by removing unneeded members. -%patch30527 -p1 +%patch30526 -p1 # bcm43xx: Fix crash on ifdown, by being careful in pio/dma freeing. -%patch30528 -p1 +%patch30527 -p1 # bcm43xx: Remove the workaround in dummy_transmission, -%patch30529 -p1 +%patch30528 -p1 # bcm43xx: Do boardflags workarounds for specific boards. -%patch30530 -p1 +%patch30529 -p1 # bcm43xx: properly mask txctl1 before writing it to hardware. -%patch30531 -p1 +%patch30530 -p1 # bcm43xx: remove check for mmio length, as it differs among platforms. (especially embedded) -%patch30532 -p1 +%patch30531 -p1 # bcm43xx: fix some gpio register trashing (hopefully :D) -%patch30533 -p1 +%patch30532 -p1 # bcm43xx: merge all iwmode code into the set_iwmode function. -%patch30534 -p1 +%patch30533 -p1 # bcm43xx: some IRQ handler cleanups. -%patch30535 -p1 +%patch30534 -p1 # bcm43xx: set default attenuation values. -%patch30536 -p1 +%patch30535 -p1 # bcm43xx: sync interference mitigation code to the specs. -%patch30537 -p1 +%patch30536 -p1 # bcm43xx: fix nrssi_threshold calculation. -%patch30538 -p1 +%patch30537 -p1 # bcm43xx: add useless and broken statistics stuff. People seem to want it. well... -%patch30539 -p1 +%patch30538 -p1 # bcm43xx: get rid of "/\* vim: ..." lines at the end of several files. -%patch30540 -p1 +%patch30539 -p1 # bcm43xx: fix "include" issues on some platforms. -%patch30541 -p1 +%patch30540 -p1 # bcm43xx: remove some compilerwarnings. -%patch30542 -p1 +%patch30541 -p1 # bcm43xx: fix the remaining sparse warnings. -%patch30543 -p1 +%patch30542 -p1 # bcm43xx: sync GPHY init with the specs. -%patch30544 -p1 +%patch30543 -p1 # bcm43xx: don't set the channel on a device, which is down. -%patch30545 -p1 +%patch30544 -p1 # PCMCIA_SPECTRUM must select FW_LOADER -%patch30546 -p1 +%patch30545 -p1 # hostap: Make hostap_tx_encrypt() static -%patch30547 -p1 +%patch30546 -p1 # hostap: Fix EAPOL frame encryption -%patch30548 -p1 +%patch30547 -p1 # knfsd: Change the store of auth_domains to not be a 'cache' -%patch30549 -p1 +%patch30548 -p1 # knfsd: Get rid of 'inplace' sunrpc caches -%patch30550 -p1 +%patch30549 -p1 # knfsd: Create cache_lookup function instead of using a macro to declare one -%patch30551 -p1 +%patch30550 -p1 # knfsd: Convert ip_map cache to use the new lookup routine -%patch30552 -p1 +%patch30551 -p1 # knfsd: Use new sunrpc cache for rsi cache -%patch30553 -p1 +%patch30552 -p1 # knfsd: Use new cache code for rsc cache -%patch30554 -p1 +%patch30553 -p1 # knfsd: An assortment of little fixes to the sunrpc cache code -%patch30555 -p1 +%patch30554 -p1 # knfsd: Unexport cache_fresh and fix a small race -%patch30556 -p1 +%patch30555 -p1 # knfsd: Tidy up unix_domain_find -%patch30557 -p1 +%patch30556 -p1 # pnp: IRDA: adjust pnp_register_driver signature -%patch30558 -p1 +%patch30557 -p1 # Minor (janitorial) change to ieee80211 -%patch30559 -p1 +%patch30558 -p1 # wireless: add prism54usb driver -%patch30560 -p1 +%patch30559 -p1 # prism54usb: fix build break in islusb_init.c -%patch30561 -p1 +%patch30560 -p1 # wireless: add acx driver -%patch30562 -p1 +%patch30561 -p1 # acxsm: merge from acx 0.3.32 -%patch30563 -p1 +%patch30562 -p1 # tiacx: Let only ACX_PCI/ACX_USB be user-visible -%patch30564 -p1 +%patch30563 -p1 # softmac: prism54usb update -%patch30565 -p1 +%patch30564 -p1 # tiacx: revert "neither PCI nor USB is selected" change -%patch30566 -p1 +%patch30565 -p1 # tiacx: implement much more flexible firmware statistics parsing -%patch30567 -p1 +%patch30566 -p1 # tiacx: Change acx_ioctl_{get,set}_encode to use kernel 80211 stack -%patch30568 -p1 +%patch30567 -p1 # tiacx: fix breakage of "Get rid of circular list of adev's" -%patch30569 -p1 +%patch30568 -p1 # tiacx: split module into acx-common + acx-pci + acx-usb -%patch30570 -p1 +%patch30569 -p1 # softmac: reduce scan dwell time -%patch30571 -p1 +%patch30570 -p1 # softmac: reduce default rate to 11Mbps. -%patch30572 -p1 +%patch30571 -p1 # update prism54usb sources -%patch30573 -p1 +%patch30572 -p1 # [TG3]: Fix probe failure due to invalid MAC address -%patch30574 -p1 +%patch30573 -p1 # [TG3]: Fix bug in 40-bit DMA workaround code -%patch30575 -p1 +%patch30574 -p1 # [TG3]: Fix PHY loopback on 5700 -%patch30576 -p1 +%patch30575 -p1 # [TG3]: Speed up SRAM access -%patch30577 -p1 +%patch30576 -p1 # [TG3]: Skip timer code during full lock -%patch30578 -p1 +%patch30577 -p1 # [TG3]: Update version and reldate -%patch30579 -p1 +%patch30578 -p1 # [NET]: Fix ipx/econet/appletalk/irda ioctl crashes -%patch30580 -p1 +%patch30579 -p1 # [ECONET]: Convert away from SOCKOPS_WRAPPED -%patch30581 -p1 +%patch30580 -p1 # [NET]: deinline 200+ byte inlines in sock.h -%patch30582 -p1 +%patch30581 -p1 # END OF PATCH APPLICATIONS @@ -3717,7 +3714,6 @@ - [IPV4] ARP: Alloc acceptance of unsolicited ARP via netdevice sysctl. - [TCP]: sysctl to allow TCP window > 32767 sans wscale - [XFRM]: Fix aevent related crash -- [SECURITY]: TCP/UDP getpeersec - [DECnet]: Endian annotation and fixes for DECnet. - [DECnet]: Patch to fix recvmsg() flag check - [DECnet]: Use RCU locking in dn_rules.c --- 1473-SECURITY-TCP-UDP-getpeersec.txt DELETED --- From fedora-cvs-commits at redhat.com Wed Mar 29 04:06:21 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 28 Mar 2006 23:06:21 -0500 Subject: rpms/policycoreutils/devel policycoreutils-rhat.patch, 1.177, 1.178 policycoreutils.spec, 1.251, 1.252 Message-ID: <200603290406.k2T46LhL030753@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/policycoreutils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv30738 Modified Files: policycoreutils-rhat.patch policycoreutils.spec Log Message: * Tue Mar 21 2006 Dan Walsh 1.30.1-3 - Add IN_MOVED_TO to catch renames policycoreutils-rhat.patch: Makefile | 2 audit2allow/audit2allow | 16 - restorecond/Makefile | 29 ++ restorecond/restorecond.8 | 31 ++ restorecond/restorecond.c | 451 +++++++++++++++++++++++++++++++++++++++++++ restorecond/restorecond.conf | 4 restorecond/restorecond.h | 31 ++ restorecond/restorecond.init | 61 +++++ restorecond/stringslist.c | 118 +++++++++++ restorecond/stringslist.h | 37 +++ restorecond/utmpwatcher.c | 105 ++++++++++ restorecond/utmpwatcher.h | 29 ++ scripts/fixfiles | 10 13 files changed, 913 insertions(+), 11 deletions(-) Index: policycoreutils-rhat.patch =================================================================== RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v retrieving revision 1.177 retrieving revision 1.178 diff -u -r1.177 -r1.178 --- policycoreutils-rhat.patch 21 Mar 2006 16:17:21 -0000 1.177 +++ policycoreutils-rhat.patch 29 Mar 2006 04:06:16 -0000 1.178 @@ -507,7 +507,7 @@ + ptr=calloc(1, sizeof(struct watchList)); + + if (!ptr) exitApp("Out of Memory"); -+ ptr->wd=inotify_add_watch (fd, dir, IN_CREATE); ++ ptr->wd=inotify_add_watch (fd, dir, IN_CREATE | IN_MOVED_TO ); + + ptr->dir=strdup(dir); + if (!ptr->dir) exitApp("Out of Memory"); Index: policycoreutils.spec =================================================================== RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils.spec,v retrieving revision 1.251 retrieving revision 1.252 diff -u -r1.251 -r1.252 --- policycoreutils.spec 21 Mar 2006 16:17:21 -0000 1.251 +++ policycoreutils.spec 29 Mar 2006 04:06:17 -0000 1.252 @@ -5,7 +5,7 @@ Summary: SELinux policy core utilities. Name: policycoreutils Version: 1.30.1 -Release: 2 +Release: 3 License: GPL Group: System Environment/Base Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz @@ -107,6 +107,9 @@ service restorecond condrestart %changelog +* Tue Mar 21 2006 Dan Walsh 1.30.1-3 +- Add IN_MOVED_TO to catch renames + * Tue Mar 21 2006 Dan Walsh 1.30.1-2 - make restorecond only ignore non directories with lnk > 1 From fedora-cvs-commits at redhat.com Wed Mar 29 05:01:45 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 29 Mar 2006 00:01:45 -0500 Subject: rpms/policycoreutils/FC-5 policycoreutils-rhat.patch, 1.168, 1.169 policycoreutils.spec, 1.242, 1.243 Message-ID: <200603290501.k2T51jf6026146@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/policycoreutils/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv26087 Modified Files: policycoreutils-rhat.patch policycoreutils.spec Log Message: * Tue Mar 21 2006 Dan Walsh 1.30.1-3.fc5 - Add IN_MOVED_TO to catch renames policycoreutils-rhat.patch: Makefile | 2 audit2allow/audit2allow | 16 - restorecond/Makefile | 29 ++ restorecond/restorecond.8 | 31 ++ restorecond/restorecond.c | 451 +++++++++++++++++++++++++++++++++++++++++++ restorecond/restorecond.conf | 4 restorecond/restorecond.h | 31 ++ restorecond/restorecond.init | 61 +++++ restorecond/stringslist.c | 118 +++++++++++ restorecond/stringslist.h | 37 +++ restorecond/utmpwatcher.c | 105 ++++++++++ restorecond/utmpwatcher.h | 29 ++ scripts/fixfiles | 10 13 files changed, 913 insertions(+), 11 deletions(-) Index: policycoreutils-rhat.patch =================================================================== RCS file: /cvs/dist/rpms/policycoreutils/FC-5/policycoreutils-rhat.patch,v retrieving revision 1.168 retrieving revision 1.169 diff -u -r1.168 -r1.169 --- policycoreutils-rhat.patch 22 Mar 2006 16:44:10 -0000 1.168 +++ policycoreutils-rhat.patch 29 Mar 2006 05:01:18 -0000 1.169 @@ -507,7 +507,7 @@ + ptr=calloc(1, sizeof(struct watchList)); + + if (!ptr) exitApp("Out of Memory"); -+ ptr->wd=inotify_add_watch (fd, dir, IN_CREATE); ++ ptr->wd=inotify_add_watch (fd, dir, IN_CREATE | IN_MOVED_TO ); + + ptr->dir=strdup(dir); + if (!ptr->dir) exitApp("Out of Memory"); Index: policycoreutils.spec =================================================================== RCS file: /cvs/dist/rpms/policycoreutils/FC-5/policycoreutils.spec,v retrieving revision 1.242 retrieving revision 1.243 diff -u -r1.242 -r1.243 --- policycoreutils.spec 22 Mar 2006 16:44:10 -0000 1.242 +++ policycoreutils.spec 29 Mar 2006 05:01:42 -0000 1.243 @@ -5,7 +5,7 @@ Summary: SELinux policy core utilities. Name: policycoreutils Version: 1.30.1 -Release: 2.fc5 +Release: 3.fc5 License: GPL Group: System Environment/Base Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz @@ -107,6 +107,9 @@ service restorecond condrestart %changelog +* Tue Mar 21 2006 Dan Walsh 1.30.1-3.fc5 +- Add IN_MOVED_TO to catch renames + * Wed Mar 21 2006 Dan Walsh 1.30.1-2.fc5 - Bump to build in FC5 From fedora-cvs-commits at redhat.com Wed Mar 29 05:52:41 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 29 Mar 2006 00:52:41 -0500 Subject: rpms/kernel/FC-5 linux-2.6-x86-smp-alternatives.patch, NONE, 1.1 kernel-2.6.spec, 1.2080, 1.2081 Message-ID: <200603290552.k2T5qfAF021377@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv21362 Modified Files: kernel-2.6.spec Added Files: linux-2.6-x86-smp-alternatives.patch Log Message: add (but dont apply yet) SMP alternatives linux-2.6-x86-smp-alternatives.patch: arch/i386/kernel/Makefile | 2 arch/i386/kernel/alternative.c | 321 +++++++++++++++++++++++++++++++++++++++++ arch/i386/kernel/cpu/proc.c | 2 arch/i386/kernel/module.c | 32 ++-- arch/i386/kernel/semaphore.c | 8 - arch/i386/kernel/setup.c | 95 ------------ arch/i386/kernel/smpboot.c | 3 arch/i386/kernel/vmlinux.lds.S | 20 ++ arch/um/kernel/um_arch.c | 12 + include/asm-i386/alternative.h | 129 ++++++++++++++++ include/asm-i386/atomic.h | 28 +-- include/asm-i386/bitops.h | 7 include/asm-i386/cpufeature.h | 1 include/asm-i386/mutex.h | 6 include/asm-i386/rwlock.h | 56 +++---- include/asm-i386/semaphore.h | 8 - include/asm-i386/spinlock.h | 21 +- include/asm-i386/system.h | 62 ------- include/asm-um/alternative.h | 6 19 files changed, 583 insertions(+), 236 deletions(-) --- NEW FILE linux-2.6-x86-smp-alternatives.patch --- commit 9a0b5817ad97bb718ab85322759d19a238712b47 tree 39bd21eb69c4001b99096d96a76a2e5d37904108 parent 4d7d8c82c181711d28c8336108330a9121f5ef07 author Gerd Hoffmann Thu, 23 Mar 2006 18:59:32 -0800 committer Linus Torvalds Thu, 23 Mar 2006 23:38:04 -0800 [PATCH] x86: SMP alternatives Implement SMP alternatives, i.e. switching at runtime between different code versions for UP and SMP. The code can patch both SMP->UP and UP->SMP. The UP->SMP case is useful for CPU hotplug. With CONFIG_CPU_HOTPLUG enabled the code switches to UP at boot time and when the number of CPUs goes down to 1, and switches to SMP when the number of CPUs goes up to 2. Without CONFIG_CPU_HOTPLUG or on non-SMP-capable systems the code is patched once at boot time (if needed) and the tables are released afterwards. The changes in detail: * The current alternatives bits are moved to a separate file, the SMP alternatives code is added there. * The patch adds some new elf sections to the kernel: .smp_altinstructions like .altinstructions, also contains a list of alt_instr structs. .smp_altinstr_replacement like .altinstr_replacement, but also has some space to save original instruction before replaving it. .smp_locks list of pointers to lock prefixes which can be nop'ed out on UP. The first two are used to replace more complex instruction sequences such as spinlocks and semaphores. It would be possible to deal with the lock prefixes with that as well, but by handling them as special case the table sizes become much smaller. * The sections are page-aligned and padded up to page size, so they can be free if they are not needed. * Splitted the code to release init pages to a separate function and use it to release the elf sections if they are unused. Signed-off-by: Gerd Hoffmann Signed-off-by: Chuck Ebbert <76306.1226 at compuserve.com> Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds arch/i386/kernel/Makefile | 2 arch/i386/kernel/alternative.c | 321 +++++++++++++++++++++++++++++++++++++++++ arch/i386/kernel/cpu/proc.c | 2 arch/i386/kernel/module.c | 32 ++-- arch/i386/kernel/semaphore.c | 8 - arch/i386/kernel/setup.c | 95 ------------ arch/i386/kernel/smpboot.c | 3 arch/i386/kernel/vmlinux.lds.S | 20 ++ arch/i386/mm/init.c | 45 ++--- arch/um/kernel/um_arch.c | 12 + include/asm-i386/alternative.h | 129 ++++++++++++++++ include/asm-i386/atomic.h | 28 +-- include/asm-i386/bitops.h | 7 include/asm-i386/cpufeature.h | 1 include/asm-i386/mutex.h | 6 include/asm-i386/rwlock.h | 56 +++---- include/asm-i386/semaphore.h | 8 - include/asm-i386/spinlock.h | 21 +- include/asm-i386/system.h | 62 ------- include/asm-um/alternative.h | 6 20 files changed, 605 insertions(+), 259 deletions(-) diff --git a/arch/i386/kernel/Makefile b/arch/i386/kernel/Makefile index 65656c0..5b9ed21 100644 --- a/arch/i386/kernel/Makefile +++ b/arch/i386/kernel/Makefile @@ -7,7 +7,7 @@ extra-y := head.o init_task.o vmlinux.ld obj-y := process.o semaphore.o signal.o entry.o traps.o irq.o \ ptrace.o time.o ioport.o ldt.o setup.o i8259.o sys_i386.o \ pci-dma.o i386_ksyms.o i387.o dmi_scan.o bootflag.o \ - quirks.o i8237.o topology.o + quirks.o i8237.o topology.o alternative.o obj-y += cpu/ obj-y += timers/ diff --git a/arch/i386/kernel/alternative.c b/arch/i386/kernel/alternative.c new file mode 100644 index 0000000..5cbd6f9 --- /dev/null +++ b/arch/i386/kernel/alternative.c @@ -0,0 +1,321 @@ +#include +#include +#include +#include +#include + +#define DEBUG 0 +#if DEBUG +# define DPRINTK(fmt, args...) printk(fmt, args) +#else +# define DPRINTK(fmt, args...) +#endif + +/* Use inline assembly to define this because the nops are defined + as inline assembly strings in the include files and we cannot + get them easily into strings. */ +asm("\t.data\nintelnops: " + GENERIC_NOP1 GENERIC_NOP2 GENERIC_NOP3 GENERIC_NOP4 GENERIC_NOP5 GENERIC_NOP6 + GENERIC_NOP7 GENERIC_NOP8); +asm("\t.data\nk8nops: " + K8_NOP1 K8_NOP2 K8_NOP3 K8_NOP4 K8_NOP5 K8_NOP6 + K8_NOP7 K8_NOP8); +asm("\t.data\nk7nops: " + K7_NOP1 K7_NOP2 K7_NOP3 K7_NOP4 K7_NOP5 K7_NOP6 + K7_NOP7 K7_NOP8); + +extern unsigned char intelnops[], k8nops[], k7nops[]; +static unsigned char *intel_nops[ASM_NOP_MAX+1] = { + NULL, + intelnops, + intelnops + 1, + intelnops + 1 + 2, + intelnops + 1 + 2 + 3, + intelnops + 1 + 2 + 3 + 4, + intelnops + 1 + 2 + 3 + 4 + 5, + intelnops + 1 + 2 + 3 + 4 + 5 + 6, + intelnops + 1 + 2 + 3 + 4 + 5 + 6 + 7, +}; +static unsigned char *k8_nops[ASM_NOP_MAX+1] = { + NULL, + k8nops, + k8nops + 1, + k8nops + 1 + 2, + k8nops + 1 + 2 + 3, + k8nops + 1 + 2 + 3 + 4, + k8nops + 1 + 2 + 3 + 4 + 5, + k8nops + 1 + 2 + 3 + 4 + 5 + 6, + k8nops + 1 + 2 + 3 + 4 + 5 + 6 + 7, +}; +static unsigned char *k7_nops[ASM_NOP_MAX+1] = { + NULL, + k7nops, + k7nops + 1, + k7nops + 1 + 2, + k7nops + 1 + 2 + 3, + k7nops + 1 + 2 + 3 + 4, + k7nops + 1 + 2 + 3 + 4 + 5, + k7nops + 1 + 2 + 3 + 4 + 5 + 6, + k7nops + 1 + 2 + 3 + 4 + 5 + 6 + 7, +}; +static struct nop { + int cpuid; + unsigned char **noptable; +} noptypes[] = { + { X86_FEATURE_K8, k8_nops }, + { X86_FEATURE_K7, k7_nops }, + { -1, NULL } +}; + + +extern struct alt_instr __alt_instructions[], __alt_instructions_end[]; +extern struct alt_instr __smp_alt_instructions[], __smp_alt_instructions_end[]; +extern u8 *__smp_locks[], *__smp_locks_end[]; + +extern u8 __smp_alt_begin[], __smp_alt_end[]; + + +static unsigned char** find_nop_table(void) +{ + unsigned char **noptable = intel_nops; + int i; + + for (i = 0; noptypes[i].cpuid >= 0; i++) { + if (boot_cpu_has(noptypes[i].cpuid)) { + noptable = noptypes[i].noptable; + break; + } + } + return noptable; +} + +/* Replace instructions with better alternatives for this CPU type. + This runs before SMP is initialized to avoid SMP problems with + self modifying code. This implies that assymetric systems where + APs have less capabilities than the boot processor are not handled. + Tough. Make sure you disable such features by hand. */ + +void apply_alternatives(struct alt_instr *start, struct alt_instr *end) +{ + unsigned char **noptable = find_nop_table(); + struct alt_instr *a; + int diff, i, k; + + DPRINTK("%s: alt table %p -> %p\n", __FUNCTION__, start, end); + for (a = start; a < end; a++) { + BUG_ON(a->replacementlen > a->instrlen); + if (!boot_cpu_has(a->cpuid)) + continue; + memcpy(a->instr, a->replacement, a->replacementlen); + diff = a->instrlen - a->replacementlen; + /* Pad the rest with nops */ + for (i = a->replacementlen; diff > 0; diff -= k, i += k) { + k = diff; + if (k > ASM_NOP_MAX) + k = ASM_NOP_MAX; + memcpy(a->instr + i, noptable[k], k); + } + } +} + +static void alternatives_smp_save(struct alt_instr *start, struct alt_instr *end) +{ + struct alt_instr *a; + + DPRINTK("%s: alt table %p-%p\n", __FUNCTION__, start, end); + for (a = start; a < end; a++) { + memcpy(a->replacement + a->replacementlen, + a->instr, + a->instrlen); + } +} + +static void alternatives_smp_apply(struct alt_instr *start, struct alt_instr *end) +{ + struct alt_instr *a; + + for (a = start; a < end; a++) { + memcpy(a->instr, + a->replacement + a->replacementlen, + a->instrlen); + } +} + +static void alternatives_smp_lock(u8 **start, u8 **end, u8 *text, u8 *text_end) +{ + u8 **ptr; + + for (ptr = start; ptr < end; ptr++) { + if (*ptr < text) + continue; + if (*ptr > text_end) + continue; + **ptr = 0xf0; /* lock prefix */ + }; +} + +static void alternatives_smp_unlock(u8 **start, u8 **end, u8 *text, u8 *text_end) +{ + unsigned char **noptable = find_nop_table(); + u8 **ptr; + + for (ptr = start; ptr < end; ptr++) { + if (*ptr < text) + continue; + if (*ptr > text_end) + continue; + **ptr = noptable[1][0]; + }; +} + +struct smp_alt_module { + /* what is this ??? */ + struct module *mod; + char *name; + + /* ptrs to lock prefixes */ + u8 **locks; + u8 **locks_end; + + /* .text segment, needed to avoid patching init code ;) */ + u8 *text; + u8 *text_end; + + struct list_head next; +}; +static LIST_HEAD(smp_alt_modules); +static DEFINE_SPINLOCK(smp_alt); + +static int smp_alt_once = 0; +static int __init bootonly(char *str) +{ + smp_alt_once = 1; + return 1; +} +__setup("smp-alt-boot", bootonly); + +void alternatives_smp_module_add(struct module *mod, char *name, + void *locks, void *locks_end, + void *text, void *text_end) +{ + struct smp_alt_module *smp; + unsigned long flags; + + if (smp_alt_once) { + if (boot_cpu_has(X86_FEATURE_UP)) + alternatives_smp_unlock(locks, locks_end, + text, text_end); + return; + } + + smp = kzalloc(sizeof(*smp), GFP_KERNEL); + if (NULL == smp) + return; /* we'll run the (safe but slow) SMP code then ... */ + + smp->mod = mod; + smp->name = name; + smp->locks = locks; + smp->locks_end = locks_end; + smp->text = text; + smp->text_end = text_end; + DPRINTK("%s: locks %p -> %p, text %p -> %p, name %s\n", + __FUNCTION__, smp->locks, smp->locks_end, + smp->text, smp->text_end, smp->name); + + spin_lock_irqsave(&smp_alt, flags); + list_add_tail(&smp->next, &smp_alt_modules); + if (boot_cpu_has(X86_FEATURE_UP)) + alternatives_smp_unlock(smp->locks, smp->locks_end, + smp->text, smp->text_end); + spin_unlock_irqrestore(&smp_alt, flags); +} + +void alternatives_smp_module_del(struct module *mod) +{ + struct smp_alt_module *item; + unsigned long flags; + + if (smp_alt_once) + return; + + spin_lock_irqsave(&smp_alt, flags); + list_for_each_entry(item, &smp_alt_modules, next) { + if (mod != item->mod) + continue; + list_del(&item->next); + spin_unlock_irqrestore(&smp_alt, flags); + DPRINTK("%s: %s\n", __FUNCTION__, item->name); + kfree(item); + return; + } + spin_unlock_irqrestore(&smp_alt, flags); +} + +void alternatives_smp_switch(int smp) +{ + struct smp_alt_module *mod; + unsigned long flags; + + if (smp_alt_once) + return; + BUG_ON(!smp && (num_online_cpus() > 1)); + + spin_lock_irqsave(&smp_alt, flags); + if (smp) { + printk(KERN_INFO "SMP alternatives: switching to SMP code\n"); + clear_bit(X86_FEATURE_UP, boot_cpu_data.x86_capability); + clear_bit(X86_FEATURE_UP, cpu_data[0].x86_capability); + alternatives_smp_apply(__smp_alt_instructions, + __smp_alt_instructions_end); + list_for_each_entry(mod, &smp_alt_modules, next) + alternatives_smp_lock(mod->locks, mod->locks_end, + mod->text, mod->text_end); + } else { + printk(KERN_INFO "SMP alternatives: switching to UP code\n"); + set_bit(X86_FEATURE_UP, boot_cpu_data.x86_capability); + set_bit(X86_FEATURE_UP, cpu_data[0].x86_capability); + apply_alternatives(__smp_alt_instructions, + __smp_alt_instructions_end); + list_for_each_entry(mod, &smp_alt_modules, next) + alternatives_smp_unlock(mod->locks, mod->locks_end, + mod->text, mod->text_end); + } + spin_unlock_irqrestore(&smp_alt, flags); +} + +void __init alternative_instructions(void) +{ + apply_alternatives(__alt_instructions, __alt_instructions_end); + + /* switch to patch-once-at-boottime-only mode and free the + * tables in case we know the number of CPUs will never ever + * change */ +#ifdef CONFIG_HOTPLUG_CPU + if (num_possible_cpus() < 2) + smp_alt_once = 1; +#else + smp_alt_once = 1; +#endif + + if (smp_alt_once) { + if (1 == num_possible_cpus()) { + printk(KERN_INFO "SMP alternatives: switching to UP code\n"); + set_bit(X86_FEATURE_UP, boot_cpu_data.x86_capability); + set_bit(X86_FEATURE_UP, cpu_data[0].x86_capability); + apply_alternatives(__smp_alt_instructions, + __smp_alt_instructions_end); + alternatives_smp_unlock(__smp_locks, __smp_locks_end, + _text, _etext); + } + free_init_pages("SMP alternatives", + (unsigned long)__smp_alt_begin, + (unsigned long)__smp_alt_end); + } else { + alternatives_smp_save(__smp_alt_instructions, + __smp_alt_instructions_end); + alternatives_smp_module_add(NULL, "core kernel", + __smp_locks, __smp_locks_end, + _text, _etext); + alternatives_smp_switch(0); + } +} diff --git a/arch/i386/kernel/cpu/proc.c b/arch/i386/kernel/cpu/proc.c index 89a85af..5cfbd80 100644 --- a/arch/i386/kernel/cpu/proc.c +++ b/arch/i386/kernel/cpu/proc.c @@ -40,7 +40,7 @@ static int show_cpuinfo(struct seq_file /* Other (Linux-defined) */ "cxmmx", "k6_mtrr", "cyrix_arr", "centaur_mcr", NULL, NULL, NULL, NULL, - "constant_tsc", NULL, NULL, NULL, NULL, NULL, NULL, NULL, + "constant_tsc", "up", NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, diff --git a/arch/i386/kernel/module.c b/arch/i386/kernel/module.c index 5149c8a..470cf97 100644 --- a/arch/i386/kernel/module.c +++ b/arch/i386/kernel/module.c @@ -104,26 +104,38 @@ int apply_relocate_add(Elf32_Shdr *sechd return -ENOEXEC; } -extern void apply_alternatives(void *start, void *end); - int module_finalize(const Elf_Ehdr *hdr, const Elf_Shdr *sechdrs, struct module *me) { - const Elf_Shdr *s; + const Elf_Shdr *s, *text = NULL, *alt = NULL, *locks = NULL; char *secstrings = (void *)hdr + sechdrs[hdr->e_shstrndx].sh_offset; - /* look for .altinstructions to patch */ for (s = sechdrs; s < sechdrs + hdr->e_shnum; s++) { - void *seg; - if (strcmp(".altinstructions", secstrings + s->sh_name)) - continue; - seg = (void *)s->sh_addr; - apply_alternatives(seg, seg + s->sh_size); - } + if (!strcmp(".text", secstrings + s->sh_name)) + text = s; + if (!strcmp(".altinstructions", secstrings + s->sh_name)) + alt = s; + if (!strcmp(".smp_locks", secstrings + s->sh_name)) + locks= s; + } + + if (alt) { + /* patch .altinstructions */ + void *aseg = (void *)alt->sh_addr; + apply_alternatives(aseg, aseg + alt->sh_size); + } + if (locks && text) { + void *lseg = (void *)locks->sh_addr; + void *tseg = (void *)text->sh_addr; + alternatives_smp_module_add(me, me->name, + lseg, lseg + locks->sh_size, + tseg, tseg + text->sh_size); + } return 0; } void module_arch_cleanup(struct module *mod) { + alternatives_smp_module_del(mod); } diff --git a/arch/i386/kernel/semaphore.c b/arch/i386/kernel/semaphore.c index 7455ab6..967dc74 100644 --- a/arch/i386/kernel/semaphore.c +++ b/arch/i386/kernel/semaphore.c @@ -110,11 +110,11 @@ asm( ".align 4\n" ".globl __write_lock_failed\n" "__write_lock_failed:\n\t" - LOCK "addl $" RW_LOCK_BIAS_STR ",(%eax)\n" + LOCK_PREFIX "addl $" RW_LOCK_BIAS_STR ",(%eax)\n" "1: rep; nop\n\t" "cmpl $" RW_LOCK_BIAS_STR ",(%eax)\n\t" "jne 1b\n\t" - LOCK "subl $" RW_LOCK_BIAS_STR ",(%eax)\n\t" + LOCK_PREFIX "subl $" RW_LOCK_BIAS_STR ",(%eax)\n\t" "jnz __write_lock_failed\n\t" "ret" ); @@ -124,11 +124,11 @@ asm( ".align 4\n" ".globl __read_lock_failed\n" "__read_lock_failed:\n\t" - LOCK "incl (%eax)\n" + LOCK_PREFIX "incl (%eax)\n" "1: rep; nop\n\t" "cmpl $1,(%eax)\n\t" "js 1b\n\t" - LOCK "decl (%eax)\n\t" + LOCK_PREFIX "decl (%eax)\n\t" "js __read_lock_failed\n\t" "ret" ); diff --git a/arch/i386/kernel/setup.c b/arch/i386/kernel/setup.c index ab62a9f..5f58f8c 100644 --- a/arch/i386/kernel/setup.c +++ b/arch/i386/kernel/setup.c @@ -1377,101 +1377,6 @@ static void __init register_memory(void) pci_mem_start, gapstart, gapsize); } -/* Use inline assembly to define this because the nops are defined - as inline assembly strings in the include files and we cannot - get them easily into strings. */ -asm("\t.data\nintelnops: " - GENERIC_NOP1 GENERIC_NOP2 GENERIC_NOP3 GENERIC_NOP4 GENERIC_NOP5 GENERIC_NOP6 - GENERIC_NOP7 GENERIC_NOP8); -asm("\t.data\nk8nops: " - K8_NOP1 K8_NOP2 K8_NOP3 K8_NOP4 K8_NOP5 K8_NOP6 - K8_NOP7 K8_NOP8); -asm("\t.data\nk7nops: " - K7_NOP1 K7_NOP2 K7_NOP3 K7_NOP4 K7_NOP5 K7_NOP6 - K7_NOP7 K7_NOP8); - -extern unsigned char intelnops[], k8nops[], k7nops[]; -static unsigned char *intel_nops[ASM_NOP_MAX+1] = { - NULL, - intelnops, - intelnops + 1, - intelnops + 1 + 2, - intelnops + 1 + 2 + 3, - intelnops + 1 + 2 + 3 + 4, - intelnops + 1 + 2 + 3 + 4 + 5, - intelnops + 1 + 2 + 3 + 4 + 5 + 6, - intelnops + 1 + 2 + 3 + 4 + 5 + 6 + 7, -}; -static unsigned char *k8_nops[ASM_NOP_MAX+1] = { - NULL, - k8nops, - k8nops + 1, - k8nops + 1 + 2, - k8nops + 1 + 2 + 3, - k8nops + 1 + 2 + 3 + 4, - k8nops + 1 + 2 + 3 + 4 + 5, - k8nops + 1 + 2 + 3 + 4 + 5 + 6, - k8nops + 1 + 2 + 3 + 4 + 5 + 6 + 7, -}; -static unsigned char *k7_nops[ASM_NOP_MAX+1] = { - NULL, - k7nops, - k7nops + 1, - k7nops + 1 + 2, - k7nops + 1 + 2 + 3, - k7nops + 1 + 2 + 3 + 4, - k7nops + 1 + 2 + 3 + 4 + 5, - k7nops + 1 + 2 + 3 + 4 + 5 + 6, - k7nops + 1 + 2 + 3 + 4 + 5 + 6 + 7, -}; -static struct nop { - int cpuid; - unsigned char **noptable; -} noptypes[] = { - { X86_FEATURE_K8, k8_nops }, - { X86_FEATURE_K7, k7_nops }, - { -1, NULL } -}; - -/* Replace instructions with better alternatives for this CPU type. - - This runs before SMP is initialized to avoid SMP problems with - self modifying code. This implies that assymetric systems where - APs have less capabilities than the boot processor are not handled. - Tough. Make sure you disable such features by hand. */ -void apply_alternatives(void *start, void *end) -{ - struct alt_instr *a; - int diff, i, k; - unsigned char **noptable = intel_nops; - for (i = 0; noptypes[i].cpuid >= 0; i++) { - if (boot_cpu_has(noptypes[i].cpuid)) { - noptable = noptypes[i].noptable; - break; - } - } - for (a = start; (void *)a < end; a++) { - if (!boot_cpu_has(a->cpuid)) - continue; - BUG_ON(a->replacementlen > a->instrlen); - memcpy(a->instr, a->replacement, a->replacementlen); - diff = a->instrlen - a->replacementlen; - /* Pad the rest with nops */ - for (i = a->replacementlen; diff > 0; diff -= k, i += k) { - k = diff; - if (k > ASM_NOP_MAX) - k = ASM_NOP_MAX; - memcpy(a->instr + i, noptable[k], k); - } - } -} - -void __init alternative_instructions(void) -{ - extern struct alt_instr __alt_instructions[], __alt_instructions_end[]; - apply_alternatives(__alt_instructions, __alt_instructions_end); -} - static char * __init machine_specific_memory_setup(void); #ifdef CONFIG_MCA diff --git a/arch/i386/kernel/smpboot.c b/arch/i386/kernel/smpboot.c index 7007e17..4c470e9 100644 --- a/arch/i386/kernel/smpboot.c +++ b/arch/i386/kernel/smpboot.c @@ -899,6 +899,7 @@ static int __devinit do_boot_cpu(int api unsigned short nmi_high = 0, nmi_low = 0; ++cpucount; + alternatives_smp_switch(1); /* * We can't use kernel_thread since we must avoid to @@ -1368,6 +1369,8 @@ void __cpu_die(unsigned int cpu) /* They ack this in play_dead by setting CPU_DEAD */ if (per_cpu(cpu_state, cpu) == CPU_DEAD) { printk ("CPU %d is now offline\n", cpu); + if (1 == num_online_cpus()) + alternatives_smp_switch(0); return; } msleep(100); diff --git a/arch/i386/kernel/vmlinux.lds.S b/arch/i386/kernel/vmlinux.lds.S index 4710195..3f21c6f 100644 --- a/arch/i386/kernel/vmlinux.lds.S +++ b/arch/i386/kernel/vmlinux.lds.S @@ -68,6 +68,26 @@ SECTIONS *(.data.init_task) } + /* might get freed after init */ + . = ALIGN(4096); + __smp_alt_begin = .; + __smp_alt_instructions = .; + .smp_altinstructions : AT(ADDR(.smp_altinstructions) - LOAD_OFFSET) { + *(.smp_altinstructions) + } + __smp_alt_instructions_end = .; + . = ALIGN(4); + __smp_locks = .; + .smp_locks : AT(ADDR(.smp_locks) - LOAD_OFFSET) { + *(.smp_locks) + } + __smp_locks_end = .; + .smp_altinstr_replacement : AT(ADDR(.smp_altinstr_replacement) - LOAD_OFFSET) { + *(.smp_altinstr_replacement) + } + . = ALIGN(4096); + __smp_alt_end = .; + /* will be freed after init */ . = ALIGN(4096); /* Init code and data */ __init_begin = .; diff --git a/arch/um/kernel/um_arch.c b/arch/um/kernel/um_arch.c index 27cdf91..80c9c18 100644 --- a/arch/um/kernel/um_arch.c +++ b/arch/um/kernel/um_arch.c @@ -491,6 +491,16 @@ void __init check_bugs(void) check_devanon(); } -void apply_alternatives(void *start, void *end) +void apply_alternatives(struct alt_instr *start, struct alt_instr *end) +{ +} + +void alternatives_smp_module_add(struct module *mod, char *name, + void *locks, void *locks_end, + void *text, void *text_end) +{ +} + +void alternatives_smp_module_del(struct module *mod) { } diff --git a/include/asm-i386/alternative.h b/include/asm-i386/alternative.h new file mode 100644 index 0000000..e201dec --- /dev/null +++ b/include/asm-i386/alternative.h @@ -0,0 +1,129 @@ +#ifndef _I386_ALTERNATIVE_H +#define _I386_ALTERNATIVE_H + +#ifdef __KERNEL__ + +struct alt_instr { + u8 *instr; /* original instruction */ + u8 *replacement; + u8 cpuid; /* cpuid bit set for replacement */ + u8 instrlen; /* length of original instruction */ + u8 replacementlen; /* length of new instruction, <= instrlen */ + u8 pad; +}; + +extern void apply_alternatives(struct alt_instr *start, struct alt_instr *end); + +struct module; +extern void alternatives_smp_module_add(struct module *mod, char *name, + void *locks, void *locks_end, + void *text, void *text_end); +extern void alternatives_smp_module_del(struct module *mod); +extern void alternatives_smp_switch(int smp); + +#endif + +/* + * Alternative instructions for different CPU types or capabilities. + * + * This allows to use optimized instructions even on generic binary + * kernels. + * + * length of oldinstr must be longer or equal the length of newinstr + * It can be padded with nops as needed. + * + * For non barrier like inlines please define new variants + * without volatile and memory clobber. + */ +#define alternative(oldinstr, newinstr, feature) \ + asm volatile ("661:\n\t" oldinstr "\n662:\n" \ + ".section .altinstructions,\"a\"\n" \ + " .align 4\n" \ + " .long 661b\n" /* label */ \ + " .long 663f\n" /* new instruction */ \ + " .byte %c0\n" /* feature bit */ \ + " .byte 662b-661b\n" /* sourcelen */ \ + " .byte 664f-663f\n" /* replacementlen */ \ + ".previous\n" \ + ".section .altinstr_replacement,\"ax\"\n" \ + "663:\n\t" newinstr "\n664:\n" /* replacement */\ + ".previous" :: "i" (feature) : "memory") + +/* + * Alternative inline assembly with input. + * + * Pecularities: + * No memory clobber here. + * Argument numbers start with 1. + * Best is to use constraints that are fixed size (like (%1) ... "r") + * If you use variable sized constraints like "m" or "g" in the + * replacement maake sure to pad to the worst case length. + */ +#define alternative_input(oldinstr, newinstr, feature, input...) \ + asm volatile ("661:\n\t" oldinstr "\n662:\n" \ + ".section .altinstructions,\"a\"\n" \ + " .align 4\n" \ + " .long 661b\n" /* label */ \ + " .long 663f\n" /* new instruction */ \ + " .byte %c0\n" /* feature bit */ \ + " .byte 662b-661b\n" /* sourcelen */ \ + " .byte 664f-663f\n" /* replacementlen */ \ + ".previous\n" \ + ".section .altinstr_replacement,\"ax\"\n" \ + "663:\n\t" newinstr "\n664:\n" /* replacement */\ + ".previous" :: "i" (feature), ##input) + +/* + * Alternative inline assembly for SMP. + * + * alternative_smp() takes two versions (SMP first, UP second) and is + * for more complex stuff such as spinlocks. + * + * The LOCK_PREFIX macro defined here replaces the LOCK and + * LOCK_PREFIX macros used everywhere in the source tree. + * + * SMP alternatives use the same data structures as the other + * alternatives and the X86_FEATURE_UP flag to indicate the case of a + * UP system running a SMP kernel. The existing apply_alternatives() + * works fine for patching a SMP kernel for UP. + * + * The SMP alternative tables can be kept after boot and contain both + * UP and SMP versions of the instructions to allow switching back to + * SMP at runtime, when hotplugging in a new CPU, which is especially + * useful in virtualized environments. + * + * The very common lock prefix is handled as special case in a + * separate table which is a pure address list without replacement ptr + * and size information. That keeps the table sizes small. + */ + +#ifdef CONFIG_SMP +#define alternative_smp(smpinstr, upinstr, args...) \ + asm volatile ("661:\n\t" smpinstr "\n662:\n" \ + ".section .smp_altinstructions,\"a\"\n" \ + " .align 4\n" \ + " .long 661b\n" /* label */ \ + " .long 663f\n" /* new instruction */ \ + " .byte 0x68\n" /* X86_FEATURE_UP */ \ + " .byte 662b-661b\n" /* sourcelen */ \ + " .byte 664f-663f\n" /* replacementlen */ \ + ".previous\n" \ + ".section .smp_altinstr_replacement,\"awx\"\n" \ + "663:\n\t" upinstr "\n" /* replacement */ \ + "664:\n\t.fill 662b-661b,1,0x42\n" /* space for original */ \ + ".previous" : args) + +#define LOCK_PREFIX \ + ".section .smp_locks,\"a\"\n" \ + " .align 4\n" \ + " .long 661f\n" /* address */ \ + ".previous\n" \ + "661:\n\tlock; " + +#else /* ! CONFIG_SMP */ +#define alternative_smp(smpinstr, upinstr, args...) \ + asm volatile (upinstr : args) +#define LOCK_PREFIX "" +#endif + +#endif /* _I386_ALTERNATIVE_H */ diff --git a/include/asm-i386/atomic.h b/include/asm-i386/atomic.h index de649d3..78b0032 100644 --- a/include/asm-i386/atomic.h +++ b/include/asm-i386/atomic.h @@ -10,12 +10,6 @@ * resource counting etc.. */ -#ifdef CONFIG_SMP -#define LOCK "lock ; " -#else -#define LOCK "" -#endif - /* * Make sure gcc doesn't try to be clever and move things around * on us. We need to use _exactly_ the address the user gave us, @@ -52,7 +46,7 @@ typedef struct { volatile int counter; } static __inline__ void atomic_add(int i, atomic_t *v) { __asm__ __volatile__( - LOCK "addl %1,%0" + LOCK_PREFIX "addl %1,%0" :"=m" (v->counter) :"ir" (i), "m" (v->counter)); } @@ -67,7 +61,7 @@ static __inline__ void atomic_add(int i, static __inline__ void atomic_sub(int i, atomic_t *v) { __asm__ __volatile__( - LOCK "subl %1,%0" + LOCK_PREFIX "subl %1,%0" :"=m" (v->counter) :"ir" (i), "m" (v->counter)); } @@ -86,7 +80,7 @@ static __inline__ int atomic_sub_and_tes unsigned char c; __asm__ __volatile__( - LOCK "subl %2,%0; sete %1" + LOCK_PREFIX "subl %2,%0; sete %1" :"=m" (v->counter), "=qm" (c) :"ir" (i), "m" (v->counter) : "memory"); return c; @@ -101,7 +95,7 @@ static __inline__ int atomic_sub_and_tes static __inline__ void atomic_inc(atomic_t *v) { __asm__ __volatile__( - LOCK "incl %0" + LOCK_PREFIX "incl %0" :"=m" (v->counter) :"m" (v->counter)); } @@ -115,7 +109,7 @@ static __inline__ void atomic_inc(atomic static __inline__ void atomic_dec(atomic_t *v) { __asm__ __volatile__( - LOCK "decl %0" + LOCK_PREFIX "decl %0" :"=m" (v->counter) :"m" (v->counter)); } @@ -133,7 +127,7 @@ static __inline__ int atomic_dec_and_tes unsigned char c; __asm__ __volatile__( - LOCK "decl %0; sete %1" + LOCK_PREFIX "decl %0; sete %1" :"=m" (v->counter), "=qm" (c) :"m" (v->counter) : "memory"); return c != 0; @@ -152,7 +146,7 @@ static __inline__ int atomic_inc_and_tes unsigned char c; __asm__ __volatile__( - LOCK "incl %0; sete %1" + LOCK_PREFIX "incl %0; sete %1" :"=m" (v->counter), "=qm" (c) :"m" (v->counter) : "memory"); return c != 0; @@ -172,7 +166,7 @@ static __inline__ int atomic_add_negativ unsigned char c; __asm__ __volatile__( - LOCK "addl %2,%0; sets %1" + LOCK_PREFIX "addl %2,%0; sets %1" :"=m" (v->counter), "=qm" (c) :"ir" (i), "m" (v->counter) : "memory"); return c; @@ -195,7 +189,7 @@ static __inline__ int atomic_add_return( /* Modern 486+ processor */ __i = i; __asm__ __volatile__( - LOCK "xaddl %0, %1;" + LOCK_PREFIX "xaddl %0, %1;" :"=r"(i) :"m"(v->counter), "0"(i)); return i + __i; @@ -242,11 +236,11 @@ static __inline__ int atomic_sub_return( /* These are x86-specific, used by some header files */ #define atomic_clear_mask(mask, addr) \ -__asm__ __volatile__(LOCK "andl %0,%1" \ +__asm__ __volatile__(LOCK_PREFIX "andl %0,%1" \ : : "r" (~(mask)),"m" (*addr) : "memory") #define atomic_set_mask(mask, addr) \ -__asm__ __volatile__(LOCK "orl %0,%1" \ +__asm__ __volatile__(LOCK_PREFIX "orl %0,%1" \ : : "r" (mask),"m" (*(addr)) : "memory") /* Atomic operations are already serializing on x86 */ diff --git a/include/asm-i386/bitops.h b/include/asm-i386/bitops.h index 88e6ca2..7d20b95 100644 --- a/include/asm-i386/bitops.h +++ b/include/asm-i386/bitops.h @@ -7,6 +7,7 @@ #include #include +#include /* * These have to be done with inline assembly: that way the bit-setting @@ -16,12 +17,6 @@ * bit 0 is the LSB of addr; bit 32 is the LSB of (addr+1). */ -#ifdef CONFIG_SMP -#define LOCK_PREFIX "lock ; " -#else -#define LOCK_PREFIX "" -#endif - #define ADDR (*(volatile long *) addr) /** diff --git a/include/asm-i386/cpufeature.h b/include/asm-i386/cpufeature.h index c4ec2a4..5c0b587 100644 --- a/include/asm-i386/cpufeature.h +++ b/include/asm-i386/cpufeature.h @@ -70,6 +70,7 @@ #define X86_FEATURE_P3 (3*32+ 6) /* P3 */ #define X86_FEATURE_P4 (3*32+ 7) /* P4 */ #define X86_FEATURE_CONSTANT_TSC (3*32+ 8) /* TSC ticks at a constant rate */ +#define X86_FEATURE_UP (3*32+ 9) /* smp kernel running on up */ /* Intel-defined CPU features, CPUID level 0x00000001 (ecx), word 4 */ #define X86_FEATURE_XMM3 (4*32+ 0) /* Streaming SIMD Extensions-3 */ diff --git a/include/asm-i386/mutex.h b/include/asm-i386/mutex.h index 9b2199e..05a5385 100644 --- a/include/asm-i386/mutex.h +++ b/include/asm-i386/mutex.h @@ -9,6 +9,8 @@ #ifndef _ASM_MUTEX_H #define _ASM_MUTEX_H +#include "asm/alternative.h" + /** * __mutex_fastpath_lock - try to take the lock by moving the count * from 1 to a 0 value @@ -27,7 +29,7 @@ do { \ typecheck_fn(fastcall void (*)(atomic_t *), fail_fn); \ \ __asm__ __volatile__( \ - LOCK " decl (%%eax) \n" \ + LOCK_PREFIX " decl (%%eax) \n" \ " js 2f \n" \ "1: \n" \ \ @@ -83,7 +85,7 @@ do { \ typecheck_fn(fastcall void (*)(atomic_t *), fail_fn); \ \ __asm__ __volatile__( \ - LOCK " incl (%%eax) \n" \ + LOCK_PREFIX " incl (%%eax) \n" \ " jle 2f \n" \ "1: \n" \ \ diff --git a/include/asm-i386/rwlock.h b/include/asm-i386/rwlock.h index b57cc7a..94f0019 100644 --- a/include/asm-i386/rwlock.h +++ b/include/asm-i386/rwlock.h @@ -21,21 +21,23 @@ #define RW_LOCK_BIAS_STR "0x01000000" #define __build_read_lock_ptr(rw, helper) \ - asm volatile(LOCK "subl $1,(%0)\n\t" \ - "jns 1f\n" \ - "call " helper "\n\t" \ - "1:\n" \ - ::"a" (rw) : "memory") + alternative_smp("lock; subl $1,(%0)\n\t" \ + "jns 1f\n" \ + "call " helper "\n\t" \ + "1:\n", \ + "subl $1,(%0)\n\t", \ + :"a" (rw) : "memory") #define __build_read_lock_const(rw, helper) \ - asm volatile(LOCK "subl $1,%0\n\t" \ - "jns 1f\n" \ - "pushl %%eax\n\t" \ - "leal %0,%%eax\n\t" \ - "call " helper "\n\t" \ - "popl %%eax\n\t" \ - "1:\n" \ - :"=m" (*(volatile int *)rw) : : "memory") + alternative_smp("lock; subl $1,%0\n\t" \ + "jns 1f\n" \ + "pushl %%eax\n\t" \ + "leal %0,%%eax\n\t" \ + "call " helper "\n\t" \ + "popl %%eax\n\t" \ + "1:\n", \ + "subl $1,%0\n\t", \ + "=m" (*(volatile int *)rw) : : "memory") #define __build_read_lock(rw, helper) do { \ if (__builtin_constant_p(rw)) \ @@ -45,21 +47,23 @@ } while (0) #define __build_write_lock_ptr(rw, helper) \ - asm volatile(LOCK "subl $" RW_LOCK_BIAS_STR ",(%0)\n\t" \ - "jz 1f\n" \ - "call " helper "\n\t" \ - "1:\n" \ - ::"a" (rw) : "memory") + alternative_smp("lock; subl $" RW_LOCK_BIAS_STR ",(%0)\n\t" \ + "jz 1f\n" \ + "call " helper "\n\t" \ + "1:\n", \ + "subl $" RW_LOCK_BIAS_STR ",(%0)\n\t", \ + :"a" (rw) : "memory") #define __build_write_lock_const(rw, helper) \ - asm volatile(LOCK "subl $" RW_LOCK_BIAS_STR ",%0\n\t" \ - "jz 1f\n" \ - "pushl %%eax\n\t" \ - "leal %0,%%eax\n\t" \ - "call " helper "\n\t" \ - "popl %%eax\n\t" \ - "1:\n" \ - :"=m" (*(volatile int *)rw) : : "memory") + alternative_smp("lock; subl $" RW_LOCK_BIAS_STR ",%0\n\t" \ + "jz 1f\n" \ + "pushl %%eax\n\t" \ + "leal %0,%%eax\n\t" \ + "call " helper "\n\t" \ + "popl %%eax\n\t" \ + "1:\n", \ + "subl $" RW_LOCK_BIAS_STR ",%0\n\t", \ + "=m" (*(volatile int *)rw) : : "memory") #define __build_write_lock(rw, helper) do { \ if (__builtin_constant_p(rw)) \ diff --git a/include/asm-i386/semaphore.h b/include/asm-i386/semaphore.h index 6a42b21..f7a0f31 100644 --- a/include/asm-i386/semaphore.h +++ b/include/asm-i386/semaphore.h @@ -99,7 +99,7 @@ static inline void down(struct semaphore might_sleep(); __asm__ __volatile__( "# atomic down operation\n\t" - LOCK "decl %0\n\t" /* --sem->count */ + LOCK_PREFIX "decl %0\n\t" /* --sem->count */ "js 2f\n" "1:\n" LOCK_SECTION_START("") @@ -123,7 +123,7 @@ static inline int down_interruptible(str might_sleep(); __asm__ __volatile__( "# atomic interruptible down operation\n\t" - LOCK "decl %1\n\t" /* --sem->count */ + LOCK_PREFIX "decl %1\n\t" /* --sem->count */ "js 2f\n\t" "xorl %0,%0\n" "1:\n" @@ -148,7 +148,7 @@ static inline int down_trylock(struct se __asm__ __volatile__( "# atomic interruptible down operation\n\t" - LOCK "decl %1\n\t" /* --sem->count */ + LOCK_PREFIX "decl %1\n\t" /* --sem->count */ "js 2f\n\t" "xorl %0,%0\n" "1:\n" @@ -173,7 +173,7 @@ static inline void up(struct semaphore * { __asm__ __volatile__( "# atomic up operation\n\t" - LOCK "incl %0\n\t" /* ++sem->count */ + LOCK_PREFIX "incl %0\n\t" /* ++sem->count */ "jle 2f\n" "1:\n" LOCK_SECTION_START("") diff --git a/include/asm-i386/spinlock.h b/include/asm-i386/spinlock.h index 2360435..a1b8a8a 100644 --- a/include/asm-i386/spinlock.h +++ b/include/asm-i386/spinlock.h @@ -48,18 +48,23 @@ "jmp 1b\n" \ "4:\n\t" +#define __raw_spin_lock_string_up \ + "\n\tdecb %0" + static inline void __raw_spin_lock(raw_spinlock_t *lock) { - __asm__ __volatile__( - __raw_spin_lock_string - :"=m" (lock->slock) : : "memory"); + alternative_smp( + __raw_spin_lock_string, + __raw_spin_lock_string_up, + "=m" (lock->slock) : : "memory"); } static inline void __raw_spin_lock_flags(raw_spinlock_t *lock, unsigned long flags) { - __asm__ __volatile__( - __raw_spin_lock_string_flags - :"=m" (lock->slock) : "r" (flags) : "memory"); + alternative_smp( + __raw_spin_lock_string_flags, + __raw_spin_lock_string_up, + "=m" (lock->slock) : "r" (flags) : "memory"); } static inline int __raw_spin_trylock(raw_spinlock_t *lock) @@ -178,12 +183,12 @@ static inline int __raw_write_trylock(ra static inline void __raw_read_unlock(raw_rwlock_t *rw) { - asm volatile("lock ; incl %0" :"=m" (rw->lock) : : "memory"); + asm volatile(LOCK_PREFIX "incl %0" :"=m" (rw->lock) : : "memory"); } static inline void __raw_write_unlock(raw_rwlock_t *rw) { - asm volatile("lock ; addl $" RW_LOCK_BIAS_STR ", %0" + asm volatile(LOCK_PREFIX "addl $" RW_LOCK_BIAS_STR ", %0" : "=m" (rw->lock) : : "memory"); } diff --git a/include/asm-i386/system.h b/include/asm-i386/system.h index 399145a..d0d8d74 100644 --- a/include/asm-i386/system.h +++ b/include/asm-i386/system.h @@ -352,67 +352,6 @@ static inline unsigned long long __cmpxc #endif -#ifdef __KERNEL__ -struct alt_instr { - __u8 *instr; /* original instruction */ - __u8 *replacement; - __u8 cpuid; /* cpuid bit set for replacement */ - __u8 instrlen; /* length of original instruction */ - __u8 replacementlen; /* length of new instruction, <= instrlen */ - __u8 pad; -}; -#endif - -/* - * Alternative instructions for different CPU types or capabilities. - * - * This allows to use optimized instructions even on generic binary - * kernels. - * - * length of oldinstr must be longer or equal the length of newinstr - * It can be padded with nops as needed. - * - * For non barrier like inlines please define new variants - * without volatile and memory clobber. - */ -#define alternative(oldinstr, newinstr, feature) \ - asm volatile ("661:\n\t" oldinstr "\n662:\n" \ - ".section .altinstructions,\"a\"\n" \ - " .align 4\n" \ - " .long 661b\n" /* label */ \ - " .long 663f\n" /* new instruction */ \ - " .byte %c0\n" /* feature bit */ \ - " .byte 662b-661b\n" /* sourcelen */ \ - " .byte 664f-663f\n" /* replacementlen */ \ - ".previous\n" \ - ".section .altinstr_replacement,\"ax\"\n" \ - "663:\n\t" newinstr "\n664:\n" /* replacement */ \ - ".previous" :: "i" (feature) : "memory") - -/* - * Alternative inline assembly with input. - * - * Pecularities: - * No memory clobber here. - * Argument numbers start with 1. - * Best is to use constraints that are fixed size (like (%1) ... "r") - * If you use variable sized constraints like "m" or "g" in the - * replacement maake sure to pad to the worst case length. - */ -#define alternative_input(oldinstr, newinstr, feature, input...) \ - asm volatile ("661:\n\t" oldinstr "\n662:\n" \ - ".section .altinstructions,\"a\"\n" \ - " .align 4\n" \ - " .long 661b\n" /* label */ \ - " .long 663f\n" /* new instruction */ \ - " .byte %c0\n" /* feature bit */ \ - " .byte 662b-661b\n" /* sourcelen */ \ - " .byte 664f-663f\n" /* replacementlen */ \ - ".previous\n" \ - ".section .altinstr_replacement,\"ax\"\n" \ - "663:\n\t" newinstr "\n664:\n" /* replacement */ \ - ".previous" :: "i" (feature), ##input) - /* * Force strict CPU ordering. * And yes, this is required on UP too when we're talking @@ -558,5 +497,6 @@ static inline void sched_cacheflush(void } extern unsigned long arch_align_stack(unsigned long sp); +extern void free_init_pages(char *what, unsigned long begin, unsigned long end); #endif diff --git a/include/asm-um/alternative.h b/include/asm-um/alternative.h new file mode 100644 index 0000000..b643439 --- /dev/null +++ b/include/asm-um/alternative.h @@ -0,0 +1,6 @@ +#ifndef __UM_ALTERNATIVE_H +#define __UM_ALTERNATIVE_H + +#include "asm/arch/alternative.h" + +#endif Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-5/kernel-2.6.spec,v retrieving revision 1.2080 retrieving revision 1.2081 diff -u -r1.2080 -r1.2081 --- kernel-2.6.spec 28 Mar 2006 08:27:56 -0000 1.2080 +++ kernel-2.6.spec 29 Mar 2006 05:52:39 -0000 1.2081 @@ -233,6 +233,7 @@ Patch206: linux-2.6-x86-hp-reboot.patch Patch207: linux-2.6-x86-cpu_index-false.patch Patch208: linux-2.6-x86_64-vdso-compile-m32.patch +Patch209: linux-2.6-x86-smp-alternatives.patch # 300 - 399 ppc(64) Patch301: linux-2.6-cell-numa-init.patch @@ -764,6 +765,8 @@ %patch207 -p1 # Fix broken x86-64 32bit vDSO %patch208 -p1 +# SMP alternatives +#%patch209 -p1 # # ppc64 @@ -1676,7 +1679,7 @@ %endif %changelog -* Tue Mar 26 2006 Dave Jones +* Tue Mar 26 2006 Dave Jones [2.6.16-1.2080_FC5] - 2.6.16.1 * Mon Mar 25 2006 Dave Jones From fedora-cvs-commits at redhat.com Wed Mar 29 06:34:43 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 29 Mar 2006 01:34:43 -0500 Subject: rpms/gcc/devel gcc41-pr20297-test.patch,1.1,1.2 Message-ID: <200603290634.k2T6Yhv1003034@cvs.devel.redhat.com> Author: jakub Update of /cvs/dist/rpms/gcc/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv3019 Modified Files: gcc41-pr20297-test.patch Log Message: 4.1.0-4 gcc41-pr20297-test.patch: gcc.dg/visibility-11.c | 24 ------------------------ gcc.target/i386/visibility-1.c | 24 ++++++++++++++++++++++++ 2 files changed, 24 insertions(+), 24 deletions(-) Index: gcc41-pr20297-test.patch =================================================================== RCS file: /cvs/dist/rpms/gcc/devel/gcc41-pr20297-test.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gcc41-pr20297-test.patch 28 Mar 2006 13:28:54 -0000 1.1 +++ gcc41-pr20297-test.patch 29 Mar 2006 06:34:39 -0000 1.2 @@ -14,7 +14,7 @@ - -/* { dg-do compile { target i?86-*-* x86_64-*-* } } */ -/* { dg-require-visibility "" } */ --/* { dg-options "-Os -fpic" } */ +-/* { dg-options "-Os -fpic" } -/* { dg-final { scan-assembler "memcpy at PLT" } } */ - -#pragma GCC visibility push(hidden) From fedora-cvs-commits at redhat.com Wed Mar 29 09:19:48 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 29 Mar 2006 04:19:48 -0500 Subject: rpms/ethereal/devel .cvsignore, 1.30, 1.31 ethereal.spec, 1.66, 1.67 sources, 1.32, 1.33 ethereal-gtk-dialog.patch, 1.1, NONE Message-ID: <200603290919.k2T9JmY6022785@cvs.devel.redhat.com> Author: rvokal Update of /cvs/dist/rpms/ethereal/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv22770 Modified Files: .cvsignore ethereal.spec sources Removed Files: ethereal-gtk-dialog.patch Log Message: -update to latest svn version, few bug fixes Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/ethereal/devel/.cvsignore,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- .cvsignore 29 Dec 2005 11:10:40 -0000 1.30 +++ .cvsignore 29 Mar 2006 09:19:46 -0000 1.31 @@ -1 +1 @@ -ethereal-0.10.14.tar.bz2 +ethereal-0.10.14-SVN-17749.tar.gz Index: ethereal.spec =================================================================== RCS file: /cvs/dist/rpms/ethereal/devel/ethereal.spec,v retrieving revision 1.66 retrieving revision 1.67 diff -u -r1.66 -r1.67 --- ethereal.spec 11 Feb 2006 02:40:15 -0000 1.66 +++ ethereal.spec 29 Mar 2006 09:19:46 -0000 1.67 @@ -1,19 +1,18 @@ %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()") -%define svn_version 16880 +%define svn_version 17749 Summary: Network traffic analyzer Name: ethereal Version: 0.10.14 -Release: 3.2 +Release: 4.svn.1 License: GPL Group: Applications/Internet -Source0: http://www.ethereal.com/distribution/%{name}-%{version}.tar.bz2 +Source0: http://www.ethereal.com/distribution/%{name}-%{version}-SVN-%{svn_version}.tar.gz Source1: ethereal.pam Source2: ethereal.console Source3: ethereal.desktop Source4: ethereal.png Patch1: ethereal-0.10.13-pie.patch -Patch2: ethereal-gtk-dialog.patch Patch3: ethereal-0.10.14-nfsv4-opts.patch Url: http://www.ethereal.com/ BuildRoot: %{_tmppath}/%{name}-root @@ -50,9 +49,8 @@ %prep -%setup -q -n %{name}-%{version} +%setup -q -n %{name}-%{version}-SVN-%{svn_version} %patch1 -p1 -b .pie -%patch2 -p0 -b .gtk %patch3 -p1 %build @@ -139,6 +137,7 @@ %{_sbindir}/dftest %{_sbindir}/capinfos %{_sbindir}/randpkt +%{_sbindir}/dumpcap %{python_sitelib}/* %{_libdir}/lib* %{_mandir}/man1/editcap.* @@ -147,6 +146,7 @@ %{_mandir}/man1/mergecap.* %{_mandir}/man1/text2pcap.* %{_mandir}/man1/capinfos.* +%{_mandir}/man1/dumpcap.* %{_mandir}/man4/ethereal-filter.* %{_libdir}/ethereal %{_sysconfdir}/pam.d/ethereal @@ -163,6 +163,10 @@ %changelog +* Wed Mar 29 2006 Radek Vok??l 0.10.14-4.svn.1 +- update to latest svn version +- dumpcap + * Fri Feb 10 2006 Jesse Keating - 0.10.14-3.2 - bump again for double-long bug on ppc(64) Index: sources =================================================================== RCS file: /cvs/dist/rpms/ethereal/devel/sources,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- sources 29 Dec 2005 11:10:40 -0000 1.32 +++ sources 29 Mar 2006 09:19:46 -0000 1.33 @@ -1 +1 @@ -297f678c037f88429250830e924b8fa0 ethereal-0.10.14.tar.bz2 +f35a7337c8a97b597d0bb806f9cc8420 ethereal-0.10.14-SVN-17749.tar.gz --- ethereal-gtk-dialog.patch DELETED --- From fedora-cvs-commits at redhat.com Wed Mar 29 09:41:41 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 29 Mar 2006 04:41:41 -0500 Subject: rpms/logrotate/devel logrotate.spec,1.44,1.45 sources,1.17,1.18 Message-ID: <200603290941.k2T9ffYc023001@cvs.devel.redhat.com> Author: pvrabec Update of /cvs/dist/rpms/logrotate/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv22976 Modified Files: logrotate.spec sources Log Message: - correct man page "extension" option description (#185318) Index: logrotate.spec =================================================================== RCS file: /cvs/dist/rpms/logrotate/devel/logrotate.spec,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- logrotate.spec 11 Feb 2006 04:25:09 -0000 1.44 +++ logrotate.spec 29 Mar 2006 09:41:37 -0000 1.45 @@ -5,7 +5,7 @@ Summary: Rotates, compresses, removes and mails system log files. Name: logrotate Version: 3.7.3 -Release: 2.2.1 +Release: 3 License: GPL Group: System Environment/Base Source: logrotate-%{PACKAGE_VERSION}.tar.gz @@ -56,6 +56,9 @@ %attr(0644, root, root) %verify(not size md5 mtime) %config(noreplace) /var/lib/logrotate.status %changelog +* Tue Mar 28 2006 Peter Vrabec 3.7.3-3 +- correct man page "extension" option description (#185318) + * Fri Feb 10 2006 Jesse Keating - 3.7.3-2.2.1 - bump again for double-long bug on ppc(64) Index: sources =================================================================== RCS file: /cvs/dist/rpms/logrotate/devel/sources,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- sources 13 Nov 2005 13:36:38 -0000 1.17 +++ sources 29 Mar 2006 09:41:37 -0000 1.18 @@ -1 +1 @@ -266c48560ba588649f815a0c59edb488 logrotate-3.7.3.tar.gz +83ec459e108999403d20a6ec59b70394 logrotate-3.7.3.tar.gz From fedora-cvs-commits at redhat.com Wed Mar 29 10:11:00 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 29 Mar 2006 05:11:00 -0500 Subject: rpms/openoffice.org/FC-5 openoffice.org.spec,1.648,1.649 Message-ID: <200603291011.k2TAB0Sa004473@cvs.devel.redhat.com> Author: caolanm Update of /cvs/dist/rpms/openoffice.org/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv4459 Modified Files: openoffice.org.spec Log Message: ready to rebuild Index: openoffice.org.spec =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/FC-5/openoffice.org.spec,v retrieving revision 1.648 retrieving revision 1.649 diff -u -r1.648 -r1.649 --- openoffice.org.spec 24 Mar 2006 14:57:18 -0000 1.648 +++ openoffice.org.spec 29 Mar 2006 10:10:58 -0000 1.649 @@ -1,6 +1,6 @@ %define oootag OOB680 %define ooomilestone 5 -%define rh_rpm_release 5 +%define rh_rpm_release 6 %define build_fc5 1 @@ -3245,7 +3245,7 @@ %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu %changelog -* Fri Mar 24 2006 Caolan McNamara - 1:2.0.2-5.5 +* Wed Mar 29 2006 Caolan McNamara - 1:2.0.2-5.6 - ooo#59997# replacement opens___.ttf updated - drop integrated openoffice.org-2.0.0.ooo56651.sw.rtfcrash.patch - drop integrated openoffice.org-1.9.114.ooo51718.rpath.patch @@ -3253,6 +3253,7 @@ - accessibility detection missing - rh#186515# Keep draw and math launchers for mimetypes - rh#186215#/ooo#63583# accessibility crasher in impress +- better fallback to english if help is missing * Fri Mar 10 2006 Bill Nottingham - 1:2.0.2-5.2 - rebuild for PPC TLS issue (#184446) From fedora-cvs-commits at redhat.com Wed Mar 29 10:45:04 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 29 Mar 2006 05:45:04 -0500 Subject: rpms/openoffice.org/devel openoffice.org-1.9.121.rh127576.gnomeprintui.patch, 1.10, 1.11 openoffice.org.spec, 1.655, 1.656 Message-ID: <200603291045.k2TAj4qC018410@cvs.devel.redhat.com> Author: caolanm Update of /cvs/dist/rpms/openoffice.org/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv18387 Modified Files: openoffice.org-1.9.121.rh127576.gnomeprintui.patch openoffice.org.spec Log Message: rh#186747# TTF fonts converted to Type1 for print to file ps openoffice.org-1.9.121.rh127576.gnomeprintui.patch: configuration/ppds/SGENPRT.PS | 0 configuration/psprint.conf | 0 inc/jobset.hxx | 0 inc/print.hxx | 0 psprint/source/printer/cupsmgr.cxx | 7 psprint_config/configuration/ppds/SGENPRT.PS | 3 psprint_config/configuration/psprint.conf | 2 source/dialogs/makefile.mk | 0 source/dialogs/printdlg.cxx | 0 source/gdi/jobset.cxx | 0 source/printer/cupsmgr.cxx | 0 svtools/source/dialogs/makefile.mk | 4 svtools/source/dialogs/printdlg.cxx | 523 ++++++++++++++++++++++++++- svtools/util/makefile.mk | 8 util/makefile.mk | 0 vcl/inc/jobset.hxx | 1 vcl/inc/print.hxx | 1 vcl/source/gdi/jobset.cxx | 194 ++++++++++ 18 files changed, 738 insertions(+), 5 deletions(-) Index: openoffice.org-1.9.121.rh127576.gnomeprintui.patch =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org-1.9.121.rh127576.gnomeprintui.patch,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- openoffice.org-1.9.121.rh127576.gnomeprintui.patch 5 Dec 2005 15:43:20 -0000 1.10 +++ openoffice.org-1.9.121.rh127576.gnomeprintui.patch 29 Mar 2006 10:45:00 -0000 1.11 @@ -908,7 +908,7 @@ diff -u -p -u -r1.3 SGENPRT.PS --- openoffice.org.orig/psprint_config/configuration/ppds/SGENPRT.PS 26 Nov 2004 16:10:35 -0000 1.3 +++ openoffice.org/psprint_config/configuration/ppds/SGENPRT.PS 30 Aug 2005 11:17:51 -0000 -@@ -68,7 +68,7 @@ +@@ -49,7 +49,7 @@ *PSVersion: "(1) 1" *Product: "(Generic Printer)" *ModelName: "Generic Printer" @@ -917,3 +917,11 @@ *PCFileName: "SGENPRT.PPD" +@@ -58,6 +58,7 @@ + *ColorDevice: True + *DefaultColorSpace: RGB + *LanguageLevel: "2" ++*TTRasterizer: Type42 + + *% --- For None Color or old PostScript(R) printers use following lines --- + *% *ColorDevice: False Index: openoffice.org.spec =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v retrieving revision 1.655 retrieving revision 1.656 diff -u -r1.655 -r1.656 --- openoffice.org.spec 28 Mar 2006 14:51:28 -0000 1.655 +++ openoffice.org.spec 29 Mar 2006 10:45:00 -0000 1.656 @@ -3268,6 +3268,9 @@ %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu %changelog +* Wed Mar 29 2006 Caolan McNamara - 1:2.0.2-5.7 +- rh#186747# TTF conts converted to Type 1 in print to file ps + * Tue Mar 28 2006 Caolan McNamara - 1:2.0.2-5.6 - more rh#186215#/ooo#63583# accessibility fixes - better fallback to english if help is missing From fedora-cvs-commits at redhat.com Wed Mar 29 10:47:44 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 29 Mar 2006 05:47:44 -0500 Subject: rpms/openoffice.org/devel openoffice.org.spec,1.656,1.657 Message-ID: <200603291047.k2TAlinG032143@cvs.devel.redhat.com> Author: caolanm Update of /cvs/dist/rpms/openoffice.org/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv32130 Modified Files: openoffice.org.spec Log Message: rh#186747# fix TTF to Type1 font i print to PS Index: openoffice.org.spec =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v retrieving revision 1.656 retrieving revision 1.657 diff -u -r1.656 -r1.657 --- openoffice.org.spec 29 Mar 2006 10:45:00 -0000 1.656 +++ openoffice.org.spec 29 Mar 2006 10:47:42 -0000 1.657 @@ -1,6 +1,6 @@ %define oootag OOB680 %define ooomilestone 5 -%define rh_rpm_release 6 +%define rh_rpm_release 7 %define build_fc6 1 %define build_rhel4 0 From fedora-cvs-commits at redhat.com Wed Mar 29 10:48:52 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 29 Mar 2006 05:48:52 -0500 Subject: rpms/openoffice.org/FC-5 openoffice.org-1.9.121.rh127576.gnomeprintui.patch, 1.10, 1.11 openoffice.org.spec, 1.649, 1.650 Message-ID: <200603291048.k2TAmq4U032204@cvs.devel.redhat.com> Author: caolanm Update of /cvs/dist/rpms/openoffice.org/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv32188 Modified Files: openoffice.org-1.9.121.rh127576.gnomeprintui.patch openoffice.org.spec Log Message: rh#186747# fix TTF to Type1 font problem openoffice.org-1.9.121.rh127576.gnomeprintui.patch: configuration/ppds/SGENPRT.PS | 0 configuration/psprint.conf | 0 inc/jobset.hxx | 0 inc/print.hxx | 0 psprint/source/printer/cupsmgr.cxx | 7 psprint_config/configuration/ppds/SGENPRT.PS | 3 psprint_config/configuration/psprint.conf | 2 source/dialogs/makefile.mk | 0 source/dialogs/printdlg.cxx | 0 source/gdi/jobset.cxx | 0 source/printer/cupsmgr.cxx | 0 svtools/source/dialogs/makefile.mk | 4 svtools/source/dialogs/printdlg.cxx | 523 ++++++++++++++++++++++++++- svtools/util/makefile.mk | 8 util/makefile.mk | 0 vcl/inc/jobset.hxx | 1 vcl/inc/print.hxx | 1 vcl/source/gdi/jobset.cxx | 194 ++++++++++ 18 files changed, 738 insertions(+), 5 deletions(-) Index: openoffice.org-1.9.121.rh127576.gnomeprintui.patch =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/FC-5/openoffice.org-1.9.121.rh127576.gnomeprintui.patch,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- openoffice.org-1.9.121.rh127576.gnomeprintui.patch 5 Dec 2005 15:43:20 -0000 1.10 +++ openoffice.org-1.9.121.rh127576.gnomeprintui.patch 29 Mar 2006 10:48:48 -0000 1.11 @@ -908,7 +908,7 @@ diff -u -p -u -r1.3 SGENPRT.PS --- openoffice.org.orig/psprint_config/configuration/ppds/SGENPRT.PS 26 Nov 2004 16:10:35 -0000 1.3 +++ openoffice.org/psprint_config/configuration/ppds/SGENPRT.PS 30 Aug 2005 11:17:51 -0000 -@@ -68,7 +68,7 @@ +@@ -49,7 +49,7 @@ *PSVersion: "(1) 1" *Product: "(Generic Printer)" *ModelName: "Generic Printer" @@ -917,3 +917,11 @@ *PCFileName: "SGENPRT.PPD" +@@ -58,6 +58,7 @@ + *ColorDevice: True + *DefaultColorSpace: RGB + *LanguageLevel: "2" ++*TTRasterizer: Type42 + + *% --- For None Color or old PostScript(R) printers use following lines --- + *% *ColorDevice: False Index: openoffice.org.spec =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/FC-5/openoffice.org.spec,v retrieving revision 1.649 retrieving revision 1.650 diff -u -r1.649 -r1.650 --- openoffice.org.spec 29 Mar 2006 10:10:58 -0000 1.649 +++ openoffice.org.spec 29 Mar 2006 10:48:48 -0000 1.650 @@ -1,6 +1,6 @@ %define oootag OOB680 %define ooomilestone 5 -%define rh_rpm_release 6 +%define rh_rpm_release 7 %define build_fc5 1 @@ -3245,7 +3245,7 @@ %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu %changelog -* Wed Mar 29 2006 Caolan McNamara - 1:2.0.2-5.6 +* Wed Mar 29 2006 Caolan McNamara - 1:2.0.2-5.7 - ooo#59997# replacement opens___.ttf updated - drop integrated openoffice.org-2.0.0.ooo56651.sw.rtfcrash.patch - drop integrated openoffice.org-1.9.114.ooo51718.rpath.patch @@ -3254,6 +3254,7 @@ - rh#186515# Keep draw and math launchers for mimetypes - rh#186215#/ooo#63583# accessibility crasher in impress - better fallback to english if help is missing +- rh#186747# TTF conts converted to Type 1 in print to file ps * Fri Mar 10 2006 Bill Nottingham - 1:2.0.2-5.2 - rebuild for PPC TLS issue (#184446) From fedora-cvs-commits at redhat.com Wed Mar 29 10:49:37 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 29 Mar 2006 05:49:37 -0500 Subject: rpms/openoffice.org/FC-5 openoffice.org.spec,1.650,1.651 Message-ID: <200603291049.k2TAnbkm032245@cvs.devel.redhat.com> Author: caolanm Update of /cvs/dist/rpms/openoffice.org/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv32232 Modified Files: openoffice.org.spec Log Message: foo Index: openoffice.org.spec =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/FC-5/openoffice.org.spec,v retrieving revision 1.650 retrieving revision 1.651 diff -u -r1.650 -r1.651 --- openoffice.org.spec 29 Mar 2006 10:48:48 -0000 1.650 +++ openoffice.org.spec 29 Mar 2006 10:49:34 -0000 1.651 @@ -3250,7 +3250,6 @@ - drop integrated openoffice.org-2.0.0.ooo56651.sw.rtfcrash.patch - drop integrated openoffice.org-1.9.114.ooo51718.rpath.patch - add openoffice.org-2.0.2.ooo63155.sfx2.badscript.patch for rh#185390# -- accessibility detection missing - rh#186515# Keep draw and math launchers for mimetypes - rh#186215#/ooo#63583# accessibility crasher in impress - better fallback to english if help is missing From fedora-cvs-commits at redhat.com Wed Mar 29 12:39:56 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 29 Mar 2006 07:39:56 -0500 Subject: rpms/kernel/FC-5 kernel-2.6.spec, 1.2080.2.2, 1.2080.2.3 1431-NET-Move-destructor-from-neigh-ops-to-neigh_params.txt, 1.1.2.1, NONE 1445-ATM-Fix-build-after-neigh-parms-neigh_destructor-change.txt, 1.1.2.1, NONE Message-ID: <200603291239.k2TCdu6S009039@cvs.devel.redhat.com> Author: linville Update of /cvs/dist/rpms/kernel/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv9026 Modified Files: Tag: private-linville-netdev-fc5-1-branch kernel-2.6.spec Removed Files: Tag: private-linville-netdev-fc5-1-branch 1431-NET-Move-destructor-from-neigh-ops-to-neigh_params.txt 1445-ATM-Fix-build-after-neigh-parms-neigh_destructor-change.txt Log Message: Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-5/kernel-2.6.spec,v retrieving revision 1.2080.2.2 retrieving revision 1.2080.2.3 diff -u -r1.2080.2.2 -r1.2080.2.3 --- kernel-2.6.spec 29 Mar 2006 02:39:44 -0000 1.2080.2.2 +++ kernel-2.6.spec 29 Mar 2006 12:39:53 -0000 1.2080.2.3 @@ -708,305 +708,303 @@ Patch30280: 1428-PKTGEN-Convert-thread-lock-to-mutexes.txt Patch30281: 1429-PKTGEN-Removes-thread_-un-lock-macros.txt Patch30282: 1430-PKTGEN-Updates-version.txt -Patch30283: 1431-NET-Move-destructor-from-neigh-ops-to-neigh_params.txt -Patch30284: 1433-NET-minor-net_rx_action-optimization.txt -Patch30285: 1435-TG3-Add-5787-and-5754-basic-support.txt -Patch30286: 1436-TG3-Add-5787-nvram-support.txt -Patch30287: 1437-TG3-Add-new-hard_start_xmit.txt -Patch30288: 1439-TG3-Add-ipv6-checksum-support.txt -Patch30289: 1440-TG3-Add-new-one-shot-MSI-handler.txt -Patch30290: 1441-TG3-Fixup-memory-test-for-5787.txt -Patch30291: 1442-TG3-nvram-cleanup.txt -Patch30292: 1443-TG3-Add-firmware-version-info.txt -Patch30293: 1444-TG3-update-version-and-reldate.txt -Patch30294: 1445-ATM-Fix-build-after-neigh-parms-neigh_destructor-change.txt -Patch30295: 1446-DCCP-options-Fix-handling-of-ackvecs-in-DATA-packets.txt -Patch30296: 1448-DCCP-ditch-dccp_v-46-_ctl_send_ack.txt -Patch30297: 1449-DCCP-Remove-leftover-dccp_send_response-prototype.txt -Patch30298: 1451-NET-dev_put-dev_hold-cleanup.txt -Patch30299: 1452-IRDA-sem2mutex-drivers-net-irda.txt -Patch30300: 1454-IRDA-remove-MODULE_PARM.txt -Patch30301: 1455-CASSINI-sem2mutex.txt -Patch30302: 1456-SUNGEM-sem2mutex.txt -Patch30303: 1457-WAN-fix-section-mismatch-warning-in-sbni.txt -Patch30304: 1459-NET-sem2mutex-part-2.txt -Patch30305: 1460-DCCP-Fix-uninitialized-var-warnings-in-dccp_parse_options.txt -Patch30306: 1461-NETFILTER-Fix-warnings-in-ip_nat_snmp_basic.c.txt -Patch30307: 1462-TIPC-Fix-simple-sparse-warnings.txt -Patch30308: 1463-TIPC-Remove-inlines-from-.c.txt -Patch30309: 1464-TIPC-Remove-unused-functions.txt -Patch30310: 1465-TIPC-Cleanups.txt -Patch30311: 1466-TIPC-Reduce-stack-usage.txt -Patch30312: 1467-TIPC-Avoid-compiler-warning.txt -Patch30313: 1468-TG3-netif_carrier_off-runs-too-early-could-still-be-queued-when-init-fails.txt -Patch30314: 1469-IPV4-ARP-Alloc-acceptance-of-unsolicited-ARP-via-netdevice-sysctl.txt -Patch30315: 1471-TCP-sysctl-to-allow-TCP-window-32767-sans-wscale.txt -Patch30316: 1472-XFRM-Fix-aevent-related-crash.txt -Patch30317: 1474-DECnet-Endian-annotation-and-fixes-for-DECnet.txt -Patch30318: 1475-DECnet-Patch-to-fix-recvmsg-flag-check.txt -Patch30319: 1476-DECnet-Use-RCU-locking-in-dn_rules.c.txt -Patch30320: 1477-NET-Replace-skb_pull-skb_postpull_rcsum-with-skb_pull_rcsum.txt -Patch30321: 1478-PKT_SCHED-Let-NET_CLS_ACT-no-longer-depend-on-EXPERIMENTAL.txt -Patch30322: 1479-IPV6-remove-useless-test-in-ip6_append_data.txt -Patch30323: 1481-SNAP-Remove-leftover-unused-hdr-variable.txt -Patch30324: 1485-SK_BUFF-export-skb_pull_rcsum.txt -Patch30325: 1492-BRIDGE-ebtables-Build-fix.txt -Patch30326: 1493-BRIDGE-br_netfilter-Warning-fixes.txt -Patch30327: 1494-BRIDGE-remove-unneeded-bh-disables.txt -Patch30328: 1495-BRIDGE-use-setup_timer.txt -Patch30329: 1496-BRIDGE-use-kcalloc.txt -Patch30330: 1497-BRIDGE-use-kzalloc.txt -Patch30331: 1498-BRIDGE-optimize-frame-pass-up.txt -Patch30332: 1499-BRIDGE-netfilter-whitespace.txt -Patch30333: 1500-BRIDGE-netfilter-dont-use-__constant_htons.txt -Patch30334: 1501-BRIDGE-netfilter-VLAN-macro-cleanup.txt -Patch30335: 1502-BRIDGE-netfilter-inline-cleanup.txt -Patch30336: 1503-BRIDGE-forwarding-remove-unneeded-preempt-and-bh-diasables.txt -Patch30337: 1504-BRIDGE-stp-timer-to-jiffies-cleanup.txt -Patch30338: 1505-BRIDGE-use-llc-for-receiving-STP-packets.txt -Patch30339: 1506-BRIDGE-allow-show-store-of-group-multicast-address.txt -Patch30340: 1507-LLC-llc_mac_hdr_init-const-arguments.txt -Patch30341: 1508-BRIDGE-use-LLC-to-send-STP.txt -Patch30342: 1509-TG3-make-drivers-net-tg3.c-tg3_request_irq-static.txt -Patch30343: 1510-DECNET-net-decnet-dn_route.c-fix-inconsequent-NULL-checking.txt -Patch30344: 1511-BRIDGE-Remove-duplicate-const-from-is_link_local-argument-type.txt -Patch30345: 1512-IPV6-Cleanup-of-net-ipv6-reassambly.c.txt -Patch30346: 1513-IPV6-Nearly-complete-kzalloc-cleanup-for-net-ipv6.txt -Patch30347: 1514-IPV6-Cleanups-for-net-ipv6-addrconf.c-kzalloc-early-exit-v2.txt -Patch30348: 1515-TG3-Don-t-mark-tg3_test_registers-as-returning-const.txt -Patch30349: 1516-NETFILTER-Add-H.323-conntrack-NAT-helper.txt -Patch30350: 1593-skge-use-NAPI-for-tx-cleanup.txt -Patch30351: 1594-skge-use-auto-masking-of-irqs.txt -Patch30352: 1595-skge-check-the-allocation-of-ring-buffer.txt -Patch30353: 1596-skge-dma-configuration-cleanup.txt -Patch30354: 1597-skge-use-kcalloc.txt -Patch30355: 1598-skge-use-mmiowb.txt -Patch30356: 1599-skge-formmating-and-whitespace-cleanup.txt -Patch30357: 1600-skge-handle-pci-errors-better.txt -Patch30358: 1601-skge-version-1.4.txt -Patch30359: 1602-mv643xx_eth-Cache-align-skb-data-if-CONFIG_NOT_COHERENT_CACHE.txt -Patch30360: 1603-sky2-remove-support-for-untested-Yukon-EC-rev-0.txt -Patch30361: 1604-sky2-drop-broken-wake-on-lan-support.txt -Patch30362: 1605-sky2-rework-of-NAPI-and-IRQ-management.txt -Patch30363: 1606-sky2-coalescing-parameters.txt -Patch30364: 1607-sky2-add-MSI-support.txt -Patch30365: 1608-sky2-whitespace-fixes.txt -Patch30366: 1609-sky2-transmit-recovery.txt -Patch30367: 1610-sky2-handle-all-error-irqs.txt -Patch30368: 1611-sky2-version-1.1.txt -Patch30369: 1612-pcnet32-support-boards-with-multiple-phys.txt -Patch30370: 1613-smc91x-allow-for-dynamic-bus-access-configs.txt -Patch30371: 1614-skfp-warning-fixes.txt -Patch30372: 1615-netdrvr-pcnet32-Lindent.txt -Patch30373: 1616-netdrvr-pcnet32-other-source-formatting-cleanups.txt -Patch30374: 1648-ARM-3373-1-move-uengine-loader-to-arch-arm-common.txt -Patch30375: 1667-Fix-spelling-in-E1000_DISABLE_PACKET_SPLIT-Kconfig-description.txt -Patch30376: 1712-BLUETOOTH-Return-negative-error-constant.txt -Patch30377: 1713-NET-allow-32-bit-socket-ioctl-in-64-bit-kernel.txt -Patch30378: 1714-NET-socket-timestamp-32-bit-handler-for-64-bit-kernel.txt -Patch30379: 1715-X25-ioctl-conversion-32-bit-user-to-64-bit-kernel.txt -Patch30380: 1716-X25-fix-kernel-error-message-64-bit-kernel.txt -Patch30381: 1717-X25-allow-ITU-T-DTE-facilities-for-x25.txt -Patch30382: 1718-X25-dte-facilities-32-64-ioctl-conversion.txt -Patch30383: 1719-TG3-Fix-SRAM-access-during-tg3_init_one.txt -Patch30384: 1720-TG3-Skip-phy-power-down-on-some-devices.txt -Patch30385: 1721-TG3-Bump-driver-version-and-reldate.txt -Patch30386: 1848-netdrvr-e100-experiment-with-doing-RX-in-a-similar-manner-to-eepro100.txt -Patch30387: 1957-NETFILTER-Fix-Kconfig-typos.txt -Patch30388: 1958-NETFILTER-ctnetlink-Fix-expectaction-mask-dumping.txt -Patch30389: 1959-NETFILTER-nfnetlink_queue-fix-nfnetlink-message-size.txt -Patch30390: 1960-NETFILTER-conntrack-cleanup-the-conntrack-ID-initialization.txt -Patch30391: 1961-NETFILTER-x_tables-set-the-protocol-family-in-x_tables-targets-matches.txt -Patch30392: 1962-NETFILTER-nf_conntrack-support-for-layer-3-protocol-load-on-demand.txt -Patch30393: 1963-NETFILTER-Fix-xt_policy-address-matching.txt -Patch30394: 1964-NETFILTER-futher-ip-ip6-arp-_tables-unification.txt -Patch30395: 1965-NETFILTER-Fix-undefined-references-to-get_h225_addr.txt -Patch30396: 1982-fix-spidernet-build-issue.txt -Patch30397: 1983-AMD-Au1xx0-fix-Ethernet-TX-stats.txt -Patch30398: 1987-sky2-more-ethtool-stats.txt -Patch30399: 1988-sis900-adm7001-PHY-support.txt -Patch30400: 1989-Use-after-free-in-net-tulip-de2104x.c.txt -Patch30401: 1990-Use-of-uninitialized-variable-in-drivers-net-depca.c.txt -Patch30402: 1992-wireless-Add-softmac-layer-to-the-kernel.txt -Patch30403: 1993-make-softmac-depend-on-IEEE80211-and-EXPERIMENTAL.txt -Patch30404: 1994-softmac-fix-some-sparse-warnings.txt -Patch30405: 1995-softmac-fix-Makefiles.txt -Patch30406: 1996-softmac-convert-to-use-global-workqueue.txt -Patch30407: 1997-softmac-correctly-use-netif_carrier_-on-off.txt -Patch30408: 1998-softmac-try-to-reassociate-when-being-disassociated-from-the-AP.txt -Patch30409: 1999-softmac-add-fixme-for-disassoc.txt -Patch30410: 2000-softmac-select-best-network-based-on-rssi.txt -Patch30411: 2001-softmac-check-if-disassociation-is-for-us-before-processing-it.txt -Patch30412: 2002-softmac-scan-at-least-once-before-selecting-a-network-by-essid.txt -Patch30413: 2003-softmac-properly-check-return-value-of-ieee80211softmac_alloc_mgt.txt -Patch30414: 2004-softmac-some-comment-stuff.txt -Patch30415: 2005-softmac-add-copyright-and-license-headers.txt -Patch30416: 2006-softmac-add-MODULE_DESCRIPTION-and-MODULE_AUTHORs.txt -Patch30417: 2007-softmac-move-EXPORT_SYMBOL_GPL-right-after-functions.txt -Patch30418: 2009-update-copyright-in-softmac.txt -Patch30419: 2010-trivial-fixes-to-softmac.txt -Patch30420: 2011-softmac-update-deauth-handler-to-quiet-warning.txt -Patch30421: 2012-softmac-add-reassociation-code.txt -Patch30422: 2013-softmac-remove-dead-code.txt -Patch30423: 2014-Fix-softmac-scan.txt -Patch30424: 2028-PKTGEN-Add-MPLS-extension.txt -Patch30425: 2029-BNX2-Fix-link-change-handling.txt -Patch30426: 2030-BNX2-Combine-small-mem-allocations.txt -Patch30427: 2031-BNX2-Move-.h-files-to-bnx2.c.txt -Patch30428: 2032-BNX2-Separate-tx-producer-and-consumer-fields.txt -Patch30429: 2033-BNX2-Update-version-and-reldate.txt -Patch30430: 2034-IPV4-Add-fib-rule-netlink-notifications.txt -Patch30431: 2035-NET_SCHED-cls_u32-remove-unnecessary-NULL-ptr-check.txt -Patch30432: 2036-IPV6-ip6_xmit-remove-unnecessary-NULL-ptr-check.txt -Patch30433: 2037-TG3-Add-5755-support.txt -Patch30434: 2038-TG3-Add-5755-nvram-support.txt -Patch30435: 2039-TG3-Update-driver-version-and-reldate.txt -Patch30436: 2040-softmac-remove-function_enter.txt -Patch30437: 2041-WE-20-for-kernel-2.6.16.txt -Patch30438: 2120-sem2mutex-drivers-raw-connector-dcdbas-ppp_generic.txt -Patch30439: 2171-more-for_each_cpu-conversions.txt -Patch30440: 2188-wireless-airo-clean-up-printk-usage-to-print-device-name.txt -Patch30441: 2189-wireless-airo-define-default-MTU.txt -Patch30442: 2190-wireless-airo-cache-wireless-scans.txt -Patch30443: 2191-hostap-Fix-hw-reset-after-CMDCODE_ACCESS_WRITE-timeout.txt -Patch30444: 2192-hostap-Fix-ap_add_sta-return-value-verification.txt -Patch30445: 2193-hostap-Fix-double-free-in-prism2_config-error-path.txt -Patch30446: 2194-hostap-Fix-unlikely-read-overrun-in-CIS-parsing.txt -Patch30447: 2195-hostap-Remove-dead-code-duplicated-idx-0.txt -Patch30448: 2196-hostap-Fix-memory-leak-on-PCI-probe-error-path.txt -Patch30449: 2198-sky2-typo-in-last-stats-patch.txt -Patch30450: 2199-sky2-Fix-RX-stats.txt -Patch30451: 2200-sky2-dont-need-to-use-dev_kfree_skb_any.txt -Patch30452: 2201-skge-align-receive-buffers.txt -Patch30453: 2202-skge-dont-use-dev_alloc_skb-for-rx-buffs.txt -Patch30454: 2203-skge-rx_reuse-called-twice.txt -Patch30455: 2204-skge-multicast-statistics-fix.txt -Patch30456: 2205-skge-dont-free-skb-until-multi-part-transmit-complete.txt -Patch30457: 2206-skge-compute-available-ring-buffers.txt -Patch30458: 2207-skge-version-1.5.txt -Patch30459: 2361-remove-ISA-legacy-functions-drivers-net-hp-plus.c.txt -Patch30460: 2362-remove-ISA-legacy-functions-drivers-net-lance.c.txt -Patch30461: 2425-Fix-value-computed-not-used-warnings.txt -Patch30462: 2449-AT91RM9200-Ethernet-driver.txt -Patch30463: 2450-net-ne2k.c-won-t-compile-if-pci_clone_list-is-const.txt -Patch30464: 2514-BRIDGE-Unaligned-accesses-in-the-ethernet-bridge.txt -Patch30465: 2517-NET-Fill-in-a-32-bit-hole-in-struct-sock-on-64-bit-platforms.txt -Patch30466: 2519-WIRELESS-Fix-config-dependencies.txt -Patch30467: 2531-NET-Take-RTNL-when-unregistering-notifier.txt -Patch30468: 2532-SCTP-Fix-up-sctp_rcv-return-value.txt -Patch30469: 2533-TCP-Set-default-max-buffers-from-memory-pool-size.txt -Patch30470: 2534-TCP-Mark-tcp_-mem-__read_mostly.txt -Patch30471: 2535-IPV4-Aggregate-route-entries-with-different-TOS-values.txt -Patch30472: 2536-NETFILTER-x_table.c-sem2mutex.txt -Patch30473: 2578-fix-defined-but-not-used-warning-in-net-rxrpc-main.c-rxrpc_initialise.txt -Patch30474: 2587-hp300-fix-driver_register-return-handling-remove-dio_module_init.txt -Patch30475: 2588-EISA-tidy-up-driver_register-return-value.txt -Patch30476: 2589-amiga-fix-driver_register-return-handling-remove-zorro_module_init.txt -Patch30477: 2608-POLLRDHUP-EPOLLRDHUP-handling-for-half-closed-devices-notifications.txt -Patch30478: 2799-3c59x-use-mii_check_media.txt -Patch30479: 2800-3c59x-decrease-polling-interval.txt -Patch30480: 2801-3c59x-carriercheck-for-forced-media.txt -Patch30481: 2802-3c59x-use-ethtool_op_get_link.txt -Patch30482: 2803-3c59x-remove-per-driver-versioning.txt -Patch30483: 2804-3c59x-minor-cleanups.txt -Patch30484: 2882-more-s-fucn-func-typo-fixes.txt -Patch30485: 2942-IPSEC-Fix-tunnel-error-handling-in-ipcomp6.txt -Patch30486: 2943-NET-drop-duplicate-assignment-in-request_sock.txt -Patch30487: 2954-wireless-import-bcm43xx-sources.txt -Patch30488: 2955-bcm43xx-patch-Kconfig-and-wireless-Makefile-for-import.txt -Patch30489: 2956-bcm43xx-sync-with-svn.berlios.de.txt -Patch30490: 2957-bcm43xx-remove-linux-version-compatibility-code.txt -Patch30491: 2960-bcm43xx-add-DEBUG-Kconfig-option.-Also-fix-indention.txt -Patch30492: 2961-bcm43xx-Fix-makefile.-Remove-all-the-out-of-tree-stuff.txt -Patch30493: 2962-bcm43xx-Add-more-initvals-sanity-checks-and-error-out-if-one-sanity-check-fails.txt -Patch30494: 2963-bcm43xx-Remove-function-bcm43xx_channel_is_allowed.txt -Patch30495: 2964-bcm43xx-basic-ethtool-support.txt -Patch30496: 2965-bcm43xx-Wireless-Ext-update.txt -Patch30497: 2966-Sync-bcm43xx_phy_initb6-with-specs.txt -Patch30498: 2967-bcm43xx-fix-txpower-reporting-in-WE.txt -Patch30499: 2968-bcm43xx-enable-SPROM-writing.txt -Patch30500: 2969-bcm43xx-heavily-increase-mac_suspend-timeout.txt -Patch30501: 2970-bcm43xx-fix-compiletime-warning-phy_xmitpower.txt -Patch30502: 2971-bcm43xx-remove-WX-debugging.txt -Patch30503: 2972-bcm43xx-Partially-fix-PIO-code.-Add-Kconfig-option-for-PIO-or-DMA-mode-or-both.txt -Patch30504: 2973-bcm43xx-add-a-note-that-not-all-devices-support-PIO.txt -Patch30505: 2974-Apple-Airport-Add-Kconfig-note-that-the-bcm43xx-driver-has-to-be-used-for-Airport-Extreme-cards.txt -Patch30506: 2976-bcm43xx-fix-LED-code.txt -Patch30507: 2977-bcm43xx-rewrite-and-simplify-the-periodic-task-handling.txt -Patch30508: 2978-bcm43xx-Code-cleanups.-This-removes-various-inline-statements-and-reduces-codesize.txt -Patch30509: 2979-bcm43xx-Move-sprom-lowlevel-reading-writing-to-its-own-functions.txt -Patch30510: 2980-bcm43xx-make-bcm43xx_sprom_crc-static.txt -Patch30511: 2981-bcm43xx-split-the-channel-helper-functions-so-that-they-can-be-used-without-a-valid-running-core.txt -Patch30512: 2982-bcm43xx-remove-old-unused-struct.txt -Patch30513: 2983-bcm43xx-Fix-Kconfig-typo-transfer-mode-default.txt -Patch30514: 2984-bcm43xx-Workaround-init_board-vs-IRQ-race.txt -Patch30515: 2985-bcm43xx-move-initialized-1-to-the-end-of-init_board.txt -Patch30516: 2986-bcm43xx-add-assert-bcm-initialized-to-periodic_tasks_setup.txt -Patch30517: 2987-bcm43xx-Move-TX-RX-related-functions-to-its-own-file.-Add-basic-RTS-CTS-code.txt -Patch30518: 2988-bcm43xx-Add-sysfs-attributes-for-device-specific-tunables.txt -Patch30519: 2989-bcm43xx-fix-DMA-TX-skb-freeing-in-case-of-fragmented-packets.txt -Patch30520: 2990-bcm43xx-Set-both-the-DMAmask-and-the-coherent-DMAmask.txt -Patch30521: 2991-bcm43xx-Abstract-the-locking-mechanism.txt -Patch30522: 2992-bcm43xx-Remove-the-mmio-access-printing-facility-overhead.txt -Patch30523: 2993-bcm43xx-fix-some-stuff-add-a-few-missing-mmiowb-remove-dead-code.txt -Patch30524: 2994-bcm43xx-receive-TX-status-on-MMIO-or-DMA-unconditionally-regarding-the-80211-core-rev.txt -Patch30525: 2995-bcm43xx-add-functions-bcm43xx_dma_read-write-bcm43xx_dma_tx_suspend-resume.txt -Patch30526: 2996-bcm43xx-reduce-the-size-of-bcm43xx_private-by-removing-unneeded-members.txt -Patch30527: 2997-bcm43xx-Fix-crash-on-ifdown-by-being-careful-in-pio-dma-freeing.txt -Patch30528: 2998-bcm43xx-Remove-the-workaround-in-dummy_transmission.txt -Patch30529: 2999-bcm43xx-Do-boardflags-workarounds-for-specific-boards.txt -Patch30530: 3000-bcm43xx-properly-mask-txctl1-before-writing-it-to-hardware.txt -Patch30531: 3001-bcm43xx-remove-check-for-mmio-length-as-it-differs-among-platforms.-especially-embedded.txt -Patch30532: 3002-bcm43xx-fix-some-gpio-register-trashing-hopefully-D.txt -Patch30533: 3003-bcm43xx-merge-all-iwmode-code-into-the-set_iwmode-function.txt -Patch30534: 3004-bcm43xx-some-IRQ-handler-cleanups.txt -Patch30535: 3005-bcm43xx-set-default-attenuation-values.txt -Patch30536: 3006-bcm43xx-sync-interference-mitigation-code-to-the-specs.txt -Patch30537: 3007-bcm43xx-fix-nrssi_threshold-calculation.txt -Patch30538: 3008-bcm43xx-add-useless-and-broken-statistics-stuff.-People-seem-to-want-it.-well.txt -Patch30539: 3009-bcm43xx-get-rid-of-vim-.-lines-at-the-end-of-several-files.txt -Patch30540: 3010-bcm43xx-fix-include-issues-on-some-platforms.txt -Patch30541: 3011-bcm43xx-remove-some-compilerwarnings.txt -Patch30542: 3012-bcm43xx-fix-the-remaining-sparse-warnings.txt -Patch30543: 3013-bcm43xx-sync-GPHY-init-with-the-specs.txt -Patch30544: 3014-bcm43xx-don-t-set-the-channel-on-a-device-which-is-down.txt -Patch30545: 3015-PCMCIA_SPECTRUM-must-select-FW_LOADER.txt -Patch30546: 3017-hostap-Make-hostap_tx_encrypt-static.txt -Patch30547: 3018-hostap-Fix-EAPOL-frame-encryption.txt -Patch30548: 3056-knfsd-Change-the-store-of-auth_domains-to-not-be-a-cache.txt -Patch30549: 3058-knfsd-Get-rid-of-inplace-sunrpc-caches.txt -Patch30550: 3059-knfsd-Create-cache_lookup-function-instead-of-using-a-macro-to-declare-one.txt -Patch30551: 3060-knfsd-Convert-ip_map-cache-to-use-the-new-lookup-routine.txt -Patch30552: 3063-knfsd-Use-new-sunrpc-cache-for-rsi-cache.txt -Patch30553: 3064-knfsd-Use-new-cache-code-for-rsc-cache.txt -Patch30554: 3066-knfsd-An-assortment-of-little-fixes-to-the-sunrpc-cache-code.txt -Patch30555: 3068-knfsd-Unexport-cache_fresh-and-fix-a-small-race.txt -Patch30556: 3071-knfsd-Tidy-up-unix_domain_find.txt -Patch30557: 3143-pnp-IRDA-adjust-pnp_register_driver-signature.txt -Patch30558: 3219-Minor-janitorial-change-to-ieee80211.txt -Patch30559: 3220-wireless-add-prism54usb-driver.txt -Patch30560: 3221-prism54usb-fix-build-break-in-islusb_init.c.txt -Patch30561: 3222-wireless-add-acx-driver.txt -Patch30562: 3223-acxsm-merge-from-acx-0.3.32.txt -Patch30563: 3224-tiacx-Let-only-ACX_PCI-ACX_USB-be-user-visible.txt -Patch30564: 3225-softmac-prism54usb-update.txt -Patch30565: 3226-tiacx-revert-neither-PCI-nor-USB-is-selected-change.txt -Patch30566: 3227-tiacx-implement-much-more-flexible-firmware-statistics-parsing.txt -Patch30567: 3228-tiacx-Change-acx_ioctl_-get-set-_encode-to-use-kernel-80211-stack.txt -Patch30568: 3229-tiacx-fix-breakage-of-Get-rid-of-circular-list-of-adev-s.txt -Patch30569: 3230-tiacx-split-module-into-acx-common-acx-pci-acx-usb.txt -Patch30570: 3231-softmac-reduce-scan-dwell-time.txt -Patch30571: 3232-softmac-reduce-default-rate-to-11Mbps.txt -Patch30572: 3233-update-prism54usb-sources.txt -Patch30573: 3234-TG3-Fix-probe-failure-due-to-invalid-MAC-address.txt -Patch30574: 3235-TG3-Fix-bug-in-40-bit-DMA-workaround-code.txt -Patch30575: 3236-TG3-Fix-PHY-loopback-on-5700.txt -Patch30576: 3237-TG3-Speed-up-SRAM-access.txt -Patch30577: 3238-TG3-Skip-timer-code-during-full-lock.txt -Patch30578: 3239-TG3-Update-version-and-reldate.txt -Patch30579: 3241-NET-Fix-ipx-econet-appletalk-irda-ioctl-crashes.txt -Patch30580: 3242-ECONET-Convert-away-from-SOCKOPS_WRAPPED.txt -Patch30581: 3243-NET-deinline-200-byte-inlines-in-sock.h.txt +Patch30283: 1433-NET-minor-net_rx_action-optimization.txt +Patch30284: 1435-TG3-Add-5787-and-5754-basic-support.txt +Patch30285: 1436-TG3-Add-5787-nvram-support.txt +Patch30286: 1437-TG3-Add-new-hard_start_xmit.txt +Patch30287: 1439-TG3-Add-ipv6-checksum-support.txt +Patch30288: 1440-TG3-Add-new-one-shot-MSI-handler.txt +Patch30289: 1441-TG3-Fixup-memory-test-for-5787.txt +Patch30290: 1442-TG3-nvram-cleanup.txt +Patch30291: 1443-TG3-Add-firmware-version-info.txt +Patch30292: 1444-TG3-update-version-and-reldate.txt +Patch30293: 1446-DCCP-options-Fix-handling-of-ackvecs-in-DATA-packets.txt +Patch30294: 1448-DCCP-ditch-dccp_v-46-_ctl_send_ack.txt +Patch30295: 1449-DCCP-Remove-leftover-dccp_send_response-prototype.txt +Patch30296: 1451-NET-dev_put-dev_hold-cleanup.txt +Patch30297: 1452-IRDA-sem2mutex-drivers-net-irda.txt +Patch30298: 1454-IRDA-remove-MODULE_PARM.txt +Patch30299: 1455-CASSINI-sem2mutex.txt +Patch30300: 1456-SUNGEM-sem2mutex.txt +Patch30301: 1457-WAN-fix-section-mismatch-warning-in-sbni.txt +Patch30302: 1459-NET-sem2mutex-part-2.txt +Patch30303: 1460-DCCP-Fix-uninitialized-var-warnings-in-dccp_parse_options.txt +Patch30304: 1461-NETFILTER-Fix-warnings-in-ip_nat_snmp_basic.c.txt +Patch30305: 1462-TIPC-Fix-simple-sparse-warnings.txt +Patch30306: 1463-TIPC-Remove-inlines-from-.c.txt +Patch30307: 1464-TIPC-Remove-unused-functions.txt +Patch30308: 1465-TIPC-Cleanups.txt +Patch30309: 1466-TIPC-Reduce-stack-usage.txt +Patch30310: 1467-TIPC-Avoid-compiler-warning.txt +Patch30311: 1468-TG3-netif_carrier_off-runs-too-early-could-still-be-queued-when-init-fails.txt +Patch30312: 1469-IPV4-ARP-Alloc-acceptance-of-unsolicited-ARP-via-netdevice-sysctl.txt +Patch30313: 1471-TCP-sysctl-to-allow-TCP-window-32767-sans-wscale.txt +Patch30314: 1472-XFRM-Fix-aevent-related-crash.txt +Patch30315: 1474-DECnet-Endian-annotation-and-fixes-for-DECnet.txt +Patch30316: 1475-DECnet-Patch-to-fix-recvmsg-flag-check.txt +Patch30317: 1476-DECnet-Use-RCU-locking-in-dn_rules.c.txt +Patch30318: 1477-NET-Replace-skb_pull-skb_postpull_rcsum-with-skb_pull_rcsum.txt +Patch30319: 1478-PKT_SCHED-Let-NET_CLS_ACT-no-longer-depend-on-EXPERIMENTAL.txt +Patch30320: 1479-IPV6-remove-useless-test-in-ip6_append_data.txt +Patch30321: 1481-SNAP-Remove-leftover-unused-hdr-variable.txt +Patch30322: 1485-SK_BUFF-export-skb_pull_rcsum.txt +Patch30323: 1492-BRIDGE-ebtables-Build-fix.txt +Patch30324: 1493-BRIDGE-br_netfilter-Warning-fixes.txt +Patch30325: 1494-BRIDGE-remove-unneeded-bh-disables.txt +Patch30326: 1495-BRIDGE-use-setup_timer.txt +Patch30327: 1496-BRIDGE-use-kcalloc.txt +Patch30328: 1497-BRIDGE-use-kzalloc.txt +Patch30329: 1498-BRIDGE-optimize-frame-pass-up.txt +Patch30330: 1499-BRIDGE-netfilter-whitespace.txt +Patch30331: 1500-BRIDGE-netfilter-dont-use-__constant_htons.txt +Patch30332: 1501-BRIDGE-netfilter-VLAN-macro-cleanup.txt +Patch30333: 1502-BRIDGE-netfilter-inline-cleanup.txt +Patch30334: 1503-BRIDGE-forwarding-remove-unneeded-preempt-and-bh-diasables.txt +Patch30335: 1504-BRIDGE-stp-timer-to-jiffies-cleanup.txt +Patch30336: 1505-BRIDGE-use-llc-for-receiving-STP-packets.txt +Patch30337: 1506-BRIDGE-allow-show-store-of-group-multicast-address.txt +Patch30338: 1507-LLC-llc_mac_hdr_init-const-arguments.txt +Patch30339: 1508-BRIDGE-use-LLC-to-send-STP.txt +Patch30340: 1509-TG3-make-drivers-net-tg3.c-tg3_request_irq-static.txt +Patch30341: 1510-DECNET-net-decnet-dn_route.c-fix-inconsequent-NULL-checking.txt +Patch30342: 1511-BRIDGE-Remove-duplicate-const-from-is_link_local-argument-type.txt +Patch30343: 1512-IPV6-Cleanup-of-net-ipv6-reassambly.c.txt +Patch30344: 1513-IPV6-Nearly-complete-kzalloc-cleanup-for-net-ipv6.txt +Patch30345: 1514-IPV6-Cleanups-for-net-ipv6-addrconf.c-kzalloc-early-exit-v2.txt +Patch30346: 1515-TG3-Don-t-mark-tg3_test_registers-as-returning-const.txt +Patch30347: 1516-NETFILTER-Add-H.323-conntrack-NAT-helper.txt +Patch30348: 1593-skge-use-NAPI-for-tx-cleanup.txt +Patch30349: 1594-skge-use-auto-masking-of-irqs.txt +Patch30350: 1595-skge-check-the-allocation-of-ring-buffer.txt +Patch30351: 1596-skge-dma-configuration-cleanup.txt +Patch30352: 1597-skge-use-kcalloc.txt +Patch30353: 1598-skge-use-mmiowb.txt +Patch30354: 1599-skge-formmating-and-whitespace-cleanup.txt +Patch30355: 1600-skge-handle-pci-errors-better.txt +Patch30356: 1601-skge-version-1.4.txt +Patch30357: 1602-mv643xx_eth-Cache-align-skb-data-if-CONFIG_NOT_COHERENT_CACHE.txt +Patch30358: 1603-sky2-remove-support-for-untested-Yukon-EC-rev-0.txt +Patch30359: 1604-sky2-drop-broken-wake-on-lan-support.txt +Patch30360: 1605-sky2-rework-of-NAPI-and-IRQ-management.txt +Patch30361: 1606-sky2-coalescing-parameters.txt +Patch30362: 1607-sky2-add-MSI-support.txt +Patch30363: 1608-sky2-whitespace-fixes.txt +Patch30364: 1609-sky2-transmit-recovery.txt +Patch30365: 1610-sky2-handle-all-error-irqs.txt +Patch30366: 1611-sky2-version-1.1.txt +Patch30367: 1612-pcnet32-support-boards-with-multiple-phys.txt +Patch30368: 1613-smc91x-allow-for-dynamic-bus-access-configs.txt +Patch30369: 1614-skfp-warning-fixes.txt +Patch30370: 1615-netdrvr-pcnet32-Lindent.txt +Patch30371: 1616-netdrvr-pcnet32-other-source-formatting-cleanups.txt +Patch30372: 1648-ARM-3373-1-move-uengine-loader-to-arch-arm-common.txt +Patch30373: 1667-Fix-spelling-in-E1000_DISABLE_PACKET_SPLIT-Kconfig-description.txt +Patch30374: 1712-BLUETOOTH-Return-negative-error-constant.txt +Patch30375: 1713-NET-allow-32-bit-socket-ioctl-in-64-bit-kernel.txt +Patch30376: 1714-NET-socket-timestamp-32-bit-handler-for-64-bit-kernel.txt +Patch30377: 1715-X25-ioctl-conversion-32-bit-user-to-64-bit-kernel.txt +Patch30378: 1716-X25-fix-kernel-error-message-64-bit-kernel.txt +Patch30379: 1717-X25-allow-ITU-T-DTE-facilities-for-x25.txt +Patch30380: 1718-X25-dte-facilities-32-64-ioctl-conversion.txt +Patch30381: 1719-TG3-Fix-SRAM-access-during-tg3_init_one.txt +Patch30382: 1720-TG3-Skip-phy-power-down-on-some-devices.txt +Patch30383: 1721-TG3-Bump-driver-version-and-reldate.txt +Patch30384: 1848-netdrvr-e100-experiment-with-doing-RX-in-a-similar-manner-to-eepro100.txt +Patch30385: 1957-NETFILTER-Fix-Kconfig-typos.txt +Patch30386: 1958-NETFILTER-ctnetlink-Fix-expectaction-mask-dumping.txt +Patch30387: 1959-NETFILTER-nfnetlink_queue-fix-nfnetlink-message-size.txt +Patch30388: 1960-NETFILTER-conntrack-cleanup-the-conntrack-ID-initialization.txt +Patch30389: 1961-NETFILTER-x_tables-set-the-protocol-family-in-x_tables-targets-matches.txt +Patch30390: 1962-NETFILTER-nf_conntrack-support-for-layer-3-protocol-load-on-demand.txt +Patch30391: 1963-NETFILTER-Fix-xt_policy-address-matching.txt +Patch30392: 1964-NETFILTER-futher-ip-ip6-arp-_tables-unification.txt +Patch30393: 1965-NETFILTER-Fix-undefined-references-to-get_h225_addr.txt +Patch30394: 1982-fix-spidernet-build-issue.txt +Patch30395: 1983-AMD-Au1xx0-fix-Ethernet-TX-stats.txt +Patch30396: 1987-sky2-more-ethtool-stats.txt +Patch30397: 1988-sis900-adm7001-PHY-support.txt +Patch30398: 1989-Use-after-free-in-net-tulip-de2104x.c.txt +Patch30399: 1990-Use-of-uninitialized-variable-in-drivers-net-depca.c.txt +Patch30400: 1992-wireless-Add-softmac-layer-to-the-kernel.txt +Patch30401: 1993-make-softmac-depend-on-IEEE80211-and-EXPERIMENTAL.txt +Patch30402: 1994-softmac-fix-some-sparse-warnings.txt +Patch30403: 1995-softmac-fix-Makefiles.txt +Patch30404: 1996-softmac-convert-to-use-global-workqueue.txt +Patch30405: 1997-softmac-correctly-use-netif_carrier_-on-off.txt +Patch30406: 1998-softmac-try-to-reassociate-when-being-disassociated-from-the-AP.txt +Patch30407: 1999-softmac-add-fixme-for-disassoc.txt +Patch30408: 2000-softmac-select-best-network-based-on-rssi.txt +Patch30409: 2001-softmac-check-if-disassociation-is-for-us-before-processing-it.txt +Patch30410: 2002-softmac-scan-at-least-once-before-selecting-a-network-by-essid.txt +Patch30411: 2003-softmac-properly-check-return-value-of-ieee80211softmac_alloc_mgt.txt +Patch30412: 2004-softmac-some-comment-stuff.txt +Patch30413: 2005-softmac-add-copyright-and-license-headers.txt +Patch30414: 2006-softmac-add-MODULE_DESCRIPTION-and-MODULE_AUTHORs.txt +Patch30415: 2007-softmac-move-EXPORT_SYMBOL_GPL-right-after-functions.txt +Patch30416: 2009-update-copyright-in-softmac.txt +Patch30417: 2010-trivial-fixes-to-softmac.txt +Patch30418: 2011-softmac-update-deauth-handler-to-quiet-warning.txt +Patch30419: 2012-softmac-add-reassociation-code.txt +Patch30420: 2013-softmac-remove-dead-code.txt +Patch30421: 2014-Fix-softmac-scan.txt +Patch30422: 2028-PKTGEN-Add-MPLS-extension.txt +Patch30423: 2029-BNX2-Fix-link-change-handling.txt +Patch30424: 2030-BNX2-Combine-small-mem-allocations.txt +Patch30425: 2031-BNX2-Move-.h-files-to-bnx2.c.txt +Patch30426: 2032-BNX2-Separate-tx-producer-and-consumer-fields.txt +Patch30427: 2033-BNX2-Update-version-and-reldate.txt +Patch30428: 2034-IPV4-Add-fib-rule-netlink-notifications.txt +Patch30429: 2035-NET_SCHED-cls_u32-remove-unnecessary-NULL-ptr-check.txt +Patch30430: 2036-IPV6-ip6_xmit-remove-unnecessary-NULL-ptr-check.txt +Patch30431: 2037-TG3-Add-5755-support.txt +Patch30432: 2038-TG3-Add-5755-nvram-support.txt +Patch30433: 2039-TG3-Update-driver-version-and-reldate.txt +Patch30434: 2040-softmac-remove-function_enter.txt +Patch30435: 2041-WE-20-for-kernel-2.6.16.txt +Patch30436: 2120-sem2mutex-drivers-raw-connector-dcdbas-ppp_generic.txt +Patch30437: 2171-more-for_each_cpu-conversions.txt +Patch30438: 2188-wireless-airo-clean-up-printk-usage-to-print-device-name.txt +Patch30439: 2189-wireless-airo-define-default-MTU.txt +Patch30440: 2190-wireless-airo-cache-wireless-scans.txt +Patch30441: 2191-hostap-Fix-hw-reset-after-CMDCODE_ACCESS_WRITE-timeout.txt +Patch30442: 2192-hostap-Fix-ap_add_sta-return-value-verification.txt +Patch30443: 2193-hostap-Fix-double-free-in-prism2_config-error-path.txt +Patch30444: 2194-hostap-Fix-unlikely-read-overrun-in-CIS-parsing.txt +Patch30445: 2195-hostap-Remove-dead-code-duplicated-idx-0.txt +Patch30446: 2196-hostap-Fix-memory-leak-on-PCI-probe-error-path.txt +Patch30447: 2198-sky2-typo-in-last-stats-patch.txt +Patch30448: 2199-sky2-Fix-RX-stats.txt +Patch30449: 2200-sky2-dont-need-to-use-dev_kfree_skb_any.txt +Patch30450: 2201-skge-align-receive-buffers.txt +Patch30451: 2202-skge-dont-use-dev_alloc_skb-for-rx-buffs.txt +Patch30452: 2203-skge-rx_reuse-called-twice.txt +Patch30453: 2204-skge-multicast-statistics-fix.txt +Patch30454: 2205-skge-dont-free-skb-until-multi-part-transmit-complete.txt +Patch30455: 2206-skge-compute-available-ring-buffers.txt +Patch30456: 2207-skge-version-1.5.txt +Patch30457: 2361-remove-ISA-legacy-functions-drivers-net-hp-plus.c.txt +Patch30458: 2362-remove-ISA-legacy-functions-drivers-net-lance.c.txt +Patch30459: 2425-Fix-value-computed-not-used-warnings.txt +Patch30460: 2449-AT91RM9200-Ethernet-driver.txt +Patch30461: 2450-net-ne2k.c-won-t-compile-if-pci_clone_list-is-const.txt +Patch30462: 2514-BRIDGE-Unaligned-accesses-in-the-ethernet-bridge.txt +Patch30463: 2517-NET-Fill-in-a-32-bit-hole-in-struct-sock-on-64-bit-platforms.txt +Patch30464: 2519-WIRELESS-Fix-config-dependencies.txt +Patch30465: 2531-NET-Take-RTNL-when-unregistering-notifier.txt +Patch30466: 2532-SCTP-Fix-up-sctp_rcv-return-value.txt +Patch30467: 2533-TCP-Set-default-max-buffers-from-memory-pool-size.txt +Patch30468: 2534-TCP-Mark-tcp_-mem-__read_mostly.txt +Patch30469: 2535-IPV4-Aggregate-route-entries-with-different-TOS-values.txt +Patch30470: 2536-NETFILTER-x_table.c-sem2mutex.txt +Patch30471: 2578-fix-defined-but-not-used-warning-in-net-rxrpc-main.c-rxrpc_initialise.txt +Patch30472: 2587-hp300-fix-driver_register-return-handling-remove-dio_module_init.txt +Patch30473: 2588-EISA-tidy-up-driver_register-return-value.txt +Patch30474: 2589-amiga-fix-driver_register-return-handling-remove-zorro_module_init.txt +Patch30475: 2608-POLLRDHUP-EPOLLRDHUP-handling-for-half-closed-devices-notifications.txt +Patch30476: 2799-3c59x-use-mii_check_media.txt +Patch30477: 2800-3c59x-decrease-polling-interval.txt +Patch30478: 2801-3c59x-carriercheck-for-forced-media.txt +Patch30479: 2802-3c59x-use-ethtool_op_get_link.txt +Patch30480: 2803-3c59x-remove-per-driver-versioning.txt +Patch30481: 2804-3c59x-minor-cleanups.txt +Patch30482: 2882-more-s-fucn-func-typo-fixes.txt +Patch30483: 2942-IPSEC-Fix-tunnel-error-handling-in-ipcomp6.txt +Patch30484: 2943-NET-drop-duplicate-assignment-in-request_sock.txt +Patch30485: 2954-wireless-import-bcm43xx-sources.txt +Patch30486: 2955-bcm43xx-patch-Kconfig-and-wireless-Makefile-for-import.txt +Patch30487: 2956-bcm43xx-sync-with-svn.berlios.de.txt +Patch30488: 2957-bcm43xx-remove-linux-version-compatibility-code.txt +Patch30489: 2960-bcm43xx-add-DEBUG-Kconfig-option.-Also-fix-indention.txt +Patch30490: 2961-bcm43xx-Fix-makefile.-Remove-all-the-out-of-tree-stuff.txt +Patch30491: 2962-bcm43xx-Add-more-initvals-sanity-checks-and-error-out-if-one-sanity-check-fails.txt +Patch30492: 2963-bcm43xx-Remove-function-bcm43xx_channel_is_allowed.txt +Patch30493: 2964-bcm43xx-basic-ethtool-support.txt +Patch30494: 2965-bcm43xx-Wireless-Ext-update.txt +Patch30495: 2966-Sync-bcm43xx_phy_initb6-with-specs.txt +Patch30496: 2967-bcm43xx-fix-txpower-reporting-in-WE.txt +Patch30497: 2968-bcm43xx-enable-SPROM-writing.txt +Patch30498: 2969-bcm43xx-heavily-increase-mac_suspend-timeout.txt +Patch30499: 2970-bcm43xx-fix-compiletime-warning-phy_xmitpower.txt +Patch30500: 2971-bcm43xx-remove-WX-debugging.txt +Patch30501: 2972-bcm43xx-Partially-fix-PIO-code.-Add-Kconfig-option-for-PIO-or-DMA-mode-or-both.txt +Patch30502: 2973-bcm43xx-add-a-note-that-not-all-devices-support-PIO.txt +Patch30503: 2974-Apple-Airport-Add-Kconfig-note-that-the-bcm43xx-driver-has-to-be-used-for-Airport-Extreme-cards.txt +Patch30504: 2976-bcm43xx-fix-LED-code.txt +Patch30505: 2977-bcm43xx-rewrite-and-simplify-the-periodic-task-handling.txt +Patch30506: 2978-bcm43xx-Code-cleanups.-This-removes-various-inline-statements-and-reduces-codesize.txt +Patch30507: 2979-bcm43xx-Move-sprom-lowlevel-reading-writing-to-its-own-functions.txt +Patch30508: 2980-bcm43xx-make-bcm43xx_sprom_crc-static.txt +Patch30509: 2981-bcm43xx-split-the-channel-helper-functions-so-that-they-can-be-used-without-a-valid-running-core.txt +Patch30510: 2982-bcm43xx-remove-old-unused-struct.txt +Patch30511: 2983-bcm43xx-Fix-Kconfig-typo-transfer-mode-default.txt +Patch30512: 2984-bcm43xx-Workaround-init_board-vs-IRQ-race.txt +Patch30513: 2985-bcm43xx-move-initialized-1-to-the-end-of-init_board.txt +Patch30514: 2986-bcm43xx-add-assert-bcm-initialized-to-periodic_tasks_setup.txt +Patch30515: 2987-bcm43xx-Move-TX-RX-related-functions-to-its-own-file.-Add-basic-RTS-CTS-code.txt +Patch30516: 2988-bcm43xx-Add-sysfs-attributes-for-device-specific-tunables.txt +Patch30517: 2989-bcm43xx-fix-DMA-TX-skb-freeing-in-case-of-fragmented-packets.txt +Patch30518: 2990-bcm43xx-Set-both-the-DMAmask-and-the-coherent-DMAmask.txt +Patch30519: 2991-bcm43xx-Abstract-the-locking-mechanism.txt +Patch30520: 2992-bcm43xx-Remove-the-mmio-access-printing-facility-overhead.txt +Patch30521: 2993-bcm43xx-fix-some-stuff-add-a-few-missing-mmiowb-remove-dead-code.txt +Patch30522: 2994-bcm43xx-receive-TX-status-on-MMIO-or-DMA-unconditionally-regarding-the-80211-core-rev.txt +Patch30523: 2995-bcm43xx-add-functions-bcm43xx_dma_read-write-bcm43xx_dma_tx_suspend-resume.txt +Patch30524: 2996-bcm43xx-reduce-the-size-of-bcm43xx_private-by-removing-unneeded-members.txt +Patch30525: 2997-bcm43xx-Fix-crash-on-ifdown-by-being-careful-in-pio-dma-freeing.txt +Patch30526: 2998-bcm43xx-Remove-the-workaround-in-dummy_transmission.txt +Patch30527: 2999-bcm43xx-Do-boardflags-workarounds-for-specific-boards.txt +Patch30528: 3000-bcm43xx-properly-mask-txctl1-before-writing-it-to-hardware.txt +Patch30529: 3001-bcm43xx-remove-check-for-mmio-length-as-it-differs-among-platforms.-especially-embedded.txt +Patch30530: 3002-bcm43xx-fix-some-gpio-register-trashing-hopefully-D.txt +Patch30531: 3003-bcm43xx-merge-all-iwmode-code-into-the-set_iwmode-function.txt +Patch30532: 3004-bcm43xx-some-IRQ-handler-cleanups.txt +Patch30533: 3005-bcm43xx-set-default-attenuation-values.txt +Patch30534: 3006-bcm43xx-sync-interference-mitigation-code-to-the-specs.txt +Patch30535: 3007-bcm43xx-fix-nrssi_threshold-calculation.txt +Patch30536: 3008-bcm43xx-add-useless-and-broken-statistics-stuff.-People-seem-to-want-it.-well.txt +Patch30537: 3009-bcm43xx-get-rid-of-vim-.-lines-at-the-end-of-several-files.txt +Patch30538: 3010-bcm43xx-fix-include-issues-on-some-platforms.txt +Patch30539: 3011-bcm43xx-remove-some-compilerwarnings.txt +Patch30540: 3012-bcm43xx-fix-the-remaining-sparse-warnings.txt +Patch30541: 3013-bcm43xx-sync-GPHY-init-with-the-specs.txt +Patch30542: 3014-bcm43xx-don-t-set-the-channel-on-a-device-which-is-down.txt +Patch30543: 3015-PCMCIA_SPECTRUM-must-select-FW_LOADER.txt +Patch30544: 3017-hostap-Make-hostap_tx_encrypt-static.txt +Patch30545: 3018-hostap-Fix-EAPOL-frame-encryption.txt +Patch30546: 3056-knfsd-Change-the-store-of-auth_domains-to-not-be-a-cache.txt +Patch30547: 3058-knfsd-Get-rid-of-inplace-sunrpc-caches.txt +Patch30548: 3059-knfsd-Create-cache_lookup-function-instead-of-using-a-macro-to-declare-one.txt +Patch30549: 3060-knfsd-Convert-ip_map-cache-to-use-the-new-lookup-routine.txt +Patch30550: 3063-knfsd-Use-new-sunrpc-cache-for-rsi-cache.txt +Patch30551: 3064-knfsd-Use-new-cache-code-for-rsc-cache.txt +Patch30552: 3066-knfsd-An-assortment-of-little-fixes-to-the-sunrpc-cache-code.txt +Patch30553: 3068-knfsd-Unexport-cache_fresh-and-fix-a-small-race.txt +Patch30554: 3071-knfsd-Tidy-up-unix_domain_find.txt +Patch30555: 3143-pnp-IRDA-adjust-pnp_register_driver-signature.txt +Patch30556: 3219-Minor-janitorial-change-to-ieee80211.txt +Patch30557: 3220-wireless-add-prism54usb-driver.txt +Patch30558: 3221-prism54usb-fix-build-break-in-islusb_init.c.txt +Patch30559: 3222-wireless-add-acx-driver.txt +Patch30560: 3223-acxsm-merge-from-acx-0.3.32.txt +Patch30561: 3224-tiacx-Let-only-ACX_PCI-ACX_USB-be-user-visible.txt +Patch30562: 3225-softmac-prism54usb-update.txt +Patch30563: 3226-tiacx-revert-neither-PCI-nor-USB-is-selected-change.txt +Patch30564: 3227-tiacx-implement-much-more-flexible-firmware-statistics-parsing.txt +Patch30565: 3228-tiacx-Change-acx_ioctl_-get-set-_encode-to-use-kernel-80211-stack.txt +Patch30566: 3229-tiacx-fix-breakage-of-Get-rid-of-circular-list-of-adev-s.txt +Patch30567: 3230-tiacx-split-module-into-acx-common-acx-pci-acx-usb.txt +Patch30568: 3231-softmac-reduce-scan-dwell-time.txt +Patch30569: 3232-softmac-reduce-default-rate-to-11Mbps.txt +Patch30570: 3233-update-prism54usb-sources.txt +Patch30571: 3234-TG3-Fix-probe-failure-due-to-invalid-MAC-address.txt +Patch30572: 3235-TG3-Fix-bug-in-40-bit-DMA-workaround-code.txt +Patch30573: 3236-TG3-Fix-PHY-loopback-on-5700.txt +Patch30574: 3237-TG3-Speed-up-SRAM-access.txt +Patch30575: 3238-TG3-Skip-timer-code-during-full-lock.txt +Patch30576: 3239-TG3-Update-version-and-reldate.txt +Patch30577: 3241-NET-Fix-ipx-econet-appletalk-irda-ioctl-crashes.txt +Patch30578: 3242-ECONET-Convert-away-from-SOCKOPS_WRAPPED.txt +Patch30579: 3243-NET-deinline-200-byte-inlines-in-sock.h.txt # END OF PATCH DEFINITIONS @@ -2210,604 +2208,600 @@ %patch30281 -p1 # [PKTGEN]: Updates version. %patch30282 -p1 -# [NET]: Move destructor from neigh->ops to neigh_params -%patch30283 -p1 # [NET]: minor net_rx_action optimization -%patch30284 -p1 +%patch30283 -p1 # [TG3]: Add 5787 and 5754 basic support -%patch30285 -p1 +%patch30284 -p1 # [TG3]: Add 5787 nvram support -%patch30286 -p1 +%patch30285 -p1 # [TG3]: Add new hard_start_xmit -%patch30287 -p1 +%patch30286 -p1 # [TG3]: Add ipv6 checksum support -%patch30288 -p1 +%patch30287 -p1 # [TG3]: Add new one-shot MSI handler -%patch30289 -p1 +%patch30288 -p1 # [TG3]: Fixup memory test for 5787 -%patch30290 -p1 +%patch30289 -p1 # [TG3]: nvram cleanup -%patch30291 -p1 +%patch30290 -p1 # [TG3]: Add firmware version info -%patch30292 -p1 +%patch30291 -p1 # [TG3]: update version and reldate -%patch30293 -p1 -# [ATM]: Fix build after neigh->parms->neigh_destructor change. -%patch30294 -p1 +%patch30292 -p1 # [DCCP] options: Fix handling of ackvecs in DATA packets -%patch30295 -p1 +%patch30293 -p1 # [DCCP]: ditch dccp_v[46]_ctl_send_ack -%patch30296 -p1 +%patch30294 -p1 # [DCCP]: Remove leftover dccp_send_response prototype -%patch30297 -p1 +%patch30295 -p1 # [NET]: dev_put/dev_hold cleanup -%patch30298 -p1 +%patch30296 -p1 # [IRDA] sem2mutex: drivers/net/irda -%patch30299 -p1 +%patch30297 -p1 # [IRDA]: remove MODULE_PARM() -%patch30300 -p1 +%patch30298 -p1 # [CASSINI]: sem2mutex -%patch30301 -p1 +%patch30299 -p1 # [SUNGEM]: sem2mutex -%patch30302 -p1 +%patch30300 -p1 # [WAN]: fix section mismatch warning in sbni -%patch30303 -p1 +%patch30301 -p1 # [NET]: sem2mutex part 2 -%patch30304 -p1 +%patch30302 -p1 # [DCCP]: Fix uninitialized var warnings in dccp_parse_options(). -%patch30305 -p1 +%patch30303 -p1 # [NETFILTER]: Fix warnings in ip_nat_snmp_basic.c -%patch30306 -p1 +%patch30304 -p1 # [TIPC]: Fix simple sparse warnings -%patch30307 -p1 +%patch30305 -p1 # [TIPC]: Remove inlines from \*.c -%patch30308 -p1 +%patch30306 -p1 # [TIPC]: Remove unused functions -%patch30309 -p1 +%patch30307 -p1 # [TIPC]: Cleanups -%patch30310 -p1 +%patch30308 -p1 # [TIPC]: Reduce stack usage -%patch30311 -p1 +%patch30309 -p1 # [TIPC]: Avoid compiler warning -%patch30312 -p1 +%patch30310 -p1 # [TG3]: netif_carrier_off runs too early; could still be queued when init fails -%patch30313 -p1 +%patch30311 -p1 # [IPV4] ARP: Alloc acceptance of unsolicited ARP via netdevice sysctl. -%patch30314 -p1 +%patch30312 -p1 # [TCP]: sysctl to allow TCP window > 32767 sans wscale -%patch30315 -p1 +%patch30313 -p1 # [XFRM]: Fix aevent related crash -%patch30316 -p1 +%patch30314 -p1 # [DECnet]: Endian annotation and fixes for DECnet. -%patch30317 -p1 +%patch30315 -p1 # [DECnet]: Patch to fix recvmsg() flag check -%patch30318 -p1 +%patch30316 -p1 # [DECnet]: Use RCU locking in dn_rules.c -%patch30319 -p1 +%patch30317 -p1 # [NET]: Replace skb_pull/skb_postpull_rcsum with skb_pull_rcsum -%patch30320 -p1 +%patch30318 -p1 # [PKT_SCHED]: Let NET_CLS_ACT no longer depend on EXPERIMENTAL -%patch30321 -p1 +%patch30319 -p1 # [IPV6]: remove useless test in ip6_append_data -%patch30322 -p1 +%patch30320 -p1 # [SNAP]: Remove leftover unused hdr variable -%patch30323 -p1 +%patch30321 -p1 # [SK_BUFF]: export skb_pull_rcsum -%patch30324 -p1 +%patch30322 -p1 # [BRIDGE] ebtables: Build fix. -%patch30325 -p1 +%patch30323 -p1 # [BRIDGE] br_netfilter: Warning fixes. -%patch30326 -p1 +%patch30324 -p1 # [BRIDGE]: remove unneeded bh disables -%patch30327 -p1 +%patch30325 -p1 # [BRIDGE]: use setup_timer -%patch30328 -p1 +%patch30326 -p1 # [BRIDGE]: use kcalloc -%patch30329 -p1 +%patch30327 -p1 # [BRIDGE]: use kzalloc -%patch30330 -p1 +%patch30328 -p1 # [BRIDGE]: optimize frame pass up -%patch30331 -p1 +%patch30329 -p1 # [BRIDGE]: netfilter whitespace -%patch30332 -p1 +%patch30330 -p1 # [BRIDGE]: netfilter dont use __constant_htons -%patch30333 -p1 +%patch30331 -p1 # [BRIDGE]: netfilter VLAN macro cleanup -%patch30334 -p1 +%patch30332 -p1 # [BRIDGE]: netfilter inline cleanup -%patch30335 -p1 +%patch30333 -p1 # [BRIDGE]: forwarding remove unneeded preempt and bh diasables -%patch30336 -p1 +%patch30334 -p1 # [BRIDGE]: stp timer to jiffies cleanup -%patch30337 -p1 +%patch30335 -p1 # [BRIDGE]: use llc for receiving STP packets -%patch30338 -p1 +%patch30336 -p1 # [BRIDGE]: allow show/store of group multicast address -%patch30339 -p1 +%patch30337 -p1 # [LLC]: llc_mac_hdr_init const arguments -%patch30340 -p1 +%patch30338 -p1 # [BRIDGE]: use LLC to send STP -%patch30341 -p1 +%patch30339 -p1 # [TG3]: make drivers/net/tg3.c:tg3_request_irq() static -%patch30342 -p1 +%patch30340 -p1 # [DECNET]: net/decnet/dn_route.c: fix inconsequent NULL checking -%patch30343 -p1 +%patch30341 -p1 # [BRIDGE]: Remove duplicate const from is_link_local() argument type. -%patch30344 -p1 +%patch30342 -p1 # [IPV6]: Cleanup of net/ipv6/reassambly.c -%patch30345 -p1 +%patch30343 -p1 # [IPV6]: Nearly complete kzalloc cleanup for net/ipv6 -%patch30346 -p1 +%patch30344 -p1 # [IPV6]: Cleanups for net/ipv6/addrconf.c (kzalloc, early exit) v2 -%patch30347 -p1 +%patch30345 -p1 # [TG3]: Don't mark tg3_test_registers() as returning const. -%patch30348 -p1 +%patch30346 -p1 # [NETFILTER]: Add H.323 conntrack/NAT helper -%patch30349 -p1 +%patch30347 -p1 # skge: use NAPI for tx cleanup. -%patch30350 -p1 +%patch30348 -p1 # skge: use auto masking of irqs -%patch30351 -p1 +%patch30349 -p1 # skge: check the allocation of ring buffer -%patch30352 -p1 +%patch30350 -p1 # skge: dma configuration cleanup -%patch30353 -p1 +%patch30351 -p1 # skge: use kcalloc -%patch30354 -p1 +%patch30352 -p1 # skge: use mmiowb -%patch30355 -p1 +%patch30353 -p1 # skge: formmating and whitespace cleanup -%patch30356 -p1 +%patch30354 -p1 # skge: handle pci errors better -%patch30357 -p1 +%patch30355 -p1 # skge: version 1.4 -%patch30358 -p1 +%patch30356 -p1 # mv643xx_eth: Cache align skb->data if CONFIG_NOT_COHERENT_CACHE -%patch30359 -p1 +%patch30357 -p1 # sky2: remove support for untested Yukon EC/rev 0 -%patch30360 -p1 +%patch30358 -p1 # sky2: drop broken wake on lan support -%patch30361 -p1 +%patch30359 -p1 # sky2: rework of NAPI and IRQ management -%patch30362 -p1 +%patch30360 -p1 # sky2: coalescing parameters -%patch30363 -p1 +%patch30361 -p1 # sky2: add MSI support -%patch30364 -p1 +%patch30362 -p1 # sky2: whitespace fixes -%patch30365 -p1 +%patch30363 -p1 # sky2: transmit recovery -%patch30366 -p1 +%patch30364 -p1 # sky2: handle all error irqs -%patch30367 -p1 +%patch30365 -p1 # sky2 version 1.1 -%patch30368 -p1 +%patch30366 -p1 # pcnet32: support boards with multiple phys -%patch30369 -p1 +%patch30367 -p1 # smc91x: allow for dynamic bus access configs -%patch30370 -p1 +%patch30368 -p1 # skfp warning fixes -%patch30371 -p1 +%patch30369 -p1 # [netdrvr] pcnet32: Lindent -%patch30372 -p1 +%patch30370 -p1 # [netdrvr] pcnet32: other source formatting cleanups -%patch30373 -p1 +%patch30371 -p1 # [ARM] 3373/1: move uengine loader to arch/arm/common -%patch30374 -p1 +%patch30372 -p1 # Fix spelling in E1000_DISABLE_PACKET_SPLIT Kconfig description -%patch30375 -p1 +%patch30373 -p1 # [BLUETOOTH]: Return negative error constant -%patch30376 -p1 +%patch30374 -p1 # [NET]: allow 32 bit socket ioctl in 64 bit kernel -%patch30377 -p1 +%patch30375 -p1 # [NET]: socket timestamp 32 bit handler for 64 bit kernel -%patch30378 -p1 +%patch30376 -p1 # [X25]: ioctl conversion 32 bit user to 64 bit kernel -%patch30379 -p1 +%patch30377 -p1 # [X25]: fix kernel error message 64 bit kernel -%patch30380 -p1 +%patch30378 -p1 # [X25]: allow ITU-T DTE facilities for x25 -%patch30381 -p1 +%patch30379 -p1 # [X25]: dte facilities 32 64 ioctl conversion -%patch30382 -p1 +%patch30380 -p1 # [TG3]: Fix SRAM access during tg3_init_one() -%patch30383 -p1 +%patch30381 -p1 # [TG3]: Skip phy power down on some devices -%patch30384 -p1 +%patch30382 -p1 # [TG3]: Bump driver version and reldate. -%patch30385 -p1 +%patch30383 -p1 # [netdrvr e100] experiment with doing RX in a similar manner to eepro100 -%patch30386 -p1 +%patch30384 -p1 # [NETFILTER]: Fix Kconfig typos -%patch30387 -p1 +%patch30385 -p1 # [NETFILTER]: ctnetlink: Fix expectaction mask dumping -%patch30388 -p1 +%patch30386 -p1 # [NETFILTER]: nfnetlink_queue: fix nfnetlink message size -%patch30389 -p1 +%patch30387 -p1 # [NETFILTER]: conntrack: cleanup the conntrack ID initialization -%patch30390 -p1 +%patch30388 -p1 # [NETFILTER]: x_tables: set the protocol family in x_tables targets/matches -%patch30391 -p1 +%patch30389 -p1 # [NETFILTER]: nf_conntrack: support for layer 3 protocol load on demand -%patch30392 -p1 +%patch30390 -p1 # [NETFILTER]: Fix xt_policy address matching -%patch30393 -p1 +%patch30391 -p1 # [NETFILTER]: futher {ip,ip6,arp}_tables unification -%patch30394 -p1 +%patch30392 -p1 # [NETFILTER]: Fix undefined references to get_h225_addr -%patch30395 -p1 +%patch30393 -p1 # fix spidernet build issue -%patch30396 -p1 +%patch30394 -p1 # AMD Au1xx0: fix Ethernet TX stats -%patch30397 -p1 +%patch30395 -p1 # sky2: more ethtool stats -%patch30398 -p1 +%patch30396 -p1 # sis900 adm7001 PHY support -%patch30399 -p1 +%patch30397 -p1 # Use after free in net/tulip/de2104x.c -%patch30400 -p1 +%patch30398 -p1 # Use of uninitialized variable in drivers/net/depca.c -%patch30401 -p1 +%patch30399 -p1 # wireless: Add softmac layer to the kernel -%patch30402 -p1 +%patch30400 -p1 # make softmac depend on IEEE80211 and EXPERIMENTAL -%patch30403 -p1 +%patch30401 -p1 # softmac: fix some sparse warnings -%patch30404 -p1 +%patch30402 -p1 # softmac: fix Makefiles -%patch30405 -p1 +%patch30403 -p1 # softmac: convert to use global workqueue -%patch30406 -p1 +%patch30404 -p1 # softmac: correctly use netif_carrier_{on,off} -%patch30407 -p1 +%patch30405 -p1 # softmac: try to reassociate when being disassociated from the AP -%patch30408 -p1 +%patch30406 -p1 # softmac: add fixme for disassoc -%patch30409 -p1 +%patch30407 -p1 # softmac: select "best" network based on rssi -%patch30410 -p1 +%patch30408 -p1 # softmac: check if disassociation is for us before processing it -%patch30411 -p1 +%patch30409 -p1 # softmac: scan at least once before selecting a network by essid -%patch30412 -p1 +%patch30410 -p1 # softmac: properly check return value of ieee80211softmac_alloc_mgt -%patch30413 -p1 +%patch30411 -p1 # softmac: some comment stuff -%patch30414 -p1 +%patch30412 -p1 # softmac: add copyright and license headers -%patch30415 -p1 +%patch30413 -p1 # softmac: add MODULE_DESCRIPTION and MODULE_AUTHORs -%patch30416 -p1 +%patch30414 -p1 # softmac: move EXPORT_SYMBOL_GPL right after functions -%patch30417 -p1 +%patch30415 -p1 # update copyright in softmac -%patch30418 -p1 +%patch30416 -p1 # trivial fixes to softmac -%patch30419 -p1 +%patch30417 -p1 # softmac: update deauth handler to quiet warning -%patch30420 -p1 +%patch30418 -p1 # softmac: add reassociation code -%patch30421 -p1 +%patch30419 -p1 # softmac: remove dead code -%patch30422 -p1 +%patch30420 -p1 # Fix softmac scan -%patch30423 -p1 +%patch30421 -p1 # [PKTGEN]: Add MPLS extension. -%patch30424 -p1 +%patch30422 -p1 # [BNX2]: Fix link change handling -%patch30425 -p1 +%patch30423 -p1 # [BNX2]: Combine small mem allocations -%patch30426 -p1 +%patch30424 -p1 # [BNX2]: Move .h files to bnx2.c -%patch30427 -p1 +%patch30425 -p1 # [BNX2]: Separate tx producer and consumer fields -%patch30428 -p1 +%patch30426 -p1 # [BNX2]: Update version and reldate -%patch30429 -p1 +%patch30427 -p1 # [IPV4]: Add fib rule netlink notifications -%patch30430 -p1 +%patch30428 -p1 # [NET_SCHED]: cls_u32: remove unnecessary NULL-ptr check -%patch30431 -p1 +%patch30429 -p1 # [IPV6]: ip6_xmit: remove unnecessary NULL ptr check -%patch30432 -p1 +%patch30430 -p1 # [TG3]: Add 5755 support -%patch30433 -p1 +%patch30431 -p1 # [TG3]: Add 5755 nvram support -%patch30434 -p1 +%patch30432 -p1 # [TG3]: Update driver version and reldate. -%patch30435 -p1 +%patch30433 -p1 # softmac: remove function_enter() -%patch30436 -p1 +%patch30434 -p1 # WE-20 for kernel 2.6.16 -%patch30437 -p1 +%patch30435 -p1 # sem2mutex: drivers: raw, connector, dcdbas, ppp_generic -%patch30438 -p1 +%patch30436 -p1 # more for_each_cpu() conversions -%patch30439 -p1 +%patch30437 -p1 # wireless/airo: clean up printk usage to print device name -%patch30440 -p1 +%patch30438 -p1 # wireless/airo: define default MTU -%patch30441 -p1 +%patch30439 -p1 # wireless/airo: cache wireless scans -%patch30442 -p1 +%patch30440 -p1 # hostap: Fix hw reset after CMDCODE_ACCESS_WRITE timeout -%patch30443 -p1 +%patch30441 -p1 # hostap: Fix ap_add_sta() return value verification -%patch30444 -p1 +%patch30442 -p1 # hostap: Fix double free in prism2_config() error path -%patch30445 -p1 +%patch30443 -p1 # hostap: Fix unlikely read overrun in CIS parsing -%patch30446 -p1 +%patch30444 -p1 # hostap: Remove dead code (duplicated idx != 0) -%patch30447 -p1 +%patch30445 -p1 # hostap: Fix memory leak on PCI probe error path -%patch30448 -p1 +%patch30446 -p1 # sky2: typo in last stats patch -%patch30449 -p1 +%patch30447 -p1 # sky2: Fix RX stats -%patch30450 -p1 +%patch30448 -p1 # sky2: dont need to use dev_kfree_skb_any -%patch30451 -p1 +%patch30449 -p1 # skge: align receive buffers -%patch30452 -p1 +%patch30450 -p1 # skge: dont use dev_alloc_skb for rx buffs -%patch30453 -p1 +%patch30451 -p1 # skge: rx_reuse called twice -%patch30454 -p1 +%patch30452 -p1 # skge: multicast statistics fix -%patch30455 -p1 +%patch30453 -p1 # skge: dont free skb until multi-part transmit complete -%patch30456 -p1 +%patch30454 -p1 # skge: compute available ring buffers -%patch30457 -p1 +%patch30455 -p1 # skge: version 1.5 -%patch30458 -p1 +%patch30456 -p1 # remove ISA legacy functions: drivers/net/hp-plus.c -%patch30459 -p1 +%patch30457 -p1 # remove ISA legacy functions: drivers/net/lance.c -%patch30460 -p1 +%patch30458 -p1 # Fix "value computed not used" warnings -%patch30461 -p1 +%patch30459 -p1 # AT91RM9200 Ethernet driver -%patch30462 -p1 +%patch30460 -p1 # net: ne2k.c won't compile if pci_clone_list is const -%patch30463 -p1 +%patch30461 -p1 # [BRIDGE]: Unaligned accesses in the ethernet bridge -%patch30464 -p1 +%patch30462 -p1 # [NET]: Fill in a 32-bit hole in struct sock on 64-bit platforms. -%patch30465 -p1 +%patch30463 -p1 # [WIRELESS]: Fix config dependencies. -%patch30466 -p1 +%patch30464 -p1 # [NET]: Take RTNL when unregistering notifier -%patch30467 -p1 +%patch30465 -p1 # [SCTP]: Fix up sctp_rcv return value -%patch30468 -p1 +%patch30466 -p1 # [TCP]: Set default max buffers from memory pool size -%patch30469 -p1 +%patch30467 -p1 # [TCP]: Mark tcp_\*mem[] __read_mostly. -%patch30470 -p1 +%patch30468 -p1 # [IPV4]: Aggregate route entries with different TOS values -%patch30471 -p1 +%patch30469 -p1 # [NETFILTER] x_table.c: sem2mutex -%patch30472 -p1 +%patch30470 -p1 # fix 'defined but not used' warning in net/rxrpc/main.c::rxrpc_initialise -%patch30473 -p1 +%patch30471 -p1 # hp300: fix driver_register() return handling, remove dio_module_init() -%patch30474 -p1 +%patch30472 -p1 # EISA: tidy-up driver_register() return value -%patch30475 -p1 +%patch30473 -p1 # amiga: fix driver_register() return handling, remove zorro_module_init() -%patch30476 -p1 +%patch30474 -p1 # POLLRDHUP/EPOLLRDHUP handling for half-closed devices notifications -%patch30477 -p1 +%patch30475 -p1 # 3c59x: use mii_check_media -%patch30478 -p1 +%patch30476 -p1 # 3c59x: decrease polling interval -%patch30479 -p1 +%patch30477 -p1 # 3c59x: carriercheck for forced media -%patch30480 -p1 +%patch30478 -p1 # 3c59x: use ethtool_op_get_link -%patch30481 -p1 +%patch30479 -p1 # 3c59x: remove per-driver versioning -%patch30482 -p1 +%patch30480 -p1 # 3c59x: minor cleanups -%patch30483 -p1 +%patch30481 -p1 # more s/fucn/func/ typo fixes -%patch30484 -p1 +%patch30482 -p1 # [IPSEC]: Fix tunnel error handling in ipcomp6 -%patch30485 -p1 +%patch30483 -p1 # [NET]: drop duplicate assignment in request_sock -%patch30486 -p1 +%patch30484 -p1 # wireless: import bcm43xx sources -%patch30487 -p1 +%patch30485 -p1 # bcm43xx: patch Kconfig and wireless/Makefile for import -%patch30488 -p1 +%patch30486 -p1 # bcm43xx: sync with svn.berlios.de -%patch30489 -p1 +%patch30487 -p1 # bcm43xx: remove linux version compatibility code. -%patch30490 -p1 +%patch30488 -p1 # bcm43xx: add DEBUG Kconfig option. Also fix indention. -%patch30491 -p1 +%patch30489 -p1 # bcm43xx: Fix makefile. Remove all the "out-of-tree" stuff. -%patch30492 -p1 +%patch30490 -p1 # bcm43xx: Add more initvals sanity checks and error out, if one sanity check fails. -%patch30493 -p1 +%patch30491 -p1 # bcm43xx: Remove function bcm43xx_channel_is_allowed() -%patch30494 -p1 +%patch30492 -p1 # bcm43xx: basic ethtool support -%patch30495 -p1 +%patch30493 -p1 # bcm43xx: Wireless Ext update -%patch30496 -p1 +%patch30494 -p1 # Sync bcm43xx_phy_initb6() with specs -%patch30497 -p1 +%patch30495 -p1 # bcm43xx: fix txpower reporting in WE. -%patch30498 -p1 +%patch30496 -p1 # bcm43xx: enable SPROM writing. -%patch30499 -p1 +%patch30497 -p1 # bcm43xx: heavily increase mac_suspend timeout. -%patch30500 -p1 +%patch30498 -p1 # bcm43xx: fix compiletime warning (phy_xmitpower) -%patch30501 -p1 +%patch30499 -p1 # bcm43xx: remove WX debugging. -%patch30502 -p1 +%patch30500 -p1 # bcm43xx: Partially fix PIO code. Add Kconfig option for PIO or DMA mode (or both). -%patch30503 -p1 +%patch30501 -p1 # bcm43xx: add a note that not all devices support PIO. -%patch30504 -p1 +%patch30502 -p1 # Apple Airport: Add Kconfig note that the bcm43xx driver has to be used for Airport Extreme cards. -%patch30505 -p1 +%patch30503 -p1 # bcm43xx: fix LED code. -%patch30506 -p1 +%patch30504 -p1 # bcm43xx: rewrite and simplify the periodic task handling. -%patch30507 -p1 +%patch30505 -p1 # bcm43xx: Code cleanups. This removes various "inline" statements and reduces codesize. -%patch30508 -p1 +%patch30506 -p1 # bcm43xx: Move sprom lowlevel reading/writing to its own functions. -%patch30509 -p1 +%patch30507 -p1 # bcm43xx: make bcm43xx_sprom_crc() static. -%patch30510 -p1 +%patch30508 -p1 # bcm43xx: split the channel helper functions, so that they can be used without a valid running core. -%patch30511 -p1 +%patch30509 -p1 # bcm43xx: remove old unused struct. -%patch30512 -p1 +%patch30510 -p1 # bcm43xx: Fix Kconfig typo (transfer mode default) -%patch30513 -p1 +%patch30511 -p1 # bcm43xx: Workaround init_board vs IRQ race. -%patch30514 -p1 +%patch30512 -p1 # bcm43xx: move initialized = 1 to the end of init_board. -%patch30515 -p1 +%patch30513 -p1 # bcm43xx: add assert(bcm->initialized) to periodic_tasks_setup(). -%patch30516 -p1 +%patch30514 -p1 # bcm43xx: Move TX/RX related functions to its own file. Add basic RTS/CTS code. -%patch30517 -p1 +%patch30515 -p1 # bcm43xx: Add sysfs attributes for device specific tunables. -%patch30518 -p1 +%patch30516 -p1 # bcm43xx: fix DMA TX skb freeing in case of fragmented packets. -%patch30519 -p1 +%patch30517 -p1 # bcm43xx: Set both, the DMAmask and the coherent DMAmask. -%patch30520 -p1 +%patch30518 -p1 # bcm43xx: Abstract the locking mechanism. -%patch30521 -p1 +%patch30519 -p1 # bcm43xx: Remove the mmio access printing facility overhead. -%patch30522 -p1 +%patch30520 -p1 # bcm43xx: fix some stuff, add a few missing mmiowb(), remove dead code. -%patch30523 -p1 +%patch30521 -p1 # bcm43xx: receive TX status on MMIO or DMA unconditionally regarding the 80211 core rev. -%patch30524 -p1 +%patch30522 -p1 # bcm43xx: add functions bcm43xx_dma_read/write, bcm43xx_dma_tx_suspend/resume. -%patch30525 -p1 +%patch30523 -p1 # bcm43xx: reduce the size of bcm43xx_private by removing unneeded members. -%patch30526 -p1 +%patch30524 -p1 # bcm43xx: Fix crash on ifdown, by being careful in pio/dma freeing. -%patch30527 -p1 +%patch30525 -p1 # bcm43xx: Remove the workaround in dummy_transmission, -%patch30528 -p1 +%patch30526 -p1 # bcm43xx: Do boardflags workarounds for specific boards. -%patch30529 -p1 +%patch30527 -p1 # bcm43xx: properly mask txctl1 before writing it to hardware. -%patch30530 -p1 +%patch30528 -p1 # bcm43xx: remove check for mmio length, as it differs among platforms. (especially embedded) -%patch30531 -p1 +%patch30529 -p1 # bcm43xx: fix some gpio register trashing (hopefully :D) -%patch30532 -p1 +%patch30530 -p1 # bcm43xx: merge all iwmode code into the set_iwmode function. -%patch30533 -p1 +%patch30531 -p1 # bcm43xx: some IRQ handler cleanups. -%patch30534 -p1 +%patch30532 -p1 # bcm43xx: set default attenuation values. -%patch30535 -p1 +%patch30533 -p1 # bcm43xx: sync interference mitigation code to the specs. -%patch30536 -p1 +%patch30534 -p1 # bcm43xx: fix nrssi_threshold calculation. -%patch30537 -p1 +%patch30535 -p1 # bcm43xx: add useless and broken statistics stuff. People seem to want it. well... -%patch30538 -p1 +%patch30536 -p1 # bcm43xx: get rid of "/\* vim: ..." lines at the end of several files. -%patch30539 -p1 +%patch30537 -p1 # bcm43xx: fix "include" issues on some platforms. -%patch30540 -p1 +%patch30538 -p1 # bcm43xx: remove some compilerwarnings. -%patch30541 -p1 +%patch30539 -p1 # bcm43xx: fix the remaining sparse warnings. -%patch30542 -p1 +%patch30540 -p1 # bcm43xx: sync GPHY init with the specs. -%patch30543 -p1 +%patch30541 -p1 # bcm43xx: don't set the channel on a device, which is down. -%patch30544 -p1 +%patch30542 -p1 # PCMCIA_SPECTRUM must select FW_LOADER -%patch30545 -p1 +%patch30543 -p1 # hostap: Make hostap_tx_encrypt() static -%patch30546 -p1 +%patch30544 -p1 # hostap: Fix EAPOL frame encryption -%patch30547 -p1 +%patch30545 -p1 # knfsd: Change the store of auth_domains to not be a 'cache' -%patch30548 -p1 +%patch30546 -p1 # knfsd: Get rid of 'inplace' sunrpc caches -%patch30549 -p1 +%patch30547 -p1 # knfsd: Create cache_lookup function instead of using a macro to declare one -%patch30550 -p1 +%patch30548 -p1 # knfsd: Convert ip_map cache to use the new lookup routine -%patch30551 -p1 +%patch30549 -p1 # knfsd: Use new sunrpc cache for rsi cache -%patch30552 -p1 +%patch30550 -p1 # knfsd: Use new cache code for rsc cache -%patch30553 -p1 +%patch30551 -p1 # knfsd: An assortment of little fixes to the sunrpc cache code -%patch30554 -p1 +%patch30552 -p1 # knfsd: Unexport cache_fresh and fix a small race -%patch30555 -p1 +%patch30553 -p1 # knfsd: Tidy up unix_domain_find -%patch30556 -p1 +%patch30554 -p1 # pnp: IRDA: adjust pnp_register_driver signature -%patch30557 -p1 +%patch30555 -p1 # Minor (janitorial) change to ieee80211 -%patch30558 -p1 +%patch30556 -p1 # wireless: add prism54usb driver -%patch30559 -p1 +%patch30557 -p1 # prism54usb: fix build break in islusb_init.c -%patch30560 -p1 +%patch30558 -p1 # wireless: add acx driver -%patch30561 -p1 +%patch30559 -p1 # acxsm: merge from acx 0.3.32 -%patch30562 -p1 +%patch30560 -p1 # tiacx: Let only ACX_PCI/ACX_USB be user-visible -%patch30563 -p1 +%patch30561 -p1 # softmac: prism54usb update -%patch30564 -p1 +%patch30562 -p1 # tiacx: revert "neither PCI nor USB is selected" change -%patch30565 -p1 +%patch30563 -p1 # tiacx: implement much more flexible firmware statistics parsing -%patch30566 -p1 +%patch30564 -p1 # tiacx: Change acx_ioctl_{get,set}_encode to use kernel 80211 stack -%patch30567 -p1 +%patch30565 -p1 # tiacx: fix breakage of "Get rid of circular list of adev's" -%patch30568 -p1 +%patch30566 -p1 # tiacx: split module into acx-common + acx-pci + acx-usb -%patch30569 -p1 +%patch30567 -p1 # softmac: reduce scan dwell time -%patch30570 -p1 +%patch30568 -p1 # softmac: reduce default rate to 11Mbps. -%patch30571 -p1 +%patch30569 -p1 # update prism54usb sources -%patch30572 -p1 +%patch30570 -p1 # [TG3]: Fix probe failure due to invalid MAC address -%patch30573 -p1 +%patch30571 -p1 # [TG3]: Fix bug in 40-bit DMA workaround code -%patch30574 -p1 +%patch30572 -p1 # [TG3]: Fix PHY loopback on 5700 -%patch30575 -p1 +%patch30573 -p1 # [TG3]: Speed up SRAM access -%patch30576 -p1 +%patch30574 -p1 # [TG3]: Skip timer code during full lock -%patch30577 -p1 +%patch30575 -p1 # [TG3]: Update version and reldate -%patch30578 -p1 +%patch30576 -p1 # [NET]: Fix ipx/econet/appletalk/irda ioctl crashes -%patch30579 -p1 +%patch30577 -p1 # [ECONET]: Convert away from SOCKOPS_WRAPPED -%patch30580 -p1 +%patch30578 -p1 # [NET]: deinline 200+ byte inlines in sock.h -%patch30581 -p1 +%patch30579 -p1 # END OF PATCH APPLICATIONS @@ -3680,7 +3674,6 @@ - [PKTGEN]: Convert thread lock to mutexes. - [PKTGEN]: Removes thread_{un,}lock() macros. - [PKTGEN]: Updates version. -- [NET]: Move destructor from neigh->ops to neigh_params - [NET]: minor net_rx_action optimization - [TG3]: Add 5787 and 5754 basic support - [TG3]: Add 5787 nvram support @@ -3691,7 +3684,6 @@ - [TG3]: nvram cleanup - [TG3]: Add firmware version info - [TG3]: update version and reldate -- [ATM]: Fix build after neigh->parms->neigh_destructor change. - [DCCP] options: Fix handling of ackvecs in DATA packets - [DCCP]: ditch dccp_v[46]_ctl_send_ack - [DCCP]: Remove leftover dccp_send_response prototype --- 1431-NET-Move-destructor-from-neigh-ops-to-neigh_params.txt DELETED --- --- 1445-ATM-Fix-build-after-neigh-parms-neigh_destructor-change.txt DELETED --- From fedora-cvs-commits at redhat.com Wed Mar 29 13:13:31 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 29 Mar 2006 08:13:31 -0500 Subject: rpms/iputils/devel iputils-ifenslave.patch, NONE, 1.1 iputils.spec, 1.37, 1.38 Message-ID: <200603291313.k2TDDVl1023055@cvs.devel.redhat.com> Author: rvokal Update of /cvs/dist/rpms/iputils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv23039 Modified Files: iputils.spec Added Files: iputils-ifenslave.patch Log Message: - fix ifenslave, shows interface addresses - add RPM_OPT_FLAGS to ifenslave iputils-ifenslave.patch: ifenslave.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) --- NEW FILE iputils-ifenslave.patch --- --- iputils/ifenslave.c.addr 2006-03-29 15:00:24.000000000 +0200 +++ iputils/ifenslave.c 2006-03-29 15:02:01.000000000 +0200 @@ -524,8 +524,8 @@ if (ioctl(skfd, SIOCGIFADDR, &ifr) < 0) return -1; printf("The result of SIOCGIFADDR is %2.2x.%2.2x.%2.2x.%2.2x.\n", - ifr.ifr_addr.sa_data[0], ifr.ifr_addr.sa_data[1], - ifr.ifr_addr.sa_data[2], ifr.ifr_addr.sa_data[3]); + ifr.ifr_addr.sa_data[2], ifr.ifr_addr.sa_data[3], + ifr.ifr_addr.sa_data[4], ifr.ifr_addr.sa_data[5]); strcpy(ifr.ifr_name, ifname); if (ioctl(skfd, SIOCGIFHWADDR, &ifr) < 0) Index: iputils.spec =================================================================== RCS file: /cvs/dist/rpms/iputils/devel/iputils.spec,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- iputils.spec 12 Mar 2006 09:33:23 -0000 1.37 +++ iputils.spec 29 Mar 2006 13:13:29 -0000 1.38 @@ -1,7 +1,7 @@ Summary: Network monitoring tools including ping. Name: iputils Version: 20020927 -Release: 36 +Release: 37 License: BSD Group: System Environment/Daemons Source0: http://www.tux.org/pub/net/ip-routing/%{name}-ss020927.tar.gz @@ -26,9 +26,10 @@ Patch16: iputils-getaddrinfo.patch Patch17: iputils-flood.patch Patch18: iputils-ping-168166.patch -Patch19: iputils-ipv6-hoplimit2.patch +Patch19: iputils-ipv6-hoplimit.patch Patch20: iputils-gcc41.patch Patch21: iputils-ping_cleanup.patch +Patch22: iputils-ifenslave.patch Prefix: %{_prefix} BuildRoot: %{_tmppath}/%{name}-root BuildPreReq: docbook-utils perl-SGMLSpm @@ -66,6 +67,7 @@ %patch19 -p1 -b .hoplimit %patch20 -p1 -b .gcc41 %patch21 -p1 -b .cleanup +%patch22 -p1 -b .addr %build %ifarch s390 s390x @@ -75,7 +77,7 @@ %endif export LDFLAGS="-pie" make -gcc -Wall -Wstrict-prototypes -O2 ifenslave.c -o ifenslave +gcc -Wall $RPM_OPT_FLAGS ifenslave.c -o ifenslave make -C doc man %install @@ -165,6 +167,10 @@ %config(noreplace) %{_sysconfdir}/rc.d/init.d/rdisc %changelog +* Wed Mar 29 2006 Radek Vok??l - 20020927-37 +- fix ifenslave, shows interface addresses +- add RPM_OPT_FLAGS to ifenslave + * Sun Mar 12 2006 Radek Vok??l - 20020927-36 - fix ifenslave man page (#185223) From fedora-cvs-commits at redhat.com Wed Mar 29 13:16:50 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 29 Mar 2006 08:16:50 -0500 Subject: rpms/system-config-samba/devel .cvsignore, 1.29, 1.30 sources, 1.29, 1.30 system-config-samba.spec, 1.32, 1.33 Message-ID: <200603291316.k2TDGopQ004160@cvs.devel.redhat.com> Author: nphilipp Update of /cvs/dist/rpms/system-config-samba/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv1948 Modified Files: .cvsignore sources system-config-samba.spec Log Message: don't require gnome module (#187200) don't wrap text in About dialog Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/system-config-samba/devel/.cvsignore,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- .cvsignore 3 Mar 2006 15:17:25 -0000 1.29 +++ .cvsignore 29 Mar 2006 13:16:47 -0000 1.30 @@ -1 +1 @@ -system-config-samba-1.2.34.tar.bz2 +system-config-samba-1.2.35.tar.bz2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/system-config-samba/devel/sources,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- sources 3 Mar 2006 15:17:25 -0000 1.29 +++ sources 29 Mar 2006 13:16:47 -0000 1.30 @@ -1 +1 @@ -a0c3e4681fb09676c0bdea5a9f07963a system-config-samba-1.2.34.tar.bz2 +c3391d986486f7098e7de60888f7e895 system-config-samba-1.2.35.tar.bz2 Index: system-config-samba.spec =================================================================== RCS file: /cvs/dist/rpms/system-config-samba/devel/system-config-samba.spec,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- system-config-samba.spec 3 Mar 2006 15:17:25 -0000 1.32 +++ system-config-samba.spec 29 Mar 2006 13:16:47 -0000 1.33 @@ -1,12 +1,12 @@ Summary: Samba server configuration tool Name: system-config-samba -Version: 1.2.34 -Release: 1 +Version: 1.2.35 +Release: 1%{?dist} URL: http://www.redhat.com/ License: GPL ExclusiveOS: Linux Group: System Environment/Base -BuildRoot: %{_tmppath}/%{name}-%{version}-root +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%__id_u -n) BuildArch: noarch Source0: %{name}-%{version}.tar.bz2 BuildRequires: desktop-file-utils @@ -77,6 +77,10 @@ %attr(0644,root,root) %config /etc/pam.d/system-config-samba %changelog +* Wed Mar 29 2006 Nils Philippsen - 1.2.35 +- don't require gnome module (#187200) +- don't wrap text in About dialog + * Fri Mar 03 2006 Nils Philippsen - 1.2.34 - require hicolor-icon-theme (#182874, #182875) From fedora-cvs-commits at redhat.com Wed Mar 29 13:19:22 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 29 Mar 2006 08:19:22 -0500 Subject: rpms/system-config-samba/devel sources, 1.30, 1.31 system-config-samba.spec, 1.33, 1.34 Message-ID: <200603291319.k2TDJMm3004537@cvs.devel.redhat.com> Author: nphilipp Update of /cvs/dist/rpms/system-config-samba/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv4523 Modified Files: sources system-config-samba.spec Log Message: don't use %{?dist} Index: sources =================================================================== RCS file: /cvs/dist/rpms/system-config-samba/devel/sources,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- sources 29 Mar 2006 13:16:47 -0000 1.30 +++ sources 29 Mar 2006 13:19:20 -0000 1.31 @@ -1 +1 @@ -c3391d986486f7098e7de60888f7e895 system-config-samba-1.2.35.tar.bz2 +dec710fe1137bbcc64fb200c6a81e452 system-config-samba-1.2.35.tar.bz2 Index: system-config-samba.spec =================================================================== RCS file: /cvs/dist/rpms/system-config-samba/devel/system-config-samba.spec,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- system-config-samba.spec 29 Mar 2006 13:16:47 -0000 1.33 +++ system-config-samba.spec 29 Mar 2006 13:19:20 -0000 1.34 @@ -1,7 +1,7 @@ Summary: Samba server configuration tool Name: system-config-samba Version: 1.2.35 -Release: 1%{?dist} +Release: 1 URL: http://www.redhat.com/ License: GPL ExclusiveOS: Linux From fedora-cvs-commits at redhat.com Wed Mar 29 13:20:54 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 29 Mar 2006 08:20:54 -0500 Subject: rpms/pilot-link/FC-4 pilot-link-0.11.0-perlmd5.patch, 1.2, 1.3 pilot-link-0.11.0-perlpollute.patch, 1.2, 1.3 pilot-link-0.11.2-malsync.patch, 1.2, 1.3 pilot-link-0.11.8-misc.patch, 1.2, 1.3 pilot-link-0.11.8-misc1.patch, 1.3, 1.4 pilot-link-0.11.8-readfile.patch, 1.2, 1.3 pilot-link-0.11.8-size.patch, 1.2, 1.3 pilot-link-0.11.8-underquoted.patch, 1.2, 1.3 pilot-link.spec, 1.28, 1.29 sources, 1.11, 1.12 pilot-link-0.12.0-pre4-misc1.patch, 1.1, NONE Message-ID: <200603291320.k2TDKsEh004668@cvs.devel.redhat.com> Author: than Update of /cvs/dist/rpms/pilot-link/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv4642 Modified Files: pilot-link.spec sources Added Files: pilot-link-0.11.0-perlmd5.patch pilot-link-0.11.0-perlpollute.patch pilot-link-0.11.2-malsync.patch pilot-link-0.11.8-misc.patch pilot-link-0.11.8-misc1.patch pilot-link-0.11.8-readfile.patch pilot-link-0.11.8-size.patch pilot-link-0.11.8-underquoted.patch Removed Files: pilot-link-0.12.0-pre4-misc1.patch Log Message: downgrade to stable release 0.11.8 pilot-link-0.11.0-perlmd5.patch: sync-plan.PL | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) Index: pilot-link-0.11.0-perlmd5.patch =================================================================== RCS file: pilot-link-0.11.0-perlmd5.patch diff -N pilot-link-0.11.0-perlmd5.patch --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ pilot-link-0.11.0-perlmd5.patch 29 Mar 2006 13:20:40 -0000 1.3 @@ -0,0 +1,38 @@ +--- pilot-link.0.9.5/src/sync-plan.PL.md5 Wed May 29 11:08:47 2002 ++++ pilot-link.0.9.5/src/sync-plan.PL Wed May 29 11:09:03 2002 +@@ -6,7 +6,7 @@ + use IO::Socket; + use IO::Select; + use Time::Local; +-use MD5; ++use Digest::MD5; + use PDA::Pilot; + + sub DatePlanToPerl { +@@ -313,7 +313,7 @@ + } + } + +- my($hash) = new MD5; ++ my($hash) = new Digest::MD5; + foreach (@output) { + #print "Adding |$_| to hash\n"; + $hash->add($_); +@@ -490,7 +490,7 @@ + my(@l) = split(/\n/,$r); + my($rec) = { raw => [@l], other => [] }; + my(@E, at R, at N, at M, at S, at US); +- my($hash) = new MD5; ++ my($hash) = new Digest::MD5; + $l[0] =~ s/\s+/ /g; + $hash->add($l[0]); + my($date, $time, $length, $early, $late, $flags, $color) = split(/\s+/, shift @l); +@@ -566,7 +566,7 @@ + + sub HashPilotRecord { + my($record) = @_; +- my($hash) = new MD5; ++ my($hash) = new Digest::MD5; + $hash->add($record->{raw}); + $hash->hexdigest; + } pilot-link-0.11.0-perlpollute.patch: Makefile.PL.in | 1 Pilot.xs | 168 ++++++++++++++++++++++++++++----------------------------- typemap | 4 - 3 files changed, 86 insertions(+), 87 deletions(-) Index: pilot-link-0.11.0-perlpollute.patch =================================================================== RCS file: pilot-link-0.11.0-perlpollute.patch diff -N pilot-link-0.11.0-perlpollute.patch --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ pilot-link-0.11.0-perlpollute.patch 29 Mar 2006 13:20:40 -0000 1.3 @@ -0,0 +1,640 @@ +--- pilot-link-0.11.0/bindings/Perl/Pilot.xs.perlpollute 2002-07-12 14:40:04.000000000 +0200 ++++ pilot-link-0.11.0/bindings/Perl/Pilot.xs 2002-07-18 10:40:45.000000000 +0200 +@@ -333,7 +333,7 @@ + #define pack_dbinfo(arg, var, failure)\ + {\ + if (failure < 0) {\ +- arg = &sv_undef;\ ++ arg = &PL_sv_undef;\ + self->errnop = failure;\ + } else {\ + HV * i = newHV();\ +@@ -387,8 +387,8 @@ + var.createDate = (s = hv_fetch(i, "createDate", 10, 0)) ? SvIV(*s) : 0;\ + var.modifyDate = (s = hv_fetch(i, "modifyDate", 10, 0)) ? SvIV(*s) : 0;\ + var.backupDate = (s = hv_fetch(i, "backupDate", 10, 0)) ? SvIV(*s) : 0;\ +- if ((s = hv_fetch(i, "name", 4, 0)) ? SvPV(*s,na) : 0)\ +- strcpy(var.name, SvPV(*s, na));\ ++ if ((s = hv_fetch(i, "name", 4, 0)) ? SvPV(*s,PL_na) : 0)\ ++ strcpy(var.name, SvPV(*s, PL_na));\ + } else {\ + croak("argument is not a hash reference");\ + } +@@ -396,7 +396,7 @@ + #define pack_userinfo(arg, var, failure)\ + {\ + if (failure < 0) {\ +- arg = &sv_undef;\ ++ arg = &PL_sv_undef;\ + self->errnop = failure;\ + } else {\ + HV * i = newHV();\ +@@ -420,8 +420,8 @@ + var.lastSyncPC = (s = hv_fetch(i, "lastSyncPC", 10, 0)) ? SvIV(*s) : 0;\ + var.lastSyncDate = (s = hv_fetch(i, "lastSyncDate", 12, 0)) ? SvIV(*s) : 0;\ + var.successfulSyncDate = (s = hv_fetch(i, "successfulSyncDate", 18, 0)) ? SvIV(*s) : 0;\ +- if ((s = hv_fetch(i, "name", 4, 0)) ? SvPV(*s,na) : 0)\ +- strcpy(var.username, SvPV(*s, na));\ ++ if ((s = hv_fetch(i, "name", 4, 0)) ? SvPV(*s,PL_na) : 0)\ ++ strcpy(var.username, SvPV(*s, PL_na));\ + } else {\ + croak("argument is not a hash reference");\ + } +@@ -465,7 +465,7 @@ + }\ + } else {\ + self->errnop = result;\ +- PUSHs(&sv_undef);\ ++ PUSHs(&PL_sv_undef);\ + } + + #define PackSI\ +@@ -507,7 +507,7 @@ + }\ + } else {\ + self->errnop = result;\ +- PUSHs(&sv_undef);\ ++ PUSHs(&PL_sv_undef);\ + } + + #define PackRecord\ +@@ -602,7 +602,7 @@ + }\ + } else {\ + self->errnop = result;\ +- PUSHs(&sv_undef);\ ++ PUSHs(&PL_sv_undef);\ + } + + #define PackResource\ +@@ -654,7 +654,7 @@ + }\ + } else {\ + self->errnop = result;\ +- PUSHs(&sv_undef);\ ++ PUSHs(&PL_sv_undef);\ + } + + #define PackPref\ +@@ -717,7 +717,7 @@ + croak("Unable to create resource");\ + } else {\ + self->errnop = result;\ +- PUSHs(&sv_undef);\ ++ PUSHs(&PL_sv_undef);\ + } + + void doUnpackCategory(HV * self, struct CategoryAppInfo * c) +@@ -757,7 +757,7 @@ + + if ((s = hv_fetch(self, "categoryName", 12, 0)) && SvOK(*s) && SvRV(*s) && (SvTYPE(av=(AV*)SvRV(*s))==SVt_PVAV)) + for (i=0;i<16;i++) +- strncpy(c->name[i], (s=av_fetch(av, i, 0)) ? SvPV(*s,na) : "", 16); ++ strncpy(c->name[i], (s=av_fetch(av, i, 0)) ? SvPV(*s,PL_na) : "", 16); + else + for (i=0;i<16;i++) + strcpy(c->name[i], ""); +@@ -783,7 +783,7 @@ + int SvList(SV * arg, char **list) + { + int i; +- char * str = SvPV(arg, na); ++ char * str = SvPV(arg, PL_na); + for (i=0;list[i];i++) + if (strcasecmp(list[i], str)==0) + return i; +@@ -839,7 +839,7 @@ + } + + SvPV(record,len); +- if (unpack_Appointment(&a, (CPTR)SvPV(record, na), len)>0) { ++ if (unpack_Appointment(&a, (CPTR)SvPV(record, PL_na), len)>0) { + + hv_store(ret, "event", 5, newSViv(a.event), 0); + hv_store(ret, "begin", 5, newRV_noinc((SV*)tmtoav(&a.begin)), 0); +@@ -949,11 +949,11 @@ + u = 2; + break; + default: +- if (strEQ(SvPV(*s, na), "minutes")) ++ if (strEQ(SvPV(*s, PL_na), "minutes")) + u = 0; +- else if (strEQ(SvPV(*s, na), "hours")) ++ else if (strEQ(SvPV(*s, PL_na), "hours")) + u = 1; +- else if (strEQ(SvPV(*s, na), "days")) ++ else if (strEQ(SvPV(*s, PL_na), "days")) + u = 2; + else + croak("Invalid advance unit %d encountered", u); +@@ -1018,10 +1018,10 @@ + } + } + +- a.description = (s = hv_fetch(h, "description", 11, 0)) ? SvPV(*s,na) : 0; ++ a.description = (s = hv_fetch(h, "description", 11, 0)) ? SvPV(*s,PL_na) : 0; + if (!a.description) + croak("appointments must contain a description"); +- a.note = (s = hv_fetch(h, "note", 4, 0)) ? SvPV(*s,na) : 0; ++ a.note = (s = hv_fetch(h, "note", 4, 0)) ? SvPV(*s,PL_na) : 0; + + len = pack_Appointment(&a, (CPTR)mybuf, 0xffff); + +@@ -1063,7 +1063,7 @@ + } + + SvPV(record,len); +- if (unpack_AppointmentAppInfo(&a, (CPTR)SvPV(record, na), len)>0) { ++ if (unpack_AppointmentAppInfo(&a, (CPTR)SvPV(record, PL_na), len)>0) { + + doUnpackCategory(ret, &a.category); + +@@ -1135,7 +1135,7 @@ + } + + SvPV(record,len); +- if (unpack_ToDo(&a, (CPTR)SvPV(record, na), len)>0) { ++ if (unpack_ToDo(&a, (CPTR)SvPV(record, PL_na), len)>0) { + + if (!a.indefinite) + hv_store(ret, "due", 3, newRV_noinc((SV*)tmtoav(&a.due)), 0); +@@ -1182,8 +1182,8 @@ + a.indefinite = 1; + } + +- a.description = (s = hv_fetch(h, "description", 11, 0)) ? SvPV(*s,na) : 0; +- a.note = (s = hv_fetch(h, "note", 4, 0)) ? SvPV(*s,na) : 0; ++ a.description = (s = hv_fetch(h, "description", 11, 0)) ? SvPV(*s,PL_na) : 0; ++ a.note = (s = hv_fetch(h, "note", 4, 0)) ? SvPV(*s,PL_na) : 0; + + len = pack_ToDo(&a, (CPTR)mybuf, 0xffff); + +@@ -1222,7 +1222,7 @@ + } + + SvPV(record,len); +- if (unpack_ToDoAppInfo(&a, (CPTR)SvPV(record, na), len)>0) { ++ if (unpack_ToDoAppInfo(&a, (CPTR)SvPV(record, PL_na), len)>0) { + + doUnpackCategory(ret, &a.category); + +@@ -1296,7 +1296,7 @@ + } + + SvPV(record,len); +- if (unpack_Address(&a, (CPTR)SvPV(record, na), len)>0) { ++ if (unpack_Address(&a, (CPTR)SvPV(record, PL_na), len)>0) { + + e = newAV(); + hv_store(ret, "phoneLabel", 10, newRV_noinc((SV*)e), 0); +@@ -1309,7 +1309,7 @@ + hv_store(ret, "entry", 5, newRV_noinc((SV*)e), 0); + + for (i=0;i<19;i++) { +- av_push(e, a.entry[i] ? newSVpv(a.entry[i],0) : &sv_undef); ++ av_push(e, a.entry[i] ? newSVpv(a.entry[i],0) : &PL_sv_undef); + } + + hv_store(ret, "showPhone", 9, newSViv(a.showPhone), 0); +@@ -1350,7 +1350,7 @@ + + if ((s = hv_fetch(h, "entry", 5, 0)) && SvOK(*s) && SvRV(*s) && (SvTYPE(av=(AV*)SvRV(*s))==SVt_PVAV)) + for (i=0;i<19;i++) +- a.entry[i] = ((s=av_fetch(av, i, 0)) && SvOK(*s)) ? SvPV(*s,na) : 0; ++ a.entry[i] = ((s=av_fetch(av, i, 0)) && SvOK(*s)) ? SvPV(*s,PL_na) : 0; + else + for (i=0;i<19;i++) + a.entry[i] = 0; +@@ -1397,7 +1397,7 @@ + } + + SvPV(record,len); +- if (unpack_AddressAppInfo(&a, (CPTR)SvPV(record, na), len)>0) { ++ if (unpack_AddressAppInfo(&a, (CPTR)SvPV(record, PL_na), len)>0) { + + doUnpackCategory(ret, &a.category); + +@@ -1457,13 +1457,13 @@ + a.sortByCompany = (s = hv_fetch(h, "sortByCompany", 13, 0)) ? SvIV(*s) : 0; + + if ((s = hv_fetch(h, "label", 5, 0)) && SvOK(*s) && SvRV(*s) && (SvTYPE(av=(AV*)SvRV(*s))==SVt_PVAV)) +- for (i=0;i<22;i++) strncpy(a.labels[i], (s=av_fetch(av, i, 0)) ? SvPV(*s,na) : "", 16); ++ for (i=0;i<22;i++) strncpy(a.labels[i], (s=av_fetch(av, i, 0)) ? SvPV(*s,PL_na) : "", 16); + else + for (i=0;i<22;i++) a.labels[i][0] = 0; + for (i=0;i<22;i++) a.labels[i][15] = 0; + + if ((s = hv_fetch(h, "phoneLabel", 10, 0)) && SvOK(*s) && SvRV(*s) && (SvTYPE(av=(AV*)SvRV(*s))==SVt_PVAV)) +- for (i=0;i<8;i++) strncpy(a.phoneLabels[i], (s=av_fetch(av, i, 0)) ? SvPV(*s,na) : "", 16); ++ for (i=0;i<8;i++) strncpy(a.phoneLabels[i], (s=av_fetch(av, i, 0)) ? SvPV(*s,PL_na) : "", 16); + else + for (i=0;i<8;i++) a.phoneLabels[i][0] = 0; + for (i=0;i<8;i++) a.phoneLabels[i][15] = 0; +@@ -1506,7 +1506,7 @@ + } + + SvPV(record,len); +- if (unpack_Memo(&a, (CPTR)SvPV(record, na), len)>0) { ++ if (unpack_Memo(&a, (CPTR)SvPV(record, PL_na), len)>0) { + + hv_store(ret, "text", 4, newSVpv(a.text,0), 0); + +@@ -1536,7 +1536,7 @@ + else { + + if ((s = hv_fetch(h, "text", 4, 0))) +- a.text = SvPV(*s,na); ++ a.text = SvPV(*s,PL_na); + else + a.text = 0; + +@@ -1576,7 +1576,7 @@ + } + + SvPV(record,len); +- if (unpack_MemoAppInfo(&a, (CPTR)SvPV(record, na), len)>0) { ++ if (unpack_MemoAppInfo(&a, (CPTR)SvPV(record, PL_na), len)>0) { + + doUnpackCategory(ret, &a.category); + +@@ -1647,7 +1647,7 @@ + } + + SvPV(record,len); +- if (unpack_Expense(&e, (CPTR)SvPV(record, na), len)>0) { ++ if (unpack_Expense(&e, (CPTR)SvPV(record, PL_na), len)>0) { + + hv_store(ret, "date", 4, newRV_noinc((SV*)tmtoav(&e.date)), 0); + hv_store(ret, "type", 4, newSVlist(e.type,ExpenseTypeNames),0); +@@ -1706,15 +1706,15 @@ + avtotm((AV*)SvRV(*s), &e.date); + else + croak("expense record must contain date"); +- if ((s = hv_fetch(h, "amount", 6, 0))) e.amount = SvPV(*s,na); ++ if ((s = hv_fetch(h, "amount", 6, 0))) e.amount = SvPV(*s,PL_na); + else e.amount = 0; +- if ((s = hv_fetch(h, "vendor", 6, 0))) e.vendor = SvPV(*s,na); ++ if ((s = hv_fetch(h, "vendor", 6, 0))) e.vendor = SvPV(*s,PL_na); + else e.vendor = 0; +- if ((s = hv_fetch(h, "city", 4, 0))) e.city = SvPV(*s,na); ++ if ((s = hv_fetch(h, "city", 4, 0))) e.city = SvPV(*s,PL_na); + else e.city = 0; +- if ((s = hv_fetch(h, "attendess", 9, 0))) e.attendees = SvPV(*s,na); ++ if ((s = hv_fetch(h, "attendess", 9, 0))) e.attendees = SvPV(*s,PL_na); + else e.attendees = 0; +- if ((s = hv_fetch(h, "note", 4, 0))) e.note = SvPV(*s,na); ++ if ((s = hv_fetch(h, "note", 4, 0))) e.note = SvPV(*s,PL_na); + else e.note = 0; + + len = pack_Expense(&e, (CPTR)mybuf, 0xffff); +@@ -1755,7 +1755,7 @@ + } + + SvPV(record,len); +- if (unpack_ExpenseAppInfo(&e, (CPTR)SvPV(record, na), len)>0) { ++ if (unpack_ExpenseAppInfo(&e, (CPTR)SvPV(record, PL_na), len)>0) { + + hv_store(ret, "sortOrder", 9, newSVlist(e.sortOrder,ExpenseSortNames),0); + a = newAV(); +@@ -1798,15 +1798,15 @@ + HV * hv; + if ((s=av_fetch(av, i, 0)) && SvOK(*s) && SvRV(*s) && (SvTYPE(hv=(HV*)SvRV(*s))==SVt_PVHV)) { + if (s = hv_fetch(hv, "name", 4, 0)) { +- strncpy(e.currencies[i].name, SvPV(*s, na), 16); ++ strncpy(e.currencies[i].name, SvPV(*s, PL_na), 16); + e.currencies[i].name[15] = 0; + } + if (s = hv_fetch(hv, "symbol", 6, 0)) { +- strncpy(e.currencies[i].symbol, SvPV(*s, na), 4); ++ strncpy(e.currencies[i].symbol, SvPV(*s, PL_na), 4); + e.currencies[i].symbol[3] = 0; + } + if (s = hv_fetch(hv, "rate", 4, 0)) { +- strncpy(e.currencies[i].rate, SvPV(*s, na), 8); ++ strncpy(e.currencies[i].rate, SvPV(*s, PL_na), 8); + e.currencies[i].rate[7] = 0; + } + } +@@ -1854,7 +1854,7 @@ + } + + SvPV(record,len); +- if (unpack_ExpensePref(&a, (CPTR)SvPV(record, na), len)>0) { ++ if (unpack_ExpensePref(&a, (CPTR)SvPV(record, PL_na), len)>0) { + + hv_store(ret, "unitOfDistance", 14, newSVlist(a.unitOfDistance, ExpenseDistanceNames), 0); + hv_store(ret, "currentCategory", 15, newSViv(a.currentCategory), 0); +@@ -1944,7 +1944,7 @@ + } + + SvPV(record,len); +- if (unpack_Mail(&a, (CPTR)SvPV(record, na), len)>0) { ++ if (unpack_Mail(&a, (CPTR)SvPV(record, PL_na), len)>0) { + + if (a.subject) hv_store(ret, "subject", 7, newSVpv(a.subject,0), 0); + if (a.from) hv_store(ret, "from", 4, newSVpv(a.from,0), 0); +@@ -1990,14 +1990,14 @@ + } + else { + +- a.subject = (s = hv_fetch(h, "subject", 7, 0)) ? SvPV(*s,na) : 0; +- a.from = (s = hv_fetch(h, "from", 4, 0)) ? SvPV(*s,na) : 0; +- a.to = (s = hv_fetch(h, "to", 2, 0)) ? SvPV(*s,na) : 0; +- a.cc = (s = hv_fetch(h, "cc", 2, 0)) ? SvPV(*s,na) : 0; +- a.bcc = (s = hv_fetch(h, "bcc", 3, 0)) ? SvPV(*s,na) : 0; +- a.replyTo = (s = hv_fetch(h, "replyTo", 7, 0)) ? SvPV(*s,na) : 0; +- a.sentTo = (s = hv_fetch(h, "sentTo", 6, 0)) ? SvPV(*s,na) : 0; +- a.body = (s = hv_fetch(h, "body", 4, 0)) ? SvPV(*s,na) : 0; ++ a.subject = (s = hv_fetch(h, "subject", 7, 0)) ? SvPV(*s,PL_na) : 0; ++ a.from = (s = hv_fetch(h, "from", 4, 0)) ? SvPV(*s,PL_na) : 0; ++ a.to = (s = hv_fetch(h, "to", 2, 0)) ? SvPV(*s,PL_na) : 0; ++ a.cc = (s = hv_fetch(h, "cc", 2, 0)) ? SvPV(*s,PL_na) : 0; ++ a.bcc = (s = hv_fetch(h, "bcc", 3, 0)) ? SvPV(*s,PL_na) : 0; ++ a.replyTo = (s = hv_fetch(h, "replyTo", 7, 0)) ? SvPV(*s,PL_na) : 0; ++ a.sentTo = (s = hv_fetch(h, "sentTo", 6, 0)) ? SvPV(*s,PL_na) : 0; ++ a.body = (s = hv_fetch(h, "body", 4, 0)) ? SvPV(*s,PL_na) : 0; + + a.read = (s = hv_fetch(h, "read", 4, 0)) ? SvIV(*s) : 0; + a.signature = (s = hv_fetch(h, "signature", 9, 0)) ? SvIV(*s) : 0; +@@ -2045,7 +2045,7 @@ + } + + SvPV(record,len); +- if (unpack_MailAppInfo(&a, (CPTR)SvPV(record, na), len)>0) { ++ if (unpack_MailAppInfo(&a, (CPTR)SvPV(record, PL_na), len)>0) { + + doUnpackCategory(ret, &a.category); + +@@ -2121,7 +2121,7 @@ + } + + SvPV(record,len); +- if (unpack_MailSyncPref(&a, (CPTR)SvPV(record, na), len)>0) { ++ if (unpack_MailSyncPref(&a, (CPTR)SvPV(record, PL_na), len)>0) { + + hv_store(ret, "syncType", 8, newSVlist(a.syncType, MailSyncTypeNames), 0); + hv_store(ret, "getHigh", 7, newSViv(a.getHigh), 0); +@@ -2165,9 +2165,9 @@ + a.getContaining = (s=hv_fetch(h,"getContaining",13,0)) ? SvIV(*s) : 0; + a.truncate = (s=hv_fetch(h,"truncate",8,0)) ? SvIV(*s) : 0; + +- a.filterTo = (s=hv_fetch(h,"filterTo",8,0)) ? SvPV(*s,na) : 0; +- a.filterFrom = (s=hv_fetch(h,"filterFrom",10,0)) ? SvPV(*s,na) : 0; +- a.filterSubject = (s=hv_fetch(h,"filterSubject",13,0)) ? SvPV(*s,na) : 0; ++ a.filterTo = (s=hv_fetch(h,"filterTo",8,0)) ? SvPV(*s,PL_na) : 0; ++ a.filterFrom = (s=hv_fetch(h,"filterFrom",10,0)) ? SvPV(*s,PL_na) : 0; ++ a.filterSubject = (s=hv_fetch(h,"filterSubject",13,0)) ? SvPV(*s,PL_na) : 0; + + len = pack_MailSyncPref(&a, (CPTR)mybuf, 0xffff); + RETVAL = newSVpv(mybuf, len); +@@ -2203,7 +2203,7 @@ + } + + SvPV(record,len); +- if (unpack_MailSignaturePref(&a, (CPTR)SvPV(record, na), len)>0) { ++ if (unpack_MailSignaturePref(&a, (CPTR)SvPV(record, PL_na), len)>0) { + + if (a.signature) + hv_store(ret, "signature", 9, newSVpv(a.signature, 0), 0); +@@ -2229,7 +2229,7 @@ + RETVAL = record; + else { + +- a.signature = (s=hv_fetch(h,"signature",9,0)) ? SvPV(*s,na) : 0; ++ a.signature = (s=hv_fetch(h,"signature",9,0)) ? SvPV(*s,PL_na) : 0; + + len = pack_MailSignaturePref(&a, (CPTR)mybuf, 0xffff); + RETVAL = newSVpv(mybuf, len); +@@ -2257,7 +2257,7 @@ + { + STRLEN len; + SvPV(msg, len); +- RETVAL = pi_write(socket,SvPV(msg,na),len); ++ RETVAL = pi_write(socket,SvPV(msg,PL_na),len); + } + + SV * +@@ -2273,7 +2273,7 @@ + if (result >=0) + RETVAL = newSVpv(mybuf, result); + else +- RETVAL = &sv_undef; ++ RETVAL = &PL_sv_undef; + } + OUTPUT: + RETVAL +@@ -2318,7 +2318,7 @@ + char * name; + struct pi_sockaddr * a; + if ((s = hv_fetch(h, "device", 6, 0))) +- name = SvPV(*s,na); ++ name = SvPV(*s,PL_na); + else + name = ""; + a = calloc(1,sizeof(struct pi_sockaddr)+strlen(name)); +@@ -2418,7 +2418,7 @@ + croak("DBClasses doesn't exist"); + if (SvOK(name)) { + (void)SvPV(name,len); +- s = hv_fetch(h, SvPV(name,na), len, 0); ++ s = hv_fetch(h, SvPV(name,PL_na), len, 0); + } + if (!s) + s = hv_fetch(h, "", 0, 0); +@@ -2879,7 +2879,7 @@ + result = dlp_WriteResource(self->socket, self->handle, type, id, c, len); + if (result < 0) { + self->errnop = result; +- RETVAL = newSVsv(&sv_undef); ++ RETVAL = newSVsv(&PL_sv_undef); + } else + RETVAL = newSViv(result); + } +@@ -2931,7 +2931,7 @@ + r = dlp_CloseDB(self->socket, self->handle); + result = dlp_ReadAppPreference(self->socket, creator, id, backup, 0xFFFF, mybuf, &len, &version); + if (pi_version(self->socket)< 0x101) +- r = dlp_OpenDB(self->socket, self->dbcard, self->dbmode, SvPV(self->dbname,na), &self->handle); ++ r = dlp_OpenDB(self->socket, self->dbcard, self->dbmode, SvPV(self->dbname,PL_na), &self->handle); + ReturnReadPref(mybuf, len); + } + +@@ -2955,10 +2955,10 @@ + r = dlp_CloseDB(self->socket, self->handle); + result = dlp_WriteAppPreference(self->socket, creator, id, backup, version, buf, len); + if (pi_version(self->socket)< 0x101) +- r = dlp_OpenDB(self->socket, self->dbcard, self->dbmode, SvPV(self->dbname,na), &self->handle); ++ r = dlp_OpenDB(self->socket, self->dbcard, self->dbmode, SvPV(self->dbname,PL_na), &self->handle); + if (result < 0) { + self->errnop = result; +- RETVAL = newSVsv(&sv_undef); ++ RETVAL = newSVsv(&PL_sv_undef); + } else { + RETVAL = newSViv(result); + } +@@ -2994,7 +2994,7 @@ + result = dlp_WriteAppPreference(self->socket, creator, number, backup, version, buf, len); + if (result < 0) { + self->errnop = result; +- RETVAL = newSVsv(&sv_undef); ++ RETVAL = newSVsv(&PL_sv_undef); + } else { + RETVAL = newSViv(result); + } +@@ -3029,7 +3029,7 @@ + int result = dlp_GetSysDateTime(self->socket, &t); + if (result < 0) { + self->errnop = result; +- RETVAL = newSVsv(&sv_undef); ++ RETVAL = newSVsv(&PL_sv_undef); + } else + RETVAL = newSViv(t); + } +@@ -3054,7 +3054,7 @@ + int result = dlp_ReadSysInfo(self->socket, &si); + if (result < 0) { + self->errnop = result; +- RETVAL = newSVsv(&sv_undef); ++ RETVAL = newSVsv(&PL_sv_undef); + } else { + HV * i = newHV(); + hv_store(i, "romVersion", 10, newSViv(si.romVersion), 0);\ +@@ -3076,7 +3076,7 @@ + int result = dlp_ReadStorageInfo(self->socket, cardno, &c); + if (result < 0) { + self->errnop = result; +- RETVAL = newSVsv(&sv_undef); ++ RETVAL = newSVsv(&PL_sv_undef); + } else { + HV * i = newHV(); + hv_store(i, "card", 6, newSViv(c.card), 0);\ +@@ -3162,7 +3162,7 @@ + croak("Default PrefClass not defined"); + PUSHMARK(sp); + XPUSHs(newSVsv(*s)); +- XPUSHs(&sv_undef); ++ XPUSHs(&PL_sv_undef); + XPUSHs(sv_2mortal(newSVChar4(creator))); + if (id) + XPUSHs(id); +@@ -3232,7 +3232,7 @@ + result = dlp_OpenDB(self->socket, cardno, nummode, name, &handle); + if (result<0) { + self->errnop = result; +- RETVAL = &sv_undef; ++ RETVAL = &PL_sv_undef; + } else { + int type; + PDA__Pilot__DLP__DB * x = malloc(sizeof(PDA__Pilot__DLP__DB)); +@@ -3281,7 +3281,7 @@ + int result = dlp_CreateDB(self->socket, creator, type, cardno, flags, version, name, &handle); + if (result<0) { + self->errnop = result; +- RETVAL = &sv_undef; ++ RETVAL = &PL_sv_undef; + } else { + PDA__Pilot__DLP__DB * x = malloc(sizeof(PDA__Pilot__DLP__DB)); + SV * sv = newSViv((IV)(void*)x); +@@ -3348,7 +3348,7 @@ + result = dlp_WriteAppPreference(self->socket, creator, id, backup, version, buf, len); + if (result < 0) { + self->errnop = result; +- RETVAL = newSVsv(&sv_undef); ++ RETVAL = newSVsv(&PL_sv_undef); + } else { + RETVAL = newSViv(result); + } +@@ -3372,7 +3372,7 @@ + result = dlp_WriteAppPreference(self->socket, creator, number, backup, version, buf, len); + if (result < 0) { + self->errnop = result; +- RETVAL = newSVsv(&sv_undef); ++ RETVAL = newSVsv(&PL_sv_undef); + } else { + RETVAL = newSViv(result); + } +@@ -3473,7 +3473,7 @@ + else + t = 0; + result = dlp_FindDBInfo(self->socket, cardno, start, +- SvOK(name) ? SvPV(name,na) : 0, ++ SvOK(name) ? SvPV(name,PL_na) : 0, + t, c, &info); + pack_dbinfo(RETVAL, info, result); + } +@@ -3490,7 +3490,7 @@ + unsigned long f; + int result; + if ((result = dlp_ReadFeature(self->socket, creator, number, &f))<0) { +- RETVAL = newSVsv(&sv_undef); ++ RETVAL = newSVsv(&PL_sv_undef); + self->errnop = result; + } else { + RETVAL = newSViv(f); +@@ -3520,7 +3520,7 @@ + } + + void +-callApplication(self, creator, type, action, data=&sv_undef, maxretlen=0xFFFF) ++callApplication(self, creator, type, action, data=&PL_sv_undef, maxretlen=0xFFFF) + PDA::Pilot::DLP * self + Char4 creator + Char4 type +@@ -3534,7 +3534,7 @@ + int result; + (void)SvPV(data,len); + result = dlp_CallApplication(self->socket, creator, +- type, action, len, SvPV(data,na), ++ type, action, len, SvPV(data,PL_na), + &retcode, maxretlen, (int *)&len, mybuf); + EXTEND(sp, 2); + if (result >= 0) { +@@ -3543,7 +3543,7 @@ + PUSHs(sv_2mortal(newSViv(retcode))); + } + } else +- PUSHs(&sv_undef); ++ PUSHs(&PL_sv_undef); + } + + int +@@ -3654,7 +3654,7 @@ + croak("DBClasses doesn't exist"); + if (SvOK(name)) { + (void)SvPV(name, len); +- s = hv_fetch(h, SvPV(name, na), len, 0); ++ s = hv_fetch(h, SvPV(name, PL_na), len, 0); + } + if (!s) + s = hv_fetch(h, "", 0, 0); +@@ -3714,7 +3714,7 @@ + result = pi_file_get_entries(self->pf, &len); + if (result) { + self->errnop = result; +- RETVAL = &sv_undef; ++ RETVAL = &PL_sv_undef; + } else + RETVAL = newSViv(len); + } +--- pilot-link-0.11.0/bindings/Perl/Makefile.PL.in.perlpollute 2002-07-12 17:12:52.000000000 +0200 ++++ pilot-link-0.11.0/bindings/Perl/Makefile.PL.in 2002-07-18 10:33:03.000000000 +0200 +@@ -14,5 +14,4 @@ + 'LIBS' => $lib, + 'XSPROTOARG' => '-noprototypes', + 'INC' => '-I../../include', +- 'DEFINE' => '-DPERL_POLLUTE', + ); +--- pilot-link-0.11.0/bindings/Perl/typemap.perlpollute 2000-10-28 02:23:48.000000000 +0200 ++++ pilot-link-0.11.0/bindings/Perl/typemap 2002-07-18 10:33:03.000000000 +0200 +@@ -50,9 +50,9 @@ + + T_RESULT + if ($var < 0) { +- sv_setsv($arg, &sv_no); ++ sv_setsv($arg, &PL_sv_no); + self->errnop = $var; + } else +- sv_setsv($arg, &sv_yes); ++ sv_setsv($arg, &PL_sv_yes); + T_PTROBJ + sv_setref_pv($arg, \"${ntype}\", (void*)$var); pilot-link-0.11.2-malsync.patch: Makefile.PL.in | 2 +- Pilot.pm | 8 ++++++++ Pilot.xs | 35 ++++++++++++++++++++++++++++++++++- 3 files changed, 43 insertions(+), 2 deletions(-) Index: pilot-link-0.11.2-malsync.patch =================================================================== RCS file: pilot-link-0.11.2-malsync.patch diff -N pilot-link-0.11.2-malsync.patch --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ pilot-link-0.11.2-malsync.patch 29 Mar 2006 13:20:40 -0000 1.3 @@ -0,0 +1,95 @@ +--- pilot-link-0.11.2/bindings/Perl/Makefile.PL.in.malsync 2002-08-06 22:04:46.000000000 +0200 ++++ pilot-link-0.11.2/bindings/Perl/Makefile.PL.in 2002-08-06 22:08:12.000000000 +0200 +@@ -11,7 +11,7 @@ + WriteMakefile( + 'NAME' => 'PDA::Pilot', + 'VERSION' => '@PILOT_LINK_VERS at .@PILOT_LINK_MAJOR at .@PILOT_LINK_MINOR@', +- 'LIBS' => $lib, ++ 'LDFROM' => "Pilot.o $lib", + 'XSPROTOARG' => '-noprototypes', + 'INC' => '-I../../include', + ); +--- pilot-link-0.11.2/bindings/Perl/Pilot.pm.malsync 2001-12-30 21:26:00.000000000 +0100 ++++ pilot-link-0.11.2/bindings/Perl/Pilot.pm 2002-08-06 22:04:46.000000000 +0200 +@@ -755,8 +755,16 @@ + + Returns last DLP error, resetting error to zero. + ++=item PDA::Pilot::DLP::socket() ++ ++Returns DLP socket. ++ + =item PDA::Pilot::DLP::GetSysDateTime(socket) + ++=item PDA::Pilot::DLP::socket() ++ ++Returns the socket in use by DLP. ++ + Same as DLP call dlp_GetSysDateTime. If successfull, returns time, otherwise + returns undef. + +--- pilot-link-0.11.2/bindings/Perl/Pilot.xs.malsync 2002-08-06 22:04:46.000000000 +0200 ++++ pilot-link-0.11.2/bindings/Perl/Pilot.xs 2002-08-06 22:04:46.000000000 +0200 +@@ -23,6 +23,10 @@ + #include "XSUB.h" + #include "patchlevel.h" + ++#include ++#include ++#include ++ + #include "pi-macros.h" + #include "pi-file.h" + #include "pi-datebook.h" +@@ -2270,7 +2274,7 @@ + if (len > sizeof(mybuf)) + len = sizeof(mybuf); + result = pi_read(socket, mybuf, len); +- if (result >=0) ++ if (result > 0) + RETVAL = newSVpv(mybuf, result); + else + RETVAL = &PL_sv_undef; +@@ -2353,6 +2357,26 @@ + OUTPUT: + RETVAL + ++int ++connect(port) ++ char * port ++ CODE: ++ { ++ struct pi_sockaddr a; ++ int socket; ++ ++ socket = pi_socket(PI_AF_PILOT, PI_SOCK_STREAM, PI_PF_PADP); ++ strcpy(a.pi_device, port); ++ a.pi_family = PI_AF_PILOT; ++ ++ if (pi_connect(socket, (struct sockaddr*)&a, sizeof(a))) ++ RETVAL = 0; ++ else ++ RETVAL = socket; ++ } ++ OUTPUT: ++ RETVAL ++ + SV * + accept(socket) + int socket +@@ -3020,6 +3044,15 @@ + OUTPUT: + RETVAL + ++int ++socket(self) ++ PDA::Pilot::DLP * self ++ CODE: ++ RETVAL = self->socket; ++ OUTPUT: ++ RETVAL ++ ++ + SV * + getTime(self) + PDA::Pilot::DLP * self pilot-link-0.11.8-misc.patch: pilot-datebook-data.c | 4 ++-- pilot-datebook-windat.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) Index: pilot-link-0.11.8-misc.patch =================================================================== RCS file: pilot-link-0.11.8-misc.patch diff -N pilot-link-0.11.8-misc.patch --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ pilot-link-0.11.8-misc.patch 29 Mar 2006 13:20:40 -0000 1.3 @@ -0,0 +1,24 @@ +--- pilot-link-0.11.8/src/pilot-datebook/pilot-datebook-data.c.orig 2004-06-30 12:52:03.086414080 +0200 ++++ pilot-link-0.11.8/src/pilot-datebook/pilot-datebook-data.c 2004-06-30 12:52:47.306875517 +0200 +@@ -1259,8 +1259,8 @@ + buffer[value_end - value_start] = '\0'; + } + else { +- text_unquote(value_start, buffer, sizeof(buffer)); +- buffer[sizeof(buffer)] = '\0'; ++ text_unquote(value_start, buffer, sizeof(buffer) -1); ++ buffer[sizeof(buffer) - 1] = '\0'; + } + value->type = DATEBOOK_FIELD_STR; + value->literal.lit_str = strdup(buffer); +--- pilot-link-0.11.8/src/pilot-datebook/pilot-datebook-windat.c.orig 2004-06-30 12:52:55.407677772 +0200 ++++ pilot-link-0.11.8/src/pilot-datebook/pilot-datebook-windat.c 2004-06-30 12:56:32.575574943 +0200 +@@ -1149,7 +1149,7 @@ + "Unfiled", + sizeof(header->aai.category.name) - 1); + header->aai.category. +- name[0][sizeof(header->aai.category.name) - ++ name[0][sizeof(header->aai.category.name[0]) - + 1] = '\0'; + header->aai.category.ID[0] = 0; + pilot-link-0.11.8-misc1.patch: libpisock++/address.cc | 4 ---- libpisock/pi-file.c | 6 +++--- 2 files changed, 3 insertions(+), 7 deletions(-) Index: pilot-link-0.11.8-misc1.patch =================================================================== RCS file: pilot-link-0.11.8-misc1.patch diff -N pilot-link-0.11.8-misc1.patch --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ pilot-link-0.11.8-misc1.patch 29 Mar 2006 13:20:40 -0000 1.4 @@ -0,0 +1,35 @@ +--- pilot-link-0.11.8/libpisock/pi-file.c.orig 2005-01-24 18:56:19.613347103 +0100 ++++ pilot-link-0.11.8/libpisock/pi-file.c 2005-01-24 18:57:12.864549313 +0100 +@@ -1319,6 +1319,9 @@ + /* Delete DB if it already exists */ + dlp_DeleteDB(socket, cardno, pf->info.name); + ++ /* Set up DB flags */ ++ flags = pf->info.flags; ++ + /* Judd - 25Nov99 - Graffiti hack We want to make sure that these 2 + flags get set for this one */ + +@@ -1327,9 +1330,6 @@ + flags |= dlpDBFlagReset; + } + +- /* Set up DB flags */ +- flags = pf->info.flags; +- + if (strcmp(pf->info.name, "Graffiti ShortCuts ") == 0) { + flags |= 0x8000; /* Rewrite an open DB */ + reset = 1; /* To be on the safe side */ +--- pilot-link-0.11.8/libpisock++/address.cc.orig 2005-01-24 18:57:58.069080760 +0100 ++++ pilot-link-0.11.8/libpisock++/address.cc 2005-01-24 19:09:32.766285313 +0100 +@@ -14,10 +14,6 @@ + + static inline int hi(const unsigned int x) { return (x >> 4) & 0x0f; } + static inline int lo(const unsigned int x) { return x & 0x0f; } +-static inline int pair(const unsigned int x, const unsigned int y) +-{ +- return (x << 4) | y; +-} + + addressAppInfo_t::addressAppInfo_t(void *ai) + : appInfo_t(ai) pilot-link-0.11.8-readfile.patch: pilot-addresses.c | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) Index: pilot-link-0.11.8-readfile.patch =================================================================== RCS file: pilot-link-0.11.8-readfile.patch diff -N pilot-link-0.11.8-readfile.patch --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ pilot-link-0.11.8-readfile.patch 29 Mar 2006 13:20:40 -0000 1.3 @@ -0,0 +1,31 @@ +diff -rubB pilot-link-0.11.8-9/src/pilot-addresses.c pilot-link-0.11.8-10/src/pilot-addresses.c +--- pilot-link-0.11.8-9/src/pilot-addresses.c 2004-06-01 23:00:19.000000000 -0400 ++++ pilot-link-0.11.8-10/src/pilot-addresses.c 2004-06-01 22:13:27.000000000 -0400 +@@ -291,7 +291,7 @@ + int read_file(FILE *in, int sd, int db, struct AddressAppInfo *aai) + { + int i = -1, +- l, ++ l, c, + attribute, + category; + char buf[0xffff]; +@@ -302,10 +302,15 @@ + fflush(stdout); + do { + +- fgets(line, 1000, in); +- if (index(line, '#') == line) { +- fprintf(stderr, "\nIgnoring header\n"); ++ /* Skip comment lines */ ++ c = getc(in); ++ if(feof(in)) break; ++ if(c == '#') { ++ fgets(line, sizeof(line), in); ++ fprintf(stderr,"Skipping line: %s\n",line); + continue; ++ } else { ++ fseek(in, -1, SEEK_CUR); + } + + i = read_field(buf, in, sizeof(buf)); pilot-link-0.11.8-size.patch: include/pi-dlp.h | 2 +- libpisock/dlp.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) Index: pilot-link-0.11.8-size.patch =================================================================== RCS file: pilot-link-0.11.8-size.patch diff -N pilot-link-0.11.8-size.patch --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ pilot-link-0.11.8-size.patch 29 Mar 2006 13:20:40 -0000 1.3 @@ -0,0 +1,22 @@ +--- pilot-link-0.11.8/include/pi-dlp.h.size 2004-06-30 15:28:11.806961956 +0200 ++++ pilot-link-0.11.8/include/pi-dlp.h 2004-06-30 15:28:20.825625065 +0200 +@@ -42,7 +42,7 @@ + + #define PI_DLP_ARG_FIRST_ID 0x20 + +-#define DLP_BUF_SIZE 0xffff ++#define DLP_BUF_SIZE 0xfffff + + /* Note: All of these functions return an integer that if greater + then zero is the number of bytes in the result, zero if there was +--- pilot-link-0.11.8/libpisock/dlp.c.size 2004-06-30 15:15:51.612579963 +0200 ++++ pilot-link-0.11.8/libpisock/dlp.c 2004-06-30 15:27:42.907246013 +0200 +@@ -85,7 +85,7 @@ + + #define set_date(ptr,val) (dlp_htopdate((val),(ptr))) + +-#define DLP_BUF_SIZE 0xffff ++#define DLP_BUF_SIZE 0xfffff + #define DLP_REQUEST_DATA(req, arg, offset) &req->argv[arg]->data[offset] + #define DLP_RESPONSE_DATA(res, arg, offset) &res->argv[arg]->data[offset] + pilot-link-0.11.8-underquoted.patch: pilot-link.m4 | 2 +- pilot-link.m4.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) Index: pilot-link-0.11.8-underquoted.patch =================================================================== RCS file: pilot-link-0.11.8-underquoted.patch diff -N pilot-link-0.11.8-underquoted.patch --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ pilot-link-0.11.8-underquoted.patch 29 Mar 2006 13:20:40 -0000 1.3 @@ -0,0 +1,16 @@ +--- pilot-link-0.11.8/pilot-link.m4.in.underquoted 2004-08-06 13:59:04.499399922 +0100 ++++ pilot-link-0.11.8/pilot-link.m4.in 2004-08-06 13:59:17.849846236 +0100 +@@ -1,4 +1,4 @@ +-AC_DEFUN(AC_PILOT_LINK_HOOK, ++AC_DEFUN([AC_PILOT_LINK_HOOK], + [ + PILOT_LINK_VERS=@PILOT_LINK_VERS@ + PILOT_LINK_MAJOR=@PILOT_LINK_MAJOR@ +--- pilot-link-0.11.8/pilot-link.m4.underquoted 2004-08-06 13:59:06.996922193 +0100 ++++ pilot-link-0.11.8/pilot-link.m4 2004-08-06 13:59:24.946488790 +0100 +@@ -1,4 +1,4 @@ +-AC_DEFUN(AC_PILOT_LINK_HOOK, ++AC_DEFUN([AC_PILOT_LINK_HOOK], + [ + PILOT_LINK_VERS=0 + PILOT_LINK_MAJOR=11 Index: pilot-link.spec =================================================================== RCS file: /cvs/dist/rpms/pilot-link/FC-4/pilot-link.spec,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- pilot-link.spec 5 Sep 2005 10:51:36 -0000 1.28 +++ pilot-link.spec 29 Mar 2006 13:20:40 -0000 1.29 @@ -1,17 +1,21 @@ %define support_perl 0 %define perl_version 5.8.0 -%define interversion cvs20050830 -%define libusb 0 Summary: File transfer utilities between Linux and PalmPilots. Name: pilot-link -Version: 0.12.0 -Release: 0.pre4.0.fc4.2 -Source: pilot-link-%{version}-%{interversion}.tar.bz2 +Version: 0.11.8 +Release: 11.1.fc4 +Source: pilot-link-%{version}.tar.bz2 Url: http://www.pilot-link.org/ -# upstream patches -Patch100: pilot-link-0.12.0-pre4-misc1.patch -Epoch: 1 +Patch1: pilot-link-0.11.0-perlmd5.patch +Patch2: pilot-link-0.11.0-perlpollute.patch +Patch3: pilot-link-0.11.2-malsync.patch +Patch5: pilot-link-0.11.8-misc.patch +Patch6: pilot-link-0.11.8-size.patch +Patch7: pilot-link-0.11.8-readfile.patch +Patch8: pilot-link-0.11.8-underquoted.patch +Patch9: pilot-link-0.11.8-misc1.patch +Epoch: 2 License: GPL Group: Applications/Communications BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root @@ -54,14 +58,20 @@ need to install pilot-link-devel. %prep -%setup -q -n %{name}-%{version}-%{interversion} -%patch100 -p1 -b .gccwarning +%setup -q +%if %{support_perl} +%patch1 -p1 -b .perlmd5 +%patch2 -p1 -b .perlpollute +%patch3 -p1 -b .malsync +%endif +%patch5 -p1 -b .misc +%patch6 -p1 -b .size +%patch7 -p1 -b .read +%patch8 -p1 -b .underquoted +%patch9 -p1 -b .misc1 %build CFLAGS="$RPM_OPT_FLAGS" %configure \ -%if %{libusb} - --enable-libusb \ -%endif --with-python=no \ --with-itcl=no \ --with-tk=no \ @@ -125,13 +135,15 @@ %files devel %defattr(-,root,root) -%{_libdir}/pkgconfig/* %{_libdir}/*.a %{_libdir}/*.so %{_includedir}/* %{_datadir}/aclocal/*.m4 %changelog +* Wed Mar 29 2006 Than Ngo 2:0.11.8-11.1.fc4 +- downgrade to stable release 0.11.8 + * Mon Sep 05 2005 Than Ngo 0.12.0-0.pre4.0.fc4.2 - pre5 cvs snapshots - remove several patches which included new upstream Index: sources =================================================================== RCS file: /cvs/dist/rpms/pilot-link/FC-4/sources,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- sources 5 Sep 2005 10:51:36 -0000 1.11 +++ sources 29 Mar 2006 13:20:40 -0000 1.12 @@ -1 +1 @@ -53c2ea236941bf9d897e3f3448376c94 pilot-link-0.12.0-cvs20050830.tar.bz2 +586f84add601e8b86da3093ab784e997 pilot-link-0.11.8.tar.bz2 --- pilot-link-0.12.0-pre4-misc1.patch DELETED --- From fedora-cvs-commits at redhat.com Wed Mar 29 13:21:15 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 29 Mar 2006 08:21:15 -0500 Subject: rpms/newt/FC-5 newt-0.52.2-screensize.patch, NONE, 1.1 newt.spec, 1.35, 1.36 Message-ID: <200603291321.k2TDLF8D004766@cvs.devel.redhat.com> Author: prockai Update of /cvs/dist/rpms/newt/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv4647 Modified Files: newt.spec Added Files: newt-0.52.2-screensize.patch Log Message: * Wed Mar 29 2006 Petr Rockai - 0.52.2-6 - fix #185950 by applying tmraz's patch (thanks) newt-0.52.2-screensize.patch: newt.c | 8 ++++---- newt.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) --- NEW FILE newt-0.52.2-screensize.patch --- --- newt-0.52.2/newt.c.wincoord 2005-09-30 16:13:16.000000000 +0200 +++ newt-0.52.2/newt.c 2006-03-28 22:39:40.000000000 +0200 @@ -617,7 +617,7 @@ * @param title - title string * @return zero on success (currently no errors reported) */ -int newtOpenWindow(unsigned int left, unsigned int top, +int newtOpenWindow(int left, int top, unsigned int width, unsigned int height, const char * title) { int j, row, col; @@ -708,14 +708,14 @@ */ int newtCenteredWindow(unsigned int width,unsigned int height, const char * title) { - unsigned int top, left; + int top, left; - top = (SLtt_Screen_Rows - height) / 2; + top = ((int)(SLtt_Screen_Rows - height)) / 2; /* I don't know why, but this seems to look better */ if ((SLtt_Screen_Rows % 2) && (top % 2)) top--; - left = (SLtt_Screen_Cols - width) / 2; + left = ((int)(SLtt_Screen_Cols - width)) / 2; newtOpenWindow(left, top, width, height, title); --- newt-0.52.2/newt.h.wincoord 2005-09-21 11:32:01.000000000 +0200 +++ newt-0.52.2/newt.h 2006-03-28 22:06:07.000000000 +0200 @@ -115,7 +115,7 @@ void newtClearKeyBuffer(void); void newtDelay(unsigned int usecs); /* top, left are *not* counting the border */ -int newtOpenWindow(unsigned int left,unsigned int top, +int newtOpenWindow(int left,int top, unsigned int width,unsigned int height, const char * title); int newtCenteredWindow(unsigned int width,unsigned int height, const char * title); Index: newt.spec =================================================================== RCS file: /cvs/dist/rpms/newt/FC-5/newt.spec,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- newt.spec 11 Feb 2006 04:45:04 -0000 1.35 +++ newt.spec 29 Mar 2006 13:21:08 -0000 1.36 @@ -4,13 +4,14 @@ Name: newt %define version 0.52.2 Version: %{version} -Release: 5.2 +Release: 6 License: LGPL Group: System Environment/Libraries Source: newt-%{version}.tar.gz Patch0: newt-0.52.2-notcl.patch Patch1: newt-0.52.2-scrollbars.patch Patch2: newt-0.52.2-pgupdown-crash.patch +Patch3: newt-0.52.2-screensize.patch BuildRequires: python, python-devel, perl, slang-devel Requires: slang Provides: snack = %{version}-%{release} @@ -44,6 +45,7 @@ %patch0 -p1 -b .notcl %patch1 -p1 -b .scrollbars %patch2 -p1 -b .pgupdown-crash +%patch3 -p1 -b .screensize %build # gpm support seems to smash the stack w/ we use help in anaconda?? @@ -89,6 +91,9 @@ %{_libdir}/libnewt.so %changelog +* Wed Mar 29 2006 Petr Rockai - 0.52.2-6 +- fix #185950 by applying tmraz's patch (thanks) + * Fri Feb 10 2006 Jesse Keating - 0.52.2-5.2 - bump again for double-long bug on ppc(64) From fedora-cvs-commits at redhat.com Wed Mar 29 13:26:44 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 29 Mar 2006 08:26:44 -0500 Subject: rpms/system-config-samba/FC-5 .cvsignore, 1.29, 1.30 sources, 1.29, 1.30 system-config-samba.spec, 1.32, 1.33 Message-ID: <200603291326.k2TDQirn004981@cvs.devel.redhat.com> Author: nphilipp Update of /cvs/dist/rpms/system-config-samba/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv4962 Modified Files: .cvsignore sources system-config-samba.spec Log Message: don't require gnome module (#187200) don't wrap text in About dialog Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/system-config-samba/FC-5/.cvsignore,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- .cvsignore 3 Mar 2006 15:17:25 -0000 1.29 +++ .cvsignore 29 Mar 2006 13:26:41 -0000 1.30 @@ -1 +1 @@ -system-config-samba-1.2.34.tar.bz2 +system-config-samba-1.2.35.tar.bz2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/system-config-samba/FC-5/sources,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- sources 3 Mar 2006 15:17:25 -0000 1.29 +++ sources 29 Mar 2006 13:26:41 -0000 1.30 @@ -1 +1 @@ -a0c3e4681fb09676c0bdea5a9f07963a system-config-samba-1.2.34.tar.bz2 +dec710fe1137bbcc64fb200c6a81e452 system-config-samba-1.2.35.tar.bz2 Index: system-config-samba.spec =================================================================== RCS file: /cvs/dist/rpms/system-config-samba/FC-5/system-config-samba.spec,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- system-config-samba.spec 3 Mar 2006 15:17:25 -0000 1.32 +++ system-config-samba.spec 29 Mar 2006 13:26:41 -0000 1.33 @@ -1,12 +1,12 @@ Summary: Samba server configuration tool Name: system-config-samba -Version: 1.2.34 -Release: 1 +Version: 1.2.35 +Release: 0.fc4.1 URL: http://www.redhat.com/ License: GPL ExclusiveOS: Linux Group: System Environment/Base -BuildRoot: %{_tmppath}/%{name}-%{version}-root +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%__id_u -n) BuildArch: noarch Source0: %{name}-%{version}.tar.bz2 BuildRequires: desktop-file-utils @@ -77,6 +77,10 @@ %attr(0644,root,root) %config /etc/pam.d/system-config-samba %changelog +* Wed Mar 29 2006 Nils Philippsen - 1.2.35 +- don't require gnome module (#187200) +- don't wrap text in About dialog + * Fri Mar 03 2006 Nils Philippsen - 1.2.34 - require hicolor-icon-theme (#182874, #182875) From fedora-cvs-commits at redhat.com Wed Mar 29 13:27:29 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 29 Mar 2006 08:27:29 -0500 Subject: rpms/system-config-samba/FC-5 system-config-samba.spec,1.33,1.34 Message-ID: <200603291327.k2TDRTaD005050@cvs.devel.redhat.com> Author: nphilipp Update of /cvs/dist/rpms/system-config-samba/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv5034 Modified Files: system-config-samba.spec Log Message: correct release tag Index: system-config-samba.spec =================================================================== RCS file: /cvs/dist/rpms/system-config-samba/FC-5/system-config-samba.spec,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- system-config-samba.spec 29 Mar 2006 13:26:41 -0000 1.33 +++ system-config-samba.spec 29 Mar 2006 13:27:27 -0000 1.34 @@ -1,7 +1,7 @@ Summary: Samba server configuration tool Name: system-config-samba Version: 1.2.35 -Release: 0.fc4.1 +Release: 0.fc5.1 URL: http://www.redhat.com/ License: GPL ExclusiveOS: Linux From fedora-cvs-commits at redhat.com Wed Mar 29 13:34:59 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 29 Mar 2006 08:34:59 -0500 Subject: rpms/pilot-link/FC-5 pilot-link-0.11.0-perlmd5.patch, 1.2, 1.3 pilot-link-0.11.0-perlpollute.patch, 1.2, 1.3 pilot-link-0.11.2-malsync.patch, 1.2, 1.3 pilot-link-0.11.8-misc.patch, 1.2, 1.3 pilot-link-0.11.8-misc1.patch, 1.3, 1.4 pilot-link-0.11.8-readfile.patch, 1.2, 1.3 pilot-link-0.11.8-size.patch, 1.2, 1.3 pilot-link-0.11.8-underquoted.patch, 1.2, 1.3 pilot-link.spec, 1.38, 1.39 sources, 1.12, 1.13 pilot-link-0.12.0-docbook-style-xsl-1.69.1.patch, 1.1, NONE pilot-link-0.12.0-pre4-misc1.patch, 1.1, NONE Message-ID: <200603291334.k2TDYwEt005229@cvs.devel.redhat.com> Author: than Update of /cvs/dist/rpms/pilot-link/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv5211 Modified Files: pilot-link.spec sources Added Files: pilot-link-0.11.0-perlmd5.patch pilot-link-0.11.0-perlpollute.patch pilot-link-0.11.2-malsync.patch pilot-link-0.11.8-misc.patch pilot-link-0.11.8-misc1.patch pilot-link-0.11.8-readfile.patch pilot-link-0.11.8-size.patch pilot-link-0.11.8-underquoted.patch Removed Files: pilot-link-0.12.0-docbook-style-xsl-1.69.1.patch pilot-link-0.12.0-pre4-misc1.patch Log Message: downgrade to stable release 0.11.8 pilot-link-0.11.0-perlmd5.patch: sync-plan.PL | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) Index: pilot-link-0.11.0-perlmd5.patch =================================================================== RCS file: pilot-link-0.11.0-perlmd5.patch diff -N pilot-link-0.11.0-perlmd5.patch --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ pilot-link-0.11.0-perlmd5.patch 29 Mar 2006 13:34:48 -0000 1.3 @@ -0,0 +1,38 @@ +--- pilot-link.0.9.5/src/sync-plan.PL.md5 Wed May 29 11:08:47 2002 ++++ pilot-link.0.9.5/src/sync-plan.PL Wed May 29 11:09:03 2002 +@@ -6,7 +6,7 @@ + use IO::Socket; + use IO::Select; + use Time::Local; +-use MD5; ++use Digest::MD5; + use PDA::Pilot; + + sub DatePlanToPerl { +@@ -313,7 +313,7 @@ + } + } + +- my($hash) = new MD5; ++ my($hash) = new Digest::MD5; + foreach (@output) { + #print "Adding |$_| to hash\n"; + $hash->add($_); +@@ -490,7 +490,7 @@ + my(@l) = split(/\n/,$r); + my($rec) = { raw => [@l], other => [] }; + my(@E, at R, at N, at M, at S, at US); +- my($hash) = new MD5; ++ my($hash) = new Digest::MD5; + $l[0] =~ s/\s+/ /g; + $hash->add($l[0]); + my($date, $time, $length, $early, $late, $flags, $color) = split(/\s+/, shift @l); +@@ -566,7 +566,7 @@ + + sub HashPilotRecord { + my($record) = @_; +- my($hash) = new MD5; ++ my($hash) = new Digest::MD5; + $hash->add($record->{raw}); + $hash->hexdigest; + } pilot-link-0.11.0-perlpollute.patch: Makefile.PL.in | 1 Pilot.xs | 168 ++++++++++++++++++++++++++++----------------------------- typemap | 4 - 3 files changed, 86 insertions(+), 87 deletions(-) Index: pilot-link-0.11.0-perlpollute.patch =================================================================== RCS file: pilot-link-0.11.0-perlpollute.patch diff -N pilot-link-0.11.0-perlpollute.patch --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ pilot-link-0.11.0-perlpollute.patch 29 Mar 2006 13:34:48 -0000 1.3 @@ -0,0 +1,640 @@ +--- pilot-link-0.11.0/bindings/Perl/Pilot.xs.perlpollute 2002-07-12 14:40:04.000000000 +0200 ++++ pilot-link-0.11.0/bindings/Perl/Pilot.xs 2002-07-18 10:40:45.000000000 +0200 +@@ -333,7 +333,7 @@ + #define pack_dbinfo(arg, var, failure)\ + {\ + if (failure < 0) {\ +- arg = &sv_undef;\ ++ arg = &PL_sv_undef;\ + self->errnop = failure;\ + } else {\ + HV * i = newHV();\ +@@ -387,8 +387,8 @@ + var.createDate = (s = hv_fetch(i, "createDate", 10, 0)) ? SvIV(*s) : 0;\ + var.modifyDate = (s = hv_fetch(i, "modifyDate", 10, 0)) ? SvIV(*s) : 0;\ + var.backupDate = (s = hv_fetch(i, "backupDate", 10, 0)) ? SvIV(*s) : 0;\ +- if ((s = hv_fetch(i, "name", 4, 0)) ? SvPV(*s,na) : 0)\ +- strcpy(var.name, SvPV(*s, na));\ ++ if ((s = hv_fetch(i, "name", 4, 0)) ? SvPV(*s,PL_na) : 0)\ ++ strcpy(var.name, SvPV(*s, PL_na));\ + } else {\ + croak("argument is not a hash reference");\ + } +@@ -396,7 +396,7 @@ + #define pack_userinfo(arg, var, failure)\ + {\ + if (failure < 0) {\ +- arg = &sv_undef;\ ++ arg = &PL_sv_undef;\ + self->errnop = failure;\ + } else {\ + HV * i = newHV();\ +@@ -420,8 +420,8 @@ + var.lastSyncPC = (s = hv_fetch(i, "lastSyncPC", 10, 0)) ? SvIV(*s) : 0;\ + var.lastSyncDate = (s = hv_fetch(i, "lastSyncDate", 12, 0)) ? SvIV(*s) : 0;\ + var.successfulSyncDate = (s = hv_fetch(i, "successfulSyncDate", 18, 0)) ? SvIV(*s) : 0;\ +- if ((s = hv_fetch(i, "name", 4, 0)) ? SvPV(*s,na) : 0)\ +- strcpy(var.username, SvPV(*s, na));\ ++ if ((s = hv_fetch(i, "name", 4, 0)) ? SvPV(*s,PL_na) : 0)\ ++ strcpy(var.username, SvPV(*s, PL_na));\ + } else {\ + croak("argument is not a hash reference");\ + } +@@ -465,7 +465,7 @@ + }\ + } else {\ + self->errnop = result;\ +- PUSHs(&sv_undef);\ ++ PUSHs(&PL_sv_undef);\ + } + + #define PackSI\ +@@ -507,7 +507,7 @@ + }\ + } else {\ + self->errnop = result;\ +- PUSHs(&sv_undef);\ ++ PUSHs(&PL_sv_undef);\ + } + + #define PackRecord\ +@@ -602,7 +602,7 @@ + }\ + } else {\ + self->errnop = result;\ +- PUSHs(&sv_undef);\ ++ PUSHs(&PL_sv_undef);\ + } + + #define PackResource\ +@@ -654,7 +654,7 @@ + }\ + } else {\ + self->errnop = result;\ +- PUSHs(&sv_undef);\ ++ PUSHs(&PL_sv_undef);\ + } + + #define PackPref\ +@@ -717,7 +717,7 @@ + croak("Unable to create resource");\ + } else {\ + self->errnop = result;\ +- PUSHs(&sv_undef);\ ++ PUSHs(&PL_sv_undef);\ + } + + void doUnpackCategory(HV * self, struct CategoryAppInfo * c) +@@ -757,7 +757,7 @@ + + if ((s = hv_fetch(self, "categoryName", 12, 0)) && SvOK(*s) && SvRV(*s) && (SvTYPE(av=(AV*)SvRV(*s))==SVt_PVAV)) + for (i=0;i<16;i++) +- strncpy(c->name[i], (s=av_fetch(av, i, 0)) ? SvPV(*s,na) : "", 16); ++ strncpy(c->name[i], (s=av_fetch(av, i, 0)) ? SvPV(*s,PL_na) : "", 16); + else + for (i=0;i<16;i++) + strcpy(c->name[i], ""); +@@ -783,7 +783,7 @@ + int SvList(SV * arg, char **list) + { + int i; +- char * str = SvPV(arg, na); ++ char * str = SvPV(arg, PL_na); + for (i=0;list[i];i++) + if (strcasecmp(list[i], str)==0) + return i; +@@ -839,7 +839,7 @@ + } + + SvPV(record,len); +- if (unpack_Appointment(&a, (CPTR)SvPV(record, na), len)>0) { ++ if (unpack_Appointment(&a, (CPTR)SvPV(record, PL_na), len)>0) { + + hv_store(ret, "event", 5, newSViv(a.event), 0); + hv_store(ret, "begin", 5, newRV_noinc((SV*)tmtoav(&a.begin)), 0); +@@ -949,11 +949,11 @@ + u = 2; + break; + default: +- if (strEQ(SvPV(*s, na), "minutes")) ++ if (strEQ(SvPV(*s, PL_na), "minutes")) + u = 0; +- else if (strEQ(SvPV(*s, na), "hours")) ++ else if (strEQ(SvPV(*s, PL_na), "hours")) + u = 1; +- else if (strEQ(SvPV(*s, na), "days")) ++ else if (strEQ(SvPV(*s, PL_na), "days")) + u = 2; + else + croak("Invalid advance unit %d encountered", u); +@@ -1018,10 +1018,10 @@ + } + } + +- a.description = (s = hv_fetch(h, "description", 11, 0)) ? SvPV(*s,na) : 0; ++ a.description = (s = hv_fetch(h, "description", 11, 0)) ? SvPV(*s,PL_na) : 0; + if (!a.description) + croak("appointments must contain a description"); +- a.note = (s = hv_fetch(h, "note", 4, 0)) ? SvPV(*s,na) : 0; ++ a.note = (s = hv_fetch(h, "note", 4, 0)) ? SvPV(*s,PL_na) : 0; + + len = pack_Appointment(&a, (CPTR)mybuf, 0xffff); + +@@ -1063,7 +1063,7 @@ + } + + SvPV(record,len); +- if (unpack_AppointmentAppInfo(&a, (CPTR)SvPV(record, na), len)>0) { ++ if (unpack_AppointmentAppInfo(&a, (CPTR)SvPV(record, PL_na), len)>0) { + + doUnpackCategory(ret, &a.category); + +@@ -1135,7 +1135,7 @@ + } + + SvPV(record,len); +- if (unpack_ToDo(&a, (CPTR)SvPV(record, na), len)>0) { ++ if (unpack_ToDo(&a, (CPTR)SvPV(record, PL_na), len)>0) { + + if (!a.indefinite) + hv_store(ret, "due", 3, newRV_noinc((SV*)tmtoav(&a.due)), 0); +@@ -1182,8 +1182,8 @@ + a.indefinite = 1; + } + +- a.description = (s = hv_fetch(h, "description", 11, 0)) ? SvPV(*s,na) : 0; +- a.note = (s = hv_fetch(h, "note", 4, 0)) ? SvPV(*s,na) : 0; ++ a.description = (s = hv_fetch(h, "description", 11, 0)) ? SvPV(*s,PL_na) : 0; ++ a.note = (s = hv_fetch(h, "note", 4, 0)) ? SvPV(*s,PL_na) : 0; + + len = pack_ToDo(&a, (CPTR)mybuf, 0xffff); + +@@ -1222,7 +1222,7 @@ + } + + SvPV(record,len); +- if (unpack_ToDoAppInfo(&a, (CPTR)SvPV(record, na), len)>0) { ++ if (unpack_ToDoAppInfo(&a, (CPTR)SvPV(record, PL_na), len)>0) { + + doUnpackCategory(ret, &a.category); + +@@ -1296,7 +1296,7 @@ + } + + SvPV(record,len); +- if (unpack_Address(&a, (CPTR)SvPV(record, na), len)>0) { ++ if (unpack_Address(&a, (CPTR)SvPV(record, PL_na), len)>0) { + + e = newAV(); + hv_store(ret, "phoneLabel", 10, newRV_noinc((SV*)e), 0); +@@ -1309,7 +1309,7 @@ + hv_store(ret, "entry", 5, newRV_noinc((SV*)e), 0); + + for (i=0;i<19;i++) { +- av_push(e, a.entry[i] ? newSVpv(a.entry[i],0) : &sv_undef); ++ av_push(e, a.entry[i] ? newSVpv(a.entry[i],0) : &PL_sv_undef); + } + + hv_store(ret, "showPhone", 9, newSViv(a.showPhone), 0); +@@ -1350,7 +1350,7 @@ + + if ((s = hv_fetch(h, "entry", 5, 0)) && SvOK(*s) && SvRV(*s) && (SvTYPE(av=(AV*)SvRV(*s))==SVt_PVAV)) + for (i=0;i<19;i++) +- a.entry[i] = ((s=av_fetch(av, i, 0)) && SvOK(*s)) ? SvPV(*s,na) : 0; ++ a.entry[i] = ((s=av_fetch(av, i, 0)) && SvOK(*s)) ? SvPV(*s,PL_na) : 0; + else + for (i=0;i<19;i++) + a.entry[i] = 0; +@@ -1397,7 +1397,7 @@ + } + + SvPV(record,len); +- if (unpack_AddressAppInfo(&a, (CPTR)SvPV(record, na), len)>0) { ++ if (unpack_AddressAppInfo(&a, (CPTR)SvPV(record, PL_na), len)>0) { + + doUnpackCategory(ret, &a.category); + +@@ -1457,13 +1457,13 @@ + a.sortByCompany = (s = hv_fetch(h, "sortByCompany", 13, 0)) ? SvIV(*s) : 0; + + if ((s = hv_fetch(h, "label", 5, 0)) && SvOK(*s) && SvRV(*s) && (SvTYPE(av=(AV*)SvRV(*s))==SVt_PVAV)) +- for (i=0;i<22;i++) strncpy(a.labels[i], (s=av_fetch(av, i, 0)) ? SvPV(*s,na) : "", 16); ++ for (i=0;i<22;i++) strncpy(a.labels[i], (s=av_fetch(av, i, 0)) ? SvPV(*s,PL_na) : "", 16); + else + for (i=0;i<22;i++) a.labels[i][0] = 0; + for (i=0;i<22;i++) a.labels[i][15] = 0; + + if ((s = hv_fetch(h, "phoneLabel", 10, 0)) && SvOK(*s) && SvRV(*s) && (SvTYPE(av=(AV*)SvRV(*s))==SVt_PVAV)) +- for (i=0;i<8;i++) strncpy(a.phoneLabels[i], (s=av_fetch(av, i, 0)) ? SvPV(*s,na) : "", 16); ++ for (i=0;i<8;i++) strncpy(a.phoneLabels[i], (s=av_fetch(av, i, 0)) ? SvPV(*s,PL_na) : "", 16); + else + for (i=0;i<8;i++) a.phoneLabels[i][0] = 0; + for (i=0;i<8;i++) a.phoneLabels[i][15] = 0; +@@ -1506,7 +1506,7 @@ + } + + SvPV(record,len); +- if (unpack_Memo(&a, (CPTR)SvPV(record, na), len)>0) { ++ if (unpack_Memo(&a, (CPTR)SvPV(record, PL_na), len)>0) { + + hv_store(ret, "text", 4, newSVpv(a.text,0), 0); + +@@ -1536,7 +1536,7 @@ + else { + + if ((s = hv_fetch(h, "text", 4, 0))) +- a.text = SvPV(*s,na); ++ a.text = SvPV(*s,PL_na); + else + a.text = 0; + +@@ -1576,7 +1576,7 @@ + } + + SvPV(record,len); +- if (unpack_MemoAppInfo(&a, (CPTR)SvPV(record, na), len)>0) { ++ if (unpack_MemoAppInfo(&a, (CPTR)SvPV(record, PL_na), len)>0) { + + doUnpackCategory(ret, &a.category); + +@@ -1647,7 +1647,7 @@ + } + + SvPV(record,len); +- if (unpack_Expense(&e, (CPTR)SvPV(record, na), len)>0) { ++ if (unpack_Expense(&e, (CPTR)SvPV(record, PL_na), len)>0) { + + hv_store(ret, "date", 4, newRV_noinc((SV*)tmtoav(&e.date)), 0); + hv_store(ret, "type", 4, newSVlist(e.type,ExpenseTypeNames),0); +@@ -1706,15 +1706,15 @@ + avtotm((AV*)SvRV(*s), &e.date); + else + croak("expense record must contain date"); +- if ((s = hv_fetch(h, "amount", 6, 0))) e.amount = SvPV(*s,na); ++ if ((s = hv_fetch(h, "amount", 6, 0))) e.amount = SvPV(*s,PL_na); + else e.amount = 0; +- if ((s = hv_fetch(h, "vendor", 6, 0))) e.vendor = SvPV(*s,na); ++ if ((s = hv_fetch(h, "vendor", 6, 0))) e.vendor = SvPV(*s,PL_na); + else e.vendor = 0; +- if ((s = hv_fetch(h, "city", 4, 0))) e.city = SvPV(*s,na); ++ if ((s = hv_fetch(h, "city", 4, 0))) e.city = SvPV(*s,PL_na); + else e.city = 0; +- if ((s = hv_fetch(h, "attendess", 9, 0))) e.attendees = SvPV(*s,na); ++ if ((s = hv_fetch(h, "attendess", 9, 0))) e.attendees = SvPV(*s,PL_na); + else e.attendees = 0; +- if ((s = hv_fetch(h, "note", 4, 0))) e.note = SvPV(*s,na); ++ if ((s = hv_fetch(h, "note", 4, 0))) e.note = SvPV(*s,PL_na); + else e.note = 0; + + len = pack_Expense(&e, (CPTR)mybuf, 0xffff); +@@ -1755,7 +1755,7 @@ + } + + SvPV(record,len); +- if (unpack_ExpenseAppInfo(&e, (CPTR)SvPV(record, na), len)>0) { ++ if (unpack_ExpenseAppInfo(&e, (CPTR)SvPV(record, PL_na), len)>0) { + + hv_store(ret, "sortOrder", 9, newSVlist(e.sortOrder,ExpenseSortNames),0); + a = newAV(); +@@ -1798,15 +1798,15 @@ + HV * hv; + if ((s=av_fetch(av, i, 0)) && SvOK(*s) && SvRV(*s) && (SvTYPE(hv=(HV*)SvRV(*s))==SVt_PVHV)) { + if (s = hv_fetch(hv, "name", 4, 0)) { +- strncpy(e.currencies[i].name, SvPV(*s, na), 16); ++ strncpy(e.currencies[i].name, SvPV(*s, PL_na), 16); + e.currencies[i].name[15] = 0; + } + if (s = hv_fetch(hv, "symbol", 6, 0)) { +- strncpy(e.currencies[i].symbol, SvPV(*s, na), 4); ++ strncpy(e.currencies[i].symbol, SvPV(*s, PL_na), 4); + e.currencies[i].symbol[3] = 0; + } + if (s = hv_fetch(hv, "rate", 4, 0)) { +- strncpy(e.currencies[i].rate, SvPV(*s, na), 8); ++ strncpy(e.currencies[i].rate, SvPV(*s, PL_na), 8); + e.currencies[i].rate[7] = 0; + } + } +@@ -1854,7 +1854,7 @@ + } + + SvPV(record,len); +- if (unpack_ExpensePref(&a, (CPTR)SvPV(record, na), len)>0) { ++ if (unpack_ExpensePref(&a, (CPTR)SvPV(record, PL_na), len)>0) { + + hv_store(ret, "unitOfDistance", 14, newSVlist(a.unitOfDistance, ExpenseDistanceNames), 0); + hv_store(ret, "currentCategory", 15, newSViv(a.currentCategory), 0); +@@ -1944,7 +1944,7 @@ + } + + SvPV(record,len); +- if (unpack_Mail(&a, (CPTR)SvPV(record, na), len)>0) { ++ if (unpack_Mail(&a, (CPTR)SvPV(record, PL_na), len)>0) { + + if (a.subject) hv_store(ret, "subject", 7, newSVpv(a.subject,0), 0); + if (a.from) hv_store(ret, "from", 4, newSVpv(a.from,0), 0); +@@ -1990,14 +1990,14 @@ + } + else { + +- a.subject = (s = hv_fetch(h, "subject", 7, 0)) ? SvPV(*s,na) : 0; +- a.from = (s = hv_fetch(h, "from", 4, 0)) ? SvPV(*s,na) : 0; +- a.to = (s = hv_fetch(h, "to", 2, 0)) ? SvPV(*s,na) : 0; +- a.cc = (s = hv_fetch(h, "cc", 2, 0)) ? SvPV(*s,na) : 0; +- a.bcc = (s = hv_fetch(h, "bcc", 3, 0)) ? SvPV(*s,na) : 0; +- a.replyTo = (s = hv_fetch(h, "replyTo", 7, 0)) ? SvPV(*s,na) : 0; +- a.sentTo = (s = hv_fetch(h, "sentTo", 6, 0)) ? SvPV(*s,na) : 0; +- a.body = (s = hv_fetch(h, "body", 4, 0)) ? SvPV(*s,na) : 0; ++ a.subject = (s = hv_fetch(h, "subject", 7, 0)) ? SvPV(*s,PL_na) : 0; ++ a.from = (s = hv_fetch(h, "from", 4, 0)) ? SvPV(*s,PL_na) : 0; ++ a.to = (s = hv_fetch(h, "to", 2, 0)) ? SvPV(*s,PL_na) : 0; ++ a.cc = (s = hv_fetch(h, "cc", 2, 0)) ? SvPV(*s,PL_na) : 0; ++ a.bcc = (s = hv_fetch(h, "bcc", 3, 0)) ? SvPV(*s,PL_na) : 0; ++ a.replyTo = (s = hv_fetch(h, "replyTo", 7, 0)) ? SvPV(*s,PL_na) : 0; ++ a.sentTo = (s = hv_fetch(h, "sentTo", 6, 0)) ? SvPV(*s,PL_na) : 0; ++ a.body = (s = hv_fetch(h, "body", 4, 0)) ? SvPV(*s,PL_na) : 0; + + a.read = (s = hv_fetch(h, "read", 4, 0)) ? SvIV(*s) : 0; + a.signature = (s = hv_fetch(h, "signature", 9, 0)) ? SvIV(*s) : 0; +@@ -2045,7 +2045,7 @@ + } + + SvPV(record,len); +- if (unpack_MailAppInfo(&a, (CPTR)SvPV(record, na), len)>0) { ++ if (unpack_MailAppInfo(&a, (CPTR)SvPV(record, PL_na), len)>0) { + + doUnpackCategory(ret, &a.category); + +@@ -2121,7 +2121,7 @@ + } + + SvPV(record,len); +- if (unpack_MailSyncPref(&a, (CPTR)SvPV(record, na), len)>0) { ++ if (unpack_MailSyncPref(&a, (CPTR)SvPV(record, PL_na), len)>0) { + + hv_store(ret, "syncType", 8, newSVlist(a.syncType, MailSyncTypeNames), 0); + hv_store(ret, "getHigh", 7, newSViv(a.getHigh), 0); +@@ -2165,9 +2165,9 @@ + a.getContaining = (s=hv_fetch(h,"getContaining",13,0)) ? SvIV(*s) : 0; + a.truncate = (s=hv_fetch(h,"truncate",8,0)) ? SvIV(*s) : 0; + +- a.filterTo = (s=hv_fetch(h,"filterTo",8,0)) ? SvPV(*s,na) : 0; +- a.filterFrom = (s=hv_fetch(h,"filterFrom",10,0)) ? SvPV(*s,na) : 0; +- a.filterSubject = (s=hv_fetch(h,"filterSubject",13,0)) ? SvPV(*s,na) : 0; ++ a.filterTo = (s=hv_fetch(h,"filterTo",8,0)) ? SvPV(*s,PL_na) : 0; ++ a.filterFrom = (s=hv_fetch(h,"filterFrom",10,0)) ? SvPV(*s,PL_na) : 0; ++ a.filterSubject = (s=hv_fetch(h,"filterSubject",13,0)) ? SvPV(*s,PL_na) : 0; + + len = pack_MailSyncPref(&a, (CPTR)mybuf, 0xffff); + RETVAL = newSVpv(mybuf, len); +@@ -2203,7 +2203,7 @@ + } + + SvPV(record,len); +- if (unpack_MailSignaturePref(&a, (CPTR)SvPV(record, na), len)>0) { ++ if (unpack_MailSignaturePref(&a, (CPTR)SvPV(record, PL_na), len)>0) { + + if (a.signature) + hv_store(ret, "signature", 9, newSVpv(a.signature, 0), 0); +@@ -2229,7 +2229,7 @@ + RETVAL = record; + else { + +- a.signature = (s=hv_fetch(h,"signature",9,0)) ? SvPV(*s,na) : 0; ++ a.signature = (s=hv_fetch(h,"signature",9,0)) ? SvPV(*s,PL_na) : 0; + + len = pack_MailSignaturePref(&a, (CPTR)mybuf, 0xffff); + RETVAL = newSVpv(mybuf, len); +@@ -2257,7 +2257,7 @@ + { + STRLEN len; + SvPV(msg, len); +- RETVAL = pi_write(socket,SvPV(msg,na),len); ++ RETVAL = pi_write(socket,SvPV(msg,PL_na),len); + } + + SV * +@@ -2273,7 +2273,7 @@ + if (result >=0) + RETVAL = newSVpv(mybuf, result); + else +- RETVAL = &sv_undef; ++ RETVAL = &PL_sv_undef; + } + OUTPUT: + RETVAL +@@ -2318,7 +2318,7 @@ + char * name; + struct pi_sockaddr * a; + if ((s = hv_fetch(h, "device", 6, 0))) +- name = SvPV(*s,na); ++ name = SvPV(*s,PL_na); + else + name = ""; + a = calloc(1,sizeof(struct pi_sockaddr)+strlen(name)); +@@ -2418,7 +2418,7 @@ + croak("DBClasses doesn't exist"); + if (SvOK(name)) { + (void)SvPV(name,len); +- s = hv_fetch(h, SvPV(name,na), len, 0); ++ s = hv_fetch(h, SvPV(name,PL_na), len, 0); + } + if (!s) + s = hv_fetch(h, "", 0, 0); +@@ -2879,7 +2879,7 @@ + result = dlp_WriteResource(self->socket, self->handle, type, id, c, len); + if (result < 0) { + self->errnop = result; +- RETVAL = newSVsv(&sv_undef); ++ RETVAL = newSVsv(&PL_sv_undef); + } else + RETVAL = newSViv(result); + } +@@ -2931,7 +2931,7 @@ + r = dlp_CloseDB(self->socket, self->handle); + result = dlp_ReadAppPreference(self->socket, creator, id, backup, 0xFFFF, mybuf, &len, &version); + if (pi_version(self->socket)< 0x101) +- r = dlp_OpenDB(self->socket, self->dbcard, self->dbmode, SvPV(self->dbname,na), &self->handle); ++ r = dlp_OpenDB(self->socket, self->dbcard, self->dbmode, SvPV(self->dbname,PL_na), &self->handle); + ReturnReadPref(mybuf, len); + } + +@@ -2955,10 +2955,10 @@ + r = dlp_CloseDB(self->socket, self->handle); + result = dlp_WriteAppPreference(self->socket, creator, id, backup, version, buf, len); + if (pi_version(self->socket)< 0x101) +- r = dlp_OpenDB(self->socket, self->dbcard, self->dbmode, SvPV(self->dbname,na), &self->handle); ++ r = dlp_OpenDB(self->socket, self->dbcard, self->dbmode, SvPV(self->dbname,PL_na), &self->handle); + if (result < 0) { + self->errnop = result; +- RETVAL = newSVsv(&sv_undef); ++ RETVAL = newSVsv(&PL_sv_undef); + } else { + RETVAL = newSViv(result); + } +@@ -2994,7 +2994,7 @@ + result = dlp_WriteAppPreference(self->socket, creator, number, backup, version, buf, len); + if (result < 0) { + self->errnop = result; +- RETVAL = newSVsv(&sv_undef); ++ RETVAL = newSVsv(&PL_sv_undef); + } else { + RETVAL = newSViv(result); + } +@@ -3029,7 +3029,7 @@ + int result = dlp_GetSysDateTime(self->socket, &t); + if (result < 0) { + self->errnop = result; +- RETVAL = newSVsv(&sv_undef); ++ RETVAL = newSVsv(&PL_sv_undef); + } else + RETVAL = newSViv(t); + } +@@ -3054,7 +3054,7 @@ + int result = dlp_ReadSysInfo(self->socket, &si); + if (result < 0) { + self->errnop = result; +- RETVAL = newSVsv(&sv_undef); ++ RETVAL = newSVsv(&PL_sv_undef); + } else { + HV * i = newHV(); + hv_store(i, "romVersion", 10, newSViv(si.romVersion), 0);\ +@@ -3076,7 +3076,7 @@ + int result = dlp_ReadStorageInfo(self->socket, cardno, &c); + if (result < 0) { + self->errnop = result; +- RETVAL = newSVsv(&sv_undef); ++ RETVAL = newSVsv(&PL_sv_undef); + } else { + HV * i = newHV(); + hv_store(i, "card", 6, newSViv(c.card), 0);\ +@@ -3162,7 +3162,7 @@ + croak("Default PrefClass not defined"); + PUSHMARK(sp); + XPUSHs(newSVsv(*s)); +- XPUSHs(&sv_undef); ++ XPUSHs(&PL_sv_undef); + XPUSHs(sv_2mortal(newSVChar4(creator))); + if (id) + XPUSHs(id); +@@ -3232,7 +3232,7 @@ + result = dlp_OpenDB(self->socket, cardno, nummode, name, &handle); + if (result<0) { + self->errnop = result; +- RETVAL = &sv_undef; ++ RETVAL = &PL_sv_undef; + } else { + int type; + PDA__Pilot__DLP__DB * x = malloc(sizeof(PDA__Pilot__DLP__DB)); +@@ -3281,7 +3281,7 @@ + int result = dlp_CreateDB(self->socket, creator, type, cardno, flags, version, name, &handle); + if (result<0) { + self->errnop = result; +- RETVAL = &sv_undef; ++ RETVAL = &PL_sv_undef; + } else { + PDA__Pilot__DLP__DB * x = malloc(sizeof(PDA__Pilot__DLP__DB)); + SV * sv = newSViv((IV)(void*)x); +@@ -3348,7 +3348,7 @@ + result = dlp_WriteAppPreference(self->socket, creator, id, backup, version, buf, len); + if (result < 0) { + self->errnop = result; +- RETVAL = newSVsv(&sv_undef); ++ RETVAL = newSVsv(&PL_sv_undef); + } else { + RETVAL = newSViv(result); + } +@@ -3372,7 +3372,7 @@ + result = dlp_WriteAppPreference(self->socket, creator, number, backup, version, buf, len); + if (result < 0) { + self->errnop = result; +- RETVAL = newSVsv(&sv_undef); ++ RETVAL = newSVsv(&PL_sv_undef); + } else { + RETVAL = newSViv(result); + } +@@ -3473,7 +3473,7 @@ + else + t = 0; + result = dlp_FindDBInfo(self->socket, cardno, start, +- SvOK(name) ? SvPV(name,na) : 0, ++ SvOK(name) ? SvPV(name,PL_na) : 0, + t, c, &info); + pack_dbinfo(RETVAL, info, result); + } +@@ -3490,7 +3490,7 @@ + unsigned long f; + int result; + if ((result = dlp_ReadFeature(self->socket, creator, number, &f))<0) { +- RETVAL = newSVsv(&sv_undef); ++ RETVAL = newSVsv(&PL_sv_undef); + self->errnop = result; + } else { + RETVAL = newSViv(f); +@@ -3520,7 +3520,7 @@ + } + + void +-callApplication(self, creator, type, action, data=&sv_undef, maxretlen=0xFFFF) ++callApplication(self, creator, type, action, data=&PL_sv_undef, maxretlen=0xFFFF) + PDA::Pilot::DLP * self + Char4 creator + Char4 type +@@ -3534,7 +3534,7 @@ + int result; + (void)SvPV(data,len); + result = dlp_CallApplication(self->socket, creator, +- type, action, len, SvPV(data,na), ++ type, action, len, SvPV(data,PL_na), + &retcode, maxretlen, (int *)&len, mybuf); + EXTEND(sp, 2); + if (result >= 0) { +@@ -3543,7 +3543,7 @@ + PUSHs(sv_2mortal(newSViv(retcode))); + } + } else +- PUSHs(&sv_undef); ++ PUSHs(&PL_sv_undef); + } + + int +@@ -3654,7 +3654,7 @@ + croak("DBClasses doesn't exist"); + if (SvOK(name)) { + (void)SvPV(name, len); +- s = hv_fetch(h, SvPV(name, na), len, 0); ++ s = hv_fetch(h, SvPV(name, PL_na), len, 0); + } + if (!s) + s = hv_fetch(h, "", 0, 0); +@@ -3714,7 +3714,7 @@ + result = pi_file_get_entries(self->pf, &len); + if (result) { + self->errnop = result; +- RETVAL = &sv_undef; ++ RETVAL = &PL_sv_undef; + } else + RETVAL = newSViv(len); + } +--- pilot-link-0.11.0/bindings/Perl/Makefile.PL.in.perlpollute 2002-07-12 17:12:52.000000000 +0200 ++++ pilot-link-0.11.0/bindings/Perl/Makefile.PL.in 2002-07-18 10:33:03.000000000 +0200 +@@ -14,5 +14,4 @@ + 'LIBS' => $lib, + 'XSPROTOARG' => '-noprototypes', + 'INC' => '-I../../include', +- 'DEFINE' => '-DPERL_POLLUTE', + ); +--- pilot-link-0.11.0/bindings/Perl/typemap.perlpollute 2000-10-28 02:23:48.000000000 +0200 ++++ pilot-link-0.11.0/bindings/Perl/typemap 2002-07-18 10:33:03.000000000 +0200 +@@ -50,9 +50,9 @@ + + T_RESULT + if ($var < 0) { +- sv_setsv($arg, &sv_no); ++ sv_setsv($arg, &PL_sv_no); + self->errnop = $var; + } else +- sv_setsv($arg, &sv_yes); ++ sv_setsv($arg, &PL_sv_yes); + T_PTROBJ + sv_setref_pv($arg, \"${ntype}\", (void*)$var); pilot-link-0.11.2-malsync.patch: Makefile.PL.in | 2 +- Pilot.pm | 8 ++++++++ Pilot.xs | 35 ++++++++++++++++++++++++++++++++++- 3 files changed, 43 insertions(+), 2 deletions(-) Index: pilot-link-0.11.2-malsync.patch =================================================================== RCS file: pilot-link-0.11.2-malsync.patch diff -N pilot-link-0.11.2-malsync.patch --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ pilot-link-0.11.2-malsync.patch 29 Mar 2006 13:34:48 -0000 1.3 @@ -0,0 +1,95 @@ +--- pilot-link-0.11.2/bindings/Perl/Makefile.PL.in.malsync 2002-08-06 22:04:46.000000000 +0200 ++++ pilot-link-0.11.2/bindings/Perl/Makefile.PL.in 2002-08-06 22:08:12.000000000 +0200 +@@ -11,7 +11,7 @@ + WriteMakefile( + 'NAME' => 'PDA::Pilot', + 'VERSION' => '@PILOT_LINK_VERS at .@PILOT_LINK_MAJOR at .@PILOT_LINK_MINOR@', +- 'LIBS' => $lib, ++ 'LDFROM' => "Pilot.o $lib", + 'XSPROTOARG' => '-noprototypes', + 'INC' => '-I../../include', + ); +--- pilot-link-0.11.2/bindings/Perl/Pilot.pm.malsync 2001-12-30 21:26:00.000000000 +0100 ++++ pilot-link-0.11.2/bindings/Perl/Pilot.pm 2002-08-06 22:04:46.000000000 +0200 +@@ -755,8 +755,16 @@ + + Returns last DLP error, resetting error to zero. + ++=item PDA::Pilot::DLP::socket() ++ ++Returns DLP socket. ++ + =item PDA::Pilot::DLP::GetSysDateTime(socket) + ++=item PDA::Pilot::DLP::socket() ++ ++Returns the socket in use by DLP. ++ + Same as DLP call dlp_GetSysDateTime. If successfull, returns time, otherwise + returns undef. + +--- pilot-link-0.11.2/bindings/Perl/Pilot.xs.malsync 2002-08-06 22:04:46.000000000 +0200 ++++ pilot-link-0.11.2/bindings/Perl/Pilot.xs 2002-08-06 22:04:46.000000000 +0200 +@@ -23,6 +23,10 @@ + #include "XSUB.h" + #include "patchlevel.h" + ++#include ++#include ++#include ++ + #include "pi-macros.h" + #include "pi-file.h" + #include "pi-datebook.h" +@@ -2270,7 +2274,7 @@ + if (len > sizeof(mybuf)) + len = sizeof(mybuf); + result = pi_read(socket, mybuf, len); +- if (result >=0) ++ if (result > 0) + RETVAL = newSVpv(mybuf, result); + else + RETVAL = &PL_sv_undef; +@@ -2353,6 +2357,26 @@ + OUTPUT: + RETVAL + ++int ++connect(port) ++ char * port ++ CODE: ++ { ++ struct pi_sockaddr a; ++ int socket; ++ ++ socket = pi_socket(PI_AF_PILOT, PI_SOCK_STREAM, PI_PF_PADP); ++ strcpy(a.pi_device, port); ++ a.pi_family = PI_AF_PILOT; ++ ++ if (pi_connect(socket, (struct sockaddr*)&a, sizeof(a))) ++ RETVAL = 0; ++ else ++ RETVAL = socket; ++ } ++ OUTPUT: ++ RETVAL ++ + SV * + accept(socket) + int socket +@@ -3020,6 +3044,15 @@ + OUTPUT: + RETVAL + ++int ++socket(self) ++ PDA::Pilot::DLP * self ++ CODE: ++ RETVAL = self->socket; ++ OUTPUT: ++ RETVAL ++ ++ + SV * + getTime(self) + PDA::Pilot::DLP * self pilot-link-0.11.8-misc.patch: pilot-datebook-data.c | 4 ++-- pilot-datebook-windat.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) Index: pilot-link-0.11.8-misc.patch =================================================================== RCS file: pilot-link-0.11.8-misc.patch diff -N pilot-link-0.11.8-misc.patch --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ pilot-link-0.11.8-misc.patch 29 Mar 2006 13:34:48 -0000 1.3 @@ -0,0 +1,24 @@ +--- pilot-link-0.11.8/src/pilot-datebook/pilot-datebook-data.c.orig 2004-06-30 12:52:03.086414080 +0200 ++++ pilot-link-0.11.8/src/pilot-datebook/pilot-datebook-data.c 2004-06-30 12:52:47.306875517 +0200 +@@ -1259,8 +1259,8 @@ + buffer[value_end - value_start] = '\0'; + } + else { +- text_unquote(value_start, buffer, sizeof(buffer)); +- buffer[sizeof(buffer)] = '\0'; ++ text_unquote(value_start, buffer, sizeof(buffer) -1); ++ buffer[sizeof(buffer) - 1] = '\0'; + } + value->type = DATEBOOK_FIELD_STR; + value->literal.lit_str = strdup(buffer); +--- pilot-link-0.11.8/src/pilot-datebook/pilot-datebook-windat.c.orig 2004-06-30 12:52:55.407677772 +0200 ++++ pilot-link-0.11.8/src/pilot-datebook/pilot-datebook-windat.c 2004-06-30 12:56:32.575574943 +0200 +@@ -1149,7 +1149,7 @@ + "Unfiled", + sizeof(header->aai.category.name) - 1); + header->aai.category. +- name[0][sizeof(header->aai.category.name) - ++ name[0][sizeof(header->aai.category.name[0]) - + 1] = '\0'; + header->aai.category.ID[0] = 0; + pilot-link-0.11.8-misc1.patch: libpisock++/address.cc | 4 ---- libpisock/pi-file.c | 6 +++--- 2 files changed, 3 insertions(+), 7 deletions(-) Index: pilot-link-0.11.8-misc1.patch =================================================================== RCS file: pilot-link-0.11.8-misc1.patch diff -N pilot-link-0.11.8-misc1.patch --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ pilot-link-0.11.8-misc1.patch 29 Mar 2006 13:34:48 -0000 1.4 @@ -0,0 +1,35 @@ +--- pilot-link-0.11.8/libpisock/pi-file.c.orig 2005-01-24 18:56:19.613347103 +0100 ++++ pilot-link-0.11.8/libpisock/pi-file.c 2005-01-24 18:57:12.864549313 +0100 +@@ -1319,6 +1319,9 @@ + /* Delete DB if it already exists */ + dlp_DeleteDB(socket, cardno, pf->info.name); + ++ /* Set up DB flags */ ++ flags = pf->info.flags; ++ + /* Judd - 25Nov99 - Graffiti hack We want to make sure that these 2 + flags get set for this one */ + +@@ -1327,9 +1330,6 @@ + flags |= dlpDBFlagReset; + } + +- /* Set up DB flags */ +- flags = pf->info.flags; +- + if (strcmp(pf->info.name, "Graffiti ShortCuts ") == 0) { + flags |= 0x8000; /* Rewrite an open DB */ + reset = 1; /* To be on the safe side */ +--- pilot-link-0.11.8/libpisock++/address.cc.orig 2005-01-24 18:57:58.069080760 +0100 ++++ pilot-link-0.11.8/libpisock++/address.cc 2005-01-24 19:09:32.766285313 +0100 +@@ -14,10 +14,6 @@ + + static inline int hi(const unsigned int x) { return (x >> 4) & 0x0f; } + static inline int lo(const unsigned int x) { return x & 0x0f; } +-static inline int pair(const unsigned int x, const unsigned int y) +-{ +- return (x << 4) | y; +-} + + addressAppInfo_t::addressAppInfo_t(void *ai) + : appInfo_t(ai) pilot-link-0.11.8-readfile.patch: pilot-addresses.c | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) Index: pilot-link-0.11.8-readfile.patch =================================================================== RCS file: pilot-link-0.11.8-readfile.patch diff -N pilot-link-0.11.8-readfile.patch --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ pilot-link-0.11.8-readfile.patch 29 Mar 2006 13:34:48 -0000 1.3 @@ -0,0 +1,31 @@ +diff -rubB pilot-link-0.11.8-9/src/pilot-addresses.c pilot-link-0.11.8-10/src/pilot-addresses.c +--- pilot-link-0.11.8-9/src/pilot-addresses.c 2004-06-01 23:00:19.000000000 -0400 ++++ pilot-link-0.11.8-10/src/pilot-addresses.c 2004-06-01 22:13:27.000000000 -0400 +@@ -291,7 +291,7 @@ + int read_file(FILE *in, int sd, int db, struct AddressAppInfo *aai) + { + int i = -1, +- l, ++ l, c, + attribute, + category; + char buf[0xffff]; +@@ -302,10 +302,15 @@ + fflush(stdout); + do { + +- fgets(line, 1000, in); +- if (index(line, '#') == line) { +- fprintf(stderr, "\nIgnoring header\n"); ++ /* Skip comment lines */ ++ c = getc(in); ++ if(feof(in)) break; ++ if(c == '#') { ++ fgets(line, sizeof(line), in); ++ fprintf(stderr,"Skipping line: %s\n",line); + continue; ++ } else { ++ fseek(in, -1, SEEK_CUR); + } + + i = read_field(buf, in, sizeof(buf)); pilot-link-0.11.8-size.patch: include/pi-dlp.h | 2 +- libpisock/dlp.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) Index: pilot-link-0.11.8-size.patch =================================================================== RCS file: pilot-link-0.11.8-size.patch diff -N pilot-link-0.11.8-size.patch --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ pilot-link-0.11.8-size.patch 29 Mar 2006 13:34:48 -0000 1.3 @@ -0,0 +1,22 @@ +--- pilot-link-0.11.8/include/pi-dlp.h.size 2004-06-30 15:28:11.806961956 +0200 ++++ pilot-link-0.11.8/include/pi-dlp.h 2004-06-30 15:28:20.825625065 +0200 +@@ -42,7 +42,7 @@ + + #define PI_DLP_ARG_FIRST_ID 0x20 + +-#define DLP_BUF_SIZE 0xffff ++#define DLP_BUF_SIZE 0xfffff + + /* Note: All of these functions return an integer that if greater + then zero is the number of bytes in the result, zero if there was +--- pilot-link-0.11.8/libpisock/dlp.c.size 2004-06-30 15:15:51.612579963 +0200 ++++ pilot-link-0.11.8/libpisock/dlp.c 2004-06-30 15:27:42.907246013 +0200 +@@ -85,7 +85,7 @@ + + #define set_date(ptr,val) (dlp_htopdate((val),(ptr))) + +-#define DLP_BUF_SIZE 0xffff ++#define DLP_BUF_SIZE 0xfffff + #define DLP_REQUEST_DATA(req, arg, offset) &req->argv[arg]->data[offset] + #define DLP_RESPONSE_DATA(res, arg, offset) &res->argv[arg]->data[offset] + pilot-link-0.11.8-underquoted.patch: pilot-link.m4 | 2 +- pilot-link.m4.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) Index: pilot-link-0.11.8-underquoted.patch =================================================================== RCS file: pilot-link-0.11.8-underquoted.patch diff -N pilot-link-0.11.8-underquoted.patch --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ pilot-link-0.11.8-underquoted.patch 29 Mar 2006 13:34:48 -0000 1.3 @@ -0,0 +1,16 @@ +--- pilot-link-0.11.8/pilot-link.m4.in.underquoted 2004-08-06 13:59:04.499399922 +0100 ++++ pilot-link-0.11.8/pilot-link.m4.in 2004-08-06 13:59:17.849846236 +0100 +@@ -1,4 +1,4 @@ +-AC_DEFUN(AC_PILOT_LINK_HOOK, ++AC_DEFUN([AC_PILOT_LINK_HOOK], + [ + PILOT_LINK_VERS=@PILOT_LINK_VERS@ + PILOT_LINK_MAJOR=@PILOT_LINK_MAJOR@ +--- pilot-link-0.11.8/pilot-link.m4.underquoted 2004-08-06 13:59:06.996922193 +0100 ++++ pilot-link-0.11.8/pilot-link.m4 2004-08-06 13:59:24.946488790 +0100 +@@ -1,4 +1,4 @@ +-AC_DEFUN(AC_PILOT_LINK_HOOK, ++AC_DEFUN([AC_PILOT_LINK_HOOK], + [ + PILOT_LINK_VERS=0 + PILOT_LINK_MAJOR=11 Index: pilot-link.spec =================================================================== RCS file: /cvs/dist/rpms/pilot-link/FC-5/pilot-link.spec,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- pilot-link.spec 11 Feb 2006 05:09:23 -0000 1.38 +++ pilot-link.spec 29 Mar 2006 13:34:48 -0000 1.39 @@ -1,19 +1,21 @@ %define support_perl 0 %define perl_version 5.8.0 -%define interversion cvs20050830 Summary: File transfer utilities between Linux and PalmPilots. Name: pilot-link -Version: 0.12.0 -Release: 0.pre4.5.2.1 -Source: pilot-link-%{version}-%{interversion}.tar.bz2 +Version: 0.11.8 +Release: 12.1.fc5 +Source: pilot-link-%{version}.tar.bz2 Url: http://www.pilot-link.org/ -Patch1: pilot-link-0.12.0-docbook-style-xsl-1.69.1.patch - -# upstream patches -Patch100: pilot-link-0.12.0-pre4-misc1.patch - -Epoch: 1 +Patch1: pilot-link-0.11.0-perlmd5.patch +Patch2: pilot-link-0.11.0-perlpollute.patch +Patch3: pilot-link-0.11.2-malsync.patch +Patch5: pilot-link-0.11.8-misc.patch +Patch6: pilot-link-0.11.8-size.patch +Patch7: pilot-link-0.11.8-readfile.patch +Patch8: pilot-link-0.11.8-underquoted.patch +Patch9: pilot-link-0.11.8-misc1.patch +Epoch: 2 License: GPL Group: Applications/Communications BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root @@ -56,9 +58,17 @@ need to install pilot-link-devel. %prep -%setup -q -n %{name}-%{version}-%{interversion} -%patch1 -p1 -b .docbook-style-xsl -%patch100 -p1 -b .gccwarning +%setup -q +%if %{support_perl} +%patch1 -p1 -b .perlmd5 +%patch2 -p1 -b .perlpollute +%patch3 -p1 -b .malsync +%endif +%patch5 -p1 -b .misc +%patch6 -p1 -b .size +%patch7 -p1 -b .read +%patch8 -p1 -b .underquoted +%patch9 -p1 -b .misc1 %build CFLAGS="$RPM_OPT_FLAGS" %configure \ @@ -125,13 +135,15 @@ %files devel %defattr(-,root,root) -%{_libdir}/pkgconfig/* %{_libdir}/*.a %{_libdir}/*.so %{_includedir}/* %{_datadir}/aclocal/*.m4 %changelog +* Wed Mar 29 2006 Than Ngo 2:0.11.8-12.1.fc5 +- downgrade to stable release 0.11.8 + * Fri Feb 10 2006 Jesse Keating - 1:0.12.0-0.pre4.5.2.1 - bump again for double-long bug on ppc(64) Index: sources =================================================================== RCS file: /cvs/dist/rpms/pilot-link/FC-5/sources,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- sources 30 Aug 2005 10:20:04 -0000 1.12 +++ sources 29 Mar 2006 13:34:48 -0000 1.13 @@ -1 +1 @@ -53c2ea236941bf9d897e3f3448376c94 pilot-link-0.12.0-cvs20050830.tar.bz2 +586f84add601e8b86da3093ab784e997 pilot-link-0.11.8.tar.bz2 --- pilot-link-0.12.0-docbook-style-xsl-1.69.1.patch DELETED --- --- pilot-link-0.12.0-pre4-misc1.patch DELETED --- From fedora-cvs-commits at redhat.com Wed Mar 29 13:41:34 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 29 Mar 2006 08:41:34 -0500 Subject: rpms/system-config-nfs/FC-4 .cvsignore, 1.21, 1.22 sources, 1.24, 1.25 system-config-nfs.spec, 1.30, 1.31 Message-ID: <200603291341.k2TDfYRq005466@cvs.devel.redhat.com> Author: nphilipp Update of /cvs/dist/rpms/system-config-nfs/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv5436 Modified Files: .cvsignore sources system-config-nfs.spec Log Message: require hicolor-icon-theme (#182870, #182871) Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/system-config-nfs/FC-4/.cvsignore,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- .cvsignore 2 Feb 2006 16:48:24 -0000 1.21 +++ .cvsignore 29 Mar 2006 13:41:31 -0000 1.22 @@ -1 +1 @@ -system-config-nfs-1.3.18.tar.bz2 +system-config-nfs-1.3.19.tar.bz2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/system-config-nfs/FC-4/sources,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- sources 2 Feb 2006 16:48:24 -0000 1.24 +++ sources 29 Mar 2006 13:41:31 -0000 1.25 @@ -1 +1 @@ -f76dbc29f2f713f7a5fd806821036a32 system-config-nfs-1.3.18.tar.bz2 +dd49bc95aebef3a46061362766baabd5 system-config-nfs-1.3.19.tar.bz2 Index: system-config-nfs.spec =================================================================== RCS file: /cvs/dist/rpms/system-config-nfs/FC-4/system-config-nfs.spec,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- system-config-nfs.spec 2 Feb 2006 16:48:24 -0000 1.30 +++ system-config-nfs.spec 29 Mar 2006 13:41:31 -0000 1.31 @@ -1,6 +1,6 @@ Summary: NFS server configuration tool Name: system-config-nfs -Version: 1.3.18 +Version: 1.3.19 Release: 0.fc4.1 URL: http://fedora.redhat.com/projects/config-tools/ License: GPL @@ -9,7 +9,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildArch: noarch Source0: %{name}-%{version}.tar.bz2 -Patch0: system-config-nfs-1.3.16-pam_stack.patch BuildRequires: desktop-file-utils BuildRequires: gettext BuildRequires: intltool @@ -21,6 +20,8 @@ Requires: usermode >= 1.36 Requires: rhpl Requires: htmlview +Requires(post): hicolor-icon-theme +Requires(postun): hicolor-icon-theme %description system-config-nfs is a graphical user interface for creating, @@ -28,7 +29,6 @@ %prep %setup -q -%patch -p1 -b .pam_stack %build make %{?_smp_mflags} @@ -72,6 +72,9 @@ %attr(0644,root,root) %config /etc/pam.d/system-config-nfs %changelog +* Fri Mar 03 2006 Nils Philippsen 1.3.19 +- require hicolor-icon-theme (#182870, #182871) + * Thu Feb 02 2006 Nils Philippsen 1.3.18 - don't complain when trying to edit a share (#179687) - handle wildcards in warning messages for duplicates @@ -79,9 +82,6 @@ * Wed Feb 01 2006 Nils Philippsen 1.3.17 - reset properties dialog before being shown for the first time -* Mon Jan 30 2006 Nils Philippsen -- use pam_stack on FC-4 - * Mon Jan 30 2006 Nils Philippsen 1.3.16 - avoid exporting a share more than once to a specific client - allow exporting a share with different settings for different clients From fedora-cvs-commits at redhat.com Wed Mar 29 13:43:27 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 29 Mar 2006 08:43:27 -0500 Subject: rpms/pilot-link/devel pilot-link-0.11.0-perlmd5.patch, 1.2, 1.3 pilot-link-0.11.0-perlpollute.patch, 1.2, 1.3 pilot-link-0.11.2-malsync.patch, 1.2, 1.3 pilot-link-0.11.8-misc.patch, 1.2, 1.3 pilot-link-0.11.8-misc1.patch, 1.3, 1.4 pilot-link-0.11.8-readfile.patch, 1.2, 1.3 pilot-link-0.11.8-size.patch, 1.2, 1.3 pilot-link-0.11.8-underquoted.patch, 1.2, 1.3 pilot-link.spec, 1.38, 1.39 sources, 1.12, 1.13 pilot-link-0.12.0-docbook-style-xsl-1.69.1.patch, 1.1, NONE pilot-link-0.12.0-pre4-misc1.patch, 1.1, NONE Message-ID: <200603291343.k2TDhRDI005576@cvs.devel.redhat.com> Author: than Update of /cvs/dist/rpms/pilot-link/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv5559 Modified Files: pilot-link.spec sources Added Files: pilot-link-0.11.0-perlmd5.patch pilot-link-0.11.0-perlpollute.patch pilot-link-0.11.2-malsync.patch pilot-link-0.11.8-misc.patch pilot-link-0.11.8-misc1.patch pilot-link-0.11.8-readfile.patch pilot-link-0.11.8-size.patch pilot-link-0.11.8-underquoted.patch Removed Files: pilot-link-0.12.0-docbook-style-xsl-1.69.1.patch pilot-link-0.12.0-pre4-misc1.patch Log Message: downgrade to stable release 0.11.8 pilot-link-0.11.0-perlmd5.patch: sync-plan.PL | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) Index: pilot-link-0.11.0-perlmd5.patch =================================================================== RCS file: pilot-link-0.11.0-perlmd5.patch diff -N pilot-link-0.11.0-perlmd5.patch --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ pilot-link-0.11.0-perlmd5.patch 29 Mar 2006 13:43:24 -0000 1.3 @@ -0,0 +1,38 @@ +--- pilot-link.0.9.5/src/sync-plan.PL.md5 Wed May 29 11:08:47 2002 ++++ pilot-link.0.9.5/src/sync-plan.PL Wed May 29 11:09:03 2002 +@@ -6,7 +6,7 @@ + use IO::Socket; + use IO::Select; + use Time::Local; +-use MD5; ++use Digest::MD5; + use PDA::Pilot; + + sub DatePlanToPerl { +@@ -313,7 +313,7 @@ + } + } + +- my($hash) = new MD5; ++ my($hash) = new Digest::MD5; + foreach (@output) { + #print "Adding |$_| to hash\n"; + $hash->add($_); +@@ -490,7 +490,7 @@ + my(@l) = split(/\n/,$r); + my($rec) = { raw => [@l], other => [] }; + my(@E, at R, at N, at M, at S, at US); +- my($hash) = new MD5; ++ my($hash) = new Digest::MD5; + $l[0] =~ s/\s+/ /g; + $hash->add($l[0]); + my($date, $time, $length, $early, $late, $flags, $color) = split(/\s+/, shift @l); +@@ -566,7 +566,7 @@ + + sub HashPilotRecord { + my($record) = @_; +- my($hash) = new MD5; ++ my($hash) = new Digest::MD5; + $hash->add($record->{raw}); + $hash->hexdigest; + } pilot-link-0.11.0-perlpollute.patch: Makefile.PL.in | 1 Pilot.xs | 168 ++++++++++++++++++++++++++++----------------------------- typemap | 4 - 3 files changed, 86 insertions(+), 87 deletions(-) Index: pilot-link-0.11.0-perlpollute.patch =================================================================== RCS file: pilot-link-0.11.0-perlpollute.patch diff -N pilot-link-0.11.0-perlpollute.patch --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ pilot-link-0.11.0-perlpollute.patch 29 Mar 2006 13:43:24 -0000 1.3 @@ -0,0 +1,640 @@ +--- pilot-link-0.11.0/bindings/Perl/Pilot.xs.perlpollute 2002-07-12 14:40:04.000000000 +0200 ++++ pilot-link-0.11.0/bindings/Perl/Pilot.xs 2002-07-18 10:40:45.000000000 +0200 +@@ -333,7 +333,7 @@ + #define pack_dbinfo(arg, var, failure)\ + {\ + if (failure < 0) {\ +- arg = &sv_undef;\ ++ arg = &PL_sv_undef;\ + self->errnop = failure;\ + } else {\ + HV * i = newHV();\ +@@ -387,8 +387,8 @@ + var.createDate = (s = hv_fetch(i, "createDate", 10, 0)) ? SvIV(*s) : 0;\ + var.modifyDate = (s = hv_fetch(i, "modifyDate", 10, 0)) ? SvIV(*s) : 0;\ + var.backupDate = (s = hv_fetch(i, "backupDate", 10, 0)) ? SvIV(*s) : 0;\ +- if ((s = hv_fetch(i, "name", 4, 0)) ? SvPV(*s,na) : 0)\ +- strcpy(var.name, SvPV(*s, na));\ ++ if ((s = hv_fetch(i, "name", 4, 0)) ? SvPV(*s,PL_na) : 0)\ ++ strcpy(var.name, SvPV(*s, PL_na));\ + } else {\ + croak("argument is not a hash reference");\ + } +@@ -396,7 +396,7 @@ + #define pack_userinfo(arg, var, failure)\ + {\ + if (failure < 0) {\ +- arg = &sv_undef;\ ++ arg = &PL_sv_undef;\ + self->errnop = failure;\ + } else {\ + HV * i = newHV();\ +@@ -420,8 +420,8 @@ + var.lastSyncPC = (s = hv_fetch(i, "lastSyncPC", 10, 0)) ? SvIV(*s) : 0;\ + var.lastSyncDate = (s = hv_fetch(i, "lastSyncDate", 12, 0)) ? SvIV(*s) : 0;\ + var.successfulSyncDate = (s = hv_fetch(i, "successfulSyncDate", 18, 0)) ? SvIV(*s) : 0;\ +- if ((s = hv_fetch(i, "name", 4, 0)) ? SvPV(*s,na) : 0)\ +- strcpy(var.username, SvPV(*s, na));\ ++ if ((s = hv_fetch(i, "name", 4, 0)) ? SvPV(*s,PL_na) : 0)\ ++ strcpy(var.username, SvPV(*s, PL_na));\ + } else {\ + croak("argument is not a hash reference");\ + } +@@ -465,7 +465,7 @@ + }\ + } else {\ + self->errnop = result;\ +- PUSHs(&sv_undef);\ ++ PUSHs(&PL_sv_undef);\ + } + + #define PackSI\ +@@ -507,7 +507,7 @@ + }\ + } else {\ + self->errnop = result;\ +- PUSHs(&sv_undef);\ ++ PUSHs(&PL_sv_undef);\ + } + + #define PackRecord\ +@@ -602,7 +602,7 @@ + }\ + } else {\ + self->errnop = result;\ +- PUSHs(&sv_undef);\ ++ PUSHs(&PL_sv_undef);\ + } + + #define PackResource\ +@@ -654,7 +654,7 @@ + }\ + } else {\ + self->errnop = result;\ +- PUSHs(&sv_undef);\ ++ PUSHs(&PL_sv_undef);\ + } + + #define PackPref\ +@@ -717,7 +717,7 @@ + croak("Unable to create resource");\ + } else {\ + self->errnop = result;\ +- PUSHs(&sv_undef);\ ++ PUSHs(&PL_sv_undef);\ + } + + void doUnpackCategory(HV * self, struct CategoryAppInfo * c) +@@ -757,7 +757,7 @@ + + if ((s = hv_fetch(self, "categoryName", 12, 0)) && SvOK(*s) && SvRV(*s) && (SvTYPE(av=(AV*)SvRV(*s))==SVt_PVAV)) + for (i=0;i<16;i++) +- strncpy(c->name[i], (s=av_fetch(av, i, 0)) ? SvPV(*s,na) : "", 16); ++ strncpy(c->name[i], (s=av_fetch(av, i, 0)) ? SvPV(*s,PL_na) : "", 16); + else + for (i=0;i<16;i++) + strcpy(c->name[i], ""); +@@ -783,7 +783,7 @@ + int SvList(SV * arg, char **list) + { + int i; +- char * str = SvPV(arg, na); ++ char * str = SvPV(arg, PL_na); + for (i=0;list[i];i++) + if (strcasecmp(list[i], str)==0) + return i; +@@ -839,7 +839,7 @@ + } + + SvPV(record,len); +- if (unpack_Appointment(&a, (CPTR)SvPV(record, na), len)>0) { ++ if (unpack_Appointment(&a, (CPTR)SvPV(record, PL_na), len)>0) { + + hv_store(ret, "event", 5, newSViv(a.event), 0); + hv_store(ret, "begin", 5, newRV_noinc((SV*)tmtoav(&a.begin)), 0); +@@ -949,11 +949,11 @@ + u = 2; + break; + default: +- if (strEQ(SvPV(*s, na), "minutes")) ++ if (strEQ(SvPV(*s, PL_na), "minutes")) + u = 0; +- else if (strEQ(SvPV(*s, na), "hours")) ++ else if (strEQ(SvPV(*s, PL_na), "hours")) + u = 1; +- else if (strEQ(SvPV(*s, na), "days")) ++ else if (strEQ(SvPV(*s, PL_na), "days")) + u = 2; + else + croak("Invalid advance unit %d encountered", u); +@@ -1018,10 +1018,10 @@ + } + } + +- a.description = (s = hv_fetch(h, "description", 11, 0)) ? SvPV(*s,na) : 0; ++ a.description = (s = hv_fetch(h, "description", 11, 0)) ? SvPV(*s,PL_na) : 0; + if (!a.description) + croak("appointments must contain a description"); +- a.note = (s = hv_fetch(h, "note", 4, 0)) ? SvPV(*s,na) : 0; ++ a.note = (s = hv_fetch(h, "note", 4, 0)) ? SvPV(*s,PL_na) : 0; + + len = pack_Appointment(&a, (CPTR)mybuf, 0xffff); + +@@ -1063,7 +1063,7 @@ + } + + SvPV(record,len); +- if (unpack_AppointmentAppInfo(&a, (CPTR)SvPV(record, na), len)>0) { ++ if (unpack_AppointmentAppInfo(&a, (CPTR)SvPV(record, PL_na), len)>0) { + + doUnpackCategory(ret, &a.category); + +@@ -1135,7 +1135,7 @@ + } + + SvPV(record,len); +- if (unpack_ToDo(&a, (CPTR)SvPV(record, na), len)>0) { ++ if (unpack_ToDo(&a, (CPTR)SvPV(record, PL_na), len)>0) { + + if (!a.indefinite) + hv_store(ret, "due", 3, newRV_noinc((SV*)tmtoav(&a.due)), 0); +@@ -1182,8 +1182,8 @@ + a.indefinite = 1; + } + +- a.description = (s = hv_fetch(h, "description", 11, 0)) ? SvPV(*s,na) : 0; +- a.note = (s = hv_fetch(h, "note", 4, 0)) ? SvPV(*s,na) : 0; ++ a.description = (s = hv_fetch(h, "description", 11, 0)) ? SvPV(*s,PL_na) : 0; ++ a.note = (s = hv_fetch(h, "note", 4, 0)) ? SvPV(*s,PL_na) : 0; + + len = pack_ToDo(&a, (CPTR)mybuf, 0xffff); + +@@ -1222,7 +1222,7 @@ + } + + SvPV(record,len); +- if (unpack_ToDoAppInfo(&a, (CPTR)SvPV(record, na), len)>0) { ++ if (unpack_ToDoAppInfo(&a, (CPTR)SvPV(record, PL_na), len)>0) { + + doUnpackCategory(ret, &a.category); + +@@ -1296,7 +1296,7 @@ + } + + SvPV(record,len); +- if (unpack_Address(&a, (CPTR)SvPV(record, na), len)>0) { ++ if (unpack_Address(&a, (CPTR)SvPV(record, PL_na), len)>0) { + + e = newAV(); + hv_store(ret, "phoneLabel", 10, newRV_noinc((SV*)e), 0); +@@ -1309,7 +1309,7 @@ + hv_store(ret, "entry", 5, newRV_noinc((SV*)e), 0); + + for (i=0;i<19;i++) { +- av_push(e, a.entry[i] ? newSVpv(a.entry[i],0) : &sv_undef); ++ av_push(e, a.entry[i] ? newSVpv(a.entry[i],0) : &PL_sv_undef); + } + + hv_store(ret, "showPhone", 9, newSViv(a.showPhone), 0); +@@ -1350,7 +1350,7 @@ + + if ((s = hv_fetch(h, "entry", 5, 0)) && SvOK(*s) && SvRV(*s) && (SvTYPE(av=(AV*)SvRV(*s))==SVt_PVAV)) + for (i=0;i<19;i++) +- a.entry[i] = ((s=av_fetch(av, i, 0)) && SvOK(*s)) ? SvPV(*s,na) : 0; ++ a.entry[i] = ((s=av_fetch(av, i, 0)) && SvOK(*s)) ? SvPV(*s,PL_na) : 0; + else + for (i=0;i<19;i++) + a.entry[i] = 0; +@@ -1397,7 +1397,7 @@ + } + + SvPV(record,len); +- if (unpack_AddressAppInfo(&a, (CPTR)SvPV(record, na), len)>0) { ++ if (unpack_AddressAppInfo(&a, (CPTR)SvPV(record, PL_na), len)>0) { + + doUnpackCategory(ret, &a.category); + +@@ -1457,13 +1457,13 @@ + a.sortByCompany = (s = hv_fetch(h, "sortByCompany", 13, 0)) ? SvIV(*s) : 0; + + if ((s = hv_fetch(h, "label", 5, 0)) && SvOK(*s) && SvRV(*s) && (SvTYPE(av=(AV*)SvRV(*s))==SVt_PVAV)) +- for (i=0;i<22;i++) strncpy(a.labels[i], (s=av_fetch(av, i, 0)) ? SvPV(*s,na) : "", 16); ++ for (i=0;i<22;i++) strncpy(a.labels[i], (s=av_fetch(av, i, 0)) ? SvPV(*s,PL_na) : "", 16); + else + for (i=0;i<22;i++) a.labels[i][0] = 0; + for (i=0;i<22;i++) a.labels[i][15] = 0; + + if ((s = hv_fetch(h, "phoneLabel", 10, 0)) && SvOK(*s) && SvRV(*s) && (SvTYPE(av=(AV*)SvRV(*s))==SVt_PVAV)) +- for (i=0;i<8;i++) strncpy(a.phoneLabels[i], (s=av_fetch(av, i, 0)) ? SvPV(*s,na) : "", 16); ++ for (i=0;i<8;i++) strncpy(a.phoneLabels[i], (s=av_fetch(av, i, 0)) ? SvPV(*s,PL_na) : "", 16); + else + for (i=0;i<8;i++) a.phoneLabels[i][0] = 0; + for (i=0;i<8;i++) a.phoneLabels[i][15] = 0; +@@ -1506,7 +1506,7 @@ + } + + SvPV(record,len); +- if (unpack_Memo(&a, (CPTR)SvPV(record, na), len)>0) { ++ if (unpack_Memo(&a, (CPTR)SvPV(record, PL_na), len)>0) { + + hv_store(ret, "text", 4, newSVpv(a.text,0), 0); + +@@ -1536,7 +1536,7 @@ + else { + + if ((s = hv_fetch(h, "text", 4, 0))) +- a.text = SvPV(*s,na); ++ a.text = SvPV(*s,PL_na); + else + a.text = 0; + +@@ -1576,7 +1576,7 @@ + } + + SvPV(record,len); +- if (unpack_MemoAppInfo(&a, (CPTR)SvPV(record, na), len)>0) { ++ if (unpack_MemoAppInfo(&a, (CPTR)SvPV(record, PL_na), len)>0) { + + doUnpackCategory(ret, &a.category); + +@@ -1647,7 +1647,7 @@ + } + + SvPV(record,len); +- if (unpack_Expense(&e, (CPTR)SvPV(record, na), len)>0) { ++ if (unpack_Expense(&e, (CPTR)SvPV(record, PL_na), len)>0) { + + hv_store(ret, "date", 4, newRV_noinc((SV*)tmtoav(&e.date)), 0); + hv_store(ret, "type", 4, newSVlist(e.type,ExpenseTypeNames),0); +@@ -1706,15 +1706,15 @@ + avtotm((AV*)SvRV(*s), &e.date); + else + croak("expense record must contain date"); +- if ((s = hv_fetch(h, "amount", 6, 0))) e.amount = SvPV(*s,na); ++ if ((s = hv_fetch(h, "amount", 6, 0))) e.amount = SvPV(*s,PL_na); + else e.amount = 0; +- if ((s = hv_fetch(h, "vendor", 6, 0))) e.vendor = SvPV(*s,na); ++ if ((s = hv_fetch(h, "vendor", 6, 0))) e.vendor = SvPV(*s,PL_na); + else e.vendor = 0; +- if ((s = hv_fetch(h, "city", 4, 0))) e.city = SvPV(*s,na); ++ if ((s = hv_fetch(h, "city", 4, 0))) e.city = SvPV(*s,PL_na); + else e.city = 0; +- if ((s = hv_fetch(h, "attendess", 9, 0))) e.attendees = SvPV(*s,na); ++ if ((s = hv_fetch(h, "attendess", 9, 0))) e.attendees = SvPV(*s,PL_na); + else e.attendees = 0; +- if ((s = hv_fetch(h, "note", 4, 0))) e.note = SvPV(*s,na); ++ if ((s = hv_fetch(h, "note", 4, 0))) e.note = SvPV(*s,PL_na); + else e.note = 0; + + len = pack_Expense(&e, (CPTR)mybuf, 0xffff); +@@ -1755,7 +1755,7 @@ + } + + SvPV(record,len); +- if (unpack_ExpenseAppInfo(&e, (CPTR)SvPV(record, na), len)>0) { ++ if (unpack_ExpenseAppInfo(&e, (CPTR)SvPV(record, PL_na), len)>0) { + + hv_store(ret, "sortOrder", 9, newSVlist(e.sortOrder,ExpenseSortNames),0); + a = newAV(); +@@ -1798,15 +1798,15 @@ + HV * hv; + if ((s=av_fetch(av, i, 0)) && SvOK(*s) && SvRV(*s) && (SvTYPE(hv=(HV*)SvRV(*s))==SVt_PVHV)) { + if (s = hv_fetch(hv, "name", 4, 0)) { +- strncpy(e.currencies[i].name, SvPV(*s, na), 16); ++ strncpy(e.currencies[i].name, SvPV(*s, PL_na), 16); + e.currencies[i].name[15] = 0; + } + if (s = hv_fetch(hv, "symbol", 6, 0)) { +- strncpy(e.currencies[i].symbol, SvPV(*s, na), 4); ++ strncpy(e.currencies[i].symbol, SvPV(*s, PL_na), 4); + e.currencies[i].symbol[3] = 0; + } + if (s = hv_fetch(hv, "rate", 4, 0)) { +- strncpy(e.currencies[i].rate, SvPV(*s, na), 8); ++ strncpy(e.currencies[i].rate, SvPV(*s, PL_na), 8); + e.currencies[i].rate[7] = 0; + } + } +@@ -1854,7 +1854,7 @@ + } + + SvPV(record,len); +- if (unpack_ExpensePref(&a, (CPTR)SvPV(record, na), len)>0) { ++ if (unpack_ExpensePref(&a, (CPTR)SvPV(record, PL_na), len)>0) { + + hv_store(ret, "unitOfDistance", 14, newSVlist(a.unitOfDistance, ExpenseDistanceNames), 0); + hv_store(ret, "currentCategory", 15, newSViv(a.currentCategory), 0); +@@ -1944,7 +1944,7 @@ + } + + SvPV(record,len); +- if (unpack_Mail(&a, (CPTR)SvPV(record, na), len)>0) { ++ if (unpack_Mail(&a, (CPTR)SvPV(record, PL_na), len)>0) { + + if (a.subject) hv_store(ret, "subject", 7, newSVpv(a.subject,0), 0); + if (a.from) hv_store(ret, "from", 4, newSVpv(a.from,0), 0); +@@ -1990,14 +1990,14 @@ + } + else { + +- a.subject = (s = hv_fetch(h, "subject", 7, 0)) ? SvPV(*s,na) : 0; +- a.from = (s = hv_fetch(h, "from", 4, 0)) ? SvPV(*s,na) : 0; +- a.to = (s = hv_fetch(h, "to", 2, 0)) ? SvPV(*s,na) : 0; +- a.cc = (s = hv_fetch(h, "cc", 2, 0)) ? SvPV(*s,na) : 0; +- a.bcc = (s = hv_fetch(h, "bcc", 3, 0)) ? SvPV(*s,na) : 0; +- a.replyTo = (s = hv_fetch(h, "replyTo", 7, 0)) ? SvPV(*s,na) : 0; +- a.sentTo = (s = hv_fetch(h, "sentTo", 6, 0)) ? SvPV(*s,na) : 0; +- a.body = (s = hv_fetch(h, "body", 4, 0)) ? SvPV(*s,na) : 0; ++ a.subject = (s = hv_fetch(h, "subject", 7, 0)) ? SvPV(*s,PL_na) : 0; ++ a.from = (s = hv_fetch(h, "from", 4, 0)) ? SvPV(*s,PL_na) : 0; ++ a.to = (s = hv_fetch(h, "to", 2, 0)) ? SvPV(*s,PL_na) : 0; ++ a.cc = (s = hv_fetch(h, "cc", 2, 0)) ? SvPV(*s,PL_na) : 0; ++ a.bcc = (s = hv_fetch(h, "bcc", 3, 0)) ? SvPV(*s,PL_na) : 0; ++ a.replyTo = (s = hv_fetch(h, "replyTo", 7, 0)) ? SvPV(*s,PL_na) : 0; ++ a.sentTo = (s = hv_fetch(h, "sentTo", 6, 0)) ? SvPV(*s,PL_na) : 0; ++ a.body = (s = hv_fetch(h, "body", 4, 0)) ? SvPV(*s,PL_na) : 0; + + a.read = (s = hv_fetch(h, "read", 4, 0)) ? SvIV(*s) : 0; + a.signature = (s = hv_fetch(h, "signature", 9, 0)) ? SvIV(*s) : 0; +@@ -2045,7 +2045,7 @@ + } + + SvPV(record,len); +- if (unpack_MailAppInfo(&a, (CPTR)SvPV(record, na), len)>0) { ++ if (unpack_MailAppInfo(&a, (CPTR)SvPV(record, PL_na), len)>0) { + + doUnpackCategory(ret, &a.category); + +@@ -2121,7 +2121,7 @@ + } + + SvPV(record,len); +- if (unpack_MailSyncPref(&a, (CPTR)SvPV(record, na), len)>0) { ++ if (unpack_MailSyncPref(&a, (CPTR)SvPV(record, PL_na), len)>0) { + + hv_store(ret, "syncType", 8, newSVlist(a.syncType, MailSyncTypeNames), 0); + hv_store(ret, "getHigh", 7, newSViv(a.getHigh), 0); +@@ -2165,9 +2165,9 @@ + a.getContaining = (s=hv_fetch(h,"getContaining",13,0)) ? SvIV(*s) : 0; + a.truncate = (s=hv_fetch(h,"truncate",8,0)) ? SvIV(*s) : 0; + +- a.filterTo = (s=hv_fetch(h,"filterTo",8,0)) ? SvPV(*s,na) : 0; +- a.filterFrom = (s=hv_fetch(h,"filterFrom",10,0)) ? SvPV(*s,na) : 0; +- a.filterSubject = (s=hv_fetch(h,"filterSubject",13,0)) ? SvPV(*s,na) : 0; ++ a.filterTo = (s=hv_fetch(h,"filterTo",8,0)) ? SvPV(*s,PL_na) : 0; ++ a.filterFrom = (s=hv_fetch(h,"filterFrom",10,0)) ? SvPV(*s,PL_na) : 0; ++ a.filterSubject = (s=hv_fetch(h,"filterSubject",13,0)) ? SvPV(*s,PL_na) : 0; + + len = pack_MailSyncPref(&a, (CPTR)mybuf, 0xffff); + RETVAL = newSVpv(mybuf, len); +@@ -2203,7 +2203,7 @@ + } + + SvPV(record,len); +- if (unpack_MailSignaturePref(&a, (CPTR)SvPV(record, na), len)>0) { ++ if (unpack_MailSignaturePref(&a, (CPTR)SvPV(record, PL_na), len)>0) { + + if (a.signature) + hv_store(ret, "signature", 9, newSVpv(a.signature, 0), 0); +@@ -2229,7 +2229,7 @@ + RETVAL = record; + else { + +- a.signature = (s=hv_fetch(h,"signature",9,0)) ? SvPV(*s,na) : 0; ++ a.signature = (s=hv_fetch(h,"signature",9,0)) ? SvPV(*s,PL_na) : 0; + + len = pack_MailSignaturePref(&a, (CPTR)mybuf, 0xffff); + RETVAL = newSVpv(mybuf, len); +@@ -2257,7 +2257,7 @@ + { + STRLEN len; + SvPV(msg, len); +- RETVAL = pi_write(socket,SvPV(msg,na),len); ++ RETVAL = pi_write(socket,SvPV(msg,PL_na),len); + } + + SV * +@@ -2273,7 +2273,7 @@ + if (result >=0) + RETVAL = newSVpv(mybuf, result); + else +- RETVAL = &sv_undef; ++ RETVAL = &PL_sv_undef; + } + OUTPUT: + RETVAL +@@ -2318,7 +2318,7 @@ + char * name; + struct pi_sockaddr * a; + if ((s = hv_fetch(h, "device", 6, 0))) +- name = SvPV(*s,na); ++ name = SvPV(*s,PL_na); + else + name = ""; + a = calloc(1,sizeof(struct pi_sockaddr)+strlen(name)); +@@ -2418,7 +2418,7 @@ + croak("DBClasses doesn't exist"); + if (SvOK(name)) { + (void)SvPV(name,len); +- s = hv_fetch(h, SvPV(name,na), len, 0); ++ s = hv_fetch(h, SvPV(name,PL_na), len, 0); + } + if (!s) + s = hv_fetch(h, "", 0, 0); +@@ -2879,7 +2879,7 @@ + result = dlp_WriteResource(self->socket, self->handle, type, id, c, len); + if (result < 0) { + self->errnop = result; +- RETVAL = newSVsv(&sv_undef); ++ RETVAL = newSVsv(&PL_sv_undef); + } else + RETVAL = newSViv(result); + } +@@ -2931,7 +2931,7 @@ + r = dlp_CloseDB(self->socket, self->handle); + result = dlp_ReadAppPreference(self->socket, creator, id, backup, 0xFFFF, mybuf, &len, &version); + if (pi_version(self->socket)< 0x101) +- r = dlp_OpenDB(self->socket, self->dbcard, self->dbmode, SvPV(self->dbname,na), &self->handle); ++ r = dlp_OpenDB(self->socket, self->dbcard, self->dbmode, SvPV(self->dbname,PL_na), &self->handle); + ReturnReadPref(mybuf, len); + } + +@@ -2955,10 +2955,10 @@ + r = dlp_CloseDB(self->socket, self->handle); + result = dlp_WriteAppPreference(self->socket, creator, id, backup, version, buf, len); + if (pi_version(self->socket)< 0x101) +- r = dlp_OpenDB(self->socket, self->dbcard, self->dbmode, SvPV(self->dbname,na), &self->handle); ++ r = dlp_OpenDB(self->socket, self->dbcard, self->dbmode, SvPV(self->dbname,PL_na), &self->handle); + if (result < 0) { + self->errnop = result; +- RETVAL = newSVsv(&sv_undef); ++ RETVAL = newSVsv(&PL_sv_undef); + } else { + RETVAL = newSViv(result); + } +@@ -2994,7 +2994,7 @@ + result = dlp_WriteAppPreference(self->socket, creator, number, backup, version, buf, len); + if (result < 0) { + self->errnop = result; +- RETVAL = newSVsv(&sv_undef); ++ RETVAL = newSVsv(&PL_sv_undef); + } else { + RETVAL = newSViv(result); + } +@@ -3029,7 +3029,7 @@ + int result = dlp_GetSysDateTime(self->socket, &t); + if (result < 0) { + self->errnop = result; +- RETVAL = newSVsv(&sv_undef); ++ RETVAL = newSVsv(&PL_sv_undef); + } else + RETVAL = newSViv(t); + } +@@ -3054,7 +3054,7 @@ + int result = dlp_ReadSysInfo(self->socket, &si); + if (result < 0) { + self->errnop = result; +- RETVAL = newSVsv(&sv_undef); ++ RETVAL = newSVsv(&PL_sv_undef); + } else { + HV * i = newHV(); + hv_store(i, "romVersion", 10, newSViv(si.romVersion), 0);\ +@@ -3076,7 +3076,7 @@ + int result = dlp_ReadStorageInfo(self->socket, cardno, &c); + if (result < 0) { + self->errnop = result; +- RETVAL = newSVsv(&sv_undef); ++ RETVAL = newSVsv(&PL_sv_undef); + } else { + HV * i = newHV(); + hv_store(i, "card", 6, newSViv(c.card), 0);\ +@@ -3162,7 +3162,7 @@ + croak("Default PrefClass not defined"); + PUSHMARK(sp); + XPUSHs(newSVsv(*s)); +- XPUSHs(&sv_undef); ++ XPUSHs(&PL_sv_undef); + XPUSHs(sv_2mortal(newSVChar4(creator))); + if (id) + XPUSHs(id); +@@ -3232,7 +3232,7 @@ + result = dlp_OpenDB(self->socket, cardno, nummode, name, &handle); + if (result<0) { + self->errnop = result; +- RETVAL = &sv_undef; ++ RETVAL = &PL_sv_undef; + } else { + int type; + PDA__Pilot__DLP__DB * x = malloc(sizeof(PDA__Pilot__DLP__DB)); +@@ -3281,7 +3281,7 @@ + int result = dlp_CreateDB(self->socket, creator, type, cardno, flags, version, name, &handle); + if (result<0) { + self->errnop = result; +- RETVAL = &sv_undef; ++ RETVAL = &PL_sv_undef; + } else { + PDA__Pilot__DLP__DB * x = malloc(sizeof(PDA__Pilot__DLP__DB)); + SV * sv = newSViv((IV)(void*)x); +@@ -3348,7 +3348,7 @@ + result = dlp_WriteAppPreference(self->socket, creator, id, backup, version, buf, len); + if (result < 0) { + self->errnop = result; +- RETVAL = newSVsv(&sv_undef); ++ RETVAL = newSVsv(&PL_sv_undef); + } else { + RETVAL = newSViv(result); + } +@@ -3372,7 +3372,7 @@ + result = dlp_WriteAppPreference(self->socket, creator, number, backup, version, buf, len); + if (result < 0) { + self->errnop = result; +- RETVAL = newSVsv(&sv_undef); ++ RETVAL = newSVsv(&PL_sv_undef); + } else { + RETVAL = newSViv(result); + } +@@ -3473,7 +3473,7 @@ + else + t = 0; + result = dlp_FindDBInfo(self->socket, cardno, start, +- SvOK(name) ? SvPV(name,na) : 0, ++ SvOK(name) ? SvPV(name,PL_na) : 0, + t, c, &info); + pack_dbinfo(RETVAL, info, result); + } +@@ -3490,7 +3490,7 @@ + unsigned long f; + int result; + if ((result = dlp_ReadFeature(self->socket, creator, number, &f))<0) { +- RETVAL = newSVsv(&sv_undef); ++ RETVAL = newSVsv(&PL_sv_undef); + self->errnop = result; + } else { + RETVAL = newSViv(f); +@@ -3520,7 +3520,7 @@ + } + + void +-callApplication(self, creator, type, action, data=&sv_undef, maxretlen=0xFFFF) ++callApplication(self, creator, type, action, data=&PL_sv_undef, maxretlen=0xFFFF) + PDA::Pilot::DLP * self + Char4 creator + Char4 type +@@ -3534,7 +3534,7 @@ + int result; + (void)SvPV(data,len); + result = dlp_CallApplication(self->socket, creator, +- type, action, len, SvPV(data,na), ++ type, action, len, SvPV(data,PL_na), + &retcode, maxretlen, (int *)&len, mybuf); + EXTEND(sp, 2); + if (result >= 0) { +@@ -3543,7 +3543,7 @@ + PUSHs(sv_2mortal(newSViv(retcode))); + } + } else +- PUSHs(&sv_undef); ++ PUSHs(&PL_sv_undef); + } + + int +@@ -3654,7 +3654,7 @@ + croak("DBClasses doesn't exist"); + if (SvOK(name)) { + (void)SvPV(name, len); +- s = hv_fetch(h, SvPV(name, na), len, 0); ++ s = hv_fetch(h, SvPV(name, PL_na), len, 0); + } + if (!s) + s = hv_fetch(h, "", 0, 0); +@@ -3714,7 +3714,7 @@ + result = pi_file_get_entries(self->pf, &len); + if (result) { + self->errnop = result; +- RETVAL = &sv_undef; ++ RETVAL = &PL_sv_undef; + } else + RETVAL = newSViv(len); + } +--- pilot-link-0.11.0/bindings/Perl/Makefile.PL.in.perlpollute 2002-07-12 17:12:52.000000000 +0200 ++++ pilot-link-0.11.0/bindings/Perl/Makefile.PL.in 2002-07-18 10:33:03.000000000 +0200 +@@ -14,5 +14,4 @@ + 'LIBS' => $lib, + 'XSPROTOARG' => '-noprototypes', + 'INC' => '-I../../include', +- 'DEFINE' => '-DPERL_POLLUTE', + ); +--- pilot-link-0.11.0/bindings/Perl/typemap.perlpollute 2000-10-28 02:23:48.000000000 +0200 ++++ pilot-link-0.11.0/bindings/Perl/typemap 2002-07-18 10:33:03.000000000 +0200 +@@ -50,9 +50,9 @@ + + T_RESULT + if ($var < 0) { +- sv_setsv($arg, &sv_no); ++ sv_setsv($arg, &PL_sv_no); + self->errnop = $var; + } else +- sv_setsv($arg, &sv_yes); ++ sv_setsv($arg, &PL_sv_yes); + T_PTROBJ + sv_setref_pv($arg, \"${ntype}\", (void*)$var); pilot-link-0.11.2-malsync.patch: Makefile.PL.in | 2 +- Pilot.pm | 8 ++++++++ Pilot.xs | 35 ++++++++++++++++++++++++++++++++++- 3 files changed, 43 insertions(+), 2 deletions(-) Index: pilot-link-0.11.2-malsync.patch =================================================================== RCS file: pilot-link-0.11.2-malsync.patch diff -N pilot-link-0.11.2-malsync.patch --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ pilot-link-0.11.2-malsync.patch 29 Mar 2006 13:43:24 -0000 1.3 @@ -0,0 +1,95 @@ +--- pilot-link-0.11.2/bindings/Perl/Makefile.PL.in.malsync 2002-08-06 22:04:46.000000000 +0200 ++++ pilot-link-0.11.2/bindings/Perl/Makefile.PL.in 2002-08-06 22:08:12.000000000 +0200 +@@ -11,7 +11,7 @@ + WriteMakefile( + 'NAME' => 'PDA::Pilot', + 'VERSION' => '@PILOT_LINK_VERS at .@PILOT_LINK_MAJOR at .@PILOT_LINK_MINOR@', +- 'LIBS' => $lib, ++ 'LDFROM' => "Pilot.o $lib", + 'XSPROTOARG' => '-noprototypes', + 'INC' => '-I../../include', + ); +--- pilot-link-0.11.2/bindings/Perl/Pilot.pm.malsync 2001-12-30 21:26:00.000000000 +0100 ++++ pilot-link-0.11.2/bindings/Perl/Pilot.pm 2002-08-06 22:04:46.000000000 +0200 +@@ -755,8 +755,16 @@ + + Returns last DLP error, resetting error to zero. + ++=item PDA::Pilot::DLP::socket() ++ ++Returns DLP socket. ++ + =item PDA::Pilot::DLP::GetSysDateTime(socket) + ++=item PDA::Pilot::DLP::socket() ++ ++Returns the socket in use by DLP. ++ + Same as DLP call dlp_GetSysDateTime. If successfull, returns time, otherwise + returns undef. + +--- pilot-link-0.11.2/bindings/Perl/Pilot.xs.malsync 2002-08-06 22:04:46.000000000 +0200 ++++ pilot-link-0.11.2/bindings/Perl/Pilot.xs 2002-08-06 22:04:46.000000000 +0200 +@@ -23,6 +23,10 @@ + #include "XSUB.h" + #include "patchlevel.h" + ++#include ++#include ++#include ++ + #include "pi-macros.h" + #include "pi-file.h" + #include "pi-datebook.h" +@@ -2270,7 +2274,7 @@ + if (len > sizeof(mybuf)) + len = sizeof(mybuf); + result = pi_read(socket, mybuf, len); +- if (result >=0) ++ if (result > 0) + RETVAL = newSVpv(mybuf, result); + else + RETVAL = &PL_sv_undef; +@@ -2353,6 +2357,26 @@ + OUTPUT: + RETVAL + ++int ++connect(port) ++ char * port ++ CODE: ++ { ++ struct pi_sockaddr a; ++ int socket; ++ ++ socket = pi_socket(PI_AF_PILOT, PI_SOCK_STREAM, PI_PF_PADP); ++ strcpy(a.pi_device, port); ++ a.pi_family = PI_AF_PILOT; ++ ++ if (pi_connect(socket, (struct sockaddr*)&a, sizeof(a))) ++ RETVAL = 0; ++ else ++ RETVAL = socket; ++ } ++ OUTPUT: ++ RETVAL ++ + SV * + accept(socket) + int socket +@@ -3020,6 +3044,15 @@ + OUTPUT: + RETVAL + ++int ++socket(self) ++ PDA::Pilot::DLP * self ++ CODE: ++ RETVAL = self->socket; ++ OUTPUT: ++ RETVAL ++ ++ + SV * + getTime(self) + PDA::Pilot::DLP * self pilot-link-0.11.8-misc.patch: pilot-datebook-data.c | 4 ++-- pilot-datebook-windat.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) Index: pilot-link-0.11.8-misc.patch =================================================================== RCS file: pilot-link-0.11.8-misc.patch diff -N pilot-link-0.11.8-misc.patch --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ pilot-link-0.11.8-misc.patch 29 Mar 2006 13:43:24 -0000 1.3 @@ -0,0 +1,24 @@ +--- pilot-link-0.11.8/src/pilot-datebook/pilot-datebook-data.c.orig 2004-06-30 12:52:03.086414080 +0200 ++++ pilot-link-0.11.8/src/pilot-datebook/pilot-datebook-data.c 2004-06-30 12:52:47.306875517 +0200 +@@ -1259,8 +1259,8 @@ + buffer[value_end - value_start] = '\0'; + } + else { +- text_unquote(value_start, buffer, sizeof(buffer)); +- buffer[sizeof(buffer)] = '\0'; ++ text_unquote(value_start, buffer, sizeof(buffer) -1); ++ buffer[sizeof(buffer) - 1] = '\0'; + } + value->type = DATEBOOK_FIELD_STR; + value->literal.lit_str = strdup(buffer); +--- pilot-link-0.11.8/src/pilot-datebook/pilot-datebook-windat.c.orig 2004-06-30 12:52:55.407677772 +0200 ++++ pilot-link-0.11.8/src/pilot-datebook/pilot-datebook-windat.c 2004-06-30 12:56:32.575574943 +0200 +@@ -1149,7 +1149,7 @@ + "Unfiled", + sizeof(header->aai.category.name) - 1); + header->aai.category. +- name[0][sizeof(header->aai.category.name) - ++ name[0][sizeof(header->aai.category.name[0]) - + 1] = '\0'; + header->aai.category.ID[0] = 0; + pilot-link-0.11.8-misc1.patch: libpisock++/address.cc | 4 ---- libpisock/pi-file.c | 6 +++--- 2 files changed, 3 insertions(+), 7 deletions(-) Index: pilot-link-0.11.8-misc1.patch =================================================================== RCS file: pilot-link-0.11.8-misc1.patch diff -N pilot-link-0.11.8-misc1.patch --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ pilot-link-0.11.8-misc1.patch 29 Mar 2006 13:43:24 -0000 1.4 @@ -0,0 +1,35 @@ +--- pilot-link-0.11.8/libpisock/pi-file.c.orig 2005-01-24 18:56:19.613347103 +0100 ++++ pilot-link-0.11.8/libpisock/pi-file.c 2005-01-24 18:57:12.864549313 +0100 +@@ -1319,6 +1319,9 @@ + /* Delete DB if it already exists */ + dlp_DeleteDB(socket, cardno, pf->info.name); + ++ /* Set up DB flags */ ++ flags = pf->info.flags; ++ + /* Judd - 25Nov99 - Graffiti hack We want to make sure that these 2 + flags get set for this one */ + +@@ -1327,9 +1330,6 @@ + flags |= dlpDBFlagReset; + } + +- /* Set up DB flags */ +- flags = pf->info.flags; +- + if (strcmp(pf->info.name, "Graffiti ShortCuts ") == 0) { + flags |= 0x8000; /* Rewrite an open DB */ + reset = 1; /* To be on the safe side */ +--- pilot-link-0.11.8/libpisock++/address.cc.orig 2005-01-24 18:57:58.069080760 +0100 ++++ pilot-link-0.11.8/libpisock++/address.cc 2005-01-24 19:09:32.766285313 +0100 +@@ -14,10 +14,6 @@ + + static inline int hi(const unsigned int x) { return (x >> 4) & 0x0f; } + static inline int lo(const unsigned int x) { return x & 0x0f; } +-static inline int pair(const unsigned int x, const unsigned int y) +-{ +- return (x << 4) | y; +-} + + addressAppInfo_t::addressAppInfo_t(void *ai) + : appInfo_t(ai) pilot-link-0.11.8-readfile.patch: pilot-addresses.c | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) Index: pilot-link-0.11.8-readfile.patch =================================================================== RCS file: pilot-link-0.11.8-readfile.patch diff -N pilot-link-0.11.8-readfile.patch --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ pilot-link-0.11.8-readfile.patch 29 Mar 2006 13:43:24 -0000 1.3 @@ -0,0 +1,31 @@ +diff -rubB pilot-link-0.11.8-9/src/pilot-addresses.c pilot-link-0.11.8-10/src/pilot-addresses.c +--- pilot-link-0.11.8-9/src/pilot-addresses.c 2004-06-01 23:00:19.000000000 -0400 ++++ pilot-link-0.11.8-10/src/pilot-addresses.c 2004-06-01 22:13:27.000000000 -0400 +@@ -291,7 +291,7 @@ + int read_file(FILE *in, int sd, int db, struct AddressAppInfo *aai) + { + int i = -1, +- l, ++ l, c, + attribute, + category; + char buf[0xffff]; +@@ -302,10 +302,15 @@ + fflush(stdout); + do { + +- fgets(line, 1000, in); +- if (index(line, '#') == line) { +- fprintf(stderr, "\nIgnoring header\n"); ++ /* Skip comment lines */ ++ c = getc(in); ++ if(feof(in)) break; ++ if(c == '#') { ++ fgets(line, sizeof(line), in); ++ fprintf(stderr,"Skipping line: %s\n",line); + continue; ++ } else { ++ fseek(in, -1, SEEK_CUR); + } + + i = read_field(buf, in, sizeof(buf)); pilot-link-0.11.8-size.patch: include/pi-dlp.h | 2 +- libpisock/dlp.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) Index: pilot-link-0.11.8-size.patch =================================================================== RCS file: pilot-link-0.11.8-size.patch diff -N pilot-link-0.11.8-size.patch --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ pilot-link-0.11.8-size.patch 29 Mar 2006 13:43:24 -0000 1.3 @@ -0,0 +1,22 @@ +--- pilot-link-0.11.8/include/pi-dlp.h.size 2004-06-30 15:28:11.806961956 +0200 ++++ pilot-link-0.11.8/include/pi-dlp.h 2004-06-30 15:28:20.825625065 +0200 +@@ -42,7 +42,7 @@ + + #define PI_DLP_ARG_FIRST_ID 0x20 + +-#define DLP_BUF_SIZE 0xffff ++#define DLP_BUF_SIZE 0xfffff + + /* Note: All of these functions return an integer that if greater + then zero is the number of bytes in the result, zero if there was +--- pilot-link-0.11.8/libpisock/dlp.c.size 2004-06-30 15:15:51.612579963 +0200 ++++ pilot-link-0.11.8/libpisock/dlp.c 2004-06-30 15:27:42.907246013 +0200 +@@ -85,7 +85,7 @@ + + #define set_date(ptr,val) (dlp_htopdate((val),(ptr))) + +-#define DLP_BUF_SIZE 0xffff ++#define DLP_BUF_SIZE 0xfffff + #define DLP_REQUEST_DATA(req, arg, offset) &req->argv[arg]->data[offset] + #define DLP_RESPONSE_DATA(res, arg, offset) &res->argv[arg]->data[offset] + pilot-link-0.11.8-underquoted.patch: pilot-link.m4 | 2 +- pilot-link.m4.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) Index: pilot-link-0.11.8-underquoted.patch =================================================================== RCS file: pilot-link-0.11.8-underquoted.patch diff -N pilot-link-0.11.8-underquoted.patch --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ pilot-link-0.11.8-underquoted.patch 29 Mar 2006 13:43:24 -0000 1.3 @@ -0,0 +1,16 @@ +--- pilot-link-0.11.8/pilot-link.m4.in.underquoted 2004-08-06 13:59:04.499399922 +0100 ++++ pilot-link-0.11.8/pilot-link.m4.in 2004-08-06 13:59:17.849846236 +0100 +@@ -1,4 +1,4 @@ +-AC_DEFUN(AC_PILOT_LINK_HOOK, ++AC_DEFUN([AC_PILOT_LINK_HOOK], + [ + PILOT_LINK_VERS=@PILOT_LINK_VERS@ + PILOT_LINK_MAJOR=@PILOT_LINK_MAJOR@ +--- pilot-link-0.11.8/pilot-link.m4.underquoted 2004-08-06 13:59:06.996922193 +0100 ++++ pilot-link-0.11.8/pilot-link.m4 2004-08-06 13:59:24.946488790 +0100 +@@ -1,4 +1,4 @@ +-AC_DEFUN(AC_PILOT_LINK_HOOK, ++AC_DEFUN([AC_PILOT_LINK_HOOK], + [ + PILOT_LINK_VERS=0 + PILOT_LINK_MAJOR=11 Index: pilot-link.spec =================================================================== RCS file: /cvs/dist/rpms/pilot-link/devel/pilot-link.spec,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- pilot-link.spec 11 Feb 2006 05:09:23 -0000 1.38 +++ pilot-link.spec 29 Mar 2006 13:43:24 -0000 1.39 @@ -1,19 +1,21 @@ %define support_perl 0 %define perl_version 5.8.0 -%define interversion cvs20050830 Summary: File transfer utilities between Linux and PalmPilots. Name: pilot-link -Version: 0.12.0 -Release: 0.pre4.5.2.1 -Source: pilot-link-%{version}-%{interversion}.tar.bz2 +Version: 0.11.8 +Release: 13 +Source: pilot-link-%{version}.tar.bz2 Url: http://www.pilot-link.org/ -Patch1: pilot-link-0.12.0-docbook-style-xsl-1.69.1.patch - -# upstream patches -Patch100: pilot-link-0.12.0-pre4-misc1.patch - -Epoch: 1 +Patch1: pilot-link-0.11.0-perlmd5.patch +Patch2: pilot-link-0.11.0-perlpollute.patch +Patch3: pilot-link-0.11.2-malsync.patch +Patch5: pilot-link-0.11.8-misc.patch +Patch6: pilot-link-0.11.8-size.patch +Patch7: pilot-link-0.11.8-readfile.patch +Patch8: pilot-link-0.11.8-underquoted.patch +Patch9: pilot-link-0.11.8-misc1.patch +Epoch: 2 License: GPL Group: Applications/Communications BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root @@ -56,9 +58,17 @@ need to install pilot-link-devel. %prep -%setup -q -n %{name}-%{version}-%{interversion} -%patch1 -p1 -b .docbook-style-xsl -%patch100 -p1 -b .gccwarning +%setup -q +%if %{support_perl} +%patch1 -p1 -b .perlmd5 +%patch2 -p1 -b .perlpollute +%patch3 -p1 -b .malsync +%endif +%patch5 -p1 -b .misc +%patch6 -p1 -b .size +%patch7 -p1 -b .read +%patch8 -p1 -b .underquoted +%patch9 -p1 -b .misc1 %build CFLAGS="$RPM_OPT_FLAGS" %configure \ @@ -125,13 +135,15 @@ %files devel %defattr(-,root,root) -%{_libdir}/pkgconfig/* %{_libdir}/*.a %{_libdir}/*.so %{_includedir}/* %{_datadir}/aclocal/*.m4 %changelog +* Wed Mar 29 2006 Than Ngo 2:0.11.8-13 +- downgrade to stable release 0.11.8 + * Fri Feb 10 2006 Jesse Keating - 1:0.12.0-0.pre4.5.2.1 - bump again for double-long bug on ppc(64) Index: sources =================================================================== RCS file: /cvs/dist/rpms/pilot-link/devel/sources,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- sources 30 Aug 2005 10:20:04 -0000 1.12 +++ sources 29 Mar 2006 13:43:24 -0000 1.13 @@ -1 +1 @@ -53c2ea236941bf9d897e3f3448376c94 pilot-link-0.12.0-cvs20050830.tar.bz2 +586f84add601e8b86da3093ab784e997 pilot-link-0.11.8.tar.bz2 --- pilot-link-0.12.0-docbook-style-xsl-1.69.1.patch DELETED --- --- pilot-link-0.12.0-pre4-misc1.patch DELETED --- From fedora-cvs-commits at redhat.com Wed Mar 29 13:50:18 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 29 Mar 2006 08:50:18 -0500 Subject: rpms/kernel/FC-5 XXXX-tiacx-ia64-enable.txt, NONE, 1.1.2.1 kernel-2.6.spec, 1.2080.2.3, 1.2080.2.4 Message-ID: <200603291350.k2TDoI0L019524@cvs.devel.redhat.com> Author: linville Update of /cvs/dist/rpms/kernel/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv19510 Modified Files: Tag: private-linville-netdev-fc5-1-branch kernel-2.6.spec Added Files: Tag: private-linville-netdev-fc5-1-branch XXXX-tiacx-ia64-enable.txt Log Message: --- NEW FILE XXXX-tiacx-ia64-enable.txt --- --- linux-2.6.16.noarch/drivers/net/wireless/tiacx/wlan_compat.h.orig 2006-03-29 08:27:14.000000000 -0500 +++ linux-2.6.16.noarch/drivers/net/wireless/tiacx/wlan_compat.h 2006-03-29 08:30:24.000000000 -0500 @@ -52,6 +52,7 @@ #define WLAN_SPARC 8 #define WLAN_SH 9 #define WLAN_x86_64 10 +#define WLAN_ITANIUM 11 /* WLAN_CPU_CORE */ #define WLAN_I386CORE 1 #define WLAN_PPCCORE 2 @@ -81,6 +82,7 @@ #define WLAN_ALPHAARCH 7 #define WLAN_MIPSARCH 9 #define WLAN_HPPAARCH 10 +#define WLAN_ITANIUMARCH 11 /* WLAN_HOSTIF (generally set on the command line, not detected) */ #define WLAN_PCMCIA 1 #define WLAN_ISA 2 @@ -158,6 +160,9 @@ #ifndef __LITTLE_ENDIAN__ #define __LITTLE_ENDIAN__ #endif +#elif defined(__ia64__) + #define WLAN_CPU_FAMILY WLAN_ITANIUM + #define WLAN_SYSARCH WLAN_ITANIUMARCH #else #error "No CPU identified!" #endif Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-5/kernel-2.6.spec,v retrieving revision 1.2080.2.3 retrieving revision 1.2080.2.4 diff -u -r1.2080.2.3 -r1.2080.2.4 --- kernel-2.6.spec 29 Mar 2006 12:39:53 -0000 1.2080.2.3 +++ kernel-2.6.spec 29 Mar 2006 13:50:16 -0000 1.2080.2.4 @@ -1005,6 +1005,7 @@ Patch30577: 3241-NET-Fix-ipx-econet-appletalk-irda-ioctl-crashes.txt Patch30578: 3242-ECONET-Convert-away-from-SOCKOPS_WRAPPED.txt Patch30579: 3243-NET-deinline-200-byte-inlines-in-sock.h.txt +Patch30580: XXXX-tiacx-ia64-enable.txt # END OF PATCH DEFINITIONS @@ -2802,6 +2803,8 @@ %patch30578 -p1 # [NET]: deinline 200+ byte inlines in sock.h %patch30579 -p1 +# tiacx: enable compiling on ia64 +%patch30580 -p1 # END OF PATCH APPLICATIONS @@ -3971,6 +3974,7 @@ - [NET]: Fix ipx/econet/appletalk/irda ioctl crashes - [ECONET]: Convert away from SOCKOPS_WRAPPED - [NET]: deinline 200+ byte inlines in sock.h +- tiacx: enable compiling on ia64 * Tue Mar 26 2006 Dave Jones - 2.6.16.1 From fedora-cvs-commits at redhat.com Wed Mar 29 14:01:36 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 29 Mar 2006 09:01:36 -0500 Subject: rpms/openmotif/FC-4 openMotif-2.2.3-CVE-2005-3964.patch, NONE, 1.1 openmotif.spec, 1.31, 1.32 Message-ID: <200603291401.k2TE1Z2N019808@cvs.devel.redhat.com> Author: twoerner Update of /cvs/dist/rpms/openmotif/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv19760 Modified Files: openmotif.spec Added Files: openMotif-2.2.3-CVE-2005-3964.patch Log Message: [tw] - fixed CVE-2005-3964: libUil buffer overflows (#174815) openMotif-2.2.3-CVE-2005-3964.patch: UilDiags.c | 4 ++-- UilSrcSrc.c | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) --- NEW FILE openMotif-2.2.3-CVE-2005-3964.patch --- --- openMotif-2.2.3/clients/uil/UilSrcSrc.c.CVE-2005-3964 2002-01-10 21:55:47.000000000 +0100 +++ openMotif-2.2.3/clients/uil/UilSrcSrc.c 2005-12-22 18:21:04.000000000 +0100 @@ -631,7 +631,8 @@ /* place the file name in the expanded_name buffer */ - strcpy(buffer, c_file_name); + strncpy(buffer, c_file_name, 256); + buffer[255] = '\0'; /* Determine if this is the main file or an include file. */ --- openMotif-2.2.3/clients/uil/UilDiags.c.CVE-2005-3964 2005-12-22 18:17:10.000000000 +0100 +++ openMotif-2.2.3/clients/uil/UilDiags.c 2005-12-22 18:17:14.000000000 +0100 @@ -293,12 +293,12 @@ va_start(ap, l_start_column); #ifndef NO_MESSAGE_CATALOG - vsprintf( msg_buffer, + vsnprintf( msg_buffer, 132, catgets(uil_catd, UIL_SET1, msg_cat_table[ message_number ], diag_rz_msg_table[ message_number ].ac_text), ap ); #else - vsprintf( msg_buffer, + vsnprintf( msg_buffer, 132, diag_rz_msg_table[ message_number ].ac_text, ap ); #endif Index: openmotif.spec =================================================================== RCS file: /cvs/dist/rpms/openmotif/FC-4/openmotif.spec,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- openmotif.spec 2 Sep 2005 15:23:51 -0000 1.31 +++ openmotif.spec 29 Mar 2006 14:01:08 -0000 1.32 @@ -3,7 +3,7 @@ Summary: Open Motif runtime libraries and executables. Name: openmotif Version: 2.2.3 -Release: 10.FC4.1 +Release: 10.FC4.2 License: Open Group Public License Group: System Environment/Libraries Source: %{intern_name}-%{version}.tar.gz @@ -39,6 +39,7 @@ Patch40: openMotif-2.2.3-motifzone_1202.patch Patch41: openMotif-2.2.3-CAN-2005-0605.patch Patch42: openMotif-2.2.3-mrm.patch +Patch43: openMotif-2.2.3-CVE-2005-3964.patch Conflicts: lesstif <= 0.92.32-6 @@ -83,6 +84,7 @@ %patch40 -p1 -b .motifzone_1202 %patch41 -p1 -b .CAN-2005-0605 %patch42 -p1 -b .mrm +%patch43 -p1 -b .CVE-2005-3964 for i in doc/man/man3/{XmColumn,XmDataField}.3; do iconv -f windows-1252 -t utf-8 < "$i" > "${i}_" @@ -165,6 +167,9 @@ %{prefix}/man/man5/* %changelog +* Wed Mar 29 2006 Thomas Woerner 2.2.3-10.FC4.2 +- fixed CVE-2005-3964: libUil buffer overflows (#174815) + * Fri Sep 2 2005 Thomas Woerner 2.2.3-10.FC4.1 - fixed mrm initialization error in MrmOpenHierarchyPerDisplay (#167094) Thanks to Arjan van de Ven for the patch. From fedora-cvs-commits at redhat.com Wed Mar 29 14:08:22 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 29 Mar 2006 09:08:22 -0500 Subject: rpms/kdepim/devel .cvsignore, 1.30, 1.31 kdepim.spec, 1.76, 1.77 sources, 1.33, 1.34 Message-ID: <200603291408.k2TE8MHa019971@cvs.devel.redhat.com> Author: than Update of /cvs/dist/rpms/kdepim/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv19956 Modified Files: .cvsignore kdepim.spec sources Log Message: update to 3.5.2 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/kdepim/devel/.cvsignore,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- .cvsignore 2 Feb 2006 17:28:58 -0000 1.30 +++ .cvsignore 29 Mar 2006 14:08:20 -0000 1.31 @@ -9,3 +9,4 @@ kdepim-3.4.92.tar.bz2 kdepim-3.5.0.tar.bz2 kdepim-3.5.1.tar.bz2 +kdepim-3.5.2.tar.bz2 Index: kdepim.spec =================================================================== RCS file: /cvs/dist/rpms/kdepim/devel/kdepim.spec,v retrieving revision 1.76 retrieving revision 1.77 diff -u -r1.76 -r1.77 --- kdepim.spec 11 Feb 2006 03:48:18 -0000 1.76 +++ kdepim.spec 29 Mar 2006 14:08:20 -0000 1.77 @@ -2,14 +2,14 @@ %define final 0 %define qt_version 1:3.3.5 -%define arts_version 8:1.5.1 +%define arts_version 8:1.5.2 %define arts 1 %define make_cvs 1 %define disable_gcc_check_and_hidden_visibility 1 -Version: 3.5.1 -Release: 1.2 +Version: 3.5.2 +Release: 1 Name: kdepim Summary: PIM (Personal Information Manager) for KDE Prefix: /usr @@ -207,6 +207,9 @@ %{_includedir}/kde/* %changelog +* Wed Mar 29 2006 Than Ngo 3.5.2-1 +- update to 3.5.2 + * Fri Feb 10 2006 Jesse Keating - 6:3.5.1-1.2 - bump again for double-long bug on ppc(64) Index: sources =================================================================== RCS file: /cvs/dist/rpms/kdepim/devel/sources,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- sources 2 Feb 2006 17:28:58 -0000 1.33 +++ sources 29 Mar 2006 14:08:20 -0000 1.34 @@ -1 +1 @@ -8e87c9cbe1f0c0f983f94d804a5bc8f9 kdepim-3.5.1.tar.bz2 +ac6b3b503e27a65a7b883c1e0a57262e kdepim-3.5.2.tar.bz2 From fedora-cvs-commits at redhat.com Wed Mar 29 14:14:58 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 29 Mar 2006 09:14:58 -0500 Subject: rpms/freeradius/FC-4 freeradius-1.0.4-#167677.patch, NONE, 1.1 freeradius-1.0.4-CVE-2006-1354.patch, NONE, 1.1 freeradius.spec, 1.23, 1.24 Message-ID: <200603291414.k2TEEwsT020085@cvs.devel.redhat.com> Author: twoerner Update of /cvs/dist/rpms/freeradius/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv20068 Modified Files: freeradius.spec Added Files: freeradius-1.0.4-#167677.patch freeradius-1.0.4-CVE-2006-1354.patch Log Message: [tw] - CVE-2006-1354: security fixes for EAP-MSCHAPv2 (#186083) - other security related fixes (#167677) freeradius-1.0.4-#167677.patch: lib/token.c | 6 - main/exec.c | 19 ++++ main/session.c | 10 ++ main/xlat.c | 68 +++++++++------- modules/rlm_ldap/rlm_ldap.c | 15 ++- modules/rlm_sql/drivers/rlm_sql_unixodbc/sql_unixodbc.c | 4 6 files changed, 83 insertions(+), 39 deletions(-) --- NEW FILE freeradius-1.0.4-#167677.patch --- --- freeradius-1.0.4/src/lib/token.c.#167676 2003-09-12 21:25:29.000000000 +0200 +++ freeradius-1.0.4/src/lib/token.c 2006-03-29 16:08:16.000000000 +0200 @@ -2,7 +2,7 @@ * token.c Read the next token from a string. * Yes it's pretty primitive but effective. * - * Version: $Id: token.c,v 1.17 2003/09/12 19:25:29 phampson Exp $ + * Version: $Id: token.c,v 1.18 2005/08/26 12:53:55 nbk Exp $ * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -27,7 +27,7 @@ #include #include "token.h" -static const char rcsid[] = "$Id: token.c,v 1.17 2003/09/12 19:25:29 phampson Exp $"; +static const char rcsid[] = "$Id: token.c,v 1.18 2005/08/26 12:53:55 nbk Exp $"; static const LRAD_NAME_NUMBER tokens[] = { { "=~", T_OP_REG_EQ, }, /* order is important! */ @@ -116,7 +116,7 @@ s = buf; escape = 0; - while (*p && buflen-- > 0) { + while (*p && buflen-- > 1) { if (escape) { escape = 0; switch(*p) { --- freeradius-1.0.4/src/modules/rlm_ldap/rlm_ldap.c.#167676 2005-02-07 20:51:28.000000000 +0100 +++ freeradius-1.0.4/src/modules/rlm_ldap/rlm_ldap.c 2006-03-29 16:08:16.000000000 +0200 @@ -834,18 +834,21 @@ break; } - if (strchr("*", *in)) { - in++; - outlen--; + if (strchr("*=\\,()", *in)) { + static const char *hex = "0123456789abcdef"; + if (outlen <= 3) break; + + *(out++) = '\\'; + *(out++) = hex[((*in) >> 4) & 0x0f]; + *(out++) = hex[(*in) & 0x0f]; + outlen -= 3; continue; } /* * Else it's a nice character. */ - *out = *in; - out++; - in++; + *(out++) = *(in++); outlen--; len++; } --- freeradius-1.0.4/src/modules/rlm_sql/drivers/rlm_sql_unixodbc/sql_unixodbc.c.#167676 2004-02-26 20:04:36.000000000 +0100 +++ freeradius-1.0.4/src/modules/rlm_sql/drivers/rlm_sql_unixodbc/sql_unixodbc.c 2006-03-29 16:08:16.000000000 +0200 @@ -345,7 +345,7 @@ SQLCHAR error[256] = ""; SQLINTEGER errornum = 0; SQLSMALLINT length = 255; - char *result; + static char result[1024]; /* NOT thread-safe! */ rlm_sql_unixodbc_sock *unixodbc_sock = sqlsocket->conn; @@ -359,8 +359,8 @@ 256, &length); - result = (char*)rad_malloc(strlen(state)+1+strlen(error)); sprintf(result, "%s %s", state, error); + result[sizeof(result) - 1] = '\0'; /* catch idiot thread issues */ return result; } --- freeradius-1.0.4/src/main/exec.c.#167676 2004-02-26 20:04:22.000000000 +0100 +++ freeradius-1.0.4/src/main/exec.c 2006-03-29 16:08:16.000000000 +0200 @@ -32,6 +32,10 @@ #include #include +#ifdef HAVE_UNISTD_H +#include +#endif + #ifdef HAVE_SYS_WAIT_H # include #endif @@ -132,6 +136,7 @@ char *envp[MAX_ENVP]; int envlen; char buffer[1024]; + int maxfd = 256; /* * Child process. @@ -193,12 +198,19 @@ } close(devnull); +#ifdef _SC_OPEN_MAX + maxfd = sysconf(_SC_OPEN_MAX); + if (maxfd < 0) { + maxfd = 256; + } +#endif + /* * The server may have MANY FD's open. We don't * want to leave dangling FD's for the child process * to play funky games with, so we close them. */ - for (i = 3; i < 256; i++) { + for (i = 3; i < maxfd; i++) { close(i); } @@ -228,6 +240,11 @@ vp_prints_value(buffer+n, sizeof(buffer) - n, vp, 1); envp[envlen++] = strdup(buffer); + + /* + * Don't add too many attributes. + */ + if (envlen == (MAX_ENVP - 1)) break; } envp[envlen] = NULL; execve(argv[0], argv, envp); --- freeradius-1.0.4/src/main/xlat.c.#167676 2004-09-09 16:31:07.000000000 +0200 +++ freeradius-1.0.4/src/main/xlat.c 2006-03-29 16:08:16.000000000 +0200 @@ -380,6 +380,7 @@ int stop=0, found=0, retlen=0; int openbraces = *open; xlat_t *c; + size_t namelen = sizeof(attrname); p = *from; q = *to; @@ -397,7 +398,7 @@ /* * Copy over the rest of the string. */ - while ((*p) && (!stop)) { + while ((*p) && (!stop) && (namelen > 1)) { switch(*p) { /* * Allow braces inside things, too. @@ -440,6 +441,7 @@ *pa++ = *p++; break; } + namelen--; } *pa = '\0'; @@ -563,7 +565,7 @@ int radius_xlat(char *out, int outlen, const char *fmt, REQUEST *request, RADIUS_ESCAPE_STRING func) { - int i, c,freespace; + int c, len, freespace; const char *p; char *q; VALUE_PAIR *tmp; @@ -668,9 +670,11 @@ break; case 'd': /* request day */ TM = localtime_r(&request->timestamp, &s_TM); - strftime(tmpdt,sizeof(tmpdt),"%d",TM); - strNcpy(q,tmpdt,freespace); - q += strlen(q); + len = strftime(tmpdt, sizeof(tmpdt), "%d", TM); + if (len > 0) { + strNcpy(q, tmpdt, freespace); + q += strlen(q); + } p++; break; case 'f': /* Framed IP address */ @@ -690,9 +694,11 @@ break; case 'm': /* request month */ TM = localtime_r(&request->timestamp, &s_TM); - strftime(tmpdt,sizeof(tmpdt),"%m",TM); - strNcpy(q,tmpdt,freespace); - q += strlen(q); + len = strftime(tmpdt, sizeof(tmpdt), "%m", TM); + if (len > 0) { + strNcpy(q, tmpdt, freespace); + q += strlen(q); + } p++; break; case 'n': /* NAS IP address */ @@ -728,16 +734,20 @@ break; case 'D': /* request date */ TM = localtime_r(&request->timestamp, &s_TM); - strftime(tmpdt,sizeof(tmpdt),"%Y%m%d",TM); - strNcpy(q,tmpdt,freespace); - q += strlen(q); + len = strftime(tmpdt, sizeof(tmpdt), "%Y%m%d", TM); + if (len > 0) { + strNcpy(q, tmpdt, freespace); + q += strlen(q); + } p++; break; case 'H': /* request hour */ TM = localtime_r(&request->timestamp, &s_TM); - strftime(tmpdt,sizeof(tmpdt),"%H",TM); - strNcpy(q,tmpdt,freespace); - q += strlen(q); + len = strftime(tmpdt, sizeof(tmpdt), "%H", TM); + if (len > 0) { + strNcpy(q, tmpdt, freespace); + q += strlen(q); + } p++; break; case 'L': /* radlog_dir */ @@ -756,16 +766,20 @@ break; case 'S': /* request timestamp in SQL format*/ TM = localtime_r(&request->timestamp, &s_TM); - strftime(tmpdt,sizeof(tmpdt),"%Y-%m-%d %H:%M:%S",TM); - strNcpy(q,tmpdt,freespace); - q += strlen(q); + len = strftime(tmpdt, sizeof(tmpdt), "%Y-%m-%d %H:%M:%S", TM); + if (len > 0) { + strNcpy(q, tmpdt, freespace); + q += strlen(q); + } p++; break; case 'T': /* request timestamp */ TM = localtime_r(&request->timestamp, &s_TM); - strftime(tmpdt,sizeof(tmpdt),"%Y-%m-%d-%H.%M.%S.000000",TM); - strNcpy(q,tmpdt,freespace); - q += strlen(q); + len = strftime(tmpdt, sizeof(tmpdt), "%Y-%m-%d-%H.%M.%S.000000", TM); + if (len > 0) { + strNcpy(q, tmpdt, freespace); + q += strlen(q); + } p++; break; case 'U': /* Stripped User name */ @@ -782,9 +796,11 @@ break; case 'Y': /* request year */ TM = localtime_r(&request->timestamp, &s_TM); - strftime(tmpdt,sizeof(tmpdt),"%Y",TM); - strNcpy(q,tmpdt,freespace); - q += strlen(q); + len = strftime(tmpdt, sizeof(tmpdt), "%Y", TM); + if (len > 0) { + strNcpy(q, tmpdt, freespace); + q += strlen(q); + } p++; break; case 'Z': /* Full request pairs except password */ @@ -792,9 +808,9 @@ while (tmp && (freespace > 3)) { if (tmp->attribute != PW_PASSWORD) { *q++ = '\t'; - i = vp_prints(q,freespace-2,tmp); - q += i; - freespace -= (i+2); + len = vp_prints(q, freespace - 2, tmp); + q += len; + freespace -= (len + 2); *q++ = '\n'; } tmp = tmp->next; --- freeradius-1.0.4/src/main/session.c.#167676 2005-03-17 14:52:44.000000000 +0100 +++ freeradius-1.0.4/src/main/session.c 2006-03-29 16:08:16.000000000 +0200 @@ -129,6 +129,7 @@ char address[16]; char port[11]; RADCLIENT *cl; + int maxfd = 256; /* * Find NAS type. @@ -196,10 +197,17 @@ return WEXITSTATUS(status); } +#ifdef _SC_OPEN_MAX + maxfd = sysconf(_SC_OPEN_MAX); + if (maxfd < 0) { + maxfd = 256; + } +#endif + /* * Child - exec checklogin with the right parameters. */ - for (n = 256; n >= 3; n--) + for (n = maxfd; n >= 3; n--) close(n); /* freeradius-1.0.4-CVE-2006-1354.patch: rlm_eap_mschapv2.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletion(-) --- NEW FILE freeradius-1.0.4-CVE-2006-1354.patch --- --- freeradius-1.0.5/src/modules/rlm_eap/types/rlm_eap_mschapv2/rlm_eap_mschapv2.c.CVE-2006-1354 2004-04-19 22:15:30.000000000 +0200 +++ freeradius-1.0.5/src/modules/rlm_eap/types/rlm_eap_mschapv2/rlm_eap_mschapv2.c 2006-03-24 12:00:02.000000000 +0100 @@ -1,7 +1,7 @@ /* * rlm_eap_mschapv2.c Handles that are called from eap * - * Version: $Id: rlm_eap_mschapv2.c,v 1.8 2004/04/19 20:15:30 aland Exp $ + * Version: $Id: rlm_eap_mschapv2.c,v 1.8.4.1 2006/03/07 18:38:17 aland Exp $ * * 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 @@ -449,6 +449,11 @@ break; case PW_EAP_MSCHAPV2_SUCCESS: + if (data->code != PW_EAP_MSCHAPV2_SUCCESS) { + radlog(L_ERR, "rlm_eap_mschapv2: Unexpected success received"); + return 0; + } + /* * It's a success. Don't proxy it. */ Index: freeradius.spec =================================================================== RCS file: /cvs/dist/rpms/freeradius/FC-4/freeradius.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- freeradius.spec 20 Jul 2005 12:08:03 -0000 1.23 +++ freeradius.spec 29 Mar 2006 14:14:55 -0000 1.24 @@ -1,7 +1,7 @@ Summary: High-performance and highly configurable free RADIUS server. Name: freeradius Version: 1.0.4 -Release: 1.FC4.1 +Release: 1.FC4.2 License: GPL Group: System Environment/Daemons URL: http://www.freeradius.org/ @@ -19,6 +19,8 @@ Patch7: freeradius-1.0.2-sasl2.patch Patch8: freeradius-1.0.0-samba3.patch Patch10: freeradius-1.0.4-build.patch +Patch11: freeradius-1.0.4-#167677.patch +Patch12: freeradius-1.0.4-CVE-2006-1354.patch %description The FreeRADIUS Server Project is a high performance and highly configurable @@ -110,6 +112,8 @@ %patch7 -p1 -b .sasl2 %patch8 -p1 -b .samba3 %patch10 -p1 -b .build +%patch11 -p1 -b .#167677 +%patch12 -p1 -b .CVE-2006-1354 %build @@ -263,6 +267,10 @@ %changelog +* Wed Mar 29 2006 Thomas Woerner 1.0.4-1.FC4.2 +- CVE-2006-1354: security fixes for EAP-MSCHAPv2 (#186083) +- other security related fixes (#167677) + * Wed Jul 20 2005 Thomas Woerner 1.0.4-1.FC4.1 - new version 1.0.4 - droppend radrelay patch (fixed upstream) From fedora-cvs-commits at redhat.com Wed Mar 29 14:26:23 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 29 Mar 2006 09:26:23 -0500 Subject: rpms/mrtg/FC-5 .cvsignore, 1.10, 1.11 mrtg.spec, 1.26, 1.27 sources, 1.10, 1.11 Message-ID: <200603291426.k2TEQNIi001441@cvs.devel.redhat.com> Author: mitr Update of /cvs/dist/rpms/mrtg/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv1429 Modified Files: .cvsignore mrtg.spec sources Log Message: * Wed Mar 29 2006 Miloslav Trmac - 2.13.2-0.fc5.1 - Update to mrtg-2.13.2 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/mrtg/FC-5/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 30 Jan 2006 22:57:28 -0000 1.10 +++ .cvsignore 29 Mar 2006 14:26:21 -0000 1.11 @@ -1 +1,2 @@ -mrtg-2.13.0.tar.gz +mrtg-2.13.2.tar.gz +mrtg-2.13.2.tar.gz.md5.pgp Index: mrtg.spec =================================================================== RCS file: /cvs/dist/rpms/mrtg/FC-5/mrtg.spec,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- mrtg.spec 11 Feb 2006 04:38:34 -0000 1.26 +++ mrtg.spec 29 Mar 2006 14:26:21 -0000 1.27 @@ -5,14 +5,15 @@ Summary: Multi Router Traffic Grapher Name: mrtg -Version: 2.13.0 -Release: 1.2 +Version: 2.13.2 +Release: 0.fc5.1 URL: http://ee-staff.ethz.ch/~oetiker/webtools/mrtg/ -Source0: http://www.ee.ethz.ch/~oetiker/webtools/mrtg/pub/%{name}-%{version}.tar.gz -Source1: mrtg.cfg -Source2: filter-requires-mrtg.sh -Source3: mrtg.crond.in -Source4: mrtg-httpd.conf +Source0: http://people.ee.ethz.ch/~oetiker/webtools/mrtg/pub/mrtg-%{version}.tar.gz +Source1: http://people.ee.ethz.ch/~oetiker/webtools/mrtg/pub/mrtg-%{version}.tar.gz.md5.pgp +Source2: mrtg.cfg +Source3: filter-requires-mrtg.sh +Source4: mrtg.crond.in +Source5: mrtg-httpd.conf Patch0: mrtg-2.9.17-lib64.patch Patch1: mrtg-2.10.5-norpath.patch License: GPL @@ -21,7 +22,7 @@ Buildroot: %{_tmppath}/%{name}-%{version}-root BuildRequires: gd-devel, libpng-devel -%define __find_requires %{SOURCE2} +%define __find_requires %{SOURCE3} %description The Multi Router Traffic Grapher (MRTG) is a tool to monitor the traffic @@ -61,14 +62,14 @@ install -m 644 images/* $RPM_BUILD_ROOT%{contentdir}/ sed 's, at CONTENTDIR@,%{contentdir},g; s, at LIBDIR@,%{_localstatedir}/lib/mrtg,g' \ - %{SOURCE1} > $RPM_BUILD_ROOT%{_sysconfdir}/mrtg/mrtg.cfg + %{SOURCE2} > $RPM_BUILD_ROOT%{_sysconfdir}/mrtg/mrtg.cfg chmod 644 $RPM_BUILD_ROOT%{_sysconfdir}/mrtg/mrtg.cfg sed -e 's, at bindir@,%{_bindir},g; s, at sysconfdir@,%{_sysconfdir},g;' \ - -e 's, at localstatedir@,%{_localstatedir},g' %{SOURCE3} \ + -e 's, at localstatedir@,%{_localstatedir},g' %{SOURCE4} \ > $RPM_BUILD_ROOT%{_sysconfdir}/cron.d/mrtg chmod 644 $RPM_BUILD_ROOT%{_sysconfdir}/cron.d/mrtg -install -m 644 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/mrtg.conf +install -m 644 %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/mrtg.conf for i in mrtg cfgmaker indexmaker; do %{__perl} -pi -e 's;\@\@lib\@\@;%{_lib};g' $RPM_BUILD_ROOT%{_bindir}/$i @@ -110,6 +111,9 @@ %dir %{_localstatedir}/lock/mrtg %changelog +* Wed Mar 29 2006 Miloslav Trmac - 2.13.2-0.fc5.1 +- Update to mrtg-2.13.2 + * Fri Feb 10 2006 Jesse Keating - 2.13.0-1.2 - bump again for double-long bug on ppc(64) Index: sources =================================================================== RCS file: /cvs/dist/rpms/mrtg/FC-5/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 30 Jan 2006 22:57:28 -0000 1.10 +++ sources 29 Mar 2006 14:26:21 -0000 1.11 @@ -1 +1,2 @@ -18fc58377fc6e697fdf7ac2f66e3e6ff mrtg-2.13.0.tar.gz +daab44b14d608cda831b4dc481cec38a mrtg-2.13.2.tar.gz +9392855c1ebc8104d7a409d95306dc50 mrtg-2.13.2.tar.gz.md5.pgp From fedora-cvs-commits at redhat.com Wed Mar 29 14:42:21 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 29 Mar 2006 09:42:21 -0500 Subject: rpms/scim/FC-5 scim.spec,1.28,1.29 Message-ID: <200603291442.k2TEgLe9001787@cvs.devel.redhat.com> Author: petersen Update of /cvs/dist/rpms/scim/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv1772 Modified Files: scim.spec Log Message: - make scim-libs prereq libstdc++so7 to avoid update-gtk-immodules error when installing on i386 (#186365) - setup xinput.d for some more locale (as_IN, or_IN, si_LK, vi_VN, and zh_HK) Index: scim.spec =================================================================== RCS file: /cvs/dist/rpms/scim/FC-5/scim.spec,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- scim.spec 2 Mar 2006 13:51:10 -0000 1.28 +++ scim.spec 29 Mar 2006 14:42:19 -0000 1.29 @@ -1,10 +1,10 @@ -%define with_libstdc_preview 1 +%define with_libstdc_preview 1 %define scim_api 1.4.0 Name: scim Version: 1.4.4 -Release: 9 +Release: 9.1.fc5 Summary: Smart Common Input Method platform License: LGPL @@ -60,6 +60,9 @@ Group: System Environment/Libraries # for update-gtk-immodules PreReq: gtk2 > 2.8 +%if %{with_libstdc_preview} +PreReq: libstdc++so7 +%endif Obsoletes: iiimf-libs <= 1:12.2 %description libs @@ -130,9 +133,9 @@ %clean rm -rf ${RPM_BUILD_ROOT} -%define cjk_langs ja_JP ko_KR zh_CN zh_TW -%define indic_langs bn_IN gu_IN hi_IN kn_IN ml_IN pa_IN ta_IN te_IN -%define supported_langs %{cjk_langs} %{indic_langs} ne_NE th_TH +%define cjk_langs ja_JP ko_KR zh_CN zh_HK zh_TW +%define indic_langs as_IN bn_IN gu_IN hi_IN kn_IN ml_IN or_IN pa_IN ta_IN te_IN +%define supported_langs %{cjk_langs} %{indic_langs} ne_NE si_LK th_TH vi_VN %post @@ -192,10 +195,15 @@ %changelog +* Wed Mar 29 2006 Jens Petersen - 1.4.4-9.1.fc5 +- make scim-libs prereq libstdc++so7 to avoid update-gtk-immodules error when + installing on i386 (#186365) +- setup xinput.d for some more locale (as_IN, or_IN, si_LK, vi_VN, and zh_HK) + * Thu Mar 2 2006 Jens Petersen - 1.4.4-9 -- scim-libs prereqs gtk2 > 2.8 so that update-gtk-immodules in %%post can - read im-scim.so (#183636) - +- make scim-libs prereq gtk2 > 2.8 to avoid update-gtk-immodules error + when upgrading from FC4 (#183636) + * Wed Mar 1 2006 Jens Petersen - 1.4.4-8 - add scim-system-default-config.patch - add Zenkaku_Hankaku as trigger hotkey for Japanese users From fedora-cvs-commits at redhat.com Wed Mar 29 14:43:58 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 29 Mar 2006 09:43:58 -0500 Subject: rpms/scim/FC-5 update-xinput-scim,1.1,NONE Message-ID: <200603291443.k2TEhw8c001811@cvs.devel.redhat.com> Author: petersen Update of /cvs/dist/rpms/scim/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv1799 Removed Files: update-xinput-scim Log Message: remove unused script --- update-xinput-scim DELETED --- From fedora-cvs-commits at redhat.com Wed Mar 29 15:14:52 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 29 Mar 2006 10:14:52 -0500 Subject: rpms/policycoreutils/devel policycoreutils-rhat.patch, 1.178, 1.179 policycoreutils.spec, 1.252, 1.253 Message-ID: <200603291514.k2TFEqbB015828@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/policycoreutils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv15813 Modified Files: policycoreutils-rhat.patch policycoreutils.spec Log Message: * Tue Mar 21 2006 Dan Walsh 1.30.1-4 - Clean up reference policy generation in audit2allow policycoreutils-rhat.patch: Makefile | 2 audit2allow/audit2allow | 42 ++-- restorecond/Makefile | 29 ++ restorecond/restorecond.8 | 31 ++ restorecond/restorecond.c | 451 +++++++++++++++++++++++++++++++++++++++++++ restorecond/restorecond.conf | 4 restorecond/restorecond.h | 31 ++ restorecond/restorecond.init | 61 +++++ restorecond/stringslist.c | 118 +++++++++++ restorecond/stringslist.h | 37 +++ restorecond/utmpwatcher.c | 105 ++++++++++ restorecond/utmpwatcher.h | 29 ++ scripts/fixfiles | 10 13 files changed, 929 insertions(+), 21 deletions(-) Index: policycoreutils-rhat.patch =================================================================== RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v retrieving revision 1.178 retrieving revision 1.179 diff -u -r1.178 -r1.179 --- policycoreutils-rhat.patch 29 Mar 2006 04:06:16 -0000 1.178 +++ policycoreutils-rhat.patch 29 Mar 2006 15:14:48 -0000 1.179 @@ -1,6 +1,6 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/audit2allow/audit2allow policycoreutils-1.30.1/audit2allow/audit2allow --- nsapolicycoreutils/audit2allow/audit2allow 2006-03-10 09:48:04.000000000 -0500 -+++ policycoreutils-1.30.1/audit2allow/audit2allow 2006-03-21 11:13:31.000000000 -0500 ++++ policycoreutils-1.30.1/audit2allow/audit2allow 2006-03-29 10:08:58.000000000 -0500 @@ -27,15 +27,14 @@ import commands, sys, os, pwd, string, getopt, re, selinux @@ -39,9 +39,73 @@ for s in Scon: for t in Tcon: for c in Class: +@@ -217,12 +215,15 @@ + class seruleRecords: + def __init__(self, input, last_reload=0, verbose=0, te_ind=0): + self.last_reload=last_reload +- self.seRules={} ++ self.initialize() ++ self.load(input, te_ind) ++ self.gen_ref_policy = False ++ ++ def initialize(self): ++ self.seRules={} + self.seclasses={} + self.types=[] + self.roles=[] +- self.load(input, te_ind) +- self.gen_ref_policy = False + + def gen_reference_policy(self): + self.gen_ref_policy = True +@@ -330,7 +331,7 @@ + return + + if "load_policy" in avc and self.last_reload: +- self.seRules={} ++ self.initialize() + + if "granted" in avc: + return +@@ -395,6 +396,9 @@ + self.types.append(type) + + def gen_module(self, module): ++ if self.gen_ref_policy: ++ return "policy_module(%s, 1.0);" % module ++ else: + return "module %s 1.0;" % module + + def gen_requires(self): +@@ -403,11 +407,11 @@ + keys=self.seclasses.keys() + keys.sort() + rec="\n\nrequire {\n" +- if len(self.roles) > 0: +- for i in self.roles: +- rec += "\trole %s; \n" % i +- rec += "\n" +- ++# if len(self.roles) > 0: ++# for i in self.roles: ++# rec += "\trole %s; \n" % i ++# rec += "\n" ++# + for i in keys: + access=self.seclasses[i] + if len(access) > 1: +@@ -423,7 +427,7 @@ + + for i in self.types: + rec += "\ttype %s; \n" % i +- rec += " };\n\n\n" ++ rec += "};\n\n" + return rec + + def out(self, require=0, module=""): diff --exclude-from=exclude -N -u -r nsapolicycoreutils/Makefile policycoreutils-1.30.1/Makefile --- nsapolicycoreutils/Makefile 2005-11-29 10:55:01.000000000 -0500 -+++ policycoreutils-1.30.1/Makefile 2006-03-21 11:13:31.000000000 -0500 ++++ policycoreutils-1.30.1/Makefile 2006-03-28 23:03:06.000000000 -0500 @@ -1,4 +1,4 @@ -SUBDIRS=setfiles semanage load_policy newrole run_init restorecon audit2allow audit2why scripts sestatus semodule_package semodule semodule_link semodule_expand setsebool po +SUBDIRS=setfiles semanage load_policy newrole run_init restorecon restorecond audit2allow audit2why scripts sestatus semodule_package semodule semodule_link semodule_expand setsebool po @@ -50,7 +114,7 @@ @for subdir in $(SUBDIRS); do \ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/restorecond/Makefile policycoreutils-1.30.1/restorecond/Makefile --- nsapolicycoreutils/restorecond/Makefile 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.30.1/restorecond/Makefile 2006-03-21 11:13:31.000000000 -0500 ++++ policycoreutils-1.30.1/restorecond/Makefile 2006-03-28 23:03:06.000000000 -0500 @@ -0,0 +1,29 @@ +# Installation directories. +PREFIX ?= ${DESTDIR}/usr @@ -83,7 +147,7 @@ + diff --exclude-from=exclude -N -u -r nsapolicycoreutils/restorecond/restorecond.8 policycoreutils-1.30.1/restorecond/restorecond.8 --- nsapolicycoreutils/restorecond/restorecond.8 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.30.1/restorecond/restorecond.8 2006-03-21 11:13:31.000000000 -0500 ++++ policycoreutils-1.30.1/restorecond/restorecond.8 2006-03-28 23:03:06.000000000 -0500 @@ -0,0 +1,31 @@ +.TH "restorecond" "8" "2002031409" "" "" +.SH "NAME" @@ -118,7 +182,7 @@ +.BR restorecon (8), diff --exclude-from=exclude -N -u -r nsapolicycoreutils/restorecond/restorecond.c policycoreutils-1.30.1/restorecond/restorecond.c --- nsapolicycoreutils/restorecond/restorecond.c 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.30.1/restorecond/restorecond.c 2006-03-21 11:13:31.000000000 -0500 ++++ policycoreutils-1.30.1/restorecond/restorecond.c 2006-03-28 23:03:06.000000000 -0500 @@ -0,0 +1,451 @@ +/* + * restorecond @@ -573,7 +637,7 @@ +} diff --exclude-from=exclude -N -u -r nsapolicycoreutils/restorecond/restorecond.conf policycoreutils-1.30.1/restorecond/restorecond.conf --- nsapolicycoreutils/restorecond/restorecond.conf 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.30.1/restorecond/restorecond.conf 2006-03-21 11:14:22.000000000 -0500 ++++ policycoreutils-1.30.1/restorecond/restorecond.conf 2006-03-28 23:03:06.000000000 -0500 @@ -0,0 +1,4 @@ +/etc/resolv.conf +/etc/mtab @@ -581,7 +645,7 @@ +~/public_html diff --exclude-from=exclude -N -u -r nsapolicycoreutils/restorecond/restorecond.h policycoreutils-1.30.1/restorecond/restorecond.h --- nsapolicycoreutils/restorecond/restorecond.h 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.30.1/restorecond/restorecond.h 2006-03-21 11:13:31.000000000 -0500 ++++ policycoreutils-1.30.1/restorecond/restorecond.h 2006-03-28 23:03:06.000000000 -0500 @@ -0,0 +1,31 @@ +/* restorecond.h -- + * Copyright 2006 Red Hat Inc., Durham, North Carolina. @@ -616,7 +680,7 @@ + diff --exclude-from=exclude -N -u -r nsapolicycoreutils/restorecond/restorecond.init policycoreutils-1.30.1/restorecond/restorecond.init --- nsapolicycoreutils/restorecond/restorecond.init 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.30.1/restorecond/restorecond.init 2006-03-21 11:13:31.000000000 -0500 ++++ policycoreutils-1.30.1/restorecond/restorecond.init 2006-03-28 23:03:06.000000000 -0500 @@ -0,0 +1,61 @@ +#!/bin/sh +# @@ -681,7 +745,7 @@ +exit 0 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/restorecond/stringslist.c policycoreutils-1.30.1/restorecond/stringslist.c --- nsapolicycoreutils/restorecond/stringslist.c 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.30.1/restorecond/stringslist.c 2006-03-21 11:13:31.000000000 -0500 ++++ policycoreutils-1.30.1/restorecond/stringslist.c 2006-03-28 23:03:06.000000000 -0500 @@ -0,0 +1,118 @@ +/* + * Copyright (C) 2006 Red Hat @@ -803,7 +867,7 @@ +#endif diff --exclude-from=exclude -N -u -r nsapolicycoreutils/restorecond/stringslist.h policycoreutils-1.30.1/restorecond/stringslist.h --- nsapolicycoreutils/restorecond/stringslist.h 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.30.1/restorecond/stringslist.h 2006-03-21 11:13:31.000000000 -0500 ++++ policycoreutils-1.30.1/restorecond/stringslist.h 2006-03-28 23:03:06.000000000 -0500 @@ -0,0 +1,37 @@ +/* stringslist.h -- + * Copyright 2006 Red Hat Inc., Durham, North Carolina. @@ -844,7 +908,7 @@ +#endif diff --exclude-from=exclude -N -u -r nsapolicycoreutils/restorecond/utmpwatcher.c policycoreutils-1.30.1/restorecond/utmpwatcher.c --- nsapolicycoreutils/restorecond/utmpwatcher.c 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.30.1/restorecond/utmpwatcher.c 2006-03-21 11:13:31.000000000 -0500 ++++ policycoreutils-1.30.1/restorecond/utmpwatcher.c 2006-03-28 23:03:06.000000000 -0500 @@ -0,0 +1,105 @@ +/* + * utmpwatcher.c @@ -953,7 +1017,7 @@ + diff --exclude-from=exclude -N -u -r nsapolicycoreutils/restorecond/utmpwatcher.h policycoreutils-1.30.1/restorecond/utmpwatcher.h --- nsapolicycoreutils/restorecond/utmpwatcher.h 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.30.1/restorecond/utmpwatcher.h 2006-03-21 11:13:31.000000000 -0500 ++++ policycoreutils-1.30.1/restorecond/utmpwatcher.h 2006-03-28 23:03:06.000000000 -0500 @@ -0,0 +1,29 @@ +/* utmpwatcher.h -- + * Copyright 2006 Red Hat Inc., Durham, North Carolina. @@ -986,7 +1050,7 @@ +#endif diff --exclude-from=exclude -N -u -r nsapolicycoreutils/scripts/fixfiles policycoreutils-1.30.1/scripts/fixfiles --- nsapolicycoreutils/scripts/fixfiles 2006-01-04 13:07:46.000000000 -0500 -+++ policycoreutils-1.30.1/scripts/fixfiles 2006-03-21 11:13:31.000000000 -0500 ++++ policycoreutils-1.30.1/scripts/fixfiles 2006-03-28 23:03:06.000000000 -0500 @@ -124,7 +124,15 @@ exit $? fi Index: policycoreutils.spec =================================================================== RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils.spec,v retrieving revision 1.252 retrieving revision 1.253 diff -u -r1.252 -r1.253 --- policycoreutils.spec 29 Mar 2006 04:06:17 -0000 1.252 +++ policycoreutils.spec 29 Mar 2006 15:14:48 -0000 1.253 @@ -5,7 +5,7 @@ Summary: SELinux policy core utilities. Name: policycoreutils Version: 1.30.1 -Release: 3 +Release: 4 License: GPL Group: System Environment/Base Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz @@ -107,6 +107,9 @@ service restorecond condrestart %changelog +* Tue Mar 21 2006 Dan Walsh 1.30.1-4 +- Clean up reference policy generation in audit2allow + * Tue Mar 21 2006 Dan Walsh 1.30.1-3 - Add IN_MOVED_TO to catch renames From fedora-cvs-commits at redhat.com Wed Mar 29 15:33:02 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 29 Mar 2006 10:33:02 -0500 Subject: rpms/system-config-printer/FC-5 .cvsignore, 1.57, 1.58 printconf.spec, 1.62, 1.63 sources, 1.59, 1.60 Message-ID: <200603291533.k2TFX2OZ029745@cvs.devel.redhat.com> Author: twaugh Update of /cvs/dist/rpms/system-config-printer/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv29718 Modified Files: .cvsignore printconf.spec sources Log Message: * Wed Mar 29 2006 Tim Waugh 0.6.151.1-1 - 0.6.151.1: - Don't make the Action->Sharing... menu entry insensitive (bug #187239). Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/system-config-printer/FC-5/.cvsignore,v retrieving revision 1.57 retrieving revision 1.58 diff -u -r1.57 -r1.58 --- .cvsignore 14 Feb 2006 12:56:40 -0000 1.57 +++ .cvsignore 29 Mar 2006 15:32:31 -0000 1.58 @@ -37,3 +37,4 @@ printconf-0.6.149.tar.bz2 printconf-0.6.150.tar.bz2 printconf-0.6.151.tar.bz2 +printconf-0.6.151.1.tar.bz2 Index: printconf.spec =================================================================== RCS file: /cvs/dist/rpms/system-config-printer/FC-5/printconf.spec,v retrieving revision 1.62 retrieving revision 1.63 diff -u -r1.62 -r1.63 --- printconf.spec 14 Feb 2006 12:56:40 -0000 1.62 +++ printconf.spec 29 Mar 2006 15:32:46 -0000 1.63 @@ -1,6 +1,6 @@ Summary: A printer configuration backend/frontend combination. Name: system-config-printer -Version: 0.6.151 +Version: 0.6.151.1 Release: 1 License: GPL Group: System Environment/Daemons @@ -174,6 +174,10 @@ %changelog +* Wed Mar 29 2006 Tim Waugh 0.6.151.1-1 +- 0.6.151.1: + - Don't make the Action->Sharing... menu entry insensitive (bug #187239). + * Tue Feb 14 2006 Tim Waugh 0.6.151-1 - 0.6.151: - Fixed case-insensitive printer matching (bug #181295). Index: sources =================================================================== RCS file: /cvs/dist/rpms/system-config-printer/FC-5/sources,v retrieving revision 1.59 retrieving revision 1.60 diff -u -r1.59 -r1.60 --- sources 14 Feb 2006 12:56:40 -0000 1.59 +++ sources 29 Mar 2006 15:32:46 -0000 1.60 @@ -1 +1 @@ -845ddb531b137b91a39f40070f6cf305 printconf-0.6.151.tar.bz2 +8ae512582093f64ae23f7bfa797e4655 printconf-0.6.151.1.tar.bz2 From fedora-cvs-commits at redhat.com Wed Mar 29 15:40:59 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 29 Mar 2006 10:40:59 -0500 Subject: rpms/ncpfs/FC-5 ncpfs.spec,1.25,1.26 Message-ID: <200603291540.k2TFexmG029974@cvs.devel.redhat.com> Author: stransky Update of /cvs/dist/rpms/ncpfs/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv29961 Modified Files: ncpfs.spec Log Message: removed opt flags (#186683) Index: ncpfs.spec =================================================================== RCS file: /cvs/dist/rpms/ncpfs/FC-5/ncpfs.spec,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- ncpfs.spec 11 Feb 2006 04:42:58 -0000 1.25 +++ ncpfs.spec 29 Mar 2006 15:40:57 -0000 1.26 @@ -1,7 +1,7 @@ Summary: Utilities for the ncpfs filesystem, a NetWare client for Linux. Name: ncpfs Version: 2.2.6 -Release: 1.2.1 +Release: 2 License: GPL Source: http://ftp.cvut.cz/ncpfs/ncpfs-%{version}.tar.gz Patch: ncpfs-2.2.3-fix.patch @@ -50,7 +50,7 @@ %ifarch s390 s390x perl -pi -e 's/-fpie/-fPIE/' sutil/Makefile.in %endif -export CFLAGS="$RPM_OPT_FLAGS -fPIC" +export CFLAGS="-fPIC" %configure --disable-pam --disable-function-sections --disable-php make make -C ipxdump @@ -116,6 +116,9 @@ %{_mandir}/man8/ipx* %changelog +* Wed Mar 29 2006 Martin Stransky 2.2.6-2 +- removed opt flags (#186683) + * Fri Feb 10 2006 Jesse Keating - 2.2.6-1.2.1 - bump again for double-long bug on ppc(64) From fedora-cvs-commits at redhat.com Wed Mar 29 15:56:33 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 29 Mar 2006 10:56:33 -0500 Subject: rpms/squid/devel squid.spec,1.59,1.60 Message-ID: <200603291556.k2TFuXFt011441@cvs.devel.redhat.com> Author: stransky Update of /cvs/dist/rpms/squid/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv11428 Modified Files: squid.spec Log Message: improved pre script (#187217) - added group switch Index: squid.spec =================================================================== RCS file: /cvs/dist/rpms/squid/devel/squid.spec,v retrieving revision 1.59 retrieving revision 1.60 diff -u -r1.59 -r1.60 --- squid.spec 23 Mar 2006 14:54:58 -0000 1.59 +++ squid.spec 29 Mar 2006 15:56:31 -0000 1.60 @@ -5,7 +5,7 @@ Summary: The Squid proxy caching server. Name: squid Version: 2.5.STABLE13 -Release: 2 +Release: 3 Epoch: 7 License: GPL Group: System Environment/Daemons @@ -201,7 +201,7 @@ %{_libdir}/squid/* %pre -if getent passwd squid >/dev/null 2>&1 ; then : ; else /usr/sbin/useradd -u 23 -d /var/spool/squid -r -s /sbin/nologin squid >/dev/null 2>&1 || exit 1 ; fi +if getent passwd squid >/dev/null 2>&1 ; then : ; else /usr/sbin/useradd -g 23 -u 23 -d /var/spool/squid -r -s /sbin/nologin squid >/dev/null 2>&1 || exit 1 ; fi for i in /var/log/squid /var/spool/squid ; do if [ -d $i ] ; then @@ -321,6 +321,9 @@ chgrp squid /var/cache/samba/winbindd_privileged > /dev/null 2>& 1 || true %changelog +* Wed Mar 29 2006 Martin Stransky - 7:2.5.STABLE13-3 +- improved pre script (#187217) - added group switch + * Thu Mar 23 2006 Martin Stransky - 7:2.5.STABLE13-2 - removed "--with-large-files" on 64bit arches From fedora-cvs-commits at redhat.com Wed Mar 29 16:18:45 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 29 Mar 2006 11:18:45 -0500 Subject: rpms/system-config-printer/FC-5 .cvsignore, 1.58, 1.59 printconf.spec, 1.63, 1.64 sources, 1.60, 1.61 Message-ID: <200603291618.k2TGIjYl025434@cvs.devel.redhat.com> Author: twaugh Update of /cvs/dist/rpms/system-config-printer/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv25419 Modified Files: .cvsignore printconf.spec sources Log Message: * Wed Mar 29 2006 Tim Waugh 0.6.151.2-1 - 0.6.151.2: - Prevent traceback seen in bug #163125. Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/system-config-printer/FC-5/.cvsignore,v retrieving revision 1.58 retrieving revision 1.59 diff -u -r1.58 -r1.59 --- .cvsignore 29 Mar 2006 15:32:31 -0000 1.58 +++ .cvsignore 29 Mar 2006 16:18:43 -0000 1.59 @@ -38,3 +38,4 @@ printconf-0.6.150.tar.bz2 printconf-0.6.151.tar.bz2 printconf-0.6.151.1.tar.bz2 +printconf-0.6.151.2.tar.bz2 Index: printconf.spec =================================================================== RCS file: /cvs/dist/rpms/system-config-printer/FC-5/printconf.spec,v retrieving revision 1.63 retrieving revision 1.64 diff -u -r1.63 -r1.64 --- printconf.spec 29 Mar 2006 15:32:46 -0000 1.63 +++ printconf.spec 29 Mar 2006 16:18:43 -0000 1.64 @@ -1,6 +1,6 @@ Summary: A printer configuration backend/frontend combination. Name: system-config-printer -Version: 0.6.151.1 +Version: 0.6.151.2 Release: 1 License: GPL Group: System Environment/Daemons @@ -174,6 +174,10 @@ %changelog +* Wed Mar 29 2006 Tim Waugh 0.6.151.2-1 +- 0.6.151.2: + - Prevent traceback seen in bug #163125. + * Wed Mar 29 2006 Tim Waugh 0.6.151.1-1 - 0.6.151.1: - Don't make the Action->Sharing... menu entry insensitive (bug #187239). Index: sources =================================================================== RCS file: /cvs/dist/rpms/system-config-printer/FC-5/sources,v retrieving revision 1.60 retrieving revision 1.61 diff -u -r1.60 -r1.61 --- sources 29 Mar 2006 15:32:46 -0000 1.60 +++ sources 29 Mar 2006 16:18:43 -0000 1.61 @@ -1 +1 @@ -8ae512582093f64ae23f7bfa797e4655 printconf-0.6.151.1.tar.bz2 +15ed8ebaa55a4458075e1d933ae84bd3 printconf-0.6.151.2.tar.bz2 From fedora-cvs-commits at redhat.com Wed Mar 29 16:20:24 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 29 Mar 2006 11:20:24 -0500 Subject: rpms/system-config-nfs/FC-4 system-config-nfs.spec,1.31,1.32 Message-ID: <200603291620.k2TGKOWY025526@cvs.devel.redhat.com> Author: nphilipp Update of /cvs/dist/rpms/system-config-nfs/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv25510 Modified Files: system-config-nfs.spec Log Message: use pam_stack Index: system-config-nfs.spec =================================================================== RCS file: /cvs/dist/rpms/system-config-nfs/FC-4/system-config-nfs.spec,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- system-config-nfs.spec 29 Mar 2006 13:41:31 -0000 1.31 +++ system-config-nfs.spec 29 Mar 2006 16:20:22 -0000 1.32 @@ -1,7 +1,7 @@ Summary: NFS server configuration tool Name: system-config-nfs Version: 1.3.19 -Release: 0.fc4.1 +Release: 0.fc4.2 URL: http://fedora.redhat.com/projects/config-tools/ License: GPL ExclusiveOS: Linux @@ -9,6 +9,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildArch: noarch Source0: %{name}-%{version}.tar.bz2 +Patch0: system-config-nfs-1.3.16-pam_stack.patch BuildRequires: desktop-file-utils BuildRequires: gettext BuildRequires: intltool @@ -29,6 +30,7 @@ %prep %setup -q +%patch0 -p1 -b .pam_stack %build make %{?_smp_mflags} From fedora-cvs-commits at redhat.com Wed Mar 29 16:42:15 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 29 Mar 2006 11:42:15 -0500 Subject: rpms/xterm/FC-5 xterm-211-bz186935.patch,NONE,1.1 Message-ID: <200603291642.k2TGgFaR025765@cvs.devel.redhat.com> Author: jvdias Update of /cvs/dist/rpms/xterm/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv25751 Added Files: xterm-211-bz186935.patch Log Message: fix bug 186935: cursor GCs must be released with XtReleaseGC xterm-211-bz186935.patch: charproc.c | 23 +++++++++++++++-------- 1 files changed, 15 insertions(+), 8 deletions(-) --- NEW FILE xterm-211-bz186935.patch --- --- xterm-211/charproc.c.bz186935 2006-03-28 19:44:35.000000000 -0500 +++ xterm-211/charproc.c 2006-03-29 11:32:23.000000000 -0500 @@ -5762,14 +5762,21 @@ static void releaseCursorGCs(TScreen * screen) { - if (screen->cursorGC) - XFreeGC(screen->display, screen->cursorGC); - if (screen->fillCursorGC) - XFreeGC(screen->display, screen->fillCursorGC); - if (screen->reversecursorGC) - XFreeGC(screen->display, screen->reversecursorGC); - if (screen->cursoroutlineGC) - XFreeGC(screen->display, screen->cursoroutlineGC); + if ( screen->cursorGC ) + XtReleaseGC((Widget)term, screen->cursorGC ); + screen->cursorGC = 0; + + if ( screen->fillCursorGC ) + XtReleaseGC((Widget)term, screen->fillCursorGC); + screen->fillCursorGC = 0; + + if ( screen->reversecursorGC ) + XtReleaseGC((Widget)term, screen->reversecursorGC); + screen->reversecursorGC = 0; + + if ( screen->cursoroutlineGC ) + XtReleaseGC((Widget)term, screen->cursoroutlineGC); + screen->cursoroutlineGC = 0; } #ifdef NO_LEAKS From fedora-cvs-commits at redhat.com Wed Mar 29 16:43:34 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 29 Mar 2006 11:43:34 -0500 Subject: rpms/xterm/FC-5 xterm.spec,1.40,1.41 Message-ID: <200603291643.k2TGhYHm025790@cvs.devel.redhat.com> Author: jvdias Update of /cvs/dist/rpms/xterm/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv25777 Modified Files: xterm.spec Log Message: fix bug 186935: cursor GCs must be released with XtReleaseGC Index: xterm.spec =================================================================== RCS file: /cvs/dist/rpms/xterm/FC-5/xterm.spec,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- xterm.spec 21 Mar 2006 22:55:18 -0000 1.40 +++ xterm.spec 29 Mar 2006 16:43:31 -0000 1.41 @@ -1,7 +1,7 @@ Summary: xterm terminal emulator for the X Window System Name: xterm Version: 211 -Release: 1.FC5 +Release: 4.FC5 URL: http://dickey.his.com/xterm License: MIT Group: User Interface/X @@ -22,7 +22,7 @@ Patch9: xterm-209-bz182382.patch Patch10: xterm-209-bz183993.patch Patch11: xterm-211-bz186094.patch - +Patch12: xterm-211-bz186935.patch BuildRequires: libXft-devel BuildRequires: freetype-devel BuildRequires: libXrender-devel @@ -41,7 +41,8 @@ BuildRequires: libtermcap-devel BuildRequires: utempter -%{?!DEBUGINFO: %define DEBUGINFO 1} +%{?!DEBUGINFO: %define DEBUGINFO 1} +%{?!enable_trace: %define enable_trace 0} %if !%{DEBUGINFO} %define debug_package %{nil} %endif @@ -74,10 +75,15 @@ #%patch10 -p1 -b .bz183993 # ^- patch now upstream %patch11 -p1 -b .bz186094 +%patch12 -p1 -b .bz186935 %build RPM_OPT_FLAGS="$RPM_OPT_FLAGS -DPROJECTROOT='\"/usr\"'" +%if %{DEBUGINFO} export CFLAGS="$RPM_OPT_FLAGS" +%else +export CFLAGS=`echo $RPM_OPT_FLAGS | sed 's/-O2 -g/-g3 -gdwarf-2/g'`; +%endif %configure --enable-luit \ --enable-warnings \ --enable-wide-chars \ @@ -90,6 +96,9 @@ %if %{_with_256_color} --enable-256-color \ %endif +%if %{enable_trace} + --enable-trace \ +%endif ; export XTERM_TTY_GROUP_NAME=tty; make @@ -123,6 +132,9 @@ %doc xterm.log.html ctlseqs.ms ctlseqs.txt UnicodeData.txt 16colors.txt README.i18n %changelog +* Wed Mar 29 2006 Jason Vas Dias - 211-4 +- fix bug 186935: cursor GCs must be freed with XtReleaseGC + * Tue Mar 21 2006 Jason Vas Dias - 211-1 - Upgrade to upstream version 211 (fixes bug 186094). - Enable new 'utf8Title' resource by default From fedora-cvs-commits at redhat.com Wed Mar 29 17:02:16 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 29 Mar 2006 12:02:16 -0500 Subject: rpms/kernel/devel patch-2.6.16-git16.bz2.sign, NONE, 1.1 .cvsignore, 1.396, 1.397 kernel-2.6.spec, 1.2102, 1.2103 sources, 1.337, 1.338 upstream, 1.310, 1.311 linux-2.6-autofs-pathlookup.patch, 1.1, NONE patch-2.6.16-git15.bz2.sign, 1.1, NONE Message-ID: <200603291702.k2TH2GeX007311@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv7228 Modified Files: .cvsignore kernel-2.6.spec sources upstream Added Files: patch-2.6.16-git16.bz2.sign Removed Files: linux-2.6-autofs-pathlookup.patch patch-2.6.16-git15.bz2.sign Log Message: git16 --- NEW FILE patch-2.6.16-git16.bz2.sign --- -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.2.2 (GNU/Linux) Comment: See http://www.kernel.org/signature.html for info iD8DBQBEKjFxyGugalF9Dw4RAuAJAKCMbr+fHpNdPnlz6AsbFSF+DVvmPgCaA6MK jeD9t6XXyk3BwsG9Kaa32bQ= =CwyR -----END PGP SIGNATURE----- Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v retrieving revision 1.396 retrieving revision 1.397 diff -u -r1.396 -r1.397 --- .cvsignore 28 Mar 2006 20:34:47 -0000 1.396 +++ .cvsignore 29 Mar 2006 17:01:22 -0000 1.397 @@ -3,5 +3,4 @@ kernel-2.6.16 linux-2.6.16.tar.bz2 xen-20060320.tar.bz2 -patch-2.6.16-git14.bz2 -patch-2.6.16-git15.bz2 +patch-2.6.16-git16.bz2 Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.2102 retrieving revision 1.2103 diff -u -r1.2102 -r1.2103 --- kernel-2.6.spec 28 Mar 2006 23:02:04 -0000 1.2102 +++ kernel-2.6.spec 29 Mar 2006 17:01:36 -0000 1.2103 @@ -217,7 +217,7 @@ # # Patches 0 through 100 are meant for core subsystem upgrades # -Patch1: patch-2.6.16-git15.bz2 +Patch1: patch-2.6.16-git16.bz2 # Patches 100 through 500 are meant for architecture patches Patch100: linux-2.6-bzimage.patch @@ -352,7 +352,6 @@ Patch1620: linux-2.6-serial-tickle-nmi.patch Patch1630: linux-2.6-radeon-backlight.patch Patch1640: linux-2.6-ide-tune-locking.patch -Patch1650: linux-2.6-autofs-pathlookup.patch Patch1660: linux-2.6-valid-ether-addr.patch Patch1670: linux-2.6-softcursor-persistent-alloc.patch Patch1690: linux-2.6-smsc-ircc2-pnp.patch @@ -949,9 +948,7 @@ %patch1630 -p1 # Fix IDE locking bug. %patch1640 -p1 -# autofs4 looks up wrong path element when ghosting is enabled -#%patch1650 -p1 -# +# %patch1660 -p1 # Use persistent allocation in softcursor %patch1670 -p1 @@ -1294,12 +1291,12 @@ BuildKernel %make_target %kernel_image smp %endif +%if %{includexen} %if %{buildxenPAE} BuildKernel vmlinuz vmlinuz xen0-PAE BuildKernel vmlinuz vmlinuz xenU-PAE %endif -%if %{includexen} %if %{buildxen} BuildKernel vmlinuz vmlinuz xen0 BuildKernel vmlinuz vmlinuz xenU @@ -1636,6 +1633,9 @@ %endif %changelog +* Wed Mar 29 2006 Dave Jones +- 2.6.16-git16 + * Tue Mar 28 2006 Dave Jones - 2.6.16-git14 & git15 - reenable sky2. Index: sources =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/sources,v retrieving revision 1.337 retrieving revision 1.338 diff -u -r1.337 -r1.338 --- sources 28 Mar 2006 20:34:52 -0000 1.337 +++ sources 29 Mar 2006 17:01:40 -0000 1.338 @@ -1,4 +1,3 @@ 9a91b2719949ff0856b40bc467fd47be linux-2.6.16.tar.bz2 8c70806f9075ebc0087f7ce1b8911700 xen-20060320.tar.bz2 -35a2659715e73ff493c815ed3a900d07 patch-2.6.16-git14.bz2 -890ad77f2d6d31d29be508a4c848d21b patch-2.6.16-git15.bz2 +02f0b28fee696c1a55c8ad5616eb4910 patch-2.6.16-git16.bz2 Index: upstream =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/upstream,v retrieving revision 1.310 retrieving revision 1.311 diff -u -r1.310 -r1.311 --- upstream 28 Mar 2006 20:34:52 -0000 1.310 +++ upstream 29 Mar 2006 17:01:40 -0000 1.311 @@ -1,2 +1,2 @@ linux-2.6.16.tar.bz2 -patch-2.6.16-git15.bz2 +patch-2.6.16-git16.bz2 --- linux-2.6-autofs-pathlookup.patch DELETED --- --- patch-2.6.16-git15.bz2.sign DELETED --- From fedora-cvs-commits at redhat.com Wed Mar 29 17:04:21 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 29 Mar 2006 12:04:21 -0500 Subject: rpms/kernel/FC-5 kernel-2.6.spec,1.2081,1.2082 Message-ID: <200603291704.k2TH4Lku007427@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv7339 Modified Files: kernel-2.6.spec Log Message: * Wed Mar 27 2006 Dave Jones - Enable SMP alternatives for x86/x86-64 - Temporarily disable Xen. Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-5/kernel-2.6.spec,v retrieving revision 1.2081 retrieving revision 1.2082 diff -u -r1.2081 -r1.2082 --- kernel-2.6.spec 29 Mar 2006 05:52:39 -0000 1.2081 +++ kernel-2.6.spec 29 Mar 2006 17:03:34 -0000 1.2082 @@ -6,7 +6,7 @@ %define buildup 1 %define buildsmp 1 # Whether to apply the Xen patches, leave this enabled. -%define includexen 1 +%define includexen 0 # Whether to build the Xen kernels, disable if you want. %define buildxen 1 %define buildxenPAE 0 @@ -766,7 +766,7 @@ # Fix broken x86-64 32bit vDSO %patch208 -p1 # SMP alternatives -#%patch209 -p1 +%patch209 -p1 # # ppc64 @@ -1247,7 +1247,7 @@ ln -sf ../../../include/asm-ppc* asm popd fi -%if %{buildxen} +%if %{includexen} cp -a xen $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/include %endif @@ -1318,6 +1318,7 @@ rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT/boot +%if %{includexen} %if %{buildxen} cd xen mkdir -p $RPM_BUILD_ROOT/%{image_install_path} @@ -1332,6 +1333,7 @@ install -m 755 xen-syms $RPM_BUILD_ROOT/boot/xen-syms-%{KVERREL} cd .. %endif +%endif cd linux-%{kversion}.%{_target_cpu} @@ -1343,6 +1345,7 @@ BuildKernel %make_target %kernel_image smp %endif +%if %{includexen} %if %{buildxenPAE} BuildKernel vmlinuz vmlinuz xen0-PAE BuildKernel vmlinuz vmlinuz xenU-PAE @@ -1352,6 +1355,7 @@ BuildKernel vmlinuz vmlinuz xen0 BuildKernel vmlinuz vmlinuz xenU %endif +%endif %if %{buildkdump} BuildKernel %make_target %kernel_image kdump @@ -1365,6 +1369,7 @@ cd linux-%{kversion}.%{_target_cpu} +%if %{includexen} %if %{buildxen} mkdir -p $RPM_BUILD_ROOT/etc/ld.so.conf.d rm -f $RPM_BUILD_ROOT/etc/ld.so.conf.d/kernelcap-%{KVERREL}.conf @@ -1378,6 +1383,7 @@ EOF chmod 444 $RPM_BUILD_ROOT/etc/ld.so.conf.d/kernelcap-%{KVERREL}.conf %endif +%endif %if %{builddoc} mkdir -p $RPM_BUILD_ROOT/usr/share/doc/kernel-doc-%{kversion}/Documentation @@ -1568,6 +1574,7 @@ /usr/src/kernels/%{KVERREL}smp-%{_target_cpu} %endif +%if %{includexen} %if %{buildxen} %files xen0 %defattr(-,root,root) @@ -1647,6 +1654,7 @@ %verify(not mtime) /usr/src/kernels/%{KVERREL}-xenU-PAE-%{_target_cpu} /usr/src/kernels/%{KVERREL}xenU-PAE-%{_target_cpu} %endif +%endif %if %{buildkdump} @@ -1679,6 +1687,10 @@ %endif %changelog +* Wed Mar 27 2006 Dave Jones +- Enable SMP alternatives for x86/x86-64 +- Temporarily disable Xen. + * Tue Mar 26 2006 Dave Jones [2.6.16-1.2080_FC5] - 2.6.16.1 From fedora-cvs-commits at redhat.com Wed Mar 29 17:23:55 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 29 Mar 2006 12:23:55 -0500 Subject: rpms/xterm/devel xterm-211-bz186935.patch, 1.1, 1.2 xterm.spec, 1.40, 1.41 Message-ID: <200603291723.k2THNtBN021415@cvs.devel.redhat.com> Author: jvdias Update of /cvs/dist/rpms/xterm/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv21400 Modified Files: xterm-211-bz186935.patch xterm.spec Log Message: fix bug 186935: cursor GCs must be freed with XtReleaseGC xterm-211-bz186935.patch: charproc.c | 23 +++++++++++++++-------- 1 files changed, 15 insertions(+), 8 deletions(-) Index: xterm-211-bz186935.patch =================================================================== RCS file: /cvs/dist/rpms/xterm/devel/xterm-211-bz186935.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- xterm-211-bz186935.patch 28 Mar 2006 00:35:00 -0000 1.1 +++ xterm-211-bz186935.patch 29 Mar 2006 17:23:52 -0000 1.2 @@ -1,6 +1,6 @@ ---- xterm-211/charproc.c.bz186935 2006-03-27 14:59:36.000000000 -0500 -+++ xterm-211/charproc.c 2006-03-27 15:00:55.000000000 -0500 -@@ -5762,14 +5762,31 @@ +--- xterm-211/charproc.c.bz186935 2006-03-28 19:44:35.000000000 -0500 ++++ xterm-211/charproc.c 2006-03-29 11:32:23.000000000 -0500 +@@ -5762,14 +5762,21 @@ static void releaseCursorGCs(TScreen * screen) { @@ -9,31 +9,23 @@ - if (screen->fillCursorGC) - XFreeGC(screen->display, screen->fillCursorGC); - if (screen->reversecursorGC) -+ GC cursorGC=screen->cursorGC, fillCursorGC=screen->fillCursorGC, -+ reverseCursorGC=screen->reversecursorGC, cursorOutlineGC=screen->cursoroutlineGC; -+ -+ if ( cursorGC ) -+ XFreeGC(screen->display, cursorGC); +- XFreeGC(screen->display, screen->reversecursorGC); +- if (screen->cursoroutlineGC) +- XFreeGC(screen->display, screen->cursoroutlineGC); ++ if ( screen->cursorGC ) ++ XtReleaseGC((Widget)term, screen->cursorGC ); + screen->cursorGC = 0; + -+ if ( fillCursorGC && (fillCursorGC != cursorGC)) -+ XFreeGC(screen->display, fillCursorGC); ++ if ( screen->fillCursorGC ) ++ XtReleaseGC((Widget)term, screen->fillCursorGC); + screen->fillCursorGC = 0; + -+ if ( reverseCursorGC -+ &&( reverseCursorGC != cursorGC ) -+ &&( reverseCursorGC != fillCursorGC ) -+ ) - XFreeGC(screen->display, screen->reversecursorGC); -- if (screen->cursoroutlineGC) ++ if ( screen->reversecursorGC ) ++ XtReleaseGC((Widget)term, screen->reversecursorGC); + screen->reversecursorGC = 0; + -+ if ( cursorOutlineGC -+ && ( cursorOutlineGC != cursorGC ) -+ && ( cursorOutlineGC != fillCursorGC ) -+ && ( cursorOutlineGC != reverseCursorGC ) -+ ) - XFreeGC(screen->display, screen->cursoroutlineGC); ++ if ( screen->cursoroutlineGC ) ++ XtReleaseGC((Widget)term, screen->cursoroutlineGC); + screen->cursoroutlineGC = 0; } Index: xterm.spec =================================================================== RCS file: /cvs/dist/rpms/xterm/devel/xterm.spec,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- xterm.spec 21 Mar 2006 22:49:56 -0000 1.40 +++ xterm.spec 29 Mar 2006 17:23:52 -0000 1.41 @@ -1,7 +1,7 @@ Summary: xterm terminal emulator for the X Window System Name: xterm Version: 211 -Release: 1.FC6 +Release: 4.FC6 URL: http://dickey.his.com/xterm License: MIT Group: User Interface/X @@ -22,7 +22,7 @@ Patch9: xterm-209-bz182382.patch Patch10: xterm-209-bz183993.patch Patch11: xterm-211-bz186094.patch - +Patch12: xterm-211-bz186935.patch BuildRequires: libXft-devel BuildRequires: freetype-devel BuildRequires: libXrender-devel @@ -41,7 +41,8 @@ BuildRequires: libtermcap-devel BuildRequires: utempter -%{?!DEBUGINFO: %define DEBUGINFO 1} +%{?!DEBUGINFO: %define DEBUGINFO 1} +%{?!enable_trace: %define enable_trace 0} %if !%{DEBUGINFO} %define debug_package %{nil} %endif @@ -74,10 +75,15 @@ #%patch10 -p1 -b .bz183993 # ^- patch now upstream %patch11 -p1 -b .bz186094 +%patch12 -p1 -b .bz186935 %build RPM_OPT_FLAGS="$RPM_OPT_FLAGS -DPROJECTROOT='\"/usr\"'" +%if %{DEBUGINFO} export CFLAGS="$RPM_OPT_FLAGS" +%else +export CFLAGS=`echo $RPM_OPT_FLAGS | sed 's/-O2 -g/-g3 -gdwarf-2/g'`; +%endif %configure --enable-luit \ --enable-warnings \ --enable-wide-chars \ @@ -90,6 +96,9 @@ %if %{_with_256_color} --enable-256-color \ %endif +%if %{enable_trace} + --enable-trace \ +%endif ; export XTERM_TTY_GROUP_NAME=tty; make @@ -123,6 +132,9 @@ %doc xterm.log.html ctlseqs.ms ctlseqs.txt UnicodeData.txt 16colors.txt README.i18n %changelog +* Wed Mar 29 2006 Jason Vas Dias - 211-4 +- fix bug 186935: cursor GCs must be freed with XtReleaseGC + * Tue Mar 21 2006 Jason Vas Dias - 211-1 - Upgrade to upstream version 211 (fixes bug 186094). - Enable new 'utf8Title' resource by default From fedora-cvs-commits at redhat.com Wed Mar 29 17:52:20 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 29 Mar 2006 12:52:20 -0500 Subject: rpms/kernel/FC-5 linux-2.6-x86-smp-alternatives.patch,1.1,1.2 Message-ID: <200603291752.k2THqKra002983@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv2965 Modified Files: linux-2.6-x86-smp-alternatives.patch Log Message: missing hunk linux-2.6-x86-smp-alternatives.patch: b/arch/i386/kernel/Makefile | 2 b/arch/i386/kernel/alternative.c | 321 ++++++++++++++++++++++++++++++++ b/arch/i386/kernel/cpu/proc.c | 2 b/arch/i386/kernel/module.c | 32 ++- b/arch/i386/kernel/semaphore.c | 8 b/arch/i386/kernel/setup.c | 95 --------- b/arch/i386/kernel/smpboot.c | 3 b/arch/i386/kernel/vmlinux.lds.S | 20 + b/arch/um/kernel/um_arch.c | 12 + b/include/asm-i386/alternative.h | 129 ++++++++++++ b/include/asm-i386/atomic.h | 28 +- b/include/asm-i386/bitops.h | 7 b/include/asm-i386/cpufeature.h | 1 b/include/asm-i386/mutex.h | 6 b/include/asm-i386/rwlock.h | 56 ++--- b/include/asm-i386/semaphore.h | 8 b/include/asm-i386/spinlock.h | 21 +- b/include/asm-i386/system.h | 62 ------ b/include/asm-um/alternative.h | 6 linux-2.6.16.noarch/arch/i386/mm/init.c | 44 ++-- 20 files changed, 604 insertions(+), 259 deletions(-) Index: linux-2.6-x86-smp-alternatives.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-5/linux-2.6-x86-smp-alternatives.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- linux-2.6-x86-smp-alternatives.patch 29 Mar 2006 05:52:39 -0000 1.1 +++ linux-2.6-x86-smp-alternatives.patch 29 Mar 2006 17:52:17 -0000 1.2 @@ -668,6 +668,69 @@ /* will be freed after init */ . = ALIGN(4096); /* Init code and data */ __init_begin = .; +--- linux-2.6.16.noarch/arch/i386/mm/init.c~ 2006-03-29 12:43:14.000000000 -0500 ++++ linux-2.6.16.noarch/arch/i386/mm/init.c 2006-03-29 12:44:38.000000000 -0500 +@@ -720,21 +720,6 @@ static int noinline do_test_wp_bit(void) + return flag; + } + +-void free_initmem(void) +-{ +- unsigned long addr; +- +- addr = (unsigned long)(&__init_begin); +- for (; addr < (unsigned long)(&__init_end); addr += PAGE_SIZE) { +- ClearPageReserved(virt_to_page(addr)); +- set_page_count(virt_to_page(addr), 1); +- memset((void *)addr, 0xcc, PAGE_SIZE); +- free_page(addr); +- totalram_pages++; +- } +- printk (KERN_INFO "Freeing unused kernel memory: %dk freed\n", (__init_end - __init_begin) >> 10); +-} +- + #ifdef CONFIG_DEBUG_RODATA + + extern char __start_rodata, __end_rodata; +@@ -758,17 +743,30 @@ void mark_rodata_ro(void) + } + #endif + ++void free_init_pages(char *what, unsigned long begin, unsigned long end) ++{ ++ unsigned long addr; ++ ++ for (addr = begin; addr < end; addr += PAGE_SIZE) { ++ ClearPageReserved(virt_to_page(addr)); ++ init_page_count(virt_to_page(addr)); ++ memset((void *)addr, 0xcc, PAGE_SIZE); ++ free_page(addr); ++ totalram_pages++; ++ } ++ printk(KERN_INFO "Freeing %s: %ldk freed\n", what, (end - begin) >> 10); ++} ++ ++void free_initmem(void) ++{ ++ free_init_pages("unused kernel memory", ++ (unsigned long)(&__init_begin), ++ (unsigned long)(&__init_end)); ++} + + #ifdef CONFIG_BLK_DEV_INITRD + void free_initrd_mem(unsigned long start, unsigned long end) + { +- if (start < end) +- printk (KERN_INFO "Freeing initrd memory: %ldk freed\n", (end - start) >> 10); +- for (; start < end; start += PAGE_SIZE) { +- ClearPageReserved(virt_to_page(start)); +- set_page_count(virt_to_page(start), 1); +- free_page(start); +- totalram_pages++; +- } ++ free_init_pages("initrd memory", start, end); + } + #endif diff --git a/arch/um/kernel/um_arch.c b/arch/um/kernel/um_arch.c index 27cdf91..80c9c18 100644 --- a/arch/um/kernel/um_arch.c From fedora-cvs-commits at redhat.com Wed Mar 29 18:27:50 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 29 Mar 2006 13:27:50 -0500 Subject: rpms/kernel/FC-5 linux-2.6-x86-smp-alternatives.patch,1.2,1.3 Message-ID: <200603291827.k2TIRo3M017012@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv16991 Modified Files: linux-2.6-x86-smp-alternatives.patch Log Message: build fix linux-2.6-x86-smp-alternatives.patch: b/arch/i386/kernel/Makefile | 2 b/arch/i386/kernel/alternative.c | 321 ++++++++++++++++++++++++++++++++ b/arch/i386/kernel/cpu/proc.c | 2 b/arch/i386/kernel/module.c | 32 ++- b/arch/i386/kernel/semaphore.c | 8 b/arch/i386/kernel/setup.c | 95 --------- b/arch/i386/kernel/smpboot.c | 3 b/arch/i386/kernel/vmlinux.lds.S | 20 + b/arch/um/kernel/um_arch.c | 12 + b/include/asm-i386/alternative.h | 129 ++++++++++++ b/include/asm-i386/atomic.h | 28 +- b/include/asm-i386/bitops.h | 7 b/include/asm-i386/cpufeature.h | 1 b/include/asm-i386/mutex.h | 6 b/include/asm-i386/rwlock.h | 56 ++--- b/include/asm-i386/semaphore.h | 8 b/include/asm-i386/spinlock.h | 21 +- b/include/asm-i386/system.h | 62 ------ b/include/asm-um/alternative.h | 6 linux-2.6.16.noarch/arch/i386/mm/init.c | 44 ++-- 20 files changed, 604 insertions(+), 259 deletions(-) Index: linux-2.6-x86-smp-alternatives.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-5/linux-2.6-x86-smp-alternatives.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- linux-2.6-x86-smp-alternatives.patch 29 Mar 2006 17:52:17 -0000 1.2 +++ linux-2.6-x86-smp-alternatives.patch 29 Mar 2006 18:27:47 -0000 1.3 @@ -702,7 +702,7 @@ + + for (addr = begin; addr < end; addr += PAGE_SIZE) { + ClearPageReserved(virt_to_page(addr)); -+ init_page_count(virt_to_page(addr)); ++ set_page_count(virt_to_page(addr),1); + memset((void *)addr, 0xcc, PAGE_SIZE); + free_page(addr); + totalram_pages++; From fedora-cvs-commits at redhat.com Wed Mar 29 18:28:31 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 29 Mar 2006 13:28:31 -0500 Subject: rpms/kernel/FC-5/configs config-i586-smp, 1.2, 1.3 config-i586, 1.8, 1.9 Message-ID: <200603291828.k2TISVH4017057@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/FC-5/configs In directory cvs.devel.redhat.com:/tmp/cvs-serv17027/configs Modified Files: config-i586 Added Files: config-i586-smp Log Message: re-add config-i586-smp Index: config-i586-smp =================================================================== RCS file: config-i586-smp diff -N config-i586-smp --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ config-i586-smp 29 Mar 2006 18:28:29 -0000 1.3 @@ -0,0 +1,55 @@ +CONFIG_M586=y +# CONFIG_NOHIGHMEM is not set +CONFIG_HIGHMEM4G=y +# CONFIG_HIGHMEM64G is not set +CONFIG_NR_CPUS=2 +CONFIG_X86_PC=y +# CONFIG_MICROCODE is not set +# CONFIG_PROFILING is not set +# CONFIG_X86_MCE_P4THERMAL is not set +# CONFIG_TOSHIBA is not set +# CONFIG_I8K is not set +# CONFIG_DELL_RBU is not set +# CONFIG_DCDBAS is not set +# CONFIG_ACPI_ASUS is not set +# CONFIG_ACPI_IBM is not set +# CONFIG_ACPI_TOSHIBA is not set +# CONFIG_X86_POWERNOW_K7 is not set +# CONFIG_X86_POWERNOW_K8 is not set +# CONFIG_X86_SPEEDSTEP_CENTRINO is not set +# CONFIG_X86_SPEEDSTEP_ICH is not set +# CONFIG_X86_SPEEDSTEP_SMI is not set +# CONFIG_X86_P4_CLOCKMOD is not set +# CONFIG_HOTPLUG_PCI_PCIE is not set +# CONFIG_PCI_MSI is not set +# CONFIG_HOTPLUG_PCI is not set +# CONFIG_NET_PKTGEN is not set +# CONFIG_MTD is not set +# CONFIG_CDROM_PKTCDVD is not set +# CONFIG_DISKDUMP is not set +# CONFIG_ATA_OVER_ETH is not set +# CONFIG_ATM is not set +# CONFIG_INPUT_JOYSTICK is not set +# CONFIG_GAMEPORT is not set +# CONFIG_ROCKETPORT is not set +# CONFIG_SYNCLINK is not set +# CONFIG_SYNCLINKMP is not set +# CONFIG_N_HDLC is not set +# CONFIG_STALDRV is not set +# CONFIG_IPMI_HANDLER is not set +# CONFIG_DTLK is not set +# CONFIG_R3964 is not set +# CONFIG_SONYPI is not set +# CONFIG_HPET is not set +# CONFIG_W1 is not set +# CONFIG_SENSORS_HDAPS is not set +# CONFIG_IBM_ASM is not set +# CONFIG_DVB is not set +# CONFIG_MMC is not set +# CONFIG_INFINIBAND is not set +# CONFIG_AGP_ATI is not set +# CONFIG_AGP_AMD is not set +# CONFIG_AGP_AMD64 is not set +# CONFIG_AGP_NVIDIA is not set +# CONFIG_AGP_SWORKS is not set + Index: config-i586 =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-5/configs/config-i586,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- config-i586 8 Mar 2006 23:55:07 -0000 1.8 +++ config-i586 29 Mar 2006 18:28:29 -0000 1.9 @@ -35,7 +35,6 @@ # CONFIG_N_HDLC is not set # CONFIG_STALDRV is not set # CONFIG_IPMI_HANDLER is not set -# CONFIG_WATCHDOG is not set # CONFIG_DTLK is not set # CONFIG_R3964 is not set # CONFIG_SONYPI is not set @@ -46,11 +45,9 @@ # CONFIG_DVB is not set # CONFIG_MMC is not set # CONFIG_INFINIBAND is not set -# CONFIG_KPROBES is not set # CONFIG_AGP_ATI is not set # CONFIG_AGP_AMD is not set # CONFIG_AGP_AMD64 is not set # CONFIG_AGP_NVIDIA is not set # CONFIG_AGP_SWORKS is not set -# CONFIG_AGP_VIA is not set From fedora-cvs-commits at redhat.com Wed Mar 29 18:28:31 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 29 Mar 2006 13:28:31 -0500 Subject: rpms/kernel/FC-5 Makefile.config, 1.36, 1.37 kernel-2.6.spec, 1.2082, 1.2083 Message-ID: <200603291828.k2TISVhV017043@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv17027 Modified Files: Makefile.config kernel-2.6.spec Log Message: re-add config-i586-smp Index: Makefile.config =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-5/Makefile.config,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- Makefile.config 7 Mar 2006 19:38:26 -0000 1.36 +++ Makefile.config 29 Mar 2006 18:28:28 -0000 1.37 @@ -6,7 +6,7 @@ CONFIGFILES = \ $(CFG)-i686.config $(CFG)-i686-smp.config $(CFG)-i686-kdump.config \ - $(CFG)-i586.config \ + $(CFG)-i586.config $(CFG)-i586-smp.config \ $(CFG)-x86_64.config $(CFG)-x86_64-kdump.config \ $(CFG)-ppc64iseries.config \ $(CFG)-s390.config $(CFG)-s390x.config \ @@ -81,6 +81,9 @@ kernel-$(VERSION)-i586.config: configs/config-i586 temp-x86-generic perl scripts/merge.pl $^ i386 > $@ +kernel-$(VERSION)-i586-smp.config: configs/config-i586-smp temp-x86-generic + perl scripts/merge.pl $^ i386 > $@ + kernel-$(VERSION)-x86_64.config: configs/config-x86_64 temp-x86_64-generic perl scripts/merge.pl $^ x86_64 > $@ Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-5/kernel-2.6.spec,v retrieving revision 1.2082 retrieving revision 1.2083 diff -u -r1.2082 -r1.2083 --- kernel-2.6.spec 29 Mar 2006 17:03:34 -0000 1.2082 +++ kernel-2.6.spec 29 Mar 2006 18:28:29 -0000 1.2083 @@ -57,10 +57,6 @@ # Second, per-architecture exclusions (ifarch) -%ifarch i586 -%define buildsmp 0 -%endif - %ifarch %{all_x86} %define all_arch_configs $RPM_SOURCE_DIR/kernel-%{kversion}-i?86*.config %define image_install_path boot @@ -192,27 +188,28 @@ Source11: genkey Source20: kernel-%{kversion}-i586.config -Source21: kernel-%{kversion}-i686.config -Source22: kernel-%{kversion}-i686-smp.config -Source23: kernel-%{kversion}-x86_64.config -Source24: kernel-%{kversion}-ppc64.config -Source25: kernel-%{kversion}-ppc64iseries.config -Source26: kernel-%{kversion}-s390.config -Source27: kernel-%{kversion}-s390x.config -Source28: kernel-%{kversion}-ppc.config -Source29: kernel-%{kversion}-ppc-smp.config -Source30: kernel-%{kversion}-ia64.config -Source31: kernel-%{kversion}-i686-xen0.config -Source32: kernel-%{kversion}-i686-xenU.config -Source33: kernel-%{kversion}-i686-kdump.config -Source33: kernel-%{kversion}-x86_64-kdump.config -#Source34: kernel-%{kversion}-sparc.config -#Source35: kernel-%{kversion}-sparc64.config -#Source36: kernel-%{kversion}-sparc64-smp.config -Source37: kernel-%{kversion}-i686-xen0-PAE.config -Source38: kernel-%{kversion}-i686-xenU-PAE.config -Source39: kernel-%{kversion}-x86_64-xen0.config -Source40: kernel-%{kversion}-x86_64-xenU.config +Source21: kernel-%{kversion}-i586-smp.config +Source22: kernel-%{kversion}-i686.config +Source23: kernel-%{kversion}-i686-smp.config +Source24: kernel-%{kversion}-x86_64.config +Source25: kernel-%{kversion}-ppc64.config +Source26: kernel-%{kversion}-ppc64iseries.config +Source27: kernel-%{kversion}-s390.config +Source28: kernel-%{kversion}-s390x.config +Source29: kernel-%{kversion}-ppc.config +Source30: kernel-%{kversion}-ppc-smp.config +Source31: kernel-%{kversion}-ia64.config +Source32: kernel-%{kversion}-i686-xen0.config +Source33: kernel-%{kversion}-i686-xenU.config +Source34: kernel-%{kversion}-i686-kdump.config +Source35: kernel-%{kversion}-x86_64-kdump.config +#Source36: kernel-%{kversion}-sparc.config +#Source37: kernel-%{kversion}-sparc64.config +#Source38: kernel-%{kversion}-sparc64-smp.config +Source39: kernel-%{kversion}-i686-xen0-PAE.config +Source40: kernel-%{kversion}-i686-xenU-PAE.config +Source41: kernel-%{kversion}-x86_64-xen0.config +Source42: kernel-%{kversion}-x86_64-xenU.config # # Patches 0 through 100 are meant for core subsystem upgrades @@ -1690,6 +1687,7 @@ * Wed Mar 27 2006 Dave Jones - Enable SMP alternatives for x86/x86-64 - Temporarily disable Xen. +- Re-add kernel-smp-586 * Tue Mar 26 2006 Dave Jones [2.6.16-1.2080_FC5] - 2.6.16.1 From fedora-cvs-commits at redhat.com Wed Mar 29 18:30:46 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 29 Mar 2006 13:30:46 -0500 Subject: rpms/kernel/FC-5 kernel-2.6.spec, 1.2080.2.4, 1.2080.2.5 3068-knfsd-Unexport-cache_fresh-and-fix-a-small-race.txt, 1.1.2.1, NONE Message-ID: <200603291830.k2TIUkH4017218@cvs.devel.redhat.com> Author: linville Update of /cvs/dist/rpms/kernel/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv17188 Modified Files: Tag: private-linville-netdev-fc5-1-branch kernel-2.6.spec Removed Files: Tag: private-linville-netdev-fc5-1-branch 3068-knfsd-Unexport-cache_fresh-and-fix-a-small-race.txt Log Message: Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-5/kernel-2.6.spec,v retrieving revision 1.2080.2.4 retrieving revision 1.2080.2.5 diff -u -r1.2080.2.4 -r1.2080.2.5 --- kernel-2.6.spec 29 Mar 2006 13:50:16 -0000 1.2080.2.4 +++ kernel-2.6.spec 29 Mar 2006 18:30:25 -0000 1.2080.2.5 @@ -978,34 +978,32 @@ Patch30550: 3063-knfsd-Use-new-sunrpc-cache-for-rsi-cache.txt Patch30551: 3064-knfsd-Use-new-cache-code-for-rsc-cache.txt Patch30552: 3066-knfsd-An-assortment-of-little-fixes-to-the-sunrpc-cache-code.txt -Patch30553: 3068-knfsd-Unexport-cache_fresh-and-fix-a-small-race.txt -Patch30554: 3071-knfsd-Tidy-up-unix_domain_find.txt -Patch30555: 3143-pnp-IRDA-adjust-pnp_register_driver-signature.txt -Patch30556: 3219-Minor-janitorial-change-to-ieee80211.txt -Patch30557: 3220-wireless-add-prism54usb-driver.txt -Patch30558: 3221-prism54usb-fix-build-break-in-islusb_init.c.txt -Patch30559: 3222-wireless-add-acx-driver.txt -Patch30560: 3223-acxsm-merge-from-acx-0.3.32.txt -Patch30561: 3224-tiacx-Let-only-ACX_PCI-ACX_USB-be-user-visible.txt -Patch30562: 3225-softmac-prism54usb-update.txt -Patch30563: 3226-tiacx-revert-neither-PCI-nor-USB-is-selected-change.txt -Patch30564: 3227-tiacx-implement-much-more-flexible-firmware-statistics-parsing.txt -Patch30565: 3228-tiacx-Change-acx_ioctl_-get-set-_encode-to-use-kernel-80211-stack.txt -Patch30566: 3229-tiacx-fix-breakage-of-Get-rid-of-circular-list-of-adev-s.txt -Patch30567: 3230-tiacx-split-module-into-acx-common-acx-pci-acx-usb.txt -Patch30568: 3231-softmac-reduce-scan-dwell-time.txt -Patch30569: 3232-softmac-reduce-default-rate-to-11Mbps.txt -Patch30570: 3233-update-prism54usb-sources.txt -Patch30571: 3234-TG3-Fix-probe-failure-due-to-invalid-MAC-address.txt -Patch30572: 3235-TG3-Fix-bug-in-40-bit-DMA-workaround-code.txt -Patch30573: 3236-TG3-Fix-PHY-loopback-on-5700.txt -Patch30574: 3237-TG3-Speed-up-SRAM-access.txt -Patch30575: 3238-TG3-Skip-timer-code-during-full-lock.txt -Patch30576: 3239-TG3-Update-version-and-reldate.txt -Patch30577: 3241-NET-Fix-ipx-econet-appletalk-irda-ioctl-crashes.txt -Patch30578: 3242-ECONET-Convert-away-from-SOCKOPS_WRAPPED.txt -Patch30579: 3243-NET-deinline-200-byte-inlines-in-sock.h.txt -Patch30580: XXXX-tiacx-ia64-enable.txt +Patch30553: 3071-knfsd-Tidy-up-unix_domain_find.txt +Patch30554: 3143-pnp-IRDA-adjust-pnp_register_driver-signature.txt +Patch30555: 3219-Minor-janitorial-change-to-ieee80211.txt +Patch30556: 3220-wireless-add-prism54usb-driver.txt +Patch30557: 3221-prism54usb-fix-build-break-in-islusb_init.c.txt +Patch30558: 3222-wireless-add-acx-driver.txt +Patch30559: 3223-acxsm-merge-from-acx-0.3.32.txt +Patch30560: 3224-tiacx-Let-only-ACX_PCI-ACX_USB-be-user-visible.txt +Patch30561: 3225-softmac-prism54usb-update.txt +Patch30562: 3226-tiacx-revert-neither-PCI-nor-USB-is-selected-change.txt +Patch30563: 3227-tiacx-implement-much-more-flexible-firmware-statistics-parsing.txt +Patch30564: 3228-tiacx-Change-acx_ioctl_-get-set-_encode-to-use-kernel-80211-stack.txt +Patch30565: 3229-tiacx-fix-breakage-of-Get-rid-of-circular-list-of-adev-s.txt +Patch30566: 3230-tiacx-split-module-into-acx-common-acx-pci-acx-usb.txt +Patch30567: 3231-softmac-reduce-scan-dwell-time.txt +Patch30568: 3232-softmac-reduce-default-rate-to-11Mbps.txt +Patch30569: 3233-update-prism54usb-sources.txt +Patch30570: 3234-TG3-Fix-probe-failure-due-to-invalid-MAC-address.txt +Patch30571: 3235-TG3-Fix-bug-in-40-bit-DMA-workaround-code.txt +Patch30572: 3236-TG3-Fix-PHY-loopback-on-5700.txt +Patch30573: 3237-TG3-Speed-up-SRAM-access.txt +Patch30574: 3238-TG3-Skip-timer-code-during-full-lock.txt +Patch30575: 3239-TG3-Update-version-and-reldate.txt +Patch30576: 3241-NET-Fix-ipx-econet-appletalk-irda-ioctl-crashes.txt +Patch30577: 3242-ECONET-Convert-away-from-SOCKOPS_WRAPPED.txt +Patch30578: 3243-NET-deinline-200-byte-inlines-in-sock.h.txt # END OF PATCH DEFINITIONS @@ -2749,62 +2747,58 @@ %patch30551 -p1 # knfsd: An assortment of little fixes to the sunrpc cache code %patch30552 -p1 -# knfsd: Unexport cache_fresh and fix a small race -%patch30553 -p1 # knfsd: Tidy up unix_domain_find -%patch30554 -p1 +%patch30553 -p1 # pnp: IRDA: adjust pnp_register_driver signature -%patch30555 -p1 +%patch30554 -p1 # Minor (janitorial) change to ieee80211 -%patch30556 -p1 +%patch30555 -p1 # wireless: add prism54usb driver -%patch30557 -p1 +%patch30556 -p1 # prism54usb: fix build break in islusb_init.c -%patch30558 -p1 +%patch30557 -p1 # wireless: add acx driver -%patch30559 -p1 +%patch30558 -p1 # acxsm: merge from acx 0.3.32 -%patch30560 -p1 +%patch30559 -p1 # tiacx: Let only ACX_PCI/ACX_USB be user-visible -%patch30561 -p1 +%patch30560 -p1 # softmac: prism54usb update -%patch30562 -p1 +%patch30561 -p1 # tiacx: revert "neither PCI nor USB is selected" change -%patch30563 -p1 +%patch30562 -p1 # tiacx: implement much more flexible firmware statistics parsing -%patch30564 -p1 +%patch30563 -p1 # tiacx: Change acx_ioctl_{get,set}_encode to use kernel 80211 stack -%patch30565 -p1 +%patch30564 -p1 # tiacx: fix breakage of "Get rid of circular list of adev's" -%patch30566 -p1 +%patch30565 -p1 # tiacx: split module into acx-common + acx-pci + acx-usb -%patch30567 -p1 +%patch30566 -p1 # softmac: reduce scan dwell time -%patch30568 -p1 +%patch30567 -p1 # softmac: reduce default rate to 11Mbps. -%patch30569 -p1 +%patch30568 -p1 # update prism54usb sources -%patch30570 -p1 +%patch30569 -p1 # [TG3]: Fix probe failure due to invalid MAC address -%patch30571 -p1 +%patch30570 -p1 # [TG3]: Fix bug in 40-bit DMA workaround code -%patch30572 -p1 +%patch30571 -p1 # [TG3]: Fix PHY loopback on 5700 -%patch30573 -p1 +%patch30572 -p1 # [TG3]: Speed up SRAM access -%patch30574 -p1 +%patch30573 -p1 # [TG3]: Skip timer code during full lock -%patch30575 -p1 +%patch30574 -p1 # [TG3]: Update version and reldate -%patch30576 -p1 +%patch30575 -p1 # [NET]: Fix ipx/econet/appletalk/irda ioctl crashes -%patch30577 -p1 +%patch30576 -p1 # [ECONET]: Convert away from SOCKOPS_WRAPPED -%patch30578 -p1 +%patch30577 -p1 # [NET]: deinline 200+ byte inlines in sock.h -%patch30579 -p1 -# tiacx: enable compiling on ia64 -%patch30580 -p1 +%patch30578 -p1 # END OF PATCH APPLICATIONS @@ -3947,7 +3941,6 @@ - knfsd: Use new sunrpc cache for rsi cache - knfsd: Use new cache code for rsc cache - knfsd: An assortment of little fixes to the sunrpc cache code -- knfsd: Unexport cache_fresh and fix a small race - knfsd: Tidy up unix_domain_find - pnp: IRDA: adjust pnp_register_driver signature - Minor (janitorial) change to ieee80211 @@ -3974,7 +3967,6 @@ - [NET]: Fix ipx/econet/appletalk/irda ioctl crashes - [ECONET]: Convert away from SOCKOPS_WRAPPED - [NET]: deinline 200+ byte inlines in sock.h -- tiacx: enable compiling on ia64 * Tue Mar 26 2006 Dave Jones - 2.6.16.1 --- 3068-knfsd-Unexport-cache_fresh-and-fix-a-small-race.txt DELETED --- From fedora-cvs-commits at redhat.com Wed Mar 29 19:16:24 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 29 Mar 2006 14:16:24 -0500 Subject: rpms/arts/FC-5 arts.spec,1.56,1.57 sources,1.26,1.27 Message-ID: <200603291916.k2TJGOeJ008590@cvs.devel.redhat.com> Author: than Update of /cvs/dist/rpms/arts/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv7630 Modified Files: arts.spec sources Log Message: update to 1.5.2 Index: arts.spec =================================================================== RCS file: /cvs/dist/rpms/arts/FC-5/arts.spec,v retrieving revision 1.56 retrieving revision 1.57 diff -u -r1.56 -r1.57 --- arts.spec 11 Feb 2006 01:38:42 -0000 1.56 +++ arts.spec 29 Mar 2006 19:16:22 -0000 1.57 @@ -9,8 +9,8 @@ %define make_cvs 1 %define disable_gcc_check_and_hidden_visibility 1 -Version: 1.5.1 -Release: 1.2 +Version: 1.5.2 +Release: 0.1.fc5 Summary: aRts (analog realtime synthesizer) - the KDE sound system Name: arts Group: System Environment/Daemons @@ -172,6 +172,9 @@ %{_bindir}/artsc-config %changelog +* Wed Mar 29 2006 Than Ngo 0:1.5.2-0.1.fc5 +- update to 1.5.2 + * Fri Feb 10 2006 Jesse Keating - 8:1.5.1-1.2 - bump again for double-long bug on ppc(64) Index: sources =================================================================== RCS file: /cvs/dist/rpms/arts/FC-5/sources,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- sources 1 Feb 2006 10:31:17 -0000 1.26 +++ sources 29 Mar 2006 19:16:22 -0000 1.27 @@ -1 +1 @@ -71c4996de36aa7f8726e54bb3d5bf059 arts-1.5.1.tar.bz2 +e1eb7969ea16aab2bdd9d1a9736d6af3 arts-1.5.2.tar.bz2 From fedora-cvs-commits at redhat.com Wed Mar 29 19:33:32 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 29 Mar 2006 14:33:32 -0500 Subject: rpms/kernel/FC-5 kernel-2.6.spec,1.2080.2.5,1.2080.2.6 Message-ID: <200603291933.k2TJXW2R013164@cvs.devel.redhat.com> Author: linville Update of /cvs/dist/rpms/kernel/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv13148 Modified Files: Tag: private-linville-netdev-fc5-1-branch kernel-2.6.spec Log Message: Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-5/kernel-2.6.spec,v retrieving revision 1.2080.2.5 retrieving revision 1.2080.2.6 diff -u -r1.2080.2.5 -r1.2080.2.6 --- kernel-2.6.spec 29 Mar 2006 18:30:25 -0000 1.2080.2.5 +++ kernel-2.6.spec 29 Mar 2006 19:33:01 -0000 1.2080.2.6 @@ -1004,6 +1004,7 @@ Patch30576: 3241-NET-Fix-ipx-econet-appletalk-irda-ioctl-crashes.txt Patch30577: 3242-ECONET-Convert-away-from-SOCKOPS_WRAPPED.txt Patch30578: 3243-NET-deinline-200-byte-inlines-in-sock.h.txt +Patch30579: XXXX-tiacx-ia64-enable.txt # END OF PATCH DEFINITIONS @@ -2799,6 +2800,8 @@ %patch30577 -p1 # [NET]: deinline 200+ byte inlines in sock.h %patch30578 -p1 +# tiacx: enable build for ia64 +%patch30579 -p1 # END OF PATCH APPLICATIONS @@ -3967,6 +3970,7 @@ - [NET]: Fix ipx/econet/appletalk/irda ioctl crashes - [ECONET]: Convert away from SOCKOPS_WRAPPED - [NET]: deinline 200+ byte inlines in sock.h +- tiacx: enable build for ia64 * Tue Mar 26 2006 Dave Jones - 2.6.16.1 From fedora-cvs-commits at redhat.com Wed Mar 29 19:41:39 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 29 Mar 2006 14:41:39 -0500 Subject: rpms/kernel/devel linux-2.6-diskdump.patch,1.6,1.7 Message-ID: <200603291941.k2TJfda1013354@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv13273 Modified Files: linux-2.6-diskdump.patch Log Message: unresolved sym fix linux-2.6-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-powerpc/diskdump.h | 55 ++ include/asm-ppc/diskdump.h | 6 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-diskdump.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-diskdump.patch,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- linux-2.6-diskdump.patch 24 Mar 2006 22:43:38 -0000 1.6 +++ linux-2.6-diskdump.patch 29 Mar 2006 19:41:36 -0000 1.7 @@ -522,7 +522,7 @@ + diskdump_mode = 1; + + Dbg("notify dump start."); -+ notifier_call_chain(&disk_dump_notifier_list, 0, NULL); ++ atomic_notifier_call_chain(&disk_dump_notifier_list, 0, NULL); + + touch_nmi_watchdog(); + freeze_other_cpus(); @@ -546,7 +546,7 @@ + } + + Dbg("notify panic."); -+ notifier_call_chain(&panic_notifier_list, 0, NULL); ++ atomic_notifier_call_chain(&panic_notifier_list, 0, NULL); + + if (panic_timeout > 0) { + int i; From fedora-cvs-commits at redhat.com Wed Mar 29 19:45:02 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 29 Mar 2006 14:45:02 -0500 Subject: rpms/kernel/devel patch-2.6.16-git17.bz2.sign, NONE, 1.1 .cvsignore, 1.397, 1.398 kernel-2.6.spec, 1.2103, 1.2104 sources, 1.338, 1.339 upstream, 1.311, 1.312 patch-2.6.16-git16.bz2.sign, 1.1, NONE Message-ID: <200603291945.k2TJj230013403@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv13380 Modified Files: .cvsignore kernel-2.6.spec sources upstream Added Files: patch-2.6.16-git17.bz2.sign Removed Files: patch-2.6.16-git16.bz2.sign Log Message: git17 --- NEW FILE patch-2.6.16-git17.bz2.sign --- -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.2.2 (GNU/Linux) Comment: See http://www.kernel.org/signature.html for info iD8DBQBEKtnwyGugalF9Dw4RAvs6AJ9FwXCxiPFXA2n/2hN3AG1+mViSzACbB4Vv X20kJkk4+m+kobDx2Ye1iFo= =SBVc -----END PGP SIGNATURE----- Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v retrieving revision 1.397 retrieving revision 1.398 diff -u -r1.397 -r1.398 --- .cvsignore 29 Mar 2006 17:01:22 -0000 1.397 +++ .cvsignore 29 Mar 2006 19:45:00 -0000 1.398 @@ -3,4 +3,4 @@ kernel-2.6.16 linux-2.6.16.tar.bz2 xen-20060320.tar.bz2 -patch-2.6.16-git16.bz2 +patch-2.6.16-git17.bz2 Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.2103 retrieving revision 1.2104 diff -u -r1.2103 -r1.2104 --- kernel-2.6.spec 29 Mar 2006 17:01:36 -0000 1.2103 +++ kernel-2.6.spec 29 Mar 2006 19:45:00 -0000 1.2104 @@ -217,7 +217,7 @@ # # Patches 0 through 100 are meant for core subsystem upgrades # -Patch1: patch-2.6.16-git16.bz2 +Patch1: patch-2.6.16-git17.bz2 # Patches 100 through 500 are meant for architecture patches Patch100: linux-2.6-bzimage.patch @@ -1634,7 +1634,7 @@ %changelog * Wed Mar 29 2006 Dave Jones -- 2.6.16-git16 +- 2.6.16-git16 & git17 * Tue Mar 28 2006 Dave Jones - 2.6.16-git14 & git15 Index: sources =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/sources,v retrieving revision 1.338 retrieving revision 1.339 diff -u -r1.338 -r1.339 --- sources 29 Mar 2006 17:01:40 -0000 1.338 +++ sources 29 Mar 2006 19:45:00 -0000 1.339 @@ -1,3 +1,3 @@ 9a91b2719949ff0856b40bc467fd47be linux-2.6.16.tar.bz2 8c70806f9075ebc0087f7ce1b8911700 xen-20060320.tar.bz2 -02f0b28fee696c1a55c8ad5616eb4910 patch-2.6.16-git16.bz2 +b27c802de6487f2f0aeacc289f1d3ae2 patch-2.6.16-git17.bz2 Index: upstream =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/upstream,v retrieving revision 1.311 retrieving revision 1.312 diff -u -r1.311 -r1.312 --- upstream 29 Mar 2006 17:01:40 -0000 1.311 +++ upstream 29 Mar 2006 19:45:00 -0000 1.312 @@ -1,2 +1,2 @@ linux-2.6.16.tar.bz2 -patch-2.6.16-git16.bz2 +patch-2.6.16-git17.bz2 --- patch-2.6.16-git16.bz2.sign DELETED --- From fedora-cvs-commits at redhat.com Wed Mar 29 19:48:28 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 29 Mar 2006 14:48:28 -0500 Subject: rpms/kdelibs/FC-5 kdelibs.spec,1.127,1.128 sources,1.45,1.46 Message-ID: <200603291948.k2TJmSFc027157@cvs.devel.redhat.com> Author: than Update of /cvs/dist/rpms/kdelibs/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv27143 Modified Files: kdelibs.spec sources Log Message: update to 3.5.2 Index: kdelibs.spec =================================================================== RCS file: /cvs/dist/rpms/kdelibs/FC-5/kdelibs.spec,v retrieving revision 1.127 retrieving revision 1.128 diff -u -r1.127 -r1.128 --- kdelibs.spec 21 Feb 2006 14:42:29 -0000 1.127 +++ kdelibs.spec 29 Mar 2006 19:48:25 -0000 1.128 @@ -8,7 +8,7 @@ %define cups_epoch 1 %define qt_version 3.3.5 -%define arts_version 1.5.1 +%define arts_version 1.5.2 %define kde_major_version 3 %define qtdocdir %{_docdir}/qt-devel-%{qt_version} @@ -23,8 +23,8 @@ %define disable_gcc_check_and_hidden_visibility 1 -Version: 3.5.1 -Release: 2.3 +Version: 3.5.2 +Release: 0.1.fc5 Summary: K Desktop Environment - Libraries Name: kdelibs Url: http://www.kde.org/ @@ -385,6 +385,9 @@ %doc %{_docdir}/HTML/en/kdelibs* %changelog +* Wed Mar 29 2006 Than Ngo 6:3.5.2-0.1.fc5 +- update to 3.5.2 + * Tue Feb 21 2006 Than Ngo 6:3.5.1-2.3 - apply patch to fix missing icons in KDE main menu - requires redhat-artwork >= 0.239-2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/kdelibs/FC-5/sources,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- sources 1 Feb 2006 11:08:03 -0000 1.45 +++ sources 29 Mar 2006 19:48:25 -0000 1.46 @@ -1 +1 @@ -2a22193ae7c23f3759b02723dab02d30 kdelibs-3.5.1.tar.bz2 +367738696dc468859cf90d5a6e8f18a9 kdelibs-3.5.2.tar.bz2 From fedora-cvs-commits at redhat.com Wed Mar 29 20:21:27 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 29 Mar 2006 15:21:27 -0500 Subject: rpms/selinux-policy/devel modules-strict.conf, 1.8, 1.9 policy-20060323.patch, 1.2, 1.3 selinux-policy.spec, 1.161, 1.162 policy-20060207.patch, 1.55, NONE Message-ID: <200603292021.k2TKLRGp009400@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/selinux-policy/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv9119 Modified Files: modules-strict.conf policy-20060323.patch selinux-policy.spec Removed Files: policy-20060207.patch Log Message: * Mon Mar 27 2006 Dan Walsh 2.2.28-1 - Update to upstream Index: modules-strict.conf =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/modules-strict.conf,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- modules-strict.conf 24 Mar 2006 16:44:06 -0000 1.8 +++ modules-strict.conf 29 Mar 2006 20:21:24 -0000 1.9 @@ -20,6 +20,14 @@ terminal = base # Layer: kernel +# Module: mcs +# Required in base +# +# Multicategory security policy +# +mcs = base + +# Layer: kernel # Module: files # Required in base # @@ -81,17 +89,9 @@ # Module: mls # Required in base # -# MultiCategory security policy -# -mls = base - -# Layer: kernel -# Module: mcs -# Required in base -# # Multilevel security policy # -mcs = base +mls = base # Layer: kernel # Module: selinux @@ -144,6 +144,13 @@ kudzu = module # Layer: admin +# Module: bootloader +# +# Policy for the kernel modules, kernel image, and bootloader. +# +bootloader = base + +# Layer: admin # Module: updfstab # # Red Hat utility to change /etc/fstab. @@ -155,7 +162,7 @@ # # Network analysis utilities # -netutils = module +netutils = base # Layer: admin # Module: alsa @@ -187,6 +194,13 @@ su = module # Layer: admin +# Module: apt +# +# APT advanced package toll. +# +apt = module + +# Layer: admin # Module: dmesg # # Policy for dmesg. @@ -201,6 +215,13 @@ anaconda = module # Layer: admin +# Module: dpkg +# +# Policy for the Debian package manager. +# +dpkg = off + +# Layer: admin # Module: amanda # # Automated backup program. @@ -279,6 +300,13 @@ tmpreaper = module # Layer: admin +# Module: mrtg +# +# Network traffic graphing +# +mrtg = module + +# Layer: admin # Module: dmidecode # # Decode DMI data for x86/ia64 bioses. @@ -292,6 +320,27 @@ # logwatch = module +# Layer: kernel +# Module: storage +# +# Policy controlling access to storage devices +# +storage = base + +# Layer: apps +# Module: evolution +# +# Evolution email client +# +evolution = module + +# Layer: apps +# Module: mozilla +# +# Policy for Mozilla and related web browsers +# +mozilla = module + # Layer: apps # Module: irc # @@ -321,6 +370,13 @@ gpg = module # Layer: apps +# Module: thunderbird +# +# Thunderbird email client +# +thunderbird = module + +# Layer: apps # Module: wine # # Wine Is Not an Emulator. Run Windows programs in Linux. @@ -342,6 +398,20 @@ screen = module # Layer: apps +# Module: calamaris +# +# Squid log analysis +# +calamaris = module + +# Layer: apps +# Module: tvtime +# +# tvtime - a high quality television application +# +tvtime = module + +# Layer: apps # Module: java # # Java virtual machine @@ -349,6 +419,13 @@ java = module # Layer: apps +# Module: uml +# +# Policy for UML +# +uml = module + +# Layer: apps # Module: cdrecord # # Policy for cdrecord @@ -356,6 +433,13 @@ cdrecord = module # Layer: apps +# Module: mplayer +# +# Mplayer media player and encoder +# +mplayer = module + +# Layer: apps # Module: webalizer # # Web server log analysis @@ -363,6 +447,13 @@ webalizer = module # Layer: apps +# Module: ethereal +# +# Ethereal packet capture tool. +# +ethereal = module + +# Layer: apps # Module: userhelper # # SELinux utility to run a shell with a new role @@ -370,6 +461,13 @@ userhelper = module # Layer: apps +# Module: games +# +# Games +# +games = module + +# Layer: apps # Module: mono # # Run .NET server and client applications on Linux. @@ -383,19 +481,181 @@ # slocate = module -# Layer: kernel -# Module: bootloader +# Layer: system +# Module: xen # -# Policy for the kernel modules, kernel image, and bootloader. +# Xen hypervisor # -bootloader = module +xen = module -# Layer: kernel -# Module: storage +# Layer: system +# Module: fstools # -# Policy controlling access to storage devices +# Tools for filesystem management, such as mkfs and fsck. +# +fstools = base + +# Layer: system +# Module: logging +# +# Policy for the kernel message logger and system logging daemon. +# +logging = base + +# Layer: system +# Module: hostname +# +# Policy for changing the system host name. +# +hostname = module + +# Layer: system +# Module: daemontools +# +# Collection of tools for managing UNIX services +# +daemontools = module + +# Layer: system +# Module: getty +# +# Policy for getty. +# +getty = module + +# Layer: system +# Module: lvm +# +# Policy for logical volume management programs. +# +lvm = base + +# Layer: system +# Module: sysnetwork +# +# Policy for network configuration: ifconfig and dhcp client. +# +sysnetwork = base + +# Layer: system +# Module: init +# +# System initialization programs (init and init scripts). +# +init = base + +# Layer: system +# Module: selinuxutil +# +# Policy for SELinux policy and userland applications. +# +selinuxutil = base + +# Layer: system +# Module: udev +# +# Policy for udev. +# +udev = base + +# Layer: system +# Module: pcmcia +# +# PCMCIA card management services +# +pcmcia = module + +# Layer: system +# Module: authlogin +# +# Common policy for authentication and user login. +# +authlogin = base + +# Layer: system +# Module: libraries +# +# Policy for system libraries. +# +libraries = base + +# Layer: system +# Module: raid +# +# RAID array management tools +# +raid = module + +# Layer: system +# Module: userdomain +# +# Policy for user domains +# +userdomain = base + +# Layer: system +# Module: modutils +# +# Policy for kernel module utilities +# +modutils = base + +# Layer: system +# Module: hotplug +# +# Policy for hotplug system, for supporting the +# connection and disconnection of devices at runtime. +# +hotplug = base + +# Layer: system +# Module: clock +# +# Policy for reading and setting the hardware clock. +# +clock = base + +# Layer: system +# Module: locallogin +# +# Policy for local logins. +# +locallogin = base + +# Layer: system +# Module: iptables +# +# Policy for iptables. +# +iptables = module + +# Layer: system +# Module: mount +# +# Policy for mount. # -storage = module +mount = base + +# Layer: system +# Module: unconfined +# +# The unconfined domain. +# +unconfined = module + +# Layer: system +# Module: miscfiles +# +# Miscelaneous files. +# +miscfiles = base + +# Layer: system +# Module: ipsec +# +# TCP/IP encryption +# +ipsec = module # Layer: services # Module: nis @@ -412,6 +672,13 @@ distcc = module # Layer: services +# Module: tor +# +# TOR, the onion router +# +tor = module + +# Layer: services # Module: rshd # # Remote shell service. @@ -433,6 +700,13 @@ bind = module # Layer: services +# Module: cipe +# +# Encrypted tunnel daemon +# +cipe = module + +# Layer: services # Module: canna # # Canna - kana-kanji conversion server @@ -624,6 +898,14 @@ dovecot = module # Layer: services +# Module: amavis +# +# Daemon that interfaces mail transfer agents and content +# checkers, such as virus scanners. +# +amavis = module + +# Layer: services # Module: cups # # Common UNIX printing system @@ -715,13 +997,6 @@ rdisc = module # Layer: services -# Module: xserver -# -# X windows login display manager -# -xserver = module - -# Layer: services # Module: nscd # # Name service cache daemon @@ -757,11 +1032,25 @@ gpm = module # Layer: services +# Module: audioentropy +# +# Generate entropy from audio input +# +audioentropy = module + +# Layer: services # Module: mta # # Policy common to all email tranfer agents. # -mta = module +mta = base + +# Layer: services +# Module: rhgb +# +# Red Hat Graphical Boot +# +rhgb = module # Layer: services # Module: postfix @@ -834,6 +1123,13 @@ slrnpull = module # Layer: services +# Module: clamav +# +# ClamAV Virus Scanner +# +clamav = module + +# Layer: services # Module: rsync # # Fast incremental file transfer for synchronization @@ -966,186 +1262,3 @@ # rlogin = module -# Layer: system -# Module: fstools -# -# Tools for filesystem management, such as mkfs and fsck. -# -fstools = module - -# Layer: system -# Module: logging -# -# Policy for the kernel message logger and system logging daemon. -# -logging = module - -# Layer: system -# Module: hostname -# -# Policy for changing the system host name. -# -hostname = module - -# Layer: system -# Module: daemontools -# -# Collection of tools for managing UNIX services -# -daemontools = module - -# Layer: system -# Module: getty -# -# Policy for getty. -# -getty = module - -# Layer: system -# Module: lvm -# -# Policy for logical volume management programs. -# -lvm = module - -# Layer: system -# Module: sysnetwork -# -# Policy for network configuration: ifconfig and dhcp client. -# -sysnetwork = module - -# Layer: system -# Module: init -# -# System initialization programs (init and init scripts). -# -init = module - -# Layer: system -# Module: selinuxutil -# -# Policy for SELinux policy and userland applications. -# -selinuxutil = module - -# Layer: system -# Module: udev -# -# Policy for udev. -# -udev = module - -# Layer: system -# Module: pcmcia -# -# PCMCIA card management services -# -pcmcia = module - -# Layer: system -# Module: authlogin -# -# Common policy for authentication and user login. -# -authlogin = base - -# Layer: system -# Module: libraries -# -# Policy for system libraries. -# -libraries = base - -# Layer: system -# Module: raid -# -# RAID array management tools -# -raid = module - -# Layer: system -# Module: userdomain -# -# Policy for user domains -# -userdomain = module - -# Layer: system -# Module: modutils -# -# Policy for kernel module utilities -# -modutils = module - -# Layer: system -# Module: hotplug -# -# Policy for hotplug system, for supporting the -# connection and disconnection of devices at runtime. -# -hotplug = module - -# Layer: system -# Module: clock -# -# Policy for reading and setting the hardware clock. -# -clock = module - -# Layer: system -# Module: locallogin -# -# Policy for local logins. -# -locallogin = module - -# Layer: system -# Module: iptables -# -# Policy for iptables. -# -iptables = module - -# Layer: system -# Module: mount -# -# Policy for mount. -# -mount = module - -# Layer: system -# Module: unconfined -# -# The unconfined domain. -# -unconfined = module - -# Layer: system -# Module: miscfiles -# -# Miscelaneous files. -# -miscfiles = module - -# Layer: system -# Module: ipsec -# -# TCP/IP encryption -# -ipsec = module - -# Layer: admin -# Module: mrtg -# -# System log analyzer and reporter -# -mrtg = module - -# Layer: system -# Module: xen -# -# TCP/IP encryption -# -xen = base - policy-20060323.patch: man/man8/samba_selinux.8 | 2 - policy/modules/admin/logwatch.te | 1 policy/modules/admin/rpm.fc | 1 policy/modules/admin/usermanage.te | 2 + policy/modules/kernel/corenetwork.te.in | 4 +- policy/modules/kernel/devices.if | 58 ++++++++++++++++++++++++++++++++ policy/modules/kernel/files.if | 27 ++++++++++++++ policy/modules/kernel/kernel.if | 4 +- policy/modules/services/apm.te | 4 ++ policy/modules/services/bluetooth.te | 2 + policy/modules/services/cups.te | 3 + policy/modules/services/dovecot.te | 2 + policy/modules/services/hal.te | 4 ++ policy/modules/services/pegasus.te | 1 policy/modules/services/privoxy.te | 5 ++ policy/modules/services/xfs.te | 1 policy/modules/services/xserver.if | 20 +++++++++++ policy/modules/system/authlogin.te | 2 + policy/modules/system/fstools.te | 5 ++ policy/modules/system/init.te | 1 policy/modules/system/libraries.fc | 2 - policy/modules/system/mount.te | 2 + policy/modules/system/selinuxutil.fc | 6 +++ policy/modules/system/selinuxutil.te | 52 ++++++++++++++++++++++++++++ 24 files changed, 205 insertions(+), 6 deletions(-) Index: policy-20060323.patch =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20060323.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- policy-20060323.patch 27 Mar 2006 22:07:37 -0000 1.2 +++ policy-20060323.patch 29 Mar 2006 20:21:25 -0000 1.3 @@ -1,6 +1,18 @@ +diff --exclude-from=exclude -N -u -r nsaserefpolicy/man/man8/samba_selinux.8 serefpolicy-2.2.28/man/man8/samba_selinux.8 +--- nsaserefpolicy/man/man8/samba_selinux.8 2006-01-06 17:55:17.000000000 -0500 ++++ serefpolicy-2.2.28/man/man8/samba_selinux.8 2006-03-29 14:44:17.000000000 -0500 +@@ -23,7 +23,7 @@ + .SH SHARING FILES + If you want to share files with multiple domains (Apache, FTP, rsync, Samba), you can set a file context of public_content_t and public_content_rw_t. These context allow any of the above domains to read the content. If you want a particular domain to write to the public_content_rw_t domain, you must set the appropriate boolean. allow_DOMAIN_anon_write. So for samba you would execute: + +-setsebool -P allow_smb_anon_write=1 ++setsebool -P allow_smbd_anon_write=1 + + .SH BOOLEANS + .br diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/logwatch.te serefpolicy-2.2.28/policy/modules/admin/logwatch.te --- nsaserefpolicy/policy/modules/admin/logwatch.te 2006-03-24 11:54:26.000000000 -0500 -+++ serefpolicy-2.2.28/policy/modules/admin/logwatch.te 2006-03-27 15:50:50.000000000 -0500 ++++ serefpolicy-2.2.28/policy/modules/admin/logwatch.te 2006-03-29 14:44:17.000000000 -0500 @@ -52,6 +52,7 @@ files_read_etc_runtime_files(logwatch_t) files_read_usr_files(logwatch_t) @@ -11,7 +23,7 @@ fs_getattr_all_fs(logwatch_t) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.fc serefpolicy-2.2.28/policy/modules/admin/rpm.fc --- nsaserefpolicy/policy/modules/admin/rpm.fc 2006-03-23 16:02:02.000000000 -0500 -+++ serefpolicy-2.2.28/policy/modules/admin/rpm.fc 2006-03-27 15:50:50.000000000 -0500 ++++ serefpolicy-2.2.28/policy/modules/admin/rpm.fc 2006-03-29 14:44:17.000000000 -0500 @@ -3,6 +3,7 @@ /usr/bin/smart -- gen_context(system_u:object_r:rpm_exec_t,s0) @@ -20,9 +32,28 @@ /usr/lib(64)?/rpm/rpmd -- gen_context(system_u:object_r:bin_t,s0) /usr/lib(64)?/rpm/rpmq -- gen_context(system_u:object_r:bin_t,s0) +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/usermanage.te serefpolicy-2.2.28/policy/modules/admin/usermanage.te +--- nsaserefpolicy/policy/modules/admin/usermanage.te 2006-03-24 11:54:26.000000000 -0500 ++++ serefpolicy-2.2.28/policy/modules/admin/usermanage.te 2006-03-29 14:44:17.000000000 -0500 +@@ -225,6 +225,7 @@ + + files_manage_etc_files(groupadd_t) + files_relabel_etc_files(groupadd_t) ++files_read_etc_runtime_files(groupadd_t) + + libs_use_ld_so(groupadd_t) + libs_use_shared_libs(groupadd_t) +@@ -492,6 +493,7 @@ + files_manage_etc_files(useradd_t) + files_search_var_lib(useradd_t) + files_relabel_etc_files(useradd_t) ++files_read_etc_runtime_files(useradd_t) + + init_use_fds(useradd_t) + init_rw_utmp(useradd_t) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corenetwork.te.in serefpolicy-2.2.28/policy/modules/kernel/corenetwork.te.in --- nsaserefpolicy/policy/modules/kernel/corenetwork.te.in 2006-03-23 16:02:03.000000000 -0500 -+++ serefpolicy-2.2.28/policy/modules/kernel/corenetwork.te.in 2006-03-27 15:51:13.000000000 -0500 ++++ serefpolicy-2.2.28/policy/modules/kernel/corenetwork.te.in 2006-03-29 14:44:17.000000000 -0500 @@ -68,7 +68,7 @@ network_port(http_cache, tcp,3128,s0, udp,3130,s0, tcp,8080,s0, tcp,8118,s0) # 8118 is for privoxy network_port(http, tcp,80,s0, tcp,443,s0, tcp,488,s0, tcp,8008,s0) @@ -42,9 +73,9 @@ network_port(zope, tcp,8021,s0) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.if serefpolicy-2.2.28/policy/modules/kernel/devices.if ---- nsaserefpolicy/policy/modules/kernel/devices.if 2006-03-23 16:02:03.000000000 -0500 -+++ serefpolicy-2.2.28/policy/modules/kernel/devices.if 2006-03-27 15:50:50.000000000 -0500 -@@ -2387,6 +2387,44 @@ +--- nsaserefpolicy/policy/modules/kernel/devices.if 2006-03-28 23:09:36.000000000 -0500 ++++ serefpolicy-2.2.28/policy/modules/kernel/devices.if 2006-03-29 14:44:17.000000000 -0500 +@@ -2383,6 +2383,44 @@ ######################################## ## @@ -89,7 +120,7 @@ ## Mount a usbfs filesystem. ## ## -@@ -2826,3 +2864,23 @@ +@@ -2822,3 +2860,23 @@ allow $1 self:capability sys_rawio; typeattribute $1 memory_raw_write, memory_raw_read; ') @@ -114,9 +145,9 @@ +') + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.if serefpolicy-2.2.28/policy/modules/kernel/files.if ---- nsaserefpolicy/policy/modules/kernel/files.if 2006-03-24 11:54:27.000000000 -0500 -+++ serefpolicy-2.2.28/policy/modules/kernel/files.if 2006-03-27 15:50:50.000000000 -0500 -@@ -1648,6 +1648,21 @@ +--- nsaserefpolicy/policy/modules/kernel/files.if 2006-03-28 23:09:36.000000000 -0500 ++++ serefpolicy-2.2.28/policy/modules/kernel/files.if 2006-03-29 14:44:17.000000000 -0500 +@@ -1643,6 +1643,21 @@ ') ######################################## @@ -138,7 +169,7 @@ ## ## Read files in /etc that are dynamically ## created on boot, such as mtab. -@@ -2157,6 +2172,18 @@ +@@ -2152,6 +2167,18 @@ ######################################## # @@ -159,7 +190,7 @@ interface(`files_list_mnt',` diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel.if serefpolicy-2.2.28/policy/modules/kernel/kernel.if --- nsaserefpolicy/policy/modules/kernel/kernel.if 2006-03-23 16:02:03.000000000 -0500 -+++ serefpolicy-2.2.28/policy/modules/kernel/kernel.if 2006-03-27 15:50:50.000000000 -0500 ++++ serefpolicy-2.2.28/policy/modules/kernel/kernel.if 2006-03-29 14:44:17.000000000 -0500 @@ -1148,7 +1148,7 @@ allow $1 proc_t:dir search; @@ -180,7 +211,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apm.te serefpolicy-2.2.28/policy/modules/services/apm.te --- nsaserefpolicy/policy/modules/services/apm.te 2006-03-24 11:54:27.000000000 -0500 -+++ serefpolicy-2.2.28/policy/modules/services/apm.te 2006-03-27 15:50:50.000000000 -0500 ++++ serefpolicy-2.2.28/policy/modules/services/apm.te 2006-03-29 14:44:17.000000000 -0500 @@ -226,6 +226,10 @@ ') @@ -193,68 +224,59 @@ ') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bluetooth.te serefpolicy-2.2.28/policy/modules/services/bluetooth.te ---- nsaserefpolicy/policy/modules/services/bluetooth.te 2006-03-24 11:54:27.000000000 -0500 -+++ serefpolicy-2.2.28/policy/modules/services/bluetooth.te 2006-03-27 15:50:50.000000000 -0500 -@@ -205,6 +205,8 @@ - miscfiles_read_localization(bluetooth_helper_t) - miscfiles_read_fonts(bluetooth_helper_t) +--- nsaserefpolicy/policy/modules/services/bluetooth.te 2006-03-29 14:26:02.000000000 -0500 ++++ serefpolicy-2.2.28/policy/modules/services/bluetooth.te 2006-03-29 14:44:17.000000000 -0500 +@@ -220,6 +220,8 @@ + ') + ') +sysnet_read_config(bluetooth_helper_t) + optional_policy(` dbus_system_bus_client_template(bluetooth_helper,bluetooth_helper_t) dbus_connect_system_bus(bluetooth_helper_t) -@@ -216,26 +218,20 @@ - ') - - optional_policy(` -- xserver_stream_connect_xdm(bluetooth_helper_t) --') -- --ifdef(`TODO',` --allow bluetooth_helper_t tmp_t:dir search; -+ locallogin_dontaudit_use_fds(bluetooth_helper_t) -+'); - --ifdef(`strict_policy',` -- ifdef(`xdm.te',` -- allow bluetooth_helper_t xdm_xserver_tmp_t:sock_file { read write }; -- ') --') --') dnl end TODO -+optional_policy(` -+ xserver_stream_connect_xdm(bluetooth_helper_t) -+'); - - ifdef(`targeted_policy',` -+ userdom_read_all_users_home_content_files(bluetooth_helper_t) -+# Not sure we need the following anymore ???? - files_rw_generic_tmp_sockets(bluetooth_helper_t) -- allow bluetooth_helper_t tmpfs_t:file { read write }; - allow bluetooth_helper_t unconfined_t:unix_stream_socket connectto; -- userdom_read_all_users_home_content_files(bluetooth_helper_t) -- -+ allow bluetooth_helper_t tmpfs_t:file { read write }; - optional_policy(` -- xserver_stream_connect_xdm(bluetooth_helper_t) -- ') -+ xserver_rw_xdm_sockets(bluetooth_helper_t) -+ '); - ') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.te serefpolicy-2.2.28/policy/modules/services/cups.te --- nsaserefpolicy/policy/modules/services/cups.te 2006-03-24 11:54:27.000000000 -0500 -+++ serefpolicy-2.2.28/policy/modules/services/cups.te 2006-03-27 15:51:21.000000000 -0500 -@@ -375,6 +375,7 @@ ++++ serefpolicy-2.2.28/policy/modules/services/cups.te 2006-03-29 14:44:17.000000000 -0500 +@@ -375,7 +375,9 @@ # HPLIP local policy # +allow hplip_t self:capability net_raw; dontaudit hplip_t self:capability sys_tty_config; ++allow hplip_t self:fifo_file rw_file_perms; allow hplip_t self:process signal_perms; allow hplip_t self:unix_dgram_socket create_socket_perms; + allow hplip_t self:unix_stream_socket create_socket_perms; +@@ -418,6 +420,7 @@ + dev_read_sysfs(hplip_t) + dev_rw_printer(hplip_t) + dev_read_urand(hplip_t) ++dev_rw_generic_usb_dev(hplip_t) + + fs_getattr_all_fs(hplip_t) + fs_search_auto_mountpoints(hplip_t) +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dovecot.te serefpolicy-2.2.28/policy/modules/services/dovecot.te +--- nsaserefpolicy/policy/modules/services/dovecot.te 2006-03-24 11:54:28.000000000 -0500 ++++ serefpolicy-2.2.28/policy/modules/services/dovecot.te 2006-03-29 14:44:17.000000000 -0500 +@@ -79,12 +79,14 @@ + corenet_tcp_bind_all_nodes(dovecot_t) + corenet_tcp_bind_pop_port(dovecot_t) + corenet_tcp_connect_all_ports(dovecot_t) ++corenet_tcp_connect_postgresql_port(dovecot_t) + + dev_read_sysfs(dovecot_t) + dev_read_urand(dovecot_t) + + fs_getattr_all_fs(dovecot_t) + fs_search_auto_mountpoints(dovecot_t) ++fs_list_inotifyfs(dovecot_t) + + term_dontaudit_use_console(dovecot_t) + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.te serefpolicy-2.2.28/policy/modules/services/hal.te --- nsaserefpolicy/policy/modules/services/hal.te 2006-03-24 11:54:28.000000000 -0500 -+++ serefpolicy-2.2.28/policy/modules/services/hal.te 2006-03-27 15:50:50.000000000 -0500 ++++ serefpolicy-2.2.28/policy/modules/services/hal.te 2006-03-29 14:44:17.000000000 -0500 @@ -211,6 +211,10 @@ ') @@ -268,7 +290,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pegasus.te serefpolicy-2.2.28/policy/modules/services/pegasus.te --- nsaserefpolicy/policy/modules/services/pegasus.te 2006-03-24 11:54:28.000000000 -0500 -+++ serefpolicy-2.2.28/policy/modules/services/pegasus.te 2006-03-27 15:50:50.000000000 -0500 ++++ serefpolicy-2.2.28/policy/modules/services/pegasus.te 2006-03-29 14:44:17.000000000 -0500 @@ -77,6 +77,7 @@ corenet_tcp_bind_pegasus_https_port(pegasus_t) corenet_tcp_connect_pegasus_http_port(pegasus_t) @@ -279,7 +301,7 @@ dev_read_urand(pegasus_t) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/privoxy.te serefpolicy-2.2.28/policy/modules/services/privoxy.te --- nsaserefpolicy/policy/modules/services/privoxy.te 2006-03-24 11:54:28.000000000 -0500 -+++ serefpolicy-2.2.28/policy/modules/services/privoxy.te 2006-03-27 15:50:50.000000000 -0500 ++++ serefpolicy-2.2.28/policy/modules/services/privoxy.te 2006-03-29 14:44:17.000000000 -0500 @@ -51,6 +51,7 @@ corenet_tcp_bind_http_cache_port(privoxy_t) corenet_tcp_connect_http_port(privoxy_t) @@ -299,10 +321,21 @@ seutil_sigchld_newrole(privoxy_t) ') +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xfs.te serefpolicy-2.2.28/policy/modules/services/xfs.te +--- nsaserefpolicy/policy/modules/services/xfs.te 2006-03-24 11:54:29.000000000 -0500 ++++ serefpolicy-2.2.28/policy/modules/services/xfs.te 2006-03-29 14:44:17.000000000 -0500 +@@ -53,6 +53,7 @@ + + files_read_etc_files(xfs_t) + files_read_etc_runtime_files(xfs_t) ++files_read_usr_files(xfs_t) + + init_use_fds(xfs_t) + init_use_script_ptys(xfs_t) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.if serefpolicy-2.2.28/policy/modules/services/xserver.if ---- nsaserefpolicy/policy/modules/services/xserver.if 2006-03-24 11:54:29.000000000 -0500 -+++ serefpolicy-2.2.28/policy/modules/services/xserver.if 2006-03-27 15:50:50.000000000 -0500 -@@ -922,3 +922,23 @@ +--- nsaserefpolicy/policy/modules/services/xserver.if 2006-03-28 23:09:36.000000000 -0500 ++++ serefpolicy-2.2.28/policy/modules/services/xserver.if 2006-03-29 14:44:17.000000000 -0500 +@@ -1015,3 +1015,23 @@ dontaudit $1 xdm_xserver_t:tcp_socket { read write }; ') @@ -328,7 +361,7 @@ +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlogin.te serefpolicy-2.2.28/policy/modules/system/authlogin.te --- nsaserefpolicy/policy/modules/system/authlogin.te 2006-03-24 11:54:29.000000000 -0500 -+++ serefpolicy-2.2.28/policy/modules/system/authlogin.te 2006-03-27 15:50:50.000000000 -0500 ++++ serefpolicy-2.2.28/policy/modules/system/authlogin.te 2006-03-29 14:44:17.000000000 -0500 @@ -171,6 +171,8 @@ dev_setattr_video_dev(pam_console_t) dev_getattr_xserver_misc_dev(pam_console_t) @@ -340,7 +373,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/fstools.te serefpolicy-2.2.28/policy/modules/system/fstools.te --- nsaserefpolicy/policy/modules/system/fstools.te 2006-03-24 11:54:29.000000000 -0500 -+++ serefpolicy-2.2.28/policy/modules/system/fstools.te 2006-03-27 15:50:50.000000000 -0500 ++++ serefpolicy-2.2.28/policy/modules/system/fstools.te 2006-03-29 14:44:17.000000000 -0500 @@ -67,6 +67,10 @@ dev_read_urand(fsadm_t) # Recreate /dev/cdrom. @@ -361,9 +394,9 @@ fs_search_auto_mountpoints(fsadm_t) fs_getattr_xattr_fs(fsadm_t) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.te serefpolicy-2.2.28/policy/modules/system/init.te ---- nsaserefpolicy/policy/modules/system/init.te 2006-03-24 11:54:29.000000000 -0500 -+++ serefpolicy-2.2.28/policy/modules/system/init.te 2006-03-27 15:50:50.000000000 -0500 -@@ -349,6 +349,7 @@ +--- nsaserefpolicy/policy/modules/system/init.te 2006-03-29 14:26:03.000000000 -0500 ++++ serefpolicy-2.2.28/policy/modules/system/init.te 2006-03-29 14:44:17.000000000 -0500 +@@ -353,6 +353,7 @@ files_mounton_isid_type_dirs(initrc_t) files_list_default(initrc_t) files_mounton_default(initrc_t) @@ -371,10 +404,119 @@ libs_rw_ld_so_cache(initrc_t) libs_use_ld_so(initrc_t) +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.fc serefpolicy-2.2.28/policy/modules/system/libraries.fc +--- nsaserefpolicy/policy/modules/system/libraries.fc 2006-03-23 16:02:04.000000000 -0500 ++++ serefpolicy-2.2.28/policy/modules/system/libraries.fc 2006-03-29 14:44:17.000000000 -0500 +@@ -148,7 +148,7 @@ + /usr/lib(64)?/php/modules/.*\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0) + + # Livna.org packages: xmms-mp3, ffmpeg, xvidcore, xine-lib, gsm, lame +-/usr/lib(64)?/xmms/Input/libmpg123\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0) ++/usr/lib(64)?.*/libmpg123\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0) + /usr/lib(64)?/libpostproc\.so.* -- gen_context(system_u:object_r:textrel_shlib_t,s0) + /usr/lib(64)?/libavformat-.*\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0) + /usr/lib(64)?/libavcodec-.*\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0) +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.te serefpolicy-2.2.28/policy/modules/system/mount.te +--- nsaserefpolicy/policy/modules/system/mount.te 2006-03-24 11:54:29.000000000 -0500 ++++ serefpolicy-2.2.28/policy/modules/system/mount.te 2006-03-29 14:44:17.000000000 -0500 +@@ -72,6 +72,8 @@ + # for when /etc/mtab loses its type + # cjp: this seems wrong, the type should probably be etc + files_read_isid_type_files(mount_t) ++# For reading cert files ++files_read_usr_files(mount_t) + + init_use_fds(mount_t) + init_use_script_ptys(mount_t) +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.fc serefpolicy-2.2.28/policy/modules/system/selinuxutil.fc +--- nsaserefpolicy/policy/modules/system/selinuxutil.fc 2006-03-23 16:02:04.000000000 -0500 ++++ serefpolicy-2.2.28/policy/modules/system/selinuxutil.fc 2006-03-29 14:44:17.000000000 -0500 +@@ -33,6 +33,7 @@ + /usr/lib(64)?/selinux(/.*)? gen_context(system_u:object_r:policy_src_t,s0) + + /usr/sbin/load_policy -- gen_context(system_u:object_r:load_policy_exec_t,s0) ++/usr/sbin/restorecond -- gen_context(system_u:object_r:restorecond_exec_t,s0) + /usr/sbin/run_init -- gen_context(system_u:object_r:run_init_exec_t,s0) + /usr/sbin/setfiles.* -- gen_context(system_u:object_r:setfiles_exec_t,s0) + /usr/sbin/semodule -- gen_context(system_u:object_r:semanage_exec_t,s0) +@@ -40,3 +41,8 @@ + ifdef(`distro_debian', ` + /usr/share/selinux(/.*)? gen_context(system_u:object_r:policy_src_t,s0) + ') ++ ++# ++# /var/run ++# ++/var/run/restorecond.pid -- gen_context(system_u:object_r:restorecond_var_run_t,s0) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.te serefpolicy-2.2.28/policy/modules/system/selinuxutil.te ---- nsaserefpolicy/policy/modules/system/selinuxutil.te 2006-03-24 11:54:29.000000000 -0500 -+++ serefpolicy-2.2.28/policy/modules/system/selinuxutil.te 2006-03-27 15:50:50.000000000 -0500 -@@ -595,6 +595,7 @@ +--- nsaserefpolicy/policy/modules/system/selinuxutil.te 2006-03-29 14:26:03.000000000 -0500 ++++ serefpolicy-2.2.28/policy/modules/system/selinuxutil.te 2006-03-29 14:44:24.000000000 -0500 +@@ -83,6 +83,15 @@ + init_system_domain(restorecon_t,restorecon_exec_t) + role system_r types restorecon_t; + ++type restorecond_t; ++type restorecond_exec_t; ++init_daemon_domain(restorecond_t,restorecond_exec_t) ++domain_obj_id_change_exemption(restorecond_t) ++role system_r types restorecond_t; ++ ++type restorecond_var_run_t; ++files_pid_file(restorecond_var_run_t) ++ + type run_init_t; + type run_init_exec_t; + domain_type(run_init_t) +@@ -415,6 +424,48 @@ + + allow restorecon_t kernel_t:unix_dgram_socket { read write }; + ++######################################## ++# ++# Restorecond local policy ++# ++ ++allow restorecond_t self:capability { dac_override dac_read_search fowner }; ++allow restorecond_t self:fifo_file rw_file_perms; ++ ++auth_relabel_all_files_except_shadow(restorecond_t ) ++auth_read_all_files_except_shadow(restorecond_t) ++ ++allow restorecond_t restorecond_var_run_t:file create_file_perms; ++files_pid_filetrans(restorecond_t,restorecond_var_run_t, file) ++ ++kernel_use_fds(restorecond_t) ++kernel_rw_pipes(restorecond_t) ++kernel_read_system_state(restorecond_t) ++ ++fs_getattr_xattr_fs(restorecond_t) ++fs_list_inotifyfs(restorecond_t) ++ ++selinux_get_fs_mount(restorecond_t) ++selinux_validate_context(restorecond_t) ++selinux_compute_access_vector(restorecond_t) ++selinux_compute_create_context(restorecond_t) ++selinux_compute_relabel_context(restorecond_t) ++selinux_compute_user_contexts(restorecond_t) ++ ++term_dontaudit_use_generic_ptys(restorecond_t) ++ ++sysnet_dns_name_resolve(restorecond_t) ++ ++init_use_fds(restorecond_t) ++ ++libs_use_ld_so(restorecond_t) ++libs_use_shared_libs(restorecond_t) ++ ++logging_send_syslog_msg(restorecond_t) ++ ++miscfiles_read_localization(run_init_t) ++ ++ + ################################# + # + # Run_init local policy +@@ -595,6 +646,7 @@ miscfiles_read_localization(setfiles_t) seutil_get_semanage_read_lock(setfiles_t) Index: selinux-policy.spec =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v retrieving revision 1.161 retrieving revision 1.162 diff -u -r1.161 -r1.162 --- selinux-policy.spec 27 Mar 2006 22:31:50 -0000 1.161 +++ selinux-policy.spec 29 Mar 2006 20:21:25 -0000 1.162 @@ -184,6 +184,7 @@ # Commented out because only targeted ref policy currently builds make NAME=strict TYPE=strict-mcs DISTRO=%{distro} DIRECT_INITRC=y MONOLITHIC=%{monolithic} POLY=n bare make NAME=strict TYPE=strict-mcs DISTRO=%{distro} DIRECT_INITRC=y MONOLITHIC=%{monolithic} POLY=n conf +cp -f ${RPM_SOURCE_DIR}/modules-strict.conf ./policy/modules.conf %installCmds strict strict-mcs y n %endif --- policy-20060207.patch DELETED --- From fedora-cvs-commits at redhat.com Wed Mar 29 20:24:04 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 29 Mar 2006 15:24:04 -0500 Subject: rpms/pilot-link/devel pilot-link.spec,1.39,1.40 Message-ID: <200603292024.k2TKO4O3009996@cvs.devel.redhat.com> Author: than Update of /cvs/dist/rpms/pilot-link/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv9983 Modified Files: pilot-link.spec Log Message: rebuilt to get rid of libpisock.so.9 Index: pilot-link.spec =================================================================== RCS file: /cvs/dist/rpms/pilot-link/devel/pilot-link.spec,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- pilot-link.spec 29 Mar 2006 13:43:24 -0000 1.39 +++ pilot-link.spec 29 Mar 2006 20:24:01 -0000 1.40 @@ -4,7 +4,7 @@ Summary: File transfer utilities between Linux and PalmPilots. Name: pilot-link Version: 0.11.8 -Release: 13 +Release: 14 Source: pilot-link-%{version}.tar.bz2 Url: http://www.pilot-link.org/ Patch1: pilot-link-0.11.0-perlmd5.patch @@ -141,6 +141,9 @@ %{_datadir}/aclocal/*.m4 %changelog +* Wed Mar 29 2006 Than Ngo 2:0.11.8-14 +- rebuild to get rid of libpisock.so.9 + * Wed Mar 29 2006 Than Ngo 2:0.11.8-13 - downgrade to stable release 0.11.8 From fedora-cvs-commits at redhat.com Wed Mar 29 20:26:38 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 29 Mar 2006 15:26:38 -0500 Subject: rpms/pilot-link/FC-5 pilot-link.spec,1.39,1.40 Message-ID: <200603292026.k2TKQcd4010204@cvs.devel.redhat.com> Author: than Update of /cvs/dist/rpms/pilot-link/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv10191 Modified Files: pilot-link.spec Log Message: rebuild to get rid of libpisock.so.9 Index: pilot-link.spec =================================================================== RCS file: /cvs/dist/rpms/pilot-link/FC-5/pilot-link.spec,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- pilot-link.spec 29 Mar 2006 13:34:48 -0000 1.39 +++ pilot-link.spec 29 Mar 2006 20:26:36 -0000 1.40 @@ -4,7 +4,7 @@ Summary: File transfer utilities between Linux and PalmPilots. Name: pilot-link Version: 0.11.8 -Release: 12.1.fc5 +Release: 12.2.fc5 Source: pilot-link-%{version}.tar.bz2 Url: http://www.pilot-link.org/ Patch1: pilot-link-0.11.0-perlmd5.patch @@ -141,6 +141,9 @@ %{_datadir}/aclocal/*.m4 %changelog +* Wed Mar 29 2006 Than Ngo 2:0.11.8-12.2.fc5 +- rebuild to get rid of libpisock.so.9 + * Wed Mar 29 2006 Than Ngo 2:0.11.8-12.1.fc5 - downgrade to stable release 0.11.8 From fedora-cvs-commits at redhat.com Wed Mar 29 20:28:20 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 29 Mar 2006 15:28:20 -0500 Subject: rpms/pilot-link/FC-4 pilot-link.spec,1.29,1.30 Message-ID: <200603292028.k2TKSKWu010273@cvs.devel.redhat.com> Author: than Update of /cvs/dist/rpms/pilot-link/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv10260 Modified Files: pilot-link.spec Log Message: rebuild to get rid of libpisock.so.9 Index: pilot-link.spec =================================================================== RCS file: /cvs/dist/rpms/pilot-link/FC-4/pilot-link.spec,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- pilot-link.spec 29 Mar 2006 13:20:40 -0000 1.29 +++ pilot-link.spec 29 Mar 2006 20:28:18 -0000 1.30 @@ -4,7 +4,7 @@ Summary: File transfer utilities between Linux and PalmPilots. Name: pilot-link Version: 0.11.8 -Release: 11.1.fc4 +Release: 11.2.fc4 Source: pilot-link-%{version}.tar.bz2 Url: http://www.pilot-link.org/ Patch1: pilot-link-0.11.0-perlmd5.patch @@ -141,6 +141,9 @@ %{_datadir}/aclocal/*.m4 %changelog +* Wed Mar 29 2006 Than Ngo 2:0.11.8-11.2.fc4 +- rebuild to get rid of libpisock.so.9 + * Wed Mar 29 2006 Than Ngo 2:0.11.8-11.1.fc4 - downgrade to stable release 0.11.8 From fedora-cvs-commits at redhat.com Wed Mar 29 20:36:52 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 29 Mar 2006 15:36:52 -0500 Subject: rpms/libsepol/devel .cvsignore, 1.91, 1.92 libsepol.spec, 1.120, 1.121 sources, 1.92, 1.93 Message-ID: <200603292036.k2TKaqQu010512@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/libsepol/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv10497 Modified Files: .cvsignore libsepol.spec sources Log Message: * Wed Mar 29 2006 Dan Walsh 1.12.4-1 - Upgrade to latest from NSA * Generalize test for bitmap overflow in ebitmap_set_bit. Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/libsepol/devel/.cvsignore,v retrieving revision 1.91 retrieving revision 1.92 diff -u -r1.91 -r1.92 --- .cvsignore 27 Mar 2006 22:04:35 -0000 1.91 +++ .cvsignore 29 Mar 2006 20:36:49 -0000 1.92 @@ -91,3 +91,4 @@ libsepol-1.12.1.tgz libsepol-1.12.2.tgz libsepol-1.12.3.tgz +libsepol-1.12.4.tgz Index: libsepol.spec =================================================================== RCS file: /cvs/dist/rpms/libsepol/devel/libsepol.spec,v retrieving revision 1.120 retrieving revision 1.121 diff -u -r1.120 -r1.121 --- libsepol.spec 27 Mar 2006 22:04:50 -0000 1.120 +++ libsepol.spec 29 Mar 2006 20:36:49 -0000 1.121 @@ -1,6 +1,6 @@ Summary: SELinux binary policy manipulation library Name: libsepol -Version: 1.12.3 +Version: 1.12.4 Release: 1 License: GPL Group: System Environment/Libraries @@ -80,6 +80,10 @@ %{_includedir}/sepol/policydb/*.h %changelog +* Wed Mar 29 2006 Dan Walsh 1.12.4-1 +- Upgrade to latest from NSA + * Generalize test for bitmap overflow in ebitmap_set_bit. + * Mon Mar 27 2006 Dan Walsh 1.12.3-1 - Upgrade to latest from NSA * Fixed attr_convert_callback and expand_convert_type_set Index: sources =================================================================== RCS file: /cvs/dist/rpms/libsepol/devel/sources,v retrieving revision 1.92 retrieving revision 1.93 diff -u -r1.92 -r1.93 --- sources 27 Mar 2006 22:04:50 -0000 1.92 +++ sources 29 Mar 2006 20:36:50 -0000 1.93 @@ -1 +1 @@ -515f91c72954fd5addb05769030f3373 libsepol-1.12.3.tgz +ddadf7b00a8f64143de3085ea17336cc libsepol-1.12.4.tgz From fedora-cvs-commits at redhat.com Wed Mar 29 20:39:46 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 29 Mar 2006 15:39:46 -0500 Subject: rpms/policycoreutils/devel .cvsignore, 1.105, 1.106 policycoreutils.spec, 1.253, 1.254 sources, 1.109, 1.110 Message-ID: <200603292039.k2TKdkLq010676@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/policycoreutils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv10657 Modified Files: .cvsignore policycoreutils.spec sources Log Message: * Wed Mar 29 2006 Dan Walsh 1.30.4-1 - Update from upstream * Merged audit2allow fixes for refpolicy from Dan Walsh. * Merged fixfiles patch from Dan Walsh. * Merged restorecond daemon from Dan Walsh. * Merged semanage non-MLS fixes from Chris PeBenito. * Merged semanage and semodule man page examples from Thomas Bleher. Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/policycoreutils/devel/.cvsignore,v retrieving revision 1.105 retrieving revision 1.106 diff -u -r1.105 -r1.106 --- .cvsignore 21 Mar 2006 15:49:19 -0000 1.105 +++ .cvsignore 29 Mar 2006 20:39:44 -0000 1.106 @@ -95,3 +95,4 @@ policycoreutils-1.29.27.tgz policycoreutils-1.30.tgz policycoreutils-1.30.1.tgz +policycoreutils-1.30.4.tgz Index: policycoreutils.spec =================================================================== RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils.spec,v retrieving revision 1.253 retrieving revision 1.254 diff -u -r1.253 -r1.254 --- policycoreutils.spec 29 Mar 2006 15:14:48 -0000 1.253 +++ policycoreutils.spec 29 Mar 2006 20:39:44 -0000 1.254 @@ -4,12 +4,11 @@ %define libselinuxver 1.30-1 Summary: SELinux policy core utilities. Name: policycoreutils -Version: 1.30.1 -Release: 4 +Version: 1.30.4 +Release: 1 License: GPL Group: System Environment/Base Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz -Patch: policycoreutils-rhat.patch BuildRequires: pam-devel libsepol-devel >= %{libsepolver} libsemanage-devel >= %{libsemanagever} libselinux-devel >= %{libselinuxver} Requires: /bin/mount /bin/egrep /bin/awk /usr/bin/diff @@ -35,7 +34,6 @@ %prep %setup -q -%patch -p1 -b .rhat %build make LOG_AUDIT_PRIV=y LIBDIR="%{_libdir}" CFLAGS="%{optflags}" all @@ -107,7 +105,15 @@ service restorecond condrestart %changelog -* Tue Mar 21 2006 Dan Walsh 1.30.1-4 +* Wed Mar 29 2006 Dan Walsh 1.30.4-1 +- Update from upstream + * Merged audit2allow fixes for refpolicy from Dan Walsh. + * Merged fixfiles patch from Dan Walsh. + * Merged restorecond daemon from Dan Walsh. + * Merged semanage non-MLS fixes from Chris PeBenito. + * Merged semanage and semodule man page examples from Thomas Bleher. + +* Tue Mar 28 2006 Dan Walsh 1.30.1-4 - Clean up reference policy generation in audit2allow * Tue Mar 21 2006 Dan Walsh 1.30.1-3 Index: sources =================================================================== RCS file: /cvs/dist/rpms/policycoreutils/devel/sources,v retrieving revision 1.109 retrieving revision 1.110 diff -u -r1.109 -r1.110 --- sources 21 Mar 2006 15:49:19 -0000 1.109 +++ sources 29 Mar 2006 20:39:44 -0000 1.110 @@ -1 +1 @@ -a1f4732b7c4d047a437d489b620a2895 policycoreutils-1.30.1.tgz +4af18b5ace84c5cb075f5160ab51f86b policycoreutils-1.30.4.tgz From fedora-cvs-commits at redhat.com Wed Mar 29 20:41:02 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 29 Mar 2006 15:41:02 -0500 Subject: rpms/policycoreutils/FC-5 policycoreutils-rhat.patch,1.169,1.170 Message-ID: <200603292041.k2TKf2vw010802@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/policycoreutils/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv10782 Modified Files: policycoreutils-rhat.patch Log Message: * Tue Mar 21 2006 Dan Walsh 1.30.1-3.fc5 - Add IN_MOVED_TO to catch renames policycoreutils-rhat.patch: Makefile | 2 audit2allow/audit2allow | 42 ++-- restorecond/Makefile | 29 ++ restorecond/restorecond.8 | 31 ++ restorecond/restorecond.c | 451 +++++++++++++++++++++++++++++++++++++++++++ restorecond/restorecond.conf | 4 restorecond/restorecond.h | 31 ++ restorecond/restorecond.init | 61 +++++ restorecond/stringslist.c | 118 +++++++++++ restorecond/stringslist.h | 37 +++ restorecond/utmpwatcher.c | 105 ++++++++++ restorecond/utmpwatcher.h | 29 ++ scripts/fixfiles | 10 13 files changed, 929 insertions(+), 21 deletions(-) Index: policycoreutils-rhat.patch =================================================================== RCS file: /cvs/dist/rpms/policycoreutils/FC-5/policycoreutils-rhat.patch,v retrieving revision 1.169 retrieving revision 1.170 diff -u -r1.169 -r1.170 --- policycoreutils-rhat.patch 29 Mar 2006 05:01:18 -0000 1.169 +++ policycoreutils-rhat.patch 29 Mar 2006 20:40:59 -0000 1.170 @@ -1,6 +1,6 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/audit2allow/audit2allow policycoreutils-1.30.1/audit2allow/audit2allow --- nsapolicycoreutils/audit2allow/audit2allow 2006-03-10 09:48:04.000000000 -0500 -+++ policycoreutils-1.30.1/audit2allow/audit2allow 2006-03-21 11:13:31.000000000 -0500 ++++ policycoreutils-1.30.1/audit2allow/audit2allow 2006-03-29 10:08:58.000000000 -0500 @@ -27,15 +27,14 @@ import commands, sys, os, pwd, string, getopt, re, selinux @@ -39,9 +39,73 @@ for s in Scon: for t in Tcon: for c in Class: +@@ -217,12 +215,15 @@ + class seruleRecords: + def __init__(self, input, last_reload=0, verbose=0, te_ind=0): + self.last_reload=last_reload +- self.seRules={} ++ self.initialize() ++ self.load(input, te_ind) ++ self.gen_ref_policy = False ++ ++ def initialize(self): ++ self.seRules={} + self.seclasses={} + self.types=[] + self.roles=[] +- self.load(input, te_ind) +- self.gen_ref_policy = False + + def gen_reference_policy(self): + self.gen_ref_policy = True +@@ -330,7 +331,7 @@ + return + + if "load_policy" in avc and self.last_reload: +- self.seRules={} ++ self.initialize() + + if "granted" in avc: + return +@@ -395,6 +396,9 @@ + self.types.append(type) + + def gen_module(self, module): ++ if self.gen_ref_policy: ++ return "policy_module(%s, 1.0);" % module ++ else: + return "module %s 1.0;" % module + + def gen_requires(self): +@@ -403,11 +407,11 @@ + keys=self.seclasses.keys() + keys.sort() + rec="\n\nrequire {\n" +- if len(self.roles) > 0: +- for i in self.roles: +- rec += "\trole %s; \n" % i +- rec += "\n" +- ++# if len(self.roles) > 0: ++# for i in self.roles: ++# rec += "\trole %s; \n" % i ++# rec += "\n" ++# + for i in keys: + access=self.seclasses[i] + if len(access) > 1: +@@ -423,7 +427,7 @@ + + for i in self.types: + rec += "\ttype %s; \n" % i +- rec += " };\n\n\n" ++ rec += "};\n\n" + return rec + + def out(self, require=0, module=""): diff --exclude-from=exclude -N -u -r nsapolicycoreutils/Makefile policycoreutils-1.30.1/Makefile --- nsapolicycoreutils/Makefile 2005-11-29 10:55:01.000000000 -0500 -+++ policycoreutils-1.30.1/Makefile 2006-03-21 11:13:31.000000000 -0500 ++++ policycoreutils-1.30.1/Makefile 2006-03-28 23:03:06.000000000 -0500 @@ -1,4 +1,4 @@ -SUBDIRS=setfiles semanage load_policy newrole run_init restorecon audit2allow audit2why scripts sestatus semodule_package semodule semodule_link semodule_expand setsebool po +SUBDIRS=setfiles semanage load_policy newrole run_init restorecon restorecond audit2allow audit2why scripts sestatus semodule_package semodule semodule_link semodule_expand setsebool po @@ -50,7 +114,7 @@ @for subdir in $(SUBDIRS); do \ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/restorecond/Makefile policycoreutils-1.30.1/restorecond/Makefile --- nsapolicycoreutils/restorecond/Makefile 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.30.1/restorecond/Makefile 2006-03-21 11:13:31.000000000 -0500 ++++ policycoreutils-1.30.1/restorecond/Makefile 2006-03-28 23:03:06.000000000 -0500 @@ -0,0 +1,29 @@ +# Installation directories. +PREFIX ?= ${DESTDIR}/usr @@ -83,7 +147,7 @@ + diff --exclude-from=exclude -N -u -r nsapolicycoreutils/restorecond/restorecond.8 policycoreutils-1.30.1/restorecond/restorecond.8 --- nsapolicycoreutils/restorecond/restorecond.8 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.30.1/restorecond/restorecond.8 2006-03-21 11:13:31.000000000 -0500 ++++ policycoreutils-1.30.1/restorecond/restorecond.8 2006-03-28 23:03:06.000000000 -0500 @@ -0,0 +1,31 @@ +.TH "restorecond" "8" "2002031409" "" "" +.SH "NAME" @@ -118,7 +182,7 @@ +.BR restorecon (8), diff --exclude-from=exclude -N -u -r nsapolicycoreutils/restorecond/restorecond.c policycoreutils-1.30.1/restorecond/restorecond.c --- nsapolicycoreutils/restorecond/restorecond.c 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.30.1/restorecond/restorecond.c 2006-03-21 11:13:31.000000000 -0500 ++++ policycoreutils-1.30.1/restorecond/restorecond.c 2006-03-28 23:03:06.000000000 -0500 @@ -0,0 +1,451 @@ +/* + * restorecond @@ -573,7 +637,7 @@ +} diff --exclude-from=exclude -N -u -r nsapolicycoreutils/restorecond/restorecond.conf policycoreutils-1.30.1/restorecond/restorecond.conf --- nsapolicycoreutils/restorecond/restorecond.conf 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.30.1/restorecond/restorecond.conf 2006-03-21 11:14:22.000000000 -0500 ++++ policycoreutils-1.30.1/restorecond/restorecond.conf 2006-03-28 23:03:06.000000000 -0500 @@ -0,0 +1,4 @@ +/etc/resolv.conf +/etc/mtab @@ -581,7 +645,7 @@ +~/public_html diff --exclude-from=exclude -N -u -r nsapolicycoreutils/restorecond/restorecond.h policycoreutils-1.30.1/restorecond/restorecond.h --- nsapolicycoreutils/restorecond/restorecond.h 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.30.1/restorecond/restorecond.h 2006-03-21 11:13:31.000000000 -0500 ++++ policycoreutils-1.30.1/restorecond/restorecond.h 2006-03-28 23:03:06.000000000 -0500 @@ -0,0 +1,31 @@ +/* restorecond.h -- + * Copyright 2006 Red Hat Inc., Durham, North Carolina. @@ -616,7 +680,7 @@ + diff --exclude-from=exclude -N -u -r nsapolicycoreutils/restorecond/restorecond.init policycoreutils-1.30.1/restorecond/restorecond.init --- nsapolicycoreutils/restorecond/restorecond.init 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.30.1/restorecond/restorecond.init 2006-03-21 11:13:31.000000000 -0500 ++++ policycoreutils-1.30.1/restorecond/restorecond.init 2006-03-28 23:03:06.000000000 -0500 @@ -0,0 +1,61 @@ +#!/bin/sh +# @@ -681,7 +745,7 @@ +exit 0 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/restorecond/stringslist.c policycoreutils-1.30.1/restorecond/stringslist.c --- nsapolicycoreutils/restorecond/stringslist.c 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.30.1/restorecond/stringslist.c 2006-03-21 11:13:31.000000000 -0500 ++++ policycoreutils-1.30.1/restorecond/stringslist.c 2006-03-28 23:03:06.000000000 -0500 @@ -0,0 +1,118 @@ +/* + * Copyright (C) 2006 Red Hat @@ -803,7 +867,7 @@ +#endif diff --exclude-from=exclude -N -u -r nsapolicycoreutils/restorecond/stringslist.h policycoreutils-1.30.1/restorecond/stringslist.h --- nsapolicycoreutils/restorecond/stringslist.h 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.30.1/restorecond/stringslist.h 2006-03-21 11:13:31.000000000 -0500 ++++ policycoreutils-1.30.1/restorecond/stringslist.h 2006-03-28 23:03:06.000000000 -0500 @@ -0,0 +1,37 @@ +/* stringslist.h -- + * Copyright 2006 Red Hat Inc., Durham, North Carolina. @@ -844,7 +908,7 @@ +#endif diff --exclude-from=exclude -N -u -r nsapolicycoreutils/restorecond/utmpwatcher.c policycoreutils-1.30.1/restorecond/utmpwatcher.c --- nsapolicycoreutils/restorecond/utmpwatcher.c 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.30.1/restorecond/utmpwatcher.c 2006-03-21 11:13:31.000000000 -0500 ++++ policycoreutils-1.30.1/restorecond/utmpwatcher.c 2006-03-28 23:03:06.000000000 -0500 @@ -0,0 +1,105 @@ +/* + * utmpwatcher.c @@ -953,7 +1017,7 @@ + diff --exclude-from=exclude -N -u -r nsapolicycoreutils/restorecond/utmpwatcher.h policycoreutils-1.30.1/restorecond/utmpwatcher.h --- nsapolicycoreutils/restorecond/utmpwatcher.h 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.30.1/restorecond/utmpwatcher.h 2006-03-21 11:13:31.000000000 -0500 ++++ policycoreutils-1.30.1/restorecond/utmpwatcher.h 2006-03-28 23:03:06.000000000 -0500 @@ -0,0 +1,29 @@ +/* utmpwatcher.h -- + * Copyright 2006 Red Hat Inc., Durham, North Carolina. @@ -986,7 +1050,7 @@ +#endif diff --exclude-from=exclude -N -u -r nsapolicycoreutils/scripts/fixfiles policycoreutils-1.30.1/scripts/fixfiles --- nsapolicycoreutils/scripts/fixfiles 2006-01-04 13:07:46.000000000 -0500 -+++ policycoreutils-1.30.1/scripts/fixfiles 2006-03-21 11:13:31.000000000 -0500 ++++ policycoreutils-1.30.1/scripts/fixfiles 2006-03-28 23:03:06.000000000 -0500 @@ -124,7 +124,15 @@ exit $? fi From fedora-cvs-commits at redhat.com Wed Mar 29 20:54:44 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 29 Mar 2006 15:54:44 -0500 Subject: rpms/kernel/FC-5 linux-2.6-crashdump-common.patch,1.13,1.14 Message-ID: <200603292054.k2TKsiJw025836@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv25821 Modified Files: linux-2.6-crashdump-common.patch Log Message: missing symbol fix linux-2.6-crashdump-common.patch: linux-2.6.12/Documentation/sysrq.txt | 8 linux-2.6.12/arch/i386/kernel/nmi.c | 1 linux-2.6.12/arch/i386/kernel/traps.c | 3 linux-2.6.12/arch/i386/mm/init.c | 47 +++++ linux-2.6.12/arch/ia64/kernel/process.c | 30 ++- linux-2.6.12/arch/ia64/kernel/traps.c | 6 linux-2.6.12/arch/ia64/mm/contig.c | 3 linux-2.6.12/arch/ia64/mm/discontig.c | 3 linux-2.6.12/arch/ia64/mm/init.c | 90 +++++++++ linux-2.6.12/arch/powerpc/kernel/process.c | 1 linux-2.6.12/arch/powerpc/kernel/traps.c | 3 linux-2.6.12/arch/powerpc/mm/mem.c | 29 +++ linux-2.6.12/arch/s390/kernel/traps.c | 6 linux-2.6.12/arch/x86_64/kernel/process.c | 2 linux-2.6.12/arch/x86_64/kernel/traps.c | 6 linux-2.6.12/arch/x86_64/mm/init.c | 32 +++ linux-2.6.12/drivers/char/sysrq.c | 2 linux-2.6.12/include/asm-generic/crashdump.h | 47 +++++ linux-2.6.12/include/asm-i386/crashdump.h | 123 +++++++++++++ linux-2.6.12/include/asm-i386/kmap_types.h | 4 linux-2.6.12/include/asm-ia64/crashdump.h | 72 +++++++ linux-2.6.12/include/asm-powerpc/crashdump.h | 61 ++++++ linux-2.6.12/include/asm-x86_64/crashdump.h | 86 +++++++++ linux-2.6.12/include/linux/kernel.h | 18 + linux-2.6.12/kernel/Makefile | 2 linux-2.6.12/kernel/dump.c | 246 +++++++++++++++++++++++++++ linux-2.6.12/kernel/panic.c | 4 linux-2.6.12/kernel/printk.c | 20 ++ linux-2.6.12/kernel/sched.c | 2 linux-2.6.13/arch/x86_64/mm/fault.c | 1 linux-2.6.13/drivers/char/sysrq.c | 5 linux-2.6.16.noarch/arch/i386/mm/pgtable.c | 3 32 files changed, 952 insertions(+), 14 deletions(-) Index: linux-2.6-crashdump-common.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-5/linux-2.6-crashdump-common.patch,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- linux-2.6-crashdump-common.patch 21 Mar 2006 04:04:26 -0000 1.13 +++ linux-2.6-crashdump-common.patch 29 Mar 2006 20:54:41 -0000 1.14 @@ -887,8 +887,16 @@ /* * devmem_is_allowed() checks to see if /dev/mem access to a certain address is * valid. The argument is a physical page number. ---- linux-2.6.16/arch/i386/mm/pgtable.c~ 2006-03-20 22:19:50.000000000 -0500 -+++ linux-2.6.16/arch/i386/mm/pgtable.c 2006-03-20 22:19:59.000000000 -0500 +--- linux-2.6.16.noarch/arch/i386/mm/pgtable.c~ 2006-03-24 21:29:33.000000000 -0500 ++++ linux-2.6.16.noarch/arch/i386/mm/pgtable.c 2006-03-24 21:29:42.000000000 -0500 +@@ -13,6 +13,7 @@ + #include + #include + #include ++#include + + #include + #include @@ -63,6 +64,8 @@ printk(KERN_INFO "%lu pages pagetables\n", ps.nr_page_table_pages); } From fedora-cvs-commits at redhat.com Wed Mar 29 20:56:50 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 29 Mar 2006 15:56:50 -0500 Subject: rpms/kernel/FC-4/configs config-generic, 1.55, 1.55.2.1 config-x86-generic, 1.21, 1.21.2.1 config-x86_64-generic, 1.20, 1.20.2.1 Message-ID: <200603292056.k2TKuoEk025883@cvs.devel.redhat.com> Author: linville Update of /cvs/dist/rpms/kernel/FC-4/configs In directory cvs.devel.redhat.com:/tmp/cvs-serv25861/configs Modified Files: Tag: private-linville-netdev-fc4-13-branch config-generic config-x86-generic config-x86_64-generic Log Message: Index: config-generic =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-4/configs/config-generic,v retrieving revision 1.55 retrieving revision 1.55.2.1 diff -u -r1.55 -r1.55.2.1 --- config-generic 28 Mar 2006 16:14:10 -0000 1.55 +++ config-generic 29 Mar 2006 20:56:47 -0000 1.55.2.1 @@ -648,6 +648,8 @@ CONFIG_IPV6=m CONFIG_IPV6_PRIVACY=y +CONFIG_IPV6_ROUTER_PREF=y +CONFIG_IPV6_ROUTE_INFO=y CONFIG_INET6_AH=m CONFIG_INET6_ESP=m CONFIG_INET6_IPCOMP=m @@ -679,6 +681,7 @@ CONFIG_NETFILTER_XT_MATCH_MARK=m CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m +CONFIG_NETFILTER_XT_MATCH_POLICY=m CONFIG_NETFILTER_XT_MATCH_REALM=m CONFIG_NETFILTER_XT_MATCH_SCTP=m CONFIG_NETFILTER_XT_MATCH_STATE=m @@ -762,6 +765,7 @@ CONFIG_IP_NF_FILTER=m CONFIG_IP_NF_NETBIOS_NS=m CONFIG_IP_NF_PPTP=m +CONFIG_IP_NF_H323=m # # IPv6: Netfilter Configuration @@ -849,6 +853,7 @@ CONFIG_WAN_ROUTER=m CONFIG_IP_DCCP=m CONFIG_IP_DCCP_CCID3=m +CONFIG_IP_DCCP_CCID2=m # CONFIG_IP_DCCP_DEBUG is not set CONFIG_IP_DCCP_UNLOAD_HACK=y @@ -1106,6 +1111,7 @@ # Wireless LAN (non-hamradio) # CONFIG_NET_RADIO=y +CONFIG_NET_WIRELESS_RTNETLINK=y # # Obsolete Wireless cards support (pre-802.11) @@ -1129,12 +1135,13 @@ CONFIG_IEEE80211_CRYPT_WEP=m CONFIG_IEEE80211_CRYPT_CCMP=m CONFIG_IEEE80211_CRYPT_TKIP=m +CONFIG_IEEE80211_SOFTMAC=m +CONFIG_IEEE80211_SOFTMAC_DEBUG=y # CONFIG_IPW2100 is not set -# CONFIG_IPW2100_PROMISC is not set -# CONFIG_IPW2100_LEGACY_FW_LOAD is not set # CONFIG_IPW2200 is not set # CONFIG_IPW2100_DEBUG is not set # CONFIG_IPW2200_DEBUG is not set +# CONFIG_IPW_QOS is not set CONFIG_AIRO=m CONFIG_HERMES=m CONFIG_PLX_HERMES=m @@ -1144,6 +1151,11 @@ CONFIG_ATMEL=m CONFIG_PCI_ATMEL=m CONFIG_PRISM54=m +CONFIG_PRISM54_USB=m +CONFIG_BCM43XX=m +CONFIG_BCM43XX_DEBUG=y +CONFIG_ACX_PCI=m +CONFIG_ACX_USB=m # # Wireless 802.11b Pcmcia/Cardbus cards support @@ -1223,6 +1235,7 @@ CONFIG_TEKRAM_DONGLE=m CONFIG_IRPORT_SIR=m # CONFIG_DONGLE_OLD is not set +CONFIG_TOIM3232_DONGLE=m CONFIG_LITELINK_DONGLE=m CONFIG_MA600_DONGLE=m CONFIG_GIRBIL_DONGLE=m Index: config-x86-generic =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-4/configs/config-x86-generic,v retrieving revision 1.21 retrieving revision 1.21.2.1 diff -u -r1.21 -r1.21.2.1 --- config-x86-generic 28 Mar 2006 16:14:10 -0000 1.21 +++ config-x86-generic 29 Mar 2006 20:56:47 -0000 1.21.2.1 @@ -242,12 +242,10 @@ CONFIG_IEEE80211_CRYPT_CCMP=m CONFIG_IEEE80211_CRYPT_TKIP=m CONFIG_IPW2100=m -# CONFIG_IPW_DEBUG is not set -CONFIG_IPW2100_PROMISC=y -# CONFIG_IPW2100_LEGACY_FW_LOAD is not set CONFIG_IPW2100_MONITOR=y CONFIG_IPW2200=m CONFIG_IPW2200_MONITOR=y +CONFIG_IPW_QOS=y CONFIG_BLK_DEV_AMD74XX=y Index: config-x86_64-generic =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-4/configs/config-x86_64-generic,v retrieving revision 1.20 retrieving revision 1.20.2.1 diff -u -r1.20 -r1.20.2.1 --- config-x86_64-generic 28 Mar 2006 16:14:10 -0000 1.20 +++ config-x86_64-generic 29 Mar 2006 20:56:47 -0000 1.20.2.1 @@ -105,9 +105,9 @@ CONFIG_IEEE80211_CRYPT_TKIP=m CONFIG_IPW2100=m CONFIG_IPW2100_MONITOR=y -# CONFIG_IPW_DEBUG is not set CONFIG_IPW2200=m CONFIG_IPW2200_MONITOR=y +CONFIG_IPW_QOS=y CONFIG_PNP=y CONFIG_PNPACPI=y From fedora-cvs-commits at redhat.com Wed Mar 29 21:17:26 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 29 Mar 2006 16:17:26 -0500 Subject: rpms/kernel/FC-4 kernel-2.6.spec, 1.1615.2.1, 1.1615.2.2 1431-NET-Move-destructor-from-neigh-ops-to-neigh_params.txt, 1.1.2.1, NONE 1445-ATM-Fix-build-after-neigh-parms-neigh_destructor-change.txt, 1.1.2.1, NONE Message-ID: <200603292117.k2TLHQ90007470@cvs.devel.redhat.com> Author: linville Update of /cvs/dist/rpms/kernel/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv7457 Modified Files: Tag: private-linville-netdev-fc4-13-branch kernel-2.6.spec Removed Files: Tag: private-linville-netdev-fc4-13-branch 1431-NET-Move-destructor-from-neigh-ops-to-neigh_params.txt 1445-ATM-Fix-build-after-neigh-parms-neigh_destructor-change.txt Log Message: Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-4/kernel-2.6.spec,v retrieving revision 1.1615.2.1 retrieving revision 1.1615.2.2 diff -u -r1.1615.2.1 -r1.1615.2.2 --- kernel-2.6.spec 29 Mar 2006 20:56:45 -0000 1.1615.2.1 +++ kernel-2.6.spec 29 Mar 2006 21:17:21 -0000 1.1615.2.2 @@ -648,306 +648,304 @@ Patch30280: 1428-PKTGEN-Convert-thread-lock-to-mutexes.txt Patch30281: 1429-PKTGEN-Removes-thread_-un-lock-macros.txt Patch30282: 1430-PKTGEN-Updates-version.txt -Patch30283: 1431-NET-Move-destructor-from-neigh-ops-to-neigh_params.txt -Patch30284: 1433-NET-minor-net_rx_action-optimization.txt -Patch30285: 1435-TG3-Add-5787-and-5754-basic-support.txt -Patch30286: 1436-TG3-Add-5787-nvram-support.txt -Patch30287: 1437-TG3-Add-new-hard_start_xmit.txt -Patch30288: 1439-TG3-Add-ipv6-checksum-support.txt -Patch30289: 1440-TG3-Add-new-one-shot-MSI-handler.txt -Patch30290: 1441-TG3-Fixup-memory-test-for-5787.txt -Patch30291: 1442-TG3-nvram-cleanup.txt -Patch30292: 1443-TG3-Add-firmware-version-info.txt -Patch30293: 1444-TG3-update-version-and-reldate.txt -Patch30294: 1445-ATM-Fix-build-after-neigh-parms-neigh_destructor-change.txt -Patch30295: 1446-DCCP-options-Fix-handling-of-ackvecs-in-DATA-packets.txt -Patch30296: 1448-DCCP-ditch-dccp_v-46-_ctl_send_ack.txt -Patch30297: 1449-DCCP-Remove-leftover-dccp_send_response-prototype.txt -Patch30298: 1451-NET-dev_put-dev_hold-cleanup.txt -Patch30299: 1452-IRDA-sem2mutex-drivers-net-irda.txt -Patch30300: 1454-IRDA-remove-MODULE_PARM.txt -Patch30301: 1455-CASSINI-sem2mutex.txt -Patch30302: 1456-SUNGEM-sem2mutex.txt -Patch30303: 1457-WAN-fix-section-mismatch-warning-in-sbni.txt -Patch30304: 1459-NET-sem2mutex-part-2.txt -Patch30305: 1460-DCCP-Fix-uninitialized-var-warnings-in-dccp_parse_options.txt -Patch30306: 1461-NETFILTER-Fix-warnings-in-ip_nat_snmp_basic.c.txt -Patch30307: 1462-TIPC-Fix-simple-sparse-warnings.txt -Patch30308: 1463-TIPC-Remove-inlines-from-.c.txt -Patch30309: 1464-TIPC-Remove-unused-functions.txt -Patch30310: 1465-TIPC-Cleanups.txt -Patch30311: 1466-TIPC-Reduce-stack-usage.txt -Patch30312: 1467-TIPC-Avoid-compiler-warning.txt -Patch30313: 1468-TG3-netif_carrier_off-runs-too-early-could-still-be-queued-when-init-fails.txt -Patch30314: 1469-IPV4-ARP-Alloc-acceptance-of-unsolicited-ARP-via-netdevice-sysctl.txt -Patch30315: 1471-TCP-sysctl-to-allow-TCP-window-32767-sans-wscale.txt -Patch30316: 1472-XFRM-Fix-aevent-related-crash.txt -Patch30317: 1474-DECnet-Endian-annotation-and-fixes-for-DECnet.txt -Patch30318: 1475-DECnet-Patch-to-fix-recvmsg-flag-check.txt -Patch30319: 1476-DECnet-Use-RCU-locking-in-dn_rules.c.txt -Patch30320: 1477-NET-Replace-skb_pull-skb_postpull_rcsum-with-skb_pull_rcsum.txt -Patch30321: 1478-PKT_SCHED-Let-NET_CLS_ACT-no-longer-depend-on-EXPERIMENTAL.txt -Patch30322: 1479-IPV6-remove-useless-test-in-ip6_append_data.txt -Patch30323: 1481-SNAP-Remove-leftover-unused-hdr-variable.txt -Patch30324: 1485-SK_BUFF-export-skb_pull_rcsum.txt -Patch30325: 1492-BRIDGE-ebtables-Build-fix.txt -Patch30326: 1493-BRIDGE-br_netfilter-Warning-fixes.txt -Patch30327: 1494-BRIDGE-remove-unneeded-bh-disables.txt -Patch30328: 1495-BRIDGE-use-setup_timer.txt -Patch30329: 1496-BRIDGE-use-kcalloc.txt -Patch30330: 1497-BRIDGE-use-kzalloc.txt -Patch30331: 1498-BRIDGE-optimize-frame-pass-up.txt -Patch30332: 1499-BRIDGE-netfilter-whitespace.txt -Patch30333: 1500-BRIDGE-netfilter-dont-use-__constant_htons.txt -Patch30334: 1501-BRIDGE-netfilter-VLAN-macro-cleanup.txt -Patch30335: 1502-BRIDGE-netfilter-inline-cleanup.txt -Patch30336: 1503-BRIDGE-forwarding-remove-unneeded-preempt-and-bh-diasables.txt -Patch30337: 1504-BRIDGE-stp-timer-to-jiffies-cleanup.txt -Patch30338: 1505-BRIDGE-use-llc-for-receiving-STP-packets.txt -Patch30339: 1506-BRIDGE-allow-show-store-of-group-multicast-address.txt -Patch30340: 1507-LLC-llc_mac_hdr_init-const-arguments.txt -Patch30341: 1508-BRIDGE-use-LLC-to-send-STP.txt -Patch30342: 1509-TG3-make-drivers-net-tg3.c-tg3_request_irq-static.txt -Patch30343: 1510-DECNET-net-decnet-dn_route.c-fix-inconsequent-NULL-checking.txt -Patch30344: 1511-BRIDGE-Remove-duplicate-const-from-is_link_local-argument-type.txt -Patch30345: 1512-IPV6-Cleanup-of-net-ipv6-reassambly.c.txt -Patch30346: 1513-IPV6-Nearly-complete-kzalloc-cleanup-for-net-ipv6.txt -Patch30347: 1514-IPV6-Cleanups-for-net-ipv6-addrconf.c-kzalloc-early-exit-v2.txt -Patch30348: 1515-TG3-Don-t-mark-tg3_test_registers-as-returning-const.txt -Patch30349: 1516-NETFILTER-Add-H.323-conntrack-NAT-helper.txt -Patch30350: 1593-skge-use-NAPI-for-tx-cleanup.txt -Patch30351: 1594-skge-use-auto-masking-of-irqs.txt -Patch30352: 1595-skge-check-the-allocation-of-ring-buffer.txt -Patch30353: 1596-skge-dma-configuration-cleanup.txt -Patch30354: 1597-skge-use-kcalloc.txt -Patch30355: 1598-skge-use-mmiowb.txt -Patch30356: 1599-skge-formmating-and-whitespace-cleanup.txt -Patch30357: 1600-skge-handle-pci-errors-better.txt -Patch30358: 1601-skge-version-1.4.txt -Patch30359: 1602-mv643xx_eth-Cache-align-skb-data-if-CONFIG_NOT_COHERENT_CACHE.txt -Patch30360: 1603-sky2-remove-support-for-untested-Yukon-EC-rev-0.txt -Patch30361: 1604-sky2-drop-broken-wake-on-lan-support.txt -Patch30362: 1605-sky2-rework-of-NAPI-and-IRQ-management.txt -Patch30363: 1606-sky2-coalescing-parameters.txt -Patch30364: 1607-sky2-add-MSI-support.txt -Patch30365: 1608-sky2-whitespace-fixes.txt -Patch30366: 1609-sky2-transmit-recovery.txt -Patch30367: 1610-sky2-handle-all-error-irqs.txt -Patch30368: 1611-sky2-version-1.1.txt -Patch30369: 1612-pcnet32-support-boards-with-multiple-phys.txt -Patch30370: 1613-smc91x-allow-for-dynamic-bus-access-configs.txt -Patch30371: 1614-skfp-warning-fixes.txt -Patch30372: 1615-netdrvr-pcnet32-Lindent.txt -Patch30373: 1616-netdrvr-pcnet32-other-source-formatting-cleanups.txt -Patch30374: 1648-ARM-3373-1-move-uengine-loader-to-arch-arm-common.txt -Patch30375: 1667-Fix-spelling-in-E1000_DISABLE_PACKET_SPLIT-Kconfig-description.txt -Patch30376: 1712-BLUETOOTH-Return-negative-error-constant.txt -Patch30377: 1713-NET-allow-32-bit-socket-ioctl-in-64-bit-kernel.txt -Patch30378: 1714-NET-socket-timestamp-32-bit-handler-for-64-bit-kernel.txt -Patch30379: 1715-X25-ioctl-conversion-32-bit-user-to-64-bit-kernel.txt -Patch30380: 1716-X25-fix-kernel-error-message-64-bit-kernel.txt -Patch30381: 1717-X25-allow-ITU-T-DTE-facilities-for-x25.txt -Patch30382: 1718-X25-dte-facilities-32-64-ioctl-conversion.txt -Patch30383: 1719-TG3-Fix-SRAM-access-during-tg3_init_one.txt -Patch30384: 1720-TG3-Skip-phy-power-down-on-some-devices.txt -Patch30385: 1721-TG3-Bump-driver-version-and-reldate.txt -Patch30386: 1848-netdrvr-e100-experiment-with-doing-RX-in-a-similar-manner-to-eepro100.txt -Patch30387: 1957-NETFILTER-Fix-Kconfig-typos.txt -Patch30388: 1958-NETFILTER-ctnetlink-Fix-expectaction-mask-dumping.txt -Patch30389: 1959-NETFILTER-nfnetlink_queue-fix-nfnetlink-message-size.txt -Patch30390: 1960-NETFILTER-conntrack-cleanup-the-conntrack-ID-initialization.txt -Patch30391: 1961-NETFILTER-x_tables-set-the-protocol-family-in-x_tables-targets-matches.txt -Patch30392: 1962-NETFILTER-nf_conntrack-support-for-layer-3-protocol-load-on-demand.txt -Patch30393: 1963-NETFILTER-Fix-xt_policy-address-matching.txt -Patch30394: 1964-NETFILTER-futher-ip-ip6-arp-_tables-unification.txt -Patch30395: 1965-NETFILTER-Fix-undefined-references-to-get_h225_addr.txt -Patch30396: 1982-fix-spidernet-build-issue.txt -Patch30397: 1983-AMD-Au1xx0-fix-Ethernet-TX-stats.txt -Patch30398: 1987-sky2-more-ethtool-stats.txt -Patch30399: 1988-sis900-adm7001-PHY-support.txt -Patch30400: 1989-Use-after-free-in-net-tulip-de2104x.c.txt -Patch30401: 1990-Use-of-uninitialized-variable-in-drivers-net-depca.c.txt -Patch30402: 1992-wireless-Add-softmac-layer-to-the-kernel.txt -Patch30403: 1993-make-softmac-depend-on-IEEE80211-and-EXPERIMENTAL.txt -Patch30404: 1994-softmac-fix-some-sparse-warnings.txt -Patch30405: 1995-softmac-fix-Makefiles.txt -Patch30406: 1996-softmac-convert-to-use-global-workqueue.txt -Patch30407: 1997-softmac-correctly-use-netif_carrier_-on-off.txt -Patch30408: 1998-softmac-try-to-reassociate-when-being-disassociated-from-the-AP.txt -Patch30409: 1999-softmac-add-fixme-for-disassoc.txt -Patch30410: 2000-softmac-select-best-network-based-on-rssi.txt -Patch30411: 2001-softmac-check-if-disassociation-is-for-us-before-processing-it.txt -Patch30412: 2002-softmac-scan-at-least-once-before-selecting-a-network-by-essid.txt -Patch30413: 2003-softmac-properly-check-return-value-of-ieee80211softmac_alloc_mgt.txt -Patch30414: 2004-softmac-some-comment-stuff.txt -Patch30415: 2005-softmac-add-copyright-and-license-headers.txt -Patch30416: 2006-softmac-add-MODULE_DESCRIPTION-and-MODULE_AUTHORs.txt -Patch30417: 2007-softmac-move-EXPORT_SYMBOL_GPL-right-after-functions.txt -Patch30418: 2009-update-copyright-in-softmac.txt -Patch30419: 2010-trivial-fixes-to-softmac.txt -Patch30420: 2011-softmac-update-deauth-handler-to-quiet-warning.txt -Patch30421: 2012-softmac-add-reassociation-code.txt -Patch30422: 2013-softmac-remove-dead-code.txt -Patch30423: 2014-Fix-softmac-scan.txt -Patch30424: 2028-PKTGEN-Add-MPLS-extension.txt -Patch30425: 2029-BNX2-Fix-link-change-handling.txt -Patch30426: 2030-BNX2-Combine-small-mem-allocations.txt -Patch30427: 2031-BNX2-Move-.h-files-to-bnx2.c.txt -Patch30428: 2032-BNX2-Separate-tx-producer-and-consumer-fields.txt -Patch30429: 2033-BNX2-Update-version-and-reldate.txt -Patch30430: 2034-IPV4-Add-fib-rule-netlink-notifications.txt -Patch30431: 2035-NET_SCHED-cls_u32-remove-unnecessary-NULL-ptr-check.txt -Patch30432: 2036-IPV6-ip6_xmit-remove-unnecessary-NULL-ptr-check.txt -Patch30433: 2037-TG3-Add-5755-support.txt -Patch30434: 2038-TG3-Add-5755-nvram-support.txt -Patch30435: 2039-TG3-Update-driver-version-and-reldate.txt -Patch30436: 2040-softmac-remove-function_enter.txt -Patch30437: 2041-WE-20-for-kernel-2.6.16.txt -Patch30438: 2120-sem2mutex-drivers-raw-connector-dcdbas-ppp_generic.txt -Patch30439: 2171-more-for_each_cpu-conversions.txt -Patch30440: 2188-wireless-airo-clean-up-printk-usage-to-print-device-name.txt -Patch30441: 2189-wireless-airo-define-default-MTU.txt -Patch30442: 2190-wireless-airo-cache-wireless-scans.txt -Patch30443: 2191-hostap-Fix-hw-reset-after-CMDCODE_ACCESS_WRITE-timeout.txt -Patch30444: 2192-hostap-Fix-ap_add_sta-return-value-verification.txt -Patch30445: 2193-hostap-Fix-double-free-in-prism2_config-error-path.txt -Patch30446: 2194-hostap-Fix-unlikely-read-overrun-in-CIS-parsing.txt -Patch30447: 2195-hostap-Remove-dead-code-duplicated-idx-0.txt -Patch30448: 2196-hostap-Fix-memory-leak-on-PCI-probe-error-path.txt -Patch30449: 2197-Restore-channel-setting-after-scan.txt -Patch30450: 2198-sky2-typo-in-last-stats-patch.txt -Patch30451: 2199-sky2-Fix-RX-stats.txt -Patch30452: 2200-sky2-dont-need-to-use-dev_kfree_skb_any.txt -Patch30453: 2201-skge-align-receive-buffers.txt -Patch30454: 2202-skge-dont-use-dev_alloc_skb-for-rx-buffs.txt -Patch30455: 2203-skge-rx_reuse-called-twice.txt -Patch30456: 2204-skge-multicast-statistics-fix.txt -Patch30457: 2205-skge-dont-free-skb-until-multi-part-transmit-complete.txt -Patch30458: 2206-skge-compute-available-ring-buffers.txt -Patch30459: 2207-skge-version-1.5.txt -Patch30460: 2361-remove-ISA-legacy-functions-drivers-net-hp-plus.c.txt -Patch30461: 2362-remove-ISA-legacy-functions-drivers-net-lance.c.txt -Patch30462: 2425-Fix-value-computed-not-used-warnings.txt -Patch30463: 2449-AT91RM9200-Ethernet-driver.txt -Patch30464: 2450-net-ne2k.c-won-t-compile-if-pci_clone_list-is-const.txt -Patch30465: 2514-BRIDGE-Unaligned-accesses-in-the-ethernet-bridge.txt -Patch30466: 2517-NET-Fill-in-a-32-bit-hole-in-struct-sock-on-64-bit-platforms.txt -Patch30467: 2519-WIRELESS-Fix-config-dependencies.txt -Patch30468: 2531-NET-Take-RTNL-when-unregistering-notifier.txt -Patch30469: 2532-SCTP-Fix-up-sctp_rcv-return-value.txt -Patch30470: 2533-TCP-Set-default-max-buffers-from-memory-pool-size.txt -Patch30471: 2534-TCP-Mark-tcp_-mem-__read_mostly.txt -Patch30472: 2535-IPV4-Aggregate-route-entries-with-different-TOS-values.txt -Patch30473: 2536-NETFILTER-x_table.c-sem2mutex.txt -Patch30474: 2578-fix-defined-but-not-used-warning-in-net-rxrpc-main.c-rxrpc_initialise.txt -Patch30475: 2587-hp300-fix-driver_register-return-handling-remove-dio_module_init.txt -Patch30476: 2588-EISA-tidy-up-driver_register-return-value.txt -Patch30477: 2589-amiga-fix-driver_register-return-handling-remove-zorro_module_init.txt -Patch30478: 2608-POLLRDHUP-EPOLLRDHUP-handling-for-half-closed-devices-notifications.txt -Patch30479: 2799-3c59x-use-mii_check_media.txt -Patch30480: 2800-3c59x-decrease-polling-interval.txt -Patch30481: 2801-3c59x-carriercheck-for-forced-media.txt -Patch30482: 2802-3c59x-use-ethtool_op_get_link.txt -Patch30483: 2803-3c59x-remove-per-driver-versioning.txt -Patch30484: 2804-3c59x-minor-cleanups.txt -Patch30485: 2882-more-s-fucn-func-typo-fixes.txt -Patch30486: 2942-IPSEC-Fix-tunnel-error-handling-in-ipcomp6.txt -Patch30487: 2943-NET-drop-duplicate-assignment-in-request_sock.txt -Patch30488: 2954-wireless-import-bcm43xx-sources.txt -Patch30489: 2955-bcm43xx-patch-Kconfig-and-wireless-Makefile-for-import.txt -Patch30490: 2956-bcm43xx-sync-with-svn.berlios.de.txt -Patch30491: 2957-bcm43xx-remove-linux-version-compatibility-code.txt -Patch30492: 2960-bcm43xx-add-DEBUG-Kconfig-option.-Also-fix-indention.txt -Patch30493: 2961-bcm43xx-Fix-makefile.-Remove-all-the-out-of-tree-stuff.txt -Patch30494: 2962-bcm43xx-Add-more-initvals-sanity-checks-and-error-out-if-one-sanity-check-fails.txt -Patch30495: 2963-bcm43xx-Remove-function-bcm43xx_channel_is_allowed.txt -Patch30496: 2964-bcm43xx-basic-ethtool-support.txt -Patch30497: 2965-bcm43xx-Wireless-Ext-update.txt -Patch30498: 2966-Sync-bcm43xx_phy_initb6-with-specs.txt -Patch30499: 2967-bcm43xx-fix-txpower-reporting-in-WE.txt -Patch30500: 2968-bcm43xx-enable-SPROM-writing.txt -Patch30501: 2969-bcm43xx-heavily-increase-mac_suspend-timeout.txt -Patch30502: 2970-bcm43xx-fix-compiletime-warning-phy_xmitpower.txt -Patch30503: 2971-bcm43xx-remove-WX-debugging.txt -Patch30504: 2972-bcm43xx-Partially-fix-PIO-code.-Add-Kconfig-option-for-PIO-or-DMA-mode-or-both.txt -Patch30505: 2973-bcm43xx-add-a-note-that-not-all-devices-support-PIO.txt -Patch30506: 2974-Apple-Airport-Add-Kconfig-note-that-the-bcm43xx-driver-has-to-be-used-for-Airport-Extreme-cards.txt -Patch30507: 2976-bcm43xx-fix-LED-code.txt -Patch30508: 2977-bcm43xx-rewrite-and-simplify-the-periodic-task-handling.txt -Patch30509: 2978-bcm43xx-Code-cleanups.-This-removes-various-inline-statements-and-reduces-codesize.txt -Patch30510: 2979-bcm43xx-Move-sprom-lowlevel-reading-writing-to-its-own-functions.txt -Patch30511: 2980-bcm43xx-make-bcm43xx_sprom_crc-static.txt -Patch30512: 2981-bcm43xx-split-the-channel-helper-functions-so-that-they-can-be-used-without-a-valid-running-core.txt -Patch30513: 2982-bcm43xx-remove-old-unused-struct.txt -Patch30514: 2983-bcm43xx-Fix-Kconfig-typo-transfer-mode-default.txt -Patch30515: 2984-bcm43xx-Workaround-init_board-vs-IRQ-race.txt -Patch30516: 2985-bcm43xx-move-initialized-1-to-the-end-of-init_board.txt -Patch30517: 2986-bcm43xx-add-assert-bcm-initialized-to-periodic_tasks_setup.txt -Patch30518: 2987-bcm43xx-Move-TX-RX-related-functions-to-its-own-file.-Add-basic-RTS-CTS-code.txt -Patch30519: 2988-bcm43xx-Add-sysfs-attributes-for-device-specific-tunables.txt -Patch30520: 2989-bcm43xx-fix-DMA-TX-skb-freeing-in-case-of-fragmented-packets.txt -Patch30521: 2990-bcm43xx-Set-both-the-DMAmask-and-the-coherent-DMAmask.txt -Patch30522: 2991-bcm43xx-Abstract-the-locking-mechanism.txt -Patch30523: 2992-bcm43xx-Remove-the-mmio-access-printing-facility-overhead.txt -Patch30524: 2993-bcm43xx-fix-some-stuff-add-a-few-missing-mmiowb-remove-dead-code.txt -Patch30525: 2994-bcm43xx-receive-TX-status-on-MMIO-or-DMA-unconditionally-regarding-the-80211-core-rev.txt -Patch30526: 2995-bcm43xx-add-functions-bcm43xx_dma_read-write-bcm43xx_dma_tx_suspend-resume.txt -Patch30527: 2996-bcm43xx-reduce-the-size-of-bcm43xx_private-by-removing-unneeded-members.txt -Patch30528: 2997-bcm43xx-Fix-crash-on-ifdown-by-being-careful-in-pio-dma-freeing.txt -Patch30529: 2998-bcm43xx-Remove-the-workaround-in-dummy_transmission.txt -Patch30530: 2999-bcm43xx-Do-boardflags-workarounds-for-specific-boards.txt -Patch30531: 3000-bcm43xx-properly-mask-txctl1-before-writing-it-to-hardware.txt -Patch30532: 3001-bcm43xx-remove-check-for-mmio-length-as-it-differs-among-platforms.-especially-embedded.txt -Patch30533: 3002-bcm43xx-fix-some-gpio-register-trashing-hopefully-D.txt -Patch30534: 3003-bcm43xx-merge-all-iwmode-code-into-the-set_iwmode-function.txt -Patch30535: 3004-bcm43xx-some-IRQ-handler-cleanups.txt -Patch30536: 3005-bcm43xx-set-default-attenuation-values.txt -Patch30537: 3006-bcm43xx-sync-interference-mitigation-code-to-the-specs.txt -Patch30538: 3007-bcm43xx-fix-nrssi_threshold-calculation.txt -Patch30539: 3008-bcm43xx-add-useless-and-broken-statistics-stuff.-People-seem-to-want-it.-well.txt -Patch30540: 3009-bcm43xx-get-rid-of-vim-.-lines-at-the-end-of-several-files.txt -Patch30541: 3010-bcm43xx-fix-include-issues-on-some-platforms.txt -Patch30542: 3011-bcm43xx-remove-some-compilerwarnings.txt -Patch30543: 3012-bcm43xx-fix-the-remaining-sparse-warnings.txt -Patch30544: 3013-bcm43xx-sync-GPHY-init-with-the-specs.txt -Patch30545: 3014-bcm43xx-don-t-set-the-channel-on-a-device-which-is-down.txt -Patch30546: 3015-PCMCIA_SPECTRUM-must-select-FW_LOADER.txt -Patch30547: 3017-hostap-Make-hostap_tx_encrypt-static.txt -Patch30548: 3018-hostap-Fix-EAPOL-frame-encryption.txt -Patch30549: 3056-knfsd-Change-the-store-of-auth_domains-to-not-be-a-cache.txt -Patch30550: 3058-knfsd-Get-rid-of-inplace-sunrpc-caches.txt -Patch30551: 3059-knfsd-Create-cache_lookup-function-instead-of-using-a-macro-to-declare-one.txt -Patch30552: 3060-knfsd-Convert-ip_map-cache-to-use-the-new-lookup-routine.txt -Patch30553: 3063-knfsd-Use-new-sunrpc-cache-for-rsi-cache.txt -Patch30554: 3064-knfsd-Use-new-cache-code-for-rsc-cache.txt -Patch30555: 3066-knfsd-An-assortment-of-little-fixes-to-the-sunrpc-cache-code.txt -Patch30556: 3071-knfsd-Tidy-up-unix_domain_find.txt -Patch30557: 3143-pnp-IRDA-adjust-pnp_register_driver-signature.txt -Patch30558: 3219-Minor-janitorial-change-to-ieee80211.txt -Patch30559: 3220-wireless-add-prism54usb-driver.txt -Patch30560: 3221-prism54usb-fix-build-break-in-islusb_init.c.txt -Patch30561: 3222-wireless-add-acx-driver.txt -Patch30562: 3223-acxsm-merge-from-acx-0.3.32.txt -Patch30563: 3224-tiacx-Let-only-ACX_PCI-ACX_USB-be-user-visible.txt -Patch30564: 3225-softmac-prism54usb-update.txt -Patch30565: 3226-tiacx-revert-neither-PCI-nor-USB-is-selected-change.txt -Patch30566: 3227-tiacx-implement-much-more-flexible-firmware-statistics-parsing.txt -Patch30567: 3228-tiacx-Change-acx_ioctl_-get-set-_encode-to-use-kernel-80211-stack.txt -Patch30568: 3229-tiacx-fix-breakage-of-Get-rid-of-circular-list-of-adev-s.txt -Patch30569: 3230-tiacx-split-module-into-acx-common-acx-pci-acx-usb.txt -Patch30570: 3231-softmac-reduce-scan-dwell-time.txt -Patch30571: 3232-softmac-reduce-default-rate-to-11Mbps.txt -Patch30572: 3233-update-prism54usb-sources.txt -Patch30573: 3234-TG3-Fix-probe-failure-due-to-invalid-MAC-address.txt -Patch30574: 3235-TG3-Fix-bug-in-40-bit-DMA-workaround-code.txt -Patch30575: 3236-TG3-Fix-PHY-loopback-on-5700.txt -Patch30576: 3237-TG3-Speed-up-SRAM-access.txt -Patch30577: 3238-TG3-Skip-timer-code-during-full-lock.txt -Patch30578: 3239-TG3-Update-version-and-reldate.txt -Patch30579: 3241-NET-Fix-ipx-econet-appletalk-irda-ioctl-crashes.txt -Patch30580: 3242-ECONET-Convert-away-from-SOCKOPS_WRAPPED.txt -Patch30581: 3243-NET-deinline-200-byte-inlines-in-sock.h.txt -Patch30582: XXXX-tiacx-ia64-enable.txt +Patch30283: 1433-NET-minor-net_rx_action-optimization.txt +Patch30284: 1435-TG3-Add-5787-and-5754-basic-support.txt +Patch30285: 1436-TG3-Add-5787-nvram-support.txt +Patch30286: 1437-TG3-Add-new-hard_start_xmit.txt +Patch30287: 1439-TG3-Add-ipv6-checksum-support.txt +Patch30288: 1440-TG3-Add-new-one-shot-MSI-handler.txt +Patch30289: 1441-TG3-Fixup-memory-test-for-5787.txt +Patch30290: 1442-TG3-nvram-cleanup.txt +Patch30291: 1443-TG3-Add-firmware-version-info.txt +Patch30292: 1444-TG3-update-version-and-reldate.txt +Patch30293: 1446-DCCP-options-Fix-handling-of-ackvecs-in-DATA-packets.txt +Patch30294: 1448-DCCP-ditch-dccp_v-46-_ctl_send_ack.txt +Patch30295: 1449-DCCP-Remove-leftover-dccp_send_response-prototype.txt +Patch30296: 1451-NET-dev_put-dev_hold-cleanup.txt +Patch30297: 1452-IRDA-sem2mutex-drivers-net-irda.txt +Patch30298: 1454-IRDA-remove-MODULE_PARM.txt +Patch30299: 1455-CASSINI-sem2mutex.txt +Patch30300: 1456-SUNGEM-sem2mutex.txt +Patch30301: 1457-WAN-fix-section-mismatch-warning-in-sbni.txt +Patch30302: 1459-NET-sem2mutex-part-2.txt +Patch30303: 1460-DCCP-Fix-uninitialized-var-warnings-in-dccp_parse_options.txt +Patch30304: 1461-NETFILTER-Fix-warnings-in-ip_nat_snmp_basic.c.txt +Patch30305: 1462-TIPC-Fix-simple-sparse-warnings.txt +Patch30306: 1463-TIPC-Remove-inlines-from-.c.txt +Patch30307: 1464-TIPC-Remove-unused-functions.txt +Patch30308: 1465-TIPC-Cleanups.txt +Patch30309: 1466-TIPC-Reduce-stack-usage.txt +Patch30310: 1467-TIPC-Avoid-compiler-warning.txt +Patch30311: 1468-TG3-netif_carrier_off-runs-too-early-could-still-be-queued-when-init-fails.txt +Patch30312: 1469-IPV4-ARP-Alloc-acceptance-of-unsolicited-ARP-via-netdevice-sysctl.txt +Patch30313: 1471-TCP-sysctl-to-allow-TCP-window-32767-sans-wscale.txt +Patch30314: 1472-XFRM-Fix-aevent-related-crash.txt +Patch30315: 1474-DECnet-Endian-annotation-and-fixes-for-DECnet.txt +Patch30316: 1475-DECnet-Patch-to-fix-recvmsg-flag-check.txt +Patch30317: 1476-DECnet-Use-RCU-locking-in-dn_rules.c.txt +Patch30318: 1477-NET-Replace-skb_pull-skb_postpull_rcsum-with-skb_pull_rcsum.txt +Patch30319: 1478-PKT_SCHED-Let-NET_CLS_ACT-no-longer-depend-on-EXPERIMENTAL.txt +Patch30320: 1479-IPV6-remove-useless-test-in-ip6_append_data.txt +Patch30321: 1481-SNAP-Remove-leftover-unused-hdr-variable.txt +Patch30322: 1485-SK_BUFF-export-skb_pull_rcsum.txt +Patch30323: 1492-BRIDGE-ebtables-Build-fix.txt +Patch30324: 1493-BRIDGE-br_netfilter-Warning-fixes.txt +Patch30325: 1494-BRIDGE-remove-unneeded-bh-disables.txt +Patch30326: 1495-BRIDGE-use-setup_timer.txt +Patch30327: 1496-BRIDGE-use-kcalloc.txt +Patch30328: 1497-BRIDGE-use-kzalloc.txt +Patch30329: 1498-BRIDGE-optimize-frame-pass-up.txt +Patch30330: 1499-BRIDGE-netfilter-whitespace.txt +Patch30331: 1500-BRIDGE-netfilter-dont-use-__constant_htons.txt +Patch30332: 1501-BRIDGE-netfilter-VLAN-macro-cleanup.txt +Patch30333: 1502-BRIDGE-netfilter-inline-cleanup.txt +Patch30334: 1503-BRIDGE-forwarding-remove-unneeded-preempt-and-bh-diasables.txt +Patch30335: 1504-BRIDGE-stp-timer-to-jiffies-cleanup.txt +Patch30336: 1505-BRIDGE-use-llc-for-receiving-STP-packets.txt +Patch30337: 1506-BRIDGE-allow-show-store-of-group-multicast-address.txt +Patch30338: 1507-LLC-llc_mac_hdr_init-const-arguments.txt +Patch30339: 1508-BRIDGE-use-LLC-to-send-STP.txt +Patch30340: 1509-TG3-make-drivers-net-tg3.c-tg3_request_irq-static.txt +Patch30341: 1510-DECNET-net-decnet-dn_route.c-fix-inconsequent-NULL-checking.txt +Patch30342: 1511-BRIDGE-Remove-duplicate-const-from-is_link_local-argument-type.txt +Patch30343: 1512-IPV6-Cleanup-of-net-ipv6-reassambly.c.txt +Patch30344: 1513-IPV6-Nearly-complete-kzalloc-cleanup-for-net-ipv6.txt +Patch30345: 1514-IPV6-Cleanups-for-net-ipv6-addrconf.c-kzalloc-early-exit-v2.txt +Patch30346: 1515-TG3-Don-t-mark-tg3_test_registers-as-returning-const.txt +Patch30347: 1516-NETFILTER-Add-H.323-conntrack-NAT-helper.txt +Patch30348: 1593-skge-use-NAPI-for-tx-cleanup.txt +Patch30349: 1594-skge-use-auto-masking-of-irqs.txt +Patch30350: 1595-skge-check-the-allocation-of-ring-buffer.txt +Patch30351: 1596-skge-dma-configuration-cleanup.txt +Patch30352: 1597-skge-use-kcalloc.txt +Patch30353: 1598-skge-use-mmiowb.txt +Patch30354: 1599-skge-formmating-and-whitespace-cleanup.txt +Patch30355: 1600-skge-handle-pci-errors-better.txt +Patch30356: 1601-skge-version-1.4.txt +Patch30357: 1602-mv643xx_eth-Cache-align-skb-data-if-CONFIG_NOT_COHERENT_CACHE.txt +Patch30358: 1603-sky2-remove-support-for-untested-Yukon-EC-rev-0.txt +Patch30359: 1604-sky2-drop-broken-wake-on-lan-support.txt +Patch30360: 1605-sky2-rework-of-NAPI-and-IRQ-management.txt +Patch30361: 1606-sky2-coalescing-parameters.txt +Patch30362: 1607-sky2-add-MSI-support.txt +Patch30363: 1608-sky2-whitespace-fixes.txt +Patch30364: 1609-sky2-transmit-recovery.txt +Patch30365: 1610-sky2-handle-all-error-irqs.txt +Patch30366: 1611-sky2-version-1.1.txt +Patch30367: 1612-pcnet32-support-boards-with-multiple-phys.txt +Patch30368: 1613-smc91x-allow-for-dynamic-bus-access-configs.txt +Patch30369: 1614-skfp-warning-fixes.txt +Patch30370: 1615-netdrvr-pcnet32-Lindent.txt +Patch30371: 1616-netdrvr-pcnet32-other-source-formatting-cleanups.txt +Patch30372: 1648-ARM-3373-1-move-uengine-loader-to-arch-arm-common.txt +Patch30373: 1667-Fix-spelling-in-E1000_DISABLE_PACKET_SPLIT-Kconfig-description.txt +Patch30374: 1712-BLUETOOTH-Return-negative-error-constant.txt +Patch30375: 1713-NET-allow-32-bit-socket-ioctl-in-64-bit-kernel.txt +Patch30376: 1714-NET-socket-timestamp-32-bit-handler-for-64-bit-kernel.txt +Patch30377: 1715-X25-ioctl-conversion-32-bit-user-to-64-bit-kernel.txt +Patch30378: 1716-X25-fix-kernel-error-message-64-bit-kernel.txt +Patch30379: 1717-X25-allow-ITU-T-DTE-facilities-for-x25.txt +Patch30380: 1718-X25-dte-facilities-32-64-ioctl-conversion.txt +Patch30381: 1719-TG3-Fix-SRAM-access-during-tg3_init_one.txt +Patch30382: 1720-TG3-Skip-phy-power-down-on-some-devices.txt +Patch30383: 1721-TG3-Bump-driver-version-and-reldate.txt +Patch30384: 1848-netdrvr-e100-experiment-with-doing-RX-in-a-similar-manner-to-eepro100.txt +Patch30385: 1957-NETFILTER-Fix-Kconfig-typos.txt +Patch30386: 1958-NETFILTER-ctnetlink-Fix-expectaction-mask-dumping.txt +Patch30387: 1959-NETFILTER-nfnetlink_queue-fix-nfnetlink-message-size.txt +Patch30388: 1960-NETFILTER-conntrack-cleanup-the-conntrack-ID-initialization.txt +Patch30389: 1961-NETFILTER-x_tables-set-the-protocol-family-in-x_tables-targets-matches.txt +Patch30390: 1962-NETFILTER-nf_conntrack-support-for-layer-3-protocol-load-on-demand.txt +Patch30391: 1963-NETFILTER-Fix-xt_policy-address-matching.txt +Patch30392: 1964-NETFILTER-futher-ip-ip6-arp-_tables-unification.txt +Patch30393: 1965-NETFILTER-Fix-undefined-references-to-get_h225_addr.txt +Patch30394: 1982-fix-spidernet-build-issue.txt +Patch30395: 1983-AMD-Au1xx0-fix-Ethernet-TX-stats.txt +Patch30396: 1987-sky2-more-ethtool-stats.txt +Patch30397: 1988-sis900-adm7001-PHY-support.txt +Patch30398: 1989-Use-after-free-in-net-tulip-de2104x.c.txt +Patch30399: 1990-Use-of-uninitialized-variable-in-drivers-net-depca.c.txt +Patch30400: 1992-wireless-Add-softmac-layer-to-the-kernel.txt +Patch30401: 1993-make-softmac-depend-on-IEEE80211-and-EXPERIMENTAL.txt +Patch30402: 1994-softmac-fix-some-sparse-warnings.txt +Patch30403: 1995-softmac-fix-Makefiles.txt +Patch30404: 1996-softmac-convert-to-use-global-workqueue.txt +Patch30405: 1997-softmac-correctly-use-netif_carrier_-on-off.txt +Patch30406: 1998-softmac-try-to-reassociate-when-being-disassociated-from-the-AP.txt +Patch30407: 1999-softmac-add-fixme-for-disassoc.txt +Patch30408: 2000-softmac-select-best-network-based-on-rssi.txt +Patch30409: 2001-softmac-check-if-disassociation-is-for-us-before-processing-it.txt +Patch30410: 2002-softmac-scan-at-least-once-before-selecting-a-network-by-essid.txt +Patch30411: 2003-softmac-properly-check-return-value-of-ieee80211softmac_alloc_mgt.txt +Patch30412: 2004-softmac-some-comment-stuff.txt +Patch30413: 2005-softmac-add-copyright-and-license-headers.txt +Patch30414: 2006-softmac-add-MODULE_DESCRIPTION-and-MODULE_AUTHORs.txt +Patch30415: 2007-softmac-move-EXPORT_SYMBOL_GPL-right-after-functions.txt +Patch30416: 2009-update-copyright-in-softmac.txt +Patch30417: 2010-trivial-fixes-to-softmac.txt +Patch30418: 2011-softmac-update-deauth-handler-to-quiet-warning.txt +Patch30419: 2012-softmac-add-reassociation-code.txt +Patch30420: 2013-softmac-remove-dead-code.txt +Patch30421: 2014-Fix-softmac-scan.txt +Patch30422: 2028-PKTGEN-Add-MPLS-extension.txt +Patch30423: 2029-BNX2-Fix-link-change-handling.txt +Patch30424: 2030-BNX2-Combine-small-mem-allocations.txt +Patch30425: 2031-BNX2-Move-.h-files-to-bnx2.c.txt +Patch30426: 2032-BNX2-Separate-tx-producer-and-consumer-fields.txt +Patch30427: 2033-BNX2-Update-version-and-reldate.txt +Patch30428: 2034-IPV4-Add-fib-rule-netlink-notifications.txt +Patch30429: 2035-NET_SCHED-cls_u32-remove-unnecessary-NULL-ptr-check.txt +Patch30430: 2036-IPV6-ip6_xmit-remove-unnecessary-NULL-ptr-check.txt +Patch30431: 2037-TG3-Add-5755-support.txt +Patch30432: 2038-TG3-Add-5755-nvram-support.txt +Patch30433: 2039-TG3-Update-driver-version-and-reldate.txt +Patch30434: 2040-softmac-remove-function_enter.txt +Patch30435: 2041-WE-20-for-kernel-2.6.16.txt +Patch30436: 2120-sem2mutex-drivers-raw-connector-dcdbas-ppp_generic.txt +Patch30437: 2171-more-for_each_cpu-conversions.txt +Patch30438: 2188-wireless-airo-clean-up-printk-usage-to-print-device-name.txt +Patch30439: 2189-wireless-airo-define-default-MTU.txt +Patch30440: 2190-wireless-airo-cache-wireless-scans.txt +Patch30441: 2191-hostap-Fix-hw-reset-after-CMDCODE_ACCESS_WRITE-timeout.txt +Patch30442: 2192-hostap-Fix-ap_add_sta-return-value-verification.txt +Patch30443: 2193-hostap-Fix-double-free-in-prism2_config-error-path.txt +Patch30444: 2194-hostap-Fix-unlikely-read-overrun-in-CIS-parsing.txt +Patch30445: 2195-hostap-Remove-dead-code-duplicated-idx-0.txt +Patch30446: 2196-hostap-Fix-memory-leak-on-PCI-probe-error-path.txt +Patch30447: 2197-Restore-channel-setting-after-scan.txt +Patch30448: 2198-sky2-typo-in-last-stats-patch.txt +Patch30449: 2199-sky2-Fix-RX-stats.txt +Patch30450: 2200-sky2-dont-need-to-use-dev_kfree_skb_any.txt +Patch30451: 2201-skge-align-receive-buffers.txt +Patch30452: 2202-skge-dont-use-dev_alloc_skb-for-rx-buffs.txt +Patch30453: 2203-skge-rx_reuse-called-twice.txt +Patch30454: 2204-skge-multicast-statistics-fix.txt +Patch30455: 2205-skge-dont-free-skb-until-multi-part-transmit-complete.txt +Patch30456: 2206-skge-compute-available-ring-buffers.txt +Patch30457: 2207-skge-version-1.5.txt +Patch30458: 2361-remove-ISA-legacy-functions-drivers-net-hp-plus.c.txt +Patch30459: 2362-remove-ISA-legacy-functions-drivers-net-lance.c.txt +Patch30460: 2425-Fix-value-computed-not-used-warnings.txt +Patch30461: 2449-AT91RM9200-Ethernet-driver.txt +Patch30462: 2450-net-ne2k.c-won-t-compile-if-pci_clone_list-is-const.txt +Patch30463: 2514-BRIDGE-Unaligned-accesses-in-the-ethernet-bridge.txt +Patch30464: 2517-NET-Fill-in-a-32-bit-hole-in-struct-sock-on-64-bit-platforms.txt +Patch30465: 2519-WIRELESS-Fix-config-dependencies.txt +Patch30466: 2531-NET-Take-RTNL-when-unregistering-notifier.txt +Patch30467: 2532-SCTP-Fix-up-sctp_rcv-return-value.txt +Patch30468: 2533-TCP-Set-default-max-buffers-from-memory-pool-size.txt +Patch30469: 2534-TCP-Mark-tcp_-mem-__read_mostly.txt +Patch30470: 2535-IPV4-Aggregate-route-entries-with-different-TOS-values.txt +Patch30471: 2536-NETFILTER-x_table.c-sem2mutex.txt +Patch30472: 2578-fix-defined-but-not-used-warning-in-net-rxrpc-main.c-rxrpc_initialise.txt +Patch30473: 2587-hp300-fix-driver_register-return-handling-remove-dio_module_init.txt +Patch30474: 2588-EISA-tidy-up-driver_register-return-value.txt +Patch30475: 2589-amiga-fix-driver_register-return-handling-remove-zorro_module_init.txt +Patch30476: 2608-POLLRDHUP-EPOLLRDHUP-handling-for-half-closed-devices-notifications.txt +Patch30477: 2799-3c59x-use-mii_check_media.txt +Patch30478: 2800-3c59x-decrease-polling-interval.txt +Patch30479: 2801-3c59x-carriercheck-for-forced-media.txt +Patch30480: 2802-3c59x-use-ethtool_op_get_link.txt +Patch30481: 2803-3c59x-remove-per-driver-versioning.txt +Patch30482: 2804-3c59x-minor-cleanups.txt +Patch30483: 2882-more-s-fucn-func-typo-fixes.txt +Patch30484: 2942-IPSEC-Fix-tunnel-error-handling-in-ipcomp6.txt +Patch30485: 2943-NET-drop-duplicate-assignment-in-request_sock.txt +Patch30486: 2954-wireless-import-bcm43xx-sources.txt +Patch30487: 2955-bcm43xx-patch-Kconfig-and-wireless-Makefile-for-import.txt +Patch30488: 2956-bcm43xx-sync-with-svn.berlios.de.txt +Patch30489: 2957-bcm43xx-remove-linux-version-compatibility-code.txt +Patch30490: 2960-bcm43xx-add-DEBUG-Kconfig-option.-Also-fix-indention.txt +Patch30491: 2961-bcm43xx-Fix-makefile.-Remove-all-the-out-of-tree-stuff.txt +Patch30492: 2962-bcm43xx-Add-more-initvals-sanity-checks-and-error-out-if-one-sanity-check-fails.txt +Patch30493: 2963-bcm43xx-Remove-function-bcm43xx_channel_is_allowed.txt +Patch30494: 2964-bcm43xx-basic-ethtool-support.txt +Patch30495: 2965-bcm43xx-Wireless-Ext-update.txt +Patch30496: 2966-Sync-bcm43xx_phy_initb6-with-specs.txt +Patch30497: 2967-bcm43xx-fix-txpower-reporting-in-WE.txt +Patch30498: 2968-bcm43xx-enable-SPROM-writing.txt +Patch30499: 2969-bcm43xx-heavily-increase-mac_suspend-timeout.txt +Patch30500: 2970-bcm43xx-fix-compiletime-warning-phy_xmitpower.txt +Patch30501: 2971-bcm43xx-remove-WX-debugging.txt +Patch30502: 2972-bcm43xx-Partially-fix-PIO-code.-Add-Kconfig-option-for-PIO-or-DMA-mode-or-both.txt +Patch30503: 2973-bcm43xx-add-a-note-that-not-all-devices-support-PIO.txt +Patch30504: 2974-Apple-Airport-Add-Kconfig-note-that-the-bcm43xx-driver-has-to-be-used-for-Airport-Extreme-cards.txt +Patch30505: 2976-bcm43xx-fix-LED-code.txt +Patch30506: 2977-bcm43xx-rewrite-and-simplify-the-periodic-task-handling.txt +Patch30507: 2978-bcm43xx-Code-cleanups.-This-removes-various-inline-statements-and-reduces-codesize.txt +Patch30508: 2979-bcm43xx-Move-sprom-lowlevel-reading-writing-to-its-own-functions.txt +Patch30509: 2980-bcm43xx-make-bcm43xx_sprom_crc-static.txt +Patch30510: 2981-bcm43xx-split-the-channel-helper-functions-so-that-they-can-be-used-without-a-valid-running-core.txt +Patch30511: 2982-bcm43xx-remove-old-unused-struct.txt +Patch30512: 2983-bcm43xx-Fix-Kconfig-typo-transfer-mode-default.txt +Patch30513: 2984-bcm43xx-Workaround-init_board-vs-IRQ-race.txt +Patch30514: 2985-bcm43xx-move-initialized-1-to-the-end-of-init_board.txt +Patch30515: 2986-bcm43xx-add-assert-bcm-initialized-to-periodic_tasks_setup.txt +Patch30516: 2987-bcm43xx-Move-TX-RX-related-functions-to-its-own-file.-Add-basic-RTS-CTS-code.txt +Patch30517: 2988-bcm43xx-Add-sysfs-attributes-for-device-specific-tunables.txt +Patch30518: 2989-bcm43xx-fix-DMA-TX-skb-freeing-in-case-of-fragmented-packets.txt +Patch30519: 2990-bcm43xx-Set-both-the-DMAmask-and-the-coherent-DMAmask.txt +Patch30520: 2991-bcm43xx-Abstract-the-locking-mechanism.txt +Patch30521: 2992-bcm43xx-Remove-the-mmio-access-printing-facility-overhead.txt +Patch30522: 2993-bcm43xx-fix-some-stuff-add-a-few-missing-mmiowb-remove-dead-code.txt +Patch30523: 2994-bcm43xx-receive-TX-status-on-MMIO-or-DMA-unconditionally-regarding-the-80211-core-rev.txt +Patch30524: 2995-bcm43xx-add-functions-bcm43xx_dma_read-write-bcm43xx_dma_tx_suspend-resume.txt +Patch30525: 2996-bcm43xx-reduce-the-size-of-bcm43xx_private-by-removing-unneeded-members.txt +Patch30526: 2997-bcm43xx-Fix-crash-on-ifdown-by-being-careful-in-pio-dma-freeing.txt +Patch30527: 2998-bcm43xx-Remove-the-workaround-in-dummy_transmission.txt +Patch30528: 2999-bcm43xx-Do-boardflags-workarounds-for-specific-boards.txt +Patch30529: 3000-bcm43xx-properly-mask-txctl1-before-writing-it-to-hardware.txt +Patch30530: 3001-bcm43xx-remove-check-for-mmio-length-as-it-differs-among-platforms.-especially-embedded.txt +Patch30531: 3002-bcm43xx-fix-some-gpio-register-trashing-hopefully-D.txt +Patch30532: 3003-bcm43xx-merge-all-iwmode-code-into-the-set_iwmode-function.txt +Patch30533: 3004-bcm43xx-some-IRQ-handler-cleanups.txt +Patch30534: 3005-bcm43xx-set-default-attenuation-values.txt +Patch30535: 3006-bcm43xx-sync-interference-mitigation-code-to-the-specs.txt +Patch30536: 3007-bcm43xx-fix-nrssi_threshold-calculation.txt +Patch30537: 3008-bcm43xx-add-useless-and-broken-statistics-stuff.-People-seem-to-want-it.-well.txt +Patch30538: 3009-bcm43xx-get-rid-of-vim-.-lines-at-the-end-of-several-files.txt +Patch30539: 3010-bcm43xx-fix-include-issues-on-some-platforms.txt +Patch30540: 3011-bcm43xx-remove-some-compilerwarnings.txt +Patch30541: 3012-bcm43xx-fix-the-remaining-sparse-warnings.txt +Patch30542: 3013-bcm43xx-sync-GPHY-init-with-the-specs.txt +Patch30543: 3014-bcm43xx-don-t-set-the-channel-on-a-device-which-is-down.txt +Patch30544: 3015-PCMCIA_SPECTRUM-must-select-FW_LOADER.txt +Patch30545: 3017-hostap-Make-hostap_tx_encrypt-static.txt +Patch30546: 3018-hostap-Fix-EAPOL-frame-encryption.txt +Patch30547: 3056-knfsd-Change-the-store-of-auth_domains-to-not-be-a-cache.txt +Patch30548: 3058-knfsd-Get-rid-of-inplace-sunrpc-caches.txt +Patch30549: 3059-knfsd-Create-cache_lookup-function-instead-of-using-a-macro-to-declare-one.txt +Patch30550: 3060-knfsd-Convert-ip_map-cache-to-use-the-new-lookup-routine.txt +Patch30551: 3063-knfsd-Use-new-sunrpc-cache-for-rsi-cache.txt +Patch30552: 3064-knfsd-Use-new-cache-code-for-rsc-cache.txt +Patch30553: 3066-knfsd-An-assortment-of-little-fixes-to-the-sunrpc-cache-code.txt +Patch30554: 3071-knfsd-Tidy-up-unix_domain_find.txt +Patch30555: 3143-pnp-IRDA-adjust-pnp_register_driver-signature.txt +Patch30556: 3219-Minor-janitorial-change-to-ieee80211.txt +Patch30557: 3220-wireless-add-prism54usb-driver.txt +Patch30558: 3221-prism54usb-fix-build-break-in-islusb_init.c.txt +Patch30559: 3222-wireless-add-acx-driver.txt +Patch30560: 3223-acxsm-merge-from-acx-0.3.32.txt +Patch30561: 3224-tiacx-Let-only-ACX_PCI-ACX_USB-be-user-visible.txt +Patch30562: 3225-softmac-prism54usb-update.txt +Patch30563: 3226-tiacx-revert-neither-PCI-nor-USB-is-selected-change.txt +Patch30564: 3227-tiacx-implement-much-more-flexible-firmware-statistics-parsing.txt +Patch30565: 3228-tiacx-Change-acx_ioctl_-get-set-_encode-to-use-kernel-80211-stack.txt +Patch30566: 3229-tiacx-fix-breakage-of-Get-rid-of-circular-list-of-adev-s.txt +Patch30567: 3230-tiacx-split-module-into-acx-common-acx-pci-acx-usb.txt +Patch30568: 3231-softmac-reduce-scan-dwell-time.txt +Patch30569: 3232-softmac-reduce-default-rate-to-11Mbps.txt +Patch30570: 3233-update-prism54usb-sources.txt +Patch30571: 3234-TG3-Fix-probe-failure-due-to-invalid-MAC-address.txt +Patch30572: 3235-TG3-Fix-bug-in-40-bit-DMA-workaround-code.txt +Patch30573: 3236-TG3-Fix-PHY-loopback-on-5700.txt +Patch30574: 3237-TG3-Speed-up-SRAM-access.txt +Patch30575: 3238-TG3-Skip-timer-code-during-full-lock.txt +Patch30576: 3239-TG3-Update-version-and-reldate.txt +Patch30577: 3241-NET-Fix-ipx-econet-appletalk-irda-ioctl-crashes.txt +Patch30578: 3242-ECONET-Convert-away-from-SOCKOPS_WRAPPED.txt +Patch30579: 3243-NET-deinline-200-byte-inlines-in-sock.h.txt +Patch30580: XXXX-tiacx-ia64-enable.txt # END OF PATCH DEFINITIONS @@ -1875,604 +1873,600 @@ %patch30281 -p1 # [PKTGEN]: Updates version. %patch30282 -p1 -# [NET]: Move destructor from neigh->ops to neigh_params -%patch30283 -p1 # [NET]: minor net_rx_action optimization -%patch30284 -p1 +%patch30283 -p1 # [TG3]: Add 5787 and 5754 basic support -%patch30285 -p1 +%patch30284 -p1 # [TG3]: Add 5787 nvram support -%patch30286 -p1 +%patch30285 -p1 # [TG3]: Add new hard_start_xmit -%patch30287 -p1 +%patch30286 -p1 # [TG3]: Add ipv6 checksum support -%patch30288 -p1 +%patch30287 -p1 # [TG3]: Add new one-shot MSI handler -%patch30289 -p1 +%patch30288 -p1 # [TG3]: Fixup memory test for 5787 -%patch30290 -p1 +%patch30289 -p1 # [TG3]: nvram cleanup -%patch30291 -p1 +%patch30290 -p1 # [TG3]: Add firmware version info -%patch30292 -p1 +%patch30291 -p1 # [TG3]: update version and reldate -%patch30293 -p1 -# [ATM]: Fix build after neigh->parms->neigh_destructor change. -%patch30294 -p1 +%patch30292 -p1 # [DCCP] options: Fix handling of ackvecs in DATA packets -%patch30295 -p1 +%patch30293 -p1 # [DCCP]: ditch dccp_v[46]_ctl_send_ack -%patch30296 -p1 +%patch30294 -p1 # [DCCP]: Remove leftover dccp_send_response prototype -%patch30297 -p1 +%patch30295 -p1 # [NET]: dev_put/dev_hold cleanup -%patch30298 -p1 +%patch30296 -p1 # [IRDA] sem2mutex: drivers/net/irda -%patch30299 -p1 +%patch30297 -p1 # [IRDA]: remove MODULE_PARM() -%patch30300 -p1 +%patch30298 -p1 # [CASSINI]: sem2mutex -%patch30301 -p1 +%patch30299 -p1 # [SUNGEM]: sem2mutex -%patch30302 -p1 +%patch30300 -p1 # [WAN]: fix section mismatch warning in sbni -%patch30303 -p1 +%patch30301 -p1 # [NET]: sem2mutex part 2 -%patch30304 -p1 +%patch30302 -p1 # [DCCP]: Fix uninitialized var warnings in dccp_parse_options(). -%patch30305 -p1 +%patch30303 -p1 # [NETFILTER]: Fix warnings in ip_nat_snmp_basic.c -%patch30306 -p1 +%patch30304 -p1 # [TIPC]: Fix simple sparse warnings -%patch30307 -p1 +%patch30305 -p1 # [TIPC]: Remove inlines from \*.c -%patch30308 -p1 +%patch30306 -p1 # [TIPC]: Remove unused functions -%patch30309 -p1 +%patch30307 -p1 # [TIPC]: Cleanups -%patch30310 -p1 +%patch30308 -p1 # [TIPC]: Reduce stack usage -%patch30311 -p1 +%patch30309 -p1 # [TIPC]: Avoid compiler warning -%patch30312 -p1 +%patch30310 -p1 # [TG3]: netif_carrier_off runs too early; could still be queued when init fails -%patch30313 -p1 +%patch30311 -p1 # [IPV4] ARP: Alloc acceptance of unsolicited ARP via netdevice sysctl. -%patch30314 -p1 +%patch30312 -p1 # [TCP]: sysctl to allow TCP window > 32767 sans wscale -%patch30315 -p1 +%patch30313 -p1 # [XFRM]: Fix aevent related crash -%patch30316 -p1 +%patch30314 -p1 # [DECnet]: Endian annotation and fixes for DECnet. -%patch30317 -p1 +%patch30315 -p1 # [DECnet]: Patch to fix recvmsg() flag check -%patch30318 -p1 +%patch30316 -p1 # [DECnet]: Use RCU locking in dn_rules.c -%patch30319 -p1 +%patch30317 -p1 # [NET]: Replace skb_pull/skb_postpull_rcsum with skb_pull_rcsum -%patch30320 -p1 +%patch30318 -p1 # [PKT_SCHED]: Let NET_CLS_ACT no longer depend on EXPERIMENTAL -%patch30321 -p1 +%patch30319 -p1 # [IPV6]: remove useless test in ip6_append_data -%patch30322 -p1 +%patch30320 -p1 # [SNAP]: Remove leftover unused hdr variable -%patch30323 -p1 +%patch30321 -p1 # [SK_BUFF]: export skb_pull_rcsum -%patch30324 -p1 +%patch30322 -p1 # [BRIDGE] ebtables: Build fix. -%patch30325 -p1 +%patch30323 -p1 # [BRIDGE] br_netfilter: Warning fixes. -%patch30326 -p1 +%patch30324 -p1 # [BRIDGE]: remove unneeded bh disables -%patch30327 -p1 +%patch30325 -p1 # [BRIDGE]: use setup_timer -%patch30328 -p1 +%patch30326 -p1 # [BRIDGE]: use kcalloc -%patch30329 -p1 +%patch30327 -p1 # [BRIDGE]: use kzalloc -%patch30330 -p1 +%patch30328 -p1 # [BRIDGE]: optimize frame pass up -%patch30331 -p1 +%patch30329 -p1 # [BRIDGE]: netfilter whitespace -%patch30332 -p1 +%patch30330 -p1 # [BRIDGE]: netfilter dont use __constant_htons -%patch30333 -p1 +%patch30331 -p1 # [BRIDGE]: netfilter VLAN macro cleanup -%patch30334 -p1 +%patch30332 -p1 # [BRIDGE]: netfilter inline cleanup -%patch30335 -p1 +%patch30333 -p1 # [BRIDGE]: forwarding remove unneeded preempt and bh diasables -%patch30336 -p1 +%patch30334 -p1 # [BRIDGE]: stp timer to jiffies cleanup -%patch30337 -p1 +%patch30335 -p1 # [BRIDGE]: use llc for receiving STP packets -%patch30338 -p1 +%patch30336 -p1 # [BRIDGE]: allow show/store of group multicast address -%patch30339 -p1 +%patch30337 -p1 # [LLC]: llc_mac_hdr_init const arguments -%patch30340 -p1 +%patch30338 -p1 # [BRIDGE]: use LLC to send STP -%patch30341 -p1 +%patch30339 -p1 # [TG3]: make drivers/net/tg3.c:tg3_request_irq() static -%patch30342 -p1 +%patch30340 -p1 # [DECNET]: net/decnet/dn_route.c: fix inconsequent NULL checking -%patch30343 -p1 +%patch30341 -p1 # [BRIDGE]: Remove duplicate const from is_link_local() argument type. -%patch30344 -p1 +%patch30342 -p1 # [IPV6]: Cleanup of net/ipv6/reassambly.c -%patch30345 -p1 +%patch30343 -p1 # [IPV6]: Nearly complete kzalloc cleanup for net/ipv6 -%patch30346 -p1 +%patch30344 -p1 # [IPV6]: Cleanups for net/ipv6/addrconf.c (kzalloc, early exit) v2 -%patch30347 -p1 +%patch30345 -p1 # [TG3]: Don't mark tg3_test_registers() as returning const. -%patch30348 -p1 +%patch30346 -p1 # [NETFILTER]: Add H.323 conntrack/NAT helper -%patch30349 -p1 +%patch30347 -p1 # skge: use NAPI for tx cleanup. -%patch30350 -p1 +%patch30348 -p1 # skge: use auto masking of irqs -%patch30351 -p1 +%patch30349 -p1 # skge: check the allocation of ring buffer -%patch30352 -p1 +%patch30350 -p1 # skge: dma configuration cleanup -%patch30353 -p1 +%patch30351 -p1 # skge: use kcalloc -%patch30354 -p1 +%patch30352 -p1 # skge: use mmiowb -%patch30355 -p1 +%patch30353 -p1 # skge: formmating and whitespace cleanup -%patch30356 -p1 +%patch30354 -p1 # skge: handle pci errors better -%patch30357 -p1 +%patch30355 -p1 # skge: version 1.4 -%patch30358 -p1 +%patch30356 -p1 # mv643xx_eth: Cache align skb->data if CONFIG_NOT_COHERENT_CACHE -%patch30359 -p1 +%patch30357 -p1 # sky2: remove support for untested Yukon EC/rev 0 -%patch30360 -p1 +%patch30358 -p1 # sky2: drop broken wake on lan support -%patch30361 -p1 +%patch30359 -p1 # sky2: rework of NAPI and IRQ management -%patch30362 -p1 +%patch30360 -p1 # sky2: coalescing parameters -%patch30363 -p1 +%patch30361 -p1 # sky2: add MSI support -%patch30364 -p1 +%patch30362 -p1 # sky2: whitespace fixes -%patch30365 -p1 +%patch30363 -p1 # sky2: transmit recovery -%patch30366 -p1 +%patch30364 -p1 # sky2: handle all error irqs -%patch30367 -p1 +%patch30365 -p1 # sky2 version 1.1 -%patch30368 -p1 +%patch30366 -p1 # pcnet32: support boards with multiple phys -%patch30369 -p1 +%patch30367 -p1 # smc91x: allow for dynamic bus access configs -%patch30370 -p1 +%patch30368 -p1 # skfp warning fixes -%patch30371 -p1 +%patch30369 -p1 # [netdrvr] pcnet32: Lindent -%patch30372 -p1 +%patch30370 -p1 # [netdrvr] pcnet32: other source formatting cleanups -%patch30373 -p1 +%patch30371 -p1 # [ARM] 3373/1: move uengine loader to arch/arm/common -%patch30374 -p1 +%patch30372 -p1 # Fix spelling in E1000_DISABLE_PACKET_SPLIT Kconfig description -%patch30375 -p1 +%patch30373 -p1 # [BLUETOOTH]: Return negative error constant -%patch30376 -p1 +%patch30374 -p1 # [NET]: allow 32 bit socket ioctl in 64 bit kernel -%patch30377 -p1 +%patch30375 -p1 # [NET]: socket timestamp 32 bit handler for 64 bit kernel -%patch30378 -p1 +%patch30376 -p1 # [X25]: ioctl conversion 32 bit user to 64 bit kernel -%patch30379 -p1 +%patch30377 -p1 # [X25]: fix kernel error message 64 bit kernel -%patch30380 -p1 +%patch30378 -p1 # [X25]: allow ITU-T DTE facilities for x25 -%patch30381 -p1 +%patch30379 -p1 # [X25]: dte facilities 32 64 ioctl conversion -%patch30382 -p1 +%patch30380 -p1 # [TG3]: Fix SRAM access during tg3_init_one() -%patch30383 -p1 +%patch30381 -p1 # [TG3]: Skip phy power down on some devices -%patch30384 -p1 +%patch30382 -p1 # [TG3]: Bump driver version and reldate. -%patch30385 -p1 +%patch30383 -p1 # [netdrvr e100] experiment with doing RX in a similar manner to eepro100 -%patch30386 -p1 +%patch30384 -p1 # [NETFILTER]: Fix Kconfig typos -%patch30387 -p1 +%patch30385 -p1 # [NETFILTER]: ctnetlink: Fix expectaction mask dumping -%patch30388 -p1 +%patch30386 -p1 # [NETFILTER]: nfnetlink_queue: fix nfnetlink message size -%patch30389 -p1 +%patch30387 -p1 # [NETFILTER]: conntrack: cleanup the conntrack ID initialization -%patch30390 -p1 +%patch30388 -p1 # [NETFILTER]: x_tables: set the protocol family in x_tables targets/matches -%patch30391 -p1 +%patch30389 -p1 # [NETFILTER]: nf_conntrack: support for layer 3 protocol load on demand -%patch30392 -p1 +%patch30390 -p1 # [NETFILTER]: Fix xt_policy address matching -%patch30393 -p1 +%patch30391 -p1 # [NETFILTER]: futher {ip,ip6,arp}_tables unification -%patch30394 -p1 +%patch30392 -p1 # [NETFILTER]: Fix undefined references to get_h225_addr -%patch30395 -p1 +%patch30393 -p1 # fix spidernet build issue -%patch30396 -p1 +%patch30394 -p1 # AMD Au1xx0: fix Ethernet TX stats -%patch30397 -p1 +%patch30395 -p1 # sky2: more ethtool stats -%patch30398 -p1 +%patch30396 -p1 # sis900 adm7001 PHY support -%patch30399 -p1 +%patch30397 -p1 # Use after free in net/tulip/de2104x.c -%patch30400 -p1 +%patch30398 -p1 # Use of uninitialized variable in drivers/net/depca.c -%patch30401 -p1 +%patch30399 -p1 # wireless: Add softmac layer to the kernel -%patch30402 -p1 +%patch30400 -p1 # make softmac depend on IEEE80211 and EXPERIMENTAL -%patch30403 -p1 +%patch30401 -p1 # softmac: fix some sparse warnings -%patch30404 -p1 +%patch30402 -p1 # softmac: fix Makefiles -%patch30405 -p1 +%patch30403 -p1 # softmac: convert to use global workqueue -%patch30406 -p1 +%patch30404 -p1 # softmac: correctly use netif_carrier_{on,off} -%patch30407 -p1 +%patch30405 -p1 # softmac: try to reassociate when being disassociated from the AP -%patch30408 -p1 +%patch30406 -p1 # softmac: add fixme for disassoc -%patch30409 -p1 +%patch30407 -p1 # softmac: select "best" network based on rssi -%patch30410 -p1 +%patch30408 -p1 # softmac: check if disassociation is for us before processing it -%patch30411 -p1 +%patch30409 -p1 # softmac: scan at least once before selecting a network by essid -%patch30412 -p1 +%patch30410 -p1 # softmac: properly check return value of ieee80211softmac_alloc_mgt -%patch30413 -p1 +%patch30411 -p1 # softmac: some comment stuff -%patch30414 -p1 +%patch30412 -p1 # softmac: add copyright and license headers -%patch30415 -p1 +%patch30413 -p1 # softmac: add MODULE_DESCRIPTION and MODULE_AUTHORs -%patch30416 -p1 +%patch30414 -p1 # softmac: move EXPORT_SYMBOL_GPL right after functions -%patch30417 -p1 +%patch30415 -p1 # update copyright in softmac -%patch30418 -p1 +%patch30416 -p1 # trivial fixes to softmac -%patch30419 -p1 +%patch30417 -p1 # softmac: update deauth handler to quiet warning -%patch30420 -p1 +%patch30418 -p1 # softmac: add reassociation code -%patch30421 -p1 +%patch30419 -p1 # softmac: remove dead code -%patch30422 -p1 +%patch30420 -p1 # Fix softmac scan -%patch30423 -p1 +%patch30421 -p1 # [PKTGEN]: Add MPLS extension. -%patch30424 -p1 +%patch30422 -p1 # [BNX2]: Fix link change handling -%patch30425 -p1 +%patch30423 -p1 # [BNX2]: Combine small mem allocations -%patch30426 -p1 +%patch30424 -p1 # [BNX2]: Move .h files to bnx2.c -%patch30427 -p1 +%patch30425 -p1 # [BNX2]: Separate tx producer and consumer fields -%patch30428 -p1 +%patch30426 -p1 # [BNX2]: Update version and reldate -%patch30429 -p1 +%patch30427 -p1 # [IPV4]: Add fib rule netlink notifications -%patch30430 -p1 +%patch30428 -p1 # [NET_SCHED]: cls_u32: remove unnecessary NULL-ptr check -%patch30431 -p1 +%patch30429 -p1 # [IPV6]: ip6_xmit: remove unnecessary NULL ptr check -%patch30432 -p1 +%patch30430 -p1 # [TG3]: Add 5755 support -%patch30433 -p1 +%patch30431 -p1 # [TG3]: Add 5755 nvram support -%patch30434 -p1 +%patch30432 -p1 # [TG3]: Update driver version and reldate. -%patch30435 -p1 +%patch30433 -p1 # softmac: remove function_enter() -%patch30436 -p1 +%patch30434 -p1 # WE-20 for kernel 2.6.16 -%patch30437 -p1 +%patch30435 -p1 # sem2mutex: drivers: raw, connector, dcdbas, ppp_generic -%patch30438 -p1 +%patch30436 -p1 # more for_each_cpu() conversions -%patch30439 -p1 +%patch30437 -p1 # wireless/airo: clean up printk usage to print device name -%patch30440 -p1 +%patch30438 -p1 # wireless/airo: define default MTU -%patch30441 -p1 +%patch30439 -p1 # wireless/airo: cache wireless scans -%patch30442 -p1 +%patch30440 -p1 # hostap: Fix hw reset after CMDCODE_ACCESS_WRITE timeout -%patch30443 -p1 +%patch30441 -p1 # hostap: Fix ap_add_sta() return value verification -%patch30444 -p1 +%patch30442 -p1 # hostap: Fix double free in prism2_config() error path -%patch30445 -p1 +%patch30443 -p1 # hostap: Fix unlikely read overrun in CIS parsing -%patch30446 -p1 +%patch30444 -p1 # hostap: Remove dead code (duplicated idx != 0) -%patch30447 -p1 +%patch30445 -p1 # hostap: Fix memory leak on PCI probe error path -%patch30448 -p1 +%patch30446 -p1 # Restore channel setting after scan. -%patch30449 -p1 +%patch30447 -p1 # sky2: typo in last stats patch -%patch30450 -p1 +%patch30448 -p1 # sky2: Fix RX stats -%patch30451 -p1 +%patch30449 -p1 # sky2: dont need to use dev_kfree_skb_any -%patch30452 -p1 +%patch30450 -p1 # skge: align receive buffers -%patch30453 -p1 +%patch30451 -p1 # skge: dont use dev_alloc_skb for rx buffs -%patch30454 -p1 +%patch30452 -p1 # skge: rx_reuse called twice -%patch30455 -p1 +%patch30453 -p1 # skge: multicast statistics fix -%patch30456 -p1 +%patch30454 -p1 # skge: dont free skb until multi-part transmit complete -%patch30457 -p1 +%patch30455 -p1 # skge: compute available ring buffers -%patch30458 -p1 +%patch30456 -p1 # skge: version 1.5 -%patch30459 -p1 +%patch30457 -p1 # remove ISA legacy functions: drivers/net/hp-plus.c -%patch30460 -p1 +%patch30458 -p1 # remove ISA legacy functions: drivers/net/lance.c -%patch30461 -p1 +%patch30459 -p1 # Fix "value computed not used" warnings -%patch30462 -p1 +%patch30460 -p1 # AT91RM9200 Ethernet driver -%patch30463 -p1 +%patch30461 -p1 # net: ne2k.c won't compile if pci_clone_list is const -%patch30464 -p1 +%patch30462 -p1 # [BRIDGE]: Unaligned accesses in the ethernet bridge -%patch30465 -p1 +%patch30463 -p1 # [NET]: Fill in a 32-bit hole in struct sock on 64-bit platforms. -%patch30466 -p1 +%patch30464 -p1 # [WIRELESS]: Fix config dependencies. -%patch30467 -p1 +%patch30465 -p1 # [NET]: Take RTNL when unregistering notifier -%patch30468 -p1 +%patch30466 -p1 # [SCTP]: Fix up sctp_rcv return value -%patch30469 -p1 +%patch30467 -p1 # [TCP]: Set default max buffers from memory pool size -%patch30470 -p1 +%patch30468 -p1 # [TCP]: Mark tcp_\*mem[] __read_mostly. -%patch30471 -p1 +%patch30469 -p1 # [IPV4]: Aggregate route entries with different TOS values -%patch30472 -p1 +%patch30470 -p1 # [NETFILTER] x_table.c: sem2mutex -%patch30473 -p1 +%patch30471 -p1 # fix 'defined but not used' warning in net/rxrpc/main.c::rxrpc_initialise -%patch30474 -p1 +%patch30472 -p1 # hp300: fix driver_register() return handling, remove dio_module_init() -%patch30475 -p1 +%patch30473 -p1 # EISA: tidy-up driver_register() return value -%patch30476 -p1 +%patch30474 -p1 # amiga: fix driver_register() return handling, remove zorro_module_init() -%patch30477 -p1 +%patch30475 -p1 # POLLRDHUP/EPOLLRDHUP handling for half-closed devices notifications -%patch30478 -p1 +%patch30476 -p1 # 3c59x: use mii_check_media -%patch30479 -p1 +%patch30477 -p1 # 3c59x: decrease polling interval -%patch30480 -p1 +%patch30478 -p1 # 3c59x: carriercheck for forced media -%patch30481 -p1 +%patch30479 -p1 # 3c59x: use ethtool_op_get_link -%patch30482 -p1 +%patch30480 -p1 # 3c59x: remove per-driver versioning -%patch30483 -p1 +%patch30481 -p1 # 3c59x: minor cleanups -%patch30484 -p1 +%patch30482 -p1 # more s/fucn/func/ typo fixes -%patch30485 -p1 +%patch30483 -p1 # [IPSEC]: Fix tunnel error handling in ipcomp6 -%patch30486 -p1 +%patch30484 -p1 # [NET]: drop duplicate assignment in request_sock -%patch30487 -p1 +%patch30485 -p1 # wireless: import bcm43xx sources -%patch30488 -p1 +%patch30486 -p1 # bcm43xx: patch Kconfig and wireless/Makefile for import -%patch30489 -p1 +%patch30487 -p1 # bcm43xx: sync with svn.berlios.de -%patch30490 -p1 +%patch30488 -p1 # bcm43xx: remove linux version compatibility code. -%patch30491 -p1 +%patch30489 -p1 # bcm43xx: add DEBUG Kconfig option. Also fix indention. -%patch30492 -p1 +%patch30490 -p1 # bcm43xx: Fix makefile. Remove all the "out-of-tree" stuff. -%patch30493 -p1 +%patch30491 -p1 # bcm43xx: Add more initvals sanity checks and error out, if one sanity check fails. -%patch30494 -p1 +%patch30492 -p1 # bcm43xx: Remove function bcm43xx_channel_is_allowed() -%patch30495 -p1 +%patch30493 -p1 # bcm43xx: basic ethtool support -%patch30496 -p1 +%patch30494 -p1 # bcm43xx: Wireless Ext update -%patch30497 -p1 +%patch30495 -p1 # Sync bcm43xx_phy_initb6() with specs -%patch30498 -p1 +%patch30496 -p1 # bcm43xx: fix txpower reporting in WE. -%patch30499 -p1 +%patch30497 -p1 # bcm43xx: enable SPROM writing. -%patch30500 -p1 +%patch30498 -p1 # bcm43xx: heavily increase mac_suspend timeout. -%patch30501 -p1 +%patch30499 -p1 # bcm43xx: fix compiletime warning (phy_xmitpower) -%patch30502 -p1 +%patch30500 -p1 # bcm43xx: remove WX debugging. -%patch30503 -p1 +%patch30501 -p1 # bcm43xx: Partially fix PIO code. Add Kconfig option for PIO or DMA mode (or both). -%patch30504 -p1 +%patch30502 -p1 # bcm43xx: add a note that not all devices support PIO. -%patch30505 -p1 +%patch30503 -p1 # Apple Airport: Add Kconfig note that the bcm43xx driver has to be used for Airport Extreme cards. -%patch30506 -p1 +%patch30504 -p1 # bcm43xx: fix LED code. -%patch30507 -p1 +%patch30505 -p1 # bcm43xx: rewrite and simplify the periodic task handling. -%patch30508 -p1 +%patch30506 -p1 # bcm43xx: Code cleanups. This removes various "inline" statements and reduces codesize. -%patch30509 -p1 +%patch30507 -p1 # bcm43xx: Move sprom lowlevel reading/writing to its own functions. -%patch30510 -p1 +%patch30508 -p1 # bcm43xx: make bcm43xx_sprom_crc() static. -%patch30511 -p1 +%patch30509 -p1 # bcm43xx: split the channel helper functions, so that they can be used without a valid running core. -%patch30512 -p1 +%patch30510 -p1 # bcm43xx: remove old unused struct. -%patch30513 -p1 +%patch30511 -p1 # bcm43xx: Fix Kconfig typo (transfer mode default) -%patch30514 -p1 +%patch30512 -p1 # bcm43xx: Workaround init_board vs IRQ race. -%patch30515 -p1 +%patch30513 -p1 # bcm43xx: move initialized = 1 to the end of init_board. -%patch30516 -p1 +%patch30514 -p1 # bcm43xx: add assert(bcm->initialized) to periodic_tasks_setup(). -%patch30517 -p1 +%patch30515 -p1 # bcm43xx: Move TX/RX related functions to its own file. Add basic RTS/CTS code. -%patch30518 -p1 +%patch30516 -p1 # bcm43xx: Add sysfs attributes for device specific tunables. -%patch30519 -p1 +%patch30517 -p1 # bcm43xx: fix DMA TX skb freeing in case of fragmented packets. -%patch30520 -p1 +%patch30518 -p1 # bcm43xx: Set both, the DMAmask and the coherent DMAmask. -%patch30521 -p1 +%patch30519 -p1 # bcm43xx: Abstract the locking mechanism. -%patch30522 -p1 +%patch30520 -p1 # bcm43xx: Remove the mmio access printing facility overhead. -%patch30523 -p1 +%patch30521 -p1 # bcm43xx: fix some stuff, add a few missing mmiowb(), remove dead code. -%patch30524 -p1 +%patch30522 -p1 # bcm43xx: receive TX status on MMIO or DMA unconditionally regarding the 80211 core rev. -%patch30525 -p1 +%patch30523 -p1 # bcm43xx: add functions bcm43xx_dma_read/write, bcm43xx_dma_tx_suspend/resume. -%patch30526 -p1 +%patch30524 -p1 # bcm43xx: reduce the size of bcm43xx_private by removing unneeded members. -%patch30527 -p1 +%patch30525 -p1 # bcm43xx: Fix crash on ifdown, by being careful in pio/dma freeing. -%patch30528 -p1 +%patch30526 -p1 # bcm43xx: Remove the workaround in dummy_transmission, -%patch30529 -p1 +%patch30527 -p1 # bcm43xx: Do boardflags workarounds for specific boards. -%patch30530 -p1 +%patch30528 -p1 # bcm43xx: properly mask txctl1 before writing it to hardware. -%patch30531 -p1 +%patch30529 -p1 # bcm43xx: remove check for mmio length, as it differs among platforms. (especially embedded) -%patch30532 -p1 +%patch30530 -p1 # bcm43xx: fix some gpio register trashing (hopefully :D) -%patch30533 -p1 +%patch30531 -p1 # bcm43xx: merge all iwmode code into the set_iwmode function. -%patch30534 -p1 +%patch30532 -p1 # bcm43xx: some IRQ handler cleanups. -%patch30535 -p1 +%patch30533 -p1 # bcm43xx: set default attenuation values. -%patch30536 -p1 +%patch30534 -p1 # bcm43xx: sync interference mitigation code to the specs. -%patch30537 -p1 +%patch30535 -p1 # bcm43xx: fix nrssi_threshold calculation. -%patch30538 -p1 +%patch30536 -p1 # bcm43xx: add useless and broken statistics stuff. People seem to want it. well... -%patch30539 -p1 +%patch30537 -p1 # bcm43xx: get rid of "/\* vim: ..." lines at the end of several files. -%patch30540 -p1 +%patch30538 -p1 # bcm43xx: fix "include" issues on some platforms. -%patch30541 -p1 +%patch30539 -p1 # bcm43xx: remove some compilerwarnings. -%patch30542 -p1 +%patch30540 -p1 # bcm43xx: fix the remaining sparse warnings. -%patch30543 -p1 +%patch30541 -p1 # bcm43xx: sync GPHY init with the specs. -%patch30544 -p1 +%patch30542 -p1 # bcm43xx: don't set the channel on a device, which is down. -%patch30545 -p1 +%patch30543 -p1 # PCMCIA_SPECTRUM must select FW_LOADER -%patch30546 -p1 +%patch30544 -p1 # hostap: Make hostap_tx_encrypt() static -%patch30547 -p1 +%patch30545 -p1 # hostap: Fix EAPOL frame encryption -%patch30548 -p1 +%patch30546 -p1 # knfsd: Change the store of auth_domains to not be a 'cache' -%patch30549 -p1 +%patch30547 -p1 # knfsd: Get rid of 'inplace' sunrpc caches -%patch30550 -p1 +%patch30548 -p1 # knfsd: Create cache_lookup function instead of using a macro to declare one -%patch30551 -p1 +%patch30549 -p1 # knfsd: Convert ip_map cache to use the new lookup routine -%patch30552 -p1 +%patch30550 -p1 # knfsd: Use new sunrpc cache for rsi cache -%patch30553 -p1 +%patch30551 -p1 # knfsd: Use new cache code for rsc cache -%patch30554 -p1 +%patch30552 -p1 # knfsd: An assortment of little fixes to the sunrpc cache code -%patch30555 -p1 +%patch30553 -p1 # knfsd: Tidy up unix_domain_find -%patch30556 -p1 +%patch30554 -p1 # pnp: IRDA: adjust pnp_register_driver signature -%patch30557 -p1 +%patch30555 -p1 # Minor (janitorial) change to ieee80211 -%patch30558 -p1 +%patch30556 -p1 # wireless: add prism54usb driver -%patch30559 -p1 +%patch30557 -p1 # prism54usb: fix build break in islusb_init.c -%patch30560 -p1 +%patch30558 -p1 # wireless: add acx driver -%patch30561 -p1 +%patch30559 -p1 # acxsm: merge from acx 0.3.32 -%patch30562 -p1 +%patch30560 -p1 # tiacx: Let only ACX_PCI/ACX_USB be user-visible -%patch30563 -p1 +%patch30561 -p1 # softmac: prism54usb update -%patch30564 -p1 +%patch30562 -p1 # tiacx: revert "neither PCI nor USB is selected" change -%patch30565 -p1 +%patch30563 -p1 # tiacx: implement much more flexible firmware statistics parsing -%patch30566 -p1 +%patch30564 -p1 # tiacx: Change acx_ioctl_{get,set}_encode to use kernel 80211 stack -%patch30567 -p1 +%patch30565 -p1 # tiacx: fix breakage of "Get rid of circular list of adev's" -%patch30568 -p1 +%patch30566 -p1 # tiacx: split module into acx-common + acx-pci + acx-usb -%patch30569 -p1 +%patch30567 -p1 # softmac: reduce scan dwell time -%patch30570 -p1 +%patch30568 -p1 # softmac: reduce default rate to 11Mbps. -%patch30571 -p1 +%patch30569 -p1 # update prism54usb sources -%patch30572 -p1 +%patch30570 -p1 # [TG3]: Fix probe failure due to invalid MAC address -%patch30573 -p1 +%patch30571 -p1 # [TG3]: Fix bug in 40-bit DMA workaround code -%patch30574 -p1 +%patch30572 -p1 # [TG3]: Fix PHY loopback on 5700 -%patch30575 -p1 +%patch30573 -p1 # [TG3]: Speed up SRAM access -%patch30576 -p1 +%patch30574 -p1 # [TG3]: Skip timer code during full lock -%patch30577 -p1 +%patch30575 -p1 # [TG3]: Update version and reldate -%patch30578 -p1 +%patch30576 -p1 # [NET]: Fix ipx/econet/appletalk/irda ioctl crashes -%patch30579 -p1 +%patch30577 -p1 # [ECONET]: Convert away from SOCKOPS_WRAPPED -%patch30580 -p1 +%patch30578 -p1 # [NET]: deinline 200+ byte inlines in sock.h -%patch30581 -p1 +%patch30579 -p1 # tiacx: enable build for ia64 %patch30582 -p1 @@ -3096,7 +3090,6 @@ - [PKTGEN]: Convert thread lock to mutexes. - [PKTGEN]: Removes thread_{un,}lock() macros. - [PKTGEN]: Updates version. -- [NET]: Move destructor from neigh->ops to neigh_params - [NET]: minor net_rx_action optimization - [TG3]: Add 5787 and 5754 basic support - [TG3]: Add 5787 nvram support @@ -3107,7 +3100,6 @@ - [TG3]: nvram cleanup - [TG3]: Add firmware version info - [TG3]: update version and reldate -- [ATM]: Fix build after neigh->parms->neigh_destructor change. - [DCCP] options: Fix handling of ackvecs in DATA packets - [DCCP]: ditch dccp_v[46]_ctl_send_ack - [DCCP]: Remove leftover dccp_send_response prototype --- 1431-NET-Move-destructor-from-neigh-ops-to-neigh_params.txt DELETED --- --- 1445-ATM-Fix-build-after-neigh-parms-neigh_destructor-change.txt DELETED --- From fedora-cvs-commits at redhat.com Wed Mar 29 21:17:57 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 29 Mar 2006 16:17:57 -0500 Subject: rpms/kernel/FC-4 kernel-2.6.spec,1.1615.2.2,1.1615.2.3 Message-ID: <200603292117.k2TLHvLo007599@cvs.devel.redhat.com> Author: linville Update of /cvs/dist/rpms/kernel/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv7586 Modified Files: Tag: private-linville-netdev-fc4-13-branch kernel-2.6.spec Log Message: Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-4/kernel-2.6.spec,v retrieving revision 1.1615.2.2 retrieving revision 1.1615.2.3 diff -u -r1.1615.2.2 -r1.1615.2.3 --- kernel-2.6.spec 29 Mar 2006 21:17:21 -0000 1.1615.2.2 +++ kernel-2.6.spec 29 Mar 2006 21:17:55 -0000 1.1615.2.3 @@ -2468,7 +2468,7 @@ # [NET]: deinline 200+ byte inlines in sock.h %patch30579 -p1 # tiacx: enable build for ia64 -%patch30582 -p1 +%patch30580 -p1 # END OF PATCH APPLICATIONS From fedora-cvs-commits at redhat.com Wed Mar 29 21:27:56 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 29 Mar 2006 16:27:56 -0500 Subject: rpms/selinux-policy/FC-5 policy-20060207.patch,1.53,1.54 Message-ID: <200603292127.k2TLRuET007990@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/selinux-policy/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv7973 Modified Files: policy-20060207.patch Log Message: * Wed Mar 22 2006 Dan Walsh 2.2.25-3.fc5 - Fixes for hplip and klogd policy-20060207.patch: Rules.modular | 2 policy/mcs | 4 policy/modules/admin/bootloader.te | 2 policy/modules/admin/dmidecode.te | 2 policy/modules/admin/logwatch.te | 1 policy/modules/admin/readahead.te | 2 policy/modules/admin/rpm.fc | 3 policy/modules/admin/rpm.if | 3 policy/modules/admin/rpm.te | 1 policy/modules/admin/su.fc | 1 policy/modules/admin/su.if | 6 policy/modules/admin/updfstab.te | 4 policy/modules/admin/usermanage.te | 2 policy/modules/admin/vbetool.te | 9 + policy/modules/kernel/corenetwork.te.in | 5 policy/modules/kernel/devices.fc | 1 policy/modules/kernel/devices.if | 59 ++++++++ policy/modules/kernel/files.fc | 8 - policy/modules/kernel/files.if | 33 ++++ policy/modules/kernel/filesystem.te | 1 policy/modules/kernel/kernel.if | 102 ++++++++++++++ policy/modules/kernel/kernel.te | 3 policy/modules/services/apache.fc | 2 policy/modules/services/apache.if | 5 policy/modules/services/apm.fc | 2 policy/modules/services/apm.te | 4 policy/modules/services/bluetooth.te | 38 ++--- policy/modules/services/cron.te | 3 policy/modules/services/cups.fc | 2 policy/modules/services/cups.if | 22 +++ policy/modules/services/cups.te | 10 + policy/modules/services/cvs.te | 2 policy/modules/services/dovecot.te | 2 policy/modules/services/hal.if | 41 +++++ policy/modules/services/hal.te | 17 ++ policy/modules/services/ktalk.fc | 1 policy/modules/services/ktalk.te | 8 + policy/modules/services/mailman.if | 25 +++ policy/modules/services/nis.fc | 1 policy/modules/services/nis.if | 25 +++ policy/modules/services/nis.te | 32 ++++ policy/modules/services/nscd.if | 2 policy/modules/services/pegasus.te | 1 policy/modules/services/postfix.te | 4 policy/modules/services/privoxy.te | 5 policy/modules/services/samba.te | 2 policy/modules/services/sendmail.te | 1 policy/modules/services/xserver.if | 20 ++ policy/modules/system/authlogin.te | 2 policy/modules/system/fstools.if | 18 ++ policy/modules/system/fstools.te | 7 + policy/modules/system/init.te | 5 policy/modules/system/libraries.fc | 2 policy/modules/system/locallogin.te | 1 policy/modules/system/lvm.fc | 1 policy/modules/system/lvm.te | 3 policy/modules/system/mount.te | 3 policy/modules/system/selinuxutil.fc | 6 policy/modules/system/selinuxutil.if | 23 ++- policy/modules/system/selinuxutil.te | 16 ++ policy/modules/system/sysnetwork.te | 7 + policy/modules/system/udev.te | 2 policy/modules/system/unconfined.if | 16 +- policy/modules/system/unconfined.te | 8 - policy/modules/system/userdomain.te | 1 policy/modules/system/xend.fc | 23 +++ policy/modules/system/xend.if | 71 ++++++++++ policy/modules/system/xend.te | 219 ++++++++++++++++++++++++++++++++ 68 files changed, 892 insertions(+), 73 deletions(-) Index: policy-20060207.patch =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/FC-5/policy-20060207.patch,v retrieving revision 1.53 retrieving revision 1.54 diff -u -r1.53 -r1.54 --- policy-20060207.patch 28 Mar 2006 15:17:34 -0000 1.53 +++ policy-20060207.patch 29 Mar 2006 21:27:52 -0000 1.54 @@ -140,6 +140,25 @@ +optional_policy(`fstools',` + fstools_getattr_swap_files(updfstab_t) ') +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/usermanage.te serefpolicy-2.2.25/policy/modules/admin/usermanage.te +--- nsaserefpolicy/policy/modules/admin/usermanage.te 2006-03-21 14:33:50.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/admin/usermanage.te 2006-03-28 14:35:31.000000000 -0500 +@@ -225,6 +225,7 @@ + + files_manage_etc_files(groupadd_t) + files_relabel_etc_files(groupadd_t) ++files_read_etc_runtime_files(groupadd_t) + + libs_use_ld_so(groupadd_t) + libs_use_shared_libs(groupadd_t) +@@ -490,6 +491,7 @@ + domain_use_interactive_fds(useradd_t) + + files_manage_etc_files(useradd_t) ++files_read_etc_runtime_files(useradd_t) + files_search_var_lib(useradd_t) + files_relabel_etc_files(useradd_t) + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/vbetool.te serefpolicy-2.2.25/policy/modules/admin/vbetool.te --- nsaserefpolicy/policy/modules/admin/vbetool.te 2006-03-21 14:33:50.000000000 -0500 +++ serefpolicy-2.2.25/policy/modules/admin/vbetool.te 2006-03-28 09:47:09.000000000 -0500 @@ -1557,6 +1576,39 @@ dontaudit udev_t self:capability sys_tty_config; allow udev_t self:process ~{ ptrace setcurrent setexec setfscreate setrlimit execmem execstack execheap }; allow udev_t self:process { execmem setfscreate }; +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.if serefpolicy-2.2.25/policy/modules/system/unconfined.if +--- nsaserefpolicy/policy/modules/system/unconfined.if 2006-03-21 14:33:50.000000000 -0500 ++++ serefpolicy-2.2.25/policy/modules/system/unconfined.if 2006-03-28 14:38:37.000000000 -0500 +@@ -55,7 +55,7 @@ + tunable_policy(`allow_execmem && allow_execstack',` + # Allow making the stack executable via mprotect. + allow $1 self:process execstack; +- auditallow $1 self:process execstack; ++# auditallow $1 self:process execstack; + ', ` + # These are fairly common but seem to be harmless + # caused by using shared libraries built with old tool chains +@@ -114,13 +114,13 @@ + interface(`unconfined_domain',` + unconfined_domain_noaudit($1) + +- tunable_policy(`allow_execheap',` +- auditallow $1 self:process execheap; +- ') +- +- tunable_policy(`allow_execmem',` +- auditallow $1 self:process execmem; +- ') ++# tunable_policy(`allow_execheap',` ++# auditallow $1 self:process execheap; ++# ') ++ ++# tunable_policy(`allow_execmem',` ++# auditallow $1 self:process execmem; ++# ') + ') + + ######################################## diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.te serefpolicy-2.2.25/policy/modules/system/unconfined.te --- nsaserefpolicy/policy/modules/system/unconfined.te 2006-03-21 14:33:50.000000000 -0500 +++ serefpolicy-2.2.25/policy/modules/system/unconfined.te 2006-03-28 09:47:09.000000000 -0500 From fedora-cvs-commits at redhat.com Wed Mar 29 22:02:48 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 29 Mar 2006 17:02:48 -0500 Subject: rpms/gnome-pilot/devel gnome-pilot.spec,1.37,1.38 Message-ID: <200603292202.k2TM2mVM022315@cvs.devel.redhat.com> Author: than Update of /cvs/dist/rpms/gnome-pilot/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv22291 Modified Files: gnome-pilot.spec Log Message: disable patches for pilot-link-0.12 Index: gnome-pilot.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-pilot/devel/gnome-pilot.spec,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- gnome-pilot.spec 29 Mar 2006 21:36:03 -0000 1.37 +++ gnome-pilot.spec 29 Mar 2006 22:02:44 -0000 1.38 @@ -13,16 +13,16 @@ Patch9: gnome-pilot-2.0.12-defines.patch # This patch has been regenerated by Mark G Adams: +# patches for pilot-link-0.12 Patch11: gnome-pilot-2.0.12-port-to-pilot-link-0.12.patch +Patch12: gnome-pilot-2.0.13-include-pi-error.patch +Patch13: rh-161799-attach-116013-backup_conduit_update.diff # Various patches by Mark G Adams filed in GNOME and RH Bugzilla: Patch16: gb-309077-attach-48373-fix-xml-properties-leak.patch Patch17: gb-309130-attach-48413-backup-conduit-valgrind-fixes.patch -Patch18: rh-161799-attach-116013-backup_conduit_update.diff Patch19: rh-161799-attach-116014-conduits_64bit.diff -Patch20: gnome-pilot-2.0.13-include-pi-error.patch - BuildRoot: %{_tmppath}/%{name}-%{version}-root Requires: pilot-link >= %{pilot_link_version} Prereq: scrollkeeper @@ -61,15 +61,16 @@ %patch7 -p1 -b .move-conduits-code %patch8 -p1 -b .move-conduits-autotools %patch9 -p1 -b .defines + +# patches for pilot-link-0.12 #%patch11 -p0 -b .port-to-pilot-link-0.12 +#%patch12 -p1 -b .include-pi-error +#%patch13 -p0 -b .backup_conduit_update %patch16 -p0 -b .fix-xml-properties-leak %patch17 -p0 -b .backup-conduit-valgrind-fixes -%patch18 -p0 -b .backup_conduit_update %patch19 -p0 -b .conduits_64bit -%patch20 -p1 -b .include-pi-error - %build autoreconf -i %configure From fedora-cvs-commits at redhat.com Wed Mar 29 22:07:56 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 29 Mar 2006 17:07:56 -0500 Subject: rpms/rpm/FC-4 rpm-4.4.1-contextverify.patch, NONE, 1.1 rpm-4.4.1-db3-param.patch, NONE, 1.1 rpm.spec, 1.172, 1.173 Message-ID: <200603292207.k2TM7uP9022411@cvs.devel.redhat.com> Author: pnasrat Update of /cvs/dist/rpms/rpm/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv22394 Modified Files: rpm.spec Added Files: rpm-4.4.1-contextverify.patch rpm-4.4.1-db3-param.patch Log Message: fix selinux double free rpm-4.4.1-contextverify.patch: verify.c | 15 ++++++++++----- 1 files changed, 10 insertions(+), 5 deletions(-) --- NEW FILE rpm-4.4.1-contextverify.patch --- --- rpm-4.4.2/lib/verify.c.contextverify 2005-09-22 13:24:09.000000000 -0400 +++ rpm-4.4.2/lib/verify.c 2005-09-22 13:38:17.000000000 -0400 @@ -122,24 +122,29 @@ */ /*@-branchstate@*/ if (selinuxEnabled == 1 && (flags & RPMVERIFY_CONTEXTS)) { - security_context_t con; + security_context_t con = NULL; rc = lgetfilecon(fn, &con); if (rc == -1) *res |= (RPMVERIFY_LGETFILECONFAIL|RPMVERIFY_CONTEXTS); else { - security_context_t fcontext; + security_context_t fcontext = NULL; /* Get file security context from patterns. */ if (matchpathcon(fn,fmode,&fcontext) != 0) { /* Get file security context from package. */ - fcontext = rpmfiFContext(fi); + char * ficontext = NULL; + ficontext = rpmfiFContext(fi); + fcontext = xmalloc(sizeof(ficontext)); + strncpy(fcontext, ficontext, sizeof(ficontext)); } if (fcontext == NULL || strcmp(fcontext, con)) *res |= RPMVERIFY_CONTEXTS; - freecon(con); - freecon(fcontext); + if (con != NULL) + freecon(con); + if (fcontext != NULL) + freecon(fcontext); } } rpm-4.4.1-db3-param.patch: configure | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE rpm-4.4.1-db3-param.patch --- --- rpm-4.4.1/db3/configure.param 2005-08-26 10:05:34.000000000 -0400 +++ rpm-4.4.1/db3/configure 2005-08-26 10:06:05.000000000 -0400 @@ -8,7 +8,7 @@ rm -f config.cache # XXX edit CFLAGS= ... out of invocation args ??? -ARGS="`echo $* | sed -e 's% [^ ]*CFLAGS=[^ ]*%%' -e 's% -[^-][^ ]*%%g' -e 's%--cache-file=.*$%%'`" +ARGS="`echo $* | sed -e 's% [^ ]*CFLAGS=[^ ]*%%' -e 's% -[^-][^ ]*%%g' -e 's% --param=[^ ]*%%g' -e 's%--cache-file=.*$%%'`" CC="$CC" CFLAGS="$CFLAGS" $db_dist/configure $ARGS \ --enable-shared --enable-static --enable-rpc \ Index: rpm.spec =================================================================== RCS file: /cvs/dist/rpms/rpm/FC-4/rpm.spec,v retrieving revision 1.172 retrieving revision 1.173 diff -u -r1.172 -r1.173 --- rpm.spec 13 Jul 2005 15:34:47 -0000 1.172 +++ rpm.spec 29 Mar 2006 22:07:54 -0000 1.173 @@ -20,7 +20,7 @@ %define version 4.4.1 Version: %{version} %{expand: %%define rpm_version %{version}} -Release: 22 +Release: 23 Group: System Environment/Base Source: ftp://jbj.org/pub/rpm-devel/rpm-%{rpm_version}.tar.gz Source1: popt_zh_TW.po @@ -37,6 +37,8 @@ Patch9: rpm-4.4.1-matchpathcon.patch Patch10: rpm-4.4.1-check-symlinks.patch Patch11: rpm-4.4.1-zlib-can-2005-2096.patch +Patch12: rpm-4.4.1-db3-param.patch +Patch13: rpm-4.4.1-contextverify.patch License: GPL Conflicts: patch < 2.5 %ifos linux @@ -157,6 +159,8 @@ %patch9 -p1 -b .matchpathcon %patch10 -p1 -b .checklinks %patch11 -p1 -b .zlib +%patch12 -p1 -b .param +%patch13 -p1 -b .contextverify # XXX move zh_CN sed -i 's/zh_CN.GB2312/zh_CN zh_TW/' popt/configure* @@ -562,6 +566,10 @@ %{__includedir}/popt.h %changelog +* Wed Mar 29 2006 Paul Nasrat - 4.4.1-23 +- Makefile fix db3 param +- Fix selinux verification + * Wed Jul 13 2005 Paul Nasrat - 4.4.1-22 - zlib fix for CAN-2005-2096 From fedora-cvs-commits at redhat.com Wed Mar 29 23:44:09 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 29 Mar 2006 18:44:09 -0500 Subject: rpms/fedora-release/devel .cvsignore, 1.10, 1.11 fedora-release.spec, 1.29, 1.30 sources, 1.20, 1.21 Message-ID: <200603292344.k2TNi9w5030733@cvs.devel.redhat.com> Author: jkeating Update of /cvs/dist/rpms/fedora-release/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv30643 Modified Files: .cvsignore fedora-release.spec sources Log Message: update for post-fc5 rawhide Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/fedora-release/devel/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 8 Mar 2006 21:23:51 -0000 1.10 +++ .cvsignore 29 Mar 2006 23:44:06 -0000 1.11 @@ -6,3 +6,4 @@ fedora-release-4.92.tar.gz fedora-release-5.tar.gz fedora-release-notes-5.tar.gz +fedora-release-5.89.tar.gz Index: fedora-release.spec =================================================================== RCS file: /cvs/dist/rpms/fedora-release/devel/fedora-release.spec,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- fedora-release.spec 20 Mar 2006 16:58:06 -0000 1.29 +++ fedora-release.spec 29 Mar 2006 23:44:06 -0000 1.30 @@ -1,4 +1,4 @@ -%define release_version 5 +%define release_version 5.89 %define release_name Rawhide %define builtin_release_version Rawhide %define builtin_release_name Rawhide Index: sources =================================================================== RCS file: /cvs/dist/rpms/fedora-release/devel/sources,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- sources 14 Mar 2006 23:15:23 -0000 1.20 +++ sources 29 Mar 2006 23:44:06 -0000 1.21 @@ -1,2 +1,2 @@ -8d852e1e82393faa2aa23fdd64318899 fedora-release-5.tar.gz 7104b3bf87a79693f5fe2d0e12dce946 fedora-release-notes-5.tar.gz +09df2a7608b7b58a3e29ffc5e6d69d1f fedora-release-5.89.tar.gz From fedora-cvs-commits at redhat.com Wed Mar 29 23:47:48 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 29 Mar 2006 18:47:48 -0500 Subject: rpms/fedora-release/devel .cvsignore,1.11,1.12 sources,1.21,1.22 Message-ID: <200603292347.k2TNlmGD011429@cvs.devel.redhat.com> Author: jkeating Update of /cvs/dist/rpms/fedora-release/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv11076 Modified Files: .cvsignore sources Log Message: Bump release-notes tarball version to match the other tarball Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/fedora-release/devel/.cvsignore,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- .cvsignore 29 Mar 2006 23:44:06 -0000 1.11 +++ .cvsignore 29 Mar 2006 23:47:45 -0000 1.12 @@ -7,3 +7,4 @@ fedora-release-5.tar.gz fedora-release-notes-5.tar.gz fedora-release-5.89.tar.gz +fedora-release-notes-5.80.tar.gz Index: sources =================================================================== RCS file: /cvs/dist/rpms/fedora-release/devel/sources,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- sources 29 Mar 2006 23:44:06 -0000 1.21 +++ sources 29 Mar 2006 23:47:45 -0000 1.22 @@ -1,2 +1,2 @@ -7104b3bf87a79693f5fe2d0e12dce946 fedora-release-notes-5.tar.gz 09df2a7608b7b58a3e29ffc5e6d69d1f fedora-release-5.89.tar.gz +7104b3bf87a79693f5fe2d0e12dce946 fedora-release-notes-5.80.tar.gz From fedora-cvs-commits at redhat.com Wed Mar 29 23:51:48 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 29 Mar 2006 18:51:48 -0500 Subject: rpms/fedora-release/devel .cvsignore,1.12,1.13 sources,1.22,1.23 Message-ID: <200603292351.k2TNpmpb014458@cvs.devel.redhat.com> Author: jkeating Update of /cvs/dist/rpms/fedora-release/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv14343 Modified Files: .cvsignore sources Log Message: .80 != .89. *sigh* silly typo. Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/fedora-release/devel/.cvsignore,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- .cvsignore 29 Mar 2006 23:47:45 -0000 1.12 +++ .cvsignore 29 Mar 2006 23:51:45 -0000 1.13 @@ -8,3 +8,4 @@ fedora-release-notes-5.tar.gz fedora-release-5.89.tar.gz fedora-release-notes-5.80.tar.gz +fedora-release-notes-5.89.tar.gz Index: sources =================================================================== RCS file: /cvs/dist/rpms/fedora-release/devel/sources,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- sources 29 Mar 2006 23:47:45 -0000 1.22 +++ sources 29 Mar 2006 23:51:45 -0000 1.23 @@ -1,2 +1,2 @@ 09df2a7608b7b58a3e29ffc5e6d69d1f fedora-release-5.89.tar.gz -7104b3bf87a79693f5fe2d0e12dce946 fedora-release-notes-5.80.tar.gz +7104b3bf87a79693f5fe2d0e12dce946 fedora-release-notes-5.89.tar.gz From fedora-cvs-commits at redhat.com Thu Mar 30 00:36:09 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 29 Mar 2006 19:36:09 -0500 Subject: rpms/bind/devel named.conf.sample, NONE, 1.1 named.rfc1912.zones.sample, NONE, 1.1 named.root.hints, NONE, 1.1 bind-chroot-admin.in, 1.3, 1.4 bind.spec, 1.98, 1.99 libbind.pc, 1.1, 1.2 named.caching-nameserver.conf, 1.2, 1.3 named.rfc1912.zones, 1.1, 1.2 Message-ID: <200603300036.k2U0a98l007077@cvs.devel.redhat.com> Author: jvdias Update of /cvs/dist/rpms/bind/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv7006 Modified Files: bind-chroot-admin.in bind.spec libbind.pc named.caching-nameserver.conf named.rfc1912.zones Added Files: named.conf.sample named.rfc1912.zones.sample named.root.hints Log Message: fix bug 186577 - libbind.pc, more .spec file cleanup; add sample configuration files to %doc; rebuild for new gcc and glibc --- NEW FILE named.conf.sample --- // // Sample named.conf BIND DNS server 'named' configuration file // for the Red Hat BIND distribution. // // See the BIND Administrator's Reference Manual (ARM) for details, in: // file:///usr/share/doc/bind-*/arm/Bv9ARM.html // Also see the BIND Configuration GUI : /usr/bin/system-config-bind and // its manual. // options { /* make named use port 53 for the source of all queries, to allow * firewalls to block all ports except 53: */ query-source port 53; query-source-v6 port 53; // Put files that named is allowed to write in the data/ directory: directory "/var/named"; // the default dump-file "data/cache_dump.db"; statistics-file "data/named_stats.txt"; memstatistics-file "data/named_mem_stats.txt"; }; logging { /* If you want to enable debugging, eg. using the 'rndc trace' command, * named will try to write the 'named.run' file in the $directory (/var/named). * By default, SELinux policy does not allow named to modify the /var/named directory, * so put the default debug log file in data/ : */ channel default_debug { file "data/named.run"; severity dynamic; }; }; // // All BIND 9 zones are in a "view", which allow different zones to be served // to different types of client addresses, and for options to be set for groups // of zones. // // By default, if named.conf contains no "view" clauses, all zones are in the // "default" view, which matches all clients. // // If named.conf contains any "view" clause, then all zones MUST be in a view; // so it is recommended to start off using views to avoid having to restructure // your configuration files in the future. // view "localhost_resolver" { /* This view sets up named to be a localhost resolver ( caching only nameserver ). * If all you want is a caching-only nameserver, then you need only define this view: */ match-clients { localhost; }; match-destinations { localhost; }; recursion yes; # all views must contain the root hints zone: include "/etc/named.root.hints"; /* these are zones that contain definitions for all the localhost * names and addresses, as recommended in RFC1912 - these names should * ONLY be served to localhost clients: */ include "/etc/named.rfc1912.zones"; }; view "internal" { /* This view will contain zones you want to serve only to "internal" clients that connect via your directly attached LAN interfaces - "localnets" . */ match-clients { !localnets; !localhost; }; match-destinations { !localnets; !localhost; }; recursion yes; // all views must contain the root hints zone: include "/etc/named.root.hints"; // include "named.rfc1912.zones"; // you should not serve your rfc1912 names to non-localhost clients. // These are your "authoritative" internal zones, and would probably // also be included in the "localhost_resolver" view above : zone "my.internal.zone" { type master; file "my.internal.zone.db"; }; zone "my.slave.internal.zone" { type slave; file "slaves/my.slave.internal.zone.db"; masters { /* put master nameserver IPs here */ 127.0.0.1; } ; // put slave zones in the slaves/ directory so named can update them }; zone "my.ddns.internal.zone" { type master; allow-update { key ddns_key; }; file "slaves/my.ddns.internal.zone.db"; // put dynamically updateable zones in the slaves/ directory so named can update them }; }; key ddns_key { algorithm hmac-md5; secret "use /usr/sbin/dns-keygen to generate TSIG keys"; }; view "external" { /* This view will contain zones you want to serve only to "external" clients * that have addresses that are not on your directly attached LAN interface subnets: */ match-clients { !localnets; !localhost; }; match-destinations { !localnets; !localhost; }; recursion no; // you'd probably want to deny recursion to external clients, so you don't // end up providing free DNS service to all takers // all views must contain the root hints zone: include "/etc/named.root.hints"; // These are your "authoritative" external zones, and would probably // contain entries for just your web and mail servers: zone "my.external.zone" { type master; file "my.external.zone.db"; }; }; --- NEW FILE named.rfc1912.zones.sample --- // named.rfc1912.zones: // // ISC BIND named zone configuration for zones recommended by // RFC 1912 section 4.1 : localhost TLDs and address zones // zone "localdomain" IN { type master; file "localdomain.zone"; allow-update { none; }; }; zone "localhost" IN { type master; file "localhost.zone"; allow-update { none; }; }; zone "0.0.127.in-addr.arpa" IN { type master; file "named.local"; allow-update { none; }; }; zone "0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.ip6.arpa" IN { type master; file "named.ip6.local"; allow-update { none; }; }; zone "255.in-addr.arpa" IN { type master; file "named.broadcast"; allow-update { none; }; }; zone "0.in-addr.arpa" IN { type master; file "named.zero"; allow-update { none; }; }; --- NEW FILE named.root.hints --- // // The 'named.root' root cache hints zone for the bind DNS 'named' nameserver. // // named's cache must be primed with the addresses of the root zone '.' nameservers. // The root zone file can be obtained by querying the root 'A' nameserver: // $ dig . ns @198.41.0.4 > named.root // Or by download via FTP / HTTP: // $ wget ftp://ftp.rs.internic.net/domain/named.root // // Every view that is to provide recursive service must include this zone. // zone "." IN { type hint; file "named.root"; }; Index: bind-chroot-admin.in =================================================================== RCS file: /cvs/dist/rpms/bind/devel/bind-chroot-admin.in,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- bind-chroot-admin.in 8 Mar 2006 18:17:55 -0000 1.3 +++ bind-chroot-admin.in 30 Mar 2006 00:35:52 -0000 1.4 @@ -198,11 +198,14 @@ ng=$? shopt -s nullglob; pfx='' + changed=`/bin/mktemp /tmp/XXXXXX`; + rm -f $changed if rootdir ; then # chroot is enabled /usr/bin/find /{etc/{named.*,rndc.*},${BIND_DIR#/}{/*,/data/*,/slaves/*}} -maxdepth 0 -type f | while read f; do replace_with_link ${BIND_CHROOT_PREFIX}/$f $f; + [ ! -e $changed ] && touch $changed; done; pfx=${BIND_CHROOT_PREFIX} else # chroot is disabled @@ -211,31 +214,54 @@ do if [ ! -d "$f" ]; then replace_with_file $f ${f#$BIND_CHROOT_PREFIX}; + [ ! -e $changed ] && touch $changed; fi; done fi; - if [ $ng -eq 1 ]; then - shopt -u nullglob; - fi; + if [ ! -e ${pfx}/etc/rndc.key ]; then + echo 'key "rndckey" { + algorithm hmac-md5; + secret "'`/usr/sbin/dns-keygen`'"; +};' > /etc/rndc.key; + elif /bin/egrep -q '@KEY@' /etc/rndc.key; then + /bin/sed -i -e 's^@KEY@^'`/usr/sbin/dns-keygen`'^' /etc/rndc.key ; + fi chown root:named ${pfx}/var/named/* >/dev/null 2>&1; chmod 750 ${pfx}/var/named >/dev/null 2>&1; chmod 640 ${pfx}/var/named/* >/dev/null 2>&1; chown named:named ${pfx}/var/named/{data{,/*},slaves{,*/}} >/dev/null 2>&1; chmod 770 ${pfx}/var/named/{data,slaves} >/dev/null 2>&1; chmod 640 ${pfx}/var/named/{data/*,slaves/*} >/dev/null 2>&1; + if [ -e $changed ]; then + if [ -e /selinux/enforce ] && [ -x /sbin/restorecon ]; then + if [ -n "$pfx" ]; then + /sbin/restorecon -R $pfx/etc $pfx/var/named $pfx/var/run/named >/dev/null 2>&1; + if [ -e $pfx/etc/localtime ] && [ -e /etc/localtime ] ; then + /usr/bin/chcon --reference=/etc/localtime $pfx/etc/localtime >/dev/null 2>&1; + fi; + else + /sbin/restorecon /etc/{named,rndc}.* >/dev/null 2>&1; + /usr/bin/chcon --reference=/etc/named.conf /etc/named.* >/dev/null 2>&1; + /sbin/restorecon -e /var/named/chroot /var/named{/,/data/,/slaves/}* >/dev/null 2>&1; + fi; + fi; + /sbin/service named condrestart + rm -f $changed; + fi; + if [ $ng -eq 1 ]; then + shopt -u nullglob; + fi; } case $1 in -e|--enable) enable_bind_chroot; sync_files; - /sbin/service named condrestart exit $?; ;; -d|--disable) disable_bind_chroot; sync_files; - /sbin/service named condrestart /bin/umount ${BIND_CHROOT_PREFIX}/proc >/dev/null 2>&1 || :; /bin/umount ${BIND_CHROOT_PREFIX}/var/run/dbus >/dev/null 2>&1 || :; exit $?; Index: bind.spec =================================================================== RCS file: /cvs/dist/rpms/bind/devel/bind.spec,v retrieving revision 1.98 retrieving revision 1.99 diff -u -r1.98 -r1.99 --- bind.spec 22 Mar 2006 18:02:50 -0000 1.98 +++ bind.spec 30 Mar 2006 00:35:52 -0000 1.99 @@ -1,11 +1,11 @@ # # Red Hat BIND package .spec file -# +# %{?!SDB: %define SDB 1} %{?!LIBBIND: %define LIBBIND 1} %{?!efence: %define efence 0} %{?!test: %define test 0} -%{?!WITH_DBUS: %define WITH_DBUS 1} # + dynamic forwarder table management with D-BUS +%{?!WITH_DBUS: %define WITH_DBUS 1} # + dynamic forwarder table management with D-BUS %{?!DEBUGINFO: %define DEBUGINFO 1} %{?!bind_uid: %define bind_uid 25} %{?!bind_gid: %define bind_gid 25} @@ -17,7 +17,7 @@ Name: bind License: BSD-like Version: 9.3.2 -Release: 12.FC6 +Release: 14.FC6 Epoch: 30 Url: http://www.isc.org/products/BIND/ Buildroot: %{_tmppath}/%{name}-root @@ -84,27 +84,25 @@ Patch28: bind-9.3.2rc1-dbus-0.6.patch Patch29: bind-9.3.2-bz177854.patch # -Requires: bind-libs = %{epoch}:%{version}-%{release}, glibc >= 2.2 -Requires(post): bash, textutils, fileutils, sed, grep -Requires(pre): shadow-utils -Requires(post,preun): chkconfig >= 1.3.26 +Requires: bind-libs = %{epoch}:%{version}-%{release}, glibc >= 2.2 +Requires(post): bash, coreutils, sed, grep, chkconfig >= 1.3.26 +Requires(pre): shadow-utils +Requires(preun):chkconfig >= 1.3.26 %if %{selinux} -Requires(post): policycoreutils +Requires(post): policycoreutils %endif +BuildRequires: gcc, glibc-devel >= 2.2.5-26, glibc-kernheaders >= 2.4-7.10, openssl-devel, libtool, pkgconfig, tar %if %{SDB} -%if %{WITH_DBUS} -BuildRequires: openssl-devel gcc dbus-devel glibc-devel >= 2.2.5-26 glibc-kernheaders >= 2.4-7.10 libtool pkgconfig tar openldap-devel postgresql-devel -%else -BuildRequires: openssl-devel gcc glibc-devel >= 2.2.5-26 glibc-kernheaders >= 2.4-7.10 libtool pkgconfig tar openldap-devel postgresql-devel +BuildRequires: openldap-devel, postgresql-devel %endif -%else %if %{WITH_DBUS} -BuildRequires: openssl-devel gcc dbus-devel glibc-devel >= 2.2.5-26 glibc-kernheaders >= 2.4-7.10 libtool pkgconfig tar -%else -BuildRequires: openssl-devel gcc glibc-devel >= 2.2.5-26 glibc-kernheaders >= 2.4-7.10 libtool pkgconfig tar +BuildRequires: dbus-devel %endif +%if %{test} +BuildRequires: net-tools, perl %endif -# fix bug 176100: do not Require: perl just for namedGetForwarders ! +# +# fix bug 176100: do not Require: perl just for namedGetForwarders ! %define __perl_requires %SOURCE15 %define __find_requires %SOURCE15 %define _use_internal_dependency_generator 0 @@ -119,7 +117,7 @@ %package libs -Summary: Libraries used by various DNS packages +Summary: Libraries used by the BIND DNS packages Group: Applications/System %description libs @@ -143,14 +141,13 @@ %package devel -Summary: Include files and libraries needed for bind DNS development. +Summary: Header files and libraries needed for BIND DNS development. Group: Development/Libraries Requires: bind-libs = %{epoch}:%{version}-%{release} %description devel -The bind-devel package contains all the include files and the library -required for DNS (Domain Name System) development for BIND versions -9.x.x. +The bind-devel package contains all the header files and libraries +required for DNS (Domain Name System) development with ISC BIND 9.x.x. %package config @@ -159,20 +156,21 @@ Obsoletes: caching-nameserver Provides: caching-nameserver Requires: bind = %{epoch}:%{version}-%{release} -Requires(post): bash, textutils, fileutils, sed, grep +Requires(post): bash, coreutils, sed, grep +Requires(postun): bash, coreutils, sed, grep %if %{selinux} Requires(post): policycoreutils %endif %description config -The bind-config package includes the configuration files which will make +The bind-config package includes the configuration files which will make the ISC BIND named DNS name server act as a simple caching nameserver. A caching nameserver is a DNS Resolver, as defined in RFC 1035, section 7. -ISC BIND named(8) provides a very efficient, flexible and robust resolver as -well as a server of authoritative DNS data - many users use this package +ISC BIND named(8) provides a very efficient, flexible and robust resolver as +well as a server of authoritative DNS data - many users use this package along with BIND to implement their primary system DNS resolver service. If you would like to set up a caching name server, you'll need to install -bind, bind-libs, and bind-utils along with this package. +bind, bind-libs, and bind-utils along with this package. This package replaces the caching-nameserver package. @@ -181,7 +179,8 @@ Group: System Environment/Daemons Prefix: %{chroot_prefix} Requires: bind = %{epoch}:%{version}-%{release} -Requires(post): bash, textutils, fileutils, sed, grep +Requires(post): bash, coreutils, sed, grep +Requires(preun): bash, coreutils, sed, grep %if %{selinux} Requires(post): policycoreutils %endif @@ -213,7 +212,8 @@ Summary: The Berkeley Internet Name Domain (BIND) DNS (Domain Name System) server with database backends. Group: System Environment/Daemons Requires: bind-libs = %{epoch}:%{version}-%{release}, bind-utils = %{epoch}:%{version}-%{release}, glibc >= 2.2 -Requires(post): bash, textutils, fileutils, sed, grep, mktemp +Requires(post): bash, coreutils, sed, grep, mktemp +Requires(preun): bash, coreutils, sed, grep %if %{selinux} Requires(post): policycoreutils %endif @@ -225,11 +225,11 @@ (routines for applications to use when interfacing with DNS); and tools for verifying that the DNS server is operating properly. -BIND SDB (Simplified Database Backend) provides named_sdb, the DNS -name server compiled to include support for using alternative Zone Databases -stored in an LDAP server (ldapdb), a postgreSQL database (pgsqldb), or in the -filesystem (dirdb), in addition to the standard in-memory RBT (Red Black Tree) -zone database. +BIND SDB (Simplified Database Backend) provides named_sdb, the DNS +name server compiled to include support for using alternative Zone Databases +stored in an LDAP server (ldapdb), a postgreSQL database (pgsqldb), or in the +filesystem (dirdb), in addition to the standard in-memory RBT (Red Black Tree) +zone database. %endif @@ -251,7 +251,7 @@ # This patch now in patch10 #%patch8 -p1 -b .handle_send_errors # This patch is now in ISC bind-9.3.1x -# +# #%patch9 -p1 -b .missing_dnssec_tools #RIP dnssec-signkey and dnssec-makekeyset: #1852. [cleanup] Remove last vestiges of dnssec-signkey and @@ -315,12 +315,18 @@ cp -fp bin/named/include/named/{dbus_mgr.h,dbus_service.h,globals.h,server.h,log.h,types.h} bin/named_sdb/include/named %endif %endif +:; %build libtoolize --copy --force; aclocal; autoconf cp -f /usr/share/libtool/config.{guess,sub} . -export CFLAGS="$RPM_OPT_FLAGS" +%if %{DEBUGINFO} +export CFLAGS="$RPM_OPT_FLAGS"; +%else +export CFLAGS=`echo $RPM_OPT_FLAGS | sed 's/-O2 -g/-g3 -gdwarf-2/g'`; +%endif +export CPPFLAGS="$CFLAGS"; %if %{WITH_DBUS} %ifarch s390x x86_64 ppc64 # every 64-bit arch EXCEPT ia64 has dbus architecture dependant @@ -333,28 +339,22 @@ export CPPFLAGS="$CPPFLAGS `pkg-config --cflags-only-I openssl`" export LDFLAGS="$LDFLAGS `pkg-config --libs-only-L openssl`" fi -#export CFLAGS="-g $CFLAGS" %if %{efence} export LDFLAGS=-lefence %endif -%if %{LIBBIND} -%configure --with-libtool --localstatedir=/var \ +%configure \ + --with-libtool \ + --localstatedir=/var \ --enable-threads \ --enable-ipv6 \ --with-pic \ --with-openssl=/usr \ - --enable-libbind -%else -%configure --with-libtool --localstatedir=/var \ - --enable-threads \ - --enable-ipv6 \ - --with-pic \ - --with-openssl=/usr +%if %{LIBBIND} + --enable-libbind \ %endif + CFLAGS="$CFLAGS" \ +; make %{?_smp_mflags} -if [ $? -ne 0 ]; then - exit $?; -fi; %if !%{DEBUGINFO} @@ -362,7 +362,7 @@ %endif %install -rm -rf $RPM_BUILD_ROOT +rm -rf ${RPM_BUILD_ROOT} cp %{SOURCE5} doc/rfc gzip -9 doc/rfc/* mkdir -p ${RPM_BUILD_ROOT}/etc/{rc.d/init.d,logrotate.d} @@ -374,7 +374,7 @@ mkdir -p ${RPM_BUILD_ROOT}/var/run/named #chroot mkdir -p ${RPM_BUILD_ROOT}/%{chroot_prefix} -tar --no-same-owner -zxvf %{SOURCE6} --directory ${RPM_BUILD_ROOT}/%{chroot_prefix} +tar --no-same-owner -zxvf %{SOURCE6} --directory ${RPM_BUILD_ROOT}/%{chroot_prefix} # these are required to prevent them being erased during upgrade of previous # versions that included them (bug #130121): touch ${RPM_BUILD_ROOT}/%{chroot_prefix}/etc/named.conf @@ -383,40 +383,32 @@ touch ${RPM_BUILD_ROOT}/%{chroot_prefix}/dev/null touch ${RPM_BUILD_ROOT}/%{chroot_prefix}/dev/random #end chroot -make DESTDIR=$RPM_BUILD_ROOT install -install -c -m 640 bin/rndc/rndc.conf $RPM_BUILD_ROOT%{_sysconfdir} -install -c -m 755 contrib/named-bootconf/named-bootconf.sh $RPM_BUILD_ROOT%{_sbindir}/named-bootconf -install -c -m 755 %SOURCE2 $RPM_BUILD_ROOT/etc/rc.d/init.d/named -install -c -m 644 %SOURCE3 $RPM_BUILD_ROOT/etc/logrotate.d/named -touch $RPM_BUILD_ROOT%{_sysconfdir}/rndc.key -cat << __EOF > $RPM_BUILD_ROOT%{_sysconfdir}/rndc.key -key "rndckey" { - algorithm hmac-md5; - secret "@KEY@"; -}; -__EOF -%{__cc} $RPM_OPT_FLAGS -o $RPM_BUILD_ROOT%{_sbindir}/dns-keygen %{SOURCE4} -mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig -cp %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/named -#mv $RPM_BUILD_ROOT/usr/share/man/man8/named.conf.* $RPM_BUILD_ROOT/usr/share/man/man5 +make DESTDIR=${RPM_BUILD_ROOT} install +touch ${RPM_BUILD_ROOT}%{_sysconfdir}/rndc.conf +install -c -m 755 contrib/named-bootconf/named-bootconf.sh ${RPM_BUILD_ROOT}%{_sbindir}/named-bootconf +install -c -m 755 %SOURCE2 ${RPM_BUILD_ROOT}/etc/rc.d/init.d/named +install -c -m 644 %SOURCE3 ${RPM_BUILD_ROOT}/etc/logrotate.d/named +touch ${RPM_BUILD_ROOT}%{_sysconfdir}/rndc.key +%{__cc} $RPM_OPT_FLAGS -o ${RPM_BUILD_ROOT}%{_sbindir}/dns-keygen %{SOURCE4} +mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig +cp %{SOURCE1} ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig/named %if %{SDB} -mkdir -p $RPM_BUILD_ROOT/etc/openldap/schema -install -c -m 644 %{SOURCE8} $RPM_BUILD_ROOT/etc/openldap/schema/dnszone.schema +mkdir -p ${RPM_BUILD_ROOT}/etc/openldap/schema +install -c -m 644 %{SOURCE8} ${RPM_BUILD_ROOT}/etc/openldap/schema/dnszone.schema cp -fp %{SOURCE12} contrib/sdb/pgsql/ %endif %if %{LIBBIND} -gunzip < %{SOURCE9} | (cd $RPM_BUILD_ROOT/usr/share; tar -xpf -) -mkdir -p $RPM_BUILD_ROOT/%{_libdir}/pkgconfig -cp -fp %{SOURCE28} $RPM_BUILD_ROOT/%{_libdir}/pkgconfig/libbind.pc -chmod 644 $RPM_BUILD_ROOT/%{_libdir}/pkgconfig/libbind.pc +gunzip < %{SOURCE9} | (cd ${RPM_BUILD_ROOT}/usr/share; tar -xpf -) +mkdir -p ${RPM_BUILD_ROOT}/%{_libdir}/pkgconfig +install -m 644 %{SOURCE28} $RPM_BUILD_ROOT%{_libdir}/pkgconfig/libbind.pc %endif %if %{WITH_DBUS} -mkdir -p $RPM_BUILD_ROOT/etc/dbus-1/system.d -mkdir -p $RPM_BUILD_ROOT/usr/share/dbus-1/services -cp -fp %{SOURCE10} $RPM_BUILD_ROOT/etc/dbus-1/system.d/named.conf -cp -fp %{SOURCE11} $RPM_BUILD_ROOT/usr/share/dbus-1/services/named.service -cp -fp %{SOURCE13} $RPM_BUILD_ROOT%{_sbindir}/namedSetForwarders -cp -fp %{SOURCE14} $RPM_BUILD_ROOT%{_sbindir}/namedGetForwarders +mkdir -p ${RPM_BUILD_ROOT}/etc/dbus-1/system.d +mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/dbus-1/services +cp -fp %{SOURCE10} ${RPM_BUILD_ROOT}/etc/dbus-1/system.d/named.conf +cp -fp %{SOURCE11} ${RPM_BUILD_ROOT}%{_datadir}/dbus-1/services/named.service +cp -fp %{SOURCE13} ${RPM_BUILD_ROOT}%{_sbindir}/namedSetForwarders +cp -fp %{SOURCE14} ${RPM_BUILD_ROOT}%{_sbindir}/namedGetForwarders %endif %if %{test} if [ "`whoami`" = 'root' ]; then @@ -427,9 +419,9 @@ ./ifconfig.sh up popd make test - e=$? + e=$? pushd system - ./ifconfig.sh down + ./ifconfig.sh down popd popd if [ "$e" -ne 0 ]; then @@ -437,40 +429,55 @@ exit $e; fi; else - echo 'test==1 : only root can run the tests (they require an ifconfig).'; + echo 'test==1 : only root can run the tests (they require an ifconfig).'; fi -:; %endif # Files required to run test-suite outside of build tree: -cp -fp config.h $RPM_BUILD_ROOT/%{_includedir}/bind9 -cp -fp lib/dns/include/dns/forward.h $RPM_BUILD_ROOT/%{_includedir}/dns -cp -fp lib/isc/unix/include/isc/keyboard.h $RPM_BUILD_ROOT/%{_includedir}/isc -cp -fp lib/isc/include/isc/hash.h $RPM_BUILD_ROOT/%{_includedir}/isc +cp -fp config.h ${RPM_BUILD_ROOT}/%{_includedir}/bind9 +cp -fp lib/dns/include/dns/forward.h ${RPM_BUILD_ROOT}/%{_includedir}/dns +cp -fp lib/isc/unix/include/isc/keyboard.h ${RPM_BUILD_ROOT}/%{_includedir}/isc +cp -fp lib/isc/include/isc/hash.h ${RPM_BUILD_ROOT}/%{_includedir}/isc # Remove libtool .la files: -find $RPM_BUILD_ROOT/%{_libdir} -name '*.la' -exec '/bin/rm' '-f' '{}' ';'; +find ${RPM_BUILD_ROOT}/%{_libdir} -name '*.la' -exec '/bin/rm' '-f' '{}' ';'; # /usr/lib/rpm/brp-compress -# +# # Ghost config files: -touch $RPM_BUILD_ROOT/etc/named.conf +touch ${RPM_BUILD_ROOT}/etc/named.conf # bind-config files: -mkdir -p $RPM_BUILD_ROOT/{etc,var/named} -install -m 644 %{SOURCE16} $RPM_BUILD_ROOT/etc/named.caching-nameserver.conf -install -m 644 %{SOURCE27} $RPM_BUILD_ROOT/etc/named.rfc1912.zones -install -m 644 %{SOURCE17} $RPM_BUILD_ROOT/var/named/named.ca -install -m 644 %{SOURCE18} $RPM_BUILD_ROOT/var/named/named.local -install -m 644 %{SOURCE19} $RPM_BUILD_ROOT/var/named/localhost.zone -install -m 644 %{SOURCE20} $RPM_BUILD_ROOT/var/named/localdomain.zone -install -m 644 %{SOURCE21} $RPM_BUILD_ROOT/var/named/named.ip6.local -install -m 644 %{SOURCE22} $RPM_BUILD_ROOT/var/named/named.broadcast -install -m 644 %{SOURCE23} $RPM_BUILD_ROOT/var/named/named.zero +mkdir -p ${RPM_BUILD_ROOT}/{etc,var/named} +install -m 644 %{SOURCE16} ${RPM_BUILD_ROOT}/etc/named.caching-nameserver.conf +install -m 644 %{SOURCE27} ${RPM_BUILD_ROOT}/etc/named.rfc1912.zones +install -m 644 %{SOURCE17} ${RPM_BUILD_ROOT}/var/named/named.ca +install -m 644 %{SOURCE18} ${RPM_BUILD_ROOT}/var/named/named.local +install -m 644 %{SOURCE19} ${RPM_BUILD_ROOT}/var/named/localhost.zone +install -m 644 %{SOURCE20} ${RPM_BUILD_ROOT}/var/named/localdomain.zone +install -m 644 %{SOURCE21} ${RPM_BUILD_ROOT}/var/named/named.ip6.local +install -m 644 %{SOURCE22} ${RPM_BUILD_ROOT}/var/named/named.broadcast +install -m 644 %{SOURCE23} ${RPM_BUILD_ROOT}/var/named/named.zero for f in /etc/named.caching-nameserver.conf /var/named/{named.ca,named.local,localhost.zone,localdomain.zone,named.ip6.local,named.broadcast,named.zero}; do - touch $RPM_BUILD_ROOT/%{chroot_prefix}/$f; + touch ${RPM_BUILD_ROOT}/%{chroot_prefix}/$f; done install -m 644 %{SOURCE24} ./rfc1912.txt install -m 644 %{SOURCE25} ./Copyright # bind-chroot-admin script: -sed -e 's^@BIND_CHROOT_PREFIX@^'%{chroot_prefix}'^;s^@BIND_DIR@^'%{bind_dir}'^' < %SOURCE26 > bind-chroot-admin; -install -m 754 bind-chroot-admin $RPM_BUILD_ROOT/%{_sbindir} +sed -e 's^@BIND_CHROOT_PREFIX@^'%{chroot_prefix}'^;s^@BIND_DIR@^'%{bind_dir}'^' < %{SOURCE26} > bind-chroot-admin; +install -m 754 bind-chroot-admin ${RPM_BUILD_ROOT}/%{_sbindir} +# sample bind configuration files for %doc: +mkdir -p sample/etc sample/var/named/{data,slaves} +cp -fp %{_sourcedir}/named.conf.sample sample/etc/named.conf +cp -fp %{_sourcedir}/named.rfc1912.zones.sample sample/etc/named.rfc1912.zones +cp -fp %{_sourcedir}/named.root.hints sample/etc/ +cp -fp %{_sourcedir}/{named.root,named.local,localhost.zone,localdomain.zone,named.ip6.local,named.broadcast,named.zero} sample/var/named +for f in my.internal.zone.db slaves/my.slave.internal.zone.db slaves/my.ddns.internal.zone.db my.external.zone.db; do + echo '@ in soa localhost. root 1 3H 15M 1W 1D + ns localhost.' > sample/var/named/$f; +done +/usr/bin/tail -n '+'`/bin/egrep -n '\\$Id$/+1/' | bc` bin/rndc/rndc.conf | sed '/Sample rndc configuration file./{p;i\ + *\ + * NOTE: you only need to create this file if it is to\ + * differ from the following default contents: +;d}' > sample/etc/rndc.conf; +# %if !%{DEBUGINFO} echo 'WARNING - NOT generating debuginfo!' /usr/lib/rpm/brp-compress @@ -487,13 +494,16 @@ %attr(770,named,named) %dir /var/run/named %attr(754,root,root) %config /etc/rc.d/init.d/named %config(noreplace) /etc/sysconfig/named -%verify(not size,not md5) %config(noreplace) %attr(0640,root,named) /etc/rndc.key +%ghost %config(noreplace) %attr(0640,root,named) /etc/rndc.key +# ^- rndc.key now created on first install only if it does not exist # %verify(not size,not md5) %config(noreplace) %attr(0640,root,named) /etc/rndc.conf -# ^- Let the named internal default rndc.conf be used - +# ^- Let the named internal default rndc.conf be used - # rndc.conf not required unless it differs from default. %ghost %config(noreplace) /etc/named.conf # ^- Ensure something owns named.conf, even though it may not be installed at all %ghost %config(noreplace) /etc/rndc.conf +# ^- The default rndc.conf which uses rndc.key is in named's default internal config - +# so rndc.conf is not necessary. %config(noreplace) /etc/logrotate.d/named %{_sbindir}/dnssec* %{_sbindir}/lwresd @@ -514,6 +524,7 @@ %{_mandir}/man8/rndc-confgen.8* %doc CHANGES COPYRIGHT README %doc doc/arm doc/misc +%doc sample/ %if %{WITH_DBUS} %doc doc/README.DBUS %attr(644,root,root) %config /etc/dbus-1/system.d/named.conf @@ -554,7 +565,7 @@ %{_includedir}/lwres %{_mandir}/man3/lwres* %{_bindir}/isc-config.sh -%doc doc/draft doc/rfc +%doc doc/draft doc/rfc %files config %defattr(-,root,root) @@ -640,18 +651,16 @@ /sbin/ldconfig /sbin/chkconfig --add named if [ "$1" -eq 1 ]; then - if [ -f /etc/named.boot -a -x /usr/sbin/named-bootconf -a ! -f /etc/named.conf ]; then - # Convert BIND 4 named.bootconf syntax to BIND 9 syntax (should never be used!) - cat /etc/named.boot | /usr/sbin/named-bootconf > /etc/named.bootconf-converted.conf - if [ "$?" -eq 0 ]; then - chmod 644 /etc/named.bootconf-converted.conf - cp -fp /etc/named.bootconf-converted.conf /etc/named.conf; - fi; - fi - if /bin/egrep -q '@KEY@' /etc/rndc.key; then - /bin/sed -i -e "s^@KEY@^`/usr/sbin/dns-keygen`^" /etc/rndc.key ; - chmod 0640 /etc/rndc.key - chown root:named /etc/rndc.key + # no more named.boot autoconversion! No-one should be using BIND-4 anymore. + if [ ! -e /etc/rndc.key ]; then + # create the rndc.key file: + echo 'key "rndckey" { + algorithm hmac-md5; + secret "'`/usr/sbin/dns-keygen`'"; +};' > /etc/rndc.key; + elif /bin/egrep -q '@KEY@' /etc/rndc.key; then + # fix potential problem with older versions + /bin/sed -i -e 's^@KEY@^'`/usr/sbin/dns-keygen`'^' /etc/rndc.key ; fi [ -e /selinux/enforce ] && [ -x /sbin/restorecon ] && /sbin/restorecon /etc/rndc.* /etc/named.* >/dev/null 2>&1 ; fi @@ -667,7 +676,7 @@ %postun /sbin/ldconfig if [ "$1" -ge 1 ]; then - /etc/rc.d/init.d/named condrestart >/dev/null 2>&1 || : + /etc/rc.d/init.d/named condrestart >/dev/null 2>&1 || :; fi; :; @@ -679,13 +688,13 @@ %triggerpostun -n bind -- bind <= 24:9.3.1-11 if [ "$1" -gt 0 ]; then # bind <= 22:9.3.0-2: -# These versions of bind installed named service at order 55 in -# runlevel startup order, after programs like nis / ntp / nfs +# These versions of bind installed named service at order 55 in +# runlevel startup order, after programs like nis / ntp / nfs # which may need its services if using no nameservers in resolv.conf. # bind <= 24:9.3.1-11: # These versions ran bind with order 11 in runlevel 2, after syslog # at order 12 . BIND should run after syslog and now has order '- 13 87'. -# +# /sbin/chkconfig named resetpriorities fi :; @@ -708,28 +717,20 @@ if [ "$1" -gt 0 ]; then /usr/bin/chcon system_u:object_r:named_conf_t /etc/named.caching-nameserver.conf >/dev/null 2>&1 || :; /usr/bin/chcon system_u:object_r:named_conf_t /etc/named.rfc1912.zones >/dev/null 2>&1 || :; -fi -if [ "$1" -eq 1 ]; then - /usr/sbin/bind-chroot-admin --sync; -fi; -:; - -%postun config -if [ "$1" -eq 0 ]; then - /usr/sbin/bind-chroot-admin --sync + . /usr/sbin/bind-chroot-admin --sync; fi; :; %post chroot if [ "$1" -gt 0 ]; then - /usr/sbin/bind-chroot-admin --enable; + . /usr/sbin/bind-chroot-admin --enable; fi; :; %preun chroot -if [ "$1" = "0" ]; then - /usr/sbin/bind-chroot-admin --disable; +if [ "$1" -eq 0 ]; then + . /usr/sbin/bind-chroot-admin --disable; fi :; @@ -790,6 +791,11 @@ :; %changelog +* Wed Mar 29 2006 Jason Vsa Dias - 30:9.3.2-14 +- fix bug 186577: remove -L/usr/lib from libbind.pc and more .spec file cleanup +- add '%doc' sample configuration files in /usr/share/doc/bind*/sample +- rebuild with new gcc and glibc + * Wed Mar 22 2006 Jason Vas Dias - 30:9.3.2-12 - fix typo in initscript - fix Requires(post): policycoreutils in sub-packages @@ -830,7 +836,7 @@ - Rebuild for new gcc, glibc, glibc-kernheaders * Mon Jan 16 2006 Jason Vas Dias - 30:9.3.2-2 -- fix bug 177854: temporary fix for broken kernel-2.6.15-1854+ +- fix bug 177854: temporary fix for broken kernel-2.6.15-1854+ /proc/net/if_inet6 format * Wed Dec 21 2005 Jason Vas Dias - 30:9.3.2-1 @@ -847,7 +853,7 @@ - fix namedSetForwarders -> namedGetForwarders SOURCE14 typo * Thu Dec 01 2005 Jason Vas Dias - 24:9.3.1-26 -- rebuild for new dbus 0.6 dependency; remove use of +- rebuild for new dbus 0.6 dependency; remove use of DBUS_NAME_FLAG_PROHIBIT_REPLACEMENT * Wed Nov 23 2005 Jason Vas Dias - 24:9.3.1-24 @@ -891,12 +897,12 @@ * Tue Aug 16 2005 Jason Vas Dias - 24:9.3.1-10 - Build with D-BUS patch by default; D-BUS support enabled with named -D option -- Enable D-BUS for named_sdb also +- Enable D-BUS for named_sdb also - fix sdb pgsql's zonetodb.c: must use isc_hash_create() before dns_db_create() -- update fix for bug 160914 : test for RD=1 and ARCOUNT=0 also before trying next server +- update fix for bug 160914 : test for RD=1 and ARCOUNT=0 also before trying next server - fix named.init script to handle named_sdb properly - fix named.init script checkconfig() to handle named '-c' option - and make configtest, test, check configcheck synonyms + and make configtest, test, check configcheck synonyms * Tue Jul 19 2005 Jason Vas Dias - 24:9.3.1-8 - fix named.init script bugs 163598, 163409, 151852(addendum) @@ -917,16 +923,16 @@ * Mon May 23 2005 Jason Vas Dias - 24:9.3.1-4_FC4 - Fix SDB LDAP -* Mon May 16 2005 Jason Vas Dias - 24:9.3.1-4 +* Mon May 16 2005 Jason Vas Dias - 24:9.3.1-4 - Fix bug 157601: give named.init a configtest function - Fix bug 156797: named.init should check SELinux booleans.local before booleans - Fix bug 154335: if no controls in named.conf, stop named with -TERM sig, not rndc -- Fix bug 155848: add NOTES section to named.8 man-page with info on all Red Hat +- Fix bug 155848: add NOTES section to named.8 man-page with info on all Red Hat BIND quirks and SELinux DDNS / slave zone file configuration - D-BUS patches NOT applied until dhcdbd is in FC * Sun May 15 2005 Jason Vas Dias - 24:9.3.1-4_dbus -- Enhancement to allow dynamic forwarder table management and +- Enhancement to allow dynamic forwarder table management and - DHCP forwarder auto-configuration with D-BUS * Thu Apr 14 2005 Jason Vas Dias - 24:9.3.1-2_FC4 @@ -939,12 +945,12 @@ - Upgrade to ISC BIND 9.3.1 (final release) released today. * Wed Mar 9 2005 Jason Vas Dias - 22.9.3.1rc1-5 -- fix bug 150288: h_errno not being accessed / set correctly in libbind +- fix bug 150288: h_errno not being accessed / set correctly in libbind - add libbind man-pages from bind-8.4.6 * Mon Mar 7 2005 Jason Vas Dias - 22:9.3.1rc1-4 - Rebuild with gcc4 / glibc-2.3.4-14. - + * Tue Mar 1 2005 Nalin Dahyabhai - 22:9.3.1rc1-3 - configure with --with-pic to get PIC libraries @@ -954,7 +960,7 @@ * Wed Feb 16 2005 Jason Vas Dias - 22:9.3.1rc1-1 - Upgrade to 9.3.1rc1 - Add Simplified Database Backend (SDB) sub-package ( bind-sdb ) -- add named_sdb - ldap + pgsql + dir database backend support with +- add named_sdb - ldap + pgsql + dir database backend support with - 'ENABLE_SDB' named.sysconfig option - Add BIND resolver library & includes sub-package ( libbind-devel) - fix bug 147824 / 147073 / 145664: ENABLE_ZONE_WRITE in named.init @@ -967,7 +973,7 @@ * Mon Nov 29 2004 Jason Vas Dias - 9.3.0-1 - Upgrade BIND to 9.3.0 in Rawhide / FC4 (bugs 134529, 133654...) - + * Mon Nov 29 2004 Jason Vas Dias - 20:9.2.4-4 - Fix bugs 140528 and 141113: - 2 second timeouts when IPv6 not configured and root nameserver's @@ -986,10 +992,10 @@ * Mon Sep 20 2004 Jason Vas Dias - 10:9.2.4rc8-14 - Upgrade to upstream bind-9.2.4rc8 . - Progress: Finally! Hooray! ISC bind now distributes: -- o named.conf(5) and nslookup(8) manpages +- o named.conf(5) and nslookup(8) manpages - 'bind-manpages.bz2' source can now disappear - (could this have something to do with ISC bug I raised about this?) -- o 'deprecation_msg' global has vanished +- o 'deprecation_msg' global has vanished - bind-9.2.3rc3-deprecation_msg_shut_up.diff.bz2 can disappear * Mon Sep 20 2004 Jason Vas Dias - 10:9.2.4rc8-14 @@ -1000,23 +1006,23 @@ - bind-chroot-9.2.2-21, restart named * Wed Sep 8 2004 Jason Vas Dias - 10:9.2.4rc7-11_EL3 -- Fix bug 131803: replace ROOTDIR line removed by broken +- Fix bug 131803: replace ROOTDIR line removed by broken - bind-chroot 9.2.2-21's '%postun'; added %triggerpostun for bind-chroot * Tue Sep 7 2004 Jason Vas Dias - 10:9.2.4rc7-10_EL3 - Fix bugs 130121 & 130981 for RHEL-3 - + * Mon Aug 30 2004 Jason Vas Dias - 10:9.2.4rc7-10 - Fix bug 130121: add '%ghost' entries for files included in previous -- bind-chroot & not in current - ie. named.conf, rndc.key, dev/* - +- bind-chroot & not in current - ie. named.conf, rndc.key, dev/* - - that RPM removed after upgrade . -* Thu Aug 26 2004 Jason Vas Dias +* Thu Aug 26 2004 Jason Vas Dias - Fix bug 130981: add '-t' option to named-checkconf invocation in - named.init if chroot installed. * Wed Aug 25 2004 Jason Vas Dias -- Remove resolver(5) manpage now in man-pages (bug 130792); +- Remove resolver(5) manpage now in man-pages (bug 130792); - Don't create /dev/ entries in bind-chroot if already there (bug 127556); - fix bind-devel Requires (bug 130919) - Set default location for dumpdb & stats files to /var/named/data @@ -1041,7 +1047,7 @@ - Fixed bug 129258: "${prefix}/var/tmp" typo in spec * Wed Jul 28 2004 Jason Vas Dias -- Fixed bug 127124 : 'Requires: kernel >= 2.4' +- Fixed bug 127124 : 'Requires: kernel >= 2.4' - causes problems with Linux VServers * Tue Jul 27 2004 Jason Vas Dias @@ -1062,7 +1068,7 @@ - remove disable-linux-caps * Wed Jun 16 2004 Daniel Walsh 9.2.3-17 -- Update RHEL3 to latest bind +- Update RHEL3 to latest bind * Tue Jun 15 2004 Elliot Lee - rebuilt @@ -1071,13 +1077,13 @@ - Remove device files from chroot, Named uses the system one * Fri Mar 26 2004 Daniel Walsh 9.2.3-14 -- Move RFC to devel package +- Move RFC to devel package * Fri Mar 26 2004 Daniel Walsh 9.2.3-13 - Fix location of restorecon * Thu Mar 25 2004 Daniel Walsh 9.2.3-12 -- Tighten security on config files. Should be owned by root +- Tighten security on config files. Should be owned by root * Thu Mar 25 2004 Daniel Walsh 9.2.3-11 - Update key patch to include conf-keygen @@ -1132,7 +1138,7 @@ - Fix local time in log file * Tue Oct 7 2003 Daniel Walsh 9.2.2.P3-5 -- Try again +- Try again * Mon Oct 6 2003 Daniel Walsh 9.2.2.P3-4 - Fix handling of chroot -/dev/random @@ -1242,7 +1248,7 @@ - Fix configure to build on x86_64 platforms * Wed Aug 07 2002 Karsten Hopp -- fix #70583, doesn't build on IA64 +- fix #70583, doesn't build on IA64 * Tue Jul 30 2002 Karsten Hopp 9.2.1-8 - bind-utils shouldn't require bind @@ -1289,7 +1295,7 @@ isn't always true. * Thu Feb 28 2002 Elliot Lee 9.2.0-6 -- Fix BuildRequires (we don't need specific glibc/glibc-kernheaders +- Fix BuildRequires (we don't need specific glibc/glibc-kernheaders versions). - Use _smp_mflags @@ -1638,7 +1644,7 @@ - add probing information in the init file to keep linuxconf happy - dont strip libbind -* Sun Mar 21 1999 Cristian Gafton +* Sun Mar 21 1999 Cristian Gafton - auto rebuild in the new build environment (release 3) * Wed Mar 17 1999 Preston Brown Index: libbind.pc =================================================================== RCS file: /cvs/dist/rpms/bind/devel/libbind.pc,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- libbind.pc 8 Mar 2006 18:21:32 -0000 1.1 +++ libbind.pc 30 Mar 2006 00:35:52 -0000 1.2 @@ -2,5 +2,5 @@ Name: libbind Description: BIND 8 compatible DNS Resolver Library Version: 9.3.2 -Libs: -L/usr/lib -lbind +Libs: -lbind Cflags: -I/usr/include/bind \ No newline at end of file Index: named.caching-nameserver.conf =================================================================== RCS file: /cvs/dist/rpms/bind/devel/named.caching-nameserver.conf,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- named.caching-nameserver.conf 8 Mar 2006 18:17:55 -0000 1.2 +++ named.caching-nameserver.conf 30 Mar 2006 00:35:52 -0000 1.3 @@ -5,6 +5,8 @@ // ISC BIND named(8) DNS server as a caching only nameserver // (as a localhost DNS resolver only). // +// See /usr/share/doc/bind*/sample/ for example named configuration files. +// // DO NOT EDIT THIS FILE - use system-config-bind or an editor // to create named.conf - edits to this file will be lost on // bind-config package upgrade. Index: named.rfc1912.zones =================================================================== RCS file: /cvs/dist/rpms/bind/devel/named.rfc1912.zones,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- named.rfc1912.zones 7 Mar 2006 04:25:38 -0000 1.1 +++ named.rfc1912.zones 30 Mar 2006 00:35:52 -0000 1.2 @@ -5,7 +5,8 @@ // ISC BIND named zone configuration for zones recommended by // RFC 1912 section 4.1 : localhost TLDs and address zones // - +// See /usr/share/doc/bind*/sample/ for example named configuration files. +// zone "." IN { type hint; file "named.ca"; From fedora-cvs-commits at redhat.com Thu Mar 30 00:52:39 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 29 Mar 2006 19:52:39 -0500 Subject: rpms/bind/devel bind.spec,1.99,1.100 Message-ID: <200603300052.k2U0qdDS025038@cvs.devel.redhat.com> Author: jvdias Update of /cvs/dist/rpms/bind/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv25008 Modified Files: bind.spec Log Message: fix bug 186577 - libbind.pc, more .spec file cleanup; add sample configuration files to %doc; rebuild for new gcc and glibc Index: bind.spec =================================================================== RCS file: /cvs/dist/rpms/bind/devel/bind.spec,v retrieving revision 1.99 retrieving revision 1.100 diff -u -r1.99 -r1.100 --- bind.spec 30 Mar 2006 00:35:52 -0000 1.99 +++ bind.spec 30 Mar 2006 00:52:34 -0000 1.100 @@ -52,6 +52,9 @@ Source26: bind-chroot-admin.in Source27: named.rfc1912.zones Source28: libbind.pc +Source29: named.conf.sample +Source30: named.rfc1912.zones.sample +Source31: named.root.hints # Patch: bind-9.2.0rc3-varrun.patch Patch1: bind-9.3.2b2-rndckey.patch @@ -464,10 +467,10 @@ install -m 754 bind-chroot-admin ${RPM_BUILD_ROOT}/%{_sbindir} # sample bind configuration files for %doc: mkdir -p sample/etc sample/var/named/{data,slaves} -cp -fp %{_sourcedir}/named.conf.sample sample/etc/named.conf -cp -fp %{_sourcedir}/named.rfc1912.zones.sample sample/etc/named.rfc1912.zones -cp -fp %{_sourcedir}/named.root.hints sample/etc/ -cp -fp %{_sourcedir}/{named.root,named.local,localhost.zone,localdomain.zone,named.ip6.local,named.broadcast,named.zero} sample/var/named +cp -fp %{SOURCE29} sample/etc/named.conf +cp -fp %{SOURCE30} sample/etc/named.rfc1912.zones +cp -fp %{SOURCE31} sample/etc/ +cp -fp %{SOURCE17} %{SOURCE18} %{SOURCE19} %{SOURCE20} %{SOURCE21} %{SOURCE22} %{SOURCE23} sample/var/named for f in my.internal.zone.db slaves/my.slave.internal.zone.db slaves/my.ddns.internal.zone.db my.external.zone.db; do echo '@ in soa localhost. root 1 3H 15M 1W 1D ns localhost.' > sample/var/named/$f; From fedora-cvs-commits at redhat.com Thu Mar 30 01:04:25 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 29 Mar 2006 20:04:25 -0500 Subject: rpms/bind/devel libbind.pc,1.2,1.3 Message-ID: <200603300104.k2U14PB9004231@cvs.devel.redhat.com> Author: jvdias Update of /cvs/dist/rpms/bind/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv4219 Modified Files: libbind.pc Log Message: Index: libbind.pc =================================================================== RCS file: /cvs/dist/rpms/bind/devel/libbind.pc,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- libbind.pc 30 Mar 2006 00:35:52 -0000 1.2 +++ libbind.pc 30 Mar 2006 01:04:19 -0000 1.3 @@ -3,4 +3,4 @@ Description: BIND 8 compatible DNS Resolver Library Version: 9.3.2 Libs: -lbind -Cflags: -I/usr/include/bind \ No newline at end of file +Cflags: -I/usr/include/bind From fedora-cvs-commits at redhat.com Thu Mar 30 01:05:33 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 29 Mar 2006 20:05:33 -0500 Subject: rpms/bind/FC-5 named.conf.sample, NONE, 1.1 named.rfc1912.zones.sample, NONE, 1.1 named.root.hints, NONE, 1.1 bind-chroot-admin.in, 1.3, 1.4 bind.spec, 1.98, 1.99 libbind.pc, 1.1, 1.2 named.caching-nameserver.conf, 1.2, 1.3 named.rfc1912.zones, 1.1, 1.2 Message-ID: <200603300105.k2U15Xl3004260@cvs.devel.redhat.com> Author: jvdias Update of /cvs/dist/rpms/bind/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv4245 Modified Files: bind-chroot-admin.in bind.spec libbind.pc named.caching-nameserver.conf named.rfc1912.zones Added Files: named.conf.sample named.rfc1912.zones.sample named.root.hints Log Message: fix bug 186577 - libbind.pc, more .spec file cleanup; add sample configuration files to %doc; rebuild for new gcc and glibc --- NEW FILE named.conf.sample --- // // Sample named.conf BIND DNS server 'named' configuration file // for the Red Hat BIND distribution. // // See the BIND Administrator's Reference Manual (ARM) for details, in: // file:///usr/share/doc/bind-*/arm/Bv9ARM.html // Also see the BIND Configuration GUI : /usr/bin/system-config-bind and // its manual. // options { /* make named use port 53 for the source of all queries, to allow * firewalls to block all ports except 53: */ query-source port 53; query-source-v6 port 53; // Put files that named is allowed to write in the data/ directory: directory "/var/named"; // the default dump-file "data/cache_dump.db"; statistics-file "data/named_stats.txt"; memstatistics-file "data/named_mem_stats.txt"; }; logging { /* If you want to enable debugging, eg. using the 'rndc trace' command, * named will try to write the 'named.run' file in the $directory (/var/named). * By default, SELinux policy does not allow named to modify the /var/named directory, * so put the default debug log file in data/ : */ channel default_debug { file "data/named.run"; severity dynamic; }; }; // // All BIND 9 zones are in a "view", which allow different zones to be served // to different types of client addresses, and for options to be set for groups // of zones. // // By default, if named.conf contains no "view" clauses, all zones are in the // "default" view, which matches all clients. // // If named.conf contains any "view" clause, then all zones MUST be in a view; // so it is recommended to start off using views to avoid having to restructure // your configuration files in the future. // view "localhost_resolver" { /* This view sets up named to be a localhost resolver ( caching only nameserver ). * If all you want is a caching-only nameserver, then you need only define this view: */ match-clients { localhost; }; match-destinations { localhost; }; recursion yes; # all views must contain the root hints zone: include "/etc/named.root.hints"; /* these are zones that contain definitions for all the localhost * names and addresses, as recommended in RFC1912 - these names should * ONLY be served to localhost clients: */ include "/etc/named.rfc1912.zones"; }; view "internal" { /* This view will contain zones you want to serve only to "internal" clients that connect via your directly attached LAN interfaces - "localnets" . */ match-clients { !localnets; !localhost; }; match-destinations { !localnets; !localhost; }; recursion yes; // all views must contain the root hints zone: include "/etc/named.root.hints"; // include "named.rfc1912.zones"; // you should not serve your rfc1912 names to non-localhost clients. // These are your "authoritative" internal zones, and would probably // also be included in the "localhost_resolver" view above : zone "my.internal.zone" { type master; file "my.internal.zone.db"; }; zone "my.slave.internal.zone" { type slave; file "slaves/my.slave.internal.zone.db"; masters { /* put master nameserver IPs here */ 127.0.0.1; } ; // put slave zones in the slaves/ directory so named can update them }; zone "my.ddns.internal.zone" { type master; allow-update { key ddns_key; }; file "slaves/my.ddns.internal.zone.db"; // put dynamically updateable zones in the slaves/ directory so named can update them }; }; key ddns_key { algorithm hmac-md5; secret "use /usr/sbin/dns-keygen to generate TSIG keys"; }; view "external" { /* This view will contain zones you want to serve only to "external" clients * that have addresses that are not on your directly attached LAN interface subnets: */ match-clients { !localnets; !localhost; }; match-destinations { !localnets; !localhost; }; recursion no; // you'd probably want to deny recursion to external clients, so you don't // end up providing free DNS service to all takers // all views must contain the root hints zone: include "/etc/named.root.hints"; // These are your "authoritative" external zones, and would probably // contain entries for just your web and mail servers: zone "my.external.zone" { type master; file "my.external.zone.db"; }; }; --- NEW FILE named.rfc1912.zones.sample --- // named.rfc1912.zones: // // ISC BIND named zone configuration for zones recommended by // RFC 1912 section 4.1 : localhost TLDs and address zones // zone "localdomain" IN { type master; file "localdomain.zone"; allow-update { none; }; }; zone "localhost" IN { type master; file "localhost.zone"; allow-update { none; }; }; zone "0.0.127.in-addr.arpa" IN { type master; file "named.local"; allow-update { none; }; }; zone "0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.ip6.arpa" IN { type master; file "named.ip6.local"; allow-update { none; }; }; zone "255.in-addr.arpa" IN { type master; file "named.broadcast"; allow-update { none; }; }; zone "0.in-addr.arpa" IN { type master; file "named.zero"; allow-update { none; }; }; --- NEW FILE named.root.hints --- // // The 'named.root' root cache hints zone for the bind DNS 'named' nameserver. // // named's cache must be primed with the addresses of the root zone '.' nameservers. // The root zone file can be obtained by querying the root 'A' nameserver: // $ dig . ns @198.41.0.4 > named.root // Or by download via FTP / HTTP: // $ wget ftp://ftp.rs.internic.net/domain/named.root // // Every view that is to provide recursive service must include this zone. // zone "." IN { type hint; file "named.root"; }; Index: bind-chroot-admin.in =================================================================== RCS file: /cvs/dist/rpms/bind/FC-5/bind-chroot-admin.in,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- bind-chroot-admin.in 8 Mar 2006 18:17:55 -0000 1.3 +++ bind-chroot-admin.in 30 Mar 2006 01:05:30 -0000 1.4 @@ -198,11 +198,14 @@ ng=$? shopt -s nullglob; pfx='' + changed=`/bin/mktemp /tmp/XXXXXX`; + rm -f $changed if rootdir ; then # chroot is enabled /usr/bin/find /{etc/{named.*,rndc.*},${BIND_DIR#/}{/*,/data/*,/slaves/*}} -maxdepth 0 -type f | while read f; do replace_with_link ${BIND_CHROOT_PREFIX}/$f $f; + [ ! -e $changed ] && touch $changed; done; pfx=${BIND_CHROOT_PREFIX} else # chroot is disabled @@ -211,31 +214,54 @@ do if [ ! -d "$f" ]; then replace_with_file $f ${f#$BIND_CHROOT_PREFIX}; + [ ! -e $changed ] && touch $changed; fi; done fi; - if [ $ng -eq 1 ]; then - shopt -u nullglob; - fi; + if [ ! -e ${pfx}/etc/rndc.key ]; then + echo 'key "rndckey" { + algorithm hmac-md5; + secret "'`/usr/sbin/dns-keygen`'"; +};' > /etc/rndc.key; + elif /bin/egrep -q '@KEY@' /etc/rndc.key; then + /bin/sed -i -e 's^@KEY@^'`/usr/sbin/dns-keygen`'^' /etc/rndc.key ; + fi chown root:named ${pfx}/var/named/* >/dev/null 2>&1; chmod 750 ${pfx}/var/named >/dev/null 2>&1; chmod 640 ${pfx}/var/named/* >/dev/null 2>&1; chown named:named ${pfx}/var/named/{data{,/*},slaves{,*/}} >/dev/null 2>&1; chmod 770 ${pfx}/var/named/{data,slaves} >/dev/null 2>&1; chmod 640 ${pfx}/var/named/{data/*,slaves/*} >/dev/null 2>&1; + if [ -e $changed ]; then + if [ -e /selinux/enforce ] && [ -x /sbin/restorecon ]; then + if [ -n "$pfx" ]; then + /sbin/restorecon -R $pfx/etc $pfx/var/named $pfx/var/run/named >/dev/null 2>&1; + if [ -e $pfx/etc/localtime ] && [ -e /etc/localtime ] ; then + /usr/bin/chcon --reference=/etc/localtime $pfx/etc/localtime >/dev/null 2>&1; + fi; + else + /sbin/restorecon /etc/{named,rndc}.* >/dev/null 2>&1; + /usr/bin/chcon --reference=/etc/named.conf /etc/named.* >/dev/null 2>&1; + /sbin/restorecon -e /var/named/chroot /var/named{/,/data/,/slaves/}* >/dev/null 2>&1; + fi; + fi; + /sbin/service named condrestart + rm -f $changed; + fi; + if [ $ng -eq 1 ]; then + shopt -u nullglob; + fi; } case $1 in -e|--enable) enable_bind_chroot; sync_files; - /sbin/service named condrestart exit $?; ;; -d|--disable) disable_bind_chroot; sync_files; - /sbin/service named condrestart /bin/umount ${BIND_CHROOT_PREFIX}/proc >/dev/null 2>&1 || :; /bin/umount ${BIND_CHROOT_PREFIX}/var/run/dbus >/dev/null 2>&1 || :; exit $?; Index: bind.spec =================================================================== RCS file: /cvs/dist/rpms/bind/FC-5/bind.spec,v retrieving revision 1.98 retrieving revision 1.99 diff -u -r1.98 -r1.99 --- bind.spec 22 Mar 2006 18:10:56 -0000 1.98 +++ bind.spec 30 Mar 2006 01:05:30 -0000 1.99 @@ -1,11 +1,11 @@ # # Red Hat BIND package .spec file -# +# %{?!SDB: %define SDB 1} %{?!LIBBIND: %define LIBBIND 1} %{?!efence: %define efence 0} %{?!test: %define test 0} -%{?!WITH_DBUS: %define WITH_DBUS 1} # + dynamic forwarder table management with D-BUS +%{?!WITH_DBUS: %define WITH_DBUS 1} # + dynamic forwarder table management with D-BUS %{?!DEBUGINFO: %define DEBUGINFO 1} %{?!bind_uid: %define bind_uid 25} %{?!bind_gid: %define bind_gid 25} @@ -17,7 +17,7 @@ Name: bind License: BSD-like Version: 9.3.2 -Release: 12.FC5 +Release: 14.FC5 Epoch: 30 Url: http://www.isc.org/products/BIND/ Buildroot: %{_tmppath}/%{name}-root @@ -52,6 +52,9 @@ Source26: bind-chroot-admin.in Source27: named.rfc1912.zones Source28: libbind.pc +Source29: named.conf.sample +Source30: named.rfc1912.zones.sample +Source31: named.root.hints # Patch: bind-9.2.0rc3-varrun.patch Patch1: bind-9.3.2b2-rndckey.patch @@ -84,27 +87,25 @@ Patch28: bind-9.3.2rc1-dbus-0.6.patch Patch29: bind-9.3.2-bz177854.patch # -Requires: bind-libs = %{epoch}:%{version}-%{release}, glibc >= 2.2 -Requires(post): bash, textutils, fileutils, sed, grep -Requires(pre): shadow-utils -Requires(post,preun): chkconfig >= 1.3.26 +Requires: bind-libs = %{epoch}:%{version}-%{release}, glibc >= 2.2 +Requires(post): bash, coreutils, sed, grep, chkconfig >= 1.3.26 +Requires(pre): shadow-utils +Requires(preun):chkconfig >= 1.3.26 %if %{selinux} -Requires(post): policycoreutils +Requires(post): policycoreutils %endif +BuildRequires: gcc, glibc-devel >= 2.2.5-26, glibc-kernheaders >= 2.4-7.10, openssl-devel, libtool, pkgconfig, tar %if %{SDB} -%if %{WITH_DBUS} -BuildRequires: openssl-devel gcc dbus-devel glibc-devel >= 2.2.5-26 glibc-kernheaders >= 2.4-7.10 libtool pkgconfig tar openldap-devel postgresql-devel -%else -BuildRequires: openssl-devel gcc glibc-devel >= 2.2.5-26 glibc-kernheaders >= 2.4-7.10 libtool pkgconfig tar openldap-devel postgresql-devel +BuildRequires: openldap-devel, postgresql-devel %endif -%else %if %{WITH_DBUS} -BuildRequires: openssl-devel gcc dbus-devel glibc-devel >= 2.2.5-26 glibc-kernheaders >= 2.4-7.10 libtool pkgconfig tar -%else -BuildRequires: openssl-devel gcc glibc-devel >= 2.2.5-26 glibc-kernheaders >= 2.4-7.10 libtool pkgconfig tar +BuildRequires: dbus-devel %endif +%if %{test} +BuildRequires: net-tools, perl %endif -# fix bug 176100: do not Require: perl just for namedGetForwarders ! +# +# fix bug 176100: do not Require: perl just for namedGetForwarders ! %define __perl_requires %SOURCE15 %define __find_requires %SOURCE15 %define _use_internal_dependency_generator 0 @@ -119,7 +120,7 @@ %package libs -Summary: Libraries used by various DNS packages +Summary: Libraries used by the BIND DNS packages Group: Applications/System %description libs @@ -143,14 +144,13 @@ %package devel -Summary: Include files and libraries needed for bind DNS development. +Summary: Header files and libraries needed for BIND DNS development. Group: Development/Libraries Requires: bind-libs = %{epoch}:%{version}-%{release} %description devel -The bind-devel package contains all the include files and the library -required for DNS (Domain Name System) development for BIND versions -9.x.x. +The bind-devel package contains all the header files and libraries +required for DNS (Domain Name System) development with ISC BIND 9.x.x. %package config @@ -159,20 +159,21 @@ Obsoletes: caching-nameserver Provides: caching-nameserver Requires: bind = %{epoch}:%{version}-%{release} -Requires(post): bash, textutils, fileutils, sed, grep +Requires(post): bash, coreutils, sed, grep +Requires(postun): bash, coreutils, sed, grep %if %{selinux} Requires(post): policycoreutils %endif %description config -The bind-config package includes the configuration files which will make +The bind-config package includes the configuration files which will make the ISC BIND named DNS name server act as a simple caching nameserver. A caching nameserver is a DNS Resolver, as defined in RFC 1035, section 7. -ISC BIND named(8) provides a very efficient, flexible and robust resolver as -well as a server of authoritative DNS data - many users use this package +ISC BIND named(8) provides a very efficient, flexible and robust resolver as +well as a server of authoritative DNS data - many users use this package along with BIND to implement their primary system DNS resolver service. If you would like to set up a caching name server, you'll need to install -bind, bind-libs, and bind-utils along with this package. +bind, bind-libs, and bind-utils along with this package. This package replaces the caching-nameserver package. @@ -181,7 +182,8 @@ Group: System Environment/Daemons Prefix: %{chroot_prefix} Requires: bind = %{epoch}:%{version}-%{release} -Requires(post): bash, textutils, fileutils, sed, grep +Requires(post): bash, coreutils, sed, grep +Requires(preun): bash, coreutils, sed, grep %if %{selinux} Requires(post): policycoreutils %endif @@ -213,7 +215,8 @@ Summary: The Berkeley Internet Name Domain (BIND) DNS (Domain Name System) server with database backends. Group: System Environment/Daemons Requires: bind-libs = %{epoch}:%{version}-%{release}, bind-utils = %{epoch}:%{version}-%{release}, glibc >= 2.2 -Requires(post): bash, textutils, fileutils, sed, grep, mktemp +Requires(post): bash, coreutils, sed, grep, mktemp +Requires(preun): bash, coreutils, sed, grep %if %{selinux} Requires(post): policycoreutils %endif @@ -225,11 +228,11 @@ (routines for applications to use when interfacing with DNS); and tools for verifying that the DNS server is operating properly. -BIND SDB (Simplified Database Backend) provides named_sdb, the DNS -name server compiled to include support for using alternative Zone Databases -stored in an LDAP server (ldapdb), a postgreSQL database (pgsqldb), or in the -filesystem (dirdb), in addition to the standard in-memory RBT (Red Black Tree) -zone database. +BIND SDB (Simplified Database Backend) provides named_sdb, the DNS +name server compiled to include support for using alternative Zone Databases +stored in an LDAP server (ldapdb), a postgreSQL database (pgsqldb), or in the +filesystem (dirdb), in addition to the standard in-memory RBT (Red Black Tree) +zone database. %endif @@ -251,7 +254,7 @@ # This patch now in patch10 #%patch8 -p1 -b .handle_send_errors # This patch is now in ISC bind-9.3.1x -# +# #%patch9 -p1 -b .missing_dnssec_tools #RIP dnssec-signkey and dnssec-makekeyset: #1852. [cleanup] Remove last vestiges of dnssec-signkey and @@ -315,12 +318,18 @@ cp -fp bin/named/include/named/{dbus_mgr.h,dbus_service.h,globals.h,server.h,log.h,types.h} bin/named_sdb/include/named %endif %endif +:; %build libtoolize --copy --force; aclocal; autoconf cp -f /usr/share/libtool/config.{guess,sub} . -export CFLAGS="$RPM_OPT_FLAGS" +%if %{DEBUGINFO} +export CFLAGS="$RPM_OPT_FLAGS"; +%else +export CFLAGS=`echo $RPM_OPT_FLAGS | sed 's/-O2 -g/-g3 -gdwarf-2/g'`; +%endif +export CPPFLAGS="$CFLAGS"; %if %{WITH_DBUS} %ifarch s390x x86_64 ppc64 # every 64-bit arch EXCEPT ia64 has dbus architecture dependant @@ -333,28 +342,22 @@ export CPPFLAGS="$CPPFLAGS `pkg-config --cflags-only-I openssl`" export LDFLAGS="$LDFLAGS `pkg-config --libs-only-L openssl`" fi -#export CFLAGS="-g $CFLAGS" %if %{efence} export LDFLAGS=-lefence %endif -%if %{LIBBIND} -%configure --with-libtool --localstatedir=/var \ +%configure \ + --with-libtool \ + --localstatedir=/var \ --enable-threads \ --enable-ipv6 \ --with-pic \ --with-openssl=/usr \ - --enable-libbind -%else -%configure --with-libtool --localstatedir=/var \ - --enable-threads \ - --enable-ipv6 \ - --with-pic \ - --with-openssl=/usr +%if %{LIBBIND} + --enable-libbind \ %endif + CFLAGS="$CFLAGS" \ +; make %{?_smp_mflags} -if [ $? -ne 0 ]; then - exit $?; -fi; %if !%{DEBUGINFO} @@ -362,7 +365,7 @@ %endif %install -rm -rf $RPM_BUILD_ROOT +rm -rf ${RPM_BUILD_ROOT} cp %{SOURCE5} doc/rfc gzip -9 doc/rfc/* mkdir -p ${RPM_BUILD_ROOT}/etc/{rc.d/init.d,logrotate.d} @@ -374,7 +377,7 @@ mkdir -p ${RPM_BUILD_ROOT}/var/run/named #chroot mkdir -p ${RPM_BUILD_ROOT}/%{chroot_prefix} -tar --no-same-owner -zxvf %{SOURCE6} --directory ${RPM_BUILD_ROOT}/%{chroot_prefix} +tar --no-same-owner -zxvf %{SOURCE6} --directory ${RPM_BUILD_ROOT}/%{chroot_prefix} # these are required to prevent them being erased during upgrade of previous # versions that included them (bug #130121): touch ${RPM_BUILD_ROOT}/%{chroot_prefix}/etc/named.conf @@ -383,40 +386,32 @@ touch ${RPM_BUILD_ROOT}/%{chroot_prefix}/dev/null touch ${RPM_BUILD_ROOT}/%{chroot_prefix}/dev/random #end chroot -make DESTDIR=$RPM_BUILD_ROOT install -install -c -m 640 bin/rndc/rndc.conf $RPM_BUILD_ROOT%{_sysconfdir} -install -c -m 755 contrib/named-bootconf/named-bootconf.sh $RPM_BUILD_ROOT%{_sbindir}/named-bootconf -install -c -m 755 %SOURCE2 $RPM_BUILD_ROOT/etc/rc.d/init.d/named -install -c -m 644 %SOURCE3 $RPM_BUILD_ROOT/etc/logrotate.d/named -touch $RPM_BUILD_ROOT%{_sysconfdir}/rndc.key -cat << __EOF > $RPM_BUILD_ROOT%{_sysconfdir}/rndc.key -key "rndckey" { - algorithm hmac-md5; - secret "@KEY@"; -}; -__EOF -%{__cc} $RPM_OPT_FLAGS -o $RPM_BUILD_ROOT%{_sbindir}/dns-keygen %{SOURCE4} -mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig -cp %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/named -#mv $RPM_BUILD_ROOT/usr/share/man/man8/named.conf.* $RPM_BUILD_ROOT/usr/share/man/man5 +make DESTDIR=${RPM_BUILD_ROOT} install +touch ${RPM_BUILD_ROOT}%{_sysconfdir}/rndc.conf +install -c -m 755 contrib/named-bootconf/named-bootconf.sh ${RPM_BUILD_ROOT}%{_sbindir}/named-bootconf +install -c -m 755 %SOURCE2 ${RPM_BUILD_ROOT}/etc/rc.d/init.d/named +install -c -m 644 %SOURCE3 ${RPM_BUILD_ROOT}/etc/logrotate.d/named +touch ${RPM_BUILD_ROOT}%{_sysconfdir}/rndc.key +%{__cc} $RPM_OPT_FLAGS -o ${RPM_BUILD_ROOT}%{_sbindir}/dns-keygen %{SOURCE4} +mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig +cp %{SOURCE1} ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig/named %if %{SDB} -mkdir -p $RPM_BUILD_ROOT/etc/openldap/schema -install -c -m 644 %{SOURCE8} $RPM_BUILD_ROOT/etc/openldap/schema/dnszone.schema +mkdir -p ${RPM_BUILD_ROOT}/etc/openldap/schema +install -c -m 644 %{SOURCE8} ${RPM_BUILD_ROOT}/etc/openldap/schema/dnszone.schema cp -fp %{SOURCE12} contrib/sdb/pgsql/ %endif %if %{LIBBIND} -gunzip < %{SOURCE9} | (cd $RPM_BUILD_ROOT/usr/share; tar -xpf -) -mkdir -p $RPM_BUILD_ROOT/%{_libdir}/pkgconfig -cp -fp %{SOURCE28} $RPM_BUILD_ROOT/%{_libdir}/pkgconfig/libbind.pc -chmod 644 $RPM_BUILD_ROOT/%{_libdir}/pkgconfig/libbind.pc +gunzip < %{SOURCE9} | (cd ${RPM_BUILD_ROOT}/usr/share; tar -xpf -) +mkdir -p ${RPM_BUILD_ROOT}/%{_libdir}/pkgconfig +install -m 644 %{SOURCE28} $RPM_BUILD_ROOT%{_libdir}/pkgconfig/libbind.pc %endif %if %{WITH_DBUS} -mkdir -p $RPM_BUILD_ROOT/etc/dbus-1/system.d -mkdir -p $RPM_BUILD_ROOT/usr/share/dbus-1/services -cp -fp %{SOURCE10} $RPM_BUILD_ROOT/etc/dbus-1/system.d/named.conf -cp -fp %{SOURCE11} $RPM_BUILD_ROOT/usr/share/dbus-1/services/named.service -cp -fp %{SOURCE13} $RPM_BUILD_ROOT%{_sbindir}/namedSetForwarders -cp -fp %{SOURCE14} $RPM_BUILD_ROOT%{_sbindir}/namedGetForwarders +mkdir -p ${RPM_BUILD_ROOT}/etc/dbus-1/system.d +mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/dbus-1/services +cp -fp %{SOURCE10} ${RPM_BUILD_ROOT}/etc/dbus-1/system.d/named.conf +cp -fp %{SOURCE11} ${RPM_BUILD_ROOT}%{_datadir}/dbus-1/services/named.service +cp -fp %{SOURCE13} ${RPM_BUILD_ROOT}%{_sbindir}/namedSetForwarders +cp -fp %{SOURCE14} ${RPM_BUILD_ROOT}%{_sbindir}/namedGetForwarders %endif %if %{test} if [ "`whoami`" = 'root' ]; then @@ -427,9 +422,9 @@ ./ifconfig.sh up popd make test - e=$? + e=$? pushd system - ./ifconfig.sh down + ./ifconfig.sh down popd popd if [ "$e" -ne 0 ]; then @@ -437,40 +432,55 @@ exit $e; fi; else - echo 'test==1 : only root can run the tests (they require an ifconfig).'; + echo 'test==1 : only root can run the tests (they require an ifconfig).'; fi -:; %endif # Files required to run test-suite outside of build tree: -cp -fp config.h $RPM_BUILD_ROOT/%{_includedir}/bind9 -cp -fp lib/dns/include/dns/forward.h $RPM_BUILD_ROOT/%{_includedir}/dns -cp -fp lib/isc/unix/include/isc/keyboard.h $RPM_BUILD_ROOT/%{_includedir}/isc -cp -fp lib/isc/include/isc/hash.h $RPM_BUILD_ROOT/%{_includedir}/isc +cp -fp config.h ${RPM_BUILD_ROOT}/%{_includedir}/bind9 +cp -fp lib/dns/include/dns/forward.h ${RPM_BUILD_ROOT}/%{_includedir}/dns +cp -fp lib/isc/unix/include/isc/keyboard.h ${RPM_BUILD_ROOT}/%{_includedir}/isc +cp -fp lib/isc/include/isc/hash.h ${RPM_BUILD_ROOT}/%{_includedir}/isc # Remove libtool .la files: -find $RPM_BUILD_ROOT/%{_libdir} -name '*.la' -exec '/bin/rm' '-f' '{}' ';'; +find ${RPM_BUILD_ROOT}/%{_libdir} -name '*.la' -exec '/bin/rm' '-f' '{}' ';'; # /usr/lib/rpm/brp-compress -# +# # Ghost config files: -touch $RPM_BUILD_ROOT/etc/named.conf +touch ${RPM_BUILD_ROOT}/etc/named.conf # bind-config files: -mkdir -p $RPM_BUILD_ROOT/{etc,var/named} -install -m 644 %{SOURCE16} $RPM_BUILD_ROOT/etc/named.caching-nameserver.conf -install -m 644 %{SOURCE27} $RPM_BUILD_ROOT/etc/named.rfc1912.zones -install -m 644 %{SOURCE17} $RPM_BUILD_ROOT/var/named/named.ca -install -m 644 %{SOURCE18} $RPM_BUILD_ROOT/var/named/named.local -install -m 644 %{SOURCE19} $RPM_BUILD_ROOT/var/named/localhost.zone -install -m 644 %{SOURCE20} $RPM_BUILD_ROOT/var/named/localdomain.zone -install -m 644 %{SOURCE21} $RPM_BUILD_ROOT/var/named/named.ip6.local -install -m 644 %{SOURCE22} $RPM_BUILD_ROOT/var/named/named.broadcast -install -m 644 %{SOURCE23} $RPM_BUILD_ROOT/var/named/named.zero +mkdir -p ${RPM_BUILD_ROOT}/{etc,var/named} +install -m 644 %{SOURCE16} ${RPM_BUILD_ROOT}/etc/named.caching-nameserver.conf +install -m 644 %{SOURCE27} ${RPM_BUILD_ROOT}/etc/named.rfc1912.zones +install -m 644 %{SOURCE17} ${RPM_BUILD_ROOT}/var/named/named.ca +install -m 644 %{SOURCE18} ${RPM_BUILD_ROOT}/var/named/named.local +install -m 644 %{SOURCE19} ${RPM_BUILD_ROOT}/var/named/localhost.zone +install -m 644 %{SOURCE20} ${RPM_BUILD_ROOT}/var/named/localdomain.zone +install -m 644 %{SOURCE21} ${RPM_BUILD_ROOT}/var/named/named.ip6.local +install -m 644 %{SOURCE22} ${RPM_BUILD_ROOT}/var/named/named.broadcast +install -m 644 %{SOURCE23} ${RPM_BUILD_ROOT}/var/named/named.zero for f in /etc/named.caching-nameserver.conf /var/named/{named.ca,named.local,localhost.zone,localdomain.zone,named.ip6.local,named.broadcast,named.zero}; do - touch $RPM_BUILD_ROOT/%{chroot_prefix}/$f; + touch ${RPM_BUILD_ROOT}/%{chroot_prefix}/$f; done install -m 644 %{SOURCE24} ./rfc1912.txt install -m 644 %{SOURCE25} ./Copyright # bind-chroot-admin script: -sed -e 's^@BIND_CHROOT_PREFIX@^'%{chroot_prefix}'^;s^@BIND_DIR@^'%{bind_dir}'^' < %SOURCE26 > bind-chroot-admin; -install -m 754 bind-chroot-admin $RPM_BUILD_ROOT/%{_sbindir} +sed -e 's^@BIND_CHROOT_PREFIX@^'%{chroot_prefix}'^;s^@BIND_DIR@^'%{bind_dir}'^' < %{SOURCE26} > bind-chroot-admin; +install -m 754 bind-chroot-admin ${RPM_BUILD_ROOT}/%{_sbindir} +# sample bind configuration files for %doc: +mkdir -p sample/etc sample/var/named/{data,slaves} +cp -fp %{SOURCE29} sample/etc/named.conf +cp -fp %{SOURCE30} sample/etc/named.rfc1912.zones +cp -fp %{SOURCE31} sample/etc/ +cp -fp %{SOURCE17} %{SOURCE18} %{SOURCE19} %{SOURCE20} %{SOURCE21} %{SOURCE22} %{SOURCE23} sample/var/named +for f in my.internal.zone.db slaves/my.slave.internal.zone.db slaves/my.ddns.internal.zone.db my.external.zone.db; do + echo '@ in soa localhost. root 1 3H 15M 1W 1D + ns localhost.' > sample/var/named/$f; +done +/usr/bin/tail -n '+'`/bin/egrep -n '\\$Id$/+1/' | bc` bin/rndc/rndc.conf | sed '/Sample rndc configuration file./{p;i\ + *\ + * NOTE: you only need to create this file if it is to\ + * differ from the following default contents: +;d}' > sample/etc/rndc.conf; +# %if !%{DEBUGINFO} echo 'WARNING - NOT generating debuginfo!' /usr/lib/rpm/brp-compress @@ -487,13 +497,16 @@ %attr(770,named,named) %dir /var/run/named %attr(754,root,root) %config /etc/rc.d/init.d/named %config(noreplace) /etc/sysconfig/named -%verify(not size,not md5) %config(noreplace) %attr(0640,root,named) /etc/rndc.key +%ghost %config(noreplace) %attr(0640,root,named) /etc/rndc.key +# ^- rndc.key now created on first install only if it does not exist # %verify(not size,not md5) %config(noreplace) %attr(0640,root,named) /etc/rndc.conf -# ^- Let the named internal default rndc.conf be used - +# ^- Let the named internal default rndc.conf be used - # rndc.conf not required unless it differs from default. %ghost %config(noreplace) /etc/named.conf # ^- Ensure something owns named.conf, even though it may not be installed at all %ghost %config(noreplace) /etc/rndc.conf +# ^- The default rndc.conf which uses rndc.key is in named's default internal config - +# so rndc.conf is not necessary. %config(noreplace) /etc/logrotate.d/named %{_sbindir}/dnssec* %{_sbindir}/lwresd @@ -514,6 +527,7 @@ %{_mandir}/man8/rndc-confgen.8* %doc CHANGES COPYRIGHT README %doc doc/arm doc/misc +%doc sample/ %if %{WITH_DBUS} %doc doc/README.DBUS %attr(644,root,root) %config /etc/dbus-1/system.d/named.conf @@ -554,7 +568,7 @@ %{_includedir}/lwres %{_mandir}/man3/lwres* %{_bindir}/isc-config.sh -%doc doc/draft doc/rfc +%doc doc/draft doc/rfc %files config %defattr(-,root,root) @@ -640,18 +654,16 @@ /sbin/ldconfig /sbin/chkconfig --add named if [ "$1" -eq 1 ]; then - if [ -f /etc/named.boot -a -x /usr/sbin/named-bootconf -a ! -f /etc/named.conf ]; then - # Convert BIND 4 named.bootconf syntax to BIND 9 syntax (should never be used!) - cat /etc/named.boot | /usr/sbin/named-bootconf > /etc/named.bootconf-converted.conf - if [ "$?" -eq 0 ]; then - chmod 644 /etc/named.bootconf-converted.conf - cp -fp /etc/named.bootconf-converted.conf /etc/named.conf; - fi; - fi - if /bin/egrep -q '@KEY@' /etc/rndc.key; then - /bin/sed -i -e "s^@KEY@^`/usr/sbin/dns-keygen`^" /etc/rndc.key ; - chmod 0640 /etc/rndc.key - chown root:named /etc/rndc.key + # no more named.boot autoconversion! No-one should be using BIND-4 anymore. + if [ ! -e /etc/rndc.key ]; then + # create the rndc.key file: + echo 'key "rndckey" { + algorithm hmac-md5; + secret "'`/usr/sbin/dns-keygen`'"; +};' > /etc/rndc.key; + elif /bin/egrep -q '@KEY@' /etc/rndc.key; then + # fix potential problem with older versions + /bin/sed -i -e 's^@KEY@^'`/usr/sbin/dns-keygen`'^' /etc/rndc.key ; fi [ -e /selinux/enforce ] && [ -x /sbin/restorecon ] && /sbin/restorecon /etc/rndc.* /etc/named.* >/dev/null 2>&1 ; fi @@ -667,7 +679,7 @@ %postun /sbin/ldconfig if [ "$1" -ge 1 ]; then - /etc/rc.d/init.d/named condrestart >/dev/null 2>&1 || : + /etc/rc.d/init.d/named condrestart >/dev/null 2>&1 || :; fi; :; @@ -679,13 +691,13 @@ %triggerpostun -n bind -- bind <= 24:9.3.1-11 if [ "$1" -gt 0 ]; then # bind <= 22:9.3.0-2: -# These versions of bind installed named service at order 55 in -# runlevel startup order, after programs like nis / ntp / nfs +# These versions of bind installed named service at order 55 in +# runlevel startup order, after programs like nis / ntp / nfs # which may need its services if using no nameservers in resolv.conf. # bind <= 24:9.3.1-11: # These versions ran bind with order 11 in runlevel 2, after syslog # at order 12 . BIND should run after syslog and now has order '- 13 87'. -# +# /sbin/chkconfig named resetpriorities fi :; @@ -708,28 +720,20 @@ if [ "$1" -gt 0 ]; then /usr/bin/chcon system_u:object_r:named_conf_t /etc/named.caching-nameserver.conf >/dev/null 2>&1 || :; /usr/bin/chcon system_u:object_r:named_conf_t /etc/named.rfc1912.zones >/dev/null 2>&1 || :; -fi -if [ "$1" -eq 1 ]; then - /usr/sbin/bind-chroot-admin --sync; -fi; -:; - -%postun config -if [ "$1" -eq 0 ]; then - /usr/sbin/bind-chroot-admin --sync + . /usr/sbin/bind-chroot-admin --sync; fi; :; %post chroot if [ "$1" -gt 0 ]; then - /usr/sbin/bind-chroot-admin --enable; + . /usr/sbin/bind-chroot-admin --enable; fi; :; %preun chroot -if [ "$1" = "0" ]; then - /usr/sbin/bind-chroot-admin --disable; +if [ "$1" -eq 0 ]; then + . /usr/sbin/bind-chroot-admin --disable; fi :; @@ -790,14 +794,19 @@ :; %changelog +* Wed Mar 29 2006 Jason Vsa Dias - 30:9.3.2-14 +- fix bug 186577: remove -L/usr/lib from libbind.pc and more .spec file cleanup +- add '%doc' sample configuration files in /usr/share/doc/bind*/sample +- rebuild with new gcc and glibc + * Wed Mar 22 2006 Jason Vas Dias - 30:9.3.2-12 - fix typo in initscript - fix Requires(post): policycoreutils in sub-packages -* Mon Mar 20 2006 Jason Vas Dias - 30:9.3.2-10 +* Mon Mar 20 2006 Jason Vas Dias - 30.9.3.2-10 - fix bug 185969: more .spec file cleanup -* Wed Mar 08 2006 Jason Vas Dias - 30:9.3.2-8 +* Wed Mar 08 2006 Jason Vas Dias - 30.9.3.2-8 - Do not allow package to be installed if named:25 userid creation fails - Give libbind a pkg-config file - remove restorecon from bind-chroot-admin (not required). @@ -830,7 +839,7 @@ - Rebuild for new gcc, glibc, glibc-kernheaders * Mon Jan 16 2006 Jason Vas Dias - 30:9.3.2-2 -- fix bug 177854: temporary fix for broken kernel-2.6.15-1854+ +- fix bug 177854: temporary fix for broken kernel-2.6.15-1854+ /proc/net/if_inet6 format * Wed Dec 21 2005 Jason Vas Dias - 30:9.3.2-1 @@ -847,7 +856,7 @@ - fix namedSetForwarders -> namedGetForwarders SOURCE14 typo * Thu Dec 01 2005 Jason Vas Dias - 24:9.3.1-26 -- rebuild for new dbus 0.6 dependency; remove use of +- rebuild for new dbus 0.6 dependency; remove use of DBUS_NAME_FLAG_PROHIBIT_REPLACEMENT * Wed Nov 23 2005 Jason Vas Dias - 24:9.3.1-24 @@ -891,12 +900,12 @@ * Tue Aug 16 2005 Jason Vas Dias - 24:9.3.1-10 - Build with D-BUS patch by default; D-BUS support enabled with named -D option -- Enable D-BUS for named_sdb also +- Enable D-BUS for named_sdb also - fix sdb pgsql's zonetodb.c: must use isc_hash_create() before dns_db_create() -- update fix for bug 160914 : test for RD=1 and ARCOUNT=0 also before trying next server +- update fix for bug 160914 : test for RD=1 and ARCOUNT=0 also before trying next server - fix named.init script to handle named_sdb properly - fix named.init script checkconfig() to handle named '-c' option - and make configtest, test, check configcheck synonyms + and make configtest, test, check configcheck synonyms * Tue Jul 19 2005 Jason Vas Dias - 24:9.3.1-8 - fix named.init script bugs 163598, 163409, 151852(addendum) @@ -917,16 +926,16 @@ * Mon May 23 2005 Jason Vas Dias - 24:9.3.1-4_FC4 - Fix SDB LDAP -* Mon May 16 2005 Jason Vas Dias - 24:9.3.1-4 +* Mon May 16 2005 Jason Vas Dias - 24:9.3.1-4 - Fix bug 157601: give named.init a configtest function - Fix bug 156797: named.init should check SELinux booleans.local before booleans - Fix bug 154335: if no controls in named.conf, stop named with -TERM sig, not rndc -- Fix bug 155848: add NOTES section to named.8 man-page with info on all Red Hat +- Fix bug 155848: add NOTES section to named.8 man-page with info on all Red Hat BIND quirks and SELinux DDNS / slave zone file configuration - D-BUS patches NOT applied until dhcdbd is in FC * Sun May 15 2005 Jason Vas Dias - 24:9.3.1-4_dbus -- Enhancement to allow dynamic forwarder table management and +- Enhancement to allow dynamic forwarder table management and - DHCP forwarder auto-configuration with D-BUS * Thu Apr 14 2005 Jason Vas Dias - 24:9.3.1-2_FC4 @@ -939,12 +948,12 @@ - Upgrade to ISC BIND 9.3.1 (final release) released today. * Wed Mar 9 2005 Jason Vas Dias - 22.9.3.1rc1-5 -- fix bug 150288: h_errno not being accessed / set correctly in libbind +- fix bug 150288: h_errno not being accessed / set correctly in libbind - add libbind man-pages from bind-8.4.6 * Mon Mar 7 2005 Jason Vas Dias - 22:9.3.1rc1-4 - Rebuild with gcc4 / glibc-2.3.4-14. - + * Tue Mar 1 2005 Nalin Dahyabhai - 22:9.3.1rc1-3 - configure with --with-pic to get PIC libraries @@ -954,7 +963,7 @@ * Wed Feb 16 2005 Jason Vas Dias - 22:9.3.1rc1-1 - Upgrade to 9.3.1rc1 - Add Simplified Database Backend (SDB) sub-package ( bind-sdb ) -- add named_sdb - ldap + pgsql + dir database backend support with +- add named_sdb - ldap + pgsql + dir database backend support with - 'ENABLE_SDB' named.sysconfig option - Add BIND resolver library & includes sub-package ( libbind-devel) - fix bug 147824 / 147073 / 145664: ENABLE_ZONE_WRITE in named.init @@ -967,7 +976,7 @@ * Mon Nov 29 2004 Jason Vas Dias - 9.3.0-1 - Upgrade BIND to 9.3.0 in Rawhide / FC4 (bugs 134529, 133654...) - + * Mon Nov 29 2004 Jason Vas Dias - 20:9.2.4-4 - Fix bugs 140528 and 141113: - 2 second timeouts when IPv6 not configured and root nameserver's @@ -986,10 +995,10 @@ * Mon Sep 20 2004 Jason Vas Dias - 10:9.2.4rc8-14 - Upgrade to upstream bind-9.2.4rc8 . - Progress: Finally! Hooray! ISC bind now distributes: -- o named.conf(5) and nslookup(8) manpages +- o named.conf(5) and nslookup(8) manpages - 'bind-manpages.bz2' source can now disappear - (could this have something to do with ISC bug I raised about this?) -- o 'deprecation_msg' global has vanished +- o 'deprecation_msg' global has vanished - bind-9.2.3rc3-deprecation_msg_shut_up.diff.bz2 can disappear * Mon Sep 20 2004 Jason Vas Dias - 10:9.2.4rc8-14 @@ -1000,23 +1009,23 @@ - bind-chroot-9.2.2-21, restart named * Wed Sep 8 2004 Jason Vas Dias - 10:9.2.4rc7-11_EL3 -- Fix bug 131803: replace ROOTDIR line removed by broken +- Fix bug 131803: replace ROOTDIR line removed by broken - bind-chroot 9.2.2-21's '%postun'; added %triggerpostun for bind-chroot * Tue Sep 7 2004 Jason Vas Dias - 10:9.2.4rc7-10_EL3 - Fix bugs 130121 & 130981 for RHEL-3 - + * Mon Aug 30 2004 Jason Vas Dias - 10:9.2.4rc7-10 - Fix bug 130121: add '%ghost' entries for files included in previous -- bind-chroot & not in current - ie. named.conf, rndc.key, dev/* - +- bind-chroot & not in current - ie. named.conf, rndc.key, dev/* - - that RPM removed after upgrade . -* Thu Aug 26 2004 Jason Vas Dias +* Thu Aug 26 2004 Jason Vas Dias - Fix bug 130981: add '-t' option to named-checkconf invocation in - named.init if chroot installed. * Wed Aug 25 2004 Jason Vas Dias -- Remove resolver(5) manpage now in man-pages (bug 130792); +- Remove resolver(5) manpage now in man-pages (bug 130792); - Don't create /dev/ entries in bind-chroot if already there (bug 127556); - fix bind-devel Requires (bug 130919) - Set default location for dumpdb & stats files to /var/named/data @@ -1041,7 +1050,7 @@ - Fixed bug 129258: "${prefix}/var/tmp" typo in spec * Wed Jul 28 2004 Jason Vas Dias -- Fixed bug 127124 : 'Requires: kernel >= 2.4' +- Fixed bug 127124 : 'Requires: kernel >= 2.4' - causes problems with Linux VServers * Tue Jul 27 2004 Jason Vas Dias @@ -1062,7 +1071,7 @@ - remove disable-linux-caps * Wed Jun 16 2004 Daniel Walsh 9.2.3-17 -- Update RHEL3 to latest bind +- Update RHEL3 to latest bind * Tue Jun 15 2004 Elliot Lee - rebuilt @@ -1071,13 +1080,13 @@ - Remove device files from chroot, Named uses the system one * Fri Mar 26 2004 Daniel Walsh 9.2.3-14 -- Move RFC to devel package +- Move RFC to devel package * Fri Mar 26 2004 Daniel Walsh 9.2.3-13 - Fix location of restorecon * Thu Mar 25 2004 Daniel Walsh 9.2.3-12 -- Tighten security on config files. Should be owned by root +- Tighten security on config files. Should be owned by root * Thu Mar 25 2004 Daniel Walsh 9.2.3-11 - Update key patch to include conf-keygen @@ -1132,7 +1141,7 @@ - Fix local time in log file * Tue Oct 7 2003 Daniel Walsh 9.2.2.P3-5 -- Try again +- Try again * Mon Oct 6 2003 Daniel Walsh 9.2.2.P3-4 - Fix handling of chroot -/dev/random @@ -1242,7 +1251,7 @@ - Fix configure to build on x86_64 platforms * Wed Aug 07 2002 Karsten Hopp -- fix #70583, doesn't build on IA64 +- fix #70583, doesn't build on IA64 * Tue Jul 30 2002 Karsten Hopp 9.2.1-8 - bind-utils shouldn't require bind @@ -1289,7 +1298,7 @@ isn't always true. * Thu Feb 28 2002 Elliot Lee 9.2.0-6 -- Fix BuildRequires (we don't need specific glibc/glibc-kernheaders +- Fix BuildRequires (we don't need specific glibc/glibc-kernheaders versions). - Use _smp_mflags @@ -1638,7 +1647,7 @@ - add probing information in the init file to keep linuxconf happy - dont strip libbind -* Sun Mar 21 1999 Cristian Gafton +* Sun Mar 21 1999 Cristian Gafton - auto rebuild in the new build environment (release 3) * Wed Mar 17 1999 Preston Brown Index: libbind.pc =================================================================== RCS file: /cvs/dist/rpms/bind/FC-5/libbind.pc,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- libbind.pc 8 Mar 2006 18:21:32 -0000 1.1 +++ libbind.pc 30 Mar 2006 01:05:30 -0000 1.2 @@ -2,5 +2,5 @@ Name: libbind Description: BIND 8 compatible DNS Resolver Library Version: 9.3.2 -Libs: -L/usr/lib -lbind -Cflags: -I/usr/include/bind \ No newline at end of file +Libs: -lbind +Cflags: -I/usr/include/bind Index: named.caching-nameserver.conf =================================================================== RCS file: /cvs/dist/rpms/bind/FC-5/named.caching-nameserver.conf,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- named.caching-nameserver.conf 8 Mar 2006 18:17:55 -0000 1.2 +++ named.caching-nameserver.conf 30 Mar 2006 01:05:30 -0000 1.3 @@ -5,6 +5,8 @@ // ISC BIND named(8) DNS server as a caching only nameserver // (as a localhost DNS resolver only). // +// See /usr/share/doc/bind*/sample/ for example named configuration files. +// // DO NOT EDIT THIS FILE - use system-config-bind or an editor // to create named.conf - edits to this file will be lost on // bind-config package upgrade. Index: named.rfc1912.zones =================================================================== RCS file: /cvs/dist/rpms/bind/FC-5/named.rfc1912.zones,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- named.rfc1912.zones 7 Mar 2006 04:25:38 -0000 1.1 +++ named.rfc1912.zones 30 Mar 2006 01:05:30 -0000 1.2 @@ -5,7 +5,8 @@ // ISC BIND named zone configuration for zones recommended by // RFC 1912 section 4.1 : localhost TLDs and address zones // - +// See /usr/share/doc/bind*/sample/ for example named configuration files. +// zone "." IN { type hint; file "named.ca"; From fedora-cvs-commits at redhat.com Thu Mar 30 01:06:03 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 29 Mar 2006 20:06:03 -0500 Subject: rpms/bind/FC-5 bind.spec,1.99,1.100 Message-ID: <200603300106.k2U163DL004296@cvs.devel.redhat.com> Author: jvdias Update of /cvs/dist/rpms/bind/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv4284 Modified Files: bind.spec Log Message: fix bug 186577 - libbind.pc, more .spec file cleanup; add sample configuration files to %doc; rebuild for new gcc and glibc From fedora-cvs-commits at redhat.com Thu Mar 30 06:24:18 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 30 Mar 2006 01:24:18 -0500 Subject: rpms/scim-hangul/devel .cvsignore, 1.4, 1.5 scim-hangul.spec, 1.12, 1.13 sources, 1.3, 1.4 Message-ID: <200603300624.k2U6OI6j026722@cvs.devel.redhat.com> Author: tagoh Update of /cvs/dist/rpms/scim-hangul/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv26706 Modified Files: .cvsignore scim-hangul.spec sources Log Message: * Thu Mar 30 2006 Akira TAGOH - 0.2.2-1 - New upstream release. Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/scim-hangul/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 31 Oct 2005 03:32:24 -0000 1.4 +++ .cvsignore 30 Mar 2006 06:24:16 -0000 1.5 @@ -4,3 +4,4 @@ *.rpm scim-hangul-0.2.0.tar.gz scim-hangul-0.2.1.tar.gz +scim-hangul-0.2.2.tar.gz Index: scim-hangul.spec =================================================================== RCS file: /cvs/dist/rpms/scim-hangul/devel/scim-hangul.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- scim-hangul.spec 11 Feb 2006 05:39:24 -0000 1.12 +++ scim-hangul.spec 30 Mar 2006 06:24:16 -0000 1.13 @@ -1,8 +1,8 @@ %define with_libstdc_preview 1 Name: scim-hangul -Version: 0.2.1 -Release: 3.fc5.1 +Version: 0.2.2 +Release: 1.fc6 License: GPL URL: http://www.scim-im.org/ @@ -63,6 +63,9 @@ %changelog +* Thu Mar 30 2006 Akira TAGOH - 0.2.2-1 +- New upstream release. + * Fri Feb 10 2006 Jesse Keating - 0.2.1-3.fc5.1 - bump again for double-long bug on ppc(64) Index: sources =================================================================== RCS file: /cvs/dist/rpms/scim-hangul/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 31 Oct 2005 03:32:24 -0000 1.3 +++ sources 30 Mar 2006 06:24:16 -0000 1.4 @@ -1 +1 @@ -586dbd1c01d414125e1bb13821c57f93 scim-hangul-0.2.1.tar.gz +de50471ffb5689696215a6eeea24b817 scim-hangul-0.2.2.tar.gz From fedora-cvs-commits at redhat.com Thu Mar 30 06:47:56 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 30 Mar 2006 01:47:56 -0500 Subject: rpms/scim-hangul/FC-5 .cvsignore, 1.4, 1.5 scim-hangul.spec, 1.12, 1.13 sources, 1.3, 1.4 Message-ID: <200603300647.k2U6luSx008122@cvs.devel.redhat.com> Author: tagoh Update of /cvs/dist/rpms/scim-hangul/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv8107 Modified Files: .cvsignore scim-hangul.spec sources Log Message: * Thu Mar 30 2006 Akira TAGOH - 0.2.2-1 - New upstream release. Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/scim-hangul/FC-5/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 31 Oct 2005 03:32:24 -0000 1.4 +++ .cvsignore 30 Mar 2006 06:47:54 -0000 1.5 @@ -4,3 +4,4 @@ *.rpm scim-hangul-0.2.0.tar.gz scim-hangul-0.2.1.tar.gz +scim-hangul-0.2.2.tar.gz Index: scim-hangul.spec =================================================================== RCS file: /cvs/dist/rpms/scim-hangul/FC-5/scim-hangul.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- scim-hangul.spec 11 Feb 2006 05:39:24 -0000 1.12 +++ scim-hangul.spec 30 Mar 2006 06:47:54 -0000 1.13 @@ -1,8 +1,8 @@ %define with_libstdc_preview 1 Name: scim-hangul -Version: 0.2.1 -Release: 3.fc5.1 +Version: 0.2.2 +Release: 1.fc5 License: GPL URL: http://www.scim-im.org/ @@ -63,6 +63,9 @@ %changelog +* Thu Mar 30 2006 Akira TAGOH - 0.2.2-1 +- New upstream release. + * Fri Feb 10 2006 Jesse Keating - 0.2.1-3.fc5.1 - bump again for double-long bug on ppc(64) Index: sources =================================================================== RCS file: /cvs/dist/rpms/scim-hangul/FC-5/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 31 Oct 2005 03:32:24 -0000 1.3 +++ sources 30 Mar 2006 06:47:54 -0000 1.4 @@ -1 +1 @@ -586dbd1c01d414125e1bb13821c57f93 scim-hangul-0.2.1.tar.gz +de50471ffb5689696215a6eeea24b817 scim-hangul-0.2.2.tar.gz From fedora-cvs-commits at redhat.com Thu Mar 30 09:17:09 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 30 Mar 2006 04:17:09 -0500 Subject: rpms/nkf/devel .cvsignore, 1.5, 1.6 nkf.spec, 1.18, 1.19 sources, 1.5, 1.6 Message-ID: <200603300917.k2U9H9XV014295@cvs.devel.redhat.com> Author: tagoh Update of /cvs/dist/rpms/nkf/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv14279 Modified Files: .cvsignore nkf.spec sources Log Message: * Thu Mar 30 2006 Akira TAGOH - 2.06-1 - New upstream release. Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/nkf/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 7 Jul 2005 05:21:24 -0000 1.5 +++ .cvsignore 30 Mar 2006 09:17:06 -0000 1.6 @@ -3,3 +3,4 @@ *rpm nkf204.tar.gz nkf205.tar.gz +nkf206a.tar.gz Index: nkf.spec =================================================================== RCS file: /cvs/dist/rpms/nkf/devel/nkf.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- nkf.spec 11 Feb 2006 04:46:31 -0000 1.18 +++ nkf.spec 30 Mar 2006 09:17:06 -0000 1.19 @@ -1,9 +1,9 @@ -%define nkfver nkf205 +%define nkfver nkf206a Summary: A Kanji code conversion filter. Name: nkf -Version: 2.05 -Release: 1.2.1 +Version: 2.06 +Release: 1.fc6 License: BSD-like Group: Applications/Text #Source: http://www.ie.u-ryukyu.ac.jp/~kono/nkf/dist/%{nkfver}.tar @@ -30,7 +30,7 @@ %{__mkdir_p} $RPM_BUILD_ROOT/%{_bindir} %{__mkdir_p} $RPM_BUILD_ROOT%{_mandir}/{man1,ja/man1} -%setup -q -n %{nkfver} +%setup -q -n nkf206 %build make nkf @@ -73,6 +73,9 @@ %{_mandir}/man3/NKF.3pm.gz %changelog +* Thu Mar 30 2006 Akira TAGOH - 2.06-1 +- New upstream release. + * Fri Feb 10 2006 Jesse Keating - 2.05-1.2.1 - bump again for double-long bug on ppc(64) Index: sources =================================================================== RCS file: /cvs/dist/rpms/nkf/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 7 Jul 2005 05:21:24 -0000 1.5 +++ sources 30 Mar 2006 09:17:06 -0000 1.6 @@ -1 +1 @@ -6c17ef1be733402b656dfad39653ffb4 nkf205.tar.gz +f4b07268b238ac85551e2777fa2c3836 nkf206a.tar.gz From fedora-cvs-commits at redhat.com Thu Mar 30 09:31:09 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 30 Mar 2006 04:31:09 -0500 Subject: rpms/cups/devel cups-str1521.patch,NONE,1.1 cups.spec,1.145,1.146 Message-ID: <200603300931.k2U9V9Dl014544@cvs.devel.redhat.com> Author: twaugh Update of /cvs/dist/rpms/cups/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv14527 Modified Files: cups.spec Added Files: cups-str1521.patch Log Message: * Wed Mar 29 2006 Tim Waugh - Fix group list of non-root backends (STR #1521, bug #186954). cups-str1521.patch: conf.c | 24 ++++++++++++++++++------ 1 files changed, 18 insertions(+), 6 deletions(-) --- NEW FILE cups-str1521.patch --- --- cups-1.2rc1/scheduler/conf.c.str1521 2006-03-14 11:54:45.000000000 +0000 +++ cups-1.2rc1/scheduler/conf.c 2006-03-30 10:09:57.000000000 +0100 @@ -338,22 +338,34 @@ endpwent(); /* - * Find the default group (nobody)... + * Find the default group... */ - group = getgrnam("nobody"); + group = getgrnam(CUPS_DEFAULT_GROUP); endgrent(); - if (group != NULL) + if (group) Group = group->gr_gid; else { /* - * Use the (historical) NFS nobody group ID (-2 as a 16-bit twos- - * complement number...) + * Fallback to group "nobody"... */ - Group = 65534; + group = getgrnam("nobody"); + endgrent(); + + if (group) + Group = group->gr_gid; + else + { + /* + * Use the (historical) NFS nobody group ID (-2 as a 16-bit twos- + * complement number...) + */ + + Group = 65534; + } } /* Index: cups.spec =================================================================== RCS file: /cvs/dist/rpms/cups/devel/cups.spec,v retrieving revision 1.145 retrieving revision 1.146 diff -u -r1.145 -r1.146 --- cups.spec 28 Mar 2006 16:32:33 -0000 1.145 +++ cups.spec 30 Mar 2006 09:31:05 -0000 1.146 @@ -31,8 +31,10 @@ Patch8: cups-logfileperm.patch Patch9: cups-1.1.17-rcp.patch Patch10: cups-1.1.17-ppdsdat.patch +Patch11: cups-parallel.patch Patch12: cups-locale.patch Patch13: cups-CAN-2005-0064.patch +Patch14: cups-str1521.patch Patch16: cups-pie.patch Patch17: cups-1.1.19-no_rpath.patch Patch18: cups-language.patch @@ -118,8 +120,10 @@ %patch8 -p1 -b .logfileperm %patch9 -p1 -b .rcp %patch10 -p1 -b .ppdsdat +%patch11 -p1 -b .parallel %patch12 -p1 -b .locale %patch13 -p1 -b .CAN-2005-0064 +%patch14 -p1 -b .str1521 %if %build_as_pie %patch16 -p1 -b .pie %endif @@ -375,6 +379,9 @@ %{cups_serverbin}/daemon/cups-lpd %changelog +* Wed Mar 29 2006 Tim Waugh +- Fix group list of non-root backends (STR #1521, bug #186954). + * Tue Mar 28 2006 Tim Waugh 1:1.2-0.2.rc1.2 - Fix lpq -h (STR#1515, bug #186686). From fedora-cvs-commits at redhat.com Thu Mar 30 09:31:46 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 30 Mar 2006 04:31:46 -0500 Subject: rpms/cups/devel cups.spec,1.146,1.147 Message-ID: <200603300931.k2U9Vkmm014580@cvs.devel.redhat.com> Author: twaugh Update of /cvs/dist/rpms/cups/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv14566 Modified Files: cups.spec Log Message: 1:1.2-0.2.rc1.3 Index: cups.spec =================================================================== RCS file: /cvs/dist/rpms/cups/devel/cups.spec,v retrieving revision 1.146 retrieving revision 1.147 diff -u -r1.146 -r1.147 --- cups.spec 30 Mar 2006 09:31:05 -0000 1.146 +++ cups.spec 30 Mar 2006 09:31:35 -0000 1.147 @@ -7,7 +7,7 @@ Summary: Common Unix Printing System Name: cups Version: 1.2 -Release: 0.2.%{beta}.2 +Release: 0.2.%{beta}.3 License: GPL Group: System Environment/Daemons Source: ftp://ftp.easysw.com/pub/cups/test/cups-1.2%{beta}-source.tar.bz2 @@ -379,7 +379,7 @@ %{cups_serverbin}/daemon/cups-lpd %changelog -* Wed Mar 29 2006 Tim Waugh +* Wed Mar 29 2006 Tim Waugh 1:1.2-0.2.rc1.3 - Fix group list of non-root backends (STR #1521, bug #186954). * Tue Mar 28 2006 Tim Waugh 1:1.2-0.2.rc1.2 From fedora-cvs-commits at redhat.com Thu Mar 30 09:33:43 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 30 Mar 2006 04:33:43 -0500 Subject: rpms/cups/devel cups.spec,1.147,1.148 Message-ID: <200603300933.k2U9Xhwl014639@cvs.devel.redhat.com> Author: twaugh Update of /cvs/dist/rpms/cups/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv14628 Modified Files: cups.spec Log Message: Remove typo. Index: cups.spec =================================================================== RCS file: /cvs/dist/rpms/cups/devel/cups.spec,v retrieving revision 1.147 retrieving revision 1.148 diff -u -r1.147 -r1.148 --- cups.spec 30 Mar 2006 09:31:35 -0000 1.147 +++ cups.spec 30 Mar 2006 09:33:40 -0000 1.148 @@ -31,7 +31,6 @@ Patch8: cups-logfileperm.patch Patch9: cups-1.1.17-rcp.patch Patch10: cups-1.1.17-ppdsdat.patch -Patch11: cups-parallel.patch Patch12: cups-locale.patch Patch13: cups-CAN-2005-0064.patch Patch14: cups-str1521.patch @@ -120,7 +119,6 @@ %patch8 -p1 -b .logfileperm %patch9 -p1 -b .rcp %patch10 -p1 -b .ppdsdat -%patch11 -p1 -b .parallel %patch12 -p1 -b .locale %patch13 -p1 -b .CAN-2005-0064 %patch14 -p1 -b .str1521 From fedora-cvs-commits at redhat.com Thu Mar 30 10:04:56 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 30 Mar 2006 05:04:56 -0500 Subject: rpms/scim-anthy/devel .cvsignore, 1.7, 1.8 scim-anthy.spec, 1.26, 1.27 sources, 1.7, 1.8 scim-anthy-symbol-style.patch, 1.1, NONE Message-ID: <200603301004.k2UA4uhp028572@cvs.devel.redhat.com> Author: tagoh Update of /cvs/dist/rpms/scim-anthy/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv28558 Modified Files: .cvsignore scim-anthy.spec sources Removed Files: scim-anthy-symbol-style.patch Log Message: * Thu Mar 30 2006 Akira TAGOH - 1.0.0-1 - New upstream release. - can input numerals when the candidate window doesn't appear. (#185934) - scim-anthy-symbol-style.patch: removed. - add Requires: gettext-devel - run aclocal and autoconf as well to regenerate Makefile properly. Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/scim-anthy/devel/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 30 Jan 2006 09:09:39 -0000 1.7 +++ .cvsignore 30 Mar 2006 10:04:53 -0000 1.8 @@ -8,3 +8,4 @@ scim-anthy-0.7.1.tar.gz scim-anthy-0.8.0.tar.gz scim-anthy-0.9.0.tar.gz +scim-anthy-1.0.0.tar.gz Index: scim-anthy.spec =================================================================== RCS file: /cvs/dist/rpms/scim-anthy/devel/scim-anthy.spec,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- scim-anthy.spec 17 Mar 2006 12:31:14 -0000 1.26 +++ scim-anthy.spec 30 Mar 2006 10:04:53 -0000 1.27 @@ -1,19 +1,18 @@ %define with_libstdc_preview 1 Name: scim-anthy -Version: 0.9.0 -Release: 3.fc6 +Version: 1.0.0 +Release: 1.fc6 License: GPL URL: http://scim-imengine.sourceforge.jp/ Source0: http://sourceforge.jp/projects/scim-imengine/files/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: scim-devel -BuildRequires: anthy-devel >= 6700b-1 +BuildRequires: anthy-devel >= 6700b-1 gettext-devel %if %{with_libstdc_preview} Buildrequires: libstdc++so7-devel %endif -Patch0: scim-anthy-symbol-style.patch Patch1: scim-anthy-helper-moduledir.patch Summary: SCIM IMEngine for anthy for Japanese input @@ -26,10 +25,11 @@ %prep %setup -q -%patch0 -p0 -b .symbol-style %patch1 -p1 -b .1-moduledir # patch1 touches src/Makefile.am +aclocal automake +autoconf %build @@ -70,8 +70,15 @@ %changelog -* Fri Mar 17 2006 Akira TAGOH - 0.9.0-3.fc6 -* scim-anthy-symbol-style.patch: applied a backport patch from upstream CVS to +* Thu Mar 30 2006 Akira TAGOH - 1.0.0-1 +- New upstream release. + - can input numerals when the candidate window doesn't appear. (#185934) +- scim-anthy-symbol-style.patch: removed. +- add Requires: gettext-devel +- run aclocal and autoconf as well to regenerate Makefile properly. + +* Fri Mar 17 2006 Akira TAGOH - 0.9.0-3 +- scim-anthy-symbol-style.patch: applied a backport patch from upstream CVS to add an UI for the symbol style. (#178400) * Fri Feb 10 2006 Jesse Keating - 0.9.0-2.fc5.1 Index: sources =================================================================== RCS file: /cvs/dist/rpms/scim-anthy/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 30 Jan 2006 09:09:39 -0000 1.7 +++ sources 30 Mar 2006 10:04:53 -0000 1.8 @@ -1,2 +1 @@ -869df30ecbbbfe43b0758f3b074ed0c9 scim-anthy-0.8.0.tar.gz -5e4742d011cdbf3554cc276f74a11ea9 scim-anthy-0.9.0.tar.gz +b0c452da1886ba36f47d9bd9f6ea7a10 scim-anthy-1.0.0.tar.gz --- scim-anthy-symbol-style.patch DELETED --- From fedora-cvs-commits at redhat.com Thu Mar 30 10:11:08 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 30 Mar 2006 05:11:08 -0500 Subject: rpms/scim-anthy/FC-5 .cvsignore, 1.7, 1.8 scim-anthy.spec, 1.26, 1.27 sources, 1.7, 1.8 Message-ID: <200603301011.k2UAB8Mk028691@cvs.devel.redhat.com> Author: tagoh Update of /cvs/dist/rpms/scim-anthy/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv28672 Modified Files: .cvsignore scim-anthy.spec sources Log Message: * Thu Mar 30 2006 Akira TAGOH - 1.0.0-1 - New upstream release. - can input numerals when the candidate window doesn't appear. (#185934) - scim-anthy-symbol-style.patch: removed. - add Requires: gettext-devel - run aclocal and autoconf as well to regenerate Makefile properly. Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/scim-anthy/FC-5/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 30 Jan 2006 09:09:39 -0000 1.7 +++ .cvsignore 30 Mar 2006 10:11:04 -0000 1.8 @@ -8,3 +8,4 @@ scim-anthy-0.7.1.tar.gz scim-anthy-0.8.0.tar.gz scim-anthy-0.9.0.tar.gz +scim-anthy-1.0.0.tar.gz Index: scim-anthy.spec =================================================================== RCS file: /cvs/dist/rpms/scim-anthy/FC-5/scim-anthy.spec,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- scim-anthy.spec 22 Mar 2006 08:16:15 -0000 1.26 +++ scim-anthy.spec 30 Mar 2006 10:11:05 -0000 1.27 @@ -1,19 +1,18 @@ %define with_libstdc_preview 1 Name: scim-anthy -Version: 0.9.0 -Release: 3.fc5 +Version: 1.0.0 +Release: 1.fc5 License: GPL URL: http://scim-imengine.sourceforge.jp/ Source0: http://sourceforge.jp/projects/scim-imengine/files/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: scim-devel -BuildRequires: anthy-devel >= 6700b-1 +BuildRequires: anthy-devel >= 6700b-1 gettext-devel %if %{with_libstdc_preview} Buildrequires: libstdc++so7-devel %endif -Patch0: scim-anthy-symbol-style.patch Patch1: scim-anthy-helper-moduledir.patch Summary: SCIM IMEngine for anthy for Japanese input @@ -26,10 +25,11 @@ %prep %setup -q -%patch0 -p0 -b .symbol-style %patch1 -p1 -b .1-moduledir # patch1 touches src/Makefile.am +aclocal automake +autoconf %build @@ -70,8 +70,15 @@ %changelog -* Wed Mar 22 2006 Akira TAGOH - 0.9.0-3 -* scim-anthy-symbol-style.patch: applied a backport patch from upstream CVS to +* Thu Mar 30 2006 Akira TAGOH - 1.0.0-1 +- New upstream release. + - can input numerals when the candidate window doesn't appear. (#185934) +- scim-anthy-symbol-style.patch: removed. +- add Requires: gettext-devel +- run aclocal and autoconf as well to regenerate Makefile properly. + +* Fri Mar 17 2006 Akira TAGOH - 0.9.0-3 +- scim-anthy-symbol-style.patch: applied a backport patch from upstream CVS to add an UI for the symbol style. (#178400) * Fri Feb 10 2006 Jesse Keating - 0.9.0-2.fc5.1 Index: sources =================================================================== RCS file: /cvs/dist/rpms/scim-anthy/FC-5/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 30 Jan 2006 09:09:39 -0000 1.7 +++ sources 30 Mar 2006 10:11:05 -0000 1.8 @@ -1,2 +1 @@ -869df30ecbbbfe43b0758f3b074ed0c9 scim-anthy-0.8.0.tar.gz -5e4742d011cdbf3554cc276f74a11ea9 scim-anthy-0.9.0.tar.gz +b0c452da1886ba36f47d9bd9f6ea7a10 scim-anthy-1.0.0.tar.gz From fedora-cvs-commits at redhat.com Thu Mar 30 10:11:37 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 30 Mar 2006 05:11:37 -0500 Subject: rpms/scim-anthy/FC-5 scim-anthy-symbol-style.patch,1.1,NONE Message-ID: <200603301011.k2UABbd6028726@cvs.devel.redhat.com> Author: tagoh Update of /cvs/dist/rpms/scim-anthy/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv28714 Removed Files: scim-anthy-symbol-style.patch Log Message: removed --- scim-anthy-symbol-style.patch DELETED --- From fedora-cvs-commits at redhat.com Thu Mar 30 10:44:47 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 30 Mar 2006 05:44:47 -0500 Subject: rpms/net-tools/devel net-tools-1.60-ifconfig_man.patch, NONE, 1.1 net-tools.spec, 1.60, 1.61 Message-ID: <200603301044.k2UAilmf010176@cvs.devel.redhat.com> Author: rvokal Update of /cvs/dist/rpms/net-tools/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv10159 Modified Files: net-tools.spec Added Files: net-tools-1.60-ifconfig_man.patch Log Message: - add note to ifconfig(8) about supported format for IPv4 addresses (#176661) net-tools-1.60-ifconfig_man.patch: ifconfig.8 | 5 +++++ 1 files changed, 5 insertions(+) --- NEW FILE net-tools-1.60-ifconfig_man.patch --- --- net-tools-1.60/man/en_US/ifconfig.8.addr_man 2006-03-30 12:32:56.000000000 +0200 +++ net-tools-1.60/man/en_US/ifconfig.8 2006-03-30 12:38:43.000000000 +0200 @@ -39,6 +39,11 @@ (Novell IPX) and .B netrom (AMPR Packet radio). +All numbers supplied as parts in IPv4 dotted decimal notation may be decimal, +octal, or hexadecimal, as specified in the ISO C standard (that is, a leading 0x +or 0X implies hexadecimal; otherwise, a leading '0' implies octal; otherwise, +the number is interpreted as decimal). Use of hexamedial and octal numbers +is not RFC-compliant and therefore its use is discouraged and may go away. .SH OPTIONS .TP .B interface Index: net-tools.spec =================================================================== RCS file: /cvs/dist/rpms/net-tools/devel/net-tools.spec,v retrieving revision 1.60 retrieving revision 1.61 diff -u -r1.60 -r1.61 --- net-tools.spec 16 Mar 2006 21:22:44 -0000 1.60 +++ net-tools.spec 30 Mar 2006 10:44:44 -0000 1.61 @@ -3,7 +3,7 @@ Summary: Basic networking tools. Name: net-tools Version: 1.60 -Release: 64 +Release: 65 License: GPL Group: System Environment/Base Source0: http://www.tazenda.demon.co.uk/phil/net-tools/net-tools-%{version}.tar.bz2 @@ -61,6 +61,7 @@ Patch47: net-tools-1.60-netstat_stop_trim.patch Patch48: net-tools-1.60-netstat_inode.patch Patch49: net-tools-1.60-fgets.patch +Patch50: net-tools-1.60-ifconfig_man.patch BuildRoot: %{_tmppath}/%{name}-root Requires(post,preun): chkconfig @@ -118,6 +119,7 @@ %patch47 -p1 -b .trim %patch48 -p1 -b .inode %patch49 -p1 -b .fgets +%patch50 -p1 -b .inet_addr cp %SOURCE2 ./config.h cp %SOURCE3 ./config.make @@ -229,6 +231,9 @@ %{_sysconfdir}/rc.d/init.d/netplugd %changelog +* Thu Mar 30 2006 Radek Vok??l - 1.60-55 +- add note to ifconfig(8) about supported format for IPv4 addresses (#176661) + * Thu Mar 16 2006 Radek Vok??l - 1.60-54 - remove duplicate arp entries (#185604) From fedora-cvs-commits at redhat.com Thu Mar 30 10:45:27 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 30 Mar 2006 05:45:27 -0500 Subject: rpms/net-tools/devel net-tools.spec,1.61,1.62 Message-ID: <200603301045.k2UAjReZ010206@cvs.devel.redhat.com> Author: rvokal Update of /cvs/dist/rpms/net-tools/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv10193 Modified Files: net-tools.spec Log Message: - fix release numbers Index: net-tools.spec =================================================================== RCS file: /cvs/dist/rpms/net-tools/devel/net-tools.spec,v retrieving revision 1.61 retrieving revision 1.62 diff -u -r1.61 -r1.62 --- net-tools.spec 30 Mar 2006 10:44:44 -0000 1.61 +++ net-tools.spec 30 Mar 2006 10:45:25 -0000 1.62 @@ -231,10 +231,10 @@ %{_sysconfdir}/rc.d/init.d/netplugd %changelog -* Thu Mar 30 2006 Radek Vok??l - 1.60-55 +* Thu Mar 30 2006 Radek Vok??l - 1.60-65 - add note to ifconfig(8) about supported format for IPv4 addresses (#176661) -* Thu Mar 16 2006 Radek Vok??l - 1.60-54 +* Thu Mar 16 2006 Radek Vok??l - 1.60-64 - remove duplicate arp entries (#185604) * Thu Feb 23 2006 Radek Vok??l - 1.60-63 From fedora-cvs-commits at redhat.com Thu Mar 30 12:13:24 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 30 Mar 2006 07:13:24 -0500 Subject: rpms/procmail/devel procmail-3.22-truncate.patch, NONE, 1.1 procmail.spec, 1.18, 1.19 Message-ID: <200603301213.k2UCDOjU019345@cvs.devel.redhat.com> Author: pvrabec Update of /cvs/dist/rpms/procmail/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv19330 Modified Files: procmail.spec Added Files: procmail-3.22-truncate.patch Log Message: - fix truncation of mailbox when running into a disk quota or a full partition. Patch from Solar Designer. procmail-3.22-truncate.patch: mailfold.c | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) --- NEW FILE procmail-3.22-truncate.patch --- --- procmail-3.22/src/mailfold.c.truncate 2006-03-30 10:56:58.000000000 -0500 +++ procmail-3.22/src/mailfold.c 2006-03-30 11:32:19.000000000 -0500 @@ -30,6 +30,7 @@ int logopened,rawnonl; off_t lasttell; +static int trunced; static off_t lastdump; static volatile int mailread; /* if the mail is completely read in already */ static struct dyna_array confield; /* escapes, concatenations */ @@ -81,6 +82,7 @@ size_t len; { int i;size_t part; lasttell=i= -1;SETerrno(EBADF); + trunced=0; if(s>=0) { if(ft_lock(type)&&(lseek(s,(off_t)0,SEEK_END),fdlock(s))) nlog("Kernel-lock failed\n"); @@ -120,13 +122,18 @@ } writefin: i=type!=ft_PIPE&&fsync(s)&&errno!=EINVAL; /* EINVAL => wasn't a file */ + if ((i||len)&&lasttell>=0) + { int serrno=errno; + if(!ftruncate(s,lasttell)) trunced=1; + SETerrno(serrno); + } if(ft_lock(type)) { int serrno=errno; /* save any error information */ if(fdunlock()) nlog("Kernel-unlock failed\n"); SETerrno(serrno); } - i=rclose(s)||i; + i=rclose(s)||i; /* if this fails, we should truncate, but it's too late */ } /* return an error even if nothing was to be sent */ return i&&!len?-1:len; } @@ -237,7 +244,7 @@ #endif default:writeerr(buf); } - if(lasttell>=0&&!truncate(boxname,lasttell)&&(logopened||verbose)) + if(lasttell>=0&&trunced&&(logopened||verbose)) nlog("Truncated file to former size\n"); /* undo garbage */ ret0: return 0; } Index: procmail.spec =================================================================== RCS file: /cvs/dist/rpms/procmail/devel/procmail.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- procmail.spec 11 Feb 2006 05:17:08 -0000 1.18 +++ procmail.spec 30 Mar 2006 12:13:22 -0000 1.19 @@ -1,7 +1,7 @@ Summary: The procmail mail processing program. Name: procmail Version: 3.22 -Release: 16.2.1 +Release: 17 License: GPL or Artistic Group: System Environment/Daemons Source: ftp://ftp.procmail.org/pub/procmail/procmail-%{version}.tar.gz @@ -11,6 +11,7 @@ Patch1: procmail-3.15.1-man.patch Patch2: procmail_3.22-8.debian.patch Patch3: procmail-3.22-large_files.patch +Patch4: procmail-3.22-truncate.patch BuildRoot: %{_tmppath}/%{name}-%{version}-root %description @@ -25,6 +26,7 @@ %patch1 -p1 %patch2 -p1 %patch3 -p1 -b .largefiles +%patch4 -p1 -b .truncate find . -type d -exec chmod 755 {} \; @@ -58,6 +60,10 @@ %{_mandir}/man[15]/* %changelog +* Thu Mar 30 2006 Peter Vrabec 3.22-17 +- fix truncation of mailbox when running into a disk quota or a + full partition. Patch from Solar Designer. + * Fri Feb 10 2006 Jesse Keating - 3.22-16.2.1 - bump again for double-long bug on ppc(64) From fedora-cvs-commits at redhat.com Thu Mar 30 13:46:26 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 30 Mar 2006 08:46:26 -0500 Subject: rpms/kdebase/FC-5 kdebase-3.5.2-dbus.patch, NONE, 1.1 kdebase-3.5.2-kioslave_media_dbus.patch, NONE, 1.1 kdebase-3.5.2-redhat.patch, NONE, 1.1 kdebase.spec, 1.159, 1.160 sources, 1.66, 1.67 kdebase-3.5.1-dbus.patch, 1.1, NONE kdebase-3.5.1-keyboardlayout.patch, 1.1, NONE kdebase-3.5.1-kwin-systray.patch, 1.1, NONE kdebase-3.5.1-redhat.patch, 1.2, NONE Message-ID: <200603301346.k2UDkQca006791@cvs.devel.redhat.com> Author: than Update of /cvs/dist/rpms/kdebase/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv3873 Modified Files: kdebase.spec sources Added Files: kdebase-3.5.2-dbus.patch kdebase-3.5.2-kioslave_media_dbus.patch kdebase-3.5.2-redhat.patch Removed Files: kdebase-3.5.1-dbus.patch kdebase-3.5.1-keyboardlayout.patch kdebase-3.5.1-kwin-systray.patch kdebase-3.5.1-redhat.patch Log Message: update to 3.5.2 kdebase-3.5.2-dbus.patch: configure.in.in | 66 ----- mediamanager/connection.cpp | 168 +++++++++++++ mediamanager/connection.h | 86 ++++++ mediamanager/integrator.cpp | 244 +++++++++++++++++++ mediamanager/integrator.h | 95 +++++++ mediamanager/message.cpp | 551 ++++++++++++++++++++++++++++++++++++++++++++ mediamanager/message.h | 132 ++++++++++ 7 files changed, 1277 insertions(+), 65 deletions(-) --- NEW FILE kdebase-3.5.2-dbus.patch --- diff -Nur kdebase-3.5.1/kioslave/media.orig/mediamanager/connection.cpp kdebase-3.5.1/kioslave/media/mediamanager/connection.cpp --- kdebase-3.5.1/kioslave/media.orig/mediamanager/connection.cpp 1970-01-01 01:00:00.000000000 +0100 +++ kdebase-3.5.1/kioslave/media/mediamanager/connection.cpp 2006-01-26 14:54:40.000000000 +0100 @@ -0,0 +1,168 @@ +// -*- Mode: C++; c-basic-offset: 2; indent-tabs-mode: nil; -*- +/* connection.cpp: Qt wrapper for DBusConnection + * + * Copyright (C) 2003 Zack Rusin + * + * Licensed under the Academic Free License version 2.0 + * + * 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 + * + */ +#include "connection.h" + +using namespace DBusQt; + +#include "integrator.h" +using Internal::Integrator; + +struct Connection::Private +{ + Private( Connection *qq ); + void setConnection( DBusConnection *c ); + DBusConnection *connection; + int connectionSlot; + DBusError error; + Integrator *integrator; + int timeout; + Connection *q; +}; + +Connection::Private::Private( Connection *qq ) + : connection( 0 ), connectionSlot( 0 ), integrator( 0 ), + timeout( -1 ), q( qq ) +{ + dbus_error_init( &error ); +} + +void Connection::Private::setConnection( DBusConnection *c ) +{ + if (!c) { + qDebug( "error: %s, %s", error.name, error.message ); + dbus_error_free( &error ); + return; + } + connection = c; + integrator = new Integrator( c, q ); + connect( integrator, SIGNAL(readReady()), q, SLOT(dispatchRead()) ); +} + +Connection::Connection( QObject *parent ) + : QObject( parent ) +{ + d = new Private( this ); +} + +Connection::Connection( const QString& host, QObject *parent ) + : QObject( parent ) +{ + d = new Private( this ); + + if ( !host.isEmpty() ) + init( host ); +} + +Connection::Connection( DBusBusType type, QObject* parent ) + : QObject( parent ) +{ + d = new Private( this ); + d->setConnection( dbus_bus_get(type, &d->error) ); +} + +void Connection::init( const QString& host ) +{ + d->setConnection( dbus_connection_open( host.ascii(), &d->error) ); + //dbus_connection_allocate_data_slot( &d->connectionSlot ); + //dbus_connection_set_data( d->connection, d->connectionSlot, 0, 0 ); +} + +bool Connection::isConnected() const +{ + return dbus_connection_get_is_connected( d->connection ); +} + +bool Connection::isAuthenticated() const +{ + return dbus_connection_get_is_authenticated( d->connection ); +} + +void Connection::open( const QString& host ) +{ + if ( host.isEmpty() ) return; + + init( host ); +} + +void Connection::close() +{ + dbus_connection_disconnect( d->connection ); +} + +void Connection::flush() +{ + dbus_connection_flush( d->connection ); +} + +void Connection::dispatchRead() +{ + while ( dbus_connection_dispatch( d->connection ) == DBUS_DISPATCH_DATA_REMAINS ) + ; +} + +DBusConnection* Connection::connection() const +{ + return d->connection; +} + +Connection::Connection( DBusConnection *connection, QObject *parent ) + : QObject( parent ) +{ + d = new Private(this); + d->setConnection(connection); +} + +void Connection::send( const Message &m ) +{ + dbus_connection_send(d->connection, m.message(), 0); +} + +void Connection::sendWithReply( const Message& ) +{ +} + +Message Connection::sendWithReplyAndBlock( const Message &m ) +{ + DBusMessage *reply; + reply = dbus_connection_send_with_reply_and_block( d->connection, m.message(), d->timeout, &d->error ); + if (dbus_error_is_set(&d->error)) { + qDebug("error: %s, %s", d->error.name, d->error.message); + dbus_error_free(&d->error); + } + return Message( reply ); +} + +void* Connection::virtual_hook( int, void* ) +{ +} + +void Connection::dbus_connection_setup_with_qt_main (DBusConnection *connection) +{ + d->setConnection( connection ); +} + + + +///////////////////////////////////////////////////////// + +#include "connection.moc" diff -Nur kdebase-3.5.1/kioslave/media.orig/mediamanager/connection.h kdebase-3.5.1/kioslave/media/mediamanager/connection.h --- kdebase-3.5.1/kioslave/media.orig/mediamanager/connection.h 1970-01-01 01:00:00.000000000 +0100 +++ kdebase-3.5.1/kioslave/media/mediamanager/connection.h 2006-01-26 14:54:44.000000000 +0100 @@ -0,0 +1,86 @@ +// -*- Mode: C++; c-basic-offset: 2; indent-tabs-mode: nil; -*- +/* connection.h: Qt wrapper for DBusConnection + * + * Copyright (C) 2003 Zack Rusin + * + * Licensed under the Academic Free License version 2.1 + * + * 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 + * + */ +#ifndef DBUS_QT_CONNECTION_H +#define DBUS_QT_CONNECTION_H + +/* We acknowledge the the dbus API is unstable */ +#define DBUS_API_SUBJECT_TO_CHANGE + +#include "message.h" + +#include +#include + +#include "dbus/dbus.h" + +namespace DBusQt { + namespace Internal { + class Integrator; + } + + class Connection : public QObject + { + Q_OBJECT + public: + Connection( QObject *parent =0 ); + Connection( const QString& host, + QObject *parent = 0 ); + Connection( DBusBusType type, QObject* parent = 0 ); + + bool isConnected() const; + bool isAuthenticated() const; + + Message borrowMessage(); + Message popMessage(); + void stealBorrowMessage( const Message& ); + void dbus_connection_setup_with_qt_main (DBusConnection *connection); + + public slots: + void open( const QString& ); + void close(); + void flush(); + void send( const Message& ); + void sendWithReply( const Message& ); + Message sendWithReplyAndBlock( const Message& ); + + protected slots: + void dispatchRead(); + + protected: + void init( const QString& host ); + virtual void *virtual_hook( int id, void *data ); + + private: + friend class Internal::Integrator; + DBusConnection *connection() const; + Connection( DBusConnection *connection, QObject *parent ); + + private: + struct Private; + Private *d; + }; + +} + + +#endif diff -Nur kdebase-3.5.1/kioslave/media.orig/mediamanager/integrator.cpp kdebase-3.5.1/kioslave/media/mediamanager/integrator.cpp --- kdebase-3.5.1/kioslave/media.orig/mediamanager/integrator.cpp 1970-01-01 01:00:00.000000000 +0100 +++ kdebase-3.5.1/kioslave/media/mediamanager/integrator.cpp 2006-01-26 14:54:52.000000000 +0100 @@ -0,0 +1,244 @@ +// -*- Mode: C++; c-basic-offset: 2; indent-tabs-mode: nil; -*- +/* integrator.h: integrates D-BUS into Qt event loop + * + * Copyright (C) 2003 Zack Rusin + * + * Licensed under the Academic Free License version 2.0 + * + * 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 + * + */ +#include "integrator.h" +#include "connection.h" + +#include +#include +#include +#include + +namespace DBusQt +{ +namespace Internal { + +struct Watch { + Watch(): readSocket( 0 ), writeSocket( 0 ) { } + + DBusWatch *watch; + QSocketNotifier *readSocket; + QSocketNotifier *writeSocket; +}; + +////////////////////////////////////////////////////////////// +dbus_bool_t dbusAddWatch( DBusWatch *watch, void *data ) +{ + Integrator *con = static_cast( data ); + con->addWatch( watch ); + return true; +} +void dbusRemoveWatch( DBusWatch *watch, void *data ) +{ + Integrator *con = static_cast( data ); + con->removeWatch( watch ); +} + +void dbusToggleWatch( DBusWatch *watch, void *data ) +{ + Integrator *itg = static_cast( data ); + if ( dbus_watch_get_enabled( watch ) ) + itg->addWatch( watch ); + else + itg->removeWatch( watch ); +} + +dbus_bool_t dbusAddTimeout( DBusTimeout *timeout, void *data ) +{ + if ( !dbus_timeout_get_enabled(timeout) ) + return true; + + Integrator *itg = static_cast( data ); + itg->addTimeout( timeout ); + return true; +} + +void dbusRemoveTimeout( DBusTimeout *timeout, void *data ) +{ + Integrator *itg = static_cast( data ); + itg->removeTimeout( timeout ); +} + +void dbusToggleTimeout( DBusTimeout *timeout, void *data ) +{ + Integrator *itg = static_cast( data ); + + if ( dbus_timeout_get_enabled( timeout ) ) + itg->addTimeout( timeout ); + else + itg->removeTimeout( timeout ); +} + +void dbusWakeupMain( void* ) +{ +} + +void dbusNewConnection( DBusServer *server, + DBusConnection *new_connection, + void *data ) +{ + Integrator *itg = static_cast( data ); + itg->handleConnection( new_connection ); +} +///////////////////////////////////////////////////////////// + +Timeout::Timeout( QObject *parent, DBusTimeout *t ) + : QObject( parent ), m_timeout( t ) +{ + m_timer = new QTimer( this ); + connect( m_timer, SIGNAL(timeout()), + SLOT(slotTimeout()) ); +} + +void Timeout::slotTimeout() +{ + emit timeout( m_timeout ); +} + +void Timeout::start() +{ + m_timer->start( dbus_timeout_get_interval( m_timeout ) ); +} + +Integrator::Integrator( DBusConnection *conn, QObject *parent ) + : QObject( parent ), m_connection( conn ) +{ + m_timeouts.setAutoDelete( true ); + + dbus_connection_set_watch_functions( m_connection, + dbusAddWatch, + dbusRemoveWatch, + dbusToggleWatch, + this, 0 ); + dbus_connection_set_timeout_functions( m_connection, + dbusAddTimeout, + dbusRemoveTimeout, + dbusToggleTimeout, + this, 0 ); + dbus_connection_set_wakeup_main_function( m_connection, + dbusWakeupMain, + this, 0 ); +} + +Integrator::Integrator( DBusServer *server, QObject *parent ) + : QObject( parent ), m_server( server ) +{ + m_connection = reinterpret_cast( m_server ); + m_timeouts.setAutoDelete( true ); + + dbus_server_set_watch_functions( m_server, + dbusAddWatch, + dbusRemoveWatch, + dbusToggleWatch, + this, 0 ); + dbus_server_set_timeout_functions( m_server, + dbusAddTimeout, + dbusRemoveTimeout, + dbusToggleTimeout, + this, 0 ); + dbus_server_set_new_connection_function( m_server, + dbusNewConnection, + this, 0 ); +} + +void Integrator::slotRead( int fd ) +{ + QIntDictIterator it( m_watches ); + for ( ; it.current(); ++it ) + dbus_watch_handle ( it.current()->watch, DBUS_WATCH_READABLE ); + + emit readReady(); +} + +void Integrator::slotWrite( int fd ) +{ + QIntDictIterator it( m_watches ); + for ( ; it.current(); ++it ) + dbus_watch_handle ( it.current()->watch, DBUS_WATCH_WRITABLE ); +} + +void Integrator::slotTimeout( DBusTimeout *timeout ) +{ + dbus_timeout_handle( timeout ); +} + +void Integrator::addWatch( DBusWatch *watch ) +{ + if ( !dbus_watch_get_enabled( watch ) ) + return; + + Watch *qtwatch = new Watch; + qtwatch->watch = watch; + + int flags = dbus_watch_get_flags( watch ); + int fd = dbus_watch_get_fd( watch ); + + if ( flags & DBUS_WATCH_READABLE ) { + qtwatch->readSocket = new QSocketNotifier( fd, QSocketNotifier::Read, this ); + QObject::connect( qtwatch->readSocket, SIGNAL(activated(int)), SLOT(slotRead(int)) ); + } + + if (flags & DBUS_WATCH_WRITABLE) { + qtwatch->writeSocket = new QSocketNotifier( fd, QSocketNotifier::Write, this ); + QObject::connect( qtwatch->writeSocket, SIGNAL(activated(int)), SLOT(slotWrite(int)) ); + } + + m_watches.insert( fd, qtwatch ); +} + +void Integrator::removeWatch( DBusWatch *watch ) +{ + int key = dbus_watch_get_fd( watch ); + + Watch *qtwatch = m_watches.take( key ); + + if ( qtwatch ) { + delete qtwatch->readSocket; qtwatch->readSocket = 0; + delete qtwatch->writeSocket; qtwatch->writeSocket = 0; + delete qtwatch; + } +} + +void Integrator::addTimeout( DBusTimeout *timeout ) +{ + Timeout *mt = new Timeout( this, timeout ); + m_timeouts.insert( timeout, mt ); + connect( mt, SIGNAL(timeout(DBusTimeout*)), + SLOT(slotTimeout(DBusTimeout*)) ); + mt->start(); +} + +void Integrator::removeTimeout( DBusTimeout *timeout ) +{ + m_timeouts.remove( timeout ); +} + +void Integrator::handleConnection( DBusConnection *c ) +{ + Connection *con = new Connection( c, this ); + emit newConnection( con ); +} + +}//end namespace Internal +}//end namespace DBusQt + +#include "integrator.moc" diff -Nur kdebase-3.5.1/kioslave/media.orig/mediamanager/integrator.h kdebase-3.5.1/kioslave/media/mediamanager/integrator.h --- kdebase-3.5.1/kioslave/media.orig/mediamanager/integrator.h 1970-01-01 01:00:00.000000000 +0100 +++ kdebase-3.5.1/kioslave/media/mediamanager/integrator.h 2006-01-26 14:54:50.000000000 +0100 @@ -0,0 +1,95 @@ +// -*- Mode: C++; c-basic-offset: 2; indent-tabs-mode: nil; -*- +/* integrator.h: integrates D-BUS into Qt event loop + * + * Copyright (C) 2003 Zack Rusin + * + * Licensed under the Academic Free License version 2.1 + * + * 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 + * + */ +#ifndef DBUS_QT_INTEGRATOR_H +#define DBUS_QT_INTEGRATOR_H + +/* We acknowledge the the dbus API is unstable */ +#define DBUS_API_SUBJECT_TO_CHANGE + +#include + +#include +#include + +#include "dbus/dbus.h" + +class QTimer; + +namespace DBusQt +{ + class Connection; + + namespace Internal + { + struct Watch; + + class Timeout : public QObject + { + Q_OBJECT + public: + Timeout( QObject *parent, DBusTimeout *t ); + public: + void start(); + signals: + void timeout( DBusTimeout* ); + protected slots: + void slotTimeout(); + private: + QTimer *m_timer; + DBusTimeout *m_timeout; + }; + + class Integrator : public QObject + { + Q_OBJECT + public: + Integrator( DBusConnection *connection, QObject *parent ); + Integrator( DBusServer *server, QObject *parent ); + + signals: + void readReady(); + void newConnection( Connection* ); + + protected slots: + void slotRead( int ); + void slotWrite( int ); + void slotTimeout( DBusTimeout *timeout ); + + public: + void addWatch( DBusWatch* ); + void removeWatch( DBusWatch* ); + + void addTimeout( DBusTimeout* ); + void removeTimeout( DBusTimeout* ); + + void handleConnection( DBusConnection* ); + private: + QIntDict m_watches; + QPtrDict m_timeouts; + DBusConnection *m_connection; + DBusServer *m_server; + }; + } +} + +#endif diff -Nur kdebase-3.5.1/kioslave/media.orig/mediamanager/message.cpp kdebase-3.5.1/kioslave/media/mediamanager/message.cpp --- kdebase-3.5.1/kioslave/media.orig/mediamanager/message.cpp 1970-01-01 01:00:00.000000000 +0100 +++ kdebase-3.5.1/kioslave/media/mediamanager/message.cpp 2006-01-26 14:54:57.000000000 +0100 @@ -0,0 +1,551 @@ +/* -*- mode: C++; c-file-style: "gnu" -*- */ +/* message.cpp: Qt wrapper for DBusMessage + * + * Copyright (C) 2003 Zack Rusin + * + * Licensed under the Academic Free License version 2.0 + * + * 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 + * + */ +#include "message.h" + +#include + +#include + +namespace DBusQt { + +struct Message::iterator::IteratorData { + DBusMessageIter *iter; + QVariant var; + bool end; + DBusMessage *mesg; +}; + +/** + * Iterator. + */ +Message::iterator::iterator() +{ + d = new IteratorData; + d->iter = 0; d->end = true; +} + +/** + * Constructs iterator for the message. + * @param msg message whose fields we want to iterate + */ +Message::iterator::iterator( DBusMessage* msg ) +{ + d = new IteratorData; + d->mesg = msg; + d->iter = static_cast( malloc( sizeof(DBusMessageIter) ) ); + dbus_message_iter_init( d->mesg, d->iter ); + if ( !d->iter ) { + qDebug("No iterator??"); + } + fillVar(); + d->end = false; +} + +/** + * Copy constructor for the iterator. + * @param itr iterator + */ +Message::iterator::iterator( const iterator& itr ) +{ + d = new IteratorData; + d->iter = itr.d->iter; + d->var = itr.d->var; + d->end = itr.d->end; +} + +/** + * Destructor. + */ +Message::iterator::~iterator() +{ + free( d->iter ); + delete d; d=0; +} + +/** + * Creates an iterator equal to the @p itr iterator + * @param itr other iterator + * @return + */ +Message::iterator& +Message::iterator::operator=( const iterator& itr ) +{ + IteratorData *tmp = new IteratorData; + tmp->iter = itr.d->iter; + tmp->var = itr.d->var; + tmp->end = itr.d->end; + delete d; d=tmp; + return *this; +} + +/** + * Returns the constant QVariant held by the iterator. + * @return the constant reference to QVariant held by this iterator + */ +const QVariant& +Message::iterator::operator*() const +{ + return d->var; +} + +/** + * Returns the QVariant held by the iterator. + * @return reference to QVariant held by this iterator + */ +QVariant& +Message::iterator::operator*() +{ + return d->var; +} + +/** + * Moves to the next field and return a reference to itself after + * incrementing. + * @return reference to self after incrementing + */ +Message::iterator& +Message::iterator::operator++() +{ + if ( d->end ) + return *this; + + if ( dbus_message_iter_next( d->iter ) ) { + fillVar(); + } else { + d->end = true; + d->var = QVariant(); + } + return *this; +} + +/** + * Moves to the next field and returns self before incrementing. + * @return self before incrementing + */ +Message::iterator +Message::iterator::operator++(int) +{ + iterator itr( *this ); + operator++(); + return itr; +} + +/** + * Compares this iterator to @p it iterator. + * @param it the iterator to which we're comparing this one to + * @return true if they're equal, false otherwise + */ +bool +Message::iterator::operator==( const iterator& it ) +{ + if ( d->end == it.d->end ) { + if ( d->end == true ) { + return true; + } else { + return d->var == it.d->var; + } + } else + return false; +} + +/** + * Compares two iterators. + * @param it The other iterator. + * @return true if two iterators are not equal, false + * otherwise + */ +bool +Message::iterator::operator!=( const iterator& it ) +{ + return !operator==( it ); +} + +QVariant Message::iterator::marshallBaseType( DBusMessageIter* i ) +{ + QVariant ret; + switch (dbus_message_iter_get_arg_type(i)) { + case DBUS_TYPE_INT32: + { + dbus_int32_t v; + dbus_message_iter_get_basic (i, &v); + ret = QVariant( v ); + } + break; + case DBUS_TYPE_UINT32: + { + dbus_uint32_t v; + dbus_message_iter_get_basic (i, &v); + ret = QVariant( v ); + } + break; + case DBUS_TYPE_DOUBLE: + { + double v; + dbus_message_iter_get_basic (i, &v); + ret = QVariant( v ); + } + break; + case DBUS_TYPE_STRING: + { + const char *v; + dbus_message_iter_get_basic (i, &v); + ret = QVariant( v ); + } + break; + default: + ret = QVariant(); + break; + } + return ret; +} + +/** + * Fills QVariant based on what current DBusMessageIter helds. + */ +void +Message::iterator::fillVar() +{ + switch ( dbus_message_iter_get_arg_type( d->iter ) ) { + case DBUS_TYPE_INT32: + case DBUS_TYPE_UINT32: + case DBUS_TYPE_DOUBLE: + case DBUS_TYPE_STRING: + d->var = marshallBaseType( d->iter ); + break; + case DBUS_TYPE_ARRAY: { + switch ( dbus_message_iter_get_element_type( d->iter ) ) { + case DBUS_TYPE_STRING: { + QStringList tempList; + DBusMessageIter sub; + dbus_message_iter_recurse (d->iter, &sub); + while (dbus_message_iter_get_arg_type (&sub) != DBUS_TYPE_INVALID) + { + const char *v; + dbus_message_iter_get_basic (&sub, &v); + tempList.append( QString( v ) ); + dbus_message_iter_next (&sub); + } + d->var = QVariant( tempList ); + break; + } + default: + qDebug( "Array of type not implemented" ); + d->var = QVariant(); + break; + } + break; + } +#if 0 + /* DICT is gone for now, but expected to be reintroduced, or else + * reintroduced as a flag on the introspection data that can + * apply to array of struct of two fields + */ + case DBUS_TYPE_DICT: { + qDebug( "Got a hash!" ); + QMap tempMap; + DBusMessageIter dictIter; + dbus_message_iter_init_dict_iterator( d->iter, &dictIter ); + do { + char *key = dbus_message_iter_get_dict_key( &dictIter ); + tempMap[key] = marshallBaseType( &dictIter ); + dbus_free( key ); + dbus_message_iter_next( &dictIter ); + } while( dbus_message_iter_has_next( &dictIter ) ); + d->var = QVariant( tempMap ); + break; + qDebug( "Hash/Dict type not implemented" ); + d->var = QVariant(); + break; + } +#endif + default: + qDebug( "not implemented" ); + d->var = QVariant(); + break; + } +} + +/** + * Returns a QVariant help by this iterator. + * @return QVariant held by this iterator + */ +QVariant +Message::iterator::var() const +{ + return d->var; +} + +struct Message::Private { + DBusMessage *msg; +}; + +Message::Message( DBusMessage *m ) +{ + d = new Private; + d->msg = m; +} + +/** + * + */ +Message::Message( int messageType ) +{ + d = new Private; + d->msg = dbus_message_new( messageType ); +} + +/** + * Constructs a new Message with the given service and name. + * @param service service service that the message should be sent to + * @param name name of the message + */ +Message::Message( const QString& service, const QString& path, + const QString& interface, const QString& method ) +{ + d = new Private; + d->msg = dbus_message_new_method_call( service.latin1(), path.latin1(), + interface.latin1(), method.latin1() ); +} + +/** + * Constructs a message that is a reply to some other + * message. + * @param name the name of the message + * @param replayingTo original_message the message which the created + * message is a reply to. + */ +Message::Message( const Message& replayingTo ) +{ + d = new Private; + d->msg = dbus_message_new_method_return( replayingTo.d->msg ); +} + +Message:: Message( const QString& path, const QString& interface, + const QString& name ) +{ + d = new Private; + d->msg = dbus_message_new_signal( path.ascii(), interface.ascii(), + name.ascii() ); +} + +Message::Message( const Message& replayingTo, const QString& errorName, + const QString& errorMessage ) +{ + d = new Private; + d->msg = dbus_message_new_error( replayingTo.d->msg, errorName.utf8(), + errorMessage.utf8() ); +} + +Message Message::operator=( const Message& other ) +{ + //FIXME: ref the other.d->msg instead of copying it? +} +/** + * Destructs message. + */ +Message::~Message() +{ + if ( d->msg ) { + dbus_message_unref( d->msg ); + } + delete d; d=0; +} + +int Message::type() const +{ + return dbus_message_get_type( d->msg ); +} + +void Message::setPath( const QString& path ) +{ + dbus_message_set_path( d->msg, path.ascii() ); +} + +QString Message::path() const +{ + return dbus_message_get_path( d->msg ); +} + +void Message::setInterface( const QString& iface ) +{ + dbus_message_set_interface( d->msg, iface.ascii() ); +} + +QString Message::interface() const +{ + return dbus_message_get_interface( d->msg ); +} + +void Message::setMember( const QString& member ) +{ + dbus_message_set_member( d->msg, member.ascii() ); +} + +QString Message::member() const +{ + return dbus_message_get_member( d->msg ); +} + +QString Message::errorName() const +{ + return dbus_message_get_error_name( d->msg ); +} + +QString Message::destination() const +{ + return dbus_message_get_destination( d->msg ); +} + +/** + * Sets the message sender. + * @param sender the sender + * @return false if unsuccessful + */ +bool +Message::setSender( const QString& sender ) +{ + return dbus_message_set_sender( d->msg, sender.latin1() ); +} + +/** + * Returns sender of this message. + * @return sender + */ +QString +Message::sender() const +{ + return dbus_message_get_sender( d->msg ); +} + +QString Message::signature() const +{ + return dbus_message_get_signature( d->msg ); +} + + +/** + * Returns the starting iterator for the fields of this + * message. + * @return starting iterator + */ +Message::iterator +Message::begin() const +{ + return iterator( d->msg ); +} + +/** + * Returns the ending iterator for the fields of this + * message. + * @return ending iterator + */ +Message::iterator +Message::end() const +{ + return iterator(); +} + +/** + * Returns the field at position @p i + * @param i position of the wanted field + * @return QVariant at position @p i or an empty QVariant + */ +QVariant +Message::at( int i ) +{ + iterator itr( d->msg ); + + while ( i-- ) { + if ( itr == end() ) + return QVariant();//nothing there + ++itr; + } + return *itr; +} + +/** + * The underlying DBusMessage of this class. + * @return DBusMessage pointer. + */ +DBusMessage* +Message::message() const +{ + return d->msg; +} + +Message& Message::operator<<( bool b ) +{ + const dbus_bool_t right_size_bool = b; + dbus_message_append_args( d->msg, DBUS_TYPE_BOOLEAN, &right_size_bool, + DBUS_TYPE_INVALID ); +} + +Message& Message::operator<<( Q_INT8 byte ) +{ + dbus_message_append_args( d->msg, DBUS_TYPE_BYTE, &byte, + DBUS_TYPE_INVALID ); +} + +Message& Message::operator<<( Q_INT32 num ) +{ + dbus_message_append_args( d->msg, DBUS_TYPE_INT32, &num, + DBUS_TYPE_INVALID ); +} + +Message& Message::operator<<( Q_UINT32 num ) +{ + dbus_message_append_args( d->msg, DBUS_TYPE_UINT32, &num, + DBUS_TYPE_INVALID ); +} + +Message& Message::operator<<( Q_INT64 num ) +{ + dbus_message_append_args( d->msg, DBUS_TYPE_INT64, &num, + DBUS_TYPE_INVALID ); +} + +Message& Message::operator<<( Q_UINT64 num ) +{ + dbus_message_append_args( d->msg, DBUS_TYPE_UINT64, &num, + DBUS_TYPE_INVALID ); +} + +Message& Message::operator<<( double num ) +{ + dbus_message_append_args( d->msg, DBUS_TYPE_DOUBLE, &num, + DBUS_TYPE_INVALID ); +} + +Message& Message::operator<<( const QString& str ) +{ + const char *u = str.utf8(); + dbus_message_append_args( d->msg, DBUS_TYPE_STRING, &u, + DBUS_TYPE_INVALID ); +} + +Message& Message::operator<<( const QVariant& custom ) +{ + //FIXME: imeplement +} + +} diff -Nur kdebase-3.5.1/kioslave/media.orig/mediamanager/message.h kdebase-3.5.1/kioslave/media/mediamanager/message.h --- kdebase-3.5.1/kioslave/media.orig/mediamanager/message.h 1970-01-01 01:00:00.000000000 +0100 +++ kdebase-3.5.1/kioslave/media/mediamanager/message.h 2006-01-26 14:55:00.000000000 +0100 @@ -0,0 +1,132 @@ +/* -*- mode: C++; c-file-style: "gnu" -*- */ +/* message.h: Qt wrapper for DBusMessage + * + * Copyright (C) 2003 Zack Rusin + * + * Licensed under the Academic Free License version 2.1 + * + * 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 + * + */ +#ifndef DBUS_QT_MESSAGE_H +#define DBUS_QT_MESSAGE_H + +/* We acknowledge the the dbus API is unstable */ +#define DBUS_API_SUBJECT_TO_CHANGE + +#include +#include +#include + +#include "dbus/dbus.h" + +namespace DBusQt { + + class Message + { + public: + class iterator { + public: + iterator(); + iterator( const iterator& ); + iterator( DBusMessage* msg ); + ~iterator(); + + iterator& operator=( const iterator& ); + const QVariant& operator*() const; + QVariant& operator*(); + iterator& operator++(); + iterator operator++(int); + bool operator==( const iterator& it ); + bool operator!=( const iterator& it ); + + QVariant var() const; + protected: + QVariant marshallBaseType( DBusMessageIter* i ); + void fillVar(); + struct IteratorData; + IteratorData *d; + }; + + Message( int messageType ); + Message( DBusMessage * );//hide this one from the public implementation + Message( const QString& service, const QString& path, + const QString& interface, const QString& method ); + Message( const Message& replayingTo ); + Message( const QString& path, const QString& interface, + const QString& name ); + Message( const Message& replayingTo, const QString& errorName, + const QString& errorMessage ); + + Message operator=( const Message& other ); + + virtual ~Message(); + + int type() const; + + void setPath( const QString& ); + QString path() const; + + void setInterface( const QString& ); + QString interface() const; + + void setMember( const QString& ); + QString member() const; + + QString errorName() const; + + QString destination() const; + + bool setSender( const QString& sender ); + QString sender() const; + + QString signature() const; + + iterator begin() const; + iterator end() const; + + QVariant at( int i ); + + + public: + Message& operator<<( bool ); + Message& operator<<( Q_INT8 ); + Message& operator<<( Q_INT32 ); + Message& operator<<( Q_UINT32 ); + Message& operator<<( Q_INT64 ); + Message& operator<<( Q_UINT64 ); + Message& operator<<( double ); + Message& operator<<( const QString& ); + Message& operator<<( const QVariant& ); + //Message& operator<<(); + //Message& operator<<(); + //Message& operator<<(); + //Message& operator<<(); + //Message& operator<<(); + //Message& operator<<(); + //Message& operator<<(); + + protected: + friend class Connection; + DBusMessage* message() const; + + private: + struct Private; + Private *d; + }; + +} + +#endif --- kdebase-3.5.1/kioslave/media/configure.in.in.dbus 2006-01-26 15:45:06.000000000 +0100 +++ kdebase-3.5.1/kioslave/media/configure.in.in 2006-01-26 15:53:54.000000000 +0100 @@ -106,70 +106,6 @@ AC_SUBST(DBUS_INCS) AC_SUBST(DBUS_LIBS) - -########### Check for DBus-Qt bindings - - AC_MSG_CHECKING(for DBus-Qt bindings) - - dbusqt_inc=NOTFOUND - dbusqt_lib=NOTFOUND - dbusqt=NOTFOUND - - search_incs="$kde_includes $kde_extra_includes /usr/include /usr/include/dbus-1.0 /usr/local/include /usr/local/include/dbus-1.0" - AC_FIND_FILE(dbus/connection.h, $search_incs, dbusqt_incdir) - - if test -r $dbusqt_incdir/dbus/connection.h ; then - have_qt_patch=0 - grep dbus_connection_setup_with_qt_main $dbusqt_incdir/dbus/connection.h \ - > /dev/null 2>&1 && have_qt_patch=1 - if test $have_qt_patch = 1 ; then - DBUSQT_INCS="-I$dbusqt_incdir" - dbusqt_inc=FOUND - fi - fi - - search_libs="$kde_libraries $kde_extra_libs /usr/lib$kdelibsuff /usr/local/lib$kdelibsuff" - AC_FIND_FILE(libdbus-qt-1.so, $search_libs, dbusqt_libdir) - - if test -r $dbusqt_libdir/libdbus-qt-1.so ; then - DBUSQT_LIBS="-L$dbusqt_libdir -ldbus-qt-1" - dbusqt_lib=FOUND - fi - - if test $dbusqt_inc != FOUND || test $dbusqt_lib != FOUND ; then - - search_incs="`pkg-config --cflags dbus-1 |sed 's/-I//g'`" - AC_FIND_FILE(dbus/connection.h, $search_incs, dbusqt_incdir) - if test -r $dbusqt_incdir/dbus/connection.h ; then - have_qt_patch=0 - grep dbus_connection_setup_with_qt_main $dbusqt_incdir/dbus/connection.h \ - > /dev/null 2>&1 && have_qt_patch=1 - if test $have_qt_patch = 1 ; then - DBUSQT_INCS="-I$dbusqt_incdir" - dbusqt_inc=FOUND - fi - fi - - search_libs="`pkg-config --libs dbus-1 --libs-only-L | sed 's/-L//g'`" - AC_FIND_FILE(libdbus-qt-1.so, $search_libs, dbusqt_libdir) - - if test -r $dbusqt_libdir/libdbus-qt-1.so ; then - DBUSQT_LIBS="-L$dbusqt_libdir -ldbus-qt-1" - dbusqt_lib=FOUND - fi - - fi - - - if test $dbusqt_inc = FOUND && test $dbusqt_lib = FOUND ; then - AC_MSG_RESULT(headers $dbusqt_incdir libraries $dbusqt_libdir) - dbusqt=FOUND - else - AC_MSG_RESULT(searched but not found) - fi - - AC_SUBST(DBUSQT_INCS) - AC_SUBST(DBUSQT_LIBS) fi ########### Check if media HAL backend sould be compiled @@ -177,7 +113,7 @@ AC_MSG_CHECKING(if the HAL backend for media:/ should be compiled) HALBACKEND=no -if test "x$hal" = "xFOUND" && test "x$dbus" = "xFOUND" && test "x$dbusqt" = "xFOUND" ; then +if test "x$hal" = "xFOUND" && test "x$dbus" = "xFOUND" ; then AC_DEFINE_UNQUOTED([COMPILE_HALBACKEND],1, [media HAL backend compilation]) HALBACKEND=yes AC_SUBST(HALBACKEND) kdebase-3.5.2-kioslave_media_dbus.patch: Makefile.am | 5 configure.in.in | 7 kcmodule/managermodule.cpp | 4 kcmodule/media.desktop | 2 kfile-plugin/kfile_media.desktop | 5 kfile-plugin/kfilemediaplugin.cpp | 9 libmediacommon/medium.cpp | 4 libmediacommon/medium.h | 21 + mediaimpl.cpp | 15 mediamanager/halbackend.cpp | 553 +++++++++++++++++++++++++++- mediamanager/halbackend.h | 19 mediamanager/mediamanager.cpp | 81 +++- mediamanager/mediamanager.desktop | 1 mediamanager/mediamanager.h | 8 medianotifier/medianotifier.cpp | 9 medianotifier/medianotifier.desktop | 8 mimetypes/audiocd.desktop | 4 mimetypes/blankcd.desktop | 2 mimetypes/blankdvd.desktop | 2 mimetypes/cdrom_mounted.desktop | 4 mimetypes/cdrom_unmounted.desktop | 2 mimetypes/cdwriter_mounted.desktop | 2 mimetypes/cdwriter_unmounted.desktop | 2 mimetypes/dvdvideo.desktop | 4 mimetypes/floppy5_mounted.desktop | 2 mimetypes/floppy5_unmounted.desktop | 2 mimetypes/floppy_mounted.desktop | 2 mimetypes/floppy_unmounted.desktop | 2 mimetypes/hdd_mounted.desktop | 1 mimetypes/hdd_unmounted.desktop | 1 mimetypes/nfs_mounted.desktop | 1 mimetypes/nfs_unmounted.desktop | 1 mimetypes/removable_mounted.desktop | 5 mimetypes/removable_unmounted.desktop | 5 mimetypes/smb_mounted.desktop | 3 mimetypes/smb_unmounted.desktop | 3 mimetypes/vcd.desktop | 1 mounthelper/Makefile.am | 2 mounthelper/kio_media_mounthelper.cpp | 51 +- propsdlgplugin/Makefile.am | 12 propsdlgplugin/media_propsdlgplugin.desktop | 7 propsdlgplugin/propertiespage.cpp | 217 ++++++++++ propsdlgplugin/propertiespage.h | 46 ++ propsdlgplugin/propertiespagegui.ui | 390 +++++++++++++++++++ propsdlgplugin/propertiespagegui.ui.h | 22 + propsdlgplugin/propsdlgshareplugin.cpp | 100 +++++ propsdlgplugin/propsdlgshareplugin.h | 44 ++ services/media_eject.desktop | 2 services/media_safelyremove.desktop | 1 49 files changed, 1595 insertions(+), 101 deletions(-) --- NEW FILE kdebase-3.5.2-kioslave_media_dbus.patch --- diff -Nur kdebase-3.5.2/kioslave/media.orig/configure.in.in kdebase-3.5.2/kioslave/media/configure.in.in --- kdebase-3.5.2/kioslave/media.orig/configure.in.in 2005-10-10 17:04:01.000000000 +0200 +++ kdebase-3.5.2/kioslave/media/configure.in.in 2006-01-25 23:50:00.000000000 +0100 @@ -90,6 +90,13 @@ if test $dbus_inc != FOUND || test $dbus_lib != FOUND ; then KDE_PKG_CHECK_MODULES( DBUS, "dbus-1", [ DBUS_INCS=$DBUS_CFLAGS; dbus_inc=FOUND; dbus_lib=FOUND; ] , AC_MSG_RESULT( Nothing found on PKG_CONFIG_PATH ) ) fi + + dbus_bus_var=`pkg-config --variable=system_bus_default_address dbus-1 2>/dev/null` + if test -z "$dbus_bus_var"; then + dbus_bus_var="unix:path=/var/run/dbus/system_bus_socket" + fi + AC_DEFINE_UNQUOTED(DBUS_SYSTEM_BUS, "$dbus_bus_var", [Define the unix domain path for dbus system bus]) + if test $dbus_inc = FOUND && test $dbus_lib = FOUND ; then AC_MSG_RESULT(headers $DBUS_INCS libraries $DBUS_LIBS) dbus=FOUND diff -Nur kdebase-3.5.2/kioslave/media.orig/kcmodule/managermodule.cpp kdebase-3.5.2/kioslave/media/kcmodule/managermodule.cpp --- kdebase-3.5.2/kioslave/media.orig/kcmodule/managermodule.cpp 2005-11-20 20:14:21.000000000 +0100 +++ kdebase-3.5.2/kioslave/media/kcmodule/managermodule.cpp 2006-01-25 23:49:54.000000000 +0100 @@ -39,15 +39,15 @@ QString hal_text = view->kcfg_HalBackendEnabled->text(); hal_text += " ("+i18n("No support for HAL on this system")+")"; view->kcfg_HalBackendEnabled->setText( hal_text ); - view->kcfg_HalBackendEnabled->setEnabled( false ); #endif + view->kcfg_HalBackendEnabled->setEnabled( false ); #ifndef COMPILE_LINUXCDPOLLING QString poll_text = view->kcfg_CdPollingEnabled->text(); poll_text += " ("+i18n("No support for CD polling on this system")+")"; view->kcfg_CdPollingEnabled->setText( poll_text ); - view->kcfg_CdPollingEnabled->setEnabled( false ); #endif + view->kcfg_CdPollingEnabled->setEnabled( false ); load(); } diff -Nur kdebase-3.5.2/kioslave/media.orig/kcmodule/media.desktop kdebase-3.5.2/kioslave/media/kcmodule/media.desktop --- kdebase-3.5.2/kioslave/media.orig/kcmodule/media.desktop 2006-03-17 11:17:33.000000000 +0100 +++ kdebase-3.5.2/kioslave/media/kcmodule/media.desktop 2006-01-25 23:49:54.000000000 +0100 @@ -79,7 +79,6 @@ Comment[fi]=Aseta tallennusmedia Comment[fr]=Configurer le m??dia de stockage Comment[fy]=Opslachmedia ynstelle -Comment[ga]=Cumraigh Me??in St??r??la Comment[gl]=Configurar Medios de Armacenaxe Comment[hu]=A t??rol??eszk??z??k be??ll??t??sa Comment[is]=Stillingar geymslumi??la @@ -123,7 +122,6 @@ Keywords[fi]=varasto,media,usb,cdrom,laite Keywords[fr]=stockage,media,medium,usb,cdrom,p??riph??rique Keywords[fy]=storage,opslach,media,usb,cd-rom,kompakt-skiif,device,apparaat,mp3-speler,usb-stick,geheugenkaart -Keywords[ga]=st??r??il,st??ras,me??in,me??n,usb,cdrom,dl??thdhiosca,gl??as Keywords[gl]=armacenaxe,medios,usb,cdrom,dispositivo Keywords[hu]=t??rol??,adathordoz??,USB,CD-ROM,eszk??z Keywords[is]=geymsla,mi??ill,usb,cdrom,t??ki diff -Nur kdebase-3.5.2/kioslave/media.orig/kfile-plugin/kfile_media.desktop kdebase-3.5.2/kioslave/media/kfile-plugin/kfile_media.desktop --- kdebase-3.5.2/kioslave/media.orig/kfile-plugin/kfile_media.desktop 2006-03-17 11:17:33.000000000 +0100 +++ kdebase-3.5.2/kioslave/media/kfile-plugin/kfile_media.desktop 2006-01-25 23:49:52.000000000 +0100 @@ -18,12 +18,11 @@ Name[fi]=Tallenteiden tiedot Name[fr]=Informations sur le m??dia Name[fy]=Mediumynformaasje -Name[ga]=Eolas faoin Mhe??n Name[gl]=Informaz??n do Meio Name[he]=???????? ?????????? ?????????? Name[hi]=?????????????????? ????????????????????? Name[hu]=Adathordoz??-jellemz??k -Name[is]=Uppl??singar um mi??il +Name[is]=Uppl??singar um mi??ill Name[it]=Informazioni supporto Name[ja]=?????????????????? Name[km]=?????????????????????????????????????????? @@ -58,4 +57,4 @@ Name[zh_TW]=???????????? ServiceTypes=KFilePlugin X-KDE-Library=kfile_media -MimeType=media/audiocd;media/hdd_mounted;media/blankcd;media/hdd_unmounted;media/blankdvd;media/cdrom_mounted;media/cdrom_unmounted;media/cdwriter_mounted;media/nfs_mounted;media/cdwriter_unmounted;media/nfs_unmounted;media/removable_mounted;media/dvd_mounted;media/removable_unmounted;media/dvd_unmounted;media/smb_mounted;media/dvdvideo;media/smb_unmounted;media/floppy5_mounted;media/svcd;media/floppy5_unmounted;media/vcd;media/floppy_mounted;media/zip_mounted;media/floppy_unmounted;media/zip_unmounted;media/gphoto2camera +MimeType=media/audiocd;media/hdd_mounted;media/blankcd;media/hdd_unmounted;media/blankdvd;media/cdrom_mounted;media/cdrom_unmounted;media/cdwriter_mounted;media/nfs_mounted;media/cdwriter_unmounted;media/nfs_unmounted;media/removable_mounted;media/dvd_mounted;media/removable_unmounted;media/dvd_unmounted;media/smb_mounted;media/dvdvideo;media/smb_unmounted;media/floppy5_mounted;media/svcd;media/floppy5_unmounted;media/vcd;media/floppy_mounted;media/zip_mounted;media/floppy_unmounted;media/zip_unmounted;media/gphoto2camera,media/camera_mounted,media/camera_unmounted diff -Nur kdebase-3.5.2/kioslave/media.orig/kfile-plugin/kfilemediaplugin.cpp kdebase-3.5.2/kioslave/media/kfile-plugin/kfilemediaplugin.cpp --- kdebase-3.5.2/kioslave/media.orig/kfile-plugin/kfilemediaplugin.cpp 2005-11-08 23:36:07.000000000 +0100 +++ kdebase-3.5.2/kioslave/media/kfile-plugin/kfilemediaplugin.cpp 2006-01-25 23:49:52.000000000 +0100 @@ -64,12 +64,16 @@ addMimeType( "media/floppy_unmounted" ); addMimeType( "media/zip_unmounted" ); addMimeType( "media/gphoto2camera" ); + addMimeType( "media/camera_mounted" ); + addMimeType( "media/camera_unmounted" ); } bool KFileMediaPlugin::readInfo(KFileMetaInfo &info, uint /*what*/) { - const Medium medium = askMedium(info); + const Medium medium = askMedium(info); + kdDebug() << "KFileMediaPlugin::readInfo " << medium.id() << endl; + if (medium.id().isNull()) return false; QString mount_point = medium.mountPoint(); @@ -161,7 +165,8 @@ const Medium KFileMediaPlugin::askMedium(KFileMetaInfo &info) { DCOPRef mediamanager("kded", "mediamanager"); - DCOPReply reply = mediamanager.call( "properties", info.url().fileName() ); + kdDebug() << "properties " << info.url() << endl; + DCOPReply reply = mediamanager.call( "properties", info.url().url() ); if ( !reply.isValid() ) { diff -Nur kdebase-3.5.2/kioslave/media.orig/libmediacommon/medium.cpp kdebase-3.5.2/kioslave/media/libmediacommon/medium.cpp --- kdebase-3.5.2/kioslave/media.orig/libmediacommon/medium.cpp 2005-10-10 17:04:00.000000000 +0200 +++ kdebase-3.5.2/kioslave/media/libmediacommon/medium.cpp 2006-02-15 23:51:31.000000000 +0100 @@ -40,6 +40,8 @@ m_properties+= QString::null; /* ICON_NAME */ loadUserLabel(); + + m_halmounted = false; } Medium::Medium() @@ -57,6 +59,8 @@ m_properties+= QString::null; /* BASE_URL */ m_properties+= QString::null; /* MIME_TYPE */ m_properties+= QString::null; /* ICON_NAME */ + + m_halmounted = false; } const Medium Medium::create(const QStringList &properties) diff -Nur kdebase-3.5.2/kioslave/media.orig/libmediacommon/medium.h kdebase-3.5.2/kioslave/media/libmediacommon/medium.h --- kdebase-3.5.2/kioslave/media.orig/libmediacommon/medium.h 2005-10-10 17:04:00.000000000 +0200 +++ kdebase-3.5.2/kioslave/media/libmediacommon/medium.h 2006-02-15 23:51:31.000000000 +0100 @@ -22,6 +22,7 @@ #include #include #include +#include class Medium { @@ -78,14 +79,32 @@ void setMimeType(const QString &mimeType); void setIconName(const QString &iconName); + void setHalMounted(bool flag) const { m_halmounted = flag; } + bool halMounted() const { return m_halmounted; } private: Medium(); void loadUserLabel(); QStringList m_properties; - + mutable bool m_halmounted; + friend class QValueListNode; }; +namespace MediaManagerUtils { + static inline QMap splitOptions(const QStringList & options) + { + QMap valids; + + for (QStringList::ConstIterator it = options.begin(); it != options.end(); ++it) + { + QString key = (*it).left((*it).find('=')); + QString value = (*it).mid((*it).find('=') + 1); + valids[key] = value; + } + return valids; + } +} + #endif diff -Nur kdebase-3.5.2/kioslave/media.orig/Makefile.am kdebase-3.5.2/kioslave/media/Makefile.am --- kdebase-3.5.2/kioslave/media.orig/Makefile.am 2005-09-10 10:25:36.000000000 +0200 +++ kdebase-3.5.2/kioslave/media/Makefile.am 2006-01-25 23:50:00.000000000 +0100 @@ -1,5 +1,5 @@ SUBDIRS = libmediacommon . mediamanager medianotifier mounthelper \ - kfile-plugin kcmodule mimetypes services + kfile-plugin kcmodule mimetypes services propsdlgplugin INCLUDES = -I$(srcdir)/libmediacommon $(all_includes) METASOURCES = AUTO @@ -28,4 +28,5 @@ ./testmedia messages: rc.cpp - $(XGETTEXT) *.cpp *.h kfile-plugin/*.cpp libmediacommon/*.cpp mediamanager/*.cpp mounthelper/*.cpp -o $(podir)/kio_media.pot + $(EXTRACTRC) propsdlgplugin/propertiespagegui.ui >> rc.cpp + $(XGETTEXT) *.cpp *.h kfile-plugin/*.cpp libmediacommon/*.cpp mediamanager/*.cpp mounthelper/*.cpp propsdlgplugin/*.cpp -o $(podir)/kio_media.pot diff -Nur kdebase-3.5.2/kioslave/media.orig/mediaimpl.cpp kdebase-3.5.2/kioslave/media/mediaimpl.cpp --- kdebase-3.5.2/kioslave/media.orig/mediaimpl.cpp 2005-10-10 17:04:01.000000000 +0200 +++ kdebase-3.5.2/kioslave/media/mediaimpl.cpp 2006-02-01 12:26:30.000000000 +0100 @@ -226,6 +226,8 @@ [...2128 lines suppressed...] +public: + PropertiesPage(QWidget* parent, const QString &_id); + virtual ~PropertiesPage(); + + bool save(); + +protected: + + QMap options; + QString id; + +}; + +#endif diff -Nur kdebase-3.5.2/kioslave/media.orig/propsdlgplugin/propsdlgshareplugin.cpp kdebase-3.5.2/kioslave/media/propsdlgplugin/propsdlgshareplugin.cpp --- kdebase-3.5.2/kioslave/media.orig/propsdlgplugin/propsdlgshareplugin.cpp 1970-01-01 01:00:00.000000000 +0100 +++ kdebase-3.5.2/kioslave/media/propsdlgplugin/propsdlgshareplugin.cpp 2006-01-25 23:49:55.000000000 +0100 @@ -0,0 +1,100 @@ +/* + Copyright (c) 2004 Jan Schaefer + + 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. + +*/ +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "propertiespage.h" +#include "propsdlgshareplugin.h" +#include "../libmediacommon/medium.h" + +typedef KGenericFactory PropsDlgSharePluginFactory; + +K_EXPORT_COMPONENT_FACTORY( media_propsdlgplugin, + PropsDlgSharePluginFactory("media_propsdlgplugin") ) + +class PropsDlgSharePlugin::Private +{ + public: + PropertiesPage* page; +}; + +PropsDlgSharePlugin::PropsDlgSharePlugin( KPropertiesDialog *dlg, + const char *, const QStringList & ) + : KPropsDlgPlugin(dlg), d(0) +{ + if (properties->items().count() != 1) + return; + + KFileItem *item = properties->items().first(); + + DCOPRef mediamanager("kded", "mediamanager"); + kdDebug() << "properties " << item->url() << endl; + DCOPReply reply = mediamanager.call( "properties", item->url().url() ); + + if ( !reply.isValid() ) + return; + + QVBox* vbox = properties->addVBoxPage(i18n("&Mounting")); + + d = new Private(); + + d->page = new PropertiesPage(vbox, Medium::create(reply).id()); + connect(d->page, SIGNAL(changed()), + SLOT(slotChanged())); + + // QTimer::singleShot(100, this, SLOT(slotChanged())); + +} + +void PropsDlgSharePlugin::slotChanged() +{ + kdDebug() << "slotChanged()\n"; + setDirty(true); +} + +PropsDlgSharePlugin::~PropsDlgSharePlugin() +{ + delete d; +} + +void PropsDlgSharePlugin::applyChanges() +{ + kdDebug() << "applychanges\n"; + if (!d->page->save()) { + properties->abortApplying(); + } +} + + +#include "propsdlgshareplugin.moc" + diff -Nur kdebase-3.5.2/kioslave/media.orig/propsdlgplugin/propsdlgshareplugin.h kdebase-3.5.2/kioslave/media/propsdlgplugin/propsdlgshareplugin.h --- kdebase-3.5.2/kioslave/media.orig/propsdlgplugin/propsdlgshareplugin.h 1970-01-01 01:00:00.000000000 +0100 +++ kdebase-3.5.2/kioslave/media/propsdlgplugin/propsdlgshareplugin.h 2006-01-25 23:49:55.000000000 +0100 @@ -0,0 +1,44 @@ +/* + Copyright (c) 2004 Jan Schaefer + + 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. + +*/ + +#ifndef KONQFILESHAREPLUGIN_H +#define KONQFILESHAREPLUGIN_H + +#include + +class PropsDlgSharePlugin : public KPropsDlgPlugin +{ +Q_OBJECT +public: + PropsDlgSharePlugin( KPropertiesDialog *dlg, const char *, const QStringList & ); + virtual ~PropsDlgSharePlugin(); + virtual void applyChanges(); + +public slots: + void slotChanged(); + +private: + class Private; + Private *d; + +}; + +#endif + + diff -Nur kdebase-3.5.2/kioslave/media.orig/services/media_eject.desktop kdebase-3.5.2/kioslave/media/services/media_eject.desktop --- kdebase-3.5.2/kioslave/media.orig/services/media_eject.desktop 2006-03-17 11:17:33.000000000 +0100 +++ kdebase-3.5.2/kioslave/media/services/media_eject.desktop 2006-01-25 23:49:51.000000000 +0100 @@ -23,7 +23,7 @@ Name[eo]=Eligo Name[es]=Expulsar Name[et]=V??ljastamine -Name[eu]=Egotzi +Name[eu]=Kanporatu Name[fa]=?????????? Name[fi]=Poista Name[fr]=??jecter diff -Nur kdebase-3.5.2/kioslave/media.orig/services/media_safelyremove.desktop kdebase-3.5.2/kioslave/media/services/media_safelyremove.desktop --- kdebase-3.5.2/kioslave/media.orig/services/media_safelyremove.desktop 2006-03-17 11:17:33.000000000 +0100 +++ kdebase-3.5.2/kioslave/media/services/media_safelyremove.desktop 2006-01-25 23:49:51.000000000 +0100 @@ -20,7 +20,6 @@ Name[fi]=Poista turvallisesti Name[fr]=Enlever en toute s??curit?? Name[fy]=Feilich ferwiderje -Name[ga]=Bain Amach go S??bh??ilte Name[gl]=Eliminar de Maneira Segura Name[he]=?????????? ?????????? Name[hu]=Biztons??gos lev??laszt??s --- kdebase-3.5.2/kioslave/media/mediamanager/halbackend.h.kioslave_media_dbus 2005-10-10 17:04:01.000000000 +0200 +++ kdebase-3.5.2/kioslave/media/mediamanager/halbackend.h 2006-03-26 13:14:00.000000000 +0200 @@ -40,7 +40,7 @@ /* We acknowledge the the dbus API is unstable */ #define DBUS_API_SUBJECT_TO_CHANGE /* DBus-Qt bindings */ -#include +#include /* HAL libraries */ #include #include kdebase-3.5.2-redhat.patch: kdebase-3.4.91/kde.pamd | 16 +++++++---- kdebase-3.5.1/startkde | 68 +++++++++++++++++++++++++++++++++++++++++------- 2 files changed, 69 insertions(+), 15 deletions(-) --- NEW FILE kdebase-3.5.2-redhat.patch --- --- kdebase-3.4.91/kde.pamd.redhat 2005-09-10 10:26:16.000000000 +0200 +++ kdebase-3.4.91/kde.pamd 2005-09-27 18:16:15.000000000 +0200 @@ -1,7 +1,11 @@ #%PAM-1.0 -auth required /lib/security/pam_pwdb.so shadow nullok -auth required /lib/security/pam_nologin.so -account required /lib/security/pam_pwdb.so -password required /lib/security/pam_cracklib.so -password required /lib/security/pam_pwdb.so shadow nullok use_authtok -session required /lib/security/pam_pwdb.so +auth sufficient pam_timestamp.so +auth include system-auth +account required pam_nologin.so +account include system-auth +password include system-auth +session include system-auth +session required pam_loginuid.so +session optional pam_timestamp.so +session optional pam_selinux.so +session optional pam_console.so --- kdebase-3.5.1/startkde.redhat 2006-01-19 18:03:19.000000000 +0100 +++ kdebase-3.5.1/startkde 2006-02-15 18:58:10.000000000 +0100 @@ -1,8 +1,56 @@ #!/bin/sh # # DEFAULT KDE STARTUP SCRIPT ( KDE-3.5.2 ) +# Modified for Red Hat Linux # +unset BLOCK_SIZE # breaks parsing of df output +shopt -u -o noclobber # allow overwriting of files with '>' + +# set up user environment if not present +# check for space on /tmp and "$HOME" and for write access +# error exit, if not +space_tmp=`df /tmp | xargs | cut -d" " -f11` +homedir_mount=`df "$HOME" | xargs | cut -d" " -f8` + +if [ "$homedir_mount" = "AFS" -a -x "`which fs 2>/dev/null`" ] ; then + # check for AFS + space_home=`fs df "$HOME" | xargs | cut -d" " -f10` +else + # check regular mounts + space_home=`df "$HOME" | xargs | cut -d" " -f11` +fi + +if [ $space_tmp -lt 50 ]; then + echo $"Not enough free disk space on /tmp" + exit 1 +fi + +if [ $space_home -lt 25 ]; then + echo $"Not enough free disk space on "$HOME"" + exit 1 +fi +testfile_tmp=`mktemp /tmp/KDE.startkde.XXXXXX` +testfile_home=`mktemp "$HOME"/KDE.startkde.XXXXXX` + +if ! echo TEST_TEXT >$testfile_tmp 2>/dev/null ; then + echo $"You don't have write permissions for /tmp" + exit 1 +fi +rm -f $testfile_tmp + +if ! echo TEST_TEXT >$testfile_home 2>/dev/null ; then + echo $"You don't have write permissions for "$HOME"" + exit 1 +fi +rm -f $testfile_home + +[ -d "$HOME"/.kde/share/config ] || mkdir -p "$HOME"/.kde/share/config + +if [ ! -e "$HOME"/.kde/share/config/emaildefaults ]; then + /usr/bin/mailsettings >"$HOME"/.kde/share/config/emaildefaults +fi + # When the X server dies we get a HUP signal from xinit. We must ignore it # because we still need to do some cleanup. trap 'echo GOT SIGHUP' HUP @@ -14,12 +62,12 @@ exit 1 fi -# Set the background to plain grey. +# Set the background to the Red Hat default blue # The standard X background is nasty, causing moire effects and exploding # people's heads. We use colours from the standard KDE palette for those with # palettised displays. if test -z "$XDM_MANAGED" || echo "$XDM_MANAGED" | grep ",auto" > /dev/null; then - xsetroot -solid "#000000" + xsetroot -solid "#5477A0" fi # we have to unset this for Darwin since it will screw up KDE's dynamic-loading @@ -64,7 +112,7 @@ cat >$kdehome/share/config/startupconfigkeys </env/*.sh and /env/*.sh -# (where is $KDEHOME or ~/.kde, and is where KDE is installed) +# Source scripts found in /env/*.sh and /etc/kde/env/*.sh +# (where is $KDEHOME or ~/.kde) # # This is where you can define environment variables that will be available to # all KDE programs, so this is where you can run agents using e.g. eval `ssh-agent` @@ -147,10 +195,11 @@ # For anything else (that doesn't set env vars, or that needs a window manager), # better use the Autostart folder. -exepath=`kde-config --path exe | tr : '\n'` +exepath=`kde-config --path exe | tr : '\n' | grep -v "^$(kde-config --prefix)"` +envpath=/etc/kde/env/ -for prefix in `echo "$exepath" | sed -n -e 's,/bin[^/]*/,/env/,p'`; do - for file in "$prefix"*.sh; do +for prefix in `echo "$exepath" | sed -n -e 's,/bin[^/]*/,/env/,p'` $envpath ; do + for file in "$prefix"*.sh ; do test -r "$file" && . "$file" done done @@ -339,7 +388,8 @@ echo 'startkde: Running shutdown scripts...' 1>&2 # Run scripts found in $KDEDIRS/shutdown -for prefix in `echo "$exepath" | sed -n -e 's,/bin[^/]*/,/shutdown/,p'`; do +shutdownpath=/etc/kde/shutdown/ +for prefix in `echo "$exepath" | sed -n -e 's,/bin[^/]*/,/shutdown/,p'` $shutdownpath; do for file in `ls "$prefix" 2> /dev/null | egrep -v '(~|\.bak)$'`; do test -x "$prefix$file" && "$prefix$file" done Index: kdebase.spec =================================================================== RCS file: /cvs/dist/rpms/kdebase/FC-5/kdebase.spec,v retrieving revision 1.159 retrieving revision 1.160 diff -u -r1.159 -r1.160 --- kdebase.spec 21 Feb 2006 19:09:39 -0000 1.159 +++ kdebase.spec 30 Mar 2006 13:46:23 -0000 1.160 @@ -7,8 +7,8 @@ %define include_kappfinder 0 %define qt_version 3.3.5 -%define arts_version 1.5.1 -%define kde_version 3.5.1 +%define arts_version 1.5.2 +%define kde_version 3.5.2 %define kdelibs_epoch 6 %define arts_epoch 8 %define make_cvs 1 @@ -19,8 +19,8 @@ Summary: K Desktop Environment - core files Name: kdebase -Version: 3.5.1 -Release: 5 +Version: 3.5.2 +Release: 0.1.fc5 Epoch: 6 Url: http://www.kde.org Group: User Interface/Desktops @@ -37,7 +37,7 @@ Source7: mailsettings.cc Patch0: kde-libtool.patch -Patch1: kdebase-3.5.1-redhat.patch +Patch1: kdebase-3.5.2-redhat.patch Patch2: kdebase-3.3.92-vroot.patch Patch3: kdebase-3.x-shortcuts.patch Patch4: kdebase-3.2.0-keymap.patch @@ -48,14 +48,11 @@ Patch9: kdebase-3.2.2-konsole-setInputMethodEnabled-20040525.diff Patch10: kdebase-3.4.2-kdesktop-konsole.patch Patch11: kdebase-3.5.1-xdg.patch -Patch12: kdebase-3.5.1-dbus.patch -Patch13: kdebase-3.5.1-kdm-readme.patch -Patch14: kdebase-3.5.1-kwin-systray.patch +Patch12: kdebase-3.5.2-kioslave_media_dbus.patch +Patch13: kdebase-3.5.2-dbus.patch +Patch14: kdebase-3.5.1-kdm-readme.patch Patch15: kdebase-3.5.1-konsole-fonts.patch -# upstream patches -Patch100: kdebase-3.5.1-keyboardlayout.patch - Requires: kdelibs >= %{kdelibs_epoch}:%{version} Requires: libxml2 >= 2.6.5 Requires: /etc/X11/xdm/Xaccess @@ -135,14 +132,11 @@ %patch9 -p1 -b .im %patch10 -p1 -b .kdestop-konsole %patch11 -p1 -b .xdg -%patch12 -p1 -b .dbus -%patch13 -p1 -b .kdm-readme -%patch14 -p1 -b .systray +%patch12 -p1 -b .kioslave_media_dbus +%patch13 -p1 -b .dbus +%patch14 -p1 -b .kdm-readme %patch15 -p1 -b .konsole-fonts -# upstream patches -%patch100 -p1 -b .keyboardlayout - %if %{rhel} rm -rf kdeprint/kdeprintfax perl -pi -e "s,kdeprintfax,," kdeprint/Makefile.am @@ -428,6 +422,11 @@ %{_includedir}/kde/ksplash/* %changelog +* Thu Mar 30 2006 Than Ngo 6:3.5.2-0.1.fc5 +- update to 3.5.2 +- drop kdebase-3.5.1-kwin-systray.patch, kdebase-3.5.1-keyboardlayout.patch, + included in new upstream + * Tue Feb 21 2006 Than Ngo 6:3.5.1-5 - fixed rpm file conflict - added missing Category X-KDE-LookNFeel Index: sources =================================================================== RCS file: /cvs/dist/rpms/kdebase/FC-5/sources,v retrieving revision 1.66 retrieving revision 1.67 diff -u -r1.66 -r1.67 --- sources 15 Feb 2006 18:13:01 -0000 1.66 +++ sources 30 Mar 2006 13:46:23 -0000 1.67 @@ -1,2 +1,2 @@ -484c7b3895ce4f95173f4789571eb1cc kdebase-3.5.1.tar.bz2 a53556b00f950797b9b32848cace66c9 kde-redhat-config-3.5-fc5-0.2.tar.bz2 +c5685e1be34e033286aa1f37002a0552 kdebase-3.5.2.tar.bz2 --- kdebase-3.5.1-dbus.patch DELETED --- --- kdebase-3.5.1-keyboardlayout.patch DELETED --- --- kdebase-3.5.1-kwin-systray.patch DELETED --- --- kdebase-3.5.1-redhat.patch DELETED --- From fedora-cvs-commits at redhat.com Thu Mar 30 14:26:39 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 30 Mar 2006 09:26:39 -0500 Subject: rpms/evolution/devel evolution.spec,1.134,1.135 Message-ID: <200603301426.k2UEQdu3024601@cvs.devel.redhat.com> Author: caolanm Update of /cvs/dist/rpms/evolution/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv24588 Modified Files: evolution.spec Log Message: rebuild Index: evolution.spec =================================================================== RCS file: /cvs/dist/rpms/evolution/devel/evolution.spec,v retrieving revision 1.134 retrieving revision 1.135 diff -u -r1.134 -r1.135 --- evolution.spec 14 Mar 2006 06:57:34 -0000 1.134 +++ evolution.spec 30 Mar 2006 14:26:37 -0000 1.135 @@ -39,7 +39,7 @@ Name: evolution Version: 2.6.0 -Release: 1 +Release: 2 License: GPL BuildRoot: %{_tmppath}/%{name}-%{version}-root URL: http://www.ximian.com/ @@ -635,6 +635,9 @@ %{_libdir}/evolution/%{evo_major}/libmenus.so %changelog +* Thu Mar 30 2006 Caolan McNamara - 2.6.0-2 +- rebuild against stable pilot-link + * Mon Mar 13 2006 Ray Strode - 2.6.0-1 - 2.6.0 - turn on the "error on missing prototypes" check thing From fedora-cvs-commits at redhat.com Thu Mar 30 14:46:39 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 30 Mar 2006 09:46:39 -0500 Subject: rpms/evolution/devel evolution.spec,1.135,1.136 Message-ID: <200603301446.k2UEkduE004488@cvs.devel.redhat.com> Author: caolanm Update of /cvs/dist/rpms/evolution/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv4046 Modified Files: evolution.spec Log Message: nontrivial Index: evolution.spec =================================================================== RCS file: /cvs/dist/rpms/evolution/devel/evolution.spec,v retrieving revision 1.135 retrieving revision 1.136 diff -u -r1.135 -r1.136 --- evolution.spec 30 Mar 2006 14:26:37 -0000 1.135 +++ evolution.spec 30 Mar 2006 14:46:36 -0000 1.136 @@ -39,7 +39,7 @@ Name: evolution Version: 2.6.0 -Release: 2 +Release: 1 License: GPL BuildRoot: %{_tmppath}/%{name}-%{version}-root URL: http://www.ximian.com/ @@ -635,9 +635,6 @@ %{_libdir}/evolution/%{evo_major}/libmenus.so %changelog -* Thu Mar 30 2006 Caolan McNamara - 2.6.0-2 -- rebuild against stable pilot-link - * Mon Mar 13 2006 Ray Strode - 2.6.0-1 - 2.6.0 - turn on the "error on missing prototypes" check thing From fedora-cvs-commits at redhat.com Thu Mar 30 15:15:39 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 30 Mar 2006 10:15:39 -0500 Subject: rpms/cups/FC-5 cups-kde.patch, NONE, 1.1 cups-str1515.patch, NONE, 1.1 cups-str1521.patch, NONE, 1.1 cups-1.1.15-initscript.patch, 1.3, 1.4 cups-1.1.16-system-auth.patch, 1.3, 1.4 cups-1.1.17-ppdsdat.patch, 1.3, 1.4 cups-1.1.17-rcp.patch, 1.2, 1.3 cups-CAN-2005-0064.patch, 1.1, 1.2 cups-dest-cache-v2.patch, 1.1, 1.2 cups-link.patch, 1.2, 1.3 cups-locale.patch, 1.1, 1.2 cups-lpd, 1.2, 1.3 cups-pie.patch, 1.4, 1.5 cups-relro.patch, 1.2, 1.3 cups.spec, 1.134, 1.135 sources, 1.15, 1.16 Message-ID: <200603301515.k2UFFds0006826@cvs.devel.redhat.com> Author: twaugh Update of /cvs/dist/rpms/cups/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv6586 Modified Files: cups-1.1.15-initscript.patch cups-1.1.16-system-auth.patch cups-1.1.17-ppdsdat.patch cups-1.1.17-rcp.patch cups-CAN-2005-0064.patch cups-dest-cache-v2.patch cups-link.patch cups-locale.patch cups-lpd cups-pie.patch cups-relro.patch cups.spec sources Added Files: cups-kde.patch cups-str1515.patch cups-str1521.patch Log Message: * Thu Mar 30 2006 Tim Waugh 1:1.2-0.2.rc1.2.3 - Added conflicts. - Built for FC5 update. cups-kde.patch: ipp.c | 4 ++-- ipp.h | 11 +++++++++++ 2 files changed, 13 insertions(+), 2 deletions(-) --- NEW FILE cups-kde.patch --- --- cups-1.2b2/cups/ipp.h.kde 2006-03-24 15:51:54.000000000 +0000 +++ cups-1.2b2/cups/ipp.h 2006-03-24 15:52:27.000000000 +0000 @@ -487,6 +487,17 @@ ipp_t *parent, ipp_t *ipp); +#ifdef __linux +/* + * The following symbol definitions are provided only for KDE + * compatibility during the CUPS 1.2 testing period and will be + * removed in a future release of CUPS. These are PRIVATE APIs + * from CUPS 1.1.x that the KDE developers chose to use... + */ +extern ipp_attribute_t *_ipp_add_attr(ipp_t *, int); +extern void _ipp_free_attr(ipp_attribute_t *); +#endif /* __linux */ + /* * C++ magic... */ --- cups-1.2b2/cups/ipp.c.kde 2006-03-24 14:42:41.000000000 +0000 +++ cups-1.2b2/cups/ipp.c 2006-03-24 14:42:53.000000000 +0000 @@ -2806,14 +2806,14 @@ */ ipp_attribute_t * /* O - New attribute */ -_ipp_add(ipp_t *ipp, /* I - IPP message */ +_ipp_add_attr(ipp_t *ipp, /* I - IPP message */ int num_values) /* I - Number of values */ { return (_ippAddAttr(ipp, num_values)); } void -_ipp_free(ipp_attribute_t *attr) /* I - Attribute to free */ +_ipp_free_attr(ipp_attribute_t *attr) /* I - Attribute to free */ { _ippFreeAttr(attr); } cups-str1515.patch: lpq.c | 62 ++++++++++++++++++++++++++++++++++++++++++++------------------ 1 files changed, 44 insertions(+), 18 deletions(-) --- NEW FILE cups-str1515.patch --- --- cups-1.2rc1/berkeley/lpq.c.str1515 2006-01-29 14:39:44.000000000 +0000 +++ cups-1.2rc1/berkeley/lpq.c 2006-03-28 17:27:50.000000000 +0100 @@ -49,6 +49,7 @@ * Local functions... */ +static http_t *connect_server(const char *, http_t *); static int show_jobs(const char *, http_t *, const char *, const char *, const int, const int); static void show_printer(const char *, http_t *, const char *); @@ -76,35 +77,23 @@ int num_dests; /* Number of destinations */ cups_dest_t *dests; /* Destinations */ cups_lang_t *language; /* Language */ -#ifdef HAVE_SSL - http_encryption_t encryption; /* Encryption? */ -#endif /* HAVE_SSL */ - language = cupsLangDefault(); - /* - * Connect to the scheduler... - */ - - if ((http = httpConnectEncrypt(cupsServer(), ippPort(), - cupsEncryption())) == NULL) - { - _cupsLangPrintf(stderr, _("%s: Unable to contact server!\n"), argv[0]); - return (1); - } /* * Check for command-line options... */ + http = NULL; dest = NULL; user = NULL; id = 0; interval = 0; longstatus = 0; all = 0; - num_dests = cupsGetDests(&dests); + language = cupsLangDefault(); + num_dests = 0; for (i = 1; i < argc; i ++) if (argv[i][0] == '+') @@ -115,10 +104,10 @@ { case 'E' : /* Encrypt */ #ifdef HAVE_SSL - encryption = HTTP_ENCRYPT_REQUIRED; + cupsSetEncryption(HTTP_ENCRYPT_REQUIRED); if (http) - httpEncryption(http, encryption); + httpEncryption(http, HTTP_ENCRYPT_REQUIRED); #else _cupsLangPrintf(stderr, _("%s: Sorry, no encryption support compiled in!\n"), @@ -166,6 +155,11 @@ if ((instance = strchr(dest, '/')) != NULL) *instance++ = '\0'; + http = connect_server(argv[0], http); + + if (num_dests == 0) + num_dests = cupsGetDests2(http, &dests); + if (cupsGetDest(dest, instance, num_dests, dests) == NULL) { if (instance) @@ -186,8 +180,11 @@ break; case 'h' : /* Connect to host */ - if (http != NULL) + if (http) + { httpClose(http); + http = NULL; + } if (argv[i][2] != '\0') cupsSetServer(argv[i] + 2); @@ -225,8 +222,13 @@ else user = argv[i]; + http = connect_server(argv[0], http); + if (dest == NULL && !all) { + if (num_dests == 0) + num_dests = cupsGetDests2(http, &dests); + for (i = 0; i < num_dests; i ++) if (dests[i].is_default) dest = dests[i].name; @@ -295,6 +297,30 @@ /* + * 'connect_server()' - Connect to the server as necessary... + */ + +static http_t * /* O - New HTTP connection */ +connect_server(const char *command, /* I - Command name */ + http_t *http) /* I - Current HTTP connection */ +{ + if (!http) + { + http = httpConnectEncrypt(cupsServer(), ippPort(), + cupsEncryption()); + + if (http == NULL) + { + _cupsLangPrintf(stderr, _("%s: Unable to connect to server\n"), command); + exit(1); + } + } + + return (http); +} + + +/* * 'show_jobs()' - Show jobs. */ cups-str1521.patch: conf.c | 24 ++++++++++++++++++------ 1 files changed, 18 insertions(+), 6 deletions(-) --- NEW FILE cups-str1521.patch --- --- cups-1.2rc1/scheduler/conf.c.str1521 2006-03-14 11:54:45.000000000 +0000 +++ cups-1.2rc1/scheduler/conf.c 2006-03-30 10:09:57.000000000 +0100 @@ -338,22 +338,34 @@ endpwent(); /* - * Find the default group (nobody)... + * Find the default group... */ - group = getgrnam("nobody"); + group = getgrnam(CUPS_DEFAULT_GROUP); endgrent(); - if (group != NULL) + if (group) Group = group->gr_gid; else { /* - * Use the (historical) NFS nobody group ID (-2 as a 16-bit twos- - * complement number...) + * Fallback to group "nobody"... */ - Group = 65534; + group = getgrnam("nobody"); + endgrent(); + + if (group) + Group = group->gr_gid; + else + { + /* + * Use the (historical) NFS nobody group ID (-2 as a 16-bit twos- + * complement number...) + */ + + Group = 65534; + } } /* cups-1.1.15-initscript.patch: Makefile | 26 -------------------------- 1 files changed, 26 deletions(-) Index: cups-1.1.15-initscript.patch =================================================================== RCS file: /cvs/dist/rpms/cups/FC-5/cups-1.1.15-initscript.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- cups-1.1.15-initscript.patch 9 Sep 2004 04:12:00 -0000 1.3 +++ cups-1.1.15-initscript.patch 30 Mar 2006 15:15:35 -0000 1.4 @@ -1,55 +1,35 @@ ---- cups-1.1.21rc2/systemv/Makefile.noinit 2004-08-11 15:10:22.000000000 +0100 -+++ cups-1.1.21rc2/systemv/Makefile 2004-08-24 12:30:31.868411346 +0100 -@@ -77,7 +77,7 @@ - $(INSTALL_BIN) lp $(BINDIR) - $(INSTALL_BIN) lpoptions $(BINDIR) - $(INSTALL_BIN) lpstat $(BINDIR) -- -$(INSTALL_BIN) -m 4755 -o $(CUPS_USER) -g $(CUPS_GROUP) lppasswd $(BINDIR) -+ -$(INSTALL_BIN) -m 4755 lppasswd $(BINDIR) - if test ! -x $(BINDIR)/lppasswd; then \ - chmod 755 $(BINDIR)/lppasswd; \ - fi ---- cups-1.1.21rc2/Makefile.noinit 2004-02-25 20:14:50.000000000 +0000 -+++ cups-1.1.21rc2/Makefile 2004-08-24 12:28:17.704029413 +0100 -@@ -89,30 +89,6 @@ +--- cups-1.2b2/Makefile.noinit 2006-03-23 11:39:33.000000000 +0000 ++++ cups-1.2b2/Makefile 2006-03-23 11:40:22.000000000 +0000 +@@ -80,32 +80,6 @@ echo Installing cups-config script... - $(INSTALL_DIR) $(BINDIR) + $(INSTALL_DIR) -m 755 $(BINDIR) $(INSTALL_SCRIPT) cups-config $(BINDIR)/cups-config - echo Installing startup script... -- if test "x$(INITDIR)" != "x"; then \ -- $(INSTALL_DIR) $(BUILDROOT)$(INITDIR)/init.d; \ -- $(INSTALL_SCRIPT) cups.sh $(BUILDROOT)$(INITDIR)/init.d/cups; \ -- $(INSTALL_DIR) $(BUILDROOT)$(INITDIR)/rc0.d; \ -- $(INSTALL_SCRIPT) cups.sh $(BUILDROOT)$(INITDIR)/rc0.d/K00cups; \ -- $(INSTALL_DIR) $(BUILDROOT)$(INITDIR)/rc2.d; \ -- $(INSTALL_SCRIPT) cups.sh $(BUILDROOT)$(INITDIR)/rc2.d/S99cups; \ -- $(INSTALL_DIR) $(BUILDROOT)$(INITDIR)/rc3.d; \ -- $(INSTALL_SCRIPT) cups.sh $(BUILDROOT)$(INITDIR)/rc3.d/S99cups; \ -- $(INSTALL_DIR) $(BUILDROOT)$(INITDIR)/rc5.d; \ -- $(INSTALL_SCRIPT) cups.sh $(BUILDROOT)$(INITDIR)/rc5.d/S99cups; \ +- if test "x$(INITDIR)" != x; then \ +- $(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/init.d; \ +- $(INSTALL_SCRIPT) init/cups.sh $(BUILDROOT)$(INITDIR)/init.d/cups; \ +- $(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/rc0.d; \ +- $(INSTALL_SCRIPT) init/cups.sh $(BUILDROOT)$(INITDIR)/rc0.d/K00cups; \ +- $(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/rc2.d; \ +- $(INSTALL_SCRIPT) init/cups.sh $(BUILDROOT)$(INITDIR)/rc2.d/S99cups; \ +- $(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/rc3.d; \ +- $(INSTALL_SCRIPT) init/cups.sh $(BUILDROOT)$(INITDIR)/rc3.d/S99cups; \ +- $(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/rc5.d; \ +- $(INSTALL_SCRIPT) init/cups.sh $(BUILDROOT)$(INITDIR)/rc5.d/S99cups; \ - fi -- if test "x$(INITDIR)" = "x" -a "x$(INITDDIR)" != "x"; then \ +- if test "x$(INITDIR)" = x -a "x$(INITDDIR)" != x; then \ - $(INSTALL_DIR) $(BUILDROOT)$(INITDDIR); \ - if test "$(INITDDIR)" = "/System/Library/StartupItems/PrintingServices"; then \ -- $(INSTALL_SCRIPT) cups.osx $(BUILDROOT)$(INITDDIR)/PrintingServices; \ -- $(INSTALL_DATA) cups.plist $(BUILDROOT)$(INITDDIR)/StartupParameters.plist; \ -- $(INSTALL_DIR) $(BUILDROOT)$(INITDDIR)/Resources/English.lproj; \ -- $(INSTALL_DATA) cups.strings $(BUILDROOT)$(INITDDIR)/Resources/English.lproj/Localizable.strings; \ +- $(INSTALL_SCRIPT) init/PrintingServices $(BUILDROOT)$(INITDDIR)/PrintingServices; \ +- $(INSTALL_DATA) init/StartupParameters.plist $(BUILDROOT)$(INITDDIR)/StartupParameters.plist; \ +- $(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDDIR)/Resources/English.lproj; \ +- $(INSTALL_DATA) init/Localizable.strings $(BUILDROOT)$(INITDDIR)/Resources/English.lproj/Localizable.strings; \ +- elif test "$(INITDDIR)" = "/System/Library/LaunchDaemons"; then \ +- $(INSTALL_DATA) init/org.cups.cupsd.plist $(BUILDROOT)$(DEFAULT_LAUNCHD_CONF); \ - else \ -- $(INSTALL_SCRIPT) cups.sh $(BUILDROOT)$(INITDDIR)/cups; \ +- $(INSTALL_SCRIPT) init/cups.sh $(BUILDROOT)$(INITDDIR)/cups; \ - fi \ - fi - - # - # Install source and header files... ---- cups-1.1.21rc2/Makedefs.in.noinit 2004-06-29 04:14:19.000000000 +0100 -+++ cups-1.1.21rc2/Makedefs.in 2004-08-24 12:28:17.713027695 +0100 -@@ -47,7 +47,7 @@ - # Installation programs... - # - --INSTALL_BIN = $(LIBTOOL) $(INSTALL) -m 755 -s -+INSTALL_BIN = $(LIBTOOL) $(INSTALL) -m 755 - INSTALL_DATA = $(INSTALL) -m 644 - INSTALL_DIR = $(INSTALL) -d - INSTALL_LIB = $(LIBTOOL) $(INSTALL) -m 755 + if test "x$(DBUSDIR)" != x; then \ + echo Installing cups.conf in $(DBUSDIR)...;\ + $(INSTALL_DIR) -m 755 $(BUILDROOT)$(DBUSDIR); \ cups-1.1.16-system-auth.patch: Makefile | 10 +++++++--- cups.system-auth | 3 +++ 2 files changed, 10 insertions(+), 3 deletions(-) Index: cups-1.1.16-system-auth.patch =================================================================== RCS file: /cvs/dist/rpms/cups/FC-5/cups-1.1.16-system-auth.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- cups-1.1.16-system-auth.patch 30 Sep 2005 12:20:31 -0000 1.3 +++ cups-1.1.16-system-auth.patch 30 Mar 2006 15:15:35 -0000 1.4 @@ -1,21 +1,26 @@ ---- /dev/null 2004-02-23 21:02:56.000000000 +0000 -+++ cups-1.1.21rc1/conf/cups.system-auth 2004-06-03 15:14:55.795385144 +0100 -@@ -0,0 +1,3 @@ -+#%PAM-1.0 -+auth include system-auth -+account include system-auth ---- cups-1.1.21rc1/conf/Makefile.system-auth 2004-02-26 16:51:59.000000000 +0000 -+++ cups-1.1.21rc1/conf/Makefile 2004-06-03 15:32:52.108540894 +0100 -@@ -67,7 +67,11 @@ +--- cups-1.2svn-r5238/conf/Makefile.system-auth 2006-03-07 09:34:20.000000000 +0000 ++++ cups-1.2svn-r5238/conf/Makefile 2006-03-07 09:45:41.000000000 +0000 +@@ -79,10 +79,14 @@ done - -if test x$(PAMDIR) != x$(BUILDROOT); then \ - $(INSTALL_DIR) $(PAMDIR); \ -- $(INSTALL_DATA) $(PAMFILE) $(PAMDIR)/cups; \ + -if test x$(PAMDIR) != x; then \ + $(INSTALL_DIR) -m 755 $(BUILDROOT)$(PAMDIR); \ +- if test -r $(BUILDROOT)$(PAMDIR)/cups/$(PAMFILE) ; then \ +- $(INSTALL_DATA) $(PAMFILE) $(BUILDROOT)$(PAMDIR)/cups.N ; \ + if test -f /etc/pam.d/system-auth; then \ -+ $(INSTALL_DATA) cups.system-auth $(PAMDIR)/cups ; \ -+ else \ -+ $(INSTALL_DATA) $(PAMFILE) $(PAMDIR)/cups; \ -+ fi \ ++ $(INSTALL_DATA) cups.system-auth $(BUILDROOT)$(PAMDIR)/cups ; \ + else \ +- $(INSTALL_DATA) $(PAMFILE) $(BUILDROOT)$(PAMDIR)/cups ; \ ++ if test -r $(BUILDROOT)$(PAMDIR)/cups/$(PAMFILE) ; then \ ++ $(INSTALL_DATA) $(PAMFILE) $(BUILDROOT)$(PAMDIR)/cups.N ; \ ++ else \ ++ $(INSTALL_DATA) $(PAMFILE) $(BUILDROOT)$(PAMDIR)/cups ; \ ++ fi ; \ + fi ; \ fi - +--- /dev/null 2006-03-07 09:12:30.964372750 +0000 ++++ cups-1.2svn-r5238/conf/cups.system-auth 2006-03-07 09:43:12.000000000 +0000 +@@ -0,0 +1,3 @@ ++#%PAM-1.0 ++auth include system-auth ++account include system-auth cups-1.1.17-ppdsdat.patch: main.c | 27 ++++++++++++++++++++++++--- 1 files changed, 24 insertions(+), 3 deletions(-) Index: cups-1.1.17-ppdsdat.patch =================================================================== RCS file: /cvs/dist/rpms/cups/FC-5/cups-1.1.17-ppdsdat.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- cups-1.1.17-ppdsdat.patch 9 Sep 2004 04:08:38 -0000 1.3 +++ cups-1.1.17-ppdsdat.patch 30 Mar 2006 15:15:35 -0000 1.4 @@ -1,14 +1,14 @@ ---- cups-1.1.21rc1/scheduler/main.c.ppdsdat 2004-05-27 19:17:54.000000000 +0100 -+++ cups-1.1.21rc1/scheduler/main.c 2004-06-03 15:33:51.054269593 +0100 -@@ -91,6 +91,7 @@ +--- cups-1.2svn-r5083/scheduler/main.c.ppdsdat 2006-02-05 21:58:58.000000000 +0000 ++++ cups-1.2svn-r5083/scheduler/main.c 2006-02-10 13:46:19.000000000 +0000 +@@ -115,6 +115,7 @@ int i; /* Looping var */ char *opt; /* Option character */ int fg; /* Run in the foreground */ + int only_ppds; /* Just build ppds.dat */ - int fds; /* Number of ready descriptors select returns */ + int fds; /* Number of ready descriptors */ fd_set *input, /* Input set for select() */ *output; /* Output set for select() */ -@@ -120,10 +121,25 @@ +@@ -150,10 +151,25 @@ */ fg = 0; @@ -28,22 +28,22 @@ + { + fprintf(stderr, "cupsd: Unknown option \'%s\' - aborting!\n", + &argv[i][2]); -+ usage(); ++ usage(1); + } + } + else for (opt = argv[i] + 1; *opt != '\0'; opt ++) switch (*opt) { case 'c' : /* Configuration file */ -@@ -166,6 +182,7 @@ - usage(); +@@ -227,6 +243,7 @@ + usage(1); break; } + } else { - fprintf(stderr, "cupsd: Unknown argument \'%s\' - aborting!\n", argv[i]); -@@ -375,6 +392,9 @@ + _cupsLangPrintf(stderr, _("cupsd: Unknown argument \"%s\" - aborting!\n"), +@@ -467,6 +484,9 @@ signal(SIGTERM, sigterm_handler); #endif /* HAVE_SIGSET */ @@ -53,12 +53,20 @@ #ifdef __sgi /* * Try to create a fake lpsched lock file if one is not already there. -@@ -1310,7 +1330,7 @@ - static void - usage(void) +@@ -2311,13 +2331,14 @@ + usage(int status) /* O - Exit status */ { -- fputs("Usage: cupsd [-c config-file] [-f] [-F]\n", stderr); -+ fputs("Usage: cupsd [-c config-file] [-f] [-F] --ppdsdat\n", stderr); - exit(1); + _cupsLangPuts(status ? stderr : stdout, +- _("Usage: cupsd [-c config-file] [-f] [-F] [-h] [-l]\n" ++ _("Usage: cupsd [-c config-file] [-f] [-F] [-h] [-l] [--ppdsdat]\n" + "\n" + "-c config-file Load alternate configuration file\n" + "-f Run in the foreground\n" + "-F Run in the foreground but detach\n" + "-h Show this usage message\n" +- "-l Run cupsd from launchd(8)\n")); ++ "-l Run cupsd from launchd(8)\n" ++ "--ppdsdat Just build ppds.dat\n")); + exit(status); } cups-1.1.17-rcp.patch: printers.tmpl | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) Index: cups-1.1.17-rcp.patch =================================================================== RCS file: /cvs/dist/rpms/cups/FC-5/cups-1.1.17-rcp.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- cups-1.1.17-rcp.patch 9 Sep 2004 04:06:15 -0000 1.2 +++ cups-1.1.17-rcp.patch 30 Mar 2006 15:15:35 -0000 1.3 @@ -1,11 +1,11 @@ ---- cups-1.1.17/templates/printers.tmpl.rcp 2000-09-05 22:08:31.000000000 +0100 -+++ cups-1.1.17/templates/printers.tmpl 2003-01-22 14:17:56.000000000 +0000 -@@ -16,7 +16,7 @@ - - - -- Description: {printer_info}
-+ {printer_info=Created by redhat-config-printer 0.6.x?Use system-config-printer to edit this!:Description: {printer_info}}
- Location: {printer_location}
- Printer State: {printer_state=3?idle:{printer_state=4?processing:stopped}}, - {printer_is_accepting_jobs=0?rejecting jobs:accepting jobs}. +--- cups-1.2svn-r4964/templates/printers.tmpl.rcp 2006-01-14 20:37:40.000000000 +0000 ++++ cups-1.2svn-r4964/templates/printers.tmpl 2006-01-24 17:13:14.000000000 +0000 +@@ -7,7 +7,7 @@ + + + +-Description: {printer_info}
++{printer_info=Created by redhat-config-printer 0.6.x?Use system-config-printer to edit this!:Description: {printer_info}}
+ Location: {printer_location}
+ Make and Model: {printer_make_and_model}
+ Printer State: {printer_state=3?idle:{printer_state=4?processing:stopped}}, cups-CAN-2005-0064.patch: Decrypt.cxx | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletion(-) Index: cups-CAN-2005-0064.patch =================================================================== RCS file: /cvs/dist/rpms/cups/FC-5/cups-CAN-2005-0064.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- cups-CAN-2005-0064.patch 19 Jan 2005 14:23:42 -0000 1.1 +++ cups-CAN-2005-0064.patch 30 Mar 2006 15:15:35 -0000 1.2 @@ -1,6 +1,6 @@ ---- cups-1.1.17/pdftops/Decrypt.cxx 2005-01-14 14:26:55.679891237 +0000 -+++ cups-1.1.17/pdftops/Decrypt.cxx 2005-01-17 14:21:58.917198715 +0000 -@@ -116,13 +116,19 @@ +--- cups-1.2svn-r4929/pdftops/Decrypt.cxx.CAN-2005-0064 2005-09-17 15:52:15.000000000 +0100 ++++ cups-1.2svn-r4929/pdftops/Decrypt.cxx 2006-01-20 14:31:21.000000000 +0000 +@@ -135,11 +135,16 @@ Guchar *buf; Guchar test[32]; Guchar fState[256]; @@ -14,14 +14,11 @@ + if ( !keyLength || keyLength > 16 ) { + return gFalse; + } -+ ++ // generate file key - buf = (Guchar *)gmalloc(68 + fileID->getLength()); -+ tmpKey = (Guchar *)gmalloc(keyLength * sizeof(Guchar)); + buf = (Guchar *)gmalloc(72 + fileID->getLength()); if (userPassword) { - len = userPassword->getLength(); - if (len < 32) { -@@ -175,6 +181,7 @@ +@@ -201,6 +206,7 @@ ok = gFalse; } cups-dest-cache-v2.patch: dest.c | 180 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 180 insertions(+) Index: cups-dest-cache-v2.patch =================================================================== RCS file: /cvs/dist/rpms/cups/FC-5/cups-dest-cache-v2.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- cups-dest-cache-v2.patch 10 Jan 2006 18:53:00 -0000 1.1 +++ cups-dest-cache-v2.patch 30 Mar 2006 15:15:35 -0000 1.2 @@ -1,18 +1,17 @@ ---- cups-1.1.23/cups/dest.c.dest-cache-v2 2005-01-03 19:29:45.000000000 +0000 -+++ cups-1.1.23/cups/dest.c 2006-01-10 17:52:39.000000000 +0000 -@@ -45,7 +45,10 @@ - #include "string.h" +--- cups-1.2svn-r5238/cups/dest.c.dest-cache-v2 2006-03-07 09:35:05.000000000 +0000 ++++ cups-1.2svn-r5238/cups/dest.c 2006-03-07 10:17:06.000000000 +0000 +@@ -44,7 +44,10 @@ + #include "globals.h" #include #include -- +#include -+#include + #include +#include +#include - /* - * Local functions... -@@ -204,6 +207,146 @@ + #ifdef HAVE_NOTIFY_H + # include +@@ -214,6 +217,144 @@ /* @@ -57,7 +56,7 @@ + close(fd); + return(-1); + } -+ ++ + /* populate the destinations structure */ + for (i=0; i < num_dests; i++) + { @@ -70,7 +69,7 @@ + return(-1); + strcpy((*dests)[i].instance, &buf[offset]); + offset += strlen((*dests)[i].instance) +1; -+ ++ + /* get number of options */ + strcpy(word, &buf[offset]); + offset += strlen(word)+1; @@ -153,13 +152,11 @@ + } +} + -+ -+ +/* - * 'cupsGetDests()' - Get the list of destinations. - */ - -@@ -211,8 +354,44 @@ + * 'cupsGetDests()' - Get the list of destinations from the default server. + * + * Starting with CUPS 1.2, the returned list of destinations include the +@@ -226,8 +367,44 @@ cupsGetDests(cups_dest_t **dests) /* O - Destinations */ { int num_dests; /* Number of destinations */ @@ -204,7 +201,7 @@ /* * Connect to the CUPS server and get the destination list and options... -@@ -225,6 +404,9 @@ +@@ -240,6 +417,9 @@ if (http) httpClose(http); cups-link.patch: Makefile | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) Index: cups-link.patch =================================================================== RCS file: /cvs/dist/rpms/cups/FC-5/cups-link.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- cups-link.patch 25 Jan 2006 17:09:53 -0000 1.2 +++ cups-link.patch 30 Mar 2006 15:15:35 -0000 1.3 @@ -1,11 +1,11 @@ ---- cups-1.1.23/filter/Makefile.lr 2005-10-15 22:58:47.000000000 +0200 -+++ cups-1.1.23/filter/Makefile 2005-10-15 22:59:43.000000000 +0200 -@@ -142,7 +142,7 @@ +--- cups-1.2b2/filter/Makefile.link 2006-03-23 11:42:25.000000000 +0000 ++++ cups-1.2b2/filter/Makefile 2006-03-23 11:43:19.000000000 +0000 +@@ -218,7 +218,7 @@ - libcupsimage.so.2 libcupsimage.sl.2: $(IMAGEOBJS) ../Makedefs + libcupsimage.so.2 libcupsimage.sl.2: $(IMAGEOBJS) echo Linking $@... -- $(DSO) $(DSOFLAGS) -o $@ $(IMAGEOBJS) $(DSOLIBS) -lm -+ $(DSO) $(DSOFLAGS) -o $@ $(IMAGEOBJS) $(DSOLIBS) -lm -L../cups -lcups +- $(DSO) $(ARCHFLAGS) $(DSOFLAGS) -o $@ $(IMAGEOBJS) $(DSOLIBS) -lm ++ $(DSO) $(ARCHFLAGS) $(DSOFLAGS) -o $@ $(IMAGEOBJS) $(DSOLIBS) -lm -L../cups -lcups $(RM) `basename $@ .2` $(LN) $@ `basename $@ .2` cups-locale.patch: language.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) Index: cups-locale.patch =================================================================== RCS file: /cvs/dist/rpms/cups/FC-5/cups-locale.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- cups-locale.patch 9 Sep 2004 04:05:22 -0000 1.1 +++ cups-locale.patch 30 Mar 2006 15:15:35 -0000 1.2 @@ -1,28 +1,39 @@ -diff -ruN cups-1.1.19.orig/cups/language.c cups-1.1.19/cups/language.c ---- cups-1.1.19.orig/cups/language.c 2003-08-14 20:13:18.000000000 +0900 -+++ cups-1.1.19/cups/language.c 2003-08-14 20:37:37.000000000 +0900 -@@ -188,6 +188,7 @@ - charset[16], /* Character set */ - *ptr, /* Pointer into language/ */ +--- cups-1.2svn-r5137/cups/language.c.locale 2006-02-15 20:11:10.000000000 +0000 ++++ cups-1.2svn-r5137/cups/language.c 2006-02-23 14:43:59.000000000 +0000 +@@ -276,6 +276,7 @@ + #endif /* CODESET */ + *ptr, /* Pointer into language/charset */ real[48], /* Real language name */ + ll_cc[48], /* Language + Country name */ - filename[1024], /* Filename for language locale file */ - *localedir; /* Directory for locale files */ + filename[1024]; /* Filename for language locale file */ cups_encoding_t encoding; /* Encoding to use */ -@@ -356,6 +357,7 @@ - */ + cups_lang_t *lang; /* Current language... */ +@@ -445,8 +446,10 @@ + country[0] = '\0'; - snprintf(real, sizeof(real), "%s_%s", langname, country); -+ strcpy(ll_cc, real); + if (language == NULL || !language[0] || +- !strcmp(language, "POSIX")) ++ !strcmp(language, "POSIX")) { + strcpy(langname, "C"); ++ strcpy(ll_cc, langname); ++ } + else + { + /* +@@ -476,6 +479,7 @@ + *ptr = '\0'; + } - if ((lang = cups_cache_lookup(real, encoding)) != NULL) - return (lang); -@@ -468,7 +470,7 @@ ++ snprintf(ll_cc, sizeof(ll_cc), "%s_%s", langname, country); + if (*language == '.' && !charset[0]) + { + /* +@@ -617,7 +621,7 @@ */ lang->used ++; - strlcpy(lang->language, real, sizeof(lang->language)); + strlcpy(lang->language, ll_cc, sizeof(lang->language)); - if (charset[0]) + if (encoding != CUPS_AUTO_ENCODING) lang->encoding = encoding; Index: cups-lpd =================================================================== RCS file: /cvs/dist/rpms/cups/FC-5/cups-lpd,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- cups-lpd 9 Sep 2004 04:02:40 -0000 1.2 +++ cups-lpd 30 Mar 2006 15:15:35 -0000 1.3 @@ -7,5 +7,5 @@ protocol = tcp wait = no user = lp - server = @LIBDIR@/cups/daemon/cups-lpd + server = /usr/lib/cups/daemon/cups-lpd } cups-pie.patch: cups/Makefile | 1 + filter/Makefile | 23 +++++++++++++++++------ pdftops/Makefile | 7 +++++++ scheduler/Makefile | 3 +++ systemv/Makefile | 3 ++- 5 files changed, 30 insertions(+), 7 deletions(-) Index: cups-pie.patch =================================================================== RCS file: /cvs/dist/rpms/cups/FC-5/cups-pie.patch,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- cups-pie.patch 9 Sep 2004 04:07:27 -0000 1.4 +++ cups-pie.patch 30 Mar 2006 15:15:35 -0000 1.5 @@ -1,65 +1,19 @@ ---- cups-1.1.19/cups/Makefile.pie 2003-03-20 02:45:21.000000000 +0000 -+++ cups-1.1.19/cups/Makefile 2003-11-20 15:53:43.000000000 +0000 -@@ -25,6 +25,7 @@ - # - - include ../Makedefs -+CFLAGS += -fpic - - # - # Object files... ---- cups-1.1.19/scheduler/Makefile.pie 2003-04-10 15:30:48.000000000 +0100 -+++ cups-1.1.19/scheduler/Makefile 2003-11-20 15:23:39.000000000 +0000 -@@ -24,6 +24,9 @@ - - include ../Makedefs - -+CFLAGS += -fpie -+LDFLAGS += -pie -+ - CUPSDOBJS = auth.o banners.o cert.o classes.o client.o conf.o devices.o \ - dirsvc.o main.o ipp.o listen.o job.o log.o network.o \ - ppds.o printers.o quotas.o server.o ---- cups-1.1.20/config-scripts/cups-compiler.m4.pie 2004-02-05 11:46:38.000000000 +0000 -+++ cups-1.1.20/config-scripts/cups-compiler.m4 2004-02-05 11:46:45.000000000 +0000 -@@ -65,10 +65,6 @@ - fi - fi - -- if test $PICFLAG = 1 -a $uname != AIX; then -- OPTIM="-fPIC $OPTIM" -- fi -- - if test "x$with_optim" = x; then - OPTIM="-Wall $OPTIM" - fi ---- cups-1.1.20/pdftops/Makefile.pie 2003-05-14 21:03:03.000000000 +0100 -+++ cups-1.1.20/pdftops/Makefile 2004-02-05 12:05:48.000000000 +0000 -@@ -9,6 +9,7 @@ - - - include ../Makedefs -+LDFLAGS += -pie - +--- cups-1.2b2/systemv/Makefile.pie 2006-03-05 16:48:12.000000000 +0000 ++++ cups-1.2b2/systemv/Makefile 2006-03-13 14:22:03.000000000 +0000 +@@ -192,9 +192,10 @@ + # lppasswd # - # Object files... -@@ -58,9 +59,14 @@ - UnicodeMap.o \ - XRef.o -+# For libxpdf.a: -+$(LIBOBJS): CXXFLAGS += -fPIC -+$(LIBOBJS): CFLAGS += -fPIC ++lppasswd.o: CFLAGS += -fPIE + lppasswd: lppasswd.o ../cups/$(LIBCUPS) + echo Linking $@... +- $(CC) $(LDFLAGS) -o lppasswd lppasswd.o $(LIBZ) $(LIBS) ++ $(CC) -pie $(LDFLAGS) -o lppasswd lppasswd.o $(LIBZ) $(LIBS) - OBJS = pdftops.o $(LIBOBJS) -+pdftops.o: CXXFLAGS += -fPIE -+ - # - # Make everything... # ---- cups-1.1.20/filter/Makefile.pie 2003-11-17 22:04:53.000000000 +0000 -+++ cups-1.1.20/filter/Makefile 2004-02-05 12:42:53.000000000 +0000 +--- cups-1.2b2/filter/Makefile.pie 2006-03-10 04:00:38.000000000 +0000 ++++ cups-1.2b2/filter/Makefile 2006-03-13 14:25:09.000000000 +0000 @@ -25,6 +25,7 @@ # @@ -67,66 +21,99 @@ +LDFLAGS += -pie FILTERS = gziptoany hpgltops texttops pstops imagetops imagetoraster \ - rastertodymo rastertoepson rastertohp -@@ -37,10 +38,21 @@ - image-sgi.o image-sgilib.o image-sun.o image-tiff.o \ - image-zoom.o image.o raster.o + rastertolabel rastertoepson rastertohp +@@ -45,11 +46,21 @@ + IMAGE32OBJS = $(IMAGEOBJS:.o=.32.o) + IMAGE64OBJS = $(IMAGEOBJS:.o=.64.o) FORMOBJS = form-attr.o form-main.o form-ps.o form-text.o form-tree.o -OBJS = $(HPGLOBJS) $(IMAGEOBJS) $(FORMOBJS) \ - gziptoany.o imagetops.o imagetoraster.o common.o pstops.o \ -+LIBOBJS = $(HPGLOBJS) $(IMAGEOBJS) $(FORMOBJS) ++LIBOBJS = $(HPGLOBJS) $(IMAGEOBJS) $(FORMOBJS) +BINOBJS = gziptoany.o imagetops.o imagetoraster.o common.o pstops.o \ - rastertodymo.o rastertoepson.o rastertohp.o \ - texttops.o textcommon.o + raster.o rastertoepson.o rastertohp.o rastertolabel.o \ + testimage.o testraster.o textcommon.o texttops.o +OBJS = $(LIBOBJS) $(BINOBJS) -+ -+FORMOBJSPIE = $(patsubst %.o,%.opie,$(FORMOBJS)) -+HPGLOBJSPIE = $(patsubst %.o,%.opie,$(HPGLOBJS)) + ++FORMOBJSPIE = $(patsubst %.o,%.opie,$(FORMOBJS)) ++HPGLOBJSPIE = $(patsubst %.o,%.opie,$(HPGLOBJS)) +$(LIBOBJS): CFLAGS += -fpic + -+$(BINOBJS): CFLAGS += -fpie ++$(BINOBJS): CFLAGS += -fPIE +.SUFFIXES: .opie +.c.opie: + echo Compiling $<... -+ $(CC) $(OPTIM) $(CFLAGS) -fpie -c $< -o $@ ++ $(CC) $(OPTIM) $(CFLAGS) -fPIE -c $< -o $@ # # Make all targets... -@@ -101,9 +113,9 @@ +@@ -178,9 +189,9 @@ # formtops # --formtops: $(FORMOBJS) common.o ../Makedefs ../cups/$(LIBCUPS) -+formtops: $(FORMOBJSPIE) common.o ../Makedefs ../cups/$(LIBCUPS) +-formtops: $(FORMOBJS) common.o ../cups/$(LIBCUPS) ++formtops: $(FORMOBJSPIE) common.o ../cups/$(LIBCUPS) echo Linking $@... - $(CC) $(LDFLAGS) -o $@ $(FORMOBJS) common.o $(LIBS) -lm + $(CC) $(LDFLAGS) -o $@ $(FORMOBJSPIE) common.o $(LIBS) -lm # -@@ -119,9 +131,9 @@ +@@ -196,9 +207,9 @@ # hpgltops # --hpgltops: $(HPGLOBJS) common.o ../Makedefs ../cups/$(LIBCUPS) -+hpgltops: $(HPGLOBJSPIE) common.o ../Makedefs ../cups/$(LIBCUPS) +-hpgltops: $(HPGLOBJS) common.o ../cups/$(LIBCUPS) ++hpgltops: $(HPGLOBJSPIE) common.o ../cups/$(LIBCUPS) echo Linking $@... - $(CC) $(LDFLAGS) -o $@ $(HPGLOBJS) common.o $(LIBS) -lm + $(CC) $(LDFLAGS) -o $@ $(HPGLOBJSPIE) common.o $(LIBS) -lm # ---- cups-1.1.20/systemv/Makefile.pie 2004-05-11 14:38:24.000000000 +0100 -+++ cups-1.1.20/systemv/Makefile 2004-05-11 14:40:22.000000000 +0100 -@@ -170,9 +170,10 @@ - # lppasswd +--- cups-1.2b2/pdftops/Makefile.pie 2006-03-05 16:48:12.000000000 +0000 ++++ cups-1.2b2/pdftops/Makefile 2006-03-13 14:22:03.000000000 +0000 +@@ -9,6 +9,7 @@ + + + include ../Makedefs ++LDFLAGS += -pie + # + # Object files... +@@ -86,8 +87,14 @@ + XRef.o -+lppasswd.o: CFLAGS += -fpie - lppasswd: lppasswd.o ../cups/$(LIBCUPS) - echo Linking $@... -- $(CC) $(LDFLAGS) -o lppasswd lppasswd.o $(LIBZ) $(LIBS) -+ $(CC) -pie $(LDFLAGS) -o lppasswd lppasswd.o $(LIBZ) $(LIBS) ++# For libxpdf.a: ++$(LIBOBJS): CXXFLAGS += -fPIC ++$(LIBOBJS): CFLAGS += -fPIC ++ + OBJS = pdftops.o $(LIBOBJS) + ++pdftops.o: CXXFLAGS += -fPIE ++ + TARGETS = libxpdf.a pdftops + + +--- cups-1.2b2/scheduler/Makefile.pie 2006-03-05 16:48:12.000000000 +0000 ++++ cups-1.2b2/scheduler/Makefile 2006-03-13 14:22:03.000000000 +0000 +@@ -24,6 +24,9 @@ + + include ../Makedefs + ++CFLAGS += -fPIE ++LDFLAGS += -pie ++ + CUPSDOBJS = \ + auth.o \ + banners.o \ +--- cups-1.2b2/cups/Makefile.pie 2006-03-10 04:42:19.000000000 +0000 ++++ cups-1.2b2/cups/Makefile 2006-03-13 14:22:03.000000000 +0000 +@@ -25,6 +25,7 @@ + # + + include ../Makedefs ++CFLAGS += -fpic # + # Object files... cups-relro.patch: Makefile | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) Index: cups-relro.patch =================================================================== RCS file: /cvs/dist/rpms/cups/FC-5/cups-relro.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- cups-relro.patch 19 Dec 2005 18:21:05 -0000 1.2 +++ cups-relro.patch 30 Mar 2006 15:15:35 -0000 1.3 @@ -1,5 +1,5 @@ ---- cups-1.1.23/pdftops/Makefile.relro 2005-12-19 16:48:14.000000000 +0000 -+++ cups-1.1.23/pdftops/Makefile 2005-12-19 16:50:49.000000000 +0000 +--- cups-1.2svn-r4964/pdftops/Makefile.relro 2006-01-25 16:56:03.000000000 +0000 ++++ cups-1.2svn-r4964/pdftops/Makefile 2006-01-25 16:56:40.000000000 +0000 @@ -9,7 +9,7 @@ Index: cups.spec =================================================================== RCS file: /cvs/dist/rpms/cups/FC-5/cups.spec,v retrieving revision 1.134 retrieving revision 1.135 diff -u -r1.134 -r1.135 --- cups.spec 13 Feb 2006 15:14:55 -0000 1.134 +++ cups.spec 30 Mar 2006 15:15:36 -0000 1.135 @@ -1,15 +1,16 @@ %define initdir /etc/rc.d/init.d %define use_alternatives 1 -%define use_dbus 1 %define build_as_pie 1 +%define beta rc1 +%define cups_serverbin %{_exec_prefix}/lib/cups Summary: Common Unix Printing System Name: cups -Version: 1.1.23 -Release: 30.2 +Version: 1.2 +Release: 0.2.%{beta}.2.3 License: GPL Group: System Environment/Daemons -Source: ftp://ftp.easysw.com/pub/cups/test/cups-%{version}-source.tar.bz2 +Source: ftp://ftp.easysw.com/pub/cups/test/cups-1.2%{beta}-source.tar.bz2 Source1: cups.init Source2: cupsprinter.png Source5: cups-lpd @@ -20,45 +21,28 @@ Source10: ncp.backend Source11: cups.conf Source12: cups.cron -Patch0: cups-1.1.15-initscript.patch -Patch1: cups-1.1.14-doclink.patch -Patch2: cups-1.1.16-system-auth.patch -Patch3: cups-1.1.17-backend.patch -Patch4: cups-ext.patch -Patch5: cups-str1023.patch -Patch6: cups-1.1.17-pdftops.patch -Patch7: cups-logfileperm.patch -Patch8: cups-1.1.17-rcp.patch -Patch9: cups-1.1.17-ppdsdat.patch -Patch10: cups-1.1.17-sanity.patch -Patch11: cups-1.1.19-lpstat.patch +Patch1: cups-1.1.15-initscript.patch +Patch2: cups-no-gzip-man.patch +Patch3: cups-1.1.16-system-auth.patch +Patch4: cups-1.1.17-backend.patch +Patch5: cups-ext.patch +Patch6: cups-kde.patch +Patch7: cups-str1515.patch +Patch8: cups-logfileperm.patch +Patch9: cups-1.1.17-rcp.patch +Patch10: cups-1.1.17-ppdsdat.patch Patch12: cups-locale.patch Patch13: cups-CAN-2005-0064.patch -Patch14: cups-str1068.patch -Patch15: cups-sigchld.patch +Patch14: cups-str1521.patch Patch16: cups-pie.patch Patch17: cups-1.1.19-no_rpath.patch Patch18: cups-language.patch -Patch19: cups-gcc34.patch -Patch20: cups-gcc4.patch -Patch21: cups-slow.patch Patch22: cups-dest-cache-v2.patch -Patch23: cups-autodetected-tag.patch Patch24: cups-maxlogsize.patch -Patch25: cups-enabledisable.patch Patch28: cups-no-propagate-ipp-port.patch Patch32: cups-pid.patch -Patch33: cups-CAN-2004-0888.patch -Patch34: cups-CAN-2005-2097.patch -Patch35: cups-finddest.patch -Patch36: cups-str1249.patch -Patch37: cups-str1284.patch -Patch38: cups-str1290.patch -Patch39: cups-str1301.patch Patch40: cups-link.patch Patch41: cups-relro.patch -Patch42: cups-CVE-2005-3625,6,7.patch -Patch43: cups-dbus.patch Epoch: 1 Url: http://www.cups.org/ BuildRoot: %{_tmppath}/%{name}-root @@ -74,15 +58,19 @@ Provides: lpd lpr LPRng = 3.8.15-3 BuildPrereq: pam-devel openssl-devel pkgconfig +BuildPrereq: gnutls-devel BuildRequires: make >= 1:3.80 +BuildRequires: php-devel, aspell-devel, pcre-devel # -fstack-protector-all requires GCC 4.0.1 BuildRequires: gcc >= 4.0.1 -%if %use_dbus BuildPrereq: dbus-devel >= 0.60 Requires: dbus >= 0.60 -%endif + +# Other packages may be expecting different backend path. +Conflicts: foomatic < 3.0.2-33.3 +Conflicts: hplip < 0.9.9-5.1 %package devel Summary: Common Unix Printing System - development environment @@ -124,50 +112,31 @@ lpd emulation. %prep -%setup -q -%patch0 -p1 -b .noinit -%patch1 -p1 -b .doclink -%patch2 -p1 -b .system-auth -%patch3 -p1 -b .backend -%patch4 -p1 -b .ext -%patch5 -p1 -b .str1023 -%patch6 -p1 -b .pdftops -%patch7 -p1 -b .logfileperm -%patch8 -p1 -b .rcp -%patch9 -p1 -b .ppdsdat -%patch10 -p1 -b .sanity -%patch11 -p1 -b .lpstat +%setup -q -n %{name}-%{version}%{beta} +%patch1 -p1 -b .noinit +%patch2 -p1 -b .no-gzip-man +%patch3 -p1 -b .system-auth +%patch4 -p1 -b .backend +%patch5 -p1 -b .ext +%patch6 -p1 -b .kde +%patch7 -p1 -b .str1515 +%patch8 -p1 -b .logfileperm +%patch9 -p1 -b .rcp +%patch10 -p1 -b .ppdsdat %patch12 -p1 -b .locale %patch13 -p1 -b .CAN-2005-0064 -%patch14 -p1 -b .str1068 -%patch15 -p1 -b .sigchld +%patch14 -p1 -b .str1521 %if %build_as_pie %patch16 -p1 -b .pie %endif %patch17 -p1 -b .no_rpath %patch18 -p1 -b .language -%patch19 -p1 -b .gcc34 -%patch20 -p1 -b .gcc4 -%patch21 -p1 -b .slow %patch22 -p1 -b .dest-cache-v2 -%patch23 -p1 -b .autodetected-tag %patch24 -p1 -b .maxlogsize -%patch25 -p1 -b .enabledisable %patch28 -p1 -b .no-propagate-ipp-port %patch32 -p1 -b .pid -%patch33 -p1 -b .CAN-2004-0888 -%patch34 -p1 -b .CAN-2005-2097 -%patch35 -p1 -b .finddest -%patch36 -p1 -b .str1249 -%patch37 -p1 -b .str1284 -%patch38 -p1 -b .str1290 -%patch39 -p1 -b .str1301 %patch40 -p1 -b .link %patch41 -p1 -b .relro -%patch42 -p1 -b .CVE-2005-3625,6,7 -%if %use_dbus -%patch43 -p1 -b .dbus -%endif perl -pi -e 's,^#(Printcap\s+/etc/printcap),$1,' conf/cupsd.conf.in aclocal -I config-scripts autoconf @@ -178,11 +147,6 @@ # Let's look at the compilation command lines. perl -pi -e "s,^.SILENT:,," Makedefs.in -for i in man/{es,fr}/*.man templates/{de,fr}/*.tmpl; do - iconv -f iso-8859-1 -t utf-8 < "$i" > "${i}_" - mv "${i}_" "$i" -done - %build if pkg-config openssl ; then export CFLAGS=`pkg-config --cflags openssl` @@ -227,7 +191,7 @@ install -c -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/pixmaps install -c -m 644 cups-lpd.real $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d/cups-lpd install -c -m 644 %{SOURCE9} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/cups -install -c -m 755 %{SOURCE10} $RPM_BUILD_ROOT%{_libdir}/cups/backend/ncp +install -c -m 755 %{SOURCE10} $RPM_BUILD_ROOT%{cups_serverbin}/backend/ncp install -c -m 755 %{SOURCE12} $RPM_BUILD_ROOT%{_sysconfdir}/cron.daily/cups ln -s ../doc/%{name}-%{version} $RPM_BUILD_ROOT%{_datadir}/%{name}/doc # Deal with users trying to access the admin tool at @@ -256,28 +220,24 @@ done # Ship pstoraster (bug #69573). -install -c -m 755 %{SOURCE6} $RPM_BUILD_ROOT%{_libdir}/cups/filter +install -c -m 755 %{SOURCE6} $RPM_BUILD_ROOT%{cups_serverbin}/filter install -c -m 644 %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}/cups # Ship a generic postscript PPD file (#73061) install -c -m 644 %{SOURCE8} $RPM_BUILD_ROOT%{_datadir}/cups/model -%if %use_dbus -# D-BUS configuration. -mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/dbus-1/system.d -install -c -m 644 %{SOURCE11} $RPM_BUILD_ROOT%{_sysconfdir}/dbus-1/system.d/cups.conf -%endif +# Ship a printers.conf file, and a client.conf file. That way, they get +# their SELinux file contexts set correctly. +touch $RPM_BUILD_ROOT%{_sysconfdir}/cups/printers.conf +touch $RPM_BUILD_ROOT%{_sysconfdir}/cups/client.conf + +# Ship an SSL directory +mkdir $RPM_BUILD_ROOT%{_sysconfdir}/cups/ssl # Remove unshipped files. rm -rf $RPM_BUILD_ROOT%{_mandir}/cat? $RPM_BUILD_ROOT%{_mandir}/*/cat? - -# Remove .pdf from docs, fix links -for pdf in cmp.pdf ipp.pdf sam.pdf spm.pdf ssr.pdf sum.pdf translation.pdf \ - idd.pdf overview.pdf sdd.pdf sps.pdf stp.pdf svd.pdf -do - perl -p -i -e "s@$pdf at http://www.cups.org/$pdf@" $RPM_BUILD_ROOT%{_docdir}/cups-%{version}/documentation.html -done -find $RPM_BUILD_ROOT%{_docdir}/cups-%{version} -name *.pdf |xargs rm +rm -f $RPM_BUILD_ROOT%{_datadir}/applications/cups.desktop +rm -rf $RPM_BUILD_ROOT%{_datadir}/icons %post @@ -327,90 +287,81 @@ exit 0 %triggerin -- samba-client -ln -sf ../../../bin/smbspool %{_libdir}/cups/backend/smb || : +ln -sf ../../../bin/smbspool %{cups_serverbin}/backend/smb || : exit 0 %triggerun -- samba-client [ $2 = 0 ] || exit 0 -rm -f %{_libdir}/cups/backend/smb +rm -f %{cups_serverbin}/backend/smb %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) -%dir %attr(0775,root,sys) /etc/cups -%dir %attr(0711,root,sys) /etc/cups/certs -%config(noreplace) %attr(0640,root,sys) /etc/cups/classes.conf -%config(noreplace) %attr(0640,root,sys) /etc/cups/cupsd.conf -%config(noreplace) %attr(0640,root,sys) /etc/cups/printers.conf -%config(noreplace) /etc/cups/client.conf +%dir %attr(0755,root,nobody) /etc/cups +%dir %attr(0511,lp,sys) /var/run/cups/certs +%config(noreplace) %attr(0640,root,nobody) /etc/cups/cupsd.conf +%attr(0640,root,nobody) /etc/cups/cupsd.conf.default +%config(noreplace) %attr(0644,root,nobody) /etc/cups/client.conf +%config(noreplace) %attr(0600,root,nobody) /etc/cups/printers.conf /etc/cups/interfaces %config(noreplace) /etc/cups/mime.types %config(noreplace) /etc/cups/mime.convs -%dir %attr(0755,root,sys) /etc/cups/ppd +%dir %attr(0755,root,nobody) /etc/cups/ppd +%dir %attr(0700,root,nobody) /etc/cups/ssl /etc/cups/pstoraster.convs %config(noreplace) /etc/pam.d/cups %dir %{_docdir}/cups-%{version} +%{_docdir}/cups-%{version}/favicon.ico %{_docdir}/cups-%{version}/images +%{_docdir}/cups-%{version}/ja +%{_docdir}/cups-%{version}/es %{_docdir}/cups-%{version}/*.css -%{_docdir}/cups-%{version}/documentation.html -%{_docdir}/cups-%{version}/?? %{_docdir}/cups-%{version}/admin %{_docdir}/cups-%{version}/classes %{_docdir}/cups-%{version}/jobs %{_docdir}/cups-%{version}/printers %doc %{_docdir}/cups-%{version}/index.html -%doc %{_docdir}/cups-%{version}/cmp.html -%doc %{_docdir}/cups-%{version}/idd.html -%doc %{_docdir}/cups-%{version}/ipp.html -%doc %{_docdir}/cups-%{version}/overview.html -%doc %{_docdir}/cups-%{version}/sam.html -%doc %{_docdir}/cups-%{version}/sdd.html -%doc %{_docdir}/cups-%{version}/spm.html -%doc %{_docdir}/cups-%{version}/sps.html -%doc %{_docdir}/cups-%{version}/ssr.html -%doc %{_docdir}/cups-%{version}/stp.html -%doc %{_docdir}/cups-%{version}/sum.html -%doc %{_docdir}/cups-%{version}/svd.html -%doc %{_docdir}/cups-%{version}/translation.html +%doc %{_docdir}/cups-%{version}/help %doc %{_docdir}/cups-%{version}/robots.txt %config(noreplace) %{initdir}/cups %{_bindir}/cupstestppd +%{_bindir}/cupstestdsc %{_bindir}/cancel* -%{_bindir}/enable* -%{_bindir}/disable* -%{_bindir}/cupsenable* -%{_bindir}/cupsdisable* %{_bindir}/lp* -%dir %{_libdir}/cups -%{_libdir}/cups/backend -%{_libdir}/cups/cgi-bin -%dir %{_libdir}/cups/daemon -%{_libdir}/cups/daemon/cups-polld -%{_libdir}/cups/filter +%dir %{cups_serverbin} +%{cups_serverbin}/backend +%{cups_serverbin}/cgi-bin +%dir %{cups_serverbin}/daemon +%{cups_serverbin}/daemon/cups-polld +%{cups_serverbin}/daemon/cups-deviced +%{cups_serverbin}/daemon/cups-driverd +%{cups_serverbin}/notifier/mailto +%{cups_serverbin}/notifier/testnotify +%{cups_serverbin}/filter +%{cups_serverbin}/monitor %{_mandir}/man?/* -%{_mandir}/*/man?/* %{_sbindir}/* %dir %{_datadir}/cups %dir %{_datadir}/cups/banners %config(noreplace) %{_datadir}/cups/banners/* %{_datadir}/cups/charsets +%{_datadir}/cups/charmaps %{_datadir}/cups/data %{_datadir}/cups/doc %{_datadir}/cups/fonts %{_datadir}/cups/model %{_datadir}/cups/templates %{_datadir}/locale/*/* -%dir %attr(1770,root,sys) /var/spool/cups/tmp -%dir %attr(0710,root,sys) /var/spool/cups +%dir %attr(1770,root,nobody) /var/spool/cups/tmp +%dir %attr(0710,root,nobody) /var/spool/cups %dir %attr(0755,lp,sys) /var/log/cups %config(noreplace) %{_sysconfdir}/logrotate.d/cups %{_datadir}/pixmaps/cupsprinter.png %{_sysconfdir}/cron.daily/cups -%if %use_dbus %{_sysconfdir}/dbus-1/system.d/cups.conf -%endif +%{_libdir}/php/modules/*.so %files libs %defattr(-,root,root) @@ -420,28 +371,101 @@ %defattr(-,root,root) %{_bindir}/cups-config %{_libdir}/*.so -%{_libdir}/*.a %{_includedir}/cups %files lpd %defattr(-,root,root) %config(noreplace) %{_sysconfdir}/xinetd.d/cups-lpd -%dir %{_libdir}/cups -%dir %{_libdir}/cups/daemon -%{_libdir}/cups/daemon/cups-lpd +%dir %{cups_serverbin} +%dir %{cups_serverbin}/daemon +%{cups_serverbin}/daemon/cups-lpd %changelog -* Mon Feb 13 2006 Tim Waugh -- Removed (unapplied) session printing patch. +* Thu Mar 30 2006 Tim Waugh 1:1.2-0.2.rc1.2.3 +- Added conflicts. +- Built for FC5 update. + +* Wed Mar 29 2006 Tim Waugh 1:1.2-0.2.rc1.3 +- Fix group list of non-root backends (STR #1521, bug #186954). + +* Tue Mar 28 2006 Tim Waugh 1:1.2-0.2.rc1.2 +- Fix lpq -h (STR#1515, bug #186686). + +* Mon Mar 27 2006 Tim Waugh 1:1.2-0.2.rc1.1 +- Ship a printers.conf file, and a client.conf file. That way, they get + their SELinux file contexts set correctly. -* Fri Feb 10 2006 Jesse Keating - 1:1.1.23-30.2 -- bump again for double-long bug on ppc(64) +* Mon Mar 27 2006 Tim Waugh 1:1.2-0.2.rc1.0 +- 1.2rc1. + +* Fri Mar 24 2006 Tim Waugh 1:1.2-0.1.b2.6 +- Add KDE compatibility symbols _ipp_add_attr/_ipp_free_attr to ipp.h, with + a comment saying why they shouldn't be used. + +* Fri Mar 24 2006 Tim Waugh 1:1.2-0.1.b2.5 +- Fix KDE compatibility symbols _ipp_add_attr/_ipp_free_attr. + +* Fri Mar 24 2006 Tim Waugh 1:1.2-0.1.b2.4 +- Update to svn snapshot. + +* Thu Mar 23 2006 Tim Waugh 1:1.2-0.1.b2.3 +- Update to svn snapshot. No longer need users or policy patches. + +* Fri Mar 17 2006 Tim Waugh 1:1.2-0.1.b2.2 +- Rebuilt. + +* Tue Mar 14 2006 Tim Waugh 1:1.2-0.1.b2.1 +- Build requires gnutls-devel. +- Fixed default policy name. +- Fixed 'set-allowed-users' in web UI. + +* Mon Mar 13 2006 Tim Waugh 1:1.2-0.1.b2.0 +- 1.2b2. +- Use new CUPS_SERVERBIN location (/usr/lib/cups even on 64-bit hosts). + +* Fri Mar 10 2006 Tim Waugh +- Fixed some permissions. + +* Fri Mar 10 2006 Tim Waugh 1:1.2-0.1.b1.1 +- Ship /etc/cups/ssl directory. + +* Thu Mar 9 2006 Tim Waugh 1:1.2-0.1.b1.0 +- 1.2b1. No longer need devid patch. + +* Wed Mar 8 2006 Tim Waugh 1:1.2-0.0.svn5238.2 +- Fixed 'device-id' attribute in GET_DEVICES requests (STR #1467). + +* Tue Mar 7 2006 Tim Waugh 1:1.2-0.0.svn5238.1 +- New svn snapshot. +- No longer need browse or raw patches. + +* Wed Mar 1 2006 Tim Waugh 1:1.2-0.0.svn5137.1 +- Fixed raw printing. +- Removed (unapplied) session printing patch. +- Fixed browse info. -* Tue Feb 07 2006 Jesse Keating - 1:1.1.23-30.1 -- rebuilt for new gcc4.1 snapshot and glibc changes +* Thu Feb 23 2006 Tim Waugh 1:1.2-0.0.svn5137.0 +- New svn snapshot. -* Wed Jan 25 2006 Tim Waugh -- Fixed link patch. +* Fri Feb 17 2006 Tim Waugh 1:1.2-0.0.svn5102.0 +- New svn snapshot. +- No longer need enabledisable patch. +- Fixed double-free in scheduler/policy.c (STR #1428). + +* Fri Feb 10 2006 Tim Waugh 1:1.2-0.0.svn5083.0 +- New svn snapshot. + +* Wed Jan 25 2006 Tim Waugh 1:1.2-0.0.svn4964.0 +- Use -fPIE not -fpie in PIE patch. +- Fix link patch. +- Patch in PIE instead of using --enable-pie, since that doesn't work. + +* Fri Jan 20 2006 Tim Waugh +- 1.2 svn snapshot. +- No longer need doclink, str1023, pdftops, sanity, lpstat, str1068, + sigchld, gcc34, gcc4, slow, CAN-2004-0888, CAN-2005-2097, finddest, + str1249, str1284, str1290, str1301, CVE-2005-3625,6,7 patches. +- Removed autodetect-tag patch. * Tue Jan 17 2006 Tim Waugh 1:1.1.23-30 - Include 'Autodetected' tag for better integration with autodetection tools. Index: sources =================================================================== RCS file: /cvs/dist/rpms/cups/FC-5/sources,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- sources 4 Jan 2005 12:24:50 -0000 1.15 +++ sources 30 Mar 2006 15:15:36 -0000 1.16 @@ -1,2 +1,2 @@ b0bb017098e8e76b8a25e666c41ce540 postscript.ppd.gz -4ce09b1dce09b6b9398af0daae9adf63 cups-1.1.23-source.tar.bz2 +e1cebe3393c360eb7972efa0715befa1 cups-1.2rc1-source.tar.bz2 From fedora-cvs-commits at redhat.com Thu Mar 30 15:19:36 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 30 Mar 2006 10:19:36 -0500 Subject: rpms/module-init-tools/devel .cvsignore, 1.6, 1.7 module-init-tools.spec, 1.19, 1.20 sources, 1.6, 1.7 Message-ID: <200603301519.k2UFJahg020481@cvs.devel.redhat.com> Author: harald Update of /cvs/dist/rpms/module-init-tools/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv20466 Modified Files: .cvsignore module-init-tools.spec sources Log Message: version 3.2.2 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/module-init-tools/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 6 Nov 2005 09:24:02 -0000 1.6 +++ .cvsignore 30 Mar 2006 15:19:34 -0000 1.7 @@ -1,6 +1,2 @@ -module-init-tools-3.1.tar.bz2 -module-init-tools-3.1.tar.bz2.sign -module-init-tools-3.2-pre7.tar.bz2 -module-init-tools-3.2-pre7.tar.bz2.sign -module-init-tools-3.2-pre9.tar.bz2 -module-init-tools-3.2-pre9.tar.bz2.sign +module-init-tools-3.2.2.tar.bz2 +module-init-tools-3.2.2.tar.bz2.sign Index: module-init-tools.spec =================================================================== RCS file: /cvs/dist/rpms/module-init-tools/devel/module-init-tools.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- module-init-tools.spec 13 Feb 2006 18:41:51 -0000 1.19 +++ module-init-tools.spec 30 Mar 2006 15:19:34 -0000 1.20 @@ -1,12 +1,12 @@ -%define preversion pre9 +%define preversion %{nil} Summary: Kernel module management utilities. Name: module-init-tools -Version: 3.2 -Release: 0.%{preversion}.2.2.1 +Version: 3.2.2 +Release: 0.FC5.1 License: GPL Group: System Environment/Kernel -Source: http://ftp.kernel.org/pub/linux/utils/kernel/module-init-tools/module-init-tools-%{version}-%{preversion}.tar.bz2 -Source1: http://ftp.kernel.org/pub/linux/utils/kernel/module-init-tools/module-init-tools-%{version}-%{preversion}.tar.bz2.sign +Source: http://ftp.kernel.org/pub/linux/utils/kernel/module-init-tools/module-init-tools-%{version}%{preversion}.tar.bz2 +Source1: http://ftp.kernel.org/pub/linux/utils/kernel/module-init-tools/module-init-tools-%{version}%{preversion}.tar.bz2.sign Source2: modprobe.conf.dist Patch1: module-init-tools-allconf.patch Patch2: module-init-tools-noescape.patch @@ -19,12 +19,12 @@ %description The modutils package includes various programs needed for automatic -loading and unloading of modules under 2.2 and later kernels, as well +loading and unloading of modules under 2.6 and later kernels, as well as other module management programs. Device drivers and filesystems are two examples of loaded and unloaded modules. %prep -%setup -q -n module-init-tools-%{version}-%{preversion} +%setup -q -n module-init-tools-%{version}%{preversion} %patch1 -p1 -b .dist %patch2 -p0 -b .noescape @@ -90,6 +90,9 @@ %ghost %config %verify(not md5 size mtime) /etc/modprobe.conf %changelog +* Thu Mar 30 2006 Harald Hoyer 3.2.2-0.FC5.1 +- version 3.2.2 + * Mon Feb 13 2006 Jesse Keating - 3.2-0.pre9.2.2.1 - rebump for build order issues during double-long bump Index: sources =================================================================== RCS file: /cvs/dist/rpms/module-init-tools/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 6 Nov 2005 09:24:02 -0000 1.6 +++ sources 30 Mar 2006 15:19:34 -0000 1.7 @@ -1,2 +1,2 @@ -f0ede5936c52e3d59411bd9594ad364f module-init-tools-3.2-pre9.tar.bz2 -eb9afce36c140208a7245e1ae4337aeb module-init-tools-3.2-pre9.tar.bz2.sign +a1ad0a09d3231673f70d631f3f5040e9 module-init-tools-3.2.2.tar.bz2 +9fce51dab77f4f62f3cb3103a1c1f753 module-init-tools-3.2.2.tar.bz2.sign From fedora-cvs-commits at redhat.com Thu Mar 30 15:21:55 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 30 Mar 2006 10:21:55 -0500 Subject: rpms/cups/FC-5 cups-no-gzip-man.patch,NONE,1.1 Message-ID: <200603301521.k2UFLtso020607@cvs.devel.redhat.com> Author: twaugh Update of /cvs/dist/rpms/cups/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv20593 Added Files: cups-no-gzip-man.patch Log Message: Include no-gzip-man page. cups-no-gzip-man.patch: cups-manpages.m4 | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) --- NEW FILE cups-no-gzip-man.patch --- --- cups-1.2svn-r5102/config-scripts/cups-manpages.m4.no-gzip-man 2006-02-13 02:46:10.000000000 +0000 +++ cups-1.2svn-r5102/config-scripts/cups-manpages.m4 2006-02-17 09:55:45.000000000 +0000 @@ -80,10 +80,10 @@ ;; Linux* | GNU*) # Linux and GNU Hurd - MAN1EXT=1.gz - MAN5EXT=5.gz - MAN7EXT=7.gz - MAN8EXT=8.gz + MAN1EXT=1 + MAN5EXT=5 + MAN7EXT=7 + MAN8EXT=8 MAN8DIR=8 ;; *) From fedora-cvs-commits at redhat.com Thu Mar 30 15:23:39 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 30 Mar 2006 10:23:39 -0500 Subject: rpms/evolution/devel evolution.spec,1.136,1.137 Message-ID: <200603301523.k2UFNdMf020673@cvs.devel.redhat.com> Author: caolanm Update of /cvs/dist/rpms/evolution/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv20660 Modified Files: evolution.spec Log Message: it'll work Index: evolution.spec =================================================================== RCS file: /cvs/dist/rpms/evolution/devel/evolution.spec,v retrieving revision 1.136 retrieving revision 1.137 diff -u -r1.136 -r1.137 --- evolution.spec 30 Mar 2006 14:46:36 -0000 1.136 +++ evolution.spec 30 Mar 2006 15:23:37 -0000 1.137 @@ -11,7 +11,7 @@ %define gnomevfs2_version 2.4 %define last_libgal2_version 2:2.5.3-2 -%define pilot_link_version 0.12.0 +%define pilot_link_version 2:0.11.8 %define gnome_pilot_version 2.0.13 %define ldap_support 1 @@ -39,7 +39,7 @@ Name: evolution Version: 2.6.0 -Release: 1 +Release: 2 License: GPL BuildRoot: %{_tmppath}/%{name}-%{version}-root URL: http://www.ximian.com/ @@ -88,7 +88,7 @@ #Patch700: evolution-1.5.9.1-filechooser.patch # Patches for conduits, based upon rh-161817-attach-116019-conduit_pilot_link_updates.diff (the latter patch was originally by Mark G. Adams): -Patch800: evolution-2.5.4-fix-conduits.patch +# Patch800: evolution-2.5.4-fix-conduits.patch # Move .conduit files from share to lib (for the sake of multilib) Patch802: evolution-2.5.4-fix-conduit-dir.patch @@ -238,7 +238,7 @@ #patch700 -p1 -b .filechooser -%patch800 -p1 -b .fix-conduits +# %patch800 -p1 -b .fix-conduits %patch802 -p1 -b .fix-conduit-dir %patch803 -p1 -b .no-gnome-common %patch804 -p1 -b .fix-missing-declarations @@ -635,6 +635,10 @@ %{_libdir}/evolution/%{evo_major}/libmenus.so %changelog +* Thu Mar 30 2006 Caolan McNamara - 2.6.0-2 +- rebuild against reverted pilot-link +- disable evolution-2.5.4-fix-conduits.patch for reversion to pilot-link 0.11.8 + * Mon Mar 13 2006 Ray Strode - 2.6.0-1 - 2.6.0 - turn on the "error on missing prototypes" check thing From fedora-cvs-commits at redhat.com Thu Mar 30 15:41:54 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 30 Mar 2006 10:41:54 -0500 Subject: rpms/eclipse-changelog/FC-5 eclipse-changelog.spec, 1.30, 1.31 sources, 1.7, 1.8 Message-ID: <200603301541.k2UFfsMS021025@cvs.devel.redhat.com> Author: ifoox Update of /cvs/dist/rpms/eclipse-changelog/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv21011 Modified Files: eclipse-changelog.spec sources Log Message: * Thu Mar 30 2006 Igor Foox 2.0.2_fc-1 - Update to version 2.0.2, bug fixes by Tom Tromey. Index: eclipse-changelog.spec =================================================================== RCS file: /cvs/dist/rpms/eclipse-changelog/FC-5/eclipse-changelog.spec,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- eclipse-changelog.spec 10 Feb 2006 16:53:51 -0000 1.30 +++ eclipse-changelog.spec 30 Mar 2006 15:41:52 -0000 1.31 @@ -7,7 +7,7 @@ %define changelog_major 2 %define changelog_minor 0 %define changelog_majmin %{changelog_major}.%{changelog_minor} -%define changelog_micro 1 +%define changelog_micro 2 %define eclipse_base %{_datadir}/%{eclipse_name} %define eclipse_lib_base %{_libdir}/%{eclipse_name} @@ -21,7 +21,7 @@ Summary: %{pkg_summary} Name: %{eclipse_name}-changelog Version: %{changelog_majmin}.%{changelog_micro}_fc -Release: 25 +Release: 1 License: EPL (Eclipse Public License) Group: Text Editors/Integrated Development Environments (IDE) URL: http://sources.redhat.com/eclipse @@ -138,6 +138,9 @@ %endif %changelog +* Thu Mar 30 2006 Igor Foox 2.0.2_fc-1 +- Update to version 2.0.2, bug fixes by Tom Tromey. + * Fri Feb 10 2006 Andrew Overholt 2.0.1_fc-25 - Use Epoch in Requires (rh#180915). - Require >= 3.1.2 but < 3.1.3 to ensure we get 3.1.2. Index: sources =================================================================== RCS file: /cvs/dist/rpms/eclipse-changelog/FC-5/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 5 Mar 2005 02:19:39 -0000 1.7 +++ sources 30 Mar 2006 15:41:52 -0000 1.8 @@ -1 +1 @@ -88bd2ca97f41c266b7f94f4d4499161a eclipse-changelog.tar.gz +b263c73a64b32caba76089bd733d2f9f eclipse-changelog.tar.gz From fedora-cvs-commits at redhat.com Thu Mar 30 15:43:34 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 30 Mar 2006 10:43:34 -0500 Subject: rpms/module-init-tools/devel module-init-tools.spec,1.20,1.21 Message-ID: <200603301543.k2UFhYom021176@cvs.devel.redhat.com> Author: harald Update of /cvs/dist/rpms/module-init-tools/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv21122 Modified Files: module-init-tools.spec Log Message: version 3.2.2 Index: module-init-tools.spec =================================================================== RCS file: /cvs/dist/rpms/module-init-tools/devel/module-init-tools.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- module-init-tools.spec 30 Mar 2006 15:19:34 -0000 1.20 +++ module-init-tools.spec 30 Mar 2006 15:43:32 -0000 1.21 @@ -2,7 +2,7 @@ Summary: Kernel module management utilities. Name: module-init-tools Version: 3.2.2 -Release: 0.FC5.1 +Release: 1 License: GPL Group: System Environment/Kernel Source: http://ftp.kernel.org/pub/linux/utils/kernel/module-init-tools/module-init-tools-%{version}%{preversion}.tar.bz2 @@ -90,7 +90,7 @@ %ghost %config %verify(not md5 size mtime) /etc/modprobe.conf %changelog -* Thu Mar 30 2006 Harald Hoyer 3.2.2-0.FC5.1 +* Thu Mar 30 2006 Harald Hoyer 3.2.2-1 - version 3.2.2 * Mon Feb 13 2006 Jesse Keating - 3.2-0.pre9.2.2.1 From fedora-cvs-commits at redhat.com Thu Mar 30 15:44:35 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 30 Mar 2006 10:44:35 -0500 Subject: rpms/module-init-tools/FC-5 module-init-tools.spec,1.19,1.20 Message-ID: <200603301544.k2UFiZ3p021260@cvs.devel.redhat.com> Author: harald Update of /cvs/dist/rpms/module-init-tools/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv21240 Modified Files: module-init-tools.spec Log Message: version 3.2.2 Index: module-init-tools.spec =================================================================== RCS file: /cvs/dist/rpms/module-init-tools/FC-5/module-init-tools.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- module-init-tools.spec 13 Feb 2006 18:41:51 -0000 1.19 +++ module-init-tools.spec 30 Mar 2006 15:44:32 -0000 1.20 @@ -1,12 +1,12 @@ -%define preversion pre9 +%define preversion %{nil} Summary: Kernel module management utilities. Name: module-init-tools -Version: 3.2 -Release: 0.%{preversion}.2.2.1 +Version: 3.2.2 +Release: 0.FC5.2 License: GPL Group: System Environment/Kernel -Source: http://ftp.kernel.org/pub/linux/utils/kernel/module-init-tools/module-init-tools-%{version}-%{preversion}.tar.bz2 -Source1: http://ftp.kernel.org/pub/linux/utils/kernel/module-init-tools/module-init-tools-%{version}-%{preversion}.tar.bz2.sign +Source: http://ftp.kernel.org/pub/linux/utils/kernel/module-init-tools/module-init-tools-%{version}%{preversion}.tar.bz2 +Source1: http://ftp.kernel.org/pub/linux/utils/kernel/module-init-tools/module-init-tools-%{version}%{preversion}.tar.bz2.sign Source2: modprobe.conf.dist Patch1: module-init-tools-allconf.patch Patch2: module-init-tools-noescape.patch @@ -19,12 +19,12 @@ %description The modutils package includes various programs needed for automatic -loading and unloading of modules under 2.2 and later kernels, as well +loading and unloading of modules under 2.6 and later kernels, as well as other module management programs. Device drivers and filesystems are two examples of loaded and unloaded modules. %prep -%setup -q -n module-init-tools-%{version}-%{preversion} +%setup -q -n module-init-tools-%{version}%{preversion} %patch1 -p1 -b .dist %patch2 -p0 -b .noescape @@ -90,6 +90,9 @@ %ghost %config %verify(not md5 size mtime) /etc/modprobe.conf %changelog +* Thu Mar 30 2006 Harald Hoyer 3.2.2-0.FC5.2 +- version 3.2.2 + * Mon Feb 13 2006 Jesse Keating - 3.2-0.pre9.2.2.1 - rebump for build order issues during double-long bump From fedora-cvs-commits at redhat.com Thu Mar 30 16:22:24 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 30 Mar 2006 11:22:24 -0500 Subject: rpms/jakarta-commons-codec/FC-4 jakarta-commons-codec.spec,1.8,1.9 Message-ID: <200603301622.k2UGMODO017479@cvs.devel.redhat.com> Author: ifoox Update of /cvs/dist/rpms/jakarta-commons-codec/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv17466 Modified Files: jakarta-commons-codec.spec Log Message: * Mon Mar 30 2006 Igor Foox - 0:1.3-2jpp_5fc - Building in FC4. Index: jakarta-commons-codec.spec =================================================================== RCS file: /cvs/dist/rpms/jakarta-commons-codec/FC-4/jakarta-commons-codec.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- jakarta-commons-codec.spec 6 Mar 2006 21:59:53 -0000 1.8 +++ jakarta-commons-codec.spec 30 Mar 2006 16:22:22 -0000 1.9 @@ -2,7 +2,7 @@ %define short_name commons-%{base_name} %define name jakarta-%{short_name} %define version 1.3 -%define release 2jpp_4fc +%define release 2jpp_5fc %define section free Name: %{name} @@ -108,6 +108,9 @@ # ----------------------------------------------------------------------------- %changelog +* Mon Mar 30 2006 Igor Foox - 0:1.3-2jpp_5fc +- Building in FC4. + * Mon Mar 6 2006 Jeremy Katz - 0:1.3-2jpp_4fc - BR java-javadoc From fedora-cvs-commits at redhat.com Thu Mar 30 16:26:32 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 30 Mar 2006 11:26:32 -0500 Subject: rpms/jakarta-commons-httpclient/FC-4 jakarta-commons-httpclient.spec, 1.8, 1.9 Message-ID: <200603301626.k2UGQWbe017581@cvs.devel.redhat.com> Author: ifoox Update of /cvs/dist/rpms/jakarta-commons-httpclient/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv17568 Modified Files: jakarta-commons-httpclient.spec Log Message: * Mon Mar 30 2006 Igor Foox - 1:3.0-0.rc2.0jpp_5fc - Building in FC4. Index: jakarta-commons-httpclient.spec =================================================================== RCS file: /cvs/dist/rpms/jakarta-commons-httpclient/FC-4/jakarta-commons-httpclient.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- jakarta-commons-httpclient.spec 6 Mar 2006 22:28:34 -0000 1.8 +++ jakarta-commons-httpclient.spec 30 Mar 2006 16:26:30 -0000 1.9 @@ -1,7 +1,7 @@ %define short_name httpclient %define name jakarta-commons-%{short_name} %define version 3.0 -%define release 0.rc2.0jpp_4fc +%define release 0.rc2.0jpp_5fc %define section free Name: %{name} @@ -142,6 +142,9 @@ %changelog +* Mon Mar 30 2006 Igor Foox - 1:3.0-0.rc2.0jpp_5fc +- Building in FC4. + * Mon Mar 6 2006 Jeremy Katz - 1:3.0-0.rc2.0jpp_4fc - stop scriptlet spew From fedora-cvs-commits at redhat.com Thu Mar 30 16:36:00 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 30 Mar 2006 11:36:00 -0500 Subject: rpms/bind/devel bind.spec,1.100,1.101 Message-ID: <200603301636.k2UGa0KX017753@cvs.devel.redhat.com> Author: jvdias Update of /cvs/dist/rpms/bind/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv17739 Modified Files: bind.spec Log Message: fix bug 187333 Index: bind.spec =================================================================== RCS file: /cvs/dist/rpms/bind/devel/bind.spec,v retrieving revision 1.100 retrieving revision 1.101 diff -u -r1.100 -r1.101 --- bind.spec 30 Mar 2006 00:52:34 -0000 1.100 +++ bind.spec 30 Mar 2006 16:35:58 -0000 1.101 @@ -460,8 +460,8 @@ for f in /etc/named.caching-nameserver.conf /var/named/{named.ca,named.local,localhost.zone,localdomain.zone,named.ip6.local,named.broadcast,named.zero}; do touch ${RPM_BUILD_ROOT}/%{chroot_prefix}/$f; done -install -m 644 %{SOURCE24} ./rfc1912.txt -install -m 644 %{SOURCE25} ./Copyright +install -m 644 %{SOURCE25} ./rfc1912.txt +install -m 644 %{SOURCE24} ./Copyright # bind-chroot-admin script: sed -e 's^@BIND_CHROOT_PREFIX@^'%{chroot_prefix}'^;s^@BIND_DIR@^'%{bind_dir}'^' < %{SOURCE26} > bind-chroot-admin; install -m 754 bind-chroot-admin ${RPM_BUILD_ROOT}/%{_sbindir} From fedora-cvs-commits at redhat.com Thu Mar 30 18:03:14 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 30 Mar 2006 13:03:14 -0500 Subject: rpms/NetworkManager/FC-5 service-startup.patch, NONE, 1.1 .cvsignore, 1.34, 1.35 NetworkManager.spec, 1.101, 1.102 sources, 1.50, 1.51 NetworkManager-0.6.0-device-up.patch, 1.1, NONE no-wpa-no-scan1.patch, 1.1, NONE Message-ID: <200603301803.k2UI3Ev8028224@cvs.devel.redhat.com> Author: dcbw Update of /cvs/dist/rpms/NetworkManager/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv28210 Modified Files: .cvsignore NetworkManager.spec sources Added Files: service-startup.patch Removed Files: NetworkManager-0.6.0-device-up.patch no-wpa-no-scan1.patch Log Message: * Thu Mar 30 2006 Dan Williams - 0.6.2-1 - Update to 0.6.2: * Fix various WPA-related bugs * Clean up leaks * Increased DHCP timeout to account for slow DHCP servers, or STP-enabled switches * Allow applet to reconnect on dbus restarts * Add "Dynamic WEP" support * Allow hiding of password/key entry text * More responsive connection switching service-startup.patch: NetworkManager.in | 9 +++++++++ 1 files changed, 9 insertions(+) --- NEW FILE service-startup.patch --- --- NetworkManager-0.6.2/initscript/RedHat/NetworkManager.in.dhcdbd 2006-03-30 12:42:28.000000000 -0500 +++ NetworkManager-0.6.2/initscript/RedHat/NetworkManager.in 2006-03-30 12:43:25.000000000 -0500 @@ -36,6 +36,15 @@ { echo $"Setting network parameters... " sysctl -e -p /etc/sysctl.conf >/dev/null 2>&1 + + if [ ! -e /var/lock/subsys/dhcdbd ]; then + service dhcdbd start + fi + + if [ ! -e /var/lock/subsys/named ]; then + service named start + fi + echo -n $"Starting NetworkManager daemon: " daemon --check $servicename $processname --pid-file=$pidfile RETVAL=$? Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/NetworkManager/FC-5/.cvsignore,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- .cvsignore 6 Mar 2006 15:15:19 -0000 1.34 +++ .cvsignore 30 Mar 2006 18:03:11 -0000 1.35 @@ -2,3 +2,4 @@ NetworkManager-0.5.1.cvs20060301.tar.gz NetworkManager-0.5.1.cvs20060302.tar.gz NetworkManager-0.6.0.tar.gz +NetworkManager-0.6.2.tar.gz Index: NetworkManager.spec =================================================================== RCS file: /cvs/dist/rpms/NetworkManager/FC-5/NetworkManager.spec,v retrieving revision 1.101 retrieving revision 1.102 diff -u -r1.101 -r1.102 --- NetworkManager.spec 14 Mar 2006 20:56:22 -0000 1.101 +++ NetworkManager.spec 30 Mar 2006 18:03:11 -0000 1.102 @@ -14,8 +14,8 @@ Name: NetworkManager Summary: Network connection manager and user applications -Version: 0.6.0 -Release: 3%{?nm_cvs_version} +Version: 0.6.2 +Release: 1%{?nm_cvs_version} Group: System Environment/Base License: GPL URL: http://www.gnome.org/projects/NetworkManager/ @@ -23,8 +23,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-root Patch0: special-case-madwifi.patch -Patch1: no-wpa-no-scan1.patch -Patch2: NetworkManager-0.6.0-device-up.patch +Patch1: service-startup.patch PreReq: chkconfig Requires: wireless-tools >= %{wireless_tools_version} @@ -119,8 +118,7 @@ %prep %setup -q %patch0 -p0 -b .madwifi -%patch1 -p0 -b .no-wpa-no-scan1 -%patch2 -p1 -b .device-up +%patch1 -p1 -b .service-startup %build %configure --with-named=/usr/sbin/named --with-named-dir=/var/named/data --with-named-user=named --enable-notify=yes @@ -215,6 +213,17 @@ %changelog +* Thu Mar 30 2006 Dan Williams - 0.6.2-1 +- Update to 0.6.2: + * Fix various WPA-related bugs + * Clean up leaks + * Increased DHCP timeout to account for slow DHCP servers, or STP-enabled + switches + * Allow applet to reconnect on dbus restarts + * Add "Dynamic WEP" support + * Allow hiding of password/key entry text + * More responsive connection switching + * Tue Mar 14 2006 Peter Jones - 0.6.0-3 - Fix device bringup on resume Index: sources =================================================================== RCS file: /cvs/dist/rpms/NetworkManager/FC-5/sources,v retrieving revision 1.50 retrieving revision 1.51 diff -u -r1.50 -r1.51 --- sources 6 Mar 2006 15:15:19 -0000 1.50 +++ sources 30 Mar 2006 18:03:11 -0000 1.51 @@ -1 +1 @@ -87e748bcd0fe866204d79f609802b4b8 NetworkManager-0.6.0.tar.gz +976f0fad89b1c9870cd1ce7b2edde088 NetworkManager-0.6.2.tar.gz --- NetworkManager-0.6.0-device-up.patch DELETED --- --- no-wpa-no-scan1.patch DELETED --- From fedora-cvs-commits at redhat.com Thu Mar 30 18:05:24 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 30 Mar 2006 13:05:24 -0500 Subject: rpms/NetworkManager/FC-5 NetworkManager.spec,1.102,1.103 Message-ID: <200603301805.k2UI5Owb028258@cvs.devel.redhat.com> Author: dcbw Update of /cvs/dist/rpms/NetworkManager/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv28245 Modified Files: NetworkManager.spec Log Message: Add fc5 to Release Index: NetworkManager.spec =================================================================== RCS file: /cvs/dist/rpms/NetworkManager/FC-5/NetworkManager.spec,v retrieving revision 1.102 retrieving revision 1.103 diff -u -r1.102 -r1.103 --- NetworkManager.spec 30 Mar 2006 18:03:11 -0000 1.102 +++ NetworkManager.spec 30 Mar 2006 18:05:22 -0000 1.103 @@ -15,7 +15,7 @@ Name: NetworkManager Summary: Network connection manager and user applications Version: 0.6.2 -Release: 1%{?nm_cvs_version} +Release: 1%{?nm_cvs_version}.fc5 Group: System Environment/Base License: GPL URL: http://www.gnome.org/projects/NetworkManager/ From fedora-cvs-commits at redhat.com Thu Mar 30 18:15:55 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 30 Mar 2006 13:15:55 -0500 Subject: rpms/NetworkManager/devel service-startup.patch, NONE, 1.1 NetworkManager.spec, 1.102, 1.103 sources, 1.51, 1.52 NetworkManager-0.6.0-device-up.patch, 1.1, NONE Message-ID: <200603301815.k2UIFtnU032167@cvs.devel.redhat.com> Author: dcbw Update of /cvs/dist/rpms/NetworkManager/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv31694 Modified Files: NetworkManager.spec sources Added Files: service-startup.patch Removed Files: NetworkManager-0.6.0-device-up.patch Log Message: Update to 0.6.2 (via copy from FC-5 branch) service-startup.patch: NetworkManager.in | 9 +++++++++ 1 files changed, 9 insertions(+) --- NEW FILE service-startup.patch --- --- NetworkManager-0.6.2/initscript/RedHat/NetworkManager.in.dhcdbd 2006-03-30 12:42:28.000000000 -0500 +++ NetworkManager-0.6.2/initscript/RedHat/NetworkManager.in 2006-03-30 12:43:25.000000000 -0500 @@ -36,6 +36,15 @@ { echo $"Setting network parameters... " sysctl -e -p /etc/sysctl.conf >/dev/null 2>&1 + + if [ ! -e /var/lock/subsys/dhcdbd ]; then + service dhcdbd start + fi + + if [ ! -e /var/lock/subsys/named ]; then + service named start + fi + echo -n $"Starting NetworkManager daemon: " daemon --check $servicename $processname --pid-file=$pidfile RETVAL=$? Index: NetworkManager.spec =================================================================== RCS file: /cvs/dist/rpms/NetworkManager/devel/NetworkManager.spec,v retrieving revision 1.102 retrieving revision 1.103 diff -u -r1.102 -r1.103 --- NetworkManager.spec 17 Mar 2006 04:43:36 -0000 1.102 +++ NetworkManager.spec 30 Mar 2006 18:15:53 -0000 1.103 @@ -14,16 +14,16 @@ Name: NetworkManager Summary: Network connection manager and user applications -Version: 0.6.1 -Release: 1%{?nm_cvs_version} +Version: 0.6.2 +Release: 1%{?nm_cvs_version}.fc6 Group: System Environment/Base License: GPL URL: http://www.gnome.org/projects/NetworkManager/ -Source: %{name}-%{version}%{?nm_cvs_version}.tar.bz2 +Source: %{name}-%{version}%{?nm_cvs_version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-root Patch0: special-case-madwifi.patch -Patch2: NetworkManager-0.6.0-device-up.patch +Patch1: service-startup.patch PreReq: chkconfig Requires: wireless-tools >= %{wireless_tools_version} @@ -118,7 +118,7 @@ %prep %setup -q %patch0 -p0 -b .madwifi -%patch2 -p1 -b .device-up +%patch1 -p1 -b .service-startup %build %configure --with-named=/usr/sbin/named --with-named-dir=/var/named/data --with-named-user=named --enable-notify=yes @@ -213,8 +213,16 @@ %changelog -* Thu Mar 16 2006 Christopher Aillon 0.6.1-1 -- Update to 0.6.1 release +* Thu Mar 30 2006 Dan Williams - 0.6.2-1 +- Update to 0.6.2: + * Fix various WPA-related bugs + * Clean up leaks + * Increased DHCP timeout to account for slow DHCP servers, or STP-enabled + switches + * Allow applet to reconnect on dbus restarts + * Add "Dynamic WEP" support + * Allow hiding of password/key entry text + * More responsive connection switching * Tue Mar 14 2006 Peter Jones - 0.6.0-3 - Fix device bringup on resume Index: sources =================================================================== RCS file: /cvs/dist/rpms/NetworkManager/devel/sources,v retrieving revision 1.51 retrieving revision 1.52 diff -u -r1.51 -r1.52 --- sources 17 Mar 2006 04:43:36 -0000 1.51 +++ sources 30 Mar 2006 18:15:53 -0000 1.52 @@ -1 +1 @@ -e9e2b95425ff0c639344d11af759076e NetworkManager-0.6.1.tar.bz2 +976f0fad89b1c9870cd1ce7b2edde088 NetworkManager-0.6.2.tar.gz --- NetworkManager-0.6.0-device-up.patch DELETED --- From fedora-cvs-commits at redhat.com Thu Mar 30 18:22:15 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 30 Mar 2006 13:22:15 -0500 Subject: rpms/libdrm/devel .cvsignore, 1.5, 1.6 libdrm.spec, 1.10, 1.11 sources, 1.5, 1.6 Message-ID: <200603301822.k2UIMF6L009846@cvs.devel.redhat.com> Author: ajackson Update of /cvs/dist/rpms/libdrm/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv9818/devel Modified Files: .cvsignore libdrm.spec sources Log Message: auto-import libdrm-2.0.1-1 on branch devel from libdrm-2.0.1-1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/libdrm/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 1 Dec 2005 03:19:30 -0000 1.5 +++ .cvsignore 30 Mar 2006 18:22:13 -0000 1.6 @@ -1 +1 @@ -libdrm-2.0.tar.gz +libdrm-2.0.1.tar.bz2 Index: libdrm.spec =================================================================== RCS file: /cvs/dist/rpms/libdrm/devel/libdrm.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- libdrm.spec 11 Feb 2006 03:55:10 -0000 1.10 +++ libdrm.spec 30 Mar 2006 18:22:13 -0000 1.11 @@ -1,12 +1,11 @@ Summary: libdrm Direct Rendering Manager runtime library Name: libdrm -Version: 2.0 -Release: 2.2 +Version: 2.0.1 +Release: 1 License: MIT/X11 Group: System Environment/Libraries URL: http://dri.sourceforge.net -# No .bz2 avail upstream -Source0: http://dri.freedesktop.org/libdrm/%{name}-%{version}.tar.gz +Source0: http://dri.freedesktop.org/libdrm/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) #BuildRequires: xorg-x11-proto-devel @@ -87,6 +86,9 @@ %{_libdir}/pkgconfig/libdrm.pc %changelog +* Thu Mar 30 2006 Adam Jackson - 2.0.1-1 +- Bump to libdrm 2.0.1 from upstream. + * Fri Feb 10 2006 Jesse Keating - 2.0-2.2 - bump again for double-long bug on ppc(64) Index: sources =================================================================== RCS file: /cvs/dist/rpms/libdrm/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 1 Dec 2005 03:19:30 -0000 1.5 +++ sources 30 Mar 2006 18:22:13 -0000 1.6 @@ -1 +1 @@ -9d1aab104eb757ceeb2c1a6d38d57411 libdrm-2.0.tar.gz +9518db08c3b4264efd1caf7be31a9659 libdrm-2.0.1.tar.bz2 From fedora-cvs-commits at redhat.com Thu Mar 30 19:11:48 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 30 Mar 2006 14:11:48 -0500 Subject: rpms/kernel/FC-4 kernel-2.6.spec,1.1615,1.1616 Message-ID: <200603301911.k2UJBmVU024831@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv24818 Modified Files: kernel-2.6.spec Log Message: ship the .kernelrelease file in -devel too. Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-4/kernel-2.6.spec,v retrieving revision 1.1615 retrieving revision 1.1616 diff -u -r1.1615 -r1.1616 --- kernel-2.6.spec 28 Mar 2006 16:14:09 -0000 1.1615 +++ kernel-2.6.spec 30 Mar 2006 19:11:43 -0000 1.1616 @@ -840,6 +840,7 @@ rm -rf $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/include cp arch/%{_arch}/kernel/asm-offsets.s $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/arch/%{_arch}/kernel || : cp .config $RPM_BUILD_ROOT/lib/modules/$KernelVer/build + cp .kernelrelease $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/ cp -a scripts $RPM_BUILD_ROOT/lib/modules/$KernelVer/build if [ -d arch/%{_arch}/scripts ]; then cp -a arch/%{_arch}/scripts $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/arch/%{_arch} || : @@ -1061,7 +1062,10 @@ %endif %changelog -* Tue Mar 26 2006 Dave Jones +* Thu Mar 30 2006 Dave Jones +- ship the .kernelrelease file in -devel too. + +* Tue Mar 26 2006 Dave Jones [2.6.16-1.2069_FC4] - 2.6.16.1 * Mon Mar 25 2006 Dave Jones From fedora-cvs-commits at redhat.com Thu Mar 30 19:57:33 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 30 Mar 2006 14:57:33 -0500 Subject: rpms/selinux-policy/devel policy-20060323.patch, 1.3, 1.4 selinux-policy.spec, 1.162, 1.163 Message-ID: <200603301957.k2UJvXC3020446@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/selinux-policy/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv20429 Modified Files: policy-20060323.patch selinux-policy.spec Log Message: * Mon Mar 27 2006 Dan Walsh 2.2.28-2 - Fix ftp policy - Fix secadm running of auditctl policy-20060323.patch: man/man8/samba_selinux.8 | 2 - policy/modules/admin/logwatch.te | 1 policy/modules/admin/rpm.fc | 1 policy/modules/admin/usermanage.te | 2 + policy/modules/kernel/corenetwork.te.in | 4 +- policy/modules/kernel/devices.if | 58 ++++++++++++++++++++++++++++++++ policy/modules/kernel/files.if | 27 ++++++++++++++ policy/modules/kernel/kernel.if | 4 +- policy/modules/services/apm.te | 4 ++ policy/modules/services/bluetooth.te | 2 + policy/modules/services/cups.te | 3 + policy/modules/services/dovecot.te | 2 + policy/modules/services/ftp.te | 10 ----- policy/modules/services/hal.te | 4 ++ policy/modules/services/pegasus.te | 1 policy/modules/services/privoxy.te | 5 ++ policy/modules/services/xfs.te | 1 policy/modules/services/xserver.if | 20 +++++++++++ policy/modules/system/authlogin.te | 2 + policy/modules/system/fstools.te | 5 ++ policy/modules/system/init.te | 1 policy/modules/system/libraries.fc | 4 +- policy/modules/system/logging.if | 32 +++++++++++++++++ policy/modules/system/mount.te | 2 + policy/modules/system/selinuxutil.fc | 6 +++ policy/modules/system/selinuxutil.te | 52 ++++++++++++++++++++++++++++ policy/modules/system/unconfined.if | 8 ---- policy/modules/system/userdomain.te | 5 +- 28 files changed, 242 insertions(+), 26 deletions(-) Index: policy-20060323.patch =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20060323.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- policy-20060323.patch 29 Mar 2006 20:21:25 -0000 1.3 +++ policy-20060323.patch 30 Mar 2006 19:57:31 -0000 1.4 @@ -274,6 +274,26 @@ term_dontaudit_use_console(dovecot_t) +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ftp.te serefpolicy-2.2.28/policy/modules/services/ftp.te +--- nsaserefpolicy/policy/modules/services/ftp.te 2006-03-24 11:54:28.000000000 -0500 ++++ serefpolicy-2.2.28/policy/modules/services/ftp.te 2006-03-30 10:32:47.000000000 -0500 +@@ -134,16 +134,6 @@ + + term_dontaudit_use_generic_ptys(ftpd_t) + term_dontaudit_use_unallocated_ttys(ftpd_t) +- +- optional_policy(` +- tunable_policy(`ftpd_is_daemon',` +- userdom_manage_generic_user_home_content_files(ftpd_t) +- userdom_manage_generic_user_home_content_symlinks(ftpd_t) +- userdom_manage_generic_user_home_content_sockets(ftpd_t) +- userdom_manage_generic_user_home_content_pipes(ftpd_t) +- userdom_generic_user_home_dir_filetrans_generic_user_home_content(ftpd_t,{ dir file lnk_file sock_file fifo_file }) +- ') +- ') + ') + + tunable_policy(`allow_ftpd_anon_write',` diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.te serefpolicy-2.2.28/policy/modules/services/hal.te --- nsaserefpolicy/policy/modules/services/hal.te 2006-03-24 11:54:28.000000000 -0500 +++ serefpolicy-2.2.28/policy/modules/services/hal.te 2006-03-29 14:44:17.000000000 -0500 @@ -406,8 +426,17 @@ libs_use_ld_so(initrc_t) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.fc serefpolicy-2.2.28/policy/modules/system/libraries.fc --- nsaserefpolicy/policy/modules/system/libraries.fc 2006-03-23 16:02:04.000000000 -0500 -+++ serefpolicy-2.2.28/policy/modules/system/libraries.fc 2006-03-29 14:44:17.000000000 -0500 -@@ -148,7 +148,7 @@ ++++ serefpolicy-2.2.28/policy/modules/system/libraries.fc 2006-03-30 13:22:43.000000000 -0500 +@@ -55,6 +55,8 @@ + + /usr(/.*)?/nvidia/.*\.so(\..*)? -- gen_context(system_u:object_r:textrel_shlib_t,s0) + ++/usr(/.*)?/lib(64)?(/.*)?/nvidia/.*\.so(\..*)? -- gen_context(system_u:object_r:textrel_shlib_t,s0) ++ + /usr/lib(64)?/pgsql/test/regress/.*\.so -- gen_context(system_u:object_r:shlib_t,s0) + + /usr/lib/win32/.* -- gen_context(system_u:object_r:shlib_t,s0) +@@ -148,7 +150,7 @@ /usr/lib(64)?/php/modules/.*\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0) # Livna.org packages: xmms-mp3, ffmpeg, xvidcore, xine-lib, gsm, lame @@ -416,6 +445,45 @@ /usr/lib(64)?/libpostproc\.so.* -- gen_context(system_u:object_r:textrel_shlib_t,s0) /usr/lib(64)?/libavformat-.*\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0) /usr/lib(64)?/libavcodec-.*\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0) +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.if serefpolicy-2.2.28/policy/modules/system/logging.if +--- nsaserefpolicy/policy/modules/system/logging.if 2006-03-21 14:33:36.000000000 -0500 ++++ serefpolicy-2.2.28/policy/modules/system/logging.if 2006-03-30 14:26:04.000000000 -0500 +@@ -368,3 +368,35 @@ + allow $1 var_log_t:dir rw_dir_perms; + allow $1 var_log_t:file create_file_perms; + ') ++ ++######################################## ++## ++## Execute auditctl in the auditctl domain, and ++## allow the specified role the auditctl domain. ++## ++## ++## ++## The type of the process performing this action. ++## ++## ++## ++## ++## The role to be allowed the auditctl domain. ++## ++## ++## ++## ++## The type of the terminal allow the auditctl domain to use. ++## ++## ++# ++interface(`logging_run_auditctl',` ++ gen_require(` ++ type auditctl_t; ++ ') ++ ++ logging_domtrans_auditctl($1) ++ role $2 types auditctl_t; ++ allow auditctl_t $3:chr_file rw_term_perms; ++') ++ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.te serefpolicy-2.2.28/policy/modules/system/mount.te --- nsaserefpolicy/policy/modules/system/mount.te 2006-03-24 11:54:29.000000000 -0500 +++ serefpolicy-2.2.28/policy/modules/system/mount.te 2006-03-29 14:44:17.000000000 -0500 @@ -524,3 +592,38 @@ userdom_use_all_users_fds(setfiles_t) # for config files in a home directory +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.if serefpolicy-2.2.28/policy/modules/system/unconfined.if +--- nsaserefpolicy/policy/modules/system/unconfined.if 2006-03-29 14:26:03.000000000 -0500 ++++ serefpolicy-2.2.28/policy/modules/system/unconfined.if 2006-03-30 13:28:32.000000000 -0500 +@@ -89,14 +89,6 @@ + storage_unconfined($1) + ') + +- ifdef(`TODO',` +- if (allow_execmod) { +- ifdef(`targeted_policy', `', ` +- # Allow text relocations on system shared libraries, e.g. libGL. +- allow $1 home_type:file execmod; +- ') +- } +- ') dnl end TODO + ') + + ######################################## +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-2.2.28/policy/modules/system/userdomain.te +--- nsaserefpolicy/policy/modules/system/userdomain.te 2006-03-28 23:09:37.000000000 -0500 ++++ serefpolicy-2.2.28/policy/modules/system/userdomain.te 2006-03-30 14:37:04.000000000 -0500 +@@ -179,10 +179,11 @@ + mls_file_downgrade(secadm_t) + init_exec(secadm_t) + logging_read_audit_log(secadm_t) +- logging_domtrans_auditctl(secadm_t) ++ logging_run_auditctl(secadm_t, secadm_r, admin_terminal) ++ logging_domtrans_auditctl + userdom_dontaudit_append_staff_home_content_files(secadm_t) + ', ` +- logging_domtrans_auditctl(sysadm_t) ++ logging_run_auditctl(sysadm_t,sysadm_r,admin_terminal) + logging_read_audit_log(sysadm_t) + ') + Index: selinux-policy.spec =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v retrieving revision 1.162 retrieving revision 1.163 diff -u -r1.162 -r1.163 --- selinux-policy.spec 29 Mar 2006 20:21:25 -0000 1.162 +++ selinux-policy.spec 30 Mar 2006 19:57:31 -0000 1.163 @@ -16,7 +16,7 @@ Summary: SELinux policy configuration Name: selinux-policy Version: 2.2.28 -Release: 1 +Release: 2 License: GPL Group: System Environment/Base Source: serefpolicy-%{version}.tgz @@ -320,6 +320,10 @@ %endif %changelog +* Mon Mar 27 2006 Dan Walsh 2.2.28-2 +- Fix ftp policy +- Fix secadm running of auditctl + * Mon Mar 27 2006 Dan Walsh 2.2.28-1 - Update to upstream From fedora-cvs-commits at redhat.com Thu Mar 30 20:04:14 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 30 Mar 2006 15:04:14 -0500 Subject: rpms/util-linux/FC-5 util-linux-2.13-mount-context.patch, NONE, 1.1 util-linux-2.13-mount-man-bugs.patch, NONE, 1.1 util-linux-2.13-mount-uuid.patch, NONE, 1.1 util-linux-2.13-nfs-noacl.patch, NONE, 1.1 util-linux-2.13-wide.patch, NONE, 1.1 .cvsignore, 1.18, 1.19 sources, 1.18, 1.19 util-linux-2.13-mount-twiceloop.patch, 1.1, 1.2 util-linux-2.13-nfsv4.patch, 1.3, 1.4 util-linux.spec, 1.112, 1.113 Message-ID: <200603302004.k2UK4Eil020863@cvs.devel.redhat.com> Author: kzak Update of /cvs/dist/rpms/util-linux/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv20830 Modified Files: .cvsignore sources util-linux-2.13-mount-twiceloop.patch util-linux-2.13-nfsv4.patch util-linux.spec Added Files: util-linux-2.13-mount-context.patch util-linux-2.13-mount-man-bugs.patch util-linux-2.13-mount-uuid.patch util-linux-2.13-nfs-noacl.patch util-linux-2.13-wide.patch Log Message: util-linux-2.13-0.20.1 FC5 update util-linux-2.13-mount-context.patch: mount.8 | 44 +++++++++++++++++++++++++++++++++++++++++++ mount.c | 65 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 107 insertions(+), 2 deletions(-) --- NEW FILE util-linux-2.13-mount-context.patch --- --- util-linux-2.13-pre7/mount/mount.8.cxt 2006-03-30 17:15:06.000000000 +0200 +++ util-linux-2.13-pre7/mount/mount.8 2006-03-30 17:15:06.000000000 +0200 @@ -661,6 +661,50 @@ .BR noexec ", " nosuid ", and " nodev (unless overridden by subsequent options, as in the option line .BR users,exec,dev,suid ). +.TP +\fBcontext=\fP\fIcontext\fP, \fBfscontext=\fP\fIcontext\fP and \fBdefcontext=\fP\fIcontext\fP +The +.BR context= +option is useful when mounting filesystems that do not support +extended attributes, such as a floppy or hard disk formatted with VFAT, or +systems that are not normally running under SELinux, such as an ext3 formatted +disk from a non-SELinux workstation. You can also use +.BR context= +on filesystems you do not trust, such as a floppy. It also helps in compatibility with +xattr-supporting filesystems on earlier 2.4. kernel versions. Even where +xattrs are supported, you can save time not having to label every file by +assigning the entire disk one security context. + +A commonly used option for removable media is +.BR context=system_u:object_r:removable_t . + +Two other options are +.BR fscontext= +and +.BR defcontext= , +both of which are mutually exclusive of the context option. This means you +can use fscontext and defcontext with each other, but neither can be used with +context. + +The +.BR fscontext= +option works for all filesystems, regardless of their xattr +support. The fscontext option sets the overarching filesystem label to a +specific security context. This filesystem label is separate from the +individual labels on the files. It represents the entire filesystem for +certain kinds of permission checks, such as during mount or file creation. +Individual file labels are still obtained from the xattrs on the files +themselves. The context option actually sets the aggregate context that +fscontext provides, in addition to supplying the same label for individual +files. + +You can set the default security context for unlabeled files using +.BR defcontext= +option. This overrides the value set for unlabeled files in the policy and requires a +file system that supports xattr labeling. + +For more details see +.BR selinux (8) .RE .TP .B \-\-bind --- util-linux-2.13-pre7/mount/mount.c.cxt 2006-03-30 17:15:06.000000000 +0200 +++ util-linux-2.13-pre7/mount/mount.c 2006-03-30 20:16:57.000000000 +0200 @@ -21,6 +21,11 @@ #include #include +#ifdef HAVE_LIBSELINUX +#include +#include +#endif + #include "mount_blkid.h" #include "mount_constants.h" #include "sundries.h" @@ -255,6 +260,49 @@ free((void *) s); } +#ifdef HAVE_LIBSELINUX +/* translates SELinux context from human to raw format and + * appends it to the mount extra options. + * + * returns -1 on error and 0 on success + */ +static int +append_context(const char *optname, const char *optdata, char *extra_opts, int *len) +{ + security_context_t raw = NULL; + char *buf = NULL; + int bufsz; + + if (!is_selinux_enabled()) + /* ignore the option if we running without selinux */ + return 0; + + if (optdata==NULL || *optdata=='\0' || optname==NULL) + return -1; + + if (selinux_trans_to_raw_context( + (security_context_t) optdata, &raw)==-1 || + raw==NULL) + return -1; + + if (verbose) + printf(_("mount: translated %s '%s' to '%s'\n"), + optname, optdata, (char *) raw); + + bufsz = strlen(optname) + strlen(raw) + 2; /* 2 is \0 and '=' */ + buf = xmalloc(bufsz); + + snprintf(buf, bufsz, "%s=%s", optname, (char *) raw); + freecon(raw); + + if ((*len -= bufsz-1) > 0) + strcat(extra_opts, buf); + + my_free(buf); + return 0; +} +#endif + /* * Look for OPT in opt_map table and return mask value. * If OPT isn't found, tack it onto extra_opts (which is non-NULL). @@ -313,7 +361,20 @@ return; } } - +#ifdef HAVE_LIBSELINUX + if (strncmp(opt, "context=", 8)==0 && *(opt+8)) { + if (append_context("context", opt+8, extra_opts, &len)==0) + return; + } + if (strncmp(opt, "fscontext=", 10)==0 && *(opt+10)) { + if (append_context("fscontext", opt+10, extra_opts, &len)==0) + return; + } + if (strncmp(opt, "defcontext=", 11)==0 && *(opt+11)) { + if (append_context("defcontext", opt+11, extra_opts, &len)==0) + return; + } +#endif if ((len -= strlen(opt)) > 0) strcat(extra_opts, opt); } @@ -330,7 +391,7 @@ if (options != NULL) { char *opts = xstrdup(options); char *opt; - int len = strlen(opts) + 20; + int len = strlen(opts) + 256; *extra_opts = xmalloc(len); **extra_opts = '\0'; util-linux-2.13-mount-man-bugs.patch: mount.8 | 17 +++++++++++++++++ nfs.5 | 7 +++++++ 2 files changed, 24 insertions(+) --- NEW FILE util-linux-2.13-mount-man-bugs.patch --- --- util-linux-2.13-pre7/mount/nfs.5.bugs 2006-03-30 21:37:53.000000000 +0200 +++ util-linux-2.13-pre7/mount/nfs.5 2006-03-30 21:38:13.000000000 +0200 @@ -443,3 +443,10 @@ .P The umount command should notify the server when an NFS filesystem is unmounted. +.P +Checking files on NFS filesystem referenced by file descriptors (i.e. the +.BR fcntl +and +.BR ioctl +families of functions) may lead to inconsistent result due to the lack of +consistency check in kernel even if noac is used. --- util-linux-2.13-pre7/mount/mount.8.bugs 2006-03-30 21:36:56.000000000 +0200 +++ util-linux-2.13-pre7/mount/mount.8 2006-03-30 21:37:35.000000000 +0200 @@ -2047,6 +2047,23 @@ .IR /proc/partitions . In particular, it may well fail if the kernel was compiled with devfs but devfs is not mounted. +.PP +It is possible that files +.IR /etc/mtab +and +.IR /proc/mounts +don't match. The first file is based only on the mount command options, but the +content of the second file also depends on the kernel and others settings (e.g. +remote NFS server. In particular case the mount command may reports unreliable +information about a NFS mount point and the /proc/mounts file usually contains +more reliable information.) +.PP +Checking files on NFS filesystem referenced by file descriptors (i.e. the +.BR fcntl +and +.BR ioctl +families of functions) may lead to inconsistent result due to the lack of +consistency check in kernel even if noac is used. .SH HISTORY A .B mount util-linux-2.13-mount-uuid.patch: fstab.c | 16 ++++++---------- mount_blkid.c | 5 +++++ mount_blkid.h | 1 + 3 files changed, 12 insertions(+), 10 deletions(-) --- NEW FILE util-linux-2.13-mount-uuid.patch --- --- util-linux-2.13-pre6/mount/mount_blkid.h.uuid 2006-03-29 15:34:24.000000000 +0200 +++ util-linux-2.13-pre6/mount/mount_blkid.h 2006-03-29 15:34:57.000000000 +0200 @@ -8,5 +8,6 @@ extern const char *mount_get_devname_by_uuid(const char *uuid); extern const char *mount_get_devname_by_label(const char *label); extern const char *mount_get_volume_label_by_spec(const char *spec); +extern const char *mount_get_volume_uuid_by_spec(const char *spec); extern const char *mount_get_devname(const char *spec); extern const char *mount_get_devname_for_mounting(const char *spec); --- util-linux-2.13-pre6/mount/mount_blkid.c.uuid 2006-03-29 15:33:44.000000000 +0200 +++ util-linux-2.13-pre6/mount/mount_blkid.c 2006-03-29 15:34:14.000000000 +0200 @@ -21,6 +21,11 @@ } const char * +mount_get_volume_uuid_by_spec(const char *spec) { + return blkid_get_tag_value(blkid, "UUID", spec); +} + +const char * mount_get_devname(const char *spec) { return blkid_get_devname(blkid, spec, 0); } --- util-linux-2.13-pre6/mount/fstab.c.uuid 2006-03-29 15:29:28.000000000 +0200 +++ util-linux-2.13-pre6/mount/fstab.c 2006-03-29 15:36:30.000000000 +0200 @@ -301,23 +301,19 @@ static int has_label(const char *device, const char *label) { const char *devlabel; - int ret; - devlabel = mount_get_volume_label_by_spec(device); - ret = !strcmp(label, devlabel); - /* free(devlabel); */ - return ret; + if (!(devlabel = mount_get_volume_label_by_spec(device))) + return 0; + return !strcmp(label, devlabel); } static int has_uuid(const char *device, const char *uuid){ const char *devuuid; - int ret; - devuuid = mount_get_devname_by_uuid(device); - ret = !strcmp(uuid, devuuid); - /* free(devuuid); */ - return ret; + if (!(devuuid = mount_get_volume_uuid_by_spec(device))) + return 0; + return !strcmp(uuid, devuuid); } /* Find the entry (SPEC,FILE) in fstab */ util-linux-2.13-nfs-noacl.patch: nfs.5 | 3 +++ nfs_mount4.h | 1 + nfsmount.c | 14 +++++++++++--- 3 files changed, 15 insertions(+), 3 deletions(-) --- NEW FILE util-linux-2.13-nfs-noacl.patch --- --- util-linux-2.13-pre6/mount/nfs_mount4.h.noacl 2006-03-29 16:26:08.000000000 +0200 +++ util-linux-2.13-pre6/mount/nfs_mount4.h 2006-03-29 16:37:01.000000000 +0200 @@ -56,6 +56,7 @@ #define NFS_MOUNT_KERBEROS 0x0100 /* 3 */ #define NFS_MOUNT_NONLM 0x0200 /* 3 */ #define NFS_MOUNT_BROKEN_SUID 0x0400 /* 4 */ +#define NFS_MOUNT_NOACL 0x0800 /* 4 */ #define NFS_MOUNT_SECFLAVOUR 0x2000 /* 5 */ /* security pseudoflavors */ --- util-linux-2.13-pre6/mount/nfsmount.c.noacl 2006-03-29 16:26:08.000000000 +0200 +++ util-linux-2.13-pre6/mount/nfsmount.c 2006-03-29 16:37:01.000000000 +0200 @@ -899,6 +899,10 @@ goto bad_option; data->flags |= NFS_MOUNT_BROKEN_SUID; } + } else if (!strcmp(opt, "acl")) { + data->flags &= ~NFS_MOUNT_NOACL; + if (!val) + data->flags |= NFS_MOUNT_NOACL; #endif } else { bad_option: @@ -1070,19 +1074,23 @@ printf("mountprog = %d, mountvers = %d, nfsprog = %d, nfsvers = %d\n", mnt_pmap->pm_prog, mnt_pmap->pm_vers, nfs_pmap->pm_prog, nfs_pmap->pm_vers); - printf("soft = %d, intr = %d, posix = %d, nocto = %d, noac = %d\n", + printf("soft = %d, intr = %d, posix = %d, nocto = %d, noac = %d ", (data.flags & NFS_MOUNT_SOFT) != 0, (data.flags & NFS_MOUNT_INTR) != 0, (data.flags & NFS_MOUNT_POSIX) != 0, (data.flags & NFS_MOUNT_NOCTO) != 0, (data.flags & NFS_MOUNT_NOAC) != 0); #if NFS_MOUNT_VERSION >= 2 - printf("tcp = %d\n", + printf("tcp = %d ", (data.flags & NFS_MOUNT_TCP) != 0); #endif +#if NFS_MOUNT_VERSION >= 4 + printf("noacl = %d ", (data.flags & NFS_MOUNT_NOACL) != 0); +#endif #if NFS_MOUNT_VERSION >= 5 - printf("sec = %u\n", data.pseudoflavor); + printf("sec = %u ", data.pseudoflavor); #endif + printf("\n"); #endif data.version = nfs_mount_version; --- util-linux-2.13-pre6/mount/nfs.5.noacl 2006-03-29 16:26:09.000000000 +0200 +++ util-linux-2.13-pre6/mount/nfs.5 2006-03-29 16:37:01.000000000 +0200 @@ -244,6 +244,9 @@ to get reasonable results when both clients are actively writing to a common export on the server. .TP 1.5i +.I noacl +Disables Access Control List (ACL) processing. +.TP 1.5i .I sec=mode Set the security flavor for this mount to "mode". The default setting is \f3sec=sys\f1, which uses local util-linux-2.13-wide.patch: include/widechar.h | 2 +- misc-utils/cal.c | 14 +++++++------- text-utils/column.c | 6 +++--- text-utils/more.c | 12 ++++++------ text-utils/pg.c | 14 +++++++------- text-utils/ul.c | 2 +- 6 files changed, 25 insertions(+), 25 deletions(-) --- NEW FILE util-linux-2.13-wide.patch --- --- util-linux-2.13-pre7/include/widechar.h.kzak 2005-08-01 20:18:35.000000000 +0200 +++ util-linux-2.13-pre7/include/widechar.h 2006-03-29 19:38:56.000000000 +0200 @@ -2,7 +2,7 @@ /* This file must be included last because the redefinition of wchar_t may cause conflicts when system include files were included after it. */ -#ifdef ENABLE_WIDECHAR +#ifdef HAVE_WIDECHAR # include # include --- util-linux-2.13-pre7/misc-utils/cal.c.kzak 2006-03-29 19:40:26.000000000 +0200 +++ util-linux-2.13-pre7/misc-utils/cal.c 2006-03-29 19:40:34.000000000 +0200 @@ -355,7 +355,7 @@ exit(0); } -#ifndef ENABLE_WIDECHAR +#ifndef HAVE_WIDECHAR static char *eos(char *s) { while (s && *s) s++; @@ -366,14 +366,14 @@ void headers_init(void) { int i, wd; -#ifdef ENABLE_WIDECHAR +#ifdef HAVE_WIDECHAR wchar_t day_headings_wc[22],j_day_headings_wc[29]; char *cur_dh = day_headings, *cur_j_dh = j_day_headings; #endif strcpy(day_headings,""); strcpy(j_day_headings,""); -#ifdef ENABLE_WIDECHAR +#ifdef HAVE_WIDECHAR wcscpy(day_headings_wc,L""); wcscpy(j_day_headings_wc,L""); #endif @@ -387,7 +387,7 @@ for(i = 0 ; i < 7 ; i++ ) { ssize_t space_left; wd = (i + week1stday) % 7; -#ifdef ENABLE_WIDECHAR +#ifdef HAVE_WIDECHAR swprintf(day_headings_wc, sizeof(day_headings_wc)/sizeof(day_headings_wc[0]), L"%1.2s ", weekday(wd)); swprintf(j_day_headings_wc, sizeof(j_day_headings_wc)/sizeof(j_day_headings_wc[0]), @@ -718,7 +718,7 @@ void center_str(const char* src, char* dest, size_t dest_size, int width) { -#ifdef ENABLE_WIDECHAR +#ifdef HAVE_WIDECHAR wchar_t str_wc[FMT_ST_CHARS]; #endif char str[FMT_ST_CHARS]; @@ -727,7 +727,7 @@ len = strlen(src); -#ifdef ENABLE_WIDECHAR +#ifdef HAVE_WIDECHAR if (mbstowcs(str_wc, src, FMT_ST_CHARS) > 0) { wide_char_enabled = 1; len = wcswidth(str_wc, SIZE(str_wc)); @@ -736,7 +736,7 @@ if (len > width) { str_to_print=str; if (wide_char_enabled) { -#ifdef ENABLE_WIDECHAR +#ifdef HAVE_WIDECHAR str_wc[width]=L'\0'; wcstombs(str, str_wc, SIZE(str)); #endif --- util-linux-2.13-pre7/text-utils/column.c.kzak 2006-03-29 19:41:20.000000000 +0200 +++ util-linux-2.13-pre7/text-utils/column.c 2006-03-29 19:41:25.000000000 +0200 @@ -52,7 +52,7 @@ #include "widechar.h" -#ifdef ENABLE_WIDECHAR +#ifdef HAVE_WIDECHAR #define wcs_width(s) wcswidth(s,wcslen(s)) static wchar_t *mbs_to_wcs(const char *); #else @@ -312,7 +312,7 @@ } } -#ifdef ENABLE_WIDECHAR +#ifdef HAVE_WIDECHAR static wchar_t *mbs_to_wcs(const char *s) { size_t n; @@ -330,7 +330,7 @@ } #endif -#ifndef ENABLE_WIDECHAR +#ifndef HAVE_WIDECHAR static char *mtsafe_strtok(char *str, const char *delim, char **ptr) { if (str == NULL) { --- util-linux-2.13-pre7/text-utils/pg.c.kzak 2006-03-29 19:41:52.000000000 +0200 +++ util-linux-2.13-pre7/text-utils/pg.c 2006-03-29 19:41:59.000000000 +0200 @@ -255,7 +255,7 @@ usage(); } -#ifdef ENABLE_WIDECHAR +#ifdef HAVE_WIDECHAR /* * A mbstowcs()-alike function that transparently handles invalid sequences. */ @@ -402,7 +402,7 @@ return 0; } -#ifdef ENABLE_WIDECHAR +#ifdef HAVE_WIDECHAR /* * Return the last character that will fit on the line at col columns * in case MB_CUR_MAX > 1. @@ -489,7 +489,7 @@ unsigned pos = 0; char *t = s; -#ifdef ENABLE_WIDECHAR +#ifdef HAVE_WIDECHAR if (MB_CUR_MAX > 1) return endline_for_mb(col, s); #endif @@ -776,7 +776,7 @@ cmd.count = getcount(cmd.cmdline); } -#ifdef ENABLE_WIDECHAR +#ifdef HAVE_WIDECHAR /* * Remove backspace formatting, for searches * in case MB_CUR_MAX > 1. @@ -817,7 +817,7 @@ { char *p = s, *q; -#ifdef ENABLE_WIDECHAR +#ifdef HAVE_WIDECHAR if (MB_CUR_MAX > 1) return colb_for_mb(s); #endif @@ -836,7 +836,7 @@ return s; } -#ifdef ENABLE_WIDECHAR +#ifdef HAVE_WIDECHAR /* * Convert nonprintable characters to spaces * in case MB_CUR_MAX > 1. @@ -867,7 +867,7 @@ static void makeprint(char *s, size_t l) { -#ifdef ENABLE_WIDECHAR +#ifdef HAVE_WIDECHAR if (MB_CUR_MAX > 1) return makeprint_for_mb(s, l); #endif --- util-linux-2.13-pre7/text-utils/more.c.kzak 2006-03-29 19:41:01.000000000 +0200 +++ util-linux-2.13-pre7/text-utils/more.c 2006-03-29 19:41:08.000000000 +0200 @@ -782,7 +782,7 @@ int column; static int colflg; -#ifdef ENABLE_WIDECHAR +#ifdef HAVE_WIDECHAR int i; wchar_t wc; int wc_width; @@ -805,7 +805,7 @@ c = Getc (f); } while (p < &Line[LINSIZ - 1]) { -#ifdef ENABLE_WIDECHAR +#ifdef HAVE_WIDECHAR if (fold_opt && use_mbc_buffer_flag && MB_CUR_MAX > 1) { use_mbc_buffer_flag = 0; state_bak = state; @@ -923,7 +923,7 @@ *length = p - Line; return (column); } else { -#ifdef ENABLE_WIDECHAR +#ifdef HAVE_WIDECHAR if (fold_opt && MB_CUR_MAX > 1) { memset (mbc, '\0', MB_LEN_MAX); mbc_pos = 0; @@ -1054,7 +1054,7 @@ my_putstring(state ? ULenter : ULexit); } if (c != ' ' || pstate == 0 || state != 0 || ulglitch == 0) -#ifdef ENABLE_WIDECHAR +#ifdef HAVE_WIDECHAR { wchar_t wc; size_t mblength; @@ -1070,7 +1070,7 @@ } #else putchar(c); -#endif /* ENABLE_WIDECHAR */ +#endif /* HAVE_WIDECHAR */ if (state && *chUL) { putsout(chBS); my_putstring(chUL); @@ -1867,7 +1867,7 @@ } else if (((cc_t) c == otty.c_cc[VERASE]) && !slash) { if (sp > buf) { -#ifdef ENABLE_WIDECHAR +#ifdef HAVE_WIDECHAR if (MB_CUR_MAX > 1) { wchar_t wc; --- util-linux-2.13-pre7/text-utils/ul.c.kzak 2006-03-29 19:42:09.000000000 +0200 +++ util-linux-2.13-pre7/text-utils/ul.c 2006-03-29 19:42:25.000000000 +0200 @@ -50,7 +50,7 @@ #include "widechar.h" -#ifdef ENABLE_WIDECHAR +#ifdef HAVE_WIDECHAR static int put1wc(int c) /* Output an ASCII character as a wide character */ { if (putwchar(c) == WEOF) Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/util-linux/FC-5/.cvsignore,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- .cvsignore 25 Nov 2005 07:32:12 -0000 1.18 +++ .cvsignore 30 Mar 2006 20:04:10 -0000 1.19 @@ -1,2 +1,2 @@ floppy-0.12.tar.gz -util-linux-2.13-pre6.tar.bz2 +util-linux-2.13-pre7.tar.bz2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/util-linux/FC-5/sources,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- sources 25 Nov 2005 07:32:12 -0000 1.18 +++ sources 30 Mar 2006 20:04:10 -0000 1.19 @@ -1,2 +1,2 @@ 7d3ac81855e26687dada6a31d2677875 floppy-0.12.tar.gz -1db1249029439e5e965c2c7178149616 util-linux-2.13-pre6.tar.bz2 +13cdf4b76533e8421dc49de188f85291 util-linux-2.13-pre7.tar.bz2 util-linux-2.13-mount-twiceloop.patch: fstab.c | 21 +++++++++++++++++++++ fstab.h | 1 + mount.c | 9 +++++++-- 3 files changed, 29 insertions(+), 2 deletions(-) Index: util-linux-2.13-mount-twiceloop.patch =================================================================== RCS file: /cvs/dist/rpms/util-linux/FC-5/util-linux-2.13-mount-twiceloop.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- util-linux-2.13-mount-twiceloop.patch 3 Jan 2006 17:50:20 -0000 1.1 +++ util-linux-2.13-mount-twiceloop.patch 30 Mar 2006 20:04:10 -0000 1.2 @@ -1,35 +1,15 @@ ---- util-linux-2.13-pre6/mount/fstab.c.twiceloop 2006-01-03 18:35:05.000000000 +0100 -+++ util-linux-2.13-pre6/mount/fstab.c 2006-01-03 18:37:44.000000000 +0100 -@@ -254,6 +254,27 @@ - return (ct == 1); - } +--- util-linux-2.13-pre6/mount/fstab.h.twiceloop 2006-03-29 16:20:37.000000000 +0200 ++++ util-linux-2.13-pre6/mount/fstab.h 2006-03-29 16:21:01.000000000 +0200 +@@ -2,6 +2,7 @@ + int mtab_is_writable(void); + int mtab_does_not_exist(void); + int is_mounted_once(const char *name); ++int is_mounted_same_loopfile(const char *loopfile, const char *dir); -+/* -+ * Given the loop file LOOPFILE, and the mount point DIR, check that -+ * same file is already mounted on same directory -+ * -+ * Don't forget there's -+ * /path/loopfile /path/dir loop=/dev/loop0 -+ * in mtab for loop devices. -+ */ -+int -+is_mounted_same_loopfile(const char *loopfile, const char *dir) { -+ struct mntentchn *mc, *mc0; -+ int ct = 0; -+ -+ mc0 = mtab_head(); -+ for (mc = mc0->prev; mc && mc != mc0; mc = mc->prev) -+ if (streq(mc->m.mnt_fsname, loopfile) && -+ streq(mc->m.mnt_dir, dir)) -+ ct++; -+ return (ct == 1); -+} -+ - /* Given the name FILE, try to find the option "loop=FILE" in mtab. */ - struct mntentchn * - getmntoptfile (const char *file) { ---- util-linux-2.13-pre6/mount/mount.c.twiceloop 2006-01-03 18:35:06.000000000 +0100 -+++ util-linux-2.13-pre6/mount/mount.c 2006-01-03 18:37:44.000000000 +0100 + struct mntentchn { + struct mntentchn *nxt, *prev; +--- util-linux-2.13-pre6/mount/mount.c.twiceloop 2006-03-29 16:16:20.000000000 +0200 ++++ util-linux-2.13-pre6/mount/mount.c 2006-03-29 16:16:21.000000000 +0200 @@ -671,7 +671,7 @@ static int @@ -60,3 +40,33 @@ if (res) goto out; } +--- util-linux-2.13-pre6/mount/fstab.c.twiceloop 2006-03-29 16:16:20.000000000 +0200 ++++ util-linux-2.13-pre6/mount/fstab.c 2006-03-29 16:16:21.000000000 +0200 +@@ -254,6 +254,27 @@ + return (ct == 1); + } + ++/* ++ * Given the loop file LOOPFILE, and the mount point DIR, check that ++ * same file is already mounted on same directory ++ * ++ * Don't forget there's ++ * /path/loopfile /path/dir loop=/dev/loop0 ++ * in mtab for loop devices. ++ */ ++int ++is_mounted_same_loopfile(const char *loopfile, const char *dir) { ++ struct mntentchn *mc, *mc0; ++ int ct = 0; ++ ++ mc0 = mtab_head(); ++ for (mc = mc0->prev; mc && mc != mc0; mc = mc->prev) ++ if (streq(mc->m.mnt_fsname, loopfile) && ++ streq(mc->m.mnt_dir, dir)) ++ ct++; ++ return (ct == 1); ++} ++ + /* Given the name FILE, try to find the option "loop=FILE" in mtab. */ + struct mntentchn * + getmntoptfile (const char *file) { util-linux-2.13-nfsv4.patch: Makefile.am | 4 mount.8 | 75 +++ mount.c | 10 nfs.5 | 219 +++++++++ nfs4_mount.h | 82 +++ nfs4mount.c | 433 ++++++++++++++++++ nfs_mount4.h | 22 nfsmount.c | 1361 +++++++++++++++++++++++++++++++++++++++-------------------- sundries.h | 4 umount.c | 7 10 files changed, 1757 insertions(+), 460 deletions(-) View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.3 -r 1.4 util-linux-2.13-nfsv4.patch Index: util-linux-2.13-nfsv4.patch =================================================================== RCS file: /cvs/dist/rpms/util-linux/FC-5/util-linux-2.13-nfsv4.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- util-linux-2.13-nfsv4.patch 20 Jan 2006 03:19:45 -0000 1.3 +++ util-linux-2.13-nfsv4.patch 30 Mar 2006 20:04:10 -0000 1.4 @@ -1,1588 +1,615 @@ ---- util-linux-2.13-pre2/mount/mount.8.nfsv4 2005-08-02 19:34:16.000000000 +0200 -+++ util-linux-2.13-pre2/mount/mount.8 2005-08-17 10:44:06.000000000 +0200 -@@ -384,6 +384,7 @@ - .IR msdos , - .IR ncpfs , - .IR nfs , -+.IR nfs4 , - .IR ntfs , - .IR proc , - .IR qnx4 , -@@ -421,7 +422,7 @@ - program has to do is issue a simple - .IR mount (2) - system call, and no detailed knowledge of the filesystem type is required. --For a few types however (like nfs, smbfs, ncpfs) ad hoc code is -+For a few types however (like nfs, nfs4, smbfs, ncpfs) ad hoc code is - necessary. The nfs ad hoc code is built in, but smbfs and ncpfs - have a separate mount program. In order to make it possible to - treat all types in a uniform way, mount will execute the program -@@ -449,9 +450,10 @@ - All of the filesystem types listed there will be tried, - except for those that are labeled "nodev" (e.g., - .IR devpts , --.I proc -+.IR proc , -+.IR nfs , - and --.IR nfs ). -+.IR nfs4 ). - If - .I /etc/filesystems - ends in a line with a single * only, mount will read -@@ -1373,6 +1375,73 @@ - .B nolock - Do not use locking. Do not start lockd. +--- util-linux-2.13-pre7/mount/nfsmount.c.nfsv4 2005-08-01 00:18:17.000000000 +0200 ++++ util-linux-2.13-pre7/mount/nfsmount.c 2006-03-29 18:00:57.000000000 +0200 +@@ -32,6 +32,7 @@ + * nfsmount.c,v 1.1.1.1 1993/11/18 08:40:51 jrs Exp + */ -+.SH "Mount options for nfs4" -+Instead of a textual option string, parsed by the kernel, the -+.I nfs4 -+file system expects a binary argument of type -+.IR "struct nfs4_mount_data" . -+The program -+.B mount -+itself parses the following options of the form `tag=value', -+and puts them in the structure mentioned: -+.BI rsize= n, -+.BI wsize= n, -+.BI timeo= n, -+.BI retrans= n, -+.BI acregmin= n, -+.BI acregmax= n, -+.BI acdirmin= n, -+.BI acdirmax= n, -+.BI actimeo= n, -+.BI retry= n, -+.BI port= n, -+.BI proto= n, -+.BI clientaddr= n, -+.BI sec= n. -+The option -+.BI addr= n -+is accepted but ignored. -+Also the following Boolean options, possibly preceded by -+.B no -+are recognized: -+.BR bg , -+.BR fg , -+.BR soft , -+.BR hard , -+.BR intr , -+.BR cto , -+.BR ac , -+For details, see -+.BR nfs (5). ++#include + #include + #include + #include +@@ -70,11 +71,121 @@ + #define NFS_FHSIZE 32 + #endif + ++#define MNT_SENDBUFSIZE ((u_int)2048) ++#define MNT_RECVBUFSIZE ((u_int)1024) + -+Especially useful options include -+.TP -+.B rsize=32768,wsize=32768 -+This will make your NFS connection faster than with the default -+buffer size of 4096. -+.TP -+.B hard -+The program accessing a file on a NFS mounted file system will hang -+when the server crashes. The process cannot be interrupted or -+killed unless you also specify -+.BR intr . -+When the NFS server is back online the program will continue undisturbed -+from where it was. This is probably what you want. -+.TP -+.B soft -+This option allows the kernel to time out if the NFS server is not -+responding for some time. The time can be -+specified with -+.BR timeo=time . -+This timeout value is expressed in tenths of a second. -+The -+.BR soft -+option might be useful if your NFS server sometimes doesn't respond -+or will be rebooted while some process tries to get a file from the server. -+Avoid using this option with -+.BR proto=udp -+or with a short timeout. + static char *nfs_strerror(int stat); + + #define MAKE_VERSION(p,q,r) (65536*(p) + 256*(q) + (r)) + + #define MAX_NFSPROT ((nfs_mount_version >= 4) ? 3 : 2) ++#define MAX_MNTPROT ((nfs_mount_version >= 4) ? 3 : 2) ++#define HAVE_RELIABLE_TCP (nfs_mount_version >= 4) + - .SH "Mount options for ntfs" - .TP - .BI iocharset= name ---- util-linux-2.13-pre2/mount/nfs.5.nfsv4 2002-06-27 23:31:33.000000000 +0200 -+++ util-linux-2.13-pre2/mount/nfs.5 2005-08-17 10:44:06.000000000 +0200 -@@ -3,7 +3,7 @@ - .\" patches. " - .TH NFS 5 "20 November 1993" "Linux 0.99" "Linux Programmer's Manual" - .SH NAME --nfs \- nfs fstab format and options -+nfs \- nfs and nfs4 fstab format and options - .SH SYNOPSIS - .B /etc/fstab - .SH DESCRIPTION -@@ -17,14 +17,51 @@ - and the NFS specific options that control - the way the filesystem is mounted. - .P --Here is an example from an \fI/etc/fstab\fP file from an NFS mount. -+Three different versions of the NFS protocol are -+supported by the Linux NFS client: -+NFS version 2, NFS version 3, and NFS version 4. -+To mount via NFS version 2, use the -+.BR nfs -+file system type and specify -+.BR nfsvers=2 . -+Version 2 is the default protocol version for the -+.BR nfs -+file system type when -+.BR nfsvers= -+is not specified on the mount command. -+To mount via NFS version 3, use the -+.BR nfs -+file system type and specify -+.BR nfsvers=3 . -+To mount via NFS version 4, use the -+.BR nfs4 -+file system type. -+The -+.BR nfsvers= -+keyword is not supported for the -+.BR nfs4 -+file system type. -+.P -+These file system types share similar mount options; -+the differences are listed below. -+.P -+Here is an example from an \fI/etc/fstab\fP file for an NFSv2 mount -+over UDP. - .sp - .nf - .ta 2.5i +0.75i +0.75i +1.0i - server:/usr/local/pub /pub nfs rsize=8192,wsize=8192,timeo=14,intr - .fi -+.P -+Here is an example for an NFSv4 mount over TCP using Kerberos -+5 mutual authentication. -+.sp -+.nf -+.ta 2.5i +0.75i +0.75i +1.0i -+server:/usr/local/pub /pub nfs4 proto=tcp,sec=krb5,hard,intr -+.fi - .DT --.SS Options -+.SS Options for the nfs file system type - .TP 1.5i [...3058 lines suppressed...] +--- util-linux-2.13-pre7/mount/umount.c.nfsv4 2006-03-29 18:00:57.000000000 +0200 ++++ util-linux-2.13-pre7/mount/umount.c 2006-03-29 18:00:57.000000000 +0200 +@@ -88,6 +88,9 @@ + /* True if ruid != euid. */ + int suid = 0; -- /* clean up */ -+ out_ok: -+ /* Ensure we have enough padding for the following strcat()s */ -+ if (strlen(new_opts) + strlen(s) + 30 >= sizeof(new_opts)) { -+ fprintf(stderr, _("mount: " -+ "excessively long option argument\n")); -+ goto fail; -+ } ++/* Needed by nfs4mount.c */ ++int sloppy = 0; + -+ sprintf(cbuf, "addr=%s", s); -+ strcat(new_opts, cbuf); - -- auth_destroy(mclient->cl_auth); -- clnt_destroy(mclient); -- close(msock); -+ *extra_opts = xstrdup(new_opts); + /* + * check_special_umountprog() + * If there is a special umount program for this type, exec it. +@@ -144,6 +147,7 @@ return 0; + } - /* abort */ -- - fail: -- if (msock != -1) { -- if (mclient) { -- auth_destroy(mclient->cl_auth); -- clnt_destroy(mclient); -- } -- close(msock); -- } - if (fsock != -1) - close(fsock); - return retval; --} -+} -+ -+static inline enum clnt_stat -+nfs3_umount(dirpath *argp, CLIENT *clnt) -+{ -+ static char clnt_res; -+ memset (&clnt_res, 0, sizeof(clnt_res)); -+ return clnt_call(clnt, MOUNTPROC_UMNT, -+ (xdrproc_t) xdr_dirpath, (caddr_t)argp, -+ (xdrproc_t) xdr_void, (caddr_t) &clnt_res, -+ TIMEOUT); -+} -+ -+static inline enum clnt_stat -+nfs2_umount(dirpath *argp, CLIENT *clnt) -+{ -+ static char clnt_res; -+ memset (&clnt_res, 0, sizeof(clnt_res)); -+ return clnt_call(clnt, MOUNTPROC_UMNT, -+ (xdrproc_t) xdr_dirpath, (caddr_t)argp, -+ (xdrproc_t) xdr_void, (caddr_t) &clnt_res, -+ TIMEOUT); -+} -+ -+static int -+nfs_call_umount(clnt_addr_t *mnt_server, dirpath *argp) -+{ -+ CLIENT *clnt; -+ enum clnt_stat res = 0; -+ int msock; -+ -+ clnt = mnt_openclnt(mnt_server, &msock, 1); -+ if (!clnt) -+ goto out_bad; -+ switch (mnt_server->pmap.pm_vers) { -+ case 3: -+ res = nfs3_umount(argp, clnt); -+ break; -+ case 2: -+ case 1: -+ res = nfs2_umount(argp, clnt); -+ break; -+ default: -+ break; -+ } -+ mnt_closeclnt(clnt, msock); -+ if (res == RPC_SUCCESS) -+ return 1; -+ out_bad: -+ return 0; -+} -+ -+int -+nfsumount(const char *spec, const char *opts) -+{ -+ char *hostname; -+ char *dirname; -+ clnt_addr_t mnt_server = { &hostname, }; -+ struct pmap *pmap = &mnt_server.pmap; -+ char *p; -+ -+ nfs_mount_version = find_kernel_nfs_mount_version(); -+ if (spec == NULL || (p = strchr(spec,':')) == NULL) -+ goto out_bad; -+ hostname = xstrndup(spec, p-spec); -+ dirname = xstrdup(p+1); -+#ifdef NFS_MOUNT_DEBUG -+ printf(_("host: %s, directory: %s\n"), hostname, dirname); ++#if 0 + static int xdr_dir(XDR *xdrsp, char *dirp) + { + return (xdr_string(xdrsp, &dirp, MNTPATHLEN)); +@@ -235,6 +239,7 @@ + + return 0; + } +#endif -+ -+ if (opts && (p = strstr(opts, "addr="))) { -+ char *q; -+ -+ free(hostname); -+ p += 5; -+ q = p; -+ while (*q && *q != ',') q++; -+ hostname = xstrndup(p,q-p); -+ } -+ -+ if (opts && (p = strstr(opts, "mounthost="))) { -+ char *q; -+ -+ free(hostname); -+ p += 10; -+ q = p; -+ while (*q && *q != ',') q++; -+ hostname = xstrndup(p,q-p); -+ } -+ -+ pmap->pm_prog = MOUNTPROG; -+ pmap->pm_vers = MOUNTVERS; -+ if (opts && (p = strstr(opts, "mountprog=")) && isdigit(*(p+10))) -+ pmap->pm_prog = atoi(p+10); -+ if (opts && (p = strstr(opts, "mountport=")) && isdigit(*(p+10))) -+ pmap->pm_port = atoi(p+10); -+ if (opts && (p = strstr(opts, "nfsvers=")) && isdigit(*(p+8))) -+ pmap->pm_vers = nfsvers_to_mnt(atoi(p+8)); -+ if (opts && (p = strstr(opts, "mountvers=")) && isdigit(*(p+10))) -+ pmap->pm_vers = atoi(p+10); -+ -+ if (!nfs_gethostbyname(hostname, &mnt_server.saddr)) -+ goto out_bad; -+ if (!probe_mntport(&mnt_server)) -+ goto out_bad; -+ return nfs_call_umount(&mnt_server, &dirname); -+ out_bad: -+ return 0; -+} - /* - * We need to translate between nfs status return values and ---- util-linux-2.13-pre2/mount/nfs_mount4.h.nfsv4 2000-10-14 16:20:51.000000000 +0200 -+++ util-linux-2.13-pre2/mount/nfs_mount4.h 2005-08-17 10:44:06.000000000 +0200 + /* complain about a failed umount */ + static void complain(int err, const char *dev) { +@@ -292,7 +297,7 @@ + /* Ignore any RPC errors, so that you can umount the filesystem + if the server is down. */ + if (strcasecmp(type, "nfs") == 0) +- nfs_umount_rpc_call(spec, opts); ++ nfsumount(spec, opts); + + umnt_err = umnt_err2 = 0; + if (lazy) { +--- util-linux-2.13-pre7/mount/nfs_mount4.h.nfsv4 2000-10-14 16:20:51.000000000 +0200 ++++ util-linux-2.13-pre7/mount/nfs_mount4.h 2006-03-29 18:00:57.000000000 +0200 @@ -8,7 +8,9 @@ * so it is easiest to ignore the kernel altogether (at compile time). */ @@ -2587,16 +2600,3 @@ +#define AUTH_GSS_SPKMP 390011 +#endif ---- util-linux-2.13-pre2/mount/sundries.h.nfsv4 2005-07-29 01:07:31.000000000 +0200 -+++ util-linux-2.13-pre2/mount/sundries.h 2005-08-17 10:44:06.000000000 +0200 -@@ -37,6 +37,10 @@ - int nfsmount (const char *spec, const char *node, int *flags, - char **orig_opts, char **opt_args, int *version, int running_bg); - -+int nfs4mount (const char *spec, const char *node, int *flags, -+ char **orig_opts, char **opt_args, int running_bg); -+int nfsumount(const char *spec, const char *opts); -+ - /* exit status - bits below are ORed */ - #define EX_USAGE 1 /* incorrect invocation or permission */ - #define EX_SYSERR 2 /* out of memory, cannot fork, ... */ Index: util-linux.spec =================================================================== RCS file: /cvs/dist/rpms/util-linux/FC-5/util-linux.spec,v retrieving revision 1.112 retrieving revision 1.113 diff -u -r1.112 -r1.113 --- util-linux.spec 9 Mar 2006 22:51:31 -0000 1.112 +++ util-linux.spec 30 Mar 2006 20:04:10 -0000 1.113 @@ -25,7 +25,7 @@ Summary: A collection of basic system utilities. Name: util-linux Version: 2.13 -Release: 0.20 +Release: 0.20.1 License: distributable Group: System Environment/Base @@ -43,8 +43,8 @@ BuildRequires: audit-libs-devel >= 1.0.6 ### Sources -# TODO [stable]: s/2.13-pre6/%{version}/ -Source0: ftp://ftp.win.tue.nl/pub/linux-local/utils/util-linux/util-linux-2.13-pre6.tar.bz2 +# TODO [stable]: s/2.13-pre7/%{version}/ +Source0: ftp://ftp.win.tue.nl/pub/linux-local/utils/util-linux/util-linux-2.13-pre7.tar.bz2 Source1: util-linux-selinux.pamd Source2: util-linux-chsh-chfn.pamd Source8: nologin.c @@ -160,8 +160,6 @@ Patch217: util-linux-2.13-cramfs-maxentries.patch # [also 171337] - mkfs.cramfs doesn't work correctly with empty files Patch218: util-linux-2.13-cramfs-zerofiles.patch -# 172203 - mount man page in RHEL4 lacks any info on cifs mount options -Patch219: util-linux-2.12a-mount-man-cifs.patch # better wide chars usage in the cal command (based on the old 'moremisc' patch) Patch220: util-linux-2.12p-cal-wide.patch # 176441: col truncates data @@ -180,6 +178,18 @@ Patch227: util-linux-2.13-umount-sysfs.patch # 182553 - fdisk -l inside xen guest shows no disks Patch228: util-linux-2.13-fdisk-xvd.patch +# 187014 - umount segfaults for normal user +Patch229: util-linux-2.13-mount-uuid.patch +# 184410 - RHEL3 and RHEL4 mount supports 'noacl', FC5 mount command does not +Patch230: util-linux-2.13-nfs-noacl.patch +# 183446 - cal not UTF-8-aware +Patch231: util-linux-2.13-wide.patch +# 186915 - mount does not translate SELIinux context options though libselinux +# 185500 - Need man page entry for -o context= mount option +Patch232: util-linux-2.13-mount-context.patch +# 152579 - missing info about /etc/mtab and /proc/mounts mismatch +# 183890 - missing info about possible ioctl() and fcntl() problems on NFS filesystem +Patch233: util-linux-2.13-mount-man-bugs.patch # When adding patches, please make sure that it is easy to find out what bug # the # patch fixes. @@ -193,7 +203,7 @@ %prep # TODO [stable]: remove -n -%setup -q -a 11 -n util-linux-2.13-pre6 +%setup -q -a 11 -n util-linux-2.13-pre7 %patch1 -p1 %patch70 -p1 @@ -250,16 +260,20 @@ %patch216 -p1 %patch217 -p1 %patch218 -p1 -%patch219 -p1 %patch220 -p1 %patch221 -p1 %patch222 -p1 %patch223 -p1 -%patch224 -p1 -b .selinux +%patch224 -p1 %patch225 -p1 %patch226 -p1 %patch227 -p1 %patch228 -p1 +%patch229 -p1 +%patch230 -p1 +%patch231 -p1 +%patch232 -p1 +%patch233 -p1 %build unset LINGUAS || : @@ -644,6 +658,16 @@ /sbin/losetup %changelog +* Thu Mar 30 2006 Karel Zak 2.13-0.20.1 +- sync with upstream 2.13-pre7 release +- fix #187014 - umount segfaults for normal user +- fix #184410 - RHEL3 and RHEL4 mount supports 'noacl', FC5 mount command does not +- fix #183446 - cal not UTF-8-aware +- fix #186915 - mount does not translate SELIinux context options though libselinux +- fix #185500 - need man page entry for -o context= mount option +- fix #152579 - missing info about /etc/mtab and /proc/mounts mismatch +- fix #183890 - missing info about possible ioctl() and fcntl() problems on NFS filesystem + * Wed Mar 9 2006 Jesse Keating 2.13-0.20 - Better calling of restorecon as suggested by Bill Nottingham - prereq restorecon to avoid ordering issues From fedora-cvs-commits at redhat.com Thu Mar 30 20:18:33 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 30 Mar 2006 15:18:33 -0500 Subject: rpms/kernel/devel patch-2.6.16-git18.bz2.sign, NONE, 1.1 .cvsignore, 1.398, 1.399 kernel-2.6.spec, 1.2104, 1.2105 linux-2.6-debug-disable-builtins.patch, 1.1, 1.2 sources, 1.339, 1.340 upstream, 1.312, 1.313 linux-2.6-softmac-scan-dwell-time.patch, 1.1, NONE patch-2.6.16-git17.bz2.sign, 1.1, NONE Message-ID: <200603302018.k2UKIXUg002415@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv2400 Modified Files: .cvsignore kernel-2.6.spec linux-2.6-debug-disable-builtins.patch sources upstream Added Files: patch-2.6.16-git18.bz2.sign Removed Files: linux-2.6-softmac-scan-dwell-time.patch patch-2.6.16-git17.bz2.sign Log Message: git18 --- NEW FILE patch-2.6.16-git18.bz2.sign --- -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.2.2 (GNU/Linux) Comment: See http://www.kernel.org/signature.html for info iD8DBQBEK4MpyGugalF9Dw4RAv4VAJ46sZ7ZGbWTb6EdSQIkpoTSgKkVWwCdEgBs uGWalgLkeO+DT3R5yicVOHQ= =b9FN -----END PGP SIGNATURE----- Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v retrieving revision 1.398 retrieving revision 1.399 diff -u -r1.398 -r1.399 --- .cvsignore 29 Mar 2006 19:45:00 -0000 1.398 +++ .cvsignore 30 Mar 2006 20:18:29 -0000 1.399 @@ -4,3 +4,4 @@ linux-2.6.16.tar.bz2 xen-20060320.tar.bz2 patch-2.6.16-git17.bz2 +patch-2.6.16-git18.bz2 Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.2104 retrieving revision 1.2105 diff -u -r1.2104 -r1.2105 --- kernel-2.6.spec 29 Mar 2006 19:45:00 -0000 1.2104 +++ kernel-2.6.spec 30 Mar 2006 20:18:29 -0000 1.2105 @@ -217,7 +217,7 @@ # # Patches 0 through 100 are meant for core subsystem upgrades # -Patch1: patch-2.6.16-git17.bz2 +Patch1: patch-2.6.16-git18.bz2 # Patches 100 through 500 are meant for architecture patches Patch100: linux-2.6-bzimage.patch @@ -394,7 +394,6 @@ # Broadcom wireless driver Patch5001: linux-2.6-bcm43xx-git.patch Patch5002: linux-2.6-bcm43xx-neuter.patch -Patch5004: linux-2.6-softmac-scan-dwell-time.patch Patch5005: linux-2.6-bcm43xx-assoc-on-startup.patch Patch5006: linux-2.6-softmac-default-rate.patch Patch5007: linux-2.6-bcm43xx-set-chan-lockup.patch @@ -749,13 +748,13 @@ # Arnd says don't call cell_spumem_init() till he fixes it. %patch301 -p1 # IBM will use 'IBM,CBEA' for future Cell systems -%patch302 -p1 +#%patch302 -p1 # Support the IBM Mambo simulator; core as well as disk and network drivers. %patch305 -p1 # Make HVC console generic; support simulator console device using it. #%patch306 -p1 # Hardcode PIC addresses for Cell spiderpic -%patch310 -p1 +#%patch310 -p1 # RTAS console support #%patch313 -p1 # Check properly for successful RTAS instantiation @@ -1013,17 +1012,15 @@ # # ... and bcm43xx driver too -%patch5001 -p1 +#%patch5001 -p1 # temporarily remove bcm43xx's MODULE_DEVICE_TABLE entry #%patch5002 -p1 -# When scanning, spend only 20ms on each channel not 500ms. -%patch5004 -p1 # Attempt to associate when the link is brought up %patch5005 -p1 # Default to 11Mbps not 54Mbps, since we don't back down automatically yet. -%patch5006 -p1 +#%patch5006 -p1 # bcm43xx dies if we attempt to set the channel while it's down. -%patch5007 -p1 +#%patch5007 -p1 # # final stuff @@ -1633,6 +1630,9 @@ %endif %changelog +* Thu Mar 30 2006 Dave Jones +- 2.6.16-git18 + * Wed Mar 29 2006 Dave Jones - 2.6.16-git16 & git17 linux-2.6-debug-disable-builtins.patch: Makefile | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) Index: linux-2.6-debug-disable-builtins.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-debug-disable-builtins.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- linux-2.6-debug-disable-builtins.patch 18 Aug 2005 18:28:13 -0000 1.1 +++ linux-2.6-debug-disable-builtins.patch 30 Mar 2006 20:18:29 -0000 1.2 @@ -1,4 +1,4 @@ -Disable built-ins and also more m32 work +Disable built-ins diff -urNp --exclude-from=/home/davej/.exclude linux-3022/arch/i386/Makefile linux-10000/arch/i386/Makefile --- linux-3022/arch/i386/Makefile Index: sources =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/sources,v retrieving revision 1.339 retrieving revision 1.340 diff -u -r1.339 -r1.340 --- sources 29 Mar 2006 19:45:00 -0000 1.339 +++ sources 30 Mar 2006 20:18:29 -0000 1.340 @@ -1,3 +1,4 @@ 9a91b2719949ff0856b40bc467fd47be linux-2.6.16.tar.bz2 8c70806f9075ebc0087f7ce1b8911700 xen-20060320.tar.bz2 b27c802de6487f2f0aeacc289f1d3ae2 patch-2.6.16-git17.bz2 +5dca5f5b52ccb2bfab6a88015af5fc2c patch-2.6.16-git18.bz2 Index: upstream =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/upstream,v retrieving revision 1.312 retrieving revision 1.313 diff -u -r1.312 -r1.313 --- upstream 29 Mar 2006 19:45:00 -0000 1.312 +++ upstream 30 Mar 2006 20:18:29 -0000 1.313 @@ -1,2 +1,2 @@ linux-2.6.16.tar.bz2 -patch-2.6.16-git17.bz2 +patch-2.6.16-git18.bz2 --- linux-2.6-softmac-scan-dwell-time.patch DELETED --- --- patch-2.6.16-git17.bz2.sign DELETED --- From fedora-cvs-commits at redhat.com Thu Mar 30 20:48:45 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 30 Mar 2006 15:48:45 -0500 Subject: rpms/kernel/devel linux-2.6-compile-fixes.patch,1.60,1.61 Message-ID: <200603302048.k2UKmjMY016684@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv16669 Modified Files: linux-2.6-compile-fixes.patch Log Message: build fix linux-2.6-compile-fixes.patch: run.c | 1 + 1 files changed, 1 insertion(+) Index: linux-2.6-compile-fixes.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-compile-fixes.patch,v retrieving revision 1.60 retrieving revision 1.61 diff -u -r1.60 -r1.61 --- linux-2.6-compile-fixes.patch 26 Mar 2006 00:13:38 -0000 1.60 +++ linux-2.6-compile-fixes.patch 30 Mar 2006 20:48:41 -0000 1.61 @@ -0,0 +1,10 @@ +--- linux-2.6.16.noarch/arch/powerpc/platforms/cell/spufs/run.c~ 2006-03-30 15:48:17.000000000 -0500 ++++ linux-2.6.16.noarch/arch/powerpc/platforms/cell/spufs/run.c 2006-03-30 15:48:25.000000000 -0500 +@@ -2,6 +2,7 @@ + #include + + #include ++#include + + #include "spufs.h" + From fedora-cvs-commits at redhat.com Thu Mar 30 20:48:58 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 30 Mar 2006 15:48:58 -0500 Subject: rpms/kernel/devel kernel-2.6.spec,1.2105,1.2106 Message-ID: <200603302048.k2UKmw2s016710@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv16697 Modified Files: kernel-2.6.spec Log Message: build fix Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.2105 retrieving revision 1.2106 diff -u -r1.2105 -r1.2106 --- kernel-2.6.spec 30 Mar 2006 20:18:29 -0000 1.2105 +++ kernel-2.6.spec 30 Mar 2006 20:48:55 -0000 1.2106 @@ -1029,7 +1029,7 @@ # # misc small stuff to make things compile or otherwise improve performance # -#%patch10000 -p1 +%patch10000 -p1 # Small 1-2 liners fixing silly bugs that get pushed upstream quickly. %patch10001 -p1 From fedora-cvs-commits at redhat.com Thu Mar 30 22:02:35 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 30 Mar 2006 17:02:35 -0500 Subject: rpms/samba/devel .cvsignore, 1.28, 1.29 samba.spec, 1.62, 1.63 sources, 1.30, 1.31 Message-ID: <200603302202.k2UM2ZpP012880@cvs.devel.redhat.com> Author: fenlason Update of /cvs/dist/rpms/samba/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv12795 Modified Files: .cvsignore samba.spec sources Log Message: 3.0.22 to close bz#187170 CVE-2005-1059 Samba clear text password exposure Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/samba/devel/.cvsignore,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- .cvsignore 17 Mar 2006 18:22:19 -0000 1.28 +++ .cvsignore 30 Mar 2006 22:02:15 -0000 1.29 @@ -1 +1 @@ -samba-3.0.21c.tar.gz +samba-3.0.22.tar.gz Index: samba.spec =================================================================== RCS file: /cvs/dist/rpms/samba/devel/samba.spec,v retrieving revision 1.62 retrieving revision 1.63 diff -u -r1.62 -r1.63 --- samba.spec 17 Mar 2006 18:22:19 -0000 1.62 +++ samba.spec 30 Mar 2006 22:02:31 -0000 1.63 @@ -2,7 +2,7 @@ Summary: The Samba SMB server. Name: samba -Version: 3.0.21c +Version: 3.0.22 Release: 2 Epoch: 0 License: GNU GPL Version 2 @@ -50,7 +50,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-root Prereq: /sbin/chkconfig /bin/mktemp /usr/bin/killall Prereq: fileutils sed /etc/init.d -BuildRequires: pam-devel, readline-devel, ncurses-devel, fileutils, libacl-devel krb5-devel openldap-devel openssl-devel cups-devel +BuildRequires: pam-devel, readline-devel, ncurses-devel, fileutils, libacl-devel krb5-devel openldap-devel openssl-devel cups-devel gnutls-devel # Working around perl dependency problem from docs Index: sources =================================================================== RCS file: /cvs/dist/rpms/samba/devel/sources,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- sources 17 Mar 2006 18:22:19 -0000 1.30 +++ sources 30 Mar 2006 22:02:31 -0000 1.31 @@ -1 +1 @@ -9deeda292399d2bbad120f98a290f5da samba-3.0.21c.tar.gz +5c39505af17cf5caf3d6ed8bab135036 samba-3.0.22.tar.gz From fedora-cvs-commits at redhat.com Thu Mar 30 22:22:49 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 30 Mar 2006 17:22:49 -0500 Subject: rpms/samba/FC-5 samba.spec,1.61,1.62 sources,1.29,1.30 Message-ID: <200603302222.k2UMMn7Z027068@cvs.devel.redhat.com> Author: fenlason Update of /cvs/dist/rpms/samba/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv27052 Modified Files: samba.spec sources Log Message: +* Thu Mar 30 2006 Jay Fenlason 2.0.21c-1.fc5 +- New upstream version, fixing + bz#187170 CVE-2005-1059 Samba clear text password exposure +- include gnutls-devel in BuildRequires + Index: samba.spec =================================================================== RCS file: /cvs/dist/rpms/samba/FC-5/samba.spec,v retrieving revision 1.61 retrieving revision 1.62 diff -u -r1.61 -r1.62 --- samba.spec 13 Feb 2006 16:27:32 -0000 1.61 +++ samba.spec 30 Mar 2006 22:22:47 -0000 1.62 @@ -2,8 +2,8 @@ Summary: The Samba SMB server. Name: samba -Version: 3.0.21b -Release: 2 +Version: 3.0.22 +Release: 1.fc5 Epoch: 0 License: GNU GPL Version 2 Group: System Environment/Daemons @@ -50,7 +50,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-root Prereq: /sbin/chkconfig /bin/mktemp /usr/bin/killall Prereq: fileutils sed /etc/init.d -BuildRequires: pam-devel, readline-devel, ncurses-devel, fileutils, libacl-devel krb5-devel openldap-devel openssl-devel cups-devel +BuildRequires: pam-devel, readline-devel, ncurses-devel, fileutils, libacl-devel krb5-devel openldap-devel openssl-devel cups-devel gnutls-devel # Working around perl dependency problem from docs @@ -443,6 +443,11 @@ %{_mandir}/man7/libsmbclient.7* %changelog +* Thu Mar 30 2006 Jay Fenlason 2.0.21c-1.fc5 +- New upstream version, fixing + bz#187170 CVE-2005-1059 Samba clear text password exposure +- include gnutls-devel in BuildRequires + * Mon Feb 13 2006 Jay Fenlason 3.0.21b-2 - New upstream version. - Since the rawhide kernel has dropped support for smbfs, remove smbmount Index: sources =================================================================== RCS file: /cvs/dist/rpms/samba/FC-5/sources,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- sources 13 Feb 2006 16:26:39 -0000 1.29 +++ sources 30 Mar 2006 22:22:47 -0000 1.30 @@ -1 +1 @@ -bb73dffb33f4a39386ef9f3e07ae28ff samba-3.0.21b.tar.gz +5c39505af17cf5caf3d6ed8bab135036 samba-3.0.22.tar.gz From fedora-cvs-commits at redhat.com Thu Mar 30 22:27:56 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 30 Mar 2006 17:27:56 -0500 Subject: rpms/selinux-policy/devel policy-20060323.patch, 1.4, 1.5 selinux-policy.spec, 1.163, 1.164 Message-ID: <200603302227.k2UMRuD0027254@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/selinux-policy/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv27239 Modified Files: policy-20060323.patch selinux-policy.spec Log Message: * Fri Mar 30 2006 Dan Walsh 2.2.28-3 - Allow automount and dbus to read cert files policy-20060323.patch: man/man8/samba_selinux.8 | 2 - policy/modules/admin/logwatch.te | 1 policy/modules/admin/rpm.fc | 1 policy/modules/admin/usermanage.te | 2 + policy/modules/kernel/corenetwork.te.in | 4 +- policy/modules/kernel/devices.if | 58 ++++++++++++++++++++++++++++++++ policy/modules/kernel/files.if | 27 ++++++++++++++ policy/modules/kernel/kernel.if | 4 +- policy/modules/services/apm.te | 4 ++ policy/modules/services/automount.te | 1 policy/modules/services/bluetooth.te | 2 + policy/modules/services/cups.te | 3 + policy/modules/services/dbus.te | 1 policy/modules/services/dovecot.te | 2 + policy/modules/services/ftp.te | 10 ----- policy/modules/services/hal.te | 5 ++ policy/modules/services/pegasus.te | 1 policy/modules/services/privoxy.te | 5 ++ policy/modules/services/xfs.te | 1 policy/modules/services/xserver.if | 20 +++++++++++ policy/modules/system/authlogin.te | 2 + policy/modules/system/fstools.te | 5 ++ policy/modules/system/init.te | 1 policy/modules/system/libraries.fc | 4 +- policy/modules/system/logging.if | 32 +++++++++++++++++ policy/modules/system/mount.te | 2 + policy/modules/system/selinuxutil.fc | 6 +++ policy/modules/system/selinuxutil.te | 52 ++++++++++++++++++++++++++++ policy/modules/system/unconfined.if | 8 ---- policy/modules/system/userdomain.te | 4 +- 30 files changed, 244 insertions(+), 26 deletions(-) Index: policy-20060323.patch =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20060323.patch,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- policy-20060323.patch 30 Mar 2006 19:57:31 -0000 1.4 +++ policy-20060323.patch 30 Mar 2006 22:27:52 -0000 1.5 @@ -146,7 +146,7 @@ + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.if serefpolicy-2.2.28/policy/modules/kernel/files.if --- nsaserefpolicy/policy/modules/kernel/files.if 2006-03-28 23:09:36.000000000 -0500 -+++ serefpolicy-2.2.28/policy/modules/kernel/files.if 2006-03-29 14:44:17.000000000 -0500 ++++ serefpolicy-2.2.28/policy/modules/kernel/files.if 2006-03-30 16:57:12.000000000 -0500 @@ -1643,6 +1643,21 @@ ') @@ -223,6 +223,17 @@ seutil_sigchld_newrole(apmd_t) ') +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/automount.te serefpolicy-2.2.28/policy/modules/services/automount.te +--- nsaserefpolicy/policy/modules/services/automount.te 2006-03-24 11:54:27.000000000 -0500 ++++ serefpolicy-2.2.28/policy/modules/services/automount.te 2006-03-30 17:24:29.000000000 -0500 +@@ -123,6 +123,7 @@ + logging_search_logs(automount_t) + + miscfiles_read_localization(automount_t) ++miscfiles_read_certs(automount_t) + + # Run mount in the mount_t domain. + mount_domtrans(automount_t) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bluetooth.te serefpolicy-2.2.28/policy/modules/services/bluetooth.te --- nsaserefpolicy/policy/modules/services/bluetooth.te 2006-03-29 14:26:02.000000000 -0500 +++ serefpolicy-2.2.28/policy/modules/services/bluetooth.te 2006-03-29 14:44:17.000000000 -0500 @@ -256,6 +267,17 @@ fs_getattr_all_fs(hplip_t) fs_search_auto_mountpoints(hplip_t) +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dbus.te serefpolicy-2.2.28/policy/modules/services/dbus.te +--- nsaserefpolicy/policy/modules/services/dbus.te 2006-03-24 11:54:27.000000000 -0500 ++++ serefpolicy-2.2.28/policy/modules/services/dbus.te 2006-03-30 17:24:01.000000000 -0500 +@@ -102,6 +102,7 @@ + logging_send_syslog_msg(system_dbusd_t) + + miscfiles_read_localization(system_dbusd_t) ++miscfiles_read_certs(system_dbusd_t) + + seutil_read_config(system_dbusd_t) + seutil_read_default_contexts(system_dbusd_t) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dovecot.te serefpolicy-2.2.28/policy/modules/services/dovecot.te --- nsaserefpolicy/policy/modules/services/dovecot.te 2006-03-24 11:54:28.000000000 -0500 +++ serefpolicy-2.2.28/policy/modules/services/dovecot.te 2006-03-29 14:44:17.000000000 -0500 @@ -296,8 +318,16 @@ tunable_policy(`allow_ftpd_anon_write',` diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.te serefpolicy-2.2.28/policy/modules/services/hal.te --- nsaserefpolicy/policy/modules/services/hal.te 2006-03-24 11:54:28.000000000 -0500 -+++ serefpolicy-2.2.28/policy/modules/services/hal.te 2006-03-29 14:44:17.000000000 -0500 -@@ -211,6 +211,10 @@ ++++ serefpolicy-2.2.28/policy/modules/services/hal.te 2006-03-30 15:04:04.000000000 -0500 +@@ -52,6 +52,7 @@ + kernel_write_proc_files(hald_t) + + files_search_boot(hald_t) ++files_getattr_home_dir(hald_t) + + corecmd_exec_bin(hald_t) + corecmd_exec_sbin(hald_t) +@@ -211,6 +212,10 @@ ') optional_policy(` @@ -612,14 +642,13 @@ ######################################## diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-2.2.28/policy/modules/system/userdomain.te --- nsaserefpolicy/policy/modules/system/userdomain.te 2006-03-28 23:09:37.000000000 -0500 -+++ serefpolicy-2.2.28/policy/modules/system/userdomain.te 2006-03-30 14:37:04.000000000 -0500 -@@ -179,10 +179,11 @@ ++++ serefpolicy-2.2.28/policy/modules/system/userdomain.te 2006-03-30 15:11:51.000000000 -0500 +@@ -179,10 +179,10 @@ mls_file_downgrade(secadm_t) init_exec(secadm_t) logging_read_audit_log(secadm_t) - logging_domtrans_auditctl(secadm_t) -+ logging_run_auditctl(secadm_t, secadm_r, admin_terminal) -+ logging_domtrans_auditctl ++ logging_run_auditctl(secadm_t,secadm_r,admin_terminal) userdom_dontaudit_append_staff_home_content_files(secadm_t) ', ` - logging_domtrans_auditctl(sysadm_t) Index: selinux-policy.spec =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v retrieving revision 1.163 retrieving revision 1.164 diff -u -r1.163 -r1.164 --- selinux-policy.spec 30 Mar 2006 19:57:31 -0000 1.163 +++ selinux-policy.spec 30 Mar 2006 22:27:52 -0000 1.164 @@ -16,7 +16,7 @@ Summary: SELinux policy configuration Name: selinux-policy Version: 2.2.28 -Release: 2 +Release: 3 License: GPL Group: System Environment/Base Source: serefpolicy-%{version}.tgz @@ -320,7 +320,10 @@ %endif %changelog -* Mon Mar 27 2006 Dan Walsh 2.2.28-2 +* Fri Mar 30 2006 Dan Walsh 2.2.28-3 +- Allow automount and dbus to read cert files + +* Fri Mar 30 2006 Dan Walsh 2.2.28-2 - Fix ftp policy - Fix secadm running of auditctl From fedora-cvs-commits at redhat.com Thu Mar 30 23:19:46 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 30 Mar 2006 18:19:46 -0500 Subject: rpms/mkinitrd/devel .cvsignore, 1.101, 1.102 mkinitrd.spec, 1.114, 1.115 sources, 1.114, 1.115 Message-ID: <200603302319.k2UNJk0a023036@cvs.devel.redhat.com> Author: pjones Update of /cvs/dist/rpms/mkinitrd/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv23021 Modified Files: .cvsignore mkinitrd.spec sources Log Message: - update to 5.0.33-1 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/mkinitrd/devel/.cvsignore,v retrieving revision 1.101 retrieving revision 1.102 diff -u -r1.101 -r1.102 --- .cvsignore 13 Mar 2006 16:57:52 -0000 1.101 +++ .cvsignore 30 Mar 2006 23:19:43 -0000 1.102 @@ -1 +1 @@ -mkinitrd-5.0.32.tar.bz2 +mkinitrd-5.0.33.tar.bz2 Index: mkinitrd.spec =================================================================== RCS file: /cvs/dist/rpms/mkinitrd/devel/mkinitrd.spec,v retrieving revision 1.114 retrieving revision 1.115 diff -u -r1.114 -r1.115 --- mkinitrd.spec 13 Mar 2006 16:57:52 -0000 1.114 +++ mkinitrd.spec 30 Mar 2006 23:19:43 -0000 1.115 @@ -1,6 +1,6 @@ Summary: Creates an initial ramdisk image for preloading modules. Name: mkinitrd -Version: 5.0.32 +Version: 5.0.33 Release: 1 License: GPL Group: System Environment/Base @@ -63,6 +63,13 @@ %attr(644,root,root) %{_mandir}/man8/grubby.8* %changelog +* Thu Mar 30 2006 Peter Jones - 5.0.33-1 +- fix unbalanced pushd in mkinitrd (patch from Pete Zaitcev, bz# 185822) +- add "cond" command for simple conditionals (bz# 182938) +- add "status" command to see/set the exit status for testing +- add "--remove-args" and "--update" args for new-kernel-pkg (patch from + Don Zickus, bz# 183917) + * Mon Mar 13 2006 Peter Jones - 5.0.32-1 - handle sd_mod on scsi_mod in findmodule, not in the scsi setup. This fixes the "no scsi_hostadapter" alias problem better (#182008). Index: sources =================================================================== RCS file: /cvs/dist/rpms/mkinitrd/devel/sources,v retrieving revision 1.114 retrieving revision 1.115 diff -u -r1.114 -r1.115 --- sources 13 Mar 2006 18:01:59 -0000 1.114 +++ sources 30 Mar 2006 23:19:43 -0000 1.115 @@ -1 +1 @@ -73c36d759e845737c9571a856f6f8605 mkinitrd-5.0.32.tar.bz2 +379ebd6b5e6b799b3621a225be5df82b mkinitrd-5.0.33.tar.bz2 From fedora-cvs-commits at redhat.com Thu Mar 30 23:36:33 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 30 Mar 2006 18:36:33 -0500 Subject: rpms/bind/devel bind-9.3.2-bz187286_fix_host_cname.patch,NONE,1.1 Message-ID: <200603302336.k2UNaXr3023255@cvs.devel.redhat.com> Author: jvdias Update of /cvs/dist/rpms/bind/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv23242 Added Files: bind-9.3.2-bz187286_fix_host_cname.patch Log Message: fix bug 187286: upstream ISC bug #15702: make host(1) use any cname returned for the A lookup for the AAAA and MX lookups, avoiding redundant "is an alias for" messages bind-9.3.2-bz187286_fix_host_cname.patch: host.c | 66 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 65 insertions(+), 1 deletion(-) --- NEW FILE bind-9.3.2-bz187286_fix_host_cname.patch --- --- bind-9.3.2/bin/dig/host.c.bz187286_fix_host_cname 2006-03-29 19:16:03.000000000 -0500 +++ bind-9.3.2/bin/dig/host.c 2006-03-30 17:53:12.000000000 -0500 @@ -37,6 +37,7 @@ #include #include #include +#include #include @@ -328,6 +329,60 @@ } static isc_result_t +get_cname( dig_query_t *query, dns_message_t *msg, char *cnamestr, int cnamestrlen ) +{ + /* check for a cname result in msg answer section; if present, copy it into cnamestr + * Jason Vas Dias, Red Hat, Inc. fix for bugzilla 187286 (RT #15702) + */ + isc_result_t result; + dns_name_t *aname; + dns_rdataset_t *rdataset; + dns_rdata_t rdata = DNS_RDATA_INIT; + + *cnamestr = '\0'; + + result = dns_message_firstname(msg, DNS_SECTION_ANSWER); + if (result != ISC_R_SUCCESS) + return ISC_R_FAILURE; + + do + { + aname = NULL; + dns_message_currentname(msg, DNS_SECTION_ANSWER, &aname); + if ( aname + &&(dns_name_equal(query->lookup->name, aname) == ISC_TRUE) + ) + { + for (rdataset = ISC_LIST_HEAD(aname->list); + rdataset != NULL; + rdataset = ISC_LIST_NEXT(rdataset, link)) + { + isc_result_t loopresult = dns_rdataset_first(rdataset); + while (loopresult == ISC_R_SUCCESS) + { + dns_rdataset_current(rdataset, &rdata); + if ( rdata.type == dns_rdatatype_cname ) + { + dns_rdata_cname_t cname; + if ( dns_rdata_tostruct( &rdata, &cname, NULL ) + == ISC_R_SUCCESS + ) + { + dns_name_format(&(cname.cname), cnamestr, cnamestrlen ); + return ( ISC_R_SUCCESS ); + } + } + dns_rdata_reset(&rdata); + loopresult = dns_rdataset_next(rdataset); + } + } + } + } while ( dns_message_nextname(msg, DNS_SECTION_ANSWER) == ISC_R_SUCCESS ); + + return ( ISC_R_FAILURE ); +} + +static isc_result_t printrdata(dns_message_t *msg, dns_rdataset_t *rdataset, dns_name_t *owner, const char *set_name, isc_boolean_t headers) { @@ -393,7 +448,16 @@ /* Add AAAA and MX lookups. */ - dns_name_format(query->lookup->name, namestr, sizeof(namestr)); + if ( ! ISC_LIST_EMPTY( msg->sections[DNS_SECTION_ANSWER] ) ) + { + /* check for CNAME answer ; if present, then use canonical name for + * AAAA and MX lookups. + */ + if ( get_cname( query, msg, namestr, sizeof(namestr) ) != ISC_R_SUCCESS ) + dns_name_format(query->lookup->name, namestr, sizeof(namestr)); + } else /* use same name for AAAA and MX lookups */ + dns_name_format(query->lookup->name, namestr, sizeof(namestr)); + lookup = clone_lookup(query->lookup, ISC_FALSE); if (lookup != NULL) { strncpy(lookup->textname, namestr, From fedora-cvs-commits at redhat.com Thu Mar 30 23:37:16 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 30 Mar 2006 18:37:16 -0500 Subject: rpms/bind/devel bind.spec,1.101,1.102 Message-ID: <200603302337.k2UNbGuh023279@cvs.devel.redhat.com> Author: jvdias Update of /cvs/dist/rpms/bind/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv23266 Modified Files: bind.spec Log Message: fix bugs 187286, 187333 Index: bind.spec =================================================================== RCS file: /cvs/dist/rpms/bind/devel/bind.spec,v retrieving revision 1.101 retrieving revision 1.102 diff -u -r1.101 -r1.102 --- bind.spec 30 Mar 2006 16:35:58 -0000 1.101 +++ bind.spec 30 Mar 2006 23:37:14 -0000 1.102 @@ -17,7 +17,7 @@ Name: bind License: BSD-like Version: 9.3.2 -Release: 14.FC6 +Release: 16.FC6 Epoch: 30 Url: http://www.isc.org/products/BIND/ Buildroot: %{_tmppath}/%{name}-root @@ -86,6 +86,7 @@ Patch27: bind-9.3.1-dbus_restart.patch Patch28: bind-9.3.2rc1-dbus-0.6.patch Patch29: bind-9.3.2-bz177854.patch +Patch30: bind-9.3.2-bz187286_fix_host_cname.patch # Requires: bind-libs = %{epoch}:%{version}-%{release}, glibc >= 2.2 Requires(post): bash, coreutils, sed, grep, chkconfig >= 1.3.26 @@ -311,6 +312,7 @@ %patch28 -p1 -b .dbus-0.6 # this patch no longer required (kernel now fixed): # %patch29 -p1 -b .bz177854 +%patch30 -p1 -b .bz187286_fix_host_cname # # this must follow all dbus patches: %if %{SDB} @@ -794,7 +796,15 @@ :; %changelog -* Wed Mar 29 2006 Jason Vsa Dias - 30:9.3.2-14 +* Thu Mar 30 2006 Jason Vas Dias - 30:9.3.2-16 +- fix bug 187286: + prevent host(1) printing duplicate 'is an alias for' messages + for the default AAAA and MX lookups as well as for the A lookup + (it now uses the CNAME returned for the A lookup for the AAAA and MX lookups). + This is upstream bug #15702 fixed in the unreleased bind-9.3.3 +- fix bug 187333: fix SOURCE24 and SOURCE25 transposition + +* Wed Mar 29 2006 Jason Vas Dias - 30:9.3.2-14 - fix bug 186577: remove -L/usr/lib from libbind.pc and more .spec file cleanup - add '%doc' sample configuration files in /usr/share/doc/bind*/sample - rebuild with new gcc and glibc From fedora-cvs-commits at redhat.com Thu Mar 30 23:54:39 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 30 Mar 2006 18:54:39 -0500 Subject: rpms/bind/FC-4 bind-9.3.1-bz187286_fix_host_cname.patch, NONE, 1.1 bind.spec, 1.74, 1.75 Message-ID: <200603302354.k2UNsd1h004833@cvs.devel.redhat.com> Author: jvdias Update of /cvs/dist/rpms/bind/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv4816 Modified Files: bind.spec Added Files: bind-9.3.1-bz187286_fix_host_cname.patch Log Message: fix bug 187286: prevent host(1) generating redundant "is an alias for" messages bind-9.3.1-bz187286_fix_host_cname.patch: host.c | 66 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 65 insertions(+), 1 deletion(-) --- NEW FILE bind-9.3.1-bz187286_fix_host_cname.patch --- --- bind-9.3.1/bin/dig/host.c.bz187286_fix_host_cname 2006-03-30 18:16:37.000000000 -0500 +++ bind-9.3.1/bin/dig/host.c 2006-03-30 18:19:03.000000000 -0500 @@ -37,6 +37,7 @@ #include #include #include +#include #include @@ -343,6 +344,60 @@ } static isc_result_t +get_cname( dig_query_t *query, dns_message_t *msg, char *cnamestr, int cnamestrlen ) +{ + /* check for a cname result in msg answer section; if present, copy it into cnamestr + * Jason Vas Dias, Red Hat, Inc. fix for bugzilla 187286 (RT #15702) + */ + isc_result_t result; + dns_name_t *aname; + dns_rdataset_t *rdataset; + dns_rdata_t rdata = DNS_RDATA_INIT; + + *cnamestr = '\0'; + + result = dns_message_firstname(msg, DNS_SECTION_ANSWER); + if (result != ISC_R_SUCCESS) + return ISC_R_FAILURE; + + do + { + aname = NULL; + dns_message_currentname(msg, DNS_SECTION_ANSWER, &aname); + if ( aname + &&(dns_name_equal(query->lookup->name, aname) == ISC_TRUE) + ) + { + for (rdataset = ISC_LIST_HEAD(aname->list); + rdataset != NULL; + rdataset = ISC_LIST_NEXT(rdataset, link)) + { + isc_result_t loopresult = dns_rdataset_first(rdataset); + while (loopresult == ISC_R_SUCCESS) + { + dns_rdataset_current(rdataset, &rdata); + if ( rdata.type == dns_rdatatype_cname ) + { + dns_rdata_cname_t cname; + if ( dns_rdata_tostruct( &rdata, &cname, NULL ) + == ISC_R_SUCCESS + ) + { + dns_name_format(&(cname.cname), cnamestr, cnamestrlen ); + return ( ISC_R_SUCCESS ); + } + } + dns_rdata_reset(&rdata); + loopresult = dns_rdataset_next(rdataset); + } + } + } + } while ( dns_message_nextname(msg, DNS_SECTION_ANSWER) == ISC_R_SUCCESS ); + + return ( ISC_R_FAILURE ); +} + +static isc_result_t printrdata(dns_message_t *msg, dns_rdataset_t *rdataset, dns_name_t *owner, const char *set_name, isc_boolean_t headers) { @@ -408,7 +463,16 @@ /* Add AAAA and MX lookups. */ - dns_name_format(query->lookup->name, namestr, sizeof(namestr)); + if ( ! ISC_LIST_EMPTY( msg->sections[DNS_SECTION_ANSWER] ) ) + { + /* check for CNAME answer ; if present, then use canonical name for + * AAAA and MX lookups. + */ + if ( get_cname( query, msg, namestr, sizeof(namestr) ) != ISC_R_SUCCESS ) + dns_name_format(query->lookup->name, namestr, sizeof(namestr)); + } else /* use same name for AAAA and MX lookups */ + dns_name_format(query->lookup->name, namestr, sizeof(namestr)); + lookup = clone_lookup(query->lookup, ISC_FALSE); if (lookup != NULL) { strncpy(lookup->textname, namestr, Index: bind.spec =================================================================== RCS file: /cvs/dist/rpms/bind/FC-4/bind.spec,v retrieving revision 1.74 retrieving revision 1.75 diff -u -r1.74 -r1.75 --- bind.spec 20 Mar 2006 21:52:25 -0000 1.74 +++ bind.spec 30 Mar 2006 23:54:37 -0000 1.75 @@ -9,7 +9,7 @@ Name: bind License: BSD-like Version: 9.3.1 -Release: 18.FC4 +Release: 20.FC4 Epoch: 24 Url: http://www.isc.org/products/BIND/ Buildroot: %{_tmppath}/%{name}-root @@ -60,6 +60,8 @@ Patch24: bind-9.3.1-t_no_default_lookups.patch Patch25: bind-9.3.1-fix_dbus.patch Patch26: bind-9.3.1-dbus_archdep_libdir_sdb.patch +Patch27: bind-9.3.1-bz187286_fix_host_cname.patch +# Requires(pre,preun): shadow-utils Requires(post,preun): chkconfig Requires(post): textutils, fileutils, sed, grep @@ -235,6 +237,7 @@ %patch23 -p1 -b .dbus_archdep_libdir %endif %patch24 -p1 -b .-t_no_default_lookups +%patch27 -p1 -b .bz187286_fix_host_cname %build libtoolize --copy --force; aclocal; autoconf @@ -742,6 +745,9 @@ :; %changelog +* Thu Mar 30 2006 Jason Vas Dias - 24:9.3.1-20 +- fix bug 187286: prevent host(1) generating redundant 'is alias for' messages + * Tue Mar 07 2006 Jason Vas Dias - 24:9.3.1-16 - fix bug 179816: fix builds for all combinations of WITH_DBUS=0/1 SDB=0/1 LIBBIND=0/1 - fix bug 177595: handle case where $ROOTDIR is a link in initscript From fedora-cvs-commits at redhat.com Thu Mar 30 23:54:44 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 30 Mar 2006 18:54:44 -0500 Subject: rpms/kernel/devel kernel-2.6.spec,1.2106,1.2107 Message-ID: <200603302354.k2UNsiPa004862@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv4825 Modified Files: kernel-2.6.spec Log Message: turn on MSI again Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.2106 retrieving revision 1.2107 diff -u -r1.2106 -r1.2107 --- kernel-2.6.spec 30 Mar 2006 20:48:55 -0000 1.2106 +++ kernel-2.6.spec 30 Mar 2006 23:54:42 -0000 1.2107 @@ -1632,6 +1632,7 @@ %changelog * Thu Mar 30 2006 Dave Jones - 2.6.16-git18 +- Reenable CONFIG_PCI_MSI * Wed Mar 29 2006 Dave Jones - 2.6.16-git16 & git17 From fedora-cvs-commits at redhat.com Thu Mar 30 23:54:44 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 30 Mar 2006 18:54:44 -0500 Subject: rpms/kernel/devel/configs config-generic,1.172,1.173 Message-ID: <200603302354.k2UNsi5Y004876@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel/configs In directory cvs.devel.redhat.com:/tmp/cvs-serv4825/configs Modified Files: config-generic Log Message: turn on MSI again Index: config-generic =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/configs/config-generic,v retrieving revision 1.172 retrieving revision 1.173 diff -u -r1.172 -r1.173 --- config-generic 28 Mar 2006 23:02:21 -0000 1.172 +++ config-generic 30 Mar 2006 23:54:42 -0000 1.173 @@ -58,7 +58,7 @@ # CONFIG_PCI=y # CONFIG_PCI_DEBUG is not set -# CONFIG_PCI_MSI is not set +CONFIG_PCI_MSI=y CONFIG_PCI_LEGACY_PROC=y CONFIG_PCIEPORTBUS=y CONFIG_HOTPLUG_PCI_PCIE=m From fedora-cvs-commits at redhat.com Thu Mar 30 23:57:08 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 30 Mar 2006 18:57:08 -0500 Subject: rpms/kernel/devel kernel-2.6.spec,1.2107,1.2108 Message-ID: <200603302357.k2UNv8ju004941@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv4928 Modified Files: kernel-2.6.spec Log Message: trailing whitespace removal Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.2107 retrieving revision 1.2108 diff -u -r1.2107 -r1.2108 --- kernel-2.6.spec 30 Mar 2006 23:54:42 -0000 1.2107 +++ kernel-2.6.spec 30 Mar 2006 23:57:06 -0000 1.2108 @@ -35,7 +35,7 @@ # groups of related archs %define all_x86 i586 i686 -# Override generic defaults with per-arch defaults +# Override generic defaults with per-arch defaults %ifarch noarch %define builddoc 1 @@ -138,10 +138,10 @@ # %define kernel_dot_org_conflicts ppp < 2.4.3-3, isdn4k-utils < 3.2-32, nfs-utils < 1.0.7-12, e2fsprogs < 1.37-4, util-linux < 2.12, jfsutils < 1.1.7-2, reiserfs-utils < 3.6.19-2, xfsprogs < 2.6.13-4, procps < 3.2.5-6.3, oprofile < 0.9.1-2 -# -# Then a series of requirements that are distribution specific, either -# because we add patches for something, or the older versions have -# problems with the newer kernel or lack certain things that make +# +# Then a series of requirements that are distribution specific, either +# because we add patches for something, or the older versions have +# problems with the newer kernel or lack certain things that make # integration in the distro harder than needed. # %define package_conflicts kudzu < 1.2.5, initscripts < 7.23, udev < 063-6, iptables < 1.3.2-1, ipw2200-firmware < 2.4, selinux-policy-targeted < 1.25.3-14 @@ -422,7 +422,7 @@ Obsoletes: kernel-smp %endif -%description +%description The kernel package contains the Linux kernel (vmlinuz), the core of any Linux operating system. The kernel handles the basic functions of the operating system: memory allocation, process allocation, device @@ -447,7 +447,7 @@ %description doc This package contains documentation files from the kernel source. Various bits of information about the Linux kernel and the -device drivers shipped with it are documented in these files. +device drivers shipped with it are documented in these files. You'll want to install this package if you need a reference to the options that can be passed to Linux kernel modules at load time. @@ -503,7 +503,7 @@ Conflicts: %{package_conflicts} Conflicts: %{xen_conflicts} # the hypervisor kernel needs a newer mkinitrd than everything else right now -Conflicts: mkinitrd <= 4.2.0 +Conflicts: mkinitrd <= 4.2.0 # We can't let RPM do the dependencies automatic because it'll then pick up # a correct but undesirable perl dependency from the module headers which # isn't required for the kernel proper to function @@ -542,7 +542,7 @@ Conflicts: %{package_conflicts} Conflicts: %{xen_conflicts} # the xen0-PAE kernel needs a newer mkinitrd than everything else right now -Conflicts: mkinitrd <= 4.2.0 +Conflicts: mkinitrd <= 4.2.0 # We can't let RPM do the dependencies automatic because it'll then pick up # a correct but undesirable perl dependency from the module headers which # isn't required for the kernel proper to function @@ -788,7 +788,7 @@ done # Delete the rest of the backup files, they just confuse the build later find -name "*.p.xen" | xargs rm -f - + # # Xen includes a patch which moves the vsyscall fixmap into a user-space VA, # freeing user-space from reliance on an absolute fixmap area and so allowing @@ -877,7 +877,7 @@ %patch1034 -p1 # -# Make /dev/mem a need-to-know function +# Make /dev/mem a need-to-know function # %patch1050 -p1 %if %{includexen} @@ -1046,8 +1046,8 @@ # now run oldconfig over all the config files for i in *.config -do - mv $i .config +do + mv $i .config Arch=`head -1 .config | cut -b 3-` %if %{includexen} make ARCH=$Arch nonint_oldconfig > /dev/null @@ -1057,7 +1057,7 @@ fi %endif echo "# $Arch" > configs/$i - cat .config >> configs/$i + cat .config >> configs/$i done # make sure the kernel has the sublevel we know it has. This looks weird @@ -1077,8 +1077,8 @@ # Create gpg keys for signing the modules # -gpg --homedir . --batch --gen-key %{SOURCE11} -gpg --homedir . --export --keyring ./kernel.pub Red > extract.pub +gpg --homedir . --batch --gen-key %{SOURCE11} +gpg --homedir . --export --keyring ./kernel.pub Red > extract.pub make linux-%{kversion}.%{_target_cpu}/scripts/bin2c linux-%{kversion}.%{_target_cpu}/scripts/bin2c ksign_def_public_key __initdata < extract.pub > linux-%{kversion}.%{_target_cpu}/crypto/signature/key.h @@ -1213,10 +1213,10 @@ # gpg sign the modules %if %{signmodules} gcc -o scripts/modsign/mod-extract scripts/modsign/mod-extract.c -Wall - KEYFLAGS="--no-default-keyring --homedir .." - KEYFLAGS="$KEYFLAGS --secret-keyring ../kernel.sec" - KEYFLAGS="$KEYFLAGS --keyring ../kernel.pub" - export KEYFLAGS + KEYFLAGS="--no-default-keyring --homedir .." + KEYFLAGS="$KEYFLAGS --secret-keyring ../kernel.sec" + KEYFLAGS="$KEYFLAGS --keyring ../kernel.pub" + export KEYFLAGS for i in `cat modnames` do @@ -1232,7 +1232,7 @@ # detect missing or incorrect license tags for i in `cat modnames` do - echo -n "$i " + echo -n "$i " /sbin/modinfo -l $i >> modinfo done cat modinfo |\ @@ -1240,7 +1240,7 @@ grep -v "^Dual BSD/GPL" |\ grep -v "^Dual MPL/GPL" |\ grep -v "^GPL and additional rights" |\ - grep -v "^GPL v2" && exit 1 + grep -v "^GPL v2" && exit 1 rm -f modinfo rm -f modnames # remove files that will be auto generated by depmod at rpm -i time @@ -1350,7 +1350,7 @@ # load the loop module for upgrades...in case the old modules get removed we have # loopback in the kernel so that mkinitrd will work. -%pre +%pre /sbin/modprobe loop 2> /dev/null > /dev/null || : exit 0 @@ -1358,7 +1358,7 @@ /sbin/modprobe loop 2> /dev/null > /dev/null || : exit 0 -%post +%post if [ `uname -i` == "x86_64" ]; then if [ -f /etc/sysconfig/kernel ]; then /bin/sed -i -e 's/^DEFAULTKERNEL=kernel-smp$/DEFAULTKERNEL=kernel/' /etc/sysconfig/kernel From fedora-cvs-commits at redhat.com Fri Mar 31 00:31:06 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 30 Mar 2006 19:31:06 -0500 Subject: rpms/bind/FC-5 bind-9.3.2-bz187286_fix_host_cname.patch,NONE,1.1 Message-ID: <200603310031.k2V0V6qp018872@cvs.devel.redhat.com> Author: jvdias Update of /cvs/dist/rpms/bind/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv18857 Added Files: bind-9.3.2-bz187286_fix_host_cname.patch Log Message: fix bug 187286: upstream ISC bug #15702: make host(1) use any cname returned for the A lookup for the AAAA and MX lookups, avoiding redundant "is an alias for" messages bind-9.3.2-bz187286_fix_host_cname.patch: host.c | 66 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 65 insertions(+), 1 deletion(-) --- NEW FILE bind-9.3.2-bz187286_fix_host_cname.patch --- --- bind-9.3.2/bin/dig/host.c.bz187286_fix_host_cname 2006-03-29 19:16:03.000000000 -0500 +++ bind-9.3.2/bin/dig/host.c 2006-03-30 17:53:12.000000000 -0500 @@ -37,6 +37,7 @@ #include #include #include +#include #include @@ -328,6 +329,60 @@ } static isc_result_t +get_cname( dig_query_t *query, dns_message_t *msg, char *cnamestr, int cnamestrlen ) +{ + /* check for a cname result in msg answer section; if present, copy it into cnamestr + * Jason Vas Dias, Red Hat, Inc. fix for bugzilla 187286 (RT #15702) + */ + isc_result_t result; + dns_name_t *aname; + dns_rdataset_t *rdataset; + dns_rdata_t rdata = DNS_RDATA_INIT; + + *cnamestr = '\0'; + + result = dns_message_firstname(msg, DNS_SECTION_ANSWER); + if (result != ISC_R_SUCCESS) + return ISC_R_FAILURE; + + do + { + aname = NULL; + dns_message_currentname(msg, DNS_SECTION_ANSWER, &aname); + if ( aname + &&(dns_name_equal(query->lookup->name, aname) == ISC_TRUE) + ) + { + for (rdataset = ISC_LIST_HEAD(aname->list); + rdataset != NULL; + rdataset = ISC_LIST_NEXT(rdataset, link)) + { + isc_result_t loopresult = dns_rdataset_first(rdataset); + while (loopresult == ISC_R_SUCCESS) + { + dns_rdataset_current(rdataset, &rdata); + if ( rdata.type == dns_rdatatype_cname ) + { + dns_rdata_cname_t cname; + if ( dns_rdata_tostruct( &rdata, &cname, NULL ) + == ISC_R_SUCCESS + ) + { + dns_name_format(&(cname.cname), cnamestr, cnamestrlen ); + return ( ISC_R_SUCCESS ); + } + } + dns_rdata_reset(&rdata); + loopresult = dns_rdataset_next(rdataset); + } + } + } + } while ( dns_message_nextname(msg, DNS_SECTION_ANSWER) == ISC_R_SUCCESS ); + + return ( ISC_R_FAILURE ); +} + +static isc_result_t printrdata(dns_message_t *msg, dns_rdataset_t *rdataset, dns_name_t *owner, const char *set_name, isc_boolean_t headers) { @@ -393,7 +448,16 @@ /* Add AAAA and MX lookups. */ - dns_name_format(query->lookup->name, namestr, sizeof(namestr)); + if ( ! ISC_LIST_EMPTY( msg->sections[DNS_SECTION_ANSWER] ) ) + { + /* check for CNAME answer ; if present, then use canonical name for + * AAAA and MX lookups. + */ + if ( get_cname( query, msg, namestr, sizeof(namestr) ) != ISC_R_SUCCESS ) + dns_name_format(query->lookup->name, namestr, sizeof(namestr)); + } else /* use same name for AAAA and MX lookups */ + dns_name_format(query->lookup->name, namestr, sizeof(namestr)); + lookup = clone_lookup(query->lookup, ISC_FALSE); if (lookup != NULL) { strncpy(lookup->textname, namestr, From fedora-cvs-commits at redhat.com Fri Mar 31 00:31:36 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 30 Mar 2006 19:31:36 -0500 Subject: rpms/bind/FC-5 bind.spec,1.100,1.101 Message-ID: <200603310031.k2V0VaMP018895@cvs.devel.redhat.com> Author: jvdias Update of /cvs/dist/rpms/bind/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv18882 Modified Files: bind.spec Log Message: fix bugs 187286, 187333 Index: bind.spec =================================================================== RCS file: /cvs/dist/rpms/bind/FC-5/bind.spec,v retrieving revision 1.100 retrieving revision 1.101 diff -u -r1.100 -r1.101 --- bind.spec 30 Mar 2006 01:05:58 -0000 1.100 +++ bind.spec 31 Mar 2006 00:31:34 -0000 1.101 @@ -17,7 +17,7 @@ Name: bind License: BSD-like Version: 9.3.2 -Release: 14.FC5 +Release: 16.FC5 Epoch: 30 Url: http://www.isc.org/products/BIND/ Buildroot: %{_tmppath}/%{name}-root @@ -86,6 +86,7 @@ Patch27: bind-9.3.1-dbus_restart.patch Patch28: bind-9.3.2rc1-dbus-0.6.patch Patch29: bind-9.3.2-bz177854.patch +Patch30: bind-9.3.2-bz187286_fix_host_cname.patch # Requires: bind-libs = %{epoch}:%{version}-%{release}, glibc >= 2.2 Requires(post): bash, coreutils, sed, grep, chkconfig >= 1.3.26 @@ -311,6 +312,7 @@ %patch28 -p1 -b .dbus-0.6 # this patch no longer required (kernel now fixed): # %patch29 -p1 -b .bz177854 +%patch30 -p1 -b .bz187286_fix_host_cname # # this must follow all dbus patches: %if %{SDB} @@ -460,8 +462,8 @@ for f in /etc/named.caching-nameserver.conf /var/named/{named.ca,named.local,localhost.zone,localdomain.zone,named.ip6.local,named.broadcast,named.zero}; do touch ${RPM_BUILD_ROOT}/%{chroot_prefix}/$f; done -install -m 644 %{SOURCE24} ./rfc1912.txt -install -m 644 %{SOURCE25} ./Copyright +install -m 644 %{SOURCE25} ./rfc1912.txt +install -m 644 %{SOURCE24} ./Copyright # bind-chroot-admin script: sed -e 's^@BIND_CHROOT_PREFIX@^'%{chroot_prefix}'^;s^@BIND_DIR@^'%{bind_dir}'^' < %{SOURCE26} > bind-chroot-admin; install -m 754 bind-chroot-admin ${RPM_BUILD_ROOT}/%{_sbindir} @@ -794,7 +796,15 @@ :; %changelog -* Wed Mar 29 2006 Jason Vsa Dias - 30:9.3.2-14 +* Thu Mar 30 2006 Jason Vas Dias - 30:9.3.2-16 +- fix bug 187286: + prevent host(1) printing duplicate 'is an alias for' messages + for the default AAAA and MX lookups as well as for the A lookup + (it now uses the CNAME returned for the A lookup for the AAAA and MX lookups). + This is upstream bug #15702 fixed in the unreleased bind-9.3.3 +- fix bug 187333: fix SOURCE24 and SOURCE25 transposition + +* Wed Mar 29 2006 Jason Vas Dias - 30:9.3.2-14 - fix bug 186577: remove -L/usr/lib from libbind.pc and more .spec file cleanup - add '%doc' sample configuration files in /usr/share/doc/bind*/sample - rebuild with new gcc and glibc From fedora-cvs-commits at redhat.com Fri Mar 31 04:02:39 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 30 Mar 2006 23:02:39 -0500 Subject: rpms/kernel/FC-4 kernel-2.6.spec,1.1616,1.1617 Message-ID: <200603310402.k2V42dqc018770@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv18749 Modified Files: kernel-2.6.spec Log Message: disable edac debug. Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-4/kernel-2.6.spec,v retrieving revision 1.1616 retrieving revision 1.1617 diff -u -r1.1616 -r1.1617 --- kernel-2.6.spec 30 Mar 2006 19:11:43 -0000 1.1616 +++ kernel-2.6.spec 31 Mar 2006 04:02:34 -0000 1.1617 @@ -1064,6 +1064,7 @@ %changelog * Thu Mar 30 2006 Dave Jones - ship the .kernelrelease file in -devel too. +- Disable EDAC debug. * Tue Mar 26 2006 Dave Jones [2.6.16-1.2069_FC4] - 2.6.16.1 From fedora-cvs-commits at redhat.com Fri Mar 31 04:02:39 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 30 Mar 2006 23:02:39 -0500 Subject: rpms/kernel/FC-4/configs config-x86-generic,1.21,1.22 Message-ID: <200603310402.k2V42dJw018779@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/FC-4/configs In directory cvs.devel.redhat.com:/tmp/cvs-serv18749/configs Modified Files: config-x86-generic Log Message: disable edac debug. Index: config-x86-generic =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-4/configs/config-x86-generic,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- config-x86-generic 28 Mar 2006 16:14:10 -0000 1.21 +++ config-x86-generic 31 Mar 2006 04:02:37 -0000 1.22 @@ -281,7 +281,7 @@ CONFIG_CS5535_GPIO=m CONFIG_EDAC=y -CONFIG_EDAC_DEBUG=y +# CONFIG_EDAC_DEBUG is not set CONFIG_EDAC_MM_EDAC=m CONFIG_EDAC_AMD76X=m CONFIG_EDAC_E7XXX=m From fedora-cvs-commits at redhat.com Fri Mar 31 04:22:44 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 30 Mar 2006 23:22:44 -0500 Subject: rpms/gnome-screensaver/FC-5 gnome-screensaver-2.14.0-pass-krb-environment.patch, NONE, 1.1 gnome-screensaver.spec, 1.62, 1.63 Message-ID: <200603310422.k2V4MiJw032577@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/gnome-screensaver/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv32562 Modified Files: gnome-screensaver.spec Added Files: gnome-screensaver-2.14.0-pass-krb-environment.patch Log Message: - refresh kerberos credentials when unlocking screen (bug 187341) gnome-screensaver-2.14.0-pass-krb-environment.patch: gs-window-x11.c | 2 ++ 1 files changed, 2 insertions(+) --- NEW FILE gnome-screensaver-2.14.0-pass-krb-environment.patch --- The pam_krb5 module is happy to store fresh credentials (which it obtains when it checks your password) in your credential cache and v4 ticket file, but it needs to be able to know where to store them. --- gnome-screensaver-2.14.0/src/gs-window-x11.c 2006-03-30 19:40:16.000000000 -0500 +++ gnome-screensaver-2.14.0/src/gs-window-x11.c 2006-03-30 19:40:08.000000000 -0500 @@ -560,6 +560,8 @@ "XAUTHLOCALHOSTNAME", "LANG", "GNOME_SCREENSAVER_THEME", + "KRB5CCNAME", + "KRBTKFILE", "LANGUAGE" }; Index: gnome-screensaver.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-screensaver/FC-5/gnome-screensaver.spec,v retrieving revision 1.62 retrieving revision 1.63 diff -u -r1.62 -r1.63 --- gnome-screensaver.spec 13 Mar 2006 15:12:54 -0000 1.62 +++ gnome-screensaver.spec 31 Mar 2006 04:22:42 -0000 1.63 @@ -11,10 +11,10 @@ %define gnome_menus_version 2.11.1 %define libexif_version 0.6.12 -Summary: GNOME Sreensaver +Summary: GNOME Screensaver Name: gnome-screensaver Version: 2.14.0 -Release: 1 +Release: 1.fc5 License: GPL Group: Amusement/Graphics Source0: %{name}-%{version}.tar.bz2 @@ -27,6 +27,7 @@ Patch0: gnome-screensaver-2.13.91-lock-dialog.patch Patch1: gnome-screensaver-0.0.23-use-floaters-by-default.patch Patch2: gnome-screensaver-2.13.91-shrink-em.patch +Patch3: gnome-screensaver-2.14.0-pass-krb-environment.patch BuildRoot: %{_tmppath}/%{name}-root URL: http://www.gnome.org @@ -63,6 +64,7 @@ %patch0 -p1 -b .lock-dialog %patch1 -p1 -b .use-floaters-by-default %patch2 -p1 -b .shrink-em +%patch3 -p1 -b .pass-krb-environment %build intltoolize --force @@ -162,6 +164,10 @@ %{_sysconfdir}/pam.d/* %changelog +* Thu Mar 30 2006 Ray Strode 2.14.0-1.fc5 +- refresh kerberos credentials when unlocking screen + (bug 187341) + * Mon Mar 13 2006 Matthias Clasen 2.14.0-1 - Update to 2.14.0 From fedora-cvs-commits at redhat.com Fri Mar 31 08:14:30 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 31 Mar 2006 03:14:30 -0500 Subject: rpms/util-linux/FC-5 util-linux-2.12a-mount-man-cifs.patch, 1.1, NONE Message-ID: <200603310814.k2V8EUck001460@cvs.devel.redhat.com> Author: kzak Update of /cvs/dist/rpms/util-linux/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv1448 Removed Files: util-linux-2.12a-mount-man-cifs.patch Log Message: remove obsolete mount-man-cifs.patch --- util-linux-2.12a-mount-man-cifs.patch DELETED --- From fedora-cvs-commits at redhat.com Fri Mar 31 09:07:49 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 31 Mar 2006 04:07:49 -0500 Subject: rpms/util-linux/FC-5 util-linux-2.13-hexdump-gcc.patch, NONE, 1.1 util-linux-2.13-mount-context.patch, 1.1, 1.2 util-linux-2.13-mount-uuid.patch, 1.1, 1.2 util-linux.spec, 1.113, 1.114 Message-ID: <200603310907.k2V97nXM029709@cvs.devel.redhat.com> Author: kzak Update of /cvs/dist/rpms/util-linux/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv29689 Modified Files: util-linux-2.13-mount-context.patch util-linux-2.13-mount-uuid.patch util-linux.spec Added Files: util-linux-2.13-hexdump-gcc.patch Log Message: fix things reported by rpmdiff util-linux-2.13-hexdump-gcc.patch: display.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletion(-) --- NEW FILE util-linux-2.13-hexdump-gcc.patch --- gcc 4.1.0: "warning: memset used with constant zero length parameter; this could be due to transposed parameters". So, fix it! -- 03/30/2006 Karel Zak --- util-linux-2.13-pre7/text-utils/display.c.gcc 2006-03-31 10:44:50.000000000 +0200 +++ util-linux-2.13-pre7/text-utils/display.c 2006-03-31 10:45:22.000000000 +0200 @@ -255,7 +255,8 @@ (void)printf("*\n"); return(NULL); } - memset((char *)curp + nread, 0, need); + if (need > 0) + memset((char *)curp + nread, 0, need); eaddress = address + nread; return(curp); } util-linux-2.13-mount-context.patch: mount.8 | 44 +++++++++++++++++++++++++++++++++++++++++++ mount.c | 65 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 107 insertions(+), 2 deletions(-) Index: util-linux-2.13-mount-context.patch =================================================================== RCS file: /cvs/dist/rpms/util-linux/FC-5/util-linux-2.13-mount-context.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- util-linux-2.13-mount-context.patch 30 Mar 2006 20:04:10 -0000 1.1 +++ util-linux-2.13-mount-context.patch 31 Mar 2006 09:07:46 -0000 1.2 @@ -1,3 +1,8 @@ + + This patch adds to the mount man page docs about context, fscontext and +defcontext mount options and translate context options from human to raw +selinux context format. -- 03/30/2006 Karel Zak + --- util-linux-2.13-pre7/mount/mount.8.cxt 2006-03-30 17:15:06.000000000 +0200 +++ util-linux-2.13-pre7/mount/mount.8 2006-03-30 17:15:06.000000000 +0200 @@ -661,6 +661,50 @@ util-linux-2.13-mount-uuid.patch: fstab.c | 16 ++++++---------- mount_blkid.c | 5 +++++ mount_blkid.h | 1 + 3 files changed, 12 insertions(+), 10 deletions(-) Index: util-linux-2.13-mount-uuid.patch =================================================================== RCS file: /cvs/dist/rpms/util-linux/FC-5/util-linux-2.13-mount-uuid.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- util-linux-2.13-mount-uuid.patch 30 Mar 2006 20:04:10 -0000 1.1 +++ util-linux-2.13-mount-uuid.patch 31 Mar 2006 09:07:46 -0000 1.2 @@ -1,3 +1,8 @@ + + The UUID code in the mount command is broken -- en example UUID= in the fstab + file is reason for SIGSEG when non-root user tries umount any device. + -- 03/30/2006 Karel Zak + --- util-linux-2.13-pre6/mount/mount_blkid.h.uuid 2006-03-29 15:34:24.000000000 +0200 +++ util-linux-2.13-pre6/mount/mount_blkid.h 2006-03-29 15:34:57.000000000 +0200 @@ -8,5 +8,6 @@ Index: util-linux.spec =================================================================== RCS file: /cvs/dist/rpms/util-linux/FC-5/util-linux.spec,v retrieving revision 1.113 retrieving revision 1.114 diff -u -r1.113 -r1.114 --- util-linux.spec 30 Mar 2006 20:04:10 -0000 1.113 +++ util-linux.spec 31 Mar 2006 09:07:46 -0000 1.114 @@ -25,7 +25,7 @@ Summary: A collection of basic system utilities. Name: util-linux Version: 2.13 -Release: 0.20.1 +Release: 0.20.2 License: distributable Group: System Environment/Base @@ -190,6 +190,8 @@ # 152579 - missing info about /etc/mtab and /proc/mounts mismatch # 183890 - missing info about possible ioctl() and fcntl() problems on NFS filesystem Patch233: util-linux-2.13-mount-man-bugs.patch +# Keep gcc happy +Patch234: util-linux-2.13-hexdump-gcc.patch # When adding patches, please make sure that it is easy to find out what bug # the # patch fixes. @@ -274,6 +276,7 @@ %patch231 -p1 %patch232 -p1 %patch233 -p1 +%patch234 -p1 %build unset LINGUAS || : @@ -658,7 +661,10 @@ /sbin/losetup %changelog -* Thu Mar 30 2006 Karel Zak 2.13-0.20.1 +* Fri Mar 31 2006 Karel Zak 2.13-0.20.2 +- fix memset() usage (and prevent gcc warning) + +* Thu Mar 30 2006 Karel Zak 2.13-0.20.1 - sync with upstream 2.13-pre7 release - fix #187014 - umount segfaults for normal user - fix #184410 - RHEL3 and RHEL4 mount supports 'noacl', FC5 mount command does not From fedora-cvs-commits at redhat.com Fri Mar 31 09:24:38 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 31 Mar 2006 04:24:38 -0500 Subject: rpms/kdepim/FC-5 kdepim.spec,1.76,1.77 sources,1.33,1.34 Message-ID: <200603310924.k2V9Ocgv011059@cvs.devel.redhat.com> Author: than Update of /cvs/dist/rpms/kdepim/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv11044 Modified Files: kdepim.spec sources Log Message: update to 3.5.2 Index: kdepim.spec =================================================================== RCS file: /cvs/dist/rpms/kdepim/FC-5/kdepim.spec,v retrieving revision 1.76 retrieving revision 1.77 diff -u -r1.76 -r1.77 --- kdepim.spec 11 Feb 2006 03:48:18 -0000 1.76 +++ kdepim.spec 31 Mar 2006 09:24:35 -0000 1.77 @@ -2,14 +2,14 @@ %define final 0 %define qt_version 1:3.3.5 -%define arts_version 8:1.5.1 +%define arts_version 8:1.5.2 %define arts 1 %define make_cvs 1 %define disable_gcc_check_and_hidden_visibility 1 -Version: 3.5.1 -Release: 1.2 +Version: 3.5.2 +Release: 0.1.fc5 Name: kdepim Summary: PIM (Personal Information Manager) for KDE Prefix: /usr @@ -207,6 +207,9 @@ %{_includedir}/kde/* %changelog +* Fri Mar 31 2006 Than Ngo 6:3.5.2-0.1.fc5 +- update to 3.5.2 + * Fri Feb 10 2006 Jesse Keating - 6:3.5.1-1.2 - bump again for double-long bug on ppc(64) Index: sources =================================================================== RCS file: /cvs/dist/rpms/kdepim/FC-5/sources,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- sources 2 Feb 2006 17:28:58 -0000 1.33 +++ sources 31 Mar 2006 09:24:35 -0000 1.34 @@ -1 +1 @@ -8e87c9cbe1f0c0f983f94d804a5bc8f9 kdepim-3.5.1.tar.bz2 +ac6b3b503e27a65a7b883c1e0a57262e kdepim-3.5.2.tar.bz2 From fedora-cvs-commits at redhat.com Fri Mar 31 09:25:45 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 31 Mar 2006 04:25:45 -0500 Subject: rpms/module-init-tools/FC-5 .cvsignore,1.6,1.7 sources,1.6,1.7 Message-ID: <200603310925.k2V9Pjh5011121@cvs.devel.redhat.com> Author: harald Update of /cvs/dist/rpms/module-init-tools/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv11107 Modified Files: .cvsignore sources Log Message: version 3.2.2 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/module-init-tools/FC-5/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 6 Nov 2005 09:24:02 -0000 1.6 +++ .cvsignore 31 Mar 2006 09:25:42 -0000 1.7 @@ -1,6 +1,2 @@ -module-init-tools-3.1.tar.bz2 -module-init-tools-3.1.tar.bz2.sign -module-init-tools-3.2-pre7.tar.bz2 -module-init-tools-3.2-pre7.tar.bz2.sign -module-init-tools-3.2-pre9.tar.bz2 -module-init-tools-3.2-pre9.tar.bz2.sign +module-init-tools-3.2.2.tar.bz2 +module-init-tools-3.2.2.tar.bz2.sign Index: sources =================================================================== RCS file: /cvs/dist/rpms/module-init-tools/FC-5/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 6 Nov 2005 09:24:02 -0000 1.6 +++ sources 31 Mar 2006 09:25:42 -0000 1.7 @@ -1,2 +1,2 @@ -f0ede5936c52e3d59411bd9594ad364f module-init-tools-3.2-pre9.tar.bz2 -eb9afce36c140208a7245e1ae4337aeb module-init-tools-3.2-pre9.tar.bz2.sign +a1ad0a09d3231673f70d631f3f5040e9 module-init-tools-3.2.2.tar.bz2 +9fce51dab77f4f62f3cb3103a1c1f753 module-init-tools-3.2.2.tar.bz2.sign From fedora-cvs-commits at redhat.com Fri Mar 31 11:15:16 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 31 Mar 2006 06:15:16 -0500 Subject: rpms/dia/FC-4 dia-0.94-rh187402.patch,NONE,1.1 dia.spec,1.28,1.29 Message-ID: <200603311115.k2VBFGaG020707@cvs.devel.redhat.com> Author: caolanm Update of /cvs/dist/rpms/dia/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv20691 Modified Files: dia.spec Added Files: dia-0.94-rh187402.patch Log Message: rh#187402# dia-0.94-rh187402.patch: xfig-import.c | 87 +++++++++++++++++++++++++++++++++++----------------------- xfig.h | 1 2 files changed, 54 insertions(+), 34 deletions(-) --- NEW FILE dia-0.94-rh187402.patch --- diff -ru dia-0.94.xfig/plug-ins/xfig/xfig.h dia-0.94/plug-ins/xfig/xfig.h --- dia-0.94.xfig/plug-ins/xfig/xfig.h 2004-08-16 03:56:21.000000000 -0400 +++ dia-0.94/plug-ins/xfig/xfig.h 2006-03-31 06:03:00.000000000 -0500 @@ -6,6 +6,7 @@ #define FIG_MAX_DEFAULT_COLORS 32 #define FIG_MAX_USER_COLORS 512 +#define FIG_MAX_DEPTHS 1000 /* 1200 PPI */ #define FIG_UNIT 472.440944881889763779527559055118 /* 1/80 inch */ diff -ru dia-0.94.xfig/plug-ins/xfig/xfig-import.c dia-0.94/plug-ins/xfig/xfig-import.c --- dia-0.94.xfig/plug-ins/xfig/xfig-import.c 2004-08-16 03:56:21.000000000 -0400 +++ dia-0.94/plug-ins/xfig/xfig-import.c 2006-03-31 06:03:00.000000000 -0500 @@ -441,11 +441,17 @@ static Color fig_color(int color_index) { - if (color_index == -1) + if (color_index <= -1) return color_black; /* Default color */ - if (color_index < FIG_MAX_DEFAULT_COLORS) + else if (color_index < FIG_MAX_DEFAULT_COLORS) return fig_default_colors[color_index]; - else return fig_colors[color_index-FIG_MAX_DEFAULT_COLORS]; + else if (color_index < FIG_MAX_USER_COLORS) + return fig_colors[color_index-FIG_MAX_DEFAULT_COLORS]; + else { + message_error(_("Color index %d too high, only 512 colors allowed. Using black instead."), + color_index); + return color_black; + } } static Color @@ -563,23 +569,25 @@ static int fig_read_n_points(FILE *file, int n, Point **points) { int i; - Point *new_points; - - new_points = (Point*)g_malloc(sizeof(Point)*n); + GArray *points_list = g_array_sized_new(FALSE, FALSE, sizeof(Point), n); for (i = 0; i < n; i++) { int x,y; + Point p; if (fscanf(file, " %d %d ", &x, &y) != 2) { message_error(_("Error while reading %dth of %d points: %s\n"), i, n, strerror(errno)); - free(new_points); + g_array_free(points_list, TRUE); return FALSE; } - new_points[i].x = x/FIG_UNIT; - new_points[i].y = y/FIG_UNIT; + p.x = x/FIG_UNIT; + p.y = y/FIG_UNIT; + g_array_append_val(points_list, p); } fscanf(file, "\n"); - *points = new_points; + + *points = (Point *)points_list->data; + g_array_free(points_list, FALSE); return TRUE; } @@ -683,7 +691,7 @@ return text_buf; } -static GList *depths[1000]; +static GList *depths[FIG_MAX_DEPTHS]; /* If there's something in the compound stack, we ignore the depth field, as it will be determined by the group anyway */ @@ -693,6 +701,26 @@ level. Best we can do now. */ static int compound_depth; +/** Add an object at a given depth. This function checks for depth limits + * and updates the compound depth if needed. + * + * @param newobj An object to add. If we're inside a compound, this + * doesn't really add the object. + * @param depth A depth as in the Fig format, max 999 + */ +static void +add_at_depth(DiaObject *newobj, int depth) { + if (depth < 0 || depth >= FIG_MAX_DEPTHS) { + message_error(_("Depth %d of of range, only 0-%d allowed.\n"), + depth, FIG_MAX_DEPTHS-1); + depth = FIG_MAX_DEPTHS - 1; + } + if (compound_stack == NULL) + depths[depth] = g_list_append(depths[depth], newobj); + else + if (compound_depth > depth) compound_depth = depth; +} + static DiaObject * fig_read_ellipse(FILE *file, DiagramData *dia) { int sub_type; @@ -749,10 +777,7 @@ /* Angle -- can't rotate yet */ /* Depth field */ - if (compound_stack == NULL) - depths[depth] = g_list_append(depths[depth], newobj); - else - if (compound_depth > depth) compound_depth = depth; + add_at_depth(newobj, depth); return newobj; } @@ -885,10 +910,7 @@ /* Cap style */ /* Depth field */ - if (compound_stack == NULL) - depths[depth] = g_list_append(depths[depth], newobj); - else - if (compound_depth > depth) compound_depth = depth; + add_at_depth(newobj, depth); exit: prop_list_free(props); g_free(forward_arrow_info); @@ -1111,10 +1133,7 @@ /* Cap style */ /* Depth field */ - if (compound_stack == NULL) - depths[depth] = g_list_append(depths[depth], newobj); - else - if (compound_depth > depth) compound_depth = depth; + add_at_depth(newobj, depth); exit: prop_list_free(props); g_free(forward_arrow_info); @@ -1202,10 +1221,7 @@ /* Cap style */ /* Depth field */ - if (compound_stack == NULL) - depths[depth] = g_list_append(depths[depth], newobj); - else - if (compound_depth > depth) compound_depth = depth; + add_at_depth(newobj, depth); exit: g_free(forward_arrow_info); @@ -1298,10 +1314,7 @@ newobj->ops->set_props(newobj, props); /* Depth field */ - if (compound_stack == NULL) - depths[depth] = g_list_append(depths[depth], newobj); - else - if (compound_depth > depth) compound_depth = depth; + add_at_depth(newobj, depth); exit: if (text_buf != NULL) free(text_buf); @@ -1347,6 +1360,12 @@ return FALSE; } + if (colornumber < 32 || colornumber > FIG_MAX_USER_COLORS) { + message_error(_("Color number %d out of range 0..%d. Discarding color.\n"), + colornumber, FIG_MAX_USER_COLORS); + return FALSE; + } + color.red = ((colorvalues & 0x00ff0000)>>16) / 255.0; color.green = ((colorvalues & 0x0000ff00)>>8) / 255.0; color.blue = (colorvalues & 0x000000ff) / 255.0; @@ -1393,7 +1412,7 @@ } /* Group extends don't really matter */ if (compound_stack == NULL) - compound_depth = 999; + compound_depth = FIG_MAX_DEPTHS - 1; compound_stack = g_slist_append(compound_stack, NULL); return TRUE; break; @@ -1551,7 +1570,7 @@ for (i = 0; i < FIG_MAX_USER_COLORS; i++) { fig_colors[i] = color_black; } - for (i = 0; i < 1000; i++) { + for (i = 0; i < FIG_MAX_DEPTHS; i++) { depths[i] = NULL; } @@ -1606,7 +1625,7 @@ } while (TRUE); /* Now we can reorder for the depth fields */ - for (i = 0; i < 1000; i++) { + for (i = 0; i < FIG_MAX_DEPTHS; i++) { if (depths[i] != NULL) layer_add_objects_first(dia->active_layer, depths[i]); } Index: dia.spec =================================================================== RCS file: /cvs/dist/rpms/dia/FC-4/dia.spec,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- dia.spec 16 Sep 2005 07:05:41 -0000 1.28 +++ dia.spec 31 Mar 2006 11:15:14 -0000 1.29 @@ -5,7 +5,7 @@ Name: dia Summary: A diagram drawing program. Version: 0.94 -Release: 12.fc4 +Release: 12.1.fc4 Epoch: 1 Source: ftp://ftp.gnome.org/pub/GNOME/stable/sources/dia/%{name}-%{version}.tar.bz2 Group: Applications/Multimedia @@ -32,6 +32,7 @@ Patch3: dia-0.94-gcc4.patch Patch4: dia-0.94-fallbacktoxpmicons.patch Patch5: dia-0.94-rh165337.patch +Patch6: dia-0.94-rh187402.patch %description The Dia drawing program is designed to be like the Windows(TM) Visio @@ -50,6 +51,7 @@ %patch3 -p1 -b .gcc4 %patch4 -p1 -b .fallbacktoxpmicons %patch5 -p1 -b .rh165337 +%patch6 -p1 -b .rh187402 %build aclocal-1.7 @@ -116,6 +118,9 @@ %{_datadir}/pixmaps/* %changelog +* Fri Mar 31 2006 Caolan McNamara +- rh#187402# buffer overflow fix + * Mon Apr 8 2005 Caolan McNamara - rh#165337# crash on >= 1000% xoom From fedora-cvs-commits at redhat.com Fri Mar 31 11:20:33 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 31 Mar 2006 06:20:33 -0500 Subject: rpms/dia/FC-4 dia.spec,1.29,1.30 Message-ID: <200603311120.k2VBKXri002025@cvs.devel.redhat.com> Author: caolanm Update of /cvs/dist/rpms/dia/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv2010 Modified Files: dia.spec Log Message: tun te tum Index: dia.spec =================================================================== RCS file: /cvs/dist/rpms/dia/FC-4/dia.spec,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- dia.spec 31 Mar 2006 11:15:14 -0000 1.29 +++ dia.spec 31 Mar 2006 11:20:31 -0000 1.30 @@ -5,7 +5,7 @@ Name: dia Summary: A diagram drawing program. Version: 0.94 -Release: 12.1.fc4 +Release: 13.fc4 Epoch: 1 Source: ftp://ftp.gnome.org/pub/GNOME/stable/sources/dia/%{name}-%{version}.tar.bz2 Group: Applications/Multimedia From fedora-cvs-commits at redhat.com Fri Mar 31 11:35:33 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 31 Mar 2006 06:35:33 -0500 Subject: rpms/binutils/devel binutils-2.16.91.0.6-frepo.patch, NONE, 1.1 binutils.spec, 1.78, 1.79 Message-ID: <200603311135.k2VBZX5E002255@cvs.devel.redhat.com> Author: jakub Update of /cvs/dist/rpms/binutils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv2240 Modified Files: binutils.spec Added Files: binutils-2.16.91.0.6-frepo.patch Log Message: 2.16.91.0.6-6 binutils-2.16.91.0.6-frepo.patch: ldmisc.c | 21 +++++++++------------ 1 files changed, 9 insertions(+), 12 deletions(-) --- NEW FILE binutils-2.16.91.0.6-frepo.patch --- 2006-03-31 Jakub Jelinek * ldmisc.c (vfinfo): Revert 2005-10-05 changes. If bfd_find_nearest_line succeeded for %C or %D, but filename is NULL, print section+offset at the end. --- ld/ldmisc.c.jj 2005-12-14 13:50:35.000000000 +0100 +++ ld/ldmisc.c 2006-03-30 18:23:59.000000000 +0200 @@ -1,6 +1,6 @@ /* ldmisc.c Copyright 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, - 2001, 2002, 2003, 2004, 2005 + 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. Written by Steve Chamberlain of Cygnus Support. @@ -337,7 +337,7 @@ vfinfo (FILE *fp, const char *fmt, va_li && strcmp (last_file, filename) != 0) || strcmp (last_function, functionname) != 0) { - lfinfo (fp, _("%B: In function `%T'"), + lfinfo (fp, _("%B: In function `%T':\n"), abfd, functionname); last_bfd = abfd; @@ -353,20 +353,17 @@ vfinfo (FILE *fp, const char *fmt, va_li discard_last = FALSE; } else - lfinfo (fp, "%B", abfd); + lfinfo (fp, "%B:", abfd); if (filename != NULL) - fprintf (fp, ":%s", filename); + fprintf (fp, "%s:", filename); if (functionname != NULL && fmt[-1] == 'G') - lfinfo (fp, ":%T", functionname); - else if (filename != NULL) - { - if (linenumber != 0) - fprintf (fp, ":%u", linenumber); - else - lfinfo (fp, ":(%A+0x%v)", section, offset); - } + lfinfo (fp, "%T", functionname); + else if (filename != NULL && linenumber != 0) + fprintf (fp, "%u", linenumber); + else + lfinfo (fp, "(%A+0x%v)", section, offset); } else lfinfo (fp, "%B:(%A+0x%v)", abfd, section, offset); Index: binutils.spec =================================================================== RCS file: /cvs/dist/rpms/binutils/devel/binutils.spec,v retrieving revision 1.78 retrieving revision 1.79 diff -u -r1.78 -r1.79 --- binutils.spec 10 Mar 2006 02:55:57 -0000 1.78 +++ binutils.spec 31 Mar 2006 11:35:30 -0000 1.79 @@ -1,7 +1,7 @@ Summary: A GNU collection of binary utilities. Name: binutils Version: 2.16.91.0.6 -Release: 4 +Release: 6 License: GPL Group: Development/Tools URL: http://sources.redhat.com/binutils @@ -17,6 +17,7 @@ Patch9: binutils-2.16.91.0.6-mni.patch Patch10: binutils-2.16.91.0.6-cfaval.patch Patch11: binutils-2.16.91.0.6-rh184590.patch +Patch12: binutils-2.16.91.0.6-frepo.patch Buildroot: %{_tmppath}/binutils-root BuildRequires: texinfo >= 4.0, dejagnu, gettext, flex, bison @@ -57,6 +58,7 @@ %patch9 -p0 -b .mni~ %patch10 -p0 -b .cfaval~ %patch11 -p0 -b .rh184590~ +%patch12 -p0 -b .frepo~ # libtool sucks perl -pi -e 'm/LIBADD/ && s/(\.\.\/bfd\/libbfd.la)/-L\.\.\/bfd\/\.libs \1/' opcodes/Makefile.{am,in} # LTP sucks @@ -167,6 +169,10 @@ %{_infodir}/*info* %changelog +* Fri Mar 31 2006 Jakub Jelinek 2.16.91.0.6-6 +- fix ld error message formatting, so that collect2 parser can + parse it again for g++ -frepo (#187142) + * Thu Mar 9 2006 Alexandre Oliva 2.16.91.0.6-4 - fix relaxation of TLS GD to LE on PPC (#184590) From fedora-cvs-commits at redhat.com Fri Mar 31 11:52:36 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 31 Mar 2006 06:52:36 -0500 Subject: rpms/binutils/FC-5 binutils-2.16.91.0.6-frepo.patch, NONE, 1.1 binutils.spec, 1.78, 1.79 Message-ID: <200603311152.k2VBqaXB016212@cvs.devel.redhat.com> Author: jakub Update of /cvs/dist/rpms/binutils/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv16187/FC-5 Modified Files: binutils.spec Added Files: binutils-2.16.91.0.6-frepo.patch Log Message: auto-import binutils-2.16.91.0.6-5 on branch FC-5 from binutils-2.16.91.0.6-5.src.rpm binutils-2.16.91.0.6-frepo.patch: ldmisc.c | 21 +++++++++------------ 1 files changed, 9 insertions(+), 12 deletions(-) --- NEW FILE binutils-2.16.91.0.6-frepo.patch --- 2006-03-31 Jakub Jelinek * ldmisc.c (vfinfo): Revert 2005-10-05 changes. If bfd_find_nearest_line succeeded for %C or %D, but filename is NULL, print section+offset at the end. --- ld/ldmisc.c.jj 2005-12-14 13:50:35.000000000 +0100 +++ ld/ldmisc.c 2006-03-30 18:23:59.000000000 +0200 @@ -1,6 +1,6 @@ /* ldmisc.c Copyright 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, - 2001, 2002, 2003, 2004, 2005 + 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. Written by Steve Chamberlain of Cygnus Support. @@ -337,7 +337,7 @@ vfinfo (FILE *fp, const char *fmt, va_li && strcmp (last_file, filename) != 0) || strcmp (last_function, functionname) != 0) { - lfinfo (fp, _("%B: In function `%T'"), + lfinfo (fp, _("%B: In function `%T':\n"), abfd, functionname); last_bfd = abfd; @@ -353,20 +353,17 @@ vfinfo (FILE *fp, const char *fmt, va_li discard_last = FALSE; } else - lfinfo (fp, "%B", abfd); + lfinfo (fp, "%B:", abfd); if (filename != NULL) - fprintf (fp, ":%s", filename); + fprintf (fp, "%s:", filename); if (functionname != NULL && fmt[-1] == 'G') - lfinfo (fp, ":%T", functionname); - else if (filename != NULL) - { - if (linenumber != 0) - fprintf (fp, ":%u", linenumber); - else - lfinfo (fp, ":(%A+0x%v)", section, offset); - } + lfinfo (fp, "%T", functionname); + else if (filename != NULL && linenumber != 0) + fprintf (fp, "%u", linenumber); + else + lfinfo (fp, "(%A+0x%v)", section, offset); } else lfinfo (fp, "%B:(%A+0x%v)", abfd, section, offset); Index: binutils.spec =================================================================== RCS file: /cvs/dist/rpms/binutils/FC-5/binutils.spec,v retrieving revision 1.78 retrieving revision 1.79 diff -u -r1.78 -r1.79 --- binutils.spec 10 Mar 2006 02:55:57 -0000 1.78 +++ binutils.spec 31 Mar 2006 11:52:34 -0000 1.79 @@ -1,7 +1,7 @@ Summary: A GNU collection of binary utilities. Name: binutils Version: 2.16.91.0.6 -Release: 4 +Release: 5 License: GPL Group: Development/Tools URL: http://sources.redhat.com/binutils @@ -17,6 +17,7 @@ Patch9: binutils-2.16.91.0.6-mni.patch Patch10: binutils-2.16.91.0.6-cfaval.patch Patch11: binutils-2.16.91.0.6-rh184590.patch +Patch12: binutils-2.16.91.0.6-frepo.patch Buildroot: %{_tmppath}/binutils-root BuildRequires: texinfo >= 4.0, dejagnu, gettext, flex, bison @@ -57,6 +58,7 @@ %patch9 -p0 -b .mni~ %patch10 -p0 -b .cfaval~ %patch11 -p0 -b .rh184590~ +%patch12 -p0 -b .frepo~ # libtool sucks perl -pi -e 'm/LIBADD/ && s/(\.\.\/bfd\/libbfd.la)/-L\.\.\/bfd\/\.libs \1/' opcodes/Makefile.{am,in} # LTP sucks @@ -167,6 +169,10 @@ %{_infodir}/*info* %changelog +* Fri Mar 31 2006 Jakub Jelinek 2.16.91.0.6-5 +- fix ld error message formatting, so that collect2 parser can + parse it again for g++ -frepo (#187142) + * Thu Mar 9 2006 Alexandre Oliva 2.16.91.0.6-4 - fix relaxation of TLS GD to LE on PPC (#184590) From fedora-cvs-commits at redhat.com Fri Mar 31 12:54:46 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 31 Mar 2006 07:54:46 -0500 Subject: rpms/dia/FC-4 dia-0.94-gnomeflags.patch, NONE, 1.1 dia.spec, 1.30, 1.31 Message-ID: <200603311254.k2VCskKQ011755@cvs.devel.redhat.com> Author: caolanm Update of /cvs/dist/rpms/dia/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv11740 Modified Files: dia.spec Added Files: dia-0.94-gnomeflags.patch Log Message: build gone stale dia-0.94-gnomeflags.patch: app/Makefile.am | 3 ++- plug-ins/cairo/Makefile.am | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) --- NEW FILE dia-0.94-gnomeflags.patch --- --- dia-0.94.orig/plug-ins/cairo/Makefile.am 2006-01-03 13:45:06.000000000 +0000 +++ dia-0.94/plug-ins/cairo/Makefile.am 2006-01-03 13:45:30.000000000 +0000 @@ -11,4 +11,4 @@ libcairo_filter_la_LIBADD = $(CAIRO_LIBS) -INCLUDES = -I$(srcdir)/../../lib $(GTK_CFLAGS) $(DEBUG_FLAGS) $(CAIRO_CFLAGS) +INCLUDES = -I$(srcdir)/../../lib $(GTK_CFLAGS) $(DEBUG_FLAGS) $(CAIRO_CFLAGS) $(GNOME_CFLAGS) --- dia-0.94.orig/app/Makefile.am 2006-01-03 13:53:07.000000000 +0000 +++ dia-0.94/app/Makefile.am 2006-01-03 13:53:27.000000000 +0000 @@ -8,6 +8,7 @@ -I$(top_srcdir)/lib \ $(DEBUG_FLAGS) \ $(GTK_CFLAGS) \ + $(GNOME_CFLAGS) \ -DPREFIX=\""$(prefix)"\" \ -DSYSCONFDIR=\""$(sysconfdir)"\" \ -DDATADIR=\""$(datadir)"\" \ --- dia-0.94.orig/app/Makefile.am 2006-01-03 14:02:08.000000000 +0000 +++ dia-0.94/app/Makefile.am 2006-01-03 14:04:00.000000000 +0000 @@ -168,7 +168,7 @@ dia_LDADD = ../lib/libdia.la \ $(EFENCE) \ - $(APP_LIBS) $(Z_LIBS) $(FREETYPE_LIBS) $(GTK_LIBS) $(PNG_LIBS) $(INTLLIBS) $(INTLOBJS) + $(APP_LIBS) $(Z_LIBS) $(FREETYPE_LIBS) $(GTK_LIBS) $(GNOME_LIBS) $(PNG_LIBS) $(INTLLIBS) $(INTLOBJS) #diaconv_LDADD = ../lib/libdia.la \ # $(EFENCE) \ Index: dia.spec =================================================================== RCS file: /cvs/dist/rpms/dia/FC-4/dia.spec,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- dia.spec 31 Mar 2006 11:20:31 -0000 1.30 +++ dia.spec 31 Mar 2006 12:54:44 -0000 1.31 @@ -32,7 +32,8 @@ Patch3: dia-0.94-gcc4.patch Patch4: dia-0.94-fallbacktoxpmicons.patch Patch5: dia-0.94-rh165337.patch -Patch6: dia-0.94-rh187402.patch +Patch6: dia-0.94-gnomeflags.patch +Patch7: dia-0.94-rh187402.patch %description The Dia drawing program is designed to be like the Windows(TM) Visio @@ -51,7 +52,8 @@ %patch3 -p1 -b .gcc4 %patch4 -p1 -b .fallbacktoxpmicons %patch5 -p1 -b .rh165337 -%patch6 -p1 -b .rh187402 +%patch6 -p1 -b .gnomeflags +%patch7 -p1 -b .rh187402 %build aclocal-1.7 @@ -119,7 +121,7 @@ %changelog * Fri Mar 31 2006 Caolan McNamara -- rh#187402# buffer overflow fix +- CVE-2006-1550 rh#187402# buffer overflow fix * Mon Apr 8 2005 Caolan McNamara - rh#165337# crash on >= 1000% xoom From fedora-cvs-commits at redhat.com Fri Mar 31 13:03:12 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 31 Mar 2006 08:03:12 -0500 Subject: rpms/dia/FC-4 dia.spec,1.31,1.32 Message-ID: <200603311303.k2VD3Clp011917@cvs.devel.redhat.com> Author: caolanm Update of /cvs/dist/rpms/dia/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv11905 Modified Files: dia.spec Log Message: like I care about beauty Index: dia.spec =================================================================== RCS file: /cvs/dist/rpms/dia/FC-4/dia.spec,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- dia.spec 31 Mar 2006 12:54:44 -0000 1.31 +++ dia.spec 31 Mar 2006 13:02:57 -0000 1.32 @@ -67,6 +67,8 @@ ## XXXX PGB - work around compiler bug #perl -pi -e "s|-O2||g" plug-ins/hpgl/Makefile +export GNOME_CFLAGS=`pkg-config --cflags libgnomeui-2.0 libgnome-2.0` +export GNOME_LIBS=`pkg-config --libs libgnomeui-2.0 libgnome-2.0` CFLAGS=$RPM_OPT_FLAGS make %install From fedora-cvs-commits at redhat.com Fri Mar 31 15:12:05 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 31 Mar 2006 10:12:05 -0500 Subject: rpms/system-config-securitylevel/devel .cvsignore, 1.52, 1.53 sources, 1.64, 1.65 system-config-securitylevel.spec, 1.75, 1.76 Message-ID: <200603311512.k2VFC5P6005129@cvs.devel.redhat.com> Author: clumens Update of /cvs/dist/rpms/system-config-securitylevel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv5072 Modified Files: .cvsignore sources system-config-securitylevel.spec Log Message: Bump version. Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/system-config-securitylevel/devel/.cvsignore,v retrieving revision 1.52 retrieving revision 1.53 diff -u -r1.52 -r1.53 --- .cvsignore 28 Feb 2006 19:09:00 -0000 1.52 +++ .cvsignore 31 Mar 2006 15:12:03 -0000 1.53 @@ -40,3 +40,4 @@ system-config-securitylevel-1.6.14.tar.bz2 system-config-securitylevel-1.6.15.tar.bz2 system-config-securitylevel-1.6.16.tar.bz2 +system-config-securitylevel-1.6.17.tar.bz2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/system-config-securitylevel/devel/sources,v retrieving revision 1.64 retrieving revision 1.65 diff -u -r1.64 -r1.65 --- sources 28 Feb 2006 19:09:00 -0000 1.64 +++ sources 31 Mar 2006 15:12:03 -0000 1.65 @@ -1 +1 @@ -04e626651001ac7fd4cbdb07947c8739 system-config-securitylevel-1.6.16.tar.bz2 +51df7b824fa5a24e7311ea253b29e549 system-config-securitylevel-1.6.17.tar.bz2 Index: system-config-securitylevel.spec =================================================================== RCS file: /cvs/dist/rpms/system-config-securitylevel/devel/system-config-securitylevel.spec,v retrieving revision 1.75 retrieving revision 1.76 diff -u -r1.75 -r1.76 --- system-config-securitylevel.spec 28 Feb 2006 19:09:00 -0000 1.75 +++ system-config-securitylevel.spec 31 Mar 2006 15:12:03 -0000 1.76 @@ -1,6 +1,6 @@ Summary: A graphical interface for modifying the system security level Name: system-config-securitylevel -Version: 1.6.16 +Version: 1.6.17 Release: 1 URL: http://fedora.redhat.com/projects/config-tools/ License: GPL @@ -97,6 +97,11 @@ /usr/bin/system-config-securitylevel-tui %changelog +* Fri Mar 31 2006 Chris Lumens 1.6.17-1 +- Be smarter about if strings are valid ports (#183964). +- Fix typo in firstboot (#186110). +- Disable SELinux page if there's no policy installed (#186554). + * Tue Feb 28 2006 Chris Lumens 1.6.16-1 - Add requirement for scriptlets (#182876, #182877). - Add glade UI strings to translations (#182181). From fedora-cvs-commits at redhat.com Fri Mar 31 15:20:24 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 31 Mar 2006 10:20:24 -0500 Subject: rpms/fetchmail/devel .cvsignore, 1.13, 1.14 fetchmail.spec, 1.40, 1.41 sources, 1.13, 1.14 patch-6.3.2.1-fix-netrc-SIGSEGV.diff, 1.1, NONE patch-6.3.2.1-fix-netrc-SIGSEGV.diff.asc, 1.1, NONE Message-ID: <200603311520.k2VFKOdA019853@cvs.devel.redhat.com> Author: mitr Update of /cvs/dist/rpms/fetchmail/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv19838 Modified Files: .cvsignore fetchmail.spec sources Removed Files: patch-6.3.2.1-fix-netrc-SIGSEGV.diff patch-6.3.2.1-fix-netrc-SIGSEGV.diff.asc Log Message: * Fri Mar 31 2006 Miloslav Trmac - 6.3.3-1 - Update to fetchmail-6.3.3 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/fetchmail/devel/.cvsignore,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- .cvsignore 23 Jan 2006 17:07:09 -0000 1.13 +++ .cvsignore 31 Mar 2006 15:20:22 -0000 1.14 @@ -1,2 +1,2 @@ -fetchmail-6.3.2.tar.bz2 -fetchmail-6.3.2.tar.bz2.asc +fetchmail-6.3.3.tar.bz2 +fetchmail-6.3.3.tar.bz2.asc Index: fetchmail.spec =================================================================== RCS file: /cvs/dist/rpms/fetchmail/devel/fetchmail.spec,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- fetchmail.spec 11 Feb 2006 02:43:15 -0000 1.40 +++ fetchmail.spec 31 Mar 2006 15:20:22 -0000 1.41 @@ -3,13 +3,11 @@ Summary: A remote mail retrieval and forwarding utility. Name: fetchmail -Version: 6.3.2.1 -Release: 1.2 +Version: 6.3.3 +Release: 1 Requires: smtpdaemon -Source0: http://download.berlios.de/fetchmail/fetchmail-6.3.2.tar.bz2 -Source1: http://download.berlios.de/fetchmail/fetchmail-6.3.2.tar.bz2.asc -Source2: http://download.berlios.de/fetchmail/patch-6.3.2.1-fix-netrc-SIGSEGV.diff -Source3: http://download.berlios.de/fetchmail/patch-6.3.2.1-fix-netrc-SIGSEGV.diff.asc +Source0: http://download.berlios.de/fetchmail/fetchmail-%{version}.tar.bz2 +Source1: http://download.berlios.de/fetchmail/fetchmail-%{version}.tar.bz2.asc Patch0: fetchmail-6.2.5-addrconf.patch URL: http://fetchmail.berlios.de/ License: GPL @@ -46,8 +44,7 @@ need to have Python and Tk installed in order to use fetchmailconf. %prep -%setup -q -n fetchmail-6.3.2 -patch -p0 < %{SOURCE2} +%setup -q %patch0 -p1 -b .addrconf %build @@ -86,6 +83,9 @@ %endif %changelog +* Fri Mar 31 2006 Miloslav Trmac - 6.3.3-1 +- Update to fetchmail-6.3.3 + * Fri Feb 10 2006 Jesse Keating - 6.3.2.1-1.2 - bump again for double-long bug on ppc(64) Index: sources =================================================================== RCS file: /cvs/dist/rpms/fetchmail/devel/sources,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- sources 23 Jan 2006 17:07:09 -0000 1.13 +++ sources 31 Mar 2006 15:20:22 -0000 1.14 @@ -1,2 +1,2 @@ -a532134a5e3b35b4f8b78a8184439837 fetchmail-6.3.2.tar.bz2 -900cc0f24fd1fd3f69c571a6bf3c15c3 fetchmail-6.3.2.tar.bz2.asc +d6f6ecd02fa5c92b84d44fe031067938 fetchmail-6.3.3.tar.bz2 +681a6008d869d0219630b84cce5af222 fetchmail-6.3.3.tar.bz2.asc --- patch-6.3.2.1-fix-netrc-SIGSEGV.diff DELETED --- --- patch-6.3.2.1-fix-netrc-SIGSEGV.diff.asc DELETED --- From fedora-cvs-commits at redhat.com Fri Mar 31 15:34:45 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 31 Mar 2006 10:34:45 -0500 Subject: rpms/cups/devel cups-str1528.patch,NONE,1.1 cups.spec,1.148,1.149 Message-ID: <200603311534.k2VFYjDH020035@cvs.devel.redhat.com> Author: twaugh Update of /cvs/dist/rpms/cups/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv20015 Modified Files: cups.spec Added Files: cups-str1528.patch Log Message: * Fri Mar 31 2006 Tim Waugh 1:1.2-0.2.rc1.4 - Fixed interaction with CUPS 1.1 servers (STR #1528). cups-str1528.patch: request.c | 73 +++++++++++++++++++++++++++++++++----------------------------- 1 files changed, 39 insertions(+), 34 deletions(-) --- NEW FILE cups-str1528.patch --- --- cups-1.2rc1/cups/request.c.str1528 2006-02-22 16:37:44.000000000 +0000 +++ cups-1.2rc1/cups/request.c 2006-03-31 16:33:23.000000000 +0100 @@ -64,6 +64,7 @@ ipp_t *response; /* IPP response data */ size_t length; /* Content-Length value */ http_status_t status; /* Status of HTTP request */ + int got_status; /* Did we get the status? */ ipp_state_t state; /* State of IPP processing */ FILE *file; /* File to send */ struct stat fileinfo; /* File information */ @@ -184,54 +185,58 @@ } /* - * Wait up to 1 second for a 100-continue response... + * Send the IPP data... */ - if (httpWait(http, 1000)) - status = httpUpdate(http); - else - status = HTTP_CONTINUE; + DEBUG_puts("cupsDoFileRequest: ipp write..."); - if (status == HTTP_CONTINUE) + request->state = IPP_IDLE; + status = HTTP_CONTINUE; + got_status = 0; + + while ((state = ippWrite(http, request)) != IPP_DATA) + if (state == IPP_ERROR) + break; + else if (httpCheck(http)) + { + got_status = 1; + + if ((status = httpUpdate(http)) != HTTP_CONTINUE) + break; + } + + if (!got_status) { /* - * Send the IPP data... + * Wait up to 1 second to get the 100-continue response... */ - DEBUG_puts("cupsDoFileRequest: ipp write..."); + if (httpWait(http, 1000)) + status = httpUpdate(http); + } + else if (httpCheck(http)) + status = httpUpdate(http); - request->state = IPP_IDLE; + if (status == HTTP_CONTINUE && state == IPP_DATA && filename) + { + DEBUG_puts("cupsDoFileRequest: file write..."); - while ((state = ippWrite(http, request)) != IPP_DATA) - if (state == IPP_ERROR) - break; - else if (httpCheck(http)) + /* + * Send the file... + */ + + rewind(file); + + while ((bytes = (int)fread(buffer, 1, sizeof(buffer), file)) > 0) + { + if (httpCheck(http)) { if ((status = httpUpdate(http)) != HTTP_CONTINUE) break; } - if (state == IPP_DATA && filename) - { - DEBUG_puts("cupsDoFileRequest: file write..."); - - /* - * Send the file... - */ - - rewind(file); - - while ((bytes = (int)fread(buffer, 1, sizeof(buffer), file)) > 0) - { - if (httpCheck(http)) - { - if ((status = httpUpdate(http)) != HTTP_CONTINUE) - break; - } - - if (httpWrite2(http, buffer, bytes) < bytes) - break; - } + if (httpWrite2(http, buffer, bytes) < bytes) + break; } } Index: cups.spec =================================================================== RCS file: /cvs/dist/rpms/cups/devel/cups.spec,v retrieving revision 1.148 retrieving revision 1.149 diff -u -r1.148 -r1.149 --- cups.spec 30 Mar 2006 09:33:40 -0000 1.148 +++ cups.spec 31 Mar 2006 15:34:43 -0000 1.149 @@ -7,7 +7,7 @@ Summary: Common Unix Printing System Name: cups Version: 1.2 -Release: 0.2.%{beta}.3 +Release: 0.2.%{beta}.4 License: GPL Group: System Environment/Daemons Source: ftp://ftp.easysw.com/pub/cups/test/cups-1.2%{beta}-source.tar.bz2 @@ -31,6 +31,7 @@ Patch8: cups-logfileperm.patch Patch9: cups-1.1.17-rcp.patch Patch10: cups-1.1.17-ppdsdat.patch +Patch11: cups-str1528.patch Patch12: cups-locale.patch Patch13: cups-CAN-2005-0064.patch Patch14: cups-str1521.patch @@ -119,6 +120,7 @@ %patch8 -p1 -b .logfileperm %patch9 -p1 -b .rcp %patch10 -p1 -b .ppdsdat +%patch11 -p1 -b .str1528 %patch12 -p1 -b .locale %patch13 -p1 -b .CAN-2005-0064 %patch14 -p1 -b .str1521 @@ -377,6 +379,9 @@ %{cups_serverbin}/daemon/cups-lpd %changelog +* Fri Mar 31 2006 Tim Waugh 1:1.2-0.2.rc1.4 +- Fixed interaction with CUPS 1.1 servers (STR #1528). + * Wed Mar 29 2006 Tim Waugh 1:1.2-0.2.rc1.3 - Fix group list of non-root backends (STR #1521, bug #186954). From fedora-cvs-commits at redhat.com Fri Mar 31 15:39:29 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 31 Mar 2006 10:39:29 -0500 Subject: rpms/cups/FC-5 cups-str1528.patch,NONE,1.1 cups.spec,1.135,1.136 Message-ID: <200603311539.k2VFdTga020141@cvs.devel.redhat.com> Author: twaugh Update of /cvs/dist/rpms/cups/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv20126 Modified Files: cups.spec Added Files: cups-str1528.patch Log Message: * Fri Mar 31 2006 Tim Waugh 1:1.2-0.2.rc1.2.4 - Fixed interaction with CUPS 1.1 servers (STR #1528). cups-str1528.patch: request.c | 73 +++++++++++++++++++++++++++++++++----------------------------- 1 files changed, 39 insertions(+), 34 deletions(-) --- NEW FILE cups-str1528.patch --- --- cups-1.2rc1/cups/request.c.str1528 2006-02-22 16:37:44.000000000 +0000 +++ cups-1.2rc1/cups/request.c 2006-03-31 16:33:23.000000000 +0100 @@ -64,6 +64,7 @@ ipp_t *response; /* IPP response data */ size_t length; /* Content-Length value */ http_status_t status; /* Status of HTTP request */ + int got_status; /* Did we get the status? */ ipp_state_t state; /* State of IPP processing */ FILE *file; /* File to send */ struct stat fileinfo; /* File information */ @@ -184,54 +185,58 @@ } /* - * Wait up to 1 second for a 100-continue response... + * Send the IPP data... */ - if (httpWait(http, 1000)) - status = httpUpdate(http); - else - status = HTTP_CONTINUE; + DEBUG_puts("cupsDoFileRequest: ipp write..."); - if (status == HTTP_CONTINUE) + request->state = IPP_IDLE; + status = HTTP_CONTINUE; + got_status = 0; + + while ((state = ippWrite(http, request)) != IPP_DATA) + if (state == IPP_ERROR) + break; + else if (httpCheck(http)) + { + got_status = 1; + + if ((status = httpUpdate(http)) != HTTP_CONTINUE) + break; + } + + if (!got_status) { /* - * Send the IPP data... + * Wait up to 1 second to get the 100-continue response... */ - DEBUG_puts("cupsDoFileRequest: ipp write..."); + if (httpWait(http, 1000)) + status = httpUpdate(http); + } + else if (httpCheck(http)) + status = httpUpdate(http); - request->state = IPP_IDLE; + if (status == HTTP_CONTINUE && state == IPP_DATA && filename) + { + DEBUG_puts("cupsDoFileRequest: file write..."); - while ((state = ippWrite(http, request)) != IPP_DATA) - if (state == IPP_ERROR) - break; - else if (httpCheck(http)) + /* + * Send the file... + */ + + rewind(file); + + while ((bytes = (int)fread(buffer, 1, sizeof(buffer), file)) > 0) + { + if (httpCheck(http)) { if ((status = httpUpdate(http)) != HTTP_CONTINUE) break; } - if (state == IPP_DATA && filename) - { - DEBUG_puts("cupsDoFileRequest: file write..."); - - /* - * Send the file... - */ - - rewind(file); - - while ((bytes = (int)fread(buffer, 1, sizeof(buffer), file)) > 0) - { - if (httpCheck(http)) - { - if ((status = httpUpdate(http)) != HTTP_CONTINUE) - break; - } - - if (httpWrite2(http, buffer, bytes) < bytes) - break; - } + if (httpWrite2(http, buffer, bytes) < bytes) + break; } } Index: cups.spec =================================================================== RCS file: /cvs/dist/rpms/cups/FC-5/cups.spec,v retrieving revision 1.135 retrieving revision 1.136 diff -u -r1.135 -r1.136 --- cups.spec 30 Mar 2006 15:15:36 -0000 1.135 +++ cups.spec 31 Mar 2006 15:39:27 -0000 1.136 @@ -7,7 +7,7 @@ Summary: Common Unix Printing System Name: cups Version: 1.2 -Release: 0.2.%{beta}.2.3 +Release: 0.2.%{beta}.2.4 License: GPL Group: System Environment/Daemons Source: ftp://ftp.easysw.com/pub/cups/test/cups-1.2%{beta}-source.tar.bz2 @@ -31,6 +31,7 @@ Patch8: cups-logfileperm.patch Patch9: cups-1.1.17-rcp.patch Patch10: cups-1.1.17-ppdsdat.patch +Patch11: cups-str1528.patch Patch12: cups-locale.patch Patch13: cups-CAN-2005-0064.patch Patch14: cups-str1521.patch @@ -123,6 +124,7 @@ %patch8 -p1 -b .logfileperm %patch9 -p1 -b .rcp %patch10 -p1 -b .ppdsdat +%patch11 -p1 -b .str1528 %patch12 -p1 -b .locale %patch13 -p1 -b .CAN-2005-0064 %patch14 -p1 -b .str1521 @@ -381,6 +383,9 @@ %{cups_serverbin}/daemon/cups-lpd %changelog +* Fri Mar 31 2006 Tim Waugh 1:1.2-0.2.rc1.2.4 +- Fixed interaction with CUPS 1.1 servers (STR #1528). + * Thu Mar 30 2006 Tim Waugh 1:1.2-0.2.rc1.2.3 - Added conflicts. - Built for FC5 update. From fedora-cvs-commits at redhat.com Fri Mar 31 16:18:36 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 31 Mar 2006 11:18:36 -0500 Subject: rpms/rpm/devel rpm-4.4.2-netsharedpath.patch, NONE, 1.1 rpm-4.4.2-userlock.patch, NONE, 1.1 rpm-4.4.2-vercmp.patch, NONE, 1.1 rpm.spec, 1.195, 1.196 Message-ID: <200603311618.k2VGIajq015966@cvs.devel.redhat.com> Author: pnasrat Update of /cvs/dist/rpms/rpm/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv15937 Modified Files: rpm.spec Added Files: rpm-4.4.2-netsharedpath.patch rpm-4.4.2-userlock.patch rpm-4.4.2-vercmp.patch Log Message: "Fix" memory exhaustion with many duplicate basenames on erase and a few backports rpm-4.4.2-netsharedpath.patch: transaction.c | 3 +++ 1 files changed, 3 insertions(+) --- NEW FILE rpm-4.4.2-netsharedpath.patch --- --- rpm-4.4.2/lib/transaction.c.netsharedpath 2006-02-13 18:15:37.000000000 -0500 +++ rpm-4.4.2/lib/transaction.c 2006-02-13 18:15:38.000000000 -0500 @@ -820,6 +820,9 @@ /*@innercontinue@*/ continue; if (strncmp(dn, *nsp, dnlen)) /*@innercontinue@*/ continue; + /* Insure that only the netsharedpath basename is compared. */ + if ((s = strchr((*nsp) + dnlen, '/')) != NULL && s[1] != '\0') + /*@innercontinue@*/ continue; if (strncmp(bn, (*nsp) + dnlen, bnlen)) /*@innercontinue@*/ continue; len = dnlen + bnlen; rpm-4.4.2-userlock.patch: rpmlock.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) --- NEW FILE rpm-4.4.2-userlock.patch --- --- rpm-4.4.2/lib/rpmlock.c.userlock 2006-02-23 15:24:46.000000000 -0500 +++ rpm-4.4.2/lib/rpmlock.c 2006-02-23 15:25:53.000000000 -0500 @@ -37,7 +37,7 @@ /* XXX oneshot to determine path for fcntl lock. */ if (rpmlock_path == NULL) { - char * t = rpmExpand(rpmlock_path_default, NULL); + char * t = rpmGenPath(rootdir, rpmlock_path_default, NULL); if (t == NULL || *t == '\0' || *t == '%') t = RPMLOCK_PATH; rpmlock_path = xstrdup(t); @@ -129,7 +129,7 @@ const char *rootDir = rpmtsRootDir(ts); rpmlock lock; - if (!rootDir) + if (!rootDir || rpmtsChrootDone(ts)) rootDir = "/"; lock = rpmlock_new(rootDir); /*@-branchstate@*/ rpm-4.4.2-vercmp.patch: rpmvercmp.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletion(-) --- NEW FILE rpm-4.4.2-vercmp.patch --- --- rpm-4.4.2/lib/rpmvercmp.c.vercmp 2005-07-03 22:32:22.000000000 -0400 +++ rpm-4.4.2/lib/rpmvercmp.c 2006-02-13 18:20:01.000000000 -0500 @@ -39,6 +39,9 @@ while (*one && !xisalnum(*one)) one++; while (*two && !xisalnum(*two)) two++; + /* If we ran to the end of either, we are finished with the loop */ + if (!(*one && *two)) break; + str1 = one; str2 = two; @@ -64,9 +67,13 @@ *str2 = '\0'; /*@=boundswrite@*/ + /* this cannot happen, as we previously tested to make sure that */ + /* the first string has a non-null segment */ + if (one == str1) return -1; /* arbitrary */ + /* take care of the case where the two version segments are */ /* different types: one numeric, the other alpha (i.e. empty) */ - if (one == str1) return -1; /* arbitrary */ + /* numeric segments are always newer than alpha segments */ /* XXX See patch #60884 (and details) from bugzilla #50977. */ if (two == str2) return (isnum ? 1 : -1); Index: rpm.spec =================================================================== RCS file: /cvs/dist/rpms/rpm/devel/rpm.spec,v retrieving revision 1.195 retrieving revision 1.196 diff -u -r1.195 -r1.196 --- rpm.spec 11 Feb 2006 05:34:50 -0000 1.195 +++ rpm.spec 31 Mar 2006 16:18:33 -0000 1.196 @@ -20,7 +20,7 @@ %define version 4.4.2 Version: %{version} %{expand: %%define rpm_version %{version}} -Release: 15.2 +Release: 16 Group: System Environment/Base Source: ftp://wraptastic.org/pub/rpm-4.4.x/rpm-%{rpm_version}.tar.gz Source1: mono-find-provides @@ -45,6 +45,9 @@ Patch17: rpm-4.4.2-no-large-mmap.patch Patch18: rpm-4.4.2-perlmainprov.patch Patch19: rpm-4.4.2-rpmsq-deadlock.patch +Patch20: rpm-4.4.2-netsharedpath.patch +Patch21: rpm-4.4.2-userlock.patch +Patch22: rpm-4.4.2-vercmp.patch License: GPL Conflicts: patch < 2.5 %ifos linux @@ -168,7 +171,7 @@ %patch9 -p1 -b .contextverify %patch10 -p1 -b .charset %patch11 -p1 -b .ghostconflicts -%patch12 -p1 -b .exclude +#patch12 -p1 -b .exclude %patch13 -p1 -b .excludedsize %patch14 -p1 -b .cronpath %patch15 -p1 -b .mono @@ -176,6 +179,9 @@ %patch17 -p1 -b .no_large_mmap %patch18 -p1 -b .perlmainprov %patch19 -p1 -b .deadlock +%patch20 -p1 -b .netsharedpath +%patch21 -p1 -b .userlock +%patch22 -p1 -b .vercmp %build @@ -568,6 +574,12 @@ %{__includedir}/popt.h %changelog +* Fri Mar 31 2006 Paul Nasrat - 4.4.2-16 +- Skipdirs on erase again (#187308) +- Make fcntl lock sensitive to --root (#151255) +- Fix netshared path comparison (#52725) +- Fix rpm vercmp (#178798) + * Fri Feb 10 2006 Jesse Keating - 4.4.2-15.2 - bump again for double-long bug on ppc(64) From fedora-cvs-commits at redhat.com Fri Mar 31 17:29:44 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 31 Mar 2006 12:29:44 -0500 Subject: rpms/xorg-x11-xdm/devel .cvsignore, 1.6, 1.7 sources, 1.5, 1.6 xorg-x11-xdm.spec, 1.19, 1.20 xdm-pre-audit-system.pamd, 1.1, NONE Message-ID: <200603311729.k2VHTiIi011977@cvs.devel.redhat.com> Author: ajackson Update of /cvs/dist/rpms/xorg-x11-xdm/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv11955/devel Modified Files: .cvsignore sources xorg-x11-xdm.spec Removed Files: xdm-pre-audit-system.pamd Log Message: auto-import xorg-x11-xdm-1.0.3-1 on branch devel from xorg-x11-xdm-1.0.3-1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/xorg-x11-xdm/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 9 Jan 2006 16:54:34 -0000 1.6 +++ .cvsignore 31 Mar 2006 17:29:42 -0000 1.7 @@ -1 +1 @@ -xdm-1.0.1.tar.bz2 +xdm-1.0.3.tar.bz2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/xorg-x11-xdm/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 9 Jan 2006 16:54:34 -0000 1.5 +++ sources 31 Mar 2006 17:29:42 -0000 1.6 @@ -1 +1 @@ -883c66b4ce39754b8111fa1e8bc0933c xdm-1.0.1.tar.bz2 +4540fd015672f8fb8590ab16f4974cfe xdm-1.0.3.tar.bz2 Index: xorg-x11-xdm.spec =================================================================== RCS file: /cvs/dist/rpms/xorg-x11-xdm/devel/xorg-x11-xdm.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- xorg-x11-xdm.spec 1 Mar 2006 07:06:02 -0000 1.19 +++ xorg-x11-xdm.spec 31 Mar 2006 17:29:42 -0000 1.20 @@ -10,14 +10,14 @@ Name: xorg-x11-%{pkgname} # NOTE: Remove Epoch line if/when the package ever gets renamed. Epoch: 1 -Version: 1.0.1 -Release: 1.2 +Version: 1.0.3 +Release: 1 License: MIT/X11 Group: User Interface/X URL: http://www.x.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Source0: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/%{pkgname}-%{version}.tar.bz2 +Source0: http://xorg.freedesktop.org/releases/individual/app/%{pkgname}-%{version}.tar.bz2 Source1: Xsetup_0 Source10: xdm.init Source11: xdm.pamd @@ -85,7 +85,7 @@ export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" # NOTE: We invoke aclocal/automake/autoconf to enable the changes present in # xdm-0.99.3-xdm-app-defaults-in-datadir.patch & xdm-0.99.3-xdm-configdir.patch -aclocal ; automake ; autoconf +aclocal ; libtoolize --force ; automake ; autoconf %configure \ --disable-static \ --disable-xprint \ @@ -174,6 +174,10 @@ %{_mandir}/man1x/*.1x* %changelog +* Fri Mar 31 2006 Adam Jackson 1:1.0.3-1 +- Updated to version 1.0.3. Forcibly relibtoolize to avoid present and future + bogons on libXdmGreet.so losing the .so extension. + * Fri Feb 10 2006 Jesse Keating 1:1.0.1-1.2 - bump again for double-long bug on ppc(64) --- xdm-pre-audit-system.pamd DELETED --- From fedora-cvs-commits at redhat.com Fri Mar 31 19:38:12 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 31 Mar 2006 14:38:12 -0500 Subject: rpms/kernel/FC-5 linux-2.6-softmac-assoc-events.patch, NONE, 1.1 kernel-2.6.spec, 1.2083, 1.2084 Message-ID: <200603311938.k2VJcCCm003126@cvs.devel.redhat.com> Author: dwmw2 Update of /cvs/dist/rpms/kernel/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv3111 Modified Files: kernel-2.6.spec Added Files: linux-2.6-softmac-assoc-events.patch Log Message: Fix bcm43xx with new NetworkManager by sending standard WEXT events linux-2.6-softmac-assoc-events.patch: include/net/ieee80211softmac.h | 3 +- net/ieee80211/softmac/ieee80211softmac_assoc.c | 2 + net/ieee80211/softmac/ieee80211softmac_event.c | 30 ++++++++++++++++++++----- 3 files changed, 29 insertions(+), 6 deletions(-) --- NEW FILE linux-2.6-softmac-assoc-events.patch --- --- a/include/net/ieee80211softmac.h.assoc 2006-03-09 13:14:56.000000000 -0500 +++ b/include/net/ieee80211softmac.h 2006-03-09 13:15:22.000000000 -0500 @@ -267,8 +267,9 @@ #define IEEE80211SOFTMAC_EVENT_AUTH_FAILED 5 #define IEEE80211SOFTMAC_EVENT_AUTH_TIMEOUT 6 #define IEEE80211SOFTMAC_EVENT_ASSOCIATE_NET_NOT_FOUND 7 +#define IEEE80211SOFTMAC_EVENT_DISASSOCIATED 8 /* keep this updated! */ -#define IEEE80211SOFTMAC_EVENT_LAST 7 +#define IEEE80211SOFTMAC_EVENT_LAST 8 /* * If you want to be notified of certain events, you can call * ieee80211softmac_notify[_atomic] with --- a/net/ieee80211/softmac/ieee80211softmac_event.c.assoc 2006-03-09 13:05:09.000000000 -0500 +++ b/net/ieee80211/softmac/ieee80211softmac_event.c 2006-03-09 15:21:12.000000000 -0500 @@ -67,6 +67,7 @@ "authenticating failed", "authenticating timed out", "associating failed because no suitable network was found", + "disassociated", }; @@ -128,13 +129,32 @@ ieee80211softmac_call_events_locked(struct ieee80211softmac_device *mac, int event, void *event_ctx) { struct ieee80211softmac_event *eventptr, *tmp; - union iwreq_data wrqu; - char *msg; if (event >= 0) { - msg = event_descriptions[event]; - wrqu.data.length = strlen(msg); - wireless_send_event(mac->dev, IWEVCUSTOM, &wrqu, msg); + union iwreq_data wrqu; + int we_event; + char *msg = NULL; + + if (event == IEEE80211SOFTMAC_EVENT_ASSOCIATED) { + struct ieee80211softmac_network *network = + (struct ieee80211softmac_network *)event_ctx; + wrqu.data.length = 0; + wrqu.data.flags = 0; + memcpy(wrqu.ap_addr.sa_data, &network->bssid[0], ETH_ALEN); + wrqu.ap_addr.sa_family = ARPHRD_ETHER; + we_event = SIOCGIWAP; + } else if (event == IEEE80211SOFTMAC_EVENT_DISASSOCIATED) { + wrqu.data.length = 0; + wrqu.data.flags = 0; + memset(&wrqu, '\0', sizeof (union iwreq_data)); + wrqu.ap_addr.sa_family = ARPHRD_ETHER; + we_event = SIOCGIWAP; + } else { + msg = event_descriptions[event]; + wrqu.data.length = strlen(msg); + we_event = IWEVCUSTOM; + } + wireless_send_event(mac->dev, we_event, &wrqu, msg); } if (!list_empty(&mac->events)) --- a/net/ieee80211/softmac/ieee80211softmac_assoc.c.assoc 2006-03-09 13:13:54.000000000 -0500 +++ b/net/ieee80211/softmac/ieee80211softmac_assoc.c 2006-03-09 13:21:00.000000000 -0500 @@ -104,6 +104,7 @@ /* Do NOT clear bssvalid as that will break ieee80211softmac_assoc_work! */ mac->associated = 0; mac->associnfo.associating = 0; + ieee80211softmac_call_events_locked(mac, IEEE80211SOFTMAC_EVENT_DISASSOCIATED, NULL); spin_unlock_irqrestore(&mac->lock, flags); } @@ -378,6 +379,7 @@ spin_lock_irqsave(&mac->lock, flags); mac->associnfo.bssvalid = 0; mac->associated = 0; + ieee80211softmac_call_events_locked(mac, IEEE80211SOFTMAC_EVENT_DISASSOCIATED, NULL); schedule_work(&mac->associnfo.work); spin_unlock_irqrestore(&mac->lock, flags); Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-5/kernel-2.6.spec,v retrieving revision 1.2083 retrieving revision 1.2084 diff -u -r1.2083 -r1.2084 --- kernel-2.6.spec 29 Mar 2006 18:28:29 -0000 1.2083 +++ kernel-2.6.spec 31 Mar 2006 19:38:10 -0000 1.2084 @@ -414,6 +414,7 @@ Patch5005: linux-2.6-bcm43xx-assoc-on-startup.patch Patch5006: linux-2.6-softmac-default-rate.patch Patch5007: linux-2.6-bcm43xx-set-chan-lockup.patch +Patch5008: linux-2.6-softmac-assoc-events.patch # # 10000 to 20000 is for stuff that has to come last due to the @@ -1075,6 +1076,8 @@ %patch5006 -p1 # bcm43xx dies if we attempt to set the channel while it's down. %patch5007 -p1 +# Send standard events on {dis,}association +%patch5008 -p1 # # final stuff @@ -1684,6 +1687,9 @@ %endif %changelog +* Fri Mar 31 2006 David Woodhouse +- Send standard WEXT events on softmac assoc/disassociation. + * Wed Mar 27 2006 Dave Jones - Enable SMP alternatives for x86/x86-64 - Temporarily disable Xen. From fedora-cvs-commits at redhat.com Fri Mar 31 20:07:41 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 31 Mar 2006 15:07:41 -0500 Subject: rpms/kernel/devel kernel-2.6.spec, 1.2108, 1.2109 linux-2.6-bcm43xx-git.patch, 1.4, NONE linux-2.6-bcm43xx-neuter.patch, 1.1, NONE linux-2.6-bcm43xx-set-chan-lockup.patch, 1.1, NONE linux-2.6-softmac-default-rate.patch, 1.1, NONE Message-ID: <200603312007.k2VK7f70017932@cvs.devel.redhat.com> Author: dwmw2 Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv17910 Modified Files: kernel-2.6.spec Removed Files: linux-2.6-bcm43xx-git.patch linux-2.6-bcm43xx-neuter.patch linux-2.6-bcm43xx-set-chan-lockup.patch linux-2.6-softmac-default-rate.patch Log Message: bcm43xx sync Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.2108 retrieving revision 1.2109 diff -u -r1.2108 -r1.2109 --- kernel-2.6.spec 30 Mar 2006 23:57:06 -0000 1.2108 +++ kernel-2.6.spec 31 Mar 2006 20:07:18 -0000 1.2109 @@ -392,11 +392,8 @@ Patch2301: linux-2.6-acpi-ecdt-uid-hack.patch # Broadcom wireless driver -Patch5001: linux-2.6-bcm43xx-git.patch -Patch5002: linux-2.6-bcm43xx-neuter.patch -Patch5005: linux-2.6-bcm43xx-assoc-on-startup.patch -Patch5006: linux-2.6-softmac-default-rate.patch -Patch5007: linux-2.6-bcm43xx-set-chan-lockup.patch +Patch5001: linux-2.6-bcm43xx-assoc-on-startup.patch +Patch5002: linux-2.6-softmac-assoc-events.patch # # 10000 to 20000 is for stuff that has to come last due to the @@ -1011,16 +1008,11 @@ # be merged upstream # -# ... and bcm43xx driver too -#%patch5001 -p1 -# temporarily remove bcm43xx's MODULE_DEVICE_TABLE entry -#%patch5002 -p1 # Attempt to associate when the link is brought up -%patch5005 -p1 -# Default to 11Mbps not 54Mbps, since we don't back down automatically yet. -#%patch5006 -p1 -# bcm43xx dies if we attempt to set the channel while it's down. -#%patch5007 -p1 +%patch5001 -p1 +# Send standard events on {dis,}association +%patch5002 -p1 + # # final stuff @@ -1630,6 +1622,9 @@ %endif %changelog +* Fri Mar 31 2006 David Woodhouse +- Send standard WEXT events on softmac assoc/disassociation. + * Thu Mar 30 2006 Dave Jones - 2.6.16-git18 - Reenable CONFIG_PCI_MSI --- linux-2.6-bcm43xx-git.patch DELETED --- --- linux-2.6-bcm43xx-neuter.patch DELETED --- --- linux-2.6-bcm43xx-set-chan-lockup.patch DELETED --- --- linux-2.6-softmac-default-rate.patch DELETED --- From fedora-cvs-commits at redhat.com Fri Mar 31 20:17:35 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 31 Mar 2006 15:17:35 -0500 Subject: rpms/selinux-policy/devel policy-20060323.patch, 1.5, 1.6 selinux-policy.spec, 1.164, 1.165 Message-ID: <200603312017.k2VKHZma031731@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/selinux-policy/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv31716 Modified Files: policy-20060323.patch selinux-policy.spec Log Message: * Fri Mar 30 2006 Dan Walsh 2.2.29-1 - Update to upstream policy-20060323.patch: kernel/devices.fc | 1 + kernel/devices.if | 20 ++++++++++++++++++++ kernel/files.if | 15 +++++++++++++++ services/automount.te | 1 + services/dbus.te | 1 + services/hal.te | 1 + services/xserver.if | 20 ++++++++++++++++++++ system/fstools.te | 1 + system/init.te | 1 + system/libraries.fc | 9 +++++++-- system/logging.if | 32 ++++++++++++++++++++++++++++++++ system/mount.te | 4 +++- system/unconfined.if | 8 -------- system/userdomain.te | 4 ++-- 14 files changed, 105 insertions(+), 13 deletions(-) Index: policy-20060323.patch =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20060323.patch,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- policy-20060323.patch 30 Mar 2006 22:27:52 -0000 1.5 +++ policy-20060323.patch 31 Mar 2006 20:17:33 -0000 1.6 @@ -1,126 +1,18 @@ -diff --exclude-from=exclude -N -u -r nsaserefpolicy/man/man8/samba_selinux.8 serefpolicy-2.2.28/man/man8/samba_selinux.8 ---- nsaserefpolicy/man/man8/samba_selinux.8 2006-01-06 17:55:17.000000000 -0500 -+++ serefpolicy-2.2.28/man/man8/samba_selinux.8 2006-03-29 14:44:17.000000000 -0500 -@@ -23,7 +23,7 @@ - .SH SHARING FILES - If you want to share files with multiple domains (Apache, FTP, rsync, Samba), you can set a file context of public_content_t and public_content_rw_t. These context allow any of the above domains to read the content. If you want a particular domain to write to the public_content_rw_t domain, you must set the appropriate boolean. allow_DOMAIN_anon_write. So for samba you would execute: - --setsebool -P allow_smb_anon_write=1 -+setsebool -P allow_smbd_anon_write=1 - - .SH BOOLEANS - .br -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/logwatch.te serefpolicy-2.2.28/policy/modules/admin/logwatch.te ---- nsaserefpolicy/policy/modules/admin/logwatch.te 2006-03-24 11:54:26.000000000 -0500 -+++ serefpolicy-2.2.28/policy/modules/admin/logwatch.te 2006-03-29 14:44:17.000000000 -0500 -@@ -52,6 +52,7 @@ - files_read_etc_runtime_files(logwatch_t) - files_read_usr_files(logwatch_t) - files_search_spool(logwatch_t) -+files_search_mnt(logwatch_t) - files_dontaudit_search_home(logwatch_t) - - fs_getattr_all_fs(logwatch_t) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.fc serefpolicy-2.2.28/policy/modules/admin/rpm.fc ---- nsaserefpolicy/policy/modules/admin/rpm.fc 2006-03-23 16:02:02.000000000 -0500 -+++ serefpolicy-2.2.28/policy/modules/admin/rpm.fc 2006-03-29 14:44:17.000000000 -0500 -@@ -3,6 +3,7 @@ - /usr/bin/smart -- gen_context(system_u:object_r:rpm_exec_t,s0) - - /usr/bin/yum -- gen_context(system_u:object_r:rpm_exec_t,s0) -+/usr/share/yumex/yumex -- gen_context(system_u:object_r:rpm_exec_t,s0) - - /usr/lib(64)?/rpm/rpmd -- gen_context(system_u:object_r:bin_t,s0) - /usr/lib(64)?/rpm/rpmq -- gen_context(system_u:object_r:bin_t,s0) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/usermanage.te serefpolicy-2.2.28/policy/modules/admin/usermanage.te ---- nsaserefpolicy/policy/modules/admin/usermanage.te 2006-03-24 11:54:26.000000000 -0500 -+++ serefpolicy-2.2.28/policy/modules/admin/usermanage.te 2006-03-29 14:44:17.000000000 -0500 -@@ -225,6 +225,7 @@ - - files_manage_etc_files(groupadd_t) - files_relabel_etc_files(groupadd_t) -+files_read_etc_runtime_files(groupadd_t) - - libs_use_ld_so(groupadd_t) - libs_use_shared_libs(groupadd_t) -@@ -492,6 +493,7 @@ - files_manage_etc_files(useradd_t) - files_search_var_lib(useradd_t) - files_relabel_etc_files(useradd_t) -+files_read_etc_runtime_files(useradd_t) - - init_use_fds(useradd_t) - init_rw_utmp(useradd_t) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corenetwork.te.in serefpolicy-2.2.28/policy/modules/kernel/corenetwork.te.in ---- nsaserefpolicy/policy/modules/kernel/corenetwork.te.in 2006-03-23 16:02:03.000000000 -0500 -+++ serefpolicy-2.2.28/policy/modules/kernel/corenetwork.te.in 2006-03-29 14:44:17.000000000 -0500 -@@ -68,7 +68,7 @@ - network_port(http_cache, tcp,3128,s0, udp,3130,s0, tcp,8080,s0, tcp,8118,s0) # 8118 is for privoxy - network_port(http, tcp,80,s0, tcp,443,s0, tcp,488,s0, tcp,8008,s0) - network_port(howl, tcp,5335,s0, udp,5353,s0) --network_port(hplip, tcp,50000,s0, tcp,50002,s0) -+network_port(hplip, tcp,50000,s0, tcp,50002,s0, tcp,9100,s0) - network_port(i18n_input, tcp,9010,s0) - network_port(imaze, tcp,5323,s0, udp,5323,s0) - network_port(inetd_child, tcp,7,s0, udp,7,s0, tcp,9,s0, udp,9,s0, tcp,13,s0, udp,13,s0, tcp,19,s0, udp,19,s0, tcp,37,s0, udp,37,s0, tcp,512,s0, tcp,543,s0, tcp,544,s0, tcp,891,s0, udp,891,s0, tcp,892,s0, udp,892,s0, tcp,2105,s0, tcp,5666,s0) -@@ -127,7 +127,7 @@ - network_port(uucpd, tcp,540,s0) - network_port(vnc, tcp,5900,s0) - network_port(xen, tcp,8002,s0) --network_port(xserver, tcp,6001,s0, tcp,6002,s0, tcp,6003,s0, tcp,6004,s0, tcp,6005,s0, tcp,6006,s0, tcp,6007,s0, tcp,6008,s0, tcp,6009,s0, tcp,6010,s0, tcp,6011,s0, tcp,6012,s0, tcp,6013,s0, tcp,6014,s0, tcp,6015,s0, tcp,6016,s0, tcp,6017,s0, tcp,6018,s0, tcp,6019,s0) -+network_port(xserver, tcp, 6000, s0, tcp,6001,s0, tcp,6002,s0, tcp,6003,s0, tcp,6004,s0, tcp,6005,s0, tcp,6006,s0, tcp,6007,s0, tcp,6008,s0, tcp,6009,s0, tcp,6010,s0, tcp,6011,s0, tcp,6012,s0, tcp,6013,s0, tcp,6014,s0, tcp,6015,s0, tcp,6016,s0, tcp,6017,s0, tcp,6018,s0, tcp,6019,s0) - network_port(zebra, tcp,2601,s0) - network_port(zope, tcp,8021,s0) - -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.if serefpolicy-2.2.28/policy/modules/kernel/devices.if ---- nsaserefpolicy/policy/modules/kernel/devices.if 2006-03-28 23:09:36.000000000 -0500 -+++ serefpolicy-2.2.28/policy/modules/kernel/devices.if 2006-03-29 14:44:17.000000000 -0500 -@@ -2383,6 +2383,44 @@ - - ######################################## - ## -+## Getattr generic the USB devices. -+## -+## -+## -+## Domain allowed access. -+## -+## -+# -+interface(`dev_getattr_generic_usb_dev',` -+ gen_require(` -+ type usb_device_t; -+ ') -+ -+ allow $1 device_t:dir r_dir_perms; -+ allow $1 usb_device_t:chr_file getattr; -+') -+ -+######################################## -+## -+## Setattr generic the USB devices. -+## -+## -+## -+## Domain allowed access. -+## -+## -+# -+interface(`dev_setattr_generic_usb_dev',` -+ gen_require(` -+ type usb_device_t; -+ ') -+ -+ allow $1 device_t:dir r_dir_perms; -+ allow $1 usb_device_t:chr_file setattr; -+') -+ -+######################################## -+## - ## Mount a usbfs filesystem. - ## - ## -@@ -2822,3 +2860,23 @@ +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.fc serefpolicy-2.2.29/policy/modules/kernel/devices.fc +--- nsaserefpolicy/policy/modules/kernel/devices.fc 2006-03-23 16:45:31.000000000 -0500 ++++ serefpolicy-2.2.29/policy/modules/kernel/devices.fc 2006-03-31 11:49:27.000000000 -0500 +@@ -59,6 +59,7 @@ + ') + /dev/vbi.* -c gen_context(system_u:object_r:v4l_device_t,s0) + /dev/video.* -c gen_context(system_u:object_r:v4l_device_t,s0) ++/dev/dvb/.* -c gen_context(system_u:object_r:v4l_device_t,s0) + /dev/vttuner -c gen_context(system_u:object_r:v4l_device_t,s0) + /dev/vtx.* -c gen_context(system_u:object_r:v4l_device_t,s0) + /dev/winradio. -c gen_context(system_u:object_r:v4l_device_t,s0) +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.if serefpolicy-2.2.29/policy/modules/kernel/devices.if +--- nsaserefpolicy/policy/modules/kernel/devices.if 2006-03-30 10:03:20.000000000 -0500 ++++ serefpolicy-2.2.29/policy/modules/kernel/devices.if 2006-03-31 11:21:52.000000000 -0500 +@@ -2860,3 +2860,23 @@ allow $1 self:capability sys_rawio; typeattribute $1 memory_raw_write, memory_raw_read; ') @@ -144,9 +36,9 @@ + dontaudit $1 device_node:dir_file_class_set getattr; +') + -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.if serefpolicy-2.2.28/policy/modules/kernel/files.if ---- nsaserefpolicy/policy/modules/kernel/files.if 2006-03-28 23:09:36.000000000 -0500 -+++ serefpolicy-2.2.28/policy/modules/kernel/files.if 2006-03-30 16:57:12.000000000 -0500 +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.if serefpolicy-2.2.29/policy/modules/kernel/files.if +--- nsaserefpolicy/policy/modules/kernel/files.if 2006-03-30 10:04:15.000000000 -0500 ++++ serefpolicy-2.2.29/policy/modules/kernel/files.if 2006-03-31 11:21:52.000000000 -0500 @@ -1643,6 +1643,21 @@ ') @@ -169,63 +61,9 @@ ## ## Read files in /etc that are dynamically ## created on boot, such as mtab. -@@ -2152,6 +2167,18 @@ - - ######################################## - # -+# files_dontaudit_search_mnt(domain) -+# -+interface(`files_dontaudit_search_mnt',` -+ gen_require(` -+ type mnt_t; -+ ') -+ -+ dontaudit $1 mnt_t:dir search_dir_perms; -+') -+ -+######################################## -+# - # files_list_mnt(domain) - # - interface(`files_list_mnt',` -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel.if serefpolicy-2.2.28/policy/modules/kernel/kernel.if ---- nsaserefpolicy/policy/modules/kernel/kernel.if 2006-03-23 16:02:03.000000000 -0500 -+++ serefpolicy-2.2.28/policy/modules/kernel/kernel.if 2006-03-29 14:44:17.000000000 -0500 -@@ -1148,7 +1148,7 @@ - - allow $1 proc_t:dir search; - allow $1 sysctl_t:dir r_dir_perms; -- allow $1 sysctl_vm_t:dir list_dir_perms; -+ allow $1 sysctl_vm_t:dir rw_dir_perms; - allow $1 sysctl_vm_t:file rw_file_perms; - ') - -@@ -1433,7 +1433,7 @@ - - allow $1 proc_t:dir search; - allow $1 sysctl_t:dir r_dir_perms; -- allow $1 sysctl_kernel_t:dir r_dir_perms; -+ allow $1 sysctl_kernel_t:dir rw_dir_perms; - allow $1 sysctl_kernel_t:file rw_file_perms; - ') - -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apm.te serefpolicy-2.2.28/policy/modules/services/apm.te ---- nsaserefpolicy/policy/modules/services/apm.te 2006-03-24 11:54:27.000000000 -0500 -+++ serefpolicy-2.2.28/policy/modules/services/apm.te 2006-03-29 14:44:17.000000000 -0500 -@@ -226,6 +226,10 @@ - ') - - optional_policy(` -+ xserver_domtrans_xdm_xserver(apmd_t) -+') -+ -+optional_policy(` - seutil_sigchld_newrole(apmd_t) - ') - -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/automount.te serefpolicy-2.2.28/policy/modules/services/automount.te ---- nsaserefpolicy/policy/modules/services/automount.te 2006-03-24 11:54:27.000000000 -0500 -+++ serefpolicy-2.2.28/policy/modules/services/automount.te 2006-03-30 17:24:29.000000000 -0500 +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/automount.te serefpolicy-2.2.29/policy/modules/services/automount.te +--- nsaserefpolicy/policy/modules/services/automount.te 2006-03-24 11:09:13.000000000 -0500 ++++ serefpolicy-2.2.29/policy/modules/services/automount.te 2006-03-31 11:21:52.000000000 -0500 @@ -123,6 +123,7 @@ logging_search_logs(automount_t) @@ -234,42 +72,9 @@ # Run mount in the mount_t domain. mount_domtrans(automount_t) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bluetooth.te serefpolicy-2.2.28/policy/modules/services/bluetooth.te ---- nsaserefpolicy/policy/modules/services/bluetooth.te 2006-03-29 14:26:02.000000000 -0500 -+++ serefpolicy-2.2.28/policy/modules/services/bluetooth.te 2006-03-29 14:44:17.000000000 -0500 -@@ -220,6 +220,8 @@ - ') - ') - -+sysnet_read_config(bluetooth_helper_t) -+ - optional_policy(` - dbus_system_bus_client_template(bluetooth_helper,bluetooth_helper_t) - dbus_connect_system_bus(bluetooth_helper_t) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.te serefpolicy-2.2.28/policy/modules/services/cups.te ---- nsaserefpolicy/policy/modules/services/cups.te 2006-03-24 11:54:27.000000000 -0500 -+++ serefpolicy-2.2.28/policy/modules/services/cups.te 2006-03-29 14:44:17.000000000 -0500 -@@ -375,7 +375,9 @@ - # HPLIP local policy - # - -+allow hplip_t self:capability net_raw; - dontaudit hplip_t self:capability sys_tty_config; -+allow hplip_t self:fifo_file rw_file_perms; - allow hplip_t self:process signal_perms; - allow hplip_t self:unix_dgram_socket create_socket_perms; - allow hplip_t self:unix_stream_socket create_socket_perms; -@@ -418,6 +420,7 @@ - dev_read_sysfs(hplip_t) - dev_rw_printer(hplip_t) - dev_read_urand(hplip_t) -+dev_rw_generic_usb_dev(hplip_t) - - fs_getattr_all_fs(hplip_t) - fs_search_auto_mountpoints(hplip_t) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dbus.te serefpolicy-2.2.28/policy/modules/services/dbus.te ---- nsaserefpolicy/policy/modules/services/dbus.te 2006-03-24 11:54:27.000000000 -0500 -+++ serefpolicy-2.2.28/policy/modules/services/dbus.te 2006-03-30 17:24:01.000000000 -0500 +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dbus.te serefpolicy-2.2.29/policy/modules/services/dbus.te +--- nsaserefpolicy/policy/modules/services/dbus.te 2006-03-24 11:09:14.000000000 -0500 ++++ serefpolicy-2.2.29/policy/modules/services/dbus.te 2006-03-31 11:21:52.000000000 -0500 @@ -102,6 +102,7 @@ logging_send_syslog_msg(system_dbusd_t) @@ -278,47 +83,9 @@ seutil_read_config(system_dbusd_t) seutil_read_default_contexts(system_dbusd_t) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dovecot.te serefpolicy-2.2.28/policy/modules/services/dovecot.te ---- nsaserefpolicy/policy/modules/services/dovecot.te 2006-03-24 11:54:28.000000000 -0500 -+++ serefpolicy-2.2.28/policy/modules/services/dovecot.te 2006-03-29 14:44:17.000000000 -0500 -@@ -79,12 +79,14 @@ - corenet_tcp_bind_all_nodes(dovecot_t) - corenet_tcp_bind_pop_port(dovecot_t) - corenet_tcp_connect_all_ports(dovecot_t) -+corenet_tcp_connect_postgresql_port(dovecot_t) - - dev_read_sysfs(dovecot_t) - dev_read_urand(dovecot_t) - - fs_getattr_all_fs(dovecot_t) - fs_search_auto_mountpoints(dovecot_t) -+fs_list_inotifyfs(dovecot_t) - - term_dontaudit_use_console(dovecot_t) - -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ftp.te serefpolicy-2.2.28/policy/modules/services/ftp.te ---- nsaserefpolicy/policy/modules/services/ftp.te 2006-03-24 11:54:28.000000000 -0500 -+++ serefpolicy-2.2.28/policy/modules/services/ftp.te 2006-03-30 10:32:47.000000000 -0500 -@@ -134,16 +134,6 @@ - - term_dontaudit_use_generic_ptys(ftpd_t) - term_dontaudit_use_unallocated_ttys(ftpd_t) -- -- optional_policy(` -- tunable_policy(`ftpd_is_daemon',` -- userdom_manage_generic_user_home_content_files(ftpd_t) -- userdom_manage_generic_user_home_content_symlinks(ftpd_t) -- userdom_manage_generic_user_home_content_sockets(ftpd_t) -- userdom_manage_generic_user_home_content_pipes(ftpd_t) -- userdom_generic_user_home_dir_filetrans_generic_user_home_content(ftpd_t,{ dir file lnk_file sock_file fifo_file }) -- ') -- ') - ') - - tunable_policy(`allow_ftpd_anon_write',` -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.te serefpolicy-2.2.28/policy/modules/services/hal.te ---- nsaserefpolicy/policy/modules/services/hal.te 2006-03-24 11:54:28.000000000 -0500 -+++ serefpolicy-2.2.28/policy/modules/services/hal.te 2006-03-30 15:04:04.000000000 -0500 +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.te serefpolicy-2.2.29/policy/modules/services/hal.te +--- nsaserefpolicy/policy/modules/services/hal.te 2006-03-30 10:59:02.000000000 -0500 ++++ serefpolicy-2.2.29/policy/modules/services/hal.te 2006-03-31 11:21:52.000000000 -0500 @@ -52,6 +52,7 @@ kernel_write_proc_files(hald_t) @@ -327,64 +94,9 @@ corecmd_exec_bin(hald_t) corecmd_exec_sbin(hald_t) -@@ -211,6 +212,10 @@ - ') - - optional_policy(` -+ ntp_domtrans(hald_t) -+') -+ -+optional_policy(` - nscd_socket_use(hald_t) - ') - -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/pegasus.te serefpolicy-2.2.28/policy/modules/services/pegasus.te ---- nsaserefpolicy/policy/modules/services/pegasus.te 2006-03-24 11:54:28.000000000 -0500 -+++ serefpolicy-2.2.28/policy/modules/services/pegasus.te 2006-03-29 14:44:17.000000000 -0500 -@@ -77,6 +77,7 @@ - corenet_tcp_bind_pegasus_https_port(pegasus_t) - corenet_tcp_connect_pegasus_http_port(pegasus_t) - corenet_tcp_connect_pegasus_https_port(pegasus_t) -+corenet_tcp_connect_generic_port(pegasus_t) - - dev_read_sysfs(pegasus_t) - dev_read_urand(pegasus_t) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/privoxy.te serefpolicy-2.2.28/policy/modules/services/privoxy.te ---- nsaserefpolicy/policy/modules/services/privoxy.te 2006-03-24 11:54:28.000000000 -0500 -+++ serefpolicy-2.2.28/policy/modules/services/privoxy.te 2006-03-29 14:44:17.000000000 -0500 -@@ -51,6 +51,7 @@ - corenet_tcp_bind_http_cache_port(privoxy_t) - corenet_tcp_connect_http_port(privoxy_t) - corenet_tcp_connect_ftp_port(privoxy_t) -+corenet_tcp_connect_tor_port(privoxy_t) - - dev_read_sysfs(privoxy_t) - -@@ -95,6 +96,10 @@ - ') - - optional_policy(` -+ nscd_socket_use(privoxy_t) -+') -+ -+optional_policy(` - seutil_sigchld_newrole(privoxy_t) - ') - -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xfs.te serefpolicy-2.2.28/policy/modules/services/xfs.te ---- nsaserefpolicy/policy/modules/services/xfs.te 2006-03-24 11:54:29.000000000 -0500 -+++ serefpolicy-2.2.28/policy/modules/services/xfs.te 2006-03-29 14:44:17.000000000 -0500 -@@ -53,6 +53,7 @@ - - files_read_etc_files(xfs_t) - files_read_etc_runtime_files(xfs_t) -+files_read_usr_files(xfs_t) - - init_use_fds(xfs_t) - init_use_script_ptys(xfs_t) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.if serefpolicy-2.2.28/policy/modules/services/xserver.if ---- nsaserefpolicy/policy/modules/services/xserver.if 2006-03-28 23:09:36.000000000 -0500 -+++ serefpolicy-2.2.28/policy/modules/services/xserver.if 2006-03-29 14:44:17.000000000 -0500 +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.if serefpolicy-2.2.29/policy/modules/services/xserver.if +--- nsaserefpolicy/policy/modules/services/xserver.if 2006-03-30 10:16:43.000000000 -0500 ++++ serefpolicy-2.2.29/policy/modules/services/xserver.if 2006-03-31 11:21:52.000000000 -0500 @@ -1015,3 +1015,23 @@ dontaudit $1 xdm_xserver_t:tcp_socket { read write }; @@ -409,33 +121,10 @@ + allow $1 xdm_xserver_tmp_t:dir search; + allow $1 xdm_xserver_tmp_t:sock_file { read write }; +') -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlogin.te serefpolicy-2.2.28/policy/modules/system/authlogin.te ---- nsaserefpolicy/policy/modules/system/authlogin.te 2006-03-24 11:54:29.000000000 -0500 -+++ serefpolicy-2.2.28/policy/modules/system/authlogin.te 2006-03-29 14:44:17.000000000 -0500 -@@ -171,6 +171,8 @@ - dev_setattr_video_dev(pam_console_t) - dev_getattr_xserver_misc_dev(pam_console_t) - dev_setattr_xserver_misc_dev(pam_console_t) -+dev_getattr_generic_usb_dev(pam_console_t) -+dev_setattr_generic_usb_dev(pam_console_t) - - fs_search_auto_mountpoints(pam_console_t) - -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/fstools.te serefpolicy-2.2.28/policy/modules/system/fstools.te ---- nsaserefpolicy/policy/modules/system/fstools.te 2006-03-24 11:54:29.000000000 -0500 -+++ serefpolicy-2.2.28/policy/modules/system/fstools.te 2006-03-29 14:44:17.000000000 -0500 -@@ -67,6 +67,10 @@ - dev_read_urand(fsadm_t) - # Recreate /dev/cdrom. - dev_manage_generic_symlinks(fsadm_t) -+ -+# fdisk needs this for early boot -+dev_manage_generic_blk_files(fsadm_t) -+ - # Access to /initrd devices - dev_search_usbfs(fsadm_t) - # for swapon -@@ -75,6 +79,7 @@ +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/fstools.te serefpolicy-2.2.29/policy/modules/system/fstools.te +--- nsaserefpolicy/policy/modules/system/fstools.te 2006-03-30 10:59:03.000000000 -0500 ++++ serefpolicy-2.2.29/policy/modules/system/fstools.te 2006-03-31 11:21:52.000000000 -0500 +@@ -77,6 +77,7 @@ dev_getattr_usbfs_dirs(fsadm_t) # Access to /dev/mapper/control dev_rw_lvm_control(fsadm_t) @@ -443,9 +132,9 @@ fs_search_auto_mountpoints(fsadm_t) fs_getattr_xattr_fs(fsadm_t) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.te serefpolicy-2.2.28/policy/modules/system/init.te ---- nsaserefpolicy/policy/modules/system/init.te 2006-03-29 14:26:03.000000000 -0500 -+++ serefpolicy-2.2.28/policy/modules/system/init.te 2006-03-29 14:44:17.000000000 -0500 +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.te serefpolicy-2.2.29/policy/modules/system/init.te +--- nsaserefpolicy/policy/modules/system/init.te 2006-03-30 10:13:28.000000000 -0500 ++++ serefpolicy-2.2.29/policy/modules/system/init.te 2006-03-31 11:21:52.000000000 -0500 @@ -353,6 +353,7 @@ files_mounton_isid_type_dirs(initrc_t) files_list_default(initrc_t) @@ -454,9 +143,9 @@ libs_rw_ld_so_cache(initrc_t) libs_use_ld_so(initrc_t) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.fc serefpolicy-2.2.28/policy/modules/system/libraries.fc ---- nsaserefpolicy/policy/modules/system/libraries.fc 2006-03-23 16:02:04.000000000 -0500 -+++ serefpolicy-2.2.28/policy/modules/system/libraries.fc 2006-03-30 13:22:43.000000000 -0500 +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.fc serefpolicy-2.2.29/policy/modules/system/libraries.fc +--- nsaserefpolicy/policy/modules/system/libraries.fc 2006-03-30 10:18:07.000000000 -0500 ++++ serefpolicy-2.2.29/policy/modules/system/libraries.fc 2006-03-31 15:15:11.000000000 -0500 @@ -55,6 +55,8 @@ /usr(/.*)?/nvidia/.*\.so(\..*)? -- gen_context(system_u:object_r:textrel_shlib_t,s0) @@ -466,18 +155,25 @@ /usr/lib(64)?/pgsql/test/regress/.*\.so -- gen_context(system_u:object_r:shlib_t,s0) /usr/lib/win32/.* -- gen_context(system_u:object_r:shlib_t,s0) -@@ -148,7 +150,7 @@ - /usr/lib(64)?/php/modules/.*\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0) - - # Livna.org packages: xmms-mp3, ffmpeg, xvidcore, xine-lib, gsm, lame --/usr/lib(64)?/xmms/Input/libmpg123\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0) -+/usr/lib(64)?.*/libmpg123\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0) - /usr/lib(64)?/libpostproc\.so.* -- gen_context(system_u:object_r:textrel_shlib_t,s0) - /usr/lib(64)?/libavformat-.*\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0) - /usr/lib(64)?/libavcodec-.*\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.if serefpolicy-2.2.28/policy/modules/system/logging.if ---- nsaserefpolicy/policy/modules/system/logging.if 2006-03-21 14:33:36.000000000 -0500 -+++ serefpolicy-2.2.28/policy/modules/system/logging.if 2006-03-30 14:26:04.000000000 -0500 +@@ -70,10 +72,13 @@ + /usr/(local/)?lib/wine/.*\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0) + /usr/(local/)?lib/libfame-.*\.so.* -- gen_context(system_u:object_r:textrel_shlib_t,s0) + /usr/local/.*\.so(\.[^/]*)* -- gen_context(system_u:object_r:shlib_t,s0) +- ++/usr/lib(64)?/libjs\.so.* -- gen_context(system_u:object_r:textrel_shlib_t,s0) + /usr/X11R6/lib/libGL\.so.* -- gen_context(system_u:object_r:textrel_shlib_t,s0) + /usr/X11R6/lib/libXvMCNVIDIA\.so.* -- gen_context(system_u:object_r:textrel_shlib_t,s0) +- ++/usr/lib(64)?/nvidia-graphics(-[^/]*/)?libGL(core)?\.so(\.[^/]*)* -- gen_context(system_u:object_r:textrel_shlib_t,s0) ++/usr/lib(64)?/nvidia-graphics(-[^/]*/)?libnvidia.*\.so(\.[^/]*)* -- gen_context(system_u:object_r:textrel_shlib_t,s0) ++/usr/lib(64)?/nvidia-graphics(-[^/]*/)?libXvMCNVIDIA\.so.* -- gen_context(system_u:object_r:textrel_shlib_t,s0) ++/usr/lib(64)?/xorg/modules/extensions/nvidia(-[^/]*)?/libglx\.so(\.[^/]*)* -- gen_context(system_u:object_r:textrel_shlib_t,s0) + /usr/x11R6/lib/modules/extensions/libglx\.so(\.[^/]*)* -- gen_context(system_u:object_r:textrel_shlib_t,s0) + /usr/lib(64)?/xorg/modules/extensions/libglx\.so(\.[^/]*)* -- gen_context(system_u:object_r:textrel_shlib_t,s0) + +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.if serefpolicy-2.2.29/policy/modules/system/logging.if +--- nsaserefpolicy/policy/modules/system/logging.if 2006-03-23 16:46:11.000000000 -0500 ++++ serefpolicy-2.2.29/policy/modules/system/logging.if 2006-03-31 11:21:52.000000000 -0500 @@ -368,3 +368,35 @@ allow $1 var_log_t:dir rw_dir_perms; allow $1 var_log_t:file create_file_perms; @@ -514,117 +210,30 @@ + allow auditctl_t $3:chr_file rw_term_perms; +') + -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.te serefpolicy-2.2.28/policy/modules/system/mount.te ---- nsaserefpolicy/policy/modules/system/mount.te 2006-03-24 11:54:29.000000000 -0500 -+++ serefpolicy-2.2.28/policy/modules/system/mount.te 2006-03-29 14:44:17.000000000 -0500 -@@ -72,6 +72,8 @@ - # for when /etc/mtab loses its type - # cjp: this seems wrong, the type should probably be etc - files_read_isid_type_files(mount_t) -+# For reading cert files -+files_read_usr_files(mount_t) - - init_use_fds(mount_t) - init_use_script_ptys(mount_t) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.fc serefpolicy-2.2.28/policy/modules/system/selinuxutil.fc ---- nsaserefpolicy/policy/modules/system/selinuxutil.fc 2006-03-23 16:02:04.000000000 -0500 -+++ serefpolicy-2.2.28/policy/modules/system/selinuxutil.fc 2006-03-29 14:44:17.000000000 -0500 -@@ -33,6 +33,7 @@ - /usr/lib(64)?/selinux(/.*)? gen_context(system_u:object_r:policy_src_t,s0) - - /usr/sbin/load_policy -- gen_context(system_u:object_r:load_policy_exec_t,s0) -+/usr/sbin/restorecond -- gen_context(system_u:object_r:restorecond_exec_t,s0) - /usr/sbin/run_init -- gen_context(system_u:object_r:run_init_exec_t,s0) - /usr/sbin/setfiles.* -- gen_context(system_u:object_r:setfiles_exec_t,s0) - /usr/sbin/semodule -- gen_context(system_u:object_r:semanage_exec_t,s0) -@@ -40,3 +41,8 @@ - ifdef(`distro_debian', ` - /usr/share/selinux(/.*)? gen_context(system_u:object_r:policy_src_t,s0) - ') -+ -+# -+# /var/run -+# -+/var/run/restorecond.pid -- gen_context(system_u:object_r:restorecond_var_run_t,s0) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.te serefpolicy-2.2.28/policy/modules/system/selinuxutil.te ---- nsaserefpolicy/policy/modules/system/selinuxutil.te 2006-03-29 14:26:03.000000000 -0500 -+++ serefpolicy-2.2.28/policy/modules/system/selinuxutil.te 2006-03-29 14:44:24.000000000 -0500 -@@ -83,6 +83,15 @@ - init_system_domain(restorecon_t,restorecon_exec_t) - role system_r types restorecon_t; - -+type restorecond_t; -+type restorecond_exec_t; -+init_daemon_domain(restorecond_t,restorecond_exec_t) -+domain_obj_id_change_exemption(restorecond_t) -+role system_r types restorecond_t; -+ -+type restorecond_var_run_t; -+files_pid_file(restorecond_var_run_t) -+ - type run_init_t; - type run_init_exec_t; - domain_type(run_init_t) -@@ -415,6 +424,48 @@ - - allow restorecon_t kernel_t:unix_dgram_socket { read write }; - -+######################################## -+# -+# Restorecond local policy -+# -+ -+allow restorecond_t self:capability { dac_override dac_read_search fowner }; -+allow restorecond_t self:fifo_file rw_file_perms; -+ -+auth_relabel_all_files_except_shadow(restorecond_t ) -+auth_read_all_files_except_shadow(restorecond_t) -+ -+allow restorecond_t restorecond_var_run_t:file create_file_perms; -+files_pid_filetrans(restorecond_t,restorecond_var_run_t, file) -+ -+kernel_use_fds(restorecond_t) -+kernel_rw_pipes(restorecond_t) -+kernel_read_system_state(restorecond_t) -+ -+fs_getattr_xattr_fs(restorecond_t) -+fs_list_inotifyfs(restorecond_t) -+ -+selinux_get_fs_mount(restorecond_t) -+selinux_validate_context(restorecond_t) -+selinux_compute_access_vector(restorecond_t) -+selinux_compute_create_context(restorecond_t) -+selinux_compute_relabel_context(restorecond_t) -+selinux_compute_user_contexts(restorecond_t) -+ -+term_dontaudit_use_generic_ptys(restorecond_t) -+ -+sysnet_dns_name_resolve(restorecond_t) -+ -+init_use_fds(restorecond_t) -+ -+libs_use_ld_so(restorecond_t) -+libs_use_shared_libs(restorecond_t) -+ -+logging_send_syslog_msg(restorecond_t) -+ -+miscfiles_read_localization(run_init_t) -+ -+ - ################################# +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.te serefpolicy-2.2.29/policy/modules/system/mount.te +--- nsaserefpolicy/policy/modules/system/mount.te 2006-03-30 10:59:03.000000000 -0500 ++++ serefpolicy-2.2.29/policy/modules/system/mount.te 2006-03-31 15:12:44.000000000 -0500 +@@ -19,7 +19,8 @@ + # mount local policy # - # Run_init local policy -@@ -595,6 +646,7 @@ - miscfiles_read_localization(setfiles_t) - - seutil_get_semanage_read_lock(setfiles_t) -+seutil_get_semanage_trans_lock(setfiles_t) - - userdom_use_all_users_fds(setfiles_t) - # for config files in a home directory -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.if serefpolicy-2.2.28/policy/modules/system/unconfined.if ---- nsaserefpolicy/policy/modules/system/unconfined.if 2006-03-29 14:26:03.000000000 -0500 -+++ serefpolicy-2.2.28/policy/modules/system/unconfined.if 2006-03-30 13:28:32.000000000 -0500 + +-allow mount_t self:capability { ipc_lock sys_rawio sys_admin dac_override chown sys_tty_config }; ++# setuid/setgid needed to mount cifs ++allow mount_t self:capability { ipc_lock sys_rawio sys_admin dac_override chown sys_tty_config setuid setgid }; + + allow mount_t mount_tmp_t:file create_file_perms; + allow mount_t mount_tmp_t:dir create_dir_perms; +@@ -44,6 +45,7 @@ + storage_raw_write_removable_device(mount_t) + + fs_getattr_xattr_fs(mount_t) ++fs_getattr_cifs(mount_t) + fs_mount_all_fs(mount_t) + fs_unmount_all_fs(mount_t) + fs_remount_all_fs(mount_t) +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.if serefpolicy-2.2.29/policy/modules/system/unconfined.if +--- nsaserefpolicy/policy/modules/system/unconfined.if 2006-03-29 09:34:53.000000000 -0500 ++++ serefpolicy-2.2.29/policy/modules/system/unconfined.if 2006-03-31 11:21:52.000000000 -0500 @@ -89,14 +89,6 @@ storage_unconfined($1) ') @@ -640,9 +249,9 @@ ') ######################################## -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-2.2.28/policy/modules/system/userdomain.te ---- nsaserefpolicy/policy/modules/system/userdomain.te 2006-03-28 23:09:37.000000000 -0500 -+++ serefpolicy-2.2.28/policy/modules/system/userdomain.te 2006-03-30 15:11:51.000000000 -0500 +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-2.2.29/policy/modules/system/userdomain.te +--- nsaserefpolicy/policy/modules/system/userdomain.te 2006-03-28 12:58:49.000000000 -0500 ++++ serefpolicy-2.2.29/policy/modules/system/userdomain.te 2006-03-31 11:21:52.000000000 -0500 @@ -179,10 +179,10 @@ mls_file_downgrade(secadm_t) init_exec(secadm_t) Index: selinux-policy.spec =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v retrieving revision 1.164 retrieving revision 1.165 diff -u -r1.164 -r1.165 --- selinux-policy.spec 30 Mar 2006 22:27:52 -0000 1.164 +++ selinux-policy.spec 31 Mar 2006 20:17:33 -0000 1.165 @@ -15,8 +15,8 @@ %define CHECKPOLICYVER 1.30.1-2 Summary: SELinux policy configuration Name: selinux-policy -Version: 2.2.28 -Release: 3 +Version: 2.2.29 +Release: 1 License: GPL Group: System Environment/Base Source: serefpolicy-%{version}.tgz @@ -320,10 +320,13 @@ %endif %changelog -* Fri Mar 30 2006 Dan Walsh 2.2.28-3 +* Fri Mar 30 2006 Dan Walsh 2.2.29-1 +- Update to upstream + +* Thu Mar 30 2006 Dan Walsh 2.2.28-3 - Allow automount and dbus to read cert files -* Fri Mar 30 2006 Dan Walsh 2.2.28-2 +* Thu Mar 30 2006 Dan Walsh 2.2.28-2 - Fix ftp policy - Fix secadm running of auditctl From fedora-cvs-commits at redhat.com Fri Mar 31 20:46:39 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 31 Mar 2006 15:46:39 -0500 Subject: rpms/selinux-policy/devel policy-20060323.patch,1.6,1.7 Message-ID: <200603312046.k2VKkdtU010029@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/selinux-policy/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv9469 Modified Files: policy-20060323.patch Log Message: * Fri Mar 30 2006 Dan Walsh 2.2.29-1 - Update to upstream policy-20060323.patch: 0 files changed From fedora-cvs-commits at redhat.com Fri Mar 31 20:46:44 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 31 Mar 2006 15:46:44 -0500 Subject: rpms/fetchmail/devel fetchmail-6.3.3-resolv.patch, NONE, 1.1 fetchmail-6.3.3-types.patch, NONE, 1.1 fetchmail.spec, 1.41, 1.42 Message-ID: <200603312046.k2VKkiEH010877@cvs.devel.redhat.com> Author: mitr Update of /cvs/dist/rpms/fetchmail/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv8770 Modified Files: fetchmail.spec Added Files: fetchmail-6.3.3-resolv.patch fetchmail-6.3.3-types.patch Log Message: * Fri Mar 31 2006 Miloslav Trmac - 6.3.3-2 - Fix some type mismatches on 64-bit architectures - Fix checking for res_* on architectures with newer glibc ABI fetchmail-6.3.3-resolv.patch: configure.ac | 32 +++++++++++++++++++++++++++----- 1 files changed, 27 insertions(+), 5 deletions(-) --- NEW FILE fetchmail-6.3.3-resolv.patch --- diff --exclude '*~' --exclude '*.o' -urN fetchmail/configure.ac fetchmail-6.3.3/configure.ac --- fetchmail/configure.ac 2006-03-29 12:30:05.000000000 +0200 +++ fetchmail-6.3.3/configure.ac 2006-03-31 19:29:12.000000000 +0200 @@ -137,7 +137,7 @@ AC_SUBST(EXTRAOBJ) AC_CHECK_FUNCS(tcsetattr stty setsid geteuid seteuid dnl - res_search strerror syslog snprintf vprintf vsnprintf vsyslog dnl + strerror syslog snprintf vprintf vsnprintf vsyslog dnl atexit inet_aton strftime setrlimit socketpair sigprocmask dnl sigaction strdup setlocale) @@ -147,10 +147,32 @@ # and breaks gethostbyname(2). It's better to use the bind stuff in the C # library. So don't add -lresolv to the link list unless it's necessary # (It will be necessary when using GNU libc6). -AC_CHECK_FUNC(res_search, - AC_MSG_RESULT(using libc's resolver functions), - AC_CHECK_LIB(resolv,res_search, - [AC_DEFINE(HAVE_RES_SEARCH) AC_MSG_RESULT(found resolver functions in libresolv); LIBS="$LIBS -lresolv"], AC_MSG_RESULT(no resolver calls found))) +old_libs=$LIBS +for lib in '' -lresolv; do + if test -z "$lib"; then + AC_MSG_CHECKING([for res_search in libc]) + else + AC_MSG_CHECKING([for res_search in $lib]) + fi + LIBS="$old_LIBS $lib" + AC_LINK_IFELSE([AC_LANG_PROGRAM([[ +#include +#ifdef HAVE_NETINET_IN_H +#include +#endif +#ifdef HAVE_ARPA_NAMESER_H +#include +#endif +#ifdef HAVE_RESOLV_H +#include +#endif +extern int res_search(); +]], [[res_search(0, 0, 0, 0, 0);]])], + [AC_MSG_RESULT([found]) + AC_DEFINE(HAVE_RES_SEARCH, [1], + [Define to 1 if you have the `res_search' function.]) + break], [AC_MSG_RESULT([not found])]) +done dnl Check for libcrypt -- it may live in libc or libcrypt, as on IRIX AC_CHECK_FUNC(crypt, , AC_CHECK_LIB(crypt,crypt)) fetchmail-6.3.3-types.patch: rpa.c | 2 +- socket.c | 2 +- transact.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) --- NEW FILE fetchmail-6.3.3-types.patch --- diff --exclude '*~' --exclude '*.o' -urN fetchmail/rpa.c fetchmail-6.3.3/rpa.c --- fetchmail/rpa.c 2006-03-15 17:38:55.000000000 +0100 +++ fetchmail-6.3.3/rpa.c 2006-03-31 17:35:53.000000000 +0200 @@ -527,7 +527,7 @@ else if ( ch=='+' ) newx = 62; else if ( ch=='/' ) newx = 63; else { - report(stderr, GT_("dec64 error at char %d: %x\n"), inp - bufp, ch); + report(stderr, GT_("dec64 error at char %d: %x\n"), (int)(inp - bufp), ch); return(0); } part=((part & 0x3F)*64) + newx; diff --exclude '*~' --exclude '*.o' -urN fetchmail/socket.c fetchmail-6.3.3/socket.c --- fetchmail/socket.c 2006-03-31 17:30:00.000000000 +0200 +++ fetchmail-6.3.3/socket.c 2006-03-31 17:34:17.000000000 +0200 @@ -755,7 +755,7 @@ case X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT: X509_NAME_oneline(issuer, buf, sizeof(buf)); buf[sizeof(buf) - 1] = '\0'; - report(stderr, GT_("unknown issuer (first %d characters): %s\n"), sizeof(buf)-1, buf); + report(stderr, GT_("unknown issuer (first %d characters): %s\n"), (int)(sizeof(buf)-1), buf); break; } } diff --exclude '*~' --exclude '*.o' -urN fetchmail/transact.c fetchmail-6.3.3/transact.c --- fetchmail/transact.c 2006-03-15 17:58:18.000000000 +0100 +++ fetchmail-6.3.3/transact.c 2006-03-31 17:35:19.000000000 +0200 @@ -1164,7 +1164,7 @@ saddr, sizeof(saddr), NULL, 0, NI_NUMERICHOST); if (e) - snprintf(saddr, sizeof(saddr), "(%-.*s)", sizeof(saddr) - 3, gai_strerror(e)); + snprintf(saddr, sizeof(saddr), "(%-.*s)", (int)(sizeof(saddr) - 3), gai_strerror(e)); snprintf(buf, sizeof(buf), "Received: from %s [%s]\r\n", ctl->server.truename, saddr); Index: fetchmail.spec =================================================================== RCS file: /cvs/dist/rpms/fetchmail/devel/fetchmail.spec,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- fetchmail.spec 31 Mar 2006 15:20:22 -0000 1.41 +++ fetchmail.spec 31 Mar 2006 20:46:42 -0000 1.42 @@ -4,11 +4,13 @@ Summary: A remote mail retrieval and forwarding utility. Name: fetchmail Version: 6.3.3 -Release: 1 +Release: 2 Requires: smtpdaemon Source0: http://download.berlios.de/fetchmail/fetchmail-%{version}.tar.bz2 Source1: http://download.berlios.de/fetchmail/fetchmail-%{version}.tar.bz2.asc Patch0: fetchmail-6.2.5-addrconf.patch +Patch1: fetchmail-6.3.3-types.patch +Patch2: fetchmail-6.3.3-resolv.patch URL: http://fetchmail.berlios.de/ License: GPL Group: Applications/Internet @@ -46,6 +48,11 @@ %prep %setup -q %patch0 -p1 -b .addrconf +%patch1 -p1 -b .types +%patch2 -p1 -b .resolv + +# For fetchmail-6.3.3-resolv.patch +autoreconf -f %build %configure --enable-POP3 --enable-IMAP --with-ssl --with-hesiod \ @@ -83,6 +90,10 @@ %endif %changelog +* Fri Mar 31 2006 Miloslav Trmac - 6.3.3-2 +- Fix some type mismatches on 64-bit architectures +- Fix checking for res_* on architectures with newer glibc ABI + * Fri Mar 31 2006 Miloslav Trmac - 6.3.3-1 - Update to fetchmail-6.3.3 From fedora-cvs-commits at redhat.com Fri Mar 31 20:48:19 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 31 Mar 2006 15:48:19 -0500 Subject: rpms/kernel/devel kernel-2.6.spec, 1.2109, 1.2110 linux-2.6-hvc-console.patch, 1.3, 1.4 linux-2.6-cell-is-cbea.patch, 1.2, NONE linux-2.6-cell-spiderpic-no-devtree.patch, 1.1, NONE linux-2.6-hvc-rtas-console.patch, 1.1, NONE Message-ID: <200603312048.k2VKmJdR013394@cvs.devel.redhat.com> Author: dwmw2 Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv13379 Modified Files: kernel-2.6.spec linux-2.6-hvc-console.patch Removed Files: linux-2.6-cell-is-cbea.patch linux-2.6-cell-spiderpic-no-devtree.patch linux-2.6-hvc-rtas-console.patch Log Message: sync cell stuff Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.2109 retrieving revision 1.2110 diff -u -r1.2109 -r1.2110 --- kernel-2.6.spec 31 Mar 2006 20:07:18 -0000 1.2109 +++ kernel-2.6.spec 31 Mar 2006 20:48:15 -0000 1.2110 @@ -236,11 +236,8 @@ # 300 - 399 ppc(64) Patch301: linux-2.6-cell-numa-init.patch -Patch302: linux-2.6-cell-is-cbea.patch Patch305: linux-2.6-cell-mambo-drivers.patch Patch306: linux-2.6-hvc-console.patch -Patch310: linux-2.6-cell-spiderpic-no-devtree.patch -Patch313: linux-2.6-hvc-rtas-console.patch Patch314: linux-2.6-ppc-rtas-check.patch Patch317: linux-2.6-ppc-iseries-input-layer.patch @@ -744,16 +741,10 @@ # # Arnd says don't call cell_spumem_init() till he fixes it. %patch301 -p1 -# IBM will use 'IBM,CBEA' for future Cell systems -#%patch302 -p1 # Support the IBM Mambo simulator; core as well as disk and network drivers. %patch305 -p1 # Make HVC console generic; support simulator console device using it. -#%patch306 -p1 -# Hardcode PIC addresses for Cell spiderpic -#%patch310 -p1 -# RTAS console support -#%patch313 -p1 +%patch306 -p1 # Check properly for successful RTAS instantiation %patch314 -p1 # No input layer on iseries linux-2.6-hvc-console.patch: linux-2.6.14/drivers/char/hvc_fss.c | 149 +++++++++++++++++++++++++++++++++ linux-2.6.16.ppc/drivers/char/Kconfig | 9 + linux-2.6.16.ppc/drivers/char/Makefile | 1 3 files changed, 159 insertions(+) Index: linux-2.6-hvc-console.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-hvc-console.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- linux-2.6-hvc-console.patch 10 Jan 2006 01:45:59 -0000 1.3 +++ linux-2.6-hvc-console.patch 31 Mar 2006 20:48:15 -0000 1.4 @@ -1,153 +1,3 @@ -diff -uNr --exclude '*.orig' linux-2.6.14.cons/drivers/char/hvc_console.c linux-2.6.14/drivers/char/hvc_console.c ---- linux-2.6.14.cons/drivers/char/hvc_console.c 2005-12-07 16:33:35.000000000 +0100 -+++ linux-2.6.14/drivers/char/hvc_console.c 2005-12-07 16:33:56.000000000 +0100 -@@ -40,7 +40,7 @@ - #include - #include - #include --#include -+#include "hvc_console.h" - - #define HVC_MAJOR 229 - #define HVC_MINOR 0 -@@ -61,11 +61,6 @@ - */ - #define HVC_ALLOC_TTY_ADAPTERS 8 - --#define N_OUTBUF 16 --#define N_INBUF 16 -- --#define __ALIGNED__ __attribute__((__aligned__(8))) -- - static struct tty_driver *hvc_driver; - static struct task_struct *hvc_task; - -@@ -76,22 +71,6 @@ - static int sysrq_pressed; - #endif - --struct hvc_struct { -- spinlock_t lock; -- int index; -- struct tty_struct *tty; -- unsigned int count; -- int do_wakeup; -- char outbuf[N_OUTBUF] __ALIGNED__; -- int n_outbuf; -- uint32_t vtermno; -- struct hv_ops *ops; -- int irq_requested; -- int irq; -- struct list_head next; -- struct kobject kobj; /* ref count & hvc_struct lifetime */ --}; -- - /* dynamic list of hvc_struct instances */ - static struct list_head hvc_structs = LIST_HEAD_INIT(hvc_structs); - -@@ -136,7 +115,6 @@ - return hp; - } - -- - /* - * Initial console vtermnos for console API usage prior to full console - * initialization. Any vty adapter outside this range will not have usable -@@ -154,6 +132,7 @@ - - void hvc_console_print(struct console *co, const char *b, unsigned count) - { -+ /* This [16] should probably use a #define */ - char c[16] __ALIGNED__; - unsigned i = 0, n = 0; - int r, donecr = 0, index = co->index; -diff -uNr --exclude '*.orig' linux-2.6.14.cons/drivers/char/hvc_console.h linux-2.6.14/drivers/char/hvc_console.h ---- linux-2.6.14.cons/drivers/char/hvc_console.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.14/drivers/char/hvc_console.h 2005-12-07 16:33:56.000000000 +0100 -@@ -0,0 +1,83 @@ -+/* -+ * hvc_console.h -+ * Copyright (C) 2005 IBM Corporation -+ * -+ * Author(s): -+ * Ryan S. Arnold -+ * -+ * hvc_console header information: -+ * moved here from include/asm-ppc64/hvconsole.h -+ * and drivers/char/hvc_console.c -+ * -+ * 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 -+ */ -+ -+#ifndef HVC_CONSOLE_H -+#define HVC_CONSOLE_H -+ -+#include -+#include -+#include -+ -+/* -+ * This is the max number of console adapters that can/will be found as -+ * console devices on first stage console init. Any number beyond this range -+ * can't be used as a console device but is still a valid tty device. -+ */ -+#define MAX_NR_HVC_CONSOLES 16 -+ -+/* -+ * This is a design shortcoming, the number '16' is a vio required buffer -+ * size. This should be changeable per architecture, but hvc_struct relies -+ * upon it and that struct is used by all hvc_console backend drivers. This -+ * needs to be fixed. -+ */ -+#define N_OUTBUF 16 -+#define N_INBUF 16 -+ -+#define __ALIGNED__ __attribute__((__aligned__(sizeof(long)))) -+ -+/* implemented by a low level driver */ -+struct hv_ops { -+ int (*get_chars)(uint32_t vtermno, char *buf, int count); -+ int (*put_chars)(uint32_t vtermno, const char *buf, int count); -+}; -+ -+struct hvc_struct { -+ spinlock_t lock; -+ int index; -+ struct tty_struct *tty; -+ unsigned int count; -+ int do_wakeup; -+ char outbuf[N_OUTBUF] __ALIGNED__; -+ int n_outbuf; -+ uint32_t vtermno; -+ struct hv_ops *ops; -+ int irq_requested; -+ int irq; -+ struct list_head next; -+ struct kobject kobj; /* ref count & hvc_struct lifetime */ -+}; -+ -+/* Register a vterm and a slot index for use as a console (console_init) */ -+extern int hvc_instantiate(uint32_t vtermno, int index, struct hv_ops *ops); -+ -+/* register a vterm for hvc tty operation (module_init or hotplug add) */ -+extern struct hvc_struct * __devinit hvc_alloc(uint32_t vtermno, int irq, -+ struct hv_ops *ops); -+/* remove a vterm from hvc tty operation (modele_exit or hotplug remove) */ -+extern int __devexit hvc_remove(struct hvc_struct *hp); -+ -+#endif // HVC_CONSOLE_H diff -uNr --exclude '*.orig' linux-2.6.14.cons/drivers/char/hvc_fss.c linux-2.6.14/drivers/char/hvc_fss.c --- linux-2.6.14.cons/drivers/char/hvc_fss.c 1970-01-01 01:00:00.000000000 +0100 +++ linux-2.6.14/drivers/char/hvc_fss.c 2005-12-07 16:34:02.000000000 +0100 @@ -301,26 +151,23 @@ + return 0; +} +console_initcall(hvc_fss_console_init); -diff -uNr --exclude '*.orig' linux-2.6.14.cons/drivers/char/Kconfig linux-2.6.14/drivers/char/Kconfig ---- linux-2.6.14.cons/drivers/char/Kconfig 2005-12-07 16:33:33.000000000 +0100 -+++ linux-2.6.14/drivers/char/Kconfig 2005-12-07 16:33:58.000000000 +0100 -@@ -552,14 +552,27 @@ - - If unsure, say N. - -+config HVC_DRIVER -+ bool -+ depends on PPC_PSERIES || PPC_CELL || PPC_RTAS -+ - config HVC_CONSOLE - bool "pSeries Hypervisor Virtual Console support" - depends on PPC_PSERIES -+ select HVC_DRIVER +--- linux-2.6.16.ppc/drivers/char/Makefile~ 2006-03-31 20:44:59.000000000 +0100 ++++ linux-2.6.16.ppc/drivers/char/Makefile 2006-03-31 21:28:29.000000000 +0100 +@@ -44,6 +44,7 @@ obj-$(CONFIG_RIO) += rio/ generic_seria + obj-$(CONFIG_HVC_DRIVER) += hvc_console.o + obj-$(CONFIG_HVC_CONSOLE) += hvc_vio.o hvsi.o + obj-$(CONFIG_HVC_RTAS) += hvc_rtas.o ++obj-$(CONFIG_HVC_FSS) += hvc_fss.o + obj-$(CONFIG_RAW_DRIVER) += raw.o + obj-$(CONFIG_SGI_SNSC) += snsc.o snsc_event.o + obj-$(CONFIG_MMTIMER) += mmtimer.o +--- linux-2.6.16.ppc/drivers/char/Kconfig~ 2006-03-31 20:44:59.000000000 +0100 ++++ linux-2.6.16.ppc/drivers/char/Kconfig 2006-03-31 21:29:05.000000000 +0100 +@@ -588,6 +588,15 @@ config HVC_RTAS help - pSeries machines when partitioned support a hypervisor virtual - console. This driver allows each pSeries partition to have a console - which is accessed via the HMC. + IBM Console device driver which makes use of RTAS ++ +config HVC_FSS + bool "IBM Full System Simulator Console support" + depends on MAMBO @@ -332,66 +179,3 @@ config HVCS tristate "IBM Hypervisor Virtual Console Server support" depends on PPC_PSERIES -diff -uNr --exclude '*.orig' linux-2.6.14.cons/drivers/char/Makefile linux-2.6.14/drivers/char/Makefile ---- linux-2.6.14.cons/drivers/char/Makefile 2005-12-07 16:33:33.000000000 +0100 -+++ linux-2.6.14/drivers/char/Makefile 2005-12-07 16:33:58.000000000 +0100 -@@ -40,11 +40,13 @@ - obj-$(CONFIG_AMIGA_BUILTIN_SERIAL) += amiserial.o - obj-$(CONFIG_SX) += sx.o generic_serial.o - obj-$(CONFIG_RIO) += rio/ generic_serial.o --obj-$(CONFIG_HVC_CONSOLE) += hvc_console.o hvc_vio.o hvsi.o -+obj-$(CONFIG_HVC_DRIVER) += hvc_console.o -+obj-$(CONFIG_HVC_CONSOLE) += hvc_vio.o hvsi.o -+obj-$(CONFIG_HVC_FSS) += hvc_fss.o - obj-$(CONFIG_RAW_DRIVER) += raw.o - obj-$(CONFIG_SGI_SNSC) += snsc.o snsc_event.o - obj-$(CONFIG_MMTIMER) += mmtimer.o --obj-$(CONFIG_VIOCONS) += viocons.o -+obj-$(CONFIG_VIOCONS) += viocons.o - obj-$(CONFIG_VIOTAPE) += viotape.o - obj-$(CONFIG_HVCS) += hvcs.o - obj-$(CONFIG_SGI_MBCS) += mbcs.o -diff -uNr --exclude '*.orig' linux-2.6.14.cons/include/asm-powerpc/hvconsole.h linux-2.6.14/include/asm-powerpc/hvconsole.h ---- linux-2.6.14.cons/include/asm-powerpc/hvconsole.h 2005-12-07 16:33:35.000000000 +0100 -+++ linux-2.6.14/include/asm-powerpc/hvconsole.h 2005-12-07 16:33:56.000000000 +0100 -@@ -22,30 +22,9 @@ - #ifndef _PPC64_HVCONSOLE_H - #define _PPC64_HVCONSOLE_H - #ifdef __KERNEL__ - --/* -- * This is the max number of console adapters that can/will be found as -- * console devices on first stage console init. Any number beyond this range -- * can't be used as a console device but is still a valid tty device. -- */ --#define MAX_NR_HVC_CONSOLES 16 -- --/* implemented by a low level driver */ --struct hv_ops { -- int (*get_chars)(uint32_t vtermno, char *buf, int count); -- int (*put_chars)(uint32_t vtermno, const char *buf, int count); --}; - extern int hvc_get_chars(uint32_t vtermno, char *buf, int count); - extern int hvc_put_chars(uint32_t vtermno, const char *buf, int count); - --struct hvc_struct; -- --/* Register a vterm and a slot index for use as a console (console_init) */ --extern int hvc_instantiate(uint32_t vtermno, int index, struct hv_ops *ops); --/* register a vterm for hvc tty operation (module_init or hotplug add) */ --extern struct hvc_struct * __devinit hvc_alloc(uint32_t vtermno, int irq, -- struct hv_ops *ops); --/* remove a vterm from hvc tty operation (modele_exit or hotplug remove) */ --extern int __devexit hvc_remove(struct hvc_struct *hp); - #endif /* __KERNEL__ */ - #endif /* _PPC64_HVCONSOLE_H */ ---- linux-2.6.14/drivers/char/hvc_vio.c~ 2005-12-07 17:46:48.000000000 +0100 -+++ linux-2.6.14/drivers/char/hvc_vio.c 2005-12-07 18:03:23.000000000 +0100 -@@ -34,6 +34,7 @@ - #include - #include - #include -+#include "hvc_console.h" - - char hvc_driver_name[] = "hvc_console"; - --- linux-2.6-cell-is-cbea.patch DELETED --- --- linux-2.6-cell-spiderpic-no-devtree.patch DELETED --- --- linux-2.6-hvc-rtas-console.patch DELETED --- From fedora-cvs-commits at redhat.com Fri Mar 31 20:51:19 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 31 Mar 2006 15:51:19 -0500 Subject: rpms/kernel/devel linux-2.6-softmac-assoc-events.patch,NONE,1.1 Message-ID: <200603312051.k2VKpJK0013752@cvs.devel.redhat.com> Author: dwmw2 Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv13738 Added Files: linux-2.6-softmac-assoc-events.patch Log Message: dcbw's softmac assoc events patch linux-2.6-softmac-assoc-events.patch: include/net/ieee80211softmac.h | 3 +- net/ieee80211/softmac/ieee80211softmac_assoc.c | 2 + net/ieee80211/softmac/ieee80211softmac_event.c | 30 ++++++++++++++++++++----- 3 files changed, 29 insertions(+), 6 deletions(-) --- NEW FILE linux-2.6-softmac-assoc-events.patch --- --- a/include/net/ieee80211softmac.h.assoc 2006-03-09 13:14:56.000000000 -0500 +++ b/include/net/ieee80211softmac.h 2006-03-09 13:15:22.000000000 -0500 @@ -267,8 +267,9 @@ #define IEEE80211SOFTMAC_EVENT_AUTH_FAILED 5 #define IEEE80211SOFTMAC_EVENT_AUTH_TIMEOUT 6 #define IEEE80211SOFTMAC_EVENT_ASSOCIATE_NET_NOT_FOUND 7 +#define IEEE80211SOFTMAC_EVENT_DISASSOCIATED 8 /* keep this updated! */ -#define IEEE80211SOFTMAC_EVENT_LAST 7 +#define IEEE80211SOFTMAC_EVENT_LAST 8 /* * If you want to be notified of certain events, you can call * ieee80211softmac_notify[_atomic] with --- a/net/ieee80211/softmac/ieee80211softmac_event.c.assoc 2006-03-09 13:05:09.000000000 -0500 +++ b/net/ieee80211/softmac/ieee80211softmac_event.c 2006-03-09 15:21:12.000000000 -0500 @@ -67,6 +67,7 @@ "authenticating failed", "authenticating timed out", "associating failed because no suitable network was found", + "disassociated", }; @@ -128,13 +129,32 @@ ieee80211softmac_call_events_locked(struct ieee80211softmac_device *mac, int event, void *event_ctx) { struct ieee80211softmac_event *eventptr, *tmp; - union iwreq_data wrqu; - char *msg; if (event >= 0) { - msg = event_descriptions[event]; - wrqu.data.length = strlen(msg); - wireless_send_event(mac->dev, IWEVCUSTOM, &wrqu, msg); + union iwreq_data wrqu; + int we_event; + char *msg = NULL; + + if (event == IEEE80211SOFTMAC_EVENT_ASSOCIATED) { + struct ieee80211softmac_network *network = + (struct ieee80211softmac_network *)event_ctx; + wrqu.data.length = 0; + wrqu.data.flags = 0; + memcpy(wrqu.ap_addr.sa_data, &network->bssid[0], ETH_ALEN); + wrqu.ap_addr.sa_family = ARPHRD_ETHER; + we_event = SIOCGIWAP; + } else if (event == IEEE80211SOFTMAC_EVENT_DISASSOCIATED) { + wrqu.data.length = 0; + wrqu.data.flags = 0; + memset(&wrqu, '\0', sizeof (union iwreq_data)); + wrqu.ap_addr.sa_family = ARPHRD_ETHER; + we_event = SIOCGIWAP; + } else { + msg = event_descriptions[event]; + wrqu.data.length = strlen(msg); + we_event = IWEVCUSTOM; + } + wireless_send_event(mac->dev, we_event, &wrqu, msg); } if (!list_empty(&mac->events)) --- a/net/ieee80211/softmac/ieee80211softmac_assoc.c.assoc 2006-03-09 13:13:54.000000000 -0500 +++ b/net/ieee80211/softmac/ieee80211softmac_assoc.c 2006-03-09 13:21:00.000000000 -0500 @@ -104,6 +104,7 @@ /* Do NOT clear bssvalid as that will break ieee80211softmac_assoc_work! */ mac->associated = 0; mac->associnfo.associating = 0; + ieee80211softmac_call_events_locked(mac, IEEE80211SOFTMAC_EVENT_DISASSOCIATED, NULL); spin_unlock_irqrestore(&mac->lock, flags); } @@ -378,6 +379,7 @@ spin_lock_irqsave(&mac->lock, flags); mac->associnfo.bssvalid = 0; mac->associated = 0; + ieee80211softmac_call_events_locked(mac, IEEE80211SOFTMAC_EVENT_DISASSOCIATED, NULL); schedule_work(&mac->associnfo.work); spin_unlock_irqrestore(&mac->lock, flags); From fedora-cvs-commits at redhat.com Fri Mar 31 20:57:46 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 31 Mar 2006 15:57:46 -0500 Subject: rpms/selinux-policy/devel .cvsignore,1.52,1.53 sources,1.56,1.57 Message-ID: <200603312057.k2VKvk7X013912@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/selinux-policy/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv13897 Modified Files: .cvsignore sources Log Message: * Fri Mar 30 2006 Dan Walsh 2.2.29-1 - Update to upstream Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/.cvsignore,v retrieving revision 1.52 retrieving revision 1.53 diff -u -r1.52 -r1.53 --- .cvsignore 27 Mar 2006 22:47:14 -0000 1.52 +++ .cvsignore 31 Mar 2006 20:57:44 -0000 1.53 @@ -53,3 +53,4 @@ serefpolicy-2.2.26.tgz serefpolicy-2.2.27.tgz serefpolicy-2.2.28.tgz +serefpolicy-2.2.29.tgz Index: sources =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/sources,v retrieving revision 1.56 retrieving revision 1.57 diff -u -r1.56 -r1.57 --- sources 27 Mar 2006 22:47:14 -0000 1.56 +++ sources 31 Mar 2006 20:57:44 -0000 1.57 @@ -1 +1 @@ -6bb1dd9bdc2e31b1b1980cc2ed41dc8e serefpolicy-2.2.28.tgz +a2106965fe20d1d3d41e0d4e05c2effb serefpolicy-2.2.29.tgz From fedora-cvs-commits at redhat.com Fri Mar 31 21:04:22 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 31 Mar 2006 16:04:22 -0500 Subject: rpms/kernel/FC-5 linux-2.6-audit-cur-cleanup.patch, NONE, 1.1.2.1 linux-2.6-audit-exit.patch, NONE, 1.1.2.1 linux-2.6-audit-inode-sid.patch, NONE, 1.1.2.1 linux-2.6-audit-ipc-sid.patch, NONE, 1.1.2.1 kernel-2.6.spec, 1.2074.2.2, 1.2074.2.3 Message-ID: <200603312104.k2VL4Mxh014073@cvs.devel.redhat.com> Author: sgrubb Update of /cvs/dist/rpms/kernel/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv14058 Modified Files: Tag: private-lspp-14-branch kernel-2.6.spec Added Files: Tag: private-lspp-14-branch linux-2.6-audit-cur-cleanup.patch linux-2.6-audit-exit.patch linux-2.6-audit-inode-sid.patch linux-2.6-audit-ipc-sid.patch Log Message: * Fri Mar 31 2006 Steve Grubb - lspp.15 kernel linux-2.6-audit-cur-cleanup.patch: auditsc.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) --- NEW FILE linux-2.6-audit-cur-cleanup.patch --- diff --git a/kernel/auditsc.c b/kernel/auditsc.c index 7f160df..4052f0a 100644 --- a/kernel/auditsc.c +++ b/kernel/auditsc.c @@ -536,13 +536,13 @@ error_path: return; } -static void audit_log_task_info(struct audit_buffer *ab, gfp_t gfp_mask) +static void audit_log_task_info(struct audit_buffer *ab, struct task_struct *tsk, gfp_t gfp_mask) { - char name[sizeof(current->comm)]; - struct mm_struct *mm = current->mm; + char name[sizeof(tsk->comm)]; + struct mm_struct *mm = tsk->mm; struct vm_area_struct *vma; - get_task_comm(name, current); + get_task_comm(name, tsk); audit_log_format(ab, " comm="); audit_log_untrustedstring(ab, name); @@ -551,7 +551,7 @@ static void audit_log_task_info(struct a /* * this is brittle; all callers that pass GFP_ATOMIC will have - * NULL current->mm and we won't get here. + * NULL tsk->mm and we won't get here. */ down_read(&mm->mmap_sem); vma = mm->mmap; @@ -569,7 +569,7 @@ static void audit_log_task_info(struct a audit_log_task_context(ab, gfp_mask); } -static void audit_log_exit(struct audit_context *context, gfp_t gfp_mask) +static void audit_log_exit(struct audit_context *context, struct task_struct *tsk, gfp_t gfp_mask) { int i; struct audit_buffer *ab; @@ -587,8 +587,8 @@ static void audit_log_exit(struct audit_ audit_log_format(ab, " success=%s exit=%ld", (context->return_valid==AUDITSC_SUCCESS)?"yes":"no", context->return_code); - if (current->signal->tty && current->signal->tty->name) - tty = current->signal->tty->name; + if (tsk->signal && tsk->signal->tty && tsk->signal->tty->name) + tty = tsk->signal->tty->name; else tty = "(none)"; audit_log_format(ab, @@ -720,7 +720,7 @@ void audit_free(struct task_struct *tsk) * We use GFP_ATOMIC here because we might be doing this * in the context of the idle thread */ if (context->in_syscall && context->auditable) - audit_log_exit(context, GFP_ATOMIC); + audit_log_exit(context, tsk, GFP_ATOMIC); audit_free_context(context); } @@ -839,7 +839,7 @@ void audit_syscall_exit(struct task_stru goto out; if (context->in_syscall && context->auditable) - audit_log_exit(context, GFP_KERNEL); + audit_log_exit(context, tsk, GFP_KERNEL); context->in_syscall = 0; context->auditable = 0; linux-2.6-audit-exit.patch: arch/i386/kernel/ptrace.c | 7 +-- arch/i386/kernel/vm86.c | 2 arch/i386/kernel/vm86.c.orig | 12 ++++- arch/ia64/kernel/ptrace.c | 4 - arch/mips/kernel/ptrace.c | 4 - arch/powerpc/kernel/ptrace.c | 5 -- arch/s390/kernel/ptrace.c | 5 -- arch/sparc64/kernel/ptrace.c | 5 -- arch/sparc64/kernel/ptrace.c.orig |only arch/um/kernel/ptrace.c | 6 -- arch/x86_64/kernel/ptrace.c | 6 +- include/linux/audit.h | 8 +-- include/linux/audit.h.orig |only kernel/auditsc.c | 85 ++++++++++++++++---------------------- kernel/auditsc.c.orig | 20 ++++---- kernel/exit.c | 2 kernel/exit.c.orig | 7 +++ kernel/fork.c | 2 18 files changed, 88 insertions(+), 92 deletions(-) --- NEW FILE linux-2.6-audit-exit.patch --- diff -urp linux-2.6.16.x86_64.orig/arch/i386/kernel/ptrace.c linux-2.6.16.x86_64/arch/i386/kernel/ptrace.c --- linux-2.6.16.x86_64.orig/arch/i386/kernel/ptrace.c 2006-03-31 08:31:18.000000000 -0500 +++ linux-2.6.16.x86_64/arch/i386/kernel/ptrace.c 2006-03-31 15:05:49.000000000 -0500 @@ -671,7 +671,7 @@ int do_syscall_trace(struct pt_regs *reg if (unlikely(current->audit_context)) { if (entryexit) - audit_syscall_exit(current, AUDITSC_RESULT(regs->eax), + audit_syscall_exit(AUDITSC_RESULT(regs->eax), regs->eax); /* Debug traps, when using PTRACE_SINGLESTEP, must be sent only * on the syscall exit path. Normally, when TIF_SYSCALL_AUDIT is @@ -720,14 +720,13 @@ int do_syscall_trace(struct pt_regs *reg ret = is_sysemu; out: if (unlikely(current->audit_context) && !entryexit) - audit_syscall_entry(current, AUDIT_ARCH_I386, regs->orig_eax, + audit_syscall_entry(AUDIT_ARCH_I386, regs->orig_eax, regs->ebx, regs->ecx, regs->edx, regs->esi); if (ret == 0) return 0; regs->orig_eax = -1; /* force skip of syscall restarting */ if (unlikely(current->audit_context)) - audit_syscall_exit(current, AUDITSC_RESULT(regs->eax), - regs->eax); + audit_syscall_exit(AUDITSC_RESULT(regs->eax), regs->eax); return 1; } diff -urp linux-2.6.16.x86_64.orig/arch/i386/kernel/vm86.c linux-2.6.16.x86_64/arch/i386/kernel/vm86.c --- linux-2.6.16.x86_64.orig/arch/i386/kernel/vm86.c 2006-03-31 08:31:17.000000000 -0500 +++ linux-2.6.16.x86_64/arch/i386/kernel/vm86.c 2006-03-31 15:05:49.000000000 -0500 @@ -320,7 +320,7 @@ static void do_sys_vm86(struct kernel_vm /*call audit_syscall_exit since we do not exit via the normal paths */ if (unlikely(current->audit_context)) - audit_syscall_exit(current, AUDITSC_RESULT(eax), eax); + audit_syscall_exit(AUDITSC_RESULT(eax), eax); __asm__ __volatile__( "movl %0,%%esp\n\t" diff -urp linux-2.6.16.x86_64.orig/arch/i386/kernel/vm86.c.orig linux-2.6.16.x86_64/arch/i386/kernel/vm86.c.orig --- linux-2.6.16.x86_64.orig/arch/i386/kernel/vm86.c.orig 2006-03-31 08:31:18.000000000 -0500 +++ linux-2.6.16.x86_64/arch/i386/kernel/vm86.c.orig 2006-03-31 15:05:42.000000000 -0500 @@ -43,6 +43,7 @@ #include #include #include +#include #include #include @@ -258,6 +259,7 @@ static void do_sys_vm86(struct kernel_vm #ifndef CONFIG_X86_NO_TSS struct tss_struct *tss; #endif + long eax; /* * make sure the vm86() system call doesn't try to do anything silly */ @@ -313,13 +315,19 @@ static void do_sys_vm86(struct kernel_vm tsk->thread.screen_bitmap = info->screen_bitmap; if (info->flags & VM86_SCREEN_BITMAP) mark_screen_rdonly(tsk->mm); + __asm__ __volatile__("xorl %eax,%eax; movl %eax,%fs; movl %eax,%gs\n\t"); + __asm__ __volatile__("movl %%eax, %0\n" :"=r"(eax)); + + /*call audit_syscall_exit since we do not exit via the normal paths */ + if (unlikely(current->audit_context)) + audit_syscall_exit(current, AUDITSC_RESULT(eax), eax); + __asm__ __volatile__( - "xorl %%eax,%%eax; movl %%eax,%%fs; movl %%eax,%%gs\n\t" "movl %0,%%esp\n\t" "movl %1,%%ebp\n\t" "jmp resume_userspace" : /* no outputs */ - :"r" (&info->regs), "r" (task_thread_info(tsk)) : "ax"); + :"r" (&info->regs), "r" (task_thread_info(tsk))); /* we never return here */ } diff -urp linux-2.6.16.x86_64.orig/arch/ia64/kernel/ptrace.c linux-2.6.16.x86_64/arch/ia64/kernel/ptrace.c --- linux-2.6.16.x86_64.orig/arch/ia64/kernel/ptrace.c 2006-03-31 08:31:25.000000000 -0500 +++ linux-2.6.16.x86_64/arch/ia64/kernel/ptrace.c 2006-03-31 15:05:49.000000000 -0500 @@ -1644,7 +1644,7 @@ syscall_trace_enter (long arg0, long arg arch = AUDIT_ARCH_IA64; } - audit_syscall_entry(current, arch, syscall, arg0, arg1, arg2, arg3); + audit_syscall_entry(arch, syscall, arg0, arg1, arg2, arg3); } } @@ -1662,7 +1662,7 @@ syscall_trace_leave (long arg0, long arg if (success != AUDITSC_SUCCESS) result = -result; - audit_syscall_exit(current, success, result); + audit_syscall_exit(success, result); } if (test_thread_flag(TIF_SYSCALL_TRACE) diff -urp linux-2.6.16.x86_64.orig/arch/mips/kernel/ptrace.c linux-2.6.16.x86_64/arch/mips/kernel/ptrace.c --- linux-2.6.16.x86_64.orig/arch/mips/kernel/ptrace.c 2006-03-31 08:31:29.000000000 -0500 +++ linux-2.6.16.x86_64/arch/mips/kernel/ptrace.c 2006-03-31 15:05:49.000000000 -0500 @@ -469,7 +469,7 @@ static inline int audit_arch(void) asmlinkage void do_syscall_trace(struct pt_regs *regs, int entryexit) { if (unlikely(current->audit_context) && entryexit) - audit_syscall_exit(current, AUDITSC_RESULT(regs->regs[2]), + audit_syscall_exit(AUDITSC_RESULT(regs->regs[2]), regs->regs[2]); if (!(current->ptrace & PT_PTRACED)) @@ -493,7 +493,7 @@ asmlinkage void do_syscall_trace(struct } out: if (unlikely(current->audit_context) && !entryexit) - audit_syscall_entry(current, audit_arch(), regs->regs[2], + audit_syscall_entry(audit_arch(), regs->regs[2], regs->regs[4], regs->regs[5], regs->regs[6], regs->regs[7]); } diff -urp linux-2.6.16.x86_64.orig/arch/powerpc/kernel/ptrace.c linux-2.6.16.x86_64/arch/powerpc/kernel/ptrace.c --- linux-2.6.16.x86_64.orig/arch/powerpc/kernel/ptrace.c 2006-03-31 08:31:44.000000000 -0500 +++ linux-2.6.16.x86_64/arch/powerpc/kernel/ptrace.c 2006-03-31 15:05:49.000000000 -0500 @@ -538,7 +538,7 @@ void do_syscall_trace_enter(struct pt_re do_syscall_trace(); if (unlikely(current->audit_context)) - audit_syscall_entry(current, + audit_syscall_entry( #ifdef CONFIG_PPC32 AUDIT_ARCH_PPC, #else @@ -556,8 +556,7 @@ void do_syscall_trace_leave(struct pt_re #endif if (unlikely(current->audit_context)) - audit_syscall_exit(current, - (regs->ccr&0x1000)?AUDITSC_FAILURE:AUDITSC_SUCCESS, + audit_syscall_exit((regs->ccr&0x1000)?AUDITSC_FAILURE:AUDITSC_SUCCESS, regs->result); if ((test_thread_flag(TIF_SYSCALL_TRACE) diff -urp linux-2.6.16.x86_64.orig/arch/s390/kernel/ptrace.c linux-2.6.16.x86_64/arch/s390/kernel/ptrace.c --- linux-2.6.16.x86_64.orig/arch/s390/kernel/ptrace.c 2006-03-31 08:31:23.000000000 -0500 +++ linux-2.6.16.x86_64/arch/s390/kernel/ptrace.c 2006-03-31 15:05:49.000000000 -0500 @@ -734,7 +734,7 @@ asmlinkage void syscall_trace(struct pt_regs *regs, int entryexit) { if (unlikely(current->audit_context) && entryexit) - audit_syscall_exit(current, AUDITSC_RESULT(regs->gprs[2]), regs->gprs[2]); + audit_syscall_exit(AUDITSC_RESULT(regs->gprs[2]), regs->gprs[2]); if (!test_thread_flag(TIF_SYSCALL_TRACE)) goto out; @@ -761,8 +761,7 @@ syscall_trace(struct pt_regs *regs, int } out: if (unlikely(current->audit_context) && !entryexit) - audit_syscall_entry(current, - test_thread_flag(TIF_31BIT)?AUDIT_ARCH_S390:AUDIT_ARCH_S390X, + audit_syscall_entry(test_thread_flag(TIF_31BIT)?AUDIT_ARCH_S390:AUDIT_ARCH_S390X, regs->gprs[2], regs->orig_gpr2, regs->gprs[3], regs->gprs[4], regs->gprs[5]); } diff -urp linux-2.6.16.x86_64.orig/arch/sparc64/kernel/ptrace.c linux-2.6.16.x86_64/arch/sparc64/kernel/ptrace.c --- linux-2.6.16.x86_64.orig/arch/sparc64/kernel/ptrace.c 2006-03-31 08:31:15.000000000 -0500 +++ linux-2.6.16.x86_64/arch/sparc64/kernel/ptrace.c 2006-03-31 15:05:49.000000000 -0500 @@ -627,7 +627,7 @@ asmlinkage void syscall_trace(struct pt_ if (unlikely(tstate & (TSTATE_XCARRY | TSTATE_ICARRY))) result = AUDITSC_FAILURE; - audit_syscall_exit(current, result, regs->u_regs[UREG_I0]); + audit_syscall_exit(result, regs->u_regs[UREG_I0]); } if (!(current->ptrace & PT_PTRACED)) @@ -651,8 +651,7 @@ asmlinkage void syscall_trace(struct pt_ out: if (unlikely(current->audit_context) && !syscall_exit_p) - audit_syscall_entry(current, - (test_thread_flag(TIF_32BIT) ? + audit_syscall_entry((test_thread_flag(TIF_32BIT) ? AUDIT_ARCH_SPARC : AUDIT_ARCH_SPARC64), regs->u_regs[UREG_G1], Only in linux-2.6.16.x86_64/arch/sparc64/kernel: ptrace.c.orig diff -urp linux-2.6.16.x86_64.orig/arch/um/kernel/ptrace.c linux-2.6.16.x86_64/arch/um/kernel/ptrace.c --- linux-2.6.16.x86_64.orig/arch/um/kernel/ptrace.c 2006-03-31 08:31:23.000000000 -0500 +++ linux-2.6.16.x86_64/arch/um/kernel/ptrace.c 2006-03-31 15:05:49.000000000 -0500 @@ -269,15 +269,13 @@ void syscall_trace(union uml_pt_regs *re if (unlikely(current->audit_context)) { if (!entryexit) - audit_syscall_entry(current, - HOST_AUDIT_ARCH, + audit_syscall_entry(HOST_AUDIT_ARCH, UPT_SYSCALL_NR(regs), UPT_SYSCALL_ARG1(regs), UPT_SYSCALL_ARG2(regs), UPT_SYSCALL_ARG3(regs), UPT_SYSCALL_ARG4(regs)); - else audit_syscall_exit(current, - AUDITSC_RESULT(UPT_SYSCALL_RET(regs)), + else audit_syscall_exit(AUDITSC_RESULT(UPT_SYSCALL_RET(regs)), UPT_SYSCALL_RET(regs)); } diff -urp linux-2.6.16.x86_64.orig/arch/x86_64/kernel/ptrace.c linux-2.6.16.x86_64/arch/x86_64/kernel/ptrace.c --- linux-2.6.16.x86_64.orig/arch/x86_64/kernel/ptrace.c 2006-03-31 08:31:16.000000000 -0500 +++ linux-2.6.16.x86_64/arch/x86_64/kernel/ptrace.c 2006-03-31 15:05:49.000000000 -0500 @@ -605,12 +605,12 @@ asmlinkage void syscall_trace_enter(stru if (unlikely(current->audit_context)) { if (test_thread_flag(TIF_IA32)) { - audit_syscall_entry(current, AUDIT_ARCH_I386, + audit_syscall_entry(AUDIT_ARCH_I386, regs->orig_rax, regs->rbx, regs->rcx, regs->rdx, regs->rsi); } else { - audit_syscall_entry(current, AUDIT_ARCH_X86_64, + audit_syscall_entry(AUDIT_ARCH_X86_64, regs->orig_rax, regs->rdi, regs->rsi, regs->rdx, regs->r10); @@ -621,7 +621,7 @@ asmlinkage void syscall_trace_enter(stru asmlinkage void syscall_trace_leave(struct pt_regs *regs) { if (unlikely(current->audit_context)) - audit_syscall_exit(current, AUDITSC_RESULT(regs->rax), regs->rax); + audit_syscall_exit(AUDITSC_RESULT(regs->rax), regs->rax); if ((test_thread_flag(TIF_SYSCALL_TRACE) || test_thread_flag(TIF_SINGLESTEP)) diff -urp linux-2.6.16.x86_64.orig/include/linux/audit.h linux-2.6.16.x86_64/include/linux/audit.h --- linux-2.6.16.x86_64.orig/include/linux/audit.h 2006-03-31 08:32:05.000000000 -0500 +++ linux-2.6.16.x86_64/include/linux/audit.h 2006-03-31 15:05:49.000000000 -0500 @@ -293,10 +293,10 @@ struct netlink_skb_parms; /* Public API */ extern int audit_alloc(struct task_struct *task); extern void audit_free(struct task_struct *task); -extern void audit_syscall_entry(struct task_struct *task, int arch, +extern void audit_syscall_entry(int arch, int major, unsigned long a0, unsigned long a1, unsigned long a2, unsigned long a3); -extern void audit_syscall_exit(struct task_struct *task, int failed, long return_code); +extern void audit_syscall_exit(int failed, long return_code); extern void audit_getname(const char *name); extern void audit_putname(const char *name); extern void __audit_inode(const char *name, const struct inode *inode, unsigned flags); @@ -329,8 +329,8 @@ extern int audit_set_macxattr(const char #else #define audit_alloc(t) ({ 0; }) #define audit_free(t) do { ; } while (0) -#define audit_syscall_entry(t,ta,a,b,c,d,e) do { ; } while (0) -#define audit_syscall_exit(t,f,r) do { ; } while (0) +#define audit_syscall_entry(ta,a,b,c,d,e) do { ; } while (0) +#define audit_syscall_exit(f,r) do { ; } while (0) #define audit_getname(n) do { ; } while (0) #define audit_putname(n) do { ; } while (0) #define __audit_inode(n,i,f) do { ; } while (0) Only in linux-2.6.16.x86_64/include/linux: audit.h.orig diff -urp linux-2.6.16.x86_64.orig/kernel/auditsc.c linux-2.6.16.x86_64/kernel/auditsc.c --- linux-2.6.16.x86_64.orig/kernel/auditsc.c 2006-03-31 14:45:14.000000000 -0500 +++ linux-2.6.16.x86_64/kernel/auditsc.c 2006-03-31 15:05:49.000000000 -0500 @@ -373,7 +373,6 @@ static enum audit_state audit_filter_sys return AUDIT_BUILD_CONTEXT; } -/* This should be called with task_lock() held. */ static inline struct audit_context *audit_get_context(struct task_struct *tsk, int return_valid, int return_code) @@ -542,7 +541,7 @@ static inline void audit_free_context(st printk(KERN_ERR "audit: freed %d contexts\n", count); } -static void audit_log_task_context(struct audit_buffer *ab, gfp_t gfp_mask) +static void audit_log_task_context(struct audit_buffer *ab) { char *ctx = NULL; ssize_t len = 0; @@ -554,7 +553,7 @@ static void audit_log_task_context(struc return; } - ctx = kmalloc(len, gfp_mask); + ctx = kmalloc(len, GFP_KERNEL); if (!ctx) goto error_path; @@ -572,47 +571,46 @@ error_path: return; } -static void audit_log_task_info(struct audit_buffer *ab, struct task_struct *tsk, gfp_t gfp_mask) +static void audit_log_task_info(struct audit_buffer *ab, struct task_struct *tsk) { char name[sizeof(tsk->comm)]; struct mm_struct *mm = tsk->mm; struct vm_area_struct *vma; + /* tsk == current */ + get_task_comm(name, tsk); audit_log_format(ab, " comm="); audit_log_untrustedstring(ab, name); - if (!mm) - return; - - /* - * this is brittle; all callers that pass GFP_ATOMIC will have - * NULL tsk->mm and we won't get here. - */ - down_read(&mm->mmap_sem); - vma = mm->mmap; - while (vma) { - if ((vma->vm_flags & VM_EXECUTABLE) && - vma->vm_file) { - audit_log_d_path(ab, "exe=", - vma->vm_file->f_dentry, - vma->vm_file->f_vfsmnt); - break; + if (mm) { + down_read(&mm->mmap_sem); + vma = mm->mmap; + while (vma) { + if ((vma->vm_flags & VM_EXECUTABLE) && + vma->vm_file) { + audit_log_d_path(ab, "exe=", + vma->vm_file->f_dentry, + vma->vm_file->f_vfsmnt); + break; + } + vma = vma->vm_next; } - vma = vma->vm_next; + up_read(&mm->mmap_sem); } - up_read(&mm->mmap_sem); - audit_log_task_context(ab, gfp_mask); + audit_log_task_context(ab); } -static void audit_log_exit(struct audit_context *context, struct task_struct *tsk, gfp_t gfp_mask) +static void audit_log_exit(struct audit_context *context, struct task_struct *tsk) { int i, call_panic = 0; struct audit_buffer *ab; struct audit_aux_data *aux; const char *tty; - ab = audit_log_start(context, gfp_mask, AUDIT_SYSCALL); + /* tsk == current */ + + ab = audit_log_start(context, GFP_KERNEL, AUDIT_SYSCALL); if (!ab) return; /* audit_panic has been called */ audit_log_format(ab, "arch=%x syscall=%d", @@ -643,12 +641,12 @@ static void audit_log_exit(struct audit_ context->gid, context->euid, context->suid, context->fsuid, context->egid, context->sgid, context->fsgid, tty); - audit_log_task_info(ab, gfp_mask); + audit_log_task_info(ab, tsk); audit_log_end(ab); for (aux = context->aux; aux; aux = aux->next) { - ab = audit_log_start(context, gfp_mask, aux->type); + ab = audit_log_start(context, GFP_KERNEL, aux->type); if (!ab) continue; /* audit_panic has been called */ @@ -697,7 +695,7 @@ static void audit_log_exit(struct audit_ } if (context->pwd && context->pwdmnt) { - ab = audit_log_start(context, gfp_mask, AUDIT_CWD); + ab = audit_log_start(context, GFP_KERNEL, AUDIT_CWD); if (ab) { audit_log_d_path(ab, "cwd=", context->pwd, context->pwdmnt); audit_log_end(ab); @@ -707,7 +705,7 @@ static void audit_log_exit(struct audit_ unsigned long ino = context->names[i].ino; unsigned long pino = context->names[i].pino; - ab = audit_log_start(context, gfp_mask, AUDIT_PATH); + ab = audit_log_start(context, GFP_KERNEL, AUDIT_PATH); if (!ab) continue; /* audit_panic has been called */ @@ -756,19 +754,12 @@ static void audit_log_exit(struct audit_ * audit_free - free a per-task audit context * @tsk: task whose audit context block to free * - * Called from copy_process and __put_task_struct. + * Called from copy_process and do_exit */ void audit_free(struct task_struct *tsk) { struct audit_context *context; - /* - * No need to lock the task - when we execute audit_free() - * then the task has no external references anymore, and - * we are tearing it down. (The locking also confuses - * DEBUG_LOCKDEP - this freeing may occur in softirq - * contexts as well, via RCU.) - */ context = audit_get_context(tsk, 0, 0); if (likely(!context)) return; @@ -777,8 +768,9 @@ void audit_free(struct task_struct *tsk) * function (e.g., exit_group), then free context block. * We use GFP_ATOMIC here because we might be doing this * in the context of the idle thread */ + /* that can happen only if we are called from do_exit() */ if (context->in_syscall && context->auditable) - audit_log_exit(context, tsk, GFP_ATOMIC); + audit_log_exit(context, tsk); audit_free_context(context); } @@ -801,10 +793,11 @@ void audit_free(struct task_struct *tsk) * will only be written if another part of the kernel requests that it * be written). */ -void audit_syscall_entry(struct task_struct *tsk, int arch, int major, +void audit_syscall_entry(int arch, int major, unsigned long a1, unsigned long a2, unsigned long a3, unsigned long a4) { + struct task_struct *tsk = current; struct audit_context *context = tsk->audit_context; enum audit_state state; @@ -882,22 +875,18 @@ void audit_syscall_entry(struct task_str * message), then write out the syscall information. In call cases, * free the names stored from getname(). */ -void audit_syscall_exit(struct task_struct *tsk, int valid, long return_code) +void audit_syscall_exit(int valid, long return_code) { + struct task_struct *tsk = current; struct audit_context *context; - get_task_struct(tsk); - task_lock(tsk); context = audit_get_context(tsk, valid, return_code); - task_unlock(tsk); - /* Not having a context here is ok, since the parent may have - * called __put_task_struct. */ if (likely(!context)) - goto out; + return; if (context->in_syscall && context->auditable) - audit_log_exit(context, tsk, GFP_KERNEL); + audit_log_exit(context, tsk); context->in_syscall = 0; context->auditable = 0; @@ -912,8 +901,6 @@ void audit_syscall_exit(struct task_stru audit_free_aux(context); tsk->audit_context = context; } - out: - put_task_struct(tsk); } /** diff -urp linux-2.6.16.x86_64.orig/kernel/auditsc.c.orig linux-2.6.16.x86_64/kernel/auditsc.c.orig --- linux-2.6.16.x86_64.orig/kernel/auditsc.c.orig 2006-03-31 14:45:03.000000000 -0500 +++ linux-2.6.16.x86_64/kernel/auditsc.c.orig 2006-03-31 15:05:46.000000000 -0500 @@ -572,13 +572,13 @@ error_path: return; } -static void audit_log_task_info(struct audit_buffer *ab, gfp_t gfp_mask) +static void audit_log_task_info(struct audit_buffer *ab, struct task_struct *tsk, gfp_t gfp_mask) { - char name[sizeof(current->comm)]; - struct mm_struct *mm = current->mm; + char name[sizeof(tsk->comm)]; + struct mm_struct *mm = tsk->mm; struct vm_area_struct *vma; - get_task_comm(name, current); + get_task_comm(name, tsk); audit_log_format(ab, " comm="); audit_log_untrustedstring(ab, name); @@ -587,7 +587,7 @@ static void audit_log_task_info(struct a /* * this is brittle; all callers that pass GFP_ATOMIC will have - * NULL current->mm and we won't get here. + * NULL tsk->mm and we won't get here. */ down_read(&mm->mmap_sem); vma = mm->mmap; @@ -605,7 +605,7 @@ static void audit_log_task_info(struct a audit_log_task_context(ab, gfp_mask); } -static void audit_log_exit(struct audit_context *context, gfp_t gfp_mask) +static void audit_log_exit(struct audit_context *context, struct task_struct *tsk, gfp_t gfp_mask) { int i, call_panic = 0; struct audit_buffer *ab; @@ -623,8 +623,8 @@ static void audit_log_exit(struct audit_ audit_log_format(ab, " success=%s exit=%ld", (context->return_valid==AUDITSC_SUCCESS)?"yes":"no", context->return_code); - if (current->signal->tty && current->signal->tty->name) - tty = current->signal->tty->name; + if (tsk->signal && tsk->signal->tty && tsk->signal->tty->name) + tty = tsk->signal->tty->name; else tty = "(none)"; audit_log_format(ab, @@ -778,7 +778,7 @@ void audit_free(struct task_struct *tsk) * We use GFP_ATOMIC here because we might be doing this * in the context of the idle thread */ if (context->in_syscall && context->auditable) - audit_log_exit(context, GFP_ATOMIC); + audit_log_exit(context, tsk, GFP_ATOMIC); audit_free_context(context); } @@ -897,7 +897,7 @@ void audit_syscall_exit(struct task_stru goto out; if (context->in_syscall && context->auditable) - audit_log_exit(context, GFP_KERNEL); + audit_log_exit(context, tsk, GFP_KERNEL); context->in_syscall = 0; context->auditable = 0; diff -urp linux-2.6.16.x86_64.orig/kernel/exit.c linux-2.6.16.x86_64/kernel/exit.c --- linux-2.6.16.x86_64.orig/kernel/exit.c 2006-03-31 08:32:14.000000000 -0500 +++ linux-2.6.16.x86_64/kernel/exit.c 2006-03-31 15:05:49.000000000 -0500 @@ -859,6 +859,8 @@ fastcall NORET_TYPE void do_exit(long co current->tux_exit(); } } + if (unlikely(tsk->audit_context)) + audit_free(tsk); exit_mm(tsk); exit_sem(tsk); diff -urp linux-2.6.16.x86_64.orig/kernel/exit.c.orig linux-2.6.16.x86_64/kernel/exit.c.orig --- linux-2.6.16.x86_64.orig/kernel/exit.c.orig 2006-03-31 08:32:14.000000000 -0500 +++ linux-2.6.16.x86_64/kernel/exit.c.orig 2006-03-31 15:05:46.000000000 -0500 @@ -851,6 +851,13 @@ fastcall NORET_TYPE void do_exit(long co hrtimer_cancel(&tsk->signal->real_timer); exit_itimers(tsk->signal); acct_process(code); + if (current->tux_info) { +#ifdef CONFIG_TUX_DEBUG + printk("Possibly unexpected TUX-thread exit(%ld) at %p?\n", + code, __builtin_return_address(0)); +#endif + current->tux_exit(); + } } exit_mm(tsk); diff -urp linux-2.6.16.x86_64.orig/kernel/fork.c linux-2.6.16.x86_64/kernel/fork.c --- linux-2.6.16.x86_64.orig/kernel/fork.c 2006-03-31 08:32:14.000000000 -0500 +++ linux-2.6.16.x86_64/kernel/fork.c 2006-03-31 15:05:49.000000000 -0500 @@ -116,8 +116,6 @@ void __put_task_struct_cb(struct rcu_hea WARN_ON(atomic_read(&tsk->usage)); WARN_ON(tsk == current); - if (unlikely(tsk->audit_context)) - audit_free(tsk); security_task_free(tsk); free_uid(tsk->user); put_group_info(tsk->group_info); linux-2.6-audit-inode-sid.patch: include/linux/selinux.h | 34 ++++++++++++++++++++++++++++ kernel/auditsc.c | 53 +++++++++++++-------------------------------- security/selinux/exports.c | 24 ++++++++++++++++++++ 3 files changed, 74 insertions(+), 37 deletions(-) --- NEW FILE linux-2.6-audit-inode-sid.patch --- diff -urp linux-2.6.16.x86_64.orig/include/linux/selinux.h linux-2.6.16.x86_64/include/linux/selinux.h --- linux-2.6.16.x86_64.orig/include/linux/selinux.h 2006-03-30 12:01:15.000000000 -0500 +++ linux-2.6.16.x86_64/include/linux/selinux.h 2006-03-30 12:04:42.000000000 -0500 @@ -15,6 +15,7 @@ struct selinux_audit_rule; struct audit_context; +struct inode; #ifdef CONFIG_SECURITY_SELINUX @@ -76,6 +77,27 @@ void selinux_audit_set_callback(int (*ca */ void selinux_task_ctxid(struct task_struct *tsk, u32 *ctxid); +/** + * selinux_ctxid_to_string - map a security context ID to a string + * @ctxid: security context ID to be converted. + * @ctx: address of context string to be returned + * @ctxlen: length of returned context string. + * + * Returns 0 if successful, -errno if not. On success, the context + * string will be allocated internally, and the caller must call + * kfree() on it after use. + */ +int selinux_ctxid_to_string(u32 ctxid, char **ctx, u32 *ctxlen); + +/** + * selinux_get_inode_sid - get the inode's security context ID + * @inode: inode structure to get the sid from. + * @sid: pointer to security context ID to be filled in. + * + * Returns nothing + */ +void selinux_get_inode_sid(const struct inode *inode, u32 *sid); + #else static inline int selinux_audit_rule_init(u32 field, u32 op, @@ -107,6 +128,18 @@ static inline void selinux_task_ctxid(st *ctxid = 0; } +static inline int selinux_ctxid_to_string(u32 ctxid, char **ctx, u32 *ctxlen) +{ + *ctx = NULL; + *ctxlen = 0; + return 0; +} + +static inline void selinux_get_inode_sid(const struct inode *inode, u32 *sid) +{ + *sid = 0; +} + #endif /* CONFIG_SECURITY_SELINUX */ #endif /* _LINUX_SELINUX_H */ diff -urp linux-2.6.16.x86_64.orig/kernel/auditsc.c linux-2.6.16.x86_64/kernel/auditsc.c --- linux-2.6.16.x86_64.orig/kernel/auditsc.c 2006-03-30 12:01:21.000000000 -0500 +++ linux-2.6.16.x86_64/kernel/auditsc.c 2006-03-30 12:06:01.000000000 -0500 @@ -90,7 +90,7 @@ struct audit_names { uid_t uid; gid_t gid; dev_t rdev; - char *ctx; + u32 osid; }; struct audit_aux_data { @@ -435,9 +435,6 @@ static inline void audit_free_names(stru #endif for (i = 0; i < context->name_count; i++) { - char *p = context->names[i].ctx; - context->names[i].ctx = NULL; - kfree(p); if (context->names[i].name) __putname(context->names[i].name); } @@ -700,6 +697,7 @@ static void audit_log_exit(struct audit_ } } for (i = 0; i < context->name_count; i++) { + int call_panic = 0; unsigned long ino = context->names[i].ino; unsigned long pino = context->names[i].pino; @@ -729,12 +727,22 @@ static void audit_log_exit(struct audit_ context->names[i].gid, MAJOR(context->names[i].rdev), MINOR(context->names[i].rdev)); - if (context->names[i].ctx) { - audit_log_format(ab, " obj=%s", - context->names[i].ctx); + if (context->names[i].osid != 0) { + char *ctx = NULL; + u32 len; + if (selinux_ctxid_to_string( + context->names[i].osid, &ctx, &len)) { + audit_log_format(ab, " obj=%u", + context->names[i].osid); + call_panic = 1; + } else + audit_log_format(ab, " obj=%s", ctx); + kfree(ctx); } audit_log_end(ab); + if (call_panic) + audit_panic("error converting sid to string"); } } @@ -983,37 +991,8 @@ void audit_putname(const char *name) void audit_inode_context(int idx, const struct inode *inode) { struct audit_context *context = current->audit_context; - const char *suffix = security_inode_xattr_getsuffix(); - char *ctx = NULL; - int len = 0; - - if (!suffix) - goto ret; - - len = security_inode_getsecurity(inode, suffix, NULL, 0, 0); - if (len == -EOPNOTSUPP) - goto ret; - if (len < 0) - goto error_path; - - ctx = kmalloc(len, GFP_KERNEL); - if (!ctx) - goto error_path; - len = security_inode_getsecurity(inode, suffix, ctx, len, 0); - if (len < 0) - goto error_path; - - kfree(context->names[idx].ctx); - context->names[idx].ctx = ctx; - goto ret; - -error_path: - if (ctx) - kfree(ctx); - audit_panic("error in audit_inode_context"); -ret: - return; + selinux_get_inode_sid(inode, &context->names[idx].osid); } diff -urp linux-2.6.16.x86_64.orig/security/selinux/exports.c linux-2.6.16.x86_64/security/selinux/exports.c --- linux-2.6.16.x86_64.orig/security/selinux/exports.c 2006-03-30 12:01:23.000000000 -0500 +++ linux-2.6.16.x86_64/security/selinux/exports.c 2006-03-30 12:05:30.000000000 -0500 @@ -14,6 +14,7 @@ #include #include #include +#include #include "security.h" #include "objsec.h" @@ -26,3 +27,26 @@ void selinux_task_ctxid(struct task_stru else *ctxid = 0; } + +int selinux_ctxid_to_string(u32 ctxid, char **ctx, u32 *ctxlen) +{ + if (selinux_enabled) + return security_sid_to_context(ctxid, ctx, ctxlen); + else { + *ctx = NULL; + *ctxlen = 0; + } + + return 0; +} + +void selinux_get_inode_sid(const struct inode *inode, u32 *sid) +{ + if (selinux_enabled) { + struct inode_security_struct *isec = inode->i_security; + *sid = isec->sid; + return; + } + *sid = 0; +} + linux-2.6-audit-ipc-sid.patch: include/linux/security.h | 16 ---------- include/linux/selinux.h | 15 +++++++++ kernel/auditsc.c | 68 +++++++++++++-------------------------------- security/dummy.c | 6 --- security/selinux/exports.c | 11 +++++++ security/selinux/hooks.c | 8 ----- 6 files changed, 47 insertions(+), 77 deletions(-) --- NEW FILE linux-2.6-audit-ipc-sid.patch --- diff -urp linux-2.6.16.x86_64.orig/include/linux/security.h linux-2.6.16.x86_64/include/linux/security.h --- linux-2.6.16.x86_64.orig/include/linux/security.h 2006-03-31 08:32:05.000000000 -0500 +++ linux-2.6.16.x86_64/include/linux/security.h 2006-03-31 09:58:48.000000000 -0500 @@ -869,11 +869,6 @@ struct swap_info_struct; * @ipcp contains the kernel IPC permission structure * @flag contains the desired (requested) permission set * Return 0 if permission is granted. - * @ipc_getsecurity: - * Copy the security label associated with the ipc object into - * @buffer. @buffer may be NULL to request the size of the buffer - * required. @size indicates the size of @buffer in bytes. Return - * number of bytes used/required on success. * * Security hooks for individual messages held in System V IPC message queues * @msg_msg_alloc_security: @@ -1223,7 +1218,6 @@ struct security_operations { void (*task_to_inode)(struct task_struct *p, struct inode *inode); int (*ipc_permission) (struct kern_ipc_perm * ipcp, short flag); - int (*ipc_getsecurity)(struct kern_ipc_perm *ipcp, void *buffer, size_t size); int (*msg_msg_alloc_security) (struct msg_msg * msg); void (*msg_msg_free_security) (struct msg_msg * msg); @@ -1881,11 +1875,6 @@ static inline int security_ipc_permissio return security_ops->ipc_permission (ipcp, flag); } -static inline int security_ipc_getsecurity(struct kern_ipc_perm *ipcp, void *buffer, size_t size) -{ - return security_ops->ipc_getsecurity(ipcp, buffer, size); -} - static inline int security_msg_msg_alloc (struct msg_msg * msg) { return security_ops->msg_msg_alloc_security (msg); @@ -2521,11 +2510,6 @@ static inline int security_ipc_permissio return 0; } -static inline int security_ipc_getsecurity(struct kern_ipc_perm *ipcp, void *buffer, size_t size) -{ - return -EOPNOTSUPP; -} - static inline int security_msg_msg_alloc (struct msg_msg * msg) { return 0; diff -urp linux-2.6.16.x86_64.orig/include/linux/selinux.h linux-2.6.16.x86_64/include/linux/selinux.h --- linux-2.6.16.x86_64.orig/include/linux/selinux.h 2006-03-31 08:32:09.000000000 -0500 +++ linux-2.6.16.x86_64/include/linux/selinux.h 2006-03-31 08:55:33.000000000 -0500 @@ -16,6 +16,7 @@ struct selinux_audit_rule; struct audit_context; struct inode; +struct kern_ipc_perm; #ifdef CONFIG_SECURITY_SELINUX @@ -98,6 +99,15 @@ int selinux_ctxid_to_string(u32 ctxid, c */ void selinux_get_inode_sid(const struct inode *inode, u32 *sid); +/** + * selinux_get_ipc_sid - get the ipc security context ID + * @ipcp: ipc structure to get the sid from. + * @sid: pointer to security context ID to be filled in. + * + * Returns nothing + */ +void selinux_get_ipc_sid(const struct kern_ipc_perm *ipcp, u32 *sid); + #else static inline int selinux_audit_rule_init(u32 field, u32 op, @@ -141,6 +151,11 @@ static inline void selinux_get_inode_sid *sid = 0; } +static inline void selinux_get_ipc_sid(const struct kern_ipc_perm *ipcp, u32 *sid) +{ + *sid = 0; +} + #endif /* CONFIG_SECURITY_SELINUX */ #endif /* _LINUX_SELINUX_H */ diff -urp linux-2.6.16.x86_64.orig/kernel/auditsc.c linux-2.6.16.x86_64/kernel/auditsc.c --- linux-2.6.16.x86_64.orig/kernel/auditsc.c 2006-03-31 08:32:14.000000000 -0500 +++ linux-2.6.16.x86_64/kernel/auditsc.c 2006-03-31 08:55:33.000000000 -0500 @@ -107,7 +107,7 @@ struct audit_aux_data_ipcctl { uid_t uid; gid_t gid; mode_t mode; - char *ctx; + u32 osid; }; struct audit_aux_data_socketcall { @@ -457,11 +457,6 @@ static inline void audit_free_aux(struct dput(axi->dentry); mntput(axi->mnt); } - if ( aux->type == AUDIT_IPC ) { - struct audit_aux_data_ipcctl *axi = (void *)aux; - if (axi->ctx) - kfree(axi->ctx); - } context->aux = aux->next; kfree(aux); @@ -612,7 +607,7 @@ static void audit_log_task_info(struct a static void audit_log_exit(struct audit_context *context, gfp_t gfp_mask) { - int i; + int i, call_panic = 0; struct audit_buffer *ab; struct audit_aux_data *aux; const char *tty; @@ -661,8 +656,20 @@ static void audit_log_exit(struct audit_ case AUDIT_IPC: { struct audit_aux_data_ipcctl *axi = (void *)aux; audit_log_format(ab, - " qbytes=%lx iuid=%u igid=%u mode=%x obj=%s", - axi->qbytes, axi->uid, axi->gid, axi->mode, axi->ctx); + " qbytes=%lx iuid=%u igid=%u mode=%x", + axi->qbytes, axi->uid, axi->gid, axi->mode); + if (axi->osid != 0) { + char *ctx = NULL; + u32 len; + if (selinux_ctxid_to_string( + axi->osid, &ctx, &len)) { + audit_log_format(ab, " obj=%u", + axi->osid); + call_panic = 1; + } else + audit_log_format(ab, " obj=%s", ctx); + kfree(ctx); + } break; } case AUDIT_SOCKETCALL: { @@ -697,7 +704,6 @@ static void audit_log_exit(struct audit_ } } for (i = 0; i < context->name_count; i++) { - int call_panic = 0; unsigned long ino = context->names[i].ino; unsigned long pino = context->names[i].pino; @@ -734,16 +740,16 @@ static void audit_log_exit(struct audit_ context->names[i].osid, &ctx, &len)) { audit_log_format(ab, " obj=%u", context->names[i].osid); - call_panic = 1; + call_panic = 2; } else audit_log_format(ab, " obj=%s", ctx); kfree(ctx); } audit_log_end(ab); - if (call_panic) - audit_panic("error converting sid to string"); } + if (call_panic) + audit_panic("error converting sid to string"); } /** @@ -988,7 +994,7 @@ void audit_putname(const char *name) #endif } -void audit_inode_context(int idx, const struct inode *inode) +static void audit_inode_context(int idx, const struct inode *inode) { struct audit_context *context = current->audit_context; @@ -1161,38 +1167,6 @@ uid_t audit_get_loginuid(struct audit_co return ctx ? ctx->loginuid : -1; } -static char *audit_ipc_context(struct kern_ipc_perm *ipcp) -{ - struct audit_context *context = current->audit_context; - char *ctx = NULL; - int len = 0; - - if (likely(!context)) - return NULL; - - len = security_ipc_getsecurity(ipcp, NULL, 0); - if (len == -EOPNOTSUPP) - goto ret; - if (len < 0) - goto error_path; - - ctx = kmalloc(len, GFP_ATOMIC); - if (!ctx) - goto error_path; - - len = security_ipc_getsecurity(ipcp, ctx, len); - if (len < 0) - goto error_path; - - return ctx; - -error_path: - kfree(ctx); - audit_panic("error in audit_ipc_context"); -ret: - return NULL; -} - /** * audit_ipc_perms - record audit data for ipc * @qbytes: msgq bytes @@ -1218,7 +1192,7 @@ int audit_ipc_perms(unsigned long qbytes ax->uid = uid; ax->gid = gid; ax->mode = mode; - ax->ctx = audit_ipc_context(ipcp); + selinux_get_ipc_sid(ipcp, &ax->osid); ax->d.type = AUDIT_IPC; ax->d.next = context->aux; diff -urp linux-2.6.16.x86_64.orig/security/dummy.c linux-2.6.16.x86_64/security/dummy.c --- linux-2.6.16.x86_64.orig/security/dummy.c 2006-03-31 08:32:15.000000000 -0500 +++ linux-2.6.16.x86_64/security/dummy.c 2006-03-31 11:51:09.000000000 -0500 @@ -563,11 +563,6 @@ static int dummy_ipc_permission (struct return 0; } -static int dummy_ipc_getsecurity(struct kern_ipc_perm *ipcp, void *buffer, size_t size) -{ - return -EOPNOTSUPP; -} - static int dummy_msg_msg_alloc_security (struct msg_msg *msg) { return 0; @@ -970,7 +965,6 @@ void security_fixup_ops (struct security set_to_dummy_if_null(ops, task_reparent_to_init); set_to_dummy_if_null(ops, task_to_inode); set_to_dummy_if_null(ops, ipc_permission); - set_to_dummy_if_null(ops, ipc_getsecurity); set_to_dummy_if_null(ops, msg_msg_alloc_security); set_to_dummy_if_null(ops, msg_msg_free_security); set_to_dummy_if_null(ops, msg_queue_alloc_security); diff -urp linux-2.6.16.x86_64.orig/security/selinux/exports.c linux-2.6.16.x86_64/security/selinux/exports.c --- linux-2.6.16.x86_64.orig/security/selinux/exports.c 2006-03-31 08:32:15.000000000 -0500 +++ linux-2.6.16.x86_64/security/selinux/exports.c 2006-03-31 08:55:33.000000000 -0500 @@ -15,6 +15,7 @@ #include #include #include +#include #include "security.h" #include "objsec.h" @@ -50,3 +51,13 @@ void selinux_get_inode_sid(const struct *sid = 0; } +void selinux_get_ipc_sid(const struct kern_ipc_perm *ipcp, u32 *sid) +{ + if (selinux_enabled) { + struct ipc_security_struct *isec = ipcp->security; + *sid = isec->sid; + return; + } + *sid = 0; +} + diff -urp linux-2.6.16.x86_64.orig/security/selinux/hooks.c linux-2.6.16.x86_64/security/selinux/hooks.c --- linux-2.6.16.x86_64.orig/security/selinux/hooks.c 2006-03-31 08:32:15.000000000 -0500 +++ linux-2.6.16.x86_64/security/selinux/hooks.c 2006-03-31 09:58:06.000000000 -0500 @@ -4016,13 +4016,6 @@ static int selinux_ipc_permission(struct return ipc_has_perm(ipcp, av); } -static int selinux_ipc_getsecurity(struct kern_ipc_perm *ipcp, void *buffer, size_t size) -{ - struct ipc_security_struct *isec = ipcp->security; - - return selinux_getsecurity(isec->sid, buffer, size); -} - /* module stacking operations */ static int selinux_register_security (const char *name, struct security_operations *ops) { @@ -4285,7 +4278,6 @@ static struct security_operations selinu .task_to_inode = selinux_task_to_inode, .ipc_permission = selinux_ipc_permission, - .ipc_getsecurity = selinux_ipc_getsecurity, .msg_msg_alloc_security = selinux_msg_msg_alloc_security, .msg_msg_free_security = selinux_msg_msg_free_security, Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-5/kernel-2.6.spec,v retrieving revision 1.2074.2.2 retrieving revision 1.2074.2.3 diff -u -r1.2074.2.2 -r1.2074.2.3 --- kernel-2.6.spec 27 Mar 2006 15:08:16 -0000 1.2074.2.2 +++ kernel-2.6.spec 31 Mar 2006 21:04:06 -0000 1.2074.2.3 @@ -11,7 +11,7 @@ %define buildxen 0 %define buildxenPAE 0 %define builddoc 0 -%define buildkdump 1 +%define buildkdump 0 # Versions of various parts @@ -24,7 +24,7 @@ %define sublevel 16 %define kversion 2.6.%{sublevel} %define rpmversion 2.6.%{sublevel} -%define rhbsys .lspp.14 +%define rhbsys .lspp.15 %define release %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})_FC5%{rhbsys} %define signmodules 0 %define make_target bzImage @@ -439,6 +439,10 @@ Patch20104: 0003-Inotify-kernel-API.patch Patch20105: 0004-filesystem-location-based-auditing.patch Patch20106: linux-2.6-audit-sockaddr.patch +Patch20107: linux-2.6-audit-inode-sid.patch +Patch20108: linux-2.6-audit-ipc-sid.patch +Patch20109: linux-2.6-audit-cur-cleanup.patch +Patch20110: linux-2.6-audit-exit.patch # END OF PATCH DEFINITIONS @@ -1097,6 +1101,10 @@ %patch20104 -p1 %patch20105 -p1 %patch20106 -p1 +%patch20107 -p1 +%patch20108 -p1 +%patch20109 -p1 +%patch20110 -p1 # END OF PATCH APPLICATIONS @@ -1688,6 +1696,9 @@ %endif %changelog +* Fri Mar 31 2006 Steve Grubb +- lspp.15 kernel + * Mon Mar 27 2006 Steve Grubb - lspp.14 kernel From fedora-cvs-commits at redhat.com Fri Mar 31 21:20:44 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 31 Mar 2006 16:20:44 -0500 Subject: rpms/kernel/devel linux-2.6-hvc-console.patch,1.4,1.5 Message-ID: <200603312120.k2VLKid1028186@cvs.devel.redhat.com> Author: dwmw2 Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv28174 Modified Files: linux-2.6-hvc-console.patch Log Message: include asm/processor.h linux-2.6-hvc-console.patch: linux-2.6.14/drivers/char/hvc_fss.c | 150 +++++++++++++++++++++++++++++++++ linux-2.6.16.ppc/drivers/char/Kconfig | 9 + linux-2.6.16.ppc/drivers/char/Makefile | 1 3 files changed, 160 insertions(+) Index: linux-2.6-hvc-console.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-hvc-console.patch,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- linux-2.6-hvc-console.patch 31 Mar 2006 20:48:15 -0000 1.4 +++ linux-2.6-hvc-console.patch 31 Mar 2006 21:20:31 -0000 1.5 @@ -1,7 +1,7 @@ diff -uNr --exclude '*.orig' linux-2.6.14.cons/drivers/char/hvc_fss.c linux-2.6.14/drivers/char/hvc_fss.c --- linux-2.6.14.cons/drivers/char/hvc_fss.c 1970-01-01 01:00:00.000000000 +0100 +++ linux-2.6.14/drivers/char/hvc_fss.c 2005-12-07 16:34:02.000000000 +0100 -@@ -0,0 +1,149 @@ +@@ -0,0 +1,150 @@ +/* + * IBM Full System Simulator driver interface to hvc_console.c + * @@ -38,6 +38,7 @@ +#include +#include +#include ++#include +#include "hvc_console.h" + +static uint32_t hvc_fss_vtermno = 0; From fedora-cvs-commits at redhat.com Fri Mar 31 21:43:54 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 31 Mar 2006 16:43:54 -0500 Subject: rpms/xen/FC-5 xen.spec,1.106,1.106.2.1 Message-ID: <200603312143.k2VLhsXN028816@cvs.devel.redhat.com> Author: sct Update of /cvs/dist/rpms/xen/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv28803 Modified Files: Tag: private-sct-fc5-nocloexec-branch xen.spec Log Message: Temporarily disable the cloexec patch for testing Index: xen.spec =================================================================== RCS file: /cvs/dist/rpms/xen/FC-5/xen.spec,v retrieving revision 1.106 retrieving revision 1.106.2.1 diff -u -r1.106 -r1.106.2.1 --- xen.spec 9 Mar 2006 05:15:37 -0000 1.106 +++ xen.spec 31 Mar 2006 21:43:52 -0000 1.106.2.1 @@ -5,7 +5,7 @@ Summary: Xen is a virtual machine monitor Name: xen Version: 3.0.1 -Release: 4 +Release: 4.0.1sct Group: Development/Libraries License: GPL URL: http://www.cl.cam.ac.uk/Research/SRG/netos/xen/index.html @@ -65,7 +65,7 @@ %patch8 -p1 %patch9 -p1 %patch10 -p1 -b .m64 -%patch11 -p1 -b .cloexec +#%patch11 -p1 -b .cloexec %patch12 -p1 -b .tempdir cp %{SOURCE2} . @@ -165,6 +165,9 @@ %dir %{_localstatedir}/run/xenstored %changelog +* Fri Mar 31 2006 Stephen Tweedie - 3.0.1-4.0.1sct +- Temporarily disable the cloexec patch for testing + * Thu Mar 9 2006 Jeremy Katz - 3.0.1-4 - add udev rule so that /dev/xen/evtchn gets created properly - make pygrub not use /tmp for SELinux From fedora-cvs-commits at redhat.com Fri Mar 31 21:47:52 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 31 Mar 2006 16:47:52 -0500 Subject: rpms/kernel/devel linux-2.6-offb-find-fb.patch, NONE, 1.1 kernel-2.6.spec, 1.2110, 1.2111 Message-ID: <200603312147.k2VLlqYa010180@cvs.devel.redhat.com> Author: dwmw2 Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv10165 Modified Files: kernel-2.6.spec Added Files: linux-2.6-offb-find-fb.patch Log Message: offb fix linux-2.6-offb-find-fb.patch: offb.c | 105 +++++++++++++++++++++++++++++------------------------------------ 1 files changed, 47 insertions(+), 58 deletions(-) --- NEW FILE linux-2.6-offb-find-fb.patch --- >From benh at kernel.crashing.org Fri Mar 31 22:27:35 2006 Return-path: Envelope-to: dwmw2 at baythorne.infradead.org Delivery-date: Fri, 31 Mar 2006 22:27:35 +0100 Received: from [2002:d592:9a28::1] (helo=pentafluge.infradead.org) by baythorne.infradead.org with esmtps (Exim 4.54 #1 (Red Hat Linux)) id 1FPR9b-00074r-6a for dwmw2 at baythorne.infradead.org; Fri, 31 Mar 2006 22:27:35 +0100 Received: from [2002:3fe4:139::1] (helo=gate.crashing.org) by pentafluge.infradead.org with esmtps (Exim 4.60 #1 (Red Hat Linux)) id 1FPR9X-0004DG-1Y for dwmw2 at infradead.org; Fri, 31 Mar 2006 22:27:34 +0100 Received: from localhost.localdomain (localhost [127.0.0.1]) by gate.crashing.org (8.12.8/8.12.8) with ESMTP id k2VLNnWP031196 for ; Fri, 31 Mar 2006 15:23:50 -0600 Subject: offb crap From: Benjamin Herrenschmidt To: David Woodhouse Content-Type: text/plain Date: Sat, 01 Apr 2006 08:24:51 +1100 Message-Id: <1143840291.24876.16.camel at localhost.localdomain> Mime-Version: 1.0 X-Mailer: Evolution 2.6.0 X-Spam-Score: -2.8 (--) X-Spam-Report: SpamAssassin version 3.0.4 on pentafluge.infradead.org summary: Content analysis details: (-2.8 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -2.8 ALL_TRUSTED Did not pass through any untrusted hosts X-Evolution-Source: imap://dwmw2 at pentafluge.infradead.org/ Content-Transfer-Encoding: 8bit Index: linux-work/drivers/video/offb.c =================================================================== --- linux-work.orig/drivers/video/offb.c 2006-01-11 13:30:27.000000000 +1100 +++ linux-work/drivers/video/offb.c 2006-01-11 14:11:01.000000000 +1100 @@ -321,8 +321,9 @@ int *pp, i; unsigned int len; int width = 640, height = 480, depth = 8, pitch; - unsigned int flags, rsize, *up; - u64 address = OF_BAD_ADDR; + unsigned flags, rsize, *up, addr_prop = 0; + unsigned long max_size = 0; + u64 rstart, address = OF_BAD_ADDR; u32 *addrp; u64 asize; @@ -343,69 +344,57 @@ } else pitch = width; - rsize = (unsigned long)pitch * (unsigned long)height * - (unsigned long)(depth / 8); + rsize = (unsigned long)pitch * (unsigned long)height * + (unsigned long)(depth / 8); - /* Try to match device to a PCI device in order to get a properly - * translated address rather then trying to decode the open firmware - * stuff in various incorrect ways - */ -#ifdef CONFIG_PCI - /* First try to locate the PCI device if any */ - { - struct pci_dev *pdev = NULL; - - for_each_pci_dev(pdev) { - if (dp == pci_device_to_OF_node(pdev)) - break; - } - if (pdev) { - for (i = 0; i < 6 && address == OF_BAD_ADDR; i++) { - if ((pci_resource_flags(pdev, i) & - IORESOURCE_MEM) && - (pci_resource_len(pdev, i) >= rsize)) - address = pci_resource_start(pdev, i); - } - pci_dev_put(pdev); - } - } -#endif /* CONFIG_PCI */ - - /* This one is dodgy, we may drop it ... */ - if (address == OF_BAD_ADDR && - (up = (unsigned *) get_property(dp, "address", &len)) != NULL && - len == sizeof(unsigned int)) - address = (u64) * up; - - if (address == OF_BAD_ADDR) { - for (i = 0; (addrp = of_get_address(dp, i, &asize, &flags)) - != NULL; i++) { - if (!(flags & IORESOURCE_MEM)) - continue; - if (asize >= pitch * height * depth / 8) - break; - } - if (addrp == NULL) { - printk(KERN_ERR - "no framebuffer address found for %s\n", - dp->full_name); - return; + /* Ok, now we try to figure out the address of the framebuffer. + * + * Unfortunately, Open Firmware doesn't provide a standard way to do + * so. All we can do is a dodgy heuristic that happens to work in + * practice. On most machines, the "address" property contains what + * we need, though not on Matrox cards found in IBM machines. What I've + * found that appears to give good results is to go through the PCI + * ranges and pick one that is both big enough and if possible encloses + * the "address" property. If none match, we pick the biggest + */ + up = (unsigned int *) get_property(dp, "address", &len); + if (up && len == sizeof(unsigned int)) + addr_prop = *up; + + for (i = 0; (addrp = of_get_address(dp, i, &asize, &flags)) + != NULL; i++) { + int match_addrp = 0; + + if (!(flags & IORESOURCE_MEM)) + continue; + if (asize < rsize) + continue; + rstart = of_translate_address(dp, addrp); + if (rstart == OF_BAD_ADDR) + continue; + if (addr_prop && (rstart <= addr_prop) && + ((rstart + rsize) > addr_prop)) + match_addrp = 1; + if (match_addrp) { + address = addr_prop; + break; } - address = of_translate_address(dp, addrp); - if (address == OF_BAD_ADDR) { - printk(KERN_ERR - "can't translate framebuffer address for %s\n", - dp->full_name); - return; + if (rsize > max_size) { + max_size = rsize; + address = OF_BAD_ADDR; } - + if (address == OF_BAD_ADDR) + address = rstart; + } + if (address == OF_BAD_ADDR && addr_prop) + address = (u_long)addr_prop; + if (address != OF_BAD_ADDR) { /* kludge for valkyrie */ if (strcmp(dp->name, "valkyrie") == 0) address += 0x1000; + offb_init_fb(dp->name, dp->full_name, width, height, depth, + pitch, address, dp); } - offb_init_fb(dp->name, dp->full_name, width, height, depth, - pitch, address, dp); - } static void __init offb_init_fb(const char *name, const char *full_name, Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.2110 retrieving revision 1.2111 diff -u -r1.2110 -r1.2111 --- kernel-2.6.spec 31 Mar 2006 20:48:15 -0000 1.2110 +++ kernel-2.6.spec 31 Mar 2006 21:47:50 -0000 1.2111 @@ -236,6 +236,7 @@ # 300 - 399 ppc(64) Patch301: linux-2.6-cell-numa-init.patch +Patch302: linux-2.6-offb-find-fb.patch Patch305: linux-2.6-cell-mambo-drivers.patch Patch306: linux-2.6-hvc-console.patch Patch314: linux-2.6-ppc-rtas-check.patch @@ -741,6 +742,8 @@ # # Arnd says don't call cell_spumem_init() till he fixes it. %patch301 -p1 +# Find OF framebuffer more reliably +%patch302 -p1 # Support the IBM Mambo simulator; core as well as disk and network drivers. %patch305 -p1 # Make HVC console generic; support simulator console device using it. @@ -1615,6 +1618,7 @@ %changelog * Fri Mar 31 2006 David Woodhouse - Send standard WEXT events on softmac assoc/disassociation. +- OFFB udpate * Thu Mar 30 2006 Dave Jones - 2.6.16-git18 From fedora-cvs-commits at redhat.com Fri Mar 31 21:57:12 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 31 Mar 2006 16:57:12 -0500 Subject: rpms/metacity/devel .cvsignore, 1.36, 1.37 metacity.spec, 1.63, 1.64 sources, 1.36, 1.37 Message-ID: <200603312157.k2VLvCEM010726@cvs.devel.redhat.com> Author: sandmann Update of /cvs/dist/rpms/metacity/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv10711 Modified Files: .cvsignore metacity.spec sources Log Message: * Fri Mar 31 2006 Soren Sandmann - 2.15.0 - Update to 2.15.0 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/metacity/devel/.cvsignore,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- .cvsignore 13 Mar 2006 23:55:02 -0000 1.36 +++ .cvsignore 31 Mar 2006 21:57:10 -0000 1.37 @@ -1,2 +1,2 @@ -libcm-0.0.16.0.2006.03.06.tar.bz2 -metacity-2.14.0.tar.bz2 +libcm-0.0.17.tar.gz +metacity-2.15.0.20060331.tar.gz Index: metacity.spec =================================================================== RCS file: /cvs/dist/rpms/metacity/devel/metacity.spec,v retrieving revision 1.63 retrieving revision 1.64 diff -u -r1.63 -r1.64 --- metacity.spec 13 Mar 2006 23:48:36 -0000 1.63 +++ metacity.spec 31 Mar 2006 21:57:10 -0000 1.64 @@ -1,16 +1,16 @@ %define gettext_package metacity -%define libcm_version 0.0.16 -%define libcm_snapshot_date 2006.03.06 -%define metacity_version 2.14.0 +%define libcm_version 0.0.17 +%define metacity_version 2.15.0 +%define metacity_snapshot 20060331 Summary: Metacity window manager Name: metacity Version: %{metacity_version} Release: 1 URL: http://ftp.gnome.org/pub/gnome/sources/metacity/ -Source0: metacity-%{metacity_version}.tar.bz2 -Source1: libcm-%{libcm_version}.0.%{libcm_snapshot_date}.tar.bz2 +Source0: metacity-%{metacity_version}.%{metacity_snapshot}.tar.gz +Source1: libcm-%{libcm_version}.tar.gz License: GPL Group: User Interface/Desktops BuildRoot: %{_tmppath}/%{name}-root @@ -34,9 +34,7 @@ Requires: redhat-artwork >= 0.62 Patch0: metacity-2.4.13.90-ctrlaltdel.patch -Patch1: metacity-2.13.144-bling.patch -Patch2: metacity-2.13.89.0.2006.02.16-static-cm.patch -Patch3: metacity-2.13.89.0.2006.02.16-fix-type.patch +Patch1: metacity-2.13.89.0.2006.02.16-static-cm.patch %description @@ -44,18 +42,16 @@ GNOME 2. %prep -%setup -q -n metacity-%{metacity_version} -%setup -D -T -a1 -n metacity-%{metacity_version} +%setup -q -n metacity-%{metacity_version}.%{metacity_snapshot} +%setup -D -T -a1 -n metacity-%{metacity_version}.%{metacity_snapshot} %patch0 -p1 -b .ctrlaltdel -%patch1 -p1 -b .bling -%patch2 -p1 -b .static-cm -%patch3 -p1 -b .fix-type +%patch1 -p1 -b .static-cm %build rm -rf $RPM_BUILD_ROOT %ifnarch s390 s390x ppc64 -pushd libcm-%{libcm_version}.0.%{libcm_snapshot_date} +pushd libcm-%{libcm_version} %configure make make install DESTDIR=$RPM_BUILD_ROOT @@ -142,6 +138,9 @@ %{_mandir}/man1/* %changelog +* Fri Mar 31 2006 Soren Sandmann - 2.15.0 +- Update to 2.15.0 + * Mon Mar 13 2006 Ray Strode - 2.14.0-1 - update to 2.14.0 Index: sources =================================================================== RCS file: /cvs/dist/rpms/metacity/devel/sources,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- sources 13 Mar 2006 23:55:02 -0000 1.36 +++ sources 31 Mar 2006 21:57:10 -0000 1.37 @@ -1,2 +1,2 @@ -eba1b4b6d6a18eb4fc28e35045b63b0e libcm-0.0.16.0.2006.03.06.tar.bz2 -2480951fb0636d3fc6a78ab8a54f355d metacity-2.14.0.tar.bz2 +4bd27c1cf6de1bb57c4c0ad5d508cf6f libcm-0.0.17.tar.gz +df7434930a126a14995c9e98d9a4f736 metacity-2.15.0.20060331.tar.gz From fedora-cvs-commits at redhat.com Fri Mar 31 22:29:19 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 31 Mar 2006 17:29:19 -0500 Subject: rpms/gnome-screensaver/devel gnome-screensaver-2.14.0-pass-krb-environment.patch, NONE, 1.1 gnome-screensaver.spec, 1.63, 1.64 Message-ID: <200603312229.k2VMTJTj025137@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/gnome-screensaver/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv25122 Modified Files: gnome-screensaver.spec Added Files: gnome-screensaver-2.14.0-pass-krb-environment.patch Log Message: - refresh kerberos credentials when unlocking screen (bug 187341) gnome-screensaver-2.14.0-pass-krb-environment.patch: gs-window-x11.c | 2 ++ 1 files changed, 2 insertions(+) --- NEW FILE gnome-screensaver-2.14.0-pass-krb-environment.patch --- The pam_krb5 module is happy to store fresh credentials (which it obtains when it checks your password) in your credential cache and v4 ticket file, but it needs to be able to know where to store them. --- gnome-screensaver-2.14.0/src/gs-window-x11.c 2006-03-30 19:40:16.000000000 -0500 +++ gnome-screensaver-2.14.0/src/gs-window-x11.c 2006-03-30 19:40:08.000000000 -0500 @@ -560,6 +560,8 @@ "XAUTHLOCALHOSTNAME", "LANG", "GNOME_SCREENSAVER_THEME", + "KRB5CCNAME", + "KRBTKFILE", "LANGUAGE" }; Index: gnome-screensaver.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-screensaver/devel/gnome-screensaver.spec,v retrieving revision 1.63 retrieving revision 1.64 diff -u -r1.63 -r1.64 --- gnome-screensaver.spec 26 Mar 2006 02:23:46 -0000 1.63 +++ gnome-screensaver.spec 31 Mar 2006 22:29:17 -0000 1.64 @@ -14,7 +14,7 @@ Summary: GNOME Screensaver Name: gnome-screensaver Version: 2.14.0 -Release: 2 +Release: 3 License: GPL Group: Amusement/Graphics Source0: %{name}-%{version}.tar.bz2 @@ -27,6 +27,7 @@ Patch0: gnome-screensaver-2.13.91-lock-dialog.patch Patch1: gnome-screensaver-0.0.23-use-floaters-by-default.patch Patch2: gnome-screensaver-2.13.91-shrink-em.patch +Patch3: gnome-screensaver-2.14.0-pass-krb-environment.patch BuildRoot: %{_tmppath}/%{name}-root URL: http://www.gnome.org @@ -63,6 +64,7 @@ %patch0 -p1 -b .lock-dialog %patch1 -p1 -b .use-floaters-by-default %patch2 -p1 -b .shrink-em +%patch3 -p1 -b .pass-krb-environment %build intltoolize --force @@ -162,6 +164,10 @@ %{_sysconfdir}/pam.d/* %changelog +* Thu Mar 30 2006 Ray Strode 2.14.0-3 +- refresh kerberos credentials when unlocking screen + (bug 187341) + * Sat Mar 25 2006 Ray Strode 2.14.0-2 - Add missing "c" to the word "Screensaver" in summary (bug 186711). From fedora-cvs-commits at redhat.com Fri Mar 31 23:09:33 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 31 Mar 2006 18:09:33 -0500 Subject: rpms/gnbd-kernel/FC-5 gnbd-kernel.spec,1.154,1.155 Message-ID: <200603312309.k2VN9X2K006796@cvs.devel.redhat.com> Author: cfeist Update of /cvs/dist/rpms/gnbd-kernel/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv6784 Modified Files: gnbd-kernel.spec Log Message: Build xen for x86_64. Index: gnbd-kernel.spec =================================================================== RCS file: /cvs/dist/rpms/gnbd-kernel/FC-5/gnbd-kernel.spec,v retrieving revision 1.154 retrieving revision 1.155 diff -u -r1.154 -r1.155 --- gnbd-kernel.spec 14 Mar 2006 23:06:20 -0000 1.154 +++ gnbd-kernel.spec 31 Mar 2006 23:09:07 -0000 1.155 @@ -19,13 +19,13 @@ %define buildsmp 0 %endif -%ifnarch i686 +%ifnarch i686 x86_64 %define buildxen 0 %endif Name: gnbd-kernel Version: 2.6.15 -Release: 5.FC5.23 +Release: 5.FC5.24 License: GPL Group: System Environment/Kernel Summary: gnbd-kernel - The kernel module for GFS's Network Block Device @@ -217,6 +217,9 @@ %{_includedir}/linux/gnbd.h %changelog +* Fri Mar 31 2006 Chris Feist +- Build xen for x86_64. + * Tue Mar 14 2006 Chris Feist - Removed 'ARCH=xen' for xen builds. From fedora-cvs-commits at redhat.com Fri Mar 31 23:12:54 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 31 Mar 2006 18:12:54 -0500 Subject: rpms/cman-kernel/FC-5 cman-kernel.spec,1.161,1.162 Message-ID: <200603312312.k2VNCspU006907@cvs.devel.redhat.com> Author: cfeist Update of /cvs/dist/rpms/cman-kernel/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv6894 Modified Files: cman-kernel.spec Log Message: Updated Kernel Version Index: cman-kernel.spec =================================================================== RCS file: /cvs/dist/rpms/cman-kernel/FC-5/cman-kernel.spec,v retrieving revision 1.161 retrieving revision 1.162 diff -u -r1.161 -r1.162 --- cman-kernel.spec 14 Mar 2006 23:23:15 -0000 1.161 +++ cman-kernel.spec 31 Mar 2006 23:12:52 -0000 1.162 @@ -12,7 +12,7 @@ %define buildup 1 %define buildsmp 1 %define buildxen 1 -%define kernel_version 2.6.15-1.2054_FC5 +%define kernel_version 2.6.16-1.2080_FC5 %define subversion 0 %define tempversion 2.6.15 @@ -26,7 +26,7 @@ Name: cman-kernel Version: 2.6.15.1 -Release: 0.FC5.16 +Release: 0.FC5.17 License: GPL Group: System Environment/Kernel Summary: cman-kernel - The Cluster Manager kernel modules From fedora-cvs-commits at redhat.com Fri Mar 31 23:13:02 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 31 Mar 2006 18:13:02 -0500 Subject: rpms/gnbd-kernel/FC-5 gnbd-kernel.spec,1.155,1.156 Message-ID: <200603312313.k2VND2SA006962@cvs.devel.redhat.com> Author: cfeist Update of /cvs/dist/rpms/gnbd-kernel/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv6949 Modified Files: gnbd-kernel.spec Log Message: Updated Kernel Version Index: gnbd-kernel.spec =================================================================== RCS file: /cvs/dist/rpms/gnbd-kernel/FC-5/gnbd-kernel.spec,v retrieving revision 1.155 retrieving revision 1.156 diff -u -r1.155 -r1.156 --- gnbd-kernel.spec 31 Mar 2006 23:09:07 -0000 1.155 +++ gnbd-kernel.spec 31 Mar 2006 23:13:00 -0000 1.156 @@ -12,7 +12,7 @@ %define buildup 1 %define buildsmp 1 %define buildxen 1 -%define kernel_version 2.6.15-1.2054_FC5 +%define kernel_version 2.6.16-1.2080_FC5 %define subversion 2 %ifnarch i686 @@ -25,7 +25,7 @@ Name: gnbd-kernel Version: 2.6.15 -Release: 5.FC5.24 +Release: 5.FC5.25 License: GPL Group: System Environment/Kernel Summary: gnbd-kernel - The kernel module for GFS's Network Block Device From fedora-cvs-commits at redhat.com Fri Mar 31 23:13:10 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 31 Mar 2006 18:13:10 -0500 Subject: rpms/dlm-kernel/FC-5 dlm-kernel.spec,1.131,1.132 Message-ID: <200603312313.k2VNDA0I007017@cvs.devel.redhat.com> Author: cfeist Update of /cvs/dist/rpms/dlm-kernel/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv7004 Modified Files: dlm-kernel.spec Log Message: Updated Kernel Version Index: dlm-kernel.spec =================================================================== RCS file: /cvs/dist/rpms/dlm-kernel/FC-5/dlm-kernel.spec,v retrieving revision 1.131 retrieving revision 1.132 diff -u -r1.131 -r1.132 --- dlm-kernel.spec 14 Mar 2006 23:23:58 -0000 1.131 +++ dlm-kernel.spec 31 Mar 2006 23:13:08 -0000 1.132 @@ -12,7 +12,7 @@ %define buildup 1 %define buildsmp 1 %define buildxen 1 -%define kernel_version 2.6.15-1.2054_FC5 +%define kernel_version 2.6.16-1.2080_FC5 %define tempversion 2.6.15 %define subversion 0 @@ -26,7 +26,7 @@ Name: dlm-kernel Version: 2.6.15.1 -Release: 0.FC5.14 +Release: 0.FC5.15 License: GPL Group: System Environment/Kernel Summary: dlm-kernel - The Distributed Lock Manager kernel modules. From fedora-cvs-commits at redhat.com Fri Mar 31 23:13:19 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 31 Mar 2006 18:13:19 -0500 Subject: rpms/GFS-kernel/FC-5 GFS-kernel.spec,1.149,1.150 Message-ID: <200603312313.k2VNDJIr007072@cvs.devel.redhat.com> Author: cfeist Update of /cvs/dist/rpms/GFS-kernel/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv7059 Modified Files: GFS-kernel.spec Log Message: Updated Kernel Version Index: GFS-kernel.spec =================================================================== RCS file: /cvs/dist/rpms/GFS-kernel/FC-5/GFS-kernel.spec,v retrieving revision 1.149 retrieving revision 1.150 diff -u -r1.149 -r1.150 --- GFS-kernel.spec 14 Mar 2006 23:22:29 -0000 1.149 +++ GFS-kernel.spec 31 Mar 2006 23:13:17 -0000 1.150 @@ -12,7 +12,7 @@ %define buildup 1 %define buildsmp 1 %define buildxen 1 -%define kernel_version 2.6.15-1.2054_FC5 +%define kernel_version 2.6.16-1.2080_FC5 %define tempversion 2.6.15 %define subversion 2 @@ -26,7 +26,7 @@ Name: GFS-kernel Version: 2.6.15.1 -Release: 5.FC5.17 +Release: 5.FC5.18 License: GPL Group: System Environment/Kernel Summary: GFS-kernel - The Global File System kernel modules From fedora-cvs-commits at redhat.com Fri Mar 31 23:19:24 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 31 Mar 2006 18:19:24 -0500 Subject: rpms/cman-kernel/FC-5 cman-kernel.spec,1.162,1.163 Message-ID: <200603312319.k2VNJOGj020841@cvs.devel.redhat.com> Author: cfeist Update of /cvs/dist/rpms/cman-kernel/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv20828 Modified Files: cman-kernel.spec Log Message: Build xen for x86_64. Index: cman-kernel.spec =================================================================== RCS file: /cvs/dist/rpms/cman-kernel/FC-5/cman-kernel.spec,v retrieving revision 1.162 retrieving revision 1.163 diff -u -r1.162 -r1.163 --- cman-kernel.spec 31 Mar 2006 23:12:52 -0000 1.162 +++ cman-kernel.spec 31 Mar 2006 23:19:21 -0000 1.163 @@ -20,13 +20,13 @@ %define buildsmp 0 %endif -%ifnarch i686 +%ifnarch i686 x86_64 %define buildxen 0 %endif Name: cman-kernel Version: 2.6.15.1 -Release: 0.FC5.17 +Release: 0.FC5.18 License: GPL Group: System Environment/Kernel Summary: cman-kernel - The Cluster Manager kernel modules @@ -225,6 +225,9 @@ %{_includedir}/cluster/* %changelog +* Fri Mar 31 2006 Chris Feist +- Build xen for x86_64. + * Tue Mar 14 2006 Chris Feist - Removed 'ARCH=xen' for xen builds. From fedora-cvs-commits at redhat.com Fri Mar 31 23:20:30 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 31 Mar 2006 18:20:30 -0500 Subject: rpms/dlm-kernel/FC-5 dlm-kernel.spec,1.132,1.133 Message-ID: <200603312320.k2VNKUKi020908@cvs.devel.redhat.com> Author: cfeist Update of /cvs/dist/rpms/dlm-kernel/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv20897 Modified Files: dlm-kernel.spec Log Message: Build xen for x86_64. Index: dlm-kernel.spec =================================================================== RCS file: /cvs/dist/rpms/dlm-kernel/FC-5/dlm-kernel.spec,v retrieving revision 1.132 retrieving revision 1.133 diff -u -r1.132 -r1.133 --- dlm-kernel.spec 31 Mar 2006 23:13:08 -0000 1.132 +++ dlm-kernel.spec 31 Mar 2006 23:20:15 -0000 1.133 @@ -20,13 +20,13 @@ %define buildsmp 0 %endif -%ifnarch i686 +%ifnarch i686 x86_64 %define buildxen 0 %endif Name: dlm-kernel Version: 2.6.15.1 -Release: 0.FC5.15 +Release: 0.FC5.16 License: GPL Group: System Environment/Kernel Summary: dlm-kernel - The Distributed Lock Manager kernel modules. @@ -233,6 +233,9 @@ %{_includedir}/cluster/* %changelog +* Fri Mar 31 2006 Chris Feist +- Build xen for x86_64. + * Tue Mar 14 2006 Chris Feist - Removed 'ARCH=xen' for xen builds. From fedora-cvs-commits at redhat.com Fri Mar 31 23:20:57 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 31 Mar 2006 18:20:57 -0500 Subject: rpms/GFS-kernel/FC-5 GFS-kernel.spec,1.150,1.151 Message-ID: <200603312320.k2VNKvRb020968@cvs.devel.redhat.com> Author: cfeist Update of /cvs/dist/rpms/GFS-kernel/FC-5 In directory cvs.devel.redhat.com:/tmp/cvs-serv20954 Modified Files: GFS-kernel.spec Log Message: Build xen for x86_64. Index: GFS-kernel.spec =================================================================== RCS file: /cvs/dist/rpms/GFS-kernel/FC-5/GFS-kernel.spec,v retrieving revision 1.150 retrieving revision 1.151 diff -u -r1.150 -r1.151 --- GFS-kernel.spec 31 Mar 2006 23:13:17 -0000 1.150 +++ GFS-kernel.spec 31 Mar 2006 23:20:55 -0000 1.151 @@ -20,13 +20,13 @@ %define buildsmp 0 %endif -%ifnarch i686 +%ifnarch i686 x86_64 %define buildxen 0 %endif Name: GFS-kernel Version: 2.6.15.1 -Release: 5.FC5.18 +Release: 5.FC5.19 License: GPL Group: System Environment/Kernel Summary: GFS-kernel - The Global File System kernel modules @@ -247,6 +247,9 @@ %{_includedir}/linux/* %changelog +* Fri Mar 31 2006 Chris Feist +- Build xen for x86_64. + * Tue Mar 14 2006 Chris Feist - Removed 'ARCH=xen' for xen builds.